ARCH: закрепить open-scope continuity для org clarification

2026-04-22 21:58:01 +03:00
parent 94e537210c
commit 8a0a4f0922
19 changed files with 981 additions and 29 deletions
@@ -137,4 +137,27 @@ describe("assistant MCP discovery data need graph", () => {
    ]);
    expect(result.reason_codes).toContain("data_need_graph_open_scope_total_without_subject");
  });
+  it("treats a generic incoming total as an understood open-scope ask that still needs organization", () => {
+    const result = buildAssistantMcpDiscoveryDataNeedGraph({
+      semanticDataNeed: "counterparty value-flow evidence",
+      rawUtterance: "сколько входящих денег за 2020 год?",
+      turnMeaning: {
+        asked_domain_family: "counterparty_value",
+        asked_action_family: "turnover",
+        explicit_date_scope: "2020"
+      }
+    });
+
+    expect(result.business_fact_family).toBe("value_flow");
+    expect(result.subject_candidates).toEqual([]);
+    expect(result.clarification_gaps).toEqual(["organization"]);
+    expect(result.proof_expectation).toBe("clarification_required");
+    expect(result.decomposition_candidates).toEqual([
+      "collect_scoped_movements",
+      "aggregate_checked_amounts",
+      "probe_coverage"
+    ]);
+    expect(result.reason_codes).toContain("data_need_graph_open_scope_total_without_subject");
+    expect(result.reason_codes).toContain("data_need_graph_open_scope_total_needs_organization");
+  });
 });
@@ -474,4 +474,42 @@ describe("assistant MCP discovery planner", () => {
    expect(result.catalog_review.review_status).toBe("catalog_compatible");
    expect(result.reason_codes).toContain("planner_selected_open_scope_value_flow_total_from_data_need_graph");
  });
+  it("keeps generic one-sided open totals in organization clarification instead of forcing entity resolution", () => {
+    const result = planAssistantMcpDiscovery({
+      dataNeedGraph: {
+        schema_version: "assistant_data_need_graph_v1",
+        policy_owner: "assistantMcpDiscoveryDataNeedGraph",
+        subject_candidates: [],
+        business_fact_family: "value_flow",
+        action_family: "turnover",
+        aggregation_need: null,
+        time_scope_need: "explicit_period",
+        comparison_need: null,
+        ranking_need: null,
+        proof_expectation: "clarification_required",
+        clarification_gaps: ["organization"],
+        decomposition_candidates: ["collect_scoped_movements", "aggregate_checked_amounts", "probe_coverage"],
+        forbidden_overclaim_flags: ["no_raw_model_claims", "no_unchecked_fact_totals"],
+        reason_codes: [
+          "data_need_graph_built",
+          "data_need_graph_open_scope_total_without_subject",
+          "data_need_graph_open_scope_total_needs_organization"
+        ]
+      },
+      turnMeaning: {
+        asked_domain_family: "counterparty_value",
+        asked_action_family: "turnover",
+        explicit_date_scope: "2020"
+      }
+    });
+
+    expect(result.planner_status).toBe("needs_clarification");
+    expect(result.selected_chain_id).toBe("value_flow");
+    expect(result.proposed_primitives).toEqual(["query_movements", "aggregate_by_axis", "probe_coverage"]);
+    expect(result.required_axes).toEqual(["period", "organization", "aggregate_axis", "amount", "coverage_target"]);
+    expect(result.catalog_review.review_status).toBe("needs_more_axes");
+    expect(result.catalog_review.missing_axes_by_primitive.query_movements).toContainEqual(["organization"]);
+    expect(result.reason_codes).toContain("planner_selected_open_scope_value_flow_total_from_data_need_graph");
+    expect(result.selected_chain_id).not.toBe("entity_resolution");
+  });
 });
@@ -161,6 +161,52 @@ describe("assistant MCP discovery response policy", () => {
    expect(result.reason_codes).toContain("mcp_discovery_response_policy_keep_aligned_factual_address_reply");
  });

