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

package/dist/{chunk-5CMPVC3N.js → chunk-5SJZW52K.js}

@@ -7,29 +7,31 @@ import {
   ConformError,
   conformChange,
   conformanceOf
-} from "./chunk-Y6K3CJBU.js";
-import "./chunk-EZIN5E5B.js";
-import "./chunk-3LZ6P5EP.js";
-import "./chunk-YWAKDNMH.js";
-import "./chunk-3AQ2R5NL.js";
-import "./chunk-BEPCKDCP.js";
-import "./chunk-HWD4JPU7.js";
-import "./chunk-5WERBKLE.js";
-import "./chunk-K332XW7K.js";
-import "./chunk-HSZMPH5T.js";
-import "./chunk-D2WSW4GU.js";
-import "./chunk-4KNOJC6J.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
-import "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-6MUGR4LS.js";
+import "./chunk-BTGPE6CR.js";
+import "./chunk-MUWDB4R4.js";
+import "./chunk-UGUP3ZM6.js";
+import "./chunk-R7NYHMUU.js";
+import "./chunk-IVBOQAGB.js";
+import "./chunk-ISUAAMGS.js";
+import "./chunk-BEVTIBRH.js";
+import "./chunk-S4PMJU6H.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/change-conform.js

package/dist/{chunk-YAH5IQAL.js → chunk-63YRMR6J.js}

@@ -9,12 +9,13 @@ import {
   todoList,
   todoRun,
   todoShow
-} from "./chunk-ZFQMMU5Y.js";
-import "./chunk-DDJPM5YX.js";
+} from "./chunk-JB5LINEM.js";
+import "./chunk-6OJQOPUN.js";
 import "./chunk-VOGCSYOI.js";
-import "./chunk-4KNOJC6J.js";
-import "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   executorsCheck,

package/dist/{chunk-GUYL7RMK.js → chunk-66PPNOON.js}

@@ -17,31 +17,33 @@ import {
   rulesTryCommand,
   scopeFile,
   tryDiff
-} from "./chunk-JRVNXLZP.js";
-import "./chunk-LIJJCBQI.js";
-import "./chunk-26Z7OGQW.js";
-import "./chunk-OKUB6RJA.js";
-import "./chunk-THN26IEF.js";
-import "./chunk-L4CESDPB.js";
-import "./chunk-455SYIIE.js";
-import "./chunk-3J5I7ZOU.js";
-import "./chunk-GIFMBCTW.js";
-import "./chunk-MD7KUEJ3.js";
-import "./chunk-Q46QDDMF.js";
-import "./chunk-TGVVUKTG.js";
-import "./chunk-3AQ2R5NL.js";
-import "./chunk-4SLBCEPD.js";
-import "./chunk-64AADMTW.js";
-import "./chunk-JYMIB5XY.js";
-import "./chunk-CPK7QSBG.js";
-import "./chunk-YO2PKTXT.js";
-import "./chunk-TWQRPM76.js";
-import "./chunk-VUVGX5L2.js";
-import "./chunk-XOL3GFW2.js";
-import "./chunk-QHJJMZLX.js";
-import "./chunk-7AB6OWTV.js";
-import "./chunk-PAINMSID.js";
-import "./chunk-ODMBPDDV.js";
+} from "./chunk-2LGRMVCA.js";
+import "./chunk-6ZJ5A7AF.js";
+import "./chunk-X5F3Q5LV.js";
+import "./chunk-VBTP56CE.js";
+import "./chunk-S7FCV7S5.js";
+import "./chunk-OUBGGKDU.js";
+import "./chunk-BPK5P77O.js";
+import "./chunk-EHA7RMZ3.js";
+import "./chunk-WXFLMQSR.js";
+import "./chunk-TYQBFTBR.js";
+import "./chunk-2F4CYZKJ.js";
+import "./chunk-LO6P2VYG.js";
+import "./chunk-BEVTIBRH.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-F3P7N7SF.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   READS_AS_RULE,

