@scemoon/cdh 1.0.0 → 1.0.3

package/tui/app.py

@@ -363,6 +363,7 @@ class A2TUIApp(App, inherit_bindings=False):
         session_id = getattr(conv.agent, "session_id", None) or conv._agent_session_id or ""
         self._exit_metrics = {
             "session_id": session_id,
+            "session_pk": conv._session_pk,
             "tool_call_total": conv._tool_call_total,
             "tool_call_success": conv._tool_call_success,
             "tool_call_failed": conv._tool_call_failed,
@@ -876,11 +877,16 @@ class A2TUIApp(App, inherit_bindings=False):
                             )
                             return
                     if agent_identity:
-                        self.launch_agent(
-                            agent_identity,
-                            agent_session_id=agent_session_id,
-                        )
-                        return
+                        try:
+                            from tui.agents import read_agents
+                            if agent_identity in await read_agents():
+                                self.launch_agent(
+                                    agent_identity,
+                                    agent_session_id=agent_session_id,
+                                )
+                                return
+                        except Exception:
+                            pass
 
             if agent_identity := self._resolve_launch_agent():
                 self.launch_agent(agent_identity, project_path=project_path)
@@ -999,9 +1005,27 @@ class A2TUIApp(App, inherit_bindings=False):
         except Exception:
             pass
         sid = (self._exit_metrics.get("session_id", "") or "")[:36] if self._exit_metrics else ""
+        session_pk = self._exit_metrics.get("session_pk") if self._exit_metrics else None
+        # Format the session ID for display: prefer the short `cdh
+        # session list` form (`session-<pk>` + agent_session_id prefix)
+        # so the displayed value matches what users see in
+        # `cdh session list` and what they pass to `cdh session load`.
+        if session_pk is not None:
+            display_id = f"session-{session_pk} ({sid[:8]})" if sid else f"session-{session_pk}"
+            hint = f"  Reload with: cdh session load {session_pk}\n"
+        elif sid:
+            display_id = sid
+            hint = ""
+        else:
+            display_id = "-"
+            hint = ""
         try:
             with open("/dev/tty", "w") as tty:
-                tty.write(f"\n  CDH powering down. Goodbye!\n  Session ID: {sid or '-'}\n")
+                tty.write(
+                    f"\n  CDH powering down. Goodbye!\n"
+                    f"  Session ID: {display_id}\n"
+                    f"{hint}"
+                )
         except Exception:
             pass
         import os
@@ -1079,10 +1103,23 @@ class A2TUIApp(App, inherit_bindings=False):
             return
         agent_identity = session["agent_identity"]
         agent_session_id = session.get("agent_session_id")
+
+        project_path = None
+        try:
+            meta = json.loads(session.get("meta_json", "{}"))
+            if cwd := meta.get("cwd"):
+                project_path = Path(cwd)
+        except (json.JSONDecodeError, TypeError):
+            pass
+
+        if project_path:
+            self.project_dir = project_path
+
         self.launch_agent(
             agent_identity,
             agent_session_id=agent_session_id,
             session_pk=session_pk,
+            project_path=project_path,
         )
 
     @work
@@ -1110,6 +1147,17 @@ class A2TUIApp(App, inherit_bindings=False):
         import yaml
 
         result = await self.push_screen_wait("projects")
+        if result is None:
+            cfg = load_config()
+            if cfg.current_project:
+                projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+                pf = projects_dir / f"{cfg.current_project}.yaml"
+                if not pf.exists():
+                    cfg.current_project = None
+                    cfg.current_project_path = None
+                    save_config(cfg)
+                    self.project_dir = None
+                    self.screen.post_message(messages.ProjectDirectoryUpdated(project_dir=None))
         if result is not None:
             if result == "__new__":
                 default_path = str((self.project_dir or Path.cwd()).resolve())
@@ -1137,7 +1185,7 @@ class A2TUIApp(App, inherit_bindings=False):
                 cfg.current_project_path = str(project_path)
                 save_config(cfg)
                 self.project_dir = project_path
-                self.screen.post_message(messages.ProjectDirectoryUpdated())
+                self.screen.post_message(messages.ProjectDirectoryUpdated(project_dir=self.project_dir))
                 self.notify(f"Created project '{name}' at {project_path}")
                 return
 
