@maycombhq/atticus 2.0.0-beta.26 → 2.0.0-beta.27.1

package/dist/bin.js

@@ -6,7 +6,7 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   VERSION
-} from "./chunk-MTIRNHRJ.js";
+} from "./chunk-QK3UFHFC.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/bin.js
@@ -25,7 +25,7 @@ else if ((await import("./chunk-QBNWF5ZU.js")).nodeTooOld(process.versions.node)
   process.exitCode = 1;
 } else {
   if (process.env.ATTICUS_MAX_OLD_SPACE) {
-    const { reExecForMemory } = await import("./chunk-YXKCE5BA.js");
+    const { reExecForMemory } = await import("./chunk-VWCNMDMZ.js");
     const again = reExecForMemory(process.env, process.execArgv);
     if (again) {
       const { spawnSync } = await import("node:child_process");
@@ -33,7 +33,7 @@ else if ((await import("./chunk-QBNWF5ZU.js")).nodeTooOld(process.versions.node)
       process.exit(r.status ?? 1);
     }
   }
-  const { main } = await import("./chunk-TYN5SG5H.js");
+  const { main } = await import("./chunk-DGNTEKF6.js");
   await main(
     argv,
     {

package/dist/{chunk-7JZONWAA.js → chunk-23OQZY5Z.js}

@@ -5,17 +5,20 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   changeStore
-} from "./chunk-WH3ZFLXT.js";
+} from "./chunk-YBAJ5SAR.js";
+import {
+  readCatalog
+} from "./chunk-6H62UHY5.js";
+import {
+  ownerQuestionStillAsked
+} from "./chunk-N5DLB74D.js";
 import {
   ManualNotifier,
   fileStepStore
-} from "./chunk-6U65YB54.js";
-import {
-  readCatalog
-} from "./chunk-2HDNOUJU.js";
+} from "./chunk-I57IH5X6.js";
 import {
   readServiceRequestExports
-} from "./chunk-QAFQLILX.js";
+} from "./chunk-IPSZDVLI.js";
 import {
   LIFECYCLE_STATES,
   catalogDirOf,
@@ -25,10 +28,10 @@ import {
   serializeRecord,
   stateDirOf,
   toCanonicalYaml
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   renameRetrying
-} from "./chunk-MEMEO7YO.js";
+} from "./chunk-SMFFUFMN.js";
 import {
   Initiative,
   IsoDate,
@@ -36,10 +39,10 @@ import {
   RecordId,
   external_exports,
   loadOrgPack
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   SCHEMA_VERSION
-} from "./chunk-CTJHEG6A.js";
+} from "./chunk-NWMFVPEP.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -1581,7 +1584,8 @@ function systemCard(view, systems, o = {}) {
     s.storeType,
     tables.filter((t) => t.dataStore === s.id).map((t) => t.id).sort().join(", ") || "none known"
   ])), "");
-  const questions = view.all("OwnerQuestion").filter((q) => ids.has(q.system) && q.questionState !== "answered").sort((a, b) => cmp3(a.id, b.id));
+  const stillAsked = o.orgPack ? ownerQuestionStillAsked({ records: view.records, orgPack: o.orgPack, now: o.now }) : () => true;
+  const questions = view.all("OwnerQuestion").filter((q) => ids.has(q.system) && q.questionState !== "answered" && stillAsked(q)).sort((a, b) => cmp3(a.id, b.id));
   L.push("## Open questions", "");
   if (questions.length)
     for (const q of questions)
