ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 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,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAssistantAddressAttemptRuntime = runAssistantAddressAttemptRuntime;
+const assistantAddressRuntimeAdapter_1 = require("./assistantAddressRuntimeAdapter");
+const assistantAddressLaneAttemptRuntimeAdapter_1 = require("./assistantAddressLaneAttemptRuntimeAdapter");
+const assistantAddressLaneResponseAttemptRuntimeAdapter_1 = require("./assistantAddressLaneResponseAttemptRuntimeAdapter");
+const assistantLivingChatAttemptRuntimeAdapter_1 = require("./assistantLivingChatAttemptRuntimeAdapter");
+async function runAssistantAddressAttemptRuntime(input) {
+    const runAddressRuntimeSafe = input.runAddressRuntime ?? assistantAddressRuntimeAdapter_1.runAssistantAddressRuntime;
+    const runAddressLaneAttemptRuntimeSafe = input.runAddressLaneAttemptRuntime ?? assistantAddressLaneAttemptRuntimeAdapter_1.runAssistantAddressLaneAttemptRuntime;
+    const runAddressLaneResponseAttemptRuntimeSafe = input.runAddressLaneResponseAttemptRuntime ?? assistantAddressLaneResponseAttemptRuntimeAdapter_1.runAssistantAddressLaneResponseAttemptRuntime;
+    const runLivingChatAttemptRuntimeSafe = input.runLivingChatAttemptRuntime ?? assistantLivingChatAttemptRuntimeAdapter_1.runAssistantLivingChatAttemptRuntime;
+    const 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,
+        toNonEmptyString: input.toNonEmptyString,
+        appendItem: input.appendItem,
+        getSession: input.getSession,
+        persistSession: input.persistSession,
+        cloneConversation: input.cloneConversation,
+        logEvent: input.logEvent,
+        messageIdFactory: input.messageIdFactory
+    });
+    const 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,
+        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
+    });
+    const 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
+    });
+}
@@ -62,12 +62,9 @@ const openaiResponsesClient_1 = __importStar(require("./openaiResponsesClient"))
 const addressMcpClient_1 = __importStar(require("./addressMcpClient"));
 const capabilitiesRegistry_1 = __importStar(require("./capabilitiesRegistry"));
 const assistantCanon_1 = __importStar(require("./assistantCanon"));
-const assistantAddressLaneResponseAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressLaneResponseAttemptRuntimeAdapter"));
+const assistantAddressAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressAttemptRuntimeAdapter"));
 const assistantCoverageGrounding_1 = __importStar(require("./assistantCoverageGrounding"));
 const assistantDeepTurnAttemptRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnAttemptRuntimeAdapter"));
-const assistantAddressRuntimeAdapter_1 = __importStar(require("./assistantAddressRuntimeAdapter"));
-const assistantAddressLaneAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressLaneAttemptRuntimeAdapter"));
-const assistantLivingChatAttemptRuntimeAdapter_1 = __importStar(require("./assistantLivingChatAttemptRuntimeAdapter"));
 const assistantUserTurnBootstrapRuntimeAdapter_1 = __importStar(require("./assistantUserTurnBootstrapRuntimeAdapter"));
 const assistantQueryPlanning_1 = __importStar(require("./assistantQueryPlanning"));
 const iconv_lite_1 = __importDefault(require("iconv-lite"));
@@ -4385,40 +4382,30 @@ class AssistantService {
            nowIso: () => new Date().toISOString()
        });
        const sessionOrganizationScope = resolveSessionOrganizationScopeContext(userMessage, session.items);
