АРЧ - Ассистент: отделить reference-срез от execution-окна в ответах по lifecycle follow-up

2026-04-15 14:50:16 +03:00
parent 70cc5a99f1
commit 7a6d8eb070
44 changed files with 2394 additions and 118 deletions
@@ -20,6 +20,7 @@ import * as assistantAddressAttemptRuntimeAdapter_1 from "./assistantAddressAtte
 import * as assistantCoverageGrounding_1 from "./assistantCoverageGrounding";
 import * as assistantDeepTurnAttemptRuntimeAdapter_1 from "./assistantDeepTurnAttemptRuntimeAdapter";
 import * as assistantOrganizationScopeRuntimeAdapter_1 from "./assistantOrganizationScopeRuntimeAdapter";
+import * as assistantOrganizationMatcher_1 from "./assistantOrganizationMatcher";
 import * as assistantTurnAttemptRuntimeAdapter_1 from "./assistantTurnAttemptRuntimeAdapter";
 import * as assistantTurnRuntimeDepsAdapter_1 from "./assistantTurnRuntimeDepsAdapter";
 import * as assistantTurnRuntimeInputBuilder_1 from "./assistantTurnRuntimeInputBuilder";
@@ -1427,6 +1428,7 @@ function buildAddressDebugPayload(addressDebug, llmPreDecomposeMeta = null) {
        account_scope_drop_reason: addressDebug.account_scope_drop_reason,
        runtime_readiness: addressDebug.runtime_readiness,
        limited_reason_category: addressDebug.limited_reason_category,
+        organization_candidates: addressDebug.organization_candidates ?? undefined,
        response_type: addressDebug.response_type,
        requested_result_mode: addressDebug.requested_result_mode ?? undefined,
        result_mode: addressDebug.result_mode ?? undefined,
@@ -2747,9 +2749,18 @@ function resolveDebtRoleSwapFollowupIntent(userMessage, previousIntent) {
    }
    return null;
 }
-function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMessage = null, llmPreDecomposeMeta = null) {
+function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMessage = null, llmPreDecomposeMeta = null, addressNavigationState = null) {
    const previousAddressItem = findLastAddressAssistantItem(items);
    const previousAddressDebug = previousAddressItem?.debug ?? null;
+    const lastOrganizationClarificationDebug = findLastOrganizationClarificationAddressDebug(items);
+    const organizationClarificationCandidates = Array.isArray(lastOrganizationClarificationDebug?.organization_candidates)
+        ? mergeKnownOrganizations(lastOrganizationClarificationDebug.organization_candidates)
+        : [];
+    const organizationClarificationSelection = resolveOrganizationSelectionFromMessage(userMessage, organizationClarificationCandidates) ??
+        (toNonEmptyString(alternateMessage)
+            ? resolveOrganizationSelectionFromMessage(String(alternateMessage ?? ""), organizationClarificationCandidates)
+            : null);
+    const hasOrganizationClarificationContinuation = Boolean(lastOrganizationClarificationDebug && organizationClarificationSelection);
    const followupOffer = previousAddressDebug ? buildAddressFollowupOffer(previousAddressDebug) : null;
    const hasImplicitContinuationSignal = Boolean(previousAddressDebug) &&
        Boolean(followupOffer?.enabled) &&
@@ -2780,10 +2791,15 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
        !hasPrimaryFollowupSignal &&
        !hasAlternateFollowupSignal &&
        !hasImplicitContinuationSignal &&
+        !hasOrganizationClarificationContinuation &&
        !hasIndexReferenceSignal) {
        return null;
    }
