@mrrlin-dev/mcp 0.3.55 → 0.3.56

package/dist/bin.cjs

@@ -21153,11 +21153,11 @@ ${block}`;
 }
 
 // src/director-bridge.ts
-var import_node_fs14 = __toESM(require("node:fs"), 1);
+var import_node_fs15 = __toESM(require("node:fs"), 1);
 var import_node_http = __toESM(require("node:http"), 1);
 var import_node_os9 = __toESM(require("node:os"), 1);
 var import_node_path18 = __toESM(require("node:path"), 1);
-var import_node_child_process10 = require("node:child_process");
+var import_node_child_process11 = require("node:child_process");
 var import_node_crypto8 = __toESM(require("node:crypto"), 1);
 
 // src/turn-replay-buffer.ts
@@ -21289,11 +21289,25 @@ function createSuspensionDetector(opts) {
     const t = now();
     const gap = t - last;
     last = t;
-    if (gap >= gapMs) suspended += gap - tickMs;
+    if (gap >= gapMs) {
+      suspended += gap - tickMs;
+    }
   }, tickMs);
   timer.unref?.();
+  const settle = () => {
+    const t = now();
+    const gap = t - last;
+    if (gap >= gapMs) {
+      suspended += gap - tickMs;
+      last = t;
+    }
+  };
   return {
-    suspendedMs: () => suspended,
+    suspendedMs: () => {
+      settle();
+      return suspended;
+    },
+    settle,
     dispose: () => clearI(timer)
   };
 }
@@ -21368,20 +21382,22 @@ function transition(state, event) {
 
 // src/bridge-tombstone.ts
 var DEFAULT_TOMBSTONE_TTL_MS = 36e5;
-function writeTombstone(tombstones, directorSessionId, buf, now) {
+function writeTombstone(tombstones, directorSessionId, buf, now, suspendedMsNow) {
   tombstones.set(directorSessionId, {
     turnId: buf.turnId,
     lastSeq: buf.lastSeq,
-    expiredAt: now
+    expiredAt: now,
+    expiredSuspendedMs: suspendedMsNow
   });
 }
 function lookupTombstone(tombstones, directorSessionId) {
   return tombstones.get(directorSessionId) ?? null;
 }
-function sweepExpiredTombstones(tombstones, now, ttlMs = DEFAULT_TOMBSTONE_TTL_MS) {
+function sweepExpiredTombstones(tombstones, now, ttlMs = DEFAULT_TOMBSTONE_TTL_MS, suspendedMsNow) {
   let removed = 0;
   for (const [sid, t] of tombstones) {
-    if (now - t.expiredAt > ttlMs) {
+    const suspendedSinceWrite = Math.max(0, suspendedMsNow - t.expiredSuspendedMs);
+    if (now - t.expiredAt - suspendedSinceWrite > ttlMs) {
       tombstones.delete(sid);
       removed += 1;
     }
@@ -36479,6 +36495,7 @@ var openApiOperationIds = {
   requeueAsyncJob: "requeueAsyncJob",
   createGithubBranch: "createGithubBranch",
   createGithubPullRequest: "createGithubPullRequest",
+  getGithubPullRequest: "getGithubPullRequest",
   getGithubWorkflowRunLatest: "getGithubWorkflowRunLatest",
   getGithubLatestDeployment: "getGithubLatestDeployment",
   mintGithubPushToken: "mintGithubPushToken",
@@ -36540,7 +36557,9 @@ var openApiOperationIds = {
   markSpecReady: "markSpecReady",
   resetDirectorThread: "resetDirectorThread",
   claimExecutionRun: "claimExecutionRun",
+  reclaimExecutionRunLease: "reclaimExecutionRunLease",
   requeueExecutionRun: "requeueExecutionRun",
+  restartExecutionRun: "restartExecutionRun",
   resolveHandoff: "resolveHandoff",
   touchExecutionRun: "touchExecutionRun",
   issueAgentCredential: "issueAgentCredential",
@@ -36824,6 +36843,14 @@ var mrrlinExecutionRunStatusSchema = external_exports.enum([
   "handoff_queued",
   "cancelled"
 ]);
+var mrrlinRunBlockingReasonCodeSchema = external_exports.enum([
+  "local_checkout_missing",
+  "task_blocked",
+  "default_branch_unresolved",
+  "execution_turn_timeout",
+  "deliverable_gate_exhausted",
+  "unknown"
+]);
 var mrrlinExecutionArtifactKindSchema = external_exports.enum([
   "plan",
   "checkpoint",
@@ -36838,7 +36865,8 @@ var mrrlinExecutionArtifactKindSchema = external_exports.enum([
   "verification",
   "produced_url",
   "resume_spec",
-  "deliverable"
+  "deliverable",
+  "pull_request_state"
 ]);
 var mrrlinDeployAttemptPayloadSchema = external_exports.object({
   env: external_exports.enum(["dev", "prod"]),
@@ -36991,6 +37019,27 @@ var mrrlinGithubPullRequestSchema = external_exports.object({
   title: external_exports.string().min(1),
   url: external_exports.string().url()
 });
+var mrrlinGithubPullRequestCheckStateSchema = external_exports.enum([
+  "passing",
+  "failing",
+  "running",
+  "none",
+  "unknown"
+]);
+var mrrlinGithubPullRequestCheckSourceSchema = external_exports.enum(["check_run", "commit_status"]);
+var mrrlinGithubPullRequestObservedSchema = external_exports.object({
+  checks: mrrlinGithubPullRequestCheckStateSchema,
+  failingChecks: external_exports.array(external_exports.object({
+    name: external_exports.string().min(1),
+    source: mrrlinGithubPullRequestCheckSourceSchema
+  })),
+  headSha: external_exports.string().min(1),
+  merged: external_exports.boolean(),
+  mergedAt: external_exports.string().datetime().nullable(),
+  number: external_exports.number().int().positive(),
+  state: external_exports.string().min(1),
+  url: external_exports.string().url()
+});
 var mrrlinGithubWorkflowSchema = external_exports.object({
   id: external_exports.union([external_exports.number().int().positive(), external_exports.string().min(1)]),
   name: external_exports.string().min(1),
@@ -37287,6 +37336,9 @@ var githubCreatePullRequestRequestSchema = external_exports.object({
 var githubCreatePullRequestResponseSchema = external_exports.object({
   data: mrrlinGithubPullRequestSchema
 });
+var githubPullRequestNumberParamSchema = external_exports.object({
+  pullNumber: external_exports.coerce.number().int().positive()
+});
 var githubWorkflowIdParamSchema = external_exports.object({
   workflowId: external_exports.string().min(1)
 });
@@ -37300,6 +37352,9 @@ var githubWorkflowDispatchResponseSchema = external_exports.object({
 var githubWorkflowListResponseSchema = external_exports.object({
   data: external_exports.array(mrrlinGithubWorkflowSchema)
 });
+var githubPullRequestResponseSchema = external_exports.object({
+  data: mrrlinGithubPullRequestObservedSchema
+});
 var githubWorkflowRunQuerySchema = external_exports.object({
   workflowId: external_exports.string().min(1),
   branch: external_exports.string().min(1),
@@ -37400,6 +37455,7 @@ var mrrlinExecutionRunSchema = external_exports.object({
   actor: external_exports.string().min(1),
   baseSha: external_exports.string().min(1).nullable(),
   branch: external_exports.string().min(1).nullable(),
+  blockingReason: mrrlinRunBlockingReasonCodeSchema.nullable(),
   checkpointCursor: external_exports.string().min(1).nullable(),
   claimedAt: external_exports.string().datetime().nullable(),
   codeExecution: external_exports.boolean(),
@@ -37414,6 +37470,7 @@ var mrrlinExecutionRunSchema = external_exports.object({
   lastActor: external_exports.string().min(1).nullable(),
   leaseId: external_exports.string().min(1).nullable(),
   prerequisites: external_exports.array(mrrlinRunPrerequisiteSchema),
+  prState: external_exports.enum(["open", "merged", "closed"]).optional(),
   prodEnvUrl: external_exports.string().min(1).nullable(),
   prodRunUrl: external_exports.string().min(1).nullable(),
   prodWorkflowId: external_exports.number().int().positive().nullable(),
@@ -37443,6 +37500,7 @@ var mrrlinExecutionRunCreateSchema = external_exports.object({
 var mrrlinExecutionRunUpdateSchema = external_exports.object({
   baseSha: external_exports.string().min(1).nullable().optional(),
   branch: external_exports.string().min(1).nullable().optional(),
+  blockingReason: mrrlinRunBlockingReasonCodeSchema.nullable().optional(),
   checkpointCursor: external_exports.string().min(1).nullable().optional(),
   devEnvUrl: external_exports.string().min(1).nullable().optional(),
   devRunUrl: external_exports.string().min(1).nullable().optional(),
@@ -37469,6 +37527,7 @@ var mrrlinResumeSpecPayloadSchema = external_exports.object({
   class: external_exports.literal("tool_assisted"),
   question: external_exports.string().min(1),
   prerequisites: external_exports.array(external_exports.object({ mcp: external_exports.string().min(1), reason: external_exports.string().min(1) })).default([]),
+  reasonCode: mrrlinRunBlockingReasonCodeSchema.optional(),
   steps: external_exports.array(external_exports.string().min(1)).min(1),
   runId: mrrlinExecutionRunIdSchema,
   artifactId: mrrlinExecutionArtifactIdSchema,
@@ -37498,7 +37557,13 @@ var mrrlinResolveHandoffSchema = external_exports.object({
   }
 });
 var resolveHandoffResponseSchema = external_exports.object({ data: mrrlinExecutionRunSchema });
-var createExecutionRunHandoffSchema = external_exports.object({ reason: external_exports.string().min(1) });
+var createExecutionRunHandoffSchema = external_exports.object({
+  reason: external_exports.string().min(1),
+  reasonCode: mrrlinRunBlockingReasonCodeSchema.optional()
+});
+var mrrlinRestartExecutionRunSchema = external_exports.object({
+  restartedBy: external_exports.string().min(1)
+});
 var mrrlinExecutionRunTouchSchema = external_exports.object({
   leaseId: external_exports.string().min(1)
 });
@@ -38363,6 +38428,10 @@ function createMrrlinClient(config2) {
       const body = await request(`${projectPath(projectSlug)}/github/workflow-runs/latest?${params.toString()}`);
       return githubWorkflowRunResponseSchema.parse(body).data;
     },
+    async getGithubPullRequest(projectSlug, pullNumber) {
+      const body = await request(`${projectPath(projectSlug)}/github/pull-requests/${encodeURIComponent(String(pullNumber))}`);
+      return githubPullRequestResponseSchema.parse(body).data;
+    },
     async getGithubLatestDeployment(projectSlug, query) {
       const params = new URLSearchParams({ environment: query.environment });
       const body = await request(`${projectPath(projectSlug)}/github/deployments/latest?${params.toString()}`);
@@ -38696,7 +38765,7 @@ function createMrrlinClient(config2) {
     async requeueExecutionRun(projectSlug, runId, staleSeconds) {
       try {
         const body = await request(`${projectPath(projectSlug)}/execution-runs/${encodeURIComponent(runId)}/requeue`, {
-          body: JSON.stringify({ staleSeconds }),
+          body: JSON.stringify(mrrlinExecutionRunRequeueSchema.parse({ staleSeconds })),
           headers: { "content-type": "application/json" },
           method: "POST"
         });
@@ -38707,6 +38776,28 @@ function createMrrlinClient(config2) {
         throw error51;
       }
     },
+    async reclaimExecutionRunLease(projectSlug, runId, staleSeconds) {
+      try {
+        const body = await request(`${projectPath(projectSlug)}/execution-runs/${encodeURIComponent(runId)}/reclaim-lease`, {
+          body: JSON.stringify(mrrlinExecutionRunRequeueSchema.parse({ staleSeconds })),
+          headers: { "content-type": "application/json" },
+          method: "POST"
+        });
+        return executionRunResponseSchema.parse(body).data;
+      } catch (error51) {
+        if (error51 instanceof MrrlinApiError && error51.status === 409 && error51.code === "RUN_LEASE_NOT_STALE")
+          return null;
+        throw error51;
+      }
+    },
+    async restartExecutionRun(projectSlug, runId, input) {
+      const body = await request(`${projectPath(projectSlug)}/execution-runs/${encodeURIComponent(runId)}/restart`, {
+        body: JSON.stringify(mrrlinRestartExecutionRunSchema.parse(input)),
+        headers: { "content-type": "application/json" },
+        method: "POST"
+      });
+      return executionRunResponseSchema.parse(body).data;
+    },
     async touchExecutionRun(projectSlug, runId, leaseId) {
       try {
         const body = await request(`${projectPath(projectSlug)}/execution-runs/${encodeURIComponent(runId)}/touch`, {
@@ -39359,7 +39450,7 @@ function startCodexProbe(deps = {}) {
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.3.55";
+var PKG_VERSION = "0.3.56";
 
 // src/api-base-url-migrate.ts
 var import_node_fs2 = __toESM(require("node:fs"), 1);
@@ -42186,6 +42277,7 @@ ${lines2.join("\n")}`;
 
 // src/execution-consumer.ts
 var DEFAULT_STALE_SECONDS = 300;
