gitnexus 1.6.8-rc.2 → 1.6.8-rc.21

package/README.md

@@ -436,6 +436,26 @@ After scope resolution, analyze prunes inert block-local value symbols (a functi
 
 Programmatic callers can pass `keepLocalValueSymbols: true` in `PipelineOptions` instead of setting the env var.
 
+### Hook augmentation/notifications are silently skipped
+
+The Claude Code / Antigravity hooks intentionally stay **silent** on normal skip
+paths so strict hook runners (e.g. Codex `PreToolUse`) never see unexpected
+output. A search may not be augmented — or a stale-index reminder may not appear
+on stderr — when the GitNexus MCP server owns the repo DB, when the DB-lock probe
+times out and fails closed, or when the index is already current.
+
+To see why a hook skipped, set `GITNEXUS_DEBUG=1` and re-run the action — the hook
+writes the reason (e.g. `[GitNexus] augment skipped: MCP server owns DB`) and the
+stale-index hint to its stderr:
+
+```bash
+GITNEXUS_DEBUG=1 <your command>   # surfaces hook skip/diagnostic reasons on stderr
+```
+
+Only `GITNEXUS_DEBUG=1` and `GITNEXUS_DEBUG=true` enable diagnostics; every other
+value (including `0` and `false`) is treated as off. Diagnostics go to stderr
+only — the hook's structured stdout (the JSON the agent consumes) is unaffected.
+
 ## Privacy
 
 - All processing happens locally on your machine

package/dist/_shared/scope-resolution/parsed-file.d.ts

@@ -96,5 +96,26 @@ export interface ParsedFile {
      * side effects — the contract default) leave this undefined.
      */
     readonly captureSideChannel?: unknown;
+    /**
+     * Per-function control-flow graphs for this file (#2081 M1, PDG/taint
+     * substrate). A DISTINCT field from {@link captureSideChannel} — different
+     * producer, consumer, and lifecycle: the worker builds it from the
+     * tree-sitter AST via `LanguageProvider.cfgVisitor` (only on a `--pdg` run),
+     * and scope-resolution emits BasicBlock nodes + CFG edges from it while the
+     * disk-backed ParsedFile store is still live (it is NOT a capture-time
+     * marker the resolver restores into module maps). Kept separate so a future
+     * change to either channel's shape invalidates independently.
+     *
+     * Shared / ingestion code treats this as opaque (`unknown`) per AGENTS.md.
+     * Concretely it is a `readonly FunctionCfg[]` (see
+     * `core/ingestion/cfg/types.ts`) — plain JSON-serializable data (no AST
+     * refs, no class instances) so it round-trips through the parse cache and
+     * the `parsedfile-store` (whose interning reviver keys on `nodeId`, which
+     * these blocks/edges deliberately lack).
+     *
+     * Optional: `undefined` on non-`--pdg` runs and for languages with no
+     * `cfgVisitor` — the default for every run today.
+     */
+    readonly cfgSideChannel?: unknown;
 }
 //# sourceMappingURL=parsed-file.d.ts.map

