ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.49: вынос turnRuntimeDeps (фабрику зависимостей) из assistantService в отдельный deps-adapter, чтобы handleMessage стал совсем тонким.

2026-04-11 00:47:38 +03:00
parent f1e621fccc
commit ca467cdecc
6 changed files with 465 additions and 147 deletions
@@ -20,6 +20,7 @@ import * as assistantAddressAttemptRuntimeAdapter_1 from "./assistantAddressAtte
 import * as assistantCoverageGrounding_1 from "./assistantCoverageGrounding";
 import * as assistantDeepTurnAttemptRuntimeAdapter_1 from "./assistantDeepTurnAttemptRuntimeAdapter";
 import * as assistantTurnAttemptRuntimeAdapter_1 from "./assistantTurnAttemptRuntimeAdapter";
+import * as assistantTurnRuntimeDepsAdapter_1 from "./assistantTurnRuntimeDepsAdapter";
 import * as assistantTurnRuntimeInputBuilder_1 from "./assistantTurnRuntimeInputBuilder";
 import * as assistantUserTurnBootstrapRuntimeAdapter_1 from "./assistantUserTurnBootstrapRuntimeAdapter";
 import * as assistantQueryPlanning_1 from "./assistantQueryPlanning";
@@ -4326,84 +4327,87 @@ export class AssistantService {
        return this.sessions.getSession(sessionId);
    }
    async handleMessage(payload) {
-        const turnRuntimeDeps = {
-            ensureSession: (targetSessionId) => this.sessions.ensureSession(targetSessionId),
-            appendItem: (targetSessionId, item) => this.sessions.appendItem(targetSessionId, item),
-            getSession: (targetSessionId) => this.sessions.getSession(targetSessionId),
-            persistSession: (sessionState) => this.sessionLogger.persistSession(sessionState),
-            setInvestigationState: (targetSessionId, snapshot) => this.sessions.setInvestigationState(targetSessionId, snapshot),
-            normalize: (normalizePayload) => this.normalizerService.normalize(normalizePayload),
-            executeRouteRuntime: (route, fragmentText, options) => this.dataLayer.executeRouteRuntime(route, fragmentText, options),
-            tryAddressQueryHandle: (laneMessageUsed, options) => this.addressQueryService.tryHandle(laneMessageUsed, options),
+        const turnRuntimeDeps = (0, assistantTurnRuntimeDepsAdapter_1.buildAssistantTurnRuntimeDeps)({
+            sessions: this.sessions,
+            sessionLogger: this.sessionLogger,
+            normalizerService: this.normalizerService,
+            dataLayer: this.dataLayer,
+            addressQueryService: this.addressQueryService,
            chatClient: this.chatClient,
            messageIdFactory: () => `msg-${(0, nanoid_1.nanoid)(10)}`,
            nowIso: () => new Date().toISOString(),
            defaultApiKey: process.env.OPENAI_API_KEY ?? "",
            logEvent: (runtimePayload) => (0, log_1.logJson)(runtimePayload),
-            featureAssistantAddressQueryV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_V1,
-            featureAddressLlmPredecomposeV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_LLM_PREDECOMPOSE_V1,
-            featureInvestigationStateV1: config_1.FEATURE_ASSISTANT_INVESTIGATION_STATE_V1,
-            featureStateFollowupBindingV1: config_1.FEATURE_ASSISTANT_STATE_FOLLOWUP_BINDING_V1,
-            featureContractsV11: config_1.FEATURE_ASSISTANT_CONTRACTS_V11,
-            featureAnswerPolicyV11: config_1.FEATURE_ASSISTANT_ANSWER_POLICY_V11,
-            featureProblemCentricAnswerV1: config_1.FEATURE_ASSISTANT_PROBLEM_CENTRIC_ANSWER_V1,
-            featureLifecycleAnswerV1: config_1.FEATURE_ASSISTANT_LIFECYCLE_ANSWER_V1,
-            defaultModel: config_1.DEFAULT_MODEL,
-            defaultBaseUrl: config_1.DEFAULT_OPENAI_BASE_URL,
-            compactWhitespace,
-            repairAddressMojibake,
-            resolveRuntimeAnalysisContext,
-            runAddressLlmPreDecompose: async (runtimePayload, runtimeUserMessage) => runAddressLlmPreDecompose(this.normalizerService, runtimePayload, runtimeUserMessage),
-            buildAddressLlmPredecomposeContractV1: predecomposeContract_1.buildAddressLlmPredecomposeContractV1,
-            sanitizeAddressMessageForFallback,
-            toNonEmptyString,
-            resolveAddressFollowupCarryoverContext,
-            resolveAssistantOrchestrationDecision,
-            buildAddressDialogContinuationContractV2,
-            mergeFollowupContextWithOrganizationScope,
-            isRetryableAddressLimitedResult,
-            mergeKnownOrganizations,
-            hasAssistantDataScopeMetaQuestionSignal,
-            shouldHandleAsAssistantCapabilityMetaQuery,
-            hasDestructiveDataActionSignal,
-            hasDangerOrCoercionSignal,
-            hasOperationalAdminActionRequestSignal,
-            hasOrganizationFactLookupSignal,
-            hasOrganizationFactFollowupSignal,
-            shouldEmitOrganizationSelectionReply,
-            hasAssistantCapabilityQuestionSignal,
-            resolveDataScopeProbe: () => resolveAssistantDataScopeProbe(),
-            applyScriptGuard: (chatText, runtimeUserMessage) => applyLivingChatScriptGuard(chatText, runtimeUserMessage),
-            applyGroundingGuard: (guardInput) => applyLivingChatGroundingGuard(guardInput),
-            buildAssistantSafetyRefusalReply,
-            buildAssistantDataScopeContractReply,
-            buildAssistantOrganizationFactBoundaryReply,
-            buildAssistantDataScopeSelectionReply,
-            buildAssistantOperationalBoundaryReply,
-            buildAssistantCapabilityContractReply,
-            loadAssistantCanonExcerpt: assistantCanon_1.loadAssistantCanonExcerpt,
-            sanitizeOutgoingAssistantText,
-            buildAddressDebugPayload,
-            buildAddressFollowupOffer,
-            buildFollowupStateBinding,
-            resolveBusinessScopeAlignment,
-            inferP0DomainFromMessage,
-            resolveBusinessScopeFromLiveContext,
-            extractRequirements,
-            toExecutionPlan,
-            enforceRbpLiveRoutePlan,
-            enforceFaLiveRoutePlan,
-            mapNoRouteReason,
-            buildSkippedResult,
-            evaluateCoverage,
-            checkGrounding,
-            collectRbpLiveRouteAudit,
-            collectFaLiveRouteAudit,
-            hasExplicitPeriodAnchorFromNormalized,
-            extractDroppedIntentSegments: (normalizedPayload) => extractDiscardedIntentSegments(normalizedPayload),
-            toDebugRoutes: (routeSummary) => toDebugRoutes(routeSummary),
-            extractExecutionState
-        };
+            flags: {
+                featureAssistantAddressQueryV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_V1,
+                featureAddressLlmPredecomposeV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_LLM_PREDECOMPOSE_V1,
+                featureInvestigationStateV1: config_1.FEATURE_ASSISTANT_INVESTIGATION_STATE_V1,
+                featureStateFollowupBindingV1: config_1.FEATURE_ASSISTANT_STATE_FOLLOWUP_BINDING_V1,
+                featureContractsV11: config_1.FEATURE_ASSISTANT_CONTRACTS_V11,
+                featureAnswerPolicyV11: config_1.FEATURE_ASSISTANT_ANSWER_POLICY_V11,
+                featureProblemCentricAnswerV1: config_1.FEATURE_ASSISTANT_PROBLEM_CENTRIC_ANSWER_V1,
+                featureLifecycleAnswerV1: config_1.FEATURE_ASSISTANT_LIFECYCLE_ANSWER_V1
+            },
+            defaults: {
+                defaultModel: config_1.DEFAULT_MODEL,
+                defaultBaseUrl: config_1.DEFAULT_OPENAI_BASE_URL
+            },
+            helpers: {
+                compactWhitespace,
+                repairAddressMojibake,
+                resolveRuntimeAnalysisContext,
+                runAddressLlmPreDecompose: async (runtimePayload, runtimeUserMessage) => runAddressLlmPreDecompose(this.normalizerService, runtimePayload, runtimeUserMessage),
+                buildAddressLlmPredecomposeContractV1: predecomposeContract_1.buildAddressLlmPredecomposeContractV1,
+                sanitizeAddressMessageForFallback,
+                toNonEmptyString,
+                resolveAddressFollowupCarryoverContext,
+                resolveAssistantOrchestrationDecision,
+                buildAddressDialogContinuationContractV2,
+                mergeFollowupContextWithOrganizationScope,
+                isRetryableAddressLimitedResult,
+                mergeKnownOrganizations,
+                hasAssistantDataScopeMetaQuestionSignal,
+                shouldHandleAsAssistantCapabilityMetaQuery,
+                hasDestructiveDataActionSignal,
+                hasDangerOrCoercionSignal,
+                hasOperationalAdminActionRequestSignal,
+                hasOrganizationFactLookupSignal,
+                hasOrganizationFactFollowupSignal,
+                shouldEmitOrganizationSelectionReply,
+                hasAssistantCapabilityQuestionSignal,
+                resolveDataScopeProbe: () => resolveAssistantDataScopeProbe(),
+                applyScriptGuard: (chatText, runtimeUserMessage) => applyLivingChatScriptGuard(chatText, runtimeUserMessage),
+                applyGroundingGuard: (guardInput) => applyLivingChatGroundingGuard(guardInput),
+                buildAssistantSafetyRefusalReply,
+                buildAssistantDataScopeContractReply,
+                buildAssistantOrganizationFactBoundaryReply,
+                buildAssistantDataScopeSelectionReply,
+                buildAssistantOperationalBoundaryReply,
+                buildAssistantCapabilityContractReply,
+                loadAssistantCanonExcerpt: assistantCanon_1.loadAssistantCanonExcerpt,
+                sanitizeOutgoingAssistantText,
+                buildAddressDebugPayload,
+                buildAddressFollowupOffer,
+                buildFollowupStateBinding,
+                resolveBusinessScopeAlignment,
+                inferP0DomainFromMessage,
+                resolveBusinessScopeFromLiveContext,
+                extractRequirements,
+                toExecutionPlan,
+                enforceRbpLiveRoutePlan,
+                enforceFaLiveRoutePlan,
+                mapNoRouteReason,
+                buildSkippedResult,
+                evaluateCoverage,
+                checkGrounding,
+                collectRbpLiveRouteAudit,
+                collectFaLiveRouteAudit,
+                hasExplicitPeriodAnchorFromNormalized,
+                extractDroppedIntentSegments: (normalizedPayload) => extractDiscardedIntentSegments(normalizedPayload),
+                toDebugRoutes: (routeSummary) => toDebugRoutes(routeSummary),
+                extractExecutionState
+            }
+        });
        const turnRuntime = await (0, assistantTurnAttemptRuntimeAdapter_1.runAssistantTurnAttemptRuntime)({
            payload,
            runUserTurnBootstrapRuntime: (runtimePayload) => (0, assistantUserTurnBootstrapRuntimeAdapter_1.runAssistantUserTurnBootstrapRuntime)((0, assistantTurnRuntimeInputBuilder_1.buildAssistantUserTurnBootstrapRuntimeInput)(runtimePayload, turnRuntimeDeps)),
@@ -0,0 +1,112 @@
+import type { AssistantTurnRuntimeBuilderDeps } from "./assistantTurnRuntimeInputBuilder";
+
+export interface AssistantTurnRuntimeDepsSessionsLike {
+  ensureSession: (sessionId: string) => unknown;
+  appendItem: (sessionId: string, item: unknown) => void;
+  getSession: (sessionId: string) => unknown;
+  setInvestigationState: (sessionId: string, snapshot: unknown) => void;
+}
+
+export interface AssistantTurnRuntimeDepsSessionLoggerLike {
+  persistSession: (sessionState: unknown) => void;
+}
+
+export interface AssistantTurnRuntimeDepsNormalizerLike {
+  normalize: (payload: unknown) => Promise<unknown>;
+}
+
+export interface AssistantTurnRuntimeDepsDataLayerLike {
+  executeRouteRuntime: (route: string, fragmentText: string, options?: unknown) => Promise<unknown>;
+}
+
+export interface AssistantTurnRuntimeDepsAddressQueryServiceLike {
+  tryHandle: (messageUsed: string, options?: unknown) => Promise<unknown>;
+}
+
+type BuilderDepsProvidedByAdapter = Pick<
+  AssistantTurnRuntimeBuilderDeps,
+  | "ensureSession"
+  | "appendItem"
+  | "getSession"
+  | "persistSession"
+  | "setInvestigationState"
+  | "normalize"
+  | "executeRouteRuntime"
+  | "tryAddressQueryHandle"
+  | "chatClient"
+  | "messageIdFactory"
+  | "nowIso"
+  | "defaultApiKey"
+  | "logEvent"
+  | "featureAssistantAddressQueryV1"
+  | "featureAddressLlmPredecomposeV1"
+  | "featureInvestigationStateV1"
+  | "featureStateFollowupBindingV1"
+  | "featureContractsV11"
+  | "featureAnswerPolicyV11"
+  | "featureProblemCentricAnswerV1"
+  | "featureLifecycleAnswerV1"
+  | "defaultModel"
+  | "defaultBaseUrl"
+>;
+
+type BuilderDepsPassThrough = Omit<AssistantTurnRuntimeBuilderDeps, keyof BuilderDepsProvidedByAdapter>;
+
+export interface BuildAssistantTurnRuntimeDepsInput {
+  sessions: AssistantTurnRuntimeDepsSessionsLike;
+  sessionLogger: AssistantTurnRuntimeDepsSessionLoggerLike;
+  normalizerService: AssistantTurnRuntimeDepsNormalizerLike;
+  dataLayer: AssistantTurnRuntimeDepsDataLayerLike;
+  addressQueryService: AssistantTurnRuntimeDepsAddressQueryServiceLike;
+  chatClient: unknown;
+  messageIdFactory: () => string;
+  nowIso: () => string;
+  defaultApiKey: string;
+  logEvent: (payload: Record<string, unknown>) => void;
+  flags: {
+    featureAssistantAddressQueryV1: boolean;
+    featureAddressLlmPredecomposeV1: boolean;
+    featureInvestigationStateV1: boolean;
+    featureStateFollowupBindingV1: boolean;
+    featureContractsV11: boolean;
+    featureAnswerPolicyV11: boolean;
+    featureProblemCentricAnswerV1: boolean;
+    featureLifecycleAnswerV1: boolean;
+  };
+  defaults: {
+    defaultModel: string;
+    defaultBaseUrl: string;
+  };
+  helpers: BuilderDepsPassThrough;
+}
+
+export function buildAssistantTurnRuntimeDeps(
+  input: BuildAssistantTurnRuntimeDepsInput
+): AssistantTurnRuntimeBuilderDeps {
+  return {
+    ...input.helpers,
+    ensureSession: (sessionId) => input.sessions.ensureSession(sessionId) as any,
+    appendItem: (sessionId, item) => input.sessions.appendItem(sessionId, item as any),
+    getSession: (sessionId) => input.sessions.getSession(sessionId) as any,
+    persistSession: (sessionState) => input.sessionLogger.persistSession(sessionState as any),
+    setInvestigationState: (sessionId, snapshot) => input.sessions.setInvestigationState(sessionId, snapshot),
+    normalize: (payload) => input.normalizerService.normalize(payload),
+    executeRouteRuntime: (route, fragmentText, options) => input.dataLayer.executeRouteRuntime(route, fragmentText, options),
+    tryAddressQueryHandle: (messageUsed, options) => input.addressQueryService.tryHandle(messageUsed, options),
+    chatClient: input.chatClient,
+    messageIdFactory: input.messageIdFactory,
+    nowIso: input.nowIso,
+    defaultApiKey: input.defaultApiKey,
+    logEvent: input.logEvent,
+    featureAssistantAddressQueryV1: input.flags.featureAssistantAddressQueryV1,
+    featureAddressLlmPredecomposeV1: input.flags.featureAddressLlmPredecomposeV1,
+    featureInvestigationStateV1: input.flags.featureInvestigationStateV1,
+    featureStateFollowupBindingV1: input.flags.featureStateFollowupBindingV1,
+    featureContractsV11: input.flags.featureContractsV11,
+    featureAnswerPolicyV11: input.flags.featureAnswerPolicyV11,
+    featureProblemCentricAnswerV1: input.flags.featureProblemCentricAnswerV1,
+    featureLifecycleAnswerV1: input.flags.featureLifecycleAnswerV1,
+    defaultModel: input.defaults.defaultModel,
+    defaultBaseUrl: input.defaults.defaultBaseUrl
+  };
+}