@bridge_gpt/mcp-server 0.2.56 → 0.2.57

package/build/start-tickets.js

@@ -58,9 +58,10 @@ import { readFile, writeFile, mkdir, mkdtemp, stat, lstat, symlink, unlink, copy
 import os from "node:os";
 import { createHash } from "node:crypto";
 import path from "path";
+import { validateHttpBaseUrl } from "./base-url.js";
 import { VERSION } from "./version.generated.js";
 import { resolveBapiCredentials, getPrimaryCredentialStorePath, } from "./credential-store.js";
-import { MCP_PACKAGE_NAME } from "./mcp-identity.js";
+import { LEGACY_SERVER_NAMES, MCP_PACKAGE_NAME, MCP_SERVER_NAME } from "./mcp-identity.js";
 // BAPI-941: the shared drift diagnostic formatter. The leaf drift module imports
 // nothing from here, so this direction stays acyclic.
 import { formatClaudeReviewWorkflowDriftDiagnostic } from "./claude-review-workflow-drift.js";
@@ -560,7 +561,7 @@ resumeMode = false, workflow = "implement", reviewRounds,
 // conductor runs always, and (BAPI-801/BAPI-847) for every plain run whose base
 // resolved, `main` included — and threaded (BAPI-593) into the spawned workflow
 // command.
-baseBranch) {
+baseBranch, bridgeApiBaseUrlOverride) {
     if (!isSupportedStartTicketsPlatform(deps.platform)) {
         return { ok: false, error: unsupportedPlatformMessage(deps.platform) };
     }
@@ -571,6 +572,7 @@ baseBranch) {
     // conductor-only — a plain worker's prompt stays bare and learns the base from
     // the env plus the create-PR instruction files.
     const prBaseBranch = resolvePrBaseBranchEnvValue(conductorEnabled, baseBranch);
+    const bridgeApiBaseUrl = bridgeApiBaseUrlOverride ?? resolveSpawnBridgeApiBaseUrl(deps.env);
     return {
         ok: true,
         config: {
@@ -580,7 +582,7 @@ baseBranch) {
             // falls back to the basename-derived repo name (the 403 root cause), and
             // (BAPI-586/BAPI-801) the run base so the spawned worker opens its PR
             // against it. The base assignment stays outermost.
-            buildAgentShellCommand: (key, worktreePath, modelAlias, launchArgs) => prependBaseBranchEnvAssignment(prependRepoNameEnvAssignment(buildAgentShellCommand(agent, key, worktreePath, platform, autoApprove, modelAlias, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, launchArgs), repoName, platform), prBaseBranch, platform),
+            buildAgentShellCommand: (key, worktreePath, modelAlias, launchArgs) => prependBaseBranchEnvAssignment(prependRepoNameEnvAssignment(buildAgentShellCommand(agent, key, worktreePath, platform, autoApprove, modelAlias, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, launchArgs, bridgeApiBaseUrl), repoName, platform), prBaseBranch, platform),
             spawnTerminalTab: deps.spawnTerminalTab,
         },
     };
@@ -610,6 +612,51 @@ export function prependRepoNameEnvAssignment(command, repoName, platform = "darw
     }
     return `export BAPI_REPO_NAME='${shSquoteInner(repoName)}' && ${command}`;
 }
