@mrrlin-dev/mcp 0.4.130 → 0.4.132

package/dist/bin.cjs

@@ -58644,7 +58644,7 @@ function indexOutside(worktreePath, files) {
   const conflicted = new Set(files);
   return git(worktreePath, ["ls-files", "-s"]).split("\n").filter((line) => {
     const match = /^(\d+) ([0-9a-f]+) (\d)\t(.*)$/.exec(line);
-    return match !== null && match[3] === "0" && !conflicted.has(match[4]);
+    return match !== null && match[3] === "0" && !conflicted.has(match[4] ?? "");
   }).sort().join("\n");
 }
 function integrationCommitMessage(defaultBranch, runId) {
@@ -58721,7 +58721,7 @@ function verifyIntegrationResolved(input) {
     const conflicted = new Set(input.files);
     const strays = gitRaw(input.worktreePath, ["status", "--porcelain", "--untracked-files=all"]).split("\n").filter((line) => line.length > 3).filter((line) => line.startsWith("??") || line[1] !== " ").map((line) => {
       const entry = line.slice(3);
-      return entry.includes(" -> ") ? entry.split(" -> ")[1] : entry;
+      return entry.includes(" -> ") ? entry.split(" -> ")[1] ?? entry : entry;
     }).filter((file2) => !conflicted.has(file2));
     if (strays.length > 0) {
       return { ok: false, reason: "changed_outside_conflicts", detail: strays.join(", ") };
@@ -63639,7 +63639,7 @@ Do NOT derail the current task - if the operator has an in-flight question, answ
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.4.130";
+var PKG_VERSION = "0.4.132";
 
 // src/bridge-allowed-origins.ts
 var DEFAULT_DIRECTOR_BRIDGE_ALLOWED_ORIGINS = [
@@ -68594,7 +68594,9 @@ Continue executing task ${task.id}. Make the next concrete increment of progress
               if (delivery.settled || !merge2?.mergeSha) throw error51;
               const message = error51 instanceof Error ? error51.message : String(error51);
               const acted = await failRun(deps, projectSlug, deliveryTask, runId, leaseId, `local_delivery_failed: ${message}`);
-              if (!acted || /lease/i.test(message)) {
+              const state = await readSettlementState(deps, projectSlug, deliveryTask.id, runId, 1);
+              const settledElsewhere = !state || state.runDone || state.taskTerminal;
+              if ((!acted || /lease/i.test(message)) && !settledElsewhere) {
                 try {
                   restoreRunBranch({
                     worktreePath: deliveryWorktree,
@@ -69499,33 +69501,42 @@ async function integrateBeforeReceipt(deps, ctx) {
 }
 async function deliverLocalRun(deps, input) {
   const { projectSlug, task, runId, leaseId } = input;
-  const restoreForLostLease = () => {
-    if (input.integration?.mergeSha) {
-      try {
-        restoreRunBranch({
-          worktreePath: input.worktreePath,
-          runId,
-          preMergeHead: input.integration.preMergeHead,
-          expectedCurrent: input.integration.mergeSha,
-          // deliverLocalRun runs inside driveRun's delivery lock, keyed by this same checkout.
-          deliveryLock: { locksDir: deps.locksDir ?? "/tmp/mrrlin-locks", key: deliveryLockKey(input.checkoutRealPath) }
-        });
-      } catch (error51) {
-        console.warn(JSON.stringify({
-          event: "local_integration_restore_failed",
-          projectSlug,
-          runId,
-          error: error51 instanceof Error ? error51.message : String(error51)
-        }));
-      }
+  const restoreForLostLease = async () => {
+    if (!input.integration?.mergeSha) return;
+    const settledNow = await readSettlementState(deps, projectSlug, task.id, runId, 1);
+    if (!settledNow || settledNow.runDone || settledNow.taskTerminal) {
+      console.warn(JSON.stringify({
+        event: "local_integration_restore_skipped",
+        projectSlug,
+        runId,
+        reason: settledNow ? "run_settled" : "state_unreadable"
+      }));
+      return;
+    }
+    try {
+      restoreRunBranch({
+        worktreePath: input.worktreePath,
+        runId,
+        preMergeHead: input.integration.preMergeHead,
+        expectedCurrent: input.integration.mergeSha,
+        // deliverLocalRun runs inside driveRun's delivery lock, keyed by this same checkout.
+        deliveryLock: { locksDir: deps.locksDir ?? "/tmp/mrrlin-locks", key: deliveryLockKey(input.checkoutRealPath) }
+      });
+    } catch (error51) {
+      console.warn(JSON.stringify({
+        event: "local_integration_restore_failed",
+        projectSlug,
+        runId,
+        error: error51 instanceof Error ? error51.message : String(error51)
+      }));
     }
   };
   const handOff = async (reason) => {
     if (!await runHasLease(deps, projectSlug, runId, leaseId)) {
-      restoreForLostLease();
+      await restoreForLostLease();
       return;
     }
-    if (!await failRun(deps, projectSlug, task, runId, leaseId, reason)) restoreForLostLease();
+    if (!await failRun(deps, projectSlug, task, runId, leaseId, reason)) await restoreForLostLease();
   };
   if (!input.baseSha) {
     await handOff(`local_delivery_failed: run ${runId} has no recorded base commit.`);
@@ -69561,7 +69572,7 @@ async function deliverLocalRun(deps, input) {
     return;
   }
   if (!await runHasLease(deps, projectSlug, runId, leaseId)) {
-    restoreForLostLease();
+    await restoreForLostLease();
     return;
   }
   await deps.client.updateExecutionRun(projectSlug, runId, {
@@ -69601,7 +69612,7 @@ async function deliverLocalRun(deps, input) {
   const stored = artifact?.payload ?? {};
   const contentHash = String(stored.contentHash ?? stored.content_hash ?? stored.hash ?? "");
   if (!await runHasLease(deps, projectSlug, runId, leaseId)) {
-    restoreForLostLease();
+    await restoreForLostLease();
     return;
   }
   try {
@@ -69621,8 +69632,19 @@ async function deliverLocalRun(deps, input) {
       }
     );
   } catch (error51) {
-    await handOff(`local_delivery_settlement_failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
-    return;
+    const message = error51 instanceof Error ? error51.message : String(error51);
+    const outcome2 = await readSettlementState(deps, projectSlug, task.id, runId, SETTLEMENT_READBACK_ATTEMPTS);
+    if (!outcome2 || outcome2.taskStatus !== "closed_done" || !outcome2.runDone) {
+      await handOff(`local_delivery_settlement_failed: ${message}`);
+      return;
+    }
+    console.warn(JSON.stringify({
+      event: "settlement_outcome_recovered",
+      projectSlug,
+      runId,
+      taskId: task.id,
+      error: message
+    }));
   }
   if (input.delivery) input.delivery.settled = true;
   const locksDir = deps.locksDir ?? "/tmp/mrrlin-locks";
@@ -69697,6 +69719,23 @@ async function deliverLocalRun(deps, input) {
   }).catch(() => {
   });
 }
+var SETTLEMENT_READBACK_ATTEMPTS = 3;
+async function readSettlementState(deps, projectSlug, taskId, runId, attempts) {
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    try {
+      const current2 = await deps.client.getTask(projectSlug, taskId);
+      const run3 = await deps.client.getExecutionRun(projectSlug, runId);
+      return {
+        taskStatus: current2.status,
+        taskTerminal: mrrlinTerminalTaskStatuses.includes(current2.status),
+        runDone: run3.status === "done"
+      };
+    } catch {
+      if (attempt < attempts) await delayMs(LANDING_RUN_READ_BACKOFF_MS * attempt);
+    }
+  }
+  return null;
+}
 var LANDING_RUN_READ_ATTEMPTS = 3;
 var LANDING_RUN_READ_BACKOFF_MS = 250;
 async function failRun(deps, projectSlug, task, runId, leaseId, reason, reasonCode) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.4.130",
+  "version": "0.4.132",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"