@@ -1611,13 +1615,13 @@ async function requestFromTeam(root, initiativeId, partyId, o) {
   const due = addWorkingDays(today, days);
   const slug = partyId.replace(/^party\./, "");
   const cardRel = `initiatives/${initiativeId}/requests/${slug}.md`;
-  const card = systemCard(view, systems, {
-    header: [
-      `For: ${initiative.title} (initiative ${initiative.id})`,
-      `Asked of: ${party.name} (${party.id}), by ${by} on ${today}`,
-      `Reply by: ${due}`
-    ]
-  });
+  const orgPack = await loadOrgPack(orgPackDirOf(root)).catch(() => void 0);
+  const header = [
+    `For: ${initiative.title} (initiative ${initiative.id})`,
+    `Asked of: ${party.name} (${party.id}), by ${by} on ${today}`,
+    `Reply by: ${due}`
+  ];
+  const card = systemCard(view, systems, orgPack ? { header, orgPack, now: nowIso2(now) } : { header });
   const cardFile = join3(initiativeDir(root, initiativeId), "requests", `${slug}.md`);
   await mkdir2(dirname2(cardFile), { recursive: true });
   await writeFile2(cardFile, card, "utf8");

package/dist/{chunk-UTZMF5CV.js → chunk-23TTURB2.js}

@@ -5,7 +5,7 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   external_exports
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";

package/dist/{chunk-YIOYKA4V.js → chunk-2AIOOA3U.js}

@@ -12,13 +12,10 @@ import {
   runEvals,
   saveReport,
   writeQuality
-} from "./chunk-EQMNMG6X.js";
+} from "./chunk-MA73J3E6.js";
 import {
   table
 } from "./chunk-VOGCSYOI.js";
-import {
-  readDocument
-} from "./chunk-HQMLY2R6.js";
 import {
   combine,
   createRuntime,
@@ -27,15 +24,18 @@ import {
   screenDiagramXml,
   screenOfficeXml,
   screenText
-} from "./chunk-ZDA72732.js";
+} from "./chunk-2MRYL45Z.js";
+import {
+  readDocument
+} from "./chunk-ELJ5Q4J2.js";
 import {
   orgPackDirOf,
   readZip,
   stateDirOf
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   loadOrgPack
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 
 // packages/cli/dist/eval-commands.js
 import { readdir, readFile, stat } from "node:fs/promises";

package/dist/chunk-2ANBMA74.js

@@ -0,0 +1,107 @@
+import { createRequire as __atticusCreateRequire } from "node:module";
+import { fileURLToPath as __atticusFileURLToPath } from "node:url";
+var require = __atticusCreateRequire(import.meta.url);
+var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
+var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
+import {
+  ADO_COLUMNS,
+  AdapterError,
+  Approval,
+  FALLBACK_CODES,
+  JIRA_COLUMNS,
+  ManualBase,
+  ManualDesignTool,
+  ManualGitHost,
+  ManualNotifier,
+  ManualServiceDesk,
+  ManualWiki,
+  ManualWorkTracker,
+  MockBase,
+  MockDesignTool,
+  MockGitHost,
+  MockNotifier,
+  MockServiceDesk,
+  MockWiki,
+  MockWorkTracker,
+  PROVISIONAL,
+  StepError,
+  StepFileError,
+  allManual,
+  changeOfBranch,
+  checkResult,
+  checkValue,
+  createAdapters,
+  csvCell,
+  exportStep,
+  fieldKey,
+  fileStepStore,
+  html,
+  manualAdapter,
+  memoryStepStore,
+  mergeBlockers,
+  provisionalId,
+  recordStep,
+  requireApproval,
+  serializeStep,
+  shortHash,
+  slugify,
+  stepApproval,
+  stepOfProvisional,
+  withManualFallback,
+  workItemRows,
+  workItemsCsv
+} from "./chunk-I57IH5X6.js";
+import "./chunk-WJWSB65O.js";
+import "./chunk-SMFFUFMN.js";
+import "./chunk-A3LVMCA5.js";
+import "./chunk-NWMFVPEP.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  ADO_COLUMNS,
+  AdapterError,
+  Approval,
+  FALLBACK_CODES,
+  JIRA_COLUMNS,
+  ManualBase,
+  ManualDesignTool,
+  ManualGitHost,
+  ManualNotifier,
+  ManualServiceDesk,
+  ManualWiki,
+  ManualWorkTracker,
+  MockBase,
+  MockDesignTool,
+  MockGitHost,
+  MockNotifier,
+  MockServiceDesk,
+  MockWiki,
+  MockWorkTracker,
+  PROVISIONAL,
+  StepError,
+  StepFileError,
+  allManual,
+  changeOfBranch,
+  checkResult,
+  checkValue,
+  createAdapters,
+  csvCell,
+  exportStep,
+  fieldKey,
+  fileStepStore,
+  html,
+  manualAdapter,
+  memoryStepStore,
+  mergeBlockers,
+  provisionalId,
+  recordStep,
+  requireApproval,
+  serializeStep,
+  shortHash,
+  slugify,
+  stepApproval,
+  stepOfProvisional,
+  withManualFallback,
+  workItemRows,
+  workItemsCsv
+};