package/dist/chunk-6H3Z5JHH.js

@@ -0,0 +1,64 @@
+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 {
+  MatchAnswer,
+  checkMatchAnswer,
+  connectMatchCommand,
+  matchBrief,
+  matchDone,
+  matchFilesOf,
+  matchLines,
+  quotesOf,
+  readMatch,
+  runMatch
+} from "./chunk-E3ISYXO3.js";
+import "./chunk-2LGRMVCA.js";
+import "./chunk-VCTWPLAO.js";
+import "./chunk-C3RY6KU6.js";
+import "./chunk-6ZJ5A7AF.js";
+import "./chunk-X5F3Q5LV.js";
+import "./chunk-VBTP56CE.js";
+import "./chunk-S7FCV7S5.js";
+import "./chunk-OUBGGKDU.js";
+import "./chunk-BPK5P77O.js";
+import "./chunk-EHA7RMZ3.js";
+import "./chunk-WXFLMQSR.js";
+import "./chunk-TYQBFTBR.js";
+import "./chunk-2F4CYZKJ.js";
+import "./chunk-LO6P2VYG.js";
+import "./chunk-ISUAAMGS.js";
+import "./chunk-BEVTIBRH.js";
+import "./chunk-S4PMJU6H.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-F3P7N7SF.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  MatchAnswer,
+  checkMatchAnswer,
+  connectMatchCommand,
+  matchBrief,
+  matchDone,
+  matchFilesOf,
+  matchLines,
+  quotesOf,
+  readMatch,
+  runMatch
+};

package/dist/{chunk-Y6K3CJBU.js → chunk-6MUGR4LS.js}

@@ -6,7 +6,7 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   slug,
   writeGateRound
