@scemoon/cdh 1.0.4 → 1.0.6

package/tui/acp/prompt.py

@@ -6,54 +6,6 @@ from tui.prompt.extract import extract_paths_from_prompt
 from tui.prompt.resource import load_resource, ResourceError
 
 
-CLOUD_SPEC_SKILL_PATH = Path(__file__).resolve().parent.parent.parent / "cloud-spec-skill" / "SKILL.md"
-
-
-def _get_cloud_spec_content() -> str:
-    """Load cloud-spec-skill content."""
-    if CLOUD_SPEC_SKILL_PATH.exists():
-        return CLOUD_SPEC_SKILL_PATH.read_text(encoding="utf-8")
-    return ""
-
-
-def cloud_spec_skill_loaded() -> bool:
-    """Check if cloud-spec-skill SKILL.md exists."""
-    return CLOUD_SPEC_SKILL_PATH.exists()
-
-
-def ensure_cloud_spec_skill_installed() -> str | None:
-    """Ensure cloud-spec-skill is accessible to agents.
-
-    Checks if SKILL.md exists in repo and copies it to ~/.cdh/skills/ if needed,
-    or updates if the repo version is newer.
-    Returns error message if installation fails, None on success.
-    """
-    from onecode.skills.loader import USER_SKILLS_DIR
-
-    if not CLOUD_SPEC_SKILL_PATH.exists():
-        return None
-
-    skill_dest = USER_SKILLS_DIR / "cloud-spec-skill"
-    dest_skills_md = skill_dest / "SKILL.md"
-
-    if skill_dest.exists() and dest_skills_md.exists():
-        repo_mtime = CLOUD_SPEC_SKILL_PATH.stat().st_mtime
-        dest_mtime = dest_skills_md.stat().st_mtime
-        if dest_mtime >= repo_mtime:
-            return None
-
-    try:
-        import shutil
-
-        if skill_dest.exists():
-            shutil.rmtree(skill_dest)
-        skill_dest.parent.mkdir(parents=True, exist_ok=True)
-        shutil.copytree(CLOUD_SPEC_SKILL_PATH.parent, skill_dest)
-        return None
-    except Exception as e:
-        return str(e)
-
-
 def build(project_path: Path, prompt: str) -> list[protocol.ContentBlock]:
     """Build the prompt structure and extract paths with the @ syntax.
 
@@ -66,14 +18,6 @@ def build(project_path: Path, prompt: str) -> list[protocol.ContentBlock]:
     """
     prompt_content: list[protocol.ContentBlock] = []
 
-    # Prepend cloud-spec-skill as system guidance
-    cloud_spec_content = _get_cloud_spec_content()
-    if cloud_spec_content:
-        prompt_content.append({
-            "type": "text",
-            "text": f"[System Guidance - Always follow these development standards]\n\n{cloud_spec_content}\n\n---\n\n"
-        })
-
     prompt_content.append({"type": "text", "text": prompt})
     for path, _, _ in extract_paths_from_prompt(prompt):
         if path.endswith("/"):
@@ -81,7 +25,6 @@ def build(project_path: Path, prompt: str) -> list[protocol.ContentBlock]:
         try:
             resource = load_resource(project_path, Path(path))
         except ResourceError:
-            # TODO: How should this be handled?
             continue
         uri = f"file://{resource.path.absolute().resolve()}"
         if resource.text is not None:

package/tui/acp/protocol.py

@@ -217,6 +217,11 @@ class ToolCall(SchemaDict, total=False, extra_items=Any):
     status: ToolCallStatus
     title: Required[str]
     toolCallId: Required[ToolCallId]
+    # Custom (non-ACP) field: when set, this tool call was invoked *inside* a
+    # subagent and the TUI should mount/update the ToolCall card inside the
+    # owning SubAgent widget (subagentId = the parent Spawn toolCallId) rather
+    # than in the main conversation.
+    subagentId: str
 
 
 # https://agentclientprotocol.com/protocol/schema#toolcallupdate
