@bridge_gpt/mcp-server 0.2.41 → 0.2.43

package/build/launcher-config-inspection.js

@@ -22,27 +22,34 @@
  * carries config bodies, `env` maps, credential values, or raw error text.
  */
 import path from "path";
-/** The npm package every Bridge launcher spec names. */
-export const BRIDGE_PACKAGE_NAME = "@bridge_gpt/mcp-server";
+import { getProjectJsonTargets, hostAdapterForTarget } from "./mcp-host-targets.js";
+import { LEGACY_SERVER_NAMES, MCP_SERVER_NAME, MCP_PACKAGE_NAME, resolveRegistrationKey, } from "./mcp-identity.js";
+/**
+ * The npm package every Bridge launcher spec names. Retained as a compatibility
+ * alias — `doctor.ts` still imports this name — assigned from the shared
+ * constant so there is no duplicate package-name literal.
+ */
+export const BRIDGE_PACKAGE_NAME = MCP_PACKAGE_NAME;
 /**
  * The subcommand token that marks a worktree shim registration. A shim points at
  * a sibling worktree's server rather than a published package, so no pin applies
  * and no rewrite is ever safe (BAPI-714 / worktree provisioning).
  */
 const WORKTREE_SHIM_TOKEN = "mcp-invoke";
-/** The MCP server entry key every Bridge registration uses. */
-export const BRIDGE_ENTRY_KEY = "bridge-api";
 /**
  * Every project-local MCP config Bridge registers into. Exported so `doctor`,
  * `init`, and `upgrade` can no longer drift apart on which paths exist or which
  * root key each one uses. Callers that need a different *order* should map over
  * their own list and use {@link launcherTargetFor} for the metadata.
+ *
+ * Derived from the shared host-target registry's project-scoped JSON targets
+ * (Claude Code, Cursor, Copilot VS Code, in that registry order) rather than
+ * duplicating each path/root-key pair here.
  */
