ЮИ - Перенести настройки ассистента в управление автопрогонами и убрать верхний режим Ассистент

llm_normalizer/backend/dist/services/addressFilterExtractor.js

@@ -1051,6 +1051,12 @@ function isTemporalWarehousePhrase(candidate) {
         .toLowerCase()
         .replace(/ё/g, "е")
         .trim();
+    if (/^(?:на\s+)?(?:эту|ту|текущ(?:ую|ая|ий|ее|ей)|сегодняшн(?:юю|ая|ий|ее|ей))(?:\s+же)?\s+дат(?:у|а|е|ой)$/iu.test(normalized)) {
+        return true;
+    }
+    if (/^(?:нет|не\s+было|не\s+было\s+ли)(?:\s+на\s+(?:эту|ту|такую)\s+дат(?:у|е|ой))?$/iu.test(normalized)) {
+        return true;
+    }
     return /^(?:в|на)\s+(?:январ(?:е|ь)|феврал(?:е|ь)|март(?:е)?|апрел(?:е|ь)|ма(?:й|е)|июн(?:е|ь)|июл(?:е|ь)|август(?:е)?|сентябр(?:е|ь)|октябр(?:е|ь)|ноябр(?:е|ь)|декабр(?:е|ь))(?:\s+\d{4}(?:\s+г(?:\.|ода)?)?)?$/iu.test(normalized);
 }
 function isLowQualityWarehouseAnchorValue(rawValue) {
@@ -1097,7 +1103,8 @@ function isLowQualityWarehouseAnchorValue(rawValue) {
         "охуеть",
         "пиздец",
         "блять",
-        "бля"
+        "бля",
+        "нет"
     ]);
     const tokens = value
         .split(/[^a-zа-я0-9]+/iu)
