ccmd 2.0.7__tar.gz → 2.0.9__tar.gz

{ccmd-2.0.7/ccmd.egg-info → ccmd-2.0.9}/PKG-INFO

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

{ccmd-2.0.7 → ccmd-2.0.9}/ccmd/__init__.py

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

{ccmd-2.0.7 → ccmd-2.0.9}/ccmd/cli.py

@@ -20,6 +20,103 @@ from ccmd.core.sessions import SessionStore
 from ccmd.core.ssh import SSHStore
 
 
+# agent accent colors for -v lines
+_AGENT_COLORS = {
+    "claude": "dark_orange3",
+    "grok": "bright_white",
+    "codex": "green",
+    "cursor": "medium_purple",
+    "goose": "yellow",
+    "aider": "cyan",
+    "chatgpt": "sea_green3",
+}
+
+
+def _print_cmd_rows(rows: list, *, verbose: bool = False) -> None:
+    """Pretty list: base command only. Agent variants only with -v or single match."""
+    try:
+        from rich.console import Console
+        from rich.table import Table
+        from rich.text import Text
+
+        console = Console(highlight=False)
+        use_rich = console.is_terminal
+    except Exception:
+        use_rich = False
+
+    if not rows:
+        if use_rich:
+            Console().print("[dim]no matching commands[/]")
+        else:
+            print("no matching commands")
+        return
+
+    show_variants = verbose or len(rows) == 1
+
+    if use_rich:
+        console = Console(highlight=False)
+        table = Table(
+            show_header=True,
+            header_style="bold cyan",
+            border_style="bright_black",
+            box=None,
+            pad_edge=False,
+            expand=False,
+        )
+        table.add_column("cmd", style="bold bright_cyan", no_wrap=True)
+        table.add_column("project", style="white")
+        table.add_column("agent", style="magenta")
+        table.add_column("path", style="dim", overflow="ellipsis", max_width=48)
+
+        for r in rows:
+            table.add_row(
+                r["short"],
+                r["project"],
+                r["default_agent"],
+                r["path"],
+            )
+        console.print(table)
+
+        if show_variants:
+            console.print()
+            for r in rows:
+                s = r["short"]
+                console.print(
+                    f"  [bold bright_cyan]{s}[/]  "
+                    f"[dim]→[/]  [white]{r['project']}[/]  "
+                    f"[dim]({r['default_agent']})[/]"
+                )
+                parts = []
+                for aid, fn in r["variants"].items():
+                    color = _AGENT_COLORS.get(aid, "white")
+                    parts.append(f"[{color}]{fn}[/{color}]")
+                console.print("    " + "  ".join(parts))
+                console.print(f"    [dim]{r['path']}[/]")
+
+        console.print()
+        console.print(
+            f"[dim]{len(rows)} command(s)[/]  "
+            f"[dim]·[/]  [bright_cyan]ccmds <name>[/][dim] for agent variants[/]  "
+            f"[dim]·[/]  [bright_cyan]ccmds -v[/][dim] show all variants[/]"
+        )
+        return
+
+    # plain fallback
+    print(f"{'CMD':<10} {'PROJECT':<22} {'AGENT':<10} PATH")
+    print("-" * 72)
+    for r in rows:
+        print(
+            f"{r['short']:<10} {r['project']:<22} "
+            f"{r['default_agent']:<10} {r['path']}"
+        )
+        if show_variants:
+            print(
+                "           agents: "
+                + "  ".join(f"{fn}" for fn in r["variants"].values())
+            )
+    print(f"\n{len(rows)} command(s)  ·  ccmds <name> for agent variants  ·  ccmds -v")
+
+
 def _cmd_shell(args: argparse.Namespace) -> int:
     from ccmd.core.shell_cmds import (
         install_shell_hook,
@@ -28,47 +125,56 @@ def _cmd_shell(args: argparse.Namespace) -> int:
         write_shell_cmds,
     )
 
-    sub = args.shell_cmd or "regen"
+    sub = args.shell_cmd or "list"
+    filt = getattr(args, "filter", None)
+    verbose = bool(getattr(args, "verbose", False))
+
     if sub == "install":
-        path = write_shell_cmds()
+        path, shorts = write_shell_cmds()
         rcs = install_shell_hook()
         print(f"wrote {path}")
         for rc in rcs:
             print(f"hooked {rc}")
         print("restart shell or:  source ~/.ccmd/shell_cmds.sh")
-        print("then:  ana / anac / anag  …")
+        print("then:  ccmds          # list base commands (color)")
+        print("       ccmds ana      # agent variants for one project")
+        print("       ana / anac / anag  …")
+        if verbose:
+            _print_cmd_rows(list_cmd_rows(), verbose=False)
         return 0
     if sub == "regen":