-    if (!hasPrimaryFollowupSignal && !hasAlternateFollowupSignal && !hasImplicitContinuationSignal && !hasIndexReferenceSignal) {
+    if (!hasPrimaryFollowupSignal &&
+        !hasAlternateFollowupSignal &&
+        !hasImplicitContinuationSignal &&
+        !hasOrganizationClarificationContinuation &&
+        !hasIndexReferenceSignal) {
        return null;
    }
    if (!previousAddressDebug) {
@@ -2811,7 +2827,45 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
        readAddressFilterString(previousAddressDebug, "counterparty") ??
        readAddressFilterString(previousAddressDebug, "account") ??
        readAddressFilterString(previousAddressDebug, "contract");
-    const inventoryRootFrame = findRecentInventoryRootFrame(items);
+    const navigationSessionContext = addressNavigationState && typeof addressNavigationState === "object"
+        ? (addressNavigationState.session_context && typeof addressNavigationState.session_context === "object"
+            ? addressNavigationState.session_context
+            : null)
+        : null;
+    const navigationDateScope = navigationSessionContext && typeof navigationSessionContext.date_scope === "object"
+        ? navigationSessionContext.date_scope
+        : null;
+    const navigationOrganization = normalizeOrganizationScopeValue(navigationSessionContext?.organization_scope);
+    const navigationFocusObject = navigationSessionContext && typeof navigationSessionContext.active_focus_object === "object"
+        ? navigationSessionContext.active_focus_object
+        : null;
+    const navigationFocusObjectType = toNonEmptyString(navigationFocusObject?.object_type);
+    const navigationFocusObjectLabel = toNonEmptyString(navigationFocusObject?.label);
+    const hasSelectedObjectInventorySignalPrimary = /(?:по\s+выбранному\s+объекту|по\s+этой\s+позиции|по\s+этому\s+товару|selected\s+object)/iu.test(String(userMessage ?? ""));
+    const hasSelectedObjectInventorySignalAlternate = toNonEmptyString(alternateMessage)
+        ? /(?:по\s+выбранному\s+объекту|по\s+этой\s+позиции|по\s+этому\s+товару|selected\s+object)/iu.test(String(alternateMessage ?? ""))
+        : false;
+    let inventoryRootFrame = findRecentInventoryRootFrame(items);
+    if (inventoryRootFrame && navigationOrganization && !toNonEmptyString(inventoryRootFrame.filters?.organization)) {
+        inventoryRootFrame = {
+            ...inventoryRootFrame,
+            filters: {
+                ...(inventoryRootFrame.filters ?? {}),
+                organization: navigationOrganization
+            }
+        };
+    }
+    if (inventoryRootFrame && navigationDateScope) {
+        inventoryRootFrame = {
+            ...inventoryRootFrame,
+            filters: {
+                ...(inventoryRootFrame.filters ?? {}),
+                as_of_date: toNonEmptyString(inventoryRootFrame.filters?.as_of_date) ?? toNonEmptyString(navigationDateScope.as_of_date) ?? undefined,
+                period_from: toNonEmptyString(inventoryRootFrame.filters?.period_from) ?? toNonEmptyString(navigationDateScope.period_from) ?? undefined,
+                period_to: toNonEmptyString(inventoryRootFrame.filters?.period_to) ?? toNonEmptyString(navigationDateScope.period_to) ?? undefined
+            }
+        };
+    }
    const currentFrameKind = inventoryRootFrame
        ? isInventoryDrilldownFrameIntent(sourceIntent)
            ? "inventory_drilldown"
@@ -2842,6 +2896,21 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
            previousFilters.organization = historicalOrganization;
        }
    }
+    if (!toNonEmptyString(previousFilters.organization) && navigationOrganization) {
+        previousFilters.organization = navigationOrganization;
+    }
+    if (!toNonEmptyString(previousFilters.organization) && organizationClarificationSelection) {
+        previousFilters.organization = organizationClarificationSelection;
+    }
+    if (!toNonEmptyString(previousFilters.as_of_date) && toNonEmptyString(navigationDateScope?.as_of_date)) {
+        previousFilters.as_of_date = toNonEmptyString(navigationDateScope?.as_of_date);
+    }
+    if (!toNonEmptyString(previousFilters.period_from) && toNonEmptyString(navigationDateScope?.period_from)) {
+        previousFilters.period_from = toNonEmptyString(navigationDateScope?.period_from);
+    }
+    if (!toNonEmptyString(previousFilters.period_to) && toNonEmptyString(navigationDateScope?.period_to)) {
+        previousFilters.period_to = toNonEmptyString(navigationDateScope?.period_to);
+    }
    const displayedEntityType = inferDisplayedEntityTypeFromIntent(sourceIntent);
    const displayedEntities = extractDisplayedAddressEntityCandidates(toNonEmptyString(previousAddressItem?.text) ?? "", displayedEntityType);
    const resolvedEntityFromFollowup = resolveDisplayedAddressEntityMention(userMessage, displayedEntities) ??