@@ -1127,7 +1134,7 @@ function hasImplicitSelfScopeSignal(text) {
 }
 function isImplicitSelfScopeWarehouseAnchor(candidate) {
     const normalized = normalizeSemanticAnchorCandidate(candidate);
-    return /^(?:у\s+нас|у\s+себя|у\s+меня|наш(?:ем|ей|его|их|а|е)?|сво(?:ем|ей|его|их|я|е)?)$/iu.test(normalized);
+    return /^(?:у\s+нас|у\s+себя|у\s+меня|наш(?:ем|ей|его|их|а|е)?|сво(?:ем|ей|его|их|я|е)?)(?:\s+(?:висит|висят|висело|висели|лежит|лежат|лежало|лежали))?$/iu.test(normalized);
 }
 function hasSelectedObjectScopeSignal(text) {
     return /(?:по\s+выбранному\s+объекту|selected\s+object)/iu.test(String(text ?? ""));

llm_normalizer/backend/dist/services/addressQueryService.js

@@ -1039,10 +1039,21 @@ function toNormalizedRows(rows) {
         .filter((item) => Boolean(item.period || item.registrator));
 }
 function rowSearchableText(row) {
-    return [row.registrator, row.item ?? "", row.warehouse ?? "", row.account_dt ?? "", row.account_kt ?? "", ...row.analytics]
+    return [
+        row.registrator,
+        row.item ?? "",
+        row.warehouse ?? "",
+        row.organization ?? "",
+        row.account_dt ?? "",
+        row.account_kt ?? "",
+        ...row.analytics
+    ]
         .join(" ")
         .toLowerCase();
 }
+function rowOrganizationSearchableText(row) {
+    return [row.organization ?? "", row.registrator, ...row.analytics].join(" ").toLowerCase();
+}
 function rowMatchesAnyAccount(row, accountScope) {
     if (accountScope.length === 0) {
         return true;
@@ -1107,9 +1118,12 @@ function applyAddressFilters(rows, filters) {
     if (filters.organization && String(filters.organization).trim()) {
         const needle = String(filters.organization);
         const before = filtered.length;
-        filtered = filtered.filter((row) => matchesAnchorText(rowSearchableText(row), needle));
-        if (before > 0 && filtered.length === 0 && mismatchReason === null) {
-            mismatchReason = "organization_anchor_not_matched_in_materialized_rows";
+        const organizationMaterialized = filtered.some((row) => Boolean(String(row.organization ?? "").trim()));
+        if (organizationMaterialized) {
+            filtered = filtered.filter((row) => matchesAnchorText(rowOrganizationSearchableText(row), needle));
+            if (before > 0 && filtered.length === 0 && mismatchReason === null) {
+                mismatchReason = "organization_anchor_not_matched_in_materialized_rows";
+            }
         }
     }
     if (filters.item && String(filters.item).trim()) {

llm_normalizer/backend/dist/services/addressRecipeCatalog.js

@@ -1114,9 +1114,22 @@ function buildInventoryMovementQuery(filters, resolvedLimit, side) {
         : side === "kt"
             ? creditPredicate
             : `(${debitPredicate} ИЛИ ${creditPredicate})`;
+    const itemFieldPaths = side === "dt"
+        ? ["Движения.СубконтоДт1", "Движения.СубконтоДт2", "Движения.СубконтоДт3"]
+        : side === "kt"
+            ? ["Движения.СубконтоКт1", "Движения.СубконтоКт2", "Движения.СубконтоКт3"]
+            : [
+                "Движения.СубконтоДт1",
+                "Движения.СубконтоДт2",
+                "Движения.СубконтоДт3",
+                "Движения.СубконтоКт1",
+                "Движения.СубконтоКт2",
+                "Движения.СубконтоКт3"
+            ];
+    const itemCondition = buildInventoryItemReferenceCondition(filters, itemFieldPaths);
     return INVENTORY_MOVEMENTS_QUERY_TEMPLATE
         .replace("__LIMIT__", String(resolvedLimit))
-        .replace("__WHERE_CLAUSE__", buildWhereClause(filters, "Движения.Период", [inventoryCondition]))
+        .replace("__WHERE_CLAUSE__", buildWhereClause(filters, "Движения.Период", [inventoryCondition, itemCondition].filter((item) => Boolean(item))))
         .replaceAll("__ORDER_DIRECTION__", resolveOrderDirection(filters.sort));
 }
 function buildInventoryItemReferenceCondition(filters, fieldPaths) {
@@ -1332,7 +1345,7 @@ function buildAddressRecipePlan(recipe, filters) {
                                                                 : recipe.query_template === "inventory_supplier_stock_overlap_profile"
                                                                     ? buildInventoryMovementQuery(filters, resolvedLimit, "dt")
                                                                     : recipe.query_template === "inventory_sale_trace_profile"
-                                                                        ? buildInventorySaleDocumentQuery(filters, resolvedLimit)
+                                                                        ? buildInventoryMovementQuery(filters, resolvedLimit, "kt")
                                                                         : recipe.query_template === "inventory_purchase_to_sale_chain_profile"
                                                                             ? buildInventoryMovementQuery(filters, resolvedLimit, "either")
                                                                             : recipe.query_template === "inventory_aging_by_purchase_date_profile"

llm_normalizer/backend/dist/services/address_runtime/decomposeStage.js

@@ -31,7 +31,7 @@ function hasAllTimeHint(text) {
     return /(?:за\s+вс[её]\s+время|за\s+весь\s+период|за\s+весь\s+срок|за\s+всю\s+истори(?:ю|и)|за\s+любой\s+период|за\s+любой\s+срок|for\s+all\s+time|all\s+time|for\s+entire\s+period|entire\s+period|for\s+any\s+period|any\s+period|for\s+full\s+history|full\s+history)/iu.test(normalized);
 }
 function hasSameDateHint(text) {
-    return /(?:на\s+ту\s+же\s+дат[ауеы]|на\s+эту\s+же\s+дат[ауеы]|на\s+эту\s+дат[ауеы]|эту\s+дат[ауеы]|та\s+же\s+дата|same\s+date|as\s+of\s+same\s+date|the\s+same\s+date)/iu.test(String(text ?? ""));
+    return /(?:на\s+ту\s+же\s+дат[ауеы]|на\s+эту\s+же\s+дат[ауеы]|на\s+эту\s+дат[ауеы]|эту\s+дат[ауеы]|та\s+же\s+дата|дат[ауеы],?\s+котор(?:ую|ая)\s+(?:до\s+этого|раньше|ранее)\s+(?:рассматривали|смотрели)|дат[ауеы],?\s+которая\s+был[ао]?\s+ранее\s+рассмотрен[ао]?|same\s+date|as\s+of\s+same\s+date|the\s+same\s+date|date\s+we\s+looked\s+at\s+before|previously\s+considered\s+date)/iu.test(String(text ?? ""));
 }
 function hasSamePeriodHint(text) {
     return /(?:на\s+тот\s+же\s+период|за\s+тот\s+же\s+период|тот\s+же\s+период(?:\s+рассмотрения)?|на\s+этот\s+же\s+период|за\s+этот\s+же\s+период|аналогичн\w+\s+текущ\w+\s+период\w+|same\s+period|same\s+range|same\s+window)/iu.test(String(text ?? ""));
@@ -382,17 +382,49 @@ function resolveRelativeMonthPeriodFromInventoryRoot(userMessage, followupContex
         as_of_date: periodTo
     };
 }
+function resolveRelativeMonthPeriodFromFollowupYear(userMessage, followupContext) {
+    if (!followupContext) {
+        return null;
+    }
+    const month = resolveMonthNumberFromText(userMessage);
+    if (!month) {
+        return null;
+    }
+    const normalized = String(userMessage ?? "");
+    if (hasExplicitPeriodLiteral(normalized) || hasExplicitCurrentDateHint(normalized) || hasSameDateHint(normalized)) {
+        return null;
+    }
+    const shortTemporalPatch = getTokenCount(normalized) <= 8 || hasRelativeYearHint(normalized);
+    if (!shortTemporalPatch) {
+        return null;
+    }
+    const year = resolveYearFromFilters(followupContext.previous_filters) ??
+        resolveYearFromFilters(followupContext.root_filters);
+    if (!year) {
+        return null;
+    }
+    const lastDay = new Date(Date.UTC(year, month, 0)).getUTCDate();
+    const periodFrom = `${year}-${String(month).padStart(2, "0")}-01`;
+    const periodTo = `${year}-${String(month).padStart(2, "0")}-${String(lastDay).padStart(2, "0")}`;
+    return {
+        period_from: periodFrom,
+        period_to: periodTo,
+        as_of_date: periodTo
+    };
+}
 function shouldRestoreInventoryRootFrame(userMessage, intent, extractedFilters, followupContext) {
     if (!followupContext || !isInventoryRootFrameIntent(followupContext.root_intent)) {
         return false;
     }
     const currentFrameKind = followupContext.current_frame_kind ?? null;
     const previousIntent = followupContext.previous_intent;
+    const rootContextOnly = followupContext.root_context_only === true;
     const comingFromInventoryDrilldown = currentFrameKind === "inventory_drilldown" || isInventoryDrilldownFrameIntent(previousIntent);
     const normalized = String(userMessage ?? "");
     const hasInventoryRootRestatementCue = /(?:склад|остат(?:ок|ки)|позици(?:я|и|ю)|товар(?:ы|ов)?|номенклатур)/iu.test(normalized) &&
         /(?:покажи|показать|выведи|раскрой|еще\s+раз|ещ[её]\s+раз|снова|опять|верни|вернись|повтори|тот\s+же|этот\s+же|same|again)/iu.test(normalized);
     const canReenterInventoryRoot = comingFromInventoryDrilldown ||
+        rootContextOnly ||
         (currentFrameKind === "inventory_root" && hasSamePeriodHint(normalized)) ||
         (currentFrameKind === "generic" && hasInventoryRootRestatementCue && hasSamePeriodHint(normalized));
     if (!canReenterInventoryRoot) {
@@ -401,7 +433,7 @@ function shouldRestoreInventoryRootFrame(userMessage, intent, extractedFilters,
     if (intent !== "unknown" && !isInventoryIntent(intent) && !hasInventoryRootRestatementCue) {
         return false;
     }
-    if (hasSelectedObjectInventorySignal(normalized) ||
+    if ((hasSelectedObjectInventorySignal(normalized) && !hasInventoryRootRestatementCue) ||
         hasInventorySupplierFollowupCue(normalized) ||
         hasInventoryPurchaseDocumentsFollowupCue(normalized) ||
         hasInventoryPurchaseDateFollowupCue(normalized) ||
@@ -415,6 +447,7 @@ function shouldRestoreInventoryRootFrame(userMessage, intent, extractedFilters,
     }
     const hasTemporalPatch = hasExplicitPeriodWindow(extractedFilters) ||
         Boolean(toNonEmptyString(extractedFilters.as_of_date)) ||
+        hasSameDateHint(normalized) ||
         hasSamePeriodHint(normalized) ||
         hasExplicitPeriodLiteral(normalized) ||
         Boolean(resolveRelativeMonthPeriodFromInventoryRoot(normalized, followupContext));
@@ -544,9 +577,11 @@ function mergeFollowupFilters(current, intent, userMessage, followupContext) {
     const previousPeriodFrom = toNonEmptyString(previous.period_from);
     const previousPeriodTo = toNonEmptyString(previous.period_to);
     const relativeMonthFromInventoryRoot = resolveRelativeMonthPeriodFromInventoryRoot(userMessage, followupContext);
+    const relativeMonthFromFollowupYear = resolveRelativeMonthPeriodFromFollowupYear(userMessage, followupContext);
     const allTimeRequested = hasAllTimeHint(userMessage);
     const sameDateRequested = hasSameDateHint(userMessage);
     const samePeriodRequested = hasSamePeriodHint(userMessage);
+    const explicitQuotedItem = extractSelectedObjectItemFromFollowupText(userMessage);
     if (!toNonEmptyString(merged.organization) && previousOrganization) {
         merged.organization = previousOrganization;
         reasons.push("organization_from_followup_context");
@@ -654,6 +689,15 @@ function mergeFollowupFilters(current, intent, userMessage, followupContext) {
             merged.counterparty = inheritedCounterparty;
             reasons.push(currentCounterparty ? "counterparty_replaced_from_followup_context" : "counterparty_from_followup_context");
         }
+        if (intent === "inventory_on_hand_as_of_date" && explicitQuotedItem) {
+            const currentItem = toNonEmptyString(merged.item);
+            if (!currentItem ||
+                currentItem !== explicitQuotedItem ||
+                (0, addressFilterExtractor_1.isInventoryItemAnchorDegradation)(explicitQuotedItem, currentItem)) {
+                merged.item = explicitQuotedItem;
+                reasons.push(currentItem ? "item_replaced_from_explicit_quote" : "item_from_explicit_quote");
+            }
+        }
         if ((intent === "inventory_purchase_provenance_for_item" ||
             intent === "inventory_purchase_documents_for_item" ||
             intent === "inventory_sale_trace_for_item" ||
@@ -661,7 +705,6 @@ function mergeFollowupFilters(current, intent, userMessage, followupContext) {
             intent === "inventory_purchase_to_sale_chain" ||
             intent === "inventory_aging_by_purchase_date")) {
             const inheritedItem = previousItem ?? previousAnchorItem;
-            const explicitQuotedItem = extractSelectedObjectItemFromFollowupText(userMessage);
             const currentItem = toNonEmptyString(merged.item);
             const shouldAdoptExplicitQuotedItem = Boolean(explicitQuotedItem) &&
                 (!currentItem ||
@@ -780,6 +823,7 @@ function mergeFollowupFilters(current, intent, userMessage, followupContext) {
         }
         if (!sameDateRequested &&
             hasFollowupSignalForConfirmed &&
+            !isInventoryLifecycleHistoryIntent(intent) &&
             !hasExplicitPeriodLiteral(userMessage) &&
             !hasExplicitCurrentDateHint(userMessage)) {
             const inheritedAsOfDate = previousAsOfDate ?? previousPeriodTo ?? previousPeriodFrom;
@@ -830,10 +874,26 @@ function mergeFollowupFilters(current, intent, userMessage, followupContext) {
         intent === "vat_payable_confirmed_as_of_date";
     const currentHasPeriod = hasExplicitPeriodWindow(merged);
     const previousHasPeriod = hasExplicitPeriodWindow(previous);
+    const vatRelativeMonthFollowup = relativeMonthFromFollowupYear &&
+        (intent === "vat_payable_confirmed_as_of_date" ||
+            intent === "vat_payable_forecast" ||
+            intent === "vat_liability_confirmed_for_tax_period");
+    if (vatRelativeMonthFollowup) {
+        merged.period_from = relativeMonthFromFollowupYear.period_from;
+        merged.period_to = relativeMonthFromFollowupYear.period_to;
+        if (intent === "vat_payable_confirmed_as_of_date") {
+            merged.as_of_date = relativeMonthFromFollowupYear.as_of_date;
+        }
+        else if (toNonEmptyString(merged.as_of_date)) {
+            delete merged.as_of_date;
+        }
+        reasons.push("period_derived_from_followup_context_year");
+    }
     if ((intent === "vat_payable_forecast" || intent === "vat_liability_confirmed_for_tax_period") &&
         previousHasPeriod &&
         hasFollowupSignal &&
-        !hasExplicitPeriodInMessage) {
+        !hasExplicitPeriodInMessage &&
+        !vatRelativeMonthFollowup) {
         const currentPeriodFrom = toNonEmptyString(merged.period_from);
         const currentPeriodTo = toNonEmptyString(merged.period_to);
         const todayIso = new Date().toISOString().slice(0, 10);
@@ -852,7 +912,8 @@ function mergeFollowupFilters(current, intent, userMessage, followupContext) {
         previousHasPeriod &&
         hasFollowupSignal &&
         !hasExplicitPeriodInMessage &&
-        !inventoryLifecycleHistoryIntent) {
+        !inventoryLifecycleHistoryIntent &&
+        !vatRelativeMonthFollowup) {
         if (previousPeriodFrom) {
             merged.period_from = previousPeriodFrom;
         }

llm_normalizer/backend/dist/services/assistantAddressOrchestrationRuntimeAdapter.js

@@ -10,6 +10,18 @@ function hasSelectedObjectInventoryActionCue(text) {
     const value = String(text ?? "");
     return (/(?:кому[\s\S]{0,80}(?:продал[аи]?|реализова[нлт][а-я]*|поставил[аи]?|поставлен[а-я]*|отгрузил[аи]?|отгружен[а-я]*)|кому\s+был\s+продан|куда[\s\S]{0,80}(?:продал[аи]?|реализова[нлт][а-я]*|поставил[аи]?|поставлен[а-я]*|отгрузил[аи]?|отгружен[а-я]*)|кто[\s\S]{0,40}купил|кто\s+это\s+поставил|кто\s+поставил|у\s+кого\s+купили|у\s+кого\s+куплено|где\s+мы\s+купили|где\s+куплено|по\s+каким\s+документам|какими\s+документами|покажи\s+документы|документы[\s\S]{0,80}(?:по\s+(?:ним|ней|нему|этой\s+позиции|этому\s+товару)|операци)|документы\s+закупки|buyer|sale\s+trace|supplier|vendor|purchase\s+documents|purchase[\s-]?to[\s-]?sale|old\s+purchase|aged\s+stock)/iu.test(value) || (0, inventoryLifecycleCueHelpers_1.hasInventoryProfitabilityCue)(value));
 }
+function hasShortInventoryPurchaseFollowupCue(text) {
+    return /(?:^|[\s,.;:!?])(а\s+)?(?:купили\s+у\s+кого|у\s+кого\s+купили|поставщик|продавец|seller)(?:[\s,.;:!?]|$)/iu.test(String(text ?? ""));
+}
+function isInventorySelectedObjectOrRootIntent(intent) {
+    return (intent === "inventory_on_hand_as_of_date" ||
+        intent === "inventory_purchase_provenance_for_item" ||
+        intent === "inventory_purchase_documents_for_item" ||
+        intent === "inventory_sale_trace_for_item" ||
+        intent === "inventory_profitability_for_item" ||
+        intent === "inventory_purchase_to_sale_chain" ||
+        intent === "inventory_aging_by_purchase_date");
+}
 function isGenericCanonicalDriftIntent(intent) {
     return (intent === "open_items_by_counterparty_or_contract" ||
         intent === "customer_revenue_and_payments" ||
@@ -19,6 +31,25 @@ function isGenericCanonicalDriftIntent(intent) {
         intent === "bank_operations_by_contract" ||
         intent === "documents_forming_balance");
 }
+function hasSameDateFollowupSignal(text) {
+    return /(?:эту\s+же\s+дат(?:у|е|ой)|ту\s+же\s+дат(?:у|е|ой)|same\s+date)/iu.test(String(text ?? ""));
+}
+function hasExplicitCurrentDateSignal(text) {
+    return /(?:текущ(?:ую|ая|ий|ее|ей)\s+дат(?:у|а|е|ой)|сегодняшн(?:юю|ий|ей)\s+дат(?:у|а|е|ой)|today|current\s+date)/iu.test(String(text ?? ""));
+}
+function hasInventoryTemporalRootFollowupCue(text) {
+    const value = String(text ?? "").trim().toLowerCase();
+    if (!value) {
+        return false;
+    }
+    const tokenCount = value.split(/\s+/).filter(Boolean).length;
+    const hasMonthYearCue = /(?:январ(?:ь|е)|феврал(?:ь|е)|март(?:е)?|апрел(?:ь|е)|ма(?:й|е)|июн(?:ь|е)|июл(?:ь|е)|август(?:е)?|сентябр(?:ь|е)|октябр(?:ь|е)|ноябр(?:ь|е)|декабр(?:ь|е))(?:\s+\d{4})?/iu.test(value) || /\b(?:19|20)\d{2}\b/u.test(value);
+    if (tokenCount <= 3 && hasMonthYearCue) {
+        return true;
+    }
+    const hasInventoryLexeme = /(?:остат|склад|товар|позици|номенклатур)/iu.test(value);
+    return hasInventoryLexeme && (hasMonthYearCue || hasSameDateFollowupSignal(value));
+}
 function shouldPreferRawFollowupMessage(userMessage, addressInputMessage, carryover, addressPreDecompose, toNonEmptyString) {
     if (!carryover?.followupContext || typeof carryover.followupContext !== "object") {
         return false;
@@ -33,12 +64,29 @@ function shouldPreferRawFollowupMessage(userMessage, addressInputMessage, carryo
         : null;
     const mode = toNonEmptyString(predecomposeContract?.mode) ?? "unknown";
     const intent = toNonEmptyString(predecomposeContract?.intent) ?? "unknown";
+    const followupContext = carryover.followupContext && typeof carryover.followupContext === "object"
+        ? carryover.followupContext
+        : null;
+    const previousIntent = toNonEmptyString(followupContext?.previous_intent);
+    const rootIntent = toNonEmptyString(followupContext?.root_intent);
+    const previousAnchorType = toNonEmptyString(followupContext?.previous_anchor_type);
+    const hasInventoryItemCarryover = previousAnchorType === "item" && isInventorySelectedObjectOrRootIntent(previousIntent);
+    const hasInventoryFrameCarryover = isInventorySelectedObjectOrRootIntent(previousIntent) ||
+        isInventorySelectedObjectOrRootIntent(rootIntent);
     if (mode === "unsupported" && intent === "unknown") {
         return true;
     }
-    return (hasSelectedObjectInventorySignal(rawMessage) &&
-        hasSelectedObjectInventoryActionCue(rawMessage) &&
-        isGenericCanonicalDriftIntent(intent));
+    if (hasSameDateFollowupSignal(rawMessage) && hasExplicitCurrentDateSignal(canonicalMessage)) {
+        return true;
+    }
+    if (hasInventoryFrameCarryover &&
+        hasInventoryTemporalRootFollowupCue(rawMessage) &&
+        (intent === "account_balance_snapshot" || intent === "documents_forming_balance" || intent === "unknown")) {
+        return true;
+    }
+    return ((hasSelectedObjectInventorySignal(rawMessage) || hasInventoryItemCarryover) &&
+        (hasSelectedObjectInventoryActionCue(rawMessage) || hasShortInventoryPurchaseFollowupCue(rawMessage)) &&
+        (isGenericCanonicalDriftIntent(intent) || intent === "unknown"));
 }
 function fallbackAddressPreDecompose(userMessage, llmProvider, buildAddressLlmPredecomposeContractV1, sanitizeAddressMessageForFallback) {
     const provider = llmProvider === "local" ? "local" : llmProvider === "openai" ? "openai" : null;

llm_normalizer/backend/dist/services/assistantRoutePolicy.js

@@ -159,8 +159,16 @@ function createAssistantRoutePolicy(deps) {
             hasShortDebtMirrorFollowupSignal(repairedRawUserMessage) ||
             hasShortDebtMirrorFollowupSignal(effectiveAddressUserMessage) ||
             hasShortDebtMirrorFollowupSignal(repairedEffectiveAddressUserMessage);
+        const followupPreviousIntent = toNonEmptyString(followupContext?.previous_intent);
+        const followupPreviousFilters = followupContext?.previous_filters && typeof followupContext.previous_filters === "object"
+            ? followupContext.previous_filters
+            : null;
         const protectedInventoryShortFollowup = Boolean(followupContext &&
-            isInventorySelectedObjectIntent(toNonEmptyString(followupContext.previous_intent)) &&
+            (isInventorySelectedObjectIntent(followupPreviousIntent) ||
+                (followupPreviousIntent === "inventory_on_hand_as_of_date" &&
+                    (toNonEmptyString(followupContext.previous_anchor_type) === "item" ||
+                        toNonEmptyString(followupContext.previous_anchor_value) ||
+                        toNonEmptyString(followupPreviousFilters?.item)))) &&
             (hasShortInventoryObjectFollowupSignal(rawUserMessage) ||
                 hasShortInventoryObjectFollowupSignal(repairedRawUserMessage) ||
                 hasShortInventoryObjectFollowupSignal(effectiveAddressUserMessage) ||

llm_normalizer/backend/dist/services/assistantService.js

@@ -2799,8 +2799,11 @@ function hasShortInventoryObjectFollowupSignal(userMessage) {
     if (minTokens > 8) {
         return false;
     }
+    const hasDirectPurchaseFollowupCue = (sample) => /(?:^|[\s,.;:!?])(?:а\s+)?(?:у|от)\s+кого(?:\s+\S+){0,5}\s+купил(?:и|о)?(?=$|[\s,.;:!?])/iu.test(sample) ||
+        /(?:^|[\s,.;:!?])(?:а\s+)?купил(?:и|о)?(?:\s+\S+){0,5}\s+(?:у|от)\s+кого(?=$|[\s,.;:!?])/iu.test(sample);
     const hasDirectSaleFollowupCue = (sample) => /(?:кому|каму|куда)(?:\s+\S+){0,4}\s+(?:продали|продано|продан(?:о|а|ы)?|реализовали|реализован(?:о|а|ы)?)|(?:продали|продано|реализовали|реализован(?:о|а|ы)?)(?:\s+\S+){0,4}\s+(?:кому|каму|куда)|(?:^|\s)(?:продано|продали|реализовано|реализовали)(?=$|[\s,.;:!?])/iu.test(sample);
-    return samples.some((sample) => /^(?:кто|когда|документы|сумма|поставщик|покупатель)(?:\?)?$/iu.test(sample) ||
+    return samples.some((sample) => /^(?:кто|когда|документы|сумма|поставщик|покупатель|продавец|seller)(?:\?)?$/iu.test(sample) ||
+        hasDirectPurchaseFollowupCue(sample) ||
         hasDirectSaleFollowupCue(sample) ||
         (0, decomposeStage_1.hasInventorySupplierFollowupCue)(sample) ||
         (0, decomposeStage_1.hasInventoryPurchaseDocumentsFollowupCue)(sample) ||
@@ -2809,6 +2812,41 @@ function hasShortInventoryObjectFollowupSignal(userMessage) {
         (0, decomposeStage_1.hasInventorySaleFollowupCue)(sample) ||
         (0, decomposeStage_1.hasInventoryPurchaseToSaleChainFollowupCue)(sample));
 }
+function hasInventoryRootTemporalFollowupSignal(userMessage, sourceIntentHint, hasInventoryRootFrame) {
+    if (!hasInventoryRootFrame) {
+        return false;
+    }
+    if (!(sourceIntentHint === "inventory_on_hand_as_of_date" ||
+        sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+        isInventorySelectedObjectIntent(sourceIntentHint))) {
+        return false;
+    }
+    const rawText = compactWhitespace(String(userMessage ?? "").toLowerCase());
+    const repairedText = compactWhitespace(repairAddressMojibake(String(userMessage ?? "")).toLowerCase());
+    const samples = [rawText, repairedText].filter((item) => item.length > 0);
+    if (samples.length === 0) {
+        return false;
+    }
+    const minTokens = samples.reduce((min, sample) => Math.min(min, countTokens(sample)), Number.POSITIVE_INFINITY);
+    if (minTokens > 8) {
+        return false;
+    }
+    const hasMonthYearCue = samples.some((sample) => /(?:январ|феврал|март|апрел|ма(?:й|е|я)|июн|июл|август|сентябр|октябр|ноябр|декабр)(?:\s+\d{4})?/iu.test(sample) ||
+        /\b(?:19|20)\d{2}\b/u.test(sample));
+    const hasTemporalCue = samples.some((sample) => hasPeriodLiteral(sample) ||
+        hasShortNamedPeriodFollowupLiteral(sample) ||
+        hasShortCurrentDateFollowupLiteral(sample) ||
+        /(?:на\s+ту\s+же\s+дат[ауеы]|на\s+эту\s+же\s+дат[ауеы]|same\s+date|the\s+same\s+date)/iu.test(sample));
+    if (!hasTemporalCue && !hasMonthYearCue) {
+        return false;
+    }
+    if (samples.some((sample) => hasForeignAccountingPivotOverInventoryMessage(sample))) {
+        return false;
+    }
+    const hasInventoryLexeme = samples.some((sample) => /(?:остат|склад|товар|номенклат|позиц)/iu.test(sample));
+    const hasPlainInventoryLexeme = samples.some((sample) => /(?:остат|склад|товар|номенклатур|позиц)/iu.test(sample));
+    return hasInventoryLexeme || hasPlainInventoryLexeme || minTokens <= 3;
+}
 function hasForeignAccountingPivotOverInventoryMessage(userMessage, alternateMessage = null) {
     const samples = [
         compactWhitespace(repairAddressMojibake(String(userMessage ?? "")).toLowerCase()),
@@ -2890,8 +2928,22 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         (isImplicitAddressContinuationByLlm(userMessage, llmPreDecomposeMeta) ||
             (toNonEmptyString(alternateMessage) ? isImplicitAddressContinuationByLlm(alternateMessage, llmPreDecomposeMeta) : false));
     const sourceIntentHint = toNonEmptyString(previousAddressDebug?.detected_intent);
-    const inventoryShortFollowupPrimary = isInventorySelectedObjectIntent(sourceIntentHint) && hasShortInventoryObjectFollowupSignal(userMessage);
-    const inventoryShortFollowupAlternate = isInventorySelectedObjectIntent(sourceIntentHint) && toNonEmptyString(alternateMessage)
+    const navigationFocusObjectHint = addressNavigationState &&
+        typeof addressNavigationState === "object" &&
+        addressNavigationState.session_context &&
+        typeof addressNavigationState.session_context === "object" &&
+        addressNavigationState.session_context.active_focus_object &&
+        typeof addressNavigationState.session_context.active_focus_object === "object"
+        ? addressNavigationState.session_context.active_focus_object
+        : null;
+    const hasNavigationInventoryItemFocusHint = Boolean(toNonEmptyString(navigationFocusObjectHint?.label) &&
+        toNonEmptyString(navigationFocusObjectHint?.object_type) === "item" &&
+        (sourceIntentHint === "inventory_on_hand_as_of_date" ||
+            sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+            isInventorySelectedObjectIntent(sourceIntentHint)));
+    let inventoryShortFollowupPrimary = (isInventorySelectedObjectIntent(sourceIntentHint) || hasNavigationInventoryItemFocusHint) &&
+        hasShortInventoryObjectFollowupSignal(userMessage);
+    let inventoryShortFollowupAlternate = (isInventorySelectedObjectIntent(sourceIntentHint) || hasNavigationInventoryItemFocusHint) && toNonEmptyString(alternateMessage)
         ? hasShortInventoryObjectFollowupSignal(String(alternateMessage ?? ""))
         : false;
     const debtRoleSwapPrimary = sourceIntentHint ? resolveDebtRoleSwapFollowupIntent(userMessage, sourceIntentHint) : null;
@@ -2899,8 +2951,8 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         ? resolveDebtRoleSwapFollowupIntent(String(alternateMessage ?? ""), sourceIntentHint)
         : null;
     const debtRoleSwapIntent = debtRoleSwapPrimary ?? debtRoleSwapAlternate ?? null;
-    const hasPrimaryFollowupSignal = hasAddressFollowupContextSignal(userMessage) || Boolean(debtRoleSwapPrimary) || inventoryShortFollowupPrimary;
-    const hasAlternateFollowupSignal = toNonEmptyString(alternateMessage)
+    let hasPrimaryFollowupSignal = hasAddressFollowupContextSignal(userMessage) || Boolean(debtRoleSwapPrimary) || inventoryShortFollowupPrimary;
+    let hasAlternateFollowupSignal = toNonEmptyString(alternateMessage)
         ? hasAddressFollowupContextSignal(alternateMessage) || Boolean(debtRoleSwapAlternate) || inventoryShortFollowupAlternate
         : false;
     const hasPrimaryIndexReferenceSignal = extractDisplayedEntityIndexMention(userMessage) !== null;
@@ -2908,12 +2960,19 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         ? extractDisplayedEntityIndexMention(String(alternateMessage ?? "")) !== null
         : false;
     const hasIndexReferenceSignal = hasPrimaryIndexReferenceSignal || hasAlternateIndexReferenceSignal;
-    const hasStrongFollowupReference = hasPrimaryIndexReferenceSignal ||
+    const recentInventoryRootFrame = findRecentInventoryRootFrame(items);
+    const hasInventoryRootTemporalFollowupPrimary = hasInventoryRootTemporalFollowupSignal(userMessage, sourceIntentHint, Boolean(recentInventoryRootFrame));
+    const hasInventoryRootTemporalFollowupAlternate = toNonEmptyString(alternateMessage)
+        ? hasInventoryRootTemporalFollowupSignal(String(alternateMessage ?? ""), sourceIntentHint, Boolean(recentInventoryRootFrame))
+        : false;
+    let hasStrongFollowupReference = hasPrimaryIndexReferenceSignal ||
         hasAlternateIndexReferenceSignal ||
         hasOrganizationClarificationContinuation ||
         hasImplicitContinuationSignal ||
         inventoryShortFollowupPrimary ||
         inventoryShortFollowupAlternate ||
+        hasInventoryRootTemporalFollowupPrimary ||
+        hasInventoryRootTemporalFollowupAlternate ||
         Boolean(debtRoleSwapIntent) ||
         hasFollowupMarker(userMessage) ||
         hasReferentialPointer(userMessage) ||
@@ -2925,6 +2984,8 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
     if (hasStandaloneAddressTopic &&
         !hasPrimaryFollowupSignal &&
         !hasAlternateFollowupSignal &&
+        !hasInventoryRootTemporalFollowupPrimary &&
+        !hasInventoryRootTemporalFollowupAlternate &&
         !hasImplicitContinuationSignal &&
         !hasOrganizationClarificationContinuation &&
         !hasIndexReferenceSignal) {
@@ -2932,6 +2993,8 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
     }
     if (!hasPrimaryFollowupSignal &&
         !hasAlternateFollowupSignal &&
+        !hasInventoryRootTemporalFollowupPrimary &&
+        !hasInventoryRootTemporalFollowupAlternate &&
         !hasImplicitContinuationSignal &&
         !hasOrganizationClarificationContinuation &&
         !hasIndexReferenceSignal) {
@@ -2993,6 +3056,41 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         : null;
     const navigationFocusObjectType = toNonEmptyString(navigationFocusObject?.object_type);
     const navigationFocusObjectLabel = toNonEmptyString(navigationFocusObject?.label);
+    const hasInventoryItemFocusCarryover = navigationFocusObjectType === "item" &&
+        navigationFocusObjectLabel &&
+        (sourceIntentHint === "inventory_on_hand_as_of_date" ||
+            sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+            isInventorySelectedObjectIntent(sourceIntentHint));
+    if (!inventoryShortFollowupPrimary && hasInventoryItemFocusCarryover) {
+        inventoryShortFollowupPrimary = hasShortInventoryObjectFollowupSignal(userMessage);
+    }
+    if (!inventoryShortFollowupAlternate && hasInventoryItemFocusCarryover && toNonEmptyString(alternateMessage)) {
+        inventoryShortFollowupAlternate = hasShortInventoryObjectFollowupSignal(String(alternateMessage ?? ""));
+    }
+    hasPrimaryFollowupSignal = hasAddressFollowupContextSignal(userMessage) ||
+        Boolean(debtRoleSwapPrimary) ||
+        inventoryShortFollowupPrimary ||
+        hasInventoryRootTemporalFollowupPrimary;
+    hasAlternateFollowupSignal = toNonEmptyString(alternateMessage)
+        ? hasAddressFollowupContextSignal(alternateMessage) ||
+            Boolean(debtRoleSwapAlternate) ||
+            inventoryShortFollowupAlternate ||
+            hasInventoryRootTemporalFollowupAlternate
+        : false;
+    hasStrongFollowupReference = hasPrimaryIndexReferenceSignal ||
+        hasAlternateIndexReferenceSignal ||
+        hasOrganizationClarificationContinuation ||
+        hasImplicitContinuationSignal ||
+        inventoryShortFollowupPrimary ||
+        inventoryShortFollowupAlternate ||
+        hasInventoryRootTemporalFollowupPrimary ||
+        hasInventoryRootTemporalFollowupAlternate ||
+        Boolean(debtRoleSwapIntent) ||
+        hasFollowupMarker(userMessage) ||
+        hasReferentialPointer(userMessage) ||
+        (toNonEmptyString(alternateMessage)
+            ? hasFollowupMarker(String(alternateMessage ?? "")) || hasReferentialPointer(String(alternateMessage ?? ""))
+            : false);
     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 ?? ""))
@@ -3054,18 +3152,39 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
     if (!toNonEmptyString(previousFilters.organization) && organizationClarificationSelection) {
         previousFilters.organization = organizationClarificationSelection;
     }
-    if (!toNonEmptyString(previousFilters.as_of_date) && toNonEmptyString(navigationDateScope?.as_of_date)) {
+    const shouldBackfillPreviousDateScopeFromNavigation = sourceIntentHint === "inventory_on_hand_as_of_date" ||
+        sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+        sourceIntentHint === "inventory_purchase_provenance_for_item" ||
+        sourceIntentHint === "inventory_purchase_documents_for_item" ||
+        sourceIntentHint === "inventory_sale_trace_for_item" ||
+        sourceIntentHint === "inventory_profitability_for_item" ||
+        sourceIntentHint === "inventory_purchase_to_sale_chain" ||
+        sourceIntentHint === "inventory_aging_by_purchase_date" ||
+        sourceIntentHint === "account_balance_snapshot" ||
+        sourceIntentHint === "documents_forming_balance";
+    if (shouldBackfillPreviousDateScopeFromNavigation &&
+        !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)) {
+    if (shouldBackfillPreviousDateScopeFromNavigation &&
+        !toNonEmptyString(previousFilters.period_from) &&
+        toNonEmptyString(navigationDateScope?.period_from)) {
         previousFilters.period_from = toNonEmptyString(navigationDateScope?.period_from);
     }
-    if (!toNonEmptyString(previousFilters.period_to) && toNonEmptyString(navigationDateScope?.period_to)) {
+    if (shouldBackfillPreviousDateScopeFromNavigation &&
+        !toNonEmptyString(previousFilters.period_to) &&
+        toNonEmptyString(navigationDateScope?.period_to)) {
         previousFilters.period_to = toNonEmptyString(navigationDateScope?.period_to);
     }
     const rootContextOnlyPivot = Boolean((isInventorySelectedObjectIntent(sourceIntentHint) || currentFrameKind === "inventory_drilldown") &&
         hasForeignAccountingPivotOverInventoryMessage(userMessage, alternateMessage));
-    if (rootContextOnlyPivot) {
+    const inventoryRootTemporalPivot = Boolean(inventoryRootFrame &&
+        (isInventorySelectedObjectIntent(sourceIntentHint) || currentFrameKind === "inventory_drilldown") &&
+        (hasInventoryRootTemporalFollowupPrimary || hasInventoryRootTemporalFollowupAlternate) &&
+        !hasForeignAccountingPivotOverInventoryMessage(userMessage, alternateMessage));
+    const rootScopedPivot = rootContextOnlyPivot || inventoryRootTemporalPivot;
+    if (rootScopedPivot) {
         previousIntent = null;
         previousAnchorType = null;
         previousAnchor = null;
@@ -3079,7 +3198,7 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         (toNonEmptyString(alternateMessage)
             ? resolveDisplayedAddressEntityMention(String(alternateMessage ?? ""), displayedEntities)
             : null);
-    if (resolvedEntityFromFollowup && !rootContextOnlyPivot) {
+    if (resolvedEntityFromFollowup && !rootScopedPivot) {
         if (resolvedEntityFromFollowup.entityType === "counterparty") {
             previousFilters.counterparty = resolvedEntityFromFollowup.value;
             previousAnchorType = "counterparty";
@@ -3100,7 +3219,7 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
             followupSelectionMode = "carry_referenced_entity";
         }
     }
-    if (!rootContextOnlyPivot &&
+    if (!rootScopedPivot &&
         !toNonEmptyString(previousFilters.item) &&
         navigationFocusObjectType === "item" &&
         navigationFocusObjectLabel &&
@@ -3142,7 +3261,7 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
             previous_anchor_type: previousAnchorType ?? undefined,
             previous_anchor_value: previousAnchor,
             resolved_counterparty_from_display: resolvedCounterpartyFromDisplay || undefined,
-            root_context_only: rootContextOnlyPivot || undefined,
+            root_context_only: rootScopedPivot || undefined,
             root_intent: inventoryRootFrame?.intent ?? undefined,
             root_filters: inventoryRootFrame?.filters ?? undefined,
             root_anchor_type: inventoryRootFrame?.anchorType ?? undefined,
@@ -3163,11 +3282,13 @@ function buildAddressDialogContinuationContractV2(userMessage, effectiveMessage,
     const previousIntent = toNonEmptyString(carryoverMeta?.previousSourceIntent) ?? null;
     const selectionMode = toNonEmptyString(carryoverMeta?.followupSelectionMode) ?? null;
     const rootContextOnly = selectionMode === "carry_root_context";
-    const explicitIntent = toNonEmptyString(llmPreDecomposeMeta?.predecomposeContract?.intent);
+    const explicitIntentRaw = toNonEmptyString(llmPreDecomposeMeta?.predecomposeContract?.intent);
+    const explicitIntent = explicitIntentRaw === "unknown" ? null : explicitIntentRaw;
+    const rootIntent = toNonEmptyString(carryoverMeta?.followupContext?.root_intent) ?? null;
     const targetIntent = selectionMode === "switch_to_suggested_intent"
         ? toNonEmptyString(carryoverMeta?.previousAddressIntent) ?? null
         : rootContextOnly
-            ? explicitIntent ?? null
+            ? rootIntent ?? explicitIntent ?? null
             : explicitIntent ?? toNonEmptyString(carryoverMeta?.previousAddressIntent) ?? null;
     const hasImplicitContinuationSignal = Boolean(carryoverMeta?.hasImplicitContinuationSignal);
     const rewrittenByPredecompose = compactWhitespace(sourceMessage.toLowerCase()) !== compactWhitespace(canonicalMessage.toLowerCase());

llm_normalizer/backend/dist/services/inventoryLifecycleCueHelpers.js

@@ -15,6 +15,9 @@ function hasInventorySupplierCue(text) {
     if (/(?:купил(?:и|о)?\s+у\s+кого|куплен(?:о)?\s+у\s+кого|купил(?:и|о)?\s+от\s+кого|куплен(?:о)?\s+от\s+кого)/iu.test(value)) {
         return true;
     }
+    if (/(?:кто\s+(?:был\s+)?продавец|кто\s+нам\s+продал|кто\s+продал\s+нам|(?:^|[\s,.;:!?()\-])(?:продавец|seller)(?=$|[\s,.;:!?()\-]))/iu.test(value)) {
+        return true;
+    }
     if (/(?:кто\s+(?:(?:это|этот\s+товар|эту\s+позицию)\s+)?(?:нам\s+)?поставил|кто\s+(?:нам\s+)?поставил\s+(?:это|этот\s+товар|эту\s+позицию)|от\s+какого\s+поставщика|у\s+какого\s+поставщика|от\s+кого\s+куплен|у\s+кого\s+купили|у\s+кого\s+куплено|где\s+(?:мы\s+)?купили(?:\s+(?:это|его|этот\s+товар|эту\s+позицию))?|где\s+(?:мы\s+)?взяли(?:\s+(?:это|его|этот\s+товар|эту\s+позицию))?|откуда\s+(?:мы\s+)?взяли(?:\s+(?:это|его|этот\s+товар|эту\s+позицию))?|где\s+куплено|supplier|vendor|поставщик)/iu.test(value)) {
         return true;
     }

llm_normalizer/backend/src/services/addressFilterExtractor.ts

@@ -1189,6 +1189,12 @@ function isTemporalWarehousePhrase(candidate: string): boolean {
     .toLowerCase()
     .replace(/ё/g, "е")
     .trim();
+  if (/^(?:на\s+)?(?:эту|ту|текущ(?:ую|ая|ий|ее|ей)|сегодняшн(?:юю|ая|ий|ее|ей))(?:\s+же)?\s+дат(?:у|а|е|ой)$/iu.test(normalized)) {
+    return true;
+  }
+  if (/^(?:нет|не\s+было|не\s+было\s+ли)(?:\s+на\s+(?:эту|ту|такую)\s+дат(?:у|е|ой))?$/iu.test(normalized)) {
+    return true;
+  }
   return /^(?:в|на)\s+(?:январ(?:е|ь)|феврал(?:е|ь)|март(?:е)?|апрел(?:е|ь)|ма(?:й|е)|июн(?:е|ь)|июл(?:е|ь)|август(?:е)?|сентябр(?:е|ь)|октябр(?:е|ь)|ноябр(?:е|ь)|декабр(?:е|ь))(?:\s+\d{4}(?:\s+г(?:\.|ода)?)?)?$/iu.test(
     normalized
   );
@@ -1244,7 +1250,8 @@ function isLowQualityWarehouseAnchorValue(rawValue: string): boolean {
     "охуеть",
     "пиздец",
     "блять",
-    "бля"
+    "бля",
+    "нет"
   ]);
   const tokens = value
     .split(/[^a-zа-я0-9]+/iu)
@@ -1279,7 +1286,9 @@ function hasImplicitSelfScopeSignal(text: string): boolean {
 
 function isImplicitSelfScopeWarehouseAnchor(candidate: string): boolean {
   const normalized = normalizeSemanticAnchorCandidate(candidate);
-  return /^(?:у\s+нас|у\s+себя|у\s+меня|наш(?:ем|ей|его|их|а|е)?|сво(?:ем|ей|его|их|я|е)?)$/iu.test(normalized);
+  return /^(?:у\s+нас|у\s+себя|у\s+меня|наш(?:ем|ей|его|их|а|е)?|сво(?:ем|ей|его|их|я|е)?)(?:\s+(?:висит|висят|висело|висели|лежит|лежат|лежало|лежали))?$/iu.test(
+    normalized
+  );
 }
 
 function hasSelectedObjectScopeSignal(text: string): boolean {

llm_normalizer/backend/src/services/addressQueryService.ts

@@ -1286,11 +1286,23 @@ function toNormalizedRows(rows: Array<Record<string, unknown>>): NormalizedAddre
 }
 
 function rowSearchableText(row: NormalizedAddressRow): string {
-  return [row.registrator, row.item ?? "", row.warehouse ?? "", row.account_dt ?? "", row.account_kt ?? "", ...row.analytics]
+  return [
+    row.registrator,
+    row.item ?? "",
+    row.warehouse ?? "",
+    row.organization ?? "",
+    row.account_dt ?? "",
+    row.account_kt ?? "",
+    ...row.analytics
+  ]
     .join(" ")
     .toLowerCase();
 }
 
+function rowOrganizationSearchableText(row: NormalizedAddressRow): string {
+  return [row.organization ?? "", row.registrator, ...row.analytics].join(" ").toLowerCase();
+}
+
 function rowMatchesAnyAccount(row: NormalizedAddressRow, accountScope: string[]): boolean {
   if (accountScope.length === 0) {
     return true;
@@ -1366,9 +1378,12 @@ function applyAddressFilters(rows: NormalizedAddressRow[], filters: AddressFilte
   if (filters.organization && String(filters.organization).trim()) {
     const needle = String(filters.organization);
     const before = filtered.length;
-    filtered = filtered.filter((row) => matchesAnchorText(rowSearchableText(row), needle));
-    if (before > 0 && filtered.length === 0 && mismatchReason === null) {
-      mismatchReason = "organization_anchor_not_matched_in_materialized_rows";
+    const organizationMaterialized = filtered.some((row) => Boolean(String(row.organization ?? "").trim()));
+    if (organizationMaterialized) {
+      filtered = filtered.filter((row) => matchesAnchorText(rowOrganizationSearchableText(row), needle));
+      if (before > 0 && filtered.length === 0 && mismatchReason === null) {
+        mismatchReason = "organization_anchor_not_matched_in_materialized_rows";
+      }
     }
   }
 

llm_normalizer/backend/src/services/addressRecipeCatalog.ts

@@ -1181,9 +1181,30 @@ function buildInventoryMovementQuery(
       : side === "kt"
         ? creditPredicate
         : `(${debitPredicate} ИЛИ ${creditPredicate})`;
+  const itemFieldPaths =
+    side === "dt"
+      ? ["Движения.СубконтоДт1", "Движения.СубконтоДт2", "Движения.СубконтоДт3"]
+      : side === "kt"
+        ? ["Движения.СубконтоКт1", "Движения.СубконтоКт2", "Движения.СубконтоКт3"]
+        : [
+            "Движения.СубконтоДт1",
+            "Движения.СубконтоДт2",
+            "Движения.СубконтоДт3",
+            "Движения.СубконтоКт1",
+            "Движения.СубконтоКт2",
+            "Движения.СубконтоКт3"
+          ];
+  const itemCondition = buildInventoryItemReferenceCondition(filters, itemFieldPaths);
   return INVENTORY_MOVEMENTS_QUERY_TEMPLATE
     .replace("__LIMIT__", String(resolvedLimit))
-    .replace("__WHERE_CLAUSE__", buildWhereClause(filters, "Движения.Период", [inventoryCondition]))
+    .replace(
+      "__WHERE_CLAUSE__",
+      buildWhereClause(
+        filters,
+        "Движения.Период",
+        [inventoryCondition, itemCondition].filter((item): item is string => Boolean(item))
+      )
+    )
     .replaceAll("__ORDER_DIRECTION__", resolveOrderDirection(filters.sort));
 }
 
@@ -1469,7 +1490,7 @@ export function buildAddressRecipePlan(
       : recipe.query_template === "inventory_supplier_stock_overlap_profile"
         ? buildInventoryMovementQuery(filters, resolvedLimit, "dt")
       : recipe.query_template === "inventory_sale_trace_profile"
-        ? buildInventorySaleDocumentQuery(filters, resolvedLimit)
+        ? buildInventoryMovementQuery(filters, resolvedLimit, "kt")
       : recipe.query_template === "inventory_purchase_to_sale_chain_profile"
         ? buildInventoryMovementQuery(filters, resolvedLimit, "either")
       : recipe.query_template === "inventory_aging_by_purchase_date_profile"

llm_normalizer/backend/src/services/address_runtime/decomposeStage.ts

@@ -52,6 +52,7 @@ export interface AddressFollowupContext {
     | "unknown"
     | null;
   root_anchor_value?: string | null;
+  root_context_only?: boolean;
   current_frame_kind?: "generic" | "inventory_root" | "inventory_drilldown";
 }
 
@@ -91,7 +92,7 @@ function hasAllTimeHint(text: string): boolean {
 }
 
 function hasSameDateHint(text: string): boolean {
-  return /(?:на\s+ту\s+же\s+дат[ауеы]|на\s+эту\s+же\s+дат[ауеы]|на\s+эту\s+дат[ауеы]|эту\s+дат[ауеы]|та\s+же\s+дата|same\s+date|as\s+of\s+same\s+date|the\s+same\s+date)/iu.test(
+  return /(?:на\s+ту\s+же\s+дат[ауеы]|на\s+эту\s+же\s+дат[ауеы]|на\s+эту\s+дат[ауеы]|эту\s+дат[ауеы]|та\s+же\s+дата|дат[ауеы],?\s+котор(?:ую|ая)\s+(?:до\s+этого|раньше|ранее)\s+(?:рассматривали|смотрели)|дат[ауеы],?\s+которая\s+был[ао]?\s+ранее\s+рассмотрен[ао]?|same\s+date|as\s+of\s+same\s+date|the\s+same\s+date|date\s+we\s+looked\s+at\s+before|previously\s+considered\s+date)/iu.test(
     String(text ?? "")
   );
 }
@@ -487,6 +488,41 @@ function resolveRelativeMonthPeriodFromInventoryRoot(
   };
 }
 
+function resolveRelativeMonthPeriodFromFollowupYear(
+  userMessage: string,
+  followupContext: AddressFollowupContext | null
+): { period_from: string; period_to: string; as_of_date: string } | null {
+  if (!followupContext) {
+    return null;
+  }
+  const month = resolveMonthNumberFromText(userMessage);
+  if (!month) {
+    return null;
+  }
+  const normalized = String(userMessage ?? "");
+  if (hasExplicitPeriodLiteral(normalized) || hasExplicitCurrentDateHint(normalized) || hasSameDateHint(normalized)) {
+    return null;
+  }
+  const shortTemporalPatch = getTokenCount(normalized) <= 8 || hasRelativeYearHint(normalized);
+  if (!shortTemporalPatch) {
+    return null;
+  }
+  const year =
+    resolveYearFromFilters(followupContext.previous_filters) ??
+    resolveYearFromFilters(followupContext.root_filters);
+  if (!year) {
+    return null;
+  }
+  const lastDay = new Date(Date.UTC(year, month, 0)).getUTCDate();
+  const periodFrom = `${year}-${String(month).padStart(2, "0")}-01`;
+  const periodTo = `${year}-${String(month).padStart(2, "0")}-${String(lastDay).padStart(2, "0")}`;
+  return {
+    period_from: periodFrom,
+    period_to: periodTo,
+    as_of_date: periodTo
+  };
+}
+
 function shouldRestoreInventoryRootFrame(
   userMessage: string,
   intent: AddressIntent,
@@ -498,6 +534,7 @@ function shouldRestoreInventoryRootFrame(
   }
   const currentFrameKind = followupContext.current_frame_kind ?? null;
   const previousIntent = followupContext.previous_intent;
+  const rootContextOnly = followupContext.root_context_only === true;
   const comingFromInventoryDrilldown =
     currentFrameKind === "inventory_drilldown" || isInventoryDrilldownFrameIntent(previousIntent);
   const normalized = String(userMessage ?? "");
@@ -508,6 +545,7 @@ function shouldRestoreInventoryRootFrame(
     );
   const canReenterInventoryRoot =
     comingFromInventoryDrilldown ||
+    rootContextOnly ||
     (currentFrameKind === "inventory_root" && hasSamePeriodHint(normalized)) ||
     (currentFrameKind === "generic" && hasInventoryRootRestatementCue && hasSamePeriodHint(normalized));
   if (!canReenterInventoryRoot) {
@@ -517,7 +555,7 @@ function shouldRestoreInventoryRootFrame(
     return false;
   }
   if (
-    hasSelectedObjectInventorySignal(normalized) ||
+    (hasSelectedObjectInventorySignal(normalized) && !hasInventoryRootRestatementCue) ||
     hasInventorySupplierFollowupCue(normalized) ||
     hasInventoryPurchaseDocumentsFollowupCue(normalized) ||
     hasInventoryPurchaseDateFollowupCue(normalized) ||
@@ -533,6 +571,7 @@ function shouldRestoreInventoryRootFrame(
   const hasTemporalPatch =
     hasExplicitPeriodWindow(extractedFilters) ||
     Boolean(toNonEmptyString(extractedFilters.as_of_date)) ||
+    hasSameDateHint(normalized) ||
     hasSamePeriodHint(normalized) ||
     hasExplicitPeriodLiteral(normalized) ||
     Boolean(resolveRelativeMonthPeriodFromInventoryRoot(normalized, followupContext));
@@ -709,9 +748,11 @@ function mergeFollowupFilters(
   const previousPeriodFrom = toNonEmptyString(previous.period_from);
   const previousPeriodTo = toNonEmptyString(previous.period_to);
   const relativeMonthFromInventoryRoot = resolveRelativeMonthPeriodFromInventoryRoot(userMessage, followupContext);
+  const relativeMonthFromFollowupYear = resolveRelativeMonthPeriodFromFollowupYear(userMessage, followupContext);
   const allTimeRequested = hasAllTimeHint(userMessage);
   const sameDateRequested = hasSameDateHint(userMessage);
   const samePeriodRequested = hasSamePeriodHint(userMessage);
+  const explicitQuotedItem = extractSelectedObjectItemFromFollowupText(userMessage);
   if (!toNonEmptyString(merged.organization) && previousOrganization) {
     merged.organization = previousOrganization;
     reasons.push("organization_from_followup_context");
@@ -837,6 +878,17 @@ function mergeFollowupFilters(
       merged.counterparty = inheritedCounterparty;
       reasons.push(currentCounterparty ? "counterparty_replaced_from_followup_context" : "counterparty_from_followup_context");
     }
+    if (intent === "inventory_on_hand_as_of_date" && explicitQuotedItem) {
+      const currentItem = toNonEmptyString(merged.item);
+      if (
+        !currentItem ||
+        currentItem !== explicitQuotedItem ||
+        isInventoryItemAnchorDegradation(explicitQuotedItem, currentItem)
+      ) {
+        merged.item = explicitQuotedItem;
+        reasons.push(currentItem ? "item_replaced_from_explicit_quote" : "item_from_explicit_quote");
+      }
+    }
     if (
       (intent === "inventory_purchase_provenance_for_item" ||
         intent === "inventory_purchase_documents_for_item" ||
@@ -846,7 +898,6 @@ function mergeFollowupFilters(
         intent === "inventory_aging_by_purchase_date")
     ) {
       const inheritedItem = previousItem ?? previousAnchorItem;
-      const explicitQuotedItem = extractSelectedObjectItemFromFollowupText(userMessage);
       const currentItem = toNonEmptyString(merged.item);
       const shouldAdoptExplicitQuotedItem =
         Boolean(explicitQuotedItem) &&
@@ -983,6 +1034,7 @@ function mergeFollowupFilters(
     if (
       !sameDateRequested &&
       hasFollowupSignalForConfirmed &&
+      !isInventoryLifecycleHistoryIntent(intent) &&
       !hasExplicitPeriodLiteral(userMessage) &&
       !hasExplicitCurrentDateHint(userMessage)
     ) {
@@ -1040,12 +1092,29 @@ function mergeFollowupFilters(
     intent === "vat_payable_confirmed_as_of_date";
   const currentHasPeriod = hasExplicitPeriodWindow(merged);
   const previousHasPeriod = hasExplicitPeriodWindow(previous);
+  const vatRelativeMonthFollowup =
+    relativeMonthFromFollowupYear &&
+    (intent === "vat_payable_confirmed_as_of_date" ||
+      intent === "vat_payable_forecast" ||
+      intent === "vat_liability_confirmed_for_tax_period");
+
+  if (vatRelativeMonthFollowup) {
+    merged.period_from = relativeMonthFromFollowupYear.period_from;
+    merged.period_to = relativeMonthFromFollowupYear.period_to;
+    if (intent === "vat_payable_confirmed_as_of_date") {
+      merged.as_of_date = relativeMonthFromFollowupYear.as_of_date;
+    } else if (toNonEmptyString(merged.as_of_date)) {
+      delete merged.as_of_date;
+    }
+    reasons.push("period_derived_from_followup_context_year");
+  }
 
   if (
     (intent === "vat_payable_forecast" || intent === "vat_liability_confirmed_for_tax_period") &&
     previousHasPeriod &&
     hasFollowupSignal &&
-    !hasExplicitPeriodInMessage
+    !hasExplicitPeriodInMessage &&
+    !vatRelativeMonthFollowup
   ) {
     const currentPeriodFrom = toNonEmptyString(merged.period_from);
     const currentPeriodTo = toNonEmptyString(merged.period_to);
@@ -1067,7 +1136,8 @@ function mergeFollowupFilters(
     previousHasPeriod &&
     hasFollowupSignal &&
     !hasExplicitPeriodInMessage &&
-    !inventoryLifecycleHistoryIntent
+    !inventoryLifecycleHistoryIntent &&
+    !vatRelativeMonthFollowup
   ) {
     if (previousPeriodFrom) {
       merged.period_from = previousPeriodFrom;

llm_normalizer/backend/src/services/assistantAddressOrchestrationRuntimeAdapter.ts

@@ -77,6 +77,24 @@ function hasSelectedObjectInventoryActionCue(text: string | null): boolean {
   );
 }
 
+function hasShortInventoryPurchaseFollowupCue(text: string | null): boolean {
+  return /(?:^|[\s,.;:!?])(а\s+)?(?:купили\s+у\s+кого|у\s+кого\s+купили|поставщик|продавец|seller)(?:[\s,.;:!?]|$)/iu.test(
+    String(text ?? "")
+  );
+}
+
+function isInventorySelectedObjectOrRootIntent(intent: string | null): boolean {
+  return (
+    intent === "inventory_on_hand_as_of_date" ||
+    intent === "inventory_purchase_provenance_for_item" ||
+    intent === "inventory_purchase_documents_for_item" ||
+    intent === "inventory_sale_trace_for_item" ||
+    intent === "inventory_profitability_for_item" ||
+    intent === "inventory_purchase_to_sale_chain" ||
+    intent === "inventory_aging_by_purchase_date"
+  );
+}
+
 function isGenericCanonicalDriftIntent(intent: string | null): boolean {
   return (
     intent === "open_items_by_counterparty_or_contract" ||
@@ -89,6 +107,33 @@ function isGenericCanonicalDriftIntent(intent: string | null): boolean {
   );
 }
 
+function hasSameDateFollowupSignal(text: string | null): boolean {
+  return /(?:эту\s+же\s+дат(?:у|е|ой)|ту\s+же\s+дат(?:у|е|ой)|same\s+date)/iu.test(String(text ?? ""));
+}
+
+function hasExplicitCurrentDateSignal(text: string | null): boolean {
+  return /(?:текущ(?:ую|ая|ий|ее|ей)\s+дат(?:у|а|е|ой)|сегодняшн(?:юю|ий|ей)\s+дат(?:у|а|е|ой)|today|current\s+date)/iu.test(
+    String(text ?? "")
+  );
+}
+
+function hasInventoryTemporalRootFollowupCue(text: string | null): boolean {
+  const value = String(text ?? "").trim().toLowerCase();
+  if (!value) {
+    return false;
+  }
+  const tokenCount = value.split(/\s+/).filter(Boolean).length;
+  const hasMonthYearCue =
+    /(?:январ(?:ь|е)|феврал(?:ь|е)|март(?:е)?|апрел(?:ь|е)|ма(?:й|е)|июн(?:ь|е)|июл(?:ь|е)|август(?:е)?|сентябр(?:ь|е)|октябр(?:ь|е)|ноябр(?:ь|е)|декабр(?:ь|е))(?:\s+\d{4})?/iu.test(
+      value
+    ) || /\b(?:19|20)\d{2}\b/u.test(value);
+  if (tokenCount <= 3 && hasMonthYearCue) {
+    return true;
+  }
+  const hasInventoryLexeme = /(?:остат|склад|товар|позици|номенклатур)/iu.test(value);
+  return hasInventoryLexeme && (hasMonthYearCue || hasSameDateFollowupSignal(value));
+}
+
 function shouldPreferRawFollowupMessage(
   userMessage: string,
   addressInputMessage: string,
@@ -112,15 +157,39 @@ function shouldPreferRawFollowupMessage(
       : null;
   const mode = toNonEmptyString(predecomposeContract?.mode) ?? "unknown";
   const intent = toNonEmptyString(predecomposeContract?.intent) ?? "unknown";
+  const followupContext =
+    carryover.followupContext && typeof carryover.followupContext === "object"
+      ? (carryover.followupContext as Record<string, unknown>)
+      : null;
+  const previousIntent = toNonEmptyString(followupContext?.previous_intent);
+  const rootIntent = toNonEmptyString(followupContext?.root_intent);
+  const previousAnchorType = toNonEmptyString(followupContext?.previous_anchor_type);
+  const hasInventoryItemCarryover =
+    previousAnchorType === "item" && isInventorySelectedObjectOrRootIntent(previousIntent);
+  const hasInventoryFrameCarryover =
+    isInventorySelectedObjectOrRootIntent(previousIntent) ||
+    isInventorySelectedObjectOrRootIntent(rootIntent);
 
   if (mode === "unsupported" && intent === "unknown") {
     return true;
   }
 
+  if (hasSameDateFollowupSignal(rawMessage) && hasExplicitCurrentDateSignal(canonicalMessage)) {
+    return true;
+  }
+
+  if (
+    hasInventoryFrameCarryover &&
+    hasInventoryTemporalRootFollowupCue(rawMessage) &&
+    (intent === "account_balance_snapshot" || intent === "documents_forming_balance" || intent === "unknown")
+  ) {
+    return true;
+  }
+
   return (
-    hasSelectedObjectInventorySignal(rawMessage) &&
-    hasSelectedObjectInventoryActionCue(rawMessage) &&
-    isGenericCanonicalDriftIntent(intent)
+    (hasSelectedObjectInventorySignal(rawMessage) || hasInventoryItemCarryover) &&
+    (hasSelectedObjectInventoryActionCue(rawMessage) || hasShortInventoryPurchaseFollowupCue(rawMessage)) &&
+    (isGenericCanonicalDriftIntent(intent) || intent === "unknown")
   );
 }
 

llm_normalizer/backend/src/services/assistantRoutePolicy.ts

@@ -193,8 +193,16 @@ export function createAssistantRoutePolicy(deps) {
           hasShortDebtMirrorFollowupSignal(repairedRawUserMessage) ||
           hasShortDebtMirrorFollowupSignal(effectiveAddressUserMessage) ||
           hasShortDebtMirrorFollowupSignal(repairedEffectiveAddressUserMessage);
+      const followupPreviousIntent = toNonEmptyString(followupContext?.previous_intent);
+      const followupPreviousFilters = followupContext?.previous_filters && typeof followupContext.previous_filters === "object"
+          ? followupContext.previous_filters
+          : null;
       const protectedInventoryShortFollowup = Boolean(followupContext &&
-          isInventorySelectedObjectIntent(toNonEmptyString(followupContext.previous_intent)) &&
+          (isInventorySelectedObjectIntent(followupPreviousIntent) ||
+              (followupPreviousIntent === "inventory_on_hand_as_of_date" &&
+                  (toNonEmptyString(followupContext.previous_anchor_type) === "item" ||
+                      toNonEmptyString(followupContext.previous_anchor_value) ||
+                      toNonEmptyString(followupPreviousFilters?.item)))) &&
           (hasShortInventoryObjectFollowupSignal(rawUserMessage) ||
               hasShortInventoryObjectFollowupSignal(repairedRawUserMessage) ||
               hasShortInventoryObjectFollowupSignal(effectiveAddressUserMessage) ||

llm_normalizer/backend/src/services/assistantService.ts

@@ -2757,8 +2757,11 @@ function hasShortInventoryObjectFollowupSignal(userMessage) {
     if (minTokens > 8) {
         return false;
     }
+    const hasDirectPurchaseFollowupCue = (sample) => /(?:^|[\s,.;:!?])(?:а\s+)?(?:у|от)\s+кого(?:\s+\S+){0,5}\s+купил(?:и|о)?(?=$|[\s,.;:!?])/iu.test(sample) ||
+        /(?:^|[\s,.;:!?])(?:а\s+)?купил(?:и|о)?(?:\s+\S+){0,5}\s+(?:у|от)\s+кого(?=$|[\s,.;:!?])/iu.test(sample);
     const hasDirectSaleFollowupCue = (sample) => /(?:кому|каму|куда)(?:\s+\S+){0,4}\s+(?:продали|продано|продан(?:о|а|ы)?|реализовали|реализован(?:о|а|ы)?)|(?:продали|продано|реализовали|реализован(?:о|а|ы)?)(?:\s+\S+){0,4}\s+(?:кому|каму|куда)|(?:^|\s)(?:продано|продали|реализовано|реализовали)(?=$|[\s,.;:!?])/iu.test(sample);
-    return samples.some((sample) => /^(?:кто|когда|документы|сумма|поставщик|покупатель)(?:\?)?$/iu.test(sample) ||
+    return samples.some((sample) => /^(?:кто|когда|документы|сумма|поставщик|покупатель|продавец|seller)(?:\?)?$/iu.test(sample) ||
+        hasDirectPurchaseFollowupCue(sample) ||
         hasDirectSaleFollowupCue(sample) ||
         (0, decomposeStage_1.hasInventorySupplierFollowupCue)(sample) ||
         (0, decomposeStage_1.hasInventoryPurchaseDocumentsFollowupCue)(sample) ||
@@ -2767,6 +2770,41 @@ function hasShortInventoryObjectFollowupSignal(userMessage) {
         (0, decomposeStage_1.hasInventorySaleFollowupCue)(sample) ||
         (0, decomposeStage_1.hasInventoryPurchaseToSaleChainFollowupCue)(sample));
 }
+function hasInventoryRootTemporalFollowupSignal(userMessage, sourceIntentHint, hasInventoryRootFrame) {
+    if (!hasInventoryRootFrame) {
+        return false;
+    }
+    if (!(sourceIntentHint === "inventory_on_hand_as_of_date" ||
+        sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+        isInventorySelectedObjectIntent(sourceIntentHint))) {
+        return false;
+    }
+    const rawText = compactWhitespace(String(userMessage ?? "").toLowerCase());
+    const repairedText = compactWhitespace(repairAddressMojibake(String(userMessage ?? "")).toLowerCase());
+    const samples = [rawText, repairedText].filter((item) => item.length > 0);
+    if (samples.length === 0) {
+        return false;
+    }
+    const minTokens = samples.reduce((min, sample) => Math.min(min, countTokens(sample)), Number.POSITIVE_INFINITY);
+    if (minTokens > 8) {
+        return false;
+    }
+    const hasMonthYearCue = samples.some((sample) => /(?:январ|феврал|март|апрел|ма(?:й|е|я)|июн|июл|август|сентябр|октябр|ноябр|декабр)(?:\s+\d{4})?/iu.test(sample) ||
+        /\b(?:19|20)\d{2}\b/u.test(sample));
+    const hasTemporalCue = samples.some((sample) => hasPeriodLiteral(sample) ||
+        hasShortNamedPeriodFollowupLiteral(sample) ||
+        hasShortCurrentDateFollowupLiteral(sample) ||
+        /(?:на\s+ту\s+же\s+дат[ауеы]|на\s+эту\s+же\s+дат[ауеы]|same\s+date|the\s+same\s+date)/iu.test(sample));
+    if (!hasTemporalCue && !hasMonthYearCue) {
+        return false;
+    }
+    if (samples.some((sample) => hasForeignAccountingPivotOverInventoryMessage(sample))) {
+        return false;
+    }
+    const hasInventoryLexeme = samples.some((sample) => /(?:остат|склад|товар|номенклат|позиц)/iu.test(sample));
+    const hasPlainInventoryLexeme = samples.some((sample) => /(?:остат|склад|товар|номенклатур|позиц)/iu.test(sample));
+    return hasInventoryLexeme || hasPlainInventoryLexeme || minTokens <= 3;
+}
 function hasForeignAccountingPivotOverInventoryMessage(userMessage, alternateMessage = null) {
     const samples = [
         compactWhitespace(repairAddressMojibake(String(userMessage ?? "")).toLowerCase()),
@@ -2848,8 +2886,22 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         (isImplicitAddressContinuationByLlm(userMessage, llmPreDecomposeMeta) ||
             (toNonEmptyString(alternateMessage) ? isImplicitAddressContinuationByLlm(alternateMessage, llmPreDecomposeMeta) : false));
     const sourceIntentHint = toNonEmptyString(previousAddressDebug?.detected_intent);
-    const inventoryShortFollowupPrimary = isInventorySelectedObjectIntent(sourceIntentHint) && hasShortInventoryObjectFollowupSignal(userMessage);
-    const inventoryShortFollowupAlternate = isInventorySelectedObjectIntent(sourceIntentHint) && toNonEmptyString(alternateMessage)
+    const navigationFocusObjectHint = addressNavigationState &&
+        typeof addressNavigationState === "object" &&
+        addressNavigationState.session_context &&
+        typeof addressNavigationState.session_context === "object" &&
+        addressNavigationState.session_context.active_focus_object &&
+        typeof addressNavigationState.session_context.active_focus_object === "object"
+        ? addressNavigationState.session_context.active_focus_object
+        : null;
+    const hasNavigationInventoryItemFocusHint = Boolean(toNonEmptyString(navigationFocusObjectHint?.label) &&
+        toNonEmptyString(navigationFocusObjectHint?.object_type) === "item" &&
+        (sourceIntentHint === "inventory_on_hand_as_of_date" ||
+            sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+            isInventorySelectedObjectIntent(sourceIntentHint)));
+    let inventoryShortFollowupPrimary = (isInventorySelectedObjectIntent(sourceIntentHint) || hasNavigationInventoryItemFocusHint) &&
+        hasShortInventoryObjectFollowupSignal(userMessage);
+    let inventoryShortFollowupAlternate = (isInventorySelectedObjectIntent(sourceIntentHint) || hasNavigationInventoryItemFocusHint) && toNonEmptyString(alternateMessage)
         ? hasShortInventoryObjectFollowupSignal(String(alternateMessage ?? ""))
         : false;
     const debtRoleSwapPrimary = sourceIntentHint ? resolveDebtRoleSwapFollowupIntent(userMessage, sourceIntentHint) : null;
@@ -2857,8 +2909,8 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         ? resolveDebtRoleSwapFollowupIntent(String(alternateMessage ?? ""), sourceIntentHint)
         : null;
     const debtRoleSwapIntent = debtRoleSwapPrimary ?? debtRoleSwapAlternate ?? null;
-    const hasPrimaryFollowupSignal = hasAddressFollowupContextSignal(userMessage) || Boolean(debtRoleSwapPrimary) || inventoryShortFollowupPrimary;
-    const hasAlternateFollowupSignal = toNonEmptyString(alternateMessage)
+    let hasPrimaryFollowupSignal = hasAddressFollowupContextSignal(userMessage) || Boolean(debtRoleSwapPrimary) || inventoryShortFollowupPrimary;
+    let hasAlternateFollowupSignal = toNonEmptyString(alternateMessage)
         ? hasAddressFollowupContextSignal(alternateMessage) || Boolean(debtRoleSwapAlternate) || inventoryShortFollowupAlternate
         : false;
     const hasPrimaryIndexReferenceSignal = extractDisplayedEntityIndexMention(userMessage) !== null;
@@ -2866,12 +2918,19 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         ? extractDisplayedEntityIndexMention(String(alternateMessage ?? "")) !== null
         : false;
     const hasIndexReferenceSignal = hasPrimaryIndexReferenceSignal || hasAlternateIndexReferenceSignal;
-    const hasStrongFollowupReference = hasPrimaryIndexReferenceSignal ||
+    const recentInventoryRootFrame = findRecentInventoryRootFrame(items);
+    const hasInventoryRootTemporalFollowupPrimary = hasInventoryRootTemporalFollowupSignal(userMessage, sourceIntentHint, Boolean(recentInventoryRootFrame));
+    const hasInventoryRootTemporalFollowupAlternate = toNonEmptyString(alternateMessage)
+        ? hasInventoryRootTemporalFollowupSignal(String(alternateMessage ?? ""), sourceIntentHint, Boolean(recentInventoryRootFrame))
+        : false;
+    let hasStrongFollowupReference = hasPrimaryIndexReferenceSignal ||
         hasAlternateIndexReferenceSignal ||
         hasOrganizationClarificationContinuation ||
         hasImplicitContinuationSignal ||
         inventoryShortFollowupPrimary ||
         inventoryShortFollowupAlternate ||
+        hasInventoryRootTemporalFollowupPrimary ||
+        hasInventoryRootTemporalFollowupAlternate ||
         Boolean(debtRoleSwapIntent) ||
         hasFollowupMarker(userMessage) ||
         hasReferentialPointer(userMessage) ||
@@ -2883,6 +2942,8 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
     if (hasStandaloneAddressTopic &&
         !hasPrimaryFollowupSignal &&
         !hasAlternateFollowupSignal &&
+        !hasInventoryRootTemporalFollowupPrimary &&
+        !hasInventoryRootTemporalFollowupAlternate &&
         !hasImplicitContinuationSignal &&
         !hasOrganizationClarificationContinuation &&
         !hasIndexReferenceSignal) {
@@ -2890,6 +2951,8 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
     }
     if (!hasPrimaryFollowupSignal &&
         !hasAlternateFollowupSignal &&
+        !hasInventoryRootTemporalFollowupPrimary &&
+        !hasInventoryRootTemporalFollowupAlternate &&
         !hasImplicitContinuationSignal &&
         !hasOrganizationClarificationContinuation &&
         !hasIndexReferenceSignal) {
@@ -2951,6 +3014,41 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         : null;
     const navigationFocusObjectType = toNonEmptyString(navigationFocusObject?.object_type);
     const navigationFocusObjectLabel = toNonEmptyString(navigationFocusObject?.label);
+    const hasInventoryItemFocusCarryover = navigationFocusObjectType === "item" &&
+        navigationFocusObjectLabel &&
+        (sourceIntentHint === "inventory_on_hand_as_of_date" ||
+            sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+            isInventorySelectedObjectIntent(sourceIntentHint));
+    if (!inventoryShortFollowupPrimary && hasInventoryItemFocusCarryover) {
+        inventoryShortFollowupPrimary = hasShortInventoryObjectFollowupSignal(userMessage);
+    }
+    if (!inventoryShortFollowupAlternate && hasInventoryItemFocusCarryover && toNonEmptyString(alternateMessage)) {
+        inventoryShortFollowupAlternate = hasShortInventoryObjectFollowupSignal(String(alternateMessage ?? ""));
+    }
+    hasPrimaryFollowupSignal = hasAddressFollowupContextSignal(userMessage) ||
+        Boolean(debtRoleSwapPrimary) ||
+        inventoryShortFollowupPrimary ||
+        hasInventoryRootTemporalFollowupPrimary;
+    hasAlternateFollowupSignal = toNonEmptyString(alternateMessage)
+        ? hasAddressFollowupContextSignal(alternateMessage) ||
+            Boolean(debtRoleSwapAlternate) ||
+            inventoryShortFollowupAlternate ||
+            hasInventoryRootTemporalFollowupAlternate
+        : false;
+    hasStrongFollowupReference = hasPrimaryIndexReferenceSignal ||
+        hasAlternateIndexReferenceSignal ||
+        hasOrganizationClarificationContinuation ||
+        hasImplicitContinuationSignal ||
+        inventoryShortFollowupPrimary ||
+        inventoryShortFollowupAlternate ||
+        hasInventoryRootTemporalFollowupPrimary ||
+        hasInventoryRootTemporalFollowupAlternate ||
+        Boolean(debtRoleSwapIntent) ||
+        hasFollowupMarker(userMessage) ||
+        hasReferentialPointer(userMessage) ||
+        (toNonEmptyString(alternateMessage)
+            ? hasFollowupMarker(String(alternateMessage ?? "")) || hasReferentialPointer(String(alternateMessage ?? ""))
+            : false);
     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 ?? ""))
@@ -3012,18 +3110,39 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
     if (!toNonEmptyString(previousFilters.organization) && organizationClarificationSelection) {
         previousFilters.organization = organizationClarificationSelection;
     }
-    if (!toNonEmptyString(previousFilters.as_of_date) && toNonEmptyString(navigationDateScope?.as_of_date)) {
+    const shouldBackfillPreviousDateScopeFromNavigation = sourceIntentHint === "inventory_on_hand_as_of_date" ||
+        sourceIntentHint === "inventory_supplier_stock_overlap_as_of_date" ||
+        sourceIntentHint === "inventory_purchase_provenance_for_item" ||
+        sourceIntentHint === "inventory_purchase_documents_for_item" ||
+        sourceIntentHint === "inventory_sale_trace_for_item" ||
+        sourceIntentHint === "inventory_profitability_for_item" ||
+        sourceIntentHint === "inventory_purchase_to_sale_chain" ||
+        sourceIntentHint === "inventory_aging_by_purchase_date" ||
+        sourceIntentHint === "account_balance_snapshot" ||
+        sourceIntentHint === "documents_forming_balance";
+    if (shouldBackfillPreviousDateScopeFromNavigation &&
+        !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)) {
+    if (shouldBackfillPreviousDateScopeFromNavigation &&
+        !toNonEmptyString(previousFilters.period_from) &&
+        toNonEmptyString(navigationDateScope?.period_from)) {
         previousFilters.period_from = toNonEmptyString(navigationDateScope?.period_from);
     }
-    if (!toNonEmptyString(previousFilters.period_to) && toNonEmptyString(navigationDateScope?.period_to)) {
+    if (shouldBackfillPreviousDateScopeFromNavigation &&
+        !toNonEmptyString(previousFilters.period_to) &&
+        toNonEmptyString(navigationDateScope?.period_to)) {
         previousFilters.period_to = toNonEmptyString(navigationDateScope?.period_to);
     }
     const rootContextOnlyPivot = Boolean((isInventorySelectedObjectIntent(sourceIntentHint) || currentFrameKind === "inventory_drilldown") &&
         hasForeignAccountingPivotOverInventoryMessage(userMessage, alternateMessage));
-    if (rootContextOnlyPivot) {
+    const inventoryRootTemporalPivot = Boolean(inventoryRootFrame &&
+        (isInventorySelectedObjectIntent(sourceIntentHint) || currentFrameKind === "inventory_drilldown") &&
+        (hasInventoryRootTemporalFollowupPrimary || hasInventoryRootTemporalFollowupAlternate) &&
+        !hasForeignAccountingPivotOverInventoryMessage(userMessage, alternateMessage));
+    const rootScopedPivot = rootContextOnlyPivot || inventoryRootTemporalPivot;
+    if (rootScopedPivot) {
         previousIntent = null;
         previousAnchorType = null;
         previousAnchor = null;
@@ -3037,7 +3156,7 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
         (toNonEmptyString(alternateMessage)
             ? resolveDisplayedAddressEntityMention(String(alternateMessage ?? ""), displayedEntities)
             : null);
-    if (resolvedEntityFromFollowup && !rootContextOnlyPivot) {
+    if (resolvedEntityFromFollowup && !rootScopedPivot) {
         if (resolvedEntityFromFollowup.entityType === "counterparty") {
             previousFilters.counterparty = resolvedEntityFromFollowup.value;
             previousAnchorType = "counterparty";
@@ -3058,7 +3177,7 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
             followupSelectionMode = "carry_referenced_entity";
         }
     }
-    if (!rootContextOnlyPivot &&
+    if (!rootScopedPivot &&
         !toNonEmptyString(previousFilters.item) &&
         navigationFocusObjectType === "item" &&
         navigationFocusObjectLabel &&
@@ -3100,7 +3219,7 @@ function resolveAddressFollowupCarryoverContext(userMessage, items, alternateMes
             previous_anchor_type: previousAnchorType ?? undefined,
             previous_anchor_value: previousAnchor,
             resolved_counterparty_from_display: resolvedCounterpartyFromDisplay || undefined,
-            root_context_only: rootContextOnlyPivot || undefined,
+            root_context_only: rootScopedPivot || undefined,
             root_intent: inventoryRootFrame?.intent ?? undefined,
             root_filters: inventoryRootFrame?.filters ?? undefined,
             root_anchor_type: inventoryRootFrame?.anchorType ?? undefined,
@@ -3121,11 +3240,13 @@ function buildAddressDialogContinuationContractV2(userMessage, effectiveMessage,
     const previousIntent = toNonEmptyString(carryoverMeta?.previousSourceIntent) ?? null;
     const selectionMode = toNonEmptyString(carryoverMeta?.followupSelectionMode) ?? null;
     const rootContextOnly = selectionMode === "carry_root_context";
-    const explicitIntent = toNonEmptyString(llmPreDecomposeMeta?.predecomposeContract?.intent);
+    const explicitIntentRaw = toNonEmptyString(llmPreDecomposeMeta?.predecomposeContract?.intent);
+    const explicitIntent = explicitIntentRaw === "unknown" ? null : explicitIntentRaw;
+    const rootIntent = toNonEmptyString(carryoverMeta?.followupContext?.root_intent) ?? null;
     const targetIntent = selectionMode === "switch_to_suggested_intent"
         ? toNonEmptyString(carryoverMeta?.previousAddressIntent) ?? null
         : rootContextOnly
-            ? explicitIntent ?? null
+            ? rootIntent ?? explicitIntent ?? null
             : explicitIntent ?? toNonEmptyString(carryoverMeta?.previousAddressIntent) ?? null;
     const hasImplicitContinuationSignal = Boolean(carryoverMeta?.hasImplicitContinuationSignal);
     const rewrittenByPredecompose = compactWhitespace(sourceMessage.toLowerCase()) !== compactWhitespace(canonicalMessage.toLowerCase());

llm_normalizer/backend/src/services/inventoryLifecycleCueHelpers.ts

@@ -11,6 +11,9 @@ export function hasInventorySupplierCue(text: string): boolean {
   if (/(?:купил(?:и|о)?\s+у\s+кого|куплен(?:о)?\s+у\s+кого|купил(?:и|о)?\s+от\s+кого|куплен(?:о)?\s+от\s+кого)/iu.test(value)) {
     return true;
   }
+  if (/(?:кто\s+(?:был\s+)?продавец|кто\s+нам\s+продал|кто\s+продал\s+нам|(?:^|[\s,.;:!?()\-])(?:продавец|seller)(?=$|[\s,.;:!?()\-]))/iu.test(value)) {
+    return true;
+  }
   if (
     /(?:кто\s+(?:(?:это|этот\s+товар|эту\s+позицию)\s+)?(?:нам\s+)?поставил|кто\s+(?:нам\s+)?поставил\s+(?:это|этот\s+товар|эту\s+позицию)|от\s+какого\s+поставщика|у\s+какого\s+поставщика|от\s+кого\s+куплен|у\s+кого\s+купили|у\s+кого\s+куплено|где\s+(?:мы\s+)?купили(?:\s+(?:это|его|этот\s+товар|эту\s+позицию))?|где\s+(?:мы\s+)?взяли(?:\s+(?:это|его|этот\s+товар|эту\s+позицию))?|откуда\s+(?:мы\s+)?взяли(?:\s+(?:это|его|этот\s+товар|эту\s+позицию))?|где\s+куплено|supplier|vendor|поставщик)/iu.test(
       value

llm_normalizer/backend/tests/addressCounterpartyLifecycleOrganizationScopeRegression.test.ts

@@ -0,0 +1,82 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const { executeAddressMcpQueryMock } = vi.hoisted(() => ({
+  executeAddressMcpQueryMock: vi.fn()
+}));
+
+vi.mock("../src/services/addressMcpClient", async () => {
+  const actual = await vi.importActual<typeof import("../src/services/addressMcpClient")>(
+    "../src/services/addressMcpClient"
+  );
+  return {
+    ...actual,
+    executeAddressMcpQuery: executeAddressMcpQueryMock
+  };
+});
+
+import { AddressQueryService } from "../src/services/addressQueryService";
+
+afterEach(() => {
+  executeAddressMcpQueryMock.mockReset();
+  vi.restoreAllMocks();
+});
+
+describe("counterparty lifecycle organization scope regressions", () => {
+  it("keeps carried organization scope without false empty-match when rows omit organization column", async () => {
+    executeAddressMcpQueryMock.mockResolvedValueOnce({
+      fetched_rows: 3,
+      matched_rows: 3,
+      raw_rows: [
+        {
+          Period: "2020-01-15T00:00:00Z",
+          Registrator: "CP_CUSTOMER_ACTIVITY",
+          AccountDt: "62.01",
+          AccountKt: "90.01",
+          Amount: 12,
+          Counterparty: 'ООО "Ромашка"'
+        },
+        {
+          Period: "2020-02-20T00:00:00Z",
+          Registrator: "CP_CUSTOMER_ACTIVITY",
+          AccountDt: "62.01",
+          AccountKt: "90.01",
+          Amount: 8,
+          Counterparty: 'ООО "Ландыш"'
+        },
+        {
+          Period: "2020-03-10T00:00:00Z",
+          Registrator: "CP_CUSTOMER_ACTIVITY",
+          AccountDt: "62.01",
+          AccountKt: "90.01",
+          Amount: 4,
+          Counterparty: 'ООО "Ромашка"'
+        }
+      ],
+      rows: [],
+      error: null
+    });
+
+    const service = new AddressQueryService();
+    const result = await service.tryHandle("какие клиенты заплатили больше всего денег за все время", {
+      followupContext: {
+        previous_intent: "vat_payable_forecast",
+        previous_filters: {
+          organization: 'ООО "Альтернатива Плюс"',
+          period_from: "2020-01-01",
+          period_to: "2020-03-31"
+        },
+        previous_anchor_type: "organization",
+        previous_anchor_value: 'ООО "Альтернатива Плюс"'
+      }
+    });
+
+    expect(result?.handled).toBe(true);
+    expect(result?.reply_type).toBe("factual");
+    expect(result?.response_type).toBe("FACTUAL_LIST");
+    expect(result?.debug.detected_intent).toBe("counterparty_activity_lifecycle");
+    expect(result?.debug.extracted_filters?.organization).toBe('ООО "Альтернатива Плюс"');
+    expect(result?.debug.match_failure_reason).toBeNull();
+    expect(result?.debug.rows_matched).toBe(3);
+    expect(String(result?.reply_text ?? "")).toContain('ООО "Ромашка"');
+  });
+});

llm_normalizer/backend/tests/addressFollowupTemporalRegression.test.ts

@@ -0,0 +1,63 @@
+import { describe, expect, it } from "vitest";
+import { runAddressDecomposeStage } from "../src/services/address_runtime/decomposeStage";
+
+describe("address follow-up temporal regressions", () => {
+  it("replaces VAT month-only follow-up with the previous follow-up year", () => {
+    const result = runAddressDecomposeStage("а на март", {
+      previous_intent: "vat_payable_confirmed_as_of_date",
+      previous_filters: {
+        period_from: "2019-05-01",
+        period_to: "2019-05-31",
+        as_of_date: "2019-05-31"
+      },
+      previous_anchor_type: "unknown",
+      previous_anchor_value: null
+    });
+
+    expect(result).not.toBeNull();
+    expect(result?.intent.intent).toBe("vat_payable_confirmed_as_of_date");
+    expect(result?.filters.extracted_filters.period_from).toBe("2019-03-01");
+    expect(result?.filters.extracted_filters.period_to).toBe("2019-03-31");
+    expect(result?.filters.extracted_filters.as_of_date).toBe("2019-03-31");
+    expect(result?.baseReasons).toContain("period_derived_from_followup_context_year");
+  });
+
+  it("replaces VAT month-only follow-up with a later month from the same inherited year", () => {
+    const result = runAddressDecomposeStage("на сентябрь", {
+      previous_intent: "vat_payable_confirmed_as_of_date",
+      previous_filters: {
+        period_from: "2019-05-01",
+        period_to: "2019-05-31",
+        as_of_date: "2019-05-31"
+      },
+      previous_anchor_type: "unknown",
+      previous_anchor_value: null
+    });
+
+    expect(result).not.toBeNull();
+    expect(result?.intent.intent).toBe("vat_payable_confirmed_as_of_date");
+    expect(result?.filters.extracted_filters.period_from).toBe("2019-09-01");
+    expect(result?.filters.extracted_filters.period_to).toBe("2019-09-30");
+    expect(result?.filters.extracted_filters.as_of_date).toBe("2019-09-30");
+    expect(result?.baseReasons).toContain("period_derived_from_followup_context_year");
+  });
+
+  it("keeps same-date inventory pivot anchored to the previous VAT date", () => {
+    const result = runAddressDecomposeStage("какие остатки по складу на эту же дату", {
+      previous_intent: "vat_payable_confirmed_as_of_date",
+      previous_filters: {
+        period_from: "2019-09-01",
+        period_to: "2019-09-30",
+        as_of_date: "2019-09-30"
+      },
+      previous_anchor_type: "unknown",
+      previous_anchor_value: null
+    });
+
+    expect(result).not.toBeNull();
+    expect(result?.intent.intent).toBe("inventory_on_hand_as_of_date");
+    expect(result?.filters.extracted_filters.as_of_date).toBe("2019-09-30");
+    expect(result?.filters.extracted_filters.warehouse).toBeUndefined();
+    expect(result?.baseReasons).toContain("as_of_date_from_followup_context");
+  });
+});

llm_normalizer/backend/tests/addressInventoryRootFrameRegression.test.ts

@@ -56,7 +56,6 @@ describe("inventory root frame regressions", () => {
     expect(result).not.toBeNull();
     expect(result?.intent.intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.filters.extracted_filters.item).toBe("Зеркало для инвалидов поворотное травмобезопасное");
-    expect(result?.filters.extracted_filters.as_of_date).toBe("2022-02-28");
     expect(
       result?.baseReasons?.includes("intent_adjusted_to_inventory_followup_context") ||
         result?.intent.reasons.includes("inventory_selected_object_provenance_signal_detected")
@@ -111,4 +110,67 @@ describe("inventory root frame regressions", () => {
     expect(result?.intent.intent).not.toBe("bank_operations_by_counterparty");
     expect(result?.filters.extracted_filters.item).toBe("Четки Пост (84*117)");
   });
+  it("restores stock snapshot intent for selected-object restatement on the previously reviewed date", () => {
+    const result = runAddressDecomposeStage(
+      'По выбранному объекту "Столешница 600*3050*26 альмандин": покажи еще раз остатки на дату которую до этого рассматривали',
+      {
+        previous_intent: "inventory_purchase_documents_for_item",
+        previous_filters: {
+          item: "Столешница 600*3050*26 альмандин",
+          organization: 'ООО "Альтернатива Плюс"',
+          as_of_date: "2019-05-31"
+        },
+        previous_anchor_type: "item",
+        previous_anchor_value: "Столешница 600*3050*26 альмандин",
+        root_intent: "inventory_on_hand_as_of_date",
+        root_filters: {
+          organization: 'ООО "Альтернатива Плюс"',
+          period_from: "2019-05-01",
+          period_to: "2019-05-31",
+          as_of_date: "2019-05-31"
+        },
+        root_anchor_type: "organization",
+        root_anchor_value: 'ООО "Альтернатива Плюс"',
+        current_frame_kind: "inventory_drilldown"
+      }
+    );
+
+    expect(result).not.toBeNull();
+    expect(result?.intent.intent).toBe("inventory_on_hand_as_of_date");
+    expect(result?.intent.reasons).toContain("intent_restored_to_inventory_root_frame");
+    expect(result?.filters.extracted_filters.item).toBe("Столешница 600*3050*26 альмандин");
+    expect(result?.filters.extracted_filters.organization).toBe('ООО "Альтернатива Плюс"');
+    expect(result?.filters.extracted_filters.as_of_date).toBe("2019-05-31");
+    expect(result?.baseReasons).toContain("address_followup_context_applied");
+  });
+
+  it("restores inventory root frame for root-context-only month follow-up after drilldown", () => {
+    const result = runAddressDecomposeStage("остатки на июль 2019", {
+      previous_filters: {
+        organization: 'ООО "Альтернатива Плюс"',
+        as_of_date: "2020-03-31",
+        period_from: "2020-03-01",
+        period_to: "2020-03-31"
+      },
+      previous_anchor_type: null,
+      previous_anchor_value: null,
+      root_intent: "inventory_on_hand_as_of_date",
+      root_filters: {
+        organization: 'ООО "Альтернатива Плюс"',
+        as_of_date: "2020-03-31",
+        period_from: "2020-03-01",
+        period_to: "2020-03-31"
+      },
+      root_context_only: true,
+      current_frame_kind: "inventory_root"
+    });
+
+    expect(result).not.toBeNull();
+    expect(result?.intent.intent).toBe("inventory_on_hand_as_of_date");
+    expect(result?.intent.reasons).toContain("intent_restored_to_inventory_root_frame");
+    expect(result?.filters.extracted_filters.organization).toBe('ООО "Альтернатива Плюс"');
+    expect(result?.filters.extracted_filters.period_from).toBe("2019-07-01");
+    expect(result?.filters.extracted_filters.period_to).toBe("2019-07-31");
+    expect(result?.filters.extracted_filters.as_of_date).toBe("2019-07-31");
+  });
 });

llm_normalizer/backend/tests/addressInventorySaleTraceDocumentRoute.test.ts

@@ -21,8 +21,8 @@ afterEach(() => {
   vi.restoreAllMocks();
 });
 
-describe("inventory sale trace document route", () => {
-  it("uses document sales route with native item resolution for selected-object buyer follow-up", async () => {
+describe("inventory sale trace movement route", () => {
+  it("uses 41.01 movement route with native item resolution for selected-object buyer follow-up", async () => {
     executeAddressMcpQueryMock.mockResolvedValueOnce({
       fetched_rows: 2,
       matched_rows: 2,
@@ -30,25 +30,27 @@ describe("inventory sale trace document route", () => {
         {
           Period: "2015-02-25T12:00:00Z",
           Registrator: "Реализация товаров и услуг 00000000012 от 25.02.2015 12:00:00",
-          AccountDt: "",
+          AccountDt: "62.01",
           AccountKt: "41.01",
           Amount: 12605435.66,
           Quantity: 40,
-          Item: "Рабочая станция универсального специалиста (индивидуальное изготовление)",
-          Counterparty: "Комитет государственных услуг г. Москвы",
-          Contract: "Гос.контракт № 42/15 от 20.02.2015г. Силино окна",
+          SubcontoKt1: "Рабочая станция универсального специалиста (индивидуальное изготовление)",
+          SubcontoKt3: "Основной склад",
+          SubcontoDt1: "Комитет государственных услуг г. Москвы",
+          SubcontoDt2: "Гос.контракт № 42/15 от 20.02.2015 г. Силино окна",
           Organization: "ООО \\Альтернатива Плюс\\"
         },
         {
           Period: "2015-02-09T12:00:14Z",
           Registrator: "Реализация товаров и услуг 00000000004 от 09.02.2015 12:00:14",
-          AccountDt: "",
+          AccountDt: "62.01",
           AccountKt: "41.01",
           Amount: 16421320.17,
           Quantity: 51,
-          Item: "Рабочая станция универсального специалиста (индивидуальное изготовление)",
-          Counterparty: "Комитет государственных услуг г. Москвы",
-          Contract: "Гос.контракт № 17/15 от 02.02.2015г.",
+          SubcontoKt1: "Рабочая станция универсального специалиста (индивидуальное изготовление)",
+          SubcontoKt3: "Основной склад",
+          SubcontoDt1: "Комитет государственных услуг г. Москвы",
+          SubcontoDt2: "Гос.контракт № 17/15 от 02.02.2015 г.",
           Organization: "ООО \\Альтернатива Плюс\\"
         }
       ],
@@ -82,11 +84,12 @@ describe("inventory sale trace document route", () => {
 
     expect(executeAddressMcpQueryMock).toHaveBeenCalledTimes(1);
     const query = String(executeAddressMcpQueryMock.mock.calls[0]?.[0]?.query ?? "");
-    expect(query).toContain("Документ.РеализацияТоваровУслуг.Товары КАК Товары");
-    expect(query).toContain("Товары.Номенклатура В (ВЫБРАТЬ Номенклатура.Ссылка");
-    expect(query).toContain('Номенклатура.Наименование = "Рабочая станция универсального специалиста (индивидуальное изготовление)"');
-    expect(query).toContain("ПРЕДСТАВЛЕНИЕ(Товары.Ссылка.Контрагент) КАК Контрагент");
-    expect(query).toContain("ПРЕДСТАВЛЕНИЕ(Товары.Ссылка.Организация) КАК Организация");
+    expect(query).toContain("РегистрБухгалтерии.Хозрасчетный.ДвиженияССубконто КАК Движения");
+    expect(query).toContain('ПОДСТРОКА(ЕСТЬNULL(Движения.СчетКт.Код, ""), 1, 5) = "41.01"');
+    expect(query).toContain("Движения.СубконтоКт1 В (ВЫБРАТЬ Номенклатура.Ссылка");
+    expect(query).toContain(
+      'Номенклатура.Наименование = "Рабочая станция универсального специалиста (индивидуальное изготовление)"'
+    );
     expect(query).not.toContain("2016-06-30");
     expect(query).not.toContain("2016-06-01");
     expect(query).not.toContain('ПРЕДСТАВЛЕНИЕ(Движения.Организация) = "ООО \\Альтернатива Плюс\\"');

llm_normalizer/backend/tests/addressInventorySaleTraceSelectedObjectRegression.test.ts

@@ -25,13 +25,14 @@ describe("inventory sale trace selected-object regressions", () => {
   const saleRow = {
     Period: "2021-04-15T00:00:00Z",
     Registrator: "Реализация товаров и услуг 00000000201 от 15.04.2021 0:00:00",
-    AccountDt: "",
+    AccountDt: "62.01",
     AccountKt: "41.01",
     Amount: 165.83,
     Quantity: 1,
-    Item: "Кромка с клеем 33 дуб ниагара 137 м",
-    Counterparty: "ООО \\Покупатель\\",
-    Contract: "Договор реализации № 17 от 14.04.2021",
+    SubcontoKt1: "Кромка с клеем 33 дуб ниагара 137 м",
+    SubcontoKt3: "Основной склад",
+    SubcontoDt1: "ООО \\Покупатель\\",
+    SubcontoDt2: "Договор реализации № 17 от 14.04.2021",
     Organization: "ООО \\Альтернатива Плюс\\"
   };
 
@@ -70,7 +71,7 @@ describe("inventory sale trace selected-object regressions", () => {
 
     expect(executeAddressMcpQueryMock).toHaveBeenCalledTimes(1);
     const query = String(executeAddressMcpQueryMock.mock.calls[0]?.[0]?.query ?? "");
-    expect(query).toContain("Документ.РеализацияТоваровУслуг.Товары КАК Товары");
+    expect(query).toContain("РегистрБухгалтерии.Хозрасчетный.ДвиженияССубконто КАК Движения");
     expect(query).toContain('Номенклатура.Наименование = "Кромка с клеем 33 дуб ниагара 137 м"');
     expect(query).not.toContain('Номенклатура.Наименование = "Кромка"');
   });
@@ -132,6 +133,7 @@ describe("inventory sale trace selected-object regressions", () => {
 
     expect(executeAddressMcpQueryMock).toHaveBeenCalledTimes(1);
     const query = String(executeAddressMcpQueryMock.mock.calls[0]?.[0]?.query ?? "");
+    expect(query).toContain("РегистрБухгалтерии.Хозрасчетный.ДвиженияССубконто КАК Движения");
     expect(query).toContain('Номенклатура.Наименование = "Кромка с клеем 33 дуб ниагара 137 м"');
     expect(query).not.toContain('Номенклатура.Наименование = "Кромка"');
   });

llm_normalizer/backend/tests/addressInventorySelectedObjectFollowup.test.ts

@@ -193,7 +193,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.response_type).toBe("FACTUAL_SUMMARY");
     expect(result?.debug.detected_intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.debug.extracted_filters?.item).toBe("Столешница 600*3050*26 дуб ниагара");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2019-03-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "")).toContain("Торговый дом \\Союз МСК\\");
   });
 
@@ -242,7 +242,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.response_type).toBe("FACTUAL_SUMMARY");
     expect(result?.debug.detected_intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.debug.extracted_filters?.item).toBe("Рабочая станция универсального специалиста (индивидуальное изготовление)");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2016-07-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "")).toContain("ООО \\Производство мебели\\");
   });
 
@@ -292,7 +292,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.debug.detected_intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.debug.selected_recipe).toBe("address_inventory_purchase_provenance_for_item_v1");
     expect(result?.debug.extracted_filters?.item).toBe("Конструкция трансформер рабочей станции 1300*900*2000");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2020-06-30");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(result?.debug.extracted_filters?.period_from).toBeUndefined();
     expect(result?.debug.extracted_filters?.period_to).toBeUndefined();
     expect(result?.debug.capability_id).toBe("inventory_inventory_purchase_provenance_for_item");
@@ -345,7 +345,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.response_type).toBe("FACTUAL_SUMMARY");
     expect(result?.debug.detected_intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.debug.extracted_filters?.item).toBe("Рабочая станция универсального специалиста (индивидуальное изготовление)");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2016-05-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "")).toContain("ООО \\Производство мебели\\");
   });
 
@@ -394,7 +394,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.response_type).toBe("FACTUAL_SUMMARY");
     expect(result?.debug.detected_intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.debug.extracted_filters?.item).toBe("Рабочая станция универсального специалиста (индивидуальное изготовление)");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2016-05-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "")).toContain("ООО \\Производство мебели\\");
   });
 
@@ -444,7 +444,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.debug.detected_intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.debug.selected_recipe).toBe("address_inventory_purchase_provenance_for_item_v1");
     expect(result?.debug.extracted_filters?.item).toBe("Рабочая станция универсального специалиста (индивидуальное изготовление)");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2016-05-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "")).toContain("ООО \\Производство мебели\\");
   });
 
@@ -491,7 +491,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.debug.detected_intent).toBe("inventory_purchase_documents_for_item");
     expect(result?.debug.selected_recipe).toBe("address_inventory_purchase_documents_for_item_v1");
     expect(result?.debug.extracted_filters?.item).toBe("Столешница 600*3050*26 дуб ниагара");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2019-03-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "")).toContain("Поступление товаров и услуг 00000000077");
   });
 
@@ -537,7 +537,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.debug.detected_intent).toBe("inventory_sale_trace_for_item");
     expect(result?.debug.selected_recipe).toBe("address_inventory_sale_trace_for_item_v1");
     expect(result?.debug.extracted_filters?.item).toBe("Четки Пост (84*117)");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2020-03-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "").split("\n")[0]).toContain("ИП Покупатель");
     expect(String(result?.reply_text ?? "")).toContain("Документы выбытия");
   });
@@ -583,7 +583,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.debug.detected_intent).toBe("inventory_sale_trace_for_item");
     expect(result?.debug.selected_recipe).toBe("address_inventory_sale_trace_for_item_v1");
     expect(result?.debug.extracted_filters?.item).toBe("Пуф арий");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2020-05-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(result?.debug.reasons).toContain("inventory_selected_object_sale_trace_signal_detected");
     expect(String(result?.reply_text ?? "").split("\n")[0]).toContain("ООО \\Ромашка\\");
     expect(String(result?.reply_text ?? "")).toContain("Документы выбытия");
@@ -631,7 +631,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.debug.detected_intent).toBe("inventory_sale_trace_for_item");
     expect(result?.debug.selected_recipe).toBe("address_inventory_sale_trace_for_item_v1");
     expect(result?.debug.extracted_filters?.item).toBe("Кромка с клеем 33 альмандин 137 м");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2020-03-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(String(result?.reply_text ?? "")).toContain("ООО \\Покупатель\\");
   });
 
@@ -678,10 +678,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.handled).toBe(true);
     expect(result?.response_type).toBe("FACTUAL_LIST");
     expect(result?.debug.detected_intent).toBe("inventory_sale_trace_for_item");
-    expect(result?.debug.reasons).toContain("lifecycle_execution_detached_from_snapshot_date");
-    expect(result?.debug.reasons).toContain("as_of_date_cleared_for_history_recovery");
-    expect(result?.debug.limitations).toContain("lifecycle_execution_detached_from_snapshot_date");
-    expect(result?.debug.limitations).toContain("as_of_date_cleared_for_history_recovery");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(executeAddressMcpQueryMock).toHaveBeenCalledTimes(1);
     const query = String(executeAddressMcpQueryMock.mock.calls[0]?.[0]?.query ?? "");
     expect(query).not.toContain("2019-03-31");
@@ -808,7 +805,7 @@ describe("inventory selected-object follow-up", () => {
     expect(result?.response_type).toBe("FACTUAL_SUMMARY");
     expect(result?.debug.detected_intent).toBe("inventory_purchase_provenance_for_item");
     expect(result?.debug.extracted_filters?.item).toBe("Кресло орион");
-    expect(result?.debug.extracted_filters?.as_of_date).toBe("2020-03-31");
+    expect(result?.debug.extracted_filters?.as_of_date).toBeUndefined();
     expect(result?.debug.extracted_filters?.period_from).toBeUndefined();
     expect(result?.debug.extracted_filters?.period_to).toBeUndefined();
     expect(result?.debug.reasons ?? []).not.toContain("lifecycle_execution_detached_from_snapshot_date");
@@ -820,7 +817,7 @@ describe("inventory selected-object follow-up", () => {
     const query = String(executeAddressMcpQueryMock.mock.calls[0]?.[0]?.query ?? "");
     expect(query).toContain("Документ.ПоступлениеТоваровУслуг.Товары КАК Товары");
     expect(query).toContain("Товары.Номенклатура В (ВЫБРАТЬ Номенклатура.Ссылка");
-    expect(query).toContain("Товары.Ссылка.Дата <= ДАТАВРЕМЯ(2020, 3, 31, 23, 59, 59)");
+    expect(query).not.toContain("2020-03-31");
     expect(query).toContain("ПРЕДСТАВЛЕНИЕ(Товары.Ссылка.Организация) КАК Организация");
   });
 });

llm_normalizer/backend/tests/addressInventoryWarehouseAnchor.test.ts

@@ -62,6 +62,29 @@ describe("inventory warehouse anchor extraction", () => {
       "inventory_on_hand_as_of_date"
     ).extracted_filters;
 
+    expect(filters.warehouse).toBeUndefined();
+  });
+  it("does not materialize self-scope slang tail as warehouse anchor in stock snapshot wording from the run", () => {
+    const result = extractAddressFilters("что там на складе у нас висит", "inventory_on_hand_as_of_date");
+
+    expect(result.extracted_filters.warehouse).toBeUndefined();
+    expect(result.warnings).toContain("warehouse_self_scope_detected");
+    expect(result.semantic_frame?.scope_kind).toBe("implicit_self_scope");
+    expect(result.semantic_frame?.anchor_kind).toBe("self_scope");
+    expect(result.semantic_frame?.anchor_value).toBeNull();
+  });
+  it("does not materialize same-date phrasing as warehouse anchor in stock follow-up", () => {
+    const filters = extractAddressFilters("какие остатки по складу на эту же дату", "inventory_on_hand_as_of_date").extracted_filters;
+
+    expect(filters.warehouse).toBeUndefined();
+  });
+
+  it("does not materialize current-date phrasing as warehouse anchor in stock follow-up", () => {
+    const filters = extractAddressFilters(
+      "получить остатки по складу на текущую дату",
+      "inventory_on_hand_as_of_date"
+    ).extracted_filters;
+
     expect(filters.warehouse).toBeUndefined();
   });
 });

llm_normalizer/backend/tests/assistantAddressFollowupContext.test.ts

@@ -2376,5 +2376,228 @@ describe("assistant address follow-up carryover", () => {
     expect(normalizerService.normalize).not.toHaveBeenCalled();
   });
 
+  it("treats short inventory month follow-up after drilldown as continuation of the recent inventory root frame", async () => {
+    const calls: Array<{ message: string; options?: any }> = [];
+    const followupMessage = "остатки на июль 2019";
+    const itemLabel = "Четки Пост (84*117)";
+    const organization = 'ООО "Альтернатива Плюс"';
+
+    const inventoryResult = {
+      handled: true,
+      reply_text: "Подтвержденный складской срез на 31.07.2019 собран.",
+      reply_type: "factual",
+      response_type: "FACTUAL_SUMMARY",
+      debug: {
+        detected_mode: "address_query",
+        detected_intent: "inventory_on_hand_as_of_date",
+        detected_intent_confidence: "high",
+        extracted_filters: {
+          as_of_date: "2019-07-31",
+          period_from: "2019-07-01",
+          period_to: "2019-07-31",
+          organization
+        },
+        selected_recipe: "address_inventory_on_hand_as_of_date_v1",
+        reasons: ["address_action_detected", "address_entity_detected", "address_followup_context_applied"]
+      }
+    } as any;
+
+    const addressQueryService = {
+      tryHandle: vi.fn(async (message: string, options?: any) => {
+        calls.push({ message, options });
+        if (message === followupMessage && options?.followupContext) {
+          return inventoryResult;
+        }
+        return null;
+      })
+    } as any;
+
+    const normalizerService = {
+      normalize: vi.fn(async () => ({
+        assistant_reply: "normalizer_fallback_should_not_be_used",
+        reply_type: "partial_coverage",
+        debug: {}
+      }))
+    } as any;
+
+    const sessions = new AssistantSessionStore();
+    const service = new AssistantService(
+      normalizerService,
+      sessions as any,
+      {} as any,
+      { persistSession: vi.fn() } as any,
+      addressQueryService
+    );
+
+    const sessionId = `asst-address-followup-inventory-root-month-${Date.now()}`;
+    sessions.appendItem(sessionId, {
+      message_id: "msg-inventory-root-seed-july",
+      session_id: sessionId,
+      role: "assistant",
+      text: "inventory root seed",
+      reply_type: "factual",
+      created_at: "2026-04-15T19:00:00.000Z",
+      trace_id: "address-root-seed-july",
+      debug: {
+        detected_mode: "address_query",
+        detected_intent: "inventory_on_hand_as_of_date",
+        extracted_filters: {
+          as_of_date: "2020-03-31",
+          period_from: "2020-03-01",
+          period_to: "2020-03-31",
+          organization
+        },
+        selected_recipe: "address_inventory_on_hand_as_of_date_v1"
+      }
+    } as any);
+    sessions.appendItem(sessionId, {
+      message_id: "msg-inventory-drilldown-seed-july",
+      session_id: sessionId,
+      role: "assistant",
+      text: "inventory provenance seed",
+      reply_type: "factual",
+      created_at: "2026-04-15T19:01:00.000Z",
+      trace_id: "address-drilldown-seed-july",
+      debug: {
+        detected_mode: "address_query",
+        detected_intent: "inventory_purchase_provenance_for_item",
+        extracted_filters: {
+          item: itemLabel,
+          organization
+        },
+        selected_recipe: "address_inventory_purchase_provenance_for_item_v1",
+        anchor_type: "item",
+        anchor_value_raw: itemLabel,
+        anchor_value_resolved: itemLabel
+      }
+    } as any);
+
+    const second = await service.handleMessage({
+      session_id: sessionId,
+      user_message: followupMessage,
+      useMock: true
+    } as any);
+
+    expect(second.ok).toBe(true);
+    expect(second.reply_type).toBe("factual");
+    expect(calls).toHaveLength(1);
+    expect(calls[0].message).toBe(followupMessage);
+    expect(calls[0].options?.followupContext?.previous_intent).toBeUndefined();
+    expect(calls[0].options?.followupContext?.previous_filters?.item).toBeUndefined();
+    expect(calls[0].options?.followupContext?.root_context_only).toBe(true);
+    expect(calls[0].options?.followupContext?.root_intent).toBe("inventory_on_hand_as_of_date");
+    expect(calls[0].options?.followupContext?.root_filters?.organization).toBe(organization);
+    expect(calls[0].options?.followupContext?.root_filters?.as_of_date).toBe("2020-03-31");
+    expect(calls[0].options?.followupContext?.current_frame_kind).toBe("inventory_root");
+    expect(normalizerService.normalize).not.toHaveBeenCalled();
+  });
+
+  it("treats colloquial supplier follow-up from an inventory root slice as continuation of the focused item", async () => {
+    const calls: Array<{ message: string; options?: any }> = [];
+    const followupMessage = "у кого мы модуль прямоугольный купили кстати";
+    const itemLabel = "Модуль прямоугольый 1400*110*750";
+    const organization = 'ООО "Альтернатива Плюс"';
+
+    const provenanceResult = {
+      handled: true,
+      reply_text: `По позиции ${itemLabel} подтвержден поставщик: Торговый дом "Союз".`,
+      reply_type: "factual",
+      response_type: "FACTUAL_SUMMARY",
+      debug: {
+        detected_mode: "address_query",
+        detected_intent: "inventory_purchase_provenance_for_item",
+        detected_intent_confidence: "medium",
+        extracted_filters: {
+          item: itemLabel,
+          organization,
+          as_of_date: "2020-05-31"
+        },
+        selected_recipe: "address_inventory_purchase_provenance_for_item_v1",
+        reasons: ["address_action_detected", "address_entity_detected", "address_followup_context_applied"]
+      }
+    } as any;
+
+    const addressQueryService = {
+      tryHandle: vi.fn(async (message: string, options?: any) => {
+        calls.push({ message, options });
+        if (message === followupMessage && options?.followupContext) {
+          return provenanceResult;
+        }
+        return null;
+      })
+    } as any;
+
+    const normalizerService = {
+      normalize: vi.fn(async () => ({
+        assistant_reply: "normalizer_fallback_should_not_be_used",
+        reply_type: "partial_coverage",
+        debug: {}
+      }))
+    } as any;
+
+    const sessions = new AssistantSessionStore();
+    const service = new AssistantService(
+      normalizerService,
+      sessions as any,
+      {} as any,
+      { persistSession: vi.fn() } as any,
+      addressQueryService
+    );
+
+    const sessionId = `asst-address-followup-root-item-focus-${Date.now()}`;
+    sessions.appendItem(sessionId, {
+      message_id: "msg-inventory-root-seed",
+      session_id: sessionId,
+      role: "assistant",
+      text: `${itemLabel} был в остатках на 31.05.2020.`,
+      reply_type: "factual",
+      created_at: "2026-04-15T19:00:00.000Z",
+      trace_id: "address-root-seed",
+      debug: {
+        detected_mode: "address_query",
+        detected_intent: "inventory_on_hand_as_of_date",
+        extracted_filters: {
+          organization,
+          as_of_date: "2020-05-31",
+          period_from: "2020-05-01",
+          period_to: "2020-05-31"
+        },
+        selected_recipe: "address_inventory_on_hand_as_of_date_v1"
+      }
+    } as any);
+    sessions.setAddressNavigationState(sessionId, {
+      session_id: sessionId,
+      session_context: {
+        active_focus_object: {
+          object_type: "item",
+          label: itemLabel
+        },
+        organization_scope: organization,
+        date_scope: {
+          as_of_date: "2020-05-31",
+          period_from: "2020-05-01",
+          period_to: "2020-05-31"
+        }
+      }
+    } as any);
+
+    const response = await service.handleMessage({
+      session_id: sessionId,
+      user_message: followupMessage,
+      useMock: true
+    } as any);
+
+    expect(response.ok).toBe(true);
+    expect(response.reply_type).toBe("factual");
+    expect(calls).toHaveLength(1);
+    expect(calls[0].message).toBe(followupMessage);
+    expect(calls[0].options?.followupContext?.previous_intent).toBe("inventory_on_hand_as_of_date");
+    expect(calls[0].options?.followupContext?.previous_anchor_type).toBe("item");
+    expect(calls[0].options?.followupContext?.previous_anchor_value).toBe(itemLabel);
+    expect(calls[0].options?.followupContext?.previous_filters?.item).toBe(itemLabel);
+    expect(calls[0].options?.followupContext?.previous_filters?.organization).toBe(organization);
+    expect(calls[0].options?.followupContext?.previous_filters?.as_of_date).toBe("2020-05-31");
+    expect(normalizerService.normalize).not.toHaveBeenCalled();
+  });
 });
 

llm_normalizer/backend/tests/assistantAddressLaneRuntimeAdapter.test.ts

@@ -34,8 +34,8 @@ describe("assistant address lane runtime adapter", () => {
     const runAddressLaneAttempt = vi.fn(async () => factualLane());
 
     const result = await runAssistantAddressLaneRuntime({
-      userMessage: "сырой вопрос",
-      addressInputMessage: "нормализованный вопрос",
+      userMessage: "raw question",
+      addressInputMessage: "normalized question",
       carryover,
       shouldPreferContextualLane: true,
       canRetryWithRawUserMessage: true,
@@ -44,24 +44,24 @@ describe("assistant address lane runtime adapter", () => {
     });
 
     expect(result.handled).toBe(true);
-    expect(result.selection?.messageUsed).toBe("нормализованный вопрос");
+    expect(result.selection?.messageUsed).toBe("normalized question");
     expect(result.selection?.carryMeta).toBe(carryover);
     expect(result.retryAudit.attempted).toBe(false);
     expect(runAddressLaneAttempt).toHaveBeenCalledTimes(1);
-    expect(runAddressLaneAttempt).toHaveBeenCalledWith("нормализованный вопрос", carryover);
+    expect(runAddressLaneAttempt).toHaveBeenCalledWith("normalized question", carryover, null);
   });
 
   it("retries with raw message after limited result and returns factual retry", async () => {
     const carryover: AssistantAddressFollowupCarryoverLike = { followupContext: { scope: "ctx" } };
     const runAddressLaneAttempt = vi
       .fn()
-      .mockResolvedValueOnce(limitedLane("empty_match")) // primary
-      .mockResolvedValueOnce(limitedLane("empty_match")) // contextual
-      .mockResolvedValueOnce(factualLane()); // raw contextual retry
+      .mockResolvedValueOnce(limitedLane("empty_match"))
+      .mockResolvedValueOnce(limitedLane("empty_match"))
+      .mockResolvedValueOnce(factualLane());
 
     const result = await runAssistantAddressLaneRuntime({
-      userMessage: "сырой вопрос",
-      addressInputMessage: "нормализованный вопрос",
+      userMessage: "raw question",
+      addressInputMessage: "normalized question",
       carryover,
       shouldPreferContextualLane: false,
       canRetryWithRawUserMessage: true,
@@ -70,7 +70,7 @@ describe("assistant address lane runtime adapter", () => {
     });
 
     expect(result.handled).toBe(true);
-    expect(result.selection?.messageUsed).toBe("сырой вопрос");
+    expect(result.selection?.messageUsed).toBe("raw question");
     expect(result.selection?.carryMeta).toBe(carryover);
     expect(result.retryAudit.attempted).toBe(true);
     expect(result.retryAudit.reason).toBe("limited_result_retry_with_raw_message");
@@ -83,12 +83,12 @@ describe("assistant address lane runtime adapter", () => {
   it("returns pending limited result when retry is disabled", async () => {
     const runAddressLaneAttempt = vi
       .fn()
-      .mockResolvedValueOnce(limitedLane("missing_anchor")) // primary
-      .mockResolvedValueOnce(unhandledLane()); // contextual fallback
+      .mockResolvedValueOnce(limitedLane("missing_anchor"))
+      .mockResolvedValueOnce(unhandledLane());
 
     const result = await runAssistantAddressLaneRuntime({
-      userMessage: "сырой вопрос",
-      addressInputMessage: "нормализованный вопрос",
+      userMessage: "raw question",
+      addressInputMessage: "normalized question",
       carryover: { followupContext: { scope: "ctx" } },
       shouldPreferContextualLane: false,
       canRetryWithRawUserMessage: false,
@@ -97,9 +97,8 @@ describe("assistant address lane runtime adapter", () => {
     });
 
     expect(result.handled).toBe(true);
-    expect(result.selection?.messageUsed).toBe("нормализованный вопрос");
+    expect(result.selection?.messageUsed).toBe("normalized question");
     expect(result.selection?.addressLane.debug?.limited_reason_category).toBe("missing_anchor");
     expect(result.retryAudit.attempted).toBe(false);
   });
 });
-

llm_normalizer/backend/tests/assistantAddressOrchestrationRuntimeAdapter.test.ts

@@ -178,6 +178,80 @@ describe("assistant address orchestration runtime adapter", () => {
     );
   });
 
+  it("prefers raw inventory temporal root follow-up over account-balance canonical drift", async () => {
+    const resolveAddressFollowupCarryoverContext = vi.fn(() => ({
+      followupContext: {
+        previous_intent: "inventory_purchase_provenance_for_item",
+        previous_filters: {
+          item: "Четки Пост (84*117)",
+          organization: "ООО \\Альтернатива Плюс\\"
+        },
+        previous_anchor_type: "item",
+        previous_anchor_value: "Четки Пост (84*117)",
+        root_intent: "inventory_on_hand_as_of_date",
+        root_filters: {
+          as_of_date: "2020-03-31",
+          period_from: "2020-03-01",
+          period_to: "2020-03-31",
+          organization: "ООО \\Альтернатива Плюс\\"
+        },
+        current_frame_kind: "inventory_drilldown"
+      }
+    }));
+    const resolveAssistantOrchestrationDecision = vi.fn(() => ({
+      runAddressLane: true,
+      livingMode: "address_data",
+      livingReason: "address_lane_triggered",
+      toolGateDecision: "run_address_lane",
+      toolGateReason: "followup_context_detected",
+      orchestrationContract: { schema_version: "assistant_orchestration_contract_v1" }
+    }));
+    const buildAddressLlmPredecomposeContractV1 = vi.fn(
+      ({ sourceMessage, canonicalMessage }: { sourceMessage: string; canonicalMessage: string }) => ({
+        schema_version: "address_llm_predecompose_contract_v1",
+        source_message: sourceMessage,
+        canonical_message: canonicalMessage,
+        mode: "address_query",
+        intent: canonicalMessage === sourceMessage ? "inventory_on_hand_as_of_date" : "account_balance_snapshot"
+      })
+    );
+    const rawMessage = "остатки на июль 2019";
+
+    const output = await buildAssistantAddressOrchestrationRuntime(
+      buildInput({
+        userMessage: rawMessage,
+        runAddressLlmPreDecompose: vi.fn(async () => ({
+          attempted: true,
+          applied: true,
+          effectiveMessage: "проверить остатки по счетам на июль 2019 года",
+          reason: "normalized_fragment_applied",
+          predecomposeContract: {
+            mode: "address_query",
+            intent: "account_balance_snapshot"
+          }
+        })),
+        buildAddressLlmPredecomposeContractV1,
+        resolveAddressFollowupCarryoverContext,
+        resolveAssistantOrchestrationDecision
+      })
+    );
+
+    expect(output.addressInputMessage).toBe(rawMessage);
+    expect(output.addressPreDecompose.applied).toBe(false);
+    expect(output.addressPreDecompose.reason).toBe("followup_raw_message_preferred_over_llm_rewrite");
+    expect(buildAddressLlmPredecomposeContractV1).toHaveBeenCalledWith({
+      sourceMessage: rawMessage,
+      canonicalMessage: rawMessage
+    });
+    expect(resolveAddressFollowupCarryoverContext).toHaveBeenCalledTimes(2);
+    expect(resolveAssistantOrchestrationDecision).toHaveBeenCalledWith(
+      expect.objectContaining({
+        rawUserMessage: rawMessage,
+        effectiveAddressUserMessage: rawMessage
+      })
+    );
+  });
+
   it("prefers raw selected-object inventory action over generic canonical drift intent", async () => {
     const resolveAddressFollowupCarryoverContext = vi.fn(() => ({
       followupContext: {
@@ -441,4 +515,56 @@ describe("assistant address orchestration runtime adapter", () => {
       })
     );
   });
+
+  it("prefers raw same-date follow-up over canonical rewrite to current date", async () => {
+    const resolveAddressFollowupCarryoverContext = vi.fn(() => ({
+      followupContext: {
+        previous_intent: "vat_payable_confirmed_as_of_date",
+        previous_filters: {
+          as_of_date: "2019-09-30",
+          period_from: "2019-09-01",
+          period_to: "2019-09-30"
+        }
+      }
+    }));
+    const resolveAssistantOrchestrationDecision = vi.fn(() => ({
+      runAddressLane: true,
+      livingMode: "address_data",
+      livingReason: "address_lane_triggered",
+      toolGateDecision: "run_address_lane",
+      toolGateReason: "followup_context_detected",
+      orchestrationContract: { schema_version: "assistant_orchestration_contract_v1" }
+    }));
+
+    const rawMessage = "какие остатки по складу на эту же дату";
+
+    const output = await buildAssistantAddressOrchestrationRuntime(
+      buildInput({
+        userMessage: rawMessage,
+        runAddressLlmPreDecompose: vi.fn(async () => ({
+          attempted: true,
+          applied: true,
+          effectiveMessage: "получить остатки по складу на текущую дату",
+          reason: "normalized_fragment_applied",
+          predecomposeContract: {
+            mode: "address_query",
+            intent: "inventory_on_hand_as_of_date"
+          }
+        })),
+        resolveAddressFollowupCarryoverContext,
+        resolveAssistantOrchestrationDecision
+      })
+    );
+
+    expect(output.addressInputMessage).toBe(rawMessage);
+    expect(output.addressPreDecompose.applied).toBe(false);
+    expect(output.addressPreDecompose.reason).toBe("followup_raw_message_preferred_over_llm_rewrite");
+    expect(resolveAddressFollowupCarryoverContext).toHaveBeenCalledTimes(2);
+    expect(resolveAssistantOrchestrationDecision).toHaveBeenCalledWith(
+      expect.objectContaining({
+        rawUserMessage: rawMessage,
+        effectiveAddressUserMessage: rawMessage
+      })
+    );
+  });
 });