@bridge_gpt/mcp-server 0.2.21 → 0.2.24

package/build/conductor/bridge-api-client.js

@@ -31,7 +31,8 @@ export async function resolveConductorBridgeApiAccess(deps = {}) {
     const platform = deps.platform ?? process.platform;
     const readFileImpl = deps.readFile ?? ((p) => readFile(p, "utf-8"));
     const statImpl = deps.stat ?? ((p) => stat(p));
-    const repoName = await resolveStartTicketsRepoName({ env, cwd, readFile: readFileImpl });
+    const repoName = deps.repoName?.trim() ||
+        (await resolveStartTicketsRepoName({ env, cwd, readFile: readFileImpl }));
     if (!repoName) {
         return {
             ok: false,
@@ -670,6 +671,38 @@ export async function fetchActiveEpicRuns(access, fetchImpl = globalThis.fetch)
     }
     return [];
 }
+/**
+ * POST `/jira/epic-runs/runs` to create the durable epic run row.
+ *
+ * The server is idempotent: if a non-terminal run already exists for this
+ * `(repo_name, epic_key)` it returns that run (HTTP 200) instead of minting a
+ * second one, and does not re-charge the automation-start debit. A second active
+ * run would wedge the epic permanently — every later store-plan / approve-plan
+ * call would 409 on "Multiple active runs" — so callers must NOT implement their
+ * own "POST and tolerate a conflict" retry.
+ *
+ * The API key travels ONLY in the `X-API-Key` header, never in the URL.
+ */
+export async function createEpicRun(access, request, fetchImpl = globalThis.fetch) {
+    requireNonEmptyString(request.epicKey);
+    const body = {
+        repo_name: access.repoName,
+        epic_key: request.epicKey,
+        status: request.status ?? "planning",
+        current_plan_version: request.currentPlanVersion ?? 0,
+    };
+    if (request.policyJson !== undefined)
+        body.policy_json = request.policyJson;
+    if (request.budgetWallClockSeconds !== undefined) {
+        body.budget_wall_clock_seconds = request.budgetWallClockSeconds;
+    }
+    if (request.budgetCostCents !== undefined) {
+        body.budget_cost_cents = request.budgetCostCents;
+    }
+    const url = buildConductorJiraUrl(access.baseUrl, `${EPIC_RUNS_API_PREFIX}/runs`);
+    const parsed = await fetchConductorJsonPostWithTimeout(url, conductorPostHeaders(access), JSON.stringify(body), CONDUCTOR_FETCH_TIMEOUT_MS, fetchImpl);
+    return parsed;
+}
 /**
  * PATCH `/jira/epic-runs/runs/{identifier}` to transition an epic run's
  * lifecycle status. Drives the same backend `update_epic_run` CAS path the
@@ -909,8 +942,16 @@ export async function approveEpicPlan(access, request, fetchImpl = globalThis.fe
     }
     catch (error) {
         if (error instanceof ConductorBridgeApiError && error.status === 409) {
-            // ConductorBridgeApiError does not expose the response body, so server-provided
-            // conflict subtypes are not accessible here. "superseded" is used as a safe default.
+            // The server overloads 409: "a later version is already approved"
+            // (benign — the caller is simply behind) and "multiple active runs"
+            // (the epic is WEDGED and every later plan call will 409 forever).
+            // Collapsing both to "superseded" reports success on a broken epic, so
+            // discriminate on the body. `bodyPreview` carries the server's bare-string
+            // FastAPI `detail`, which is exactly where that distinction lives.
+            const preview = error.bodyPreview ?? "";
+            if (/multiple active runs/i.test(preview)) {
+                return { ok: false, kind: "conflict", reason: "multiple_active_runs" };
+            }
             return { ok: false, kind: "conflict", reason: "superseded" };
         }
         throw error;

package/build/conductor/doctor.js

@@ -146,35 +146,36 @@ export async function inspectEpicTickSchedule(deps, orchestrateListOverride) {
         const report = await doList(resolvedDeps);
         const entry = report.entries.find((e) => commandLabel(e.metadata) === "epic-tick");
         if (!entry) {
+            // The healthy state. Epic Conductor v2 reconciles server-side; there is
+            // nothing for an operator to schedule locally.
             return {
                 registered: false,
                 backend: null,
                 next_fire_iso: null,
                 latest_run_status: null,
-                degraded: true,
-                warnings: [
-                    "No epic-tick schedule is registered. Run: " +
-                        "npx -y @bridge_gpt/mcp-server schedule-run create --in 1m --command epic-tick -- --epic-key <EPIC-KEY>",
-                ],
+                degraded: false,
+                warnings: [],
             };
         }
+        // A registered epic-tick schedule is a dead timer: the v1 command throws
+        // EPIC_TICK_V1_FROZEN on every fire (see conductor/errors.ts). Anyone who has
+        // one registered followed the old advice and is now firing a no-op on a timer.
         const m = entry.metadata;
         const latest = runStatus(m);
-        const degraded = entry.status !== "active";
-        const warnings = [];
-        if (degraded) {
-            const msg = entry.status === "backend-unavailable"
-                ? `epic-tick schedule status is "backend-unavailable": the OS scheduler backend is unreachable. Check that the scheduler daemon is running.`
-                : `epic-tick schedule status is "${entry.status}" (expected "active"); re-register if stale.`;
-            warnings.push(msg);
-        }
         return {
             registered: true,
             backend: m.backend ?? null,
             next_fire_iso: m.run_at_iso ?? null,
             latest_run_status: latest || null,
-            degraded,
-            warnings,
+            degraded: true,
+            warnings: [
+                "An epic-tick schedule is registered, but the v1 `conductor epic-tick` " +
+                    "path is frozen (EPIC_TICK_V1_FROZEN) — it advances nothing. Cancel it: " +
+                    "`npx -y @bridge_gpt/mcp-server schedule-run cancel --id " +
+                    `${entry.metadata.id ?? "<id>"}\`. ` +
+                    "Epic Conductor v2 reconciles server-side; run jobs locally with " +
+                    "`npx -y @bridge_gpt/mcp-server executor --repo <name>`.",
+            ],
         };
     }
     catch (err) {
@@ -368,13 +369,19 @@ export function formatConductorDoctorReport(report) {
             lines.push(`  - ${w}`);
     }
     lines.push("");
-    lines.push("Epic Supervisor Schedule (optional, local)");
-    lines.push("──────────────────────────────────────────");
-    const registeredTag = epic_tick.registered ? "[SUCCESS] registered" : "[WARNING] not registered";
-    lines.push(`registered:            ${registeredTag}`);
-    lines.push(`backend:               ${epic_tick.backend ?? "n/a"}`);
-    lines.push(`next fire:             ${epic_tick.next_fire_iso ?? "n/a"}`);
-    lines.push(`latest run status:     ${epic_tick.latest_run_status ?? "n/a"}`);
+    lines.push("Epic Supervisor Schedule (v1 epic-tick — frozen)");
+    lines.push("───────────────────────────────────────────────");
+    // Inverted on purpose: no schedule is the healthy state. Epic Conductor v2
+    // reconciles server-side, so a registered epic-tick unit is a dead timer.
+    const registeredTag = epic_tick.registered
+        ? "[WARNING] registered — dead timer, remove it"
+        : "[SUCCESS] none registered (v1 is frozen)";
+    lines.push(`epic-tick schedule:    ${registeredTag}`);
+    if (epic_tick.registered) {
+        lines.push(`backend:               ${epic_tick.backend ?? "n/a"}`);
+        lines.push(`next fire:             ${epic_tick.next_fire_iso ?? "n/a"}`);
+        lines.push(`latest run status:     ${epic_tick.latest_run_status ?? "n/a"}`);
+    }
     lines.push(`degraded:              ${epic_tick.degraded}`);
     if (epic_tick.warnings.length > 0) {
         lines.push("epic-tick warnings:");
@@ -382,6 +389,10 @@ export function formatConductorDoctorReport(report) {
             lines.push(`  - ${w}`);
     }
     lines.push("");
+    lines.push("Epic Conductor v2 reconciles epics server-side — nothing to schedule");
+    lines.push("locally. To execute claimed jobs on this machine, run:");
+    lines.push("  npx -y @bridge_gpt/mcp-server executor --repo <name>");
+    lines.push("");
     lines.push("MCP Profile (optional, local)");
     lines.push("─────────────────────────────");
     const profileTag = mcp_profile.degraded ? "[WARNING] degraded" : "[OK]";

package/build/conductor/epic-runtime.js

@@ -38,6 +38,7 @@ import { makeSupervisorIdempotencyKey } from "./supervisor-ledger.js";
 import { createDefaultStartTicketsDeps, orchestrateStartTickets } from "../start-tickets.js";
 import { orchestrateReviewTickets } from "../review-tickets.js";
 import { createStartTicketsConductorContext, provisionConductorHooksForRows, emitStartTicketsRunStarted, } from "../start-tickets-conductor.js";
+import { validateBranchName } from "../base-ref.js";
 // ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
@@ -92,11 +93,14 @@ export function parsePrBindingFromGhJson(stdout) {
         // BAPI-494: parse mergeability defensively from the same JSON object — unknown
         // values become null and never reject an otherwise valid open PR binding.
         const mergeability = parseGhPrMergeabilityFields(pr);
+        const rawBase = pr.baseRefName;
+        const baseRef = typeof rawBase === "string" && rawBase.trim().length > 0 ? rawBase.trim() : undefined;
         return {
             prNumber: num,
             headSha: sha,
             mergeable: mergeability.mergeable,
             mergeStateStatus: mergeability.mergeStateStatus,
+            ...(baseRef !== undefined ? { baseRef } : {}),
         };
     }
     return null;
@@ -120,7 +124,8 @@ export function resolveTicketPrBindingFromGh(ticketKey, options = {}) {
     const ghRes = runGh(
     // BAPI-494: mergeability fields added to the SAME per-ticket binding call — the
     // done-gate reads mergeability inside this existing call, spawning no new gh process.
-    ["pr", "view", `feature/${ticketKey}`, "--json", "number,headRefOid,state,mergeable,mergeStateStatus"], { cwd: options.cwd ?? process.cwd() });
+    // BAPI-586: baseRefName added to the SAME call so the done-gate can detect a wrong-base PR.
+    ["pr", "view", `feature/${ticketKey}`, "--json", "number,headRefOid,state,mergeable,mergeStateStatus,baseRefName"], { cwd: options.cwd ?? process.cwd() });
     if (ghRes.ok && ghRes.stdout.trim()) {
         const parsed = parsePrBindingFromGhJson(ghRes.stdout);
         // Normalize the head SHA to lowercase so downstream head-scoped comparisons
@@ -432,6 +437,22 @@ export async function runConductorDoneGatePass(ticketStatuses, deps) {
             }
             continue;
         }
+        // BAPI-586: block a wrong-base PR at reconciliation BEFORE any CI/review
+        // evaluation. The comparison uses the ACTUAL observed base (`prBinding.baseRef`,
+        // from the SAME gh binding call) rather than delegating to observePrCiOnce —
+        // that call receives EXPLICIT pr_number/head_sha and so takes the no-discovery
+        // binding path, where `base_ref` is never populated. Fail-open when the base is
+        // unknown (`baseRef` absent) so a correctly-based PR is NEVER falsely blocked;
+        // only a CONFIRMED mismatch skips the ticket. The executor finalization guard
+        // remains the primary layer; this is the reconciliation backstop.
+        if (deps.expectedBaseBranch &&
+            typeof prBinding.baseRef === "string" &&
+            prBinding.baseRef !== deps.expectedBaseBranch) {
+            deps.log(`[epic-tick] done-gate poll for ${ticketKey}: pr-base-mismatch — PR #${prBinding.prNumber} ` +
+                `targets base '${prBinding.baseRef}' but the run base is '${deps.expectedBaseBranch}'; ` +
+                `not emitting gate.met (rebuild from origin/${deps.expectedBaseBranch}, do not retarget the PR in the UI)`);
+            continue;
+        }
         const perTicketEnv = {
             ...deps.env,
             ...(runId ? { BAPI_CONDUCTOR_RUN_ID: runId } : {}),
@@ -1070,6 +1091,16 @@ export async function runEpicTick(options, deps = {}) {
             // tickets, gated by quiescence. Invert the impl-dispatch maps so ledger
             // events can be attributed back to a ticket for local-first PR binding.
             const dispatchedBackstopPolicy = resolveDispatchedBackstopPolicy(epicRunState.epic_run.policy_json);
+            // BAPI-586: resolve the run's configured base branch so the done-gate pass
+            // can catch a wrong-base PR (one not targeting the run base) at
+            // reconciliation time — the backstop to the executor's own finalization
+            // guard. A malformed configured base defaults to undefined (base check
+            // skipped) rather than failing the whole tick; dispatch already fails
+            // closed on a malformed base separately.
+            const runBaseResolution = resolveConfiguredRunBaseBranch(epicRunState.epic_run.policy_json);
+            const doneGateExpectedBaseBranch = runBaseResolution.ok
+                ? runBaseResolution.baseBranch
+                : undefined;
             const ticketForRunId = new Map();
             for (const [tk, rid] of ticketRunIdMap)
                 ticketForRunId.set(rid, tk);
@@ -1088,6 +1119,10 @@ export async function runEpicTick(options, deps = {}) {
             });
             await runConductorDoneGatePass(observed.ticket_statuses, {
                 observePrCi: observePrCiSeamFn,
+                // BAPI-586: the run base so the done-gate pass fails a wrong-base PR
+                // before CI/review evaluation (reconciliation backstop to executor
+                // finalization).
+                expectedBaseBranch: doneGateExpectedBaseBranch,
                 resolvePrBinding,
                 // BAPI-525 Change B: local-first binding + quiescence gate for the new
                 // dispatched/running admission (policy default OFF ⇒ no behavior change).
@@ -1491,9 +1526,41 @@ export async function runEpicTick(options, deps = {}) {
         }
     }
 }
-// ---------------------------------------------------------------------------
-// Production EpicRuntimeDeps factory
-// ---------------------------------------------------------------------------
+/**
+ * BAPI-586: resolve the epic run's configured base branch from `policy_json`
+ * (`base_branch`, else `baseBranch`), mirroring the server-side reconciler's
+ * spec-review base resolution. The authoritative run base — NOT a hard-coded
+ * `main` — is what every fresh dispatch and PR must target.
+ *
+ * - absent/empty → `main` (the legacy/default value).
+ * - present and a valid branch name → that branch (e.g. `develop`).
+ * - present but malformed (non-string, `..`, `.lock`, control chars, leading `-`)
+ *   → a contract failure so dispatch fails CLOSED rather than emitting a malformed
+ *   base (a wrong base is exactly the BAPI-586 defect).
+ */
+export function resolveConfiguredRunBaseBranch(policyJson) {
+    const DEFAULT_BASE = "main";
+    if (!policyJson || typeof policyJson !== "object") {
+        return { ok: true, baseBranch: DEFAULT_BASE };
+    }
+    const raw = policyJson.base_branch ??
+        policyJson.baseBranch;
+    if (raw === undefined || raw === null) {
+        return { ok: true, baseBranch: DEFAULT_BASE };
+    }
+    if (typeof raw !== "string") {
+        return { ok: false, error: "epic run policy base_branch is present but is not a string." };
+    }
+    const trimmed = raw.trim();
+    if (trimmed.length === 0) {
+        return { ok: true, baseBranch: DEFAULT_BASE };
+    }
+    const validationError = validateBranchName(trimmed);
+    if (validationError) {
+        return { ok: false, error: `epic run policy base_branch is invalid: ${validationError}` };
+    }
+    return { ok: true, baseBranch: trimmed };
+}
 /**
  * Build the production EpicRuntimeDeps for use inside `runEpicTickCommand`.
  *
@@ -1515,6 +1582,20 @@ export async function buildProductionEpicRuntimeDeps(epicKey) {
         process.stderr.write(`[epic-tick] factory: observe-only — bridge access resolution failed\n`);
         return {};
     }
+    // BAPI-586: resolve the run's configured base branch ONCE (from the epic run's
+    // policy_json) so every fresh dispatch cuts from — and every PR targets — the
+    // authoritative run base rather than a hard-coded `main`. Fail-open on a fetch
+    // error (observe-only would already default to `main`); a malformed configured
+    // base is captured as an error and re-raised at dispatch time so a bad base
+    // never silently dispatches.
+    let cachedRunBase = { ok: true, baseBranch: "main" };
+    try {
+        const runState = await fetchEpicRunState(access, epicKey);
+        cachedRunBase = resolveConfiguredRunBaseBranch(runState.epic_run.policy_json);
+    }
+    catch {
+        cachedRunBase = { ok: true, baseBranch: "main" };
+    }
     // Shared closure state populated by fetchPlan and consumed by dispatchSeam.
     let cachedPlanVersion = 0;
     const automationMap = new Map();
@@ -1579,6 +1660,12 @@ export async function buildProductionEpicRuntimeDeps(epicKey) {
         if (cachedPlanVersion === 0) {
             throw new Error(`dispatchSeam called before fetchPlan for epic ${ek} ticket ${tk}; cachedPlanVersion is 0`);
         }
+        // BAPI-586: fail CLOSED on a malformed configured run base rather than
+        // dispatching a worker (and opening a PR) against a bad base.
+        if (!cachedRunBase.ok) {
+            throw new Error(`invalid configured base branch for epic ${ek}: ${cachedRunBase.error}`);
+        }
+        const runBaseBranch = cachedRunBase.baseBranch;
         // BAPI-441: a remediation re-dispatch (attempt > 0) reuses the existing
         // branch/worktree (resume mode) and claims an attempt-scoped dispatch key so
         // it is not deduped against the original epic dispatch.
@@ -1601,6 +1688,9 @@ export async function buildProductionEpicRuntimeDeps(epicKey) {
             epic_run_id: ek,
             plan_version: cachedPlanVersion,
             dispatch_key: buildEpicDispatchKey(ek, tk, cachedPlanVersion, attempt),
+            // BAPI-586: carry the authoritative run base so orchestrateStartTickets
+            // seeds worktrees from — and workers target their PR at — the run base.
+            base_branch: runBaseBranch,
             ...(declaredTouchedFiles && declaredTouchedFiles.length > 0
                 ? { declared_touched_files: declaredTouchedFiles }
                 : {}),
@@ -1655,8 +1745,14 @@ export async function buildProductionEpicRuntimeDeps(epicKey) {
                 // checkout. Interactive start-tickets keeps the old refreshBaseBranch path.
                 nonMutatingBase: true,
                 branchOverrides: {},
-                baseBranch: "main",
+                // BAPI-586: the authoritative run base (retains "main" as the default when
+                // no custom base is configured), not a hard-coded literal. Also carried on
+                // `identity.base_branch` above; orchestrateStartTickets reconciles both.
+                baseBranch: runBaseBranch,
                 conductorEnabled: true,
+                // Epic dispatch always runs the plain implementation workflow; the
+                // review-and-implement workflow is a manual/front-door-only seam.
+                workflow: "implement",
                 // BAPI-441: re-dispatch reuses the existing branch/worktree.
                 resumeMode: isResume,
                 // F7: on a FRESH dispatch, refuse a stale leftover `feature/<KEY>` branch

package/build/conductor/pr-ci-producer.js

@@ -128,7 +128,7 @@ function defaultSleep(ms) {
  * and {@link waitForDoneGate} so the gate config / binding / access are each
  * resolved exactly once by the caller.
  */
-async function observeWithResolved(binding, access, gateConfig, deps) {
+async function observeWithResolved(binding, access, gateConfig, deps, expectedBaseBranch) {
     // The event-WRITE sink defaults to the in-process store; the worker gate path
     // injects a CLI-subprocess emitter (BAPI-527). When a caller supplies its own
     // `emitIfNew` (e.g. unit tests / conductor-owned callers), that fully overrides
@@ -169,6 +169,25 @@ async function observeWithResolved(binding, access, gateConfig, deps) {
         head_sha: binding.head_sha,
     });
     result.pr_opened_emitted = prDecision.emitted;
+    // 1a. BAPI-586: fail CLOSED on a wrong-base PR BEFORE evaluating CI or review.
+    // A PR that targets a branch other than the run base never triggers the
+    // review/CI workflows scoped to that base, so polling for their evidence would
+    // hang forever. Compare exact logical branch names (never merge-base or local
+    // ancestry). This guard is observational and idempotent: it emits no gate event,
+    // performs no retarget/rewrite, and returns the same result for repeated passes.
+    const expectedBase = typeof expectedBaseBranch === "string" ? expectedBaseBranch.trim() : "";
+    if (expectedBase) {
+        const observedBase = typeof binding.base_ref === "string" ? binding.base_ref.trim() : "";
+        if (observedBase !== expectedBase) {
+            const actual = observedBase.length > 0 ? observedBase : "(unresolved)";
+            result.gate_met = false;
+            result.reason =
+                `pr-base-mismatch: PR #${binding.pr_number} targets base '${actual}' but the run base is ` +
+                    `'${expectedBase}'. Rebuild the branch from fresh origin/${expectedBase} and cherry-pick only ` +
+                    `this ticket's commits; do not retarget the PR base in the GitHub UI.`;
+            return result;
+        }
+    }
     // 2. Poll CI for the bound head SHA. A poll failure is NOT a CI failure event.
     let rawPoll;
     try {
@@ -279,7 +298,7 @@ export async function observePrCiOnce(params = {}, deps = {}) {
         rawConfig = undefined; // fail closed
     }
     const gateConfig = parseDoneGateConfig(rawConfig);
-    return observeWithResolved(bindingResult.binding, accessResult.access, gateConfig, deps);
+    return observeWithResolved(bindingResult.binding, accessResult.access, gateConfig, deps, params.expectedBaseBranch);
 }
 function clampInt(value, fallback, min, max) {
     if (typeof value !== "number" || !Number.isFinite(value))

package/build/conductor/pr-discovery.js

@@ -36,7 +36,8 @@ const GH_PR_VIEW_ARGS = [
     "view",
     "--json",
     // BAPI-494: mergeability fields added to the SAME one-shot call — no new gh process.
-    "number,headRefOid,headRefName,url,state,mergeable,mergeStateStatus",
+    // BAPI-586: baseRefName added to the same call so a wrong-base PR is detectable.
+    "number,headRefOid,headRefName,baseRefName,url,state,mergeable,mergeStateStatus",
 ];
 /**
  * Perform a one-shot `gh pr view` lookup for the current branch's PR. Returns a
@@ -73,6 +74,9 @@ export function discoverPrWithGhCli(options = {}, deps = {}) {
     if (typeof record.headRefName === "string" && record.headRefName.trim().length > 0) {
         discovered.head_ref = record.headRefName.trim();
     }
+    if (typeof record.baseRefName === "string" && record.baseRefName.trim().length > 0) {
+        discovered.base_ref = record.baseRefName.trim();
+    }
     if (typeof record.url === "string" && record.url.trim().length > 0) {
         discovered.url = record.url.trim();
     }
@@ -89,6 +93,8 @@ function makeBinding(repo, prNumber, headSha, extra = {}) {
         binding.url = extra.url;
     if (extra.head_ref !== undefined)
         binding.head_ref = extra.head_ref;
+    if (extra.base_ref !== undefined)
+        binding.base_ref = extra.base_ref;
     return binding;
 }
 /**
@@ -140,6 +146,10 @@ export function resolvePrHeadBinding(input = {}, deps = {}) {
     }
     return {
         ok: true,
-        binding: makeBinding(repo, prNumber, localSha, { url: pr.url, head_ref: pr.head_ref }),
+        binding: makeBinding(repo, prNumber, localSha, {
+            url: pr.url,
+            head_ref: pr.head_ref,
+            base_ref: pr.base_ref,
+        }),
     };
 }

package/build/conductor-bin.js

@@ -5695,6 +5695,7 @@ __export(bridge_api_client_exports, {
   buildConductorVcsUrl: () => buildConductorVcsUrl,
   buildEpicDispatchKey: () => buildEpicDispatchKey,
   claimEpicSupervisionLease: () => claimEpicSupervisionLease,
+  createEpicRun: () => createEpicRun,
   createEpicTicketStatus: () => createEpicTicketStatus,
   deletePullRequestBranch: () => deletePullRequestBranch,
   extractSanitizedErrorDiagnostics: () => extractSanitizedErrorDiagnostics,
@@ -5731,7 +5732,7 @@ async function resolveConductorBridgeApiAccess(deps = {}) {
   const platform = deps.platform ?? process.platform;
   const readFileImpl = deps.readFile ?? ((p) => readFile(p, "utf-8"));
   const statImpl = deps.stat ?? ((p) => stat(p));
-  const repoName = await resolveStartTicketsRepoName({ env, cwd, readFile: readFileImpl });
+  const repoName = deps.repoName?.trim() || await resolveStartTicketsRepoName({ env, cwd, readFile: readFileImpl });
   if (!repoName) {
     return {
       ok: false,
@@ -6161,6 +6162,31 @@ async function fetchActiveEpicRuns(access, fetchImpl = globalThis.fetch) {
   }
   return [];
 }
+async function createEpicRun(access, request, fetchImpl = globalThis.fetch) {
+  requireNonEmptyString(request.epicKey);
+  const body = {
+    repo_name: access.repoName,
+    epic_key: request.epicKey,
+    status: request.status ?? "planning",
+    current_plan_version: request.currentPlanVersion ?? 0
+  };
+  if (request.policyJson !== void 0) body.policy_json = request.policyJson;
+  if (request.budgetWallClockSeconds !== void 0) {
+    body.budget_wall_clock_seconds = request.budgetWallClockSeconds;
+  }
+  if (request.budgetCostCents !== void 0) {
+    body.budget_cost_cents = request.budgetCostCents;
+  }
+  const url = buildConductorJiraUrl(access.baseUrl, `${EPIC_RUNS_API_PREFIX}/runs`);
+  const parsed = await fetchConductorJsonPostWithTimeout(
+    url,
+    conductorPostHeaders(access),
+    JSON.stringify(body),
+    CONDUCTOR_FETCH_TIMEOUT_MS,
+    fetchImpl
+  );
+  return parsed;
+}
 async function updateEpicRunStatus(access, request, fetchImpl = globalThis.fetch) {
   requireNonEmptyString(request.epicKey);
   const url = buildConductorJiraUrl(access.baseUrl, epicRunApiPath(request.epicKey));
@@ -6383,6 +6409,10 @@ async function approveEpicPlan(access, request, fetchImpl = globalThis.fetch) {
     return parsed;
   } catch (error) {
     if (error instanceof ConductorBridgeApiError && error.status === 409) {
+      const preview = error.bodyPreview ?? "";
+      if (/multiple active runs/i.test(preview)) {
+        return { ok: false, kind: "conflict", reason: "multiple_active_runs" };
+      }
       return { ok: false, kind: "conflict", reason: "superseded" };
     }
     throw error;
@@ -8250,27 +8280,21 @@ async function inspectEpicTickSchedule(deps, orchestrateListOverride) {
         backend: null,
         next_fire_iso: null,
         latest_run_status: null,
-        degraded: true,
-        warnings: [
-          "No epic-tick schedule is registered. Run: npx -y @bridge_gpt/mcp-server schedule-run create --in 1m --command epic-tick -- --epic-key <EPIC-KEY>"
-        ]
+        degraded: false,
+        warnings: []
       };
     }
     const m = entry.metadata;
     const latest = runStatus(m);
-    const degraded = entry.status !== "active";
-    const warnings = [];
-    if (degraded) {
-      const msg = entry.status === "backend-unavailable" ? `epic-tick schedule status is "backend-unavailable": the OS scheduler backend is unreachable. Check that the scheduler daemon is running.` : `epic-tick schedule status is "${entry.status}" (expected "active"); re-register if stale.`;
-      warnings.push(msg);
-    }
     return {
       registered: true,
       backend: m.backend ?? null,
       next_fire_iso: m.run_at_iso ?? null,
       latest_run_status: latest || null,
-      degraded,
-      warnings
+      degraded: true,
+      warnings: [
+        `An epic-tick schedule is registered, but the v1 \`conductor epic-tick\` path is frozen (EPIC_TICK_V1_FROZEN) \u2014 it advances nothing. Cancel it: \`npx -y @bridge_gpt/mcp-server schedule-run cancel --id ${entry.metadata.id ?? "<id>"}\`. Epic Conductor v2 reconciles server-side; run jobs locally with \`npx -y @bridge_gpt/mcp-server executor --repo <name>\`.`
+      ]
     };
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -8416,19 +8440,25 @@ function formatConductorDoctorReport(report) {
     for (const w of git_hooks.warnings) lines.push(`  - ${w}`);
   }
   lines.push("");
-  lines.push("Epic Supervisor Schedule (optional, local)");
-  lines.push("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
-  const registeredTag = epic_tick.registered ? "[SUCCESS] registered" : "[WARNING] not registered";
-  lines.push(`registered:            ${registeredTag}`);
-  lines.push(`backend:               ${epic_tick.backend ?? "n/a"}`);
-  lines.push(`next fire:             ${epic_tick.next_fire_iso ?? "n/a"}`);
-  lines.push(`latest run status:     ${epic_tick.latest_run_status ?? "n/a"}`);
+  lines.push("Epic Supervisor Schedule (v1 epic-tick \u2014 frozen)");
+  lines.push("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
+  const registeredTag = epic_tick.registered ? "[WARNING] registered \u2014 dead timer, remove it" : "[SUCCESS] none registered (v1 is frozen)";
+  lines.push(`epic-tick schedule:    ${registeredTag}`);
+  if (epic_tick.registered) {
+    lines.push(`backend:               ${epic_tick.backend ?? "n/a"}`);
+    lines.push(`next fire:             ${epic_tick.next_fire_iso ?? "n/a"}`);
+    lines.push(`latest run status:     ${epic_tick.latest_run_status ?? "n/a"}`);
+  }
   lines.push(`degraded:              ${epic_tick.degraded}`);
   if (epic_tick.warnings.length > 0) {
     lines.push("epic-tick warnings:");
     for (const w of epic_tick.warnings) lines.push(`  - ${w}`);
   }
   lines.push("");
+  lines.push("Epic Conductor v2 reconciles epics server-side \u2014 nothing to schedule");
+  lines.push("locally. To execute claimed jobs on this machine, run:");
+  lines.push("  npx -y @bridge_gpt/mcp-server executor --repo <name>");
+  lines.push("");
   lines.push("MCP Profile (optional, local)");
   lines.push("\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
   const profileTag = mcp_profile.degraded ? "[WARNING] degraded" : "[OK]";