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

package/dist/{ConfigWizard-OYNUMRTO.js → ConfigWizard-5MOWNA7O.js}

@@ -9,7 +9,7 @@ import {
   readConfig,
   readRawConfig,
   writeConfig
-} from "./chunk-UA32XYYL.js";
+} from "./chunk-5ZRROOCC.js";
 
 // src/config/ConfigWizard.tsx
 import { useState } from "react";

package/dist/{chunk-UA32XYYL.js → chunk-5ZRROOCC.js}

@@ -13,7 +13,7 @@ var DEFAULT_DO_WORK = {
   maxRunsPerTick: 0,
   lockStaleMinutes: 120
 };
-var DEFAULT_DO_WORK_ISSUE_DISCUSS_PROMPT = "You are the agent named in the context below, working on a GitHub issue together with the people allowed to instruct you. Answer the messages marked NEW; the earlier messages are context only.\n\nDo not modify, create or delete any file, and do not create a branch or a pull request, UNLESS a message marked NEW explicitly asks you to implement the work. If it does: create a branch off the base branch named below, implement the change following the project's existing conventions, run the tests and the linter, and open a pull request whose body contains `Closes #<issue number>`.\n\nOtherwise do not touch the code at all: reply on the issue with the specification, the plan, or the open questions you need answered. Keep the reply short and concrete, and always post a reply \u2014 silence looks like a crash.";
+var DEFAULT_DO_WORK_ISSUE_DISCUSS_PROMPT = "You are the agent named in the context below, working on a GitHub issue together with the people allowed to instruct you. Answer the messages marked NEW; the earlier messages are context only.\n\nDo not modify, create or delete any file, and do not create a branch or a pull request, UNLESS a message marked NEW explicitly asks you to implement the work. If it does: create a branch off the base branch named below, implement the change following the project's existing conventions, run the tests and the linter, and open a pull request whose body contains `Closes #<issue number>`.\n\nOtherwise do not touch the code at all: reply on the issue with the specification, the plan, or the open questions you need answered. Keep the reply short and concrete.\n\nEither way, always post a reply on the issue before you finish \u2014 including when you implemented and opened a pull request. Silence is indistinguishable from a crash, and the run will be reported as having produced no answer.";
 var DEFAULT_DO_WORK_PR_WORK_PROMPT = "You are the agent named in the context below, working on the pull request for a GitHub issue together with the people allowed to instruct you. Work on the branch named below, which is already checked out and up to date.\n\nAddress every message marked NEW and every unresolved review thread listed. Follow the project's existing conventions, run the tests and the linter, then commit and push to that branch. Do not merge the pull request and do not push to the base branch.\n\nReply on the pull request with a short summary of what you changed, or reply in the review thread when your answer belongs to a specific comment. Always post a reply \u2014 silence looks like a crash.";
 var CONFIG_DIR = ".automata";
 var CONFIG_FILE = "config.json";

package/dist/index.js

@@ -10,7 +10,7 @@ import {
   readConfig,
   readRawConfig,
   writeConfig
-} from "./chunk-UA32XYYL.js";
+} from "./chunk-5ZRROOCC.js";
 
 // src/index.ts
 import { Command as Command7 } from "commander";
@@ -184,7 +184,7 @@ var configCommand = new Command("config").description("Configure automata settin
   const [{ render }, React, { ConfigWizard }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./ConfigWizard-OYNUMRTO.js")
+    import("./ConfigWizard-5MOWNA7O.js")
   ]);
   const { waitUntilExit } = render(React.createElement(ConfigWizard));
   await waitUntilExit();