package/dist/{chunk-ZYLGEWTC.js → chunk-2FORECYK.js}

@@ -6,60 +6,25 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   changeSteps,
   readNextState
-} from "./chunk-ISCX25D7.js";
-import "./chunk-K2NQTROJ.js";
-import "./chunk-KAWWXCPI.js";
-import "./chunk-X7XVMYIL.js";
-import "./chunk-2FTHLB2H.js";
-import "./chunk-EUTZTJIO.js";
-import "./chunk-RBO4A7TC.js";
-import "./chunk-ET7SPOBA.js";
-import "./chunk-BD7HBZLP.js";
-import "./chunk-LY7DOYX2.js";
-import "./chunk-V5FT3MZG.js";
-import "./chunk-P6DM2EFI.js";
-import "./chunk-XDLMQL5A.js";
-import "./chunk-PBDIVTFL.js";
-import "./chunk-XI3GPYP4.js";
-import "./chunk-3G4YI4ZU.js";
-import "./chunk-DPH4BS3F.js";
-import "./chunk-IBIIKUC7.js";
-import "./chunk-SAPX3PVK.js";
-import "./chunk-MUWDB4R4.js";
-import "./chunk-VOGCSYOI.js";
-import "./chunk-CSHJZFOE.js";
-import "./chunk-5A4RHEEL.js";
-import "./chunk-2SCZZQNQ.js";
-import "./chunk-VIQHZA53.js";
+} from "./chunk-RTHQIGGY.js";
 import {
   changeReport,
-  changeStore
-} from "./chunk-WH3ZFLXT.js";
-import "./chunk-UTZMF5CV.js";
-import "./chunk-6U65YB54.js";
-import "./chunk-SZDOBIWE.js";
-import "./chunk-2HDNOUJU.js";
-import "./chunk-RK5P2DWD.js";
-import "./chunk-K3QKOVZN.js";
-import "./chunk-QAFQLILX.js";
-import "./chunk-HQMLY2R6.js";
-import "./chunk-I2EWY3MG.js";
-import "./chunk-UFIQ5FWY.js";
-import "./chunk-MTIRNHRJ.js";
-import "./chunk-ZDA72732.js";
-import "./chunk-QA4O2GGC.js";
+  changeStore,
+  handoffName,
+  loadChangePolicy,
+  stageCompletion,
+  stageWorkDone
+} from "./chunk-YBAJ5SAR.js";
 import {
   readChangeRepos
-} from "./chunk-XIJBQM45.js";
+} from "./chunk-X5B7KYPD.js";
 import {
   changesDirOf,
   listQuestions,
   nextOwnersOf,
+  orgPackDirOf,
   ownersOfRole
-} from "./chunk-6ZDAEUKB.js";
-import "./chunk-MEMEO7YO.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+} from "./chunk-WJWSB65O.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
@@ -93,10 +58,60 @@ function waitsOnOf(c, storiesDone, custom = []) {
     return void 0;
   return { role, people: ownersOfRole(role, c.owners, custom), because: "phase", phase: c.state };
 }
