ccmd 2.0.8__tar.gz → 2.1.0__tar.gz

{ccmd-2.0.8/ccmd.egg-info → ccmd-2.1.0}/PKG-INFO

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

{ccmd-2.0.8 → ccmd-2.1.0}/ccmd/__init__.py

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

{ccmd-2.0.8 → ccmd-2.1.0}/ccmd/cli.py

@@ -20,33 +20,133 @@ from ccmd.core.sessions import SessionStore
 from ccmd.core.ssh import SSHStore
 
 
+# Rich colors for agent columns / badges
+_AGENT_STYLE = {
+    "claude": "dark_orange3",
+    "grok": "bright_white",
+    "codex": "green",
+    "cursor": "medium_purple",
+    "goose": "yellow",
+    "aider": "cyan",
+    "chatgpt": "sea_green3",
+}
+
+
+def _agent_meta() -> list[dict]:
+    """Logo + name + id for every agent (order matches variants)."""
+    from ccmd.core.agents import all_agents
+
+    return [
+        {
+            "id": a.id,
+            "name": a.display_name,
+            "logo": a.ascii_logo,
+            "color": a.brand_color,
+            "style": _AGENT_STYLE.get(a.id, "white"),
+        }
+        for a in all_agents()
+    ]
+
+
 def _print_cmd_rows(rows: list, *, verbose: bool = False) -> None:
+    """Full ccmds view: base cmd + every agent variant with logo & name."""
+    try:
+        from rich import box
+        from rich.console import Console
+        from rich.table import Table
+        from rich.text import Text
+
+        console = Console(highlight=False)
+        use_rich = True
+    except Exception:
+        use_rich = False
+
     if not rows:
         print("no matching commands")
         return
