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

llm_normalizer/backend/dist/services/assistantOrganizationScopeRuntimeAdapter.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSessionOrganizationScopeContextRuntime = resolveSessionOrganizationScopeContextRuntime;
+exports.mergeFollowupContextWithOrganizationScopeRuntime = mergeFollowupContextWithOrganizationScopeRuntime;
+function resolveSessionOrganizationScopeContextRuntime(input) {
+    const knownOrganizations = input.extractKnownOrganizationsFromHistory(input.items);
+    const selectedOrganization = input.resolveOrganizationSelectionFromMessage(input.userMessage, knownOrganizations);
+    const lastActiveOrganization = input.findLastAssistantActiveOrganization(input.items);
+    const activeOrganization = selectedOrganization ?? input.normalizeOrganizationScopeValue(lastActiveOrganization);
+    return {
+        knownOrganizations,
+        selectedOrganization,
+        activeOrganization
+    };
+}
+function mergeFollowupContextWithOrganizationScopeRuntime(input) {
+    const normalizedOrganization = input.normalizeOrganizationScopeValue(input.organization);
+    const hasBase = input.followupContext && typeof input.followupContext === "object";
+    const base = hasBase ? { ...input.followupContext } : {};
+    if (!normalizedOrganization) {
+        return hasBase ? base : null;
+    }
+    const previousFiltersRaw = base.previous_filters;
+    const previousFilters = previousFiltersRaw && typeof previousFiltersRaw === "object"
+        ? { ...previousFiltersRaw }
+        : {};
+    if (!input.toNonEmptyString(previousFilters.organization)) {
+        previousFilters.organization = normalizedOrganization;
+    }
+    base.previous_filters = previousFilters;
+    return base;
+}

llm_normalizer/backend/dist/services/assistantService.js

@@ -65,6 +65,7 @@ const assistantCanon_1 = __importStar(require("./assistantCanon"));
 const assistantAddressAttemptRuntimeAdapter_1 = __importStar(require("./assistantAddressAttemptRuntimeAdapter"));
 const assistantCoverageGrounding_1 = __importStar(require("./assistantCoverageGrounding"));
 const assistantDeepTurnAttemptRuntimeAdapter_1 = __importStar(require("./assistantDeepTurnAttemptRuntimeAdapter"));
+const assistantOrganizationScopeRuntimeAdapter_1 = __importStar(require("./assistantOrganizationScopeRuntimeAdapter"));
 const assistantTurnAttemptRuntimeAdapter_1 = __importStar(require("./assistantTurnAttemptRuntimeAdapter"));
 const assistantTurnRuntimeDepsAdapter_1 = __importStar(require("./assistantTurnRuntimeDepsAdapter"));
 const assistantTurnRuntimeInputBuilder_1 = __importStar(require("./assistantTurnRuntimeInputBuilder"));
@@ -3772,30 +3773,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
+    });
 }
 function resolveSessionOrganizationScopeContextForTests(userMessage, items) {
     return resolveSessionOrganizationScopeContext(userMessage, items);