automata-cli 0.7.0-develop.316 → 0.7.0-develop.324

package/dist/index.js

@@ -815,10 +815,14 @@ function listRemoteBranches() {
 function createBranchAtHead(branch) {
   return gitCommand(["checkout", "-b", branch]);
 }
+function pathIsIgnored(path) {
+  return run2("git", ["check-ignore", "-q", "--", path]).status === 0;
+}
 function stageAllExcept(excludePaths) {
+  const needed = excludePaths.filter((path) => !pathIsIgnored(path));
   const args = ["add", "-A"];
-  if (excludePaths.length > 0) {
-    args.push("--", ".", ...excludePaths.map((path) => `:(exclude)${path}`));
+  if (needed.length > 0) {
+    args.push("--", ".", ...needed.map((path) => `:(exclude)${path}`));
   }
   return gitCommand(args);
 }
@@ -1534,7 +1538,7 @@ function getCurrentBranchPr(branch) {
   if (branch) {
     args.push(branch);
   }
-  args.push("--json", "number,url,body");
+  args.push("--json", "number,url,body,assignees");
   const { stdout, stderr, status } = run3("gh", args);
   if (status !== 0) {
     if (stderr.includes("no pull requests found") || stderr.includes("Could not resolve")) {
@@ -1542,7 +1546,15 @@ function getCurrentBranchPr(branch) {
     }
     throw new Error(stderr.trim() || "Failed to query PR for current branch.");
   }
-  return JSON.parse(stdout);
+  const raw = JSON.parse(stdout);
+  return {
+    number: raw.number,
+    url: raw.url,
+    body: raw.body,
+    // Absent when an older `gh` ignores the field, and `[]` is the right reading
+    // of "nobody is assigned" either way.
+    assignees: (raw.assignees ?? []).map((a) => a.login ?? "").filter((name) => name.length > 0)
+  };
 }
 function addClosesRefToPr(prNumber, issueNumber) {
   const { stdout, status: viewStatus } = run3("gh", [
@@ -1577,1335 +1589,1350 @@ function addCopilotReviewer(prNumber) {
   }
 }
 
-// src/claude/claudeService.ts
-import { spawn, spawnSync as spawnSync4 } from "child_process";
-import { createInterface } from "readline";
-import { existsSync } from "fs";
-import { delimiter, join } from "path";
-
-// src/cli/spawnUtils.ts
-var SHELL_SAFE = /^[A-Za-z0-9_@%+=:,./-]+$/;
-var ESCAPED_QUOTE = String.raw`'\''`;
-function shellQuote(arg) {
-  if (SHELL_SAFE.test(arg)) return arg;
-  return "'" + arg.replaceAll("'", ESCAPED_QUOTE) + "'";
-}
-function truncate(str, max) {
-  return str.length > max ? str.slice(0, max) + "..." : str;
-}
-function handleSpawnError(error, toolName) {
-  if (!error) return;
-  const err = error;
-  if (err.code === "ENOENT") {
-    process.stderr.write(`Error: \`${toolName}\` CLI is not installed or not on PATH.
-`);
-    process.exit(1);
+// src/github/ghWorkService.ts
+import { spawnSync as spawnSync4 } from "child_process";
+function run4(cmd, args) {
+  const result = spawnSync4(cmd, args, { encoding: "utf8" });
+  if (result.error) {
+    const err = result.error;
+    if (err.code === "ENOENT") {
+      throw new Error(`\`${cmd}\` CLI is not installed or not on PATH.`);
+    }
+    throw new Error(err.message);
   }
-  process.stderr.write(`Error: ${err.message}
-`);
-  process.exit(1);
+  return { stdout: result.stdout ?? "", stderr: result.stderr ?? "", status: result.status ?? 1 };
 }
-function handleExitCode(status, toolName) {
-  if (status === null) {
-    process.stderr.write(`Error: ${toolName} terminated abnormally (exit code is null, likely due to a signal).
-`);
-    process.exit(1);
-  }
+function ghJson(args, what) {
+  const { stdout, stderr, status } = run4("gh", args);
   if (status !== 0) {
-    process.stderr.write(`Error: ${toolName} exited with code ${status}.
-`);
-    process.exit(status);
-  }
-}
-function resolveEffortOption(value) {
-  if (value === void 0) return void 0;
-  const trimmed2 = value.trim();
-  if (trimmed2.length === 0) {
-    process.stderr.write("Error: --effort must be a non-empty level.\n");
-    process.exit(1);
+    throw new Error(stderr.trim() || `Failed to ${what}. Is \`gh\` installed and authenticated?`);
   }
-  return trimmed2;
-}
-
-// src/cli/childRegistry.ts
-var active = /* @__PURE__ */ new Set();
-function trackChild(child) {
-  active.add(child);
+  return JSON.parse(stdout);
 }
-function untrackChild(child) {
-  active.delete(child);
+function login(author) {
+  return author?.login ?? "";
 }
-function waitForExit(child) {
-  return new Promise((resolve2) => {
-    if (child.exitCode !== null || child.signalCode !== null) {
-      resolve2();
-      return;
-    }
-    child.once("exit", () => resolve2());
-  });
+function byCreatedAt(a, b) {
+  return a.createdAt.localeCompare(b.createdAt);
 }
-function afterDelay(ms) {
-  return new Promise((resolve2) => {
-    const timer = setTimeout(() => resolve2("timeout"), ms);
-    timer.unref();
-  });
+function visibleAt(createdAt, submittedAt) {
+  if (submittedAt === null || submittedAt === void 0) return createdAt;
+  return submittedAt > createdAt ? submittedAt : createdAt;
 }
-async function terminateTrackedChildren(timeoutMs = 1e4, killGraceMs = 5e3) {
-  const children = [...active];
-  if (children.length === 0) return true;
-  const exits = children.map((child) => waitForExit(child));
-  for (const child of children) {
-    if (child.exitCode === null && child.signalCode === null) child.kill("SIGTERM");
+function getRepoSlug() {
+  const { stdout, status } = run4("git", ["remote", "get-url", "origin"]);
+  if (status !== 0) {
+    throw new Error("Could not read the `origin` remote. Is this a git repository with a remote?");
   }
-  const settled = await Promise.race([Promise.all(exits).then(() => "exited"), afterDelay(timeoutMs)]);
-  if (settled === "exited") return true;
-  for (const child of children) {
-    if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
+  const url = stdout.trim();
+  const match = /github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/.exec(url) ?? /github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/.exec(url);
+  if (!match) {
+    throw new Error(`Could not determine the GitHub owner/repo from the origin remote: ${url}`);
   }
-  const escalated = await Promise.race([
-    Promise.all(exits).then(() => "exited"),
-    afterDelay(killGraceMs)
-  ]);
-  return escalated === "exited";
+  return { owner: match[1], repo: match[2] };
 }
-
-// src/claude/claudeService.ts
-function resolveCommand(name) {
-  const pathDirs = (process.env["PATH"] ?? "").split(delimiter);
-  for (const dir of pathDirs) {
-    const candidate = join(dir, name);
-    if (existsSync(candidate)) return candidate;
+function getAuthenticatedLogin() {
+  const { stdout, status } = run4("gh", ["api", "user", "--jq", ".login"]);
+  if (status !== 0) return null;
+  const login2 = stdout.trim();
+  return login2.length > 0 ? login2 : null;
+}
+function listCandidateIssues(technique, value, limit) {
+  const args = [
+    "issue",
+    "list",
+    "--state",
+    "open",
+    "--limit",
+    String(limit),
+    "--json",
+    "number,title,body,url"
+  ];
+  switch (technique) {
+    case "label":
+      args.push("--label", value);
+      break;
+    case "assignee":
+      args.push("--assignee", value);
+      break;
+    case "title-contains":
+      args.push("--search", `${value} in:title`);
+      break;
   }
-  return name;
+  return ghJson(args, "query GitHub issues");
 }
-function buildClaudeArgs(prompt, options = {}) {
-  const args = [];
-  if (options.yolo) args.push("--dangerously-skip-permissions");
-  if (options.model) args.push("--model", options.model);
-  if (options.effort) args.push("--effort", options.effort);
-  if (options.verbose) args.push("--verbose", "--output-format", "stream-json");
-  args.push("-p", prompt);
-  return args;
+function getIssueSurface(issueNumber) {
+  const raw = ghJson(
+    [
+      "issue",
+      "view",
+      String(issueNumber),
+      "--json",
+      "number,title,body,url,state,author,createdAt,assignees,labels,comments"
+    ],
+    `read issue #${String(issueNumber)}`
+  );
+  const messages = [
+    {
+      kind: "issue-body",
+      author: login(raw.author),
+      body: raw.body,
+      createdAt: raw.createdAt
+    },
+    ...(raw.comments ?? []).map((comment) => ({
+      kind: "issue-comment",
+      author: login(comment.author),
+      body: comment.body,
+      createdAt: comment.createdAt
+    }))
+  ].sort(byCreatedAt);
+  return {
+    issue: { number: raw.number, title: raw.title, body: raw.body, url: raw.url },
+    state: raw.state === "CLOSED" ? "CLOSED" : "OPEN",
+    assignees: (raw.assignees ?? []).map(login).filter((name) => name.length > 0),
+    labels: (raw.labels ?? []).map((label) => label.name ?? "").filter((name) => name.length > 0),
+    messages
+  };
 }
-function runClaude(prompt, options = {}) {
-  return new Promise((resolve2, reject) => {
-    const claudeBin = resolveCommand("claude");
-    const args = buildClaudeArgs(prompt, {
-      yolo: true,
-      model: options.model,
-      effort: options.effort,
-      verbose: true
-    });
-    const child = spawn(claudeBin, args, { stdio: ["inherit", "pipe", "inherit"] });
-    trackChild(child);
-    const rl = createInterface({ input: child.stdout });
-    let turnCount = 0;
-    rl.on("line", (line) => {
-      if (options.printSteps !== true) return;
-      try {
-        const event = JSON.parse(line);
-        formatEvent(event, turnCount);
-        if (event["type"] === "assistant") turnCount++;
-      } catch {
-      }
-    });
-    child.on("error", (err) => {
-      untrackChild(child);
-      const nodeErr = err;
-      reject(
-        nodeErr.code === "ENOENT" ? new Error("`claude` CLI is not installed or not on PATH.") : new Error(nodeErr.message)
-      );
-    });
-    child.on("close", (code, signal) => {
-      untrackChild(child);
-      if (code === 0) {
-        resolve2();
-        return;
+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{
+        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 } }
+        }
       }
-      reject(
-        new Error(
-          signal === null ? `Claude Code exited with code ${String(code)}.` : `Claude Code terminated on ${signal}.`
-        )
-      );
-    });
-  });
-}
-function invokeClaudeCode(prompt, options = {}) {
-  if (options.verbose) {
-    return invokeClaudeCodeVerbose(prompt, options.yolo ?? false, options.model, options.effort);
+    }
   }
-  invokeClaudeCodeSync(prompt, options.yolo ?? false, options.model, options.effort);
-}
-function invokeClaudeCodeSync(prompt, yolo, model, effort) {
-  const claudeBin = resolveCommand("claude");
-  const args = buildClaudeArgs(prompt, { yolo, model, effort, verbose: false });
-  const result = spawnSync4(claudeBin, args, { encoding: "utf8", stdio: "inherit" });
-  handleSpawnError(result.error, "claude");
-  handleExitCode(result.status, "Claude Code");
-}
-function invokeClaudeCodeVerbose(prompt, yolo, model, effort) {
-  return new Promise((resolve2) => {
-    const claudeBin = resolveCommand("claude");
-    const args = buildClaudeArgs(prompt, { yolo, model, effort, verbose: true });
-    const child = spawn(claudeBin, args, { stdio: ["inherit", "pipe", "inherit"] });
-    const rl = createInterface({ input: child.stdout });
-    let turnCount = 0;
-    child.on("error", (err) => {
-      handleSpawnError(err, "claude");
-    });
-    rl.on("line", (line) => {
-      try {
-        const event = JSON.parse(line);
-        formatEvent(event, turnCount);
-        if (event["type"] === "assistant") turnCount++;
-      } catch {
-      }
-    });
-    child.on("close", (code) => {
-      handleExitCode(code, "Claude Code");
-      resolve2();
-    });
-  });
-}
-function formatAssistantEvent(event, turnCount) {
-  const message = event["message"];
-  const content = message?.["content"];
-  if (!content) return;
-  for (const block of content) {
-    const line = formatContentBlock(block);
-    if (line !== null) {
-      process.stderr.write(`  [step ${turnCount + 1}] ${line}
-`);
-    }
-  }
-}
-function formatContentBlock(block) {
-  if (block["type"] === "tool_use") {
-    const toolName = block["name"];
-    const input = block["input"];
-    return summarizeTool(toolName, input);
-  }
-  if (block["type"] === "text") {
-    const text = block["text"] ?? "";
-    if (text.length === 0) return null;
-    const preview = text.length > 120 ? text.slice(0, 120) + "..." : text;
-    return preview.split("\n")[0] ?? null;
-  }
-  return null;
-}
-function formatResultEvent(event) {
-  const result = event["result"];
-  const cost = event["cost_usd"];
-  const duration = event["duration_ms"];
-  const turns = event["num_turns"];
-  process.stderr.write("\n--- Result ---\n");
-  const parts = [];
-  if (turns !== void 0) parts.push(`${turns} turns`);
-  if (duration !== void 0) parts.push(`${(duration / 1e3).toFixed(1)}s`);
-  if (cost !== void 0) parts.push(`$${cost.toFixed(4)}`);
-  if (parts.length > 0) {
-    process.stderr.write(`  [info] ${parts.join(" | ")}
-`);
-  }
-  if (result) {
-    process.stdout.write(result + "\n");
-  }
-}
-function formatEvent(event, turnCount) {
-  const type = event["type"];
-  if (type === "assistant") {
-    formatAssistantEvent(event, turnCount);
-  } else if (type === "result") {
-    formatResultEvent(event);
+}`.trim();
+var MAX_LINK_MAP_PAGES = 50;
+function indexPullRequest(map, node, nameWithOwner) {
+  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.`
+    );
   }
-}
-function asText(value, fallback) {
-  return typeof value === "string" ? value : fallback;
-}
-function summarizeTool(name, input) {
-  if (!input) return `tool: ${name}`;
-  switch (name) {
-    case "Read":
-      return `reading ${asText(input["file_path"], "file")}`;
-    case "Write":
-      return `writing ${asText(input["file_path"], "file")}`;
-    case "Edit":
-      return `editing ${asText(input["file_path"], "file")}`;
-    case "Bash":
-      return `running: ${truncate(asText(input["command"], ""), 80)}`;
-    case "Glob":
-      return `searching files: ${asText(input["pattern"], "")}`;
-    case "Grep":
-      return `searching content: ${truncate(asText(input["pattern"], ""), 60)}`;
-    case "Agent":
-      return `spawning agent: ${asText(input["description"], name)}`;
-    default:
-      return `tool: ${name}`;
+  let closedAnyHere = false;
+  for (const issue of node.closingIssuesReferences.nodes) {
+    if (issue.repository.nameWithOwner.toLowerCase() !== nameWithOwner.toLowerCase()) continue;
+    closedAnyHere = true;
+    const existing = map.get(issue.number);
+    if (existing) {
+      existing.push(ref);
+    } else {
+      map.set(issue.number, [ref]);
+    }
   }
+  return closedAnyHere;
 }
-
-// src/codex/codexService.ts
-import { spawn as spawn2, spawnSync as spawnSync5 } from "child_process";
-function toTomlBasicString(value) {
-  return JSON.stringify(value);
+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 buildCodexArgs(prompt, options = {}) {
-  const args = ["exec"];
-  if (options.yolo) args.push("--dangerously-bypass-approvals-and-sandbox");
-  if (options.model) args.push("--model", options.model);
-  if (options.effort) args.push("-c", `model_reasoning_effort=${toTomlBasicString(options.effort)}`);
-  args.push(prompt);
-  return args;
+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 invokeCodexCode(prompt, options = {}) {
-  if (options.verbose) {
-    process.stderr.write("Warning: --verbose is not supported for Codex and will be ignored.\n");
+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++) {
+    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) {
+      if (!indexPullRequest(map, node, `${owner}/${repo}`)) {
+        orphans.push(toOrphanPr(node));
+      }
+    }
+    if (!connection.pageInfo?.hasNextPage || connection.pageInfo.endCursor === null) {
+      return { byIssue: map, defaultBranch, orphans };
+    }
+    cursor = connection.pageInfo.endCursor;
   }
-  invokeCodexCodeSync(prompt, options.yolo ?? false, options.model, options.effort);
-}
-function invokeCodexCodeSync(prompt, yolo, model, effort) {
-  const codexBin = resolveCommand("codex");
-  const args = buildCodexArgs(prompt, { yolo, model, effort });
-  const result = spawnSync5(codexBin, args, { encoding: "utf8", stdio: "inherit" });
-  handleSpawnError(result.error, "codex");
-  handleExitCode(result.status, "Codex");
+  throw new Error(
+    `Stopped paginating open pull requests after ${String(MAX_LINK_MAP_PAGES)} pages, so the issue-to-pull-request map cannot be trusted. Refusing the tick rather than risk starting work on an issue that already has a pull request.`
+  );
 }
-function runCodex(prompt, options = {}) {
-  return new Promise((resolve2, reject) => {
-    const codexBin = resolveCommand("codex");
-    const args = buildCodexArgs(prompt, { yolo: true, model: options.model, effort: options.effort });
-    const child = spawn2(codexBin, args, { stdio: "inherit" });
-    trackChild(child);
-    child.on("error", (err) => {
-      untrackChild(child);
-      const nodeErr = err;
-      reject(
-        nodeErr.code === "ENOENT" ? new Error("`codex` CLI is not installed or not on PATH.") : new Error(nodeErr.message)
-      );
-    });
-    child.on("close", (code, signal) => {
-      untrackChild(child);
-      if (code === 0) {
-        resolve2();
-        return;
+var REVIEW_THREADS_QUERY2 = `
+query($owner:String!,$repo:String!,$prNumber:Int!,$cursor:String){
+  repository(owner:$owner,name:$repo){
+    pullRequest(number:$prNumber){
+      reviewThreads(first:100, after:$cursor){
+        pageInfo{ hasNextPage endCursor }
+        nodes{
+          isResolved isOutdated path line
+          comments(last:100){
+            pageInfo{ hasPreviousPage }
+            nodes{ author{login} body createdAt url pullRequestReview{ submittedAt } }
+          }
+        }
       }
-      reject(
-        new Error(
-          signal === null ? `Codex exited with code ${String(code)}.` : `Codex terminated on ${signal}.`
-        )
-      );
-    });
-  });
-}
-
-// src/commands/getReady.ts
-function writeOverflowHint(output, issues, limit) {
-  if (issues.length === limit) {
-    output.write(`(Showing first ${limit} matching issues \u2014 there may be more. Use --limit to fetch more.)
-`);
+    }
   }
+}`.trim();
+var MAX_THREAD_PAGES = 50;
+function normalizePrState(state) {
+  if (state === "MERGED") return "MERGED";
+  if (state === "CLOSED") return "CLOSED";
+  return "OPEN";
 }
-function writeIssueList(output, issues, limit) {
-  output.write("\nAvailable issues:\n");
-  for (let i = 0; i < issues.length; i++) {
-    output.write(`  [${i + 1}] #${issues[i].number} - ${issues[i].title}
-`);
+function getReviewThreads(prNumber) {
+  const { owner, repo } = getRepoSlug();
+  const threads = [];
+  let cursor = null;
+  for (let page = 0; page < MAX_THREAD_PAGES; page++) {
+    const args = [
+      "api",
+      "graphql",
+      "-f",
+      `query=${REVIEW_THREADS_QUERY2}`,
+      "-f",
+      `owner=${owner}`,
+      "-f",
+      `repo=${repo}`,
+      "-F",
+      `prNumber=${String(prNumber)}`
+    ];
+    if (cursor !== null) args.push("-f", `cursor=${cursor}`);
+    const response = ghJson(
+      args,
+      `query review threads for pull request #${String(prNumber)}`
+    );
+    const connection = response.data.repository.pullRequest.reviewThreads;
+    for (const node of connection.nodes) {
+      if (node.comments.pageInfo?.hasPreviousPage) {
+        throw new Error(
+          `Review thread on ${node.path} in pull request #${String(prNumber)} has more than 100 comments, so the earliest ones were not read. Refusing rather than risk suppressing a maintainer's request.`
+        );
+      }
+      threads.push({
+        path: node.path,
+        line: node.line ?? null,
+        isResolved: node.isResolved,
+        url: node.comments.nodes.at(-1)?.url ?? null,
+        comments: node.comments.nodes.map((comment) => ({
+          kind: "thread-comment",
+          author: login(comment.author),
+          body: comment.body,
+          // When the comment became *visible*, not when it was drafted.
+          // GitHub stamps `createdAt` the moment a comment is added to a
+          // pending review, and it only becomes visible when the review is
+          // submitted — minutes later for a human working through a diff.
+          // Using `createdAt` let an agent answer posted in between look newer
+          // than the review, which marked every one of its threads answered
+          // and discarded the whole review silently.
+          createdAt: visibleAt(comment.createdAt, comment.pullRequestReview?.submittedAt)
+        })).sort(byCreatedAt)
+      });
+    }
+    if (!connection.pageInfo?.hasNextPage || connection.pageInfo.endCursor === null) {
+      return threads;
+    }
+    cursor = connection.pageInfo.endCursor;
   }
-  writeOverflowHint(output, issues, limit);
+  throw new Error(
+    `Stopped paginating review threads for pull request #${String(prNumber)} after ${String(MAX_THREAD_PAGES)} pages; refusing rather than answering only part of the feedback.`
+  );
 }
-async function promptSelection(issues, limit, output) {
-  writeIssueList(output, issues, limit);
-  const rl = createInterface2({ input: process.stdin, output });
-  const answer = await new Promise(
-    (resolve2) => rl.question(`
-Select issue (1-${issues.length}): `, resolve2)
+function getPrSurface(prNumber) {
+  const raw = ghJson(
+    [
+      "pr",
+      "view",
+      String(prNumber),
+      "--json",
+      "number,title,url,headRefName,baseRefName,isCrossRepository,state,isDraft,body,author,createdAt,updatedAt,assignees,comments,reviews"
+    ],
+    `read pull request #${String(prNumber)}`
   );
-  rl.close();
-  const n = Number.parseInt(answer.trim(), 10);
-  if (Number.isNaN(n) || n < 1 || n > issues.length) {
-    process.stderr.write(`Error: Invalid selection "${answer.trim()}". Enter a number between 1 and ${issues.length}.
-`);
-    process.exit(1);
-  }
-  return issues[n - 1];
+  const messages = [
+    ...(raw.comments ?? []).map((comment) => ({
+      kind: "pr-comment",
+      author: login(comment.author),
+      body: comment.body,
+      createdAt: comment.createdAt
+    })),
+    // A review with no body carries no message — only its inline comments do,
+    // and those arrive through the review-thread query.
+    ...(raw.reviews ?? []).filter((review) => review.body.trim().length > 0).map((review) => ({
+      kind: "pr-review",
+      author: login(review.author),
+      body: review.body,
+      createdAt: review.submittedAt ?? review.createdAt ?? ""
+    }))
+  ].sort(byCreatedAt);
+  const threads = getReviewThreads(prNumber);
+  const state = normalizePrState(raw.state);
+  return {
+    pr: {
+      number: raw.number,
+      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
+    },
+    assignees: (raw.assignees ?? []).map(login).filter((name) => name.length > 0),
+    messages,
+    threads
+  };
 }
-function validateConfig(config) {
-  if (config.remoteType !== "gh") {
-    process.stderr.write(
-      "Error: implement-next is not supported in Azure DevOps mode. Work item discovery is not available in azdo-cli. See docs/azdo-gap.md for details.\n"
-    );
-    process.exit(1);
-  }
-  if (!config.issueDiscoveryTechnique) {
-    process.stderr.write(
-      "Error: No issue discovery technique configured. Run `automata config` to set one.\n"
-    );
-    process.exit(1);
+function assignIssueToAgent(issueNumber, agentUser) {
+  const { stderr, status } = run4("gh", [
+    "issue",
+    "edit",
+    String(issueNumber),
+    "--add-assignee",
+    agentUser
+  ]);
+  if (status !== 0) {
+    throw new Error(stderr.trim() || `Failed to assign issue #${String(issueNumber)} to ${agentUser}.`);
   }
-  if (!config.issueDiscoveryValue) {
-    process.stderr.write(
-      "Error: No issue discovery value configured. Run `automata config` to set one.\n"
+}
+function assignPrToAgent(prNumber, agentUser) {
+  const { stderr, status } = run4("gh", ["pr", "edit", String(prNumber), "--add-assignee", agentUser]);
+  if (status !== 0) {
+    throw new Error(
+      stderr.trim() || `Failed to assign pull request #${String(prNumber)} to ${agentUser}.`
     );
-    process.exit(1);
   }
 }
-async function resolveIssue(issues, options, limit) {
-  const selectionOutput = options.json ? process.stderr : process.stdout;
-  if (issues.length === 0) {
-    process.stdout.write("No issues found matching the configured filter.\n");
-    process.exit(0);
-  }
-  if (issues.length > 1 && options.queryOnly) {
-    writeIssueList(selectionOutput, issues, limit);
-    process.exit(0);
-  }
-  let issue;
-  if (issues.length === 1) {
-    issue = issues[0];
-    selectionOutput.write(`Issue:  #${issue.number}
-Title:  ${issue.title}
-`);
-  } else if (options.takeFirst) {
-    issue = issues[0];
-    selectionOutput.write(`Selecting issue #${issue.number}: ${issue.title}
-`);
-  } else {
-    issue = await promptSelection(issues, limit, selectionOutput);
-    selectionOutput.write(`
-Issue:  #${issue.number}
-Title:  ${issue.title}
-`);
-  }
-  return issue;
+function postMarker(_surface, number, body) {
+  const { owner, repo } = getRepoSlug();
+  const raw = ghJson(
+    [
+      "api",
+      "--method",
+      "POST",
+      `repos/${owner}/${repo}/issues/${String(number)}/comments`,
+      "-f",
+      `body=${body}`
+    ],
+    `post a comment on #${String(number)}`
+  );
+  return { commentId: String(raw.id), createdAt: raw.created_at };
 }
-var implementNextCommand = new Command3("implement-next").description("Find the next open GitHub issue matching the configured filter, claim it, and invoke the AI code assistant (Claude or Codex)").option("--json", "Output issue details as JSON").option("--no-claude", "Skip all AI invocation (Claude or Codex) after claiming the issue").option("--with <executor>", "Executor to use: claude or codex", "claude").option("--query-only", "Print issue content and exit without claiming or invoking any AI tools").option("--yolo", "Launch with --dangerously-skip-permissions (Claude) or --dangerously-bypass-approvals-and-sandbox (Codex)").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--model <string>", "Model identifier to pass to the executor").option("--effort <level>", "Reasoning effort to pass to the executor").option("--take-first", "When multiple issues match, pick the first without prompting").option("--limit <n>", "Max issues to fetch and display (default: 10)", "10").option("--ask-copilot-review", "Request a Copilot code review on the PR after AI invocation finishes").action(async (options) => {
-  const config = readConfig();
-  validateConfig(config);
-  const limit = Number.parseInt(options.limit, 10);
-  if (Number.isNaN(limit) || limit <= 0) {
-    process.stderr.write(`Error: --limit must be a positive integer (got "${options.limit}").
-`);
-    process.exit(1);
-  }
-  let issues;
-  try {
-    issues = listIssues(config.issueDiscoveryTechnique, config.issueDiscoveryValue, limit);
-  } catch (err) {
-    process.stderr.write(`Error: ${err.message}
-`);
-    process.exit(1);
-  }
-  const issue = await resolveIssue(issues, options, limit);
-  if (options.json) {
-    process.stdout.write(JSON.stringify({ number: issue.number, title: issue.title, body: issue.body, url: issue.url }, null, 2) + "\n");
-  } else {
-    process.stdout.write(`URL:    ${issue.url}
-
-${issue.body}
-`);
-  }
-  if (options.queryOnly) {
-    process.exit(0);
-  }
-  const executor = options.claude === false ? void 0 : resolveExecutor(options.with);
-  let commentUrl;
-  try {
-    commentUrl = postComment(issue.number, "working");
-  } catch (err) {
-    process.stderr.write(`Error: ${err.message}
-`);
-    process.exit(1);
-  }
-  const effort = resolveEffortOption(options.effort);
-  if (options.claude !== false) {
-    const systemPrompt = config.claudeSystemPrompt ?? DEFAULT_CLAUDE_SYSTEM_PROMPT;
-    const prompt = `Resolving issue #${issue.number}:
-
-${systemPrompt}
-
-${issue.body}`;
-    if (executor === "codex") {
-      if (options.silent) {
-        process.stderr.write("Warning: --silent is only supported with Claude and has no effect when used with Codex.\n");
-      }
-      invokeCodexCode(prompt, { yolo: options.yolo, model: options.model, effort });
-    } else {
-      await invokeClaudeCode(prompt, {
-        yolo: options.yolo,
-        verbose: !options.silent,
-        model: options.model,
-        effort
-      });
-    }
-  }
-  linkPrToIssue(issue.number, commentUrl, options.askCopilotReview === true);
-});
-function resolveExecutor(requested) {
-  const executor = requested.toLowerCase();
-  if (executor !== "claude" && executor !== "codex") {
-    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${requested}'.
-`);
-    process.exit(1);
+function updateMarker(marker, body) {
+  const { owner, repo } = getRepoSlug();
+  const { stderr, status } = run4("gh", [
+    "api",
+    "--method",
+    "PATCH",
+    `repos/${owner}/${repo}/issues/comments/${marker.commentId}`,
+    "-f",
+    `body=${body}`
+  ]);
+  if (status !== 0) {
+    throw new Error(stderr.trim() || `Failed to update comment ${marker.commentId}.`);
   }
-  return executor;
 }
-function warnOnFailure(what, action) {
-  try {
-    action();
-  } catch (err) {
-    process.stderr.write(`Warning: could not ${what}: ${err.message}
-`);
+function deleteMarker(marker) {
+  const { owner, repo } = getRepoSlug();
+  const { stderr, status } = run4("gh", [
+    "api",
+    "--method",
+    "DELETE",
+    `repos/${owner}/${repo}/issues/comments/${marker.commentId}`
+  ]);
+  if (status !== 0) {
+    if (/not found/i.test(stderr) || /HTTP 404/i.test(stderr)) return;
+    throw new Error(stderr.trim() || `Failed to delete comment ${marker.commentId}.`);
   }
 }
-function linkPrToIssue(issueNumber, commentUrl, askCopilotReview) {
-  let pr;
-  try {
-    pr = getCurrentBranchPr();
-  } catch (err) {
-    process.stderr.write(`Warning: could not detect current branch PR: ${err.message}
-`);
-    return;
+function toHeadState(state) {
+  return state === "OPEN" || state === "MERGED" ? state : "CLOSED";
+}
+function listPullRequestsForHead(branch) {
+  const raw = ghJson(
+    ["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,
+    author: pr.author?.login ?? ""
+  })).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+}
+var MISSING_LABEL_PATTERNS = [
+  // gh's own message: `could not add label: 'rescue' not found`.
+  /could not add label/i,
+  // The GraphQL error it wraps, seen directly on some gh versions.
+  /could not resolve to a label/i,
+  /\blabels?\b[^\n]*\b(?:not found|does not exist)\b/i
+];
+function isMissingLabelError(stderr) {
+  return MISSING_LABEL_PATTERNS.some((pattern) => pattern.test(stderr));
+}
+function createDraftPullRequest(input) {
+  const base = [
+    "pr",
+    "create",
+    "--draft",
+    "--head",
+    input.head,
+    "--base",
+    input.base,
+    "--title",
+    input.title,
+    "--body",
+    input.body
+  ];
+  if (input.label !== void 0 && input.label.length > 0) {
+    const labelled = run4("gh", [...base, "--label", input.label]);
+    if (labelled.status === 0) return parseCreatedPrUrl(labelled.stdout, input.head);
+    if (!isMissingLabelError(labelled.stderr)) {
+      throw new Error(
+        labelled.stderr.trim() || `Failed to open a draft pull request for ${input.head}.`
+      );
+    }
   }
-  if (!pr) return;
-  if (commentUrl) {
-    warnOnFailure("update issue comment", () => {
-      editComment(commentUrl, `Working on this in PR #${pr.number} \u2014 ${pr.url}`);
-    });
+  const { stdout, stderr, status } = run4("gh", base);
+  if (status !== 0) {
+    throw new Error(stderr.trim() || `Failed to open a draft pull request for ${input.head}.`);
   }
-  warnOnFailure(`add Closes #${String(issueNumber)} to PR`, () => {
-    addClosesRefToPr(pr.number, issueNumber);
-  });
-  if (askCopilotReview) {
-    warnOnFailure("request Copilot review", () => {
-      addCopilotReviewer(pr.number);
-    });
+  return parseCreatedPrUrl(stdout, input.head);
+}
+function parseCreatedPrUrl(stdout, head) {
+  const url = stdout.trim().split("\n").pop()?.trim() ?? "";
+  const match = /\/pull\/(\d+)\s*$/.exec(url);
+  if (!match) {
+    throw new Error(`Opened a pull request for ${head} but could not read its number from: ${url}`);
   }
+  return { number: Number(match[1]), url };
 }
 
-// src/commands/execute.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { Command as Command4 } from "commander";
-function readStdin() {
-  return new Promise((resolve2, reject) => {
-    const chunks = [];
-    process.stdin.on("data", (chunk) => chunks.push(chunk));
-    process.stdin.on("end", () => resolve2(Buffer.concat(chunks).toString("utf8")));
-    process.stdin.on("error", reject);
-  });
+// src/claude/claudeService.ts
+import { spawn, spawnSync as spawnSync5 } from "child_process";
+import { createInterface } from "readline";
+import { existsSync } from "fs";
+import { delimiter, join } from "path";
+
+// src/cli/spawnUtils.ts
+var SHELL_SAFE = /^[A-Za-z0-9_@%+=:,./-]+$/;
+var ESCAPED_QUOTE = String.raw`'\''`;
+function shellQuote(arg) {
+  if (SHELL_SAFE.test(arg)) return arg;
+  return "'" + arg.replaceAll("'", ESCAPED_QUOTE) + "'";
+}
+function truncate(str, max) {
+  return str.length > max ? str.slice(0, max) + "..." : str;
 }
-async function resolvePrompt(options) {
-  const hasCli = options.prompt !== void 0;
-  const hasFile = options.filePrompt !== void 0;
-  if (hasCli && hasFile) {
-    process.stderr.write("Error: --prompt is mutually exclusive with --file-prompt.\n");
+function handleSpawnError(error, toolName) {
+  if (!error) return;
+  const err = error;
+  if (err.code === "ENOENT") {
+    process.stderr.write(`Error: \`${toolName}\` CLI is not installed or not on PATH.
+`);
     process.exit(1);
   }
-  if (hasCli) {
-    return options.prompt;
-  }
-  if (hasFile) {
-    const path = options.filePrompt;
-    try {
-      return readFileSync2(path, "utf8");
-    } catch {
-      process.stderr.write(`Error: Cannot read file: ${path}
+  process.stderr.write(`Error: ${err.message}
 `);
-      process.exit(1);
-    }
-  }
-  if (!process.stdin.isTTY) {
-    const content = await readStdin();
-    if (content.trim().length === 0) {
-      process.stderr.write("Error: No prompt provided. Use --prompt, --file-prompt, or pipe via stdin.\n");
-      process.exit(1);
-    }
-    return content;
-  }
-  process.stderr.write("Error: No prompt provided. Use --prompt, --file-prompt, or pipe via stdin.\n");
   process.exit(1);
 }
-var executeCommand = new Command4("execute").description("Delegate work to an AI executor").requiredOption("--with <executor>", "Executor to use: claude or codex").option("--prompt <string>", "Prompt to send to the executor").option("--file-prompt <path>", "Path to a file whose content is used as the prompt").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--model <string>", "Model identifier to pass to the executor").option("--effort <level>", "Reasoning effort to pass to the executor").action(async (options) => {
-  const executor = options.with.toLowerCase();
-  if (executor !== "claude" && executor !== "codex") {
-    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${options.with}'.
+function handleExitCode(status, toolName) {
+  if (status === null) {
+    process.stderr.write(`Error: ${toolName} terminated abnormally (exit code is null, likely due to a signal).
 `);
     process.exit(1);
   }
-  const prompt = await resolvePrompt(options);
-  const effort = resolveEffortOption(options.effort);
-  if (executor === "codex") {
-    invokeCodexCode(prompt, { yolo: true, model: options.model, effort });
-  } else {
-    await invokeClaudeCode(prompt, {
-      yolo: true,
-      verbose: !options.silent,
-      model: options.model,
-      effort
-    });
+  if (status !== 0) {
+    process.stderr.write(`Error: ${toolName} exited with code ${status}.
+`);
+    process.exit(status);
   }
-});
-
-// src/commands/executePrompt.ts
-import { Command as Command5 } from "commander";
+}
+function resolveEffortOption(value) {
+  if (value === void 0) return void 0;
+  const trimmed2 = value.trim();
+  if (trimmed2.length === 0) {
+    process.stderr.write("Error: --effort must be a non-empty level.\n");
+    process.exit(1);
+  }
+  return trimmed2;
+}
 
-// src/github/conversation.ts
-var KIND_LABELS = {
-  "issue-body": "issue description",
-  "issue-comment": "comment",
-  "pr-comment": "pull request comment",
-  "pr-review": "pull request review",
-  "thread-comment": "review thread comment"
-};
-function byCreatedAt(a, b) {
-  return a.createdAt.localeCompare(b.createdAt);
+// src/cli/childRegistry.ts
+var active = /* @__PURE__ */ new Set();
+function trackChild(child) {
+  active.add(child);
 }
-function classify(author, p) {
-  const login2 = author.toLowerCase();
-  if (login2 === p.agentUser.toLowerCase()) return "agent";
-  return p.allowedUsers.some((user) => user.toLowerCase() === login2) ? "authorized" : "other";
+function untrackChild(child) {
+  active.delete(child);
 }
-function analyzeSurface(messages, p) {
-  const ordered = [...messages].sort(byCreatedAt);
-  let lastAgentAt = null;
-  for (const message of ordered) {
-    if (message.kind === "issue-body") continue;
-    if (classify(message.author, p) !== "agent") continue;
-    if (lastAgentAt === null || message.createdAt > lastAgentAt) {
-      lastAgentAt = message.createdAt;
+function waitForExit(child) {
+  return new Promise((resolve2) => {
+    if (child.exitCode !== null || child.signalCode !== null) {
+      resolve2();
+      return;
     }
-  }
-  const kept = [];
-  for (const message of ordered) {
-    const authorClass = classify(message.author, p);
-    if (authorClass === "other") continue;
-    const isNew = authorClass === "authorized" && (lastAgentAt === null || message.createdAt > lastAgentAt);
-    kept.push({ ...message, isNew });
-  }
-  const newMessages = kept.filter((message) => message.isNew);
-  return {
-    messages: kept,
-    newMessages,
-    newMessageCount: newMessages.length,
-    hasNewMessage: newMessages.length > 0,
-    lastAgentAt
-  };
+    child.once("exit", () => resolve2());
+  });
 }
-function lastAuthorClass(messages, p) {
-  if (messages.length === 0) return "none";
-  const newest2 = [...messages].sort(byCreatedAt).at(-1);
-  return newest2 === void 0 ? "none" : classify(newest2.author, p);
+function afterDelay(ms) {
+  return new Promise((resolve2) => {
+    const timer = setTimeout(() => resolve2("timeout"), ms);
+    timer.unref();
+  });
 }
-function formatMessages(messages) {
-  return messages.map((message) => {
-    const marker = message.isNew ? " \xB7 NEW since last agent run" : "";
-    return `[${message.author}] ${KIND_LABELS[message.kind]} \xB7 ${message.createdAt}${marker}
-${message.body}`;
-  }).join("\n\n");
+async function terminateTrackedChildren(timeoutMs = 1e4, killGraceMs = 5e3) {
+  const children = [...active];
+  if (children.length === 0) return true;
+  const exits = children.map((child) => waitForExit(child));
+  for (const child of children) {
+    if (child.exitCode === null && child.signalCode === null) child.kill("SIGTERM");
+  }
+  const settled = await Promise.race([Promise.all(exits).then(() => "exited"), afterDelay(timeoutMs)]);
+  if (settled === "exited") return true;
+  for (const child of children) {
+    if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
+  }
+  const escalated = await Promise.race([
+    Promise.all(exits).then(() => "exited"),
+    afterDelay(killGraceMs)
+  ]);
+  return escalated === "exited";
 }
 
-// src/github/issueConversation.ts
-function analyzeConversation(conversation, allowedUsers, agentUser) {
-  const participants = { allowedUsers, agentUser };
-  const messages = [
-    {
-      kind: "issue-body",
-      author: conversation.author,
-      body: conversation.body,
-      createdAt: conversation.createdAt
-    },
-    ...conversation.comments.map((comment) => ({
-      kind: "issue-comment",
-      author: comment.author,
-      body: comment.body,
-      createdAt: comment.createdAt
-    }))
-  ];
-  const analysis = analyzeSurface(messages, participants);
-  return {
-    messages: analysis.messages.map(toConversationMessage),
-    newMessageCount: analysis.newMessageCount,
-    hasNewMessage: analysis.hasNewMessage,
-    lastAgentAt: analysis.lastAgentAt
-  };
-}
-function toConversationMessage(message) {
-  return {
-    kind: message.kind === "issue-body" ? "issue" : "comment",
-    author: message.author,
-    body: message.body,
-    createdAt: message.createdAt,
-    isNew: message.isNew
-  };
+// src/claude/claudeService.ts
+function resolveCommand(name) {
+  const pathDirs = (process.env["PATH"] ?? "").split(delimiter);
+  for (const dir of pathDirs) {
+    const candidate = join(dir, name);
+    if (existsSync(candidate)) return candidate;
+  }
+  return name;
 }
-function formatConversation(messages) {
-  return formatMessages(
-    messages.map((message) => ({
-      kind: message.kind === "issue" ? "issue-body" : "issue-comment",
-      author: message.author,
-      body: message.body,
-      createdAt: message.createdAt,
-      isNew: message.isNew
-    }))
-  );
+function buildClaudeArgs(prompt, options = {}) {
+  const args = [];
+  if (options.yolo) args.push("--dangerously-skip-permissions");
+  if (options.model) args.push("--model", options.model);
+  if (options.effort) args.push("--effort", options.effort);
+  if (options.verbose) args.push("--verbose", "--output-format", "stream-json");
+  args.push("-p", prompt);
+  return args;
 }
-
-// src/commands/executePrompt.ts
-var PUSH_INSTRUCTION = "Once all changes are complete, stage every modified file, create a single commit with a clear and descriptive commit message that summarises what was fixed, and push the branch to the remote.";
-function withPush(prompt, push) {
-  return push ? `${prompt}
-
-${PUSH_INSTRUCTION}` : prompt;
+function runClaude(prompt, options = {}) {
+  return new Promise((resolve2, reject) => {
+    const claudeBin = resolveCommand("claude");
+    const args = buildClaudeArgs(prompt, {
+      yolo: true,
+      model: options.model,
+      effort: options.effort,
+      verbose: true
+    });
+    const child = spawn(claudeBin, args, { stdio: ["inherit", "pipe", "inherit"] });
+    trackChild(child);
+    const rl = createInterface({ input: child.stdout });
+    let turnCount = 0;
+    rl.on("line", (line) => {
+      if (options.printSteps !== true) return;
+      try {
+        const event = JSON.parse(line);
+        formatEvent(event, turnCount);
+        if (event["type"] === "assistant") turnCount++;
+      } catch {
+      }
+    });
+    child.on("error", (err) => {
+      untrackChild(child);
+      const nodeErr = err;
+      reject(
+        nodeErr.code === "ENOENT" ? new Error("`claude` CLI is not installed or not on PATH.") : new Error(nodeErr.message)
+      );
+    });
+    child.on("close", (code, signal) => {
+      untrackChild(child);
+      if (code === 0) {
+        resolve2();
+        return;
+      }
+      reject(
+        new Error(
+          signal === null ? `Claude Code exited with code ${String(code)}.` : `Claude Code terminated on ${signal}.`
+        )
+      );
+    });
+  });
 }
-function formatPrInfoContext(pr) {
-  return JSON.stringify(pr, null, 2);
+function invokeClaudeCode(prompt, options = {}) {
+  if (options.verbose) {
+    return invokeClaudeCodeVerbose(prompt, options.yolo ?? false, options.model, options.effort);
+  }
+  invokeClaudeCodeSync(prompt, options.yolo ?? false, options.model, options.effort);
 }
-function pluralSuffix(count) {
-  return count === 1 ? "" : "s";
+function invokeClaudeCodeSync(prompt, yolo, model, effort) {
+  const claudeBin = resolveCommand("claude");
+  const args = buildClaudeArgs(prompt, { yolo, model, effort, verbose: false });
+  const result = spawnSync5(claudeBin, args, { encoding: "utf8", stdio: "inherit" });
+  handleSpawnError(result.error, "claude");
+  handleExitCode(result.status, "Claude Code");
 }
-function addAiOptions(cmd) {
-  return cmd.requiredOption("--with <executor>", "Executor to use: claude or codex").option("--model <string>", "Model identifier to pass to the executor").option("--effort <level>", "Reasoning effort to pass to the executor").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--push", "Append instruction to commit and push changes after the AI finishes");
+function invokeClaudeCodeVerbose(prompt, yolo, model, effort) {
+  return new Promise((resolve2) => {
+    const claudeBin = resolveCommand("claude");
+    const args = buildClaudeArgs(prompt, { yolo, model, effort, verbose: true });
+    const child = spawn(claudeBin, args, { stdio: ["inherit", "pipe", "inherit"] });
+    const rl = createInterface({ input: child.stdout });
+    let turnCount = 0;
+    child.on("error", (err) => {
+      handleSpawnError(err, "claude");
+    });
+    rl.on("line", (line) => {
+      try {
+        const event = JSON.parse(line);
+        formatEvent(event, turnCount);
+        if (event["type"] === "assistant") turnCount++;
+      } catch {
+      }
+    });
+    child.on("close", (code) => {
+      handleExitCode(code, "Claude Code");
+      resolve2();
+    });
+  });
 }
-function resolveExecutor2(withOption) {
-  const executor = withOption.toLowerCase();
-  if (executor !== "claude" && executor !== "codex") {
-    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${withOption}'.
+function formatAssistantEvent(event, turnCount) {
+  const message = event["message"];
+  const content = message?.["content"];
+  if (!content) return;
+  for (const block of content) {
+    const line = formatContentBlock(block);
+    if (line !== null) {
+      process.stderr.write(`  [step ${turnCount + 1}] ${line}
 `);
-    process.exit(1);
+    }
   }
-  return executor;
 }
-function invokeSelectedExecutor(prompt, executor, options) {
-  const effort = resolveEffortOption(options.effort);
-  if (executor === "codex") {
-    invokeCodexCode(prompt, { yolo: true, model: options.model, effort });
-    return;
+function formatContentBlock(block) {
+  if (block["type"] === "tool_use") {
+    const toolName = block["name"];
+    const input = block["input"];
+    return summarizeTool(toolName, input);
   }
-  return invokeClaudeCode(prompt, {
-    yolo: true,
-    verbose: !options.silent,
-    model: options.model,
-    effort
-  });
+  if (block["type"] === "text") {
+    const text = block["text"] ?? "";
+    if (text.length === 0) return null;
+    const preview = text.length > 120 ? text.slice(0, 120) + "..." : text;
+    return preview.split("\n")[0] ?? null;
+  }
+  return null;
 }
-var executeSonarCmd = addAiOptions(
-  new Command5("sonar").description(
-    "Check the current branch for a SonarCloud analysis and invoke the AI with the Sonar prompt and analysis URL"
-  )
-).action(async (options) => {
-  const executor = resolveExecutor2(options.with);
-  let branch;
-  try {
-    branch = getCurrentBranch();
-  } catch (err) {
-    process.stderr.write(`Error: ${err.message}
+function formatResultEvent(event) {
+  const result = event["result"];
+  const cost = event["cost_usd"];
+  const duration = event["duration_ms"];
+  const turns = event["num_turns"];
+  process.stderr.write("\n--- Result ---\n");
+  const parts = [];
+  if (turns !== void 0) parts.push(`${turns} turns`);
+  if (duration !== void 0) parts.push(`${(duration / 1e3).toFixed(1)}s`);
+  if (cost !== void 0) parts.push(`$${cost.toFixed(4)}`);
+  if (parts.length > 0) {
+    process.stderr.write(`  [info] ${parts.join(" | ")}
 `);
-    process.exit(1);
   }
-  let pr;
-  try {
-    pr = await getPrInfo2(branch);
-  } catch (err) {
-    process.stderr.write(`Error: ${err.message}
-`);
-    process.exit(1);
+  if (result) {
+    process.stdout.write(result + "\n");
   }
-  if (pr === null) {
-    process.stderr.write(`Error: No pull request found for branch: ${branch}
-`);
-    process.exit(1);
+}
+function formatEvent(event, turnCount) {
+  const type = event["type"];
+  if (type === "assistant") {
+    formatAssistantEvent(event, turnCount);
+  } else if (type === "result") {
+    formatResultEvent(event);
   }
-  if (!pr.sonarcloudUrl) {
-    process.stderr.write(
-      `Error: No SonarCloud analysis found for PR #${pr.number}. Ensure a SonarCloud check is configured on this repository.
-`
-    );
-    process.exit(1);
+}
+function asText(value, fallback) {
+  return typeof value === "string" ? value : fallback;
+}
+function summarizeTool(name, input) {
+  if (!input) return `tool: ${name}`;
+  switch (name) {
+    case "Read":
+      return `reading ${asText(input["file_path"], "file")}`;
+    case "Write":
+      return `writing ${asText(input["file_path"], "file")}`;
+    case "Edit":
+      return `editing ${asText(input["file_path"], "file")}`;
+    case "Bash":
+      return `running: ${truncate(asText(input["command"], ""), 80)}`;
+    case "Glob":
+      return `searching files: ${asText(input["pattern"], "")}`;
+    case "Grep":
+      return `searching content: ${truncate(asText(input["pattern"], ""), 60)}`;
+    case "Agent":
+      return `spawning agent: ${asText(input["description"], name)}`;
+    default:
+      return `tool: ${name}`;
   }
-  const config = readConfig();
-  const sonarPromptText = config.prompts?.sonar ?? DEFAULT_SONAR_PROMPT;
-  const fullPrompt = withPush(
-    `${sonarPromptText}
-
-SonarCloud analysis URL: ${pr.sonarcloudUrl}
+}
 
-Current PR context from automata git get-pr-info --json:
-${formatPrInfoContext(pr)}`,
-    options.push
-  );
-  await invokeSelectedExecutor(fullPrompt, executor, options);
-});
-function formatComments(comments) {
-  return comments.map((c) => {
-    const loc = c.line === null ? `${c.path}:(file)` : `${c.path}:${String(c.line)}`;
-    return `[${c.author}] on ${loc}
-${c.body}`;
-  }).join("\n\n");
+// src/codex/codexService.ts
+import { spawn as spawn2, spawnSync as spawnSync6 } from "child_process";
+function toTomlBasicString(value) {
+  return JSON.stringify(value);
 }
-var executeFixCommentsCmd = addAiOptions(
-  new Command5("fix-comments").description(
-    "Fetch open review comments on the current PR and invoke the AI with the Fix-Comments prompt"
-  )
-).action(async (options) => {
-  const executor = resolveExecutor2(options.with);
-  const result = resolveCurrentBranchComments();
-  if (!result.ok) {
-    if (result.kind === "error") {
-      process.stderr.write(`Error: ${result.message}
-`);
-      process.exit(1);
-    }
-    if (result.kind === "unsupported") {
-      process.stderr.write(
-        `Error: fix-comments is not supported for Azure DevOps. See docs/azdo-gap.md for details.
-`
+function buildCodexArgs(prompt, options = {}) {
+  const args = ["exec"];
+  if (options.yolo) args.push("--dangerously-bypass-approvals-and-sandbox");
+  if (options.model) args.push("--model", options.model);
+  if (options.effort) args.push("-c", `model_reasoning_effort=${toTomlBasicString(options.effort)}`);
+  args.push(prompt);
+  return args;
+}
+function invokeCodexCode(prompt, options = {}) {
+  if (options.verbose) {
+    process.stderr.write("Warning: --verbose is not supported for Codex and will be ignored.\n");
+  }
+  invokeCodexCodeSync(prompt, options.yolo ?? false, options.model, options.effort);
+}
+function invokeCodexCodeSync(prompt, yolo, model, effort) {
+  const codexBin = resolveCommand("codex");
+  const args = buildCodexArgs(prompt, { yolo, model, effort });
+  const result = spawnSync6(codexBin, args, { encoding: "utf8", stdio: "inherit" });
+  handleSpawnError(result.error, "codex");
+  handleExitCode(result.status, "Codex");
+}
+function runCodex(prompt, options = {}) {
+  return new Promise((resolve2, reject) => {
+    const codexBin = resolveCommand("codex");
+    const args = buildCodexArgs(prompt, { yolo: true, model: options.model, effort: options.effort });
+    const child = spawn2(codexBin, args, { stdio: "inherit" });
+    trackChild(child);
+    child.on("error", (err) => {
+      untrackChild(child);
+      const nodeErr = err;
+      reject(
+        nodeErr.code === "ENOENT" ? new Error("`codex` CLI is not installed or not on PATH.") : new Error(nodeErr.message)
       );
-      process.exit(1);
-    }
-    process.stderr.write(`Error: No pull request found for branch: ${result.branch}
+    });
+    child.on("close", (code, signal) => {
+      untrackChild(child);
+      if (code === 0) {
+        resolve2();
+        return;
+      }
+      reject(
+        new Error(
+          signal === null ? `Codex exited with code ${String(code)}.` : `Codex terminated on ${signal}.`
+        )
+      );
+    });
+  });
+}
+
+// src/commands/getReady.ts
+function writeOverflowHint(output, issues, limit) {
+  if (issues.length === limit) {
+    output.write(`(Showing first ${limit} matching issues \u2014 there may be more. Use --limit to fetch more.)
 `);
-    process.exit(1);
   }
-  const { comments } = result;
-  if (comments.length === 0) {
-    process.stderr.write(`Error: No open review comments found on the pull request.
+}
+function writeIssueList(output, issues, limit) {
+  output.write("\nAvailable issues:\n");
+  for (let i = 0; i < issues.length; i++) {
+    output.write(`  [${i + 1}] #${issues[i].number} - ${issues[i].title}
 `);
-    process.exit(1);
   }
-  process.stdout.write(`Found ${String(comments.length)} open review comment${comments.length === 1 ? "" : "s"} on PR. Invoking AI\u2026
-`);
-  const config = readConfig();
-  const promptText = config.prompts?.fixComments ?? DEFAULT_FIX_COMMENTS_PROMPT;
-  const fullPrompt = withPush(
-    `${promptText}
-
-Open review comments:
-
-${formatComments(comments)}`,
-    options.push
+  writeOverflowHint(output, issues, limit);
+}
+async function promptSelection(issues, limit, output) {
+  writeIssueList(output, issues, limit);
+  const rl = createInterface2({ input: process.stdin, output });
+  const answer = await new Promise(
+    (resolve2) => rl.question(`
+Select issue (1-${issues.length}): `, resolve2)
   );
-  await invokeSelectedExecutor(fullPrompt, executor, options);
-});
-var executeCheckIssueCmd = addAiOptions(
-  new Command5("check-issue").description(
-    "Check a GitHub issue for a new message from an allowed user since the last agent run and invoke the AI with the issue conversation"
-  ).argument("<issue-number>", "GitHub issue number to check")
-).option("--force", "Skip the new-message check and invoke the AI directly").action(async (issueNumberArg, options) => {
-  const executor = resolveExecutor2(options.with);
-  const issueNumber = Number.parseInt(issueNumberArg, 10);
-  if (Number.isNaN(issueNumber) || issueNumber <= 0) {
-    process.stderr.write(`Error: <issue-number> must be a positive integer (got '${issueNumberArg}').
+  rl.close();
+  const n = Number.parseInt(answer.trim(), 10);
+  if (Number.isNaN(n) || n < 1 || n > issues.length) {
+    process.stderr.write(`Error: Invalid selection "${answer.trim()}". Enter a number between 1 and ${issues.length}.
 `);
     process.exit(1);
   }
-  const config = readConfig();
-  if (config.remoteType === "azdo") {
+  return issues[n - 1];
+}
+function validateConfig(config) {
+  if (config.remoteType !== "gh") {
     process.stderr.write(
-      "Error: check-issue is not supported for Azure DevOps. See docs/azdo-gap.md for details.\n"
+      "Error: implement-next is not supported in Azure DevOps mode. Work item discovery is not available in azdo-cli. See docs/azdo-gap.md for details.\n"
     );
     process.exit(1);
   }
-  const allowedUsers = (config.allowedUsers ?? []).filter((user) => user.trim().length > 0);
-  if (allowedUsers.length === 0) {
+  if (!config.issueDiscoveryTechnique) {
     process.stderr.write(
-      "Error: No allowed users configured. Run `automata config` or `automata config set allowed-users <user1,user2>` to set them.\n"
+      "Error: No issue discovery technique configured. Run `automata config` to set one.\n"
     );
     process.exit(1);
   }
-  const agentUser = (config.agentUser ?? "").trim();
-  if (agentUser.length === 0) {
+  if (!config.issueDiscoveryValue) {
     process.stderr.write(
-      "Error: No agent user configured. Run `automata config` or `automata config set agent-user <login>` to set it.\n"
+      "Error: No issue discovery value configured. Run `automata config` to set one.\n"
     );
     process.exit(1);
   }
-  let conversation;
-  try {
-    conversation = getIssueConversation(issueNumber);
-  } catch (err) {
-    process.stderr.write(`Error: ${err.message}
-`);
-    process.exit(1);
+}
+async function resolveIssue(issues, options, limit) {
+  const selectionOutput = options.json ? process.stderr : process.stdout;
+  if (issues.length === 0) {
+    process.stdout.write("No issues found matching the configured filter.\n");
+    process.exit(0);
   }
-  const analysis = analyzeConversation(conversation, allowedUsers, agentUser);
-  if (!analysis.hasNewMessage && !options.force) {
-    const since = analysis.lastAgentAt === null ? "" : ` (last agent message: ${analysis.lastAgentAt})`;
-    process.stdout.write(
-      `No new messages from allowed users on issue #${String(issueNumber)}${since}. Use --force to invoke the AI anyway.
-`
-    );
-    return;
+  if (issues.length > 1 && options.queryOnly) {
+    writeIssueList(selectionOutput, issues, limit);
+    process.exit(0);
   }
-  if (analysis.hasNewMessage) {
-    process.stdout.write(
-      `Found ${String(analysis.newMessageCount)} new message${pluralSuffix(analysis.newMessageCount)} on issue #${String(issueNumber)}. Invoking AI\u2026
-`
-    );
+  let issue;
+  if (issues.length === 1) {
+    issue = issues[0];
+    selectionOutput.write(`Issue:  #${issue.number}
+Title:  ${issue.title}
+`);
+  } else if (options.takeFirst) {
+    issue = issues[0];
+    selectionOutput.write(`Selecting issue #${issue.number}: ${issue.title}
+`);
   } else {
-    process.stdout.write(`No new messages on issue #${String(issueNumber)} \u2014 forced run. Invoking AI\u2026
+    issue = await promptSelection(issues, limit, selectionOutput);
+    selectionOutput.write(`
+Issue:  #${issue.number}
+Title:  ${issue.title}
 `);
   }
-  const promptText = config.prompts?.checkIssue ?? DEFAULT_CHECK_ISSUE_PROMPT;
-  const fullPrompt = withPush(
-    `${promptText}
-
-Issue #${String(issueNumber)}: ${conversation.title}
-URL: ${conversation.url}
-
-Conversation (only messages from allowed users and the agent, oldest first):
-
-${formatConversation(analysis.messages)}`,
-    options.push
-  );
-  const marker = analysis.hasNewMessage ? `automata check-issue: picked up ${String(analysis.newMessageCount)} new message${pluralSuffix(analysis.newMessageCount)}, starting an agent run.` : "automata check-issue: forced run, starting an agent run.";
-  try {
-    postComment(issueNumber, marker);
-  } catch (err) {
-    process.stderr.write(
-      `Error: could not post the execution marker comment on issue #${String(issueNumber)}: ${err.message}
-`
-    );
-    process.exit(1);
-  }
-  await invokeSelectedExecutor(fullPrompt, executor, options);
-});
-var executePromptCommand = new Command5("execute-prompt").description("Execute a configured custom prompt using an AI assistant").addCommand(executeSonarCmd).addCommand(executeFixCommentsCmd).addCommand(executeCheckIssueCmd);
-
-// src/commands/doWork.ts
-import { Command as Command6 } from "commander";
-
-// src/github/ghWorkService.ts
-import { spawnSync as spawnSync6 } from "child_process";
-function run4(cmd, args) {
-  const result = spawnSync6(cmd, args, { encoding: "utf8" });
-  if (result.error) {
-    const err = result.error;
-    if (err.code === "ENOENT") {
-      throw new Error(`\`${cmd}\` CLI is not installed or not on PATH.`);
-    }
-    throw new Error(err.message);
-  }
-  return { stdout: result.stdout ?? "", stderr: result.stderr ?? "", status: result.status ?? 1 };
-}
-function ghJson(args, what) {
-  const { stdout, stderr, status } = run4("gh", args);
-  if (status !== 0) {
-    throw new Error(stderr.trim() || `Failed to ${what}. Is \`gh\` installed and authenticated?`);
-  }
-  return JSON.parse(stdout);
-}
-function login(author) {
-  return author?.login ?? "";
-}
-function byCreatedAt2(a, b) {
-  return a.createdAt.localeCompare(b.createdAt);
-}
-function visibleAt(createdAt, submittedAt) {
-  if (submittedAt === null || submittedAt === void 0) return createdAt;
-  return submittedAt > createdAt ? submittedAt : createdAt;
-}
-function getRepoSlug() {
-  const { stdout, status } = run4("git", ["remote", "get-url", "origin"]);
-  if (status !== 0) {
-    throw new Error("Could not read the `origin` remote. Is this a git repository with a remote?");
-  }
-  const url = stdout.trim();
-  const match = /github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/.exec(url) ?? /github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/.exec(url);
-  if (!match) {
-    throw new Error(`Could not determine the GitHub owner/repo from the origin remote: ${url}`);
-  }
-  return { owner: match[1], repo: match[2] };
-}
-function getAuthenticatedLogin() {
-  const { stdout, status } = run4("gh", ["api", "user", "--jq", ".login"]);
-  if (status !== 0) return null;
-  const login2 = stdout.trim();
-  return login2.length > 0 ? login2 : null;
+  return issue;
 }
-function listCandidateIssues(technique, value, limit) {
-  const args = [
-    "issue",
-    "list",
-    "--state",
-    "open",
-    "--limit",
-    String(limit),
-    "--json",
-    "number,title,body,url"
-  ];
-  switch (technique) {
-    case "label":
-      args.push("--label", value);
-      break;
-    case "assignee":
-      args.push("--assignee", value);
-      break;
-    case "title-contains":
-      args.push("--search", `${value} in:title`);
-      break;
+var implementNextCommand = new Command3("implement-next").description("Find the next open GitHub issue matching the configured filter, claim it, and invoke the AI code assistant (Claude or Codex)").option("--json", "Output issue details as JSON").option("--no-claude", "Skip all AI invocation (Claude or Codex) after claiming the issue").option("--with <executor>", "Executor to use: claude or codex", "claude").option("--query-only", "Print issue content and exit without claiming or invoking any AI tools").option("--yolo", "Launch with --dangerously-skip-permissions (Claude) or --dangerously-bypass-approvals-and-sandbox (Codex)").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--model <string>", "Model identifier to pass to the executor").option("--effort <level>", "Reasoning effort to pass to the executor").option("--take-first", "When multiple issues match, pick the first without prompting").option("--limit <n>", "Max issues to fetch and display (default: 10)", "10").option("--ask-copilot-review", "Request a Copilot code review on the PR after AI invocation finishes").action(async (options) => {
+  const config = readConfig();
+  validateConfig(config);
+  const limit = Number.parseInt(options.limit, 10);
+  if (Number.isNaN(limit) || limit <= 0) {
+    process.stderr.write(`Error: --limit must be a positive integer (got "${options.limit}").
+`);
+    process.exit(1);
   }
-  return ghJson(args, "query GitHub issues");
-}
-function getIssueSurface(issueNumber) {
-  const raw = ghJson(
-    [
-      "issue",
-      "view",
-      String(issueNumber),
-      "--json",
-      "number,title,body,url,state,author,createdAt,assignees,labels,comments"
-    ],
-    `read issue #${String(issueNumber)}`
-  );
-  const messages = [
-    {
-      kind: "issue-body",
-      author: login(raw.author),
-      body: raw.body,
-      createdAt: raw.createdAt
-    },
-    ...(raw.comments ?? []).map((comment) => ({
-      kind: "issue-comment",
-      author: login(comment.author),
-      body: comment.body,
-      createdAt: comment.createdAt
-    }))
-  ].sort(byCreatedAt2);
-  return {
-    issue: { number: raw.number, title: raw.title, body: raw.body, url: raw.url },
-    state: raw.state === "CLOSED" ? "CLOSED" : "OPEN",
-    assignees: (raw.assignees ?? []).map(login).filter((name) => name.length > 0),
-    labels: (raw.labels ?? []).map((label) => label.name ?? "").filter((name) => name.length > 0),
-    messages
-  };
-}
-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{
-        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 } }
-        }
-      }
-    }
+  let issues;
+  try {
+    issues = listIssues(config.issueDiscoveryTechnique, config.issueDiscoveryValue, limit);
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}
+`);
+    process.exit(1);
   }
-}`.trim();
-var MAX_LINK_MAP_PAGES = 50;
-function indexPullRequest(map, node, nameWithOwner) {
-  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.`
-    );
+  const issue = await resolveIssue(issues, options, limit);
+  if (options.json) {
+    process.stdout.write(JSON.stringify({ number: issue.number, title: issue.title, body: issue.body, url: issue.url }, null, 2) + "\n");
+  } else {
+    process.stdout.write(`URL:    ${issue.url}
+
+${issue.body}
+`);
   }
-  let closedAnyHere = false;
-  for (const issue of node.closingIssuesReferences.nodes) {
-    if (issue.repository.nameWithOwner.toLowerCase() !== nameWithOwner.toLowerCase()) continue;
-    closedAnyHere = true;
-    const existing = map.get(issue.number);
-    if (existing) {
-      existing.push(ref);
+  if (options.queryOnly) {
+    process.exit(0);
+  }
+  const executor = options.claude === false ? void 0 : resolveExecutor(options.with);
+  let commentUrl;
+  try {
+    commentUrl = postComment(issue.number, "working");
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}
+`);
+    process.exit(1);
+  }
+  const effort = resolveEffortOption(options.effort);
+  if (options.claude !== false) {
+    const systemPrompt = config.claudeSystemPrompt ?? DEFAULT_CLAUDE_SYSTEM_PROMPT;
+    const prompt = `Resolving issue #${issue.number}:
+
+${systemPrompt}
+
+${issue.body}`;
+    if (executor === "codex") {
+      if (options.silent) {
+        process.stderr.write("Warning: --silent is only supported with Claude and has no effect when used with Codex.\n");
+      }
+      invokeCodexCode(prompt, { yolo: options.yolo, model: options.model, effort });
     } else {
-      map.set(issue.number, [ref]);
+      await invokeClaudeCode(prompt, {
+        yolo: options.yolo,
+        verbose: !options.silent,
+        model: options.model,
+        effort
+      });
     }
   }
-  return closedAnyHere;
+  linkPrToIssue(issue.number, commentUrl, options.askCopilotReview === true, config.agentUser);
+});
+function resolveExecutor(requested) {
+  const executor = requested.toLowerCase();
+  if (executor !== "claude" && executor !== "codex") {
+    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${requested}'.
+`);
+    process.exit(1);
+  }
+  return executor;
 }
-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 warnOnFailure(what, action) {
+  try {
+    action();
+  } catch (err) {
+    process.stderr.write(`Warning: could not ${what}: ${err.message}
+`);
+  }
 }
-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 linkPrToIssue(issueNumber, commentUrl, askCopilotReview, agentUser) {
+  let pr;
+  try {
+    pr = getCurrentBranchPr();
+  } catch (err) {
+    process.stderr.write(`Warning: could not detect current branch PR: ${err.message}
+`);
+    return;
+  }
+  if (!pr) return;
+  if (commentUrl) {
+    warnOnFailure("update issue comment", () => {
+      editComment(commentUrl, `Working on this in PR #${pr.number} \u2014 ${pr.url}`);
+    });
+  }
+  warnOnFailure(`add Closes #${String(issueNumber)} to PR`, () => {
+    addClosesRefToPr(pr.number, issueNumber);
+  });
+  if (pr.assignees.length === 0) {
+    const claimant = (agentUser ?? "").trim() || "@me";
+    warnOnFailure(`assign PR #${String(pr.number)} to ${claimant}`, () => {
+      assignPrToAgent(pr.number, claimant);
+    });
+  }
+  if (askCopilotReview) {
+    warnOnFailure("request Copilot review", () => {
+      addCopilotReviewer(pr.number);
+    });
+  }
 }
-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++) {
-    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) {
-      if (!indexPullRequest(map, node, `${owner}/${repo}`)) {
-        orphans.push(toOrphanPr(node));
-      }
-    }
-    if (!connection.pageInfo?.hasNextPage || connection.pageInfo.endCursor === null) {
-      return { byIssue: map, defaultBranch, orphans };
+
+// src/commands/execute.ts
+import { readFileSync as readFileSync2 } from "fs";
+import { Command as Command4 } from "commander";
+function readStdin() {
+  return new Promise((resolve2, reject) => {
+    const chunks = [];
+    process.stdin.on("data", (chunk) => chunks.push(chunk));
+    process.stdin.on("end", () => resolve2(Buffer.concat(chunks).toString("utf8")));
+    process.stdin.on("error", reject);
+  });
+}
+async function resolvePrompt(options) {
+  const hasCli = options.prompt !== void 0;
+  const hasFile = options.filePrompt !== void 0;
+  if (hasCli && hasFile) {
+    process.stderr.write("Error: --prompt is mutually exclusive with --file-prompt.\n");
+    process.exit(1);
+  }
+  if (hasCli) {
+    return options.prompt;
+  }
+  if (hasFile) {
+    const path = options.filePrompt;
+    try {
+      return readFileSync2(path, "utf8");
+    } catch {
+      process.stderr.write(`Error: Cannot read file: ${path}
+`);
+      process.exit(1);
     }
-    cursor = connection.pageInfo.endCursor;
   }
-  throw new Error(
-    `Stopped paginating open pull requests after ${String(MAX_LINK_MAP_PAGES)} pages, so the issue-to-pull-request map cannot be trusted. Refusing the tick rather than risk starting work on an issue that already has a pull request.`
-  );
-}
-var REVIEW_THREADS_QUERY2 = `
-query($owner:String!,$repo:String!,$prNumber:Int!,$cursor:String){
-  repository(owner:$owner,name:$repo){
-    pullRequest(number:$prNumber){
-      reviewThreads(first:100, after:$cursor){
-        pageInfo{ hasNextPage endCursor }
-        nodes{
-          isResolved isOutdated path line
-          comments(last:100){
-            pageInfo{ hasPreviousPage }
-            nodes{ author{login} body createdAt url pullRequestReview{ submittedAt } }
-          }
-        }
-      }
+  if (!process.stdin.isTTY) {
+    const content = await readStdin();
+    if (content.trim().length === 0) {
+      process.stderr.write("Error: No prompt provided. Use --prompt, --file-prompt, or pipe via stdin.\n");
+      process.exit(1);
     }
+    return content;
   }
-}`.trim();
-var MAX_THREAD_PAGES = 50;
-function normalizePrState(state) {
-  if (state === "MERGED") return "MERGED";
-  if (state === "CLOSED") return "CLOSED";
-  return "OPEN";
+  process.stderr.write("Error: No prompt provided. Use --prompt, --file-prompt, or pipe via stdin.\n");
+  process.exit(1);
 }
-function getReviewThreads(prNumber) {
-  const { owner, repo } = getRepoSlug();
-  const threads = [];
-  let cursor = null;
-  for (let page = 0; page < MAX_THREAD_PAGES; page++) {
-    const args = [
-      "api",
-      "graphql",
-      "-f",
-      `query=${REVIEW_THREADS_QUERY2}`,
-      "-f",
-      `owner=${owner}`,
-      "-f",
-      `repo=${repo}`,
-      "-F",
-      `prNumber=${String(prNumber)}`
-    ];
-    if (cursor !== null) args.push("-f", `cursor=${cursor}`);
-    const response = ghJson(
-      args,
-      `query review threads for pull request #${String(prNumber)}`
-    );
-    const connection = response.data.repository.pullRequest.reviewThreads;
-    for (const node of connection.nodes) {
-      if (node.comments.pageInfo?.hasPreviousPage) {
-        throw new Error(
-          `Review thread on ${node.path} in pull request #${String(prNumber)} has more than 100 comments, so the earliest ones were not read. Refusing rather than risk suppressing a maintainer's request.`
-        );
-      }
-      threads.push({
-        path: node.path,
-        line: node.line ?? null,
-        isResolved: node.isResolved,
-        url: node.comments.nodes.at(-1)?.url ?? null,
-        comments: node.comments.nodes.map((comment) => ({
-          kind: "thread-comment",
-          author: login(comment.author),
-          body: comment.body,
-          // When the comment became *visible*, not when it was drafted.
-          // GitHub stamps `createdAt` the moment a comment is added to a
-          // pending review, and it only becomes visible when the review is
-          // submitted — minutes later for a human working through a diff.
-          // Using `createdAt` let an agent answer posted in between look newer
-          // than the review, which marked every one of its threads answered
-          // and discarded the whole review silently.
-          createdAt: visibleAt(comment.createdAt, comment.pullRequestReview?.submittedAt)
-        })).sort(byCreatedAt2)
-      });
-    }
-    if (!connection.pageInfo?.hasNextPage || connection.pageInfo.endCursor === null) {
-      return threads;
+var executeCommand = new Command4("execute").description("Delegate work to an AI executor").requiredOption("--with <executor>", "Executor to use: claude or codex").option("--prompt <string>", "Prompt to send to the executor").option("--file-prompt <path>", "Path to a file whose content is used as the prompt").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--model <string>", "Model identifier to pass to the executor").option("--effort <level>", "Reasoning effort to pass to the executor").action(async (options) => {
+  const executor = options.with.toLowerCase();
+  if (executor !== "claude" && executor !== "codex") {
+    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${options.with}'.
+`);
+    process.exit(1);
+  }
+  const prompt = await resolvePrompt(options);
+  const effort = resolveEffortOption(options.effort);
+  if (executor === "codex") {
+    invokeCodexCode(prompt, { yolo: true, model: options.model, effort });
+  } else {
+    await invokeClaudeCode(prompt, {
+      yolo: true,
+      verbose: !options.silent,
+      model: options.model,
+      effort
+    });
+  }
+});
+
+// src/commands/executePrompt.ts
+import { Command as Command5 } from "commander";
+
+// src/github/conversation.ts
+var KIND_LABELS = {
+  "issue-body": "issue description",
+  "issue-comment": "comment",
+  "pr-comment": "pull request comment",
+  "pr-review": "pull request review",
+  "thread-comment": "review thread comment"
+};
+function byCreatedAt2(a, b) {
+  return a.createdAt.localeCompare(b.createdAt);
+}
+function classify(author, p) {
+  const login2 = author.toLowerCase();
+  if (login2 === p.agentUser.toLowerCase()) return "agent";
+  return p.allowedUsers.some((user) => user.toLowerCase() === login2) ? "authorized" : "other";
+}
+function analyzeSurface(messages, p) {
+  const ordered = [...messages].sort(byCreatedAt2);
+  let lastAgentAt = null;
+  for (const message of ordered) {
+    if (message.kind === "issue-body") continue;
+    if (classify(message.author, p) !== "agent") continue;
+    if (lastAgentAt === null || message.createdAt > lastAgentAt) {
+      lastAgentAt = message.createdAt;
     }
-    cursor = connection.pageInfo.endCursor;
   }
-  throw new Error(
-    `Stopped paginating review threads for pull request #${String(prNumber)} after ${String(MAX_THREAD_PAGES)} pages; refusing rather than answering only part of the feedback.`
-  );
+  const kept = [];
+  for (const message of ordered) {
+    const authorClass = classify(message.author, p);
+    if (authorClass === "other") continue;
+    const isNew = authorClass === "authorized" && (lastAgentAt === null || message.createdAt > lastAgentAt);
+    kept.push({ ...message, isNew });
+  }
+  const newMessages = kept.filter((message) => message.isNew);
+  return {
+    messages: kept,
+    newMessages,
+    newMessageCount: newMessages.length,
+    hasNewMessage: newMessages.length > 0,
+    lastAgentAt
+  };
 }
-function getPrSurface(prNumber) {
-  const raw = ghJson(
-    [
-      "pr",
-      "view",
-      String(prNumber),
-      "--json",
-      "number,title,url,headRefName,baseRefName,isCrossRepository,state,isDraft,body,author,createdAt,updatedAt,comments,reviews"
-    ],
-    `read pull request #${String(prNumber)}`
-  );
+function lastAuthorClass(messages, p) {
+  if (messages.length === 0) return "none";
+  const newest2 = [...messages].sort(byCreatedAt2).at(-1);
+  return newest2 === void 0 ? "none" : classify(newest2.author, p);
+}
+function formatMessages(messages) {
+  return messages.map((message) => {
+    const marker = message.isNew ? " \xB7 NEW since last agent run" : "";
+    return `[${message.author}] ${KIND_LABELS[message.kind]} \xB7 ${message.createdAt}${marker}
+${message.body}`;
+  }).join("\n\n");
+}
+
+// src/github/issueConversation.ts
+function analyzeConversation(conversation, allowedUsers, agentUser) {
+  const participants = { allowedUsers, agentUser };
   const messages = [
-    ...(raw.comments ?? []).map((comment) => ({
-      kind: "pr-comment",
-      author: login(comment.author),
+    {
+      kind: "issue-body",
+      author: conversation.author,
+      body: conversation.body,
+      createdAt: conversation.createdAt
+    },
+    ...conversation.comments.map((comment) => ({
+      kind: "issue-comment",
+      author: comment.author,
       body: comment.body,
       createdAt: comment.createdAt
-    })),
-    // A review with no body carries no message — only its inline comments do,
-    // and those arrive through the review-thread query.
-    ...(raw.reviews ?? []).filter((review) => review.body.trim().length > 0).map((review) => ({
-      kind: "pr-review",
-      author: login(review.author),
-      body: review.body,
-      createdAt: review.submittedAt ?? review.createdAt ?? ""
     }))
-  ].sort(byCreatedAt2);
-  const threads = getReviewThreads(prNumber);
-  const state = normalizePrState(raw.state);
+  ];
+  const analysis = analyzeSurface(messages, participants);
   return {
-    pr: {
-      number: raw.number,
-      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
-    },
-    messages,
-    threads
+    messages: analysis.messages.map(toConversationMessage),
+    newMessageCount: analysis.newMessageCount,
+    hasNewMessage: analysis.hasNewMessage,
+    lastAgentAt: analysis.lastAgentAt
   };
 }
-function assignIssueToAgent(issueNumber, agentUser) {
-  const { stderr, status } = run4("gh", [
-    "issue",
-    "edit",
-    String(issueNumber),
-    "--add-assignee",
-    agentUser
-  ]);
-  if (status !== 0) {
-    throw new Error(stderr.trim() || `Failed to assign issue #${String(issueNumber)} to ${agentUser}.`);
-  }
+function toConversationMessage(message) {
+  return {
+    kind: message.kind === "issue-body" ? "issue" : "comment",
+    author: message.author,
+    body: message.body,
+    createdAt: message.createdAt,
+    isNew: message.isNew
+  };
 }
-function postMarker(_surface, number, body) {
-  const { owner, repo } = getRepoSlug();
-  const raw = ghJson(
-    [
-      "api",
-      "--method",
-      "POST",
-      `repos/${owner}/${repo}/issues/${String(number)}/comments`,
-      "-f",
-      `body=${body}`
-    ],
-    `post a comment on #${String(number)}`
+function formatConversation(messages) {
+  return formatMessages(
+    messages.map((message) => ({
+      kind: message.kind === "issue" ? "issue-body" : "issue-comment",
+      author: message.author,
+      body: message.body,
+      createdAt: message.createdAt,
+      isNew: message.isNew
+    }))
   );
-  return { commentId: String(raw.id), createdAt: raw.created_at };
 }
-function updateMarker(marker, body) {
-  const { owner, repo } = getRepoSlug();
-  const { stderr, status } = run4("gh", [
-    "api",
-    "--method",
-    "PATCH",
-    `repos/${owner}/${repo}/issues/comments/${marker.commentId}`,
-    "-f",
-    `body=${body}`
-  ]);
-  if (status !== 0) {
-    throw new Error(stderr.trim() || `Failed to update comment ${marker.commentId}.`);
+
+// src/commands/executePrompt.ts
+var PUSH_INSTRUCTION = "Once all changes are complete, stage every modified file, create a single commit with a clear and descriptive commit message that summarises what was fixed, and push the branch to the remote.";
+function withPush(prompt, push) {
+  return push ? `${prompt}
+
+${PUSH_INSTRUCTION}` : prompt;
+}
+function formatPrInfoContext(pr) {
+  return JSON.stringify(pr, null, 2);
+}
+function pluralSuffix(count) {
+  return count === 1 ? "" : "s";
+}
+function addAiOptions(cmd) {
+  return cmd.requiredOption("--with <executor>", "Executor to use: claude or codex").option("--model <string>", "Model identifier to pass to the executor").option("--effort <level>", "Reasoning effort to pass to the executor").option("--silent", "Suppress step-by-step Claude output; show only the final summary").option("--push", "Append instruction to commit and push changes after the AI finishes");
+}
+function resolveExecutor2(withOption) {
+  const executor = withOption.toLowerCase();
+  if (executor !== "claude" && executor !== "codex") {
+    process.stderr.write(`Error: --with must be 'claude' or 'codex', got '${withOption}'.
+`);
+    process.exit(1);
   }
+  return executor;
 }
-function deleteMarker(marker) {
-  const { owner, repo } = getRepoSlug();
-  const { stderr, status } = run4("gh", [
-    "api",
-    "--method",
-    "DELETE",
-    `repos/${owner}/${repo}/issues/comments/${marker.commentId}`
-  ]);
-  if (status !== 0) {
-    if (/not found/i.test(stderr) || /HTTP 404/i.test(stderr)) return;
-    throw new Error(stderr.trim() || `Failed to delete comment ${marker.commentId}.`);
+function invokeSelectedExecutor(prompt, executor, options) {
+  const effort = resolveEffortOption(options.effort);
+  if (executor === "codex") {
+    invokeCodexCode(prompt, { yolo: true, model: options.model, effort });
+    return;
+  }
+  return invokeClaudeCode(prompt, {
+    yolo: true,
+    verbose: !options.silent,
+    model: options.model,
+    effort
+  });
+}
+var executeSonarCmd = addAiOptions(
+  new Command5("sonar").description(
+    "Check the current branch for a SonarCloud analysis and invoke the AI with the Sonar prompt and analysis URL"
+  )
+).action(async (options) => {
+  const executor = resolveExecutor2(options.with);
+  let branch;
+  try {
+    branch = getCurrentBranch();
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}
+`);
+    process.exit(1);
+  }
+  let pr;
+  try {
+    pr = await getPrInfo2(branch);
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}
+`);
+    process.exit(1);
+  }
+  if (pr === null) {
+    process.stderr.write(`Error: No pull request found for branch: ${branch}
+`);
+    process.exit(1);
+  }
+  if (!pr.sonarcloudUrl) {
+    process.stderr.write(
+      `Error: No SonarCloud analysis found for PR #${pr.number}. Ensure a SonarCloud check is configured on this repository.
+`
+    );
+    process.exit(1);
   }
-}
-function toHeadState(state) {
-  return state === "OPEN" || state === "MERGED" ? state : "CLOSED";
-}
-function listPullRequestsForHead(branch) {
-  const raw = ghJson(
-    ["pr", "list", "--head", branch, "--state", "all", "--json", "number,state,url,updatedAt,author"],
-    `list pull requests for branch ${branch}`
+  const config = readConfig();
+  const sonarPromptText = config.prompts?.sonar ?? DEFAULT_SONAR_PROMPT;
+  const fullPrompt = withPush(
+    `${sonarPromptText}
+
+SonarCloud analysis URL: ${pr.sonarcloudUrl}
+
+Current PR context from automata git get-pr-info --json:
+${formatPrInfoContext(pr)}`,
+    options.push
   );
-  return raw.map((pr) => ({
-    number: pr.number,
-    url: pr.url,
-    state: toHeadState(pr.state),
-    updatedAt: pr.updatedAt,
-    author: pr.author?.login ?? ""
-  })).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
-}
-var MISSING_LABEL_PATTERNS = [
-  // gh's own message: `could not add label: 'rescue' not found`.
-  /could not add label/i,
-  // The GraphQL error it wraps, seen directly on some gh versions.
-  /could not resolve to a label/i,
-  /\blabels?\b[^\n]*\b(?:not found|does not exist)\b/i
-];
-function isMissingLabelError(stderr) {
-  return MISSING_LABEL_PATTERNS.some((pattern) => pattern.test(stderr));
+  await invokeSelectedExecutor(fullPrompt, executor, options);
+});
+function formatComments(comments) {
+  return comments.map((c) => {
+    const loc = c.line === null ? `${c.path}:(file)` : `${c.path}:${String(c.line)}`;
+    return `[${c.author}] on ${loc}
+${c.body}`;
+  }).join("\n\n");
 }
-function createDraftPullRequest(input) {
-  const base = [
-    "pr",
-    "create",
-    "--draft",
-    "--head",
-    input.head,
-    "--base",
-    input.base,
-    "--title",
-    input.title,
-    "--body",
-    input.body
-  ];
-  if (input.label !== void 0 && input.label.length > 0) {
-    const labelled = run4("gh", [...base, "--label", input.label]);
-    if (labelled.status === 0) return parseCreatedPrUrl(labelled.stdout, input.head);
-    if (!isMissingLabelError(labelled.stderr)) {
-      throw new Error(
-        labelled.stderr.trim() || `Failed to open a draft pull request for ${input.head}.`
+var executeFixCommentsCmd = addAiOptions(
+  new Command5("fix-comments").description(
+    "Fetch open review comments on the current PR and invoke the AI with the Fix-Comments prompt"
+  )
+).action(async (options) => {
+  const executor = resolveExecutor2(options.with);
+  const result = resolveCurrentBranchComments();
+  if (!result.ok) {
+    if (result.kind === "error") {
+      process.stderr.write(`Error: ${result.message}
+`);
+      process.exit(1);
+    }
+    if (result.kind === "unsupported") {
+      process.stderr.write(
+        `Error: fix-comments is not supported for Azure DevOps. See docs/azdo-gap.md for details.
+`
       );
+      process.exit(1);
     }
+    process.stderr.write(`Error: No pull request found for branch: ${result.branch}
+`);
+    process.exit(1);
   }
-  const { stdout, stderr, status } = run4("gh", base);
-  if (status !== 0) {
-    throw new Error(stderr.trim() || `Failed to open a draft pull request for ${input.head}.`);
+  const { comments } = result;
+  if (comments.length === 0) {
+    process.stderr.write(`Error: No open review comments found on the pull request.
+`);
+    process.exit(1);
   }
-  return parseCreatedPrUrl(stdout, input.head);
-}
-function parseCreatedPrUrl(stdout, head) {
-  const url = stdout.trim().split("\n").pop()?.trim() ?? "";
-  const match = /\/pull\/(\d+)\s*$/.exec(url);
-  if (!match) {
-    throw new Error(`Opened a pull request for ${head} but could not read its number from: ${url}`);
+  process.stdout.write(`Found ${String(comments.length)} open review comment${comments.length === 1 ? "" : "s"} on PR. Invoking AI\u2026
+`);
+  const config = readConfig();
+  const promptText = config.prompts?.fixComments ?? DEFAULT_FIX_COMMENTS_PROMPT;
+  const fullPrompt = withPush(
+    `${promptText}
+
+Open review comments:
+
+${formatComments(comments)}`,
+    options.push
+  );
+  await invokeSelectedExecutor(fullPrompt, executor, options);
+});
+var executeCheckIssueCmd = addAiOptions(
+  new Command5("check-issue").description(
+    "Check a GitHub issue for a new message from an allowed user since the last agent run and invoke the AI with the issue conversation"
+  ).argument("<issue-number>", "GitHub issue number to check")
+).option("--force", "Skip the new-message check and invoke the AI directly").action(async (issueNumberArg, options) => {
+  const executor = resolveExecutor2(options.with);
+  const issueNumber = Number.parseInt(issueNumberArg, 10);
+  if (Number.isNaN(issueNumber) || issueNumber <= 0) {
+    process.stderr.write(`Error: <issue-number> must be a positive integer (got '${issueNumberArg}').
+`);
+    process.exit(1);
   }
-  return { number: Number(match[1]), url };
-}
+  const config = readConfig();
+  if (config.remoteType === "azdo") {
+    process.stderr.write(
+      "Error: check-issue is not supported for Azure DevOps. See docs/azdo-gap.md for details.\n"
+    );
+    process.exit(1);
+  }
+  const allowedUsers = (config.allowedUsers ?? []).filter((user) => user.trim().length > 0);
+  if (allowedUsers.length === 0) {
+    process.stderr.write(
+      "Error: No allowed users configured. Run `automata config` or `automata config set allowed-users <user1,user2>` to set them.\n"
+    );
+    process.exit(1);
+  }
+  const agentUser = (config.agentUser ?? "").trim();
+  if (agentUser.length === 0) {
+    process.stderr.write(
+      "Error: No agent user configured. Run `automata config` or `automata config set agent-user <login>` to set it.\n"
+    );
+    process.exit(1);
+  }
+  let conversation;
+  try {
+    conversation = getIssueConversation(issueNumber);
+  } catch (err) {
+    process.stderr.write(`Error: ${err.message}
+`);
+    process.exit(1);
+  }
+  const analysis = analyzeConversation(conversation, allowedUsers, agentUser);
+  if (!analysis.hasNewMessage && !options.force) {
+    const since = analysis.lastAgentAt === null ? "" : ` (last agent message: ${analysis.lastAgentAt})`;
+    process.stdout.write(
+      `No new messages from allowed users on issue #${String(issueNumber)}${since}. Use --force to invoke the AI anyway.
+`
+    );
+    return;
+  }
+  if (analysis.hasNewMessage) {
+    process.stdout.write(
+      `Found ${String(analysis.newMessageCount)} new message${pluralSuffix(analysis.newMessageCount)} on issue #${String(issueNumber)}. Invoking AI\u2026
+`
+    );
+  } else {
+    process.stdout.write(`No new messages on issue #${String(issueNumber)} \u2014 forced run. Invoking AI\u2026
+`);
+  }
+  const promptText = config.prompts?.checkIssue ?? DEFAULT_CHECK_ISSUE_PROMPT;
+  const fullPrompt = withPush(
+    `${promptText}
+
+Issue #${String(issueNumber)}: ${conversation.title}
+URL: ${conversation.url}
+
+Conversation (only messages from allowed users and the agent, oldest first):
+
+${formatConversation(analysis.messages)}`,
+    options.push
+  );
+  const marker = analysis.hasNewMessage ? `automata check-issue: picked up ${String(analysis.newMessageCount)} new message${pluralSuffix(analysis.newMessageCount)}, starting an agent run.` : "automata check-issue: forced run, starting an agent run.";
+  try {
+    postComment(issueNumber, marker);
+  } catch (err) {
+    process.stderr.write(
+      `Error: could not post the execution marker comment on issue #${String(issueNumber)}: ${err.message}
+`
+    );
+    process.exit(1);
+  }
+  await invokeSelectedExecutor(fullPrompt, executor, options);
+});
+var executePromptCommand = new Command5("execute-prompt").description("Execute a configured custom prompt using an AI assistant").addCommand(executeSonarCmd).addCommand(executeFixCommentsCmd).addCommand(executeCheckIssueCmd);
+
+// src/commands/doWork.ts
+import { Command as Command6 } from "commander";
 
 // src/github/workDetection.ts
 var NO_ISSUE_MESSAGES = {
@@ -2915,10 +2942,6 @@ var NO_ISSUE_MESSAGES = {
   hasNewMessage: false,
   lastAgentAt: null
 };
-function isAssignedToAgent(assignees, agentUser) {
-  const agent = agentUser.toLowerCase();
-  return assignees.some((name) => name.toLowerCase() === agent);
-}
 function findActionableThreads(threads, p, prLastAgentAt) {
   const actionable = [];
   for (const thread of threads) {
@@ -2983,7 +3006,7 @@ function decideWork(state, p, policy) {
     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);
+  const needsAssignment = issueSurface.assignees.length === 0;
   const openPrs = state.linkedPrs.filter((pr) => pr.state === "OPEN");
   const hasOpenPr = openPrs.length > 0 && prSurface !== null && prSurface.pr.state === "OPEN";
   if (!hasOpenPr) {
@@ -3004,6 +3027,7 @@ function decideWork(state, p, policy) {
         pr: null,
         branch: baseBranch,
         needsAssignment,
+        prNeedsAssignment: false,
         issueAnalysis,
         prAnalysis: null,
         actionableThreads: [],
@@ -3044,6 +3068,7 @@ function decideWork(state, p, policy) {
       pr: surface.pr,
       branch: surface.pr.headRefName,
       needsAssignment,
+      prNeedsAssignment: surface.assignees.length === 0,
       issueAnalysis,
       prAnalysis,
       actionableThreads,
@@ -3097,6 +3122,13 @@ function decideOrphanPrWork(state, p, policy) {
       // agent here would change what the discovery filter matches next tick.
       // The `working…` marker on the pull request is the claim.
       needsAssignment: false,
+      // For the same reason, and more directly: the orphan pass discovers by
+      // the *pull request's own* assignees, so claiming an unassigned orphan
+      // would make it match the filter on the next tick — the agent would
+      // permanently own a pull request the operator never opted in. A build
+      // turn is safe because it reaches its pull request through an issue that
+      // matched the filter, not through the pull request's assignees.
+      prNeedsAssignment: false,
       issueAnalysis: NO_ISSUE_MESSAGES,
       prAnalysis,
       actionableThreads,
@@ -3129,6 +3161,30 @@ function selectLinkedPr(linkedPrs) {
   const open = linkedPrs.filter((pr) => pr.state === "OPEN");
   return open.length === 0 ? null : newestPr(open);
 }
+function claimStates(item) {
+  const states = [];
+  if (item.issue !== null) {
+    states.push({
+      surface: "issue",
+      number: item.issue.number,
+      state: item.needsAssignment ? "would-claim" : "already-assigned"
+    });
+  }
+  if (item.pr !== null) {
+    states.push({
+      surface: "pull request",
+      number: item.pr.number,
+      // An exemption is a rule, not a state, so it outranks the assignee list:
+      // an orphan pull request with nobody on it is still not claimed.
+      state: prClaimState(item)
+    });
+  }
+  return states;
+}
+function prClaimState(item) {
+  if (item.turn === "pr-orphan") return "rule-exempt";
+  return item.prNeedsAssignment ? "would-claim" : "already-assigned";
+}
 
 // src/github/workPrompt.ts
 function promptBaseBranch(item, configuredBaseBranch) {
@@ -3711,6 +3767,12 @@ function rescueUncommittedChanges(options, now) {
     );
     return { kind: "would-rescue", branch: target.branch, createdBranch: target.createdBranch };
   }
+  const staged = stageAllExcept([RUN_LOCK_RELATIVE_PATH]);
+  if (!staged.ok) {
+    options.log(`  rescue    FAILED to stage the changes: ${staged.stderr}
+`);
+    return { kind: "failed", step: "stage", detail: staged.stderr };
+  }
   if (target.createdBranch) {
     const created = createBranchAtHead(target.branch);
     if (!created.ok) {
@@ -3719,17 +3781,18 @@ function rescueUncommittedChanges(options, now) {
       return { kind: "failed", step: "branch", detail: created.stderr };
     }
   }
-  const staged = stageAllExcept([RUN_LOCK_RELATIVE_PATH]);
-  if (!staged.ok) {
-    options.log(`  rescue    FAILED to stage the changes: ${staged.stderr}
-`);
-    return { kind: "failed", step: "stage", detail: staged.stderr };
-  }
+  const left = target.createdBranch ? { branch: target.branch, createdBranch: target.branch } : { branch: target.branch };
   const committed = commitStaged(`chore(automata): rescue uncommitted work from ${target.source}`);
   if (!committed.ok) {
-    options.log(`  rescue    FAILED to commit: ${committed.stderr}
+    options.log(`  rescue    FAILED to commit on ${target.branch}: ${committed.stderr}
 `);
-    return { kind: "failed", step: "commit", detail: committed.stderr };
+    if (target.createdBranch) {
+      options.log(
+        `  rescue    ${target.branch} was created by this rescue and carries none of the work; it is left in the checkout
+`
+      );
+    }
+    return { kind: "failed", step: "commit", detail: committed.stderr, ...left };
   }
   const pushed = pushSetUpstream(target.branch);
   if (!pushed.ok) {
@@ -3738,7 +3801,7 @@ function rescueUncommittedChanges(options, now) {
   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 };
+    return { kind: "failed", step: "push", detail: pushed.stderr, ...left };
   }
   let existing;
   try {
@@ -3748,7 +3811,7 @@ function rescueUncommittedChanges(options, now) {
       `  rescue    committed and pushed ${target.branch}, but could not check for an open PR: ${err.message}
 `
     );
-    return { kind: "failed", step: "pr", detail: err.message };
+    return { kind: "failed", step: "pr", detail: err.message, ...left };
   }
   if (existing !== null) {
     options.log(
@@ -3789,7 +3852,7 @@ function rescueUncommittedChanges(options, now) {
       `  rescue    committed and pushed ${target.branch}, but could not open a draft PR: ${err.message}
 `
     );
-    return { kind: "failed", step: "pr", detail: err.message };
+    return { kind: "failed", step: "pr", detail: err.message, ...left };
   }
 }
 function prepareBase(options) {
@@ -3814,12 +3877,13 @@ function prepareBase(options) {
 `);
   return { ok: true };
 }
-function collectCandidates(options) {
+function collectCandidates(options, rescueBranch) {
   const remote = listRemoteBranches();
   if (remote === null) return null;
   const remoteNames = new Set(remote);
   const current = getCurrentBranch();
   const untouchable = /* @__PURE__ */ new Set([options.baseBranch, current, ...options.protectedBranches]);
+  if (rescueBranch !== null) untouchable.add(rescueBranch);
   return listLocalBranches().filter(
     (branch) => !untouchable.has(branch) && !remoteNames.has(branch)
   );
@@ -3915,8 +3979,8 @@ function pruneCandidate(branch, options) {
     return { kind: "rescued", branch, pr: null, prUrl: null };
   }
 }
-function prune(options) {
-  const candidates = collectCandidates(options);
+function prune(options, rescueBranch) {
+  const candidates = collectCandidates(options, rescueBranch);
   if (candidates === null) {
     options.log(
       "  prune     skipped: could not list origin's branches, so no branch can be shown to have no remote\n"
@@ -3936,12 +4000,46 @@ function runRepoHygiene(options, now = /* @__PURE__ */ new Date()) {
   options.log(options.dryRun ? "\nPre-flight (dry run):\n" : "\nPre-flight:\n");
   const rescue = rescueUncommittedChanges(options, now);
   const base = prepareBase(options);
-  const { outcomes, remoteUnreadable } = prune(options);
+  const { outcomes, remoteUnreadable } = prune(options, rescueCreatedBranch(rescue));
   const degraded = rescue.kind === "failed" || !base.ok || remoteUnreadable || outcomes.some(
     (outcome) => outcome.kind === "kept" && outcome.reason !== "open-pr" || outcome.kind === "rescued" && outcome.pr === null
   );
   return { rescue, base, prunes: outcomes, degraded };
 }
+function rescueCreatedBranch(rescue) {
+  switch (rescue.kind) {
+    case "rescued":
+    case "would-rescue":
+      return rescue.createdBranch ? rescue.branch : null;
+    case "failed":
+      return rescue.createdBranch ?? null;
+    default:
+      return null;
+  }
+}
+function describePreflightFailures(report) {
+  const causes = [];
+  if (report.rescue.kind === "failed") {
+    causes.push(
+      `the rescue failed at the ${report.rescue.step} step (${describeRescueRemains(report.rescue)}): ${report.rescue.detail}`
+    );
+  }
+  if (!report.base.ok) {
+    causes.push(`the base branch ${report.base.step} failed: ${report.base.detail}`);
+  }
+  return causes;
+}
+function describeRescueRemains(rescue) {
+  if (rescue.branch === void 0) return "the tree is still dirty";
+  switch (rescue.step) {
+    case "push":
+      return `the work is committed on ${rescue.branch} but not pushed`;
+    case "pr":
+      return `the work is committed and pushed on ${rescue.branch}, without a draft pull request`;
+    default:
+      return `the tree is still dirty and ${rescue.branch} carries none of it`;
+  }
+}
 
 // src/run/operationLog.ts
 import {
@@ -4271,10 +4369,32 @@ function planRun(item, settings, execution) {
   });
   return { prompt, bin, args, command: [bin, ...args].map(shellQuote).join(" ") };
 }
+function describeAssignment(item, agentUser) {
+  return claimStates(item).map((claim) => {
+    const label = claim.surface === "issue" ? "issue" : `pull request #${String(claim.number)}`;
+    switch (claim.state) {
+      case "would-claim":
+        return `would assign ${label} to ${agentUser}`;
+      case "already-assigned":
+        return `${label} already assigned`;
+      case "rule-exempt":
+        return `${label} not claimed (orphan pass)`;
+    }
+  }).join(" \xB7 ");
+}
+function describePlanClaim(item) {
+  const claims = claimStates(item);
+  const would = claims.filter((claim) => claim.state === "would-claim").map((claim) => `the ${claim.surface}`);
+  const exempt = claims.filter((claim) => claim.state === "rule-exempt").map((claim) => claim.surface);
+  const parts = [];
+  if (would.length > 0) parts.push(`will assign ${would.join(" and ")} to the agent`);
+  if (exempt.length > 0) parts.push(`${exempt.join(" and ")} not claimed (orphan pass)`);
+  return parts.length === 0 ? "" : `, ${parts.join(", ")}`;
+}
 function describePlannedRun(item, settings, run5, execution) {
   const rule = "\u2500".repeat(72);
   const branchAction = item.turn === "issue-discuss" ? " and pull" : " and fast-forward";
-  const assignment = item.needsAssignment ? `would assign to ${settings.participants.agentUser}` : "already assigned";
+  const assignment = describeAssignment(item, settings.participants.agentUser);
   const markerTarget = markerSurfaceLabel(item);
   const lines = [
     rule,
@@ -4469,8 +4589,7 @@ function describePlan(decisions) {
       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 `  ${itemLabel(item)} ${item.turn} on ${item.branch} \u2014 ${item.reason}${claim}`;
+    return `  ${itemLabel(item)} ${item.turn} on ${item.branch} \u2014 ${item.reason}${describePlanClaim(item)}`;
   });
   return lines.length === 0 ? "  (nothing matched the discovery filter)\n" : lines.join("\n") + "\n";
 }
@@ -4485,6 +4604,16 @@ function claimIssue(item, settings) {
 `);
   }
 }
+function claimPr(prNumber, agentUser) {
+  try {
+    assignPrToAgent(prNumber, agentUser);
+    progress(`  assigned pull request #${String(prNumber)} to ${agentUser}.
+`);
+  } catch (err) {
+    progress(`  warning: could not assign pull request #${String(prNumber)}: ${err.message}
+`);
+  }
+}
 function notePickupOnIssue(item, marker) {
   if (item.turn !== "pr-work" || item.pr === null || item.issue === null) return null;
   if (!item.issueAnalysis.hasNewMessage) return null;
@@ -4657,7 +4786,7 @@ async function invokeExecutor(prompt, execution, silent) {
   }
   await runClaude(prompt, { model: execution.model, effort: execution.effort, printSteps: !silent });
 }
-function repairIssueLink(item, baseBranch) {
+function repairIssueLink(item, baseBranch, agentUser) {
   const issue = item.issue;
   if (issue === null) return false;
   try {
@@ -4673,6 +4802,9 @@ function repairIssueLink(item, baseBranch) {
 `);
       return false;
     }
+    if (pr.assignees.length === 0) {
+      claimPr(pr.number, agentUser);
+    }
     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(issue.number)}.
@@ -4701,7 +4833,10 @@ function refuseBeforeRun(base, marker, detail, markerText) {
   }
   return { ...base, outcome: "failed", detail };
 }
-async function processItem(planned, settings, silent) {
+function preflightSuffix(causes) {
+  return causes.length === 0 ? "" : ` [pre-flight: ${causes.join("; ")}]`;
+}
+async function processItem(planned, settings, silent, preflightCauses) {
   progress(`
 ${itemLabel(planned)} ${planned.turn}: ${planned.reason}
 `);
@@ -4731,11 +4866,19 @@ ${itemLabel(planned)} ${planned.turn}: ${planned.reason}
   };
   const prepared = item.turn === "issue-discuss" ? prepareBaseBranch(item.branch) : preparePrBranch(item.branch);
   if (!prepared.ok) {
-    progress(`  skipped: ${prepared.reason} \u2014 ${prepared.detail}
+    const why = preflightSuffix(preflightCauses);
+    progress(`  skipped: ${prepared.reason} \u2014 ${prepared.detail}${why}
 `);
-    return { ...base, outcome: "skipped", detail: `${prepared.reason}: ${prepared.detail}` };
+    return {
+      ...base,
+      outcome: "skipped",
+      detail: `${prepared.reason}: ${prepared.detail}${why}`
+    };
   }
   claimIssue(item, settings);
+  if (item.turn === "pr-work" && item.pr !== null && item.prNeedsAssignment) {
+    claimPr(item.pr.number, settings.participants.agentUser);
+  }
   let marker;
   const markerTarget = markerSurfaceTarget(item);
   try {
@@ -4819,7 +4962,7 @@ function adjustOutcome(reconciled, item, settings, buriedByNote) {
     };
   }
   if (item.turn !== "issue-discuss") return outcome;
-  const linked = repairIssueLink(item, settings.baseBranch);
+  const linked = repairIssueLink(item, settings.baseBranch, settings.participants.agentUser);
   if (linked && outcome.reason === "no-answer") {
     progress("  a pull request was opened, so the turn is counted as answered.\n");
     return {
@@ -5021,6 +5164,7 @@ ${describePlan(decisions)}`;
   }
   const reports = [];
   const deferred = [];
+  const preflightCauses = describePreflightFailures(hygiene);
   let runsUsed = 0;
   for (const item of items) {
     if (settings.maxRuns > 0 && runsUsed >= settings.maxRuns) {
@@ -5029,7 +5173,7 @@ ${describePlan(decisions)}`;
     }
     let report;
     try {
-      report = await processItem(item, settings, options.silent === true);
+      report = await processItem(item, settings, options.silent === true, preflightCauses);
     } catch (err) {
       progress(`  failed: ${err.message}
 `);
@@ -5183,7 +5327,7 @@ function describeRescue(rescue) {
     case "would-rescue":
       return `would rescue onto ${rescue.branch}`;
     case "failed":
-      return `${rescue.step} failed \u2014 ${rescue.detail}; the tree is still dirty and nothing was discarded`;
+      return `${rescue.step} failed \u2014 ${rescue.detail}; ${describeRescueRemains(rescue)}; nothing was discarded`;
   }
 }
 function describePrune(outcome) {
@@ -5227,6 +5371,7 @@ function toPlanJson(decision) {
     turn: item.turn,
     branch: item.branch,
     needsAssignment: item.needsAssignment,
+    prNeedsAssignment: item.prNeedsAssignment,
     reason: item.reason
   };
 }