ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.39: вынос bootstrap пользовательского хода (нормализация текста + append/persist user-item) из handleMessage в отдельный runtime-адаптер. Это безопасно и дополнительно разгружает assistantService.

2026-04-10 23:09:23 +03:00
parent 0cc8f71068
commit 5520dbccbc
6 changed files with 223 additions and 43 deletions
@@ -35,6 +35,7 @@ import * as assistantDeepTurnRetrievalRuntimeAdapter_1 from "./assistantDeepTurn
 import * as assistantAddressRuntimeAdapter_1 from "./assistantAddressRuntimeAdapter";
 import * as assistantLivingChatHandlerRuntimeAdapter_1 from "./assistantLivingChatHandlerRuntimeAdapter";
 import * as assistantLivingChatLlmRuntimeAdapter_1 from "./assistantLivingChatLlmRuntimeAdapter";
+import * as assistantUserTurnBootstrapRuntimeAdapter_1 from "./assistantUserTurnBootstrapRuntimeAdapter";
 import * as assistantQueryPlanning_1 from "./assistantQueryPlanning";
 import iconv from "iconv-lite";
 const DATA_SCOPE_CACHE_TTL_MS = 60_000;
@@ -4339,27 +4340,18 @@ export class AssistantService {
        return this.sessions.getSession(sessionId);
    }
    async handleMessage(payload) {
-        const session = this.sessions.ensureSession(payload.session_id);
-        const sessionId = session.session_id;
-        const userMessageRaw = String(payload.user_message ?? payload.message ?? "").trim();
-        const repairedUserMessage = compactWhitespace(repairAddressMojibake(userMessageRaw));
-        const userMessage = repairedUserMessage || userMessageRaw;
-        const runtimeAnalysisContext = resolveRuntimeAnalysisContext(payload?.context);
-        const userItem = {
-            message_id: `msg-${(0, nanoid_1.nanoid)(10)}`,
-            session_id: sessionId,
-            role: "user",
-            text: userMessage,
-            reply_type: null,
-            created_at: new Date().toISOString(),
-            trace_id: null,
-            debug: null
-        };
-        this.sessions.appendItem(sessionId, userItem);
-        const sessionAfterUserAppend = this.sessions.getSession(sessionId);
-        if (sessionAfterUserAppend) {
-            this.sessionLogger.persistSession(sessionAfterUserAppend);
-        }
+        const { session, sessionId, userMessage, runtimeAnalysisContext, userItem } = (0, assistantUserTurnBootstrapRuntimeAdapter_1.runAssistantUserTurnBootstrapRuntime)({
+            payload,
+            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),
+            compactWhitespace,
+            repairAddressMojibake,
+            resolveRuntimeAnalysisContext,
+            messageIdFactory: () => `msg-${(0, nanoid_1.nanoid)(10)}`,
+            nowIso: () => new Date().toISOString()
+        });
        const sessionOrganizationScope = resolveSessionOrganizationScopeContext(userMessage, session.items);
        const finalizeAddressLaneResponse = (addressLane, effectiveAddressUserMessage, carryoverMeta = null, llmPreDecomposeMeta = null) => {
            const runtime = (0, assistantAddressLaneResponseRuntimeAdapter_1.runAssistantAddressLaneResponseRuntime)({
@@ -0,0 +1,64 @@
+import type { AssistantConversationItem, AssistantSessionState } from "../types/assistant";
+
+export interface AssistantUserTurnBootstrapPayloadLike {
+  session_id?: unknown;
+  user_message?: unknown;
+  message?: unknown;
+  context?: unknown;
+}
+
+export interface RunAssistantUserTurnBootstrapRuntimeInput {
+  payload: AssistantUserTurnBootstrapPayloadLike;
+  ensureSession: (sessionId: string) => AssistantSessionState;
+  appendItem: (sessionId: string, item: AssistantConversationItem) => void;
+  getSession: (sessionId: string) => AssistantSessionState | null;
+  persistSession: (session: AssistantSessionState) => void;
+  compactWhitespace: (value: unknown) => string;
+  repairAddressMojibake: (value: unknown) => string;
+  resolveRuntimeAnalysisContext: (value: unknown) => { as_of_date: string | null };
+  messageIdFactory?: () => string;
+  nowIso?: () => string;
+}
+
+export interface RunAssistantUserTurnBootstrapRuntimeOutput {
+  session: AssistantSessionState;
+  sessionId: string;
+  userMessageRaw: string;
+  userMessage: string;
+  runtimeAnalysisContext: { as_of_date: string | null };
+  userItem: AssistantConversationItem;
+}
+
+export function runAssistantUserTurnBootstrapRuntime(
+  input: RunAssistantUserTurnBootstrapRuntimeInput
+): RunAssistantUserTurnBootstrapRuntimeOutput {
+  const session = input.ensureSession(String(input.payload.session_id ?? ""));
+  const sessionId = session.session_id;
+  const userMessageRaw = String(input.payload.user_message ?? input.payload.message ?? "").trim();
+  const repairedUserMessage = input.compactWhitespace(input.repairAddressMojibake(userMessageRaw));
+  const userMessage = repairedUserMessage || userMessageRaw;
+  const runtimeAnalysisContext = input.resolveRuntimeAnalysisContext(input.payload?.context);
+  const userItem: AssistantConversationItem = {
+    message_id: (input.messageIdFactory ?? (() => "msg-unknown"))(),
+    session_id: sessionId,
+    role: "user",
+    text: userMessage,
+    reply_type: null,
+    created_at: (input.nowIso ?? (() => new Date().toISOString()))(),
+    trace_id: null,
+    debug: null
+  };
+  input.appendItem(sessionId, userItem);
+  const sessionAfterUserAppend = input.getSession(sessionId);
+  if (sessionAfterUserAppend) {
+    input.persistSession(sessionAfterUserAppend);
+  }
+  return {
+    session,
+    sessionId,
+    userMessageRaw,
+    userMessage,
+    runtimeAnalysisContext,
+    userItem
+  };
+}