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

2026-04-11 00:52:46 +03:00
parent ca467cdecc
commit 5e4cc0ed67
6 changed files with 261 additions and 45 deletions
@@ -1572,7 +1572,45 @@ Validation:
   - `assistantDeepTurnPackagingRuntimeAdapter.test.ts`
   - `assistantWave10SettlementCorrectiveRegression.test.ts`

-Status: **In progress (Phase 2.1 + 2.2 + 2.3 + 2.4 + 2.5 + 2.6 + 2.7 + 2.8 + 2.9 + 2.10 + 2.11 + 2.12 + 2.13 + 2.14 + 2.15 + 2.16 + 2.17 + 2.18 + 2.19 + 2.20 + 2.21 + 2.22 + 2.23 + 2.24 + 2.25 + 2.26 + 2.27 + 2.28 + 2.29 + 2.30 + 2.31 + 2.32 + 2.33 + 2.34 + 2.35 + 2.36 + 2.37 + 2.38 + 2.39 + 2.40 + 2.41 + 2.42 + 2.43 + 2.44 + 2.45 + 2.46 + 2.47 + 2.48 + 2.49 completed)**
+Implemented in current pass (Phase 2.50):
+1. Extracted organization-scope runtime logic from `assistantService` into dedicated adapter:
+   - `assistantOrganizationScopeRuntimeAdapter.ts`
+   - introduced:
+     - `resolveSessionOrganizationScopeContextRuntime(...)`
+     - `mergeFollowupContextWithOrganizationScopeRuntime(...)`
+2. Rewired `assistantService` scope helpers to delegate through the adapter (behavior-preserving):
+   - `resolveSessionOrganizationScopeContext(...)` now uses runtime adapter with existing extraction/scoring/sanitization helpers;
+   - `mergeFollowupContextWithOrganizationScope(...)` now uses runtime adapter while preserving existing normalization/toNonEmpty semantics.
+3. Added focused unit tests:
+   - `assistantOrganizationScopeRuntimeAdapter.test.ts`
+
+Validation:
+1. `npm run build` passed.
+2. Targeted living/address/deep followup pack passed:
+   - `assistantOrganizationScopeRuntimeAdapter.test.ts`
+   - `assistantTurnRuntimeDepsAdapter.test.ts`
+   - `assistantTurnRuntimeInputBuilder.test.ts`
+   - `assistantTurnAttemptRuntimeAdapter.test.ts`
+   - `assistantAddressAttemptRuntimeAdapter.test.ts`
+   - `assistantDeepTurnAttemptRuntimeAdapter.test.ts`
+   - `assistantDeepTurnResponseAttemptRuntimeAdapter.test.ts`
+   - `assistantDeepTurnAnalysisAttemptRuntimeAdapter.test.ts`
+   - `assistantDeepTurnAnalysisRuntimeAdapter.test.ts`
+   - `assistantAddressLaneResponseAttemptRuntimeAdapter.test.ts`
+   - `assistantLivingChatAttemptRuntimeAdapter.test.ts`
+   - `assistantAddressLaneAttemptRuntimeAdapter.test.ts`
+   - `assistantUserTurnBootstrapRuntimeAdapter.test.ts`
+   - `assistantLivingChatLlmRuntimeAdapter.test.ts`
+   - `assistantLivingChatHandlerRuntimeAdapter.test.ts`
+   - `assistantLivingChatRuntimeAdapter.test.ts`
+   - `assistantAddressRuntimeAdapter.test.ts`
+   - `assistantAddressLaneResponseRuntimeAdapter.test.ts`
+   - `assistantDeepTurnResponseRuntimeAdapter.test.ts`
+   - `assistantDeepTurnPackagingRuntimeAdapter.test.ts`
+   - `assistantWave10SettlementCorrectiveRegression.test.ts`
+   - `assistantLivingChatMode.test.ts`
+
+Status: **In progress (Phase 2.1 + 2.2 + 2.3 + 2.4 + 2.5 + 2.6 + 2.7 + 2.8 + 2.9 + 2.10 + 2.11 + 2.12 + 2.13 + 2.14 + 2.15 + 2.16 + 2.17 + 2.18 + 2.19 + 2.20 + 2.21 + 2.22 + 2.23 + 2.24 + 2.25 + 2.26 + 2.27 + 2.28 + 2.29 + 2.30 + 2.31 + 2.32 + 2.33 + 2.34 + 2.35 + 2.36 + 2.37 + 2.38 + 2.39 + 2.40 + 2.41 + 2.42 + 2.43 + 2.44 + 2.45 + 2.46 + 2.47 + 2.48 + 2.49 + 2.50 completed)**

 ## Stage 3 (P2): Hybrid Semantic Layer (LLM + Deterministic Guards)