@@ -231,6 +236,7 @@ class ToolCallUpdate(SchemaDict, total=False, extra_items=Any):
     status: ToolCallStatus | None
     title: str | None
     toolCallId: Required[ToolCallId]
+    subagentId: str
 
 
 # https://agentclientprotocol.com/protocol/schema#param-tool-call

package/tui/app.py

@@ -22,7 +22,6 @@ from textual.timer import Timer
 from textual.notifications import Notify
 from textual.screen import Screen
 
-import tui
 from tui.db import DB
 from tui.settings import Schema, Settings
 from tui.agent_schema import Agent as AgentData
@@ -234,12 +233,6 @@ def get_store_screen():
     return StoreScreen()
 
 
-def get_projects_screen() -> "ProjectsScreen":
-    from tui.screens.projects_screen import ProjectsScreen
-
-    return ProjectsScreen()
-
-
 class A2TUIApp(App, inherit_bindings=False):
     """The top level app."""
 
@@ -249,7 +242,6 @@ class A2TUIApp(App, inherit_bindings=False):
         "settings": get_settings_screen,
         "sessions": get_sessions_screen,
         "store": get_store_screen,
-        "projects": get_projects_screen,
     }
     MODES = {}
     BINDING_GROUP_TITLE = "System"
@@ -361,9 +353,12 @@ class A2TUIApp(App, inherit_bindings=False):
             return
         session_time = monotonic() - conv.session_start_time
         session_id = getattr(conv.agent, "session_id", None) or conv._agent_session_id or ""
