aline-ai 0.6.5__py3-none-any.whl → 0.6.7__py3-none-any.whl

realign/codex_terminal_linker.py

@@ -13,6 +13,7 @@ from __future__ import annotations
 import json
 from dataclasses import dataclass
 from datetime import datetime, timezone
+import os
 from pathlib import Path
 from typing import Iterable, Optional, Protocol
 
@@ -42,6 +43,16 @@ def _parse_iso8601(ts: str) -> Optional[datetime]:
     return dt
 
 
+def _normalize_cwd(cwd: str | None) -> str:
+    raw = (cwd or "").strip()
+    if not raw:
+        return ""
+    try:
+        return os.path.normpath(raw)
+    except Exception:
+        return raw.rstrip("/\\")
+
+
 def read_codex_session_meta(session_file: Path) -> Optional[CodexSessionMeta]:
     """Extract Codex session metadata from a session file (best-effort)."""
     try:
@@ -108,10 +119,10 @@ def select_agent_for_codex_session(
     agents: Iterable[_AgentLike],
     *,
     session: CodexSessionMeta,
-    max_time_delta_seconds: int = 6 * 60 * 60,
+    max_time_delta_seconds: Optional[int] = 6 * 60 * 60,
 ) -> Optional[str]:
     """Pick the best active Codex terminal for a Codex session file (best-effort)."""
-    cwd = (session.cwd or "").strip()
+    cwd = _normalize_cwd(session.cwd)
     if not cwd:
         return None
 
