@bridge_gpt/mcp-server 0.2.41 → 0.2.43

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