-        const finalizeAddressLaneResponse = (addressLane, effectiveAddressUserMessage, carryoverMeta = null, llmPreDecomposeMeta = null) => (0, assistantAddressLaneResponseAttemptRuntimeAdapter_1.runAssistantAddressLaneResponseAttemptRuntime)({
-            sessionId,
-            userMessage,
-            effectiveAddressUserMessage,
-            addressLane,
-            carryoverMeta,
-            llmPreDecomposeMeta,
-            knownOrganizations: sessionOrganizationScope.knownOrganizations,
-            activeOrganization: sessionOrganizationScope.activeOrganization,
-            sanitizeOutgoingAssistantText,
-            buildAddressDebugPayload,
-            buildAddressFollowupOffer,
-            mergeKnownOrganizations,
-            toNonEmptyString,
-            appendItem: (targetSessionId, item) => this.sessions.appendItem(targetSessionId, item),
-            getSession: (targetSessionId) => this.sessions.getSession(targetSessionId),
-            persistSession: (sessionState) => this.sessionLogger.persistSession(sessionState),
-            cloneConversation: (items) => cloneItems(items),
-            logEvent: (payload) => (0, log_1.logJson)(payload),
-            messageIdFactory: () => `msg-${(0, nanoid_1.nanoid)(10)}`
-        });
-        const tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => (0, assistantLivingChatAttemptRuntimeAdapter_1.runAssistantLivingChatAttemptRuntime)({
+        const addressRuntime = await (0, assistantAddressAttemptRuntimeAdapter_1.runAssistantAddressAttemptRuntime)({
+            featureAssistantAddressQueryV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_V1,
            sessionId,
            userMessage,
            sessionItems: session.items,
-            modeDecision,
+            payload,
            sessionScope: {
                knownOrganizations: sessionOrganizationScope.knownOrganizations,
                selectedOrganization: sessionOrganizationScope.selectedOrganization,
                activeOrganization: sessionOrganizationScope.activeOrganization
            },
-            addressRuntimeMeta,
-            traceIdFactory: () => `chat-${(0, nanoid_1.nanoid)(10)}`,
+            featureAddressLlmPredecomposeV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_LLM_PREDECOMPOSE_V1,
+            runAddressLlmPreDecompose: async () => runAddressLlmPreDecompose(this.normalizerService, payload, userMessage),
+            buildAddressLlmPredecomposeContractV1: predecomposeContract_1.buildAddressLlmPredecomposeContractV1,
+            sanitizeAddressMessageForFallback,
            toNonEmptyString,
+            resolveAddressFollowupCarryoverContext,
+            resolveAssistantOrchestrationDecision,
+            buildAddressDialogContinuationContractV2,
+            runtimeAnalysisContextAsOfDate: runtimeAnalysisContext.as_of_date,
+            compactWhitespace,
+            mergeFollowupContextWithOrganizationScope,
+            runAddressQueryTryHandle: (laneMessageUsed, options) => this.addressQueryService.tryHandle(laneMessageUsed, options),
+            isRetryableAddressLimitedResult,
            mergeKnownOrganizations,
            hasAssistantDataScopeMetaQuestionSignal,
            shouldHandleAsAssistantCapabilityMetaQuery,
@@ -4438,56 +4425,23 @@ class AssistantService {
            buildAssistantDataScopeSelectionReply,
            buildAssistantOperationalBoundaryReply,
            buildAssistantCapabilityContractReply,
+            chatClient: this.chatClient,
+            loadAssistantCanonExcerpt: assistantCanon_1.loadAssistantCanonExcerpt,
+            sanitizeOutgoingAssistantText,
+            defaultModel: config_1.DEFAULT_MODEL,
+            defaultBaseUrl: config_1.DEFAULT_OPENAI_BASE_URL,
+            defaultApiKey: process.env.OPENAI_API_KEY ?? "",
+            buildAddressDebugPayload,
+            buildAddressFollowupOffer,
            appendItem: (targetSessionId, item) => this.sessions.appendItem(targetSessionId, item),
            getSession: (targetSessionId) => this.sessions.getSession(targetSessionId),
            persistSession: (sessionState) => this.sessionLogger.persistSession(sessionState),
            cloneConversation: (items) => cloneItems(items),
            logEvent: (payload) => (0, log_1.logJson)(payload),
            messageIdFactory: () => `msg-${(0, nanoid_1.nanoid)(10)}`,
-            nowIso: () => new Date().toISOString(),
-            payload,
-            chatClient: this.chatClient,
-            loadAssistantCanonExcerpt: assistantCanon_1.loadAssistantCanonExcerpt,
-            sanitizeOutgoingAssistantText,
-            defaultModel: config_1.DEFAULT_MODEL,
-            defaultBaseUrl: config_1.DEFAULT_OPENAI_BASE_URL,
-            defaultApiKey: process.env.OPENAI_API_KEY ?? ""
-        });
-        let addressRuntimeMetaForDeep = null;
-        const runAddressLaneAttempt = async (messageUsed, carryMeta, analysisDateHint) => (0, assistantAddressLaneAttemptRuntimeAdapter_1.runAssistantAddressLaneAttemptRuntime)({
-            messageUsed,
-            carryMeta: carryMeta ?? null,
-            analysisDateHint: analysisDateHint ?? null,
-            activeOrganization: sessionOrganizationScope.activeOrganization,
-            mergeFollowupContextWithOrganizationScope,
-            runAddressQueryTryHandle: (laneMessageUsed, options) => this.addressQueryService.tryHandle(laneMessageUsed, options)
-        });
-        const addressRuntime = await (0, assistantAddressRuntimeAdapter_1.runAssistantAddressRuntime)({
-            featureAssistantAddressQueryV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_V1,
-            sessionId,
-            userMessage,
-            sessionItems: session.items,
-            llmProvider: payload?.llmProvider,
-            useMock: Boolean(payload.useMock),
-            featureAddressLlmPredecomposeV1: config_1.FEATURE_ASSISTANT_ADDRESS_QUERY_LLM_PREDECOMPOSE_V1,
-            runAddressLlmPreDecompose: async () => runAddressLlmPreDecompose(this.normalizerService, payload, userMessage),
-            buildAddressLlmPredecomposeContractV1: predecomposeContract_1.buildAddressLlmPredecomposeContractV1,
-            sanitizeAddressMessageForFallback,
-            toNonEmptyString,
-            resolveAddressFollowupCarryoverContext,
-            resolveAssistantOrchestrationDecision,
-            buildAddressDialogContinuationContractV2,
-            runtimeAnalysisContextAsOfDate: runtimeAnalysisContext.as_of_date,
-            payloadContextPeriodHint: payload?.context?.period_hint,
-            compactWhitespace,
-            runAddressLaneAttempt,
-            isRetryableAddressLimitedResult,
-            finalizeAddressLaneResponse,
-            tryHandleLivingChat: (modeDecision, runtimeMeta) => tryHandleLivingChat(modeDecision, runtimeMeta),
-            logEvent: (payload) => (0, log_1.logJson)(payload),
            nowIso: () => new Date().toISOString()
        });
-        addressRuntimeMetaForDeep = addressRuntime.addressRuntimeMetaForDeep;
+        const addressRuntimeMetaForDeep = addressRuntime.addressRuntimeMetaForDeep;
        if (addressRuntime.handled && addressRuntime.response) {
            return addressRuntime.response;
        }