@@ -2428,6 +2428,7 @@ function getIssueSurface(issueNumber) {
 var LINK_MAP_QUERY = `
 query($owner:String!,$repo:String!,$cursor:String){
   repository(owner:$owner,name:$repo){
+    defaultBranchRef{ name }
     pullRequests(states:OPEN, first:100, after:$cursor, orderBy:{field:UPDATED_AT, direction:DESC}){
       pageInfo{ hasNextPage endCursor }
       nodes{
@@ -2471,17 +2472,19 @@ function indexPullRequest(map, node, nameWithOwner) {
 function getOpenPrLinkMap() {
   const { owner, repo } = getRepoSlug();
   const map = /* @__PURE__ */ new Map();
+  let defaultBranch = null;
   let cursor = null;
   for (let page = 0; page < MAX_LINK_MAP_PAGES; page++) {
     const args = ["api", "graphql", "-f", `query=${LINK_MAP_QUERY}`, "-f", `owner=${owner}`, "-f", `repo=${repo}`];
     if (cursor !== null) args.push("-f", `cursor=${cursor}`);
     const response = ghJson(args, "query open pull requests");
+    defaultBranch = response.data.repository.defaultBranchRef?.name ?? defaultBranch;
     const connection = response.data.repository.pullRequests;
     for (const node of connection.nodes) {
       indexPullRequest(map, node, `${owner}/${repo}`);
     }
     if (!connection.pageInfo?.hasNextPage || connection.pageInfo.endCursor === null) {
-      return map;
+      return { byIssue: map, defaultBranch };
     }
     cursor = connection.pageInfo.endCursor;
   }
@@ -2499,7 +2502,7 @@ query($owner:String!,$repo:String!,$prNumber:Int!,$cursor:String){
           isResolved isOutdated path line
           comments(last:100){
             pageInfo{ hasPreviousPage }
-            nodes{ author{login} body createdAt }
+            nodes{ author{login} body createdAt url }
           }
         }
       }
@@ -2545,6 +2548,7 @@ function getReviewThreads(prNumber) {
         path: node.path,
         line: node.line ?? null,
         isResolved: node.isResolved,
+        url: node.comments.nodes.at(-1)?.url ?? null,
         comments: node.comments.nodes.map((comment) => ({
           kind: "thread-comment",
           author: login(comment.author),
@@ -2667,12 +2671,16 @@ function isAssignedToAgent(assignees, agentUser) {
   const agent = agentUser.toLowerCase();
   return assignees.some((name) => name.toLowerCase() === agent);
 }
-function findActionableThreads(threads, p) {
+function findActionableThreads(threads, p, prLastAgentAt) {
   const actionable = [];
   for (const thread of threads) {
     if (thread.isResolved) continue;
     const comments = thread.comments.filter((comment) => classifyForThread(comment.author, p) !== "other");
     if (lastAuthorClass(comments, p) !== "authorized") continue;
+    const newestAuthorized = comments.at(-1)?.createdAt;
+    if (newestAuthorized !== void 0 && prLastAgentAt !== null && prLastAgentAt > newestAuthorized) {
+      continue;
+    }
     actionable.push({ ...thread, comments });
   }
   return actionable;
@@ -2688,7 +2696,7 @@ function newestPr(prs) {
 function plural(count, noun) {
   return `${String(count)} ${noun}${count === 1 ? "" : "s"}`;
 }
-function decideWork(state, p, baseBranch) {
+function decideWork(state, p, baseBranch, defaultBranch = null) {
   const { issueSurface, prSurface } = state;
   const issue = issueSurface.issue;
   if (issueSurface.state === "CLOSED") {
@@ -2732,17 +2740,20 @@ function decideWork(state, p, baseBranch) {
       detail: `pull request #${String(surface.pr.number)} comes from a fork; its head branch is not in this repository`
     };
   }
