code-context-control 2.92.4__tar.gz → 2.96.0__tar.gz

{code_context_control-2.92.4/code_context_control.egg-info → code_context_control-2.96.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.92.4
+Version: 2.96.0
 Summary: Local MCP code-intelligence for AI coding tools: surgical search/read/edit, agent-config version history, path-level access + masking guards, and a multi-project hub.
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0
@@ -149,7 +149,7 @@ Every C3-initialized project registers itself here on `c3 init`. Filter by activ
 
 Three top-level views — **Projects**, **Tasks** (a cross-project kanban), and **Credentials** — plus a drill-in panel per project covering Overview, Sub-projects, Tasks, Artifacts, Memory, Ledger, Sessions, Health, Budget, Credentials, Config, and MCP.
 
-**Sub-projects** make a nested repo a first-class child with its own `.c3`: the parent's index excludes the child's subtree, and `c3_search` / `c3_memory` fan out on demand (`scope='all'`, or one child by name). → [Sub-projects guide](https://github.com/drknowhow/code-context-control/blob/main/docs/sub-projects.md)
+**Sub-projects** make one project a first-class child of another, with its own `.c3`. It can be a nested repo — the parent's index then excludes its subtree — or a project anywhere else on disk, linked by path. Hierarchies nest up to 8 levels, and `c3_search` / `c3_memory` fan out on demand (`scope='all'`, or one by name). → [Sub-projects guide](https://github.com/drknowhow/code-context-control/blob/main/docs/sub-projects.md)
 
 ### Per-project UI
 
@@ -208,10 +208,10 @@ C3 exposes **21 tools** as a native MCP server. Your IDE calls them directly:
 | `c3_edits` | Edit-ledger queries, version diffs, restore points, per-branch filter, `verify` (did a failed `c3_edit` still land?) |
 | `c3_task` | Per-project PM — tasks, dependencies, milestones, time tracking (v2.53.0) |
 | `c3_artifacts` | Agent-config version history, diff & restore (v2.46.0) |
-| `c3_credentials` | Named-secret vault; values never enter model context (v2.58.0) |
+| `c3_credentials` | Named-secret vault; values never enter model context (v2.58.0). `import_env` bulk-imports a `.env` the agent still cannot read (v2.93.0) |
 | `c3_bitbucket` | Bitbucket Data Center — PRs, branches, builds, admin (v2.30.0) |
 | `c3_jira` | Jira Cloud + Data Center — JQL, issues, transitions (v2.56.0) |
-| `c3_project` | Cross-project discovery & operations; guarded writes (v2.31.0) |
+| `c3_project` | Cross-project discovery & operations; sub-project hierarchy (link by path, inspect, multi-level tree); guarded writes (v2.31.0) |
 
 Every tool is **read-only safe in plan mode** except `c3_edit`, `c3_shell`, `c3_ci(action='run'|'rerun')`, `c3_artifacts(action='restore')`, `c3_delegate` with write delegation enabled, and write actions on `c3_bitbucket` / `c3_jira` / `c3_credentials` / `c3_project` / `c3_task` / `c3_locks`.
 

{code_context_control-2.92.4 → code_context_control-2.96.0}/README.md

@@ -86,7 +86,7 @@ Every C3-initialized project registers itself here on `c3 init`. Filter by activ
 
 Three top-level views — **Projects**, **Tasks** (a cross-project kanban), and **Credentials** — plus a drill-in panel per project covering Overview, Sub-projects, Tasks, Artifacts, Memory, Ledger, Sessions, Health, Budget, Credentials, Config, and MCP.
 
-**Sub-projects** make a nested repo a first-class child with its own `.c3`: the parent's index excludes the child's subtree, and `c3_search` / `c3_memory` fan out on demand (`scope='all'`, or one child by name). → [Sub-projects guide](https://github.com/drknowhow/code-context-control/blob/main/docs/sub-projects.md)
+**Sub-projects** make one project a first-class child of another, with its own `.c3`. It can be a nested repo — the parent's index then excludes its subtree — or a project anywhere else on disk, linked by path. Hierarchies nest up to 8 levels, and `c3_search` / `c3_memory` fan out on demand (`scope='all'`, or one by name). → [Sub-projects guide](https://github.com/drknowhow/code-context-control/blob/main/docs/sub-projects.md)
 
 ### Per-project UI
 
@@ -145,10 +145,10 @@ C3 exposes **21 tools** as a native MCP server. Your IDE calls them directly:
 | `c3_edits` | Edit-ledger queries, version diffs, restore points, per-branch filter, `verify` (did a failed `c3_edit` still land?) |
 | `c3_task` | Per-project PM — tasks, dependencies, milestones, time tracking (v2.53.0) |
 | `c3_artifacts` | Agent-config version history, diff & restore (v2.46.0) |
-| `c3_credentials` | Named-secret vault; values never enter model context (v2.58.0) |
+| `c3_credentials` | Named-secret vault; values never enter model context (v2.58.0). `import_env` bulk-imports a `.env` the agent still cannot read (v2.93.0) |
 | `c3_bitbucket` | Bitbucket Data Center — PRs, branches, builds, admin (v2.30.0) |
 | `c3_jira` | Jira Cloud + Data Center — JQL, issues, transitions (v2.56.0) |
-| `c3_project` | Cross-project discovery & operations; guarded writes (v2.31.0) |
+| `c3_project` | Cross-project discovery & operations; sub-project hierarchy (link by path, inspect, multi-level tree); guarded writes (v2.31.0) |
 
 Every tool is **read-only safe in plan mode** except `c3_edit`, `c3_shell`, `c3_ci(action='run'|'rerun')`, `c3_artifacts(action='restore')`, `c3_delegate` with write delegation enabled, and write actions on `c3_bitbucket` / `c3_jira` / `c3_credentials` / `c3_project` / `c3_task` / `c3_locks`.
 

{code_context_control-2.92.4 → code_context_control-2.96.0}/cli/c3.py

@@ -92,7 +92,7 @@ console = Console() if HAS_RICH else None
 # Config
 CONFIG_DIR = ".c3"
 CONFIG_FILE = ".c3/config.json"
-__version__ = "2.92.4"
+__version__ = "2.96.0"
 
 
 def _compress_file_cli(compressor, path, mode="smart", **kw):
@@ -6114,11 +6114,75 @@ def _bb_cmd_set_default(args, project_path: str) -> None:
     print(f"[OK] Default repo: {args.project}/{args.repo}")
 
 
+def cmd_tokens(args):
+    """Print token usage from the two local measurement logs.
+
+    Reads only; writes nothing. Counts come from .c3/tool_telemetry.jsonl
+    (what C3's tools returned) and .c3/session_stats.jsonl (what the whole
+    conversation cost, per the transcript).
+    """
+    from services import telemetry
+
+    project_path = getattr(args, "project_path", ".") or "."
+    days = max(0, int(getattr(args, "days", 30) or 0))
+    limit = max(1, int(getattr(args, "limit", 15) or 15))
+    tools = telemetry.aggregate_tool_telemetry(project_path, days=days)
+    sess = telemetry.aggregate_session_stats(project_path, days=days)
+
+    if getattr(args, "json", False):
+        print(json.dumps({"tools": tools, "sessions": sess}, indent=2))
+        return
+
+    window = "all history" if days == 0 else f"last {days}d"
+    print(f"\nToken usage — {window}")
+    print(f"  tool calls        {tools['total_calls']:>14,}")
+    print(f"  tool tokens       {tools['total_response_tokens']:>14,}")
+    print(f"  est. saved        {tools['estimated_saved_vs_full_read']:>14,}"
+          "   (vs full-read baseline)")
+    print(f"  session tokens    {sess['total_tokens']:>14,}"
+          f"   across {sess['session_count']} session(s)")
+    if sess["rows_seen"] and sess["all_zero_rows"] == sess["rows_seen"]:
+        # Do not let a log full of zeros read as "you used nothing".
+        print("  note: every session row is zero — these predate the v2.95.0 "
+              "Stop-hook fix; new sessions record real numbers.")
+
+    by = getattr(args, "by", "tool")
+    if by == "tool":
+        rows = sorted(({"name": k, **v} for k, v in tools["by_tool"].items()),
+                      key=lambda r: -r["response_tokens"])
+        head, cols = "tool", ("calls", "tokens", "avg")
+    elif by == "day":
+        rows, head, cols = tools["by_day"][::-1], "day", ("calls", "tokens", "avg")
+    elif by == "session":
+        rows, head, cols = tools["by_session"], "session", ("calls", "tokens", "avg")
+    else:
+        rows, head, cols = tools["by_target"], "file", ("calls", "tokens", "avg")
+
+    if not rows:
+        extra = ("  (no file attribution recorded yet — targets are logged "
+                 "from v2.95.0 onward)" if by == "file" else "  (nothing recorded)")
+        print(f"\n{extra}")
+        return
+
+    print(f"\n{head:<44}{cols[0]:>8}{cols[1]:>12}{cols[2]:>8}")
+    print("  " + "-" * 70)
+    for r in rows[:limit]:
+        calls = r.get("calls", 0)
+        toks = r.get("response_tokens", 0)
+        name = str(r.get("name", ""))
+        if len(name) > 43:
+            name = "…" + name[-42:]
+        print(f"{name:<44}{calls:>8}{toks:>12,}{toks // max(1, calls):>8}")
+    if len(rows) > limit:
+        print(f"  … {len(rows) - limit} more (use --limit)")
+    print()
+
+
 def cmd_creds(args):
     """Credential vault management (global + per-project scopes)."""
     sub = getattr(args, "creds_cmd", None)
     if not sub:
-        print("Usage: c3 creds {set,get,list,rm,import,usage} [args]")
+        print("Usage: c3 creds {set,get,list,rm,import,usage,audit} [args]")
         return
 
     project_path = getattr(args, "project_path", ".") or "."
@@ -6135,6 +6199,8 @@ def cmd_creds(args):
         _creds_cmd_import(args, project_path)
     elif sub == "usage":
         _creds_cmd_usage(args, project_path)
+    elif sub == "audit":
+        _creds_cmd_audit(args, project_path)
     else:
         print(f"Unknown creds subcommand: {sub}")
 
@@ -6321,6 +6387,25 @@ def _creds_cmd_rm(args, project_path: str) -> None:
         print(f"[error] no credential named '{args.name}' in {scope} scope")
 
 
+def _creds_import_table(rows: list) -> None:
+    """Print one line per parsed row: what it is, not what it holds.
+
+    Length and fingerprint are enough to tell two keys apart and to spot a
+    truncated paste; a value prefix would be part of the secret, so there
+    isn't one.
+    """
+    if not rows:
+        print("Nothing to import — no KEY=VALUE lines found.")
+        return
+    width = max(len(str(r["name"])) for r in rows)
+    print(f"{'NAME'.ljust(width)}  LINE  TYPE       LEN  FINGERPRINT  STATUS")
+    for r in rows:
+        status = r["detail"] or r["action"]
+        print(f"{str(r['name']).ljust(width)}  {str(r['line']).rjust(4)}  "
+              f"{r['ctype']:<9}  {str(r['value_len']).rjust(4)}  "
+              f"{(r['fingerprint'] or '-'):<11}  {status}")
+
+
 def _creds_cmd_import(args, project_path: str) -> None:
     from services import credential_store as cred_store
 
@@ -6328,20 +6413,126 @@ def _creds_cmd_import(args, project_path: str) -> None:
     if not env_path.exists():
         print(f"[error] file not found: {env_path}")
         return
+    only = [n.strip() for n in str(getattr(args, "only", "") or "").split(",")
+            if n.strip()] or None
+    dry_run = bool(getattr(args, "dry_run", False))
     try:
-        text = env_path.read_text(encoding="utf-8")
+        text = cred_store.read_env_file(env_path)
         result = cred_store.import_env(
             text, scope=_creds_scope(args), project_path=project_path,
             overwrite=bool(getattr(args, "overwrite", False)),
+            preview=dry_run, only=only,
+            source=str(env_path.resolve()), compare=dry_run,
         )
     except (cred_store.CredentialError, RuntimeError) as exc:
         print(f"[error] {exc}")
         return
+
+    if dry_run:
+        _creds_import_table(result["rows"])
+        print(f"\n[dry-run] {len(result['created'])} would be imported, "
+              f"{len(result['skipped'])} skipped. Nothing was written.")
+        return
+
     print(f"[OK] Imported {len(result['created'])} credential(s): "
           f"{', '.join(result['created']) or '-'}")
     if result["skipped"]:
-        print(f"Skipped {len(result['skipped'])}: {', '.join(result['skipped'])} "
-              "(use --overwrite to replace)")
+        # Reasons come off the rows, which already carry human text — the old
+        # output was a bare comma list that lumped four causes together.
+        detail = {r["name"]: r["detail"] for r in result["rows"] if r["reason"]}
+        print(f"Skipped {len(result['skipped'])}:")
+        for name in result["skipped"]:
+            print(f"  {name} - {detail.get(name, 'skipped')}")
+    notes = [r for r in result["rows"] if r["reason"] in ("no-assignment", "duplicate")]
+    if notes:
+        print(f"{len(notes)} line(s) ignored "
+              "(no KEY=VALUE, or redefined later in the file).")
+    if result["created"]:
+        _creds_audit_import(project_path, _creds_scope(args), result["created"],
+                            env_path)
+
+
+def _creds_audit_import(project_path: str, scope: str, created: list,
+                        env_path) -> None:
+    """The CLI import was the one credential mutation with no audit trail —
+    both REST paths logged and this did not. Names only, never values."""
+    try:
+        from services.edit_ledger import EditLedger
+        ledger = EditLedger(str(project_path))
+        ledger.log_edit(
+            file=f"cred://{len(created)} entries",
+            change_type="cred_import",
+            summary=f"import {len(created)} entries ({scope}) from "
+                    f"{Path(env_path).name} via c3 creds",
+            tags=["creds", "import"],
+            detail={"kind": "creds", "action": "import", "scope": scope,
+                    "names": list(created), "source": Path(env_path).name},
+        )
+        for name in created:
+            ledger.log_edit(
+                file=f"cred://{name}", change_type="cred_set",
+                summary=f"set {name} ({scope}) via c3 creds import",
+                tags=["creds", "set"],
+                detail={"kind": "creds", "action": "set", "name": name,
+                        "scope": scope},
+            )
+    except Exception:
+        pass
+    try:
+        from services.activity_log import ActivityLog
+        log = ActivityLog(str(project_path))
+        for name in created:
+            log.log("cred_action", {"kind": "creds", "action": "set",
+                                    "name": name, "scope": scope, "via": "cli"})
+    except Exception:
+        pass
+
+
+def _creds_cmd_audit(args, project_path):
+    """One timeline of every credential change and use.
+
+    Reads only. Prints names and command TEMPLATES — the logs never hold a
+    value, so there is nothing to redact on the way out.
+    """
+    from services import cred_audit
+
+    res = cred_audit.audit_events(
+        project_path,
+        name=getattr(args, "name", "") or "",
+        kind=getattr(args, "kind", "") or "",
+        action=getattr(args, "action", "") or "",
+        surface=getattr(args, "surface", "") or "",
+        q=getattr(args, "q", "") or "",
+        since=getattr(args, "since", "") or "",
+        limit=getattr(args, "limit", 40) or 40,
+    )
+    if getattr(args, "as_json", False):
+        print(json.dumps(res, indent=2))
+        return
+
+    counts = res["counts"]
+    print(f"\nCredential audit — {res['matched']} event(s): "
+          f"{counts['use']} use, {counts['change']} change"
+          + (f", {counts['exposing']} exposing" if counts["exposing"] else ""))
+    if not res["events"]:
+        print("  (nothing recorded for these filters)\n")
+        return
+
+    print(f"\n{'when':<20}{'kind':<8}{'action':<12}{'name':<24}{'where'}")
+    print("  " + "-" * 84)
+    for ev in res["events"]:
+        when = str(ev["ts"])[:19].replace("T", " ")
+        name = ev["name"] + (f".{ev['field']}" if ev["field"] else "")
+        where = ev["surface"] or "?"
+        if ev["scope"]:
+            where += f" ({ev['scope']})"
+        mark = " !" if ev["action"] in cred_audit.EXPOSING_ACTIONS else ""
+        print(f"{when:<20}{ev['kind']:<8}{ev['action']:<12}{name[:23]:<24}{where}{mark}")
+        if ev["cmd"]:
+            print(f"{'':<20}  cmd: {ev['cmd']}")
+    if res["truncated"]:
+        print(f"  … {res['matched'] - res['returned']} more (use --limit)")
+    print(f"\n  {res['note']}\n")
 
 
 def _creds_cmd_usage(args, project_path: str) -> None:
@@ -7795,14 +7986,117 @@ def cmd_sub(args):
         print(f"No .c3 found in {parent}. Run 'c3 init' there first.")
         return
     # Import after the cheap guard — the registry module needs a resolvable home.
-    from services.subprojects import VALID_CASCADE_OPS, SubprojectManager
+    from services.subprojects import (
+        MAX_DEPTH,
+        VALID_CASCADE_OPS,
+        SubprojectManager,
+        inspect_path,
+    )
 
     sm = SubprojectManager(parent)
     sub = getattr(args, "sub_cmd", "list") or "list"
     target = getattr(args, "target", None)
     as_json = getattr(args, "json", False)
+    depth = getattr(args, "depth", None) or MAX_DEPTH
+
+    if sub == "inspect":
+        if not target:
+            print("Usage: c3 sub inspect <path> [--json]")
+            return
+        rep = inspect_path(target, detect=not getattr(args, "no_detect", False))
+        if as_json:
+            print(json.dumps(rep, indent=2))
+            return
+        print(f"\n{rep['path']}")
+        if not rep["is_dir"]:
+            print("  not a folder")
+            return
+        proj = rep.get("project")
+        if proj:
+            reg = "registered" if rep["registered"] else "NOT registered"
+            print(f"  C3 project: {proj['name']}  (v{proj.get('c3_version') or '?'}, "
+                  f"ide={proj.get('ide') or '?'}, {reg})")
+            print(f"  {proj['facts_count']} facts, {proj['sessions']} sessions, "
+                  f"{proj['edit_ledger_entries']} ledger entries, "
+                  f"{proj['notification_count']} alerts")
+        else:
+            print("  no .c3 — not a C3 project yet")
+        if rep["ancestors"]:
+            chain = " < ".join(a["name"] for a in rep["ancestors"])
+            print(f"  parent chain (depth {rep['depth']}): {chain}")
+        else:
+            print("  top-level (no parent)")
+        if rep["children"]:
+            print(f"  {len(rep['children'])} sub-project(s):")
+            for c in rep["children"]:
+                print(f"    - {c['name']:<22} [{c['link_kind']}/{c['status']}]  {c['path']}")
+        if rep["detected"]:
+            print(f"  {len(rep['detected'])} unlinked project(s) detected inside:")
+            for d in rep["detected"]:
+                print(f"    ? {d['name']:<22} {d['path']}")
+            print("    (suggestions only — link with `c3 sub link <path>`)")
+        for w in rep["warnings"]:
+            print(f"  warning: {w}")
 
-    if sub == "add":
+    elif sub == "tree":
+        t = sm.tree(depth=depth)
+        if as_json:
+            print(json.dumps(t, indent=2))
+            return
+        r = t["rollup"]
+        print(f"\n{t['parent']['name']}  ({t['parent']['path']})")
+
+        def _render(rows, indent="  "):
+            for row in rows:
+                flag = "" if row["status"] == "ok" else f"  [{row['status']}]"
+                kind = "" if row["link_kind"] == "nested" else "  (linked)"
+                print(f"{indent}- {row['name']}{kind}{flag}")
+                _render(row.get("children") or [], indent + "    ")
+
+        _render(t["children"])
+        if not t["children"]:
+            print("  No sub-projects designated. Use `c3 sub link <path>`.")
+            return
+        line = f"\n{r['children']} descendant(s), {r['direct_children']} direct"
+        if r["issues"]:
+            line += f" -- {r['issues']} with issues (run `c3 sub check --fix`)"
+        print(line)
+
+    elif sub == "link":
+        if not target:
+            print("Usage: c3 sub link <path> [--parent PATH] [--name NAME] [--init]")
+            return
+        # link is designation for a project that already exists anywhere on
+        # disk; add is for a folder this parent should initialize.
+        want_init = getattr(args, "init", False)
+        candidate = target if Path(target).is_absolute() else str(Path(parent) / target)
+        probe = inspect_path(candidate, detect=False)
+        if probe["is_dir"] and not probe["has_c3"] and not want_init:
+            err = (f"not a C3 project: {probe['path']} — "
+                   "pass --init to initialize it, or run `c3 init` there first")
+            if as_json:
+                print(json.dumps({"added": False, "error": err}, indent=2))
+            else:
+                print(f"Failed: {err}")
+            return
+        result = sm.add(
+            target,
+            name=getattr(args, "name", None),
+            ide=getattr(args, "ide", None),
+            run_init=want_init,
+            reindex_parent=not getattr(args, "no_reindex_parent", False),
+        )
+        if as_json:
+            print(json.dumps(result, indent=2))
+            return
+        if not result.get("added"):
+            print(f"Failed: {result.get('error')}")
+            return
+        where = "by path" if result["link_kind"] == "external" else f"at {result['rel_path']}"
+        print(f"\n[OK] Linked {result['name']} {where}  (depth {result['depth']})")
+        print(f"  {result['path']}")
+
+    elif sub == "add":
         if not target:
             print("Usage: c3 sub add <folder> [--parent PATH] [--name NAME]")
             return
@@ -7835,16 +8129,19 @@ def cmd_sub(args):
         if not children:
             print("No sub-projects designated. Use `c3 sub add <folder>`.")
             return
-        fmt = "{:<22} {:<16} {:>6} {:>7}  {}"
-        print(fmt.format("NAME", "STATUS", "FACTS", "ALERTS", "REL PATH"))
-        print("-" * 76)
+        fmt = "{:<22} {:<16} {:<9} {:>6} {:>7}  {}"
+        print(fmt.format("NAME", "STATUS", "LINK", "FACTS", "ALERTS", "LOCATION"))
+        print("-" * 90)
         for c in children:
+            # An external child has no rel_path — show where it actually lives.
+            location = c.get("rel_path") or c.get("path", "")
             print(fmt.format(
                 (c.get("name") or "?")[:21],
                 c.get("status", "?"),
+                c.get("link_kind", "nested"),
                 c.get("facts_count", 0),
                 c.get("notification_count", 0),
-                c.get("rel_path", ""),
+                location,
             ))
         issues = sum(1 for c in children if c["status"] != "ok")
         line = f"\n{len(children)} sub-project(s)"
@@ -7884,7 +8181,8 @@ def cmd_sub(args):
             return
         result = sm.cascade(target,
                             include_parent=getattr(args, "include_parent", False),
-                            mcp=getattr(args, "mcp", False))
+                            mcp=getattr(args, "mcp", False),
+                            depth=depth)
         if as_json:
             print(json.dumps(result, indent=2))
             return
@@ -7905,7 +8203,8 @@ def cmd_sub(args):
             print("No sub-projects designated.")
             return
         for c in result["children"]:
-            print(f"  [{c['status']:<16}] {c.get('name') or '?':<22} {c.get('rel_path', '')}")
+            location = c.get("rel_path") or c.get("path", "")
+            print(f"  [{c['status']:<16}] {c.get('name') or '?':<22} {location}")
         for o in result["orphans"]:
             print(f"  [orphan_registry ] {o}")
         for f in result.get("fixed", []):
@@ -8769,6 +9068,7 @@ def main():
         "bitbucket": cmd_bitbucket,
         "jira": cmd_jira,
         "creds": cmd_creds,
+        "tokens": cmd_tokens,
         "access": cmd_access,
         "enforce": cmd_enforce,
         "override": cmd_override,

{code_context_control-2.92.4 → code_context_control-2.96.0}/cli/commands/parser.py

@@ -152,7 +152,7 @@ def build_parser(version: str, parse_cli_ide_arg):
     p_sub.add_argument(
         "sub_cmd",
         nargs="?",
-        choices=["add", "list", "remove", "run", "check"],
+        choices=["add", "link", "inspect", "list", "tree", "remove", "run", "check"],
         default="list",
         help="Sub-command (default: list)",
     )
@@ -160,7 +160,8 @@ def build_parser(version: str, parse_cli_ide_arg):
         "target",
         nargs="?",
         default=None,
-        help="Folder (add), sub-project name/path (remove), or operation update|reindex|health (run)",
+        help="Folder (add), path to an existing project (link|inspect), "
+             "sub-project name/path (remove), or operation update|reindex|health (run)",
     )
     p_sub.add_argument("--parent", default=".", help="Parent project path (default: current directory)")
     p_sub.add_argument("--name", default=None, help="Display name for the sub-project (add)")
@@ -173,6 +174,12 @@ def build_parser(version: str, parse_cli_ide_arg):
     p_sub.add_argument("--mcp", action="store_true", help="Also reinstall MCP config on update (run update)")
     p_sub.add_argument("--fix", action="store_true", help="Repair links from the parent config (check)")
     p_sub.add_argument("--prune", action="store_true", help="With --fix: drop entries whose folder is gone (check)")
+    p_sub.add_argument("--depth", default=None, type=int,
+                       help="Levels to descend (tree|run); default: the full hierarchy")
+    p_sub.add_argument("--init", action="store_true",
+                       help="Initialize the folder if it is not a C3 project yet (link)")
+    p_sub.add_argument("--no-detect", action="store_true",
+                       help="Skip the scan for unlinked nested projects (inspect)")
     p_sub.add_argument("--json", action="store_true", help="Emit JSON output")
 
     p_perms = subparsers.add_parser("permissions",
@@ -407,6 +414,21 @@ def build_parser(version: str, parse_cli_ide_arg):
     jr_default.add_argument("project_path", nargs="?", default=".")
 
     # ── Credential vault (v2.58.0) ──────────────────────────────────────
+    # ── Tokens ──────────────────────────────────────────────────────────
+    p_tokens = subparsers.add_parser(
+        "tokens",
+        help="Token usage — per tool, per day, per session, per file",
+    )
+    p_tokens.add_argument("--days", type=int, default=30,
+                          help="Window in days; 0 = all recorded history (default: 30)")
+    p_tokens.add_argument("--by", default="tool",
+                          choices=["tool", "day", "session", "file"],
+                          help="Which breakdown to print (default: tool)")
+    p_tokens.add_argument("--limit", type=int, default=15,
+                          help="Rows to show (default: 15)")
+    p_tokens.add_argument("--json", action="store_true",
+                          help="Emit the full aggregate as JSON")
+
     p_creds = subparsers.add_parser(
         "creds",
         help="Credential vault — named secrets for agents (global + per-project)",
@@ -452,6 +474,8 @@ def build_parser(version: str, parse_cli_ide_arg):
     cr_import.add_argument("env_file", help="Path to the .env file")
     cr_import.add_argument("--global", dest="use_global", action="store_true", help="Import into the global scope")
     cr_import.add_argument("--overwrite", action="store_true", help="Replace entries already registered in the target scope")
+    cr_import.add_argument("--dry-run", dest="dry_run", action="store_true", help="Show what would be imported; write nothing")
+    cr_import.add_argument("--only", default="", help="Comma-separated names to import (default: all)")
     cr_import.add_argument("--path", dest="project_path", default=".", help="Project directory (default: current)")
 
     cr_usage = creds_subs.add_parser(
@@ -461,6 +485,20 @@ def build_parser(version: str, parse_cli_ide_arg):
     cr_usage.add_argument("--json", dest="as_json", action="store_true", help="Emit raw JSON")
     cr_usage.add_argument("--path", dest="project_path", default=".", help="Project directory (default: current)")
 
+    cr_audit = creds_subs.add_parser(
+        "audit", help="Audit trail — every change AND use, on one timeline")
+    cr_audit.add_argument("name", nargs="?", default="", help="Limit to one credential (default: all)")
+    cr_audit.add_argument("--kind", default="", choices=["", "use", "change"],
+                          help="Show only uses or only changes (default: both)")
+    cr_audit.add_argument("--action", default="",
+                          help="Exact action: inject_env, template, reveal, cli_show, set, update, delete, import…")
+    cr_audit.add_argument("--surface", default="", help="Exact surface: shell, cli, mcp, ui, hub")
+    cr_audit.add_argument("--since", default="", help="ISO timestamp lower bound, e.g. 2026-08-01")
+    cr_audit.add_argument("-q", dest="q", default="", help="Free-text over name/field/cmd/project")
+    cr_audit.add_argument("--limit", type=int, default=40, help="Events to show (default: 40)")
+    cr_audit.add_argument("--json", dest="as_json", action="store_true", help="Emit raw JSON")
+    cr_audit.add_argument("--path", dest="project_path", default=".", help="Project directory (default: current)")
+
     # ── Agent Locks (docs/agent-locks.md) ───────────────────────────────
     # force-release is human-only: it bumps the fencing counter so a holder
     # that comes back is stale by construction. Agents get c3_locks instead,