-    for r in rows:
-        v = r["variants"]
-        print(
-            f"{r['short']:<10} {r['project']:<20} "
-            f"default={r['default_agent']:<8}  "
-            f"{v.get('claude',''):<10} {v.get('grok',''):<10} "
-            f"{v.get('codex',''):<10} {v.get('cursor',''):<10}"
+
+    agents = _agent_meta()
+
+    if use_rich:
+        console = Console(highlight=False)
+
+        # legend once
+        legend = Text()
+        legend.append("agents  ", style="dim")
+        for a in agents:
+            legend.append(f"{a['logo']} ", style=a["style"])
+            legend.append(f"{a['name']}", style=a["style"])
+            legend.append("  ", style="dim")
+        console.print(legend)
+        console.print()
+
+        table = Table(
+            show_header=True,
+            header_style="bold bright_cyan",
+            border_style="bright_black",
+            box=box.SIMPLE_HEAVY,
+            pad_edge=False,
+            expand=False,
+            show_lines=False,
+        )
+        table.add_column("cmd", style="bold bright_cyan", no_wrap=True)
+        table.add_column("project", style="white", no_wrap=True)
+        table.add_column("default", style="magenta", no_wrap=True)
+        for a in agents:
+            # header: logo + short id
+            hdr = Text()
+            hdr.append(f"{a['logo']}\n", style=a["style"])
+            hdr.append(a["id"][:6], style=f"dim {a['style']}")
+            table.add_column(hdr, justify="center", no_wrap=True)
+        if verbose:
+            table.add_column("path", style="dim", overflow="ellipsis", max_width=36)
+
+        for r in rows:
+            cells: list = [
+                Text(r["short"], style="bold bright_cyan"),
+                Text(r["project"], style="white"),
+                Text(r["default_agent"], style="magenta"),
+            ]
+            for a in agents:
+                fn = r["variants"].get(a["id"], "")
+                is_default = r["default_agent"] == a["id"]
+                style = a["style"] if is_default else f"dim {a['style']}"
+                # mark default with *
+                label = f"{fn}*" if is_default and fn else fn
+                cells.append(Text(label, style=style))
+            if verbose:
+                cells.append(Text(r["path"], style="dim"))
+            table.add_row(*cells)
+
+        console.print(table)
+        console.print()
+        console.print(
+            f"[dim]{len(rows)} project(s)[/]  "
+            f"[dim]·[/]  [bright_cyan]cmd[/][dim] = default agent[/]  "
+            f"[dim]·[/]  [bright_cyan]*[/][dim] = project default[/]  "
+            f"[dim]·[/]  [bright_cyan]ccmds ana[/][dim] filter[/]  "
+            f"[dim]·[/]  [bright_cyan]ccmds -v[/][dim] show paths[/]"
         )
-        if verbose or len(rows) == 1:
-            print(f"{'':10} path  {r['path']}")
-            print(
-                f"{'':10} all   "
-                + "  ".join(f"{aid}={fn}" for aid, fn in v.items())
-            )
-    print(f"\n{len(rows)} project(s)  ·  helper: ccmds   ·  file: use ccmd shell list")
+        return
+
+    # plain fallback — still show all agent cmds
+    headers = ["cmd", "project", "default"] + [a["id"][:6] for a in agents]
+    print("  ".join(f"{h:<10}" for h in headers))
+    print("-" * (12 * len(headers)))
+    for r in rows:
+        cols = [r["short"], r["project"], r["default_agent"]]
+        for a in agents:
+            cols.append(r["variants"].get(a["id"], ""))
+        print("  ".join(f"{c:<10}" for c in cols))
+        if verbose:
+            print(f"           {r['path']}")
+    print(f"\n{len(rows)} project(s)  ·  * default agent on project")
 
 
 def _cmd_shell(args: argparse.Namespace) -> int:
     from ccmd.core.shell_cmds import (
-        format_cmds_block,
         install_shell_hook,
         list_cmd_rows,
-        shell_cmds_path,
         write_shell_cmds,
     )
 
@@ -61,40 +161,32 @@ def _cmd_shell(args: argparse.Namespace) -> int:
         for rc in rcs:
             print(f"hooked {rc}")
         print("restart shell or:  source ~/.ccmd/shell_cmds.sh")
-        print("then:  ccmds          # list all")
+        print("then:  ccmds          # all cmds + agents with logos")
+        print("       ccmds ana      # filter one project")
         print("       ana / anac / anag  …")
         if verbose:
-            _print_cmd_rows(list_cmd_rows(), verbose=False)
+            _print_cmd_rows(list_cmd_rows(), verbose=True)
         return 0
     if sub == "regen":
         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":
-        rows = list_cmd_rows(filter_text=filt)
-        _print_cmd_rows(rows, verbose=verbose or bool(filt))
-        print(f"file: {shell_cmds_path()}")
+        _print_cmd_rows(list_cmd_rows(filter_text=filt), verbose=verbose)
         return 0
-    if sub == "show" and filt:
-        rows = list_cmd_rows(filter_text=filt)
-        _print_cmd_rows(rows, verbose=True)
+    if sub in ("list", "show"):
+        _print_cmd_rows(list_cmd_rows(filter_text=filt), verbose=verbose)
         return 0
     print("usage: ccmd shell install|regen|list [--filter NAME] [-v]", file=sys.stderr)
-    print("       ccmds              # shell helper (after: source ~/.ccmd/shell_cmds.sh)", file=sys.stderr)
+    print("       ccmds              # full table with agent logos", file=sys.stderr)
     return 1
 
 
 def _cmd_cmds(args: argparse.Namespace) -> int:
-    """Top-level: ccmd cmds [--list] [filter]  — same as shell list."""
-    from ccmd.core.shell_cmds import list_cmd_rows, shell_cmds_path
+    """Top-level: ccmd cmds [name] [-v] — same as ccmds."""
+    from ccmd.core.shell_cmds import list_cmd_rows
 
     filt = args.filter or args.name
     rows = list_cmd_rows(filter_text=filt)
-    _print_cmd_rows(rows, verbose=bool(filt) or args.verbose)
-    print(f"file: {shell_cmds_path()}")
-    print("tip:  ccmds   (shell function) after source ~/.ccmd/shell_cmds.sh")
+    _print_cmd_rows(rows, verbose=bool(args.verbose))
     return 0
 
 

{ccmd-2.0.8 → ccmd-2.1.0}/ccmd/core/shell_cmds.py

@@ -243,18 +243,22 @@ def render_shell_cmds(projects: list, shorts: dict[str, str]) -> str:
             )
         lines.append("")
 
-    # helper: list all short commands from the shell
+    # helper: full table — cmd + every agent logo/name/variant
     lines.extend(
         [
-            "# list every project short command",
+            "# list all short commands with agent logos & variants",
             "ccmds() {",
             '  if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then',
-            '    echo "ccmds              list all short commands"',
-            '    echo "ccmds <name>       show one project (e.g. ccmds ana)"',
+            '    echo "ccmds              all projects + agent cmds (logos)"',
+            '    echo "ccmds -v           include full paths"',
+            '    echo "ccmds <name>       filter (e.g. ccmds ana)"',
             '    echo "ccmds -l|--list    same as bare ccmds"',
-            '    echo "ccmd shell list    full CLI list"',
             "    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 $?",

{ccmd-2.0.8 → ccmd-2.1.0/ccmd.egg-info}/PKG-INFO

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

{ccmd-2.0.8 → ccmd-2.1.0}/pyproject.toml

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