+/** Carry the parent's non-secret Bridge endpoint into a newly opened terminal. */
+export function prependBridgeApiBaseUrlEnvAssignment(command, baseUrl, platform = "darwin") {
+    if (!baseUrl)
+        return command;
+    if (platform === "win32") {
+        return `$env:BAPI_BASE_URL = ${powershellSquote(baseUrl)}; ${command}`;
+    }
+    return `export BAPI_BASE_URL='${shSquoteInner(baseUrl)}' && ${command}`;
+}
+/** Validate before placing an endpoint in a launch script or MCP registration. */
+export function resolveSpawnBridgeApiBaseUrl(env) {
+    const raw = env.BAPI_BASE_URL;
+    if (!raw || !raw.trim())
+        return undefined;
+    const result = validateHttpBaseUrl(raw);
+    return result.ok ? result.baseUrl : undefined;
+}
+/**
+ * A shell-spawned CLI cannot see the parent MCP process's environment. Read only
+ * the non-secret endpoint from the selected host's project registration when the
+ * shell did not inherit BAPI_BASE_URL (common for Cursor launched from the GUI).
+ */
+export async function resolveStartTicketsBridgeApiBaseUrl(deps, agent) {
+    const inherited = resolveSpawnBridgeApiBaseUrl(deps.env);
+    if (inherited)
+        return inherited;
+    const configPath = agent.name === "cursor-agent"
+        ? path.join(deps.cwd, ".cursor", "mcp.json")
+        : path.join(deps.cwd, ".mcp.json");
+    try {
+        const raw = await (deps.readFile ?? ((filePath) => readFile(filePath, "utf-8")))(configPath);
+        const parsed = JSON.parse(raw);
+        const bridge = parsed.mcpServers?.[MCP_SERVER_NAME] ?? parsed.mcpServers?.[LEGACY_SERVER_NAMES[0]];
+        if (!bridge)
+            return undefined;
+        const args = Array.isArray(bridge.args) ? bridge.args : [];
+        const flagIndex = args.indexOf("--base-url");
+        const candidate = bridge.env?.BAPI_BASE_URL ?? (flagIndex >= 0 ? args[flagIndex + 1] : undefined);
+        const validated = validateHttpBaseUrl(candidate);
+        return validated.ok ? validated.baseUrl : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * BAPI-801/BAPI-847: decide the `BAPI_BASE_BRANCH` value a spawned worker's shell
  * should carry — the single rule shared by the real spawn builder
@@ -1347,14 +1394,14 @@ export function buildAgentInvocation(agent, prompt, quote, modelAlias, launchArg
     }
 }
 /** POSIX agent shell command: `cd '<path>' && <agent> [--model '<alias>'] '<prompt>'`. */
-export function buildPosixAgentShellCommand(agent, key, worktreePath, autoApprove = false, modelAlias, conductorEnabled = false, resumeMode = false, workflow = "implement", reviewRounds, baseBranch, launchArgs = []) {
+export function buildPosixAgentShellCommand(agent, key, worktreePath, autoApprove = false, modelAlias, conductorEnabled = false, resumeMode = false, workflow = "implement", reviewRounds, baseBranch, launchArgs = [], bridgeApiBaseUrl) {
     const invocation = buildAgentInvocation(agent, buildAgentPrompt(key, { autoApprove, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, agentName: agent.name }), (p) => `'${shSquoteInner(p)}'`, modelAlias, agent.name === "cursor-agent" && autoApprove ? worktreePath : launchArgs);
-    return `cd '${shSquoteInner(worktreePath)}' && ${invocation}`;
+    return `cd '${shSquoteInner(worktreePath)}' && ${prependBridgeApiBaseUrlEnvAssignment(invocation, bridgeApiBaseUrl, "darwin")}`;
 }
 /** PowerShell agent shell command: `Set-Location -LiteralPath '<path>'; <agent> [--model '<alias>'] '<prompt>'`. */
-export function buildPowerShellAgentShellCommand(agent, key, worktreePath, autoApprove = false, modelAlias, conductorEnabled = false, resumeMode = false, workflow = "implement", reviewRounds, baseBranch, launchArgs = []) {
+export function buildPowerShellAgentShellCommand(agent, key, worktreePath, autoApprove = false, modelAlias, conductorEnabled = false, resumeMode = false, workflow = "implement", reviewRounds, baseBranch, launchArgs = [], bridgeApiBaseUrl) {
     const invocation = buildAgentInvocation(agent, buildAgentPrompt(key, { autoApprove, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, agentName: agent.name }), powershellSquote, modelAlias, agent.name === "cursor-agent" && autoApprove ? worktreePath : launchArgs);
-    return `Set-Location -LiteralPath ${powershellSquote(worktreePath)}; ${invocation}`;
+    return `Set-Location -LiteralPath ${powershellSquote(worktreePath)}; ${prependBridgeApiBaseUrlEnvAssignment(invocation, bridgeApiBaseUrl, "win32")}`;
 }
 /**
  * Build the shell command run inside each spawned tab/session, dispatched by
@@ -1364,10 +1411,10 @@ export function buildPowerShellAgentShellCommand(agent, key, worktreePath, autoA
  * injected as `--model` at the spawn boundary. `conductorEnabled` appends the
  * BAPI-586 PR-base contract instruction to the prompt (opt-in via `--conductor`).
  */
-export function buildAgentShellCommand(agent, key, worktreePath, platform = "darwin", autoApprove = false, modelAlias, conductorEnabled = false, resumeMode = false, workflow = "implement", reviewRounds, baseBranch, launchArgs = []) {
+export function buildAgentShellCommand(agent, key, worktreePath, platform = "darwin", autoApprove = false, modelAlias, conductorEnabled = false, resumeMode = false, workflow = "implement", reviewRounds, baseBranch, launchArgs = [], bridgeApiBaseUrl) {
     if (platform === "win32")
-        return buildPowerShellAgentShellCommand(agent, key, worktreePath, autoApprove, modelAlias, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, launchArgs);
-    return buildPosixAgentShellCommand(agent, key, worktreePath, autoApprove, modelAlias, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, launchArgs);
+        return buildPowerShellAgentShellCommand(agent, key, worktreePath, autoApprove, modelAlias, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, launchArgs, bridgeApiBaseUrl);
+    return buildPosixAgentShellCommand(agent, key, worktreePath, autoApprove, modelAlias, conductorEnabled, resumeMode, workflow, reviewRounds, baseBranch, launchArgs, bridgeApiBaseUrl);
 }
 /**
  * Build the shell command run inside a spawned tab/session for an ARBITRARY
@@ -2008,7 +2055,7 @@ export function getDryRunPlatformDetails(agent, platform = process.platform, env
         // buildAgentShellCommand/buildAgentPrompt path as a real spawn. A Codex
         // dry-run has no created worktree to bind, so its preview omits the
         // process-local -C/-c MCP scope that the real spawn resolves later.
-        buildAgentShellCommand: (key, worktreePath, modelAlias, launchArgs) => prependBaseBranchEnvAssignment(prependRepoNameEnvAssignment(buildAgentShellCommand(agent, key, worktreePath, platform, autoApprove, modelAlias, conductorEnabled, false, workflow, reviewRounds, baseBranch, launchArgs), repoName, platform), resolvePrBaseBranchEnvValue(conductorEnabled, baseBranch), platform),
+        buildAgentShellCommand: (key, worktreePath, modelAlias, launchArgs) => prependBaseBranchEnvAssignment(prependRepoNameEnvAssignment(buildAgentShellCommand(agent, key, worktreePath, platform, autoApprove, modelAlias, conductorEnabled, false, workflow, reviewRounds, baseBranch, launchArgs, resolveSpawnBridgeApiBaseUrl(env)), repoName, platform), resolvePrBaseBranchEnvValue(conductorEnabled, baseBranch), platform),
     };
 }
 /**
@@ -2017,7 +2064,7 @@ export function getDryRunPlatformDetails(agent, platform = process.platform, env
  * the `bapi` target. Lists both registration files and the version-pinned shim
  * command. Pure formatting — implies no credentials and writes no files.
  */
-export function buildDryRunMcpProvisioningLines(worktreePath, platform = process.platform, mcpServerInvocation) {
+export function buildDryRunMcpProvisioningLines(worktreePath, platform = process.platform, mcpServerInvocation, bridgeApiBaseUrl) {
     const api = platform === "win32" ? path.win32 : path.posix;
     const mcpJson = api.join(worktreePath, ".mcp.json");
     const cursorJson = api.join(worktreePath, ".cursor", "mcp.json");
@@ -2038,6 +2085,7 @@ export function buildDryRunMcpProvisioningLines(worktreePath, platform = process
         `DRY-RUN:     ${mcpJson}`,
         `DRY-RUN:     ${cursorJson}`,
         `DRY-RUN:     ${shim}`,
+        ...(bridgeApiBaseUrl ? [`DRY-RUN:     bapi shim adds --base-url ${bridgeApiBaseUrl}`] : []),
     ];
 }
 /**
@@ -2062,7 +2110,7 @@ export function buildDryRunDetailLines(agent, key, branch, platform = process.pl
         `DRY-RUN:   ${worktrunkBinary} ${wtArgs.join(" ")}`,
         `DRY-RUN:   ${agentInvocation}`,
         ...(prBaseBranch ? [`DRY-RUN:   PR base: ${prBaseBranch}`] : []),
-        ...buildDryRunMcpProvisioningLines("<worktree-path>", platform, mcpServerInvocation),
+        ...buildDryRunMcpProvisioningLines("<worktree-path>", platform, mcpServerInvocation, resolveSpawnBridgeApiBaseUrl(env)),
     ];
 }
 /**
@@ -2136,13 +2184,15 @@ export function formatSummaryReport(rows) {
  * Provisioning needs real `fs/promises` ops (not part of the command-runner DI
  * boundary), but inherits the platform and cwd from the orchestration deps.
  */
-export function buildMcpProvisioningDeps(deps) {
+export function buildMcpProvisioningDeps(deps, bridgeApiBaseUrlOverride) {
     return {
+        env: deps.env,
         readFile: deps.readFile ?? ((filePath) => readFile(filePath, "utf-8")),
         writeFile: deps.writeFile ?? ((filePath, data) => writeFile(filePath, data, "utf-8")),
         mkdir: deps.mkdir ?? ((dirPath, options) => mkdir(dirPath, options)),
         platform: deps.platform,
         cwd: deps.cwd,
+        bridgeApiBaseUrl: bridgeApiBaseUrlOverride ?? resolveSpawnBridgeApiBaseUrl(deps.env),
         // Resolve how the worker MCP shim launches at dispatch time from the running
         // conductor's own on-disk build (absolute-build-path primary, npm-channel
         // fallback) — never from process.cwd(). `nodeExecutable` is kept as "node"
@@ -3199,6 +3249,7 @@ export async function orchestrateStartTickets(deps, options, overrides = {}) {
     // Fail-open: an unresolved name is warned about loudly but never aborts the run.
     const resolveRepoNameFn = overrides.resolveRepoName ?? resolveStartTicketsRepoName;
     const resolvedRepoName = await resolveRepoNameFn(deps);
+    const bridgeApiBaseUrl = await resolveStartTicketsBridgeApiBaseUrl(deps, agent);
     if (!resolvedRepoName) {
         overrides.repoNameWarningLog?.("Warning: could not resolve the repo name (set BAPI_REPO_NAME or add a valid " +
             ".bridge/config). Spawned worktrees may fall back to the directory name and " +
@@ -3211,7 +3262,7 @@ export async function orchestrateStartTickets(deps, options, overrides = {}) {
     // epic.base_branch override applied above) so the spawned worker gets
     // BAPI_BASE_BRANCH — every conductor worker, and a plain worker whose base
     // is non-default.
-    options.baseBranch);
+    options.baseBranch, bridgeApiBaseUrl);
     if (!platformConfig.ok)
         return { ok: false, error: platformConfig.error };
     // BAPI-527: resolve the base start point new worktrees are cut from BEFORE any
@@ -3261,7 +3312,7 @@ export async function orchestrateStartTickets(deps, options, overrides = {}) {
     const provisionCommandsFn = overrides.provisionCommands ??
         ((rows, d) => provisionCommandsForCreatedWorktrees(rows, buildCommandProvisioningDeps(d), agent.name === "codex"));
     const provisionFn = overrides.provisionMcpRegistrations ??
-        ((rows, d) => provisionMcpRegistrationsForCreatedWorktrees(rows, buildMcpProvisioningDeps(d)));
+        ((rows, d) => provisionMcpRegistrationsForCreatedWorktrees(rows, buildMcpProvisioningDeps(d, bridgeApiBaseUrl)));
     const materializeFn = overrides.materializeFileCredentials ?? materializeFileCredentialsForCreatedWorktrees;
     const detectTerminalFn = overrides.detectTerminal ?? detectTerminal;
     const spawnTabsFn = overrides.spawnTabsForCreatedWorktrees ?? spawnTabsForCreatedWorktrees;
@@ -3427,7 +3478,7 @@ export async function runStartTicketsCli(argv, overrides = {}) {
         return 1;
     }
     const options = parsed.options;
-    const deps = overrides.deps ?? createDefaultStartTicketsDeps();
+    const rawDeps = overrides.deps ?? createDefaultStartTicketsDeps();
     const orchestrate = overrides.orchestrate ?? orchestrateStartTickets;
     // The parser validates `--agent`, so this resolves to a real spec; the guard
     // is defensive only.
@@ -3436,6 +3487,14 @@ export async function runStartTicketsCli(argv, overrides = {}) {
         errorLog(`Error: Unknown agent: '${options.agentName}'. Launchable agents: ${formatStartTicketsAgentNames()}.`);
         return 1;
     }
+    // The editor's MCP registration can have a local endpoint that its Bash tool
+    // does not inherit. Use that endpoint for the CLI's own routing as well as for
+    // its generated worktree registration and terminal command. Never mutate the
+    // caller's environment or read/copy its API key from the registration.
+    const bridgeApiBaseUrl = await resolveStartTicketsBridgeApiBaseUrl(rawDeps, agent);
+    const deps = bridgeApiBaseUrl
+        ? { ...rawDeps, env: { ...rawDeps.env, BAPI_BASE_URL: bridgeApiBaseUrl } }
+        : rawDeps;
     // BAPI-642: a malformed `--tier` value is fail-open — emit ONE concise,
     // secret-free warning and continue (routing applies the premium fallback). It
     // never aborts the launch or changes the numeric exit code.

package/build/version.generated.js

@@ -1,4 +1,4 @@
 // AUTO-GENERATED — do not edit manually. Regenerate with: npm run build
-export const VERSION = "0.2.56";
-export const BUILD_COMMIT = "ba95aad09dd4";
-export const LAUNCHER_ARGS = ["-y", "--prefer-offline", "@bridge_gpt/mcp-server@0.2.56", "serve"];
+export const VERSION = "0.2.57";
+export const BUILD_COMMIT = "dcfa5632b4eb";
+export const LAUNCHER_ARGS = ["-y", "--prefer-offline", "@bridge_gpt/mcp-server@0.2.57", "serve"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bridge_gpt/mcp-server",
-  "version": "0.2.56",
+  "version": "0.2.57",
   "description": "Bridge API MCP server — exposes Jira endpoints as MCP tools for Claude Code agents",
   "license": "MIT",
   "type": "module",