-        path = write_shell_cmds()
-        print(f"regenerated {path}")
-        rows = list_cmd_rows()
-        for r in rows[:30]:
-            print(
-                f"  {r['short']:<10} {r['project']:<18} "
-                f"default={r['default_agent']:<8}  "
-                f"{r['short']}c/g/x/u/o/a/p"
-            )
-        if len(rows) > 30:
-            print(f"  … +{len(rows) - 30} more  (see {path})")
+        path, shorts = write_shell_cmds()
+        print(f"regenerated {path}  ({len(shorts)} projects)")
+        rows = list_cmd_rows(filter_text=filt)
+        _print_cmd_rows(rows, verbose=verbose)
         return 0
     if sub == "list":
-        for r in list_cmd_rows():
-            vars_ = " ".join(
-                f"{k[0]}={v}" for k, v in r["variants"].items()
-            )
-            # show compact
-            v = r["variants"]
-            print(
-                f"{r['short']:<10} {r['project']:<20} "
-                f"{v.get('claude','')} {v.get('grok','')} {v.get('codex','')} "
-                f"{v.get('cursor','')}  → {r['path']}"
-            )
-        print(f"\nfile: {shell_cmds_path()}")
+        rows = list_cmd_rows(filter_text=filt)
+        # filter alone does NOT dump variants unless -v (cleaner list)
+        _print_cmd_rows(rows, verbose=verbose)
         return 0
-    print("usage: ccmd shell install|regen|list", file=sys.stderr)
+    if sub == "show":
+        rows = list_cmd_rows(filter_text=filt)
+        _print_cmd_rows(rows, verbose=True)
+        return 0
+    print("usage: ccmd shell install|regen|list [--filter NAME] [-v]", file=sys.stderr)
+    print("       ccmds              # list base cmds", file=sys.stderr)
+    print("       ccmds ana          # one project + agent variants", file=sys.stderr)
     return 1
 
 
+def _cmd_cmds(args: argparse.Namespace) -> int:
+    """Top-level: ccmd cmds [name] [-v] — same as ccmds."""
+    from ccmd.core.shell_cmds import list_cmd_rows
+
+    filt = args.filter or args.name
+    # single-name lookup → show agent variants; bare list → base only
+    verbose = bool(args.verbose) or bool(filt)
+    rows = list_cmd_rows(filter_text=filt)
+    _print_cmd_rows(rows, verbose=verbose)
+    return 0
+
+
 def _cmd_open(args: argparse.Namespace) -> int:
     reg = ProjectRegistry()
     project = reg.get(args.project)
@@ -301,9 +407,35 @@ def build_parser() -> argparse.ArgumentParser:
     sh.add_argument(
         "shell_cmd",
         nargs="?",
-        choices=["install", "regen", "list"],
-        default="regen",
-        help="install=write cmds + hook bashrc; regen=rewrite cmds; list=show",
+        choices=["install", "regen", "list", "show"],
+        default="list",
+        help="install|regen|list|show",
+    )
+    sh.add_argument(
+        "--filter",
+        "-f",
+        dest="filter",
+        help="filter by short/project/path (e.g. ana)",
+    )
+    sh.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        help="show full agent variant map",
+    )
+
+    cmds = sub.add_parser(
+        "cmds",
+        help="List short shell commands (same as: ccmd shell list / ccmds)",
+    )
+    cmds.add_argument("name", nargs="?", help="filter (e.g. ana or flow)")
+    cmds.add_argument("--filter", "-f", dest="filter", help="filter text")
+    cmds.add_argument("-v", "--verbose", action="store_true")
+    cmds.add_argument(
+        "--list",
+        "-l",
+        action="store_true",
+        help="list all (default)",
     )
 
     return p
@@ -336,6 +468,7 @@ def main(argv: list[str] | None = None) -> int:
         "doctor": _cmd_doctor,
         "mcp": _cmd_mcp,
         "shell": _cmd_shell,
+        "cmds": _cmd_cmds,
     }
     handler = handlers.get(args.cmd)
     if not handler:

{ccmd-2.0.7 → ccmd-2.0.9}/ccmd/core/shell_cmds.py

@@ -243,13 +243,71 @@ def render_shell_cmds(projects: list, shorts: dict[str, str]) -> str:
             )
         lines.append("")
 