@@ -1159,8 +1207,12 @@ class A2TUIApp(App, inherit_bindings=False):
 
                     new_project_dir = Path(project_path) if project_path else Path.cwd()
                     self.project_dir = new_project_dir
-                    self.screen.post_message(messages.ProjectDirectoryUpdated())
+                    self.screen.post_message(messages.ProjectDirectoryUpdated(project_dir=self.project_dir))
                     self.notify(f"Switched to project: {project_name}")
+                    from tui.agents import read_agents
+                    agents = await read_agents()
+                    if cfg.default_mode in agents:
+                        self.launch_agent(cfg.default_mode, project_path=new_project_dir)
 
     @on(messages.LaunchAgent)
     def on_launch_agent(self, message: messages.LaunchAgent) -> None:

package/tui/db.py

@@ -172,6 +172,29 @@ class DB:
         except aiosqlite.Error:
             return False
 
+    async def session_get_by_agent_session_id(self, agent_session_id: str) -> Session | None:
+        """Get a session from its agent_session_id.
+
+        Args:
+            agent_session_id: The agent's session id (UUID).
+
+        Returns:
+            A Session if one is found, or `None`.
+        """
+        try:
+            async with self.open() as db:
+                db.row_factory = aiosqlite.Row
+                cursor = await db.execute(
+                    "SELECT * from sessions WHERE agent_session_id = ?",
+                    (agent_session_id,),
+                )
+                row = await cursor.fetchone()
+        except aiosqlite.Error:
+            return None
+        if row is None:
+            return None
+        return cast(Session, dict(row))
+
     async def session_get_recent(self, max_results: int = 100) -> list[Session] | None:
         """Get the most recent sessions."""
         try:

package/tui/directory_watcher.py

@@ -28,6 +28,32 @@ class DirectoryChanged(Message):
         return isinstance(message, DirectoryChanged)
 
 
+_NOISY_DIR_NAMES = frozenset(
+    {
+        ".venv",
+        ".git",
+        ".pytest_cache",
+        "__pycache__",
+        ".mypy_cache",
+        "node_modules",
+        ".uv-cache",
+        "dist",
+        "build",
+        ".idea",
+    }
+)
+
+
+def _is_noisy_path(path: str) -> bool:
+    """Return True when *path* lives inside a directory we want to
+    ignore for change notifications (virtualenvs, caches, build output…).
+    """
+    if not path:
+        return False
+    parts = path.replace("\\", "/").split("/")
+    return any(part in _NOISY_DIR_NAMES for part in parts)
+
+
 class _PathEventDispatcher(FileSystemEventHandler):
     """Dispatches file system events to multiple DirectoryWatcher instances."""
 
@@ -53,7 +79,15 @@ class _PathEventDispatcher(FileSystemEventHandler):
             return bool(self._watchers)
 
     def on_any_event(self, event: FileSystemEvent) -> None:
-        """Dispatch events to all registered watchers."""
+        """Dispatch events to all registered watchers.
+
+        Events for paths inside noisy directories (virtualenvs, caches,
+        build output, etc.) are dropped so they don't flood the UI.
+        """
+        src = getattr(event, "src_path", "") or ""
+        dest = getattr(event, "dest_path", "") or ""
+        if _is_noisy_path(src) or _is_noisy_path(dest):
+            return
         with self._lock:
             watchers = list(self._watchers)
 

package/tui/messages.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-
+from pathlib import Path
 from typing import Literal
 
 from textual.content import Content
@@ -72,9 +72,12 @@ class Flash(Message):
     duration: float | None = None
 
 
+@dataclass
 class ProjectDirectoryUpdated(Message):
     """The project directory may may changed."""
 
+    project_dir: Path | None = None
+
 
 @dataclass
 class SessionNavigate(Message):

package/tui/paths.py

@@ -2,7 +2,7 @@ from contextlib import suppress
 from pathlib import Path
 from typing import Final
 
-from xdg_base_dirs import xdg_config_home, xdg_data_home, xdg_state_home
+from xdg_base_dirs import xdg_config_home, xdg_data_home
 
 
 APP_NAME: Final[str] = "tui"
@@ -39,7 +39,7 @@ def get_config() -> Path:
 
 def get_state() -> Path:
     """Return (possibly creating) the application state directory."""
