automata-cli 0.6.0-develop.296 → 0.6.0

package/README.md

@@ -129,7 +129,7 @@ See [docs/execute-prompt.md](docs/execute-prompt.md) for full details.
 
 ## `automata do-work`
 
-One tick of the autonomous loop: answer the open issues whose newest message from an authorized account the agent has not answered. Reference: [docs/do-work.md](docs/do-work.md). Process, trust model and setup: [the wiki](docs/wiki/Home.md).
+One tick of the autonomous loop: answer the open issues whose newest message from an authorized account the agent has not answered, then do the same for the open pull requests that close no issue of this repository. Reference: [docs/do-work.md](docs/do-work.md). Process, trust model and setup: [the wiki](docs/wiki/Home.md).
 
 ---
 

package/dist/{ConfigWizard-HDHKPY6J.js → ConfigWizard-D6NYL2E6.js}

@@ -3,13 +3,14 @@ import {
   DEFAULT_CHECK_ISSUE_PROMPT,
   DEFAULT_DO_WORK,
   DEFAULT_DO_WORK_ISSUE_DISCUSS_PROMPT,
+  DEFAULT_DO_WORK_PR_ORPHAN_PROMPT,
   DEFAULT_DO_WORK_PR_WORK_PROMPT,
   DEFAULT_FIX_COMMENTS_PROMPT,
   DEFAULT_SONAR_PROMPT,
   readConfig,
   readRawConfig,
   writeConfig
-} from "./chunk-LTCVLM4I.js";
+} from "./chunk-MIPBYVK5.js";
 
 // src/config/ConfigWizard.tsx
 import { useState } from "react";
