automata-cli 0.1.0-feature-030-do-work.204 → 0.1.0-feature-030-do-work.208

package/dist/{ConfigWizard-26Y5YBF7.js → ConfigWizard-OYNUMRTO.js}

@@ -73,7 +73,7 @@ function handleMenu(input, key, menu, cancel) {
     cancel();
   }
 }
-function TextEntryScreen({ title, label, value, hint }) {
+function TextEntryScreen({ title, label, value, hint, error }) {
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginY: 1, children: [
     /* @__PURE__ */ jsx(Text, { bold: true, children: title }),
     /* @__PURE__ */ jsx(Text, { children: " " }),
@@ -85,7 +85,7 @@ function TextEntryScreen({ title, label, value, hint }) {
         /* @__PURE__ */ jsx(Text, { children: "_" })
       ] })
     ] }),
-    /* @__PURE__ */ jsx(Text, { children: " " }),
+    error ? /* @__PURE__ */ jsx(Text, { color: "red", children: error }) : /* @__PURE__ */ jsx(Text, { children: " " }),
     /* @__PURE__ */ jsx(Text, { dimColor: true, children: hint })
   ] });
 }
@@ -102,6 +102,12 @@ function MenuEntryScreen({ title, options, index, hint }) {
   ] });
 }
 var BACK = "Esc to go back \xB7 Ctrl+C to cancel";
