@scemoon/cdh 1.0.3 → 1.0.5

package/tui/screens/main.py

@@ -2,6 +2,7 @@ import asyncio
 from functools import partial
 from pathlib import Path
 import random
+import subprocess
 
 from textual import on
 from textual.app import ComposeResult
@@ -27,9 +28,9 @@ from tui.widgets.modified_files import ModifiedFiles
 from tui.widgets.plan import Plan
 from tui.widgets.throbber import Throbber
 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 tui.screens.diff_screen import DiffScreen
 
 
 class ModeProvider(Provider):
@@ -210,33 +211,15 @@ class MainScreen(Screen, can_focus=False):
             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 self.project_path == new_dir:
                 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(
-                        "Project",
-                        ProjectDirectoryTree(
-                            self.project_path,
-                            id="project_directory_tree",
-                        ),
-                        flex=True,
-                        id="project-panel",
-                    ),
-                )
-                tree = collapsible.query_one(ProjectDirectoryTree)
-                tree.data_bind(path=MainScreen.project_path)
-                tree.guide_depth = 3
-    
             if mf := sidebar.query_one_optional("#modified_files", ModifiedFiles):
                 mf.refresh_files()
             self._swap_directory_watcher(new_dir)
@@ -247,18 +230,54 @@ class MainScreen(Screen, can_focus=False):
         except Exception:
             pass
 
-    def _has_project_panel(self) -> bool:
-        try:
-            sidebar = self.query_one(SideBar)
-        except Exception:
-            return False
-        return sidebar.has_panel("project-panel")
 
     @on(DirectoryTree.FileSelected, "ProjectDirectoryTree")
     def on_project_directory_tree_selected(self, event: Tree.NodeSelected):
         if (data := event.node.data) is not None:
             self.conversation.insert_path_into_prompt(data.path)
 
+    @on(ModifiedFiles.FileSelected)
+    async def on_modified_files_file_selected(self, event: ModifiedFiles.FileSelected):
+        event.stop()
+        filepath = event.filepath
+        project_path = self.project_path
+        if project_path is None:
+            return
+
+        before, after = self._get_file_diff_content(project_path, filepath)
+        if before is None and after is None:
+            self.app.notify("No diff available", severity="warning")
+            return
+        full_path = str(project_path / filepath)
+        self.app.push_screen(DiffScreen(full_path, before, after or ""))
+
+    def _get_file_diff_content(
+        self, project_path: Path, filepath: str
+    ) -> tuple[str | None, str | None]:
+        after: str | None = None
+        current_path = project_path / filepath
+        try:
+            after = current_path.read_text()
+        except Exception:
+            after = "" if current_path.exists() else None
+
+        before: str | None = None
+        try:
+            r = subprocess.run(
+                ["git", "-C", str(project_path), "show", f"HEAD:{filepath}"],
+                capture_output=True, text=True, timeout=5.0,
+            )
+            if r.returncode == 0:
+                before = r.stdout
+        except Exception:
+            pass
+
+        if before == after:
+            return None, None
+        if before is None and after is None:
+            return None, None
+        return before, after or ""
+
     @on(acp_messages.Plan)
     async def on_acp_plan(self, message: acp_messages.Plan):
         message.stop()
@@ -277,7 +296,10 @@ class MainScreen(Screen, can_focus=False):
                 subtitle=event.subtitle,
                 path=event.path,
                 state=event.state,
+                session_pk=event.session_pk,
             )
+        if event.session_pk is not None:
+            self.conversation._session_pk = event.session_pk
         if event.name is not None:
             self.conversation.update_title()
 

package/tui/screens/projects.tcss

@@ -28,6 +28,10 @@ ProjectsScreen {
 
     #actions Button {
         margin: 0 1;
+        &:focus {
+            color: $text;
+            background-tint: $primary 20%;
+        }
     }
 
 
@@ -68,7 +72,7 @@ ProjectsScreen {
             width: 1fr;
         }
         .path {
-            color: $text-secondary;
+            color: $foreground 70%;
             text-style: italic;
         }
     }

package/tui/screens/projects_app.py

@@ -9,7 +9,7 @@ from textual.reactive import var
 from textual.widget import Widget
 from textual.widgets import Button, Label, Static
 
-from onecode.config import CLOUD_DEV_HARNESS_DIR, load_config, save_config
+from onecode.config import load_config, save_config
 from onecode.agent.cdh_loader import CdhProjectLoader
 from onecode.config_screen import EditFieldScreen
 