@@ -2869,6 +2938,36 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
            followupSelectionMode = "carry_referenced_entity";
        }
    }
+    if (!toNonEmptyString(previousFilters.item) &&
+        navigationFocusObjectType === "item" &&
+        navigationFocusObjectLabel &&
+        (sourceIntentHint === "inventory_on_hand_as_of_date" ||
+            sourceIntentHint === "inventory_purchase_provenance_for_item" ||
+            sourceIntentHint === "inventory_purchase_documents_for_item" ||
+            sourceIntentHint === "inventory_sale_trace_for_item" ||
+            sourceIntentHint === "inventory_purchase_to_sale_chain" ||
+            sourceIntentHint === "inventory_aging_by_purchase_date" ||
+            hasSelectedObjectInventorySignalPrimary ||
+            hasSelectedObjectInventorySignalAlternate)) {
+        previousFilters.item = navigationFocusObjectLabel;
+        if (!previousAnchor) {
+            previousAnchorType = "item";
+            previousAnchor = navigationFocusObjectLabel;
+        }
+    }
+    if (organizationClarificationSelection && !previousAnchor) {
+        previousAnchorType = "organization";
+        previousAnchor = organizationClarificationSelection;
+    }
+    if (inventoryRootFrame && organizationClarificationSelection && !toNonEmptyString(inventoryRootFrame.filters?.organization)) {
+        inventoryRootFrame = {
+            ...inventoryRootFrame,
+            filters: {
+                ...(inventoryRootFrame.filters ?? {}),
+                organization: organizationClarificationSelection
+            }
+        };
+    }
    if (!previousIntent && !previousAnchor && Object.keys(previousFilters).length === 0) {
        return null;
    }
@@ -3994,6 +4093,28 @@ export function resolveAssistantOrchestrationDecision(input) {
    const llmPreDecomposeMeta = input?.llmPreDecomposeMeta ?? null;
    const useMock = Boolean(input?.useMock);
    const sessionItems = Array.isArray(input?.sessionItems) ? input.sessionItems : null;
+    const sessionOrganizationScope = input?.sessionOrganizationScope && typeof input.sessionOrganizationScope === "object"
+        ? input.sessionOrganizationScope
+        : null;
+    const lastGroundedAddressDebug = findLastGroundedAddressAnswerDebug(sessionItems);
+    const lastOrganizationClarificationDebug = findLastOrganizationClarificationAddressDebug(sessionItems);
+    const organizationClarificationCandidates = Array.isArray(lastOrganizationClarificationDebug?.organization_candidates)
+        ? mergeKnownOrganizations([
+            ...lastOrganizationClarificationDebug.organization_candidates,
+            ...((Array.isArray(sessionOrganizationScope?.knownOrganizations)
+                ? sessionOrganizationScope.knownOrganizations
+                : []))
+        ])
+        : [];
+    const organizationClarificationSelectionFromScope = normalizeOrganizationScopeValue(sessionOrganizationScope?.selectedOrganization);
+    const organizationClarificationSelection = resolveOrganizationSelectionFromMessage(rawUserMessage, organizationClarificationCandidates) ??
+        resolveOrganizationSelectionFromMessage(repairedRawUserMessage, organizationClarificationCandidates) ??
+        resolveOrganizationSelectionFromMessage(effectiveAddressUserMessage, organizationClarificationCandidates) ??
+        resolveOrganizationSelectionFromMessage(repairedEffectiveAddressUserMessage, organizationClarificationCandidates) ??
+        (organizationClarificationSelectionFromScope &&
+            organizationClarificationCandidates.some((candidate) => normalizeOrganizationScopeValue(candidate) === organizationClarificationSelectionFromScope)
+            ? organizationClarificationSelectionFromScope
+            : null);
    const dataScopeMetaQuery = hasAssistantDataScopeMetaQuestionSignal(rawUserMessage) ||
        hasAssistantDataScopeMetaQuestionSignal(repairedRawUserMessage) ||
        hasAssistantDataScopeMetaQuestionSignal(effectiveAddressUserMessage) ||
@@ -4081,6 +4202,12 @@ export function resolveAssistantOrchestrationDecision(input) {
            hasShortInventoryObjectFollowupSignal(repairedRawUserMessage) ||
            hasShortInventoryObjectFollowupSignal(effectiveAddressUserMessage) ||
            hasShortInventoryObjectFollowupSignal(repairedEffectiveAddressUserMessage)));
