code-context-control 2.50.0__tar.gz → 2.52.0__tar.gz

{code_context_control-2.50.0/code_context_control.egg-info → code_context_control-2.52.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.50.0
-Summary: Local code-intelligence layer for AI coding tools (Claude Code, Codex, Gemini, Copilot). Retrieve less, read less, edit safer — and version the configs that shape your agent (CLAUDE.md, skills, hooks, MCP).
+Version: 2.52.0
+Summary: Local code-intelligence layer for AI coding tools (Claude Code, Codex, Copilot, Cursor, Antigravity). Retrieve less, read less, edit safer — and version the configs that shape your agent (CLAUDE.md, skills, hooks, MCP).
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://github.com/drknowhow/code-context-control
@@ -66,7 +66,7 @@ Dynamic: license-file
 <p align="center">
   <strong>The local code-intelligence layer for AI coding tools.</strong><br>
   Stop burning tokens on whole-file reads, blind greps, and unbounded log dumps.<br>
-  Works with Claude Code, Codex, Gemini CLI, Copilot, Cursor, and Antigravity.
+  Works with Claude Code, Codex, Copilot, Cursor, and Antigravity.
 </p>
 
 <p align="center">
@@ -100,7 +100,7 @@ A thin **local** layer that sits between your IDE and your repo. Every AI tool c
 | Edit, hope it compiled | `c3_edit` writes via a ledger + `c3_validate` runs `pyright`/`tsc` automatically |
 | `Bash` test runs that hang on Windows | `c3_shell` returns structured `{exit_code, stdout, stderr, duration}` with auto-filter |
 | Lose all context on `/clear` | `c3_session(snapshot)` + `c3_memory` persist decisions across sessions |
-| Re-explain the project every session | Auto-synced `CLAUDE.md` / `AGENTS.md` / `GEMINI.md` / `copilot-instructions.md` from a single source of truth |
+| Re-explain the project every session | Auto-synced `CLAUDE.md` / `AGENTS.md` / `copilot-instructions.md` from a single source of truth |
 
 Everything runs **locally**. No source code, prompts, or model output ever leaves your machine unless you explicitly opt into a third-party model API.
 
@@ -125,7 +125,7 @@ c3 init /path/to/your/project
 ```
 
 Running `c3` with no arguments opens the interactive TUI. `c3 init` walks you through:
-1. **IDE selection** (Claude Code CLI/App, Codex CLI, Gemini CLI, VS Code, Cursor, Antigravity, or Custom)
+1. **IDE selection** (Claude Code CLI/App, Codex CLI, VS Code, Cursor, Antigravity, or Custom — the Gemini CLI profile was removed in v2.52; use Antigravity, which reads AGENTS.md)
 2. Optional local `git init`
 3. MCP server registration (auto-wired into your IDE)
 4. (Claude Code only) Permission tier selection
@@ -278,6 +278,10 @@ C3 exposes 18 tools as a native MCP server. Your IDE calls them directly:
 | `c3_task` | Durable per-project tasks, milestones, and decision notes (v2.45.0) |
 | `c3_artifacts` | Agent-config tracking — version history, diff & restore for CLAUDE.md, settings/hooks, MCP configs, skills (v2.46.0) |
 
+On Windows, `c3_shell` uses Git Bash when available. Git Bash does not bundle
+optional utilities such as `jq`; use `python -m json.tool` for portable JSON
+formatting, or install `jq` separately when filter expressions are required.
+
 Every tool is **read-only safe in plan mode** (except `c3_edit`, `c3_shell`, `c3_artifacts(action='restore')`, and write actions on `c3_bitbucket` / `c3_project` / `c3_task`).
 
 ### Bitbucket Data Center / Server (v2.30.0)

{code_context_control-2.50.0 → code_context_control-2.52.0}/README.md

@@ -3,7 +3,7 @@
 <p align="center">
   <strong>The local code-intelligence layer for AI coding tools.</strong><br>
   Stop burning tokens on whole-file reads, blind greps, and unbounded log dumps.<br>
-  Works with Claude Code, Codex, Gemini CLI, Copilot, Cursor, and Antigravity.
+  Works with Claude Code, Codex, Copilot, Cursor, and Antigravity.
 </p>
 
 <p align="center">
@@ -37,7 +37,7 @@ A thin **local** layer that sits between your IDE and your repo. Every AI tool c
 | Edit, hope it compiled | `c3_edit` writes via a ledger + `c3_validate` runs `pyright`/`tsc` automatically |
 | `Bash` test runs that hang on Windows | `c3_shell` returns structured `{exit_code, stdout, stderr, duration}` with auto-filter |
 | Lose all context on `/clear` | `c3_session(snapshot)` + `c3_memory` persist decisions across sessions |
-| Re-explain the project every session | Auto-synced `CLAUDE.md` / `AGENTS.md` / `GEMINI.md` / `copilot-instructions.md` from a single source of truth |
+| Re-explain the project every session | Auto-synced `CLAUDE.md` / `AGENTS.md` / `copilot-instructions.md` from a single source of truth |
 
 Everything runs **locally**. No source code, prompts, or model output ever leaves your machine unless you explicitly opt into a third-party model API.
 
@@ -62,7 +62,7 @@ c3 init /path/to/your/project
 ```
 
 Running `c3` with no arguments opens the interactive TUI. `c3 init` walks you through:
-1. **IDE selection** (Claude Code CLI/App, Codex CLI, Gemini CLI, VS Code, Cursor, Antigravity, or Custom)
+1. **IDE selection** (Claude Code CLI/App, Codex CLI, VS Code, Cursor, Antigravity, or Custom — the Gemini CLI profile was removed in v2.52; use Antigravity, which reads AGENTS.md)
 2. Optional local `git init`
 3. MCP server registration (auto-wired into your IDE)
 4. (Claude Code only) Permission tier selection
@@ -215,6 +215,10 @@ C3 exposes 18 tools as a native MCP server. Your IDE calls them directly:
 | `c3_task` | Durable per-project tasks, milestones, and decision notes (v2.45.0) |
 | `c3_artifacts` | Agent-config tracking — version history, diff & restore for CLAUDE.md, settings/hooks, MCP configs, skills (v2.46.0) |
 
+On Windows, `c3_shell` uses Git Bash when available. Git Bash does not bundle
+optional utilities such as `jq`; use `python -m json.tool` for portable JSON
+formatting, or install `jq` separately when filter expressions are required.
+
 Every tool is **read-only safe in plan mode** (except `c3_edit`, `c3_shell`, `c3_artifacts(action='restore')`, and write actions on `c3_bitbucket` / `c3_project` / `c3_task`).
 
 ### Bitbucket Data Center / Server (v2.30.0)

{code_context_control-2.50.0 → code_context_control-2.52.0}/cli/_hook_utils.py

@@ -33,6 +33,28 @@ LEGACY_UNLOCK_FILE = ".c3/unlocked_files.json"
 STATE_WARNINGS: list = []
 
 
+def ensure_utf8_stdio() -> None:
+    """Force UTF-8 on the hook process's stdio pipes.
+
+    On Windows a hook subprocess gets cp1252 stdout/stdin (piped, non-TTY),
+    so printing user-visible text containing box-drawing chars ("─") or emoji
+    raises UnicodeEncodeError and surfaces as a "Stop hook error" in the IDE.
+    Claude Code reads hook stdout as UTF-8. Call this at the top of every
+    entrypoint that prints raw (non-json.dumps) text. Never raises.
+    """
+    for stream in (sys.stdout, sys.stderr):
+        try:
+            if hasattr(stream, "reconfigure"):
+                stream.reconfigure(encoding="utf-8", errors="replace")
+        except Exception:
+            pass
+    try:
+        if hasattr(sys.stdin, "reconfigure"):
+            sys.stdin.reconfigure(encoding="utf-8", errors="strict")
+    except Exception:
+        pass
+
+
 def log_hook_error(hook_name: str, exc: BaseException) -> None:
     """Append a timestamped error entry to .c3/hook_errors.log.
 

{code_context_control-2.50.0 → code_context_control-2.52.0}/cli/c3.py

@@ -60,7 +60,14 @@ from cli.commands.common import cmd_stats as common_cmd_stats
 from cli.commands.common import cmd_ui as common_cmd_ui
 from cli.commands.parser import build_parser
 from core import count_tokens, format_token_count
-from core.config import AGENT_DEFAULTS, BITBUCKET_DEFAULTS, DELEGATE_DEFAULTS, PROXY_DEFAULTS, load_delegate_config
+from core.config import (
+    AGENT_DEFAULTS,
+    BITBUCKET_DEFAULTS,
+    DELEGATE_DEFAULTS,
+    MEMORY_LLM_DEFAULTS,
+    PROXY_DEFAULTS,
+    load_delegate_config,
+)
 from core.config import DEFAULTS as HYBRID_DEFAULTS
 from core.ide import PROFILES, detect_ide, get_profile, load_ide_config, normalize_ide_name
 from services.compressor import CodeCompressor
@@ -85,7 +92,7 @@ console = Console() if HAS_RICH else None
 # Config
 CONFIG_DIR = ".c3"
 CONFIG_FILE = ".c3/config.json"
-__version__ = "2.49.1"
+__version__ = "2.52.0"
 
 
 def _command_deps() -> CommandDeps:
@@ -165,6 +172,7 @@ def _build_init_config(project_path: str) -> dict:
         "delegate": deepcopy(DELEGATE_DEFAULTS),
         "agents": deepcopy(AGENT_DEFAULTS),
         "bitbucket": deepcopy(BITBUCKET_DEFAULTS),
+        "memory_llm": deepcopy(MEMORY_LLM_DEFAULTS),
     }
     merged = _deep_merge_dict(defaults, existing if isinstance(existing, dict) else {})
     # Always persist current path/version on init/update.
@@ -703,8 +711,7 @@ def _select_init_ide(default_ide: str) -> str:
         "VS Code      — .vscode/mcp.json + Copilot instructions",
         "Cursor       — .cursor/mcp.json",
         "Codex        — .codex/config.toml + AGENTS.md",
-        "Gemini       — .gemini/settings.json + GEMINI.md",
-        "Antigravity  — ~/.gemini/antigravity/mcp_config.json",
+        "Antigravity  — ~/.gemini/antigravity/mcp_config.json + AGENTS.md",
     ]
     selected = _prompt_choice("Step 1/3 — Choose IDE profile", choices)
     mapping = {
@@ -713,14 +720,87 @@ def _select_init_ide(default_ide: str) -> str:
         choices[2]: "vscode",
         choices[3]: "cursor",
         choices[4]: "codex",
-        choices[5]: "gemini",
-        choices[6]: "antigravity",
+        choices[5]: "antigravity",
     }
     chosen = mapping.get(selected or "", normalize_ide_name(default_ide) if default_ide != "auto" else "auto")
     print(f"  IDE profile: {chosen}")
     return chosen
 
 
+def _prompt_memory_llm(project_path: str) -> None:
+    """Interactive memory_llm setup: privacy-first local model + optional cloud opt-in.
+
+    Skipped entirely under --force (that path never enters _prompt_init_steps),
+    which keeps the privacy defaults: distillation on, cloud OFF.
+    """
+    print()
+    choice = _prompt_choice(
+        "Memory — distill each session into durable project facts with an LLM?",
+        [
+            "Local only — a local Ollama model, nothing leaves this machine (recommended)",
+            "Cloud      — a Sonnet-class Ollama Cloud model (API key or signed-in daemon)",
+            "Off        — keep the basic pattern-based capture only",
+        ],
+    )
+    if not choice:
+        return  # EOF/Ctrl+C — keep defaults (local-only, cloud off)
+
+    existing = load_config(project_path).get("memory_llm")
+    section = dict(existing) if isinstance(existing, dict) else {}
+
+    if choice.startswith("Off"):
+        section["enabled"] = False
+        section["cloud_enabled"] = False
+        save_config({"memory_llm": section}, project_path)
+        print("Memory distillation: off (regex capture only).")
+        return
+
+    section["enabled"] = True
+    section["cloud_enabled"] = choice.startswith("Cloud")
+
+    # Local model pick — it is the only tier in local mode and the privacy
+    # fallback tier in cloud mode.
+    default_local = section.get("local_model") or MEMORY_LLM_DEFAULTS["local_model"]
+    models = None
+    try:
+        client = OllamaClient()
+        if client.is_available(timeout=2):
+            models = client.list_models()
+    except Exception:
+        models = None
+    if models:
+        options = [f"Keep default — {default_local}"] + [m for m in models if m != default_local][:8]
+        pick = _prompt_choice("Pick the local model for distillation:", options)
+        if pick and not pick.startswith("Keep default"):
+            section["local_model"] = pick
+    else:
+        print(f"  (Local Ollama not reachable — keeping '{default_local}'; "
+              "change it later in the Settings UI.)")
+
+    if section["cloud_enabled"]:
+        if os.environ.get("OLLAMA_API_KEY"):
+            print("  Cloud key: using OLLAMA_API_KEY from the environment.")
+        else:
+            try:
+                key = input("  Paste Ollama Cloud API key (Enter to skip — a signed-in "
+                            "local daemon also works): ").strip()
+            except (EOFError, KeyboardInterrupt):
+                key = ""
+            if key:
+                try:
+                    from services.ollama_credentials import save_api_key
+                    save_api_key(key, section.get("cloud_base_url")
+                                 or MEMORY_LLM_DEFAULTS["cloud_base_url"])
+                    print("  Key stored in the OS keyring (never in config.json).")
+                except Exception as exc:
+                    print(f"  Could not store key in keyring ({exc}); "
+                          "set the OLLAMA_API_KEY environment variable instead.")
+
+    save_config({"memory_llm": section}, project_path)
+    print("Memory distillation: "
+          + ("cloud + local fallback." if section["cloud_enabled"] else "local only (private)."))
+
+
 def _prompt_init_steps(project_path: str, ide_name: str, default_mode: str = "direct") -> tuple[str, bool]:
     """Run guided post-init setup steps for Git and MCP."""
     chosen_ide = _select_init_ide(ide_name or "auto")
@@ -739,6 +819,8 @@ def _prompt_init_steps(project_path: str, ide_name: str, default_mode: str = "di
     else:
         print("Git: skipped.")
 
+    _prompt_memory_llm(project_path)
+
     print()
     install_choice = _prompt_choice(
         "Step 3/3 — Install MCP tooling for this project?",
@@ -803,7 +885,7 @@ def _parse_cli_ide_arg(value: str) -> str:
     normalized = normalize_ide_name(raw)
     if normalized not in PROFILES:
         raise argparse.ArgumentTypeError(
-            "Unsupported IDE. Use one of: auto, claude, vscode, cursor, codex, gemini, antigravity."
+            "Unsupported IDE. Use one of: auto, claude, vscode, cursor, codex, antigravity."
         )
     return normalized
 
@@ -3929,29 +4011,6 @@ enabled = true
 ```
 """
 
-_GEMINI_MD_CONTENT = _C3_COMPACT_WORKFLOW + """
-
-## IDE Configuration (Gemini CLI)
-This project uses project-scoped MCP servers. Ensure your `.gemini/settings.json` includes:
-```json
-{
-  "mcpServers": {
-    "c3": {
-      "command": "c3-mcp",
-      "args": ["--project", "."]
-    }
-  }
-}
-```
-
-## Gemini Enforcement
-- `c3 init` and `c3 install-mcp` install this file as a required workflow, not a suggestion.
-- After install, use the `c3` MCP server for recall, search, structural mapping, surgical reads, filtering, and session logging before native Gemini repo exploration.
-- Do not bypass C3 with broad native search/read steps unless a matching `c3_*` tool failed or was too narrow for a final follow-up.
-- If fallback is necessary, say which `c3_*` tool was attempted or skipped and why.
-"""
-
-
 _TERSE_SKILL_CONTENT = """\
 # /terse — Terse Output Mode
 
@@ -4029,28 +4088,16 @@ Say "normal mode", start a new session, or let the turn counter expire.
 _TERSE_SKILL_MARKER = "# /terse — Terse Output Mode"
 
 
-_TERSE_GEMINI_TOML = (
-    'description = "Terse output mode. Usage: /terse [lite|full|ultra] (default: full)."\n'
-    "prompt = '''\n"
-    + _TERSE_SKILL_CONTENT.replace("'''", "''\\''")
-    + "\n'''\n"
-)
-
-
 def _ensure_terse_skill(ide: str = "claude-code") -> None:
     """Install the /terse slash command for the given IDE profile.
 
     claude-code -> ~/.claude/commands/terse.md
     codex       -> ~/.codex/prompts/terse.md
-    gemini      -> ~/.gemini/commands/terse.toml
     """
     home = Path.home()
     if ide == "codex":
         skill_path = home / ".codex" / "prompts" / "terse.md"
         content = _TERSE_SKILL_CONTENT
-    elif ide == "gemini":
-        skill_path = home / ".gemini" / "commands" / "terse.toml"
-        content = _TERSE_GEMINI_TOML
     else:
         skill_path = home / ".claude" / "commands" / "terse.md"
         content = _TERSE_SKILL_CONTENT
@@ -4273,7 +4320,7 @@ def _upsert_json_mcp_server(config_path: Path, config_key: str, server_name: str
 
 def _ensure_project_session_configs(target: Path, server_script: str, primary_profile: str | None = None,
                                     c3_mcp_exe: str | None = None) -> None:
-    """Keep project-local Codex and Gemini MCP configs in sync for new sessions."""
+    """Keep the project-local Codex MCP config in sync for new sessions."""
     # Ensure forward slashes for config portability and avoid Windows path-splitting issues
     server_script_posix = Path(server_script).as_posix()
     if c3_mcp_exe:
@@ -4297,26 +4344,16 @@ def _ensure_project_session_configs(target: Path, server_script: str, primary_pr
         )
         print(f"{codex_state.capitalize()} {codex_path}")
 
-    if primary_profile != "gemini":
-        gemini_path = target / ".gemini" / "settings.json"
-        gemini_state = _upsert_json_mcp_server(
-            gemini_path,
-            "mcpServers",
-            "c3",
-            {
-                "command": mcp_command,
-                "args": server_args,
-            },
-        )
-        print(f"{gemini_state.capitalize()} {gemini_path}")
 
 
-def _ensure_global_session_fallbacks(server_script: str, c3_mcp_exe: str | None = None) -> None:
-    """Keep user-global Codex/Gemini MCP configs pointing at C3.
+
+def _ensure_global_session_fallbacks(server_script: str, c3_mcp_exe: str | None = None,
+                                     primary_profile: str | None = None) -> None:
+    """Keep user-global Codex/Antigravity MCP configs pointing at C3.
 
     These fallback entries omit `--project` so the MCP server can resolve the
     active working directory dynamically when a session starts in a project that
-    does not yet have project-local Codex/Gemini config files.
+    does not yet have a project-local Codex config file.
     """
     server_script_posix = Path(server_script).as_posix()
     # With the installed entry point, no script path is needed; --project stays
@@ -4339,20 +4376,25 @@ def _ensure_global_session_fallbacks(server_script: str, c3_mcp_exe: str | None
     except PermissionError:
         print(f"Warning: Could not update {codex_path} (global fallback skipped)")
 
-    gemini_path = Path.home() / ".gemini" / "settings.json"
-    try:
-        gemini_state = _upsert_json_mcp_server(
-            gemini_path,
-            "mcpServers",
-            "c3",
-            {
-                "command": c3_mcp_exe or sys.executable,
-                "args": fallback_args,
-            },
-        )
-        print(f"{gemini_state.capitalize()} {gemini_path}  (global fallback)")
-    except PermissionError:
-        print(f"Warning: Could not update {gemini_path} (global fallback skipped)")
+    # Antigravity shares the ~/.gemini home dir but reads its own MCP config.
+    # When Antigravity is the primary profile, the main install flow already
+    # wrote this file — here we only keep it fresh for codex installs
+    # on machines that have Antigravity (its config dir exists).
+    antigravity_path = Path.home() / ".gemini" / "antigravity" / "mcp_config.json"
+    if primary_profile != "antigravity" and antigravity_path.parent.is_dir():
+        try:
+            ag_state = _upsert_json_mcp_server(
+                antigravity_path,
+                "mcpServers",
+                "c3",
+                {
+                    "command": c3_mcp_exe or sys.executable,
+                    "args": fallback_args,
+                },
+            )
+            print(f"{ag_state.capitalize()} {antigravity_path}  (global fallback)")
+        except PermissionError:
+            print(f"Warning: Could not update {antigravity_path} (global fallback skipped)")
 
 
 def _uninstall_mcp_all(project_path: str):
@@ -4390,8 +4432,8 @@ def _uninstall_mcp_all(project_path: str):
             config_paths.append(Path.home() / profile.config_path)
         else:
             config_paths.append(target / profile.config_path)
-            # For Codex and Gemini, also check the global fallback in home dir
-            if ide_name in ("codex", "gemini"):
+            # For Codex, also check the global fallback in home dir
+            if ide_name == "codex":
                 config_paths.append(Path.home() / profile.config_path)
 
         for mcp_config_path in config_paths:
@@ -4513,6 +4555,22 @@ def _uninstall_mcp_all(project_path: str):
                 except Exception as e:
                     print(f"  Warning: Could not update {vscode_settings_path}: {e}")
 
+    # Legacy Gemini CLI configs (profile removed in v2.52) — still strip the c3 entry.
+    for legacy_cfg in (target / ".gemini" / "settings.json",
+                       Path.home() / ".gemini" / "settings.json"):
+        if not legacy_cfg.exists():
+            continue
+        try:
+            with open(legacy_cfg, encoding="utf-8") as f:
+                legacy_data = json.load(f)
+            if "c3" in (legacy_data.get("mcpServers") or {}):
+                del legacy_data["mcpServers"]["c3"]
+                with open(legacy_cfg, "w", encoding="utf-8") as f:
+                    json.dump(legacy_data, f, indent=2)
+                print(f"  Removed C3 from {legacy_cfg}")
+        except Exception as e:
+            print(f"  Warning: Could not update {legacy_cfg}: {e}")
+
     # Final pass: clean up empty IDE directories (.claude, .codex, .gemini, .vscode, .github)
     dirs_to_check = [".claude", ".codex", ".gemini", ".vscode", ".github"]
     for dname in dirs_to_check:
@@ -4631,11 +4689,27 @@ def _ensure_global_claude_md() -> None:
 
 
 def _instruction_documents_for_project() -> list[tuple[str, str]]:
-    """Return the project-local instruction documents C3 should keep in sync."""
+    """Return every project-local instruction document C3 has ever managed.
+
+    Used by uninstall/cleanup paths, so it must keep listing legacy docs
+    (GEMINI.md — profile removed in v2.52; empty template, never generated).
+    """
     return [
         ("CLAUDE.md", _CLAUDE_MD_CONTENT),
         ("AGENTS.md", _AGENTS_MD_CONTENT),
-        ("GEMINI.md", _GEMINI_MD_CONTENT),
+        ("GEMINI.md", ""),
+    ]
+
+
+_LEGACY_INSTRUCTION_DOCS = ("GEMINI.md",)  # Gemini CLI profile removed in v2.52
+
+
+def _instruction_documents_to_generate() -> list[tuple[str, str]]:
+    """Instruction docs to write for a project (legacy docs excluded)."""
+    return [
+        (name, template)
+        for name, template in _instruction_documents_for_project()
+        if name not in _LEGACY_INSTRUCTION_DOCS
     ]
 
 
@@ -4643,7 +4717,7 @@ def _sync_project_instruction_docs(project_path: str, sm: SessionManager) -> Non
     """Write the current C3 instruction docs into the project root."""
     repo_root = Path(__file__).resolve().parent.parent
     synced: list[str] = []
-    for instructions_file, template in _instruction_documents_for_project():
+    for instructions_file, template in _instruction_documents_to_generate():
         print(f"Generating {instructions_file}...")
         # Resolve placeholder for project-scoped MCP configs
         resolved_template = template.replace("<path-to-c3>", str(repo_root).replace("\\", "/"))
@@ -4909,8 +4983,8 @@ def cmd_install_mcp(args):
         if _found:
             c3_mcp_exe = Path(_found).resolve().as_posix()
 
-    # On Windows, Gemini CLI splits command args by space, so the script path stays a
-    # single arg. 'python' keeps the source fallback portable across platforms.
+    # Keep the script path as a single arg; 'python' keeps the source fallback
+    # portable across platforms.
     if c3_mcp_exe:
         new_entry = {"command": c3_mcp_exe, "args": ["--project", "."]}
     else:
@@ -4985,9 +5059,9 @@ def cmd_install_mcp(args):
         # instead of letting it surface as anonymous out-of-band drift.
         from services.artifact_defs import note_pending_write
         note_pending_write(target, profile.config_path, "install_mcp")
-    if profile.name in {"codex", "gemini"}:
+    if profile.name in {"codex", "antigravity"}:
         _ensure_project_session_configs(target, server_script, primary_profile=profile.name, c3_mcp_exe=c3_mcp_exe)
-        _ensure_global_session_fallbacks(server_script, c3_mcp_exe=c3_mcp_exe)
+        _ensure_global_session_fallbacks(server_script, c3_mcp_exe=c3_mcp_exe, primary_profile=profile.name)
 
     # ── Persist IDE choice to .c3/config.json ──
     c3_config_dir = target / ".c3"
@@ -5001,7 +5075,7 @@ def cmd_install_mcp(args):
     with open(c3_config_path, 'w', encoding="utf-8") as f:
         json.dump(c3_config, f, indent=2)
 
-    # ── Install hooks (Claude Code + Gemini CLI) ──
+    # ── Install hooks (Claude Code) ──
     if profile.supports_hooks and profile.settings_path:
         settings_dir = target / Path(profile.settings_path).parent
         settings_dir.mkdir(parents=True, exist_ok=True)
@@ -5030,27 +5104,17 @@ def cmd_install_mcp(args):
         hook_pretool_cmd  = f"{_dispatch_base} pretool"
         hook_posttool_cmd = f"{_dispatch_base} posttool"
         hook_stop_cmd     = f"{_dispatch_base} stop"
-
-        # Tool matcher names differ by IDE: Gemini uses snake_case built-in names.
-        if profile.name == "gemini":
-            shell_matcher  = "run_shell_command"
-            read_matcher   = "read_file"
-            grep_matcher   = "grep"
-            glob_matcher   = "find_files"
-            edit_matcher   = "edit_file"
-            write_matcher  = "write_file"
-            # Gemini has no MultiEdit / NotebookEdit equivalents.
-            extra_edit_matchers = []
-        else:
-            shell_matcher  = "Bash"
-            read_matcher   = "Read"
-            grep_matcher   = "Grep"
-            glob_matcher   = "Glob"
-            edit_matcher   = "Edit"
-            write_matcher  = "Write"
-            # Claude Code also exposes MultiEdit (batch edits) and NotebookEdit;
-            # both bypass enforcement/logging unless their matchers are registered.
-            extra_edit_matchers = ["MultiEdit", "NotebookEdit"]
+        hook_prompt_cmd   = f"{_dispatch_base} prompt"
+
+        shell_matcher  = "Bash"
+        read_matcher   = "Read"
+        grep_matcher   = "Grep"
+        glob_matcher   = "Glob"
+        edit_matcher   = "Edit"
+        write_matcher  = "Write"
+        # Claude Code also exposes MultiEdit (batch edits) and NotebookEdit;
+        # both bypass enforcement/logging unless their matchers are registered.
+        extra_edit_matchers = ["MultiEdit", "NotebookEdit"]
 
         # ── PostToolUse hooks ──
         # Matcher set is unchanged from pre-v2.42; every matcher now points at
@@ -5108,8 +5172,7 @@ def cmd_install_mcp(args):
         existing_post.extend(desired_post_hooks)
         settings.setdefault("hooks", {})[hook_event] = existing_post
 
-        # PreToolUse hooks (Claude Code: "PreToolUse", Gemini: "BeforeTool")
-        pre_event = "BeforeTool" if profile.name == "gemini" else "PreToolUse"
+        pre_event = "PreToolUse"
         pre_matchers = {h.get("matcher") for h in desired_pre_hooks}
         existing_pre = [
             h for h in settings.get("hooks", {}).get(pre_event, [])
@@ -5119,7 +5182,6 @@ def cmd_install_mcp(args):
         settings.setdefault("hooks", {})[pre_event] = existing_pre
 
         # ── Stop hooks (auto-snapshot + session stats on session end / Ctrl+C) ──
-        # Stop hooks fire for both Claude Code ("Stop") and Gemini ("Stop").
         desired_stop_hooks = [
             {
                 "matcher": "",
@@ -5153,6 +5215,27 @@ def cmd_install_mcp(args):
         existing_stop.extend(desired_stop_hooks)
         settings.setdefault("hooks", {})[stop_event] = existing_stop
 
+        # ── UserPromptSubmit hook (per-prompt project-memory injection) ──
+        # Same merge discipline as Stop: replace only C3's own entries
+        # (identified by the dispatcher script in the command), keep
+        # user-added ones.
+        prompt_event = "UserPromptSubmit"
+
+        def _is_c3_prompt_hook(entry: dict) -> bool:
+            return any(
+                "hook_dispatch.py" in (hk.get("command") or "")
+                for hk in entry.get("hooks", [])
+            )
+
+        existing_prompt = [
+            h for h in settings.get("hooks", {}).get(prompt_event, [])
+            if not _is_c3_prompt_hook(h)
+        ]
+        existing_prompt.append(
+            {"matcher": "", "hooks": [{"type": "command", "command": hook_prompt_cmd}]}
+        )
+        settings.setdefault("hooks", {})[prompt_event] = existing_prompt
+
         # Claude Code only: enable MCP server prompt settings
         if profile.name == "claude-code":
             settings["enableAllProjectMcpServers"] = True
@@ -5257,20 +5340,6 @@ def cmd_install_mcp(args):
             print(f"Warning: {global_codex_cfg} has [mcp_servers.c3] enabled = false.")
             print("  This can make C3 look disabled. Set it to true or remove that global c3 section.")
 
-    # ── Gemini settings.json enforcement file ──────────────────
-    if profile.name == "gemini":
-        # Warn about a common conflict: global Gemini config pointing elsewhere.
-        global_gemini_cfg = Path.home() / ".gemini" / "settings.json"
-        if global_gemini_cfg.exists():
-            try:
-                with open(global_gemini_cfg, 'r', encoding="utf-8") as f:
-                    g_data = json.load(f)
-                if "mcpServers" in g_data and "c3" in g_data["mcpServers"]:
-                    print(f"Note: Global config {global_gemini_cfg} also defines 'c3'.")
-                    print("  The project-local config at .gemini/settings.json should take precedence.")
-            except Exception:
-                pass
-
     _sync_project_instruction_docs(str(target), sm)
 
     # ── User-global C3 enforcement ──────────────────────────────
@@ -5280,7 +5349,7 @@ def cmd_install_mcp(args):
         print(f"Warning: Could not update global CLAUDE.md: {e}")
 
     # ── Install /terse skill for supported IDEs ──────────────────
-    if profile.name in ("claude-code", "codex", "gemini"):
+    if profile.name in ("claude-code", "codex"):
         try:
             _ensure_terse_skill(profile.name)
         except Exception as e:

{code_context_control-2.50.0 → code_context_control-2.52.0}/cli/commands/parser.py

@@ -21,7 +21,7 @@ def build_parser(version: str, parse_cli_ide_arg):
     p_init.add_argument("project_path", nargs="?", default=".")
     p_init.add_argument("--force", action="store_true", help="Skip prompts and apply update non-interactively")
     p_init.add_argument("--clear", action="store_true", help="Remove all C3 files and exit without rebuilding")
-    p_init.add_argument("--ide", default="auto", type=parse_cli_ide_arg, metavar="{auto,claude,vscode,cursor,codex,gemini,antigravity}", help="Target IDE for MCP config (default: auto-detect)")
+    p_init.add_argument("--ide", default="auto", type=parse_cli_ide_arg, metavar="{auto,claude,vscode,cursor,codex,antigravity}", help="Target IDE for MCP config (default: auto-detect)")
     p_init.add_argument("--mcp-mode", choices=["direct", "proxy"], default="direct", help="Default MCP mode if install is selected during init (default: direct)")
     p_init.add_argument("--git", action="store_true", help="Initialize a local Git repository during init/update")
     p_init.add_argument("--permissions", choices=["read-only", "c3-strict", "standard", "permissive"], default=None, help="Apply Claude Code permission tier (Claude Code only, used with --force)")
@@ -93,14 +93,14 @@ def build_parser(version: str, parse_cli_ide_arg):
 
     p_install_mcp = subparsers.add_parser("install-mcp", help="Generate MCP config for your IDE")
     p_install_mcp.add_argument("targets", nargs="*", help="Optional project path and/or IDE shorthand (for example: `claude` or `. codex`)")
-    p_install_mcp.add_argument("--ide", default="auto", type=parse_cli_ide_arg, metavar="{auto,claude,vscode,cursor,codex,gemini,antigravity}", help="Target IDE (default: auto-detect)")
+    p_install_mcp.add_argument("--ide", default="auto", type=parse_cli_ide_arg, metavar="{auto,claude,vscode,cursor,codex,antigravity}", help="Target IDE (default: auto-detect)")
     p_install_mcp.add_argument("--mcp-mode", choices=["direct", "proxy"], default="direct", help="MCP entrypoint mode (default: direct)")
     p_install_mcp.add_argument("--permissions", choices=["read-only", "c3-strict", "standard", "permissive"], default=None, help="Apply Claude Code permission tier (Claude Code only)")
     p_install_mcp.add_argument("--include-mcp-wildcard", action="store_true", help="Add mcp__* wildcard so non-C3 MCP servers don't prompt per-call")
 
     p_mcp_install = subparsers.add_parser("mcp-install", help="Alias for install-mcp")
     p_mcp_install.add_argument("targets", nargs="*", help="Optional project path and/or IDE shorthand")
-    p_mcp_install.add_argument("--ide", default="auto", type=parse_cli_ide_arg, metavar="{auto,claude,vscode,cursor,codex,gemini,antigravity}", help="Target IDE (default: auto-detect)")
+    p_mcp_install.add_argument("--ide", default="auto", type=parse_cli_ide_arg, metavar="{auto,claude,vscode,cursor,codex,antigravity}", help="Target IDE (default: auto-detect)")
     p_mcp_install.add_argument("--mcp-mode", choices=["direct", "proxy"], default="direct", help="MCP entrypoint mode (default: direct)")
     p_mcp_install.add_argument("--permissions", choices=["read-only", "c3-strict", "standard", "permissive"], default=None, help="Apply Claude Code permission tier (Claude Code only)")
     p_mcp_install.add_argument("--include-mcp-wildcard", action="store_true", help="Add mcp__* wildcard so non-C3 MCP servers don't prompt per-call")