-    lines.append("# end ccmd shell cmds")
-    lines.append("")
+    # helper: list base commands (color); pass a name for agent variants
+    lines.extend(
+        [
+            "# list short commands — base only; pass a name for agent variants",
+            "ccmds() {",
+            '  if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then',
+            '    echo "ccmds              list base commands (colored)"',
+            '    echo "ccmds -v           list base + all agent variants"',
+            '    echo "ccmds <name>       one project + agents (e.g. ccmds ana)"',
+            '    echo "ccmds -l|--list    same as bare ccmds"',
+            "    return 0",
+            "  fi",
+            '  if [ "$1" = "-v" ] || [ "$1" = "--verbose" ]; then',
+            '    command ccmd shell list -v',
+            "    return $?",
+            "  fi",
+            '  if [ -z "$1" ] || [ "$1" = "-l" ] || [ "$1" = "--list" ]; then',
+            '    command ccmd shell list',
+            "    return $?",
+            "  fi",
+            '  # one project → show agent subcommands',
+            '  command ccmd shell show --filter "$1"',
+            "}",
+            "",
+            "# end ccmd shell cmds",
+            "",
+        ]
+    )
+    return "\n".join(lines)
+
+
+def cmds_notice(project, short: str | None = None) -> str:
+    """Human-readable one-liner of shortcuts for a project (for TUI/CLI notices)."""
+    s = short or getattr(project, "short", None) or ""
+    if not s:
+        shorts = allocate_shorts([project])
+        s = shorts.get(project.id, project.id[:4])
+    variants = " ".join(
+        f"{s}{suf}={aid}" for aid, suf in AGENT_SUFFIX.items()
+    )
+    return (
+        f"cmds: {s} (default={project.default_agent})  "
+        f"{s}c=claude {s}g=grok {s}x=codex {s}u=cursor  "
+        f"| ccmds  or  ccmd shell list"
+    )
+
+
+def format_cmds_block(project, short: str | None = None) -> str:
+    """Multi-line block shown after save."""
+    s = short or getattr(project, "short", None) or project.id[:4]
+    lines = [
+        f"shell commands for {project.id}:",
+        f"  {s:<10} open with default agent ({project.default_agent})",
+    ]
+    for aid, suf in AGENT_SUFFIX.items():
+        lines.append(f"  {s}{suf:<9} --agent {aid}")
+    lines.append("list all:  ccmds   or   ccmd shell list")
     return "\n".join(lines)
 
 
-def write_shell_cmds(projects: list | None = None) -> Path:
-    """Write ~/.ccmd/shell_cmds.sh and persist short names on projects."""
+def write_shell_cmds(projects: list | None = None) -> tuple[Path, dict[str, str]]:
+    """Write ~/.ccmd/shell_cmds.sh and persist short names on projects.
+
+    Returns (path, {project_id: short}).
+    """
     from ccmd.core.projects import ProjectRegistry
 
     reg = ProjectRegistry()
@@ -278,7 +336,7 @@ def write_shell_cmds(projects: list | None = None) -> Path:
         )
         lines.append(f"{'':10} {p.path}\n")
     sheet.write_text("".join(lines), encoding="utf-8")
-    return path
+    return path, shorts
 
 
 def install_shell_hook(rc_file: Path | None = None) -> list[Path]:
@@ -288,6 +346,7 @@ def install_shell_hook(rc_file: Path | None = None) -> list[Path]:
     block = (
         f"\n{MARKER_BEGIN}\n"
         f"# managed by ccmd — short project commands (ana/anac/anag…)\n"
+        f"# list them anytime: ccmds   or   ccmds ana\n"
         f'[ -f "$HOME/.ccmd/shell_cmds.sh" ] && . "$HOME/.ccmd/shell_cmds.sh"\n'
         f"{MARKER_END}\n"
     )
@@ -331,22 +390,38 @@ def install_shell_hook(rc_file: Path | None = None) -> list[Path]:
     return updated
 
 
-def list_cmd_rows(projects: list | None = None) -> list[dict]:
+def list_cmd_rows(
+    projects: list | None = None,
+    *,
+    filter_text: str | None = None,
+) -> list[dict]:
     from ccmd.core.projects import ProjectRegistry
 
     projects = list(projects) if projects is not None else ProjectRegistry().list()
     shorts = allocate_shorts(projects)
     rows = []
     for p in projects:
-        s = shorts.get(p.id, "")
+        s = shorts.get(p.id, "") or getattr(p, "short", "") or ""
         rows.append(
             {
                 "short": s,
                 "project": p.id,
+                "name": p.name,
                 "default_agent": p.default_agent,
                 "path": p.path,
                 "variants": {a: f"{s}{suf}" for a, suf in AGENT_SUFFIX.items()},
             }
         )
     rows.sort(key=lambda r: r["short"])
+    if filter_text:
+        q = filter_text.strip().lower()
+        rows = [
+            r
+            for r in rows
+            if q in r["short"].lower()
+            or q in r["project"].lower()
+            or q in r["name"].lower()
+            or q in r["path"].lower()
+            or any(q in v.lower() for v in r["variants"].values())
+        ]
     return rows

{ccmd-2.0.7 → ccmd-2.0.9}/ccmd/tui/screens/browser.py

@@ -323,14 +323,24 @@ class DirBrowserScreen(Screen[bool | None]):
             self.notify(str(e), severity="error")
             return
 
