@bridge_gpt/mcp-server 0.2.54 → 0.2.56

package/build/mcp-host-config.js

@@ -9,17 +9,17 @@
  * Write strategy per target comes from the data-only registry
  * {@link file:./mcp-host-targets.ts}:
  *   - vendor-first — prefer the official vendor CLI, fall back to a safe direct
- *     write (Claude Code, Copilot CLI, Codex).
+ *     write (Claude Code, Codex).
  *   - direct — merge-write the JSON file directly (Cursor, Copilot VS Code).
  *   - manual-instructions — never auto-write; emit redacted instructions
  *     (Windsurf).
  *
  * SECRET DISCIPLINE: the API key lives only inside the logical entry's `env`.
- * When a verified vendor contract delivers it via argv (all three do — none
- * expose a stdin channel), the argv is constructed and spawned INSIDE the vendor
- * adapter and is never stringified, logged, previewed, returned, or interpolated
- * into a warning. Structured outcomes and inspectors carry presence + launcher
- * args only, never env values.
+ * When a verified vendor contract delivers it via argv (neither expose a stdin
+ * channel), the argv is constructed and spawned INSIDE the vendor adapter and is
+ * never stringified, logged, previewed, returned, or interpolated into a
+ * warning. Structured outcomes and inspectors carry presence + launcher args
+ * only, never env values.
  *
  * TOML NOTE: there is no comment-preserving TOML library available, so Codex
  * direct writes render a canonical document for a missing file, APPEND canonical
@@ -30,6 +30,8 @@
 import { VERSION } from "./version.generated.js";
 import { refreshBridgeApiPackageSpec } from "./init.js";
 import { hostAdapterForTarget, } from "./mcp-host-targets.js";
