ГЛОБАЛЬНЫЙ РЕФАКТОРИНГ АРХИТЕКТУРЫ - Рефакторинг этапов 2.50: вынос resolveSessionOrganizationScopeContext(...) + related scope sanitation в отдельный runtime-adapter, чтобы добить верхний слой assistantService.

llm_normalizer/backend/src/services/assistantService.ts

@@ -19,6 +19,7 @@ import * as assistantCanon_1 from "./assistantCanon";
 import * as assistantAddressAttemptRuntimeAdapter_1 from "./assistantAddressAttemptRuntimeAdapter";
 import * as assistantCoverageGrounding_1 from "./assistantCoverageGrounding";
 import * as assistantDeepTurnAttemptRuntimeAdapter_1 from "./assistantDeepTurnAttemptRuntimeAdapter";
+import * as assistantOrganizationScopeRuntimeAdapter_1 from "./assistantOrganizationScopeRuntimeAdapter";
 import * as assistantTurnAttemptRuntimeAdapter_1 from "./assistantTurnAttemptRuntimeAdapter";
 import * as assistantTurnRuntimeDepsAdapter_1 from "./assistantTurnRuntimeDepsAdapter";
 import * as assistantTurnRuntimeInputBuilder_1 from "./assistantTurnRuntimeInputBuilder";
@@ -3727,30 +3728,22 @@ function resolveOrganizationSelectionFromMessage(userMessage, knownOrganizations
     return best.organization;
 }
 function resolveSessionOrganizationScopeContext(userMessage, items) {
-    const knownOrganizations = extractKnownOrganizationsFromHistory(items);
-    const selectedOrganization = resolveOrganizationSelectionFromMessage(userMessage, knownOrganizations);
-    const lastActiveOrganization = findLastAssistantActiveOrganization(items);
-    const activeOrganization = selectedOrganization ?? normalizeOrganizationScopeValue(lastActiveOrganization);
-    return {
-        knownOrganizations,
-        selectedOrganization,
-        activeOrganization
-    };
+    return (0, assistantOrganizationScopeRuntimeAdapter_1.resolveSessionOrganizationScopeContextRuntime)({
+        userMessage,
+        items,
+        extractKnownOrganizationsFromHistory,
+        resolveOrganizationSelectionFromMessage,
+        findLastAssistantActiveOrganization,
+        normalizeOrganizationScopeValue
+    });
 }
 function mergeFollowupContextWithOrganizationScope(followupContext, organization) {
-    const normalizedOrganization = normalizeOrganizationScopeValue(organization);
-    const base = followupContext && typeof followupContext === "object" ? { ...followupContext } : {};
-    if (!normalizedOrganization) {
-        return followupContext && typeof followupContext === "object" ? base : null;
-    }
-    const previousFilters = base.previous_filters && typeof base.previous_filters === "object"
-        ? { ...base.previous_filters }
-        : {};
-    if (!toNonEmptyString(previousFilters.organization)) {
-        previousFilters.organization = normalizedOrganization;
-    }
-    base.previous_filters = previousFilters;
-    return base;
+    return (0, assistantOrganizationScopeRuntimeAdapter_1.mergeFollowupContextWithOrganizationScopeRuntime)({
+        followupContext,
+        organization,
+        normalizeOrganizationScopeValue,
+        toNonEmptyString
+    });
 }
 export function resolveSessionOrganizationScopeContextForTests(userMessage, items) {
     return resolveSessionOrganizationScopeContext(userMessage, items);