-} from "./chunk-EZIN5E5B.js";
+} from "./chunk-BTGPE6CR.js";
 import {
   catchUpChangeBranch,
   changeWorktree,
@@ -14,11 +14,9 @@ import {
   loadTask,
   openTaskWorktree,
   readChangeTasks,
-  setTaskDone
-} from "./chunk-YWAKDNMH.js";
-import {
-  buildEngineFor
-} from "./chunk-3AQ2R5NL.js";
+  setTaskDone,
+  taskBranchOwnCommits
+} from "./chunk-UGUP3ZM6.js";
 import {
   conform,
   readConformDeltas,
@@ -26,38 +24,42 @@ import {
   renderTaskContext,
   taskContext,
   withBuildLine
-} from "./chunk-BEPCKDCP.js";
+} from "./chunk-R7NYHMUU.js";
+import {
+  buildEngineFor
+} from "./chunk-BEVTIBRH.js";
 import {
   readChangeFiles,
   readRound,
   readStoryIndex,
   roundsOf,
   writeQuarantineItems
-} from "./chunk-K332XW7K.js";
+} from "./chunk-S4PMJU6H.js";
 import {
   changeFolder,
   changeStore
-} from "./chunk-HSZMPH5T.js";
+} from "./chunk-IDKCWSM5.js";
 import {
+  AdapterError,
   createAdapters,
   fileStepStore,
   requireApproval
-} from "./chunk-4KNOJC6J.js";
+} from "./chunk-7IGKHZ4Z.js";
 import {
   scanEstate
-} from "./chunk-4SLBCEPD.js";
+} from "./chunk-J2JAKCIW.js";
 import {
   baseClonePath,
   createGit,
   toRepoRelative
-} from "./chunk-XOL3GFW2.js";
+} from "./chunk-PKBHS4AA.js";
 import {
   HandoffRuntime,
   buildContextPack,
   createRuntime,
   quarantineItems,
   toRunSummary
-} from "./chunk-QHJJMZLX.js";
+} from "./chunk-P32RUW3B.js";
 import {
   AgentDefinition,
   ChecklistPack,
@@ -71,18 +73,20 @@ import {
   changesRelOf,
   external_exports,
   readRepoSpec,
-  require_dist,
   runsDirOf,
   runsRelOf,
   stateDirOf,
   taskBranch,
   toCanonicalYaml
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
 import {
   LockHeldError,
   acquireLock,
   writeFileAtomic
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -564,7 +568,9 @@ ${s.body.trim()}`,
       id: "task-context",
       kind: "artifact",
       origin: `atticus task context ${t.change.id} ${t.task.id}`,
-      text: renderTaskContext(context).replace(/\r\n/g, "\n"),
+      // The pack wraps and screens the whole file as one source, so its parts aren't fenced
+      // again inside it (review round 47).
+      text: renderTaskContext(context, { fence: false }).replace(/\r\n/g, "\n"),
       classification: "internal",
       priority: 35
     });
@@ -1112,6 +1118,12 @@ async function commit(c, runId) {
   await c.git(["add", "-A", "--", "."], c.worktree);
   const staged = (await c.git(["diff", "--cached", "--name-only"], c.worktree)).stdout.trim();
   if (!staged) {
+    const own = await ownTaskCommit(c);
+    if (own) {
+      c.record.commit = own;
+      c.record.notes.push(`Nothing new to commit: ${c.record.branch} already has this task's commit ${own.slice(0, 12)}, ahead of ${changeBranch(c.t.change.id)}, so it is the one built and raised.`);
+      return true;
+    }
     c.record.state = "needs-person";
     c.record.notes.push(`The AI's answer changed nothing in ${c.record.branch}, so there is nothing to commit: run the task again, or do it by hand in ${c.record.worktree}.`);
     return false;
@@ -1130,9 +1142,20 @@ Requested-By: ${c.record.by}`
   c.record.commit = (await c.git(["rev-parse", "HEAD"], c.worktree)).stdout.trim();
   return true;
 }
+async function ownTaskCommit(c) {
+  const base = changeBranch(c.t.change.id);
+  const log = await c.git(["log", "--format=%B%x00", `refs/heads/${base}..HEAD`], c.worktree).catch(() => ({ stdout: "" }));
+  const mine = log.stdout.split("\0").some((m) => {
+    const lines = m.split("\n").map((l) => l.trim());
+    return lines.includes(`Atticus-Change: ${c.t.change.id}`) && lines.includes(`Atticus-Task: ${c.t.task.id}`);
+  });
+  if (!mine)
+    return void 0;
+  return (await c.git(["rev-parse", "HEAD"], c.worktree)).stdout.trim() || void 0;
+}
 async function openPr(c) {
   if (c.record.state !== "built") {
-    c.record.notes.push(c.record.state === "unverified" ? "No PR: a pull request needs a passing build, and this repo has no build command." : "No PR: the build doesn't pass.");
+    c.record.notes.push(c.record.state === "unverified" ? `No PR: a pull request needs a passing build, and ${c.t.repo.id} has no build command: set a build command for ${c.t.repo.id} (build: under its entry in repos.manifest.yaml), then run task ${c.t.task.id} again.` : "No PR: the build doesn't pass.");
     if (c.record.state === "unverified")
       c.record.state = "needs-person";
     return;
@@ -1182,6 +1205,15 @@ async function openPr(c) {
   } catch (e) {
     if (e instanceof TaskRunError)
       throw e;
+    if (e instanceof AdapterError && e.code === "conflict") {
+      const open = (await c.gitHost.listPullRequests(c.t.repo.id, { head: c.record.branch }).catch(() => [])).filter((p) => p.base === base && (p.state === "open" || p.state === "draft")).at(0);
+      if (open) {
+        c.record.pr = { number: open.number, url: open.url };
+        c.record.state = "pr-open";
+        c.record.notes.push(`PR #${open.number} from ${c.record.branch} into ${base} was already open on the Git host; recorded it (${open.url}).`);
+        return;
+      }
+    }
     c.record.notes.push(`${PR_NOT_RAISED} ${(e instanceof Error ? e.message : String(e)).replace(/\.?$/, ".")} The build still passes: fix that and raise the task's PR again (Raise the task's PR on the Task board), or push ${c.record.branch} and open its PR into ${base} yourself.`);
   }
 }
