Фиксация изменений

app/modules/chat/service.py

@@ -6,6 +6,7 @@ from app.modules.contracts import AgentRunner
 from app.schemas.chat import ChatMessageRequest, TaskResultType, TaskStatus
 from app.schemas.common import ErrorPayload, ModuleName
 from app.modules.chat.dialog_store import DialogSessionStore
+from app.modules.chat.session_resolver import ChatSessionResolver
 from app.modules.chat.task_store import TaskState, TaskStore
 from app.modules.shared.event_bus import EventBus
 from app.modules.shared.idempotency_store import IdempotencyStore
@@ -41,6 +42,7 @@ class ChatOrchestrator:
         self._retry = retry
         self._rag_session_exists = rag_session_exists
         self._message_sink = message_sink
+        self._session_resolver = ChatSessionResolver(dialogs, rag_session_exists)
 
     async def enqueue_message(
         self,
@@ -52,7 +54,7 @@ class ChatOrchestrator:
             if existing:
                 task = self._task_store.get(existing)
                 if task:
-                    LOGGER.warning(
+                    LOGGER.info(
                         "enqueue_message reused task by idempotency key: task_id=%s mode=%s",
                         task.task_id,
                         request.mode.value,
@@ -63,7 +65,7 @@ class ChatOrchestrator:
         if idempotency_key:
             self._idempotency.put(idempotency_key, task.task_id)
         asyncio.create_task(self._process_task(task.task_id, request))
-        LOGGER.warning(
+        LOGGER.info(
             "enqueue_message created task: task_id=%s mode=%s",
             task.task_id,
             request.mode.value,
@@ -135,6 +137,13 @@ class ChatOrchestrator:
             task.changeset = result.changeset
             if task.result_type == TaskResultType.ANSWER and task.answer:
                 self._message_sink(dialog_session_id, "assistant", task.answer, task_id=task_id)
+                LOGGER.warning(
+                    "outgoing chat response: task_id=%s dialog_session_id=%s result_type=%s answer=%s",
+                    task_id,
+                    dialog_session_id,
+                    task.result_type.value,
+                    _truncate_for_log(task.answer),
+                )
             elif task.result_type == TaskResultType.CHANGESET:
                 self._message_sink(
                     dialog_session_id,
@@ -146,6 +155,14 @@ class ChatOrchestrator:
                         "changeset": [item.model_dump(mode="json") for item in task.changeset],
                     },
                 )
+                LOGGER.warning(
+                    "outgoing chat response: task_id=%s dialog_session_id=%s result_type=%s changeset_items=%s answer=%s",
+                    task_id,
+                    dialog_session_id,
+                    task.result_type.value,
+                    len(task.changeset),
+                    _truncate_for_log(task.answer or ""),
+                )
             self._task_store.save(task)
             await self._events.publish(
                 task_id,
@@ -160,7 +177,7 @@ class ChatOrchestrator:
                 },
             )
             await self._publish_progress(task_id, "task.done", "Обработка завершена.", progress=100)
-            LOGGER.warning(
+            LOGGER.info(
                 "_process_task completed: task_id=%s status=%s result_type=%s changeset_items=%s",
                 task_id,
                 task.status.value,
@@ -232,7 +249,7 @@ class ChatOrchestrator:
         if progress is not None:
             payload["progress"] = max(0, min(100, int(progress)))
         await self._events.publish(task_id, kind, payload)
-        LOGGER.warning(
+        LOGGER.debug(
             "_publish_progress emitted: task_id=%s kind=%s stage=%s progress=%s",
             task_id,
             kind,
@@ -259,35 +276,7 @@ class ChatOrchestrator:
                     meta={"heartbeat": True},
                 )
                 index += 1
-        LOGGER.warning("_run_heartbeat stopped: task_id=%s ticks=%s", task_id, index)
+        LOGGER.debug("_run_heartbeat stopped: task_id=%s ticks=%s", task_id, index)
 
     def _resolve_sessions(self, request: ChatMessageRequest) -> tuple[str, str]:
-        # Legacy compatibility: old session_id/project_id flow.
-        if request.dialog_session_id and request.rag_session_id:
-            dialog = self._dialogs.get(request.dialog_session_id)
-            if not dialog:
-                raise AppError("dialog_not_found", "Dialog session not found", ModuleName.BACKEND)
-            if dialog.rag_session_id != request.rag_session_id:
-                raise AppError("dialog_rag_mismatch", "Dialog session does not belong to rag session", ModuleName.BACKEND)
-            LOGGER.warning(
-                "_resolve_sessions resolved by dialog_session_id: dialog_session_id=%s rag_session_id=%s",
-                request.dialog_session_id,
-                request.rag_session_id,
-            )
-            return request.dialog_session_id, request.rag_session_id
-
-        if request.session_id and request.project_id:
-            if not self._rag_session_exists(request.project_id):
-                raise AppError("rag_session_not_found", "RAG session not found", ModuleName.RAG)
-            LOGGER.warning(
-                "_resolve_sessions resolved by legacy session/project: session_id=%s project_id=%s",
-                request.session_id,
-                request.project_id,
-            )
-            return request.session_id, request.project_id
-
-        raise AppError(
-            "missing_sessions",
-            "dialog_session_id and rag_session_id are required",
-            ModuleName.BACKEND,
-        )
+        return self._session_resolver.resolve(request)