@bridge_gpt/mcp-server 0.2.55 → 0.2.57

package/build/review-tickets.js

@@ -18,11 +18,21 @@
  * This path is worktree-free and base-branch-free; the human CLI path leaves
  * `epic` unset and retains byte-for-byte identical behavior.
  */
-import { createDefaultStartTicketsDeps, detectTerminal, runWithConcurrency, buildAgentInvocation, shSquoteInner, powershellSquote, isCommandOnPath, resolveFirstCommandOnPath, tmuxSessionNameForTicket, TICKET_KEY_PATTERN, DEFAULT_MAX_PARALLEL, validateBranchName, fetchAndResolveBaseSha, fetchStartTicketsConfigField, resolveStartTicketsBridgeApiAccess, } from "./start-tickets.js";
+import { createDefaultStartTicketsDeps, detectTerminal, runWithConcurrency, buildAgentInvocation, shSquoteInner, powershellSquote, isCommandOnPath, resolveFirstCommandOnPath, tmuxSessionNameForTicket, TICKET_KEY_PATTERN, DEFAULT_MAX_PARALLEL, validateBranchName, fetchAndResolveBaseSha, fetchStartTicketsConfigField, resolveStartTicketsBridgeApiAccess, buildCommandProvisioningDeps, buildMcpProvisioningDeps, } from "./start-tickets.js";
+import { provisionCommandsForWorktree } from "./command-provisioning.js";
+import { resolveCodexLaunchScope } from "./codex-launch-scope.js";
 import { WINDOWS_TERMINAL_COMMAND, WINDOWS_POWERSHELL_CANDIDATES, TMUX_COMMAND, isSupportedStartTicketsPlatform, unsupportedPlatformMessage, } from "./start-tickets-prereqs.js";
-import { DEFAULT_AGENT_NAME, resolveAgentSpec, isAgentName, formatValidAgentNames, isValidModelAlias, } from "./agent-registry.js";
+import { DEFAULT_AGENT_NAME, resolveAgentSpec, isAgentName, isValidModelAlias, } from "./agent-registry.js";
 import { injectConductorEnvIntoShellCommand, buildEpicIdentityEnv, mintStartTicketsRunId, } from "./start-tickets-conductor.js";
 import { MCP_PACKAGE_NAME } from "./mcp-identity.js";
+/** Every registered agent with a review workflow the launcher can provision. */
+const REVIEW_TICKETS_AGENT_NAMES = ["claude", "cursor-agent", "codex"];
+function isReviewTicketsAgentName(value) {
+    return REVIEW_TICKETS_AGENT_NAMES.includes(value);
+}
+function formatReviewTicketsAgentNames() {
+    return REVIEW_TICKETS_AGENT_NAMES.join(", ");
+}
 /** Default base context: no flags threaded through (matches pre-BAPI-474 behavior). */
 const NO_BASE_CONTEXT = { noRefreshBase: false };
 // ---------------------------------------------------------------------------
@@ -37,7 +47,7 @@ export function getReviewTicketsUsage() {
         "  --auto                            Auto-approve all review gates (global, applies to all tickets)",
         "  --rounds=1|2                      Review depth: 1=single-pass, 2=full two-pass (default: adaptive — backend routes by difficulty)",
         "  --review KEY=auto,rounds=1        Per-ticket review mode override (repeatable)",
-        "  --agent claude|cursor-agent       Agent command to launch in each tab (default: claude)",
+        "  --agent claude|cursor-agent|codex Agent command to launch in each tab (default: claude)",
         "  --model VALUE                     Model alias to pass as --model to the agent (optional passthrough)",
         "  --max-parallel N                  Max tabs to spawn concurrently (default: 3)",
         "  --dry-run                         Print intended commands; creates no tabs and opens no sessions",
@@ -289,10 +299,10 @@ export function parseReviewTicketsArgs(argv) {
                     return { status: "error", message: "--agent requires a value (an agent name)." };
                 }
             }