@@ -41,7 +42,8 @@ var PROMPTS_MENU_OPTIONS = [
   "Fix-Comments",
   "Check-Issue",
   "Do Work \u2014 Discuss",
-  "Do Work \u2014 PR"
+  "Do Work \u2014 PR",
+  "Do Work \u2014 Orphan PR"
 ];
 function parseAllowedUsers(value) {
   return value.split(",").map((user) => user.trim()).filter((user) => user.length > 0);
@@ -121,7 +123,8 @@ var PROMPT_SCREEN_BY_OPTION = {
   "Fix-Comments": "fix-comments-prompt",
   "Check-Issue": "check-issue-prompt",
   "Do Work \u2014 Discuss": "do-work-discuss-prompt",
-  "Do Work \u2014 PR": "do-work-pr-prompt"
+  "Do Work \u2014 PR": "do-work-pr-prompt",
+  "Do Work \u2014 Orphan PR": "do-work-pr-orphan-prompt"
 };
 function ConfigWizard() {
   const existing = readConfig();
@@ -167,6 +170,9 @@ function ConfigWizard() {
   const [doWorkPrPrompt, setDoWorkPrPrompt] = useState(
     existing.doWork?.prompts?.prWork ?? DEFAULT_DO_WORK_PR_WORK_PROMPT
   );
+  const [doWorkPrOrphanPrompt, setDoWorkPrOrphanPrompt] = useState(
+    existing.doWork?.prompts?.prOrphan ?? DEFAULT_DO_WORK_PR_ORPHAN_PROMPT
+  );
   const [pendingRemote, setPendingRemote] = useState(existing.remoteType ?? "gh");
   const [pendingTechnique, setPendingTechnique] = useState(
     existing.issueDiscoveryTechnique ?? "label"
@@ -362,6 +368,17 @@ function ConfigWizard() {
         setScreen("prompts-menu");
       },
       onBack: () => setScreen("prompts-menu")
+    },
+    "do-work-pr-orphan-prompt": {
+      setValue: setDoWorkPrOrphanPrompt,
+      onSubmit: () => {
+        savePrompt("do-work-pr-orphan.md", doWorkPrOrphanPrompt, (value, current) => ({
+          ...current,
+          doWork: { ...current.doWork, prompts: { ...current.doWork?.prompts, prOrphan: value } }
+        }));
+        setScreen("prompts-menu");
+      },
+      onBack: () => setScreen("prompts-menu")
     }
   };
   const menus = {
@@ -527,6 +544,12 @@ function ConfigWizard() {
       label: "Pull request turn instructions:",
       value: doWorkPrPrompt,
       hint: `Type prompt \xB7 Enter to save \xB7 ${BACK}`
+    },
+    "do-work-pr-orphan-prompt": {
+      title: "Prompts \u2014 Do Work \u2014 Orphan PR",
+      label: "Instructions for a pull request with no linked issue:",
+      value: doWorkPrOrphanPrompt,
+      hint: `Type prompt \xB7 Enter to save \xB7 ${BACK}`
     }
   };
   const menuViews = {

package/dist/{chunk-LTCVLM4I.js → chunk-MIPBYVK5.js}

@@ -16,6 +16,7 @@ var DEFAULT_DO_WORK = {
 };
 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 DEFAULT_DO_WORK_PR_ORPHAN_PROMPT = "You are the agent named in the context below, working on a pull request that is not linked to any issue \u2014 a dependency bump, or another change opened without one \u2014 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. Typical work here is finding out why the checks are failing, bringing the branch up to date with the base branch, and fixing whatever the change needs in order to be mergeable. Follow the project's existing conventions, run the tests and the linter, then commit and push to that branch.\n\nDo not merge the pull request, do not close it, and do not push to the base branch. If you conclude that it should be merged or closed, say so in your reply and leave the decision to the humans.\n\nReply on the pull request with a short summary of what you did and what you recommend, 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";
 function configPath() {
@@ -81,6 +82,9 @@ function readConfig() {
   if (config.doWork?.prompts?.prWork) {
     config.doWork.prompts.prWork = resolvePromptRef(config.doWork.prompts.prWork, dir);
   }
+  if (config.doWork?.prompts?.prOrphan) {
+    config.doWork.prompts.prOrphan = resolvePromptRef(config.doWork.prompts.prOrphan, dir);
+  }
   return config;
 }
 function writeConfig(config) {
@@ -97,6 +101,7 @@ export {
   DEFAULT_DO_WORK,
   DEFAULT_DO_WORK_ISSUE_DISCUSS_PROMPT,
   DEFAULT_DO_WORK_PR_WORK_PROMPT,
+  DEFAULT_DO_WORK_PR_ORPHAN_PROMPT,
   readRawConfig,
   readConfig,
   writeConfig

package/dist/index.js

@@ -4,13 +4,14 @@ import {
   DEFAULT_CLAUDE_SYSTEM_PROMPT,
   DEFAULT_DO_WORK,
   DEFAULT_DO_WORK_ISSUE_DISCUSS_PROMPT,
+  DEFAULT_DO_WORK_PR_ORPHAN_PROMPT,
   DEFAULT_DO_WORK_PR_WORK_PROMPT,
   DEFAULT_FIX_COMMENTS_PROMPT,
   DEFAULT_SONAR_PROMPT,
   readConfig,
   readRawConfig,
   writeConfig
-} from "./chunk-LTCVLM4I.js";
+} from "./chunk-MIPBYVK5.js";
 
 // src/index.ts
 import { Command as Command7 } from "commander";
@@ -28,7 +29,7 @@ import { Command } from "commander";
 var VALID_TYPES = ["gh", "azdo"];
 var VALID_TECHNIQUES = ["label", "assignee", "title-contains"];
 var VALID_EXECUTORS = ["claude", "codex"];
-var VALID_TURN_KINDS = ["issue-discuss", "pr-work"];
+var VALID_TURN_KINDS = ["issue-discuss", "pr-work", "pr-orphan"];
 function writeDoWork(patch) {
   const current = readRawConfig();
   writeConfig({ ...current, doWork: { ...current.doWork, ...patch } });
@@ -198,10 +199,16 @@ var configSetDoWorkPrompt = new Command("do-work-prompt").description("Set the t
   }
   const current = readRawConfig();
   const prompts = { ...current.doWork?.prompts };
-  if (turnKind === "issue-discuss") {
-    prompts.issueDiscuss = prompt;
-  } else {
-    prompts.prWork = prompt;
+  switch (turnKind) {
+    case "issue-discuss":
+      prompts.issueDiscuss = prompt;
+      break;
+    case "pr-work":
+      prompts.prWork = prompt;
+      break;
+    case "pr-orphan":
+      prompts.prOrphan = prompt;
+      break;
   }
   writeDoWork({ prompts });
   process.stdout.write(`do-work ${turnKind} prompt set.
@@ -212,7 +219,7 @@ var configCommand = new Command("config").description("Configure automata settin
   const [{ render }, React, { ConfigWizard }] = await Promise.all([
     import("ink"),
     import("react"),
-    import("./ConfigWizard-HDHKPY6J.js")
+    import("./ConfigWizard-D6NYL2E6.js")
   ]);
   const { waitUntilExit } = render(React.createElement(ConfigWizard));
   await waitUntilExit();
@@ -766,6 +773,18 @@ function fetchBranch(branch) {
 function pullFastForwardOnly(branch) {
   return gitCommand(branch === void 0 ? ["pull", "--ff-only"] : ["pull", "--ff-only", "origin", branch]);
 }
+function revParse(ref) {
+  const { stdout, status } = run2("git", ["rev-parse", "--verify", "--quiet", ref]);
+  if (status !== 0) return null;
+  const sha = stdout.trim();
+  return sha.length === 0 ? null : sha;
+}
+function isAncestorCommit(maybeAncestor, descendant) {
+  return run2("git", ["merge-base", "--is-ancestor", maybeAncestor, descendant]).status === 0;
+}
+function resetHardTo(ref) {
+  return gitCommand(["reset", "--hard", ref]);
+}
 function fetchPrune() {
   const result = run2("git", ["fetch", "--prune"]);
   if (result.status !== 0) {
@@ -2567,6 +2586,8 @@ query($owner:String!,$repo:String!,$cursor:String){
       pageInfo{ hasNextPage endCursor }
       nodes{
         number url title headRefName baseRefName isCrossRepository isDraft updatedAt
+        labels(first:50){ nodes{ name } }
+        assignees(first:50){ nodes{ login } }
         closingIssuesReferences(first:50){
           pageInfo{ hasNextPage }
           nodes{ number repository{ nameWithOwner } }
@@ -2577,24 +2598,16 @@ query($owner:String!,$repo:String!,$cursor:String){
 }`.trim();
 var MAX_LINK_MAP_PAGES = 50;
 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
-  };
+  const ref = toPullRequestRef(node);
   if (node.closingIssuesReferences.pageInfo?.hasNextPage) {
     throw new Error(
       `Pull request #${String(node.number)} closes more than 50 issues, so the issue-to-pull-request map cannot be read completely. Refusing the tick rather than risk starting work on an issue that already has a pull request.`
     );
   }
+  let closedAnyHere = false;
   for (const issue of node.closingIssuesReferences.nodes) {
-    if (issue.repository.nameWithOwner !== nameWithOwner) continue;
+    if (issue.repository.nameWithOwner.toLowerCase() !== nameWithOwner.toLowerCase()) continue;
+    closedAnyHere = true;
     const existing = map.get(issue.number);
     if (existing) {
       existing.push(ref);
@@ -2602,10 +2615,32 @@ function indexPullRequest(map, node, nameWithOwner) {
       map.set(issue.number, [ref]);
     }
   }
+  return closedAnyHere;
+}
+function toPullRequestRef(node) {
+  return {
+    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
+  };
+}
+function toOrphanPr(node) {
+  return {
+    pr: toPullRequestRef(node),
+    labels: (node.labels?.nodes ?? []).map((label) => label.name ?? "").filter((name) => name.length > 0),
+    assignees: (node.assignees?.nodes ?? []).map((assignee) => assignee.login ?? "").filter((login2) => login2.length > 0)
+  };
 }
 function getOpenPrLinkMap() {
   const { owner, repo } = getRepoSlug();
   const map = /* @__PURE__ */ new Map();
+  const orphans = [];
   let defaultBranch = null;
   let cursor = null;
   for (let page = 0; page < MAX_LINK_MAP_PAGES; page++) {
@@ -2615,10 +2650,12 @@ function getOpenPrLinkMap() {
     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 (!indexPullRequest(map, node, `${owner}/${repo}`)) {
+        orphans.push(toOrphanPr(node));
+      }
     }
     if (!connection.pageInfo?.hasNextPage || connection.pageInfo.endCursor === null) {
-      return { byIssue: map, defaultBranch };
+      return { byIssue: map, defaultBranch, orphans };
     }
     cursor = connection.pageInfo.endCursor;
   }
@@ -2811,14 +2848,15 @@ function toHeadState(state) {
 }
 function listPullRequestsForHead(branch) {
   const raw = ghJson(
-    ["pr", "list", "--head", branch, "--state", "all", "--json", "number,state,url,updatedAt"],
+    ["pr", "list", "--head", branch, "--state", "all", "--json", "number,state,url,updatedAt,author"],
     `list pull requests for branch ${branch}`
   );
   return raw.map((pr) => ({
     number: pr.number,
     url: pr.url,
     state: toHeadState(pr.state),
-    updatedAt: pr.updatedAt
+    updatedAt: pr.updatedAt,
+    author: pr.author?.login ?? ""
   })).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
 }
 var MISSING_LABEL_PATTERNS = [
@@ -2870,6 +2908,13 @@ function parseCreatedPrUrl(stdout, head) {
 }
 
 // src/github/workDetection.ts
+var NO_ISSUE_MESSAGES = {
+  messages: [],
+  newMessages: [],
+  newMessageCount: 0,
+  hasNewMessage: false,
+  lastAgentAt: null
+};
 function isAssignedToAgent(assignees, agentUser) {
   const agent = agentUser.toLowerCase();
   return assignees.some((name) => name.toLowerCase() === agent);
@@ -2909,6 +2954,7 @@ function unsafeBranchSkip(pr, issue, policy) {
     return {
       kind: "skip",
       issue,
+      pr,
       reason: "unsafe-pr-branch",
       detail: `pull request #${String(pr.number)} comes from a fork; its head branch is not in this repository`
     };
@@ -2917,18 +2963,24 @@ function unsafeBranchSkip(pr, issue, policy) {
     return {
       kind: "skip",
       issue,
+      pr,
       reason: "unsafe-pr-branch",
       detail: `pull request #${String(pr.number)} has a protected branch (${pr.headRefName}) as its head, so a turn would have to push to it`
     };
   }
   return null;
 }
+function analysePrSurface(surface, p) {
+  const agentThreadMessages = surface.threads.flatMap((thread) => thread.comments).filter((comment) => comment.author.toLowerCase() === p.agentUser.toLowerCase());
+  const prAnalysis = analyzeSurface([...surface.messages, ...agentThreadMessages], p);
+  return { prAnalysis, actionableThreads: findActionableThreads(surface.threads, p, prAnalysis.lastAgentAt) };
+}
 function decideWork(state, p, policy) {
   const baseBranch = policy.baseBranch;
   const { issueSurface, prSurface } = state;
   const issue = issueSurface.issue;
   if (issueSurface.state === "CLOSED") {
-    return { kind: "skip", issue, reason: "issue-closed", detail: "the issue is closed" };
+    return { kind: "skip", issue, pr: null, reason: "issue-closed", detail: "the issue is closed" };
   }
   const issueAnalysis = analyzeSurface(issueSurface.messages, p);
   const needsAssignment = !isAssignedToAgent(issueSurface.assignees, p.agentUser);
@@ -2939,6 +2991,7 @@ function decideWork(state, p, policy) {
       return {
         kind: "skip",
         issue,
+        pr: null,
         reason: "no-new-messages",
         detail: issueAnalysis.lastAgentAt === null ? "no messages from authorized accounts" : `nothing new since the agent's message at ${issueAnalysis.lastAgentAt}`
       };
@@ -2962,14 +3015,13 @@ function decideWork(state, p, policy) {
   const surface = prSurface;
   const unsafe = unsafeBranchSkip(surface.pr, issue, policy);
   if (unsafe !== null) return unsafe;
-  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, prAnalysis.lastAgentAt);
+  const { prAnalysis, actionableThreads } = analysePrSurface(surface, p);
   const hasPrWork = prAnalysis.hasNewMessage || actionableThreads.length > 0;
   if (!hasPrWork && !issueAnalysis.hasNewMessage) {
     return {
       kind: "skip",
       issue,
+      pr: surface.pr,
       reason: "no-new-messages",
       detail: `nothing new on issue or pull request #${String(surface.pr.number)}`
     };
@@ -3002,12 +3054,87 @@ function decideWork(state, p, policy) {
     }
   };
 }
+function decideOrphanPrWork(state, p, policy) {
+  const surface = state.prSurface;
+  const pr = surface.pr;
+  if (pr.state !== "OPEN") {
+    return {
+      kind: "skip",
+      issue: null,
+      pr,
+      reason: "pr-closed",
+      detail: `pull request #${String(pr.number)} is ${pr.state.toLowerCase()}`
+    };
+  }
+  const unsafe = unsafeBranchSkip(pr, null, policy);
+  if (unsafe !== null) return unsafe;
+  const { prAnalysis, actionableThreads } = analysePrSurface(surface, p);
+  if (!prAnalysis.hasNewMessage && actionableThreads.length === 0) {
+    return {
+      kind: "skip",
+      issue: null,
+      pr,
+      reason: "no-new-messages",
+      detail: prAnalysis.lastAgentAt === null ? `no messages from authorized accounts on pull request #${String(pr.number)}` : `nothing new on pull request #${String(pr.number)} since the agent's message at ${prAnalysis.lastAgentAt}`
+    };
+  }
+  const reasons = [];
+  if (prAnalysis.hasNewMessage) {
+    reasons.push(plural(prAnalysis.newMessageCount, "new pull request message"));
+  }
+  if (actionableThreads.length > 0) {
+    reasons.push(plural(actionableThreads.length, "unresolved review thread"));
+  }
+  return {
+    kind: "work",
+    item: {
+      issue: null,
+      turn: "pr-orphan",
+      pr,
+      branch: pr.headRefName,
+      // Assignment is an issue mechanism: it makes the claim visible in the
+      // issue list, and with `issueDiscoveryTechnique: assignee` assigning the
+      // agent here would change what the discovery filter matches next tick.
+      // The `working…` marker on the pull request is the claim.
+      needsAssignment: false,
+      issueAnalysis: NO_ISSUE_MESSAGES,
+      prAnalysis,
+      actionableThreads,
+      reason: `${reasons.join(", ")} on pull request #${String(pr.number)} (no linked issue)`,
+      ambiguousPrs: []
+    }
+  };
+}
+function skipDuplicateHeadBranches(decisions) {
+  const owners = /* @__PURE__ */ new Map();
+  return decisions.map((decision) => {
+    if (decision.kind !== "work") return decision;
+    const { item } = decision;
+    if (item.turn === "issue-discuss" || item.pr === null) return decision;
+    const owner = owners.get(item.branch);
+    if (owner === void 0) {
+      owners.set(item.branch, item.pr);
+      return decision;
+    }
+    return {
+      kind: "skip",
+      issue: item.issue,
+      pr: item.pr,
+      reason: "branch-busy",
+      detail: `pull request #${String(item.pr.number)} shares its head branch (${item.branch}) with pull request #${String(owner.number)}, which this tick works on first`
+    };
+  });
+}
 function selectLinkedPr(linkedPrs) {
   const open = linkedPrs.filter((pr) => pr.state === "OPEN");
   return open.length === 0 ? null : newestPr(open);
 }
 
 // src/github/workPrompt.ts
+function promptBaseBranch(item, configuredBaseBranch) {
+  const prBase = item.pr?.baseRefName ?? "";
+  return prBase.length > 0 ? prBase : configuredBaseBranch;
+}
 function formatThreads(threads) {
   return threads.map((thread) => {
     const location = thread.line === null ? `${thread.path}:(file)` : `${thread.path}:${String(thread.line)}`;
@@ -3029,10 +3156,11 @@ function composePrompt(input) {
     `Repository: ${repo.owner}/${repo.repo}`,
     `You are: ${agentUser}`,
     `Turn: ${item.turn}`,
-    `Base branch: ${baseBranch}`,
-    `Issue #${String(item.issue.number)}: ${item.issue.title}`,
-    `Issue URL: ${item.issue.url}`
+    `Base branch: ${promptBaseBranch(item, baseBranch)}`
   ];
+  if (item.issue) {
+    lines.push(`Issue #${String(item.issue.number)}: ${item.issue.title}`, `Issue URL: ${item.issue.url}`);
+  }
   if (item.pr) {
     lines.push(
       `Pull request #${String(item.pr.number)}: ${item.pr.title}`,
@@ -3047,12 +3175,14 @@ function composePrompt(input) {
   if (newMessages.length > 0) {
     lines.push("", "New since your last message \u2014 this is what you must answer:", "", formatMessages(newMessages));
   }
-  lines.push(
-    "",
-    "Full conversation on the issue (authorized accounts and you only, oldest first):",
-    "",
-    formatMessages(item.issueAnalysis.messages)
-  );
+  if (item.issue) {
+    lines.push(
+      "",
+      "Full conversation on the issue (authorized accounts and you only, oldest first):",
+      "",
+      formatMessages(item.issueAnalysis.messages)
+    );
+  }
   if (item.prAnalysis && item.prAnalysis.messages.length > 0) {
     lines.push(
       "",
@@ -3484,8 +3614,19 @@ function prepareBaseBranch(baseBranch) {
   }
   return { ok: true, branch: baseBranch };
 }
+function resetToForcePushedRemote(headRefName, previousRemoteSha) {
+  const localSha = revParse(`refs/heads/${headRefName}`);
+  if (previousRemoteSha === null || localSha === null) return null;
+  if (!isAncestorCommit(localSha, previousRemoteSha)) return null;
+  const reset = resetHardTo(`refs/remotes/origin/${headRefName}`);
+  if (!reset.ok) {
+    return { ok: false, reason: "pull-failed", detail: reset.stderr };
+  }
+  return { ok: true, branch: headRefName };
+}
 function preparePrBranch(headRefName) {
   if (hasUncommittedChanges([RUN_LOCK_RELATIVE_PATH])) return dirtyTree();
+  const previousRemoteSha = revParse(`refs/remotes/origin/${headRefName}`);
   const fetched = fetchBranch(headRefName);
   if (!fetched.ok) {
     return { ok: false, reason: "checkout-failed", detail: fetched.stderr };
@@ -3500,7 +3641,13 @@ function preparePrBranch(headRefName) {
   }
   const pull = pullFastForwardOnly(headRefName);
   if (!pull.ok) {
-    return { ok: false, reason: "pull-failed", detail: pull.stderr };
+    const reset = resetToForcePushedRemote(headRefName, previousRemoteSha);
+    if (reset !== null) return reset;
+    return {
+      ok: false,
+      reason: "pull-failed",
+      detail: `${pull.stderr} \u2014 the local ${headRefName} has commits origin/${headRefName} does not, so it was not reset automatically; inspect them and \`git reset --hard origin/${headRefName}\` yourself`
+    };
   }
   return { ok: true, branch: headRefName };
 }
@@ -3514,14 +3661,25 @@ function utcStamp(now) {
 function flattenBranchName(branch) {
   return branch.replaceAll("/", "-");
 }
-function detectRescueTarget(baseBranch, now) {
+function agentOwnsBranch(branch, agentUser) {
+  if (agentUser.length === 0) return false;
+  let open;
+  try {
+    open = findOpenPr(branch);
+  } catch {
+    return false;
+  }
+  if (open === null) return true;
+  return open.author.toLowerCase() === agentUser.toLowerCase();
+}
+function detectRescueTarget(options, now) {
   const current = getCurrentBranch();
   const detached = current === "HEAD" || current.length === 0;
-  if (!detached && current !== baseBranch) {
+  if (!detached && current !== options.baseBranch && agentOwnsBranch(current, options.agentUser)) {
     return { branch: current, createdBranch: false, source: current };
   }
-  const source = detached ? "detached HEAD" : baseBranch;
-  const label = detached ? "detached" : flattenBranchName(baseBranch);
+  const source = detached ? "detached HEAD" : current === options.baseBranch ? options.baseBranch : current;
+  const label = detached ? "detached" : flattenBranchName(source);
   return {
     branch: `${RESCUE_BRANCH_PREFIX}${label}-${utcStamp(now)}`,
     createdBranch: true,
@@ -3544,7 +3702,7 @@ function rescueUncommittedChanges(options, now) {
     options.log("  rescue    nothing to do; the working tree is clean\n");
     return { kind: "clean" };
   }
-  const target = detectRescueTarget(options.baseBranch, now);
+  const target = detectRescueTarget(options, now);
   if (options.dryRun) {
     options.log(
       target.createdBranch ? `  rescue    would create ${target.branch} off ${target.source}, commit the uncommitted changes, push it and open a draft PR
@@ -3575,8 +3733,11 @@ function rescueUncommittedChanges(options, now) {
   }
   const pushed = pushSetUpstream(target.branch);
   if (!pushed.ok) {
-    options.log(`  rescue    FAILED to push ${target.branch}: ${pushed.stderr}
-`);
+    options.log(
+      `  rescue    FAILED to push ${target.branch}: ${pushed.stderr}
+  rescue    the work is committed locally on ${target.branch}; push it by hand before it is lost
+`
+    );
     return { kind: "failed", step: "push", detail: pushed.stderr };
   }
   let existing;
@@ -3859,7 +4020,7 @@ function formatWorkRecord(tick) {
   const header = `=== ${tick.timestamp.toISOString()} ${repoField(tick.repo)} ===
 `;
   const lines = ran.map(
-    (item) => `#${String(item.issue)} ${item.turn === null ? "-" : oneLine(item.turn)} ${item.outcome}${describeItemExecution(item)} \u2014 ${briefDetail(item.detail)}
+    (item) => `${oneLine(item.subject)} ${item.turn === null ? "-" : oneLine(item.turn)} ${item.outcome}${describeItemExecution(item)} \u2014 ${briefDetail(item.detail)}
 `
   );
   return header + lines.join("") + "\n";
@@ -3943,6 +4104,19 @@ function recordTick(tick, dir = operationLogDirectory()) {
 
 // src/commands/doWork.ts
 var inFlightMarker = null;
+function subjectLabel(issue, pr) {
+  if (issue !== null) return `#${String(issue)}`;
+  return pr === null ? "#?" : `PR #${String(pr)}`;
+}
+function itemLabel(item) {
+  return subjectLabel(item.issue?.number ?? null, item.pr?.number ?? null);
+}
+function reportLabel(report) {
+  return subjectLabel(report.issue, report.pr);
+}
+function itemTitle(item) {
+  return item.issue?.title ?? item.pr?.title ?? "";
+}
 function out(message) {
   process.stdout.write(message);
 }
@@ -4029,11 +4203,13 @@ function resolveSettings(options) {
     participants: { allowedUsers, agentUser },
     prompts: {
       "issue-discuss": doWork.prompts?.issueDiscuss ?? DEFAULT_DO_WORK_ISSUE_DISCUSS_PROMPT,
-      "pr-work": doWork.prompts?.prWork ?? DEFAULT_DO_WORK_PR_WORK_PROMPT
+      "pr-work": doWork.prompts?.prWork ?? DEFAULT_DO_WORK_PR_WORK_PROMPT,
+      "pr-orphan": doWork.prompts?.prOrphan ?? DEFAULT_DO_WORK_PR_ORPHAN_PROMPT
     },
     technique: config.issueDiscoveryTechnique,
     discoveryValue: config.issueDiscoveryValue,
-    onlyIssue: options.issue === void 0 ? void 0 : parsePositiveInt(options.issue, "--issue")
+    onlyIssue: options.issue === void 0 ? void 0 : parsePositiveInt(options.issue, "--issue"),
+    onlyPr: options.pr === void 0 ? void 0 : parsePositiveInt(options.pr, "--pr")
   };
 }
 function checkAuthenticatedIdentity(agentUser, allowedUsers) {
@@ -4097,12 +4273,12 @@ function planRun(item, settings, execution) {
 }
 function describePlannedRun(item, settings, run5, execution) {
   const rule = "\u2500".repeat(72);
-  const branchAction = item.turn === "pr-work" ? " and fast-forward" : " and pull";
+  const branchAction = item.turn === "issue-discuss" ? " and pull" : " and fast-forward";
   const assignment = item.needsAssignment ? `would assign to ${settings.participants.agentUser}` : "already assigned";
-  const markerTarget = item.turn === "pr-work" && item.pr ? `pull request #${String(item.pr.number)}` : `issue #${String(item.issue.number)}`;
+  const markerTarget = markerSurfaceLabel(item);
   const lines = [
     rule,
-    `Issue #${String(item.issue.number)} \u2014 ${item.issue.title}`,
+    describeSubject(item),
     rule,
     `  Turn         ${item.turn}`,
     `  Why          ${item.reason}`,
@@ -4125,11 +4301,14 @@ function describePlannedRun(item, settings, run5, execution) {
   ];
   return lines.join("\n") + "\n";
 }
+function describeSubject(item) {
+  return item.issue !== null ? `Issue #${String(item.issue.number)} \u2014 ${item.issue.title}` : `Pull request #${String(item.pr?.number ?? 0)} \u2014 ${itemTitle(item)}`;
+}
 function describeRefusedRun(item, refusal) {
   const rule = "\u2500".repeat(72);
   return [
     rule,
-    `Issue #${String(item.issue.number)} \u2014 ${item.issue.title}`,
+    describeSubject(item),
     rule,
     `  Turn         ${item.turn}`,
     `  Why          ${item.reason}`,
@@ -4170,7 +4349,7 @@ function validateDoWorkConfig(section) {
   validateProtectedBranches(section["protectedBranches"]);
   validateSettingContainer(section["models"], "models", ["claude", "codex"]);
   validateSettingContainer(section["effort"], "effort", ["claude", "codex"]);
-  validateSettingContainer(section["prompts"], "prompts", ["issueDiscuss", "prWork"]);
+  validateSettingContainer(section["prompts"], "prompts", ["issueDiscuss", "prWork", "prOrphan"]);
 }
 function validateProtectedBranches(value) {
   if (value === void 0 || value === null) return;
@@ -4193,7 +4372,14 @@ function validateSettingContainer(value, container, keys) {
     }
   }
 }
+function issuePassEnabled(settings) {
+  return settings.onlyPr === void 0 || settings.onlyIssue !== void 0;
+}
+function orphanPassEnabled(settings) {
+  return settings.onlyIssue === void 0 || settings.onlyPr !== void 0;
+}
 function discoverIssues(settings) {
+  if (!issuePassEnabled(settings)) return [];
   const candidates = listCandidateIssues(settings.technique, settings.discoveryValue, settings.limit);
   if (settings.onlyIssue === void 0) {
     if (candidates.length === settings.limit) {
@@ -4215,16 +4401,57 @@ function discoverIssues(settings) {
   }
   return [surface.issue];
 }
-function issueMatchesFilter(surface, settings) {
+function matchesDiscoveryFilter(subject, settings) {
   const value = settings.discoveryValue.toLowerCase();
   switch (settings.technique) {
     case "label":
-      return surface.labels.some((label) => label.toLowerCase() === value);
+      return subject.labels.some((label) => label.toLowerCase() === value);
     case "assignee":
-      return surface.assignees.some((assignee) => assignee.toLowerCase() === value);
+      return subject.assignees.some((assignee) => assignee.toLowerCase() === value);
     case "title-contains":
-      return surface.issue.title.toLowerCase().includes(value);
+      return subject.title.toLowerCase().includes(value);
+  }
+}
+function issueMatchesFilter(surface, settings) {
+  return matchesDiscoveryFilter(
+    { labels: surface.labels, assignees: surface.assignees, title: surface.issue.title },
+    settings
+  );
+}
+function prMatchesFilter(candidate, settings) {
+  return matchesDiscoveryFilter(
+    { labels: candidate.labels, assignees: candidate.assignees, title: candidate.pr.title },
+    settings
+  );
+}
+function issuesClosedBy(linkMap, prNumber) {
+  return [...linkMap.byIssue.entries()].filter(([, prs]) => prs.some((pr) => pr.number === prNumber)).map(([issueNumber]) => issueNumber);
+}
+function discoverOrphanPrs(settings, linkMap) {
+  if (!orphanPassEnabled(settings)) return [];
+  if (settings.onlyPr === void 0) {
+    return linkMap.orphans.filter((candidate) => prMatchesFilter(candidate, settings));
+  }
+  const target = settings.onlyPr;
+  const match = linkMap.orphans.find((candidate) => candidate.pr.number === target);
+  if (match === void 0) {
+    const closes = issuesClosedBy(linkMap, target);
+    if (closes.length > 0) {
+      throw new Error(
+        `Pull request #${String(target)} closes issue #${String(closes[0])} of this repository, so it is not orphaned and the issue pass owns it. Use \`--issue ${String(closes[0])}\` instead.`
+      );
+    }
+    throw new Error(
+      `#${String(target)} is not an open pull request of this repository. The orphan pass only ever works on open pull requests; use \`--issue\` for an issue.`
+    );
   }
+  if (!prMatchesFilter(match, settings)) {
+    progress(
+      `Note: pull request #${String(target)} does not match the configured discovery filter (${settings.technique} = ${settings.discoveryValue}); processing it anyway because --pr was given.
+`
+    );
+  }
+  return [match];
 }
 function buildIssueState(issue, linkMap) {
   const issueSurface = getIssueSurface(issue.number);
@@ -4239,16 +4466,16 @@ function buildIssueState(issue, linkMap) {
 function describePlan(decisions) {
   const lines = decisions.map((decision) => {
     if (decision.kind === "skip") {
-      return `  #${String(decision.issue.number)} nothing to do \u2014 ${decision.detail}`;
+      return `  ${subjectLabel(decision.issue?.number ?? null, decision.pr?.number ?? null)} nothing to do \u2014 ${decision.detail}`;
     }
     const item = decision.item;
     const claim = item.needsAssignment ? ", will assign to the agent" : "";
-    return `  #${String(item.issue.number)} ${item.turn} on ${item.branch} \u2014 ${item.reason}${claim}`;
+    return `  ${itemLabel(item)} ${item.turn} on ${item.branch} \u2014 ${item.reason}${claim}`;
   });
-  return lines.length === 0 ? "  (no issues matched the discovery filter)\n" : lines.join("\n") + "\n";
+  return lines.length === 0 ? "  (nothing matched the discovery filter)\n" : lines.join("\n") + "\n";
 }
 function claimIssue(item, settings) {
-  if (!item.needsAssignment) return;
+  if (!item.needsAssignment || item.issue === null) return;
   try {
     assignIssueToAgent(item.issue.number, settings.participants.agentUser);
     progress(`  assigned issue #${String(item.issue.number)} to ${settings.participants.agentUser}.
@@ -4259,7 +4486,8 @@ function claimIssue(item, settings) {
   }
 }
 function notePickupOnIssue(item, marker) {
-  if (item.turn !== "pr-work" || item.pr === null || !item.issueAnalysis.hasNewMessage) return null;
+  if (item.turn !== "pr-work" || item.pr === null || item.issue === null) return null;
+  if (!item.issueAnalysis.hasNewMessage) return null;
   try {
     return postMarker(
       "issue",
@@ -4279,6 +4507,7 @@ function notePickupOnIssue(item, marker) {
   }
 }
 function reportIssueMessagesBuriedByNote(item, note, participants) {
+  if (item.issue === null) return 0;
   const watermark = promptWatermark([item.issueAnalysis.messages]);
   let buried;
   try {
@@ -4305,24 +4534,43 @@ function reportIssueMessagesBuriedByNote(item, note, participants) {
 }
 function refreshItem(item, settings) {
   const linkMap = getOpenPrLinkMap();
-  return decideWork(buildIssueState(item.issue, linkMap), settings.participants, {
+  const policy = {
     baseBranch: settings.baseBranch,
     defaultBranch: linkMap.defaultBranch,
     protectedBranches: settings.protectedBranches
-  });
+  };
+  if (item.issue === null) return refreshOrphanItem(item, linkMap, settings, policy);
+  return decideWork(buildIssueState(item.issue, linkMap), settings.participants, policy);
+}
+function refreshOrphanItem(item, linkMap, settings, policy) {
+  const number = item.pr?.number ?? 0;
+  const stillOrphan = linkMap.orphans.some((candidate) => candidate.pr.number === number);
+  if (!stillOrphan) {
+    const linkedTo = issuesClosedBy(linkMap, number).map((issueNumber) => `#${String(issueNumber)}`);
+    return {
+      kind: "skip",
+      issue: null,
+      pr: item.pr,
+      reason: linkedTo.length > 0 ? "pr-linked" : "pr-closed",
+      detail: linkedTo.length > 0 ? `pull request #${String(number)} now closes ${linkedTo.join(", ")}, so it is no longer orphaned` : `pull request #${String(number)} is no longer an open pull request of this repository`
+    };
+  }
+  return decideOrphanPrWork({ prSurface: getPrSurface(number) }, settings.participants, policy);
 }
 function readAnsweringSurface(item) {
-  if (item.turn === "issue-discuss" || item.pr === null) {
-    return getIssueSurface(item.issue.number).messages;
+  const pr = item.pr;
+  if (pr !== null && item.turn !== "issue-discuss") {
+    const surface = getPrSurface(pr.number);
+    return [...surface.messages, ...surface.threads.flatMap((thread) => thread.comments)];
   }
-  const surface = getPrSurface(item.pr.number);
-  return [...surface.messages, ...surface.threads.flatMap((thread) => thread.comments)];
-}
-function markerSurfaceLabel(item) {
-  return item.turn === "pr-work" && item.pr ? `pull request #${String(item.pr.number)}` : `issue #${String(item.issue.number)}`;
+  return item.issue === null ? [] : getIssueSurface(item.issue.number).messages;
 }
 function markerSurfaceTarget(item) {
-  return item.turn === "pr-work" && item.pr ? { surface: "pr", number: item.pr.number } : { surface: "issue", number: item.issue.number };
+  return item.pr !== null && item.turn !== "issue-discuss" ? { surface: "pr", number: item.pr.number } : { surface: "issue", number: item.issue?.number ?? 0 };
+}
+function markerSurfaceLabel(item) {
+  const target = markerSurfaceTarget(item);
+  return target.surface === "pr" ? `pull request #${String(target.number)}` : `issue #${String(target.number)}`;
 }
 function reportOvertakenMessages(item, analysis) {
   if (analysis.missed.length === 0) return;
@@ -4346,7 +4594,7 @@ function reconcileMarker(item, marker, participants, watermark, runError) {
     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}
+      `  warning: could not re-read ${markerSurfaceLabel(item)} to check for an answer: ${err.message}
 `
     );
     return reportUnverified(item, marker);
@@ -4395,7 +4643,7 @@ function reportNoAnswer(item, marker, runError) {
     updateMarker(marker, explanation);
   } catch (err) {
     progress(
-      `  warning: could not update the marker comment on issue #${String(item.issue.number)}: ${err.message}
+      `  warning: could not update the marker comment on ${surface}: ${err.message}
   the humans have not been told that this run produced no answer.
 `
     );
@@ -4410,31 +4658,33 @@ async function invokeExecutor(prompt, execution, silent) {
   await runClaude(prompt, { model: execution.model, effort: execution.effort, printSteps: !silent });
 }
 function repairIssueLink(item, baseBranch) {
+  const issue = item.issue;
+  if (issue === null) return false;
   try {
     const branch = getCurrentBranch();
     if (branch === baseBranch) {
-      progress(`  issue #${String(item.issue.number)} is still in discussion (no branch was created).
+      progress(`  issue #${String(issue.number)} is still in discussion (no branch was created).
 `);
       return false;
     }
     const pr = getCurrentBranchPr();
     if (!pr) {
-      progress(`  issue #${String(item.issue.number)} is still in discussion (no pull request).
+      progress(`  issue #${String(issue.number)} is still in discussion (no pull request).
 `);
       return false;
     }
-    const closesRef = new RegExp(String.raw`\bcloses\s+#` + String(item.issue.number) + String.raw`\b`, "i");
+    const closesRef = new RegExp(String.raw`\bcloses\s+#` + String(issue.number) + String.raw`\b`, "i");
     if (closesRef.test(pr.body)) {
-      progress(`  pull request #${String(pr.number)} already closes issue #${String(item.issue.number)}.
+      progress(`  pull request #${String(pr.number)} already closes issue #${String(issue.number)}.
 `);
       return true;
     }
-    addClosesRefToPr(pr.number, item.issue.number);
-    progress(`  linked pull request #${String(pr.number)} to issue #${String(item.issue.number)}.
+    addClosesRefToPr(pr.number, issue.number);
+    progress(`  linked pull request #${String(pr.number)} to issue #${String(issue.number)}.
 `);
     return true;
   } catch (err) {
-    progress(`  warning: could not link a pull request to issue #${String(item.issue.number)}: ${err.message}
+    progress(`  warning: could not link a pull request to issue #${String(issue.number)}: ${err.message}
 `);
     return false;
   }
@@ -4453,15 +4703,16 @@ function refuseBeforeRun(base, marker, detail, markerText) {
 }
 async function processItem(planned, settings, silent) {
   progress(`
-#${String(planned.issue.number)} ${planned.turn}: ${planned.reason}
+${itemLabel(planned)} ${planned.turn}: ${planned.reason}
 `);
   const refreshed = refreshItem(planned, settings);
   if (refreshed.kind === "skip") {
     progress(`  skipped: ${refreshed.detail}
 `);
     return {
-      issue: planned.issue.number,
-      title: planned.issue.title,
+      issue: planned.issue?.number ?? null,
+      pr: planned.pr?.number ?? null,
+      title: itemTitle(planned),
       turn: planned.turn,
       outcome: "skipped",
       detail: `no longer actionable: ${refreshed.detail}`
@@ -4473,8 +4724,9 @@ async function processItem(planned, settings, silent) {
 `);
   }
   const base = {
-    issue: item.issue.number,
-    title: item.issue.title,
+    issue: item.issue?.number ?? null,
+    pr: item.pr?.number ?? null,
+    title: itemTitle(item),
     turn: item.turn
   };
   const prepared = item.turn === "issue-discuss" ? prepareBaseBranch(item.branch) : preparePrBranch(item.branch);
@@ -4485,9 +4737,9 @@ async function processItem(planned, settings, silent) {
   }
   claimIssue(item, settings);
   let marker;
-  const markerSurface = item.turn === "pr-work" && item.pr ? item.pr.number : item.issue.number;
+  const markerTarget = markerSurfaceTarget(item);
   try {
-    marker = postMarker(item.turn === "pr-work" ? "pr" : "issue", markerSurface, "automata do-work: working\u2026");
+    marker = postMarker(markerTarget.surface, markerTarget.number, "automata do-work: working\u2026");
   } catch (err) {
     progress(`  skipped: could not post the working marker \u2014 ${err.message}
 `);
@@ -4501,7 +4753,7 @@ async function processItem(planned, settings, silent) {
   }
   let buriedByNote = 0;
   if (note !== null) {
-    progress(`  noted on issue #${String(item.issue.number)} that the work is on pull request #${String(item.pr?.number ?? 0)}.
+    progress(`  noted on issue #${String(item.issue?.number ?? 0)} that the work is on pull request #${String(item.pr?.number ?? 0)}.
 `);
     buriedByNote = reportIssueMessagesBuriedByNote(item, note, settings.participants);
   }
@@ -4586,13 +4838,14 @@ function summarize(reports) {
   }
   for (const report of reports) {
     const ran = report.execution === void 0 ? "" : ` \xB7 ${describeExecution(report.execution)}`;
-    out(`  #${String(report.issue)} ${report.turn ?? "-"} ${report.outcome} \u2014 ${report.detail}${ran}
+    out(`  ${reportLabel(report)} ${report.turn ?? "-"} ${report.outcome} \u2014 ${report.detail}${ran}
 `);
   }
 }
 function toItemJson(report) {
   return {
     issue: report.issue,
+    pr: report.pr,
     title: report.title,
     turn: report.turn,
     outcome: report.outcome,
@@ -4607,11 +4860,14 @@ function toItemJson(report) {
   };
 }
 var doWorkCommand = new Command6("do-work").description(
-  "Run one tick of the autonomous loop: find the issues whose newest authorized message the agent has not answered, and answer them"
+  "Run one tick of the autonomous loop: answer the issues whose newest authorized message the agent has not answered, then the open pull requests that close no issue of this repository and have one"
 ).option("--with <executor>", "Executor to use: claude or codex (default: from config, else claude)").option("--model <string>", "Model identifier to pass to the executor, overriding the configured default for it").option(
   "--effort <level>",
   "Reasoning effort to pass to the executor, overriding the configured default for it"
-).option("--issue <number>", "Restrict the tick to a single issue").option("--limit <n>", "Maximum number of issues to fetch", "10").option("--max-runs <n>", "Maximum number of model runs this tick").option(
+).option("--issue <number>", "Restrict the tick to a single issue").option(
+  "--pr <number>",
+  "Restrict the orphan-pull-request pass to a single pull request (one that closes no issue of this repository)"
+).option("--limit <n>", "Maximum number of issues to fetch", "10").option("--max-runs <n>", "Maximum number of model runs this tick").option(
   "--dry-run",
   "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) => {
@@ -4671,7 +4927,7 @@ var doWorkCommand = new Command6("do-work").description(
 });
 function toTickLogItem(report) {
   return {
-    issue: report.issue,
+    subject: reportLabel(report),
     turn: report.turn,
     outcome: report.outcome,
     detail: report.detail,
@@ -4735,19 +4991,24 @@ async function runTick(settings, options) {
     baseBranch: settings.baseBranch,
     protectedBranches: settings.protectedBranches,
     dryRun: options.dryRun === true,
+    agentUser: settings.participants.agentUser,
     log: progress
   });
   const issues = discoverIssues(settings);
   const linkMap = getOpenPrLinkMap();
-  const decisions = issues.map(
-    (issue) => decideWork(buildIssueState(issue, linkMap), settings.participants, {
-      baseBranch: settings.baseBranch,
-      defaultBranch: linkMap.defaultBranch,
-      protectedBranches: settings.protectedBranches
-    })
-  );
+  const policy = {
+    baseBranch: settings.baseBranch,
+    defaultBranch: linkMap.defaultBranch,
+    protectedBranches: settings.protectedBranches
+  };
+  const decisions = skipDuplicateHeadBranches([
+    ...issues.map((issue) => decideWork(buildIssueState(issue, linkMap), settings.participants, policy)),
+    ...discoverOrphanPrs(settings, linkMap).map(
+      (candidate) => decideOrphanPrWork({ prSurface: getPrSurface(candidate.pr.number) }, settings.participants, policy)
+    )
+  ]);
   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):
+  const planText = `Work plan (${String(items.length)} of ${String(decisions.length)} candidates need an answer):
 ${describePlan(decisions)}`;
   if (options.json) {
     progress(planText);
@@ -4773,8 +5034,9 @@ ${describePlan(decisions)}`;
       progress(`  failed: ${err.message}
 `);
       report = {
-        issue: item.issue.number,
-        title: item.issue.title,
+        issue: item.issue?.number ?? null,
+        pr: item.pr?.number ?? null,
+        title: itemTitle(item),
         turn: item.turn,
         outcome: "failed",
         detail: err.message
@@ -4785,11 +5047,12 @@ ${describePlan(decisions)}`;
   }
   for (const item of deferred) {
     progress(`
-#${String(item.issue.number)} deferred: --max-runs / maxRunsPerTick reached.
+${itemLabel(item)} deferred: --max-runs / maxRunsPerTick reached.
 `);
     reports.push({
-      issue: item.issue.number,
-      title: item.issue.title,
+      issue: item.issue?.number ?? null,
+      pr: item.pr?.number ?? null,
+      title: itemTitle(item),
       turn: item.turn,
       outcome: "deferred",
       detail: `run cap of ${String(settings.maxRuns)} reached`
@@ -4820,7 +5083,8 @@ ${describePlan(decisions)}`;
 function toRunJson(entry) {
   if (entry.kind === "refused") {
     return {
-      issue: entry.item.issue.number,
+      issue: entry.item.issue?.number ?? null,
+      pr: entry.item.pr?.number ?? null,
       turn: entry.item.turn,
       executor: null,
       model: null,
@@ -4836,7 +5100,8 @@ function toRunJson(entry) {
     };
   }
   return {
-    issue: entry.item.issue.number,
+    issue: entry.item.issue?.number ?? null,
+    pr: entry.item.pr?.number ?? null,
     turn: entry.item.turn,
     executor: entry.execution.executor,
     model: entry.execution.model ?? null,
@@ -4946,8 +5211,9 @@ function toHygieneJson(hygiene) {
 function toPlanJson(decision) {
   if (decision.kind === "skip") {
     return {
-      issue: decision.issue.number,
-      title: decision.issue.title,
+      issue: decision.issue?.number ?? null,
+      pr: decision.pr?.number ?? null,
+      title: decision.issue?.title ?? decision.pr?.title ?? "",
       turn: null,
       skipReason: decision.reason,
       reason: decision.detail
@@ -4955,11 +5221,11 @@ function toPlanJson(decision) {
   }
   const item = decision.item;
   return {
-    issue: item.issue.number,
-    title: item.issue.title,
+    issue: item.issue?.number ?? null,
+    pr: item.pr?.number ?? null,
+    title: itemTitle(item),
     turn: item.turn,
     branch: item.branch,
-    pr: item.pr?.number ?? null,
     needsAssignment: item.needsAssignment,
     reason: item.reason
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automata-cli",
-  "version": "0.6.0-develop.296",
+  "version": "0.6.0",
   "description": "Automata CLI tool",
   "type": "module",
   "engines": {