package/dist/_shared/scope-resolution/parsed-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsed-file.d.ts","sourceRoot":"","sources":["../../src/scope-resolution/parsed-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,oDAAoD;IACpD,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,SAAS,YAAY,EAAE,CAAC;IAChD;;;;OAIG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAChD,QAAQ,CAAC,cAAc,EAAE,SAAS,aAAa,EAAE,CAAC;IAClD;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACvC"}
+{"version":3,"file":"parsed-file.d.ts","sourceRoot":"","sources":["../../src/scope-resolution/parsed-file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,oDAAoD;IACpD,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,SAAS,KAAK,EAAE,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,SAAS,YAAY,EAAE,CAAC;IAChD;;;;OAIG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAChD,QAAQ,CAAC,cAAc,EAAE,SAAS,aAAa,EAAE,CAAC;IAClD;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAEtC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;CACnC"}

package/dist/_shared/scope-resolution/symbol-definition.d.ts

@@ -54,6 +54,10 @@ export interface SymbolDefinition {
      *  Currently used by C++ overload ranking to exclude explicit constructors
      *  from implicit user-defined conversion candidates. */
     isExplicit?: boolean;
+    /** True when the callable is declared unavailable (for example C++ `= delete`).
+     *  Unavailable callables still participate in overload selection, but a
+     *  selected unavailable target must suppress edge emission. */
+    isDeleted?: boolean;
     /** Links Method/Constructor/Property to owning Class/Struct/Trait nodeId */
     ownerId?: string;
     /** #1982/#1993: bridge-held enclosing-namespace path (e.g. `NS1`, `Outer.Inner`)

package/dist/_shared/scope-resolution/symbol-definition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"symbol-definition.d.ts","sourceRoot":"","sources":["../../src/scope-resolution/symbol-definition.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,kBAAkB;IACjC,wFAAwF;IACxF,IAAI,EAAE,MAAM,CAAC;IACb,8EAA8E;IAC9E,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,gBAAgB,GAAG,SAAS,CAAC;IACjE,4CAA4C;IAC5C,WAAW,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC;IAC3E,4EAA4E;IAC5E,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB;;+FAE2F;IAC3F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;iHAC6G;IAC7G,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;uFACmF;IACnF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;4FACwF;IACxF,oBAAoB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC5C,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gGAAgG;IAChG,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;yEAKqE;IACrE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;4DAEwD;IACxD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;iEAO6D;IAC7D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B"}
+{"version":3,"file":"symbol-definition.d.ts","sourceRoot":"","sources":["../../src/scope-resolution/symbol-definition.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,kBAAkB;IACjC,wFAAwF;IACxF,IAAI,EAAE,MAAM,CAAC;IACb,8EAA8E;IAC9E,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,gBAAgB,GAAG,SAAS,CAAC;IACjE,4CAA4C;IAC5C,WAAW,EAAE,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC;IAC3E,4EAA4E;IAC5E,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB;;+FAE2F;IAC3F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;iHAC6G;IAC7G,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;uFACmF;IACnF,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;4FACwF;IACxF,oBAAoB,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC5C,6EAA6E;IAC7E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gGAAgG;IAChG,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;;yEAKqE;IACrE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;4DAEwD;IACxD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;mEAE+D;IAC/D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;iEAO6D;IAC7D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B"}

package/dist/cli/ai-context.js

@@ -136,6 +136,7 @@ This project is indexed by GitNexus as **${projectName}**${noStats ? '' : ` (${s
 - **MUST warn the user** if impact analysis returns HIGH or CRITICAL risk before proceeding with edits.
 - When exploring unfamiliar code, use \`query({query: "concept"})\` to find execution flows instead of grepping. It returns process-grouped results ranked by relevance.
 - When you need full context on a specific symbol — callers, callees, which execution flows it participates in — use \`context({name: "symbolName"})\`.
+- For security review, \`explain({target: "fileOrSymbol"})\` lists taint findings (source→sink flows; needs \`analyze --pdg\`).
 
 ## Never Do
 

package/dist/cli/analyze-config.js

@@ -63,6 +63,7 @@ const KEY_SPECS = {
     skipContextFiles: { target: 'skipAgentsMd', kind: 'boolean' },
     skipAiContext: { target: 'skipAgentsMd', kind: 'boolean' },
     skipSkills: { target: 'skipSkills', kind: 'boolean' },
+    pdg: { target: 'pdg', kind: 'boolean' },
     indexOnly: { target: 'indexOnly', kind: 'boolean' },
     stats: { target: 'stats', kind: 'boolean' },
     noStats: { target: 'stats', kind: 'boolean-negate' },
@@ -78,6 +79,12 @@ const KEY_SPECS = {
     embeddingBatchSize: { target: 'embeddingBatchSize', kind: 'numeric-string' },
     embeddingSubBatchSize: { target: 'embeddingSubBatchSize', kind: 'numeric-string' },
     embeddingDevice: { target: 'embeddingDevice', kind: 'string' },
+    // #1589/#1852 residual — extra fetch-wrapper function names to treat as HTTP
+    // consumers. The auto-detector only flags functions that call the bare global
+    // `fetch()`; a wrapper built on axios / a custom client, or named outside the
+    // built-in convention set, is otherwise invisible to route_map consumers.
+    // Listing it here adds it to the cross-file consumer scan.
+    fetchWrappers: { target: 'fetchWrappers', kind: 'string-array' },
 };
 /** Top-level container key for the nested form; not itself an `AnalyzeOptions` field. */
 const NESTED_KEY = 'analyze';
@@ -195,6 +202,39 @@ const normalizeValue = (kind, value, key) => {
             }
             return trimmed;
         }
+        case 'string-array': {
+            // Generic shared validator — `source` already names the config key, so
+            // messages here stay key-agnostic (no fetch-wrapper coupling in the
+            // shared normalizer; #1589/#1852 review F7).
+            if (!Array.isArray(value)) {
+                throw new GitNexusRcError(`${source} must be an array of strings.`);
+            }
+            const names = [];
+            for (const item of value) {
+                if (typeof item !== 'string') {
+                    throw new GitNexusRcError(`${source} entries must all be strings.`);
+                }
+                const trimmed = item.trim();
+                if (!trimmed) {
+                    throw new GitNexusRcError(`${source} entries must not be empty.`);
+                }
+                assertNoHiddenChars(trimmed, source);
+                // Values may be interpolated into a RegExp downstream. Restrict to
+                // identifier / member-access shapes so a config value can never smuggle
+                // regex metacharacters into a consumer.
+                if (!/^[A-Za-z_$][A-Za-z0-9_$.]*$/.test(trimmed)) {
+                    throw new GitNexusRcError(`${source} entry "${trimmed}" must be an identifier or member name ` +
+                        `(letters, digits, _, $, . — e.g. "client.get").`);
+                }
+                names.push(trimmed);
+            }
+            if (names.length === 0) {
+                throw new GitNexusRcError(`${source} must list at least one string.`);
+            }
+            // De-duplicate and cap to a sane bound so a pathological config cannot
+            // blow up the consumer scan's alternation.
+            return Array.from(new Set(names)).slice(0, 100);
+        }
         case 'numeric-string': {
             // Mirror Commander's contract: these options reach the existing CLI
             // validation as strings. Accept a JSON number or a string; normalize to a

package/dist/cli/analyze.d.ts

@@ -37,6 +37,12 @@ export interface AnalyzeOptions {
     verbose?: boolean;
     /** Skip AGENTS.md and CLAUDE.md gitnexus block updates. */
     skipAgentsMd?: boolean;
+    /**
+     * Build the control-flow-graph / PDG substrate (#2081 M1). Opt-in; off by
+     * default. Threaded to both the worker (CFG build) and scope-resolution
+     * (BasicBlock/CFG emit).
+     */
+    pdg?: boolean;
     /**
      * Stats inclusion in AGENTS.md and CLAUDE.md.
      *
@@ -58,6 +64,14 @@ export interface AnalyzeOptions {
      * before being threaded into the generated AGENTS.md / CLAUDE.md content.
      */
     defaultBranch?: string;
+    /**
+     * Index-branch selector (#2106). From `--branch`. Distinct from
+     * `defaultBranch` (cosmetic base_ref): this routes the index to a per-branch
+     * slot. NOT sourced from `.gitnexusrc` — the `.gitnexusrc` `branch` key is an
+     * alias for `defaultBranch` and must not change index placement. Defaults to
+     * the checked-out branch inside `runFullAnalysis` when omitted.
+     */
+    branch?: string;
     /** Pure index mode: skip all file injection (AGENTS.md, CLAUDE.md, skills). */
     indexOnly?: boolean;
     /** Index the folder even when no .git directory is present. */
@@ -93,6 +107,14 @@ export interface AnalyzeOptions {
     embeddingBatchSize?: string;
     embeddingSubBatchSize?: string;
     embeddingDevice?: string;
+    /**
+     * Extra fetch-wrapper function names to treat as HTTP consumers (#1589/#1852
+     * residual). Supplied via `.gitnexusrc` `fetchWrappers: [...]`. Threaded into
+     * the routes phase, where the cross-file consumer scan unions them with the
+     * auto-detected `fetch()` wrappers so a custom/axios-based wrapper named
+     * outside the built-in convention still produces `route_map` consumers.
+     */
+    fetchWrappers?: string[];
 }
 /**
  * Whether the post-index skill step should run.

package/dist/cli/analyze.js

@@ -551,6 +551,21 @@ const analyzeCommandImpl = async (inputPath, cliOptions) => {
             return;
         }
     }
+    // Validate the index-branch selector (#2106) the same way, so a malformed
+    // `--branch` exits before any expensive analysis starts. Capture the TRIMMED
+    // return so a whitespace-padded value (e.g. " feature" from shell completion)
+    // normalizes before the checked-out-branch mismatch guard and slug — otherwise
+    // it would false-reject on-branch or create a ghost index when detached.
+    if (cliOptions?.branch !== undefined) {
+        try {
+            cliOptions.branch = validateBranchName(cliOptions.branch, '--branch');
+        }
+        catch (err) {
+            cliError(`  ${err instanceof Error ? err.message : String(err)}\n`);
+            process.exitCode = 1;
+            return;
+        }
+    }
     // ── Load .gitnexusrc and merge: CLI flags override config (#243) ───
     // Parse/validate before the progress bar so a malformed config produces an
     // actionable error and exits before any expensive analysis starts.
@@ -826,9 +841,15 @@ const analyzeCommandImpl = async (inputPath, cliOptions) => {
             skipGit: options.skipGit,
             skipAgentsMd,
             skipSkills,
+            // CFG/PDG substrate opt-in (#2081 M1) — threaded to both sinks downstream.
+            pdg: options.pdg === true,
             // Resolved default branch (CLI > .gitnexusrc > auto-detect > "main")
             // threaded into the generated regression-compare example (#243).
             defaultBranch: resolvedDefaultBranch,
+            // Index-branch selector (#2106). Read straight from the CLI flag (not
+            // the .gitnexusrc-merged options) so the cosmetic defaultBranch config
+            // can never change index placement. Undefined → auto-detect in pipeline.
+            branch: cliOptions?.branch,
             // commander.js `.option('--no-stats', …)` registers the flag as
             // `options.stats` (boolean, default true; `false` when the user
             // passed --no-stats). Reading `options.noStats` here returns
@@ -845,6 +866,9 @@ const analyzeCommandImpl = async (inputPath, cliOptions) => {
             // GITNEXUS_WORKER_POOL_SIZE env mutation. `undefined` defers to the
             // env / auto-formula fallback inside the pipeline.
             workerPoolSize,
+            // Extra fetch-wrapper names from `.gitnexusrc` (#1589/#1852 residual);
+            // forwarded to the routes phase consumer scan.
+            fetchWrappers: options.fetchWrappers,
         }, {
             onProgress: (_phase, percent, message) => {
                 updateBar(percent, message);
@@ -863,13 +887,19 @@ const analyzeCommandImpl = async (inputPath, cliOptions) => {
             // preserving the rest of the block (incl. --skills community rows). No-op
             // when the value already matches, so a routine up-to-date run is silent
             // (#1996 tri-review P2).
+            // Only refresh the repo-root AGENTS.md/CLAUDE.md base_ref for the
+            // PRIMARY/flat index (#2106 R2). A non-primary branch's up-to-date
+            // analyze must not churn the committed AGENTS.md — this mirrors the
+            // in-pipeline `if (!placement.branch)` gate around generateAIContextFiles.
             let baseRefRefreshed = [];
-            try {
-                const { refreshBaseRefLine } = await import('./ai-context.js');
-                baseRefRefreshed = (await refreshBaseRefLine(repoPath, resolvedDefaultBranch, { skipAgentsMd })).files;
-            }
-            catch {
-                /* best-effort — never fail the fast path over a context refresh */
+            if (result.isPrimaryBranch !== false) {
+                try {
+                    const { refreshBaseRefLine } = await import('./ai-context.js');
+                    baseRefRefreshed = (await refreshBaseRefLine(repoPath, resolvedDefaultBranch, { skipAgentsMd })).files;
+                }
+                catch {
+                    /* best-effort — never fail the fast path over a context refresh */
+                }
             }
             clearInterval(elapsedTimer);
             process.removeListener('SIGINT', sigintHandler);

package/dist/cli/clean.d.ts

@@ -8,4 +8,5 @@ export declare const cleanCommand: (options?: {
     force?: boolean;
     all?: boolean;
     lbugSidecars?: boolean;
+    branch?: string;
 }) => Promise<void>;

package/dist/cli/clean.js

@@ -7,10 +7,52 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { logger } from '../core/logger.js';
-import { findRepo, unregisterRepo, listRegisteredRepos, assertSafeStoragePath, UnsafeStoragePathError, } from '../storage/repo-manager.js';
+import { findRepo, unregisterRepo, listRegisteredRepos, assertSafeStoragePath, getStoragePaths, removeBranchIndex, UnsafeStoragePathError, } from '../storage/repo-manager.js';
 import { cleanQuarantinedMissingShadowWals, inspectLbugSidecars, listQuarantinedMissingShadowWals, } from '../core/lbug/sidecar-recovery.js';
 import { t } from './i18n/index.js';
 export const cleanCommand = async (options) => {
+    // --branch <name>: remove a single non-primary branch's index (#2106 R7).
+    // Resolve against the RECORDED branches[] summary (never by slugging the
+    // user's raw input, which can disagree with the index-time-sanitized label).
+    if (options?.branch) {
+        const cwd = process.cwd();
+        const repo = await findRepo(cwd);
+        if (!repo) {
+            console.log(t('clean.notFoundHere'));
+            return;
+        }
+        const entries = await listRegisteredRepos();
+        const entry = entries.find((e) => path.resolve(e.path) === path.resolve(repo.repoPath));
+        const summary = entry?.branches?.find((b) => b.branch === options.branch);
+        if (!summary) {
+            console.log(t('clean.branchNotIndexed', { branch: options.branch }));
+            return;
+        }
+        const { storagePath, lbugPath } = getStoragePaths(repo.repoPath, summary.branch);
+        const branchDir = path.dirname(lbugPath);
+        // Safety guard: the target MUST live under <repo>/.gitnexus/branches/.
+        // assertSafeStoragePath only validates the flat `<repo>/.gitnexus`, so this
+        // is a dedicated branches-sub-dir check before any destructive fs.rm.
+        const branchesRoot = path.join(storagePath, 'branches') + path.sep;
+        if (!branchDir.startsWith(branchesRoot)) {
+            logger.error(`Refusing to clean branch index outside .gitnexus/branches: ${branchDir}`);
+            return;
+        }
+        if (!options.force) {
+            console.log(t('clean.deleteBranch', { branch: summary.branch, path: branchDir }));
+            console.log(`\n${t('common.runForceConfirm')}`);
+            return;
+        }
+        try {
+            await fs.rm(branchDir, { recursive: true, force: true });
+            await removeBranchIndex(repo.repoPath, summary.branch);
+            console.log(t('clean.deletedBranch', { branch: summary.branch }));
+        }
+        catch (err) {
+            logger.error({ err }, 'Failed to delete branch index:');
+        }
+        return;
+    }
     if (options?.lbugSidecars) {
         const cwd = process.cwd();
         const repo = await findRepo(cwd);

package/dist/cli/eval-server.js

@@ -155,7 +155,43 @@ export function formatImpactResult(result) {
     const direction = result.direction;
     const byDepth = result.byDepth || {};
     const total = result.impactedCount || 0;
+    // #2129 — an ambiguous bare name must not print the "isolated / safe to
+    // refactor" headline. Surface the per-candidate blast radius + the maximum,
+    // mirroring formatContextResult, so the real impact under whichever symbol the
+    // caller meant is visible on the text surface, not just in the JSON.
+    if (result.status === 'ambiguous') {
+        // #2129 review F11 — report the FULL match count (`totalCandidates`), not the
+        // truncated `candidates[]` length; note when the candidate list is capped.
+        const shown = result.candidates?.length ?? 0;
+        const total = result.totalCandidates ?? shown;
+        const countPhrase = total > shown ? `${total} symbols (showing ${shown})` : `${total} symbols`;
+        const lines = [
+            `${target?.name || '?'}: AMBIGUOUS — ${countPhrase} share this name. ` +
+                `Max blast radius ${result.maxImpactedCount ?? 0} (${result.maxRisk ?? 'UNKNOWN'} risk). ` +
+                `Disambiguate with --uid for one authoritative result:`,
+        ];
+        for (const c of result.candidates || []) {
+            lines.push(`  ${c.kind} ${c.name} → ${c.filePath}:${c.line || '?'}  ` +
+                `[${c.impactedCount ?? 0} ${direction}, risk ${c.risk ?? 'UNKNOWN'}]  (uid: ${c.uid})`);
+        }
+        // #2129 review F1 — a failed per-candidate probe makes the max a lower bound.
+        if (result.partialProbe) {
+            lines.push('  ⚠️  One or more candidate probes failed — max blast radius / risk are lower bounds.');
+        }
+        return lines.join('\n');
+    }
     if (total === 0) {
+        // #1858 — "isolated" is a confident claim. If an interface / indirection
+        // boundary is on the path, the true count is a lower bound, not zero;
+        // callers binding via DI / dynamic dispatch were not traced. Say so instead.
+        if (result.epistemic === 'lower-bound') {
+            const lines = [
+                `${target?.name || '?'}: no direct ${direction} dependencies traced, but this is a LOWER BOUND — unresolved indirection on the path (actual impact may be higher):`,
+            ];
+            for (const b of result.boundaries || [])
+                lines.push(`    • ${b}`);
+            return lines.join('\n');
+        }
         return `${target?.name || '?'}: No ${direction} dependencies found. This symbol appears isolated.`;
     }
     const lines = [];
@@ -164,6 +200,13 @@ export function formatImpactResult(result) {
     if (result.partial) {
         lines.push('⚠️  Partial results — graph traversal was interrupted. Deeper impacts may exist.');
     }
+    // #1858 — an interface / indirection boundary on the path makes this a lower
+    // bound; surface it so the count is not read as exhaustive.
+    if (result.epistemic === 'lower-bound') {
+        lines.push('⚠️  Lower bound — unresolved indirection on the path (callers binding via DI / dynamic dispatch are not traced; actual impact may be higher):');
+        for (const b of result.boundaries || [])
+            lines.push(`    • ${b}`);
+    }
     lines.push('');
     const depthLabels = {
         1: 'WILL BREAK (direct)',

package/dist/cli/help-i18n.js

@@ -27,6 +27,7 @@ const COMMAND_DESCRIPTION_KEYS = {
     impact: 'help.command.impact.description',
     cypher: 'help.command.cypher.description',
     'detect-changes': 'help.command.detectChanges.description',
+    check: 'help.command.check.description',
     'eval-server': 'help.command.evalServer.description',
     group: 'help.command.group.description',
     'group create': 'help.command.group.create.description',
@@ -69,6 +70,7 @@ const OPTION_DESCRIPTION_KEYS = {
     'uninstall|-f, --force': 'help.option.uninstall.force',
     'clean|-f, --force': 'help.option.force.confirmation',
     'clean|--all': 'help.option.clean.all',
+    'clean|--branch <name>': 'help.option.clean.branch',
     'clean|--lbug-sidecars': 'help.option.clean.lbugSidecars',
     'remove|-f, --force': 'help.option.force.confirmation',
     'wiki|-f, --force': 'help.option.wiki.force',
@@ -89,16 +91,19 @@ const OPTION_DESCRIPTION_KEYS = {
     'publish|--id <owner/repo>': 'help.option.publish.id',
     'publish|--skip-git': 'help.option.skipGit',
     'query|-r, --repo <name>': 'help.option.repo.targetOmitOne',
+    'query|--branch <name>': 'help.option.branch',
     'query|-c, --context <text>': 'help.option.query.context',
     'query|-g, --goal <text>': 'help.option.query.goal',
     'query|-l, --limit <n>': 'help.option.query.limit',
     'query|--content': 'help.option.content',
     'context|-r, --repo <name>': 'help.option.repo.target',
+    'context|--branch <name>': 'help.option.branch',
     'context|-u, --uid <uid>': 'help.option.context.uid',
     'context|-f, --file <path>': 'help.option.context.file',
     'context|--content': 'help.option.content',
     'impact|-d, --direction <dir>': 'help.option.impact.direction',
     'impact|-r, --repo <name>': 'help.option.repo.target',
+    'impact|--branch <name>': 'help.option.branch',
     'impact|-u, --uid <uid>': 'help.option.context.uid',
     'impact|-f, --file <path>': 'help.option.context.file',
     'impact|--kind <kind>': 'help.option.impact.kind',
@@ -108,9 +113,15 @@ const OPTION_DESCRIPTION_KEYS = {
     'impact|--offset <n>': 'help.option.impact.offset',
     'impact|--summary-only': 'help.option.impact.summaryOnly',
     'cypher|-r, --repo <name>': 'help.option.repo.target',
+    'cypher|--branch <name>': 'help.option.branch',
     'detect-changes|-s, --scope <scope>': 'help.option.detectChanges.scope',
     'detect-changes|-b, --base-ref <ref>': 'help.option.detectChanges.baseRef',
     'detect-changes|-r, --repo <name>': 'help.option.repo.target',
+    'detect-changes|--branch <name>': 'help.option.branch',
+    'check|--cycles': 'help.option.check.cycles',
+    'check|--json': 'help.option.json',
+    'check|-r, --repo <name>': 'help.option.repo.target',
+    'check|--branch <name>': 'help.option.branch',
     'eval-server|-p, --port <port>': 'help.option.port',
     'eval-server|--host <host>': 'help.option.evalServer.host',
     'eval-server|--idle-timeout <seconds>': 'help.option.evalServer.idleTimeout',

package/dist/cli/i18n/en.d.ts

@@ -10,6 +10,9 @@ export declare const en: {
     readonly 'list.title': "Indexed Repositories ({{count}})";
     readonly 'list.indexed': "Indexed";
     readonly 'list.commit': "Commit";
+    readonly 'list.branch': "Branch";
+    readonly 'list.branchIndexes': "Branch indexes";
+    readonly 'list.branchLine': "{{branch}} ({{commit}}, {{indexed}})";
     readonly 'list.stats': "Stats";
     readonly 'list.statsValue': "{{files}} files, {{symbols}} symbols, {{edges}} edges";
     readonly 'list.clusters': "Clusters";
@@ -23,6 +26,9 @@ export declare const en: {
     readonly 'status.indexed': "Indexed";
     readonly 'status.indexedCommit': "Indexed commit";
     readonly 'status.currentCommit': "Current commit";
+    readonly 'status.branch': "Branch";
+    readonly 'status.detached': "(detached HEAD)";
+    readonly 'status.branchNotIndexed': "⚠️ current branch not indexed (primary index is for '{{primary}}'; run gitnexus analyze)";
     readonly 'status.status': "Status";
     readonly 'status.upToDate': "✅ up-to-date";
     readonly 'status.stale': "⚠️ stale (re-run gitnexus analyze)";
@@ -30,6 +36,9 @@ export declare const en: {
     readonly 'clean.deletedRepo': "Deleted: {{name}} ({{storagePath}})";
     readonly 'clean.notFoundHere': "No indexed repository found in this directory.";
     readonly 'clean.deleteCurrent': "This will delete the GitNexus index for: {{repoName}}";
+    readonly 'clean.branchNotIndexed': "No indexed branch named \"{{branch}}\" for this repository.";
+    readonly 'clean.deleteBranch': "This will delete the branch index \"{{branch}}\" at: {{path}}";
+    readonly 'clean.deletedBranch': "Deleted branch index: {{branch}}";
     readonly 'clean.lbugSidecars.state': "LadybugDB sidecar state: {{state}}";
     readonly 'clean.lbugSidecars.none': "No quarantined LadybugDB missing-shadow WAL sidecars found.";
     readonly 'clean.lbugSidecars.preview': "This will delete {{count}} quarantined LadybugDB missing-shadow WAL sidecar(s):";
@@ -117,6 +126,7 @@ export declare const en: {
     readonly 'help.command.impact.description': "Blast radius analysis: what breaks if you change a symbol";
     readonly 'help.command.cypher.description': "Execute raw Cypher query against the knowledge graph";
     readonly 'help.command.detectChanges.description': "Map git diff hunks to indexed symbols and affected execution flows";
+    readonly 'help.command.check.description': "Run structural checks against the indexed graph";
     readonly 'help.command.evalServer.description': "Start lightweight HTTP server for fast tool calls during evaluation";
     readonly 'help.command.group.description': "Manage repository groups for cross-index impact analysis";
     readonly 'help.command.group.create.description': "Create a new group with template group.yaml";
@@ -156,6 +166,7 @@ export declare const en: {
     readonly 'help.option.force.confirmation': "Skip confirmation prompt";
     readonly 'help.option.uninstall.force': "Apply the changes (default is a dry-run preview)";
     readonly 'help.option.clean.all': "Clean all indexed repos";
+    readonly 'help.option.clean.branch': "Delete only the named branch index (not the primary)";
     readonly 'help.option.clean.lbugSidecars': "Clean quarantined LadybugDB missing-shadow WAL sidecars";
     readonly 'help.option.wiki.force': "Force full regeneration even if up to date";
     readonly 'help.option.wiki.provider': "LLM provider: openai, openrouter, azure, custom, cursor, claude, codex, or opencode (default: openai)";
@@ -178,6 +189,7 @@ export declare const en: {
     readonly 'help.option.query.limit': "Max processes to return (default: 5)";
     readonly 'help.option.content': "Include full symbol source code";
     readonly 'help.option.repo.target': "Target repository";
+    readonly 'help.option.branch': "Scope to a specific branch index (multi-branch repos)";
     readonly 'help.option.context.uid': "Direct symbol UID (zero-ambiguity lookup)";
     readonly 'help.option.context.file': "File path to disambiguate common names";
     readonly 'help.option.impact.kind': "Kind filter to disambiguate common names (e.g. Function, Class, Method)";
@@ -189,6 +201,7 @@ export declare const en: {
     readonly 'help.option.impact.summaryOnly': "Return counts and risk only, omit symbol list";
     readonly 'help.option.detectChanges.scope': "What to analyze: unstaged, staged, all, or compare";
     readonly 'help.option.detectChanges.baseRef': "Branch/commit for compare scope (e.g. main)";
+    readonly 'help.option.check.cycles': "Detect circular imports and fail when any are found";
     readonly 'help.option.evalServer.host': "Bind address (default: 127.0.0.1, use 0.0.0.0 to expose to all interfaces)";
     readonly 'help.option.evalServer.idleTimeout': "Auto-shutdown after N seconds idle (0 = disabled)";
     readonly 'help.option.group.create.force': "Overwrite existing group";

package/dist/cli/i18n/en.js

@@ -10,6 +10,9 @@ export const en = {
     'list.title': 'Indexed Repositories ({{count}})',
     'list.indexed': 'Indexed',
     'list.commit': 'Commit',
+    'list.branch': 'Branch',
+    'list.branchIndexes': 'Branch indexes',
+    'list.branchLine': '{{branch}} ({{commit}}, {{indexed}})',
     'list.stats': 'Stats',
     'list.statsValue': '{{files}} files, {{symbols}} symbols, {{edges}} edges',
     'list.clusters': 'Clusters',
@@ -23,6 +26,9 @@ export const en = {
     'status.indexed': 'Indexed',
     'status.indexedCommit': 'Indexed commit',
     'status.currentCommit': 'Current commit',
+    'status.branch': 'Branch',
+    'status.detached': '(detached HEAD)',
+    'status.branchNotIndexed': "⚠️ current branch not indexed (primary index is for '{{primary}}'; run gitnexus analyze)",
     'status.status': 'Status',
     'status.upToDate': '✅ up-to-date',
     'status.stale': '⚠️ stale (re-run gitnexus analyze)',
@@ -30,6 +36,9 @@ export const en = {
     'clean.deletedRepo': 'Deleted: {{name}} ({{storagePath}})',
     'clean.notFoundHere': 'No indexed repository found in this directory.',
     'clean.deleteCurrent': 'This will delete the GitNexus index for: {{repoName}}',
+    'clean.branchNotIndexed': 'No indexed branch named "{{branch}}" for this repository.',
+    'clean.deleteBranch': 'This will delete the branch index "{{branch}}" at: {{path}}',
+    'clean.deletedBranch': 'Deleted branch index: {{branch}}',
     'clean.lbugSidecars.state': 'LadybugDB sidecar state: {{state}}',
     'clean.lbugSidecars.none': 'No quarantined LadybugDB missing-shadow WAL sidecars found.',
     'clean.lbugSidecars.preview': 'This will delete {{count}} quarantined LadybugDB missing-shadow WAL sidecar(s):',
@@ -117,6 +126,7 @@ export const en = {
     'help.command.impact.description': 'Blast radius analysis: what breaks if you change a symbol',
     'help.command.cypher.description': 'Execute raw Cypher query against the knowledge graph',
     'help.command.detectChanges.description': 'Map git diff hunks to indexed symbols and affected execution flows',
+    'help.command.check.description': 'Run structural checks against the indexed graph',
     'help.command.evalServer.description': 'Start lightweight HTTP server for fast tool calls during evaluation',
     'help.command.group.description': 'Manage repository groups for cross-index impact analysis',
     'help.command.group.create.description': 'Create a new group with template group.yaml',
@@ -156,6 +166,7 @@ export const en = {
     'help.option.force.confirmation': 'Skip confirmation prompt',
     'help.option.uninstall.force': 'Apply the changes (default is a dry-run preview)',
     'help.option.clean.all': 'Clean all indexed repos',
+    'help.option.clean.branch': 'Delete only the named branch index (not the primary)',
     'help.option.clean.lbugSidecars': 'Clean quarantined LadybugDB missing-shadow WAL sidecars',
     'help.option.wiki.force': 'Force full regeneration even if up to date',
     'help.option.wiki.provider': 'LLM provider: openai, openrouter, azure, custom, cursor, claude, codex, or opencode (default: openai)',
@@ -178,6 +189,7 @@ export const en = {
     'help.option.query.limit': 'Max processes to return (default: 5)',
     'help.option.content': 'Include full symbol source code',
     'help.option.repo.target': 'Target repository',
+    'help.option.branch': 'Scope to a specific branch index (multi-branch repos)',
     'help.option.context.uid': 'Direct symbol UID (zero-ambiguity lookup)',
     'help.option.context.file': 'File path to disambiguate common names',
     'help.option.impact.kind': 'Kind filter to disambiguate common names (e.g. Function, Class, Method)',
@@ -189,6 +201,7 @@ export const en = {
     'help.option.impact.summaryOnly': 'Return counts and risk only, omit symbol list',
     'help.option.detectChanges.scope': 'What to analyze: unstaged, staged, all, or compare',
     'help.option.detectChanges.baseRef': 'Branch/commit for compare scope (e.g. main)',
+    'help.option.check.cycles': 'Detect circular imports and fail when any are found',
     'help.option.evalServer.host': 'Bind address (default: 127.0.0.1, use 0.0.0.0 to expose to all interfaces)',
     'help.option.evalServer.idleTimeout': 'Auto-shutdown after N seconds idle (0 = disabled)',
     'help.option.group.create.force': 'Overwrite existing group',