+var DEFAULT_MAX_LEASE_RECLAIMS = 3;
 var DEFAULT_TOUCH_INTERVAL_MS = 6e4;
 var DEFAULT_CLAIM_INTERVAL_SECONDS = 30;
 var DEFAULT_EXEC_TURN_IDLE_TIMEOUT_SECONDS = 600;
@@ -42276,8 +42368,8 @@ function buildCompletionTurnPrompt(taskId, currentStatus) {
     "If the work is NOT complete \u2014 be honest, do not close incomplete work:",
     "1. Call update_task with the status that matches why it is not complete, and explain what remains",
     "   in the notes:",
-    "   - if the code work itself is done and only a PR or merge remains, use status=awaiting_verification;",
-    "   - if you are blocked and need an operator decision before the work can continue, use status=needs_human.",
+    "   - if the code work itself is done and only an open PR still awaits operator merge or follow-up, use status=awaiting_verification;",
+    "   - if you are blocked and need an operator decision before the work can continue, use status=handoff_needed.",
     "2. Append a handoff_judgement artifact explaining what the operator needs to do.",
     "",
     "You must pick one of these paths \u2014 do not leave the task in_progress."
@@ -42301,9 +42393,9 @@ var BASE_INSTRUCTIONS_PREFIX = [
   "- For a CODE task the run opens a draft PR for you after your turn; opening that PR is NOT",
   "  completion. Do NOT set closed_done for code work \u2014 leave the task open; the run parks at",
   "  `pull_request` (waiting for merge) and the operator merges. Closure happens after merge.",
-  "- Pick the right open status when you stop a CODE task: if the code work itself is done and only a",
-  "  PR or merge remains, leave the task at `awaiting_verification`; if you are blocked and a human",
-  "  must decide before the work can continue, leave it at `needs_human`.",
+  "- Pick the right open status when you stop a CODE task: if the code work itself is done and only an",
+  "  already-open PR still awaits operator merge or follow-up, leave the task at `awaiting_verification`;",
+  "  if you are blocked and a human must decide before the work can continue, leave it at `handoff_needed`.",
   "",
   "File artifacts:",
   "- When your output is a file (markdown report, HTML, screenshot), upload it with",
@@ -42549,14 +42641,19 @@ async function assertRunCompletionReady(deps, projectSlug, taskId, runId, allowe
       task
     };
   }
-  const artifacts = await deps.client.listExecutionArtifacts(projectSlug, runId);
-  const hasEvidence = artifacts.some(
-    (artifact) => COMPLETION_EVIDENCE_KINDS.has(artifact.kind) && !isBridgeGeneratedArtifact(artifact)
+  const runs = await deps.client.listExecutionRuns(projectSlug, { taskId });
+  const runIds = new Set(runs.map((run3) => run3.id));
+  runIds.add(runId);
+  const artifactsNested = await Promise.all(
+    [...runIds].map(async (candidateRunId) => deps.client.listExecutionArtifacts(projectSlug, candidateRunId))
+  );
+  const hasEvidence = artifactsNested.flat().some(
+    (artifact) => COMPLETION_EVIDENCE_KINDS.has(artifact.kind) && !isBridgeGeneratedArtifact(artifact) && runIds.has(artifact.runId)
   );
   if (!hasEvidence) {
     return {
       ok: false,
-      reason: `Codex turn completed and task ${task.id} closed, but run ${runId} has no durable completion evidence artifact.`,
+      reason: `Codex turn completed and task ${task.id} closed, but task lineage for run ${runId} has no durable completion evidence artifact.`,
       task
     };
   }
@@ -42699,7 +42796,8 @@ async function driveRun(deps, projectSlug, runId) {
       task,
       runId,
       leaseId,
-      `task_blocked: run ${runId} targets ${task.id} but blocker tasks could not be loaded: ${missingBlockers.join(", ")}`
+      `task_blocked: run ${runId} targets ${task.id} but blocker tasks could not be loaded: ${missingBlockers.join(", ")}`,
+      "task_blocked"
     );
     return;
   }
@@ -42711,7 +42809,8 @@ async function driveRun(deps, projectSlug, runId) {
       task,
       runId,
       leaseId,
-      `task_blocked: run ${runId} targets ${task.id} but active blockers remain open: ${activeBlockers.join(", ")}`
+      `task_blocked: run ${runId} targets ${task.id} but active blockers remain open: ${activeBlockers.join(", ")}`,
+      "task_blocked"
     );
     return;
   }