-async function stageProgress(dir, stage, open) {
+var GATE_STEPS = /* @__PURE__ */ new Set(["handoff", "small-handoff", "merge"]);
+var RELEASE_GATE_STEPS = /* @__PURE__ */ new Set(["release", "release-prs", "release-prs-merge"]);
+function glanceNextStep(report, next, where = "glance") {
+  if (!report.ready || !report.phase || glanceReady(report, next))
+    return report.nextStep;
+  const not = `Not ready to raise "${handoffName(report.type, report.phase)}" yet`;
+  const why = next?.why?.trim();
+  if (where === "page" && why)
+    return `${not}: first, ${lowerFirst(why)}`;
+  return `${not}: the step below comes first.`;
+}
+var lowerFirst = (s) => /^[A-Z][a-z]/.test(s) ? s[0].toLowerCase() + s.slice(1) : s;
+function glanceReady(report, next) {
+  if (!report.ready || !report.phase)
+    return false;
+  if (!next || GATE_STEPS.has(next.step))
+    return true;
+  return report.phase === "release" && RELEASE_GATE_STEPS.has(next.step);
+}
+async function changeNextStep(root, id, report, state, where = "glance") {
+  const s = state ?? await readNextState(root).catch(() => void 0);
+  const own = s?.changes.find((c) => c.id === id);
+  const next = own ? changeSteps(own)[0] : void 0;
+  const ready = glanceReady(report, next);
+  const nextStep = glanceNextStep(report, next, where);
+  const stepFirst = report.ready && !ready;
+  let nextStepApp;
+  if (where === "page" && stepFirst && next?.why) {
+    const { commandShapes, stepInAppWords } = await import("./chunk-MA44TMTL.js");
+    nextStepApp = glanceNextStep(report, { ...next, why: stepInAppWords(next.why, await commandShapes()) }, where);
+  }
+  return {
+    nextStep,
+    ...nextStepApp ? { nextStepApp } : {},
+    ready,
+    // Nothing in the gate's checks blocks, yet another step comes first.
+    stepFirst,
+    ...next ? { next } : {}
+  };
+}
+async function stageProgress(dir, stage, open, done) {
   const text = await readFile(join(dir, "stage", `${stage}.yaml`), "utf8").catch(() => void 0);
-  if (!text)
-    return { stage, state: "not-started", drafts: 0, rounds: 0, openQuestions: 0, asked: [] };
+  if (!text) {
+    const state = done && done.state !== "unknown" ? done.state : "not-started";
+    return {
+      stage,
+      state,
+      ...done?.files?.length ? { files: done.files } : {},
+      drafts: 0,
+      rounds: 0,
+      openQuestions: 0,
+      asked: []
+    };
+  }
   const y = (0, import_yaml.parse)(text) ?? {};
   const asked = Array.isArray(y.questions) ? y.questions.filter((q) => typeof q === "string") : [];
   return {
@@ -116,14 +131,17 @@ async function cockpit(root, id, o = {}) {
     questions: []
   }));
   const open = new Set(questions.map((q) => q.id));
+  const lifecycle = await changeStore(root).read(id).catch(() => void 0);
+  const { policy } = await loadChangePolicy(orgPackDirOf(root));
+  const completion = await stageCompletion({ root, policy }, { id, ...lifecycle ? { state: lifecycle.state } : {} }).catch(() => []);
   const stages = [];
   for (const s of STAGES)
-    stages.push(await stageProgress(dir, s, open));
+    stages.push(await stageProgress(dir, s, open, completion.find((x) => x.stage === s)));
   const ofChange = /* @__PURE__ */ new Set([
     ...questions.filter((q) => q.repo === id).map((q) => q.id),
     ...stages.flatMap((s) => s.asked)
   ]);
-  const { stageQuestions, roleWithStage, personsRoles, customRoles } = await import("./chunk-2JT4QV3Q.js");
+  const { stageQuestions, roleWithStage, personsRoles, customRoles } = await import("./chunk-HDWVR5KD.js");
   const raisedBy = await stageQuestions(root, id);
   const byRole = {};
   for (const q of questions) {
@@ -133,16 +151,15 @@ async function cockpit(root, id, o = {}) {
     if (r)
       byRole[r] = (byRole[r] ?? 0) + 1;
   }
-  const state = (await readNextState(root)).changes.find((c) => c.id === id);
-  const next = state ? changeSteps(state)[0] : void 0;
+  const said = await changeNextStep(root, id, report, await readNextState(root));
+  const next = said.next;
   const repos = await readChangeRepos(root, id).catch(() => void 0);
-  const lifecycle = await changeStore(root).read(id).catch(() => void 0);
-  const waitsOn = lifecycle ? waitsOnOf(lifecycle, stages.find((s) => s.stage === "stories")?.state === "done", await customRoles(root)) : void 0;
+  const waitsOn = lifecycle ? waitsOnOf(lifecycle, stageWorkDone(stages.find((s) => s.stage === "stories")?.state ?? ""), await customRoles(root)) : void 0;
   return {
     id,
     state: report.state,
     ...next ? { next } : {},
-    nextStep: report.nextStep,
+    nextStep: said.nextStep,
     reasons: report.reasons,
     risk: { level: report.risk.level, score: report.risk.score },
     ...report.progress ? { work: report.progress.summary } : {},
@@ -159,8 +176,12 @@ async function cockpit(root, id, o = {}) {
     }))
   };
 }
