@bridge_gpt/mcp-server 0.2.41 → 0.2.42

package/README.md

@@ -23,7 +23,7 @@ account — it will ask.
 
 - Adds slash commands and agent definitions for your editor (`.claude/commands/`,
   `.cursor/commands/`, and the equivalents your editor uses).
-- Registers a `bridge-api` MCP server in your editor's MCP config, leaving any
+- Registers a `bridge` MCP server in your editor's MCP config, leaving any
   other servers you have configured untouched.
 - Creates `.bridge/` for your project manifest and pipeline definitions.
 - Writes nothing outside your project root except your Bridge credential, which is
@@ -160,7 +160,7 @@ to ask for it.
 
 **"My editor doesn't see any Bridge tools."** Two usual causes. First, the config
 was written somewhere your editor is not looking — re-run the installer from the
-directory your editor actually opens, and check that a `bridge-api` entry exists in
+directory your editor actually opens, and check that a `bridge` entry exists in
 that project's MCP config. Second, the editor has not been reloaded since the file
 was written; restart it. In Claude Code, also confirm you accepted the trust prompt
 for the project's `.mcp.json`.
@@ -278,7 +278,7 @@ No `package.json` is required:
 npx -y @bridge_gpt/mcp-server --init
 ```
 
-Then add a `bridge-api` entry to your host's MCP config, filling in your repository
+Then add a `bridge` entry to your host's MCP config, filling in your repository
 name and API key. Add `"serve"` as the last launcher argument, as shown — it is the
 explicit way to say "start the MCP server."
 
@@ -288,7 +288,7 @@ explicit way to say "start the MCP server."
 ```json
 {
   "mcpServers": {
-    "bridge-api": {
+    "bridge": {
       "command": "npx",
       "args": ["-y", "@bridge_gpt/mcp-server", "serve"],
       "env": {
@@ -309,7 +309,7 @@ explicit way to say "start the MCP server."
 ```json
 {
   "servers": {
-    "bridge-api": {
+    "bridge": {
       "command": "npx",
       "args": ["-y", "@bridge_gpt/mcp-server", "serve"],
       "env": {
@@ -330,7 +330,7 @@ explicit way to say "start the MCP server."
 ```json
 {
   "mcpServers": {
-    "bridge-api": {
+    "bridge": {
       "command": "npx",
       "args": ["-y", "@bridge_gpt/mcp-server", "serve"],
       "env": {
@@ -355,7 +355,7 @@ Windsurf only supports global MCP configuration.
 ```json
 {
   "mcpServers": {
-    "bridge-api": {
+    "bridge": {
       "command": "npx",
       "args": ["-y", "@bridge_gpt/mcp-server", "serve"],
       "env": {
@@ -374,11 +374,11 @@ Windsurf only supports global MCP configuration.
 <summary><strong>OpenAI Codex (~/.codex/config.toml)</strong></summary>
 
 ```toml
-[mcp_servers.bridge-api]
+[mcp_servers.bridge]
 command = "npx"
 args = ["-y", "@bridge_gpt/mcp-server", "serve"]
 
-[mcp_servers.bridge-api.env]
+[mcp_servers.bridge.env]
 BAPI_BASE_URL = "https://bridgegpt-api.com"
 BAPI_REPO_NAME = "your-repo"
 BAPI_API_KEY = "your-api-key"
@@ -456,7 +456,7 @@ For invocation, prefer the slash command — it's deterministic. A free-text exa
      metadata in scripts/sync_mcp_tool_catalog.py — never the JSON artifact and never the
      text between the markers. Generation order is: sync_mcp_tool_catalog.py, then
      sync_mcp_server_readme.py, then `cd mcp_server && npm run build` (which bundles this
-     file into readme.generated.ts, served as the MCP resource bridge-api://readme).
+     file into readme.generated.ts, served as the MCP resource bridge://readme).
      Everything outside the marker pair — including the sections below it — is hand-written. -->
 
 <!-- BEGIN GENERATED: mcp-tool-documentation (managed by scripts/sync_mcp_server_readme.py — DO NOT EDIT BY HAND) -->

package/build/agent-capabilities/cli.js

@@ -12,10 +12,11 @@ import { createDefaultAgentCapabilitiesDeps } from "./default-deps.js";
 import { formatCapabilityJson, formatCapabilityReport } from "./reporter.js";
 import { collectCapabilityResults, hasFailureOrHang } from "./runner.js";
 import { listProbeIds } from "./probes.js";
+import { MCP_PACKAGE_NAME } from "../mcp-identity.js";
 export function getAgentCapabilitiesUsage() {
     return [
         "Usage:",
-        "  npx -y @bridge_gpt/mcp-server agent-capabilities [--agent <name|all>] [--only <ids>] [--json]",
+        `  npx -y ${MCP_PACKAGE_NAME} agent-capabilities [--agent <name|all>] [--only <ids>] [--json]`,
         "",
         "Empirically validates what an agent CLI can do (binary resolution, headless",
         "print mode + exit, .claude/commands resolution, preamble drift-check, output",

package/build/agent-launchers/claude-executor-adapter.js

@@ -6,6 +6,7 @@ import { provisionExecutorDenyLayer } from "../executor/permissions.js";
 import { SUPPORTED_EXECUTOR_PLATFORMS, evaluateExecutorPlatform } from "../executor/platform.js";
 import { normalizeMcpServerNames } from "../executor/observation.js";
 import { supported } from "./executor-adapter.js";
+import { MCP_SERVER_NAME } from "../mcp-identity.js";
 /** Stable identity of this reference implementation. */
 export const CLAUDE_ADAPTER_ID = "claude-reference";
 /** Registry strategy identifier that selects this adapter's factory. */
@@ -15,7 +16,7 @@ export const CLAUDE_ADAPTER_VERSION = "1.0.0";
 /** The one operator-owned credential name this adapter forwards. */
 export const CLAUDE_OAUTH_TOKEN_ENV = "CLAUDE_CODE_OAUTH_TOKEN";
 /** The provisioned MCP server a Claude worker requires. */
-export const CLAUDE_REQUIRED_MCP_SERVER_NAME = "bridge-api";
+export const CLAUDE_REQUIRED_MCP_SERVER_NAME = MCP_SERVER_NAME;
 /** Fixed replacement written in place of a redacted secret value. */
 export const CLAUDE_REDACTION_REPLACEMENT = "[redacted]";
 /** Upper bound on retained version text, matching preflight's existing cap. */
@@ -221,6 +222,11 @@ export function buildClaudeArgv(prompt, alias, mcpConfigPath, posture) {
  * validation, logging, or fallback. A non-string or absent value is silently
  * skipped rather than synthesized. `ANTHROPIC_API_KEY` has no equivalent branch
  * and cannot reach a worker environment through any path in this function.
+ *
+ * `options` is forwarded to the generic builder unchanged, including BAPI-844's
+ * `indexScope`. This adapter neither reads nor validates the scope: it is not an
+ * agent-specific credential decision, so it stays owned by the generic builder,
+ * where the deny-list and the shared shape check both live.
  */
 export function buildClaudeWorkerEnv(parentEnv, options = {}) {
     const env = buildExecutorBaseWorkerEnv(parentEnv, options);
@@ -252,9 +258,16 @@ export function createClaudeExecutorAdapter(spec, deps = {}) {
     };
     const headlessInvocation = {
         buildSpawnShape(input) {
-            const envOptions = input.effectiveBaseBranch === undefined
-                ? {}
-                : { effectiveBaseBranch: input.effectiveBaseBranch };
+            // Each option is included only when the input carries it, so an unscoped
+            // job on a legacy base still produces the exact `{}` the pre-existing
+            // fixtures pin — an explicit `undefined` would be a different object.
+            const envOptions = {};
+            if (input.effectiveBaseBranch !== undefined) {
+                envOptions.effectiveBaseBranch = input.effectiveBaseBranch;
+            }
+            if (input.indexScope !== undefined) {
+                envOptions.indexScope = input.indexScope;
+            }
             return {
                 executable: spec.command,
                 argv: buildClaudeArgv(input.prompt, input.modelAlias, input.mcpConfigPath, input.posture),

package/build/claude-user-config-doctor.js

@@ -39,8 +39,8 @@
  */
 import { isBridgeApiShimEntry, readJsonIfPresent } from "./mcp-registration-doctor.js";
 import { normalizeWorktreePathForRegistration, pathApiForProvisioningPlatform, } from "./mcp-provisioning.js";
-/** The registration key both the provisioner and a user config would use. */
-const BRIDGE_API_SERVER_NAME = "bridge-api";
+import { MCP_SERVER_NAME, resolveRegistrationKey, } from "./mcp-identity.js";
+import { DUPLICATE_REGISTRATION_GUIDANCE } from "./launcher-config-inspection.js";
 /** The Claude user configuration file name, at the home directory root. */
 const CLAUDE_USER_CONFIG_FILENAME = ".claude.json";
 /**
@@ -217,9 +217,22 @@ export async function inspectClaudeUserConfigForMcpShadowing(input, deps) {
         }
         if (!servers)
             continue;
-        if (!Object.prototype.hasOwnProperty.call(servers, BRIDGE_API_SERVER_NAME))
+        // BAPI-807: every recognized key is inspected at every supported scope. A
+        // legacy `bridge-api` registration shadows exactly as much as a canonical
+        // one, so checking only the canonical name would silently stop reporting the
+        // collisions this inspector exists to surface.
+        const resolution = resolveRegistrationKey(servers);
+        if (resolution.state === "conflict") {
+            // Two Bridge registrations at one scope. Reported as its own diagnostic
+            // rather than treating either as authoritative — which of them Claude
+            // loads is not something this inspector can know.
+            diagnostics.push({ kind: "duplicate-registration", configPath, scope: lookup.scope });
             continue;
-        const entry = servers[BRIDGE_API_SERVER_NAME];
+        }
+        if (resolution.state === "absent")
+            continue;
+        const registrationKey = resolution.key;
+        const entry = servers[registrationKey];
         const classification = classifyEntry(entry, lookup.allowedPaths);
         if (classification.verdict === "safe")
             continue;
@@ -238,6 +251,7 @@ export async function inspectClaudeUserConfigForMcpShadowing(input, deps) {
         const finding = {
             scopes: [lookup.scope],
             configPath,
+            registrationKey,
             shape: classification.shape,
             envKeyNames: envKeyNamesOf(entry),
         };
@@ -290,7 +304,9 @@ export function formatClaudeMcpShadowFinding(finding) {
     const envNote = finding.envKeyNames.length > 0
         ? ` (env keys: ${finding.envKeyNames.join(", ")})`
         : "";
-    return (`${finding.configPath} registers a '${BRIDGE_API_SERVER_NAME}' MCP server at ${scopes}: ` +
+    // The KEY is rendered dynamically from the finding (BAPI-807); the entry body,
+    // its arguments, and its env VALUES remain unrendered — only key names appear.
+    return (`${finding.configPath} registers a '${finding.registrationKey}' MCP server at ${scopes}: ` +
         `${SHAPE_LABELS[finding.shape]}${envNote}`);
 }
 /** Render one degraded diagnostic as a fixed, path-only sentence. */
@@ -301,18 +317,33 @@ export function formatClaudeUserConfigDiagnostic(diagnostic) {
         case "malformed":
             return `${diagnostic.configPath} contains malformed JSON; Claude MCP shadowing could not be checked`;
         case "inconclusive-user-shim":
-            return (`${diagnostic.configPath} registers a user-scope '${BRIDGE_API_SERVER_NAME}' shim for an ` +
+            return (`${diagnostic.configPath} registers a user-scope Bridge shim for an ` +
                 "unverifiable project root (the main repository path could not be resolved)");
+        case "duplicate-registration":
+            return (`${diagnostic.configPath} at ${SCOPE_LABELS[diagnostic.scope]}: ` +
+                DUPLICATE_REGISTRATION_GUIDANCE);
     }
 }
 /**
- * The exact remediation command every shadowing advisory carries (BAPI-790).
+ * Build the remediation command for ONE registration key (BAPI-807).
  *
  * A same-named registration is almost always a local-scope leftover, and this is
- * the one command that removes it. Centralized so the executor advisory, the
- * doctor prerequisite, and the operator runbook cannot drift apart.
+ * the one command that removes it. It is generated from the key that was
+ * actually found rather than fixed, because a command naming the wrong key
+ * silently succeeds-as-no-op and teaches the operator to distrust the advisory.
+ */
+export function claudeMcpShadowingRemediationCommand(registrationKey) {
+    return `claude mcp remove ${registrationKey} -s local`;
+}
+/**
+ * The remediation command for the CANONICAL key.
+ *
+ * Retained as a named constant — the doctor prerequisite and the operator
+ * runbook reference one shared string — but every advisory rendered from an
+ * actual finding uses {@link claudeMcpShadowingRemediationCommand} with that
+ * finding's own key instead.
  */
-export const CLAUDE_MCP_SHADOWING_REMEDIATION_COMMAND = "claude mcp remove bridge-api -s local";
+export const CLAUDE_MCP_SHADOWING_REMEDIATION_COMMAND = claudeMcpShadowingRemediationCommand(MCP_SERVER_NAME);
 /**
  * The SINGLE policy every consumer (executor preflight, per-worktree enforcement,
  * doctor) applies to an inspection result, so none of them re-derives
@@ -338,6 +369,6 @@ export function evaluateClaudeMcpShadowingPolicy(inspection) {
     // trailing sentence changes from a refusal to an advisory.
     const findingMessages = inspection.findings.map((finding) => `${formatClaudeMcpShadowFinding(finding)}. Advisory only: strict worker MCP loading ` +
         "means this registration is not loaded by a worker, and the per-spawn MCP surface " +
-        `assertion verifies that. To clear it: ${CLAUDE_MCP_SHADOWING_REMEDIATION_COMMAND}`);
+        `assertion verifies that. To clear it: ${claudeMcpShadowingRemediationCommand(finding.registrationKey)}`);
     return { ok: true, warnings: [...findingMessages, ...warnings] };
 }

package/build/cli-release.js

@@ -15,8 +15,9 @@
  * logs, because both callers treat "no usable version" as "keep using the local
  * copy" rather than as an error worth reporting to the user.
  */
+import { MCP_PACKAGE_NAME } from "./mcp-identity.js";
 /** The npm registry endpoint carrying the latest published release metadata. */
-export const NPM_LATEST_ENDPOINT = "https://registry.npmjs.org/@bridge_gpt/mcp-server/latest";
+export const NPM_LATEST_ENDPOINT = `https://registry.npmjs.org/${MCP_PACKAGE_NAME}/latest`;
 /**
  * Hard bound on the registry lookup. Owned here rather than duplicated at each
  * call site: `install` is a first-time user's very first contact with Bridge, so