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

package/dist/index.js

@@ -2431,22 +2431,24 @@ query($owner:String!,$repo:String!,$cursor:String){
     pullRequests(states:OPEN, first:100, after:$cursor, orderBy:{field:UPDATED_AT, direction:DESC}){
       pageInfo{ hasNextPage endCursor }
       nodes{
-        number url title headRefName isDraft updatedAt
+        number url title headRefName baseRefName isCrossRepository isDraft updatedAt
         closingIssuesReferences(first:50){
           pageInfo{ hasNextPage }
-          nodes{ number }
+          nodes{ number repository{ nameWithOwner } }
         }
       }
     }
   }
 }`.trim();
 var MAX_LINK_MAP_PAGES = 50;
-function indexPullRequest(map, node) {
+function indexPullRequest(map, node, nameWithOwner) {
   const ref = {
     number: node.number,
     url: node.url,
     title: node.title,
     headRefName: node.headRefName,
+    baseRefName: node.baseRefName,
+    isCrossRepository: node.isCrossRepository,
     state: "OPEN",
     isDraft: node.isDraft,
     updatedAt: node.updatedAt
@@ -2457,6 +2459,7 @@ function indexPullRequest(map, node) {
     );
   }
   for (const issue of node.closingIssuesReferences.nodes) {
+    if (issue.repository.nameWithOwner !== nameWithOwner) continue;
     const existing = map.get(issue.number);
     if (existing) {
       existing.push(ref);
@@ -2475,7 +2478,7 @@ function getOpenPrLinkMap() {
     const response = ghJson(args, "query open pull requests");
     const connection = response.data.repository.pullRequests;
     for (const node of connection.nodes) {
-      indexPullRequest(map, node);
+      indexPullRequest(map, node, `${owner}/${repo}`);
     }
     if (!connection.pageInfo?.hasNextPage || connection.pageInfo.endCursor === null) {
       return map;
@@ -2566,7 +2569,7 @@ function getPrSurface(prNumber) {
       "view",
       String(prNumber),
       "--json",
-      "number,title,url,headRefName,state,isDraft,body,author,createdAt,updatedAt,comments,reviews"
+      "number,title,url,headRefName,baseRefName,isCrossRepository,state,isDraft,body,author,createdAt,updatedAt,comments,reviews"
     ],
     `read pull request #${String(prNumber)}`
   );
@@ -2594,6 +2597,8 @@ function getPrSurface(prNumber) {
       url: raw.url,
       title: raw.title,
       headRefName: raw.headRefName,
+      baseRefName: raw.baseRefName ?? "",
+      isCrossRepository: raw.isCrossRepository ?? false,
       state,
       isDraft: raw.isDraft ?? false,
       updatedAt: raw.updatedAt ?? raw.createdAt
@@ -2719,7 +2724,24 @@ function decideWork(state, p, baseBranch) {
     };
   }
   const surface = prSurface;