+
 export {
   STAGES,
-  cockpit,
-  waitsOnOf
+  waitsOnOf,
+  glanceNextStep,
+  glanceReady,
+  changeNextStep,
+  cockpit
 };

package/dist/{chunk-D5H3RZNE.js → chunk-2J2GMERV.js}

@@ -7,22 +7,23 @@ import {
   diagramLibrary,
   diagramRender,
   loadCatalog
-} from "./chunk-HSJKYDHI.js";
-import "./chunk-2HDNOUJU.js";
-import "./chunk-RK5P2DWD.js";
-import "./chunk-K3QKOVZN.js";
-import "./chunk-QAFQLILX.js";
-import "./chunk-HQMLY2R6.js";
-import "./chunk-I2EWY3MG.js";
-import "./chunk-UFIQ5FWY.js";
-import "./chunk-ZDA72732.js";
-import "./chunk-QA4O2GGC.js";
-import "./chunk-XIJBQM45.js";
-import "./chunk-6ZDAEUKB.js";
-import "./chunk-MEMEO7YO.js";
-import "./chunk-LZFKJ2BR.js";
-import "./chunk-CTJHEG6A.js";
+} from "./chunk-6TXB2WR6.js";
+import "./chunk-6H62UHY5.js";
+import "./chunk-YIGSUTW2.js";
+import "./chunk-N5DLB74D.js";
+import "./chunk-4NPWOUI2.js";
+import "./chunk-X5B7KYPD.js";
+import "./chunk-IPSZDVLI.js";
+import "./chunk-2MRYL45Z.js";
+import "./chunk-ELJ5Q4J2.js";
+import "./chunk-XZY4GTCX.js";
+import "./chunk-3M3MDBOG.js";
+import "./chunk-WJWSB65O.js";
+import "./chunk-SMFFUFMN.js";
+import "./chunk-A3LVMCA5.js";
+import "./chunk-NWMFVPEP.js";
 import "./chunk-BQGDB6ZL.js";
+import "./chunk-R4TUWD4C.js";
 import "./chunk-TV45EUGM.js";
 export {
   diagramLibrary,

package/dist/{chunk-ZDA72732.js → chunk-2MRYL45Z.js}

@@ -3,9 +3,6 @@ import { fileURLToPath as __atticusFileURLToPath } from "node:url";
 var require = __atticusCreateRequire(import.meta.url);
 var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
-import {
-  commandWords
-} from "./chunk-QA4O2GGC.js";
 import {
   ANSWERED_BY,
   SAME_QUESTION,
@@ -24,10 +21,10 @@ import {
   runsRelOf,
   stateDirOf,
   tokenUnits
-} from "./chunk-6ZDAEUKB.js";
+} from "./chunk-WJWSB65O.js";
 import {
   writeFileAtomic
-} from "./chunk-MEMEO7YO.js";
+} from "./chunk-SMFFUFMN.js";
 import {
   AgentDefinition,
   RUN_SCHEMA_VERSION,
@@ -37,10 +34,13 @@ import {
   copilotAcpOf,
   loadOrgPack,
   stepModelsOf
-} from "./chunk-LZFKJ2BR.js";
+} from "./chunk-A3LVMCA5.js";
 import {
   require_dist
 } from "./chunk-BQGDB6ZL.js";
+import {
+  commandWords
+} from "./chunk-R4TUWD4C.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -78,6 +78,34 @@ var RULES = [
   },
   { test: (w) => w[1] === "accept", why: "a person accepts what is proposed" },
   { test: (w) => w[0] === "baseline", why: "a person accepts the catalog as the baseline" },
