ccmd 2.0.2__tar.gz → 2.0.4__tar.gz

{ccmd-2.0.2/ccmd.egg-info → ccmd-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccmd
-Version: 2.0.2
+Version: 2.0.4
 Summary: ccmd — Agentic Project Hub. Pick a project, pick an agent, launch.
 Author-email: De Catalyst <Robert5560newton@gmail.com>
 License: MIT

{ccmd-2.0.2 → ccmd-2.0.4}/ccmd/__init__.py

@@ -1,4 +1,4 @@
 """ccmd 2.0 — Agentic Project Hub."""
 
-__version__ = "2.0.2"
+__version__ = "2.0.4"
 __all__ = ["__version__"]

{ccmd-2.0.2 → ccmd-2.0.4}/ccmd/tui/screens/browser.py

@@ -12,6 +12,8 @@ from textual.screen import Screen
 from textual.widgets import Footer, Input, OptionList, Static
 from textual.widgets.option_list import Option
 
+from rich.markup import escape
+
 from ccmd.config.schema import load_config
 from ccmd.core.agents import all_agents, get_agent
 from ccmd.core.fs import default_browse_roots, is_projectish, list_dir_entries
@@ -98,9 +100,9 @@ class DirBrowserScreen(Screen[bool | None]):
         ag = get_agent(self._agent)
         ag_s = f"{ag.ascii_logo} {self._agent}" if ag else self._agent
         bar.update(
-            f"[bold #00ffc8]{self._cwd}[/]{mark}{hidden}  ·  "
-            f"agent [bold #c84bff]{ag_s}[/]"
-            + (f"  [#6a6a80]{extra}[/]" if extra else "")
+            f"[bold #00ffc8]{escape(str(self._cwd))}[/]{mark}{hidden}  ·  "
+            f"agent [bold #c84bff]{escape(ag_s)}[/]"
+            + (f"  [#6a6a80]{escape(extra)}[/]" if extra else "")
         )
 
     def _render_list(self) -> None:
@@ -184,21 +186,21 @@ class DirBrowserScreen(Screen[bool | None]):
         kids = list_dir_entries(resolved, show_hidden=self._show_hidden, dirs_only=True)
         project = is_projectish(resolved)
         lines = [
-            f"[bold #00ffc8]{resolved.name or resolved}[/]",
-            f"path     {resolved}",
+            f"[bold #00ffc8]{escape(str(resolved.name or resolved))}[/]",
+            f"path     {escape(str(resolved))}",
             f"project  {'yes ◆' if project else 'no (still selectable)'}",
             f"subdirs  {len(kids)}",
             "",
             "[#6a6a80]children[/]",
         ]
         for name, _, _ in kids[:12]:
-            lines.append(f"  · {name}/")
+            lines.append(f"  · {escape(name)}/")
         if len(kids) > 12:
             lines.append(f"  … +{len(kids) - 12} more")
         lines.extend(
             [
                 "",
-                "[#6a6a80]↵ open folder · s select as project[/]",
+                "[#6a6a80]enter open folder · s select as project[/]",
             ]
         )
         prev.update("\n".join(lines))

{ccmd-2.0.2 → ccmd-2.0.4}/ccmd/tui/screens/hub.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
+from rich.markup import escape
 from textual import on, work
 from textual.app import ComposeResult
 from textual.binding import Binding
@@ -33,6 +34,7 @@ def _agent_bar() -> str:
 
 
 class HubScreen(Screen):
+    # Filter Input is can_focus=False until / is pressed, so f/b/a never type into it.
     BINDINGS = [
         Binding("enter", "open_project", "Open", show=True),
         Binding("a", "pick_agent", "Agents", show=True),
@@ -44,13 +46,13 @@ class HubScreen(Screen):
         Binding("h", "ssh", "SSH", show=True),
         Binding("l", "aliases", "Aliases", show=True),
         Binding("d", "detach", "Detach", show=True),
+        Binding("r", "refresh", "Refresh", show=True),
+        Binding("q", "quit", "Quit", show=True),
         Binding("left_square_bracket", "agent_prev", "Agent−", show=True),
         Binding("right_square_bracket", "agent_next", "Agent+", show=True),
         Binding("slash", "focus_filter", "Filter", show=False),
         Binding("/", "focus_filter", "Filter", show=True),
-        Binding("r", "refresh", "Refresh", show=True),
-        Binding("q", "quit", "Quit", show=True),
-        # 1–7 set default agent
+        Binding("escape", "blur_filter", "Esc", show=False),
         Binding("1", "agent_n_1", show=False),
         Binding("2", "agent_n_2", show=False),
         Binding("3", "agent_n_3", show=False),
@@ -74,7 +76,11 @@ class HubScreen(Screen):
             id="subtitle",
         )
         yield Static(_agent_bar(), id="agent-bar")
-        yield Input(placeholder="filter projects…  (/ to focus)", id="filter")
+        # can_focus stays False until / — prevents f/b/a landing in the box
+        yield Input(
+            placeholder="press / to filter projects…",
+            id="filter",
+        )
         with Horizontal(id="main"):
             with Vertical(id="projects-panel"):
                 yield Static("projects (registry — not whole disk)", classes="panel-title")
@@ -84,13 +90,14 @@ class HubScreen(Screen):
                 yield Static("Select a project", id="detail")
         yield Static("", id="status")
         yield Static(
-            "↵ open · a launch w/ agent · A set default · ]/[ cycle · 1-7 agent · "
-            "b browse · f /mnt · d detach · q quit",
+            "↵ open · f /mnt · b browse · / filter · esc list · a agent · ] cycle · q quit",
             id="footer-bar",
         )
         yield Footer()
 
     def on_mount(self) -> None:
+        filt = self.query_one("#filter", Input)
+        filt.can_focus = False
         self._load_projects()
         self.query_one("#project-list", OptionList).focus()
         if not self._projects:
@@ -101,10 +108,9 @@ class HubScreen(Screen):
             )
             self.set_timer(0.3, self.action_browse)
         else:
-            # hint once if everything is claude
             if all(p.default_agent == "claude" for p in self._projects[:20]):
                 self.notify(
-                    "tip: ] cycles default agent · 1–7 picks agent · f browses /mnt",
+                    "tip: f = browse /mnt · / = filter · ] = cycle agent",
                     severity="information",
                     timeout=5,
                 )
@@ -171,7 +177,7 @@ class HubScreen(Screen):
                 "[#6a6a80]This list is your saved registry.\n"
                 "Press [bold]f[/] to browse /mnt and subdirs,\n"
                 "or [bold]b[/] for home + all roots.\n"
-                "[bold]][/] cycles default agent on selection.[/]"
+                "Press ] to cycle default agent.[/]"
             )
             return
         agent = get_agent(p.default_agent)
@@ -181,29 +187,32 @@ class HubScreen(Screen):
             else p.default_agent
         )
         exists = "yes" if p.exists() else "MISSING"
-        # agent roster
         roster: list[str] = []
         for i, a in enumerate(self._agent_info, start=1):
             mark = "●" if a["id"] == p.default_agent else "·"
             ready = "✓" if a["installed"] else "✗"
-            roster.append(f"  {mark} {i} {a['logo']} {a['id']:<8} {ready}")
+            roster.append(
+                f"  {mark} {i} {escape(str(a['logo']))} "
+                f"{escape(a['id']):<8} {ready}"
+            )
 
