ARCH: ввести resumable discovery loop state для clarification follow-up
This commit is contained in:
@@ -9,6 +9,7 @@ import {
|
||||
} from "./assistantMcpDiscoveryPilotExecutor";
|
||||
import {
|
||||
planAssistantMcpDiscovery,
|
||||
type AssistantMcpDiscoveryChainId,
|
||||
type AssistantMcpDiscoveryMetadataSurfaceRef,
|
||||
type AssistantMcpDiscoveryPlannerContract
|
||||
} from "./assistantMcpDiscoveryPlanner";
|
||||
@@ -17,6 +18,8 @@ import type { AssistantMcpDiscoveryTurnMeaningRef } from "./assistantMcpDiscover
|
||||
|
||||
export const ASSISTANT_MCP_DISCOVERY_RUNTIME_BRIDGE_SCHEMA_VERSION =
|
||||
"assistant_mcp_discovery_runtime_bridge_v1" as const;
|
||||
export const ASSISTANT_MCP_DISCOVERY_LOOP_STATE_SCHEMA_VERSION =
|
||||
"assistant_mcp_discovery_loop_state_v1" as const;
|
||||
|
||||
export type AssistantMcpDiscoveryRuntimeBridgeStatus =
|
||||
| "answer_draft_ready"
|
||||
@@ -24,6 +27,10 @@ export type AssistantMcpDiscoveryRuntimeBridgeStatus =
|
||||
| "needs_clarification"
|
||||
| "blocked"
|
||||
| "unsupported";
|
||||
export type AssistantMcpDiscoveryLoopStatus =
|
||||
| "awaiting_clarification"
|
||||
| "ready_for_next_hop"
|
||||
| "blocked";
|
||||
|
||||
export interface AssistantMcpDiscoveryRuntimeBridgeInput {
|
||||
semanticDataNeed?: string | null;
|
||||
@@ -33,6 +40,23 @@ export interface AssistantMcpDiscoveryRuntimeBridgeInput {
|
||||
deps?: AssistantMcpDiscoveryPilotExecutorDeps;
|
||||
}
|
||||
|
||||
export interface AssistantMcpDiscoveryLoopStateContract {
|
||||
schema_version: typeof ASSISTANT_MCP_DISCOVERY_LOOP_STATE_SCHEMA_VERSION;
|
||||
policy_owner: "assistantMcpDiscoveryRuntimeBridge";
|
||||
loop_status: AssistantMcpDiscoveryLoopStatus;
|
||||
selected_chain_id: AssistantMcpDiscoveryChainId;
|
||||
pilot_scope: AssistantMcpDiscoveryPilotExecutionContract["pilot_scope"];
|
||||
asked_domain_family: string | null;
|
||||
asked_action_family: string | null;
|
||||
unsupported_but_understood_family: string | null;
|
||||
ranking_need: string | null;
|
||||
pending_axes: string[];
|
||||
provided_axes: string[];
|
||||
explicit_entity_candidates: string[];
|
||||
explicit_organization_scope: string | null;
|
||||
explicit_date_scope: string | null;
|
||||
}
|
||||
|
||||
export interface AssistantMcpDiscoveryRuntimeBridgeContract {
|
||||
schema_version: typeof ASSISTANT_MCP_DISCOVERY_RUNTIME_BRIDGE_SCHEMA_VERSION;
|
||||
policy_owner: "assistantMcpDiscoveryRuntimeBridge";
|
||||
@@ -41,6 +65,7 @@ export interface AssistantMcpDiscoveryRuntimeBridgeContract {
|
||||
planner: AssistantMcpDiscoveryPlannerContract;
|
||||
pilot: AssistantMcpDiscoveryPilotExecutionContract;
|
||||
answer_draft: AssistantMcpDiscoveryAnswerDraftContract;
|
||||
loop_state: AssistantMcpDiscoveryLoopStateContract;
|
||||
user_facing_response_allowed: boolean;
|
||||
business_fact_answer_allowed: boolean;
|
||||
requires_user_clarification: boolean;
|
||||
@@ -97,6 +122,72 @@ function businessFactAnswerAllowed(draft: AssistantMcpDiscoveryAnswerDraftContra
|
||||
return draft.answer_mode === "confirmed_with_bounded_inference" || draft.answer_mode === "bounded_inference_only";
|
||||
}
|
||||
|
||||
function loopStatusFor(
|
||||
bridgeStatus: AssistantMcpDiscoveryRuntimeBridgeStatus
|
||||
): AssistantMcpDiscoveryLoopStatus {
|
||||
if (bridgeStatus === "needs_clarification") {
|
||||
return "awaiting_clarification";
|
||||
}
|
||||
if (bridgeStatus === "blocked" || bridgeStatus === "unsupported") {
|
||||
return "blocked";
|
||||
}
|
||||
return "ready_for_next_hop";
|
||||
}
|
||||
|
||||
function flattenAxes(
|
||||
pilot: AssistantMcpDiscoveryPilotExecutionContract,
|
||||
source: "provided_axes" | "missing_axis_options"
|
||||
): string[] {
|
||||
const result: string[] = [];
|
||||
for (const step of pilot.dry_run.execution_steps) {
|
||||
if (source === "provided_axes") {
|
||||
for (const axis of step.provided_axes) {
|
||||
if (axis && !result.includes(axis)) {
|
||||
result.push(axis);
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
for (const option of step.missing_axis_options) {
|
||||
for (const axis of option) {
|
||||
if (axis && !result.includes(axis)) {
|
||||
result.push(axis);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
function entityCandidatesFromPlanner(planner: AssistantMcpDiscoveryPlannerContract): string[] {
|
||||
const values = planner.discovery_plan.turn_meaning_ref?.explicit_entity_candidates ?? [];
|
||||
return uniqueStrings(values);
|
||||
}
|
||||
|
||||
function buildLoopState(
|
||||
planner: AssistantMcpDiscoveryPlannerContract,
|
||||
pilot: AssistantMcpDiscoveryPilotExecutionContract,
|
||||
bridgeStatus: AssistantMcpDiscoveryRuntimeBridgeStatus
|
||||
): AssistantMcpDiscoveryLoopStateContract {
|
||||
return {
|
||||
schema_version: ASSISTANT_MCP_DISCOVERY_LOOP_STATE_SCHEMA_VERSION,
|
||||
policy_owner: "assistantMcpDiscoveryRuntimeBridge",
|
||||
loop_status: loopStatusFor(bridgeStatus),
|
||||
selected_chain_id: planner.selected_chain_id,
|
||||
pilot_scope: pilot.pilot_scope,
|
||||
asked_domain_family: planner.discovery_plan.turn_meaning_ref?.asked_domain_family ?? null,
|
||||
asked_action_family: planner.discovery_plan.turn_meaning_ref?.asked_action_family ?? null,
|
||||
unsupported_but_understood_family:
|
||||
planner.discovery_plan.turn_meaning_ref?.unsupported_but_understood_family ?? null,
|
||||
ranking_need: planner.data_need_graph?.ranking_need ?? planner.discovery_plan.turn_meaning_ref?.seeded_ranking_need ?? null,
|
||||
pending_axes: flattenAxes(pilot, "missing_axis_options"),
|
||||
provided_axes: flattenAxes(pilot, "provided_axes"),
|
||||
explicit_entity_candidates: entityCandidatesFromPlanner(planner),
|
||||
explicit_organization_scope: planner.discovery_plan.turn_meaning_ref?.explicit_organization_scope ?? null,
|
||||
explicit_date_scope: planner.discovery_plan.turn_meaning_ref?.explicit_date_scope ?? null
|
||||
};
|
||||
}
|
||||
|
||||
export async function runAssistantMcpDiscoveryRuntimeBridge(
|
||||
input: AssistantMcpDiscoveryRuntimeBridgeInput
|
||||
): Promise<AssistantMcpDiscoveryRuntimeBridgeContract> {
|
||||
@@ -109,10 +200,12 @@ export async function runAssistantMcpDiscoveryRuntimeBridge(
|
||||
const pilot = await executeAssistantMcpDiscoveryPilot(planner, input.deps);
|
||||
const answerDraft = buildAssistantMcpDiscoveryAnswerDraft(pilot);
|
||||
const bridgeStatus = bridgeStatusFor(pilot, answerDraft);
|
||||
const loopState = buildLoopState(planner, pilot, bridgeStatus);
|
||||
const reasonCodes = uniqueStrings([...planner.reason_codes, ...pilot.reason_codes, ...answerDraft.reason_codes]);
|
||||
|
||||
pushReason(reasonCodes, `runtime_bridge_status_${bridgeStatus}`);
|
||||
pushReason(reasonCodes, "runtime_bridge_not_wired_to_hot_assistant_answer");
|
||||
pushReason(reasonCodes, `runtime_bridge_loop_state_${loopState.loop_status}`);
|
||||
|
||||
return {
|
||||
schema_version: ASSISTANT_MCP_DISCOVERY_RUNTIME_BRIDGE_SCHEMA_VERSION,
|
||||
@@ -122,6 +215,7 @@ export async function runAssistantMcpDiscoveryRuntimeBridge(
|
||||
planner,
|
||||
pilot,
|
||||
answer_draft: answerDraft,
|
||||
loop_state: loopState,
|
||||
user_facing_response_allowed: bridgeStatus !== "blocked",
|
||||
business_fact_answer_allowed: businessFactAnswerAllowed(answerDraft),
|
||||
requires_user_clarification: bridgeStatus === "needs_clarification",
|
||||
|
||||
Reference in New Issue
Block a user