+  {
+    // ADR 0195 point 3: a person checks the cited line, then dismisses what the readers found.
+    test: (w, a) => w[0] === "catalog" && w[1] === "crosscheck" && flag(a, "--dismiss", "--undismiss"),
+    why: "a person dismisses what the readers found, after checking its line (ADR 0195)"
+  },
+  {
+    // ADR 0195 point 3: promote to assert writes a `by: person` fact; only a person vouches.
+    test: (w, a) => w[0] === "catalog" && w[1] === "crosscheck" && flag(a, "--promote"),
+    why: "a person promotes what the readers found to their own fact, after checking its line (ADR 0195)"
+  },
+  {
+    // ADR 0195 (the review): a confirmation names the count a person was shown; only a person
+    // confirms that what a build removes or discards may go, on any command that builds.
+    test: (_w, a) => flag(a, "--allow-removals", "--discard-edits"),
+    why: "a person confirms what a build removes or discards, with the count it listed (ADR 0195)"
+  },
+  {
+    test: (w, a) => w[0] === "catalog" && (w[1] === "undo" || w[1] === "prune") && switchOn(a, "--yes"),
+    why: "a person confirms an undo or a prune after reading what it puts back or removes (ADR 0195)"
+  },
+  {
+    test: (w, a) => w[0] === "catalog" && w[1] === "edits" && switchOn(a, "--curate"),
+    why: "a person makes their hand edits curated decisions (ADR 0195)"
+  },
+  {
+    test: (w, a) => w[0] === "upgrade" && (switchOn(a, "--yes") || flag(a, "--accept-changes")),
+    why: "a person confirms the upgrade to source slots after reading what it writes (ADR 0195)"
+  },
   { test: (w) => w[0] === "triage" && w[1] === "decide", why: "a person decides a triage item" },
   { test: (w) => w[0] === "finding", why: "a person acts on a finding (it is recorded with them)" },
   {
@@ -142,7 +170,7 @@ function personOnlyWhy(argv) {
   const words2 = commandWords(argv);
   return RULES.find((r) => r.test(words2, argv))?.why;
 }
-var isPersonsFactsFile = (name) => /\.audit\.yaml$|\.corrections\.jsonl$/i.test(windowsName(name));
+var isPersonsFactsFile = (name) => /\.audit\.yaml$|\.corrections\.jsonl$|\.crosscheck\.yaml$/i.test(windowsName(name));
 var windowsName = (name) => name.replace(/:.*$/, "").replace(/[. ]+$/, "");
 
 // packages/ai/dist/context.js
@@ -2611,6 +2639,7 @@ var AcpSetupError = class extends RuntimeError {
     this.name = "AcpSetupError";
   }
 };
+var MAX_FOLLOW_UPS = 2;
 var MAX_NUDGES = 3;
 function carryOnPrompt(refusals) {
   return [
@@ -2875,7 +2904,9 @@ async function runAcpSession(o) {
       stopReason: "end_turn"
     };
     const usages = [];
-    for (let nudge = 0; ; nudge++) {
+    let followUps = 0;
+    let nudge = 0;
+    for (; ; ) {
       const before = refused.length;
       const asked = client.prompt(sessionId, prompt);
       try {
@@ -2900,9 +2931,18 @@ async function runAcpSession(o) {
       const fresh = refused.slice(before);
       const after = text.slice(textAtRefusal);
       const overIt = fresh.length > 0 && !!calls.at(-1)?.error && (!after.trim() || /cancel|refused|not allowed|can'?t|cannot|couldn'?t|unable/i.test(after));
+      if (!cancelWhy && !overIt && answer.stopReason === "end_turn" && followUps < MAX_FOLLOW_UPS) {
+        const more = await o.followUp?.().catch(() => void 0);
+        if (more) {
+          followUps++;
+          prompt = more;
+          continue;
+        }
+      }
       if (cancelWhy || !overIt || nudge >= MAX_NUDGES || !["end_turn", "cancelled"].includes(answer.stopReason))
         break;
-      say(`  Atticus: told Copilot why that was refused and to carry on (${nudge + 1} of ${MAX_NUDGES}).`);
+      nudge++;
+      say(`  Atticus: told Copilot why that was refused and to carry on (${nudge} of ${MAX_NUDGES}).`);
       prompt = carryOnPrompt(fresh);
     }
     const usage = usageOf(sumUsage(usages));
@@ -4247,6 +4287,7 @@ export {
   atticusExec,
   AcpSignInError,
   AcpSetupError,
+  MAX_FOLLOW_UPS,
   MAX_NUDGES,
   carryOnPrompt,
   ACP_OFFERED,