@bridge_gpt/mcp-server 0.2.55 → 0.2.57

package/build/init.js

@@ -13,6 +13,7 @@ import { writeFile, mkdir, readFile, stat } from "fs/promises";
 import path from "path";
 import os from "os";
 import { COMMANDS } from "./commands.generated.js";
+import { renderCommandForHost } from "./command-host.js";
 import { CODEX_SKILLS_DIR, codexSkillAssets } from "./codex-skill-adapter.js";
 import { AGENTS } from "./agents.generated.js";
 import { DOCS } from "./docs.generated.js";
@@ -770,7 +771,7 @@ export async function runInit(cwd, options = {}) {
         await mkdir(dir, { recursive: true });
         // Per-file read/compare/write runs concurrently; outcomes are applied to the
         // Sets afterward in entry order so the summary counts are unchanged.
-        const outcomes = await Promise.all(commandEntries.map(([filename, content]) => scaffoldFile(path.join(dir, filename), content)));
+        const outcomes = await Promise.all(commandEntries.map(([filename, content]) => scaffoldFile(path.join(dir, filename), renderCommandForHost(filename, content, dir === path.join(cwd, ".cursor", "commands") ? "cursor" : "claude-code"))));
         commandEntries.forEach(([filename], i) => {
             const outcome = outcomes[i];
             if (outcome === "skipped") {

package/build/install-bridge.js

@@ -152,6 +152,7 @@ import { provisionHostTarget, createDefaultVendorProcessDeps, inspectBridgeApiPr
 import { adaptBridgeEntryForHostTarget, } from "./mcp-host-entry-adapter.js";
 import { MCP_SERVER_NAME, MCP_PACKAGE_NAME, resolveRegistrationKey, } from "./mcp-identity.js";
 import { DUPLICATE_REGISTRATION_GUIDANCE } from "./launcher-config-inspection.js";
+import { codexHome, configureBridgeCodexProfile, inspectBridgeCodexProfile } from "./codex-bridge-profile.js";
 import { recordInstalledConductorCapability, recordInstalledExecutorServiceUnit, recordInstalledProjectArtifact, writeMcpInstallState, } from "./mcp-install-state.js";
 // BAPI-1207: opt-in cross-platform agent notes (AGENTS.md / CLAUDE.md).
 import { AGENT_GUIDANCE } from "./agent-guidance.generated.js";
@@ -517,6 +518,9 @@ export function getInstallBridgeUsage(baseUrl = DEFAULT_BAPI_BASE_URL) {
         "                                manual continuation instead). --tools= (empty) is",
         "                                an explicit empty selection: it writes nothing and",
         "                                launches nothing.",
+        "  --codex-profile on|off       Opt in to Bridge workflow MCP approvals for",
+        "                                Codex workers, or explicitly decline. With a",
+        "                                Codex TTY selection, the installer asks.",
         "  --force                       Overwrite an existing real BAPI_API_KEY in a",
         "                                host config (or in the credential store) without",
         "                                prompting. It does NOT bypass the git-tracked",
@@ -530,7 +534,7 @@ export function getInstallBridgeUsage(baseUrl = DEFAULT_BAPI_BASE_URL) {
         "                                prompting, or spawning anything. With --invite it",
         "                                also never calls the exchange endpoint and never",
         "                                generates or stores a secret.",
-        "  --agent claude|cursor-agent   Explicit launch override for the post-install",
+        "  --agent claude|cursor-agent|codex  Explicit agent choice for post-install",
         "                                session — it always wins, and there is NO Claude",
         "                                default. Without it the launch tool is derived",
         "                                from your selection: Claude Code opens `claude`.",
@@ -539,9 +543,11 @@ export function getInstallBridgeUsage(baseUrl = DEFAULT_BAPI_BASE_URL) {
         "                                session); selecting Cursor writes .cursor/mcp.json",
         "                                and prints how to finish by running /install-bridge",
         "                                in a new Cursor session. A selection whose tools have",
-        "                                no agentic CLI (e.g. Copilot) likewise opens nothing",
+        "                                no supported auto-launch path (e.g. Copilot) opens nothing",
         "                                and prints how to finish configuring later. Passing",
-        "                                --agent cursor-agent still force-spawns it.",
+        "                                --agent cursor-agent still force-spawns it. Codex",
+        "                                is accepted only for manual continuation: neither",
+        "                                this bootstrap nor start-tickets launches it yet.",
         "  -h, --help                    Show this help.",
         "",
         "Subcommands:",
@@ -612,6 +618,7 @@ export function parseInstallBridgeArgs(argv) {
     let invite;
     let email;
     let tools;
+    let codexProfile;
     // Track SUPPLIED-ness separately from the values: `--invite` is legitimately
     // valueless (prompt path) and `--api-key ""` is still a contradiction with it.
     let inviteSupplied = false;
@@ -697,6 +704,16 @@ export function parseInstallBridgeArgs(argv) {
             i = r.nextIndex;
             continue;
         }
+        if (arg === "--codex-profile" || arg.startsWith("--codex-profile=")) {
+            const r = readValue(arg, "--codex-profile", i);
+            if ("error" in r)
+                return { status: "error", message: r.error };
+            if (r.value !== "on" && r.value !== "off")
+                return { status: "error", message: "--codex-profile must be on or off." };
+            codexProfile = r.value;
+            i = r.nextIndex;
+            continue;
+        }
         if (arg === "--agent" || arg.startsWith("--agent=")) {
             const r = readValue(arg, "--agent", i);
             if ("error" in r)
@@ -747,7 +764,7 @@ export function parseInstallBridgeArgs(argv) {
     }
     return {
         status: "ok",
-        options: { apiKey, repo, force, dryRun, agentName, invite, inviteMode: inviteSupplied, email, tools },
+        options: { apiKey, repo, force, dryRun, agentName, invite, inviteMode: inviteSupplied, email, tools, codexProfile },
     };
 }
 /**
@@ -2057,7 +2074,7 @@ async function resolveDryRunHostPlatforms(deps, options) {
  * Launch agents install-bridge will NEVER auto-spawn from a host SELECTION, even
  * though their CLI exists and the host's MCP config is still written normally.
  *
- * `cursor-agent` is excluded: its FIRST-RUN workspace-trust handshake collapses
+ * `cursor-agent` and `codex` are excluded. Cursor's FIRST-RUN workspace-trust handshake collapses
  * under our osascript-spawned launch — the "Workspace Trust Required" dialog
  * renders, then the process exits before a selection registers, so configuration
  * never runs (reproduced on a pristine, never-trusted workspace; the identical
@@ -2065,16 +2082,20 @@ async function resolveDryRunHostPlatforms(deps, options) {
  * cursor-agent's own behavior on an untrusted workspace and is not something our
  * launch can drive, so we treat Cursor as a no-auto-launch host: selecting it
  * still writes `.cursor/mcp.json`, then prints the manual `/install-bridge`
- * continuation (same path as Copilot/Codex/Windsurf, which have no agentic CLI).
+ * continuation. Codex does have an agentic CLI, but this workflow is a Claude
+ * `/install-bridge` command and its native skill is not available until after
+ * the bootstrap it would be asked to run completes.
  * An explicit `--agent cursor-agent` override still spawns it — a deliberate,
  * documented power-user opt-in that bypasses this selection guard.
  */
-const SELECTION_NON_LAUNCHABLE_AGENTS = new Set(["cursor-agent"]);
+const SELECTION_NON_LAUNCHABLE_AGENTS = new Set(["cursor-agent", "codex"]);
+/** Agents whose interactive command surface cannot run the post-install recipe yet. */
+const INSTALL_BRIDGE_UNSUPPORTED_AGENTS = new Set(["codex"]);
 /**
  * Resolve the post-install launch decision from the selected host platforms and an
  * OPTIONAL explicit `--agent` override (BAPI-657). Pure and total:
  *
- *  - An explicit `--agent` is an ABSOLUTE override (ratified AC-4): a valid explicit
+ *  - An explicit supported `--agent` is an ABSOLUTE override: a valid explicit
  *    agent always returns `spawn(agent)`, regardless of which tools were selected —
  *    the flag is honored even for a host outside the selection, and it bypasses the
  *    {@link SELECTION_NON_LAUNCHABLE_AGENTS} guard below.
@@ -2089,6 +2110,9 @@ const SELECTION_NON_LAUNCHABLE_AGENTS = new Set(["cursor-agent"]);
  */
 export function resolveInstallBridgeLaunchDecision(selectedPlatforms, explicitAgent) {
     if (explicitAgent) {
+        if (INSTALL_BRIDGE_UNSUPPORTED_AGENTS.has(explicitAgent)) {
+            return { kind: "manual", reason: "unsupported-agent-workflow" };
+        }
         return { kind: "spawn", agent: explicitAgent };
     }
     if (selectedPlatforms.length === 0) {
@@ -3871,7 +3895,9 @@ function describePlannedLaunchAgent(launch) {
     }
     return launch.reason === "empty-selection"
         ? "none — no tools selected"
-        : "none — no launchable tool selected; manual continuation is printed";
+        : launch.reason === "unsupported-agent-workflow"
+            ? "none — selected agent cannot run the install-bridge workflow; manual continuation is printed"
+            : "none — no launchable tool selected; manual continuation is printed";
 }
 /**
  * The Step 5 preview lines, shared by both previews so the launch description
@@ -3923,7 +3949,9 @@ function buildLaunchStepPreview(launch) {
         ...githubLines,
         launch.reason === "empty-selection"
             ? "Step 5 — no agent session: no tools were selected, so nothing is configured or opened; re-run and select at least one tool."
-            : "Step 5 — no automatic launch: no selected tool has an agentic CLI. The deterministic setup completes and copy-pasteable /install-bridge continuation is printed (your Bridge MCP tools stay limited until configured).",
+            : launch.reason === "unsupported-agent-workflow"
+                ? "Step 5 — no automatic launch: the selected agent cannot run the install-bridge workflow. The deterministic setup completes and manual continuation is printed."
+                : "Step 5 — no automatic launch: no selected tool can auto-launch this workflow. The deterministic setup completes and copy-pasteable /install-bridge continuation is printed (your Bridge MCP tools stay limited until configured).",
     ];
 }
 /**
@@ -4919,6 +4947,15 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
     // global (Codex) or manual (Windsurf) target is provisioned by the
     // registry-driven emitter after the connectivity check.
     const selectedPlatforms = await resolveSelectedHostPlatforms(deps, options);
+    if (options.codexProfile && !selectedPlatforms.includes("codex")) {
+        errorLog("Error: --codex-profile requires Codex in --tools or the interactive selection.");
+        return 1;
+    }
+    let codexProfileChoice = options.codexProfile;
+    if (selectedPlatforms.includes("codex") && !options.dryRun && !codexProfileChoice && deps.isTTY && deps.promptLine) {
+        const answer = (await deps.promptLine("Install the opt-in Bridge Codex approval profile for spawned workers? (y/N) ")).trim().toLowerCase();
+        codexProfileChoice = answer === "y" || answer === "yes" ? "on" : "off";
+    }
     const targets = hostConfigTargetsForPlatforms(selectedPlatforms);
     // Read-only detection (safe in dry-run) of global-config editors we can't write.
     const manualEditors = await detectManualEditors(deps);
@@ -5699,6 +5736,28 @@ export async function runInstallBridgeCli(argv, overrides = {}) {
             errorLog("  That host was left untouched. Re-run install-bridge once one entry is removed.");
             return 1;
         }
+        if (selectedPlatforms.includes("codex")) {
+            const home = codexHome(deps.env, deps.homedir());
+            try {
+                const profileDeps = {
+                    readFile: deps.readFile,
+                    writeFile: (p, data) => deps.writeFile(p, data, { encoding: "utf-8", mode: 0o600 }),
+                    mkdir: deps.mkdir,
+                };
+                const result = codexProfileChoice
+                    ? await configureBridgeCodexProfile(home, codexProfileChoice === "on" ? "enable" : "decline", profileDeps)
+                    : await inspectBridgeCodexProfile(home, deps.readFile);
+                if (result.status === "active")
+                    log("  Codex Bridge approval profile installed; spawned workers use --profile bridge.");
+                else if (result.status === "declined" || result.status === "missing")
+                    log("  Codex Bridge approval profile inactive; spawned workers use existing Codex approvals. Opt in with --codex-profile=on.");
+                else
+                    log(`  Codex Bridge approval profile ${result.status}; spawned workers will not use it. Inspect ${home}/bridge.config.toml and rerun with --codex-profile=on.`);
+            }
+            catch {
+                log("  Codex Bridge approval profile could not be configured; spawned workers will not use it. Inspect CODEX_HOME and rerun with --codex-profile=on.");
+            }
+        }
         // Legacy manual-editor instructions cover editors that are DETECTED but were
         // NOT part of the selection (so the emitter above did not handle them). The two
         // editors are suppressed INDEPENDENTLY: Codex is dropped when it was selected

package/build/mcp-host-config.js

@@ -28,6 +28,7 @@
  * rather than reserialize unrelated content.
  */
 import { VERSION } from "./version.generated.js";
+import { codexHome } from "./codex-home.js";
 import { refreshBridgeApiPackageSpec } from "./init.js";
 import { hostAdapterForTarget, } from "./mcp-host-targets.js";
 import { adaptBridgeEntryForHostTarget, } from "./mcp-host-entry-adapter.js";
@@ -56,6 +57,9 @@ function dirnameOf(p) {
 }
 /** Resolve a target's absolute path from injected cwd/homedir. */
 export function resolveTargetAbsPath(target, ctx) {
+    if (target.id === "codex" && ctx.env?.CODEX_HOME) {
+        return `${codexHome(ctx.env, ctx.homedir)}/config.toml`;
+    }
     if (target.scope === "project") {
         if (!target.relPath)
             throw new Error(`${target.id} missing relPath`);

package/build/mcp-host-targets.js

@@ -15,6 +15,7 @@
  * platform is a matter of adding one entry to {@link MCP_HOST_TARGETS} plus its
  * `PlatformId` union member.
  */
+import { codexHome } from "./codex-home.js";
 // ---------------------------------------------------------------------------
 // Path helpers (pure)
 // ---------------------------------------------------------------------------
@@ -73,7 +74,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,
@@ -86,7 +87,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" &&
@@ -99,7 +100,7 @@ export const MCP_HOST_TARGETS = {
         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")),
     },
@@ -111,7 +112,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")),
     },
@@ -122,7 +126,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,18 +157,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() {
@@ -183,6 +191,8 @@ export function getManualHostTargets() {
  * Project targets resolve below `ctx.cwd`; global targets below `ctx.homedir`.
  */
 export function resolveHostTargetPath(target, ctx) {
+    if (target.id === "codex" && ctx.env?.CODEX_HOME)
+        return `${codexHome(ctx.env, ctx.homedir)}/config.toml`;
     if (target.scope === "project") {
         if (!target.relPath) {
             throw new Error(`project target ${target.id} is missing relPath`);

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,
     }));