@@ -162,7 +162,7 @@ class ProjectsApp(App):
         self._refresh()
 
     def _refresh(self) -> None:
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         projects_dir.mkdir(parents=True, exist_ok=True)
         pf_list = sorted(
             list(projects_dir.glob("*.yaml")) + list(projects_dir.glob("*.json"))
@@ -226,7 +226,7 @@ class ProjectsApp(App):
         except Exception:
             ws = Path.cwd().resolve()
         name = ws.name
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         projects_dir.mkdir(parents=True, exist_ok=True)
         proj_file = projects_dir / f"{name}.yaml"
         if proj_file.exists():
@@ -273,7 +273,7 @@ class ProjectsApp(App):
             self.notify(f".cdh already exists at {existing}", severity="warning")
             return
         name = target.name
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         projects_dir.mkdir(parents=True, exist_ok=True)
         proj_file = projects_dir / f"{name}.yaml"
         if proj_file.exists():
@@ -301,7 +301,7 @@ class ProjectsApp(App):
             self.notify("No project selected", severity="warning")
             return
         name = item._name
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         for ext in ["yaml", "yml", "json"]:
             pf = projects_dir / f"{name}.{ext}"
             if pf.exists():
@@ -332,7 +332,7 @@ class ProjectsApp(App):
             self.notify("No project selected", severity="warning")
             return
         name = item._name
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         for ext in ["yaml", "yml", "json"]:
             pf = projects_dir / f"{name}.{ext}"
             if pf.exists():

package/tui/screens/projects_screen.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from time import monotonic
 
 from textual.app import ComposeResult
@@ -10,8 +11,6 @@ from textual import containers
 from textual import on
 
 
-from onecode.config import CLOUD_DEV_HARNESS_DIR
-
 from tui.app import A2TUIApp
 from tui.widgets.grid_select import GridSelect
 from tui.widgets.project_grid_select import ProjectGridSelect
@@ -28,7 +27,7 @@ def _project_db_path(name: str):
     for *name* across all supported extensions, or ``None`` if the
     project is not registered yet.
     """
-    projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+    projects_dir = Path.home() / ".cdh" / "projects"
     for ext in ("yaml", "yml", "json"):
         pf = projects_dir / f"{name}.{ext}"
         if pf.exists():
@@ -61,7 +60,11 @@ class ProjectsScreen(ModalScreen[str]):
 
     @property
     def focus_chain(self) -> list[Widget]:
-        return [self.project_grid_select]
+        return [
+            self.project_grid_select,
+            self.query_one("#new-project", widgets.Button),
+            self.query_one("#init-project", widgets.Button),
+        ]
 
     def action_delete_project(self) -> None:
         now = monotonic()
@@ -87,7 +90,7 @@ class ProjectsScreen(ModalScreen[str]):
         project_name = widget.id
         if project_name is None:
             return
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         deleted = False
         for ext in ["yaml", "yml", "json"]:
             pf = projects_dir / f"{project_name}.{ext}"
@@ -96,7 +99,7 @@ class ProjectsScreen(ModalScreen[str]):
                 deleted = True
                 break
         if not deleted:
-            self.notify(f"Project file not found", severity="error")
+            self.notify("Project file not found", severity="error")
             return
         widget.remove()
         self.notify(f"Deleted project: {project_name}")
@@ -139,7 +142,7 @@ class ProjectsScreen(ModalScreen[str]):
             lambda picked: self._on_new_project_components(target, picked),
         )
 
-    def _on_new_project_components(
+    async def _on_new_project_components(
         self,
         target: "Path",
         picked: list[str] | None,
@@ -149,9 +152,9 @@ class ProjectsScreen(ModalScreen[str]):
             return
         if not picked:
             return
-        self._do_new_project(target, picked)
+        await self._do_new_project(target, picked)
 
-    def _do_new_project(
+    async def _do_new_project(
         self,
         target: "Path",
         components: list[str],
@@ -173,15 +176,14 @@ class ProjectsScreen(ModalScreen[str]):
                 severity="error",
             )
             return
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         projects_dir.mkdir(parents=True, exist_ok=True)
         proj_file = projects_dir / f"{name}.yaml"
         CdhProjectLoader.init_project(target, name)
         import yaml
         proj_data = {"name": name, "path": str(target), "description": ""}
         proj_file.write_text(yaml.dump(proj_data))
-        widget = ProjectSummary(name, str(target), id=name)
-        self.project_grid_select.mount(widget)
+        await self.project_grid_select.reload()
         self.project_grid_select.highlighted = len(self.project_grid_select.children) - 1
         self.notify(
             f"Created project '{name}' at {target} "
@@ -198,7 +200,7 @@ class ProjectsScreen(ModalScreen[str]):
             self._on_init_path,
         )
 
-    def _on_init_path(self, path_str: str | None) -> None:
+    async def _on_init_path(self, path_str: str | None) -> None:
         from pathlib import Path
         from onecode.agent.cdh_loader import CdhProjectLoader
 
@@ -222,30 +224,9 @@ class ProjectsScreen(ModalScreen[str]):
                 severity="warning",
             )
             return
-        self.app.push_screen(
-            ComponentPickerScreen(
-                title="Init .cdh — Select Components",
-                subtitle=(
-                    f"Directory: {target}\n"
-                    "Pick the components already present in this directory. "
-                    "Empty selection is allowed (no apps/ created)."
-                ),
-                allow_empty=True,
-            ),
-            lambda picked: self._on_init_components(target, picked),
-        )
-
-    def _on_init_components(
-        self,
-        target: "Path",
-        picked: list[str] | None,
-    ) -> None:
-        if picked is None:
-            self.notify("Init cancelled", severity="warning")
-            return
-        self._do_init_project(target, picked)
+        await self._do_init_project(target, [])
 
-    def _do_init_project(
+    async def _do_init_project(
         self,
         target: "Path",
         components: list[str],
@@ -273,13 +254,12 @@ class ProjectsScreen(ModalScreen[str]):
                 self.notify(str(e), severity="error")
         CdhProjectLoader.init_project(target, name)
         import yaml
-        projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+        projects_dir = Path.home() / ".cdh" / "projects"
         projects_dir.mkdir(parents=True, exist_ok=True)
         proj_file = projects_dir / f"{name}.yaml"
         proj_data = {"name": name, "path": str(target), "description": ""}
         proj_file.write_text(yaml.dump(proj_data))
-        widget = ProjectSummary(name, str(target), id=name)
-        self.project_grid_select.mount(widget)
+        await self.project_grid_select.reload()
         self.project_grid_select.highlighted = len(self.project_grid_select.children) - 1
         suffix = (
             f" (components: {', '.join(components)})"

package/tui/screens/sessions.py

@@ -12,10 +12,9 @@ from textual import containers
 from textual import on
 
 
-from onecode.config import CLOUD_DEV_HARNESS_DIR
-
 from tui.app import A2TUIApp
 from tui.db import DB
+from tui.paths import get_sessions
 from tui.widgets.grid_select import GridSelect
 from tui.widgets.session_grid_select import (
     SessionGridSelect,
@@ -92,7 +91,7 @@ class SessionsScreen(ModalScreen[str]):
         await db.session_delete(session_pk)
 
         if agent_session_id:
-            session_file = CLOUD_DEV_HARNESS_DIR / "sessions" / f"{agent_session_id}.json"
+            session_file = get_sessions() / f"{agent_session_id}.json"
             if session_file.exists():
                 session_file.unlink()
 
@@ -145,9 +144,8 @@ class SessionsScreen(ModalScreen[str]):
         self.run_worker(self._load_historical_sessions())
 
     async def _on_screen_resume(self, event: ScreenResume) -> None:
+        await self._load_historical_sessions()
         current_mode = self.app.screen_stack[0].id
-        for instructions in self.query(".instructions"):
-            instructions.display = not self.session_grid_select.children
         if current_mode is not None:
             self.session_grid_select.update_current(current_mode)
 

package/tui/screens/store.py

@@ -421,7 +421,7 @@ class StoreScreen(Screen):
     async def on_mount(self) -> None:
         self.app.settings_changed_signal.subscribe(self, self.setting_updated)
         if not self.app.settings.get("launcher.agents", str).strip():
-            self.app.settings.set("launcher.agents", "cdh.cloud-dev-harness")
+            self.app.settings.set("launcher.agents", "onecode.dev")
             await self.app.save_settings()
         try:
             self._agents = await read_agents()

package/tui/session_tracker.py

@@ -77,6 +77,7 @@ class SessionTracker:
         subtitle: str | None = None,
         path: str | None = None,
         state: SessionState | None = None,
+        session_pk: int | None = None,
     ) -> SessionDetails:
         session_details = self.sessions[mode_name]
         if title is not None:
@@ -87,6 +88,8 @@ class SessionTracker:
             session_details.path = path
         if state is not None:
             session_details.state = state
+        if session_pk is not None:
+            session_details.session_pk = session_pk
         self.signal.publish((mode_name, session_details))
         return session_details
 

package/tui/settings_schema.py

@@ -261,7 +261,7 @@ SCHEMA: list[SchemaDict] = [
                 "title": "Tool content max height",
                 "help": "Max height of expanded tool content as a percentage of viewport height (0 = no limit).",
                 "type": "integer",
-                "default": 60,
+                "default": 30,
                 "validate": [{"type": "minimum", "value": 0}, {"type": "maximum", "value": 100}],
             },
         ],
@@ -363,7 +363,7 @@ SCHEMA: list[SchemaDict] = [
                 "key": "agents",
                 "title": "Agents to show in the launcher",
                 "type": "text",
-                "default": "cdh.cloud-dev-harness",
+                "default": "onecode.dev",
             }
         ],
     },

package/tui/visuals/columns.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Iterable, Iterator, Literal
+from typing import Iterator, Literal
 from fractions import Fraction
 
 import rich.repr
@@ -16,7 +16,6 @@ from textual.style import Style
 from tui._loop import loop_last
 
 
-from textual._profile import timer
 
 
 @rich.repr.auto

package/tui/widgets/agent_response.py

@@ -1,6 +1,5 @@
 from textual.reactive import var
 from textual.widget import Widget
-from textual.widgets import Markdown
 from textual.widgets.markdown import MarkdownStream
 
 from tui.conversation_markdown import ConversationMarkdown

package/tui/widgets/agent_thought.py

@@ -9,7 +9,6 @@ from textual.reactive import reactive
 from textual.widgets import Markdown, Static
 from textual.widgets.markdown import MarkdownStream
 
-from tui.protocol import ExpandProtocol
 
 
 class AgentThought(Vertical, can_focus=True):