+  it("does not treat an open-scope value-flow total as aligned with exact top-counterparty carryover", () => {
+    const result = applyAssistantMcpDiscoveryResponsePolicy({
+      currentReply: "\u0421\u0430\u043c\u044b\u0439 \u0434\u043e\u0445\u043e\u0434\u043d\u044b\u0439 \u043a\u043b\u0438\u0435\u043d\u0442: \u0413\u0440\u0443\u043f\u043f\u0430 \u0421\u0412\u041a.",
+      currentReplySource: "address_query_runtime_v1",
+      currentReplyType: "factual",
+      addressRuntimeMeta: {
+        detected_intent: "customer_revenue_and_payments",
+        dialogContinuationContract: {
+          target_intent: "customer_revenue_and_payments"
+        },
+        truth_gate_contract_status: "full_confirmed",
+        assistant_truth_answer_policy_v1: {
+          truth_gate: {
+            coverage_status: "full",
+            grounding_status: "grounded",
+            source_truth_gate_status: "full_confirmed"
+          }
+        },
+        assistant_mcp_discovery_entry_point_v1: entryPoint({
+          turn_input: {
+            adapter_status: "ready",
+            should_run_discovery: true,
+            data_need_graph: {
+              business_fact_family: "value_flow",
+              subject_candidates: [],
+              reason_codes: ["data_need_graph_open_scope_total_without_subject"]
+            },
+            turn_meaning_ref: {
+              asked_domain_family: "counterparty_value",
+              asked_action_family: "turnover",
+              explicit_organization_scope: "\u041e\u041e\u041e \u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0430 \u041f\u043b\u044e\u0441",
+              explicit_date_scope: "2020"
+            }
+          }
+        })
+      }
+    });
+
+    expect(result.applied).toBe(true);
+    expect(result.decision).toBe("apply_candidate");
+    expect(result.reason_codes).toContain("mcp_discovery_response_policy_semantic_conflict_allows_candidate_override");
+    expect(result.reason_codes).not.toContain("mcp_discovery_response_policy_keep_aligned_factual_address_reply");
+    expect(result.reason_codes).not.toContain("mcp_discovery_response_policy_keep_factual_address_continuation_target");
+    expect(result.reason_codes).not.toContain("mcp_discovery_response_policy_keep_full_confirmed_factual_address_reply");
+  });
+
  it("keeps factual address follow-up replies when they already match the continuation target intent", () => {
    const result = applyAssistantMcpDiscoveryResponsePolicy({
      currentReply: "ИП Калинин Н.М. | сумма: 216600 | операций: 2",
@@ -316,4 +316,42 @@ describe("assistant MCP discovery runtime bridge", () => {
    expect(result.answer_draft.confirmed_lines.join("\n")).toContain("5 000");
    expect(result.answer_draft.confirmed_lines.join("\n")).not.toContain("контрагенту");
  });
+  it("keeps generic one-sided open totals in organization clarification without asking for a counterparty", async () => {
+    const result = await runAssistantMcpDiscoveryRuntimeBridge({
+      dataNeedGraph: {
+        schema_version: "assistant_data_need_graph_v1",
+        policy_owner: "assistantMcpDiscoveryDataNeedGraph",
+        subject_candidates: [],
+        business_fact_family: "value_flow",
+        action_family: "turnover",
+        aggregation_need: null,
+        time_scope_need: "explicit_period",
+        comparison_need: null,
+        ranking_need: null,
+        proof_expectation: "clarification_required",
+        clarification_gaps: ["organization"],
+        decomposition_candidates: ["collect_scoped_movements", "aggregate_checked_amounts", "probe_coverage"],
+        forbidden_overclaim_flags: ["no_raw_model_claims", "no_unchecked_fact_totals"],
+        reason_codes: [
+          "data_need_graph_built",
+          "data_need_graph_open_scope_total_without_subject",
+          "data_need_graph_open_scope_total_needs_organization"
+        ]
+      },
+      turnMeaning: {
+        asked_domain_family: "counterparty_value",
+        asked_action_family: "turnover",
+        explicit_date_scope: "2020"
+      },
+      deps: buildDeps([])
+    });
+
+    expect(result.bridge_status).toBe("needs_clarification");
+    expect(result.requires_user_clarification).toBe(true);
+    expect(result.planner.selected_chain_id).toBe("value_flow");
+    expect(result.answer_draft.next_step_line).toContain("\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044e");
+    expect(result.answer_draft.next_step_line).not.toContain(
+      "\u043a\u043e\u043d\u0442\u0440\u0430\u0433\u0435\u043d\u0442\u0430"
+    );
+  });
 });
@@ -408,4 +408,104 @@ describe("assistant MCP discovery runtime entry point", () => {
    expect(result.bridge?.pilot.pilot_scope).toBe("counterparty_supplier_payout_query_movements_v1");
    expect(result.bridge?.answer_draft.confirmed_lines.join("\n")).toContain("исход");
  });
+  it("keeps a generic incoming total in organization clarification instead of asking for counterparty", async () => {
+    const result = await runAssistantMcpDiscoveryRuntimeEntryPoint({
+      userMessage: "сколько входящих денег за 2020 год?",
+      deps: buildDeps([])
+    });
+
+    expect(result.entry_status).toBe("bridge_executed");
+    expect(result.discovery_attempted).toBe(true);
+    expect(result.turn_input.turn_meaning_ref).toMatchObject({
+      asked_domain_family: "counterparty_value",
+      asked_action_family: "turnover",
+      explicit_date_scope: "2020"
+    });
+    expect(result.turn_input.turn_meaning_ref?.explicit_entity_candidates).toBeUndefined();
+    expect(result.turn_input.data_need_graph?.clarification_gaps).toEqual(["organization"]);
+    expect(result.bridge?.planner.selected_chain_id).toBe("value_flow");
+    expect(result.bridge?.bridge_status).toBe("needs_clarification");
+    expect(result.bridge?.answer_draft.next_step_line).toContain("\u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044e");
+    expect(result.bridge?.answer_draft.next_step_line).not.toContain(
+      "\u043a\u043e\u043d\u0442\u0440\u0430\u0433\u0435\u043d\u0442\u0430"
+    );
+  });
+
+  it("resumes a generic incoming total after organization clarification without reintroducing a counterparty", async () => {
+    const orgName = "ООО Альтернатива Плюс";
+    const result = await runAssistantMcpDiscoveryRuntimeEntryPoint({
+      userMessage: "по ООО Альтернатива Плюс",
+      predecomposeContract: {
+        entities: { organization: orgName }
+      },
+      followupContext: {
+        previous_discovery_pilot_scope: "counterparty_value_flow_query_movements_v1",
+        previous_filters: {
+          period_from: "2020-01-01",
+          period_to: "2020-12-31"
+        }
+      },
+      deps: buildDeps([
+        { Period: "2020-01-15T00:00:00", Amount: 2500, Counterparty: "Клиент-А" },
+        { Period: "2020-06-20T00:00:00", Amount: 1000, Counterparty: "Клиент-Б" }
+      ])
+    });
+
+    expect(result.entry_status).toBe("bridge_executed");
+    expect(result.discovery_attempted).toBe(true);
+    expect(result.turn_input.source_signal).toBe("followup_context");
+    expect(result.turn_input.turn_meaning_ref).toMatchObject({
+      asked_domain_family: "counterparty_value",
+      asked_action_family: "turnover",
+      explicit_organization_scope: orgName,
+      explicit_date_scope: "2020"
+    });
+    expect(result.turn_input.turn_meaning_ref?.explicit_entity_candidates).toBeUndefined();
+    expect(result.bridge?.planner.selected_chain_id).toBe("value_flow");
+    expect(result.bridge?.pilot.pilot_scope).toBe("counterparty_value_flow_query_movements_v1");
+    expect(result.bridge?.pilot.derived_value_flow).toMatchObject({
+      counterparty: null,
+      period_scope: "2020",
+      total_amount: 3500
+    });
+  });
+  it("overrides a supported exact intent when organization-only follow-up resolves an open-scope total", async () => {
+    const orgName = "\u041e\u041e\u041e \u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0430 \u041f\u043b\u044e\u0441";
+    const result = await runAssistantMcpDiscoveryRuntimeEntryPoint({
+      userMessage: "\u043f\u043e \u041e\u041e\u041e \u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0430 \u041f\u043b\u044e\u0441",
+      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: {
+          period_from: "2020-01-01",
+          period_to: "2020-12-31"
+        }
+      },
+      deps: buildDeps([
+        { Period: "2020-01-15T00:00:00", Amount: 2500, Counterparty: "\u041a\u043b\u0438\u0435\u043d\u0442-\u0410" },
+        { Period: "2020-06-20T00:00:00", Amount: 1000, Counterparty: "\u041a\u043b\u0438\u0435\u043d\u0442-\u0411" }
+      ])
+    });
+
+    expect(result.entry_status).toBe("bridge_executed");
+    expect(result.discovery_attempted).toBe(true);
+    expect(result.turn_input.turn_meaning_ref).toMatchObject({
+      asked_domain_family: "counterparty_value",
+      asked_action_family: "turnover",
+      explicit_organization_scope: orgName,
+      explicit_date_scope: "2020"
+    });
+    expect(result.turn_input.turn_meaning_ref?.explicit_entity_candidates).toBeUndefined();
+    expect(result.bridge?.planner.selected_chain_id).toBe("value_flow");
+    expect(result.bridge?.pilot.pilot_scope).toBe("counterparty_value_flow_query_movements_v1");
+    expect(result.bridge?.pilot.derived_value_flow).toMatchObject({
+      counterparty: null,
+      period_scope: "2020",
+      total_amount: 3500
+    });
+  });
 });