@@ -1251,7 +1283,7 @@ async function ownTaskPr(host, r, held) {
     return own;
   throw new TaskRunError("refused", `PR #${held.number} on the Git host is from ${pr.head}, not ${r.branch}, and no PR from ${r.branch} was found`);
 }
-async function refuseIfHeld(root, t, host) {
+async function refuseIfHeld(root, t, host, git) {
   const before = await readTaskRun(root, t.change.id, t.task.id);
   if (before?.state === "pr-open") {
     let state;
@@ -1265,14 +1297,23 @@ async function refuseIfHeld(root, t, host) {
     } catch (e) {
       why = e instanceof Error ? e.message : String(e);
     }
-    if (before.pr && (state === "merged" || state === "closed"))
-      return [`Its earlier PR ${before.pr.url} is ${state}.`];
+    if (before.pr && (state === "merged" || state === "closed")) {
+      const own = await taskBranchOwnCommits(root, t.change.id, t.task.id, t.repo.id, git);
+      if (own > 0) {
+        const branch = taskBranch(t.change.id, t.task.id);
+        const from = changeBranch(t.change.id);
+        const clone = baseClonePath(root, t.repo.id);
+        const carried = state === "closed" ? "the commits that PR carried" : "commits the change branch hasn't (a squash or rebase merge took them in another form)";
+        throw new TaskRunError("refused", `Task ${t.task.id}'s earlier PR ${before.pr.url} is ${state}, and its branch ${branch} still has ${carried} (${own} not in ${from}): running the task again would raise them again. Atticus doesn't delete or rewrite them. To start the task afresh, remove its worktree and branch here (git -C ${clone} worktree remove ${join5(root, before.worktree)}, then git -C ${clone} branch -D ${branch}) and delete ${branch} on the Git host, then run the task again; or ask whoever looks after the workspace for a fresh start.`);
+      }
+      return { notes: [`Its earlier PR ${before.pr.url} is ${state}.`], settled: true };
+    }
     throw new TaskRunError("refused", `Task ${t.task.id}'s PR is open (${before.pr?.url ?? "see its run"}): running the task again would start over beside it. Merge or close the PR first, then run the task again.${why ? ` (Atticus couldn't ask the Git host whether it still is: ${why}.)` : ""}`);
   }
   const open = ["prepared", "waiting", "produced", "failed"];
   if (before?.state === "waiting" && before.waiting && open.includes(await handoffRunState(root, t.change.id, before.waiting) ?? ""))
     throw new TaskRunError("refused", `Task ${t.task.id} already waits on your assistant (run ${before.waiting}, in ${before.worktree}): finish it with Done on its run page (Model runs) or atticus handoff done ${before.waiting}, or Cancel it there and run the task again.`);
-  return [];
+  return { notes: [] };
 }
 async function taskPrState(root, changeId, taskId, o = {}) {
   const r = await readTaskRun(root, changeId, taskId).catch(() => void 0);
@@ -1347,7 +1388,7 @@ function gitHostConnected(root, t, given) {
 async function previewTaskRun(root, changeId, taskId, o = {}) {
   const t = await loadTask(root, changeId, taskId);
   const level = levelOf(t, o.level);
-  await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t));
+  await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t), createGit());
   return {
     change: t.change.id,
     task: t.task.id,
@@ -1413,7 +1454,7 @@ async function runTaskHeld(root, changeId, taskId, o) {
   let t = await loadTask(root, changeId, taskId);
   const rt = t.ctx.orgPack.runtime;
   const level = levelOf(t, o.level);
-  const earlier = await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t));
+  const earlier = await refuseIfHeld(root, t, () => o.gitHost ?? gitHostOf(root, t), git);
   if (level === "pr") {
     try {
       requireApproval("git-host", o.approval);
@@ -1424,9 +1465,9 @@ async function runTaskHeld(root, changeId, taskId, o) {
   const engine = buildEngineFor(t.ctx.orgPack, t.repo.id);
   const changeDir = await changeWorktree(root, t.change.id, t.repo.id);
   const handed = engine === "speckit" ? `specs/${t.task.id}/plan.md` : `.atticus/tasks/${t.task.id}.md`;
-  const notes = [...earlier];
+  const notes = [...earlier.notes];
   try {
-    const caught = await catchUpChangeBranch(root, t.change.id, t.task.id, t.repo.id, changeDir, git);
+    const caught = await catchUpChangeBranch(root, t.change.id, t.task.id, t.repo.id, changeDir, git, earlier.settled ? { settled: true } : {});
     if (caught)
       notes.push(caught);
   } catch (e) {
@@ -1439,7 +1480,14 @@ async function runTaskHeld(root, changeId, taskId, o) {
     notes.push(`Handed the task down first (${h.feature} in ${h.repo}${h.commit ? `, commit ${h.commit.slice(0, 12)}` : ""}).`);
     t = await loadTask(root, changeId, taskId);
   }
-  const wt = await openTaskWorktree(root, t.change.id, t.task.id, t.repo.id, git);
+  let wt;
+  try {
+    wt = await openTaskWorktree(root, t.change.id, t.task.id, t.repo.id, git, earlier.settled ? { fresh: true } : {});
+  } catch (e) {
+    if (e instanceof Error && e.name === "SpecKitError")
+      throw new TaskRunError("refused", e.message);
+    throw e;
+  }
   const runtime = o.runtime ?? await createRuntime(t.ctx.orgPack, {
     root,
     ...o.mode ? { mode: o.mode } : {},

package/dist/{chunk-DDJPM5YX.js → chunk-6OJQOPUN.js}

@@ -7,7 +7,7 @@ import {
   checkResult,
   fileStepStore,
   recordStep
-} from "./chunk-4KNOJC6J.js";
+} from "./chunk-7IGKHZ4Z.js";
 import {
   ExecutorsFile,
   IdempotencyAnswer,
@@ -18,9 +18,11 @@ import {
   external_exports,
   loadOrgPack,
   orgPackDirOf,
-  require_dist,
   secretKeys
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/{chunk-2V2ZPQQU.js → chunk-6PPOWY5E.js}

@@ -5,17 +5,17 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   changeStore
-} from "./chunk-HSZMPH5T.js";
+} from "./chunk-IDKCWSM5.js";
 import {
   ManualNotifier,
   fileStepStore
-} from "./chunk-4KNOJC6J.js";
+} from "./chunk-7IGKHZ4Z.js";
 import {
   readCatalog
-} from "./chunk-4SLBCEPD.js";
+} from "./chunk-J2JAKCIW.js";
 import {
   readServiceRequestExports
-} from "./chunk-CPK7QSBG.js";
+} from "./chunk-QKUJMING.js";
 import {
   Initiative,
   IsoDate,
@@ -28,15 +28,17 @@ import {
   orgPackDirOf,
   parseRecord,
   recordPath,
-  require_dist,
   serializeRecord,
   stateDirOf,
   toCanonicalYaml
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
 import {
   SCHEMA_VERSION,
   renameRetrying
-} from "./chunk-ODMBPDDV.js";
+} from "./chunk-TUULXQRW.js";
+import {
+  require_dist
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/{chunk-YO2PKTXT.js → chunk-6ZGLAACW.js}

@@ -5,14 +5,16 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   parseXml
-} from "./chunk-TWQRPM76.js";
+} from "./chunk-CQDGOPGH.js";
 import {
   JOINED_BY_PERSON,
   ZipError,
   peekZip,
-  readZip,
+  readZip
+} from "./chunk-Q2TECDIT.js";
+import {
   require_dist
-} from "./chunk-PAINMSID.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/{chunk-LIJJCBQI.js → chunk-6ZJ5A7AF.js}

@@ -5,24 +5,25 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   repoReaderAgent
-} from "./chunk-26Z7OGQW.js";
+} from "./chunk-X5F3Q5LV.js";
 import {
   ASSISTANT_FORMATS,
   FINISH,
   GUARD,
   metarepoCommands
-} from "./chunk-3AQ2R5NL.js";
+} from "./chunk-BEVTIBRH.js";
 import {
   VERSION
-} from "./chunk-VUVGX5L2.js";
+} from "./chunk-F3P7N7SF.js";
 import {
   AcpSignInError,
   atticusExec,
+  claimRunDir,
   keepAcpRun,
   makeRunId,
   readRootsOf,
   runAcpSession
-} from "./chunk-QHJJMZLX.js";
+} from "./chunk-P32RUW3B.js";
 import {
   copilotAcpOf,
   factsDirOf,
@@ -31,7 +32,7 @@ import {
   proposalsDirOf,
   proposalsRelOf,
   runsDirOf
-} from "./chunk-PAINMSID.js";
+} from "./chunk-Q2TECDIT.js";
 
 // packages/cli/dist/copilot-acp-steps.js
 import { readFile } from "node:fs/promises";
