@bridge_gpt/mcp-server 0.2.36 → 0.2.37

package/build/worktree-core.js

@@ -144,6 +144,13 @@ export async function isExistingBranchSafeToReuse(deps, branch, baseStartPoint)
  * instead of being silently reused as-is. This stays executor-agnostic: no
  * job-type logic lives here — the caller decides the start point, the stale
  * guard, and the freshen behavior.
+ *
+ * BAPI-727: each of the two RESET paths is followed by an untracked-file cleanup
+ * (see {@link cleanUntrackedWorktree}). That coupling is what keeps `resume`
+ * excluded BY CONSTRUCTION rather than by a job-type check: the resume caller
+ * supplies neither `freshenFromOrigin` nor `alignExistingBranchTo`, so it reaches
+ * neither reset and therefore neither cleanup, and its unpushed local work is
+ * preserved exactly as before.
  */
 /**
  * Hard-reset the branch checked out in `worktreePath` onto `ref`. Returns null on
@@ -159,6 +166,64 @@ async function hardResetWorktree(deps, worktreePath, ref) {
     }
     return null;
 }
+/** The one fixed, sanitized diagnostic emitted for ANY cleanup failure. */
+const CLEANUP_FAILURE_DIAGNOSTIC = "untracked-file cleanup did not complete; continuing with the reset worktree";
+/**
+ * BAPI-727: remove untracked residue from a worktree that was just hard-reset.
+ *
+ * `git reset --hard` restores TRACKED files but leaves untracked ones in place, so
+ * a reused worktree carried a prior attempt's scratch files into the next run. This
+ * removes them with exactly `git clean -fd`.
+ *
+ * `-x` IS FORBIDDEN, and `-fdx` doubly so: ignored paths in a prepared worktree are
+ * precisely the executor-owned assets — `.mcp.json` / `.cursor/mcp.json`
+ * registrations, worker environment files, installed dependencies, worker logs, and
+ * the provisioned `.claude/commands/` assets. `-fdx` would destroy all of them.
+ *
+ * Note that `.claude/settings.local.json` is NOT ignored by this repository, so
+ * plain `-fd` may remove it on some hosts. That is safe only because of WHERE this
+ * runs: cleanup happens during worktree PREPARATION, before command assets, deny
+ * settings, MCP registrations/trust, and worker logging are provisioned again — so
+ * anything cleanup removes is re-created by the provisioning that follows it.
+ *
+ * Stale, non-ignored `.conductor/result.json` and `.conductor/critique.md` from a
+ * prior attempt are removed intentionally: a leftover verdict artifact read by a
+ * later attempt would be a prior run's answer presented as this one's.
+ *
+ * FAIL-OPEN. Pre-change behavior performed no cleanup at all, so being unable to
+ * clean must never change the worktree row or the job outcome. Every failure path —
+ * a non-zero exit, a thrown runner — emits the one fixed diagnostic and returns
+ * normally, and the throw is caught HERE so the outer `createWorktreeForTicket()`
+ * catch cannot convert it into `create-failed`.
+ */
+async function cleanUntrackedWorktree(deps, worktreePath) {
+    const emit = deps.onCleanupDiagnostic;
+    const report = (message) => {
+        if (emit)
+            emit(message);
+    };
+    try {
+        const result = await deps.runCommand("git", ["clean", "-fd"], { cwd: worktreePath });
+        // Report removals even when the command later failed: paths Git printed on
+        // stdout were genuinely removed, and losing that record would make a partial
+        // cleanup invisible. Only lines with Git's standard `Removing ` prefix are
+        // read; all other output is discarded rather than serialized.
+        for (const line of result.stdout.split(/\r?\n/)) {
+            if (!line.startsWith("Removing "))
+                continue;
+            const removed = line.slice("Removing ".length).trim();
+            if (removed.length > 0)
+                report(`removed untracked path: ${removed}`);
+        }
+        if (!commandSucceeded(result))
+            report(CLEANUP_FAILURE_DIAGNOSTIC);
+    }
+    catch {
+        // Never interpolate the thrown exception: a command-runner error message can
+        // carry an environment dump or an argv fragment.
+        report(CLEANUP_FAILURE_DIAGNOSTIC);
+    }
+}
 /**
  * BAPI-586: resolve the worktree's `HEAD^{commit}` and the `expected` ref/commit
  * and confirm they are equal. Returns null when they match, or a bounded,
@@ -223,6 +288,10 @@ export async function createWorktreeForTicket(deps, key, branchOverrides, worktr
             if (resetError) {
                 return { key, branch, status: "create-failed", error: resetError };
             }
+            // BAPI-727: the reset restored tracked files; drop the untracked residue a
+            // prior attempt left behind. Only after a SUCCESSFUL reset — a failed reset
+            // returns above, so a worktree in an unknown state is never cleaned.
+            await cleanUntrackedWorktree(deps, worktreePath);
         }
         // BAPI-586 (fresh dispatch): a guard-approved pre-existing branch is an
         // ancestor of base but may sit at an OLDER tip. Align it EXACTLY to the
@@ -235,6 +304,10 @@ export async function createWorktreeForTicket(deps, key, branchOverrides, worktr
             if (resetError) {
                 return { key, branch, status: "create-failed", error: resetError };
             }
+            // BAPI-727: same cleanup on the fresh-dispatch alignment path. The resulting
+            // fresh-dispatch order is: stale-branch guard, Worktrunk switch, hard reset,
+            // untracked clean, then `verifyHeadMatches` below.
+            await cleanUntrackedWorktree(deps, worktreePath);
         }
         // BAPI-586 (fresh dispatch): verify the worktree actually starts at the
         // pinned base. If Worktrunk seeded from an unexpected sibling despite

package/docs/CONDUCTOR.md

@@ -64,9 +64,17 @@ pipeline step. `setup-epic` validates it locally (unique ticket keys, resolvable
 `depends_on`/edge references, acyclicity) before sending anything, so a malformed
 plan fails legibly instead of as a bare HTTP 400.
 
+Since BAPI-754 it then calls the server's **real** validator
+(`POST /jira/epic-runs/plan/validate`) before creating anything, so a plan the
+server would reject — a node missing `status`, say, which the local checks do not
+cover — no longer creates a run and incurs an automation-start charge on its way
+to failing.
+
 It is **idempotent**: re-running it on an epic that already has a live run reuses
-that run rather than minting a second one. Use `--dry-run` to validate a plan and
-preview the calls without mutating anything.
+that run rather than minting a second one. Use `--dry-run` to run that
+authoritative validation and preview the calls without mutating anything; add
+`--local-only` to skip the server entirely, which reports
+`partial (local checks only)` and is never a substitute for the server's verdict.
 
 Once the plan is approved the run becomes `active`, the server-side reconciler
 picks it up within ~30s, and your local `executor` starts claiming jobs.
@@ -139,12 +147,19 @@ the real, always-reporting required context **`conductor-ci / gate`**; set
 on every run you want gated. The workflow existing is not enough — the context has
 to be in the run policy.
 
-> **`setup-epic` has no flag for this.** There is no `--required-checks` option, so a
-> run created by `setup-epic` starts with an **empty** `required_checks` and its `ci`
-> gate short-circuits to `PASSED` until you wire it. Because `setup-epic` also
-> approves the plan — making the run `active` and visible to the reconciler within
-> ~30s — wire the policy by PATCH **immediately** after setup, before any ticket can
-> reach its `ci` gate.
+> **Wire it at creation with `--policy-file` (BAPI-754).** There is still no
+> `--required-checks` option, but `setup-epic --policy-file <path>` sends the
+> **complete** run policy on the create that mints the run, so the run is born with
+> `required_checks` already in force. A run created *without* a policy still starts
+> with an **empty** `required_checks` and a `ci` gate that short-circuits to
+> `PASSED` — and because `setup-epic` also approves the plan, making the run
+> `active` and visible to the reconciler within ~30s, there is no comfortable window
+> to fix that afterwards. Supply the policy file up front.
+>
+> To change the policy on a run that is already live, re-run with `--policy-file`:
+> an identical policy is a no-op, and a divergent one is **refused** with a redacted
+> diff unless you also pass `--replace-policy` (which applies it as a complete
+> replacement).
 
 > **This is NOT `done_gate_config`.** The per-run `policy_json.required_checks`
 > read by the reconciler `ci` gate is a *different* surface from the supervisor

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bridge_gpt/mcp-server",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "Bridge API MCP server — exposes Jira endpoints as MCP tools for Claude Code agents",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,7 @@
     "test": "npm run test:normal && npm run test:module-mocks",
     "test:normal": "node scripts/run-unit-tests.js normal",
     "test:module-mocks": "node scripts/run-unit-tests.js module-mocks",
-    "test:integration": "node --test build/integration/refresh-main.integration.test.js build/integration/command-provisioning.integration.test.js build/integration/start-tickets.integration.test.js build/integration/start-tickets-tier-handoff.integration.test.js build/integration/doctor.integration.test.js build/integration/agent-capabilities.integration.test.js build/integration/conductor-producer.integration.test.js build/integration/conductor-message-relay.integration.test.js build/integration/executor-http-runner.integration.test.js build/integration/executor-job-behaviors.integration.test.js build/integration/executor-recovery-jobs.integration.test.js build/integration/executor-spec-review-prompt.integration.test.js build/integration/resume-pre-spawn.git.integration.test.js build/integration/worker-finalization-origin.integration.test.js build/integration/post-remediation-merge-ci-wait.integration.test.js build/integration/executor-merge-supervision.integration.test.js build/integration/attachment-binary-roundtrip.integration.test.js build/integration/dependent-ticket-fresh-base.integration.test.js build/integration/execute-plan-instructions.integration.test.js build/integration/implement-ticket-finalization-order.integration.test.js build/integration/conductor-bundle-artifacts.integration.test.js build/integration/install-bridge-repo-resolution.integration.test.js build/integration/capability-report-contract.integration.test.js build/integration/request-brainstorm-general.integration.test.js build/integration/request-council-trigger-drop.integration.test.js build/integration/install-bridge-onboarding-launch.integration.test.js build/integration/install-bridge-conductor.integration.test.js build/integration/install-bridge-failure-guards.integration.test.js build/integration/learn-repository-pipeline.integration.test.js build/integration/visual-diff-mcp.integration.test.js build/integration/executor-mcp-provisioning.integration.test.js build/integration/serve-stdio.integration.test.js build/integration/install-alias.integration.test.js",
+    "test:integration": "node --test build/integration/refresh-main.integration.test.js build/integration/command-provisioning.integration.test.js build/integration/start-tickets.integration.test.js build/integration/start-tickets-tier-handoff.integration.test.js build/integration/doctor.integration.test.js build/integration/agent-capabilities.integration.test.js build/integration/conductor-producer.integration.test.js build/integration/conductor-message-relay.integration.test.js build/integration/executor-http-runner.integration.test.js build/integration/executor-job-behaviors.integration.test.js build/integration/executor-recovery-jobs.integration.test.js build/integration/executor-spec-review-prompt.integration.test.js build/integration/resume-pre-spawn.git.integration.test.js build/integration/worker-finalization-origin.integration.test.js build/integration/post-remediation-merge-ci-wait.integration.test.js build/integration/executor-merge-supervision.integration.test.js build/integration/attachment-binary-roundtrip.integration.test.js build/integration/dependent-ticket-fresh-base.integration.test.js build/integration/execute-plan-instructions.integration.test.js build/integration/implement-ticket-finalization-order.integration.test.js build/integration/conductor-bundle-artifacts.integration.test.js build/integration/install-bridge-repo-resolution.integration.test.js build/integration/capability-report-contract.integration.test.js build/integration/request-brainstorm-general.integration.test.js build/integration/request-council-trigger-drop.integration.test.js build/integration/install-bridge-onboarding-launch.integration.test.js build/integration/install-bridge-conductor.integration.test.js build/integration/install-bridge-failure-guards.integration.test.js build/integration/learn-repository-pipeline.integration.test.js build/integration/visual-diff-mcp.integration.test.js build/integration/executor-mcp-provisioning.integration.test.js build/integration/executor-worktree-reentry.integration.test.js build/integration/sfcc-read-error-contract.integration.test.js build/integration/sfcc-response-envelope.integration.test.js build/integration/sfcc-total-error-contract.integration.test.js build/integration/serve-stdio.integration.test.js build/integration/install-alias.integration.test.js build/integration/setup-epic-validation.integration.test.js build/integration/plane-cli.integration.test.js",
     "test:smoke": "node --test build/integration/packaged-cli-smoke.test.js",
     "canary:agent-capabilities": "npm run build && node scripts/agent-capabilities-canary.mjs",
     "prepublishOnly": "node scripts/bundle-assets.js && npm run build && node scripts/verify-shebang.cjs"
@@ -56,7 +56,7 @@
   },
   "overrides": {
     "fast-uri": ">=4.1.1",
-    "hono": ">=4.12.31",
+    "hono": ">=4.13.1",
     "@hono/node-server": "^1.19.13",
     "ip-address": ">=10.1.1"
   },

package/pipelines/implement-ticket.json

@@ -1,7 +1,7 @@
 {
   "name": "implement-ticket",
-  "description": "Generate plan, execute implementation, commit, open PR, verify, and monitor CI.",
-  "variables": ["ticket_key", "docs_dir"],
+  "description": "Generate plan, produce artifacts, checkpoint them to origin, run the plan's remaining verification faithfully, commit, open PR, close post-PR gaps, and monitor CI. Re-entrant: recovery jobs (ci_fix/remediate/rebase) safely re-run this whole recipe from step 1 — the plan-generation step reuses a fresh existing plan (reused: true, no new run) and the produce phase recognizes work already recorded in the durable ledger instead of redoing it.",
+  "variables": ["ticket_key", "docs_dir", "provider"],
   "steps": [
     {
       "type": "mcp_call",
@@ -18,12 +18,22 @@
         "save_locally": true,
         "provider": "{provider}"
       },
-      "description": "Generate implementation plan"
+      "description": "Generate implementation plan. Re-entry-safe: a non-forced request against a fresh existing plan returns reused: true and runs nothing new — the expected fast path on recovery re-entry. force is reserved for deliberate regeneration; this step never sets it. On a GATEWAY_TIMEOUT/504 response, poll get_plan (or the response's recovery_get URL) until a terminal result — never reissue this step."
     },
     {
       "type": "agent_task",
       "instruction_file": "execute-plan.md",
-      "description": "Execute the implementation plan"
+      "description": "Produce the plan's implementation artifacts"
+    },
+    {
+      "type": "agent_task",
+      "instruction_file": "checkpoint-work.md",
+      "description": "Checkpoint produced work to origin before verification begins"
+    },
+    {
+      "type": "agent_task",
+      "instruction_file": "execute-plan-verification.md",
+      "description": "Execute the plan's remaining review, test, and rendered-UI steps before the PR opens"
     },
     {
       "type": "agent_task",
@@ -39,7 +49,7 @@
     {
       "type": "agent_task",
       "instruction_file": "verify-plan.md",
-      "description": "Run bounded post-finalization verification and push any correction"
+      "description": "Close post-PR plan gaps and push any correction"
     },
     {
       "type": "mcp_call",