+        # Escape anything that can contain [ ] so Rich markup doesn't explode
         lines = [
-            f"[bold #00ffc8]{p.name}[/]",
-            f"id      {p.id}",
-            f"path    {p.path}",
-            f"root    {_root_label(p.path)}",
+            f"[bold #00ffc8]{escape(p.name)}[/]",
+            f"id      {escape(p.id)}",
+            f"path    {escape(p.path)}",
+            f"root    {escape(_root_label(p.path))}",
             f"exists  {exists}",
-            f"agent   [bold]{agent_line}[/]  (default)",
-            f"ssh     {p.ssh_host or '—'}",
-            f"env     {', '.join(p.env_files) or '—'}",
-            f"tags    {', '.join(p.tags) or '—'}",
-            f"opened  {p.last_opened_at or 'never'}",
+            f"agent   [bold]{escape(agent_line)}[/]  (default)",
+            f"ssh     {escape(p.ssh_host or '—')}",
+            f"env     {escape(', '.join(p.env_files) or '—')}",
+            f"tags    {escape(', '.join(p.tags) or '—')}",
+            f"opened  {escape(p.last_opened_at or 'never')}",
             "",
-            "[bold #c84bff]agents[/]  ]/[ cycle · 1-7 set · A set only · a launch",
+            "[bold #c84bff]agents[/]  keys: ] [ cycle · 1-7 set · A set · a launch",
             *roster,
             "",
-            "[#6a6a80]↵ open · d detach · b/f add from disk[/]",
+            "[#6a6a80]enter open · d detach · b/f add from disk[/]",
         ]
         detail.update("\n".join(lines))
 
@@ -255,7 +264,23 @@ class HubScreen(Screen):
     # ── actions ──────────────────────────────────────────────
 
     def action_focus_filter(self) -> None:
-        self.query_one("#filter", Input).focus()
+        """Only way into the filter — so f never types into the box by accident."""
+        filt = self.query_one("#filter", Input)
+        filt.can_focus = True
+        filt.focus()
+
+    def action_blur_filter(self) -> None:
+        """Esc: leave filter, give keys back to hub (f/b/a work again)."""
+        filt = self.query_one("#filter", Input)
+        if self.focused is filt or filt.has_focus:
+            filt.can_focus = False
+            self.query_one("#project-list", OptionList).focus()
+            return
+        # if not in filter, esc clears filter text
+        if filt.value:
+            filt.value = ""
+            self._load_projects("")
+        self.query_one("#project-list", OptionList).focus()
 
     def action_refresh(self) -> None:
         self._agent_info = detect_agents()
@@ -434,19 +459,22 @@ class HubScreen(Screen):
 
 
 def _root_label(path: str) -> str:
-    """Short badge for where the project lives."""
+    """Short badge for where the project lives.
+
+    Uses angle brackets, not square ones — square brackets break Rich markup.
+    """
     p = path.replace("\\", "/")
     if p.startswith("/mnt/vylth"):
-        return "[vylth]"
+        return "<vylth>"
     if p.startswith("/mnt/c"):
-        return "[win-c]"
+        return "<win-c>"
     if p.startswith("/mnt/d"):
-        return "[win-d]"
+        return "<win-d>"
     if p.startswith("/mnt/"):
         part = p.split("/")[2] if len(p.split("/")) > 2 else "mnt"
-        return f"[mnt/{part}]"
+        return f"<mnt/{part}>"
     if p.startswith(str(Path.home())):
-        return "[home]"
+        return "<home>"
     if p.startswith("/opt"):
-        return "[opt]"
-    return "[disk]"
+        return "<opt>"
+    return "<disk>"

{ccmd-2.0.2 → ccmd-2.0.4/ccmd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccmd
-Version: 2.0.2
+Version: 2.0.4
 Summary: ccmd — Agentic Project Hub. Pick a project, pick an agent, launch.
 Author-email: De Catalyst <Robert5560newton@gmail.com>
 License: MIT

{ccmd-2.0.2 → ccmd-2.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ccmd"
-version = "2.0.2"
+version = "2.0.4"
 description = "ccmd — Agentic Project Hub. Pick a project, pick an agent, launch."
 readme = "README.md"
 requires-python = ">=3.11"