@@ -122,7 +133,7 @@ def select_agent_for_codex_session(
                 continue
             if getattr(a, "provider", "") != "codex":
                 continue
-            if (getattr(a, "cwd", None) or "").strip() != cwd:
+            if _normalize_cwd(getattr(a, "cwd", None)) != cwd:
                 continue
             # Avoid clobbering an existing binding to a different session.
             existing_sid = (getattr(a, "session_id", None) or "").strip()
@@ -165,8 +176,8 @@ def select_agent_for_codex_session(
 
     if best_id is None:
         return None
-    if best_delta is not None and best_delta > max_time_delta_seconds:
-        # Ambiguous: don't bind if terminals are too far from the session start.
-        return None
+    if max_time_delta_seconds is not None and best_delta is not None:
+        if best_delta > max_time_delta_seconds:
+            # Ambiguous: don't bind if terminals are too far from the session start.
+            return None
     return best_id
-

realign/commands/agent.py

@@ -0,0 +1,109 @@
+"""Agent management commands."""
+
+import uuid
+from pathlib import Path
+
+from rich.console import Console
+
+console = Console()
+
+
+def _get_db():
+    """Get database instance."""
+    from ..config import ReAlignConfig
+    from ..db.sqlite_db import SQLiteDatabase
+
+    config = ReAlignConfig.load()
+    db_path = Path(config.sqlite_db_path).expanduser()
+    db = SQLiteDatabase(str(db_path))
+    db.initialize()
+    return db
+
+
+def agent_new_command(name: str | None = None, desc: str = "") -> int:
+    """Create a new agent profile.
+
+    Args:
+        name: Display name (random Docker-style name if None).
+        desc: Agent description.
+
+    Returns:
+        Exit code (0 = success).
+    """
+    from ..agent_names import generate_agent_name
+
+    agent_id = str(uuid.uuid4())
+    display_name = name or generate_agent_name()
+
+    db = _get_db()
+    try:
+        record = db.get_or_create_agent_info(agent_id, name=display_name)
+        if desc:
+            record = db.update_agent_info(agent_id, description=desc)
+
+        console.print(f"[bold green]Agent created[/bold green]")
+        console.print(f"  id:          {record.id}")
+        console.print(f"  name:        {record.name}")
+        console.print(f"  description: {record.description or '(none)'}")
+        return 0
+    finally:
+        db.close()
+
+
+def agent_list_command(*, include_invisible: bool = False) -> int:
+    """List agent profiles.
+
+    Returns:
+        Exit code (0 = success).
+    """
+    from rich.table import Table
+
+    db = _get_db()
+    try:
+        agents = db.list_agent_info(include_invisible=include_invisible)
+
+        if not agents:
+            console.print("[dim]No agents yet.[/dim]")
+            return 0
+
+        table = Table(title="Agents")
+        table.add_column("ID", style="dim", width=8)
+        table.add_column("Name", style="bold")
+        table.add_column("Description")
+        table.add_column("Sessions", style="cyan")
+        table.add_column("Created", style="dim")
+
+        def _unique_prefixes(ids: list[str], min_len: int = 8) -> list[str]:
+            if not ids:
+                return []
+            max_len = max(len(i) for i in ids)
+            length = min_len
+            while length <= max_len:
+                prefixes = [i[:length] for i in ids]
+                if len(set(prefixes)) == len(ids):
+                    return prefixes
+                length += 2
+            return ids
+
+        for agent in agents:
+            created_str = agent.created_at.strftime("%Y-%m-%d %H:%M")
+            sessions = db.get_sessions_by_agent_id(agent.id)
+            if sessions:
+                raw_ids = [s.id for s in sessions]
+                short_ids = _unique_prefixes(raw_ids, min_len=8)
+                session_ids = ", ".join(short_ids)
+                sessions_display = f"{len(sessions)} ({session_ids})"
+            else:
+                sessions_display = "0"
+            table.add_row(
+                agent.id[:8],
+                agent.name,
+                agent.description or "",
+                sessions_display,
+                created_str,
+            )
+
+        console.print(table)
+        return 0
+    finally:
+        db.close()

realign/commands/doctor.py

@@ -435,6 +435,17 @@ def run_doctor(
     except Exception as e:
         console.print(f"  [yellow]![/yellow] Failed to check jobs: {e}")
 
+    # 5b. Repair agent/session associations
+    console.print("\n[bold]5b. Repairing agent/session associations...[/bold]")
+    try:
+        repaired = _repair_agent_session_links(verbose=verbose)
+        if repaired > 0:
+            console.print(f"  [green]✓[/green] Repaired {repaired} session(s)")
+        else:
+            console.print("  [green]✓[/green] No missing associations found")
+    except Exception as e:
+        console.print(f"  [yellow]![/yellow] Failed to repair associations: {e}")
+
     # 6. Restart/ensure daemons
     if restart_daemons:
         console.print("\n[bold]6. Checking daemons...[/bold]")
@@ -472,6 +483,69 @@ def run_doctor(
     return 0
 
 
+def _repair_agent_session_links(*, verbose: bool = False) -> int:
+    """Backfill sessions.agent_id using windowlink and agents mappings."""
+    try:
+        from ..db import get_database
+
+        db = get_database(read_only=False)
+    except Exception:
+        return 0
+
+    repaired = 0
+
+    # 1) Use windowlink latest records
+    try:
+        links = db.list_latest_window_links(limit=5000)
+    except Exception:
+        links = []
+
+    for link in links:
+        session_id = (link.session_id or "").strip()
+        agent_id = (link.agent_id or "").strip()
+        if not session_id or not agent_id:
+            continue
+        try:
+            session = db.get_session_by_id(session_id)
+            if session and getattr(session, "agent_id", None):
+                continue
+        except Exception:
+            pass
+        try:
+            db.update_session_agent_id(session_id, agent_id)
+            repaired += 1
+        except Exception:
+            continue
+
+    # 2) Fallback: agents table mapping (session_id -> agent source)
+    try:
+        agents = db.list_agents(status=None, limit=5000)
+    except Exception:
+        agents = []
+    for agent in agents:
+        session_id = (agent.session_id or "").strip()
+        source = (agent.source or "").strip()
+        if not session_id or not source.startswith("agent:"):
+            continue
+        agent_id = source[6:]
+        try:
+            session = db.get_session_by_id(session_id)
+            if session and getattr(session, "agent_id", None):
+                continue
+        except Exception:
+            pass
+        try:
+            db.update_session_agent_id(session_id, agent_id)
+            repaired += 1
+        except Exception:
+            continue
+
+    if verbose and repaired:
+        console.print(f"  [dim]Repaired session links: {repaired}[/dim]")
+
+    return repaired
+
+
 def doctor_command(
     no_restart: bool = typer.Option(False, "--no-restart", help="Only repair files, don't restart daemons"),
     verbose: bool = typer.Option(False, "--verbose", "-v", help="Show detailed output"),
@@ -494,4 +568,3 @@ def doctor_command(
         clear_cache=True,
     )
     raise typer.Exit(code=exit_code)
-