+        from ccmd.core.shell_cmds import cmds_notice
+
         reg = ProjectRegistry()
         existing = reg.find_by_path(resolved)
         if existing:
             existing.default_agent = self._agent
             reg.save(existing)
+            # reload short after regen
+            existing = reg.get(existing.id) or existing
+            self.notify(
+                f"updated {existing.id} · agent {self._agent}",
+                severity="information",
+                timeout=4,
+            )
             self.notify(
-                f"already had {existing.id} — default agent → {self._agent}",
+                cmds_notice(existing),
                 severity="information",
+                timeout=8,
             )
             self.dismiss(True)
             return
@@ -342,9 +352,16 @@ class DirBrowserScreen(Screen[bool | None]):
             default_agent=self._agent,
             notes="added via browser",
         )
+        p = reg.get(p.id) or p
         self.notify(
             f"added {p.id} · agent {self._agent} → {resolved}",
             severity="information",
+            timeout=4,
+        )
+        self.notify(
+            cmds_notice(p),
+            severity="information",
+            timeout=10,
         )
         self.dismiss(True)
 

{ccmd-2.0.7 → ccmd-2.0.9}/ccmd/tui/screens/hub.py

@@ -51,6 +51,7 @@ class HubScreen(Screen):
         Binding("slash", "focus_filter", "Filter", show=False),
         Binding("/", "focus_filter", "Filter", show=True),
         Binding("escape", "blur_filter", "Esc", show=False),
+        Binding("c", "show_cmds", "Cmds", show=True),
         Binding("1", "agent_n_1", show=False),
         Binding("2", "agent_n_2", show=False),
         Binding("3", "agent_n_3", show=False),
@@ -211,11 +212,34 @@ class HubScreen(Screen):
             "agents  ]/[ cycle · 1-7 set · A set · a launch",
             *roster,
             "",
-            "enter open · d detach · b/f add from disk",
-            "shell: source ~/.ccmd/shell_cmds.sh  (or: ccmd shell install)",
+            "enter open · d detach · b/f add from disk · c show cmds",
+            "shell: ccmds  |  ccmd shell list  |  source ~/.ccmd/shell_cmds.sh",
         ]
         detail.update("\n".join(lines))
 
+    def action_show_cmds(self) -> None:
+        """Flag-style view: toast the shell shortcuts for the selected project."""
+        from ccmd.core.shell_cmds import cmds_notice, format_cmds_block
+
+        p = self._selected()
+        if not p:
+            self.notify(
+                "all cmds: run  ccmds  or  ccmd shell list",
+                severity="information",
+                timeout=6,
+            )
+            return
+        p = self.registry.get(p.id) or p
+        # multi-line block in status + toast summary
+        block = format_cmds_block(p)
+        self.query_one("#status", Static).update(block.replace("\n", " · "))
+        self.notify(cmds_notice(p), severity="information", timeout=10)
+        self.notify(
+            f"{p.short or p.id}: c={p.short}c g={p.short}g x={p.short}x u={p.short}u",
+            severity="information",
+            timeout=8,
+        )
+
     def _set_default_agent(self, agent_id: str, *, notify: bool = True) -> None:
         p = self._selected()
         if not p:
@@ -226,8 +250,16 @@ class HubScreen(Screen):
             return
         p.default_agent = agent_id
         self.registry.save(p)
+        p = self.registry.get(p.id) or p
         if notify:
-            self.notify(f"{p.id} → default agent {agent_id}", severity="information")
+            from ccmd.core.shell_cmds import cmds_notice
+
+            self.notify(
+                f"{p.id} → default agent {agent_id}",
+                severity="information",
+                timeout=3,
+            )
+            self.notify(cmds_notice(p), severity="information", timeout=8)
         self._load_projects(self.query_one("#filter", Input).value)
 
     def _cycle_agent(self, delta: int) -> None:

{ccmd-2.0.7 → ccmd-2.0.9}/ccmd/tui/screens/project_edit.py

@@ -45,8 +45,12 @@ class ProjectEditScreen(Screen[bool | None]):
         if not p.is_dir():
             self.notify(f"not a directory: {p}", severity="error")
             return
-        ProjectRegistry().add(name=name, path=p, default_agent=agent)
-        self.notify(f"added {name}", severity="information")
+        from ccmd.core.shell_cmds import cmds_notice
+
+        proj = ProjectRegistry().add(name=name, path=p, default_agent=agent)
+        proj = ProjectRegistry().get(proj.id) or proj
+        self.notify(f"added {name}", severity="information", timeout=3)
+        self.notify(cmds_notice(proj), severity="information", timeout=10)
         self.dismiss(True)
 
     def action_cancel(self) -> None:

{ccmd-2.0.7 → ccmd-2.0.9/ccmd.egg-info}/PKG-INFO

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

{ccmd-2.0.7 → ccmd-2.0.9}/pyproject.toml

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