+    const organizationClarificationContinuationDetected = Boolean(followupContext &&
+        lastOrganizationClarificationDebug &&
+        organizationClarificationSelection &&
+        !dataScopeMetaQuery &&
+        !capabilityMetaQuery &&
+        !dataRetrievalSignal);
    const effectiveAddressFollowupSignal = explicitAddressFollowupSignal && !dangerOrCoercionSignal;
    const deterministicNonDomainGuard = Boolean(!dataScopeMetaQuery &&
        !capabilityMetaQuery &&
@@ -4091,7 +4218,16 @@ export function resolveAssistantOrchestrationDecision(input) {
    const nonDomainQueryIndexed = Boolean(!llmFirstAddressCandidate &&
        deterministicNonDomainGuard &&
        (llmFirstUnsupportedCandidate || llmContractMode === null) &&
-        !protectedInventoryShortFollowup);
+        !protectedInventoryShortFollowup &&
+        !organizationClarificationContinuationDetected);
+    const contextualHistoricalCapabilityFollowupDetected = Boolean(capabilityMetaQuery &&
+        !dataScopeMetaQuery &&
+        !dataRetrievalSignal &&
+        (hasHistoricalCapabilityFollowupSignal(rawUserMessage) ||
+            hasHistoricalCapabilityFollowupSignal(repairedRawUserMessage) ||
+            hasHistoricalCapabilityFollowupSignal(effectiveAddressUserMessage) ||
+            hasHistoricalCapabilityFollowupSignal(repairedEffectiveAddressUserMessage)) &&
+        isGroundedInventoryContextDebug(lastGroundedAddressDebug));
    const hardMetaMode = dataScopeMetaQuery
        ? "data_scope"
        : capabilityMetaQuery && !dataRetrievalSignal
@@ -4126,6 +4262,34 @@ export function resolveAssistantOrchestrationDecision(input) {
        };
    }
    if (hardMetaMode === "capability") {
+        if (contextualHistoricalCapabilityFollowupDetected) {
+            return {
+                runAddressLane: false,
+                toolGateDecision: "skip_address_lane",
+                toolGateReason: "inventory_history_capability_followup_detected",
+                livingMode: "chat",
+                livingReason: "inventory_history_capability_followup_detected",
+                orchestrationContract: {
+                    schema_version: "assistant_orchestration_contract_v1",
+                    hard_meta_mode: "capability",
+                    address_mode: resolvedModeDetection.mode,
+                    address_mode_confidence: resolvedModeDetection.confidence,
+                    address_intent: resolvedIntentResolution.intent,
+                    address_intent_confidence: resolvedIntentResolution.confidence,
+                    strong_data_signal_detected: strongDataSignal,
+                    data_retrieval_signal_detected: dataRetrievalSignal,
+                    followup_context_detected: Boolean(followupContext || lastGroundedAddressDebug),
+                    unsupported_address_intent_fallback_to_deep: false,
+                    final_decision: {
+                        run_address_lane: false,
+                        tool_gate_decision: "skip_address_lane",
+                        tool_gate_reason: "inventory_history_capability_followup_detected",
+                        living_mode: "chat",
+                        living_reason: "inventory_history_capability_followup_detected"
+                    }
+                }
+            };
+        }
        return {
            runAddressLane: false,
            toolGateDecision: "skip_address_lane",
@@ -4181,6 +4345,10 @@ export function resolveAssistantOrchestrationDecision(input) {
            }
        };
    }
+    const metaAnswerFollowupSignal = hasMetaAnswerFollowupSignal(rawUserMessage) ||
+        hasMetaAnswerFollowupSignal(repairedRawUserMessage) ||
+        hasMetaAnswerFollowupSignal(effectiveAddressUserMessage) ||
+        hasMetaAnswerFollowupSignal(repairedEffectiveAddressUserMessage);
    const baseToolGate = resolveAddressToolGateDecision(effectiveAddressUserMessage, followupContext, llmPreDecomposeMeta, rawUserMessage);
    const preserveAddressLaneSignal = Boolean((llmPreDecomposeMeta?.llmCanonicalCandidateDetected &&
        llmPreDecomposeMeta?.applied &&
@@ -4275,6 +4443,19 @@ export function resolveAssistantOrchestrationDecision(input) {
            repairedEffectiveAddressUserMessage,
            sessionItems
        }));