-  const prAnalysis = analyzeSurface(surface.messages, p);
+  if (surface.pr.isCrossRepository) {
+    return {
+      kind: "skip",
+      issue,
+      reason: "unsafe-pr-branch",
+      detail: `pull request #${String(surface.pr.number)} comes from a fork; its head branch is not in this repository`
+    };
+  }
+  if (surface.pr.headRefName === baseBranch) {
+    return {
+      kind: "skip",
+      issue,
+      reason: "unsafe-pr-branch",
+      detail: `pull request #${String(surface.pr.number)} has the base branch (${baseBranch}) as its head`
+    };
+  }
+  const agentThreadMessages = surface.threads.flatMap((thread) => thread.comments).filter((comment) => comment.author.toLowerCase() === p.agentUser.toLowerCase());
+  const prAnalysis = analyzeSurface([...surface.messages, ...agentThreadMessages], p);
   const actionableThreads = findActionableThreads(surface.threads, p);
   const hasPrWork = prAnalysis.hasNewMessage || actionableThreads.length > 0;
   if (!hasPrWork && !issueAnalysis.hasNewMessage) {
@@ -2850,6 +2872,16 @@ var RUN_LOCK_RELATIVE_PATH = `${LOCK_DIR}/${LOCK_FILE}`;
 function lockPath() {
   return join2(process.cwd(), LOCK_DIR, LOCK_FILE);
 }
+function processStartedAt(pid) {
+  try {
+    const stat = readFileSync3(`/proc/${String(pid)}/stat`, "utf8");
+    const afterComm = stat.slice(stat.lastIndexOf(")") + 2);
+    const field = afterComm.split(" ")[19];
+    return field === void 0 || field.length === 0 ? null : field;
+  } catch {
+    return null;
+  }
+}
 function isAlive(pid) {
   try {
     process.kill(pid, 0);
@@ -2867,7 +2899,8 @@ function readOwner(path) {
       startedAt: parsed.startedAt,
       host: parsed.host ?? "unknown",
       command: parsed.command ?? "unknown",
-      token: parsed.token ?? ""
+      token: parsed.token ?? "",
+      pidStartedAt: parsed.pidStartedAt
     };
   } catch {
     return null;
@@ -2876,12 +2909,24 @@ function readOwner(path) {
 function isStale(owner, staleMinutes) {
   if (owner === null) return true;
   if (owner.host === hostname()) {
-    return !isAlive(owner.pid);
+    if (!isAlive(owner.pid)) return true;
+    const startedAt2 = processStartedAt(owner.pid);
+    if (owner.pidStartedAt !== void 0 && startedAt2 !== null && startedAt2 !== owner.pidStartedAt) {
+      return true;
+    }
+    return false;
   }
   const startedAt = Date.parse(owner.startedAt);
   if (Number.isNaN(startedAt)) return true;
   return Date.now() - startedAt > staleMinutes * 60 * 1e3;
 }
+function heldTooLong(owner, staleMinutes) {
+  if (owner.host !== hostname()) return false;
+  if (owner.pidStartedAt !== void 0 && processStartedAt(owner.pid) !== null) return false;
+  const startedAt = Date.parse(owner.startedAt);
+  if (Number.isNaN(startedAt)) return true;
+  return Date.now() - startedAt > staleMinutes * 60 * 1e3;
+}
 function makeHandle(path, token) {
   let released = false;
   return {
@@ -2923,7 +2968,8 @@ function write(path, command, token, flag = "wx") {
     startedAt: (/* @__PURE__ */ new Date()).toISOString(),
     host: hostname(),
     command,
-    token
+    token,
+    pidStartedAt: processStartedAt(process.pid) ?? void 0
   };
   writeFileSync(path, JSON.stringify(owner, null, 2) + "\n", { encoding: "utf8", flag });
 }
@@ -2939,9 +2985,10 @@ function acquireRunLock(command, staleMinutes) {
   }
   const owner = readOwner(path);
   if (!isStale(owner, staleMinutes)) {
-    return { ok: false, heldBy: owner };
+    const held = owner;
+    return { ok: false, heldBy: held, suspect: heldTooLong(held, staleMinutes) };
   }
-  return reclaim(path, command, token);
+  return reclaim(path, command, token, owner);
 }
 var UNKNOWN_OWNER = {
   pid: 0,
@@ -2950,18 +2997,34 @@ var UNKNOWN_OWNER = {
   command: "unknown",
   token: ""
 };
-function claimStaleLock(path, token) {
+function claimStaleLock(path, token, expected) {
+  const claimed = `${path}.stale.${token}`;
   try {
-    renameSync(path, `${path}.stale.${token}`);
-    return true;
+    renameSync(path, claimed);
   } catch (err) {
     if (err.code === "ENOENT") return false;
     throw err;
   }
+  if (expected !== void 0) {
+    const taken = readOwner(claimed);
+    const sameFile = expected === null && taken === null || expected !== null && taken !== null && taken.token === expected.token;
+    if (!sameFile) {
+      try {
+        linkSync(claimed, path);
+      } catch {
+      }
+      try {
+        unlinkSync(claimed);
+      } catch {
+      }
+      return false;
+    }
+  }
+  return true;
 }
-function reclaim(path, command, token) {
-  if (!claimStaleLock(path, token)) {
-    return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER };
+function reclaim(path, command, token, expected) {
+  if (!claimStaleLock(path, token, expected)) {
+    return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER, suspect: false };
   }
   const claimed = `${path}.stale.${token}`;
   try {
@@ -2969,7 +3032,7 @@ function reclaim(path, command, token) {
     return { ok: true, handle: makeHandle(path, token) };
   } catch (err) {
     if (err.code !== "EEXIST") throw err;
-    return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER };
+    return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER, suspect: false };
   } finally {
     try {
       unlinkSync(claimed);
@@ -3020,6 +3083,7 @@ function preparePrBranch(headRefName) {
 }
 
 // src/commands/doWork.ts
+var inFlightMarker = null;
 function out(message) {
   process.stdout.write(message);
 }
@@ -3261,6 +3325,40 @@ function describePlan(decisions) {
   });
   return lines.length === 0 ? "  (no issues matched the discovery filter)\n" : lines.join("\n") + "\n";
 }
+function claimIssue(item, settings) {
+  if (!item.needsAssignment) return;
+  try {
+    assignIssueToAgent(item.issue.number, settings.participants.agentUser);
+    progress(`  assigned issue #${String(item.issue.number)} to ${settings.participants.agentUser}.
+`);
+  } catch (err) {
+    progress(`  warning: could not assign issue #${String(item.issue.number)}: ${err.message}
+`);
+  }
+}
+function notePickupOnIssue(item, marker) {
+  if (item.turn !== "pr-work" || item.pr === null || !item.issueAnalysis.hasNewMessage) return true;
+  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)}.
+`);
+    return true;
+  } catch (err) {
+    progress(`  skipped: could not note the pickup on issue #${String(item.issue.number)} \u2014 ${err.message}
+`);
+    try {
+      deleteMarker(marker);
+    } catch (deleteErr) {
+      progress(`  warning: could not withdraw the working marker: ${deleteErr.message}
+`);
+    }
+    return false;
+  }
+}
 function refreshItem(item, settings) {
   const linkMap = getOpenPrLinkMap();
   return decideWork(
@@ -3269,6 +3367,14 @@ function refreshItem(item, settings) {
     settings.baseBranch
   );
 }
+function authorizedMessagesSince(messages, participants, marker) {
+  const allowed = participants.allowedUsers.map((user) => user.toLowerCase());
+  const agent = participants.agentUser.toLowerCase();
+  return messages.filter((message) => {
+    const author = message.author.toLowerCase();
+    return author !== agent && allowed.includes(author) && message.createdAt > marker.createdAt;
+  });
+}
 function readAnsweringSurface(item) {
   if (item.turn === "issue-discuss" || item.pr === null) {
     return getIssueSurface(item.issue.number).messages;
@@ -3279,10 +3385,13 @@ function readAnsweringSurface(item) {
 function markerSurfaceLabel(item) {
   return item.turn === "pr-work" && item.pr ? `pull request #${String(item.pr.number)}` : `issue #${String(item.issue.number)}`;
 }
-function reconcileMarker(item, marker, agentUser, runError) {
+function reconcileMarker(item, marker, participants, runError) {
+  const agentUser = participants.agentUser;
+  let surfaceMessages = [];
   let answered;
   try {
-    answered = agentAnsweredAfter(readAnsweringSurface(item), agentUser, marker);
+    surfaceMessages = readAnsweringSurface(item);
+    answered = agentAnsweredAfter(surfaceMessages, agentUser, marker);
   } catch (err) {
     progress(
       `  warning: could not re-read issue #${String(item.issue.number)} to check for an answer: ${err.message}
@@ -3304,12 +3413,30 @@ function reconcileMarker(item, marker, agentUser, runError) {
     return { outcome: "answered-no-reply", detail: "could not verify whether an answer was posted" };
   }
   if (answered) {
+    const interleaved = authorizedMessagesSince(surfaceMessages, participants, marker);
+    if (interleaved.length > 0) {
+      const authors = [...new Set(interleaved.map((message) => message.author))].join(", ");
+      try {
+        postMarker(
+          item.turn === "pr-work" ? "pr" : "issue",
+          item.turn === "pr-work" && item.pr ? item.pr.number : item.issue.number,
+          `automata do-work: ${authors} posted here while this run was already in progress, so ${interleaved.length === 1 ? "that message was" : "those messages were"} not included in it. Please post again to have them acted on.`
+        );
+      } catch (err) {
+        progress(`  warning: could not report the interleaved message(s): ${err.message}
+`);
+      }
+    }
     try {
       deleteMarker(marker);
     } catch (err) {
       progress(`  warning: could not delete the marker comment: ${err.message}
 `);
     }
+    const noted = interleaved.length > 0 ? ` (${String(interleaved.length)} message(s) arrived mid-run and were flagged)` : "";
+    if (interleaved.length > 0) {
+      return { outcome: "answered-no-reply", detail: `answered${noted}` };
+    }
     return runError === null ? { outcome: "answered", detail: "answered" } : { outcome: "answered", detail: `answered, but the run reported: ${runError.message}` };
   }
   const surface = markerSurfaceLabel(item);
@@ -3346,7 +3473,8 @@ function repairIssueLink(item, baseBranch) {
 `);
       return;
     }
-    if (pr.body.includes(`Closes #${String(item.issue.number)}`)) {
+    const closesRef = new RegExp(String.raw`\bcloses\s+#` + String(item.issue.number) + String.raw`\b`, "i");
+    if (closesRef.test(pr.body)) {
       progress(`  pull request #${String(pr.number)} already closes issue #${String(item.issue.number)}.
 `);
       return;
@@ -3391,31 +3519,7 @@ async function processItem(planned, settings, silent) {
 `);
     return { ...base, outcome: "skipped", detail: `${prepared.reason}: ${prepared.detail}` };
   }
-  if (item.needsAssignment) {
-    try {
-      assignIssueToAgent(item.issue.number, settings.participants.agentUser);
-      progress(`  assigned issue #${String(item.issue.number)} to ${settings.participants.agentUser}.
-`);
-    } catch (err) {
-      progress(`  warning: could not assign issue #${String(item.issue.number)}: ${err.message}
-`);
-    }
-  }
-  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}` };
-    }
-  }
+  claimIssue(item, settings);
   let marker;
   const markerSurface = item.turn === "pr-work" && item.pr ? item.pr.number : item.issue.number;
   try {
@@ -3425,6 +3529,11 @@ async function processItem(planned, settings, silent) {
 `);
     return { ...base, outcome: "skipped", detail: `marker failed: ${err.message}` };
   }
+  inFlightMarker = { marker, item };
+  if (!notePickupOnIssue(item, marker)) {
+    inFlightMarker = null;
+    return { ...base, outcome: "skipped", detail: "issue pickup note failed" };
+  }
   const prompt = composePrompt({
     item,
     repo: getRepoSlug(),
@@ -3432,19 +3541,39 @@ async function processItem(planned, settings, silent) {
     baseBranch: settings.baseBranch,
     frame: settings.prompts[item.turn]
   });
+  const MAX_PROMPT_BYTES = 96 * 1024;
+  const promptBytes = Buffer.byteLength(prompt, "utf8");
+  if (promptBytes > MAX_PROMPT_BYTES) {
+    const detail = `the composed prompt is ${String(Math.round(promptBytes / 1024))} KiB, over the ${String(MAX_PROMPT_BYTES / 1024)} KiB limit for a single command-line argument. The conversation is too long to hand to the executor this way.`;
+    progress(`  failed: ${detail}
+`);
+    inFlightMarker = null;
+    try {
+      updateMarker(
+        marker,
+        `automata do-work: could not start a run because ${detail} Summarise the discussion in a new issue, or shorten the thread, and try again.`
+      );
+    } catch (err) {
+      progress(`  warning: could not update the marker comment: ${err.message}
+`);
+    }
+    return { ...base, outcome: "failed", detail };
+  }
   let runError = null;
   try {
     await invokeExecutor(prompt, settings, silent);
   } catch (err) {
     runError = err;
   }
-  const reconciled = reconcileMarker(item, marker, settings.participants.agentUser, runError);
+  const ranExecutor = true;
+  inFlightMarker = null;
+  const reconciled = reconcileMarker(item, marker, settings.participants, runError);
   progress(`  ${reconciled.detail}
 `);
   if (item.turn === "issue-discuss") {
     repairIssueLink(item, settings.baseBranch);
   }
-  return { ...base, outcome: reconciled.outcome, detail: reconciled.detail };
+  return { ...base, outcome: reconciled.outcome, detail: reconciled.detail, ranExecutor };
 }
 function summarize(reports) {
   out("\nTick summary:\n");
@@ -3464,17 +3593,33 @@ var doWorkCommand = new Command6("do-work").description(
   "Print the work plan, plus a summary and the exact command that would be launched for each item, and exit without changing anything"
 ).option("--json", "Emit the work plan and outcomes as JSON on stdout").option("--silent", "Suppress step-by-step Claude output; show only the final summary").action(async (options) => {
   const settings = resolveSettings(options);
+  if (options.dryRun === true) {
+    const exitCode2 = await runTick(settings, options);
+    if (exitCode2 !== 0) process.exit(exitCode2);
+    return;
+  }
   const lock = acquireRunLock("do-work", settings.lockStaleMinutes);
   if (!lock.ok) {
     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.
 `;
+    const suspectSentence = lock.suspect ? `Warning: that lock has been held longer than ${String(settings.lockStaleMinutes)} minutes. If no tick is really running, its process id was probably reused; remove ${RUN_LOCK_RELATIVE_PATH} once you have confirmed that.
+` : "";
+    const exitCode2 = lock.suspect ? 2 : 0;
     if (options.json === true) {
-      progress(sentence);
-      out(JSON.stringify({ lockHeld: true, heldBy: held, plan: [], items: [], exitCode: 0 }, null, 2) + "\n");
+      progress(sentence + suspectSentence);
+      out(
+        JSON.stringify(
+          { lockHeld: true, suspect: lock.suspect, heldBy: held, plan: [], items: [], exitCode: exitCode2 },
+          null,
+          2
+        ) + "\n"
+      );
     } else {
       out(sentence);
+      if (suspectSentence) progress(suspectSentence);
     }
+    if (exitCode2 !== 0) process.exit(exitCode2);
     return;
   }
   const handle = lock.handle;
@@ -3483,6 +3628,18 @@ var doWorkCommand = new Command6("do-work").description(
     if (shuttingDown) return;
     shuttingDown = true;
     progress("\nInterrupted: stopping the executor before releasing the run lock\u2026\n");
+    const pending = inFlightMarker;
+    if (pending !== null) {
+      try {
+        updateMarker(
+          pending.marker,
+          `automata do-work: this run was interrupted before it finished, so no answer was produced. The branch \`${pending.item.branch}\` may have been changed. Reply here to have another attempt made.`
+        );
+      } catch (err) {
+        progress(`Warning: could not update the in-flight marker: ${err.message}
+`);
+      }
+    }
     void terminateTrackedChildren().then((allExited) => {
       if (allExited) {
         handle.release();
@@ -3548,7 +3705,7 @@ ${describePlan(decisions)}`;
         detail: err.message
       };
     }
-    if (report.outcome !== "skipped") runsUsed++;
+    if (report.ranExecutor === true) runsUsed++;
     reports.push(report);
   }
   for (const item of deferred) {

package/package.json

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