ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.41 - вынос склейки вызова live-chat из handleMessage в отдельный runtime-адаптер и переподключение на новый runtime bridge

2026-04-10 23:23:35 +03:00
parent bac6ebe701
commit fbf2d6a19a
6 changed files with 401 additions and 111 deletions
@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAssistantLivingChatAttemptRuntime = runAssistantLivingChatAttemptRuntime;
+const assistantLivingChatHandlerRuntimeAdapter_1 = require("./assistantLivingChatHandlerRuntimeAdapter");
+const assistantLivingChatLlmRuntimeAdapter_1 = require("./assistantLivingChatLlmRuntimeAdapter");
+function buildExecuteLlmChat(input, runLivingChatLlmSafe) {
+    return async () => runLivingChatLlmSafe({
+        userMessage: input.userMessage,
+        sessionItems: input.sessionItems,
+        payload: input.payload,
+        chatClient: input.chatClient,
+        loadAssistantCanonExcerpt: input.loadAssistantCanonExcerpt,
+        sanitizeOutgoingAssistantText: input.sanitizeOutgoingAssistantText,
+        defaultModel: input.defaultModel,
+        defaultBaseUrl: input.defaultBaseUrl,
+        defaultApiKey: input.defaultApiKey
+    });
+}
+async function runAssistantLivingChatAttemptRuntime(input) {
+    const runLivingChatHandlerSafe = input.runLivingChatHandler ?? assistantLivingChatHandlerRuntimeAdapter_1.tryHandleAssistantLivingChatRuntime;
+    const runLivingChatLlmSafe = input.runLivingChatLlm ?? assistantLivingChatLlmRuntimeAdapter_1.runAssistantLivingChatLlmRuntime;
+    const executeLlmChat = buildExecuteLlmChat(input, runLivingChatLlmSafe);
+    return runLivingChatHandlerSafe({
+        sessionId: input.sessionId,
+        userMessage: input.userMessage,
+        sessionItems: input.sessionItems,
+        modeDecision: input.modeDecision,
+        sessionScope: input.sessionScope,
+        addressRuntimeMeta: input.addressRuntimeMeta,
+        traceIdFactory: input.traceIdFactory,
+        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,
+        executeLlmChat,
+        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,
+        runLivingChatRuntime: input.runLivingChatRuntime,
+        finalizeLivingChatTurn: input.finalizeLivingChatTurn
+    });
+}
@@ -80,8 +80,7 @@ const assistantDeepTurnResponseRuntimeAdapter_1 = __importStar(require("./assist
 const assistantDeepTurnRetrievalRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnRetrievalRuntimeAdapter"));
 const assistantAddressRuntimeAdapter_1 = __importStar(require("./assistantAddressRuntimeAdapter"));
 const assistantAddressLaneAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressLaneAttemptRuntimeAdapter"));
-const assistantLivingChatHandlerRuntimeAdapter_1 = __importStar(require("./assistantLivingChatHandlerRuntimeAdapter"));
-const assistantLivingChatLlmRuntimeAdapter_1 = __importStar(require("./assistantLivingChatLlmRuntimeAdapter"));
+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"));
@@ -4423,59 +4422,53 @@ class AssistantService {
            });
            return runtime.response;
        };
-        const tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => {
-            return (0, assistantLivingChatHandlerRuntimeAdapter_1.tryHandleAssistantLivingChatRuntime)({
-                sessionId,
-                userMessage,
-                sessionItems: session.items,
-                modeDecision,
-                sessionScope: {
-                    knownOrganizations: sessionOrganizationScope.knownOrganizations,
-                    selectedOrganization: sessionOrganizationScope.selectedOrganization,
-                    activeOrganization: sessionOrganizationScope.activeOrganization
-                },
-                addressRuntimeMeta,
-                traceIdFactory: () => `chat-${(0, nanoid_1.nanoid)(10)}`,
-                toNonEmptyString,
-                mergeKnownOrganizations,
-                hasAssistantDataScopeMetaQuestionSignal,
-                shouldHandleAsAssistantCapabilityMetaQuery,
-                hasDestructiveDataActionSignal,
-                hasDangerOrCoercionSignal,
-                hasOperationalAdminActionRequestSignal,
-                hasOrganizationFactLookupSignal,
-                hasOrganizationFactFollowupSignal,
-                shouldEmitOrganizationSelectionReply,
-                hasAssistantCapabilityQuestionSignal,
-                resolveDataScopeProbe: () => resolveAssistantDataScopeProbe(),
-                executeLlmChat: async () => (0, assistantLivingChatLlmRuntimeAdapter_1.runAssistantLivingChatLlmRuntime)({
-                    userMessage,
-                    sessionItems: session.items,
-                    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 ?? ""
-                }),
-                applyScriptGuard: (chatText, runtimeUserMessage) => applyLivingChatScriptGuard(chatText, runtimeUserMessage),
-                applyGroundingGuard: (guardInput) => applyLivingChatGroundingGuard(guardInput),
-                buildAssistantSafetyRefusalReply,
-                buildAssistantDataScopeContractReply,
-                buildAssistantOrganizationFactBoundaryReply,
-                buildAssistantDataScopeSelectionReply,
-                buildAssistantOperationalBoundaryReply,
-                buildAssistantCapabilityContractReply,
-                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()
-            });
-        };
+        const tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => (0, assistantLivingChatAttemptRuntimeAdapter_1.runAssistantLivingChatAttemptRuntime)({
+            sessionId,
+            userMessage,
+            sessionItems: session.items,
+            modeDecision,
+            sessionScope: {
+                knownOrganizations: sessionOrganizationScope.knownOrganizations,
+                selectedOrganization: sessionOrganizationScope.selectedOrganization,
+                activeOrganization: sessionOrganizationScope.activeOrganization
+            },
+            addressRuntimeMeta,
+            traceIdFactory: () => `chat-${(0, nanoid_1.nanoid)(10)}`,
+            toNonEmptyString,
+            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,
+            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,