-  if (surface.pr.headRefName === baseBranch) {
+  const protectedHead = [baseBranch, defaultBranch].filter(
+    (branch) => branch !== null && branch.length > 0
+  );
+  if (protectedHead.includes(surface.pr.headRefName)) {
     return {
       kind: "skip",
       issue,
       reason: "unsafe-pr-branch",
-      detail: `pull request #${String(surface.pr.number)} has the base branch (${baseBranch}) as its head`
+      detail: `pull request #${String(surface.pr.number)} has a protected branch (${surface.pr.headRefName}) as its head, so a turn would have to push to it`
     };
   }
   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 actionableThreads = findActionableThreads(surface.threads, p, prAnalysis.lastAgentAt);
   const hasPrWork = prAnalysis.hasNewMessage || actionableThreads.length > 0;
   if (!hasPrWork && !issueAnalysis.hasNewMessage) {
     return {
@@ -2784,12 +2795,6 @@ function selectLinkedPr(linkedPrs) {
   const open = linkedPrs.filter((pr) => pr.state === "OPEN");
   return open.length === 0 ? null : newestPr(open);
 }
-function agentAnsweredAfter(messages, agentUser, marker) {
-  const agent = agentUser.toLowerCase();
-  return messages.some(
-    (message) => message.author.toLowerCase() === agent && message.kind !== "issue-body" && message.createdAt > marker.createdAt
-  );
-}
 
 // src/github/workPrompt.ts
 function formatThreads(threads) {
@@ -2798,7 +2803,9 @@ function formatThreads(threads) {
     const newest = thread.comments.at(-1);
     const author = newest?.author ?? "unknown";
     const body = newest?.body ?? "";
-    return `[${author}] ${location}
+    const link = thread.url === null ? "" : `
+${thread.url}`;
+    return `[${author}] ${location}${link}
 ${body}`;
   }).join("\n\n");
 }
@@ -2861,6 +2868,36 @@ function composePrompt(input) {
   return lines.join("\n");
 }
 
+// src/github/markerReconciliation.ts
+function isAuthorized(author, p) {
+  const login2 = author.toLowerCase();
+  return login2 !== p.agentUser.toLowerCase() && p.allowedUsers.some((user) => user.toLowerCase() === login2);
+}
+function promptWatermark(analysed) {
+  let watermark = null;
+  for (const surface of analysed) {
+    for (const message of surface.messages) {
+      if (watermark === null || message.createdAt > watermark) watermark = message.createdAt;
+    }
+  }
+  return watermark;
+}
+function analyseAnswer(messages, p, marker, watermark) {
+  let answeredAt = null;
+  for (const message of messages) {
+    if (message.kind === "issue-body") continue;
+    if (message.author.toLowerCase() !== p.agentUser.toLowerCase()) continue;
+    if (message.createdAt <= marker.createdAt) continue;
+    if (answeredAt === null || message.createdAt > answeredAt) answeredAt = message.createdAt;
+  }
+  const since = watermark ?? marker.createdAt;
+  const toReport = messages.filter(
+    (message) => isAuthorized(message.author, p) && message.createdAt > since
+  );
+  const missed = answeredAt === null ? [] : toReport.filter((message) => message.createdAt < answeredAt);
+  return { answeredAt, missed, toReport };
+}
+
 // src/run/runLock.ts
 import { writeFileSync, readFileSync as readFileSync3, unlinkSync, mkdirSync, renameSync, linkSync } from "fs";
 import { randomUUID } from "crypto";
@@ -3022,20 +3059,60 @@ function claimStaleLock(path, token, expected) {
   }
   return true;
 }
-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}`;
+var CLAIM_STALE_MS = 6e4;
+function acquireClaim(path) {
+  const claimPath = `${path}.claim`;
   try {
-    write(path, command, token, "wx");
-    return { ok: true, handle: makeHandle(path, token) };
+    writeFileSync(claimPath, JSON.stringify({ pid: process.pid, at: (/* @__PURE__ */ new Date()).toISOString() }), {
+      encoding: "utf8",
+      flag: "wx"
+    });
+    return claimPath;
   } catch (err) {
     if (err.code !== "EEXIST") throw err;
+  }
+  try {
+    const raw = JSON.parse(readFileSync3(claimPath, "utf8"));
+    const at = raw.at === void 0 ? Number.NaN : Date.parse(raw.at);
+    if (!Number.isNaN(at) && Date.now() - at < CLAIM_STALE_MS) return null;
+    unlinkSync(claimPath);
+  } catch {
+  }
+  try {
+    writeFileSync(claimPath, JSON.stringify({ pid: process.pid, at: (/* @__PURE__ */ new Date()).toISOString() }), {
+      encoding: "utf8",
+      flag: "wx"
+    });
+    return claimPath;
+  } catch {
+    return null;
+  }
+}
+function reclaim(path, command, token, expected) {
+  const claimPath = acquireClaim(path);
+  if (claimPath === null) {
     return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER, suspect: false };
+  }
+  try {
+    if (!claimStaleLock(path, token, expected)) {
+      return { ok: false, heldBy: readOwner(path) ?? UNKNOWN_OWNER, suspect: false };
+    }
+    const claimed = `${path}.stale.${token}`;
+    try {
+      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, suspect: false };
+    } finally {
+      try {
+        unlinkSync(claimed);
+      } catch {
+      }
+    }
   } finally {
     try {
-      unlinkSync(claimed);
+      unlinkSync(claimPath);
     } catch {
     }
   }
@@ -3306,7 +3383,7 @@ function issueMatchesFilter(surface, settings) {
 }
 function buildIssueState(issue, linkMap) {
   const issueSurface = getIssueSurface(issue.number);
-  const linkedPrs = linkMap.get(issue.number) ?? [];
+  const linkedPrs = linkMap.byIssue.get(issue.number) ?? [];
   const selected = selectLinkedPr(linkedPrs);
   return {
     issueSurface,
@@ -3364,17 +3441,10 @@ function refreshItem(item, settings) {
   return decideWork(
     buildIssueState(item.issue, linkMap),
     settings.participants,
-    settings.baseBranch
+    settings.baseBranch,
+    linkMap.defaultBranch
   );
 }
-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;
@@ -3385,62 +3455,71 @@ 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, participants, runError) {
-  const agentUser = participants.agentUser;
-  let surfaceMessages = [];
-  let answered;
+function markerSurfaceTarget(item) {
+  return item.turn === "pr-work" && item.pr ? { surface: "pr", number: item.pr.number } : { surface: "issue", number: item.issue.number };
+}
+function reportOvertakenMessages(item, analysis) {
+  if (analysis.missed.length === 0) return;
+  const authors = [...new Set(analysis.toReport.map((message) => message.author))].join(", ");
+  const count = analysis.toReport.length;
+  const target = markerSurfaceTarget(item);
   try {
-    surfaceMessages = readAnsweringSurface(item);
-    answered = agentAnsweredAfter(surfaceMessages, agentUser, marker);
+    postMarker(
+      target.surface,
+      target.number,
+      `automata do-work: ${authors} posted here while this run was already in progress, so ${count === 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 overtaken message(s): ${err.message}
+`);
+  }
+}
+function reconcileMarker(item, marker, participants, watermark, runError) {
+  let analysis;
+  try {
+    analysis = analyseAnswer(readAnsweringSurface(item), participants, marker, watermark);
   } catch (err) {
     progress(
       `  warning: could not re-read issue #${String(item.issue.number)} to check for an answer: ${err.message}
 `
     );
-    answered = "unknown";
-  }
-  if (answered === "unknown") {
-    const surface2 = markerSurfaceLabel(item);
-    try {
-      updateMarker(
-        marker,
-        `automata do-work: the agent run finished, but automata could not read ${surface2} afterwards to confirm whether an answer was posted. Check this thread and the branch before assuming either. Reply here to have another attempt made.`
-      );
-    } catch (updateErr) {
-      progress(`  warning: could not update the marker comment: ${updateErr.message}
-`);
-    }
-    return { outcome: "answered-no-reply", detail: "could not verify whether an answer was posted" };
+    return reportUnverified(item, marker);
   }
-  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}
-`);
-      }
-    }
+  if (analysis.answeredAt !== null) {
+    reportOvertakenMessages(item, analysis);
     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}` };
+    if (analysis.missed.length > 0) {
+      return {
+        outcome: "answered-no-reply",
+        detail: `answered (${String(analysis.toReport.length)} message(s) arrived mid-run and were flagged)`
+      };
     }
     return runError === null ? { outcome: "answered", detail: "answered" } : { outcome: "answered", detail: `answered, but the run reported: ${runError.message}` };
   }
+  return reportNoAnswer(item, marker, runError);
+}
+function reportUnverified(item, marker) {
   const surface = markerSurfaceLabel(item);
-  const explanation = runError === null ? `automata do-work: the agent run finished without posting an answer on ${surface}. It may still have changed the branch \`${item.branch}\` \u2014 check it before assuming otherwise. Reply on ${surface} to have another attempt made.` : `automata do-work: the agent run failed before posting an answer (${runError.message}). It may have left partial changes on the branch \`${item.branch}\`. Reply on ${surface} to have another attempt made.`;
+  try {
+    updateMarker(
+      marker,
+      `automata do-work: the agent run finished, but automata could not read ${surface} afterwards to confirm whether an answer was posted. Check this thread and the branch before assuming either. Reply here to have another attempt made.`
+    );
+  } catch (err) {
+    progress(`  warning: could not update the marker comment: ${err.message}
+`);
+  }
+  return { outcome: "answered-no-reply", detail: "could not verify whether an answer was posted" };
+}
+function reportNoAnswer(item, marker, runError) {
+  const surface = markerSurfaceLabel(item);
+  const sideEffects = item.turn === "issue-discuss" ? "It may still have created a branch or opened a pull request \u2014 check before assuming otherwise." : `It may still have changed the branch \`${item.branch}\` \u2014 check it before assuming otherwise.`;
+  const explanation = runError === null ? `automata do-work: the agent run finished without posting an answer on ${surface}. ${sideEffects} Reply on ${surface} to have another attempt made.` : `automata do-work: the agent run failed before posting an answer (${runError.message}). ${sideEffects} Reply on ${surface} to have another attempt made.`;
   try {
     updateMarker(marker, explanation);
   } catch (err) {
@@ -3465,26 +3544,28 @@ function repairIssueLink(item, baseBranch) {
     if (branch === baseBranch) {
       progress(`  issue #${String(item.issue.number)} is still in discussion (no branch was created).
 `);
-      return;
+      return false;
     }
     const pr = getCurrentBranchPr();
     if (!pr) {
       progress(`  issue #${String(item.issue.number)} is still in discussion (no pull request).
 `);
-      return;
+      return false;
     }
     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;
+      return true;
     }
     addClosesRefToPr(pr.number, item.issue.number);
     progress(`  linked pull request #${String(pr.number)} to issue #${String(item.issue.number)}.
 `);
+    return true;
   } catch (err) {
     progress(`  warning: could not link a pull request to issue #${String(item.issue.number)}: ${err.message}
 `);
+    return false;
   }
 }
 async function processItem(planned, settings, silent) {
@@ -3534,6 +3615,10 @@ async function processItem(planned, settings, silent) {
     inFlightMarker = null;
     return { ...base, outcome: "skipped", detail: "issue pickup note failed" };
   }
+  const watermark = promptWatermark([
+    item.issueAnalysis,
+    ...item.prAnalysis === null ? [] : [item.prAnalysis]
+  ]);
   const prompt = composePrompt({
     item,
     repo: getRepoSlug(),
@@ -3567,13 +3652,18 @@ async function processItem(planned, settings, silent) {
   }
   const ranExecutor = true;
   inFlightMarker = null;
-  const reconciled = reconcileMarker(item, marker, settings.participants, runError);
+  const reconciled = reconcileMarker(item, marker, settings.participants, watermark, runError);
   progress(`  ${reconciled.detail}
 `);
+  let outcome = reconciled;
   if (item.turn === "issue-discuss") {
-    repairIssueLink(item, settings.baseBranch);
+    const linked = repairIssueLink(item, settings.baseBranch);
+    if (linked && outcome.outcome === "answered-no-reply") {
+      outcome = { outcome: "answered", detail: "opened a pull request (no issue comment)" };
+      progress("  a pull request was opened, so the turn is counted as answered.\n");
+    }
   }
-  return { ...base, outcome: reconciled.outcome, detail: reconciled.detail, ranExecutor };
+  return { ...base, outcome: outcome.outcome, detail: outcome.detail, ranExecutor };
 }
 function summarize(reports) {
   out("\nTick summary:\n");
@@ -3670,7 +3760,14 @@ var doWorkCommand = new Command6("do-work").description(
 async function runTick(settings, options) {
   const issues = discoverIssues(settings);
   const linkMap = getOpenPrLinkMap();
-  const decisions = issues.map((issue) => decideWork(buildIssueState(issue, linkMap), settings.participants, settings.baseBranch));
+  const decisions = issues.map(
+    (issue) => decideWork(
+      buildIssueState(issue, linkMap),
+      settings.participants,
+      settings.baseBranch,
+      linkMap.defaultBranch
+    )
+  );
   const items = decisions.flatMap((decision) => decision.kind === "work" ? [decision.item] : []);
   const planText = `Work plan (${String(items.length)} of ${String(issues.length)} issues need an answer):
 ${describePlan(decisions)}`;

package/package.json

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