aline-ai 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

{aline_ai-0.5.5.dist-info → aline_ai-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aline-ai
-Version: 0.5.5
+Version: 0.5.7
 Summary: Shared AI memory; everyone knows everything in teams
 Author: Sharemind
 License: MIT

{aline_ai-0.5.5.dist-info → aline_ai-0.5.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-aline_ai-0.5.5.dist-info/licenses/LICENSE,sha256=H8wTqV5IF1oHw_HbBtS1PSDU8G_q81yblEIL_JfV8Vo,1077
-realign/__init__.py,sha256=bcfFHKLZs3gqPRuWwo5pAfBK0K2BuS6pB2bwjqmpoCQ,1623
+aline_ai-0.5.7.dist-info/licenses/LICENSE,sha256=H8wTqV5IF1oHw_HbBtS1PSDU8G_q81yblEIL_JfV8Vo,1077
+realign/__init__.py,sha256=yVsHlHyZpDRPyaFzYXTltDHKp6XXpiIGe-TlrznKALo,1623
 realign/claude_detector.py,sha256=ZLSJacMo6zzQclXByABKA70UNpstxqIv3fPGqdpA934,2792
-realign/cli.py,sha256=j_G_FcwbTgCOE0c2kHjX_dma6IdcPcB-maYjr82y1XE,30050
+realign/cli.py,sha256=yeq_a3Peoqx8N13Jo2etjJtbTCZYpuqwoMMyAPdrANs,30569
 realign/codex_detector.py,sha256=N9ulgMgvTzDfXE4s4vLd6OoS0hT7R6h2bDFFXWa-2hE,4183
 realign/config.py,sha256=lIKZqeOwYc_gHo760lYYX6PnapuKrCWGqT5SA8-PbeA,12044
 realign/context.py,sha256=S1YEUn5HWSDTerDDMsSsRV871IZxoaxDjPTPI2z6-Xs,9976
@@ -19,7 +19,7 @@ realign/worker_daemon.py,sha256=LpJbQDY0Z4AMtq0LmpxvFeQM4puuoGDRBayKRafvKhc,3574
 realign/adapters/__init__.py,sha256=bpDm5aBxMdq4OA_beYahoUb4zfNaq3KOG6KghQJruRc,827
 realign/adapters/antigravity.py,sha256=geaYxAEswpgsVtERqsQ1OwvPFsy5tRkyjx2yQ-Uq9nM,5461
 realign/adapters/base.py,sha256=2IdAZKGjg5gPB3YLf_8r3V4XAdbK7fHpj06GjjsYEFY,7409
-realign/adapters/claude.py,sha256=sZD-W8nAOF-2jWwgEmJpnT2EpbVbF0NfSbnnW1X0wtg,5060
+realign/adapters/claude.py,sha256=ksTRwC5Z8AzUcB21LFjx6DETP08cv__fjgBzm-TeZdI,5444
 realign/adapters/codex.py,sha256=5ex3zJ5Hpb_StV2CcBSHVhHleygZxzVJjYsWw8qK1Bc,2051
 realign/adapters/gemini.py,sha256=NvtXQPWUtEY-DaAAMvLGvQW4FalTG-g0pD514HYnzF0,2540
 realign/adapters/registry.py,sha256=yM6nf9nGTJ1vaK2Uixp-VacseK7PmxZkCdKedmWI8MA,3255
@@ -37,29 +37,31 @@ realign/commands/config.py,sha256=nYnu_h2pk7GODcrzrV04K51D-s7v06FlRXHJ0HJ-gvU,67
 realign/commands/context.py,sha256=pM2KfZHVkB-ou4nBhFvKSwnYliLBzwN3zerLyBAbhfE,7095
 realign/commands/export_shares.py,sha256=Djy1aO7MoU1_ewzn6CZ43oNhSEEonV3sTkSQbHgiaKI,135806
 realign/commands/import_shares.py,sha256=ukX8huvLvEM5g0qEIoqrV1-imz1g-r0Jj2FqD-ojrIA,25297
-realign/commands/init.py,sha256=0wjutL1DxA0hYMt1aCfgUSf91ZBExXCXFrwuOyQNHLg,32060
+realign/commands/init.py,sha256=ef-q3Qz5D_0Eqld8qjtX26X2QrovBSYcva3uAjiJuwk,33015
 realign/commands/restore.py,sha256=s2BxQZHxQw9r12NzRVsK20KlGafy5AIoSjWMo5PcnHY,11173
 realign/commands/search.py,sha256=RUdseQsjy-SNfKFkGLWrE4IhxkzgkW9IIxAX33XnCHk,24589
 realign/commands/upgrade.py,sha256=L3PLOUIN5qAQTbkfoVtSsIbbzEezA_xjjk9F1GMVfjw,12781
 realign/commands/watcher.py,sha256=fWL3kaRkqE03-NtFLaXlx93hJAQrAuNPSoYhOyQZfq8,136273
 realign/commands/worker.py,sha256=K1DG1uZ--ebKwklHCyIFdN_axoLjL9Onx8Naq-DOZBs,23078
 realign/dashboard/__init__.py,sha256=QZkHTsGityH8UkF8rmvA3xW7dMXNe0swEWr443qfgCM,128
-realign/dashboard/app.py,sha256=J1oQz63dpH1aEScUsjLRi32mwg3dywm1hSm-gquAk8U,11936
+realign/dashboard/app.py,sha256=LPgDXCqXHtJXzgFiwJvWolLJZ34EU4gejLrBIrgEk4Y,12233
 realign/dashboard/tmux_manager.py,sha256=DdCiumQ7YQZnje5VfOQ60585C0X6Va_AhBQi_zmhE0Y,24035
-realign/dashboard/screens/__init__.py,sha256=x42K31sqL5KVMtufOnZjG8LnFN7hQyN5-z8CySqbwlM,304
+realign/dashboard/screens/__init__.py,sha256=US6sAmQs5VVkH2tFkH_z0WDT4H8cVhLL-JckfSR1yQY,446
+realign/dashboard/screens/create_agent.py,sha256=ugEs3IHrT7FsbuMEwyrqY3eoylp_pbftw42_Fu07tF4,7419
 realign/dashboard/screens/create_event.py,sha256=oiQY1zKpUYnQU-5fQLeuZH9BV5NClE5B5XZIVBYG5A8,5506
 realign/dashboard/screens/event_detail.py,sha256=OLaL3-FgAohDdzVlfuUw5yh2SR49IHIpCtiqXJhBTc0,20992
+realign/dashboard/screens/help_screen.py,sha256=Icrcvbgyz49R2tBiu8vBZ4CLm6iYclv_-FTa2pCFRRQ,3398
 realign/dashboard/screens/session_detail.py,sha256=gfpUIhMO00ecMlMyzpkxDdvGb9zhESEvxwrJvqLuHOI,9603
 realign/dashboard/screens/share_import.py,sha256=hl2x0yGVycsoUI76AmdZTAV-br3Q6191g5xHHrZ8hOA,6318
 realign/dashboard/styles/dashboard.tcss,sha256=9sSIs3r4V8eeTwCK56s7fnYxjMEuASP8EcmK1fhpUmA,3454
 realign/dashboard/widgets/__init__.py,sha256=3Pf2_K9obrertgv_psfxradgkI9RXlmjoXYQH7oBKm0,583
 realign/dashboard/widgets/config_panel.py,sha256=Afezfd6nvHo0Q44IS2UZTPJsYmHbqzjx7bi5jWrCDPA,11182
-realign/dashboard/widgets/events_table.py,sha256=zzX08U2zSNnGX925BA1Bksem-xk2Nd_ujo61rbqGIm8,21904
-realign/dashboard/widgets/header.py,sha256=1I8XUf_2qbmpMDuteSvcG3amqeQ4nWa_8Zfev0dXXNI,1583
+realign/dashboard/widgets/events_table.py,sha256=OG9RjwU4c50-RUMmdhXzmIMnYrt6_mCP1GNQWDAX95s,30368
+realign/dashboard/widgets/header.py,sha256=0HHCFXX7F3C6HII-WDwOJwWkJrajmKPWmdoMWyOkn9E,1587
 realign/dashboard/widgets/openable_table.py,sha256=GeJPDEYp0kRHShqvmPMzAePpYXRZHUNqcWNnxqsqxjA,1963
 realign/dashboard/widgets/search_panel.py,sha256=ZNJDfwDSxUFnCeltYQYsQsPJ6t4HDeNWpENoTOoBdVM,8951
-realign/dashboard/widgets/sessions_table.py,sha256=syM0CjP79Xd9HuJ2ttCa4rwON2q3jXmROjcFtJ0hA9w,22069
-realign/dashboard/widgets/terminal_panel.py,sha256=a0-XQ7IUVhC8rQAhZd9gA3N7ue87Q74jLqGzEPFWntU,30897
+realign/dashboard/widgets/sessions_table.py,sha256=toHE96RLwddqXE9Ykocy6loqoGld_6gFawLwdiiJ2cA,32877
+realign/dashboard/widgets/terminal_panel.py,sha256=uXgPcgjWaQ2tTD6Mx6ikCXzq6wYqh-ft0Bait83_DKE,28290
 realign/dashboard/widgets/watcher_panel.py,sha256=O_mdDacgc87xA-5KEfta53Ik_Xsk_B2OfwenMOTtGw8,19722
 realign/dashboard/widgets/worker_panel.py,sha256=F_jKWABuCNmjQgeeuCr4KnFRKdY4CLTNcEXMYwsNaSk,18691
 realign/db/__init__.py,sha256=-1d-Zc4IOUVokbdTXi3R-bIwlkFEPAz_qTHAdcsdp6g,1870
@@ -86,8 +88,8 @@ realign/triggers/next_turn_trigger.py,sha256=BpP0PWn4mU1MZd6mv89jWcjs8Jtv0zEWapW
 realign/triggers/registry.py,sha256=cb-AVLbYB2pqwfWL3q1DQxLv4kOw7g7m-GshTdfFESc,3827
 realign/triggers/turn_status.py,sha256=wAZEhXDAmDoX5F-ohWfSnZZ0eA6DAJ9svSPiSv_f6sg,6041
 realign/triggers/turn_summary.py,sha256=f3hEUshgv9skJ9AbfWpoYs417lsv_HK2A_vpPjgryO4,4467
-aline_ai-0.5.5.dist-info/METADATA,sha256=iIDlswhdjHF_CCaONwDX0iRFFZ1VvNxxabYxzKeTWC8,1597
-aline_ai-0.5.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-aline_ai-0.5.5.dist-info/entry_points.txt,sha256=TvYELpMoWsUTcQdMV8tBHxCbEf_LbK4sESqK3r8PM6Y,78
-aline_ai-0.5.5.dist-info/top_level.txt,sha256=yIL3s2xv9nf1GwD5n71Aq_JEIV4AfzCIDNKBzewuRm4,8
-aline_ai-0.5.5.dist-info/RECORD,,
+aline_ai-0.5.7.dist-info/METADATA,sha256=SG0PLhxEgWQIrjE3rCiSk9DFURyfEkxXteRKqdFhijU,1597
+aline_ai-0.5.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+aline_ai-0.5.7.dist-info/entry_points.txt,sha256=TvYELpMoWsUTcQdMV8tBHxCbEf_LbK4sESqK3r8PM6Y,78
+aline_ai-0.5.7.dist-info/top_level.txt,sha256=yIL3s2xv9nf1GwD5n71Aq_JEIV4AfzCIDNKBzewuRm4,8
+aline_ai-0.5.7.dist-info/RECORD,,

realign/__init__.py

@@ -3,7 +3,7 @@
 import hashlib
 from pathlib import Path
 
-__version__ = "0.5.5"
+__version__ = "0.5.7"
 
 
 def get_realign_dir(project_root: Path) -> Path:

realign/adapters/claude.py

@@ -76,14 +76,13 @@ class ClaudeAdapter(SessionAdapter):
             project_path_str = "/" + parent_name[1:].replace("-", "/")
             project_path = Path(project_path_str)
 
-            # Validation: check if path exists
-            # We relax this slightly: if it's a valid-looking path, we return it,
-            # but ideally we check existence.
+            # If path exists locally, return it immediately
             if project_path.exists():
                 return project_path
 
             # Fallback: read cwd from the session JSONL (more reliable when the encoded
             # directory name is ambiguous due to '-' in real paths).
+            cwd_path: Optional[Path] = None
             try:
                 with session_file.open("r", encoding="utf-8") as f:
                     for i, line in enumerate(f):
@@ -98,13 +97,20 @@ class ClaudeAdapter(SessionAdapter):
                             continue
                         cwd = obj.get("cwd")
                         if isinstance(cwd, str) and cwd.strip():
-                            path = Path(cwd.strip())
-                            if path.exists():
-                                return path
+                            cwd_path = Path(cwd.strip())
+                            # If cwd exists locally, prefer it
+                            if cwd_path.exists():
+                                return cwd_path
+                            break  # Found cwd, stop searching
             except Exception:
                 pass
 
-            return None
+            # Return the best available path even if it doesn't exist locally.
+            # This allows importing sessions from other machines (e.g., SWEBench).
+            # Prefer cwd from JSONL as it's more accurate than path decoding.
+            if cwd_path is not None:
+                return cwd_path
+            return project_path
 
         except Exception:
             return None

realign/cli.py

@@ -19,12 +19,19 @@ console = Console()
 
 
 @app.callback()
-def main(ctx: typer.Context):
+def main(
+    ctx: typer.Context,
+    dev: bool = typer.Option(False, "--dev", help="Enable developer mode (shows Watcher and Worker tabs)"),
+):
     """
     Aline CLI - Shared AI Memory for teams.
 
     Run 'aline' without arguments to open the interactive dashboard.
     """
+    # Store dev mode in context for subcommands
+    ctx.ensure_object(dict)
+    ctx.obj["dev"] = dev
+
     if ctx.invoked_subcommand is None:
         # Check for updates before launching dashboard
         from .commands.upgrade import check_and_prompt_update
@@ -40,7 +47,7 @@ def main(ctx: typer.Context):
 
         from .dashboard.app import AlineDashboard
 
-        dashboard = AlineDashboard()
+        dashboard = AlineDashboard(dev_mode=dev)
         dashboard.run()
 
 
@@ -809,7 +816,10 @@ def version():
 
 
 @app.command()
-def dashboard():
+def dashboard(
+    ctx: typer.Context,
+    dev: bool = typer.Option(False, "--dev", help="Enable developer mode (shows Watcher and Worker tabs)"),
+):
     """Open the interactive TUI dashboard."""
     from .dashboard.tmux_manager import bootstrap_dashboard_into_tmux
 
@@ -817,7 +827,9 @@ def dashboard():
 
     from .dashboard.app import AlineDashboard
 
-    dash = AlineDashboard()
+    # Use dev flag from this command or inherit from parent context
+    dev_mode = dev or (ctx.obj.get("dev", False) if ctx.obj else False)
+    dash = AlineDashboard(dev_mode=dev_mode)
     dash.run()
 
 

realign/commands/init.py

@@ -18,10 +18,14 @@ console = Console()
 
 # tmux config template for Aline-managed dashboard sessions.
 # Stored at ~/.aline/tmux/tmux.conf and sourced by the dashboard tmux bootstrap.
+# Bump this version when the tmux config changes to trigger auto-update on `aline init`.
+_TMUX_CONFIG_VERSION = 2
+
+
 def _get_tmux_config() -> str:
     """Generate tmux config with Type-to-Exit bindings."""
-    conf = r"""# Aline tmux config
-#
+    conf = f"# Aline tmux config (v{_TMUX_CONFIG_VERSION})\n"
+    conf += r"""#
 # Goal: make mouse selection copy to the system clipboard (macOS Terminal friendly).
 # - Drag-select text with the mouse; when you release, it is copied to the clipboard.
 # - Paste anywhere with Cmd+V.
@@ -448,24 +452,46 @@ def _initialize_prompts_directory() -> None:
             file_path.write_text(content, encoding="utf-8")
 
 
+def _get_tmux_config_version(content: str) -> int:
+    """Extract version number from tmux config content. Returns 0 if not found."""
+    # Look for "# Aline tmux config (vN)" pattern
+    match = re.search(r"# Aline tmux config \(v(\d+)\)", content)
+    if match:
+        return int(match.group(1))
+    # Old configs without version marker are version 1
+    if "# Aline tmux config" in content:
+        return 1
+    return 0
+
+
 def _initialize_tmux_config() -> Path:
-    """Initialize ~/.aline/tmux/tmux.conf (best-effort, no overwrite)."""
+    """Initialize ~/.aline/tmux/tmux.conf with auto-update on version change."""
     tmux_conf_path = Path.home() / ".aline" / "tmux" / "tmux.conf"
     tmux_conf_path.parent.mkdir(parents=True, exist_ok=True)
+
     if not tmux_conf_path.exists():
         tmux_conf_path.write_text(_get_tmux_config(), encoding="utf-8")
         return tmux_conf_path
 
-    # Best-effort repair for older Aline-generated configs that used unquoted `#` keys.
-    # tmux parses `#` as a comment delimiter, turning `bind ... # ...` into `bind ...` (invalid).
+    # Check existing config
     try:
         existing = tmux_conf_path.read_text(encoding="utf-8")
     except Exception:
         return tmux_conf_path
 
+    # Only manage Aline-generated configs
     if "# Aline tmux config" not in existing:
         return tmux_conf_path
 
+    # Check version and update if outdated
+    existing_version = _get_tmux_config_version(existing)
+    if existing_version < _TMUX_CONFIG_VERSION:
+        # Auto-update to latest config
+        tmux_conf_path.write_text(_get_tmux_config(), encoding="utf-8")
+        return tmux_conf_path
+
+    # Best-effort repair for older Aline-generated configs that used unquoted `#` keys.
+    # tmux parses `#` as a comment delimiter, turning `bind ... # ...` into `bind ...` (invalid).
     repaired = existing
     repaired = _TMUX_CONF_REPAIR_TILDE_KEY_RE.sub(r"\1\\~\2\\~", repaired)
     repaired = _TMUX_CONF_REPAIR_KEY_NEEDS_QUOTE_RE.sub(r'\1"\2"\3"\2"', repaired)

realign/dashboard/app.py

@@ -54,35 +54,45 @@ class AlineDashboard(App):
     TITLE = "Aline Dashboard"
 
     BINDINGS = [
-        Binding("r", "refresh", "Refresh"),
+        Binding("r", "refresh", "Refresh", show=False),
         Binding("?", "help", "Help"),
-        Binding("tab", "next_tab", "Next Tab", priority=True),
-        Binding("shift+tab", "prev_tab", "Prev Tab", priority=True),
-        Binding("n", "page_next", "Next Page"),
-        Binding("p", "page_prev", "Prev Page"),
-        Binding("s", "switch_view", "Switch View"),
-        Binding("c", "create_event", "Create Event"),
-        Binding("l", "load_context", "Load Context"),
-        Binding("y", "share_import", "Share Import"),
+        Binding("tab", "next_tab", "Next Tab", priority=True, show=False),
+        Binding("shift+tab", "prev_tab", "Prev Tab", priority=True, show=False),
+        Binding("n", "page_next", "Next Page", show=False),
+        Binding("p", "page_prev", "Prev Page", show=False),
+        Binding("s", "switch_view", "Switch View", show=False),
+        Binding("c", "create_event", "Create Event", show=False),
+        Binding("l", "load_context", "Load Context", show=False),
+        Binding("y", "share_import", "Share Import", show=False),
         Binding("ctrl+c", "quit_confirm", "Quit", priority=True),
     ]
 
     _quit_confirm_window_s: float = 1.2
 
+    def __init__(self, dev_mode: bool = False):
+        """Initialize the dashboard.
+
+        Args:
+            dev_mode: If True, shows developer tabs (Watcher, Worker).
+        """
+        super().__init__()
+        self.dev_mode = dev_mode
+
     def compose(self) -> ComposeResult:
         """Compose the dashboard layout."""
         yield AlineHeader()
         tab_ids = self._tab_ids()
         with TabbedContent(initial=tab_ids[0] if tab_ids else "terminal"):
-            with TabPane("Terminal", id="terminal"):
+            with TabPane("Agents", id="terminal"):
                 yield TerminalPanel()
-            with TabPane("Watcher", id="watcher"):
-                yield WatcherPanel()
-            with TabPane("Worker", id="worker"):
-                yield WorkerPanel()
-            with TabPane("Sessions", id="sessions"):
+            if self.dev_mode:
+                with TabPane("Watcher", id="watcher"):
+                    yield WatcherPanel()
+                with TabPane("Worker", id="worker"):
+                    yield WorkerPanel()
+            with TabPane("Contexts", id="sessions"):
                 yield SessionsTable()
-            with TabPane("Events", id="events"):
+            with TabPane("Share", id="events"):
                 yield EventsTable()
             with TabPane("Config", id="config"):
                 yield ConfigPanel()
@@ -91,7 +101,9 @@ class AlineDashboard(App):
         yield Footer()
 
     def _tab_ids(self) -> list[str]:
-        return ["terminal", "watcher", "worker", "sessions", "events", "config", "search"]
+        if self.dev_mode:
+            return ["terminal", "watcher", "worker", "sessions", "events", "config", "search"]
+        return ["terminal", "sessions", "events", "config", "search"]
 
     def on_mount(self) -> None:
         """Apply theme based on system settings and watch for changes."""
@@ -190,11 +202,9 @@ class AlineDashboard(App):
 
     def action_help(self) -> None:
         """Show help information."""
-        self.notify(
-            "Tab/Shift+Tab: Switch tabs | n/p: Page | Enter/dblclick: Open | space: Toggle select | c: Create event | l: Load ctx | s: Switch view | r: Refresh | Ctrl+C Ctrl+C: Quit",
-            title="Keyboard Shortcuts",
-            timeout=5,
-        )
+        from .screens import HelpScreen
+
+        self.push_screen(HelpScreen())
 
     def action_quit_confirm(self) -> None:
         """Quit only when Ctrl+C is pressed twice quickly."""

realign/dashboard/screens/__init__.py

@@ -3,6 +3,15 @@
 from .session_detail import SessionDetailScreen
 from .event_detail import EventDetailScreen
 from .create_event import CreateEventScreen
+from .create_agent import CreateAgentScreen
 from .share_import import ShareImportScreen
+from .help_screen import HelpScreen
 
-__all__ = ["SessionDetailScreen", "EventDetailScreen", "CreateEventScreen", "ShareImportScreen"]
+__all__ = [
+    "SessionDetailScreen",
+    "EventDetailScreen",
+    "CreateEventScreen",
+    "CreateAgentScreen",
+    "ShareImportScreen",
+    "HelpScreen",
+]

realign/dashboard/screens/create_agent.py

@@ -0,0 +1,244 @@
+"""Create agent modal for the dashboard."""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import os
+import subprocess
+from pathlib import Path
+from typing import Optional
+
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Container, Horizontal, Vertical
+from textual.screen import ModalScreen
+from textual.widgets import Button, Label, RadioButton, RadioSet, Static
+
+
+# State file for storing last workspace path
+DASHBOARD_STATE_FILE = Path.home() / ".aline" / "dashboard_state.json"
+
+
+def _load_last_workspace() -> str:
+    """Load the last used workspace path from state file."""
+    try:
+        if DASHBOARD_STATE_FILE.exists():
+            with open(DASHBOARD_STATE_FILE, "r", encoding="utf-8") as f:
+                state = json.load(f)
+                path = state.get("last_workspace", "")
+                if path and os.path.isdir(path):
+                    return path
+    except Exception:
+        pass
+    # Default to current working directory or home
+    try:
+        return os.getcwd()
+    except Exception:
+        return str(Path.home())
+
+
+def _save_last_workspace(path: str) -> None:
+    """Save the last used workspace path to state file."""
+    try:
+        DASHBOARD_STATE_FILE.parent.mkdir(parents=True, exist_ok=True)
+        state = {}
+        if DASHBOARD_STATE_FILE.exists():
+            with open(DASHBOARD_STATE_FILE, "r", encoding="utf-8") as f:
+                state = json.load(f)
+        state["last_workspace"] = path
+        with open(DASHBOARD_STATE_FILE, "w", encoding="utf-8") as f:
+            json.dump(state, f, indent=2)
+    except Exception:
+        pass
+
+
+class CreateAgentScreen(ModalScreen[Optional[tuple[str, str]]]):
+    """Modal to create a new agent terminal.
+
+    Returns a tuple of (agent_type, workspace_path) on success, None on cancel.
+    """
+
+    BINDINGS = [
+        Binding("escape", "close", "Close", show=False),
+    ]
+
+    DEFAULT_CSS = """
+    CreateAgentScreen {
+        align: center middle;
+    }
+
+    CreateAgentScreen #create-agent-root {
+        width: 60;
+        height: auto;
+        max-height: 80%;
+        padding: 1 2;
+        background: $background;
+        border: solid $accent;
+    }
+
+    CreateAgentScreen #create-agent-title {
+        height: auto;
+        margin-bottom: 1;
+        text-style: bold;
+    }
+
+    CreateAgentScreen .section-label {
+        height: auto;
+        margin-top: 1;
+        margin-bottom: 0;
+        color: $text-muted;
+    }
+
+    CreateAgentScreen RadioSet {
+        height: auto;
+        margin: 0;
+        padding: 0;
+        border: none;
+        background: transparent;
+    }
+
+    CreateAgentScreen RadioButton {
+        height: auto;
+        padding: 0;
+        margin: 0;
+        background: transparent;
+    }
+
+    CreateAgentScreen #workspace-section {
+        height: auto;
+        margin-top: 1;
+    }
+
+    CreateAgentScreen #workspace-row {
+        height: auto;
+        margin-top: 0;
+    }
+
+    CreateAgentScreen #workspace-path {
+        width: 1fr;
+        height: auto;
+        padding: 0 1;
+        background: $surface;
+        border: solid $primary-lighten-2;
+    }
+
+    CreateAgentScreen #browse-btn {
+        width: auto;
+        min-width: 10;
+        margin-left: 1;
+    }
+
+    CreateAgentScreen #buttons {
+        height: auto;
+        margin-top: 2;
+        align: right middle;
+    }
+
+    CreateAgentScreen #buttons Button {
+        margin-left: 1;
+    }
+    """
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._workspace_path = _load_last_workspace()
+
+    def compose(self) -> ComposeResult:
+        with Container(id="create-agent-root"):
+            yield Static("Create New Agent", id="create-agent-title")
+
+            yield Label("Agent Type", classes="section-label")
+            with RadioSet(id="agent-type"):
+                yield RadioButton("Claude", id="type-claude", value=True)
+                yield RadioButton("Codex", id="type-codex")
+                yield RadioButton("Opencode", id="type-opencode")
+                yield RadioButton("zsh", id="type-zsh")
+
+            with Vertical(id="workspace-section"):
+                yield Label("Workspace", classes="section-label")
+                with Horizontal(id="workspace-row"):
+                    yield Static(self._workspace_path, id="workspace-path")
+                    yield Button("Browse", id="browse-btn", variant="default")
+
+            with Horizontal(id="buttons"):
+                yield Button("Cancel", id="cancel")
+                yield Button("Create", id="create", variant="primary")
+
+    def on_mount(self) -> None:
+        self.query_one("#create", Button).focus()
+
+    def action_close(self) -> None:
+        self.dismiss(None)
+
+    def _update_workspace_display(self) -> None:
+        """Update the workspace path display."""
+        self.query_one("#workspace-path", Static).update(self._workspace_path)
+
+    async def _select_workspace(self) -> str | None:
+        """Open macOS folder picker and return selected path, or None if cancelled."""
+        default_path = self._workspace_path
+        default_path_escaped = default_path.replace('"', '\\"')
+        prompt = "Select workspace folder"
+        prompt_escaped = prompt.replace('"', '\\"')
+        script = f"""
+            set defaultFolder to POSIX file "{default_path_escaped}" as alias
+            try
+                set selectedFolder to choose folder with prompt "{prompt_escaped}" default location defaultFolder
+                return POSIX path of selectedFolder
+            on error
+                return ""
+            end try
+        """
+        try:
+            proc = await asyncio.get_event_loop().run_in_executor(
+                None,
+                lambda: subprocess.run(
+                    ["osascript", "-e", script],
+                    capture_output=True,
+                    text=True,
+                    timeout=120,
+                ),
+            )
+            result = (proc.stdout or "").strip()
+            if result and os.path.isdir(result):
+                return result
+            return None
+        except Exception:
+            return None
+
+    async def on_button_pressed(self, event: Button.Pressed) -> None:
+        button_id = event.button.id or ""
+
+        if button_id == "cancel":
+            self.dismiss(None)
+            return
+
+        if button_id == "browse-btn":
+            new_path = await self._select_workspace()
+            if new_path:
+                self._workspace_path = new_path
+                self._update_workspace_display()
+            return
+
+        if button_id == "create":
+            # Get selected agent type
+            radio_set = self.query_one("#agent-type", RadioSet)
+            pressed_button = radio_set.pressed_button
+            if pressed_button is None:
+                self.app.notify("Please select an agent type", severity="warning")
+                return
+
+            agent_type_map = {
+                "type-claude": "claude",
+                "type-codex": "codex",
+                "type-opencode": "opencode",
+                "type-zsh": "zsh",
+            }
+            agent_type = agent_type_map.get(pressed_button.id or "", "claude")
+
+            # Save the workspace path for next time
+            _save_last_workspace(self._workspace_path)
+
+            # Return the result
+            self.dismiss((agent_type, self._workspace_path))