-    path = xdg_state_home() / APP_NAME
+    path = Path.home() / ".cdh" / "state" / APP_NAME
     with suppress(OSError):
         path.mkdir(0o700, exist_ok=True, parents=True)
     return path
@@ -65,7 +65,7 @@ def get_log() -> Path:
         Path to log directory.
 
     """
-    path = Path.home() / ".onecode" / "logs"
+    path = Path.home() / ".cdh" / "logs"
     with suppress(OSError):
         path.mkdir(0o700, exist_ok=True, parents=True)
     return path

package/tui/screens/component_picker.py

@@ -0,0 +1,148 @@
+from __future__ import annotations
+
+from typing import Optional
+
+from textual import on
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Horizontal, Vertical, VerticalScroll
+from textual.screen import ModalScreen
+from textual.widgets import Button, Checkbox, Footer, Static
+
+
+class ComponentPickerScreen(ModalScreen[Optional[list[str]]]):
+    """Modal screen for selecting application components.
+
+    Returns the list of selected component ids, or None if cancelled.
+    If ``allow_empty`` is False (default), confirming with no selection
+    shows a notification and does not dismiss the screen.
+    """
+
+    BINDINGS = [
+        Binding("escape", "cancel", "Cancel", show=False),
+    ]
+
+    CSS = """
+    ComponentPickerScreen {
+        align: center middle;
+        background: rgba(0, 0, 0, 0.7);
+    }
+
+    #picker-dialog {
+        width: 78;
+        height: auto;
+        max-height: 90%;
+        background: #111;
+        border: solid #555;
+        padding: 0 1;
+    }
+
+    #picker-title {
+        height: 1;
+        background: #333;
+        color: #fff;
+        padding: 0 1;
+        text-style: bold;
+    }
+
+    #picker-subtitle {
+        height: 1;
+        color: #aaa;
+        padding: 0 1;
+        margin-bottom: 1;
+    }
+
+    #picker-list {
+        height: auto;
+        max-height: 22;
+        padding: 0 1;
+    }
+
+    .component-row {
+        height: 2;
+        padding: 0 1;
+    }
+
+    .component-row Checkbox {
+        width: 1fr;
+    }
+
+    #picker-buttons {
+        height: 3;
+        align: center middle;
+        background: #222;
+    }
+
+    #picker-buttons Button {
+        margin: 0 1;
+        background: #444;
+        color: #fff;
+    }
+
+    #picker-buttons Button:hover {
+        background: #666;
+    }
+
+    #picker-buttons Button:focus {
+        background: #555;
+    }
+
+    #picker-buttons #picker-confirm {
+        background: #1a4d8f;
+    }
+
+    #picker-buttons #picker-confirm:hover {
+        background: #2870c2;
+    }
+    """
+
+    def __init__(
+        self,
+        title: str = "Select Application Components",
+        subtitle: str = "Choose the components for this project.",
+        allow_empty: bool = False,
+    ) -> None:
+        super().__init__()
+        self._title_text = title
+        self._subtitle_text = subtitle
+        self._allow_empty = allow_empty
+
+    def compose(self) -> ComposeResult:
+        with Vertical(id="picker-dialog"):
+            yield Static(self._title_text, id="picker-title")
+            yield Static(self._subtitle_text, id="picker-subtitle")
+            with VerticalScroll(id="picker-list"):
+                from cdh.scaffold import COMPONENTS
+
+                for spec in COMPONENTS:
+                    label = f"{spec.label}  \u2014  {spec.description}"
+                    yield Checkbox(label, id=f"comp-{spec.id}", classes="component-row")
+            with Horizontal(id="picker-buttons"):
+                yield Button("Cancel", id="picker-cancel")
+                yield Button("Confirm", id="picker-confirm", variant="primary")
+        yield Footer()
+
+    def action_cancel(self) -> None:
+        self.dismiss(None)
+
+    @on(Button.Pressed, "#picker-cancel")
+    def on_cancel(self) -> None:
+        self.dismiss(None)
+
+    @on(Button.Pressed, "#picker-confirm")
+    def on_confirm(self) -> None:
+        selected: list[str] = []
+        from cdh.scaffold import COMPONENTS
+
+        for spec in COMPONENTS:
+            cb = self.query_one(f"#comp-{spec.id}", Checkbox)
+            if cb.value:
+                selected.append(spec.id)
+        if not selected and not self._allow_empty:
+            self.notify(
+                "Select at least one application component",
+                title="No components selected",
+                severity="error",
+            )
+            return
+        self.dismiss(selected)

package/tui/screens/main.py

@@ -1,3 +1,4 @@
+import asyncio
 from functools import partial
 from pathlib import Path
 import random
@@ -8,10 +9,10 @@ from textual import getters
 from textual.binding import Binding
 from textual.command import Hit, Hits, Provider, DiscoveryHit
 from textual.content import Content
-from textual.events import ScreenResume, Click
+from textual.events import ScreenResume
 from textual.screen import Screen
 from textual.reactive import var, reactive
-from textual.widgets import Footer, OptionList, DirectoryTree, Tree, Static
+from textual.widgets import Footer, OptionList, DirectoryTree, Tree
 from textual import containers
 from textual.widget import Widget
 
@@ -29,7 +30,6 @@ from tui.widgets.conversation import Conversation
 from tui.widgets.project_directory_tree import ProjectDirectoryTree
 from tui.widgets.side_bar import SideBar
 from tui.widgets.session_tabs import SessionsTabs, SessionLabel
-from onecode.agent.cdh_loader import CdhProjectLoader
 
 
 class ModeProvider(Provider):
@@ -102,7 +102,7 @@ class MainScreen(Screen, can_focus=False):
     column = reactive(False)
     column_width = reactive(80)
     scrollbar = reactive("")
-    project_path: var[Path] = var(Path("./").expanduser().absolute())
+    project_path: var[Path | None] = var(Path("./").expanduser().absolute())
 
     app = getters.app(A2TUIApp)
 
@@ -116,6 +116,7 @@ class MainScreen(Screen, can_focus=False):
         initial_prompt: str | None = None,
     ) -> None:
         super().__init__()
+        self._project_update_lock = asyncio.Lock()
         self.set_reactive(MainScreen.project_path, project_path)
         self._agent = agent
         self._agent_session_id = agent_session_id
@@ -154,30 +155,17 @@ class MainScreen(Screen, can_focus=False):
                 id="context-panel",
             ),
         ]
-        cdh_dir = CdhProjectLoader.find_cdh_dir(self.project_path)
-        if cdh_dir is not None:
-            panels.append(
-                SideBar.Panel(
-                    "Project",
-                    ProjectDirectoryTree(
-                        self.project_path,
-                        id="project_directory_tree",
-                    ),
-                    flex=True,
-                    id="project-panel",
-                ),
-            )
-        else:
-            panels.append(
-                SideBar.Panel(
-                    "No Project",
-                    Static(
-                        "[bold]No .cdh project[/]\n\nClick to initialize .cdh in this directory",
-                        id="init-cdh-hint",
-                    ),
-                    id="no-project-panel",
-                ),
-            )
+        # panels.append(
+        #     SideBar.Panel(
+        #         "Project",
+        #         ProjectDirectoryTree(
+        #             self.project_path,
+        #             id="project_directory_tree",
+        #         ),
+        #         flex=True,
+        #         id="project-panel",
+        #     ),
+        # )
         panels.append(
             SideBar.Panel(
                 "Modified Files",
@@ -217,12 +205,22 @@ class MainScreen(Screen, can_focus=False):
             self.post_message(messages.SessionNavigate(self.screen.id, +1))
 
     @on(messages.ProjectDirectoryUpdated)
-    async def on_project_directory_update(self) -> None:
-        self.project_path = self.app.project_dir
-        sidebar = self.query_one(SideBar)
-        cdh_dir = CdhProjectLoader.find_cdh_dir(self.project_path)
-        if cdh_dir is not None:
-            sidebar.remove_panel("no-project-panel")
+    async def on_project_directory_update(self, event: messages.ProjectDirectoryUpdated) -> None:
+        async with self._project_update_lock:
+            new_dir = event.project_dir
+            sidebar = self.query_one(SideBar)
+            if new_dir is None:
+                sidebar.remove_panel("project-panel")
+                self.project_path = None
+                if mf := sidebar.query_one_optional("#modified_files", ModifiedFiles):
+                    mf.refresh_files()
+                self._swap_directory_watcher(None)
+                return
+            if self.project_path == new_dir and sidebar.has_panel("project-panel"):
+                if mf := sidebar.query_one_optional("#modified_files", ModifiedFiles):
+                    mf.refresh_files()
+                return
+            self.project_path = new_dir
             if not sidebar.has_panel("project-panel"):
                 collapsible = await sidebar.add_panel(
                     SideBar.Panel(
@@ -238,62 +236,23 @@ class MainScreen(Screen, can_focus=False):
                 tree = collapsible.query_one(ProjectDirectoryTree)
                 tree.data_bind(path=MainScreen.project_path)
                 tree.guide_depth = 3
-            else:
-                tree = sidebar.query_one(ProjectDirectoryTree)
-                tree.path = self.project_path
-                await tree.reload()
-        else:
-            sidebar.remove_panel("project-panel")
-            if not sidebar.has_panel("no-project-panel"):
-                await sidebar.add_panel(
-                    SideBar.Panel(
-                        "No Project",
-                        Static(
-                            "[bold]No .cdh project[/]\n\nClick to initialize .cdh in this directory",
-                            id="init-cdh-hint",
-                        ),
-                        id="no-project-panel",
-                    ),
-                )
-        if mf := sidebar.query_one_optional("#modified_files", ModifiedFiles):
-            mf.refresh_files()
-
-    @on(Click, "#init-cdh-hint")
-    def on_init_cdh_click(self) -> None:
-        from pathlib import Path
-        from onecode.config_screen import EditFieldScreen
-        from onecode.agent.cdh_loader import CdhProjectLoader
-
-        default_path = str(self.project_path.resolve())
-        self.app.push_screen(
-            EditFieldScreen("Directory to initialize .cdh", default_path),
-            self._on_init_cdh_path,
-        )
+    
+            if mf := sidebar.query_one_optional("#modified_files", ModifiedFiles):
+                mf.refresh_files()
+            self._swap_directory_watcher(new_dir)
 
-    def _on_init_cdh_path(self, path_str: str | None) -> None:
-        from pathlib import Path
-        from onecode.agent.cdh_loader import CdhProjectLoader
+    def _swap_directory_watcher(self, project_path: Path | None) -> None:
+        try:
+            self.conversation.directory_watcher_swap(project_path)
+        except Exception:
+            pass
 
-        if not path_str:
-            return
+    def _has_project_panel(self) -> bool:
         try:
-            target = Path(path_str).expanduser().resolve()
-            if not target.is_dir():
-                self.notify(f"Not a directory: {target}", severity="error")
-                return
+            sidebar = self.query_one(SideBar)
         except Exception:
-            self.notify("Invalid path", severity="error")
-            return
-        existing = CdhProjectLoader.find_cdh_dir(target)
-        if existing is not None:
-            self.notify(f".cdh already exists at {existing}", severity="warning")
-            return
-        name = target.name
-        from cdh.scaffold import scaffold_dlc_project
-        scaffold_dlc_project(target, name)
-        CdhProjectLoader.init_project(target, name)
-        self.notify(f"Initialized .cdh in {target}")
-        self.post_message(messages.ProjectDirectoryUpdated())
+            return False
+        return sidebar.has_panel("project-panel")
 
     @on(DirectoryTree.FileSelected, "ProjectDirectoryTree")
     def on_project_directory_tree_selected(self, event: Tree.NodeSelected):
@@ -303,15 +262,8 @@ class MainScreen(Screen, can_focus=False):
     @on(acp_messages.Plan)
     async def on_acp_plan(self, message: acp_messages.Plan):
         message.stop()
-        entries = [
-            Plan.Entry(
-                Content(entry["content"]),
-                entry.get("priority", "medium"),
-                entry.get("status", "pending"),
-            )
-            for entry in message.entries
-        ]
-        self.query_one("SideBar Plan", Plan).entries = entries
+        from tui.widgets.plan import entries_from_dicts
+        self.query_one("SideBar Plan", Plan).entries = entries_from_dicts(message.entries)
 
     @on(messages.SessionUpdate)
     async def on_session_update(self, event: messages.SessionUpdate) -> None:

package/tui/screens/projects.tcss

@@ -20,6 +20,16 @@ ProjectsScreen {
         text-style: italic;
     }
 
+    #actions {
+        height: auto;
+        align-horizontal: center;
+        margin: 0 1 1 1;
+    }
+
+    #actions Button {
+        margin: 0 1;
+    }
+
 
     ProjectGridSelect {
         &:empty {