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

realign/dashboard/screens/create_agent_info.py

@@ -7,9 +7,10 @@ from typing import Optional
 
 from textual.app import ComposeResult
 from textual.binding import Binding
-from textual.containers import Container, Horizontal
+from textual.containers import Container, Horizontal, Vertical
 from textual.screen import ModalScreen
 from textual.widgets import Button, Input, Label, Static
+from textual.worker import Worker, WorkerState
 
 from ...logging_config import setup_logger
 
@@ -17,8 +18,9 @@ logger = setup_logger("realign.dashboard.screens.create_agent_info", "dashboard.
 
 
 class CreateAgentInfoScreen(ModalScreen[Optional[dict]]):
-    """Modal to create a new agent profile.
+    """Modal to create a new agent profile or import from a share link.
 
+    Both options are shown together; the user picks one.
     Returns a dict with agent info on success, None on cancel.
     """
 
@@ -32,7 +34,7 @@ class CreateAgentInfoScreen(ModalScreen[Optional[dict]]):
     }
 
     CreateAgentInfoScreen #create-agent-info-root {
-        width: 60;
+        width: 65;
         height: auto;
         max-height: 80%;
         padding: 1 2;
@@ -54,41 +56,92 @@ class CreateAgentInfoScreen(ModalScreen[Optional[dict]]):
     }
 
     CreateAgentInfoScreen Input {
-        height: auto;
         margin-top: 0;
+        border: none;
+    }
+
+    CreateAgentInfoScreen #or-separator {
+        height: auto;
+        margin-top: 1;
+        margin-bottom: 0;
+        text-align: center;
+        color: $text-muted;
+    }
+
+    CreateAgentInfoScreen #import-status {
+        height: auto;
+        margin-top: 1;
+        color: $text-muted;
+    }
+
+    CreateAgentInfoScreen #create-buttons {
+        height: auto;
+        margin-top: 1;
+        align: right middle;
     }
 
-    CreateAgentInfoScreen #buttons {
+    CreateAgentInfoScreen #import-buttons {
         height: auto;
-        margin-top: 2;
+        margin-top: 1;
         align: right middle;
     }
 
-    CreateAgentInfoScreen #buttons Button {
+    CreateAgentInfoScreen #create-buttons Button {
+        margin-left: 1;
+    }
+
+    CreateAgentInfoScreen #import-buttons Button {
         margin-left: 1;
     }
     """
 
+    def __init__(self) -> None:
+        super().__init__()
+        self._import_worker: Optional[Worker] = None
+        from ...agent_names import generate_agent_name
+        self._default_name: str = generate_agent_name()
+
     def compose(self) -> ComposeResult:
         with Container(id="create-agent-info-root"):
             yield Static("Create Agent Profile", id="create-agent-info-title")
 
+            # --- Create New section ---
             yield Label("Name", classes="section-label")
-            yield Input(placeholder="Agent name (leave blank for random)", id="agent-name")
-
-            yield Label("Description", classes="section-label")
-            yield Input(placeholder="Optional description", id="agent-description")
+            yield Input(placeholder=self._default_name, id="agent-name")
 
-            with Horizontal(id="buttons"):
+            with Horizontal(id="create-buttons"):
                 yield Button("Cancel", id="cancel")
                 yield Button("Create", id="create", variant="primary")
 
+            # --- Separator ---
+            yield Static("-- Or --", id="or-separator")
+
+            # --- Import from Link section ---
+            yield Label("Import from Link", classes="section-label")
+            yield Input(placeholder="https://realign-server.vercel.app/share/...", id="share-url")
+
+            yield Label("Password (optional)", classes="section-label")
+            yield Input(placeholder="Leave blank if not password-protected", id="share-password", password=True)
+
+            yield Static("", id="import-status")
+
+            with Horizontal(id="import-buttons"):
+                yield Button("Import", id="import", variant="primary")
+
     def on_mount(self) -> None:
         self.query_one("#agent-name", Input).focus()
 
     def action_close(self) -> None:
         self.dismiss(None)
 
+    def _set_busy(self, busy: bool) -> None:
+        self.query_one("#agent-name", Input).disabled = busy
+        self.query_one("#share-url", Input).disabled = busy
+        self.query_one("#share-password", Input).disabled = busy
+        self.query_one("#create", Button).disabled = busy
+        self.query_one("#cancel", Button).disabled = busy
+        self.query_one("#import", Button).disabled = busy
+
     async def on_button_pressed(self, event: Button.Pressed) -> None:
         button_id = event.button.id or ""
 
@@ -100,28 +153,30 @@ class CreateAgentInfoScreen(ModalScreen[Optional[dict]]):
             await self._create_agent()
             return
 
+        if button_id == "import":
+            await self._import_agent()
+            return
+
     async def on_input_submitted(self, event: Input.Submitted) -> None:
         """Handle enter key in input fields."""
-        await self._create_agent()
+        input_id = event.input.id or ""
+        if input_id == "agent-name":
+            await self._create_agent()
+        elif input_id in ("share-url", "share-password"):
+            await self._import_agent()
 
     async def _create_agent(self) -> None:
         """Create the agent profile."""
         try:
-            from ...agent_names import generate_agent_name
             from ...db import get_database
 
             name_input = self.query_one("#agent-name", Input).value.strip()
-            description = self.query_one("#agent-description", Input).value.strip()
-
-            # Generate random name if not provided
-            name = name_input or generate_agent_name()
+            name = name_input or self._default_name
 
             agent_id = str(uuid.uuid4())
 
             db = get_database(read_only=False)
             record = db.get_or_create_agent_info(agent_id, name=name)
-            if description:
-                record = db.update_agent_info(agent_id, description=description)
 
             self.dismiss({
                 "id": record.id,
@@ -131,3 +186,59 @@ class CreateAgentInfoScreen(ModalScreen[Optional[dict]]):
         except Exception as e:
             logger.error(f"Failed to create agent: {e}")
             self.app.notify(f"Failed to create agent: {e}", severity="error")
+
+    async def _import_agent(self) -> None:
+        """Import an agent from a share link."""
+        share_url = self.query_one("#share-url", Input).value.strip()
+        password = self.query_one("#share-password", Input).value.strip() or None
+
+        if not share_url:
+            self.app.notify("Please enter a share URL", severity="warning")
+            self.query_one("#share-url", Input).focus()
+            return
+
+        if "/share/" not in share_url:
+            self.app.notify("Invalid share URL format", severity="warning")
+            self.query_one("#share-url", Input).focus()
+            return
+
+        status = self.query_one("#import-status", Static)
+        status.update("Importing...")
+        self._set_busy(True)
+
+        def do_import() -> dict:
+            from ...commands.import_shares import import_agent_from_share
+
+            return import_agent_from_share(share_url, password=password)
+
+        self._import_worker = self.run_worker(do_import, thread=True, exit_on_error=False)
+
+    def on_worker_state_changed(self, event: Worker.StateChanged) -> None:
+        if self._import_worker is None or event.worker is not self._import_worker:
+            return
+
+        status = self.query_one("#import-status", Static)
+
+        if event.state == WorkerState.ERROR:
+            err = self._import_worker.error if self._import_worker else "Unknown error"
+            status.update(f"Error: {err}")
+            self._set_busy(False)
+            return
+
+        if event.state != WorkerState.SUCCESS:
+            return
+
+        result = self._import_worker.result if self._import_worker else {}
+        if not result or not result.get("success"):
+            error_msg = (result or {}).get("error", "Import failed")
+            status.update(f"Error: {error_msg}")
+            self._set_busy(False)
+            return
+
+        self.dismiss({
+            "id": result["agent_id"],
+            "name": result["agent_name"],
+            "description": result.get("agent_description", ""),
+            "imported": True,
+            "sessions_imported": result.get("sessions_imported", 0),
+        })

realign/dashboard/styles/dashboard.tcss

@@ -156,79 +156,6 @@ Tab:hover {
     background: $surface-lighten-1;
 }
 
-/* Terminal tab: compact layout without "boxed" buttons/panels. */
-TerminalPanel {
-    padding: 0 1;
-}
-
-TerminalPanel:focus {
-    border: none;
-}
-
-TerminalPanel .summary {
-    background: transparent;
-    border: none;
-    padding: 0;
-    margin: 0 0 1 0;
-}
-
-TerminalPanel .list {
-    background: transparent;
-    border: none;
-    padding: 0;
-}
-
-TerminalPanel Button {
-    min-width: 0;
-    background: transparent;
-    border: none;
-    padding: 0 1;
-}
-
-TerminalPanel Button:hover {
-    background: $surface-lighten-1;
-}
-
-TerminalPanel .terminal-row Button.terminal-switch.active {
-    background: $primary;
-    color: $text;
-    text-style: bold;
-}
-
-TerminalPanel .terminal-row Button.terminal-switch {
-    text-align: left;
-    content-align: left top;
-}
-
-TerminalPanel .terminal-row Button.terminal-close {
-    padding: 0;
-    width: 3;
-    min-width: 3;
-}
-
-TerminalPanel .terminal-row Button.terminal-toggle {
-    padding: 0;
-    width: 3;
-    min-width: 3;
-}
-
-TerminalPanel .context-sessions {
-    border: none;
-    padding: 0;
-    height: 8;
-    overflow-y: auto;
-}
-
-TerminalPanel Button.context-session {
-    text-align: left;
-    content-align: left middle;
-}
-
-TerminalPanel .context-sessions Static {
-    text-align: left;
-    content-align: left middle;
-}
-
 /* Agents tab: compact layout matching terminal panel */
 AgentsPanel {
     padding: 0 1;

realign/dashboard/tmux_manager.py

@@ -776,16 +776,42 @@ def list_inner_windows() -> list[InnerWindow]:
 
         if terminal_id:
             persisted = state.get(terminal_id) or {}
-            if not provider:
-                provider = persisted.get("provider") or provider
-            if not session_type:
-                session_type = persisted.get("session_type") or session_type
-            if not session_id:
-                session_id = persisted.get("session_id") or session_id
-            if not transcript_path:
-                transcript_path = persisted.get("transcript_path") or transcript_path
-            if not context_id:
-                context_id = persisted.get("context_id") or context_id
+            updates: dict[str, str] = {}
+            persisted_provider = (persisted.get("provider") or "").strip()
+            if persisted_provider and persisted_provider != (provider or "").strip():
+                provider = persisted_provider
+                updates[OPT_PROVIDER] = persisted_provider
+            if not provider and persisted_provider:
+                provider = persisted_provider
+            persisted_session_type = (persisted.get("session_type") or "").strip()
+            if persisted_session_type and persisted_session_type != (session_type or "").strip():
+                session_type = persisted_session_type
+                updates[OPT_SESSION_TYPE] = persisted_session_type
+            if not session_type and persisted_session_type:
+                session_type = persisted_session_type
+            persisted_session_id = (persisted.get("session_id") or "").strip()
+            if persisted_session_id and persisted_session_id != (session_id or "").strip():
+                session_id = persisted_session_id
+                updates[OPT_SESSION_ID] = persisted_session_id
+            if not session_id and persisted_session_id:
+                session_id = persisted_session_id
+            persisted_transcript = (persisted.get("transcript_path") or "").strip()
+            if persisted_transcript and persisted_transcript != (transcript_path or "").strip():
+                transcript_path = persisted_transcript
+                updates[OPT_TRANSCRIPT_PATH] = persisted_transcript
+            if not transcript_path and persisted_transcript:
+                transcript_path = persisted_transcript
+            persisted_context = (persisted.get("context_id") or "").strip()
+            if persisted_context and persisted_context != (context_id or "").strip():
+                context_id = persisted_context
+                updates[OPT_CONTEXT_ID] = persisted_context
+            if not context_id and persisted_context:
+                context_id = persisted_context
+            if updates:
+                try:
+                    set_inner_window_options(window_id, updates)
+                except Exception:
+                    pass
 
         transcript_session_id = _session_id_from_transcript_path(transcript_path)
         if transcript_session_id:

realign/dashboard/widgets/__init__.py

@@ -8,7 +8,6 @@ from .events_table import EventsTable
 from .config_panel import ConfigPanel
 from .search_panel import SearchPanel
 from .openable_table import OpenableDataTable
-from .terminal_panel import TerminalPanel
 from .agents_panel import AgentsPanel
 
 __all__ = [
@@ -20,6 +19,5 @@ __all__ = [
     "ConfigPanel",
     "SearchPanel",
     "OpenableDataTable",
-    "TerminalPanel",
     "AgentsPanel",
 ]

realign/dashboard/widgets/agents_panel.py

@@ -165,7 +165,9 @@ class AgentsPanel(Container, can_focus=True):
         self._agents: list[dict] = []
         self._refresh_worker: Optional[Worker] = None
         self._share_worker: Optional[Worker] = None
+        self._sync_worker: Optional[Worker] = None
         self._share_agent_id: Optional[str] = None
+        self._sync_agent_id: Optional[str] = None
         self._refresh_timer = None
 
     def compose(self) -> ComposeResult:
@@ -216,18 +218,27 @@ class AgentsPanel(Container, can_focus=True):
             agent_infos = db.list_agent_info()
             active_terminals = db.list_agents(status="active", limit=1000)
 
-            # Get tmux windows to retrieve session_id (same as Terminal panel)
+            # Latest window links per terminal (V23)
+            latest_links = db.list_latest_window_links(limit=2000)
+            link_by_terminal = {l.terminal_id: l for l in latest_links if l.terminal_id}
+
+            # Get tmux windows to retrieve window id and fallback session_id
             tmux_windows = tmux_manager.list_inner_windows()
-            # Map terminal_id -> tmux window
             terminal_to_window = {
                 w.terminal_id: w for w in tmux_windows if w.terminal_id
             }
 
-            # Collect all session_ids from tmux windows for title lookup
-            session_ids = [
-                w.session_id for w in tmux_windows if w.session_id and w.terminal_id
-            ]
-            # Fetch titles from database (same method as Terminal panel)
+            # Collect all session_ids for title lookup
+            session_ids: list[str] = []
+            for t in active_terminals:
+                link = link_by_terminal.get(t.id)
+                if link and link.session_id:
+                    session_ids.append(link.session_id)
+                    continue
+                window = terminal_to_window.get(t.id)
+                if window and window.session_id:
+                    session_ids.append(window.session_id)
+
             titles = self._fetch_session_titles(session_ids)
 
             # Map agent_info.id -> list of terminals
@@ -236,16 +247,21 @@ class AgentsPanel(Container, can_focus=True):
                 # Find which agent_info this terminal belongs to
                 agent_info_id = None
 
+                link = link_by_terminal.get(t.id)
+
                 # Method 1: Check source field for "agent:{agent_info_id}" format
                 source = t.source or ""
                 if source.startswith("agent:"):
-                    agent_info_id = source[6:]  # Extract agent_info_id after "agent:"
+                    agent_info_id = source[6:]
+
+                # Method 2: WindowLink agent_id
+                if not agent_info_id and link and link.agent_id:
+                    agent_info_id = link.agent_id
 
-                # Method 2: Fallback - check tmux window's session.agent_id
+                # Method 3: Fallback - check tmux window's session.agent_id
                 if not agent_info_id:
                     window = terminal_to_window.get(t.id)
                     if window and window.session_id:
-                        # Look up session to get agent_id
                         session = db.get_session_by_id(window.session_id)
                         if session:
                             agent_info_id = session.agent_id
@@ -254,16 +270,18 @@ class AgentsPanel(Container, can_focus=True):
                     if agent_info_id not in agent_to_terminals:
                         agent_to_terminals[agent_info_id] = []
 
-                    # Get session_id and title from tmux window (same as Terminal panel)
+                    # Get session_id from windowlink (preferred) or tmux window
                     window = terminal_to_window.get(t.id)
-                    session_id = window.session_id if window else None
+                    session_id = (
+                        link.session_id if link and link.session_id else (window.session_id if window else None)
+                    )
                     title = titles.get(session_id, "") if session_id else ""
 
                     agent_to_terminals[agent_info_id].append(
                         {
                             "terminal_id": t.id,
                             "session_id": session_id,
-                            "provider": t.provider or "",
+                            "provider": link.provider if link and link.provider else (t.provider or ""),
                             "session_type": t.session_type or "",
                             "title": title,
                             "cwd": t.cwd or "",
@@ -278,12 +296,15 @@ class AgentsPanel(Container, can_focus=True):
                         "name": info.name,
                         "description": info.description or "",
                         "terminals": terminals,
+                        "share_url": getattr(info, "share_url", None),
+                        "last_synced_at": getattr(info, "last_synced_at", None),
                     }
                 )
         except Exception as e:
             logger.debug(f"Failed to collect agents: {e}")
         return agents
 
+
     def on_worker_state_changed(self, event: Worker.StateChanged) -> None:
         # Handle refresh worker
         if self._refresh_worker is not None and event.worker is self._refresh_worker:
@@ -302,6 +323,10 @@ class AgentsPanel(Container, can_focus=True):
         if self._share_worker is not None and event.worker is self._share_worker:
             self._handle_share_worker_state_changed(event)
 
+        # Handle sync worker
+        if self._sync_worker is not None and event.worker is self._sync_worker:
+            self._handle_sync_worker_state_changed(event)
+
     async def _render_agents(self) -> None:
         async with self._refresh_lock:
             try:
@@ -339,15 +364,25 @@ class AgentsPanel(Container, can_focus=True):
                     )
                 )
 
-                # Share button
-                await row.mount(
-                    Button(
-                        "Share",
-                        id=f"share-{safe_id}",
-                        name=agent["id"],
-                        classes="agent-share",
+                # Share or Sync button (Sync if agent already has a share_url)
+                if agent.get("share_url"):
+                    await row.mount(
+                        Button(
+                            "Sync",
+                            id=f"sync-{safe_id}",
+                            name=agent["id"],
+                            classes="agent-share",
+                        )
+                    )
+                else:
+                    await row.mount(
+                        Button(
+                            "Share",
+                            id=f"share-{safe_id}",
+                            name=agent["id"],
+                            classes="agent-share",
+                        )
                     )
-                )
 
                 # Create terminal button
                 await row.mount(
@@ -500,6 +535,11 @@ class AgentsPanel(Container, can_focus=True):
             await self._share_agent(agent_id)
             return
 
+        if btn_id.startswith("sync-"):
+            agent_id = event.button.name or ""
+            await self._sync_agent(agent_id)
+            return
+
         if btn_id.startswith("switch-"):
             terminal_id = event.button.name or ""
             await self._switch_to_terminal(terminal_id)
@@ -543,7 +583,13 @@ class AgentsPanel(Container, can_focus=True):
 
     def _on_create_result(self, result: dict | None) -> None:
         if result:
-            self.app.notify(f"Created: {result.get('name')}", title="Agent")
+            if result.get("imported"):
+                n = result.get("sessions_imported", 0)
+                self.app.notify(
+                    f"Imported: {result.get('name')} ({n} sessions)", title="Agent"
+                )
+            else:
+                self.app.notify(f"Created: {result.get('name')}", title="Agent")
         self.refresh_data()
 
     async def _create_terminal_for_agent(self, agent_id: str) -> None:
@@ -619,7 +665,7 @@ class AgentsPanel(Container, can_focus=True):
         try:
             from ...codex_home import prepare_codex_home
 
-            codex_home = prepare_codex_home(terminal_id, agent_id=agent_id)
+            codex_home = prepare_codex_home(terminal_id)
         except Exception:
             codex_home = None
 
@@ -1127,3 +1173,76 @@ class AgentsPanel(Container, can_focus=True):
             self.app.notify(
                 f"Share failed (exit {exit_code}){suffix}", title="Share", timeout=6
             )
+
+    async def _sync_agent(self, agent_id: str) -> None:
+        """Sync all sessions for an agent with remote share."""
+        if not agent_id:
+            return
+
+        # Check if sync is already in progress
+        if self._sync_worker is not None and self._sync_worker.state in (
+            WorkerState.PENDING,
+            WorkerState.RUNNING,
+        ):
+            return
+
+        self._sync_agent_id = agent_id
+
+        app = self.app
+
+        def progress_callback(message: str) -> None:
+            try:
+                app.call_from_thread(app.notify, message, title="Sync", timeout=3)
+            except Exception:
+                pass
+
+        def work() -> dict:
+            from ...commands.sync_agent import sync_agent_command
+
+            return sync_agent_command(
+                agent_id=agent_id,
+                progress_callback=progress_callback,
+            )
+
+        self.app.notify("Starting sync...", title="Sync", timeout=2)
+        self._sync_worker = self.run_worker(work, thread=True, exit_on_error=False)
+
+    def _handle_sync_worker_state_changed(self, event: Worker.StateChanged) -> None:
+        """Handle sync worker state changes."""
+        if event.state == WorkerState.ERROR:
+            err = self._sync_worker.error if self._sync_worker else "Unknown error"
+            self.app.notify(f"Sync failed: {err}", title="Sync", severity="error")
+            return
+
+        if event.state != WorkerState.SUCCESS:
+            return
+
+        result = self._sync_worker.result if self._sync_worker else {}
+
+        if result.get("success"):
+            pulled = result.get("sessions_pulled", 0)
+            pushed = result.get("sessions_pushed", 0)
+
+            # Copy share URL to clipboard
+            agent_id = self._sync_agent_id
+            share_url = None
+            if agent_id:
+                agent = next((a for a in self._agents if a["id"] == agent_id), None)
+                if agent:
+                    share_url = agent.get("share_url")
+
+            if share_url:
+                copied = copy_text(self.app, share_url)
+                suffix = " (link copied)" if copied else ""
+            else:
+                suffix = ""
+
+            self.app.notify(
+                f"Synced: pulled {pulled}, pushed {pushed} session(s){suffix}",
+                title="Sync",
+                timeout=6,
+            )
+            self.refresh_data()
+        else:
+            error = result.get("error", "Unknown error")
+            self.app.notify(f"Sync failed: {error}", title="Sync", severity="error")