ARCH: замкнуть grounded entity retarget на value-flow follow-up

llm_normalizer/backend/tests/assistantMcpDiscoveryTurnInputAdapter.test.ts

@@ -348,6 +348,80 @@ describe("assistant MCP discovery turn input adapter", () => {
     expect(result.reason_codes).not.toContain("mcp_discovery_not_applicable_for_supported_exact_turn");
   });
 
+  it("overrides a supported exact payout intent when a grounded value-flow follow-up switches from incoming to outgoing", () => {
+    const result = buildAssistantMcpDiscoveryTurnInput({
+      userMessage: "а теперь сколько заплатили?",
+      assistantTurnMeaning: {
+        asked_domain_family: "counterparty",
+        asked_action_family: "turnover",
+        explicit_intent_candidate: "customer_revenue_and_payments"
+      },
+      followupContext: {
+        previous_discovery_pilot_scope: "counterparty_value_flow_query_movements_v1",
+        previous_filters: {
+          counterparty: "Группа СВК",
+          organization: "ООО Альтернатива Плюс",
+          period_from: "2020-01-01",
+          period_to: "2020-12-31"
+        },
+        previous_anchor_type: "counterparty",
+        previous_anchor_value: "Группа СВК"
+      }
+    });
+
+    expect(result.adapter_status).toBe("ready");
+    expect(result.should_run_discovery).toBe(true);
+    expect(result.semantic_data_need).toBe("counterparty value-flow evidence");
+    expect(result.turn_meaning_ref).toMatchObject({
+      asked_domain_family: "counterparty_value",
+      asked_action_family: "payout",
+      explicit_entity_candidates: ["Группа СВК"],
+      explicit_organization_scope: "ООО Альтернатива Плюс",
+      explicit_date_scope: "2020",
+      unsupported_but_understood_family: "counterparty_payouts_or_outflow",
+      stale_replay_forbidden: true
+    });
+    expect(result.reason_codes).toContain("mcp_discovery_grounded_value_flow_followup");
+    expect(result.reason_codes).toContain("mcp_discovery_payout_signal_detected");
+    expect(result.reason_codes).not.toContain("mcp_discovery_not_applicable_for_supported_exact_turn");
+  });
+
+  it("overrides a supported exact net intent when a grounded payout follow-up switches into net flow", () => {
+    const result = buildAssistantMcpDiscoveryTurnInput({
+      userMessage: "а какое нетто?",
+      assistantTurnMeaning: {
+        asked_domain_family: "counterparty",
+        asked_action_family: "turnover",
+        explicit_intent_candidate: "customer_revenue_and_payments"
+      },
+      followupContext: {
+        previous_discovery_pilot_scope: "counterparty_supplier_payout_query_movements_v1",
+        previous_filters: {
+          counterparty: "Группа СВК",
+          period_from: "2021-01-01",
+          period_to: "2021-12-31"
+        },
+        previous_anchor_type: "counterparty",
+        previous_anchor_value: "Группа СВК"
+      }
+    });
+
+    expect(result.adapter_status).toBe("ready");
+    expect(result.should_run_discovery).toBe(true);
+    expect(result.semantic_data_need).toBe("counterparty value-flow evidence");
+    expect(result.turn_meaning_ref).toMatchObject({
+      asked_domain_family: "counterparty_value",
+      asked_action_family: "net_value_flow",
+      explicit_entity_candidates: ["Группа СВК"],
+      explicit_date_scope: "2021",
+      unsupported_but_understood_family: "counterparty_bidirectional_value_flow_or_netting",
+      stale_replay_forbidden: true
+    });
+    expect(result.reason_codes).toContain("mcp_discovery_grounded_value_flow_followup");
+    expect(result.reason_codes).toContain("mcp_discovery_bidirectional_value_flow_signal_detected");
+    expect(result.reason_codes).not.toContain("mcp_discovery_not_applicable_for_supported_exact_turn");
+  });
+
   it("seeds short monthly follow-up from prior bidirectional discovery context", () => {
     const result = buildAssistantMcpDiscoveryTurnInput({
       userMessage: "а по месяцам?",

llm_normalizer/backend/tests/assistantTransitionPolicy.test.ts

@@ -796,6 +796,7 @@ describe("assistantTransitionPolicy", () => {
 
   it("retargets selected-object provenance follow-up from inventory root when semantic scope is already detected", () => {
     const policy = buildPolicy({
+      hasAddressFollowupContextSignal: () => true,
       findLastAddressAssistantItem: () => ({
         text: "На 31.03.2016 на складе подтверждено 2 позиции.",
         debug: {
@@ -810,8 +811,7 @@ describe("assistantTransitionPolicy", () => {
           anchor_type: "organization",
           anchor_value_resolved: 'ООО "Альтернатива Плюс"'
         }
-      }),
-      hasAddressFollowupContextSignal: () => true
+      })
     });
 
     const carryover = policy.resolveAddressFollowupCarryoverContext(
@@ -1173,6 +1173,48 @@ describe("assistantTransitionPolicy", () => {
     });
   });
 
+  it("keeps exact payout carryover for a short net follow-up without restating counterparty or year", () => {
+    const policy = buildPolicy({
+      findLastAddressAssistantItem: () => ({
+        role: "assistant",
+        text: "Платежи по Группа СВК за 2021",
+        debug: {
+          execution_lane: "address_query",
+          answer_grounding_check: { status: "grounded" },
+          detected_intent: "customer_revenue_and_payments",
+          selected_recipe: "address_customer_revenue_and_payments_v1",
+          extracted_filters: {
+            counterparty: "Группа СВК",
+            period_from: "2021-01-01",
+            period_to: "2021-12-31"
+          },
+          anchor_type: "counterparty",
+          anchor_value_resolved: "Группа СВК"
+        }
+      }),
+      hasAddressFollowupContextSignal: () => true
+    });
+
+    const carryover = policy.resolveAddressFollowupCarryoverContext(
+      "а какое нетто?",
+      [],
+      null,
+      null,
+      null
+    );
+
+    expect(carryover?.followupSelectionMode).toBe("carry_previous_intent");
+    expect(carryover?.followupContext?.previous_intent).toBe("customer_revenue_and_payments");
+    expect(carryover?.followupContext?.target_intent).toBe("customer_revenue_and_payments");
+    expect(carryover?.followupContext?.previous_anchor_type).toBe("counterparty");
+    expect(carryover?.followupContext?.previous_anchor_value).toBe("Группа СВК");
+    expect(carryover?.followupContext?.previous_filters).toMatchObject({
+      counterparty: "Группа СВК",
+      period_from: "2021-01-01",
+      period_to: "2021-12-31"
+    });
+  });
+
   it("carries grounded metadata downstream route hints into followup context", () => {
     const policy = buildPolicy({
       findLastAddressAssistantItem: () => null,