@@ -42748,7 +42847,7 @@ async function driveRun(deps, projectSlug, runId) {
 2. If you find a likely match, tell the operator where you think it is and ask them to confirm \u2014 e.g. "For code changes I need this project's repo checked out here. I think it's at <path> \u2014 should I register that one, or do you want to point me at a different path?"
 3. When the operator confirms a path, call register_local_checkout({ projectSlug: "${projectSlug}", path: "<absolute path>", repo: "<this project's GitHub repo>" }).
 4. If no candidate is found, ask the operator for the absolute path to the checkout (or to clone the repo first), then register it. Once a checkout is registered, the run can be re-queued.`;
-      await failRun(deps, projectSlug, task, runId, leaseId, reason);
+      await failRun(deps, projectSlug, task, runId, leaseId, reason, "local_checkout_missing");
       return;
     }
     try {
@@ -42782,7 +42881,15 @@ async function driveRun(deps, projectSlug, runId) {
     } catch (error51) {
       const detail = error51 instanceof Error ? error51.message : String(error51);
       const reason = `worktree_setup_failed: run ${runId} could not provision a code-execution worktree for project ${projectSlug}: ${detail}. (A missing default branch surfaces here as default_branch_unresolved; the operator must resolve the repo state before re-queuing.)`;
-      await failRun(deps, projectSlug, task, runId, leaseId, reason);
+      await failRun(
+        deps,
+        projectSlug,
+        task,
+        runId,
+        leaseId,
+        reason,
+        detail.includes("default_branch_unresolved") ? "default_branch_unresolved" : void 0
+      );
       return;
     }
   } else {
@@ -42821,7 +42928,15 @@ async function driveRun(deps, projectSlug, runId) {
     if (!resumed) {
       const primingBudgetMs = remainingTurnBudgetMs();
       if (primingBudgetMs <= 0) {
-        await failRun(deps, projectSlug, task, runId, leaseId, executionTurnBudgetMessage(execRunMaxMs()));
+        await failRun(
+          deps,
+          projectSlug,
+          task,
+          runId,
+          leaseId,
+          executionTurnBudgetMessage(execRunMaxMs()),
+          "execution_turn_timeout"
+        );
         return;
       }
       const primed = await driveTurn(deps, codex, projectSlug, runId, leaseId, threadId, bundle, primingBudgetMs, "priming");
@@ -42836,7 +42951,15 @@ async function driveRun(deps, projectSlug, runId) {
 Continue executing task ${task.id}. Make the next concrete increment of progress and record artifacts/judgements via MCP tools.` : `Continue executing task ${task.id}. Make the next concrete increment of progress and record artifacts/judgements via MCP tools.`;
     const workBudgetMs = remainingTurnBudgetMs();
     if (workBudgetMs <= 0) {
-      await failRun(deps, projectSlug, task, runId, leaseId, executionTurnBudgetMessage(execRunMaxMs()));
+      await failRun(
+        deps,
+        projectSlug,
+        task,
+        runId,
+        leaseId,
+        executionTurnBudgetMessage(execRunMaxMs()),
+        "execution_turn_timeout"
+      );
       return;
     }
     const outcome = await driveTurn(deps, codex, projectSlug, runId, leaseId, threadId, executionPrompt, workBudgetMs, "work");
@@ -43003,6 +43126,13 @@ Continue executing task ${task.id}. Make the next concrete increment of progress
           pullRequestUrl: pr.url,
           status: "dev_deploy"
         });
