ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.692.72 и 2.732.76 - типобезопасность turn-runtime билдера и убрал остатки слабых кастов в маппинге зависимостей: assistantTurnRuntimeInputBuilder.ts / Поднял типы в deps-адаптере до контрактов AssistantTurnRuntimeBuilderDeps (sessions/normalizer/data-layer/query/chat/log), убрал unknown/any-обертки: assistantTurnRuntimeDepsAdapter.ts

2026-04-11 10:24:16 +03:00
parent bf16309a29
commit 9f3749fd4a
6 changed files with 309 additions and 220 deletions
@@ -35,52 +35,64 @@ async function runAssistantAddressAttemptRuntime(input) {
        logEvent: input.logEvent,
        messageIdFactory: input.messageIdFactory
    }));
-    const tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => runLivingChatAttemptRuntimeSafe((0, assistantLivingChatAttemptInputBuilder_1.buildAssistantLivingChatAttemptRuntimeInput)({
-        sessionId: input.sessionId,
-        userMessage: input.userMessage,
-        sessionItems: input.sessionItems,
-        modeDecision,
-        sessionScope: {
-            knownOrganizations: input.sessionScope.knownOrganizations,
-            selectedOrganization: input.sessionScope.selectedOrganization,
-            activeOrganization: input.sessionScope.activeOrganization
-        },
-        addressRuntimeMeta,
-        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 tryHandleLivingChat = async (modeDecision, addressRuntimeMeta = null) => {
+        const normalizedModeDecision = (() => {
+            if (!modeDecision || typeof modeDecision !== "object") {
+                return undefined;
+            }
+            const candidate = modeDecision;
+            return {
+                mode: typeof candidate.mode === "string" ? candidate.mode : null,
+                reason: typeof candidate.reason === "string" ? candidate.reason : null
+            };
+        })();
+        return runLivingChatAttemptRuntimeSafe((0, assistantLivingChatAttemptInputBuilder_1.buildAssistantLivingChatAttemptRuntimeInput)({
+            sessionId: input.sessionId,
+            userMessage: input.userMessage,
+            sessionItems: input.sessionItems,
+            modeDecision: normalizedModeDecision,
+            sessionScope: {
+                knownOrganizations: input.sessionScope.knownOrganizations,
+                selectedOrganization: input.sessionScope.selectedOrganization,
+                activeOrganization: input.sessionScope.activeOrganization
+            },
+            addressRuntimeMeta,
+            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((0, assistantAddressLaneAttemptInputBuilder_1.buildAssistantAddressLaneAttemptRuntimeInput)({
        messageUsed,
        carryMeta,
@@ -4,12 +4,12 @@ exports.buildAssistantTurnRuntimeDeps = buildAssistantTurnRuntimeDeps;
 function buildAssistantTurnRuntimeDeps(input) {
    return {
        ...input.helpers,
-        ensureSession: (sessionId) => input.sessions.ensureSession(sessionId),
-        appendItem: (sessionId, item) => input.sessions.appendItem(sessionId, item),
-        getSession: (sessionId) => input.sessions.getSession(sessionId),
-        persistSession: (sessionState) => input.sessionLogger.persistSession(sessionState),
-        setInvestigationState: (sessionId, snapshot) => input.sessions.setInvestigationState(sessionId, snapshot),
-        normalize: (payload) => input.normalizerService.normalize(payload),
+        ensureSession: input.sessions.ensureSession,
+        appendItem: input.sessions.appendItem,
+        getSession: input.sessions.getSession,
+        persistSession: input.sessionLogger.persistSession,
+        setInvestigationState: input.sessions.setInvestigationState,
+        normalize: input.normalizerService.normalize,
        executeRouteRuntime: (route, fragmentText, options) => input.dataLayer.executeRouteRuntime(route, fragmentText, options),
        tryAddressQueryHandle: (messageUsed, options) => input.addressQueryService.tryHandle(messageUsed, options),
        chatClient: input.chatClient,