+        session_pk = conv._session_pk
+        if session_pk is None and conv.agent is not None:
+            session_pk = getattr(conv.agent, "session_pk", None)
         self._exit_metrics = {
             "session_id": session_id,
-            "session_pk": conv._session_pk,
+            "session_pk": session_pk,
             "tool_call_total": conv._tool_call_total,
             "tool_call_success": conv._tool_call_success,
             "tool_call_failed": conv._tool_call_failed,
@@ -838,15 +833,6 @@ class A2TUIApp(App, inherit_bindings=False):
         self.capture_event("tui-run")
         self.anon_id  # Created on frst reference
 
-        from tui.acp.prompt import ensure_cloud_spec_skill_installed
-
-        if err := ensure_cloud_spec_skill_installed():
-            self.notify(
-                f"Failed to install cloud-spec-skill: {err}",
-                title="cloud-spec-skill",
-                severity="warning",
-            )
-
         from pathlib import Path
 
         if mode := self._initial_mode:
@@ -1015,7 +1001,7 @@ class A2TUIApp(App, inherit_bindings=False):
             hint = f"  Reload with: cdh session load {session_pk}\n"
         elif sid:
             display_id = sid
-            hint = ""
+            hint = f"  Reload with: cdh session load {sid}\n"
         else:
             display_id = "-"
             hint = ""
@@ -1142,15 +1128,16 @@ class A2TUIApp(App, inherit_bindings=False):
     @work
     async def action_projects(self) -> None:
         from pathlib import Path
-        from onecode.config import load_config, save_config, CLOUD_DEV_HARNESS_DIR
+        from onecode.config import load_config, save_config
         from onecode.config_screen import EditFieldScreen
         import yaml
 
-        result = await self.push_screen_wait("projects")
+        from tui.screens.projects_screen import ProjectsScreen
+        result = await self.push_screen_wait(ProjectsScreen())
         if result is None:
             cfg = load_config()
             if cfg.current_project:
-                projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+                projects_dir = Path.home() / ".cdh" / "projects"
                 pf = projects_dir / f"{cfg.current_project}.yaml"
                 if not pf.exists():
                     cfg.current_project = None
@@ -1176,7 +1163,7 @@ class A2TUIApp(App, inherit_bindings=False):
                 from cdh.scaffold import scaffold_dlc_project
                 scaffold_dlc_project(project_path, name)
                 CdhProjectLoader.init_project(project_path, name)
-                projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+                projects_dir = Path.home() / ".cdh" / "projects"
                 projects_dir.mkdir(parents=True, exist_ok=True)
                 proj_data = {"name": name, "path": str(project_path), "description": ""}
                 (projects_dir / f"{name}.yaml").write_text(yaml.dump(proj_data))
@@ -1191,7 +1178,7 @@ class A2TUIApp(App, inherit_bindings=False):
 
             project_name = result if isinstance(result, str) else getattr(result, 'name', None)
             if project_name:
-                projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+                projects_dir = Path.home() / ".cdh" / "projects"
                 project_path = None
                 for ext in ["yaml", "yml", "json"]:
                     pf = projects_dir / f"{project_name}.{ext}"
@@ -1216,15 +1203,6 @@ class A2TUIApp(App, inherit_bindings=False):
 
     @on(messages.LaunchAgent)
     def on_launch_agent(self, message: messages.LaunchAgent) -> None:
-        from tui.acp.prompt import ensure_cloud_spec_skill_installed
-
-        if err := ensure_cloud_spec_skill_installed():
-            self.notify(
-                f"Failed to install cloud-spec-skill: {err}",
-                title="cloud-spec-skill",
-                severity="warning",
-            )
-
         self.launch_agent(
             message.identity,
             agent_session_id=message.session_id,

package/tui/messages.py

@@ -116,6 +116,8 @@ class SessionUpdate(Message):
     """Project directory path."""
     state: SessionState | None = None
     """New session state."""
+    session_pk: int | None = None
+    """DB primary key of the session."""
 
 
 @dataclass

package/tui/path_complete.py

@@ -2,7 +2,7 @@ import asyncio
 from itertools import islice
 import os
 from pathlib import Path
-from typing import Iterable, Literal, Sequence
+from typing import Iterable, Literal
 
 
 def longest_common_prefix(strings: list[str]) -> str:

package/tui/paths.py

@@ -69,3 +69,19 @@ def get_log() -> Path:
     with suppress(OSError):
         path.mkdir(0o700, exist_ok=True, parents=True)
     return path
+
+
+def get_sessions() -> Path:
+    """Get the platform-level sessions directory (~/.cdh/sessions/).
+
+    Session JSON files are stored by the cdh platform, not by individual
+    agent engines.  The DB index at ~/.cdh/state/tui/tui.db maps each
+    session to its owning engine (B mapping mode).
+
+    Returns:
+        Path to the sessions directory.
+    """
+    path = Path.home() / ".cdh" / "sessions"
+    with suppress(OSError):
+        path.mkdir(0o700, exist_ok=True, parents=True)
+    return path

package/tui/screens/component_picker.py

@@ -32,22 +32,22 @@ class ComponentPickerScreen(ModalScreen[Optional[list[str]]]):
         width: 78;
         height: auto;
         max-height: 90%;
-        background: #111;
-        border: solid #555;
+        background: $surface;
+        border: solid $border;
         padding: 0 1;
     }
 
     #picker-title {
         height: 1;
-        background: #333;
-        color: #fff;
+        background: $panel;
+        color: $text;
         padding: 0 1;
         text-style: bold;
     }
 
     #picker-subtitle {
         height: 1;
-        color: #aaa;
+        color: $text-muted;
         padding: 0 1;
         margin-bottom: 1;
     }
@@ -56,43 +56,63 @@ class ComponentPickerScreen(ModalScreen[Optional[list[str]]]):
         height: auto;
         max-height: 22;
         padding: 0 1;
+        background: $surface;
     }
 
     .component-row {
         height: 2;
         padding: 0 1;
+        background: $surface;
     }
 
     .component-row Checkbox {
         width: 1fr;
+        background: $surface;
+        color: $text;
+    }
+
+    .component-row Checkbox > .toggle--button {
+        background: $panel;
+        color: $text-muted;
+    }
+
+    .component-row Checkbox.-on > .toggle--button {
+        background: $primary;
+        color: $text;
+    }
+
+    .component-row Checkbox > .toggle--label {
+        color: $text;
+    }
+
+    Footer {
+        background: $panel;
+        color: $text-muted;
     }
 
     #picker-buttons {
         height: 3;
         align: center middle;
