@maycombhq/atticus 2.0.0-beta.2 → 2.0.0-beta.22

package/dist/{chunk-CSZ4C5N6.js → chunk-VTZMAJ3W.js}

@@ -5,32 +5,40 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   RunLevel,
+  TASK_RUNNER,
   completeTaskHandoff,
+  findTaskRunOfRun,
+  isTaskRun,
+  previewTaskRun,
   runTask
-} from "./chunk-CEXSU4S6.js";
+} from "./chunk-6MUGR4LS.js";
+import {
+  handoffDone
+} from "./chunk-DOBQKHIF.js";
 import {
   driftCheck,
   handDown,
   handUp
-} from "./chunk-OT2O76OS.js";
+} from "./chunk-UGUP3ZM6.js";
 import {
   generateAssistantFiles,
   smokeCheck
-} from "./chunk-IPKHE5D6.js";
+} from "./chunk-BEVTIBRH.js";
 import {
   createAdapters,
   fileStepStore
-} from "./chunk-7JUKDRSZ.js";
+} from "./chunk-7IGKHZ4Z.js";
 import {
   RUNTIME_MODES,
   runtimeForCli
-} from "./chunk-CNUKCS2T.js";
+} from "./chunk-P32RUW3B.js";
 import {
   changesRelOf,
   loadOrgPack,
   orgPackDirOf,
+  runsDirOf,
   runsRelOf
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-Q2TECDIT.js";
 
 // packages/cli/dist/run-commands.js
 import { readFile } from "node:fs/promises";
@@ -38,6 +46,8 @@ import { join } from "node:path";
 var KNOWN = /* @__PURE__ */ new Set([
   "SpecKitError",
   "TaskRunError",
+  "GitError",
+  "RuntimeError",
   "RuntimeConfigError",
   "AssistantFilesError",
   "ChangeError",
@@ -53,10 +63,11 @@ function fail(io, e) {
   throw e;
 }
 var plural = (n, w) => `${n} ${w}${n === 1 ? "" : "s"}`;
+var exitOf = (r) => r.state === "failed" || r.state === "needs-person" || r.level === "pr" && r.state === "built" ? 1 : 0;
 function describeRun(root, r, io) {
   const what = {
     planned: `Wrote the plan for task ${r.task}: ${changesRelOf(root)}/${r.change}/tasks/${r.task}/plan.md.`,
-    waiting: `Handed task ${r.task} to your assistant. The prompt is in ${runsRelOf(root)}/${r.change}/${r.waiting}/prompt.md; it ends with: atticus handoff done ${r.waiting}`,
+    waiting: r.level === "pr" ? `Handed task ${r.task} to your assistant. The prompt is in ${runsRelOf(root)}/${r.change}/${r.waiting}/prompt.md. When it is done, you run: atticus handoff done ${r.waiting} --approve (it pushes the branch and opens the PR; an assistant never approves a push)` : `Handed task ${r.task} to your assistant. The prompt is in ${runsRelOf(root)}/${r.change}/${r.waiting}/prompt.md; it ends with: atticus handoff done ${r.waiting}`,
     built: `Task ${r.task} is drafted on ${r.branch} and the build passes (${plural(r.attempts.length, "attempt")}); committed ${r.commit?.slice(0, 12) ?? ""}.`,
     unverified: `Task ${r.task} is drafted on ${r.branch} but wasn't built: ${r.repo} has no build command.`,
     "pr-open": `Opened PR ${r.pr?.url ?? ""} from ${r.branch} for review.`,
@@ -67,7 +78,7 @@ function describeRun(root, r, io) {
   io.out(reason ? `The run for task ${r.task} failed: ${reason}` : what[r.state]);
   for (const n of reason ? r.notes.slice(0, -1) : r.notes)
     io.out(`  ${n}`);
-  return r.state === "failed" || r.state === "needs-person" ? 1 : 0;
+  return exitOf(r);
 }
 async function taskRun(root, changeId, taskId, o, io, deps = {}) {
   if (!changeId || !taskId) {
@@ -88,6 +99,30 @@ async function taskRun(root, changeId, taskId, o, io, deps = {}) {
     io.err(`Unknown mode ${mode}. Use one of: hand-off, model, headless-claude-code, replay.`);
     return 2;
   }
+  if (o.dryRun || !o.approve) {
+    let p;
+    try {
+      p = await previewTaskRun(root, changeId, taskId, {
+        ...o.level ? { level: o.level } : {},
+        ...deps.gitHost ? { gitHost: deps.gitHost } : {}
+      });
+    } catch (e) {
+      return fail(io, e);
+    }
+    if (o.dryRun || p.level === "pr") {
+      const what = [
+        p.level === "plan" ? `Task ${p.task} of ${p.change} at the plan level: the plan is written to tasks/${p.task}/plan.md; no code changes.` : `Task ${p.task} of ${p.change} at the ${p.level} level: drafted on ${p.branch} in its own worktree of ${p.repo}, built and committed${p.level === "pr" ? p.gitHost ? `, then the branch is pushed and a PR opened into change/${p.change}.` : `; no Git host is connected (runtime.yaml adapters.gitHost), so you push it and open the PR by hand.` : "."}`,
+        // The yes is the person's: an assistant that ran this says so to them, never adds it.
+        o.dryRun || p.level !== "pr" || o.approve ? "Nothing was done: this was a dry run." : p.gitHost ? "Nothing was done: run it again with --approve to let it push and open the PR (the person's yes; an assistant never approves a push)." : "Nothing was done: run it again with --approve to draft and commit it; you push and open the PR (the person's yes; an assistant never approves a push)."
+      ];
+      if (o.json)
+        io.out(JSON.stringify({ dryRun: true, ...p, lines: what }, null, 2));
+      else
+        for (const l of what)
+          io.out(l);
+      return 0;
+    }
+  }
   const now = deps.now ?? (() => /* @__PURE__ */ new Date());
   try {
     const r = await runTask(root, changeId, taskId, {
@@ -111,7 +146,7 @@ async function taskRun(root, changeId, taskId, o, io, deps = {}) {
     });
     if (o.json) {
       io.out(JSON.stringify(r, null, 2));
-      return r.state === "failed" || r.state === "needs-person" ? 1 : 0;
+      return exitOf(r);
     }
     return describeRun(root, r, io);
   } catch (e) {
@@ -135,7 +170,7 @@ async function taskHandoff(root, runId, o, io, deps = {}) {
     if (o.json)
       io.out(JSON.stringify(r, null, 2));
     else if (r.state === "waiting")
-      io.out(`The build still fails; fix it in ${r.worktree} and run atticus handoff done ${runId} again.`);
+      io.out(r.notes.at(-1)?.startsWith("Build attempt") ? `The build still fails; fix it in ${r.worktree} and run atticus handoff done ${runId} again.` : r.notes.at(-1) ?? `Run atticus handoff done ${runId} again.`);
     else
       return describeRun(root, r, io);
     return r.state === "waiting" ? 1 : 0;
@@ -143,6 +178,52 @@ async function taskHandoff(root, runId, o, io, deps = {}) {
     return fail(io, e);
   }
 }
+async function runDone(root, runId, o, io, deps = {}) {
+  if (await isTaskRun(root, runId))
+    return taskHandoff(root, runId, {
+      ...o.by ? { by: o.by } : {},
+      ...o.approve ? { approve: true } : {},
+      ...o.json ? { json: true } : {}
+    }, io, deps);
+  const owner = await findTaskRunOfRun(root, runId);
+  if (owner) {
+    io.err(taskRunNotWaiting(runId, owner));
+    return 1;
+  }
+  if (await runAgentOf(root, runId) === TASK_RUNNER) {
+    io.err(`Run ${runId} was a task run's, and no task run waits on it now: run the task again (atticus task run <change> <task>).`);
+    return 1;
+  }
+  const agent = await runAgentOf(root, runId);
+  if (agent === "decide-propose" || agent === "decide-match") {
+    const { decideRunDone } = await import("./chunk-EBL2R3YG.js");
+    return decideRunDone(root, runId, io);
+  }
+  return handoffDone(root, runId, io, o.model ? { model: o.model } : {});
+}
+async function runAgentOf(root, runId) {
+  if (!/^run-[0-9a-z-]+$/.test(runId))
+    return void 0;
+  const { readdir } = await import("node:fs/promises");
+  const runs = runsDirOf(root);
+  for (const change of await readdir(runs).catch(() => [])) {
+    const text = await readFile(join(runs, change, runId, "run.json"), "utf8").catch(() => void 0);
+    if (!text)
+      continue;
+    try {
+      const a = JSON.parse(text).request?.agent;
+      return typeof a === "string" ? a : a?.id;
+    } catch {
+      return void 0;
+    }
+  }
+  return void 0;
+}
+function taskRunNotWaiting(runId, r) {
+  if (r.notes.at(-1)?.startsWith(`Run ${runId} was cancelled`))
+    return `Run ${runId} was cancelled; run the task again (atticus task run ${r.change} ${r.task}).`;
+  return r.state === "needs-person" ? `Run ${runId} is part of task ${r.task}'s run, which needs a person now: carry on in ${r.worktree}, or run atticus task run ${r.change} ${r.task} again.` : `Run ${runId} is part of task ${r.task}'s run, which is ${r.state} and waits on no run: run the task again (atticus task run ${r.change} ${r.task}).`;
+}
 async function specHandDown(root, changeId, taskId, o, io, deps = {}) {
   if (!changeId || !taskId) {
     io.err("Usage: atticus spec hand-down <change> <task> [--force]");
@@ -300,6 +381,8 @@ export {
   describeRun,
   taskRun,
   taskHandoff,
+  runDone,
+  taskRunNotWaiting,
   specHandDown,
   specHandUp,
   driftCommand,

package/dist/{chunk-TXLH6WHQ.js → chunk-VW62D6QE.js}

@@ -5,29 +5,29 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   upgradeCommand
-} from "./chunk-YISXLPHN.js";
+} from "./chunk-P2V7QW4D.js";
+import {
+  generateAssistantFiles
+} from "./chunk-BEVTIBRH.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
-import {
-  generateAssistantFiles
-} from "./chunk-IPKHE5D6.js";
 import {
   changeStore
-} from "./chunk-XY3P7JW7.js";
+} from "./chunk-IDKCWSM5.js";
 import {
   fileStepStore
-} from "./chunk-7JUKDRSZ.js";
+} from "./chunk-7IGKHZ4Z.js";
 import {
   readCatalog,
   scanEstate,
   writeCatalog
-} from "./chunk-27NKUS3X.js";
+} from "./chunk-J2JAKCIW.js";
 import {
   buildContextPack,
   formatOf,
   screenText
-} from "./chunk-CNUKCS2T.js";
+} from "./chunk-P32RUW3B.js";
 import {
   AgentDefinition,
   CORE_ROLES,
@@ -39,10 +39,12 @@ import {
   external_exports,
   orgPackDirOf,
   recordReferences,
-  require_dist,
   stateDirOf,
   toCanonicalYaml
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-Q2TECDIT.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -659,7 +661,7 @@ var COMMANDS = [
   },
   {
     name: "map",
-    usage: "atticus map <repo> [--estimate] [--handoff | --copy [--answer <file>] | --mode m] [--next] [--max-tokens n] [--force]",
+    usage: "atticus map <repo> [--estimate] [--handoff | --copy [--answer <file>] | --mode m] [--next] [--max-tokens n] [--force], or atticus map --all [--max-tokens n] [--stale | --gaps] [--repos a,b] [--dry-run]",
     what: "Has your assistant read a repo into facts, each citing its file and line: an agentic assistant follows /atticus-map; one without tools gets the repo in batches that fit its model, each answer checked before the next.",
     who: ["developer", "architect"],
     changes: "facts/<repo>.jsonl and the questions the reader raised",
@@ -699,7 +701,7 @@ var COMMANDS = [
   },
   {
     name: "verify",
-    usage: "atticus verify <repo> [--write] [--dir path] [--commit sha] [--routed a,b] [--json]",
+    usage: "atticus verify <repo> [--write] [--dir path] [--commit sha] [--routed a,b] [--skipped] [--json]",
     what: "Checks every fact in a repo's facts file against the line it cites, keeps the ones that hold, writes the rest with why to <repo>.rejected.jsonl, and says which source files no fact has read yet. With --write the kept facts become catalog records.",
     who: ["developer", "architect"],
     changes: "facts/ (the kept facts, the rejected ones, the coverage); catalog/generated with --write",