+        await reconcileTaskAwaitingMerge(
+          deps,
+          projectSlug,
+          readiness.task,
+          runId,
+          `PR opened (${pr.url}); deploy gate is running, but the operator still owns the merge decision.`
+        );
       } else {
         await deps.client.updateExecutionRun(projectSlug, runId, {
           leaseId,
@@ -43258,7 +43388,7 @@ async function resetWedgedThread(deps, projectSlug, taskId, interruptFailed) {
   await deps.client.resetDirectorThread(projectSlug, taskId).catch(() => {
   });
 }
-async function failRun(deps, projectSlug, task, runId, leaseId, reason) {
+async function failRun(deps, projectSlug, task, runId, leaseId, reason, reasonCode) {
   let currentRun;
   try {
     currentRun = await deps.client.getExecutionRun(projectSlug, runId);
@@ -43317,13 +43447,21 @@ async function failRun(deps, projectSlug, task, runId, leaseId, reason) {
     }
   }
   try {
-    await deps.client.createExecutionRunHandoff(projectSlug, runId, { reason });
+    await deps.client.createExecutionRunHandoff(projectSlug, runId, {
+      reason,
+      ...reasonCode ? { reasonCode } : {}
+    });
   } catch {
     await notifyOperatorHandoff(deps, projectSlug, task, runId, reason);
   }
 }
 async function reconcileTaskAwaitingMerge(deps, projectSlug, task, runId, reason) {
   if (task.status === "handoff_needed") return;
+  const run3 = await deps.client.getExecutionRun(projectSlug, runId).catch(() => null);
+  if (run3?.prState === "merged") {
+    console.log(JSON.stringify({ event: "pr_merge_already_observed", projectSlug, runId, taskId: task.id }));
+    return;
+  }
   await deps.client.appendExecutionArtifact(projectSlug, runId, {
     id: newArtifactId(),
     kind: "handoff_judgement",
@@ -43425,6 +43563,27 @@ async function runBackstopSweep(deps, drive = (slug, id) => driveRun(deps, slug,
       pending = [];
     }
     for (const run3 of pending) {
+      const updatedAtMs = run3.updatedAt ? Date.parse(run3.updatedAt) : Number.NaN;
+      const staleBeforeMs = Date.now() - deps.staleSeconds * 1e3;
+      if (run3.leaseId) {
+        if (!Number.isFinite(updatedAtMs) || updatedAtMs >= staleBeforeMs) continue;
+        try {
+          const reclaimed = await deps.client.reclaimExecutionRunLease(slug, run3.id, deps.staleSeconds);
+          if (!reclaimed) continue;
+        } catch (error51) {
+          if (error51 instanceof MrrlinApiError && error51.status === 404) continue;
+          if (error51 instanceof MrrlinApiError && error51.status === 409 && error51.code === "RUN_LEASE_RECLAIM_EXHAUSTED") {
+            await deps.client.createInboxItem(slug, {
+              id: `II-${run3.id}-lease-stuck`,
+              kind: "handoff",
+              taskId: run3.taskId,
+              body: `Execution run ${run3.id} exceeded its stale-lease reclaim budget (${maxLeaseReclaims()} attempts) and still is not making progress.`
+            }).catch(() => {
+            });
+          }
+          continue;
+        }
+      }
       await drive(slug, run3.id);
     }
     if (deps.deployGate) {
@@ -43493,6 +43652,9 @@ function claimIntervalMs() {
   const jitter = base * 0.25 * (Math.random() * 2 - 1);
   return Math.round((base + jitter) * 1e3);
 }
+function maxLeaseReclaims() {
+  return readPositiveIntEnv("MRRLIN_MAX_LEASE_RECLAIMS", DEFAULT_MAX_LEASE_RECLAIMS);
+}
 
 // src/async-job-consumer.ts
 var import_node_crypto6 = __toESM(require("node:crypto"), 1);
@@ -47950,6 +48112,103 @@ var CheckoutRegistry = class {
   }
 };
 
+// src/checkout-handlers.ts
+var import_node_child_process10 = require("node:child_process");
+var import_node_fs12 = require("node:fs");
+
+// src/git-remote-match.ts
+function normalizeRemote(url2) {
+  const trimmed = url2.trim().replace(/\.git$/i, "");
+  const scp = /^[^@]+@[^:]+:(.+)$/.exec(trimmed);
+  const pathPart = scp ? scp[1] : (() => {
+    try {
+      return new URL(trimmed).pathname.replace(/^\/+/, "");
+    } catch {
+      return null;
+    }
+  })();
+  if (!pathPart) return null;
+  const segs = pathPart.split("/").filter(Boolean);
+  if (segs.length < 2) return null;
+  return `${segs[segs.length - 2]}/${segs[segs.length - 1]}`.toLowerCase();
+}
+function remoteMatchesRepo(remoteUrl, repoFullName) {
+  const a = normalizeRemote(remoteUrl);
+  return a !== null && a === repoFullName.trim().toLowerCase();
+}
+
+// src/checkout-handlers.ts
+function validateCheckoutPath(checkoutPath, repo) {
+  const trimmedPath = checkoutPath.trim();
+  if (!trimmedPath.startsWith("/")) {
+    return {
+      ok: false,
+      code: "not_absolute",
+      detail: `Path must be absolute, got: ${trimmedPath}`
+    };
+  }
+  let resolvedPath;
+  try {
+    resolvedPath = (0, import_node_fs12.realpathSync)(trimmedPath);
+  } catch {
+    return {
+      ok: false,
+      code: "not_found",
+      detail: `Path does not exist or is not accessible: ${trimmedPath}`
+    };
+  }
+  let remoteUrl;
+  try {
+    remoteUrl = (0, import_node_child_process10.execFileSync)("git", ["-C", resolvedPath, "remote", "get-url", "origin"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 15e3,
+      env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
+    }).trim();
+  } catch {
+    return {
+      ok: false,
+      code: "not_a_git_repo",
+      detail: `Path is not a git repository or has no origin remote: ${resolvedPath}`
+    };
+  }
+  if (!remoteMatchesRepo(remoteUrl, repo)) {
+    return {
+      ok: false,
+      code: "remote_mismatch",
+      detail: `Origin remote ${remoteUrl} does not match repo ${repo}.`
+    };
+  }
+  return { ok: true, resolvedPath };
+}
+function readCheckoutState(registry3, projectSlug, machineLabel) {
+  const entry = registry3.get(projectSlug);
+  if (!entry) return null;
+  return checkoutStateData(projectSlug, entry, machineLabel);
+}
+function registerCheckout(registry3, input, machineLabel, now = (/* @__PURE__ */ new Date()).toISOString()) {
+  const validated = validateCheckoutPath(input.path, input.repo);
+  if (!validated.ok) return validated;
+  registry3.confirm(input.projectSlug, validated.resolvedPath, now);
+  return {
+    ok: true,
+    data: {
+      projectSlug: input.projectSlug,
+      path: validated.resolvedPath,
+      confirmedAt: now,
+      machineLabel
+    }
+  };
+}
+function checkoutStateData(projectSlug, entry, machineLabel) {
+  return {
+    projectSlug,
+    path: entry.path,
+    confirmedAt: entry.confirmedAt,
+    machineLabel
+  };
+}
+
 // src/executor-server.ts
 async function startExecutorServer(opts) {
   const manager = new CodexServerManager();
@@ -48157,7 +48416,7 @@ function extractVerificationSection(markdown) {
 }
 
 // src/bridge-log.ts
-var import_node_fs12 = require("node:fs");
+var import_node_fs13 = require("node:fs");
 var import_node_path16 = require("node:path");
 
 // src/redact.ts
@@ -48245,7 +48504,7 @@ function createBridgeLogger(stateDir, env = process.env) {
   if (!resolveBridgeLogEnabled(env)) return NOOP_LOGGER;
   const logsDir = (0, import_node_path16.join)(stateDir, "logs");
   try {
-    (0, import_node_fs12.mkdirSync)(logsDir, { recursive: true });
+    (0, import_node_fs13.mkdirSync)(logsDir, { recursive: true });
   } catch {
     return NOOP_LOGGER;
   }
@@ -48262,7 +48521,7 @@ function createBridgeLogger(stateDir, env = process.env) {
         ...rec.ms !== void 0 ? { ms: rec.ms } : {},
         payload: redactMessage(rec.payload, { includePrompts })
       }) + "\n";
-      (0, import_node_fs12.appendFileSync)(fileFor(), line);
+      (0, import_node_fs13.appendFileSync)(fileFor(), line);
     } catch {
     }
   };
@@ -48275,7 +48534,7 @@ function createBridgeLogger(stateDir, env = process.env) {
 }
 
 // src/external-agents-scrub.ts
-var import_node_fs13 = __toESM(require("node:fs"), 1);
+var import_node_fs14 = __toESM(require("node:fs"), 1);
 var import_node_os8 = __toESM(require("node:os"), 1);
 var import_node_path17 = __toESM(require("node:path"), 1);
 var REDACTION = "[REDACTED]";
@@ -48286,7 +48545,7 @@ function readKeysEnv() {
   const filePath = KEYS_ENV_PATH();
   let mtimeMs = 0;
   try {
-    mtimeMs = import_node_fs13.default.statSync(filePath).mtimeMs;
+    mtimeMs = import_node_fs14.default.statSync(filePath).mtimeMs;
   } catch {
     mtimeMs = 0;
   }
@@ -48295,7 +48554,7 @@ function readKeysEnv() {
   }
   const map2 = /* @__PURE__ */ new Map();
   try {
-    const content = import_node_fs13.default.readFileSync(filePath, "utf8");
+    const content = import_node_fs14.default.readFileSync(filePath, "utf8");
     for (const rawLine of content.split(/\r?\n/)) {
       const line = rawLine.trim();
       if (line === "" || line.startsWith("#")) continue;
@@ -48687,7 +48946,7 @@ function addBridgeModel(target, model) {
 }
 function readTextIfExists(filePath) {
   try {
-    return import_node_fs14.default.readFileSync(filePath, "utf8");
+    return import_node_fs15.default.readFileSync(filePath, "utf8");
   } catch {
     return null;
   }
@@ -48766,7 +49025,7 @@ function readCodexFallbackModels() {
   }
   const automationsDir = import_node_path18.default.join(codexHome, "automations");
   try {
-    for (const entry of import_node_fs14.default.readdirSync(automationsDir, { withFileTypes: true })) {
+    for (const entry of import_node_fs15.default.readdirSync(automationsDir, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
       for (const slug of readKnownGptSlugsFromTomlFile(import_node_path18.default.join(automationsDir, entry.name, "automation.toml"))) {
         addBridgeModel(
@@ -48790,7 +49049,7 @@ function readCodexFallbackModels() {
 function neutralCheckoutCwd(stateDir) {
   const dir = import_node_path18.default.join(stateDir, "no-checkout");
   try {
-    import_node_fs14.default.mkdirSync(dir, { recursive: true });
+    import_node_fs15.default.mkdirSync(dir, { recursive: true });
   } catch {
   }
   return dir;
@@ -49111,7 +49370,7 @@ function resolveDefaultBranch(checkoutPath) {
   if (!checkoutPath) return "main";
   const runGit = (args) => {
     try {
-      return (0, import_node_child_process10.execFileSync)("git", ["-C", checkoutPath, ...args], {
+      return (0, import_node_child_process11.execFileSync)("git", ["-C", checkoutPath, ...args], {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"],
         timeout: 15e3,
@@ -49143,7 +49402,7 @@ async function runOrphanWorktreeSweep(client, opts) {
   const cutoff = Date.now() - worktreeRetentionMs();
   const isReapable = (worktreePath) => {
     try {
-      return import_node_fs14.default.statSync(worktreePath).mtimeMs < cutoff;
+      return import_node_fs15.default.statSync(worktreePath).mtimeMs < cutoff;
     } catch {
       return false;
     }
@@ -49447,7 +49706,9 @@ function createBridgeMessageHandler(deps) {
         logResumeRejected(req.directorSessionId, reason);
         return;
       }
-      const buf = t?.replay ?? null;
+      const parked = t?.supersededReplay ?? null;
+      const buf = req.acceptSuperseded === true && parked && parked.turnId === req.turnId ? parked : t?.replay ?? null;
+      const servingSuperseded = buf !== null && buf === parked;
       if (!buf) {
         sendMsg({ type: "resume", status: "no-buffer", reason: "wrong-session" });
         logResumeRejected(req.directorSessionId, "wrong-session");
@@ -49478,15 +49739,17 @@ function createBridgeMessageHandler(deps) {
       buf.state = result.next;
       incrementBindEpoch(buf);
       buf.replaying = true;
-      deps.bindSessionSink?.(req.directorSessionId, send);
-      boundSessions.add(req.directorSessionId);
-      if (buf.triggerDetach) {
-        const detach = buf.triggerDetach;
-        const epochAtBind = buf.bindEpoch;
-        socket.once("close", () => {
-          if (buf.bindEpoch !== epochAtBind) return;
-          detach();
-        });
+      if (!servingSuperseded) {
+        deps.bindSessionSink?.(req.directorSessionId, send);
+        boundSessions.add(req.directorSessionId);
+        if (buf.triggerDetach) {
+          const detach = buf.triggerDetach;
+          const epochAtBind = buf.bindEpoch;
+          socket.once("close", () => {
+            if (buf.bindEpoch !== epochAtBind) return;
+            detach();
+          });
+        }
       }
       const willStreamLive = result.next === "live";
       sendMsg({
@@ -49563,7 +49826,8 @@ function createBridgeMessageHandler(deps) {
       }
       const msg = parsed;
       const sid = sessionIdOf(msg);
-      if (sid && deps.bindSessionSink && !boundSessions.has(sid)) {
+      const skipEagerBindForSupersededResume = msg.type === "resume" && msg.acceptSuperseded === true;
+      if (sid && deps.bindSessionSink && !boundSessions.has(sid) && !skipEagerBindForSupersededResume) {
         deps.bindSessionSink(sid, send);
         boundSessions.add(sid);
       }
@@ -49585,6 +49849,57 @@ function createBridgeMessageHandler(deps) {
         sendForSpan({ type: "pairing-qr", ...result });
         return;
       }
+      if (msg.type === "checkout-state") {
+        if (!deps.checkoutRegistry) {
+          sendForSpan({ type: "checkout-state", ok: false, error: { code: "bridge_offline", detail: "checkout registry is not configured on this bridge" } });
+          return;
+        }
+        const projectSlug = typeof msg.projectSlug === "string" ? msg.projectSlug.trim() : "";
+        if (!projectSlug) {
+          sendForSpan({ type: "checkout-state", ok: false, error: { code: "invalid_input", fields: { projectSlug: "required" } } });
+          return;
+        }
+        const state = readCheckoutState(deps.checkoutRegistry, projectSlug, import_node_os9.default.hostname());
+        if (!state) {
+          sendForSpan({ type: "checkout-state", ok: false, error: { code: "checkout_missing" } });
+          return;
+        }
+        sendForSpan({ type: "checkout-state", ok: true, data: state });
+        return;
+      }
+      if (msg.type === "checkout-register") {
+        if (!deps.checkoutRegistry) {
+          sendForSpan({ type: "checkout-register", ok: false, error: { code: "bridge_offline", detail: "checkout registry is not configured on this bridge" } });
+          return;
+        }
+        const projectSlug = typeof msg.projectSlug === "string" ? msg.projectSlug.trim() : "";
+        const repo = typeof msg.repo === "string" ? msg.repo.trim() : "";
+        if (!projectSlug || !repo) {
+          sendForSpan({
+            type: "checkout-register",
+            ok: false,
+            error: {
+              code: "invalid_input",
+              fields: {
+                ...!projectSlug ? { projectSlug: "required" } : {},
+                ...!repo ? { repo: "required" } : {}
+              }
+            }
+          });
+          return;
+        }
+        const result = registerCheckout(
+          deps.checkoutRegistry,
+          { projectSlug, path: typeof msg.path === "string" ? msg.path : "", repo },
+          import_node_os9.default.hostname()
+        );
+        if (!result.ok) {
+          sendForSpan({ type: "checkout-register", ok: false, error: { code: result.code, detail: result.detail } });
+          return;
+        }
+        sendForSpan({ type: "checkout-register", ok: true, data: result.data });
+        return;
+      }
       if (msg.type === "agents-state") {
         if (!deps.runExternalAgentsCli) {
           sendForSpan({ type: "agents-state", ok: false, error: { code: "bridge_offline", detail: "external-agents is not configured on this bridge" } });
@@ -49894,6 +50209,10 @@ function createBridgeMessageHandler(deps) {
             recordInterrupted(oldBuf, Date.now(), deps.suspendedMs?.() ?? 0);
           }
         }
+        const droppedParked = takenOver.supersededReplay;
+        if (oldBuf) {
+          takenOver.supersededReplay = oldBuf;
+        }
         takenOver.cancel?.();
         void withTimeout2(
           codexClient.turn.interrupt({ threadId: takenOver.threadId }),
@@ -49911,7 +50230,13 @@ function createBridgeMessageHandler(deps) {
           spanId,
           sessionId: directorSessionId,
           type: "<turn-takeover>",
-          payload: { sessionId: directorSessionId, clean: cleared, oldTurnId: oldBuf?.turnId ?? null }
+          payload: {
+            sessionId: directorSessionId,
+            clean: cleared,
+            oldTurnId: oldBuf?.turnId ?? null,
+            parkedTurnId: oldBuf?.turnId ?? null,
+            droppedParkedTurnId: droppedParked?.turnId ?? null
+          }
         });
       }
       const desiredModel = normalizeModel(msg.model);
@@ -49923,10 +50248,12 @@ function createBridgeMessageHandler(deps) {
             threadId: "",
             mapper: new CodexBridgeEventMapper(),
             lastUsedAt: Date.now(),
+            lastUsedAtSuspendedMs: deps.suspendedMs?.() ?? 0,
             inFlight: false,
             model: desiredModel,
             reasoningEffort: desiredEffort,
-            replay: null
+            replay: null,
+            supersededReplay: null
           };
           await acquireThread(codexClient, {
             threadId: null,
@@ -49992,6 +50319,7 @@ function createBridgeMessageHandler(deps) {
         ...deps.ackLingerMs !== void 0 ? { ackLingerMs: deps.ackLingerMs } : {}
       });
       thread.lastUsedAt = Date.now();
+      thread.lastUsedAtSuspendedMs = deps.suspendedMs?.() ?? 0;
       const threadId = thread.threadId;
       const currentReplayBuf = thread.replay;
       sendForSpan({
@@ -50210,6 +50538,7 @@ ${effectiveText}` : effectiveText;
           thread.inFlight = false;
         }
         thread.lastUsedAt = Date.now();
+        thread.lastUsedAtSuspendedMs = deps.suspendedMs?.() ?? 0;
         deps.persistThreads();
         deps.releaseCodex();
       }
@@ -50235,6 +50564,56 @@ function createBridgeShutdown(deps) {
     deps.exit(0);
   };
 }
+function shouldReapIdleThread(thread, now, suspendedMsNow, idleThreadTtlMs) {
+  const suspendedSinceUse = Math.max(0, suspendedMsNow - thread.lastUsedAtSuspendedMs);
+  return now - thread.lastUsedAt - suspendedSinceUse > idleThreadTtlMs;
+}
+function sweepIdleThreads(threads, opts) {
+  const suspendedNow = opts.suspendedMs();
+  const reaped = [];
+  for (const [directorSessionId, thread] of threads.entries()) {
+    if (thread.inFlight) continue;
+    if (thread.replay && !shouldGc(thread.replay, opts.now, suspendedNow)) continue;
+    if (thread.supersededReplay && !shouldGc(thread.supersededReplay, opts.now, suspendedNow)) continue;
+    if (!shouldReapIdleThread(thread, opts.now, suspendedNow, opts.idleThreadTtlMs)) continue;
+    threads.delete(directorSessionId);
+    reaped.push(directorSessionId);
+  }
+  return reaped;
+}
+function sweepReplayBuffers(threads, tombstones, opts) {
+  const suspendedNow = opts.suspendedMs();
+  let retainedBuffers = 0;
+  let retainedBytes = 0;
+  for (const [directorSessionId, thread] of threads) {
+    if (thread.replay && shouldGc(thread.replay, opts.now, suspendedNow)) {
+      const turnId = thread.replay.turnId;
+      const lastSeq = thread.replay.lastSeq;
+      const expiredUnacked = thread.replay.ackedAt === null;
+      writeTombstone(tombstones, directorSessionId, thread.replay, opts.now, suspendedNow);
+      opts.onTombstone?.({ directorSessionId, turnId, lastSeq, expiredUnacked });
+      thread.replay = null;
+    } else if (thread.replay) {
+      retainedBuffers += 1;
+      retainedBytes += thread.replay.bytesUsed;
+    }
+    if (thread.supersededReplay && shouldGc(thread.supersededReplay, opts.now, suspendedNow)) {
+      const turnId = thread.supersededReplay.turnId;
+      thread.supersededReplay = null;
+      opts.onSupersededDropped?.({ directorSessionId, turnId });
+    } else if (thread.supersededReplay) {
+      retainedBuffers += 1;
+      retainedBytes += thread.supersededReplay.bytesUsed;
+    }
+  }
+  const tombstonesRemoved = sweepExpiredTombstones(
+    tombstones,
+    opts.now,
+    opts.tombstoneTtlMs ?? DEFAULT_TOMBSTONE_TTL_MS,
+    suspendedNow
+  );
+  return { retainedBuffers, retainedBytes, tombstonesRemoved };
+}
 function parseConfig() {
   const host = (process.env.MRRLIN_DIRECTOR_BRIDGE_HOST ?? "127.0.0.1").trim() || "127.0.0.1";
   const port = readEnvInt("MRRLIN_DIRECTOR_BRIDGE_PORT", 8791);
@@ -50248,7 +50627,7 @@ function parseConfig() {
 }
 function scanForOtherBridges() {
   try {
-    const result = (0, import_node_child_process10.spawnSync)("pgrep", ["-f", "mrrlin-mcp director-bridge"], {
+    const result = (0, import_node_child_process11.spawnSync)("pgrep", ["-f", "mrrlin-mcp director-bridge"], {
       encoding: "utf8"
     });
     if (result.status !== 0) return [];
@@ -50428,13 +50807,13 @@ async function startDirectorBridge() {
         // egressDomains is retained in the seam signature (verification-turn.ts still computes the
         // env host) but no longer constrains anything — the executor is unrestricted.
         startSandbox: async (_egressDomains) => {
-          const cwd = import_node_fs14.default.mkdtempSync(import_node_path18.default.join(import_node_os9.default.tmpdir(), "mrrlin-verify-"));
+          const cwd = import_node_fs15.default.mkdtempSync(import_node_path18.default.join(import_node_os9.default.tmpdir(), "mrrlin-verify-"));
           let handle;
           try {
             handle = await startExecutorServer({ worktree: cwd });
           } catch (error51) {
             try {
-              import_node_fs14.default.rmSync(cwd, { recursive: true, force: true });
+              import_node_fs15.default.rmSync(cwd, { recursive: true, force: true });
             } catch {
             }
             throw error51;
@@ -50445,7 +50824,7 @@ async function startDirectorBridge() {
             dispose: () => {
               handle.dispose();
               try {
-                import_node_fs14.default.rmSync(cwd, { recursive: true, force: true });
+                import_node_fs15.default.rmSync(cwd, { recursive: true, force: true });
               } catch {
               }
             }
@@ -50557,10 +50936,12 @@ async function startDirectorBridge() {
       threadId: entry.threadId,
       mapper: new CodexBridgeEventMapper(),
       lastUsedAt: entry.lastUsedAt,
+      lastUsedAtSuspendedMs: suspensionDetector.suspendedMs(),
       inFlight: false,
       model: entry.model,
       reasoningEffort: normalizeReasoningEffort(entry.reasoningEffort),
-      replay: null
+      replay: null,
+      supersededReplay: null
     });
   }
   const persistThreads = () => {
@@ -50585,17 +50966,12 @@ async function startDirectorBridge() {
     }
   };
   const cleanupTimer = setInterval(() => {
-    const now = Date.now();
-    let changed = false;
-    for (const [directorSessionId, thread] of threads.entries()) {
-      if (thread.inFlight) continue;
-      if (thread.replay && !shouldGc(thread.replay, now, suspensionDetector.suspendedMs())) continue;
-      if (now - thread.lastUsedAt > config2.idleThreadTtlMs) {
-        threads.delete(directorSessionId);
-        changed = true;
-      }
-    }
-    if (changed) persistThreads();
+    const reaped = sweepIdleThreads(threads, {
+      now: Date.now(),
+      suspendedMs: () => suspensionDetector.suspendedMs(),
+      idleThreadTtlMs: config2.idleThreadTtlMs
+    });
+    if (reaped.length > 0) persistThreads();
   }, 6e4);
   cleanupTimer.unref?.();
   let remoteRelay = null;
@@ -50656,7 +51032,7 @@ async function startDirectorBridge() {
   const bridgeLogger = createBridgeLogger(config2.stateDir, process.env);
   let bridgeBinShaShort = "unknown00000";
   try {
-    bridgeBinShaShort = import_node_crypto8.default.createHash("sha256").update(import_node_fs14.default.readFileSync(process.argv[1] ?? "")).digest("hex").slice(0, 12);
+    bridgeBinShaShort = import_node_crypto8.default.createHash("sha256").update(import_node_fs15.default.readFileSync(process.argv[1] ?? "")).digest("hex").slice(0, 12);
   } catch {
   }
   attachBridgeWss(server, {
@@ -50790,28 +51166,27 @@ async function startDirectorBridge() {
         })
       );
       enqueueRun(async () => {
-        const now = Date.now();
-        const suspendedNow = suspensionDetector.suspendedMs();
-        let retainedBuffers = 0;
-        let retainedBytes = 0;
-        for (const [sid, t] of threads) {
-          if (t.replay && shouldGc(t.replay, now, suspendedNow)) {
-            const turnId = t.replay.turnId;
-            const lastSeq = t.replay.lastSeq;
-            const expiredUnacked = t.replay.ackedAt === null;
-            writeTombstone(tombstones, sid, t.replay, now);
+        const { retainedBuffers, retainedBytes, tombstonesRemoved } = sweepReplayBuffers(threads, tombstones, {
+          now: Date.now(),
+          suspendedMs: () => suspensionDetector.suspendedMs(),
+          tombstoneTtlMs: DEFAULT_TOMBSTONE_TTL_MS,
+          onTombstone: ({ directorSessionId, turnId, lastSeq, expiredUnacked }) => {
             bridgeLogger.logOut({
               spanId: "gc",
-              sessionId: sid,
+              sessionId: directorSessionId,
               type: expiredUnacked ? "<result-expired>" : "<tombstone-written>",
-              payload: { sessionId: sid, turnId, lastSeq }
+              payload: { sessionId: directorSessionId, turnId, lastSeq }
+            });
+          },
+          onSupersededDropped: ({ directorSessionId, turnId }) => {
+            bridgeLogger.logOut({
+              spanId: "gc",
+              sessionId: directorSessionId,
+              type: "<superseded-dropped>",
+              payload: { sessionId: directorSessionId, turnId }
             });
-            t.replay = null;
-          } else if (t.replay) {
-            retainedBuffers += 1;
-            retainedBytes += t.replay.bytesUsed;
           }
-        }
+        });
         if (retainedBuffers > 0) {
           bridgeLogger.logOut({
             spanId: "gc",
@@ -50820,13 +51195,12 @@ async function startDirectorBridge() {
             payload: { retainedBuffers, retainedBytes }
           });
         }
-        const removed = sweepExpiredTombstones(tombstones, now);
-        if (removed > 0) {
+        if (tombstonesRemoved > 0) {
           bridgeLogger.logOut({
             spanId: "gc",
             sessionId: null,
             type: "<tombstone-expired>",
-            payload: { removed }
+            payload: { removed: tombstonesRemoved }
           });
         }
       });
@@ -51050,13 +51424,13 @@ function readOrCreateBridgeToken(stateDir) {
   if (explicit) return explicit;
   const tokenPath = import_node_path18.default.join(stateDir, "token.txt");
   try {
-    const existing = import_node_fs14.default.readFileSync(tokenPath, "utf8").trim();
+    const existing = import_node_fs15.default.readFileSync(tokenPath, "utf8").trim();
     if (existing) return existing;
   } catch {
   }
-  import_node_fs14.default.mkdirSync(stateDir, { recursive: true, mode: 448 });
+  import_node_fs15.default.mkdirSync(stateDir, { recursive: true, mode: 448 });
   const token = import_node_crypto8.default.randomBytes(32).toString("base64url");
-  import_node_fs14.default.writeFileSync(tokenPath, `${token}
+  import_node_fs15.default.writeFileSync(tokenPath, `${token}
 `, { mode: 384 });
   return token;
 }
@@ -54440,10 +54814,8 @@ var StdioServerTransport = class {
 // src/tools.ts
 var import_node_crypto11 = require("node:crypto");
 var import_promises3 = require("node:fs/promises");
-var import_node_fs15 = require("node:fs");
 var import_node_path20 = __toESM(require("node:path"), 1);
 var import_node_os10 = __toESM(require("node:os"), 1);
-var import_node_child_process12 = require("node:child_process");
 
 // ../../packages/wiki/dist/index.js
 var import_promises2 = __toESM(require("node:fs/promises"), 1);
@@ -54901,7 +55273,7 @@ async function runCodeGate(_target, deps) {
 }
 
 // src/consensus/multi-llm-head.ts
-var import_node_child_process11 = require("node:child_process");
+var import_node_child_process12 = require("node:child_process");
 function errMessage3(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -54943,7 +55315,7 @@ function runExternalAgents(bin, args, label, timeoutMs, spawn3) {
   });
 }
 async function pickPanel(input, deps) {
-  const spawn3 = deps?.spawn ?? import_node_child_process11.spawn;
+  const spawn3 = deps?.spawn ?? import_node_child_process12.spawn;
   const { command, prefixArgs } = resolveExternalAgentsCliInvocation(deps?.externalAgentsBin);
   const args = [
     "pick",
@@ -54964,7 +55336,7 @@ async function pickPanel(input, deps) {
   return { ok: true, agents };
 }
 async function dispatchHead(agentId, prompt, timeoutMs, deps) {
-  const spawn3 = deps?.spawn ?? import_node_child_process11.spawn;
+  const spawn3 = deps?.spawn ?? import_node_child_process12.spawn;
   const { command, prefixArgs } = resolveExternalAgentsCliInvocation(deps?.externalAgentsBin);
   const args = ["dispatch", agentId, "--json", prompt];
   const r = await runExternalAgents(command, [...prefixArgs, ...args], "dispatch", timeoutMs, spawn3);
@@ -55622,27 +55994,6 @@ async function enqueueAsyncTool(client, descriptor2, input) {
   }
 }
 
-// src/git-remote-match.ts
-function normalizeRemote(url2) {
-  const trimmed = url2.trim().replace(/\.git$/i, "");
-  const scp = /^[^@]+@[^:]+:(.+)$/.exec(trimmed);
-  const pathPart = scp ? scp[1] : (() => {
-    try {
-      return new URL(trimmed).pathname.replace(/^\/+/, "");
-    } catch {
-      return null;
-    }
-  })();
-  if (!pathPart) return null;
-  const segs = pathPart.split("/").filter(Boolean);
-  if (segs.length < 2) return null;
-  return `${segs[segs.length - 2]}/${segs[segs.length - 1]}`.toLowerCase();
-}
-function remoteMatchesRepo(remoteUrl, repoFullName) {
-  const a = normalizeRemote(remoteUrl);
-  return a !== null && a === repoFullName.trim().toLowerCase();
-}
-
 // src/tool-names.ts
 var mcpToolNames = {
   appendExecutionArtifact: "append_execution_artifact",
@@ -55704,6 +56055,8 @@ var mcpToolNames = {
   runCodeReviewerGate: "run_code_reviewer_gate",
   uploadArtifact: "upload_artifact",
   listArtifactFiles: "list_artifact_files",
+  reclaimExecutionRunLease: "reclaim_execution_run_lease",
+  restartExecutionRun: "restart_execution_run",
   resolveHandoff: "resolve_handoff",
   recordProducedUrl: "record_produced_url",
   registerLocalCheckout: "register_local_checkout",
@@ -56302,6 +56655,8 @@ var listArtifactFilesInputSchema = projectScopedSchema.merge(
     runId: mrrlinExecutionRunIdSchema.optional()
   })
 );
+var reclaimExecutionRunLeaseInputSchema = projectScopedSchema.extend({ runId: mrrlinExecutionRunIdSchema }).merge(mrrlinExecutionRunRequeueSchema);
+var restartExecutionRunInputSchema = projectScopedSchema.extend({ runId: mrrlinExecutionRunIdSchema }).merge(mrrlinRestartExecutionRunSchema);
 var listInboxItemsInputSchema = projectScopedSchema.merge(mrrlinInboxItemListFiltersSchema);
 var createInboxItemInputSchema = projectScopedSchema.merge(mrrlinInboxItemCreateSchema);
 var decideInboxItemInputSchema = projectScopedSchema.extend({ itemId: mrrlinInboxItemIdSchema }).merge(mrrlinInboxItemDecideSchema);
@@ -56378,6 +56733,8 @@ var mcpToolInputSchemas = {
   [mcpToolNames.decideInboxItem]: decideInboxItemInputSchema,
   [mcpToolNames.uploadArtifact]: uploadArtifactInputSchema,
   [mcpToolNames.listArtifactFiles]: listArtifactFilesInputSchema,
+  [mcpToolNames.reclaimExecutionRunLease]: reclaimExecutionRunLeaseInputSchema,
+  [mcpToolNames.restartExecutionRun]: restartExecutionRunInputSchema,
   [mcpToolNames.resolveHandoff]: resolveHandoffInputSchema,
   [mcpToolNames.recordProducedUrl]: recordProducedUrlInputSchema,
   [mcpToolNames.registerLocalCheckout]: registerLocalCheckoutInputSchema,
@@ -56441,6 +56798,8 @@ var mcpToolOperationIds = {
   [mcpToolNames.decideInboxItem]: openApiOperationIds.decideInboxItem,
   [mcpToolNames.uploadArtifact]: openApiOperationIds.createArtifactFile,
   [mcpToolNames.listArtifactFiles]: openApiOperationIds.listArtifactFiles,
+  [mcpToolNames.reclaimExecutionRunLease]: openApiOperationIds.reclaimExecutionRunLease,
+  [mcpToolNames.restartExecutionRun]: openApiOperationIds.restartExecutionRun,
   [mcpToolNames.resolveHandoff]: openApiOperationIds.resolveHandoff
 };
 var mcpToolDescriptions = {
@@ -56504,6 +56863,8 @@ var mcpToolDescriptions = {
   [mcpToolNames.decideInboxItem]: "Approve, reject, or acknowledge an operator-inbox item. Rejection requires a reason.",
   [mcpToolNames.uploadArtifact]: "Upload a local file (md/txt/html/csv/json/pdf/png/jpg/webp/gif, <=5MB) as a project artifact. Returns a stable markdown link to embed in chat/spec/handoff text. Use class=temp for one-off hand-offs, class=durable for anything referenced by specs or evidence. Pass runId to record the file in that run's artifact history; pass taskId to surface it on the task's Artifacts list.",
   [mcpToolNames.listArtifactFiles]: "List uploaded artifact files for the project (optionally filtered by taskId/runId), newest first.",
+  [mcpToolNames.reclaimExecutionRunLease]: "Clear a stale pending execution-run lease when the lease has aged past staleSeconds. Returns the reclaimed run on success, null when the lease is not stale yet, and surfaces a structured conflict when reclaim retries are exhausted.",
+  [mcpToolNames.restartExecutionRun]: "Restart a parked execution run (handoff_requested or handoff_queued) back to pending so the queue can resume it.",
   [mcpToolNames.resolveHandoff]: "Resolve a tool_assisted handoff for an execution run (outcome success|failure). Success returns the task to the board; failure opens a new handoff cycle. Idempotent.",
   [mcpToolNames.registerLocalCheckout]: "Register the operator-local git checkout path for `projectSlug` so execution-run workers run code on this machine instead of the cloud. Validates the path is a git repo whose `origin` remote matches `repo`, then writes the (slug -> absolute path) entry to the operator-local checkout registry. Call this after locating the checkout on disk (e.g. via filesystem search) and confirming the choice with the user in chat \u2014 they should NOT have to paste the path into Settings. Returns `{ projectSlug, path, confirmedAt }`. Idempotent: re-registering overwrites the prior entry.",
   [mcpToolNames.retrieveContext]: "Rehydrate a mrrlin:// handle emitted by the compact-context layer into the full canonical Mrrlin record (task/wiki page/project snapshot/execution run/artifacts). Use whenever you need the full source \u2014 irreversible decisions (closing tasks, dispatching deploys, writing specs) MUST call this first; never act on a compact envelope alone. Returns `{ kind, data }`. Invalid or unsupported handle \u2192 structured `HANDLE_INVALID` error."
@@ -57261,6 +57622,20 @@ function createMrrlinTools(options) {
       "Unable to list artifact files.",
       async (c, { projectSlug, taskId, runId }) => await c.listArtifactFiles(projectSlug, { runId, taskId })
     ),
+    [mcpToolNames.reclaimExecutionRunLease]: makeTool(
+      client,
+      mcpToolNames.reclaimExecutionRunLease,
+      "EXECUTION_RUN_RECLAIM_FAILED",
+      "Unable to reclaim the execution run lease.",
+      async (c, { projectSlug, runId, staleSeconds }) => await c.reclaimExecutionRunLease(projectSlug, runId, staleSeconds)
+    ),
+    [mcpToolNames.restartExecutionRun]: makeTool(
+      client,
+      mcpToolNames.restartExecutionRun,
+      "EXECUTION_RUN_RESTART_FAILED",
+      "Unable to restart the execution run.",
+      async (c, { projectSlug, runId, ...input }) => await c.restartExecutionRun(projectSlug, runId, input)
+    ),
     [mcpToolNames.resolveHandoff]: makeTool(
       client,
       mcpToolNames.resolveHandoff,
@@ -57274,47 +57649,19 @@ function createMrrlinTools(options) {
       "LOCAL_CHECKOUT_REGISTER_FAILED",
       "Unable to register local checkout.",
       async (_c, { projectSlug, path: checkoutPath, repo }) => {
-        const trimmedPath = checkoutPath.trim();
-        if (!import_node_path20.default.isAbsolute(trimmedPath)) {
-          throw new McpToolCodedError(
-            "LOCAL_CHECKOUT_PATH_NOT_ABSOLUTE",
-            `Path must be absolute, got: ${trimmedPath}`
-          );
-        }
-        let resolvedPath;
-        try {
-          resolvedPath = (0, import_node_fs15.realpathSync)(trimmedPath);
-        } catch {
-          throw new McpToolCodedError(
-            "LOCAL_CHECKOUT_PATH_NOT_FOUND",
-            `Path does not exist or is not accessible: ${trimmedPath}`
-          );
-        }
-        let remoteUrl;
-        try {
-          remoteUrl = (0, import_node_child_process12.execFileSync)("git", ["-C", resolvedPath, "remote", "get-url", "origin"], {
-            encoding: "utf8",
-            stdio: ["ignore", "pipe", "ignore"],
-            timeout: 15e3,
-            env: { ...process.env, GIT_TERMINAL_PROMPT: "0" }
-          }).trim();
-        } catch {
-          throw new McpToolCodedError(
-            "LOCAL_CHECKOUT_NOT_A_GIT_REPO",
-            `Path is not a git repository or has no origin remote: ${resolvedPath}`
-          );
-        }
-        if (!remoteMatchesRepo(remoteUrl, repo)) {
-          throw new McpToolCodedError(
-            "LOCAL_CHECKOUT_REMOTE_MISMATCH",
-            `Origin remote ${remoteUrl} does not match repo ${repo}.`
-          );
-        }
         const stateDir = process.env.CODEX_HOME ? import_node_path20.default.join(process.env.CODEX_HOME, "mrrlin", "director-bridge") : import_node_path20.default.join(import_node_os10.default.homedir(), ".mrrlin", "director-bridge");
         const registry3 = new CheckoutRegistry(stateDir);
-        const confirmedAt = (/* @__PURE__ */ new Date()).toISOString();
-        registry3.confirm(projectSlug, resolvedPath, confirmedAt);
-        return { projectSlug, path: resolvedPath, confirmedAt };
+        const result = registerCheckout(registry3, { projectSlug, path: checkoutPath, repo }, import_node_os10.default.hostname());
+        if (!result.ok) {
+          const codeMap = {
+            not_absolute: "LOCAL_CHECKOUT_PATH_NOT_ABSOLUTE",
+            not_found: "LOCAL_CHECKOUT_PATH_NOT_FOUND",
+            not_a_git_repo: "LOCAL_CHECKOUT_NOT_A_GIT_REPO",
+            remote_mismatch: "LOCAL_CHECKOUT_REMOTE_MISMATCH"
+          };
+          throw new McpToolCodedError(codeMap[result.code], result.detail);
+        }
+        return result.data;
       }
     ),
     [mcpToolNames.retrieveContext]: makeTool(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.3.55",
+  "version": "0.3.56",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"
@@ -21,12 +21,12 @@
     "@types/ws": "^8.18.1",
     "esbuild": "^0.24.0",
     "tsx": "^4.22.3",
-    "@mrrlin/client": "0.0.0",
-    "@mrrlin/codex-client": "0.0.0",
-    "@mrrlin/tsconfig": "0.0.0",
     "@mrrlin/director-e2e": "0.0.0",
     "@mrrlin/schemas": "0.0.0",
-    "@mrrlin/wiki": "0.0.0"
+    "@mrrlin/wiki": "0.0.0",
+    "@mrrlin/client": "0.0.0",
+    "@mrrlin/tsconfig": "0.0.0",
+    "@mrrlin/codex-client": "0.0.0"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",