@scemoon/cdh 1.0.0 → 1.0.4

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 {

package/tui/screens/projects_app.py

@@ -226,13 +226,24 @@ class ProjectsApp(App):
         except Exception:
             ws = Path.cwd().resolve()
         name = ws.name
-        from cdh.scaffold import scaffold_dlc_project
-        scaffold_dlc_project(ws, name)
-        CdhProjectLoader.init_project(ws, name)
         projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
         projects_dir.mkdir(parents=True, exist_ok=True)
+        proj_file = projects_dir / f"{name}.yaml"
+        if proj_file.exists():
+            self.notify(
+                f"Project '{name}' already exists in the project list",
+                severity="error",
+            )
+            return
+        from cdh.scaffold import scaffold_dlc_project
+        try:
+            scaffold_dlc_project(ws, name)
+        except (ValueError, RuntimeError) as e:
+            self.notify(str(e), severity="error")
+            return
+        CdhProjectLoader.init_project(ws, name)
         proj_data = {"name": name, "path": str(ws), "description": ""}
-        (projects_dir / f"{name}.yaml").write_text(yaml.dump(proj_data))
+        proj_file.write_text(yaml.dump(proj_data))
         cfg = load_config()
         cfg.current_project = name
         cfg.current_project_path = str(ws)
@@ -262,9 +273,26 @@ 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.mkdir(parents=True, exist_ok=True)
+        proj_file = projects_dir / f"{name}.yaml"
+        if proj_file.exists():
+            self.notify(
+                f"Project '{name}' already exists in the project list",
+                severity="error",
+            )
+            return
         from cdh.scaffold import init_dlc_project
-        init_dlc_project(target, name)
+        try:
+            init_dlc_project(target, name)
+        except (ValueError, RuntimeError) as e:
+            self.notify(str(e), severity="error")
+            return
         CdhProjectLoader.init_project(target, name)
+        import yaml
+        proj_data = {"name": name, "path": str(target), "description": ""}
+        proj_file.write_text(yaml.dump(proj_data))
+        self._refresh()
         self.notify(f"Initialized .cdh in {target}")
 
     def _load_project(self) -> None:

package/tui/screens/projects_screen.py

@@ -2,7 +2,6 @@ from time import monotonic
 
 from textual.app import ComposeResult
 from textual.binding import Binding
-from textual.events import ScreenResume
 from textual.screen import ModalScreen
 from textual import getters
 from textual.widget import Widget
@@ -17,12 +16,26 @@ from tui.app import A2TUIApp
 from tui.widgets.grid_select import GridSelect
 from tui.widgets.project_grid_select import ProjectGridSelect
 from tui.widgets.project_summary import ProjectSummary
+from tui.screens.component_picker import ComponentPickerScreen
 
 
 CONFIRM_TIMEOUT = 5.0
 INSTRUCTIONS_NO_PROJECTS = "Your projects will be shown here."
 
 
+def _project_db_path(name: str):
+    """Return the path of the project entry in ``~/.cdh/projects/``
+    for *name* across all supported extensions, or ``None`` if the
+    project is not registered yet.
+    """
+    projects_dir = CLOUD_DEV_HARNESS_DIR / "projects"
+    for ext in ("yaml", "yml", "json"):
+        pf = projects_dir / f"{name}.{ext}"
+        if pf.exists():
+            return pf
+    return None
+
+
 class ProjectsScreen(ModalScreen[str]):
     CSS_PATH = "projects.tcss"
     BINDINGS = [
@@ -41,7 +54,7 @@ class ProjectsScreen(ModalScreen[str]):
             yield widgets.Label("Projects")
         yield widgets.Static(INSTRUCTIONS_NO_PROJECTS, classes="instructions")
         yield ProjectGridSelect()
-        with containers.Center():
+        with containers.Horizontal(id="actions"):
             yield widgets.Button("+ New Project", id="new-project", variant="primary")
             yield widgets.Button("Init .cdh (i)", id="init-project")
         yield widgets.Footer()
@@ -89,12 +102,95 @@ class ProjectsScreen(ModalScreen[str]):
         self.notify(f"Deleted project: {project_name}")
 
     def action_new_project(self) -> None:
-        self.dismiss("__new__")
+        from pathlib import Path
+        from onecode.config_screen import EditFieldScreen
+
+        default_path = str(Path.cwd().resolve())
+        self.app.push_screen(
+            EditFieldScreen("Project path", default_path),
+            self._on_new_project_path,
+        )
+
+    def _on_new_project_path(self, path_str: str | None) -> None:
+        from pathlib import Path
+
+        if not path_str:
+            return
+        try:
+            target = Path(path_str).expanduser().resolve()
+        except Exception:
+            self.notify("Invalid path", severity="error")
+            return
+        if _project_db_path(target.name) is not None:
+            self.notify(
+                f"Project '{target.name}' is already in the project list",
+                severity="warning",
+            )
+            return
+        self.app.push_screen(
+            ComponentPickerScreen(
+                title="New Project — Select Components",
+                subtitle=(
+                    f"Project path: {target}\n"
+                    "Cross-cutting items (contracts, shared types, etc.) are created automatically."
+                ),
+                allow_empty=False,
+            ),
+            lambda picked: self._on_new_project_components(target, picked),
+        )
+
+    def _on_new_project_components(
+        self,
+        target: "Path",
+        picked: list[str] | None,
+    ) -> None:
+        if picked is None:
+            self.notify("New project cancelled", severity="warning")
+            return
+        if not picked:
+            return
+        self._do_new_project(target, picked)
+
+    def _do_new_project(
+        self,
+        target: "Path",
+        components: list[str],
+    ) -> None:
+        from pathlib import Path
+        from onecode.agent.cdh_loader import CdhProjectLoader
+
+        name = target.name
+        from cdh.scaffold import scaffold_dlc_project
+
+        try:
+            scaffold_dlc_project(target, name, components=components)
+        except (ValueError, RuntimeError) as e:
+            self.notify(str(e), severity="error")
+            return
+        if _project_db_path(name) is not None:
+            self.notify(
+                f"Project '{name}' is already in the project list",
+                severity="error",
+            )
+            return
+        projects_dir = CLOUD_DEV_HARNESS_DIR / "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)
+        self.project_grid_select.highlighted = len(self.project_grid_select.children) - 1
+        self.notify(
+            f"Created project '{name}' at {target} "
+            f"(components: {', '.join(components)})"
+        )
 
     def action_init_project(self) -> None:
         from pathlib import Path
         from onecode.config_screen import EditFieldScreen
-        from onecode.agent.cdh_loader import CdhProjectLoader
 
         default_path = str(Path.cwd().resolve())
         self.app.push_screen(
@@ -117,14 +213,80 @@ class ProjectsScreen(ModalScreen[str]):
             self.notify("Invalid path", severity="error")
             return
         existing = CdhProjectLoader.find_cdh_dir(target)
-        if existing is not None:
+        if existing is not None and existing.parent == target:
             self.notify(f".cdh already exists at {existing}", severity="warning")
             return
+        if _project_db_path(target.name) is not None:
+            self.notify(
+                f"Project '{target.name}' is already in the project list",
+                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)
+
+    def _do_init_project(
+        self,
+        target: "Path",
+        components: list[str],
+    ) -> None:
+        from pathlib import Path
+        from onecode.agent.cdh_loader import CdhProjectLoader
+        from cdh.scaffold import add_component, init_dlc_project
+
         name = target.name
-        from cdh.scaffold import scaffold_dlc_project
-        scaffold_dlc_project(target, name)
+        if _project_db_path(name) is not None:
+            self.notify(
+                f"Project '{name}' is already in the project list",
+                severity="error",
+            )
+            return
+        try:
+            init_dlc_project(target, name)
+        except (ValueError, RuntimeError) as e:
+            self.notify(str(e), severity="error")
+            return
+        for cid in components:
+            try:
+                add_component(target, cid)
+            except (ValueError, FileNotFoundError) as e:
+                self.notify(str(e), severity="error")
         CdhProjectLoader.init_project(target, name)
-        self.notify(f"Initialized .cdh in {target}")
+        import yaml
+        projects_dir = CLOUD_DEV_HARNESS_DIR / "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)
+        self.project_grid_select.highlighted = len(self.project_grid_select.children) - 1
+        suffix = (
+            f" (components: {', '.join(components)})"
+            if components
+            else " (no components)"
+        )
+        self.notify(f"Initialized .cdh in {target}{suffix}")
 
     @on(GridSelect.Selected)
     def on_selected(self, event: GridSelect.Selected) -> None:
@@ -135,7 +297,7 @@ class ProjectsScreen(ModalScreen[str]):
 
     @on(widgets.Button.Pressed, "#new-project")
     def on_new_project(self) -> None:
-        self.dismiss("__new__")
+        self.action_new_project()
 
     @on(widgets.Button.Pressed, "#init-project")
     def on_init_project(self) -> None:

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/settings_schema.py

@@ -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/widgets/ask_user.py

@@ -260,5 +260,5 @@ class AskUserWidget(VerticalGroup):
     def _finish(self, value: str) -> None:
         self._answer = value
         self._done = True
-        self.refresh(recompose=True, layout=True)
+        self.refresh(recompose=True)
         self.post_message(AskUserSubmitted(value, self._tool_id))