code-context-control 2.61.0__py3-none-any.whl → 2.61.2__py3-none-any.whl

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.61.0"
+__version__ = "2.61.2"
 
 
 def _command_deps() -> CommandDeps:

cli/hook_pretool_enforce.py

@@ -78,6 +78,11 @@ _PREREQS = {
 _ADVISORY_TOOLS = {"Read", "Grep", "Glob", "FindFiles", "SearchText"}
 _BLOCKED_TOOLS = {"Edit", "Write", "MultiEdit"}
 
+# Vault files no native write may touch, regardless of unlock state.
+# Mirrors services.credential_store.VAULT_PROTECTED_FILES (parity-tested);
+# duplicated because hooks must stay import-light.
+_VAULT_FILES = frozenset({"config.json", "secrets.enc", "cred_state.json"})
+
 # Redirect messages per native tool
 _REDIRECTS = {
     "Read": (
@@ -283,6 +288,23 @@ def run(payload: dict, project_path: Path | None = None) -> dict | None:
     session_id = str(payload.get("session_id") or "")
     base = project_path if project_path is not None else Path.cwd()
 
+    # Vault write-guard: the credential registry/state may never be modified
+    # by the agent — even with a warm c3 signal or sticky unlock (v2.61.2).
+    if tool_name in _BLOCKED_TOOLS:
+        target = Path(str(tool_input.get("file_path") or ""))
+        if target.name.lower() in _VAULT_FILES and target.parent.name.lower() == ".c3":
+            return {
+                "hookSpecificOutput": {
+                    "hookEventName": "PreToolUse",
+                    "permissionDecision": "deny",
+                    "permissionDecisionReason": (
+                        f"[c3:vault-protected] {target.name} belongs to the "
+                        "credential vault and cannot be modified by the agent. "
+                        "Ask the user to use the Credentials UI or `c3 creds` CLI."
+                    ),
+                }
+            }
+
     # Session-scoped load: state written by a different session comes back
     # empty, so stale unlocks degrade to the advisory path below.
     state = load_enforcement_state(base, session_id=session_id)

cli/hub_ui/components/project_card.js

@@ -377,24 +377,63 @@ function ProjectCard({ p, isChild, rollup, expanded, onToggleExpand, onChanged,
   // Launch the UI server, then open its tab once the port shows up in the
   // registry. launch_session cannot return the port (the detached child
   // picks it), so open a placeholder tab synchronously — still inside the
-  // click gesture, so popup blockers allow it — and navigate it when
-  // polling /api/projects finds the port.
+  // click gesture, so popup blockers allow it. The placeholder carries its
+  // own poll/redirect script (about:blank inherits this tab's origin, so
+  // its fetches are same-origin) and resolves even if this hub tab is
+  // closed, reloaded, or hung mid-launch — it must never depend on the
+  // opener surviving the launch window.
   const start = async (e) => {
     e.stopPropagation();
     if (starting) return;
     setStarting(true);
     const win = window.open('', '_blank');
+    // armed = the placeholder polls and navigates itself; when false
+    // (write failed / popup blocked) the hub-side poll navigates instead.
+    let armed = false;
     if (win) {
       try {
+        const escHtml = (s) => String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;');
+        const jsStr = (s) => JSON.stringify(String(s)).replace(/</g, '\\u003c');
         win.document.write(
-          `<title>Starting ${p.name}…</title>` +
+          `<title>Starting ${escHtml(p.name)}…</title>` +
           '<body style="background:#0d1117;color:#8b949e;font-family:sans-serif;' +
-          'display:flex;align-items:center;justify-content:center;height:100vh">' +
-          `Starting ${p.name}…</body>`);
+          'display:flex;align-items:center;justify-content:center;height:100vh;margin:0">' +
+          '<div style="text-align:center;max-width:560px;padding:0 20px">' +
+          '<div id="spin" style="margin:0 auto 14px;width:22px;height:22px;' +
+          'border:2px solid #21262d;border-top-color:#58a6ff;border-radius:50%;' +
+          'animation:s .8s linear infinite"></div>' +
+          '<style>@keyframes s{to{transform:rotate(360deg)}}</style>' +
+          `<div id="msg" style="color:#c9d1d9">Starting ${escHtml(p.name)}…</div>` +
+          '<div id="sub" style="margin-top:6px;font-size:12px">waiting for the UI server to report a port</div>' +
+          '</div><script>' +
+          `var ORIGIN=${jsStr(location.origin)},TARGET=${jsStr((p.path || '').toLowerCase())},NAME=${jsStr(p.name)},tries=0,dead=0;` +
+          'function fail(why){dead=1;document.getElementById("spin").style.display="none";' +
+          'document.getElementById("msg").textContent=NAME+": "+why;' +
+          'document.getElementById("sub").textContent=' +
+          '"Check the project\'s .c3/ui.log — you can close this tab.";}' +
+          'window.__c3fail=fail;' +
+          'function poll(){if(dead)return;' +
+          'fetch(ORIGIN+"/api/projects").then(function(r){return r.json()})' +
+          '.then(function(rows){if(dead)return;' +
+          'var row=(Array.isArray(rows)?rows:[]).find(function(r){' +
+          'return (r.path||"").toLowerCase()===TARGET});' +
+          'if(row&&row.port){location.replace("http://127.0.0.1:"+row.port);return}' +
+          'if(++tries>=20){fail("UI server did not report a port after 30s");return}' +
+          'setTimeout(poll,1500)}).catch(function(){if(dead)return;' +
+          'if(++tries>=20){fail("hub unreachable");return}setTimeout(poll,1500)})}' +
+          'setTimeout(poll,1200);<\/script>');
+        win.document.close();
+        armed = true;
       } catch { }
     }
     const fail = (msg) => {
-      if (win) win.close();
+      if (win) {
+        // Surface the error inside the tab the user is looking at; close
+        // it only when the placeholder script isn't there to show it.
+        let shown = false;
+        try { if (armed && win.__c3fail) { win.__c3fail(msg); shown = true; } } catch { }
+        if (!shown) { try { win.close(); } catch { } }
+      }
       notify(msg, 'err');
       setStarting(false);
     };
@@ -403,19 +442,28 @@ function ProjectCard({ p, isChild, rollup, expanded, onToggleExpand, onChanged,
       if (!d.launched) { fail('Launch failed'); return; }
       notify(`Starting ${p.name}…`);
       setTimeout(onChanged, 1500);
+      // Bookkeeping poll: refresh the card and clear the busy state. Only
+      // navigates or closes the tab when the placeholder isn't armed.
       const poll = async (tries) => {
         let rows = [];
         try { rows = await api.get('/api/projects'); } catch { }
         const row = (Array.isArray(rows) ? rows : []).find(r =>
           (r.path || '').toLowerCase() === (p.path || '').toLowerCase());
         if (row && row.port) {
-          const url = 'http://127.0.0.1:' + row.port;
-          if (win) { win.location = url; } else { window.open(url, '_blank'); }
+          if (!armed) {
+            const url = 'http://127.0.0.1:' + row.port;
+            if (win) { win.location = url; } else { window.open(url, '_blank'); }
+          }
           onChanged();
           setStarting(false);
           return;
         }
-        if (tries >= 20) { fail(`${p.name}: UI server did not report a port — check .c3/ui.log`); return; }
+        if (tries >= 20) {
+          if (!armed && win) { try { win.close(); } catch { } }
+          notify(`${p.name}: UI server did not report a port — check .c3/ui.log`, 'err');
+          setStarting(false);
+          return;
+        }
         setTimeout(() => poll(tries + 1), 1500);
       };
       setTimeout(() => poll(0), 1200);

cli/tools/credentials.py

@@ -130,6 +130,14 @@ def _act_reveal(name: str, svc, project_path: str) -> str:
             "or ask the user to enable agent_readable in the Credentials UI / "
             f"`c3 creds set {name} --agent-readable`."
         )
+    if not cs.verify_agent_readable(name, scope=entry["scope"], project_path=project_path):
+        return (
+            f"[creds:integrity] {name!r} is marked agent_readable in the registry, "
+            "but the flag's keyring attestation is missing or disagrees — the "
+            "registry may have been modified outside the credentials API. Ask the "
+            "user to re-confirm the flag (toggle it in the Credentials UI or "
+            "`c3 creds`); re-saving it restores the attestation."
+        )
     value = cs.get_value(name, project_path=project_path, scope=entry["scope"])
     if value is None:
         return (

cli/tools/edit.py

@@ -13,6 +13,8 @@ import json
 import threading
 from pathlib import Path
 
+from services import credential_store as _cs
+
 # Per-file locks — keyed by resolved absolute path string.
 _file_locks: dict[str, threading.Lock] = {}
 _locks_lock = threading.Lock()
@@ -237,6 +239,12 @@ def handle_edit(file_path: str, old_string: str, new_string: str,
         path = Path(svc.project_path) / path
     path = path.resolve()
 
+    # Vault write-guard: the credential registry/state is never agent-writable
+    # (covers create, edit, and batch modes — and c3_project's edit proxy).
+    guard = _cs.vault_guard_reason(path)
+    if guard:
+        return finalize("c3_edit", {"file": file_path}, guard, "vault-protected")
+
     # Relative path for ledger + display (computed even for new files)
     try:
         rel = str(path.relative_to(Path(svc.project_path).resolve())).replace("\\", "/")

{code_context_control-2.61.0.dist-info → code_context_control-2.61.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.61.0
+Version: 2.61.2
 Summary: Local code-intelligence layer for AI coding tools (Claude Code, Codex, Copilot, Cursor, Antigravity). Retrieve less, read less, edit safer — version the configs that shape your agent (CLAUDE.md, skills, hooks, MCP), and manage multi-project + sub-project hierarchies from a local hub.
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0

{code_context_control-2.61.0.dist-info → code_context_control-2.61.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cli/__init__.py,sha256=ec66drCZGNMRU4V6ov0zVhYZph1us12Vn8OvG_LJyRY,22
 cli/_hook_utils.py,sha256=tJ4ZmXD5Y-JjFWb0uoR7ycYklYFUMnnjF2G7BO-wyBI,12600
-cli/c3.py,sha256=H4UM0e53AgRd9Mi-4WRt-ZHfWuo7ZBjJUQB-QEeOgx0,322864
+cli/c3.py,sha256=0m9SqPIVQKy7zbrGq9xOndjmKcu9VOuVFPjJHLuRrlk,322864
 cli/docs.html,sha256=bNymSz7LatnWHjxSXL92QSUtGvB3jBzNHbOV-bRpAOo,142507
 cli/edits.html,sha256=UjAhoCmBmQ89cklGvJqzC6eyNP2tc8H6T-e01DVkLvE,43418
 cli/hook_artifact.py,sha256=Se1CNBfoBFyvJQlRmYdNtdRXIkQp9zaF0O6ndRMo7ts,2198
@@ -12,7 +12,7 @@ cli/hook_edit_ledger.py,sha256=7YK-v5SfW7W5c7F_Ywcwo6UAuvkOR7hZqmWxVokrOAY,8531
 cli/hook_edit_unlock.py,sha256=6xrnsbwmD6TuyADuP_Z-QfwM7sUrtOfyLL6R-gAm9iw,6492
 cli/hook_filter.py,sha256=v8ZSznK5StTfYYqae1l4V2bm-e9sy2RFfpbNr5KwE2U,4988
 cli/hook_ghost_files.py,sha256=plbedFgIJ5tXEE_8USUE39RmyODh1UjIUFNRbUo4R8w,10291
-cli/hook_pretool_enforce.py,sha256=Qbm4VncD4j0HA8urzR6vRTtm06OmlLz7DfL78BOY9b8,13262
+cli/hook_pretool_enforce.py,sha256=ywHygBUUuSyjGlngq1oLeDZg2Q1_FOk5z2F3UNNeiEU,14386
 cli/hook_prompt_recall.py,sha256=LHyubu36pf5h3hbLBe0yH-yGhAlwLJdsc7hfa7WB1h4,3471
 cli/hook_read.py,sha256=ZWZldgqGSNz78COhlgETQ7yxdOW5vWIIHUet9gZKhxk,8176
 cli/hook_session_stats.py,sha256=hZiX0r1SLOstu1PXvygWae0cIqHCcC3mb0SbFL6nCic,2083
@@ -52,7 +52,7 @@ cli/hub_ui/components/global_search.js,sha256=GPfq1EsZa73vXBNCVn4VhT3a7gYkaUblbc
 cli/hub_ui/components/hub_credentials.js,sha256=fIXwU4vdfj-oD3bfgRxUIp8PhWcLjX42STuf-nn4Mjw,72700
 cli/hub_ui/components/mcp_manager.js,sha256=KxA0LlpyNFDgtGxajoqwViJ0pJ0lsa1PqdCMNyyfhCo,17368
 cli/hub_ui/components/modals.js,sha256=3maxEVYIg4McqM-RiOQyr0wz0U08_plGifxVHw2CShQ,52437
-cli/hub_ui/components/project_card.js,sha256=PBHtRmh-bocIDkd_qlJmMoxQqQYTcDFFGmjmeSI560E,27219
+cli/hub_ui/components/project_card.js,sha256=HtGqEtALhe5rR0jlNclXKzCy75eLx0uGVgTkZsrJQ9U,30188
 cli/hub_ui/components/project_tree.js,sha256=8zs2mfj_RsoxY1gDXmqonPPKKQnm1Ev9dizghg4zpHE,3831
 cli/hub_ui/components/session_drawer.js,sha256=OEBvdF3PqRji9CEntolDMVplXF2NTG2xwmXCqkcb0Nw,7553
 cli/hub_ui/components/settings_modal.js,sha256=KF2gQj7HG568N06k3HjTROEURC1wuBvBi05eJ_URLBk,8929
@@ -67,9 +67,9 @@ cli/tools/agent.py,sha256=Fp9XLrOqjSP7_Ihq7VXjYXcGoXjw17-Hx3JMvoOVnhc,48105
 cli/tools/artifacts.py,sha256=98shRIs3cdC8r0E1gfsEOIDUopqSP1WpYwzFiWfdtg0,7491
 cli/tools/bitbucket.py,sha256=_hgORCW9-IF5xZJaznoONVfaTGKaX8VcU7ALrBeLhWo,27518
 cli/tools/compress.py,sha256=aZ4owwqaQLtkszDr_g7yv5KkvtQPuqaSyMk-aM_hsCY,10060
-cli/tools/credentials.py,sha256=YgrC4-GhuKb77jBokIP7mrMMWy2L391_DPizc3NtIno,10051
+cli/tools/credentials.py,sha256=nUsunY09zXYAX-D5oEPD6B2WaWicMLJDNjjxbdce4gE,10566
 cli/tools/delegate.py,sha256=j82eh1UhvQ0k0lShynngmHiUFxEN1SCQG6LwOxoiYBM,54243
-cli/tools/edit.py,sha256=_3QosNcdZ_DaFRYn0Pa7qPsOuMaw7A9zcavb2HvgK2U,21493
+cli/tools/edit.py,sha256=6JDUIVWiKjbbdukEELTA9eISOQQSxGa1xzicYURvJvU,21834
 cli/tools/edits.py,sha256=8zM01TzLmjm7ULQlCmXOmitlJd84zQHVzE0z7UHJUdA,5520
 cli/tools/federate.py,sha256=wmC2QN7A6aay3cT7U9LDPYRCZKL1m_T6qFdZzpZmPx4,4650
 cli/tools/filter.py,sha256=_yhjOncC1kb-aRxjT7pkSILcMC-yXarBMh7oNS057rQ,12083
@@ -102,7 +102,7 @@ cli/ui/components/sessions.js,sha256=FIKtil76B8tCkAmcFV7hlj6GQ_DCJK2jCzvEmdK7NBE
 cli/ui/components/settings.js,sha256=ATbAjBlVIwCNpxq7s191b49a_INQV38iwmySqtJLYwY,79066
 cli/ui/components/sidebar.js,sha256=K2ym2kUgpbyG-EBA_wBIIiqQY8qTatsiBZwzseMWuIQ,9939
 cli/ui/components/tasks.js,sha256=vyKQ3uwoppMwvdEaHlhWXW4oWcAisx4NveqzMhsYqHo,38438
-code_context_control-2.61.0.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
+code_context_control-2.61.2.dist-info/licenses/LICENSE,sha256=l8Kh5QCNWNvR6kIt8L0BUZvc2LAFiHv2c-FnsGnUZf4,11301
 core/__init__.py,sha256=TSDCEcM4V7gcZVM3w2ykJaqEUch4Dkon-rivV17T73s,2501
 core/config.py,sha256=YmkcZwedz_lfDM0ZuI_f4xpe98ixPLcSQFcTCHgRiRg,19206
 core/ide.py,sha256=V6VVMVsFdmmcsMyxikjQp7z9xa42CWiHKS-ya-MAcG4,6172
@@ -163,7 +163,7 @@ services/claude_md.py,sha256=HHJo3sKn1KM-DE5b5d3mSyf9PV60EUsQ8015HjkMAq4,45549
 services/compressor.py,sha256=AK31TqHFpkOD_Lqbp9aEOkOx7zENUwpsQHQ9B2imEHo,33081
 services/context_snapshot.py,sha256=2f_bxY3xX4ZC653ncYno8YSeSTFSavwBjrorytHA0Ns,16879
 services/conversation_store.py,sha256=-E2H6f9pMSOHiBjsq7tFUjrFAwWYExf7LJkibi5MRMA,35650
-services/credential_store.py,sha256=4LAolC_fBjFgW-Lg8yMpoRwFh0dwi-raP1UMw5z3YbA,23270
+services/credential_store.py,sha256=P2_zb_ESr3UXLzju9bLOdQRQDsvrXiL5ulYssztnJJE,25677
 services/doc_index.py,sha256=ZEQD1kyGCAMm9AY4Kpi1zDWJTul-cAcAdi_4Md43Hpw,19205
 services/e2e_benchmark.py,sha256=4pDXkOFjq5b2ZwDvMK0CWdUXQli5OE4cOh_OJs7W36c,132970
 services/e2e_evaluator.py,sha256=FsB4vMzcFUcmicfIwRtA8JZ_XeMpuk2_-86F2iVNEDc,17783
@@ -240,8 +240,8 @@ tui/screens/search_view.py,sha256=MMHjVdlk3HZSuDBSvq8IGrqv_Mh5Us6YqXQ80bcWSMk,19
 tui/screens/session_view.py,sha256=eZ1eDwHTvPOck1wCCviixtOaCxIkBT_95ytNNNriGNA,5991
 tui/screens/stats.py,sha256=p81PjzdaIv7hllb8f45-rlVe4lJZwSdIMqu7e86_u5s,6223
 tui/screens/ui_view.py,sha256=1QJCgLh2YfgWIpvzRG1KOGXYEaOYX6ojN61Azjf2oX0,2125
-code_context_control-2.61.0.dist-info/METADATA,sha256=wcocBgnJCm25L1f0A8sILEwYvL6gq1bFqiHDfFUWI_w,31631
-code_context_control-2.61.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-code_context_control-2.61.0.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
-code_context_control-2.61.0.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
-code_context_control-2.61.0.dist-info/RECORD,,
+code_context_control-2.61.2.dist-info/METADATA,sha256=G1VV47I4vb9Bp0A8cOdzUJTUgqfvb9FfaI2iEgJRF3E,31631
+code_context_control-2.61.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+code_context_control-2.61.2.dist-info/entry_points.txt,sha256=7kX_WUsDCF2hbXzvbNyscyaBb9AeA-DJY5v_5hN0DlU,93
+code_context_control-2.61.2.dist-info/top_level.txt,sha256=wRt41zBybVF3qAiNXHz9BURbkKvUvfhmWWtKMhaw6eE,29
+code_context_control-2.61.2.dist-info/RECORD,,

services/credential_store.py

@@ -135,6 +135,56 @@ def _account(realm_s: str, name: str) -> str:
     return f"{realm_s}|{name}"
 
 
+def _flag_account(realm_s: str, name: str) -> str:
+    return f"{realm_s}|{name}::agent_readable"
+
+
+# Files the agent must never write through c3 tool surfaces: the vault
+# registry (config.json) and its sidecar state. Editing these outside the
+# credentials API is how a prompt-injected agent would grant itself reveal
+# access. Mirrored in cli/hook_pretool_enforce.py (parity-tested).
+VAULT_PROTECTED_FILES = frozenset({"config.json", "secrets.enc", "cred_state.json"})
+
+
+def vault_guard_reason(path) -> str:
+    """Non-empty refusal message when ``path`` is a vault file under .c3/."""
+    p = Path(path)
+    if p.name.lower() in VAULT_PROTECTED_FILES and p.parent.name.lower() == ".c3":
+        return (
+            f"[c3:vault-protected] {p.name} belongs to the credential vault "
+            "(registry/state) and cannot be modified by the agent. Changes go "
+            "through the Credentials UI or the `c3 creds` CLI — ask the user."
+        )
+    return ""
+
+
+def _write_flag_attestation(realm_s: str, name: str, readable: bool) -> None:
+    """Keyring copy of agent_readable — reveal trusts registry AND keyring.
+
+    A registry flag flipped by editing config.json directly (outside this
+    API) disagrees with the attestation, and reveal fails closed.
+    """
+    try:
+        _keyring_module().set_password(
+            KEYRING_SERVICE, _flag_account(realm_s, name), "1" if readable else "0")
+    except Exception:
+        pass  # keyring-less env: verify_agent_readable fails closed anyway
+
+
+def verify_agent_readable(name: str, *, scope: str, project_path: str = ".") -> bool:
+    """True only when the keyring attestation agrees the flag is enabled.
+
+    Fails closed: a missing attestation (pre-v2.61.2 entry, keyring failure,
+    or a registry edited outside this API) reads as not-readable.
+    """
+    try:
+        realm_s = realm(_norm_scope(scope, project_path), project_path)
+        return _keyring_module().get_password(
+            KEYRING_SERVICE, _flag_account(realm_s, name)) == "1"
+    except Exception:
+        return False
+
+
 def _scope_dir(scope: str, project_path: str) -> Optional[Path]:
     """Base directory holding .c3/ for the scope; None when global is unresolvable."""
     if scope == "global":
@@ -376,6 +426,7 @@ def set_credential(
     section["entries"][name] = entry
     config["credentials"] = section
     _save_config(base, config)
+    _write_flag_attestation(realm_s, name, bool(agent_readable))
     return dict(entry)
 
 
@@ -407,6 +458,9 @@ def update_metadata(name: str, *, scope: str, project_path: str = ".", **fields)
     entry["updated"] = _utcnow()
     config["credentials"] = section
     _save_config(base, config)
+    if "agent_readable" in fields:
+        _write_flag_attestation(
+            realm(scope, project_path), name, bool(fields["agent_readable"]))
     return dict(entry)
 
 
@@ -467,6 +521,10 @@ def delete_credential(name: str, *, scope: str, project_path: str = ".") -> bool
         removed_value = True
     except Exception:
         pass
+    try:
+        _keyring_module().delete_password(KEYRING_SERVICE, _flag_account(realm_s, name))
+    except Exception:
+        pass
     config = _load_config(base)
     section = _creds_section(config)
     removed_entry = name in section["entries"]