+    const hasPriorAddressAnswerContext = Boolean(lastGroundedAddressDebug || toNonEmptyString(followupContext?.previous_intent));
+    const metaFollowupOverGroundedAnswer = Boolean(followupContext &&
+        hasPriorAddressAnswerContext &&
+        metaAnswerFollowupSignal &&
+        !dataScopeMetaQuery &&
+        !capabilityMetaQuery &&
+        !aggregateBusinessAnalyticsSignal &&
+        !dataRetrievalSignal &&
+        !strongDataSignal &&
+        resolvedModeDetection.mode !== "address_query" &&
+        resolvedIntentResolution.intent === "unknown" &&
+        (!llmContractIntent || llmContractIntent === "unknown") &&
+        llmContractMode !== "address_query");
    let runAddressLane = Boolean(baseToolGate?.runAddressLane);
    let toolGateDecision = String(baseToolGate?.decision ?? "skip_address_lane");
    let toolGateReason = String(baseToolGate?.reason ?? "no_address_signal_after_l0");
@@ -4300,6 +4481,11 @@ export function resolveAssistantOrchestrationDecision(input) {
        toolGateDecision = "skip_address_lane";
        toolGateReason = "deep_session_continuation_fallback_to_deep";
    }
+    if (metaFollowupOverGroundedAnswer) {
+        runAddressLane = false;
+        toolGateDecision = "skip_address_lane";
+        toolGateReason = "meta_followup_over_grounded_answer";
+    }
    let livingDecision = resolveLivingAssistantModeDecision({
        userMessage: rawUserMessage,
        addressLaneTriggered: runAddressLane,
@@ -4333,6 +4519,12 @@ export function resolveAssistantOrchestrationDecision(input) {
            reason: "deep_session_continuation_fallback_to_deep"
        };
    }
+    if (metaFollowupOverGroundedAnswer) {
+        livingDecision = {
+            mode: "chat",
+            reason: "meta_followup_over_grounded_answer"
+        };
+    }
    return {
        runAddressLane,
        toolGateDecision,
@@ -4434,6 +4626,105 @@ function findLastAssistantLivingChatDebug(items) {
    }
    return null;
 }
+function findLastGroundedAddressAnswerDebug(items) {
+    if (!Array.isArray(items)) {
+        return null;
+    }
+    for (let index = items.length - 1; index >= 0; index -= 1) {
+        const item = items[index];
+        if (!item || item.role !== "assistant" || !item.debug || typeof item.debug !== "object") {
+            continue;
+        }
+        const debug = item.debug;
+        if (debug.execution_lane !== "address_query") {
+            continue;
+        }
+        const groundingStatus = toNonEmptyString(debug.answer_grounding_check?.status);
+        if (groundingStatus === "grounded") {
+            return debug;
+        }
+    }
+    return null;
+}
+function findLastOrganizationClarificationAddressDebug(items) {
+    if (!Array.isArray(items)) {
+        return null;
+    }
+    for (let index = items.length - 1; index >= 0; index -= 1) {
+        const item = items[index];
+        if (!item || item.role !== "assistant" || !item.debug || typeof item.debug !== "object") {
+            continue;
+        }
+        const debug = item.debug;
+        if (debug.execution_lane !== "address_query" && debug.detected_mode !== "address_query") {
+            continue;
+        }
+        const limitedCategory = toNonEmptyString(debug.limited_reason_category);
+        const candidates = Array.isArray(debug.organization_candidates)
+            ? mergeKnownOrganizations(debug.organization_candidates)
+            : [];
+        if (limitedCategory === "missing_anchor" && candidates.length > 0) {
+            return debug;
+        }
+    }
+    return null;
+}
+function hasMetaAnswerFollowupSignal(userMessage) {
+    const rawText = compactWhitespace(String(userMessage ?? "").toLowerCase());
+    const repairedText = compactWhitespace(repairAddressMojibake(String(userMessage ?? "")).toLowerCase());
+    const samples = [rawText, repairedText]
+        .filter((item) => item.length > 0)
+        .map((item) => item.replace(/ё/g, "е"));
+    if (samples.length === 0) {
+        return false;
+    }
+    const hasReflectionCue = samples.some((sample) => sample.includes("дума") ||
+        sample.includes("скаж") ||
+        sample.includes("мнение") ||
+        sample.includes("как тебе") ||
+        sample.includes("норм") ||
+        sample.includes("стран") ||
+        sample.includes("логич") ||
+        sample.includes("смуща") ||
+        sample.includes("выгляд"));
+    const hasTopicPointerCue = samples.some((sample) => sample.includes("на эту тему") ||
+        sample.includes("по этому поводу") ||
+        sample.includes("об этом") ||
+        (sample.includes("это") && hasReferentialPointer(sample)));
+    if (!(hasReflectionCue && hasTopicPointerCue)) {
+        return false;
+    }
+    return !samples.some((sample) => hasAssistantDataScopeMetaQuestionSignal(sample) ||
+        shouldHandleAsAssistantCapabilityMetaQuery(sample) ||
+        hasDataRetrievalRequestSignal(sample) ||
+        hasStrongDataIntentSignal(sample));
+}
+function hasHistoricalCapabilityFollowupSignal(text) {
+    const repaired = repairAddressMojibake(String(text ?? ""));
+    const normalized = compactWhitespace(repaired.toLowerCase()).replace(/ё/g, "е");
+    if (!normalized) {
+        return false;
+    }
+    const hasHistoryCue = /(?:историческ|история|архив|прошл(?:ый|ые|ую|ых)?|раньше|ретро|старые\s+данные)/iu.test(normalized);
+    if (!hasHistoryCue) {
+        return false;
+    }
+    return /(?:мож(?:ешь|ете|но)|уме(?:ешь|ете)|показ|вывед|дай|раскрой)/iu.test(normalized);
+}
+function isGroundedInventoryContextDebug(debug) {
+    if (!debug || typeof debug !== "object") {
+        return false;
+    }
+    const detectedIntent = toNonEmptyString(debug.detected_intent);
+    const capabilityId = toNonEmptyString(debug.capability_id);
+    const rootFrameContext = debug.address_root_frame_context && typeof debug.address_root_frame_context === "object"
+        ? debug.address_root_frame_context
+        : null;
+    const rootIntent = toNonEmptyString(rootFrameContext?.root_intent);
+    return detectedIntent === "inventory_on_hand_as_of_date" ||
+        capabilityId === "confirmed_inventory_on_hand_as_of_date" ||
+        rootIntent === "inventory_on_hand_as_of_date";
+}
 function hasOrganizationFactFollowupSignal(userMessage, items) {
    const repaired = repairAddressMojibake(String(userMessage ?? ""));
    const normalized = compactWhitespace(repaired.toLowerCase()).replace(/ё/g, "е");
@@ -4722,7 +5013,6 @@ function normalizeOrganizationScopeValue(value) {
        return null;
    }
    const unwrapped = normalized
-        .replace(/^\\+|\\+$/g, "")
        .replace(/^"+|"+$/g, "")
        .replace(/^'+|'+$/g, "")
        .trim();
@@ -4862,8 +5152,34 @@ function mergeKnownOrganizations(values) {
    }
    return Array.from(dedup.values()).slice(0, 20);
 }
-function extractKnownOrganizationsFromHistory(items) {
+function extractKnownOrganizationsFromNavigationState(addressNavigationState) {
+    if (!addressNavigationState || typeof addressNavigationState !== "object") {
+        return [];
+    }
    const collected = [];
+    const sessionContext = addressNavigationState.session_context && typeof addressNavigationState.session_context === "object"
+        ? addressNavigationState.session_context
+        : null;
+    const directOrganization = normalizeOrganizationScopeValue(sessionContext?.organization_scope);
+    if (directOrganization) {
+        collected.push(directOrganization);
+    }
+    const resultSets = Array.isArray(addressNavigationState.result_sets) ? addressNavigationState.result_sets : [];
+    for (const resultSet of resultSets) {
+        const filters = resultSet?.filters && typeof resultSet.filters === "object" ? resultSet.filters : null;
+        const scopedOrganization = normalizeOrganizationScopeValue(filters?.organization);
+        if (scopedOrganization) {
+            collected.push(scopedOrganization);
+        }
+    }
+    return mergeKnownOrganizations(collected);
+}
+function extractKnownOrganizationsFromHistory(items, addressNavigationState = null) {
+    const collected = [];
+    const navigationOrganizations = extractKnownOrganizationsFromNavigationState(addressNavigationState);
+    if (navigationOrganizations.length > 0) {
+        collected.push(...navigationOrganizations);
+    }
    for (let index = (Array.isArray(items) ? items.length : 0) - 1; index >= 0; index -= 1) {
        const item = items[index];
        if (!item || item.role !== "assistant") {
@@ -4877,8 +5193,17 @@ function extractKnownOrganizationsFromHistory(items) {
            const knownFromDebug = Array.isArray(debug.assistant_known_organizations)
                ? debug.assistant_known_organizations
                : [];
-            if (directFromProbe.length > 0 || knownFromDebug.length > 0) {
-                collected.push(...directFromProbe, ...knownFromDebug);
+            const directFromCandidates = Array.isArray(debug.organization_candidates)
+                ? debug.organization_candidates
+                : [];
+            const directFromResolved = [
+                normalizeOrganizationScopeValue(debug.assistant_active_organization),
+                normalizeOrganizationScopeValue(debug.living_chat_selected_organization),
+                normalizeOrganizationScopeValue(debug.extracted_filters?.organization),
+                normalizeOrganizationScopeValue(debug.address_root_frame_context?.organization)
+            ].filter(Boolean);
+            if (directFromProbe.length > 0 || knownFromDebug.length > 0 || directFromCandidates.length > 0 || directFromResolved.length > 0) {
+                collected.push(...directFromProbe, ...knownFromDebug, ...directFromCandidates, ...directFromResolved);
            }
        }
        const parsedFromText = parseOrganizationsFromDataScopeAssistantText(item.text);
@@ -4891,7 +5216,16 @@ function extractKnownOrganizationsFromHistory(items) {
    }
    return mergeKnownOrganizations(collected);
 }
-function findLastAssistantActiveOrganization(items) {
+function findLastAssistantActiveOrganization(items, addressNavigationState = null) {
+    const sessionContext = addressNavigationState && typeof addressNavigationState === "object"
+        ? (addressNavigationState.session_context && typeof addressNavigationState.session_context === "object"
+            ? addressNavigationState.session_context
+            : null)
+        : null;
+    const navigationOrganization = normalizeOrganizationScopeValue(sessionContext?.organization_scope);
+    if (navigationOrganization) {
+        return navigationOrganization;
+    }
    for (let index = (Array.isArray(items) ? items.length : 0) - 1; index >= 0; index -= 1) {
        const item = items[index];
        if (!item || item.role !== "assistant" || !item.debug || typeof item.debug !== "object") {
@@ -4937,10 +5271,11 @@ function resolveOrganizationSelectionFromMessage(userMessage, knownOrganizations
    }
    return best.organization;
 }
-function resolveSessionOrganizationScopeContext(userMessage, items) {
+function resolveSessionOrganizationScopeContext(userMessage, items, addressNavigationState = null) {
    return (0, assistantOrganizationScopeRuntimeAdapter_1.resolveSessionOrganizationScopeContextRuntime)({
        userMessage,
        items,
+        addressNavigationState,
        extractKnownOrganizationsFromHistory,
        resolveOrganizationSelectionFromMessage,
        findLastAssistantActiveOrganization,
@@ -4955,8 +5290,8 @@ function mergeFollowupContextWithOrganizationScope(followupContext, organization
        toNonEmptyString
    });
 }
-export function resolveSessionOrganizationScopeContextForTests(userMessage, items) {
-    return resolveSessionOrganizationScopeContext(userMessage, items);
+export function resolveSessionOrganizationScopeContextForTests(userMessage, items, addressNavigationState = null) {
+    return resolveSessionOrganizationScopeContext(userMessage, items, addressNavigationState);
 }
 function normalizeGuidValue(value) {
    const source = normalizeScopeLabel(value);