-export const LAUNCHER_CONFIG_TARGETS = [
-    { relPath: ".mcp.json", topLevelKey: "mcpServers" },
-    { relPath: ".cursor/mcp.json", topLevelKey: "mcpServers" },
-    { relPath: ".vscode/mcp.json", topLevelKey: "servers" },
-];
+export const LAUNCHER_CONFIG_TARGETS = getProjectJsonTargets().map((target) => ({
+    relPath: target.relPath,
+    topLevelKey: hostAdapterForTarget(target).topLevelKey,
+}));
 /** Look up a target's metadata by relative path, or `undefined` if unknown. */
 export function launcherTargetFor(relPath) {
     return LAUNCHER_CONFIG_TARGETS.find((t) => t.relPath === relPath);
@@ -123,26 +130,52 @@ export function parseLauncherPin(args) {
 export function isWorktreeShimArgs(args) {
     return Array.isArray(args) && args.some((a) => a === WORKTREE_SHIM_TOKEN);
 }
+/**
+ * The one sentence every duplicate-registration diagnostic renders (BAPI-807).
+ *
+ * It names BOTH keys and instructs a manual removal, deliberately without
+ * choosing one: Bridge cannot know which registration the user meant to keep,
+ * and a wrong guess destroys a working configuration. Exported so `doctor`, the
+ * worktree registration probe, and the Claude scope inspector cannot drift into
+ * three different wordings for the same fault.
+ */
+export const DUPLICATE_REGISTRATION_GUIDANCE = `duplicate Bridge registrations: this config carries both \`${MCP_SERVER_NAME}\` and ` +
+    `\`${LEGACY_SERVER_NAMES.join("`, `")}\`. Confirm which registration you want to keep, ` +
+    "then remove the unintended entry manually. Bridge will not choose for you.";
 /** Human-readable text for each reason code (no dynamic content). */
 const REASON_TEXT = {
     "file-unreadable": "the file exists but could not be read",
     "invalid-json": "the file is not valid JSON",
     "root-not-object": "the JSON root is not an object",
     "servers-not-object": "the servers section is not an object",
-    "entry-not-object": "the bridge-api entry is not an object",
-    "no-package-token": "the bridge-api launcher has no recognizable @bridge_gpt/mcp-server token",
+    "entry-not-object": "the Bridge entry is not an object",
+    "no-package-token": `the Bridge launcher has no recognizable ${MCP_PACKAGE_NAME} token`,
     "version-range": "the launcher pin is a version range, which an automated repin must not rewrite",
     "non-release-specifier": "the launcher pin is a dist-tag or channel, not an exact release",
     "malformed-version": "the launcher pin is not a valid MAJOR.MINOR.PATCH release",
     "pinned-ahead-of-target": "the launcher pin is newer than the target version and must not be downgraded",
+    "duplicate-registration": DUPLICATE_REGISTRATION_GUIDANCE,
 };
 /** Render a reason code as sanitized prose. */
 export function describeLauncherReason(reason) {
     return REASON_TEXT[reason];
 }
-/** True for the two actions that must abort a mutation run before any write. */
+/**
+ * True for the actions that must abort a mutation run before any write.
+ *
+ * `duplicate-registration` joins `invalid` and `unsupported` here (BAPI-807) so
+ * every existing mutating caller — `init`'s preflight, `upgrade`'s preflight,
+ * install — blocks on a both-key config through the gate it already had, rather
+ * than each needing its own new branch it might forget.
+ */
 export function isPrerequisiteFailure(inspection) {
-    return inspection.action === "invalid" || inspection.action === "unsupported";
+    return (inspection.action === "invalid" ||
+        inspection.action === "unsupported" ||
+        inspection.action === "duplicate-registration");
+}
+/** True when this config carries both a canonical and a legacy registration. */
+export function isDuplicateRegistration(inspection) {
+    return inspection.action === "duplicate-registration";
 }
 /**
  * True when this target carries a standard launcher whose pin participates in
@@ -156,7 +189,7 @@ export function isApplicableStandardLauncher(inspection) {
             inspection.action === "normalize-unpinned"));
 }
 /**
- * Inspect every project-local MCP config's `bridge-api` launcher, read-only.
+ * Inspect every project-local MCP config's Bridge launcher, read-only.
  *
  * Every target always produces exactly one result, so a caller can render one
  * line per config without re-deriving which paths it looked at. Only an `ENOENT`
@@ -179,6 +212,8 @@ async function inspectOne(target, options) {
         targetVersion,
         spec: null,
         currentVersion: null,
+        registrationKey: null,
+        legacyRegistration: false,
     };
     let raw;
     try {
@@ -242,10 +277,26 @@ async function inspectOne(target, options) {
             reason: "servers-not-object",
         };
     }
-    const entry = isPlainObject(servers)
-        ? servers[BRIDGE_ENTRY_KEY]
-        : undefined;
-    if (entry === undefined) {
+    // BAPI-807: WHICH key this config's Bridge entry lives under is resolved once,
+    // here, through the shared identity resolver — never assumed to be the
+    // canonical name. A legacy `bridge-api` entry is a real, permanently supported
+    // registration; treating it as absence is what would make `init` add a second
+    // entry beside it.
+    const resolution = resolveRegistrationKey(servers);
+    if (resolution.state === "conflict") {
+        // Both keys present. Gate BEFORE reading either entry: which one is "the"
+        // registration is exactly the question a human has to answer, and every
+        // downstream classification would have to pick one to proceed.
+        return {
+            ...base,
+            filePresent: true,
+            bridgeEntryPresent: true,
+            shape: "custom",
+            action: "duplicate-registration",
+            reason: "duplicate-registration",
+        };
+    }
+    if (resolution.state === "absent") {
         // A valid host config that simply has no Bridge registration yet. Other
         // servers in the same file are deliberately not inspected or reported.
         return {
@@ -256,9 +307,19 @@ async function inspectOne(target, options) {
             action: "add",
         };
     }
+    const registrationKey = resolution.key;
+    // Every classification below is computed identically for a canonical and a
+    // legacy entry — the resolved key changes only which property was read, never
+    // the launcher-shape, package-pin, worktree-shim, or readiness verdict.
+    const keyed = {
+        ...base,
+        registrationKey,
+        legacyRegistration: resolution.state === "legacy",
+    };
+    const entry = servers[registrationKey];
     if (!isPlainObject(entry)) {
         return {
-            ...base,
+            ...keyed,
             filePresent: true,
             bridgeEntryPresent: true,
             shape: "custom",
@@ -272,7 +333,7 @@ async function inspectOne(target, options) {
     // package token at all, and must not be misread as an unsupported launcher.
     if (isWorktreeShimArgs(args)) {
         return {
-            ...base,
+            ...keyed,
             filePresent: true,
             bridgeEntryPresent: true,
             shape: "worktree-shim",
@@ -282,7 +343,7 @@ async function inspectOne(target, options) {
     const pin = parseLauncherPin(args);
     if (!pin) {
         return {
-            ...base,
+            ...keyed,
             filePresent: true,
             bridgeEntryPresent: true,
             shape: "custom",
@@ -291,7 +352,7 @@ async function inspectOne(target, options) {
         };
     }
     const common = {
-        ...base,
+        ...keyed,
         filePresent: true,
         bridgeEntryPresent: true,
         shape: "standard",