ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.36 вынос tryHandleLivingChat в отдельный runtime-handler чтобы убрать еще один большой локальный блок. новый living-chat handler-адаптер с try/catch + finalize + warn fallback

2026-04-10 22:34:10 +03:00
parent 9c22460e8b
commit be116dcbde
6 changed files with 482 additions and 197 deletions
@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tryHandleAssistantLivingChatRuntime = tryHandleAssistantLivingChatRuntime;
+const assistantLivingChatRuntimeAdapter_1 = require("./assistantLivingChatRuntimeAdapter");
+const assistantLivingChatTurnFinalizeRuntimeAdapter_1 = require("./assistantLivingChatTurnFinalizeRuntimeAdapter");
+async function tryHandleAssistantLivingChatRuntime(input) {
+    const runLivingChatRuntimeSafe = input.runLivingChatRuntime ?? assistantLivingChatRuntimeAdapter_1.runAssistantLivingChatRuntime;
+    const finalizeLivingChatTurnSafe = input.finalizeLivingChatTurn ?? assistantLivingChatTurnFinalizeRuntimeAdapter_1.finalizeAssistantLivingChatTurn;
+    try {
+        const runtime = await runLivingChatRuntimeSafe({
+            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: input.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
+        });
+        if (!runtime.handled || !runtime.debug) {
+            return null;
+        }
+        const finalization = finalizeLivingChatTurnSafe({
+            sessionId: input.sessionId,
+            userMessage: input.userMessage,
+            assistantReply: runtime.chatText,
+            replyType: "factual_with_explanation",
+            debug: runtime.debug,
+            modeDecision: input.modeDecision,
+            appendItem: input.appendItem,
+            getSession: input.getSession,
+            persistSession: input.persistSession,
+            cloneConversation: input.cloneConversation,
+            logEvent: input.logEvent,
+            messageIdFactory: input.messageIdFactory
+        });
+        return finalization.response;
+    }
+    catch (error) {
+        input.logEvent({
+            timestamp: input.nowIso(),
+            level: "warn",
+            service: "assistant_loop",
+            message: "assistant_living_chat_failed_fallback_to_deep",
+            sessionId: input.sessionId,
+            details: {
+                session_id: input.sessionId,
+                user_message: input.userMessage,
+                reason: error instanceof Error ? error.message : String(error)
+            }
+        });
+        return null;
+    }
+}
@@ -79,8 +79,7 @@ const assistantDeepTurnNormalizationRuntimeAdapter_1 = __importStar(require("./a
 const assistantDeepTurnResponseRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnResponseRuntimeAdapter"));
 const assistantDeepTurnRetrievalRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnRetrievalRuntimeAdapter"));
 const assistantAddressRuntimeAdapter_1 = __importStar(require("./assistantAddressRuntimeAdapter"));
-const assistantLivingChatTurnFinalizeRuntimeAdapter_1 = __importStar(require("./assistantLivingChatTurnFinalizeRuntimeAdapter"));
-const assistantLivingChatRuntimeAdapter_1 = __importStar(require("./assistantLivingChatRuntimeAdapter"));
+const assistantLivingChatHandlerRuntimeAdapter_1 = __importStar(require("./assistantLivingChatHandlerRuntimeAdapter"));
 const assistantQueryPlanning_1 = __importStar(require("./assistantQueryPlanning"));
 const iconv_lite_1 = __importDefault(require("iconv-lite"));
 const DATA_SCOPE_CACHE_TTL_MS = 60_000;
@@ -4454,102 +4453,73 @@ class AssistantService {
            return runtime.response;
        };
        const tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => {
-            try {
-                const runtime = await (0, assistantLivingChatRuntimeAdapter_1.runAssistantLivingChatRuntime)({
-                    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 () => {
-                        const conversationWindow = buildLivingChatContextWindow(session.items);
-                        const userPrompt = buildLivingChatPrompt(userMessage, conversationWindow);
-                        const canonExcerpt = (0, assistantCanon_1.loadAssistantCanonExcerpt)(520);
-                        const chatResponse = await this.chatClient.chat({
-                            llmProvider: payload.llmProvider,
-                            apiKey: String(payload.apiKey ?? process.env.OPENAI_API_KEY ?? ''),
-                            model: String(payload.model ?? config_1.DEFAULT_MODEL),
-                            baseUrl: payload.baseUrl ?? config_1.DEFAULT_OPENAI_BASE_URL,
-                            temperature: payload.temperature ?? 0.35,
-                            maxOutputTokens: Math.max(120, Math.min(Number(payload.maxOutputTokens ?? 420), 900))
-                        }, {
-                            systemPrompt: [
-                                'Ты живой русскоязычный ассистент для чтения и анализа данных 1С.',
-                                'Работай честно: не заявляй действия, которые недоступны в этом рантайме.',
-                                'Разрешено: анализ и объяснение данных, формулировка запросов, подсказки по следующему шагу.',
-                                'Запрещено: обещать настройку 1С, админ-действия, создание/проведение документов или любые изменения в базе.',
-                                'Если пользователь спрашивает про возможности, отвечай только по этому контракту.',
-                                `Канон поведения: ${canonExcerpt}`
-                            ].join(' '),
-                            developerPrompt: 'Формат: коротко и по сути, без JSON и без служебных блоков. Пиши человеко-понятно.',
-                            userMessage: userPrompt,
-                            maxOutputTokens: Math.max(120, Math.min(Number(payload.maxOutputTokens ?? 420), 900)),
-                            temperature: payload.temperature ?? 0.35
-                        });
-                        return sanitizeOutgoingAssistantText(chatResponse?.outputText ?? '', 'Понял. Сформулируйте, что именно нужно по данным 1С, и я помогу по шагам.');
-                    },
-                    applyScriptGuard: (chatText, runtimeUserMessage) => applyLivingChatScriptGuard(chatText, runtimeUserMessage),
-                    applyGroundingGuard: (guardInput) => applyLivingChatGroundingGuard(guardInput),
-                    buildAssistantSafetyRefusalReply,
-                    buildAssistantDataScopeContractReply,
-                    buildAssistantOrganizationFactBoundaryReply,
-                    buildAssistantDataScopeSelectionReply,
-                    buildAssistantOperationalBoundaryReply,
-                    buildAssistantCapabilityContractReply
-                });
-                if (!runtime.handled || !runtime.debug) {
-                    return null;
-                }
-                const chatText = runtime.chatText;
-                const debug = runtime.debug;
-                const finalization = (0, assistantLivingChatTurnFinalizeRuntimeAdapter_1.finalizeAssistantLivingChatTurn)({
-                    sessionId,
-                    userMessage,
-                    assistantReply: chatText,
-                    replyType: 'factual_with_explanation',
-                    debug,
-                    modeDecision,
-                    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)}`
-                });
-                return finalization.response;
-            }
-            catch (error) {
-                (0, log_1.logJson)({
-                    timestamp: new Date().toISOString(),
-                    level: 'warn',
-                    service: 'assistant_loop',
-                    message: 'assistant_living_chat_failed_fallback_to_deep',
-                    sessionId,
-                    details: {
-                        session_id: sessionId,
-                        user_message: userMessage,
-                        reason: error instanceof Error ? error.message : String(error)
-                    }
-                });
-                return 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 () => {
+                    const conversationWindow = buildLivingChatContextWindow(session.items);
+                    const userPrompt = buildLivingChatPrompt(userMessage, conversationWindow);
+                    const canonExcerpt = (0, assistantCanon_1.loadAssistantCanonExcerpt)(520);
+                    const chatResponse = await this.chatClient.chat({
+                        llmProvider: payload.llmProvider,
+                        apiKey: String(payload.apiKey ?? process.env.OPENAI_API_KEY ?? ''),
+                        model: String(payload.model ?? config_1.DEFAULT_MODEL),
+                        baseUrl: payload.baseUrl ?? config_1.DEFAULT_OPENAI_BASE_URL,
+                        temperature: payload.temperature ?? 0.35,
+                        maxOutputTokens: Math.max(120, Math.min(Number(payload.maxOutputTokens ?? 420), 900))
+                    }, {
+                        systemPrompt: [
+                            'РўС‹ Р¶РёРІРѕР№ СЂСѓСЃСЃРєРѕСЏР·С‹С‡РЅС‹Р№ Р°СЃСЃРёСЃС‚РµРЅС‚ РґР»СЏ С‡С‚РµРЅРёСЏ Рё Р°РЅР°Р»РёР·Р° РґР°РЅРЅС‹С… 1РЎ.',
+                            'Р Р°Р±РѕС‚Р°Р№ С‡РµСЃС‚РЅРѕ: РЅРµ Р·Р°СЏРІР»СЏР№ РґРµР№СЃС‚РІРёСЏ, РєРѕС‚РѕСЂС‹Рµ РЅРµРґРѕСЃС‚СѓРїРЅС‹ РІ СЌС‚РѕРј СЂР°РЅС‚Р°Р№РјРµ.',
+                            'Р Р°Р·СЂРµС€РµРЅРѕ: Р°РЅР°Р»РёР· Рё РѕР±СЉСЏСЃРЅРµРЅРёРµ РґР°РЅРЅС‹С…, С„РѕСЂРјСѓР»РёСЂРѕРІРєР° Р·Р°РїСЂРѕСЃРѕРІ, РїРѕРґСЃРєР°Р·РєРё РїРѕ СЃР»РµРґСѓСЋС‰РµРјСѓ С€Р°РіСѓ.',
+                            'Р—Р°РїСЂРµС‰РµРЅРѕ: РѕР±РµС‰Р°С‚СЊ РЅР°СЃС‚СЂРѕР№РєСѓ 1РЎ, Р°РґРјРёРЅ-РґРµР№СЃС‚РІРёСЏ, СЃРѕР·РґР°РЅРёРµ/РїСЂРѕРІРµРґРµРЅРёРµ РґРѕРєСѓРјРµРЅС‚РѕРІ РёР»Рё Р»СЋР±С‹Рµ РёР·РјРµРЅРµРЅРёСЏ РІ Р±Р°Р·Рµ.',
+                            'Р•СЃР»Рё РїРѕР»СЊР·РѕРІР°С‚РµР»СЊ СЃРїСЂР°С€РёРІР°РµС‚ РїСЂРѕ РІРѕР·РјРѕР¶РЅРѕСЃС‚Рё, РѕС‚РІРµС‡Р°Р№ С‚РѕР»СЊРєРѕ РїРѕ СЌС‚РѕРјСѓ РєРѕРЅС‚СЂР°РєС‚Сѓ.',
+                            `РљР°РЅРѕРЅ РїРѕРІРµРґРµРЅРёСЏ: ${canonExcerpt}`
+                        ].join(' '),
+                        developerPrompt: 'Р¤РѕСЂРјР°С‚: РєРѕСЂРѕС‚РєРѕ Рё РїРѕ СЃСѓС‚Рё, Р±РµР· JSON Рё Р±РµР· СЃР»СѓР¶РµР±РЅС‹С… Р±Р»РѕРєРѕРІ. РџРёС€Рё С‡РµР»РѕРІРµРєРѕ-РїРѕРЅСЏС‚РЅРѕ.',
+                        userMessage: userPrompt,
+                        maxOutputTokens: Math.max(120, Math.min(Number(payload.maxOutputTokens ?? 420), 900)),
+                        temperature: payload.temperature ?? 0.35
+                    });
+                    return sanitizeOutgoingAssistantText(chatResponse?.outputText ?? '', 'РџРѕРЅСЏР». РЎС„РѕСЂРјСѓР»РёСЂСѓР№С‚Рµ, С‡С‚Рѕ РёРјРµРЅРЅРѕ РЅСѓР¶РЅРѕ РїРѕ РґР°РЅРЅС‹Рј 1РЎ, Рё СЏ РїРѕРјРѕРіСѓ РїРѕ С€Р°РіР°Рј.');
+                },
+                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()
+            });
        };
        let addressRuntimeMetaForDeep = null;
        const runAddressLaneAttempt = async (messageUsed, carryMeta, analysisDateHint) => {