ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.46: склейка всего address-потока в отдельный assistantAddressAttemptRuntimeAdapter, для того чтобы из handleMessage убрать три локальных closure целиком. Все три моста (lane, response, living chat) прокидываются и не ломают контракт.

2026-04-11 00:22:00 +03:00
parent 5790e25b68
commit 5f4e898c7c
11 changed files with 1269 additions and 143 deletions
@@ -0,0 +1,228 @@
+import {
+  runAssistantAddressRuntime,
+  type RunAssistantAddressRuntimeInput,
+  type RunAssistantAddressRuntimeOutput
+} from "./assistantAddressRuntimeAdapter";
+import {
+  runAssistantAddressLaneAttemptRuntime,
+  type RunAssistantAddressLaneAttemptRuntimeInput
+} from "./assistantAddressLaneAttemptRuntimeAdapter";
+import {
+  runAssistantAddressLaneResponseAttemptRuntime,
+  type RunAssistantAddressLaneResponseAttemptRuntimeInput
+} from "./assistantAddressLaneResponseAttemptRuntimeAdapter";
+import {
+  runAssistantLivingChatAttemptRuntime,
+  type RunAssistantLivingChatAttemptRuntimeInput
+} from "./assistantLivingChatAttemptRuntimeAdapter";
+
+interface AddressAttemptPayload {
+  llmProvider?: unknown;
+  useMock?: unknown;
+  context?: {
+    period_hint?: unknown;
+  } | null;
+  apiKey?: unknown;
+  model?: unknown;
+  baseUrl?: unknown;
+  temperature?: number;
+  maxOutputTokens?: number;
+}
+
+interface AddressSessionScope {
+  knownOrganizations: string[];
+  selectedOrganization: string | null;
+  activeOrganization: string | null;
+}
+
+export interface RunAssistantAddressAttemptRuntimeInput<ResponseType = unknown>
+  extends Omit<
+    RunAssistantAddressRuntimeInput<ResponseType>,
+    "llmProvider" | "useMock" | "payloadContextPeriodHint" | "runAddressLaneAttempt" | "finalizeAddressLaneResponse" | "tryHandleLivingChat"
+  > {
+  payload: AddressAttemptPayload;
+  sessionScope: AddressSessionScope;
+  mergeFollowupContextWithOrganizationScope: RunAssistantAddressLaneAttemptRuntimeInput["mergeFollowupContextWithOrganizationScope"];
+  runAddressQueryTryHandle: RunAssistantAddressLaneAttemptRuntimeInput["runAddressQueryTryHandle"];
+  mergeKnownOrganizations: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["mergeKnownOrganizations"];
+  hasAssistantDataScopeMetaQuestionSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasAssistantDataScopeMetaQuestionSignal"];
+  shouldHandleAsAssistantCapabilityMetaQuery: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["shouldHandleAsAssistantCapabilityMetaQuery"];
+  hasDestructiveDataActionSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasDestructiveDataActionSignal"];
+  hasDangerOrCoercionSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasDangerOrCoercionSignal"];
+  hasOperationalAdminActionRequestSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasOperationalAdminActionRequestSignal"];
+  hasOrganizationFactLookupSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasOrganizationFactLookupSignal"];
+  hasOrganizationFactFollowupSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasOrganizationFactFollowupSignal"];
+  shouldEmitOrganizationSelectionReply: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["shouldEmitOrganizationSelectionReply"];
+  hasAssistantCapabilityQuestionSignal: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["hasAssistantCapabilityQuestionSignal"];
+  resolveDataScopeProbe: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["resolveDataScopeProbe"];
+  applyScriptGuard: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["applyScriptGuard"];
+  applyGroundingGuard: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["applyGroundingGuard"];
+  buildAssistantSafetyRefusalReply: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["buildAssistantSafetyRefusalReply"];
+  buildAssistantDataScopeContractReply: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["buildAssistantDataScopeContractReply"];
+  buildAssistantOrganizationFactBoundaryReply: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["buildAssistantOrganizationFactBoundaryReply"];
+  buildAssistantDataScopeSelectionReply: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["buildAssistantDataScopeSelectionReply"];
+  buildAssistantOperationalBoundaryReply: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["buildAssistantOperationalBoundaryReply"];
+  buildAssistantCapabilityContractReply: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["buildAssistantCapabilityContractReply"];
+  chatClient: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["chatClient"];
+  loadAssistantCanonExcerpt: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["loadAssistantCanonExcerpt"];
+  sanitizeOutgoingAssistantText: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["sanitizeOutgoingAssistantText"];
+  defaultModel: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["defaultModel"];
+  defaultBaseUrl: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["defaultBaseUrl"];
+  defaultApiKey?: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>["defaultApiKey"];
+  buildAddressDebugPayload: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["buildAddressDebugPayload"];
+  buildAddressFollowupOffer: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["buildAddressFollowupOffer"];
+  appendItem: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["appendItem"];
+  getSession: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["getSession"];
+  persistSession: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["persistSession"];
+  cloneConversation: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["cloneConversation"];
+  logEvent: RunAssistantAddressRuntimeInput<ResponseType>["logEvent"];
+  messageIdFactory: NonNullable<
+    RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>["messageIdFactory"]
+  >;
+  runAddressRuntime?: (
+    input: RunAssistantAddressRuntimeInput<ResponseType>
+  ) => Promise<RunAssistantAddressRuntimeOutput<ResponseType>>;
+  runAddressLaneAttemptRuntime?: (
+    input: RunAssistantAddressLaneAttemptRuntimeInput
+  ) => Promise<Awaited<ReturnType<RunAssistantAddressLaneAttemptRuntimeInput["runAddressQueryTryHandle"]>>>;
+  runAddressLaneResponseAttemptRuntime?: (
+    input: RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>
+  ) => ResponseType;
+  runLivingChatAttemptRuntime?: (
+    input: RunAssistantLivingChatAttemptRuntimeInput<ResponseType>
+  ) => Promise<ResponseType | null>;
+}
+
+export async function runAssistantAddressAttemptRuntime<ResponseType = unknown>(
+  input: RunAssistantAddressAttemptRuntimeInput<ResponseType>
+): Promise<RunAssistantAddressRuntimeOutput<ResponseType>> {
+  const runAddressRuntimeSafe = input.runAddressRuntime ?? runAssistantAddressRuntime;
+  const runAddressLaneAttemptRuntimeSafe = input.runAddressLaneAttemptRuntime ?? runAssistantAddressLaneAttemptRuntime;
+  const runAddressLaneResponseAttemptRuntimeSafe =
+    input.runAddressLaneResponseAttemptRuntime ?? runAssistantAddressLaneResponseAttemptRuntime;
+  const runLivingChatAttemptRuntimeSafe =
+    input.runLivingChatAttemptRuntime ?? runAssistantLivingChatAttemptRuntime;
+
+  const finalizeAddressLaneResponse: RunAssistantAddressRuntimeInput<ResponseType>["finalizeAddressLaneResponse"] = (
+    addressLane,
+    effectiveAddressUserMessage,
+    carryoverMeta = null,
+    llmPreDecomposeMeta = null
+  ) =>
+    runAddressLaneResponseAttemptRuntimeSafe({
+      sessionId: input.sessionId,
+      userMessage: input.userMessage,
+      effectiveAddressUserMessage,
+      addressLane,
+      carryoverMeta,
+      llmPreDecomposeMeta,
+      knownOrganizations: input.sessionScope.knownOrganizations,
+      activeOrganization: input.sessionScope.activeOrganization,
+      sanitizeOutgoingAssistantText: input.sanitizeOutgoingAssistantText,
+      buildAddressDebugPayload: input.buildAddressDebugPayload,
+      buildAddressFollowupOffer: input.buildAddressFollowupOffer,
+      mergeKnownOrganizations: input.mergeKnownOrganizations as any,
+      toNonEmptyString: input.toNonEmptyString,
+      appendItem: input.appendItem,
+      getSession: input.getSession,
+      persistSession: input.persistSession,
+      cloneConversation: input.cloneConversation,
+      logEvent: input.logEvent,
+      messageIdFactory: input.messageIdFactory
+    } as RunAssistantAddressLaneResponseAttemptRuntimeInput<ResponseType>);
+
+  const tryHandleLivingChat: RunAssistantAddressRuntimeInput<ResponseType>["tryHandleLivingChat"] = async (
+    modeDecision,
+    addressRuntimeMeta = null
+  ) =>
+    runLivingChatAttemptRuntimeSafe({
+      sessionId: input.sessionId,
+      userMessage: input.userMessage,
+      sessionItems: input.sessionItems,
+      modeDecision,
+      sessionScope: {
+        knownOrganizations: input.sessionScope.knownOrganizations,
+        selectedOrganization: input.sessionScope.selectedOrganization,
+        activeOrganization: input.sessionScope.activeOrganization
+      },
+      addressRuntimeMeta,
+      traceIdFactory: () => `chat-${input.messageIdFactory().replace(/^msg-/, "")}`,
+      toNonEmptyString: input.toNonEmptyString,
+      mergeKnownOrganizations: input.mergeKnownOrganizations as any,
+      hasAssistantDataScopeMetaQuestionSignal: input.hasAssistantDataScopeMetaQuestionSignal,
+      shouldHandleAsAssistantCapabilityMetaQuery: input.shouldHandleAsAssistantCapabilityMetaQuery,
+      hasDestructiveDataActionSignal: input.hasDestructiveDataActionSignal,
+      hasDangerOrCoercionSignal: input.hasDangerOrCoercionSignal,
+      hasOperationalAdminActionRequestSignal: input.hasOperationalAdminActionRequestSignal,
+      hasOrganizationFactLookupSignal: input.hasOrganizationFactLookupSignal,
+      hasOrganizationFactFollowupSignal: input.hasOrganizationFactFollowupSignal,
+      shouldEmitOrganizationSelectionReply: input.shouldEmitOrganizationSelectionReply,
+      hasAssistantCapabilityQuestionSignal: input.hasAssistantCapabilityQuestionSignal,
+      resolveDataScopeProbe: input.resolveDataScopeProbe,
+      applyScriptGuard: input.applyScriptGuard,
+      applyGroundingGuard: input.applyGroundingGuard,
+      buildAssistantSafetyRefusalReply: input.buildAssistantSafetyRefusalReply,
+      buildAssistantDataScopeContractReply: input.buildAssistantDataScopeContractReply,
+      buildAssistantOrganizationFactBoundaryReply: input.buildAssistantOrganizationFactBoundaryReply,
+      buildAssistantDataScopeSelectionReply: input.buildAssistantDataScopeSelectionReply,
+      buildAssistantOperationalBoundaryReply: input.buildAssistantOperationalBoundaryReply,
+      buildAssistantCapabilityContractReply: input.buildAssistantCapabilityContractReply,
+      appendItem: input.appendItem,
+      getSession: input.getSession,
+      persistSession: input.persistSession,
+      cloneConversation: input.cloneConversation,
+      logEvent: input.logEvent,
+      messageIdFactory: input.messageIdFactory,
+      nowIso: input.nowIso,
+      payload: input.payload,
+      chatClient: input.chatClient,
+      loadAssistantCanonExcerpt: input.loadAssistantCanonExcerpt,
+      sanitizeOutgoingAssistantText: input.sanitizeOutgoingAssistantText,
+      defaultModel: input.defaultModel,
+      defaultBaseUrl: input.defaultBaseUrl,
+      defaultApiKey: input.defaultApiKey
+    } as RunAssistantLivingChatAttemptRuntimeInput<ResponseType>);
+
+  const runAddressLaneAttempt: RunAssistantAddressRuntimeInput<ResponseType>["runAddressLaneAttempt"] = async (
+    messageUsed,
+    carryMeta,
+    analysisDateHint
+  ) =>
+    runAddressLaneAttemptRuntimeSafe({
+      messageUsed,
+      carryMeta,
+      analysisDateHint,
+      activeOrganization: input.sessionScope.activeOrganization,
+      mergeFollowupContextWithOrganizationScope: input.mergeFollowupContextWithOrganizationScope,
+      runAddressQueryTryHandle: input.runAddressQueryTryHandle
+    });
+
+  return runAddressRuntimeSafe({
+    featureAssistantAddressQueryV1: input.featureAssistantAddressQueryV1,
+    sessionId: input.sessionId,
+    userMessage: input.userMessage,
+    sessionItems: input.sessionItems,
+    llmProvider: input.payload.llmProvider,
+    useMock: Boolean(input.payload.useMock),
+    featureAddressLlmPredecomposeV1: input.featureAddressLlmPredecomposeV1,
+    runAddressLlmPreDecompose: input.runAddressLlmPreDecompose,
+    buildAddressLlmPredecomposeContractV1: input.buildAddressLlmPredecomposeContractV1,
+    sanitizeAddressMessageForFallback: input.sanitizeAddressMessageForFallback,
+    toNonEmptyString: input.toNonEmptyString,
+    resolveAddressFollowupCarryoverContext: input.resolveAddressFollowupCarryoverContext,
+    resolveAssistantOrchestrationDecision: input.resolveAssistantOrchestrationDecision,
+    buildAddressDialogContinuationContractV2: input.buildAddressDialogContinuationContractV2,
+    runtimeAnalysisContextAsOfDate: input.runtimeAnalysisContextAsOfDate,
+    payloadContextPeriodHint: input.payload?.context?.period_hint,
+    compactWhitespace: input.compactWhitespace,
+    runAddressLaneAttempt,
+    isRetryableAddressLimitedResult: input.isRetryableAddressLimitedResult,
+    finalizeAddressLaneResponse,
+    tryHandleLivingChat,
+    logEvent: input.logEvent,
+    nowIso: input.nowIso,
+    runAddressOrchestrationRuntime: input.runAddressOrchestrationRuntime,
+    runAddressToolGateRuntime: input.runAddressToolGateRuntime,
+    runAddressLaneRuntime: input.runAddressLaneRuntime
+  });
+}