@@ -1422,4 +1422,93 @@ describe("assistant MCP discovery turn input adapter", () => {
    expect(result.turn_meaning_ref?.explicit_entity_candidates).toBeUndefined();
    expect(result.data_need_graph?.subject_candidates).toEqual([]);
  });
+  it("treats a generic incoming total as an open-scope value ask that needs organization rather than a counterparty", () => {
+    const result = buildAssistantMcpDiscoveryTurnInput({
+      userMessage: "сколько входящих денег за 2020 год?"
+    });
+
+    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: "turnover",
+      explicit_date_scope: "2020",
+      unsupported_but_understood_family: "counterparty_value_or_turnover",
+      stale_replay_forbidden: true
+    });
+    expect(result.turn_meaning_ref?.explicit_entity_candidates).toBeUndefined();
+    expect(result.data_need_graph?.subject_candidates).toEqual([]);
+    expect(result.data_need_graph?.clarification_gaps).toEqual(["organization"]);
+    expect(result.data_need_graph?.reason_codes).toContain("data_need_graph_open_scope_total_without_subject");
+    expect(result.data_need_graph?.reason_codes).toContain("data_need_graph_open_scope_total_needs_organization");
+  });
+
+  it("resumes an open-scope incoming total from follow-up context when the user clarifies only the organization", () => {
+    const orgName = "ООО Альтернатива Плюс";
+    const result = buildAssistantMcpDiscoveryTurnInput({
+      userMessage: "по ООО Альтернатива Плюс",
+      predecomposeContract: {
+        entities: { organization: orgName }
+      },
+      followupContext: {
+        previous_discovery_pilot_scope: "counterparty_value_flow_query_movements_v1",
+        previous_filters: {
+          period_from: "2020-01-01",
+          period_to: "2020-12-31"
+        }
+      }
+    });
+
+    expect(result.adapter_status).toBe("ready");
+    expect(result.should_run_discovery).toBe(true);
+    expect(result.source_signal).toBe("followup_context");
+    expect(result.semantic_data_need).toBe("counterparty value-flow evidence");
+    expect(result.turn_meaning_ref).toMatchObject({
+      asked_domain_family: "counterparty_value",
+      asked_action_family: "turnover",
+      explicit_organization_scope: orgName,
+      explicit_date_scope: "2020",
+      unsupported_but_understood_family: "counterparty_value_or_turnover",
+      stale_replay_forbidden: true
+    });
+    expect(result.turn_meaning_ref?.explicit_entity_candidates).toBeUndefined();
+    expect(result.reason_codes).toContain("mcp_discovery_seeded_from_followup_context");
+    expect(result.data_need_graph?.clarification_gaps).toEqual([]);
+  });
+  it("forces discovery over a supported exact intent when organization-only follow-up resolves an open-scope total", () => {
+    const orgName = "\u041e\u041e\u041e \u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0430 \u041f\u043b\u044e\u0441";
+    const result = buildAssistantMcpDiscoveryTurnInput({
+      userMessage: "\u043f\u043e \u041e\u041e\u041e \u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0430 \u041f\u043b\u044e\u0441",
+      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: {
+          period_from: "2020-01-01",
+          period_to: "2020-12-31"
+        }
+      }
+    });
+
+    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: "turnover",
+      explicit_organization_scope: orgName,
+      explicit_date_scope: "2020",
+      unsupported_but_understood_family: "counterparty_value_or_turnover",
+      stale_replay_forbidden: true
+    });
+    expect(result.turn_meaning_ref?.explicit_entity_candidates).toBeUndefined();
+    expect(result.reason_codes).toContain(
+      "mcp_discovery_organization_clarification_followup_from_followup_context"
+    );
+    expect(result.reason_codes).not.toContain("mcp_discovery_not_applicable_for_supported_exact_turn");
+  });
 });