Закрепить Y9 selected-object agent loop

llm_normalizer/backend/src/services/addressFilterExtractor.ts

@@ -1912,7 +1912,7 @@ export function extractAddressFilters(userMessage: string, intent: AddressIntent
     }
   }
 
-  const allowGenericCounterpartyAnchor = !isInventoryTraceIntent(intent);
+  const allowGenericCounterpartyAnchor = !isInventoryTraceIntent(intent) && intent !== "inventory_on_hand_as_of_date";
   const knownFinancialCounterparty =
     allowGenericCounterpartyAnchor && shouldPreferKnownFinancialCounterpartyAnchor(intent)
       ? extractKnownFinancialCounterpartyAnchor(text)

llm_normalizer/backend/src/services/addressNavigationState.ts

@@ -442,7 +442,14 @@ function buildFocusObjectFromDebug(debug: Record<string, unknown>, resultSetId:
     }
   }
   const objectType = toAddressFocusObjectType(debug.anchor_type);
-  const canonicalType = objectType === "unknown" ? inferDisplayEntityType(toAddressIntent(debug.detected_intent)) : objectType;
+  const detectedIntent = toAddressIntent(debug.detected_intent);
+  if (detectedIntent === "inventory_on_hand_as_of_date") {
+    const organization = readAddressDebugOrganization(debug, toNonEmptyString);
+    if (organization) {
+      return buildFocusObject("organization", organization, resultSetId, createdAt);
+    }
+  }
+  const canonicalType = objectType === "unknown" ? inferDisplayEntityType(detectedIntent) : objectType;
   if (canonicalType === "item") {
     const item = readAddressDebugItem(debug, toNonEmptyString);
     return item ? buildFocusObject(canonicalType, item, resultSetId, createdAt) : null;

llm_normalizer/backend/src/services/addressQueryService.ts

@@ -2012,6 +2012,20 @@ function applyPreExecutionOrganizationScopeGrounding(input: {
     }
   }
 
+  if (
+    activeOrganization &&
+    sameNormalizedOrganizationScope(input.filters.organization ?? null, activeOrganization) &&
+    referentialOrganizationScopeDetected &&
+    typeof input.filters.counterparty !== "string"
+  ) {
+    if (!input.warnings.includes("counterparty_cleared_from_referential_organization_scope")) {
+      input.warnings.push("counterparty_cleared_from_referential_organization_scope");
+    }
+    if (!input.baseReasons.includes("counterparty_cleared_from_referential_organization_scope")) {
+      input.baseReasons.push("counterparty_cleared_from_referential_organization_scope");
+    }
+  }
+
   if (
     activeOrganization &&
     sameNormalizedOrganizationScope(input.filters.organization ?? null, activeOrganization) &&

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

@@ -4094,9 +4094,9 @@ function composeFactualReplyBody(
     const purchaseBasisLabel = vatPurchaseDateBasisLabel(options.purchaseDateBridge?.basis, hasMultiplePurchaseDates);
     const directVatLine = selectedPurchaseDate
       ? hasMultiplePurchaseDates
-        ? `Коротко: если брать ${purchaseBasisLabel} ${formatDateRu(selectedPurchaseDate)}, подтвержденный НДС к уплате за налоговый период${organizationScopeLabel} — ${formatConfirmedMoney(vatToPay)}.`
-        : `Коротко: по дате покупки ${formatDateRu(selectedPurchaseDate)} подтвержденный НДС к уплате за налоговый период${organizationScopeLabel} — ${formatConfirmedMoney(vatToPay)}.`
-      : `Коротко: подтвержденный НДС к уплате за налоговый период${organizationScopeLabel} — ${formatConfirmedMoney(vatToPay)}.`;
+        ? `Если брать ${purchaseBasisLabel} ${formatDateRu(selectedPurchaseDate)}, подтвержденный НДС к уплате за налоговый период${organizationScopeLabel} — ${formatConfirmedMoney(vatToPay)}.`
+        : `По дате покупки ${formatDateRu(selectedPurchaseDate)} подтвержденный НДС к уплате за налоговый период${organizationScopeLabel} — ${formatConfirmedMoney(vatToPay)}.`
+      : `Подтвержденный НДС к уплате за налоговый период${organizationScopeLabel} — ${formatConfirmedMoney(vatToPay)}.`;
 
     const lines = [
       directVatLine,

llm_normalizer/backend/src/services/assistantRoutePolicy.ts

@@ -584,6 +584,11 @@ export function createAssistantRoutePolicy(deps) {
           hasDataRetrievalRequestSignal(repairedRawUserMessage);
       const llmContractMode = toNonEmptyString(llmPreDecomposeMeta?.predecomposeContract?.mode);
       const llmFirstAddressCandidate = Boolean(llmContractMode === "address_query" && llmContractIntent && llmContractIntent !== "unknown");
+      const llmSupportedAddressQueryIntent = Boolean(
+          llmContractMode === "address_query" &&
+          llmContractIntent &&
+          ADDRESS_INTENTS_KEEP_ADDRESS_LANE.has(llmContractIntent)
+      );
       const llmFirstUnsupportedCandidate = Boolean(llmContractMode === "unsupported" &&
           (!llmContractIntent || llmContractIntent === "unknown"));
       const dangerOrCoercionSignal = hasDangerOrCoercionSignal(rawUserMessage) ||
@@ -924,6 +929,7 @@ export function createAssistantRoutePolicy(deps) {
           !capabilityMetaQuery &&
           !dangerOrCoercionSignal &&
           !effectiveGroundedValueFlowFollowupContextDetected &&
+          !llmSupportedAddressQueryIntent &&
           !organizationClarificationContinuationDetected);
       if (unsupportedCurrentTurnMeaningBoundary) {
           return {