aline-ai 0.6.6__py3-none-any.whl → 0.7.0__py3-none-any.whl

realign/watcher_core.py

@@ -259,6 +259,54 @@ class DialogueWatcher:
         except Exception:
             return
 
+    def _agent_info_id_for_codex_session(
+        self, session_file: Path, *, db=None
+    ) -> Optional[str]:
+        """Best-effort: resolve agent_info_id from a codex session file."""
+        try:
+            from .codex_home import codex_home_owner_from_session_file
+        except Exception:
+            return None
+
+        try:
+            owner = codex_home_owner_from_session_file(session_file)
+        except Exception:
+            owner = None
+        if not owner or owner[0] != "terminal":
+            return None
+        terminal_id = owner[1]
+        if not terminal_id:
+            return None
+
+        try:
+            if db is None:
+                from .db import get_database
+
+                db = get_database(read_only=True)
+            agent = db.get_agent_by_id(terminal_id)
+        except Exception:
+            return None
+
+        source = (agent.source or "").strip() if agent else ""
+        if source.startswith("agent:"):
+            return source[6:]
+        return None
+
+    def _terminal_id_for_codex_session(self, session_file: Path) -> Optional[str]:
+        """Best-effort: resolve terminal_id from codex session file path."""
+        try:
+            from .codex_home import codex_home_owner_from_session_file
+        except Exception:
+            return None
+
+        try:
+            owner = codex_home_owner_from_session_file(session_file)
+        except Exception:
+            owner = None
+        if not owner or owner[0] != "terminal":
+            return None
+        return owner[1]
+
         try:
             from .codex_home import codex_home_owner_from_session_file
             from .codex_terminal_linker import read_codex_session_meta, select_agent_for_codex_session
@@ -326,6 +374,18 @@ class DialogueWatcher:
                 source=source,
             )
 
+            try:
+                db.insert_window_link(
+                    terminal_id=agent_id,
+                    agent_id=agent_info_id,
+                    session_id=session_file.stem,
+                    provider="codex",
+                    source="codex:watcher",
+                    ts=time.time(),
+                )
+            except Exception:
+                pass
+
             # Link session to agent_info if available (bidirectional linking)
             if agent_info_id:
                 try:
@@ -851,6 +911,23 @@ class DialogueWatcher:
                     file=sys.stderr,
                 )
 
+                agent_id = None
+                if session_type == "codex":
+                    agent_id = self._agent_info_id_for_codex_session(session_file, db=db)
+                    terminal_id = self._terminal_id_for_codex_session(session_file)
+                    if terminal_id:
+                        try:
+                            db.insert_window_link(
+                                terminal_id=terminal_id,
+                                agent_id=agent_id,
+                                session_id=session_id,
+                                provider="codex",
+                                source="codex:watcher",
+                                ts=time.time(),
+                            )
+                        except Exception:
+                            pass
+
                 enqueued = 0
                 for turn in missing_turns:
                     try:
@@ -859,6 +936,7 @@ class DialogueWatcher:
                             workspace_path=project_path,
                             turn_number=turn,
                             session_type=session_type,
+                            agent_id=agent_id if agent_id else None,
                         )
                         enqueued += 1
                     except Exception as e:
@@ -992,6 +1070,22 @@ class DialogueWatcher:
                             continue
 
                         enqueued_any = False
+                        agent_id = None
+                        if session_type == "codex":
+                            agent_id = self._agent_info_id_for_codex_session(session_file, db=db)
+                            terminal_id = self._terminal_id_for_codex_session(session_file)
+                            if terminal_id:
+                                try:
+                                    db.insert_window_link(
+                                        terminal_id=terminal_id,
+                                        agent_id=agent_id,
+                                        session_id=session_id,
+                                        provider="codex",
+                                        source="codex:watcher",
+                                        ts=time.time(),
+                                    )
+                                except Exception:
+                                    pass
                         for turn_number in sorted(set(new_turns)):
                             try:
                                 db.enqueue_turn_summary_job(  # type: ignore[attr-defined]
@@ -999,6 +1093,7 @@ class DialogueWatcher:
                                     workspace_path=project_path,
                                     turn_number=int(turn_number),
                                     session_type=session_type,
+                                    agent_id=agent_id if agent_id else None,
                                 )
                                 enqueued_any = True
                             except Exception as e:
@@ -1249,13 +1344,31 @@ class DialogueWatcher:
                     continue
 
                 enqueued_any = False
+                session_type = self._detect_session_type(session_file)
+                agent_id = None
+                if session_type == "codex":
+                    agent_id = self._agent_info_id_for_codex_session(session_file, db=db)
+                    terminal_id = self._terminal_id_for_codex_session(session_file)
+                    if terminal_id:
+                        try:
+                            db.insert_window_link(
+                                terminal_id=terminal_id,
+                                agent_id=agent_id,
+                                session_id=session_file.stem,
+                                provider="codex",
+                                source="codex:watcher",
+                                ts=time.time(),
+                            )
+                        except Exception:
+                            pass
                 for turn_number in new_turns:
                     try:
                         db.enqueue_turn_summary_job(  # type: ignore[attr-defined]
                             session_file_path=session_file,
                             workspace_path=project_path,
                             turn_number=turn_number,
-                            session_type=self._detect_session_type(session_file),
+                            session_type=session_type,
+                            agent_id=agent_id if agent_id else None,
                         )
                         enqueued_any = True
                     except Exception as e:
@@ -1305,11 +1418,29 @@ class DialogueWatcher:
 
                 for turn_number in new_turns:
                     try:
+                        session_type = self._detect_session_type(session_file)
+                        agent_id = None
+                        if session_type == "codex":
+                            agent_id = self._agent_info_id_for_codex_session(session_file, db=db)
+                            terminal_id = self._terminal_id_for_codex_session(session_file)
+                            if terminal_id:
+                                try:
+                                    db.insert_window_link(
+                                        terminal_id=terminal_id,
+                                        agent_id=agent_id,
+                                        session_id=session_file.stem,
+                                        provider="codex",
+                                        source="codex:watcher",
+                                        ts=time.time(),
+                                    )
+                                except Exception:
+                                    pass
                         db.enqueue_turn_summary_job(  # type: ignore[attr-defined]
                             session_file_path=session_file,
                             workspace_path=project_path,
                             turn_number=turn_number,
-                            session_type=self._detect_session_type(session_file),
+                            session_type=session_type,
+                            agent_id=agent_id if agent_id else None,
                         )
                     except Exception:
                         continue

realign/worker_core.py

@@ -224,9 +224,12 @@ class AlineWorker:
         )
 
         # Link session to agent after commit ensures session exists in DB
-        if agent_id and session_id:
+        if session_id:
             try:
-                self.db.update_session_agent_id(session_id, agent_id)
+                if agent_id:
+                    self.db.update_session_agent_id(session_id, agent_id)
+                else:
+                    self._maybe_link_session_from_terminal(session_id)
             except Exception:
                 pass
 
@@ -261,6 +264,38 @@ class AlineWorker:
         except Exception as e:
             logger.warning(f"Failed to enqueue session summary after import for {session_id}: {e}")
 
+    def _maybe_link_session_from_terminal(self, session_id: str) -> None:
+        """Best-effort: backfill sessions.agent_id using terminal mapping."""
+        try:
+            session = self.db.get_session_by_id(session_id)
+            if session and getattr(session, "agent_id", None):
+                return
+        except Exception:
+            return
+
+        try:
+            agents = self.db.list_agents(status=None, limit=1000)
+        except Exception:
+            return
+
+        agent_info_id = None
+        for agent in agents:
+            try:
+                if (agent.session_id or "").strip() != session_id:
+                    continue
+                source = (agent.source or "").strip()
+                if source.startswith("agent:"):
+                    agent_info_id = source[6:]
+                    break
+            except Exception:
+                continue
+
+        if agent_info_id:
+            try:
+                self.db.update_session_agent_id(session_id, agent_info_id)
+            except Exception:
+                pass
+
     async def _process_session_summary_job(self, payload: Dict[str, Any]) -> bool:
         session_id = str(payload.get("session_id") or "")
         if not session_id: