@bridge_gpt/mcp-server 0.2.41 → 0.2.43

package/build/init.js

@@ -20,7 +20,8 @@ import { reconstructAgentMarkdown, translateAgentToCopilot } from "./agent-utils
 import { validateRepoName, resolveRepoNameForProjectRoot } from "./bridge-config.js";
 import { ensureGitignored as ensureGitignoredShared } from "./git-ignore-utils.js";
 import { resolveBapiCredentials } from "./credential-store.js";
-import { BRIDGE_ENTRY_KEY, describeLauncherReason, inspectLauncherConfigs, isPrerequisiteFailure, launcherTargetFor, } from "./launcher-config-inspection.js";
+import { describeLauncherReason, DUPLICATE_REGISTRATION_GUIDANCE, inspectLauncherConfigs, isPrerequisiteFailure, launcherTargetFor, } from "./launcher-config-inspection.js";
+import { MCP_SERVER_NAME, MCP_PACKAGE_NAME, resolveRegistrationKey, } from "./mcp-identity.js";
 // ---------------------------------------------------------------------------
 // CLI: --init scaffolds slash commands and MCP configs into the current project
 // ---------------------------------------------------------------------------
@@ -59,7 +60,7 @@ export function buildBridgeApiEntry(cwd, metadata) {
     // EVERY branch — the server self-resolves it at runtime.
     return {
         command: "npx",
-        args: ["-y", "--prefer-offline", `@bridge_gpt/mcp-server@${VERSION}`, "serve"],
+        args: ["-y", "--prefer-offline", `${MCP_PACKAGE_NAME}@${VERSION}`, "serve"],
         env: {
             BAPI_BASE_URL: metadata?.baseUrl ?? DEFAULT_BRIDGE_BASE_URL,
             BAPI_REPO_NAME: metadata?.repoName ?? PLACEHOLDER_REPO_NAME,
@@ -68,8 +69,6 @@ export function buildBridgeApiEntry(cwd, metadata) {
         },
     };
 }
-/** The package-name prefix every Bridge launcher spec starts with. */
-const BRIDGE_PACKAGE_PREFIX = "@bridge_gpt/mcp-server";
 /**
  * Refresh ONLY the package-spec token of an existing launcher args array
  * (BAPI-714, Group C).
@@ -95,7 +94,7 @@ export function refreshBridgeApiPackageSpec(args, spec) {
     const tokens = args.filter((a) => typeof a === "string");
     if (tokens.length !== args.length)
         return null;
-    const index = tokens.findIndex((token) => token.startsWith(BRIDGE_PACKAGE_PREFIX));
+    const index = tokens.findIndex((token) => token.startsWith(MCP_PACKAGE_NAME));
     if (index === -1)
         return null;
     const next = [...tokens];
@@ -104,7 +103,7 @@ export function refreshBridgeApiPackageSpec(args, spec) {
 }
 /** The exact package spec a launcher generated by THIS build should carry. */
 export function currentBridgePackageSpec() {
-    return `${BRIDGE_PACKAGE_PREFIX}@${VERSION}`;
+    return `${MCP_PACKAGE_NAME}@${VERSION}`;
 }
 /**
  * Choose the `repo_name` written into a scaffolded `.bridge/config`. Uses the
@@ -224,16 +223,47 @@ export async function resolveInitScaffoldAssets(options) {
     ];
     return { ide, pipelinesDir, instructionsDir, commitSafePaths };
 }
+/**
+ * Thrown when a profile merge finds a config carrying BOTH recognized
+ * registration keys (BAPI-807). Raised before ANY file is written, so the
+ * operation is all-or-nothing.
+ */
+export class DuplicateRegistrationError extends Error {
+    relPaths;
+    constructor(relPaths) {
+        super(`Cannot update the Bridge MCP profile:\n${relPaths
+            .map((p) => `  ${p}: ${DUPLICATE_REGISTRATION_GUIDANCE}`)
+            .join("\n")}`);
+        this.name = "DuplicateRegistrationError";
+        this.relPaths = relPaths;
+    }
+}
 /**
  * Merge a group token (e.g. "sfcc") into the BRIDGE_MCP_PROFILE env value of the
- * `bridge-api` entry in each present MCP config file (.mcp.json, .vscode/mcp.json,
+ * Bridge entry in each present MCP config file (.mcp.json, .vscode/mcp.json,
  * .cursor/mcp.json). Existing tokens are preserved; the merge is idempotent.
  *
- * Only files where a `bridge-api` entry already exists are modified — new files
- * are never created by this helper.
+ * Only files where a recognized Bridge entry already exists are modified — new
+ * files are never created by this helper, and the entry is updated under the key
+ * it actually lives under (`bridge` or the permanently supported `bridge-api`),
+ * never renamed.
+ *
+ * BAPI-807: every present target is READ AND RESOLVED first, and only then is
+ * anything written. A both-key config in the third file must not be discovered
+ * after the first two were already modified — that would leave the project
+ * half-updated with no record of what moved, which is the same all-or-nothing
+ * guarantee `runInit`'s preflight provides.
  *
  * Returns the final resolved profile string (comma-joined) after merging, or an
  * empty string if no config file was found or updated.
+ *
+ * Its READ-ONLY counterpart is `inspectBridgeApiProfileToken`
+ * ({@link file:./mcp-host-config.ts}), which reports token presence across the
+ * same three configs without writing. Callers that need to say WHICH config
+ * carries the token must use it: this function returns a merged profile string,
+ * not a per-config roster (BAPI-775).
+ *
+ * @throws {DuplicateRegistrationError} when any target carries both keys.
  */
 export async function mergeBridgeApiProfileToken(cwd, token) {
     const targets = [
@@ -241,7 +271,9 @@ export async function mergeBridgeApiProfileToken(cwd, token) {
         { path: ".vscode/mcp.json", topLevelKey: "servers" },
         { path: ".cursor/mcp.json", topLevelKey: "mcpServers" },
     ];
-    let lastProfile = "";
+    // ---- Pass 1: read + resolve every target. No writes. ----
+    const pending = [];
+    const conflicts = [];
     for (const target of targets) {
         const fullPath = path.join(cwd, target.path);
         let raw;
@@ -259,10 +291,25 @@ export async function mergeBridgeApiProfileToken(cwd, token) {
             continue; // invalid JSON — skip
         }
         const topLevel = parsed[target.topLevelKey];
-        if (!topLevel || !topLevel["bridge-api"]) {
-            continue; // no bridge-api entry — skip
+        const resolution = resolveRegistrationKey(topLevel);
+        if (resolution.state === "conflict") {
+            conflicts.push(target.path);
+            continue;
+        }
+        if (resolution.state === "absent") {
+            continue; // no recognized Bridge entry — skip
         }
-        const entry = topLevel["bridge-api"];
+        const entry = topLevel[resolution.key];
+        if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+            continue; // present key but not an updatable entry — skip
+        }
+        pending.push({ fullPath, parsed, entry });
+    }
+    if (conflicts.length > 0)
+        throw new DuplicateRegistrationError(conflicts);
+    // ---- Pass 2: apply. Every target here was proven unambiguous above. ----
+    let lastProfile = "";
+    for (const { fullPath, parsed, entry } of pending) {
         if (!entry.env)
             entry.env = {};
         const existing = entry.env.BRIDGE_MCP_PROFILE;
@@ -329,7 +376,7 @@ export class InitPreflightError extends Error {
     }
 }
 /**
- * Resolve the non-secret identity a NEW `bridge-api` entry should carry.
+ * Resolve the non-secret identity a NEW Bridge entry should carry.
  *
  * Precedence (plan Step 3.9): an explicit caller context wins; then an explicit
  * `BAPI_REPO_NAME`; then the committed `.bridge/config` / git-derived identity.
@@ -454,7 +501,7 @@ export async function runInit(cwd, options = {}) {
         stat: options.io?.stat ?? stat,
     };
     const targetVersion = options.targetVersion ?? VERSION;
-    const targetSpec = `@bridge_gpt/mcp-server@${targetVersion}`;
+    const targetSpec = `${MCP_PACKAGE_NAME}@${targetVersion}`;
     const say = options.stdout ?? ((m) => console.log(m));
     const warn = options.stderr ?? ((m) => console.error(m));
     // ---- Phase 1: IDE Detection ----
@@ -467,7 +514,7 @@ export async function runInit(cwd, options = {}) {
     console.log(`Bridge API --init: detected IDEs: ${detectedIDEs.join(", ")}`);
     // ---- Phase 2: Windsurf manual instructions ----
     if (ideDetection.windsurf) {
-        const windsurfSnippet = JSON.stringify({ mcpServers: { "bridge-api": buildBridgeApiEntry(cwd) } }, null, 2);
+        const windsurfSnippet = JSON.stringify({ mcpServers: { [MCP_SERVER_NAME]: buildBridgeApiEntry(cwd) } }, null, 2);
         console.log("\n⚠ Windsurf does not support project-local MCP configuration.\n" +
             "Add the following to ~/.codeium/windsurf/mcp_config.json:\n\n" +
             windsurfSnippet + "\n");
@@ -539,6 +586,7 @@ export async function runInit(cwd, options = {}) {
             structuredActions.push({
                 relPath: target.path,
                 kind: "skipped-worktree-shim",
+                registrationKey: found.registrationKey ?? undefined,
             });
             continue;
         }
@@ -555,14 +603,17 @@ export async function runInit(cwd, options = {}) {
                 kind: "skipped-ahead",
                 fromVersion: found.currentVersion ?? undefined,
                 fromSpec: found.spec ?? undefined,
+                registrationKey: found.registrationKey ?? undefined,
             });
             continue;
         }
         if (found.action === "create") {
+            // A CREATE is by definition an absent registration, so the key is the
+            // canonical one. `add` below is the same case in an existing file.
             await io.mkdir(path.dirname(fullPath), { recursive: true });
             const content = {
                 [target.topLevelKey]: {
-                    [BRIDGE_ENTRY_KEY]: buildBridgeApiEntry(cwd, newEntryMetadata),
+                    [MCP_SERVER_NAME]: buildBridgeApiEntry(cwd, newEntryMetadata),
                 },
             };
             await io.writeFile(fullPath, JSON.stringify(content, null, 2) + "\n", "utf-8");
@@ -573,6 +624,7 @@ export async function runInit(cwd, options = {}) {
                 kind: "created",
                 toVersion: targetVersion,
                 unconfigured: !entryReady,
+                registrationKey: MCP_SERVER_NAME,
             });
             if (!entryReady) {
                 readinessWarnings.push({
@@ -589,9 +641,11 @@ export async function runInit(cwd, options = {}) {
         const raw = await io.readFile(fullPath, "utf-8");
         const parsed = JSON.parse(raw);
         if (found.action === "add") {
+            // No recognized key was present (the preflight proved it), so this is a
+            // fresh registration and uses MCP_SERVER_NAME.
             if (!parsed[target.topLevelKey])
                 parsed[target.topLevelKey] = {};
-            parsed[target.topLevelKey][BRIDGE_ENTRY_KEY] = buildBridgeApiEntry(cwd, newEntryMetadata);
+            parsed[target.topLevelKey][MCP_SERVER_NAME] = buildBridgeApiEntry(cwd, newEntryMetadata);
             await io.writeFile(fullPath, JSON.stringify(parsed, null, 2) + "\n", "utf-8");
             configActions.push({ path: target.path, action: "added entry" });
             structuredActions.push({
@@ -599,6 +653,7 @@ export async function runInit(cwd, options = {}) {
                 kind: "added",
                 toVersion: targetVersion,
                 unconfigured: !entryReady,
+                registrationKey: MCP_SERVER_NAME,
             });
             if (!entryReady) {
                 readinessWarnings.push({
@@ -614,7 +669,12 @@ export async function runInit(cwd, options = {}) {
         // rewrote it to "npx" unconditionally, silently replacing a custom
         // launcher), and `refreshBridgeApiPackageSpec` preserves the bare-versus-
         // `serve` composition plus every surrounding argument (BAPI-714 C-3).
-        const entry = parsed[target.topLevelKey][BRIDGE_ENTRY_KEY];
+        //
+        // BAPI-807: the entry is reached through the key the PREFLIGHT resolved,
+        // not through MCP_SERVER_NAME. Indexing by the canonical name here is what
+        // would turn a `bridge-api` project's repin into a second `bridge` entry.
+        const registrationKey = found.registrationKey ?? MCP_SERVER_NAME;
+        const entry = parsed[target.topLevelKey][registrationKey];
         const refreshed = refreshBridgeApiPackageSpec(entry.args, targetSpec);
         if (refreshed === null) {
             // Unreachable: preflight classifies an unrecognizable args array as
@@ -641,6 +701,7 @@ export async function runInit(cwd, options = {}) {
             fromVersion: found.currentVersion ?? undefined,
             fromSpec: found.spec ?? undefined,
             toVersion: targetVersion,
+            registrationKey,
         });
         // An existing entry that still says YOUR_REPO_NAME loads without error and
         // authenticates as nobody. Its env is left exactly as-is — but the run is
@@ -666,7 +727,7 @@ export async function runInit(cwd, options = {}) {
         const existing = readinessWarnings.filter((w) => w.kind === "unconfigured-entry-existing");
         warn("\n⚠ Bridge API MCP configuration is NOT ready to authenticate.");
         if (created.length > 0) {
-            warn(`  Wrote an UNCONFIGURED bridge-api entry (BAPI_REPO_NAME=${PLACEHOLDER_REPO_NAME}) to: ${created
+            warn(`  Wrote an UNCONFIGURED ${MCP_SERVER_NAME} entry (BAPI_REPO_NAME=${PLACEHOLDER_REPO_NAME}) to: ${created
                 .map((w) => w.relPath)
                 .join(", ")}`);
             warn(identity.repoName
@@ -677,11 +738,11 @@ export async function runInit(cwd, options = {}) {
             }
         }
         if (existing.length > 0) {
-            warn(`  Existing bridge-api entry still uses the ${PLACEHOLDER_REPO_NAME} placeholder in: ${existing
+            warn(`  Existing Bridge entry still uses the ${PLACEHOLDER_REPO_NAME} placeholder in: ${existing
                 .map((w) => w.relPath)
                 .join(", ")}`);
         }
-        warn("  Fix with: npx -y @bridge_gpt/mcp-server install   (or set BAPI_REPO_NAME and store a key with the install flow)");
+        warn(`  Fix with: npx -y ${MCP_PACKAGE_NAME} install   (or set BAPI_REPO_NAME and store a key with the install flow)`);
     }
     // ---- Phase 4: Scaffold slash command directories ----
     const commandDirs = [path.join(cwd, ".claude", "commands")];