automata-cli 0.1.0-feature-030-do-work.206 → 0.1.0-feature-030-do-work.210

package/dist/index.js

@@ -34,8 +34,9 @@ function writeDoWork(patch) {
   writeConfig({ ...current, doWork: { ...current.doWork, ...patch } });
 }
 function parseNonNegativeInt(value, label) {
-  const parsed = Number.parseInt(value, 10);
-  if (Number.isNaN(parsed) || parsed < 0 || String(parsed) !== value.trim()) {
+  const trimmed = value.trim();
+  const parsed = Number.parseInt(trimmed, 10);
+  if (Number.isNaN(parsed) || parsed < 0 || String(parsed) !== trimmed || !Number.isSafeInteger(parsed)) {
     process.stderr.write(`Error: ${label} must be a non-negative integer (got "${value}").
 `);
     process.exit(1);
@@ -722,7 +723,7 @@ function createTrackingBranch(branch) {
   return gitCommand(["checkout", "-b", branch, `origin/${branch}`]);
 }
 function fetchBranch(branch) {
-  return gitCommand(["fetch", "origin", branch]);
+  return gitCommand(["fetch", "origin", `+refs/heads/${branch}:refs/remotes/origin/${branch}`]);
 }
 function pullFastForwardOnly(branch) {
   return gitCommand(branch === void 0 ? ["pull", "--ff-only"] : ["pull", "--ff-only", "origin", branch]);
@@ -2494,6 +2495,7 @@ query($owner:String!,$repo:String!,$prNumber:Int!,$cursor:String){
         nodes{
           isResolved isOutdated path line
           comments(last:100){
+            pageInfo{ hasPreviousPage }
             nodes{ author{login} body createdAt }
           }
         }
@@ -2531,6 +2533,11 @@ function getReviewThreads(prNumber) {
     );
     const connection = response.data.repository.pullRequest.reviewThreads;
     for (const node of connection.nodes) {
+      if (node.comments.pageInfo?.hasPreviousPage) {
+        throw new Error(
+          `Review thread on ${node.path} in pull request #${String(prNumber)} has more than 100 comments, so the earliest ones were not read. Refusing rather than risk suppressing a maintainer's request.`
+        );
+      }
       threads.push({
         path: node.path,
         line: node.line ?? null,
@@ -2833,7 +2840,7 @@ function composePrompt(input) {
 }
 
 // src/run/runLock.ts
-import { writeFileSync, readFileSync as readFileSync3, unlinkSync, mkdirSync, renameSync } from "fs";
+import { writeFileSync, readFileSync as readFileSync3, unlinkSync, mkdirSync, renameSync, linkSync } from "fs";
 import { randomUUID } from "crypto";
 import { hostname } from "os";
 import { join as join2 } from "path";
@@ -2885,8 +2892,26 @@ function makeHandle(path, token) {
       if (current !== null && current.token !== token) {
         return;
       }
+      const takenAway = `${path}.releasing.${token}`;
+      try {
+        renameSync(path, takenAway);
+      } catch {
+        return;
+      }
+      const owner = readOwner(takenAway);
+      if (owner === null || owner.token === token) {
+        try {
+          unlinkSync(takenAway);
+        } catch {
+        }
+        return;
+      }
       try {
-        unlinkSync(path);
+        linkSync(takenAway, path);
+      } catch {
+      }
+      try {
+        unlinkSync(takenAway);
       } catch {
       }
     }
@@ -3043,8 +3068,8 @@ function resolveSettings(options) {
   if (agentUser.length === 0) {
     fail("No agent user configured. Run `automata config set agent-user <login>`.");
   }
+  validateDoWorkConfig(config.doWork);
   const doWork = config.doWork ?? {};
-  validateDoWorkConfig(doWork);
   let executor = doWork.executor ?? DEFAULT_DO_WORK.executor;
   if (options.with !== void 0) {
     const requested = options.with.toLowerCase();
@@ -3136,33 +3161,49 @@ function describePlannedRun(item, settings, run5) {
   ];
   return lines.join("\n") + "\n";
 }
-function validateDoWorkConfig(doWork) {
-  if (doWork.executor !== void 0 && doWork.executor !== "claude" && doWork.executor !== "codex") {
-    fail(`doWork.executor must be 'claude' or 'codex', got '${String(doWork.executor)}'.`);
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function validateOptionalString(container, key, path) {
+  const value = container[key];
+  if (value === void 0 || value === null) return;
+  if (typeof value !== "string" || value.trim().length === 0) {
+    fail(`${path} must be a non-empty string.`);
   }
-  if (doWork.baseBranch?.trim().length === 0) {
-    fail("doWork.baseBranch must not be empty.");
+}
+function validateOptionalInt(container, key, path, min, hint) {
+  const value = container[key];
+  if (value === void 0 || value === null) return;
+  if (typeof value !== "number" || !Number.isSafeInteger(value) || value < min) {
+    fail(`${path} must be ${hint}, got ${JSON.stringify(value)}.`);
   }
-  if (doWork.maxRunsPerTick !== void 0) {
-    if (!Number.isSafeInteger(doWork.maxRunsPerTick) || doWork.maxRunsPerTick < 0) {
-      fail(
-        `doWork.maxRunsPerTick must be a non-negative integer (0 = unlimited), got ${String(doWork.maxRunsPerTick)}.`
-      );
-    }
+}
+function validateDoWorkConfig(section) {
+  if (section === void 0 || section === null) return;
+  if (!isPlainObject(section)) {
+    fail(`doWork must be an object, got ${JSON.stringify(section)}.`);
   }
-  if (doWork.lockStaleMinutes !== void 0) {
-    if (!Number.isSafeInteger(doWork.lockStaleMinutes) || doWork.lockStaleMinutes <= 0) {
-      fail(`doWork.lockStaleMinutes must be a positive integer, got ${String(doWork.lockStaleMinutes)}.`);
-    }
+  const executor = section["executor"];
+  if (executor !== void 0 && executor !== "claude" && executor !== "codex") {
+    fail(`doWork.executor must be 'claude' or 'codex', got ${JSON.stringify(executor)}.`);
   }
-  for (const [key, value] of [
-    ["doWork.models.claude", doWork.models?.claude],
-    ["doWork.models.codex", doWork.models?.codex],
-    ["doWork.prompts.issueDiscuss", doWork.prompts?.issueDiscuss],
-    ["doWork.prompts.prWork", doWork.prompts?.prWork]
-  ]) {
-    if (value !== void 0 && (typeof value !== "string" || value.trim().length === 0)) {
-      fail(`${key} must be a non-empty string.`);
+  validateOptionalString(section, "baseBranch", "doWork.baseBranch");
+  validateOptionalInt(section, "maxRunsPerTick", "doWork.maxRunsPerTick", 0, "a non-negative integer (0 = unlimited)");
+  validateOptionalInt(section, "lockStaleMinutes", "doWork.lockStaleMinutes", 1, "a positive integer");
+  for (const container of ["models", "prompts"]) {
+    const value = section[container];
+    if (value === void 0 || value === null) continue;
+    if (!isPlainObject(value)) {
+      fail(`doWork.${container} must be an object, got ${JSON.stringify(value)}.`);
+    }
+    const keys = container === "models" ? ["claude", "codex"] : ["issueDiscuss", "prWork"];
+    for (const key of keys) {
+      validateOptionalString(value, key, `doWork.${container}.${key}`);
+    }
+    for (const key of Object.keys(value)) {
+      if (!keys.includes(key)) {
+        fail(`doWork.${container}.${key} is not a recognised setting; expected one of: ${keys.join(", ")}.`);
+      }
     }
   }
 }
@@ -3360,6 +3401,21 @@ async function processItem(planned, settings, silent) {
 `);
     }
   }
+  if (item.turn === "pr-work" && item.pr && item.issueAnalysis.hasNewMessage) {
+    try {
+      postMarker(
+        "issue",
+        item.issue.number,
+        `automata do-work: picked this up on pull request #${String(item.pr.number)} \u2014 ${item.pr.url}`
+      );
+      progress(`  noted on issue #${String(item.issue.number)} that the work is on pull request #${String(item.pr.number)}.
+`);
+    } catch (err) {
+      progress(`  skipped: could not note the pickup on issue #${String(item.issue.number)} \u2014 ${err.message}
+`);
+      return { ...base, outcome: "skipped", detail: `issue pickup note failed: ${err.message}` };
+    }
+  }
   let marker;
   const markerSurface = item.turn === "pr-work" && item.pr ? item.pr.number : item.issue.number;
   try {
@@ -3410,10 +3466,15 @@ var doWorkCommand = new Command6("do-work").description(
   const settings = resolveSettings(options);
   const lock = acquireRunLock("do-work", settings.lockStaleMinutes);
   if (!lock.ok) {
-    out(
-      `Another automata instance is already running here (pid ${String(lock.heldBy.pid)} on ${lock.heldBy.host}, started ${lock.heldBy.startedAt}, command ${lock.heldBy.command}). Doing nothing.
-`
-    );
+    const held = lock.heldBy;
+    const sentence = `Another automata instance is already running here (pid ${String(held.pid)} on ${held.host}, started ${held.startedAt}, command ${held.command}). Doing nothing.
+`;
+    if (options.json === true) {
+      progress(sentence);
+      out(JSON.stringify({ lockHeld: true, heldBy: held, plan: [], items: [], exitCode: 0 }, null, 2) + "\n");
+    } else {
+      out(sentence);
+    }
     return;
   }
   const handle = lock.handle;
@@ -3473,7 +3534,20 @@ ${describePlan(decisions)}`;
       deferred.push(item);
       continue;
     }
-    const report = await processItem(item, settings, options.silent === true);
+    let report;
+    try {
+      report = await processItem(item, settings, options.silent === true);
+    } catch (err) {
+      progress(`  failed: ${err.message}
+`);
+      report = {
+        issue: item.issue.number,
+        title: item.issue.title,
+        turn: item.turn,
+        outcome: "failed",
+        detail: err.message
+      };
+    }
     if (report.outcome !== "skipped") runsUsed++;
     reports.push(report);
   }

package/package.json

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