+import { adaptBridgeEntryForHostTarget, } from "./mcp-host-entry-adapter.js";
+export { adaptBridgeEntryForHostTarget, } from "./mcp-host-entry-adapter.js";
 import { LEGACY_SERVER_NAMES, MCP_SERVER_NAME, MCP_PACKAGE_NAME, RECOGNIZED_SERVER_NAMES, resolveRegistrationKey, } from "./mcp-identity.js";
 /**
  * The secret-free, repair-oriented detail every duplicate-registration outcome
@@ -64,31 +66,6 @@ export function resolveTargetAbsPath(target, ctx) {
     return target.absPathResolver(ctx.homedir);
 }
 // ---------------------------------------------------------------------------
-// Entry adaptation
-// ---------------------------------------------------------------------------
-/**
- * Adapt the shared logical entry into a target's physical JSON entry: copy
- * command/args/env, conditionally add the registry `transportType` as `type`,
- * and merge `extraEntryKeys`. Claude Code omits `type`; Cursor/Copilot VS Code
- * use `stdio`; Copilot CLI uses `local` + `tools: ["*"]`.
- */
-export function adaptBridgeEntryForHostTarget(entry, target) {
-    const adapter = hostAdapterForTarget(target);
-    const physical = {};
-    if (adapter.transportType !== undefined) {
-        physical.type = adapter.transportType;
-    }
-    physical.command = entry.command;
-    physical.args = [...entry.args];
-    physical.env = { ...entry.env };
-    if (adapter.extraEntryKeys) {
-        for (const [k, v] of Object.entries(adapter.extraEntryKeys)) {
-            physical[k] = v;
-        }
-    }
-    return physical;
-}
-// ---------------------------------------------------------------------------
 // JSON read / merge / write
 // ---------------------------------------------------------------------------
 function isEnoent(err) {
@@ -153,10 +130,17 @@ export function mergeJsonHostConfig(existing, target, adaptedEntry) {
     // key, so a legacy registration's args are preserved exactly like a canonical
     // one's.
     const prior = root[writeKey];
+    const priorEntry = prior && typeof prior === "object" && !Array.isArray(prior)
+        ? prior
+        : {};
     const preservedArgs = prior && typeof prior === "object" && !Array.isArray(prior)
-        ? refreshBridgeApiPackageSpec(prior.args, currentLauncherSpec())
+        ? refreshBridgeApiPackageSpec(priorEntry.args, currentLauncherSpec())
         : null;
-    root[writeKey] = preservedArgs ? { ...adaptedEntry, args: preservedArgs } : adaptedEntry;
+    root[writeKey] = {
+        ...priorEntry,
+        ...adaptedEntry,
+        ...(preservedArgs ? { args: preservedArgs } : {}),
+    };
     merged[adapter.topLevelKey] = root;
     return { status: "merged", document: merged, registrationKey: writeKey };
 }
@@ -467,7 +451,7 @@ export async function inspectHostEntry(target, ctx, deps) {
  *
  * Deliberately NOT derived from {@link file:./mcp-host-targets.ts}: the merge
  * path's surface is these three files and nothing else, so an inspector built
- * from the wider registry would report on Codex/Copilot hosts the writer never
+ * from the wider registry would report on Codex/Windsurf hosts the writer never
  * touches — and a report implying those hosts gained the token would be wrong.
  */
 export const BRIDGE_PROFILE_TOKEN_CONFIGS = [
@@ -567,12 +551,12 @@ export async function inspectBridgeApiProfileToken(projectRoot, token, deps) {
  * Whether a vendor kind's secret-delivery contract is VERIFIED. Only verified
  * contracts are ever invoked; an uncertain contract falls back to a direct
  * write rather than guessing argv. Verified from empirical probes (BAPI-635):
- * claude `mcp add-json <name> <json>` and copilot `mcp add --env` both deliver
- * the secret through argv. Codex's contract is unverified (binary absent at
- * authoring time) → never invoked; always direct-written.
+ * claude `mcp add-json <name> <json>` delivers the secret through argv.
+ * Codex's contract is unverified (binary absent at authoring time) → never
+ * invoked; always direct-written.
  */
 function isVendorContractVerified(kind) {
-    return kind === "claude-add-json" || kind === "copilot-add";
+    return kind === "claude-add-json";
 }
 /**
  * Build the vendor add invocation for a target. Returns `null` when the
@@ -597,28 +581,6 @@ function buildVendorInvocation(target, entry) {
             args: ["mcp", "add-json", MCP_SERVER_NAME, json, "--scope", "project"],
         };
     }
-    if (vendor.kind === "copilot-add") {
-        // copilot mcp add <name> --tools "*" --env K=V ... -- <command> <args...>
-        // Env pairs (incl BAPI_API_KEY) are secret-bearing argv.
-        const envArgs = [];
-        for (const [k, v] of Object.entries(entry.env)) {
-            envArgs.push("--env", `${k}=${v}`);
-        }
-        return {
-            bin: vendor.bin,
-            args: [
-                "mcp",
-                "add",
-                MCP_SERVER_NAME,
-                "--tools",
-                "*",
-                ...envArgs,
-                "--",
-                entry.command,
-                ...entry.args,
-            ],
-        };
-    }
     return null;
 }
 // ---------------------------------------------------------------------------

package/build/mcp-host-entry-adapter.js

@@ -0,0 +1,18 @@
+import { hostAdapterForTarget, } from "./mcp-host-targets.js";
+/**
+ * Applies only registry-owned physical fields at the host emission boundary.
+ * Logical entries remain portable across host formats.
+ */
+export function adaptBridgeEntryForHostTarget(entry, target) {
+    const adapter = hostAdapterForTarget(target);
+    const physical = {
+        command: entry.command,
+        args: [...entry.args],
+        env: { ...entry.env },
+    };
+    if (adapter.transportType !== undefined)
+        physical.type = adapter.transportType;
+    if (adapter.extraEntryKeys)
+        Object.assign(physical, adapter.extraEntryKeys);
+    return physical;
+}

package/build/mcp-host-targets.js

@@ -51,12 +51,6 @@ export const HOST_ADAPTERS = {
         topLevelKey: "mcp_servers",
         transportType: undefined, // TOML table shape has no `type`.
     },
-    "copilot-cli": {
-        format: "json",
-        topLevelKey: "mcpServers",
-        transportType: "local",
-        extraEntryKeys: { tools: ["*"] },
-    },
 };
 /** Pure typed lookup from a target's declared {@link HostKind} to its adapter. */
 export function hostAdapterForTarget(target) {
@@ -79,7 +73,7 @@ export const MCP_HOST_TARGETS = {
         hostKind: "claude-code-json",
         vendorCli: { bin: "claude", kind: "claude-add-json" },
         launchAgent: "claude",
-        worktreeSupported: true,
+        capabilities: { mcpConfiguration: true, customCommands: true, worktreeProvisioning: true, sessionSpawning: true },
         writeStrategy: "vendor-first",
         // Claude Code is always a candidate default.
         detect: () => true,
@@ -92,7 +86,7 @@ export const MCP_HOST_TARGETS = {
         displayPath: ".cursor/mcp.json",
         hostKind: "cursor-json",
         launchAgent: "cursor-agent",
-        worktreeSupported: true,
+        capabilities: { mcpConfiguration: true, customCommands: true, worktreeProvisioning: true, sessionSpawning: true },
         writeStrategy: "direct",
         detect: (ctx) => ctx.exists(joinPath(ctx.cwd, ".cursor")) ||
             typeof ctx.env.CURSOR_TRACE_DIR === "string" &&
@@ -100,28 +94,15 @@ export const MCP_HOST_TARGETS = {
     },
     "copilot-vscode": {
         id: "copilot-vscode",
-        label: "GitHub Copilot (VS Code)",
+        label: "GitHub Copilot",
         scope: "project",
         relPath: ".vscode/mcp.json",
         displayPath: ".vscode/mcp.json",
         hostKind: "vscode-json",
-        worktreeSupported: false,
+        capabilities: { mcpConfiguration: true, customCommands: true, worktreeProvisioning: false, sessionSpawning: false },
         writeStrategy: "direct",
         detect: (ctx) => ctx.exists(joinPath(ctx.cwd, ".vscode")),
     },
-    "copilot-cli": {
-        id: "copilot-cli",
-        label: "GitHub Copilot CLI",
-        scope: "global",
-        absPathResolver: (homedir) => joinPath(homedir, ".copilot/mcp-config.json"),
-        displayPath: "~/.copilot/mcp-config.json",
-        hostKind: "copilot-cli",
-        vendorCli: { bin: "copilot", kind: "copilot-add" },
-        worktreeSupported: false,
-        writeStrategy: "vendor-first",
-        // No existing probe supports Copilot CLI; never a default.
-        detect: () => false,
-    },
     codex: {
         id: "codex",
         label: "OpenAI Codex",
@@ -130,7 +111,10 @@ export const MCP_HOST_TARGETS = {
         displayPath: "~/.codex/config.toml",
         hostKind: "codex-toml",
         vendorCli: { bin: "codex", kind: "codex-add" },
-        worktreeSupported: false,
+        launchAgent: "codex",
+        // The launcher injects a per-process, worktree-bound MCP table. The global
+        // registration remains the ordinary interactive default.
+        capabilities: { mcpConfiguration: true, customCommands: true, worktreeProvisioning: true, sessionSpawning: true },
         writeStrategy: "vendor-first",
         detect: (ctx) => ctx.exists(joinPath(ctx.homedir, ".codex")),
     },
@@ -141,7 +125,7 @@ export const MCP_HOST_TARGETS = {
         absPathResolver: (homedir) => joinPath(homedir, ".codeium/windsurf/mcp_config.json"),
         displayPath: "~/.codeium/windsurf/mcp_config.json",
         hostKind: "claude-code-json", // Windsurf uses the Claude-compatible JSON shape.
-        worktreeSupported: false,
+        capabilities: { mcpConfiguration: true, customCommands: false, worktreeProvisioning: false, sessionSpawning: false },
         // Preserve current behavior: never auto-modify the global Windsurf file.
         writeStrategy: "manual-instructions",
         detect: (ctx) => ctx.exists(joinPath(ctx.cwd, ".windsurf")) ||
@@ -153,7 +137,6 @@ export const HOST_PLATFORM_ORDER = [
     "claude-code",
     "cursor",
     "copilot-vscode",
-    "copilot-cli",
     "codex",
     "windsurf",
 ];
@@ -173,18 +156,22 @@ export function getHostTarget(id) {
     return isHostPlatformId(id) ? MCP_HOST_TARGETS[id] : undefined;
 }
 /**
- * The centrally-registered launchable agent for a host platform, or `undefined`
- * when the platform has no supported agentic CLI (Copilot / Codex / Windsurf).
+ * The centrally-registered agent identity for a host platform, or `undefined`
+ * when the platform has no registered agent (Copilot / Windsurf).
  * Pure projection of the registry's {@link HostTargetDefinition.launchAgent}
- * metadata — the single source of truth for which selected tools can open a
- * post-install configuration session (BAPI-657).
+ * metadata. Callers must check workflow-specific capabilities before launching.
  */
 export function agentForPlatform(id) {
     return MCP_HOST_TARGETS[id].launchAgent;
 }
-/** The two worktree-supported targets, in stable order (Claude, Cursor). */
+/** Hosts whose declared workflow capability permits worktree provisioning. */
 export function getWorktreeHostTargets() {
-    return allHostTargets().filter((t) => t.worktreeSupported);
+    return allHostTargets().filter((t) => t.capabilities.worktreeProvisioning);
+}
+/** True only when a host has every capability needed for a spawned workflow. */
+export function isRunnableHostTarget(target) {
+    const c = target.capabilities;
+    return c.mcpConfiguration && c.customCommands && c.worktreeProvisioning && c.sessionSpawning && target.launchAgent !== undefined;
 }
 /** Project-scoped JSON targets (used by init, launcher-token merge, doctor). */
 export function getProjectJsonTargets() {

package/build/mcp-provisioning.js

@@ -138,7 +138,7 @@ export function buildMcpServerEntriesForManifest(manifest, absoluteWorktreePath,
 /** Both registration files written for every provisioned worktree. */
 export function getWorktreeMcpRegistrationTargets(worktreePath, platform) {
     const api = pathApiForProvisioningPlatform(platform);
-    return getWorktreeHostTargets().map((target) => ({
+    return getWorktreeHostTargets().filter((target) => target.scope === "project").map((target) => ({
         filePath: api.join(worktreePath, target.relPath),
         topLevelKey: hostAdapterForTarget(target).topLevelKey,
     }));

package/build/mcp-registration-doctor.js

@@ -104,7 +104,7 @@ export function isBridgeApiShimEntry(entry, worktreeRoot) {
  * to validate.
  */
 export async function probeWorktreeMcpRegistration(worktreeRoot, deps) {
-    const targets = getWorktreeHostTargets().map((target) => ({
+    const targets = getWorktreeHostTargets().filter((target) => target.scope === "project").map((target) => ({
         filePath: path.join(worktreeRoot, target.relPath),
         topLevelKey: hostAdapterForTarget(target).topLevelKey,
     }));

package/build/merge-pull-request.js

@@ -356,7 +356,7 @@ function withReviewWaiver(env, waiver) {
  *
  * So the waiver mirrors the Python seam field for field: `api/library/vcs/epic_observers.py`
  * routes `sticky is None` to `PENDING` (waivable) and EVERY `"unknown"` to
- * `UNKNOWN` (never waivable), and `conductor_merge_service` admits only `PENDING`.
+ * `UNKNOWN` (never waivable), and `epic_implementer_merge_service` admits only `PENDING`.
  * No new server field is needed to do this — `sticky_verdict` already carries the
  * distinction on the wire, and `normalizeReviewSnapshot` already preserves it.
  *