+function parseWholeInt(value) {
+  const trimmed = value.trim();
+  if (!/^\d+$/.test(trimmed)) return null;
+  const parsed = Number(trimmed);
+  return Number.isSafeInteger(parsed) ? parsed : null;
+}
 function savePrompt(filename, content, merge) {
   let value;
   if (content) {
@@ -143,6 +149,10 @@ function ConfigWizard() {
   const [doWorkExecutorIndex, setDoWorkExecutorIndex] = useState(Math.max(initialExecutorIndex, 0));
   const [doWorkClaudeModel, setDoWorkClaudeModel] = useState(existing.doWork?.models?.claude ?? "");
   const [doWorkCodexModel, setDoWorkCodexModel] = useState(existing.doWork?.models?.codex ?? "");
+  const [doWorkLockStale, setDoWorkLockStale] = useState(
+    String(existing.doWork?.lockStaleMinutes ?? DEFAULT_DO_WORK.lockStaleMinutes)
+  );
+  const [validationError, setValidationError] = useState("");
   const [doWorkMaxRuns, setDoWorkMaxRuns] = useState(
     String(existing.doWork?.maxRunsPerTick ?? DEFAULT_DO_WORK.maxRunsPerTick)
   );
@@ -250,10 +260,33 @@ function ConfigWizard() {
       onBack: () => setScreen("do-work-claude-model")
     },
     "do-work-max-runs": {
-      setValue: setDoWorkMaxRuns,
+      setValue: (update) => {
+        setValidationError("");
+        setDoWorkMaxRuns(update);
+      },
       onSubmit: () => {
-        const trimmedMaxRuns = doWorkMaxRuns.trim();
-        const parsedMaxRuns = /^\d+$/.test(trimmedMaxRuns) ? Number(trimmedMaxRuns) : Number.NaN;
+        const parsed = parseWholeInt(doWorkMaxRuns);
+        if (parsed === null || parsed < 0) {
+          setValidationError("Enter a non-negative whole number (0 = unlimited).");
+          return;
+        }
+        setValidationError("");
+        setScreen("do-work-lock-stale");
+      },
+      onBack: () => setScreen("do-work-codex-model")
+    },
+    "do-work-lock-stale": {
+      setValue: (update) => {
+        setValidationError("");
+        setDoWorkLockStale(update);
+      },
+      onSubmit: () => {
+        const parsed = parseWholeInt(doWorkLockStale);
+        if (parsed === null || parsed <= 0) {
+          setValidationError("Enter a whole number of minutes greater than zero.");
+          return;
+        }
+        const maxRuns = parseWholeInt(doWorkMaxRuns);
         const current = readRawConfig();
         writeConfig({
           ...current,
@@ -265,12 +298,13 @@ function ConfigWizard() {
               claude: doWorkClaudeModel.trim() || void 0,
               codex: doWorkCodexModel.trim() || void 0
             },
-            maxRunsPerTick: Number.isSafeInteger(parsedMaxRuns) && parsedMaxRuns >= 0 ? parsedMaxRuns : void 0
+            maxRunsPerTick: maxRuns ?? void 0,
+            lockStaleMinutes: parsed
           }
         });
         exit();
       },
-      onBack: () => setScreen("do-work-codex-model")
+      onBack: () => setScreen("do-work-max-runs")
     },
     "do-work-discuss-prompt": {
       setValue: setDoWorkDiscussPrompt,
@@ -421,6 +455,12 @@ function ConfigWizard() {
       title: "Do Work \u2014 Max Runs Per Tick",
       label: "Model runs allowed per tick (0 = unlimited):",
       value: doWorkMaxRuns,
+      hint: `Type a number \xB7 Enter to continue \xB7 ${BACK}`
+    },
+    "do-work-lock-stale": {
+      title: "Do Work \u2014 Lock Staleness",
+      label: "Minutes before a run lock from another host is treated as stale:",
+      value: doWorkLockStale,
       hint: `Type a number \xB7 Enter to save \xB7 ${BACK}`
     },
     "do-work-discuss-prompt": {
@@ -469,7 +509,7 @@ function ConfigWizard() {
     }
   };
   const textView = textViews[screen];
-  if (textView) return /* @__PURE__ */ jsx(TextEntryScreen, { ...textView });
+  if (textView) return /* @__PURE__ */ jsx(TextEntryScreen, { ...textView, error: validationError });
   const menuView = menuViews[screen];
   if (menuView) return /* @__PURE__ */ jsx(MenuEntryScreen, { ...menuView });
   return null;

package/dist/index.js

@@ -183,7 +183,7 @@ var configCommand = new Command("config").description("Configure automata settin
   const [{ render }, React, { ConfigWizard }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./ConfigWizard-26Y5YBF7.js")
+    import("./ConfigWizard-OYNUMRTO.js")
   ]);
   const { waitUntilExit } = render(React.createElement(ConfigWizard));
   await waitUntilExit();
@@ -1529,29 +1529,38 @@ function trackChild(child) {
 function untrackChild(child) {
   active.delete(child);
 }
-function terminateTrackedChildren(timeoutMs = 1e4) {
+function waitForExit(child) {
+  return new Promise((resolve2) => {
+    if (child.exitCode !== null || child.signalCode !== null) {
+      resolve2();
+      return;
+    }
+    child.once("exit", () => resolve2());
+  });
+}
+function afterDelay(ms) {
+  return new Promise((resolve2) => {
+    const timer = setTimeout(() => resolve2("timeout"), ms);
+    timer.unref();
+  });
+}
+async function terminateTrackedChildren(timeoutMs = 1e4, killGraceMs = 5e3) {
   const children = [...active];
-  if (children.length === 0) return Promise.resolve();
-  const exits = children.map(
-    (child) => new Promise((resolve2) => {
-      if (child.exitCode !== null || child.signalCode !== null) {
-        resolve2();
-        return;
-      }
-      child.once("exit", () => resolve2());
-      child.kill("SIGTERM");
-    })
-  );
-  return Promise.race([
-    Promise.all(exits).then(() => void 0),
-    new Promise((resolve2) => {
-      const timer = setTimeout(() => {
-        for (const child of children) child.kill("SIGKILL");
-        resolve2();
-      }, timeoutMs);
-      timer.unref();
-    })
+  if (children.length === 0) return true;
+  const exits = children.map((child) => waitForExit(child));
+  for (const child of children) {
+    if (child.exitCode === null && child.signalCode === null) child.kill("SIGTERM");
+  }
+  const settled = await Promise.race([Promise.all(exits).then(() => "exited"), afterDelay(timeoutMs)]);
+  if (settled === "exited") return true;
+  for (const child of children) {
+    if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
+  }
+  const escalated = await Promise.race([
+    Promise.all(exits).then(() => "exited"),
+    afterDelay(killGraceMs)
   ]);
+  return escalated === "exited";
 }
 
 // src/claude/claudeService.ts
@@ -2916,23 +2925,32 @@ var UNKNOWN_OWNER = {
   command: "unknown",
   token: ""
 };
+function claimStaleLock(path, token) {
+  try {
+    renameSync(path, `${path}.stale.${token}`);
+    return true;
+  } catch (err) {
+    if (err.code === "ENOENT") return false;
+    throw err;
+  }
+}
 function reclaim(path, command, token) {
-  const candidate = `${path}.${token}`;
+  if (!claimStaleLock(path, token)) {
+    return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER };
+  }
+  const claimed = `${path}.stale.${token}`;
   try {
-    write(candidate, command, token, "w");
-    renameSync(candidate, path);
+    write(path, command, token, "wx");
+    return { ok: true, handle: makeHandle(path, token) };
   } catch (err) {
+    if (err.code !== "EEXIST") throw err;
+    return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER };
+  } finally {
     try {
-      unlinkSync(candidate);
+      unlinkSync(claimed);
     } catch {
     }
-    throw err;
   }
-  const winner = readOwner(path);
-  if (winner !== null && winner.token === token) {
-    return { ok: true, handle: makeHandle(path, token) };
-  }
-  return { ok: false, heldBy: winner ?? UNKNOWN_OWNER };
 }
 
 // src/git/workspaceService.ts
@@ -3202,7 +3220,8 @@ function describePlan(decisions) {
   });
   return lines.length === 0 ? "  (no issues matched the discovery filter)\n" : lines.join("\n") + "\n";
 }
-function refreshItem(item, settings, linkMap) {
+function refreshItem(item, settings) {
+  const linkMap = getOpenPrLinkMap();
   return decideWork(
     buildIssueState(item.issue, linkMap),
     settings.participants,
@@ -3299,26 +3318,32 @@ function repairIssueLink(item, baseBranch) {
 `);
   }
 }
-async function processItem(planned, settings, linkMap, silent) {
-  const base = {
-    issue: planned.issue.number,
-    title: planned.issue.title,
-    turn: planned.turn
-  };
+async function processItem(planned, settings, silent) {
   progress(`
 #${String(planned.issue.number)} ${planned.turn}: ${planned.reason}
 `);
-  const refreshed = refreshItem(planned, settings, linkMap);
+  const refreshed = refreshItem(planned, settings);
   if (refreshed.kind === "skip") {
     progress(`  skipped: ${refreshed.detail}
 `);
-    return { ...base, outcome: "skipped", detail: `no longer actionable: ${refreshed.detail}` };
+    return {
+      issue: planned.issue.number,
+      title: planned.issue.title,
+      turn: planned.turn,
+      outcome: "skipped",
+      detail: `no longer actionable: ${refreshed.detail}`
+    };
   }
   const item = refreshed.item;
   if (item.turn !== planned.turn) {
     progress(`  turn changed to ${item.turn} since the plan was built; using the current state.
 `);
   }
+  const base = {
+    issue: item.issue.number,
+    title: item.issue.title,
+    turn: item.turn
+  };
   const prepared = item.turn === "issue-discuss" ? prepareBaseBranch(item.branch) : preparePrBranch(item.branch);
   if (!prepared.ok) {
     progress(`  skipped: ${prepared.reason} \u2014 ${prepared.detail}
@@ -3397,8 +3422,14 @@ var doWorkCommand = new Command6("do-work").description(
     if (shuttingDown) return;
     shuttingDown = true;
     progress("\nInterrupted: stopping the executor before releasing the run lock\u2026\n");
-    void terminateTrackedChildren().then(() => {
-      handle.release();
+    void terminateTrackedChildren().then((allExited) => {
+      if (allExited) {
+        handle.release();
+      } else {
+        progress(
+          "Warning: could not confirm the executor exited; leaving the run lock in place. Check for a stray executor process before the next tick.\n"
+        );
+      }
       process.exit(130);
     });
   };
@@ -3434,11 +3465,17 @@ ${describePlan(decisions)}`;
     reportDryRun(items, decisions, settings, options);
     return 0;
   }
-  const runnable = settings.maxRuns > 0 ? items.slice(0, settings.maxRuns) : items;
-  const deferred = items.slice(runnable.length);
   const reports = [];
-  for (const item of runnable) {
-    reports.push(await processItem(item, settings, linkMap, options.silent === true));
+  const deferred = [];
+  let runsUsed = 0;
+  for (const item of items) {
+    if (settings.maxRuns > 0 && runsUsed >= settings.maxRuns) {
+      deferred.push(item);
+      continue;
+    }
+    const report = await processItem(item, settings, options.silent === true);
+    if (report.outcome !== "skipped") runsUsed++;
+    reports.push(report);
   }
   for (const item of deferred) {
     progress(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automata-cli",
-  "version": "0.1.0-feature-030-do-work.204",
+  "version": "0.1.0-feature-030-do-work.208",
   "description": "Automata CLI tool",
   "type": "module",
   "bin": {