-            if (!isAgentName(value)) {
+            if (!isAgentName(value) || !isReviewTicketsAgentName(value)) {
                 return {
                     status: "error",
-                    message: `Invalid --agent value: '${value}' (allowed agents: ${formatValidAgentNames()}).`,
+                    message: `Invalid --agent value: '${value}' (allowed agents: ${formatReviewTicketsAgentNames()}).`,
                 };
             }
             agentName = value;
@@ -416,7 +426,7 @@ export function resolveEffectiveReviewMode(key, options) {
 // hard-wired to `/implement-ticket`. Review-aware builders are used instead so
 // the prompt uses `/review-ticket` and no directory change is prepended.
 // ---------------------------------------------------------------------------
-export function buildReviewTicketPrompt(key, mode, base = NO_BASE_CONTEXT) {
+export function buildReviewTicketPrompt(key, mode, base = NO_BASE_CONTEXT, agentName = "claude") {
     const autoFlag = mode.auto ? " --auto" : "";
     // Omit --rounds entirely when adaptive (mode.rounds === undefined) so the
     // backend routes by difficulty; only forward it for an explicit 1/2 override.
@@ -424,22 +434,23 @@ export function buildReviewTicketPrompt(key, mode, base = NO_BASE_CONTEXT) {
     const baseBranchFlag = base.baseBranch ? ` --base-branch=${base.baseBranch}` : "";
     const baseShaFlag = base.baseSha ? ` --base-sha=${base.baseSha}` : "";
     const noRefreshFlag = base.noRefreshBase ? " --no-refresh-base" : "";
-    return `/review-ticket ${key}${autoFlag}${roundsFlag}${baseBranchFlag}${baseShaFlag}${noRefreshFlag}`;
+    const command = agentName === "codex" ? "$bridge-review-ticket" : "/review-ticket";
+    return `${command} ${key}${autoFlag}${roundsFlag}${baseBranchFlag}${baseShaFlag}${noRefreshFlag}`;
 }
-export function buildPosixReviewAgentShellCommand(agent, key, mode, cwd, modelAlias, base = NO_BASE_CONTEXT) {
-    const prompt = buildReviewTicketPrompt(key, mode, base);
-    const invocation = buildAgentInvocation(agent, prompt, (p) => `'${shSquoteInner(p)}'`, modelAlias);
+export function buildPosixReviewAgentShellCommand(agent, key, mode, cwd, modelAlias, base = NO_BASE_CONTEXT, launchArgs = []) {
+    const prompt = buildReviewTicketPrompt(key, mode, base, agent.name);
+    const invocation = buildAgentInvocation(agent, prompt, (p) => `'${shSquoteInner(p)}'`, modelAlias, launchArgs);
     return `cd '${shSquoteInner(cwd)}' && ${invocation}`;
 }
-export function buildPowerShellReviewAgentShellCommand(agent, key, mode, modelAlias, base = NO_BASE_CONTEXT) {
-    const prompt = buildReviewTicketPrompt(key, mode, base);
-    return buildAgentInvocation(agent, prompt, powershellSquote, modelAlias);
+export function buildPowerShellReviewAgentShellCommand(agent, key, mode, modelAlias, base = NO_BASE_CONTEXT, launchArgs = []) {
+    const prompt = buildReviewTicketPrompt(key, mode, base, agent.name);
+    return buildAgentInvocation(agent, prompt, powershellSquote, modelAlias, launchArgs);
 }
-export function buildReviewAgentShellCommand(agent, key, mode, platform, cwd, modelAlias, base = NO_BASE_CONTEXT) {
+export function buildReviewAgentShellCommand(agent, key, mode, platform, cwd, modelAlias, base = NO_BASE_CONTEXT, launchArgs = []) {
     if (platform === "win32") {
-        return buildPowerShellReviewAgentShellCommand(agent, key, mode, modelAlias, base);
+        return buildPowerShellReviewAgentShellCommand(agent, key, mode, modelAlias, base, launchArgs);
     }
-    return buildPosixReviewAgentShellCommand(agent, key, mode, cwd, modelAlias, base);
+    return buildPosixReviewAgentShellCommand(agent, key, mode, cwd, modelAlias, base, launchArgs);
 }
 // ---------------------------------------------------------------------------
 // Unsupported platform message for review-tickets
@@ -535,17 +546,18 @@ export async function orchestrateReviewTickets(deps, options, overrides = {}) {
     if (!agent) {
         return {
             ok: false,
-            error: `Unknown agent: '${options.agentName}'. Valid agents: ${formatValidAgentNames()}.`,
+            error: `Unknown agent: '${options.agentName}'. Valid agents: ${formatReviewTicketsAgentNames()}.`,
+        };
+    }
+    // Reject an invalid multi-key claim before any Codex skill/config writes.
+    if (options.epic?.dispatch_key && options.keys.length > 1) {
+        return {
+            ok: false,
+            error: "epic.dispatch_key cannot be used with multiple keys: dispatch_key is a single-ticket claim " +
+                "and would be re-claimed for each key in the batch. Call orchestrateReviewTickets once per ticket instead.",
         };
     }
     if (options.dryRun) {
-        if (options.epic?.dispatch_key && options.keys.length > 1) {
-            return {
-                ok: false,
-                error: "epic.dispatch_key cannot be used with multiple keys: dispatch_key is a single-ticket claim " +
-                    "and would be re-claimed for each key in the batch. Call orchestrateReviewTickets once per ticket instead.",
-            };
-        }
         // --dry-run never performs the base-branch fetch (side-effect-free preview);
         // it reflects only what the user explicitly passed on the CLI.
         const rows = buildReviewPlanRows(deps, options, agent, "dry-run", overrides, previewBaseContextFromOptions(options));
@@ -554,15 +566,18 @@ export async function orchestrateReviewTickets(deps, options, overrides = {}) {
     const preflight = await runReviewTicketsPreflight(deps, options);
     if (!preflight.ok)
         return { ok: false, error: preflight.error };
-    // A dispatch_key embeds a single ticket (dispatch:{epic}:{ticket}:{plan_version}).
-    // Claiming the same key for every iteration of a multi-key batch would silently
-    // drop all but the first ticket; reject early with a clear error instead.
-    if (options.epic?.dispatch_key && options.keys.length > 1) {
-        return {
-            ok: false,
-            error: "epic.dispatch_key cannot be used with multiple keys: dispatch_key is a single-ticket claim " +
-                "and would be re-claimed for each key in the batch. Call orchestrateReviewTickets once per ticket instead.",
-        };
+    let codexLaunchArgs = [];
+    if (agent.name === "codex") {
+        const prepare = overrides.prepareCodexSession ?? (async (d) => {
+            const provision = await provisionCommandsForWorktree(d.cwd, buildCommandProvisioningDeps(d), true);
+            if (!provision.ok)
+                return { ok: false, error: provision.error };
+            return resolveCodexLaunchScope(d.cwd, buildMcpProvisioningDeps(d));
+        });
+        const scope = await prepare(deps);
+        if (!scope.ok)
+            return { ok: false, error: scope.error };
+        codexLaunchArgs = scope.argv;
     }
     // BAPI-474 D-3: parent-fetch-once — resolve ONE base_branch/base_sha pin for
     // the whole batch before any tab is spawned. D-4: on failure (and no
@@ -578,7 +593,7 @@ export async function orchestrateReviewTickets(deps, options, overrides = {}) {
     const terminal = detectTerminal(undefined, deps.env);
     const rows = await runWithConcurrency(options.keys, options.maxParallel, async (key) => {
         const mode = resolveEffectiveReviewMode(key, options);
-        const baseShellCommand = buildReviewAgentShellCommand(agent, key, mode, deps.platform, deps.cwd, options.modelAlias, baseContext);
+        const baseShellCommand = buildReviewAgentShellCommand(agent, key, mode, deps.platform, deps.cwd, options.modelAlias, baseContext, codexLaunchArgs);
         let shellCommand = baseShellCommand;
         let runId;
         if (options.epic) {
@@ -727,7 +742,7 @@ export async function runReviewTicketsCli(argv, overrides = {}) {
     if (options.dryRun) {
         const agent = resolveAgentSpec(options.agentName);
         if (!agent) {
-            errorLog(`Error: Unknown agent: '${options.agentName}'. Valid agents: ${formatValidAgentNames()}.`);
+            errorLog(`Error: Unknown agent: '${options.agentName}'. Valid agents: ${formatReviewTicketsAgentNames()}.`);
             return 1;
         }
         const rows = buildReviewPlanRows(deps, options, agent, "dry-run", overrides.orchestrateOverrides, previewBaseContextFromOptions(options));