-        background: #222;
+        background: $panel;
     }
 
     #picker-buttons Button {
         margin: 0 1;
-        background: #444;
-        color: #fff;
+        background: $panel;
+        color: $text;
     }
 
     #picker-buttons Button:hover {
-        background: #666;
-    }
-
-    #picker-buttons Button:focus {
-        background: #555;
+        background: $primary-darken-2;
     }
 
     #picker-buttons #picker-confirm {
-        background: #1a4d8f;
+        background: $primary-background;
+        color: $text;
     }
 
     #picker-buttons #picker-confirm:hover {
-        background: #2870c2;
+        background: $primary-darken-1;
     }
     """
 

package/tui/screens/diff_screen.py

@@ -0,0 +1,84 @@
+from __future__ import annotations
+
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import VerticalScroll
+from textual.screen import ModalScreen
+from textual.widgets import Static
+
+from tui.widgets.diff_view import make_diff
+
+
+class DiffScreen(ModalScreen[None]):
+    """Full-screen view of a file diff.
+
+    Opened when a file is selected from the ModifiedFiles sidebar. Displays
+    the same DiffView widget that ``Conversation.post_diff`` would have mounted
+    inline, but as a dedicated modal screen instead of a conversation block.
+    """
+
+    BINDINGS = [
+        Binding("escape", "dismiss(None)", "Close", show=False, priority=True),
+        Binding("q", "dismiss(None)", "Close", show=False, priority=True),
+    ]
+
+    DEFAULT_CSS = """
+    DiffScreen {
+        background: $surface;
+    }
+
+    #diff-header {
+        dock: top;
+        width: 100%;
+        padding: 1 2;
+        background: $panel;
+        color: $text-primary;
+        text-style: bold;
+        height: 3;
+    }
+
+    #diff-header-meta {
+        color: $text-muted;
+        text-style: none;
+    }
+
+    #diff-scroll {
+        width: 100%;
+        height: 1fr;
+        padding: 0 1 0 1;
+    }
+
+    #diff-scroll > DiffView {
+        width: 100%;
+        height: auto;
+    }
+    """
+
+    def __init__(
+        self,
+        path: str,
+        before: str | None,
+        after: str,
+        *,
+        name: str | None = None,
+        id: str | None = None,
+        classes: str | None = None,
+    ) -> None:
+        super().__init__(name=name, id=id, classes=classes)
+        self._path = path
+        self._before = before
+        self._after = after
+
+    def compose(self) -> ComposeResult:
+        filename = self._path.rsplit("/", 1)[-1] or self._path
+        meta = "untracked" if self._before is None else "modified"
+        yield Static(
+            f"[b]📝 {filename}[/b]  [#888888]{meta}[/]",
+            id="diff-header",
+            markup=True,
+        )
+        with VerticalScroll(id="diff-scroll"):
+            yield make_diff(self._path, self._path, self._before, self._after)
+
+    def on_mount(self) -> None:
+        self.title = f"Diff: {self._path}"

package/tui/screens/log.py

@@ -285,7 +285,7 @@ class LogScreen(ModalScreen[None]):
         padding: 0 1;
     }
 
-    LogScreen VerticalScroll {
+    LogScreen #log-list {
         height: 1fr;
         background: $surface;
     }
@@ -308,7 +308,8 @@ class LogScreen(ModalScreen[None]):
             yield Static(self._header_text(), id="log-header")
             yield VerticalScroll(id="log-list")
 
-    def on_mount(self) -> None:
+    async def on_mount(self) -> None:
+        self.query_one("#log-list", VerticalScroll).can_focus = False
         if self._log_path is None:
             self._append_system("No log file yet. Start an agent to begin logging.")
             return
@@ -318,7 +319,7 @@ class LogScreen(ModalScreen[None]):
             )
             self._poll_timer = self.set_interval(0.2, self._poll_new_lines)
             return
-        self._begin_tailing()
+        await self._begin_tailing()
 
     # ── Page helpers ───────────────────────────────────────────────
 
@@ -330,25 +331,24 @@ class LogScreen(ModalScreen[None]):
         end = min(start + _PAGE_SIZE, len(self._entries))
         return start, end
 
-    def _render_page(self) -> None:
+    async def _render_page(self) -> None:
         scroller = self.query_one("#log-list", VerticalScroll)
-        scroller.remove_children()
+        await scroller.remove_children()
         start, end = self._page_range()
         page_entries = self._entries[start:end]
-        for tag, raw in page_entries:
-            scroller.mount(LogEntry(tag, raw))
+        await scroller.mount(*[LogEntry(tag, raw) for tag, raw in page_entries])
         self._current_index = 0 if page_entries else -1
         self._apply_selection()
         self._refresh_header()
 
-    def _navigate_to_page(self, page: int) -> None:
+    async def _navigate_to_page(self, page: int) -> None:
         total = self._total_pages()
         self._current_page = max(1, min(page, total))
-        self._render_page()
+        await self._render_page()
 
     # ── File loading ───────────────────────────────────────────────
 
-    def _begin_tailing(self) -> None:
+    async def _begin_tailing(self) -> None:
         """Read entire log file and start polling."""
         assert self._log_path is not None
         try:
@@ -360,9 +360,9 @@ class LogScreen(ModalScreen[None]):
             return
         self._file_was_present = True
         self._entries = []
-        self._ingest(data)
+        await self._ingest(data)
         self._current_page = self._total_pages()
-        self._render_page()
+        await self._render_page()
         if self._poll_timer is None:
             self._poll_timer = self.set_interval(0.2, self._poll_new_lines)
 
@@ -413,14 +413,14 @@ class LogScreen(ModalScreen[None]):
 
     # ── Polling for new lines ──────────────────────────────────────
 
-    def _poll_new_lines(self) -> None:
+    async def _poll_new_lines(self) -> None:
         if self._log_path is None:
             return
         if not self._log_path.exists():
             return
         if not self._file_was_present:
             self._append_system(f"── log file appeared: {self._log_path} ──")
-            self._begin_tailing()
+            await self._begin_tailing()
             return
         try:
             size = self._log_path.stat().st_size
@@ -433,11 +433,11 @@ class LogScreen(ModalScreen[None]):
                 new_text = f.read()
             self._file_pos = size
             if new_text:
-                self._ingest(new_text)
+                await self._ingest(new_text)
         except OSError:
             pass
 
-    def _ingest(self, chunk: str) -> None:
+    async def _ingest(self, chunk: str) -> None:
         was_on_last_page = (
             len(self._entries) == 0
             or self._current_page == self._total_pages()
@@ -466,7 +466,7 @@ class LogScreen(ModalScreen[None]):
                 self._entries.append(("error", line))
         if was_on_last_page:
             self._current_page = self._total_pages()
-            self._render_page()
+            await self._render_page()
         else:
             self._refresh_header()
 
@@ -479,19 +479,19 @@ class LogScreen(ModalScreen[None]):
                 return child
         return None
 
-    def action_next_page(self) -> None:
+    async def action_next_page(self) -> None:
         if self._current_page < self._total_pages():
-            self._navigate_to_page(self._current_page + 1)
+            await self._navigate_to_page(self._current_page + 1)
 
-    def action_prev_page(self) -> None:
+    async def action_prev_page(self) -> None:
         if self._current_page > 1:
-            self._navigate_to_page(self._current_page - 1)
+            await self._navigate_to_page(self._current_page - 1)
 
-    def action_first_page(self) -> None:
-        self._navigate_to_page(1)
+    async def action_first_page(self) -> None:
+        await self._navigate_to_page(1)
 
-    def action_last_page(self) -> None:
-        self._navigate_to_page(self._total_pages())
+    async def action_last_page(self) -> None:
+        await self._navigate_to_page(self._total_pages())
 
     def action_next_entry(self) -> None:
         scroller = self.query_one("#log-list", VerticalScroll)