@m8t-stack/cli 0.2.66 → 0.2.67

package/dist/cli.js

@@ -1364,7 +1364,7 @@ var init_enable_hosted_brain = __esm({
 import { Builtins, Cli } from "clipanion";
 
 // src/lib/package-version.ts
-var CLI_VERSION = "0.2.66";
+var CLI_VERSION = "0.2.67";
 
 // src/lib/render-error.ts
 init_errors();
@@ -21295,6 +21295,7 @@ function resolveHeadlessContextFromEnv(env) {
 
 // src/lib/apply-request-store.ts
 import { TableClient as TableClient4 } from "@azure/data-tables";
+var MAX_LEASE_TAKEOVERS = 2;
 async function openApplyTable(opts) {
   const { tableEndpoint } = await discoverStampStorage(opts);
   return new TableClient4(tableEndpoint, "Metadata", opts.credential);
@@ -21314,12 +21315,37 @@ async function readApplyRequest(client) {
 async function claimApplyRequest(client, executionId, nowIso, leaseMs) {
   const cur = await readApplyRequest(client);
   if (!cur) return null;
-  const leaseExpired = cur.status === "claimed" && cur.leaseUntil !== null && Date.parse(cur.leaseUntil) < Date.parse(nowIso);
+  const leaseExpired = isInFlight(cur.status) && cur.leaseUntil !== null && Date.parse(cur.leaseUntil) < Date.parse(nowIso);
   const claimable = cur.status === "pending" || cur.status === "awaiting-engine-update" || leaseExpired;
   if (!claimable) return null;
   const nowMs = Date.parse(nowIso);
   const leaseUntil = new Date((Number.isNaN(nowMs) ? Date.now() : nowMs) + leaseMs).toISOString();
-  const claimed = { ...cur, status: "claimed", claimedBy: executionId, leaseUntil, updatedAt: nowIso };
+  if (leaseExpired && cur.attempt >= MAX_LEASE_TAKEOVERS) {
+    const held = {
+      ...cur,
+      status: "held",
+      breaker: "held",
+      result: {
+        appliedVersion: cur.result?.appliedVersion ?? null,
+        error: `the converge was abandoned mid-apply ${(cur.attempt + 1).toString()} times (last owner ${cur.claimedBy ?? "(unknown)"}, phase "${cur.phase ?? "(none)"}"); the updater stopped retrying to avoid re-rolling infra behind a converge that cannot finish`
+      },
+      updatedAt: nowIso
+    };
+    try {
+      await client.updateEntity({ ...applyRequestToEntity(held), etag: cur.etag }, "Merge", { etag: cur.etag });
+    } catch (e) {
+      if (!hasStatus(e, 412)) throw e;
+    }
+    return null;
+  }
+  const claimed = {
+    ...cur,
+    status: "claimed",
+    claimedBy: executionId,
+    leaseUntil,
+    ...leaseExpired ? { attempt: cur.attempt + 1 } : {},
+    updatedAt: nowIso
+  };
   try {
     await client.updateEntity({ ...applyRequestToEntity(claimed), etag: cur.etag }, "Merge", { etag: cur.etag });
     return claimed;