@@ -79,7 +80,7 @@ async function acpStepRunner(root, o = {}) {
   const exec = o.exec ?? atticusExec(process.argv[1] ?? "atticus");
   return async (s) => {
     const started = o.now?.() ?? /* @__PURE__ */ new Date();
-    const runId = makeRunId(started);
+    const runId = await claimRunDir(join(runsDirOf(root), s.change), () => makeRunId(started));
     const prompt = UNATTENDED + await expandSlashLine(root, s.line, { unattended: true });
     let result;
     let error;
@@ -124,15 +125,9 @@ async function acpStepRunner(root, o = {}) {
 var readWrites = (root) => [factsDirOf(root)];
 async function startProposeHandoff(root, o = {}) {
   const line = `/atticus-propose${o.id ? ` ${o.id}` : ""}`;
-  const { finishDecideRun, openDecideRun, PROPOSE_CHANGE, sha256, startDecideRun } = await import("./chunk-EFCQSMXB.js");
-  const { proposalsSnapshot } = await import("./chunk-LU4MQVAL.js");
-  const was = await openDecideRun(root, PROPOSE_CHANGE);
-  if (was)
-    await finishDecideRun(root, was, {
-      state: "failed",
-      errors: ["A new hand-off of /atticus-propose was started: its Done reads these proposals."],
-      ...o.now ? { now: o.now } : {}
-    });
+  const { cancelOpenDecideRuns, PROPOSE_CHANGE, sha256, startDecideRun } = await import("./chunk-EBL2R3YG.js");
+  const { proposalsSnapshot } = await import("./chunk-Q4K5WB2W.js");
+  await cancelOpenDecideRuns(root, PROPOSE_CHANGE, "A new hand-off of /atticus-propose was started: its Done reads these proposals.", o.now ? { now: o.now } : {});
   const before = Object.fromEntries([...await proposalsSnapshot(root)].map(([id, text]) => [id, sha256(text)]));
   const prompt = await expandSlashLine(root, line);
   const run = await startDecideRun(root, {
@@ -175,8 +170,12 @@ async function questionsProposeCommand(root, o, io, check) {
     return 2;
   }
   const run = o.runner ?? await acpStepRunner(root, { op });
+  {
+    const { cancelOpenDecideRuns, PROPOSE_CHANGE } = await import("./chunk-EBL2R3YG.js");
+    await cancelOpenDecideRuns(root, PROPOSE_CHANGE, "A Copilot session was started for /atticus-propose: Atticus reads its proposals itself.", o.now ? { now: o.now } : {});
+  }
   io.out(`Proposing answers in a new Copilot session: ${line}`);
-  const { decideAnswers, proposalsSnapshot } = await import("./chunk-LU4MQVAL.js");
+  const { decideAnswers, proposalsSnapshot } = await import("./chunk-Q4K5WB2W.js");
   const before = await proposalsSnapshot(root);
   let runId;
   try {