@jpcasabiancai/cayenne 0.5.3 → 0.5.5

package/dist/cli.js

@@ -2261,7 +2261,7 @@ var init_registry2 = __esm({
     UNCLAIMED_PROFILE = "(unclaimed)";
     IDENTITY_ATTEMPTS = 4;
     IDENTITY_RETRY_MS = 500;
-    wait = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
+    wait = (ms) => new Promise((resolve6) => setTimeout(resolve6, ms));
     CAPABILITIES_REFRESH_MS = 5 * 6e4;
   }
 });
@@ -2626,10 +2626,10 @@ var init_version = __esm({
 
 // src/exec-path.ts
 import { accessSync, constants, statSync as statSync3 } from "fs";
-import { delimiter, isAbsolute as isAbsolute4, join as join8 } from "path";
+import { delimiter, isAbsolute as isAbsolute5, join as join8 } from "path";
 function findOnPath(name, path) {
   for (const dir of (path ?? "").split(delimiter)) {
-    if (!isAbsolute4(dir)) continue;
+    if (!isAbsolute5(dir)) continue;
     const candidate = join8(dir, name);
     try {
       if (!statSync3(candidate).isFile()) continue;
@@ -2698,8 +2698,8 @@ var init_rpc = __esm({
       request(method, params) {
         if (this.closed) return Promise.reject(new Error("PROVIDER_ERROR: codex app-server closed"));
         const id = this.nextId++;
-        return new Promise((resolve5, reject) => {
-          this.pending.set(id, { resolve: resolve5, reject });
+        return new Promise((resolve6, reject) => {
+          this.pending.set(id, { resolve: resolve6, reject });
           this.write({ id, method, params });
         });
       }
@@ -3498,8 +3498,8 @@ var init_source = __esm({
 });
 
 // src/paths.ts
-import { lstatSync, realpathSync as realpathSync4 } from "fs";
-import { dirname as dirname3, isAbsolute as isAbsolute5, join as join9, relative, sep } from "path";
+import { lstatSync, realpathSync as realpathSync5 } from "fs";
+import { dirname as dirname3, isAbsolute as isAbsolute6, join as join9, relative as relative2, sep as sep2 } from "path";
 function assertInsideRoots(target, roots) {
   return resolveInsideRoots(target, roots).real;
 }
@@ -3507,7 +3507,7 @@ function resolveInsideRoots(target, roots) {
   assertRoots(roots);
   let real;
   try {
-    real = realpathSync4.native(target);
+    real = realpathSync5.native(target);
   } catch {
     throw new Error(`ROOT_NOT_ALLOWED: ${target} does not exist`);
   }
@@ -3517,7 +3517,7 @@ function resolveInsideRoots(target, roots) {
 }
 function assertInsideRootsOrAncestor(target, roots) {
   assertRoots(roots);
-  const absolute = isAbsolute5(target) ? target : `${process.cwd()}${sep}${target}`;
+  const absolute = isAbsolute6(target) ? target : `${process.cwd()}${sep2}${target}`;
   let walked = walk(target, absolute);
   if (walked.tail.includes("..")) walked = walk(target, join9(walked.real, ...walked.tail));
   const checked = walked.tail.length === 0 ? walked.real : join9(walked.real, ...walked.tail);
@@ -3529,9 +3529,9 @@ function isPlainToolPath(value) {
   return !value.split(/[/\\]/).includes("..");
 }
 function walk(target, absolute) {
-  let real = sep;
+  let real = sep2;
   const tail = [];
-  for (const segment of absolute.split(sep)) {
+  for (const segment of absolute.split(sep2)) {
     if (segment === "" || segment === ".") continue;
     if (tail.length > 0) {
       tail.push(segment);
@@ -3543,7 +3543,7 @@ function walk(target, absolute) {
       continue;
     }
     try {
-      real = realpathSync4.native(next);
+      real = realpathSync5.native(next);
     } catch {
       throw new Error(`ROOT_NOT_ALLOWED: ${target} does not exist`);
     }
@@ -3565,12 +3565,12 @@ function matchRoot(candidate, roots) {
   for (const root of roots) {
     let rootReal;
     try {
-      rootReal = realpathSync4.native(root);
+      rootReal = realpathSync5.native(root);
     } catch {
       continue;
     }
-    const rel = relative(rootReal, candidate);
-    const inside4 = rel === "" || !rel.startsWith("..") && !isAbsolute5(rel);
+    const rel = relative2(rootReal, candidate);
+    const inside4 = rel === "" || !rel.startsWith("..") && !isAbsolute6(rel);
     if (inside4 && (match === null || rootReal.length < match.length)) match = rootReal;
   }
   return match;
@@ -3585,8 +3585,8 @@ var init_paths = __esm({
 
 // src/git/introspect.ts
 import { execFile as execFile3 } from "child_process";
-import { readFileSync as readFileSync4, realpathSync as realpathSync5 } from "fs";
-import { delimiter as delimiter2, dirname as dirname4, isAbsolute as isAbsolute6, join as join10, resolve } from "path";
+import { readFileSync as readFileSync4, realpathSync as realpathSync6 } from "fs";
+import { delimiter as delimiter2, dirname as dirname4, isAbsolute as isAbsolute7, join as join10, resolve as resolve2 } from "path";
 import { promisify as promisify2 } from "util";
 function parseGitHubRemote(url) {
   const trimmed = url.trim();
@@ -3658,7 +3658,7 @@ function makeGitRun(opts) {
 }
 function canonical(path, cwd) {
   try {
-    return realpathSync5.native(resolve(cwd, path));
+    return realpathSync6.native(resolve2(cwd, path));
   } catch {
     return null;
   }
@@ -3702,7 +3702,7 @@ async function introspectRepo(cwd, run, root, { names = true } = {}) {
     const head = names ? await line(["rev-parse", "--abbrev-ref", "HEAD"]) : null;
     const branch = head === "HEAD" ? null : head;
     const dirs = (await line(["rev-parse", "--path-format=absolute", "--git-dir", "--git-common-dir"]))?.split("\n").map((d) => d.trim());
-    const [gitDir, commonDir] = dirs?.length === 2 && dirs.every((d) => isAbsolute6(d)) ? dirs.map((d) => canonical(d, cwd)) : [null, null];
+    const [gitDir, commonDir] = dirs?.length === 2 && dirs.every((d) => isAbsolute7(d)) ? dirs.map((d) => canonical(d, cwd)) : [null, null];
     if (commonDir == null || gitDir == null) return { ...NONE };
     if (!insideRoot(commonDir, root) && !isLinkedWorktree(gitDir, commonDir, repoRoot)) {
       return { ...NONE };
@@ -3782,9 +3782,9 @@ var init_introspect = __esm({
 // src/repos/credentials.ts
 import { chmodSync as chmodSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync5, rmSync as rmSync3, writeFileSync as writeFileSync4 } from "fs";
 import { devNull, homedir as homedir4 } from "os";
-import { delimiter as delimiter3, isAbsolute as isAbsolute7, join as join11 } from "path";
+import { delimiter as delimiter3, isAbsolute as isAbsolute8, join as join11 } from "path";
 function gitWrapper(git, gitHome) {
-  if (git === null || !isAbsolute7(git)) {
+  if (git === null || !isAbsolute8(git)) {
     return `#!/bin/sh
 printf '%s\\n' ${shellQuote(GIT_NOT_FOUND_TEXT)} >&2
 exit 127
@@ -3967,8 +3967,8 @@ exit 1
 });
 
 // src/git/commands.ts
-import { lstatSync as lstatSync2, realpathSync as realpathSync6, statSync as statSync4 } from "fs";
-import { dirname as dirname5, isAbsolute as isAbsolute8, join as join12, relative as relative2, resolve as resolve2, sep as sep2 } from "path";
+import { lstatSync as lstatSync2, realpathSync as realpathSync7, statSync as statSync4 } from "fs";
+import { dirname as dirname5, isAbsolute as isAbsolute9, join as join12, relative as relative3, resolve as resolve3, sep as sep3 } from "path";
 async function scopeRepo(cwd, run, root) {
   const identity = await introspectRepo(cwd, run, root, { names: false });
   if (identity.repo_root === null) {
@@ -4126,9 +4126,9 @@ async function gitDirs(scope, run) {
   );
   if (r.code !== 0) return null;
   const lines = r.stdout.split("\n").filter((l) => l !== "");
-  if (lines.length === 0 || !lines.every((l) => isAbsolute8(l))) return null;
+  if (lines.length === 0 || !lines.every((l) => isAbsolute9(l))) return null;
   try {
-    return lines.map((l) => realpathSync6.native(l));
+    return lines.map((l) => realpathSync7.native(l));
   } catch {
     return null;
   }
@@ -4150,9 +4150,9 @@ function isGitDirShape(dir) {
 function enclosesHome(repoRoot, home) {
   let real;
   try {
-    real = realpathSync6.native(home);
+    real = realpathSync7.native(home);
   } catch {
-    real = resolve2(home);
+    real = resolve3(home);
   }
   if (within(real, repoRoot)) return true;
   let root;
@@ -4206,7 +4206,7 @@ function identities(paths) {
   const out = [];
   for (const path of paths) {
     try {
-      const real = realpathSync6.native(path);
+      const real = realpathSync7.native(path);
       const st = statSync4(real, { bigint: true });
       out.push({ real, dev: st.dev, ino: st.ino });
     } catch {
@@ -4228,7 +4228,7 @@ async function gitDiff(scope, run, opts, guard = {}) {
     const named = join12(scope.repoRoot, opts.path);
     let resolved = null;
     try {
-      resolved = realpathSync6.native(named);
+      resolved = realpathSync7.native(named);
     } catch {
     }
     if (isProtected(named) || resolved !== null && isProtected(resolved)) {
@@ -4271,7 +4271,7 @@ async function gitDiff(scope, run, opts, guard = {}) {
       throw new Error(`ROOT_NOT_ALLOWED: ${opts.path}`);
     }
     const dirs = await gitDirs(scope, run);
-    const relPath = relative2(scope.repoRoot, real);
+    const relPath = relative3(scope.repoRoot, real);
     if (dirs === null || dirs.some((d) => within(real, d)) || namesGitDir(relPath) || insideOtherGitDir(real, scope.repoRoot) || isProtected(real)) {
       throw new Error(`ROOT_NOT_ALLOWED: ${opts.path}`);
     }
@@ -4355,7 +4355,7 @@ var init_commands = __esm({
     failed = (what, stderr) => new Error(`GIT_ERROR: ${what}: ${(stderr ?? "").trim() || "git exited non-zero"}`);
     UNQUOTED_PATHS = ["-c", "core.quotePath=false"];
     namesGitDir = (path) => path.split(/[\\/]/).some((segment) => segment.toLowerCase() === ".git");
-    within = (candidate, dir) => candidate === dir || candidate.startsWith(dir.endsWith(sep2) ? dir : `${dir}${sep2}`);
+    within = (candidate, dir) => candidate === dir || candidate.startsWith(dir.endsWith(sep3) ? dir : `${dir}${sep3}`);
   }
 });
 
@@ -4368,12 +4368,12 @@ import {
   mkdirSync as mkdirSync5,
   openSync,
   readFileSync as readFileSync6,
-  realpathSync as realpathSync7,
+  realpathSync as realpathSync8,
   statSync as statSync5,
   writeSync
 } from "fs";
 import { readdir } from "fs/promises";
-import { dirname as dirname6, isAbsolute as isAbsolute9, join as join13, relative as relative3, sep as sep3 } from "path";
+import { dirname as dirname6, isAbsolute as isAbsolute10, join as join13, relative as relative4, sep as sep4 } from "path";
 import { setImmediate } from "timers/promises";
 function worktreePathFor(repoRoot, name) {
   return join13(repoRoot, WORKTREES_DIR, name);
@@ -4385,7 +4385,7 @@ async function listedWorktrees(scope, run) {
   for (const line of r.stdout.split("\n")) {
     if (!line.startsWith("worktree ")) continue;
     try {
-      out.add(realpathSync7.native(line.slice("worktree ".length)));
+      out.add(realpathSync8.native(line.slice("worktree ".length)));
     } catch {
     }
   }
@@ -4398,7 +4398,7 @@ async function excludeCayenneDir(scope, run) {
     scope.ceiling
   );
   const common = r.stdout.trim();
-  if (r.code !== 0 || !isAbsolute9(common)) return;
+  if (r.code !== 0 || !isAbsolute10(common)) return;
   const dotGit = join13(scope.repoRoot, ".git");
   let dotGitIsRealDir;
   try {
@@ -4410,8 +4410,8 @@ async function excludeCayenneDir(scope, run) {
   let commonReal;
   let dotGitReal;
   try {
-    commonReal = realpathSync7.native(common);
-    dotGitReal = realpathSync7.native(dotGit);
+    commonReal = realpathSync8.native(common);
+    dotGitReal = realpathSync8.native(dotGit);
   } catch {
     return;
   }
@@ -4482,7 +4482,7 @@ async function createWorktree(scope, run, name, base) {
       throw new Error(`ROOT_NOT_ALLOWED: ${path}`);
     }
     const listed = await listedWorktrees(scope, run);
-    if (listed.has(realpathSync7.native(path))) {
+    if (listed.has(realpathSync8.native(path))) {
       return { worktreePath: path, branch: name, reused: true };
     }
     throw new Error(`VALIDATION: ${path} exists and is not a worktree of this repository`);
@@ -4546,9 +4546,9 @@ async function worktreeIdentity(scope, run) {
     scope.ceiling
   );
   const gitDir = r.stdout.trim();
-  if (r.code !== 0 || !isAbsolute9(gitDir)) throw failed2("git rev-parse --git-dir", r.stderr);
+  if (r.code !== 0 || !isAbsolute10(gitDir)) throw failed2("git rev-parse --git-dir", r.stderr);
   try {
-    const st = statSync5(realpathSync7.native(gitDir), { bigint: true });
+    const st = statSync5(realpathSync8.native(gitDir), { bigint: true });
     return {
       gitDirDev: st.dev.toString(),
       gitDirIno: st.ino.toString(),
@@ -4562,7 +4562,7 @@ async function removeWorktree(scope, run, worktreePath, force) {
   const worktreesDir = join13(scope.repoRoot, WORKTREES_DIR);
   let base;
   try {
-    base = realpathSync7.native(worktreesDir);
+    base = realpathSync8.native(worktreesDir);
   } catch {
     throw new Error(`VALIDATION: ${worktreesDir} does not exist`);
   }
@@ -4573,7 +4573,7 @@ async function removeWorktree(scope, run, worktreePath, force) {
   }
   let real;
   try {
-    real = realpathSync7.native(worktreePath);
+    real = realpathSync8.native(worktreePath);
   } catch {
     throw new Error(`VALIDATION: ${worktreePath} does not exist`);
   }
@@ -4582,11 +4582,11 @@ async function removeWorktree(scope, run, worktreePath, force) {
   } catch {
     throw new Error(`ROOT_NOT_ALLOWED: ${real}`);
   }
-  const rel = relative3(base, real);
-  if (rel === "" || rel.startsWith("..") || isAbsolute9(rel) || rel.includes("/")) {
+  const rel = relative4(base, real);
+  if (rel === "" || rel.startsWith("..") || isAbsolute10(rel) || rel.includes("/")) {
     throw new Error(`VALIDATION: ${worktreePath} is not under ${base}`);
   }
-  const inside4 = `${real}${sep3}`;
+  const inside4 = `${real}${sep4}`;
   for (const listed of await listedWorktrees(scope, run)) {
     if (listed.startsWith(inside4)) {
       throw new Error(`VALIDATION: ${real} contains another worktree`);
@@ -4619,7 +4619,7 @@ var init_worktree = __esm({
 });
 
 // src/git/ops.ts
-import { sep as sep4 } from "path";
+import { sep as sep5 } from "path";
 function managedGitRuns(gitHome) {
   const env = gitCredentialEnv(null, "", { home: gitHome });
   return {
@@ -4658,7 +4658,7 @@ var init_ops = __esm({
     init_commands();
     init_introspect();
     init_worktree();
-    isAtOrBelow = (path, dir) => path === dir || path.startsWith(dir.endsWith(sep4) ? dir : `${dir}${sep4}`);
+    isAtOrBelow = (path, dir) => path === dir || path.startsWith(dir.endsWith(sep5) ? dir : `${dir}${sep5}`);
   }
 });
 
@@ -4773,11 +4773,11 @@ var init_session_worktrees = __esm({
 
 // src/git/watch.ts
 import { watch } from "fs";
-import { isAbsolute as isAbsolute10, normalize, sep as sep5 } from "path";
+import { isAbsolute as isAbsolute11, normalize, sep as sep6 } from "path";
 function ignored(name) {
   if (name === null || name === "") return false;
   const rel = normalize(name);
-  if (isAbsolute10(rel) || rel === ".." || rel.startsWith(`..${sep5}`)) return true;
+  if (isAbsolute11(rel) || rel === ".." || rel.startsWith(`..${sep6}`)) return true;
   return rel.split(/[\\/]/).some((segment) => IGNORED_NAMES.has(segment));
 }
 function watchChanges(cwd, onChange, debounceMs = CHANGES_DEBOUNCE_MS, onError = () => void 0, fsWatch = recursiveWatch) {
@@ -5480,14 +5480,14 @@ Content-Length: 0\r
       return bound;
     },
     listen() {
-      return new Promise((resolve5, reject) => {
+      return new Promise((resolve6, reject) => {
         server.once("error", reject);
         server.listen(port, HOST, () => {
           server.off("error", reject);
           const address = server.address();
           bound = typeof address === "object" && address ? address.port : port;
           log.info({ host: HOST, port: bound }, "local server listening");
-          resolve5(bound);
+          resolve6(bound);
         });
       });
     },
@@ -5517,9 +5517,9 @@ Content-Length: 0\r
       untapTerminals?.();
       untapTerminals = null;
       for (const client of wss.clients) client.close(1001, "runner stopping");
-      return new Promise((resolve5) => {
+      return new Promise((resolve6) => {
         wss.close();
-        server.close(() => resolve5());
+        server.close(() => resolve6());
         server.closeAllConnections();
       });
     }
@@ -5547,7 +5547,7 @@ import {
   openSync as openSync2,
   readdirSync,
   readFileSync as readFileSync8,
-  realpathSync as realpathSync8,
+  realpathSync as realpathSync9,
   renameSync as renameSync3,
   rmSync as rmSync6,
   statSync as statSync6,
@@ -5562,7 +5562,7 @@ function githubRemoteUrl(repo) {
 }
 function createManagedRepos(deps) {
   mkdirSync7(deps.root, { recursive: true, mode: 448 });
-  const root = realpathSync8.native(deps.root);
+  const root = realpathSync9.native(deps.root);
   const remoteUrl = deps.remoteUrl ?? githubRemoteUrl;
   const protocols = deps.allowFileProtocol ? [...HTTPS_ONLY, ...FILE_TOO] : HTTPS_ONLY;
   const cloneTimeoutMs = deps.cloneTimeoutMs ?? CLONE_TIMEOUT_MS;
@@ -5939,8 +5939,8 @@ function keyedMutex() {
       const prev = tails.get(key) ?? Promise.resolve();
       let done = () => {
       };
-      const mine = new Promise((resolve5) => {
-        done = resolve5;
+      const mine = new Promise((resolve6) => {
+        done = resolve6;
       });
       const tail = prev.then(() => mine);
       tails.set(key, tail);
@@ -6022,8 +6022,8 @@ var init_managed = __esm({
 });
 
 // src/repos/sweep.ts
-import { lstatSync as lstatSync5, realpathSync as realpathSync9 } from "fs";
-import { isAbsolute as isAbsolute11, join as join17, relative as relative4, sep as sep6 } from "path";
+import { lstatSync as lstatSync5, realpathSync as realpathSync10 } from "fs";
+import { isAbsolute as isAbsolute12, join as join17, relative as relative5, sep as sep7 } from "path";
 function createRepoWorktreeSweep(deps) {
   const { log } = deps;
   const said3 = /* @__PURE__ */ new Set();
@@ -6031,8 +6031,8 @@ function createRepoWorktreeSweep(deps) {
   let stopped = false;
   function candidateOf(sessionId) {
     const rec = deps.sessionWorktrees.read(sessionId);
-    if (!rec || rec.runnerId !== deps.runnerId || !isAbsolute11(rec.path)) return null;
-    const parts = relative4(deps.managedRoot, rec.path).split(sep6);
+    if (!rec || rec.runnerId !== deps.runnerId || !isAbsolute12(rec.path)) return null;
+    const parts = relative5(deps.managedRoot, rec.path).split(sep7);
     const [owner, name] = parts;
     if (parts.length !== 5 || owner === void 0 || name === void 0 || !RepositoryRef.shape.owner.safeParse(owner).success || !RepositoryRef.shape.name.safeParse(name).success) {
       return null;
@@ -6077,7 +6077,7 @@ function createRepoWorktreeSweep(deps) {
     const notRecorded = new Error(`VALIDATION: ${c.path} is not the worktree this runner recorded`);
     let real;
     try {
-      real = realpathSync9.native(c.path);
+      real = realpathSync10.native(c.path);
     } catch {
       throw notRecorded;
     }
@@ -6556,8 +6556,8 @@ var init_attachments2 = __esm({
 });
 
 // src/fs/list.ts
-import { readdirSync as readdirSync3, realpathSync as realpathSync10, statSync as statSync7 } from "fs";
-import { join as join19, relative as relative5, sep as sep7 } from "path";
+import { readdirSync as readdirSync3, realpathSync as realpathSync11, statSync as statSync7 } from "fs";
+import { join as join19, relative as relative6, sep as sep8 } from "path";
 function order(a, b) {
   const aDir = a.kind === "dir" ? 0 : 1;
   const bDir = b.kind === "dir" ? 0 : 1;
@@ -6565,12 +6565,12 @@ function order(a, b) {
 }
 function inside(child, root) {
   if (child === root) return true;
-  const rel = relative5(root, child);
-  return rel !== "" && !rel.startsWith("..") && !rel.startsWith(sep7) && !rel.includes(`..${sep7}`);
+  const rel = relative6(root, child);
+  return rel !== "" && !rel.startsWith("..") && !rel.startsWith(sep8) && !rel.includes(`..${sep8}`);
 }
 function symlinkKind(path, root) {
   try {
-    const real = realpathSync10.native(path);
+    const real = realpathSync11.native(path);
     if (!inside(real, root)) return { kind: "file", size: 0 };
     const st = statSync7(real);
     return st.isDirectory() ? { kind: "dir", size: 0 } : { kind: "file", size: st.size };
@@ -6788,7 +6788,7 @@ var init_refusals = __esm({
 });
 
 // src/sessions/handlers.ts
-import { sep as sep8 } from "path";
+import { sep as sep9 } from "path";
 import { ZodError } from "zod";
 function parsePayload(row, kind) {
   try {
@@ -6809,7 +6809,7 @@ function buildHandlers(manager, info) {
   const { git } = info;
   const refuseManaged = (path) => {
     const managed = info.managedRoot;
-    if (path === managed || path.startsWith(managed.endsWith(sep8) ? managed : `${managed}${sep8}`)) {
+    if (path === managed || path.startsWith(managed.endsWith(sep9) ? managed : `${managed}${sep9}`)) {
       throw new Error(
         `ROOT_NOT_ALLOWED: ${path} is inside the managed repositories directory; only repository chats make worktrees there`
       );
@@ -7042,17 +7042,17 @@ var init_broadcast = __esm({
 });
 
 // src/documents/paths.ts
-import { realpathSync as realpathSync11 } from "fs";
-import { isAbsolute as isAbsolute12, join as join20, relative as relative6, sep as sep9 } from "path";
+import { realpathSync as realpathSync12 } from "fs";
+import { isAbsolute as isAbsolute13, join as join20, relative as relative7, sep as sep10 } from "path";
 function contained(dir, candidate) {
-  const rel = relative6(dir, candidate);
-  return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep9}`) && !isAbsolute12(rel);
+  const rel = relative7(dir, candidate);
+  return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep10}`) && !isAbsolute13(rel);
 }
 function resolveDocsDir(cwd, log) {
   const dir = docsDir(cwd);
   let real;
   try {
-    real = realpathSync11.native(dir);
+    real = realpathSync12.native(dir);
   } catch {
     return null;
   }
@@ -7068,7 +7068,7 @@ function resolveDocsDir(cwd, log) {
 function assertInsideDocsDir(dir, candidate) {
   let real;
   try {
-    real = realpathSync11.native(candidate);
+    real = realpathSync12.native(candidate);
   } catch {
     throw new Error(`ROOT_NOT_ALLOWED: ${candidate} cannot be resolved`);
   }
@@ -7733,7 +7733,7 @@ var init_pushable = __esm({
             const value = this.queue.shift();
             if (value !== void 0) return Promise.resolve({ value, done: false });
             if (this.ended) return Promise.resolve({ value: void 0, done: true });
-            return new Promise((resolve5) => this.waiters.push(resolve5));
+            return new Promise((resolve6) => this.waiters.push(resolve6));
           }
         };
       }
@@ -7753,7 +7753,15 @@ async function askGuard(guard, toolName2, input) {
     return GUARD_FAILED;
   }
 }
-var SESSION_FLAG_SETTINGS, GUARD_FAILED, ASK_TOOL_REASON, ClaudeSession;
+function asInterrupted(row) {
+  return {
+    ...row,
+    content: row.content.map(
+      (block) => block.type === "result" ? { ...block, isError: false, text: INTERRUPTED } : block
+    )
+  };
+}
+var SESSION_FLAG_SETTINGS, GUARD_FAILED, ASK_TOOL_REASON, INTERRUPTED, STOPPED_TURN, ClaudeSession;
 var init_session2 = __esm({
   "src/claude/session.ts"() {
     "use strict";
@@ -7768,6 +7776,8 @@ var init_session2 = __esm({
     };
     GUARD_FAILED = "Refused: the runner could not check this tool call.";
     ASK_TOOL_REASON = "This session was started from a task, so every shell command needs the member's approval.";
+    INTERRUPTED = "interrupted";
+    STOPPED_TURN = "error_during_execution after a requested stop: recorded as interrupted";
     ClaudeSession = class extends EventEmitter {
       constructor(opts) {
         super();
@@ -7786,6 +7796,13 @@ var init_session2 = __esm({
       /** `null` until `accountInfo()` answers, and for good when it cannot. */
       authMode = null;
       authAsked = false;
+      /** A prompt is waiting for its turn, or a turn began (`init`), and no result has closed it. */
+      turnOpen = false;
+      /**
+       * `interrupt()` or `stop()` was asked of the open turn. The CLI reports a turn cut short as
+       * `error_during_execution`; with this set, that result is the stop landing, not a failure.
+       */
+      stopAsked = false;
       start() {
         if (this.q) throw new Error("VALIDATION: session already started");
         const queryFn = this.opts.queryFn ?? sdkQuery;
@@ -7869,6 +7886,7 @@ var init_session2 = __esm({
           })),
           { type: "text", text }
         ] : text;
+        this.turnOpen = true;
         this.inbox.push({
           type: "user",
           message: { role: "user", content },
@@ -7885,6 +7903,7 @@ var init_session2 = __esm({
         return true;
       }
       async interrupt() {
+        if (this.turnOpen) this.stopAsked = true;
         await this.q?.interrupt();
       }
       async setPermissionMode(mode) {
@@ -7901,6 +7920,7 @@ var init_session2 = __esm({
         for (const id of [...this.pending.keys()]) {
           this.expire(id, "session stopped");
         }
+        if (this.turnOpen) this.stopAsked = true;
         void this.q?.interrupt().catch(() => void 0);
         const killer = setTimeout(() => this.abort.abort(), 5e3);
         await this.pumping;
@@ -7917,14 +7937,14 @@ var init_session2 = __esm({
         this.respondPermission(id, { behavior: "deny", message, interrupt: false });
       }
       requestPermission(toolName2, input, suggestions, toolUseId, signal) {
-        return new Promise((resolve5) => {
+        return new Promise((resolve6) => {
           const id = randomUUID3();
           const settle2 = (d) => {
             const entry = this.pending.get(id);
             if (!entry) return;
             clearTimeout(entry.timer);
             this.pending.delete(id);
-            resolve5(
+            resolve6(
               d.behavior === "allow" ? {
                 behavior: "allow",
                 updatedInput: d.updatedInput ?? input,
@@ -7955,6 +7975,7 @@ ${this.stderrTail.join("\n")}` : "";
       }
       route(msg) {
         if (msg.type === "system" && msg.subtype === "init") {
+          this.turnOpen = true;
           this.providerSessionId = msg.session_id;
           this.lookUpAuthMode();
           this.emit("init", {
@@ -7974,15 +7995,19 @@ ${this.stderrTail.join("\n")}` : "";
           });
           return;
         }
+        const stopped = msg.type === "result" && this.stopAsked && msg.subtype === "error_during_execution";
+        if (stopped) logger.info({ providerSessionId: this.providerSessionId }, STOPPED_TURN);
         const normalized = normalizeSdkMessage(msg);
-        if (normalized) this.emit("message", normalized);
+        if (normalized) this.emit("message", stopped ? asInterrupted(normalized) : normalized);
         if (msg.type === "result") {
+          this.turnOpen = false;
+          this.stopAsked = false;
           this.emit("result", {
-            isError: msg.is_error,
+            isError: stopped ? false : msg.is_error,
             durationMs: msg.duration_ms,
             numTurns: msg.num_turns,
             totalCostUsd: msg.total_cost_usd,
-            stopReason: msg.stop_reason,
+            stopReason: stopped ? INTERRUPTED : msg.stop_reason,
             authMode: this.authMode
           });
         }
@@ -8136,13 +8161,23 @@ import { randomUUID as randomUUID4 } from "crypto";
 import { EventEmitter as EventEmitter2 } from "events";
 import { chmodSync as chmodSync5, lstatSync as lstatSync7, mkdirSync as mkdirSync8, rmdirSync, rmSync as rmSync8, writeFileSync as writeFileSync6 } from "fs";
 import { dirname as dirname8, join as join22 } from "path";
+function newStop() {
+  let resolve6;
+  let reject;
+  const settled = new Promise((res, rej) => {
+    resolve6 = res;
+    reject = rej;
+  });
+  settled.catch(() => void 0);
+  return { sentAt: null, covered: [], settled, resolve: resolve6, reject };
+}
 function removeFiles(files) {
   for (const file of files) rmSync8(file, { force: true });
 }
 function scrubSecrets(text) {
   return SECRET_PATTERNS.reduce((acc, [pattern, to]) => acc.replace(pattern, to), text);
 }
-var STDERR_TAIL_MAX, SIGKILL_AFTER_MS, SECRET_PATTERNS, APPROVAL_METHODS, CodexSession;
+var STDERR_TAIL_MAX, STOP_WAIT_MS, SIGKILL_AFTER_MS, SECRET_PATTERNS, APPROVAL_METHODS, CodexSession;
 var init_session3 = __esm({
   "src/codex/session.ts"() {
     "use strict";
@@ -8153,6 +8188,7 @@ var init_session3 = __esm({
     init_policy();
     init_rpc();
     STDERR_TAIL_MAX = 2 * 1024;
+    STOP_WAIT_MS = 2e3;
     SIGKILL_AFTER_MS = 5e3;
     SECRET_PATTERNS = [
       [
@@ -8189,11 +8225,8 @@ var init_session3 = __esm({
       sandbox;
       pendingModel;
       pendingEffort;
-      turnId = null;
-      running = false;
+      turn = null;
       queue = [];
-      /** The image files of the turn in flight, removed when it ends. */
-      turnFiles = [];
       approvals = /* @__PURE__ */ new Map();
       streaming = /* @__PURE__ */ new Set();
       stderrTail = [];
@@ -8269,7 +8302,7 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
         if (staged.files.length !== staged.images.length) {
           throw new Error("PROVIDER_ERROR: codex images must be staged before the prompt");
         }
-        this.queue.push({ text, files: [...staged.files] });
+        this.queue.push({ text, files: [...staged.files], stopped: false });
         this.flush();
       }
       /**
@@ -8311,13 +8344,19 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
         }
         return written;
       }
-      /** The turn in flight is over: its images have been read, or never will be. */
-      endTurnFiles() {
-        removeFiles(this.turnFiles);
-        this.turnFiles = [];
+      /**
+       * The turn in flight is over: its images have been read, or never will be, and a Stop asked of
+       * it has nothing left to stop.
+       */
+      endTurn() {
+        const turn = this.turn;
+        if (!turn) return;
+        this.turn = null;
+        removeFiles(turn.files);
+        turn.stop?.resolve();
       }
       removeAllFiles() {
-        this.endTurnFiles();
+        this.endTurn();
         for (const turn of this.queue) {
           removeFiles(turn.files);
           turn.files = [];
@@ -8331,11 +8370,18 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
       }
       /** One turn at a time: Codex has no notion of a second concurrent turn on a thread. */
       flush() {
-        if (this.running || !this.rpc || !this.providerSessionId) return;
+        if (this.turn || !this.rpc || !this.providerSessionId) return;
         const next = this.queue.shift();
         if (next === void 0) return;
-        this.running = true;
-        this.turnFiles = next.files;
+        const turn = {
+          id: null,
+          answered: false,
+          heard: null,
+          started: false,
+          files: next.files,
+          stop: next.stopped ? newStop() : null
+        };
+        this.turn = turn;
         void this.rpc.request("turn/start", {
           threadId: this.providerSessionId,
           // app-server v2 `UserInput`: images as `localImage` paths, then the text.
@@ -8346,11 +8392,9 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
           sandboxPolicy: this.sandbox,
           ...this.pendingModel ? { model: this.pendingModel } : {},
           ...this.pendingEffort ? { effort: this.pendingEffort } : {}
-        }).then((res) => {
-          this.turnId = res.turnId ?? null;
-        }).catch((err) => {
-          this.running = false;
-          this.endTurnFiles();
+        }).then((res) => this.named(turn, res.turn?.id ?? res.turnId)).catch((err) => {
+          if (this.turn !== turn) return;
+          this.endTurn();
           this.emit("result", {
             isError: true,
             durationMs: 0,
@@ -8359,10 +8403,60 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
           });
         });
       }
+      /**
+       * `turn/start` answered, with the turn's id. Should the answer name none, the id is the one
+       * `turn/started` gave or gives. An answer for a turn that has ended names nothing.
+       */
+      named(turn, id) {
+        if (this.turn !== turn) return;
+        turn.answered = true;
+        turn.id = id ?? turn.heard;
+        if (turn.id && turn.heard === turn.id) turn.started = true;
+        this.sendStop(turn);
+      }
+      /**
+       * The app-server runs the turn `id`: `turn/started`, or something that turn produced. If it is
+       * the one in flight, a Stop that was waiting for that goes out now. Another turn's is not: what
+       * the turn before still had to say must not pass for the start of this one, since a stop sent
+       * on it would come too early to stop anything. Before `turn/start` has answered there is no
+       * telling, so the id is kept for the answer to settle.
+       */
+      began(id) {
+        const turn = this.turn;
+        if (!turn) return;
+        if (id && !turn.id) {
+          turn.heard = id;
+          if (!turn.answered) return;
+          turn.id = id;
+        }
+        if (id && id !== turn.id) return;
+        turn.started = true;
+        this.sendStop(turn);
+      }
+      /** Send the turn's Stop, if one was asked, it has not gone out, and the turn can be stopped. */
+      sendStop(turn) {
+        const { stop, id } = turn;
+        if (!stop || stop.sentAt !== null || !id || !turn.started) return;
+        if (!this.rpc || !this.providerSessionId) return;
+        stop.sentAt = Date.now();
+        this.rpc.request("turn/interrupt", { threadId: this.providerSessionId, turnId: id }).then(
+          () => stop.resolve(),
+          (err) => {
+            if (this.turn !== turn) return;
+            for (const queued of stop.covered) queued.stopped = false;
+            if (turn.stop === stop) turn.stop = null;
+            stop.reject(err);
+          }
+        );
+      }
       onNotification(method, params) {
+        const turn = params.turn;
+        if (method.startsWith("item/") && this.turn?.id) {
+          this.began(params.turnId);
+        }
         switch (method) {
           case "turn/started":
-            this.turnId = params.turnId ?? this.turnId;
+            this.began(turn?.id ?? params.turnId);
             return;
           case "item/agentMessage/delta":
             this.delta(params, "text", "delta");
@@ -8385,13 +8479,11 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
           }
           case "turn/completed":
           case "turn/failed": {
-            this.running = false;
-            this.turnId = null;
-            this.endTurnFiles();
-            const status = params.status ?? (method === "turn/failed" ? "failed" : "completed");
+            this.endTurn();
+            const status = turn?.status ?? params.status ?? (method === "turn/failed" ? "failed" : "completed");
             this.emit("result", {
               isError: status === "failed",
-              durationMs: params.durationMs ?? 0,
+              durationMs: turn?.durationMs ?? params.durationMs ?? 0,
               numTurns: 1,
               stopReason: status
             });
@@ -8477,23 +8569,23 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
         if (this.approvals.has(id) || this.resolvers.has(id)) {
           throw new Error(`VALIDATION: approval id ${id} is already held`);
         }
-        return new Promise((resolve5) => {
+        return new Promise((resolve6) => {
           const timer = setTimeout(() => {
             this.approvals.delete(id);
             this.resolvers.delete(id);
             this.questionCounts.delete(id);
             this.emit("permissionTimeout", { id });
-            resolve5(onTimeout);
+            resolve6(onTimeout);
           }, this.opts.permissionTimeoutMs ?? PERMISSION_TIMEOUT_MS);
           this.approvals.set(id, { rpcId: 0, kind, refusal: onTimeout, timer });
-          this.resolvers.set(id, resolve5);
+          this.resolvers.set(id, resolve6);
           this.emit("permission", { id, ...req, suggestions: null });
         });
       }
       respondPermission(id, decision) {
         const entry = this.approvals.get(id);
-        const resolve5 = this.resolvers.get(id);
-        if (!entry || !resolve5) return false;
+        const resolve6 = this.resolvers.get(id);
+        if (!entry || !resolve6) return false;
         let reply;
         if (entry.kind === "question") {
           if (decision.behavior === "deny") reply = "cancel";
@@ -8510,12 +8602,43 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
         this.approvals.delete(id);
         this.resolvers.delete(id);
         this.questionCounts.delete(id);
-        resolve5(reply);
+        resolve6(reply);
         return true;
       }
-      async interrupt() {
-        if (!this.rpc || !this.providerSessionId || !this.turnId) return;
-        await this.rpc.request("turn/interrupt", { threadId: this.providerSessionId, turnId: this.turnId }).catch(() => void 0);
+      /**
+       * Stop every prompt handed over before this call, and none after: the turn in flight, and each
+       * prompt still queued here, which keeps its turn and its result and is stopped as that turn
+       * starts. With nothing in flight or queued there is nothing to stop, and nothing is remembered.
+       *
+       * The app-server can stop a turn only once it has named it and started it, so a Stop asked
+       * before that is kept on the turn and goes out at `turn/started` (before, it was dropped, and
+       * the prompt ran). The promise is the turn in flight's: it resolves when the app-server took the
+       * stop, when the turn ended, or after `STOP_WAIT_MS` without word of either, the stop staying on
+       * the turn; it rejects when the app-server refused it while the turn was still running, in
+       * which case this Stop covers nothing, the queued prompts included.
+       *
+       * `'turn'` is a Stop the manager already asked, sent again for the turn in flight: the queue is
+       * left as that Stop found it, or the prompts handed over since would be stopped with it.
+       */
+      async interrupt(scope) {
+        const covered = scope === "turn" ? [] : this.queue.filter((queued) => !queued.stopped);
+        for (const queued of covered) queued.stopped = true;
+        const turn = this.turn;
+        if (!turn) return;
+        const sentAt = turn.stop?.sentAt ?? null;
+        if (sentAt !== null && Date.now() - sentAt > STOP_WAIT_MS) turn.stop = null;
+        turn.stop ??= newStop();
+        turn.stop.covered.push(...covered);
+        this.sendStop(turn);
+        let timer;
+        const waited = new Promise((resolve6) => {
+          timer = setTimeout(resolve6, STOP_WAIT_MS);
+        });
+        try {
+          await Promise.race([turn.stop.settled, waited]);
+        } finally {
+          clearTimeout(timer);
+        }
       }
       async setPermissionMode(mode) {
         this.mode = mode;
@@ -8541,7 +8664,8 @@ ${scrubSecrets(this.stderrTail.join("")).slice(-STDERR_TAIL_MAX)}` : "";
           this.resolvers.delete(id);
           this.emit("permissionTimeout", { id });
         }
-        await this.interrupt();
+        const stoppable = this.turn?.started && this.turn.id;
+        await (stoppable ? this.interrupt().catch(() => void 0) : void 0);
         this.removeAllFiles();
         this.rpc?.close();
         this.child?.stdin?.end();
@@ -8590,15 +8714,15 @@ var init_types = __esm({
 });
 
 // src/skills/paths.ts
-import { realpathSync as realpathSync12 } from "fs";
-import { isAbsolute as isAbsolute13, join as join23, relative as relative7, sep as sep10 } from "path";
+import { realpathSync as realpathSync13 } from "fs";
+import { isAbsolute as isAbsolute14, join as join23, relative as relative8, sep as sep11 } from "path";
 function clearSessionSkills(home, runnerId, heldBy) {
   clearRunnerStaging(home, join23(home, "session-skills"), runnerId, heldBy);
 }
 function assertInsideScopeDir(path, scopeDir) {
   let dirNow;
   try {
-    dirNow = realpathSync12.native(scopeDir);
+    dirNow = realpathSync13.native(scopeDir);
   } catch {
     throw new Error(`ROOT_NOT_ALLOWED: ${scopeDir} does not exist`);
   }
@@ -8606,8 +8730,8 @@ function assertInsideScopeDir(path, scopeDir) {
     throw new Error(`ROOT_NOT_ALLOWED: ${scopeDir} no longer resolves to itself (${dirNow})`);
   }
   const real = assertInsideRoots(path, [scopeDir]);
-  const rel = relative7(scopeDir, real);
-  if (rel === "" || rel === ".." || rel.startsWith(`..${sep10}`) || isAbsolute13(rel)) {
+  const rel = relative8(scopeDir, real);
+  if (rel === "" || rel === ".." || rel.startsWith(`..${sep11}`) || isAbsolute14(rel)) {
     throw new Error(`ROOT_NOT_ALLOWED: ${path}`);
   }
   return real;
@@ -8755,17 +8879,17 @@ import {
   existsSync as existsSync5,
   constants as fsConstants2,
   lstatSync as lstatSync8,
-  realpathSync as realpathSync13
+  realpathSync as realpathSync14
 } from "fs";
 import { open as open2, opendir } from "fs/promises";
-import { isAbsolute as isAbsolute14, join as join24, relative as relative8, sep as sep11 } from "path";
+import { isAbsolute as isAbsolute15, join as join24, relative as relative9, sep as sep12 } from "path";
 function inside2(root, candidate) {
-  const rel = relative8(root, candidate);
-  return rel === "" || !rel.startsWith(`..${sep11}`) && rel !== ".." && !isAbsolute14(rel);
+  const rel = relative9(root, candidate);
+  return rel === "" || !rel.startsWith(`..${sep12}`) && rel !== ".." && !isAbsolute15(rel);
 }
 function canonical2(dir) {
   try {
-    return realpathSync13.native(dir);
+    return realpathSync14.native(dir);
   } catch {
     return dir;
   }
@@ -8791,7 +8915,7 @@ function scopeRoots(opts) {
   let skillsRepo;
   if (opts.skillsRepo !== void 0) {
     try {
-      if (!isAbsolute14(opts.skillsRepo)) throw new Error("skillsRepo must be an absolute path");
+      if (!isAbsolute15(opts.skillsRepo)) throw new Error("skillsRepo must be an absolute path");
       skillsRepo = resolveInsideRoots(opts.skillsRepo, opts.roots).real;
     } catch (err) {
       log.warn(
@@ -8803,7 +8927,7 @@ function scopeRoots(opts) {
   for (const root of opts.roots) {
     let real;
     try {
-      real = realpathSync13.native(root);
+      real = realpathSync14.native(root);
     } catch {
       continue;
     }
@@ -8826,7 +8950,7 @@ function resolveScopeRoots(opts) {
   for (const root of scopeRoots(opts)) {
     let dirReal;
     try {
-      dirReal = realpathSync13.native(root.dir);
+      dirReal = realpathSync14.native(root.dir);
     } catch {
       continue;
     }
@@ -8931,7 +9055,7 @@ async function readEntry(root, entry, log, budget) {
   if (!SKILL_SLUG.test(slug)) return skip("the filename is not a legal slug");
   let real;
   try {
-    real = realpathSync13.native(path);
+    real = realpathSync14.native(path);
   } catch {
     return skip("cannot be resolved");
   }
@@ -8984,7 +9108,7 @@ async function readEntry(root, entry, log, budget) {
     ...parsed.ok && parsed.data.description !== void 0 ? { description: parsed.data.description } : {},
     declaredTools: parsed.ok ? parsed.data.tools : [],
     permission: parsed.ok ? parsed.data.permission : "inherit",
-    sourcePath: relative8(root.base, path),
+    sourcePath: relative9(root.base, path),
     ...root.projectPath !== void 0 ? { projectPath: root.projectPath } : {},
     contentHash: createHash4("sha256").update(bytes).digest("hex"),
     ...fileMtime !== void 0 ? { fileMtime } : {},
@@ -9100,7 +9224,7 @@ import {
   rmSync as rmSync9
 } from "fs";
 import { open as open3, writeFile } from "fs/promises";
-import { dirname as dirname9, isAbsolute as isAbsolute15, join as join25, relative as relative9, sep as sep12 } from "path";
+import { dirname as dirname9, isAbsolute as isAbsolute16, join as join25, relative as relative10, sep as sep13 } from "path";
 function isSkillRefusal(err) {
   const msg = err instanceof Error ? err.message : String(err);
   return msg.startsWith("ROOT_NOT_ALLOWED") || msg.startsWith(BUDGET) || msg.includes("is not a plain directory") || msg.includes("is not part of the session skills plugin");
@@ -9311,24 +9435,24 @@ var init_materialise = __esm({
     BUDGET = "SKILL_BUDGET:";
     PRECEDENCE = { personal: 0, project: 1, workspace: 2 };
     isAtOrBelow2 = (p, dir) => {
-      const rel = relative9(dir, p);
-      return rel === "" || !rel.startsWith(`..${sep12}`) && rel !== ".." && !isAbsolute15(rel);
+      const rel = relative10(dir, p);
+      return rel === "" || !rel.startsWith(`..${sep13}`) && rel !== ".." && !isAbsolute16(rel);
     };
   }
 });
 
 // src/sessions/managed-git-guard.ts
-import { realpathSync as realpathSync14 } from "fs";
-import { isAbsolute as isAbsolute16, relative as relative10, resolve as resolve3, sep as sep13 } from "path";
+import { realpathSync as realpathSync15 } from "fs";
+import { isAbsolute as isAbsolute17, relative as relative11, resolve as resolve4, sep as sep14 } from "path";
 function namesGitFiles(path, managedRoot) {
-  const rel = relative10(managedRoot, path);
-  if (rel === "" || rel === ".." || rel.startsWith(`..${sep13}`) || isAbsolute16(rel)) return false;
-  return rel.split(sep13).some((segment) => segment.toLowerCase() === ".git");
+  const rel = relative11(managedRoot, path);
+  if (rel === "" || rel === ".." || rel.startsWith(`..${sep14}`) || isAbsolute17(rel)) return false;
+  return rel.split(sep14).some((segment) => segment.toLowerCase() === ".git");
 }
 function writesManagedGit(target, managedRoot, cwd) {
-  const absolute = isAbsolute16(target) ? target : `${cwd}${sep13}${target}`;
-  const canonical3 = assertInsideRootsOrAncestor(absolute, [sep13]);
-  return namesGitFiles(resolve3(absolute), managedRoot) || namesGitFiles(canonical3, managedRoot);
+  const absolute = isAbsolute17(target) ? target : `${cwd}${sep14}${target}`;
+  const canonical3 = assertInsideRootsOrAncestor(absolute, [sep14]);
+  return namesGitFiles(resolve4(absolute), managedRoot) || namesGitFiles(canonical3, managedRoot);
 }
 function targetOf(keys, toolName2, input) {
   const key = keys[toolName2];
@@ -9355,7 +9479,7 @@ function walksInside(path, roots) {
 }
 function realOrSelf(dir) {
   try {
-    return realpathSync14.native(dir);
+    return realpathSync15.native(dir);
   } catch {
     return dir;
   }
@@ -9364,13 +9488,13 @@ function walksStrictlyInside(path, dirs) {
   if (dirs.length === 0) return false;
   let canonical3;
   try {
-    canonical3 = assertInsideRootsOrAncestor(path, [sep13]);
+    canonical3 = assertInsideRootsOrAncestor(path, [sep14]);
   } catch {
     return false;
   }
   return dirs.some((dir) => {
-    const rel = relative10(realOrSelf(dir), canonical3);
-    return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep13}`) && !isAbsolute16(rel);
+    const rel = relative11(realOrSelf(dir), canonical3);
+    return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep14}`) && !isAbsolute17(rel);
   });
 }
 function createWorktreeBoundGuard(roots, _cwd, opts = {}) {
@@ -9383,14 +9507,14 @@ function createWorktreeBoundGuard(roots, _cwd, opts = {}) {
     const written = targetOf(WRITE_TARGET_KEYS, toolName2, input);
     const target = written ?? targetOf(READ_TARGET_KEYS, toolName2, input);
     if (target === null) return null;
-    if (!isPlainToolPath(target) || !isAbsolute16(target)) return repositoryPathRefusal(target);
+    if (!isPlainToolPath(target) || !isAbsolute17(target)) return repositoryPathRefusal(target);
     if (written !== null) return walksInside(target, roots) ? null : worktreeBoundRefusal(target);
     return walksInside(target, readable) || walksStrictlyInside(target, readInside()) ? null : worktreeBoundRefusal(target);
   };
 }
 function patternStaysBelow(pattern) {
   const p = pattern.trim();
-  if (isAbsolute16(p) || /^[\\/]/.test(p) || /^[A-Za-z]:/.test(p) || p.startsWith("~")) return false;
+  if (isAbsolute17(p) || /^[\\/]/.test(p) || /^[A-Za-z]:/.test(p) || p.startsWith("~")) return false;
   return !p.split(/[\\/]/).includes("..");
 }
 function createRepositoryChatGuard(managedRoot, roots, cwd, opts = {}) {
@@ -9398,7 +9522,7 @@ function createRepositoryChatGuard(managedRoot, roots, cwd, opts = {}) {
   const bound = createWorktreeBoundGuard(roots, cwd, opts);
   return async (toolName2, input) => {
     const target = targetOf(WRITE_TARGET_KEYS, toolName2, input) ?? targetOf(READ_TARGET_KEYS, toolName2, input);
-    if (target !== null && (!isPlainToolPath(target) || !isAbsolute16(target))) {
+    if (target !== null && (!isPlainToolPath(target) || !isAbsolute17(target))) {
       return repositoryPathRefusal(target);
     }
     return await git(toolName2, input) ?? bound(toolName2, input);
@@ -9597,7 +9721,7 @@ var init_relay = __esm({
 });
 
 // src/sessions/repo-settings.ts
-import { isAbsolute as isAbsolute17, relative as relative11, sep as sep14 } from "path";
+import { isAbsolute as isAbsolute18, relative as relative12, sep as sep15 } from "path";
 function repoSettingsPolicy(input) {
   const bypassLock = input.permissionMode === "bypassPermissions" ? {} : { permissions: { disableBypassPermissionsMode: "disable" } };
   const claudeMd = () => ({
@@ -9619,8 +9743,8 @@ function repoSettingsPolicy(input) {
   return { settingSources: ["user"], ...claudeMd(), settings: { ...bypassLock } };
 }
 function insideRoot2(candidate, root) {
-  const rel = relative11(root, candidate);
-  return rel === "" || rel !== ".." && !rel.startsWith(`..${sep14}`) && !isAbsolute17(rel);
+  const rel = relative12(root, candidate);
+  return rel === "" || rel !== ".." && !rel.startsWith(`..${sep15}`) && !isAbsolute18(rel);
 }
 var init_repo_settings = __esm({
   "src/sessions/repo-settings.ts"() {
@@ -9629,10 +9753,10 @@ var init_repo_settings = __esm({
 });
 
 // src/sessions/secret-files.ts
-import { realpathSync as realpathSync15 } from "fs";
+import { realpathSync as realpathSync16 } from "fs";
 import { realpath } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { basename, isAbsolute as isAbsolute18, relative as relative12, resolve as resolve4, sep as sep15 } from "path";
+import { basename, isAbsolute as isAbsolute19, relative as relative13, resolve as resolve5, sep as sep16 } from "path";
 function isSecretFileName(name) {
   const n = name.toLowerCase();
   if (n.startsWith(".env")) return true;
@@ -9712,23 +9836,23 @@ function createSecretGuard(cwd, protectedPaths2 = []) {
   const home = homedir5();
   const protectedReal = protectedPaths2.flatMap((p) => {
     try {
-      const real = realpathSync15.native(p);
+      const real = realpathSync16.native(p);
       return real === p ? [p] : [p, real];
     } catch {
       return [p];
     }
   });
-  const expand = (arg) => arg === "~" ? home : arg.startsWith("~/") ? resolve4(home, arg.slice(2)) : arg;
+  const expand = (arg) => arg === "~" ? home : arg.startsWith("~/") ? resolve5(home, arg.slice(2)) : arg;
   const pathShaped = (path) => isSecretFileName(basename(path)) || inSecretDir(path) || protectedReal.some((root) => within2(path, root));
   const argTargets = (raw) => {
     if (GLOB_CHARS.test(raw))
-      return globTargetsSecrets(raw) || pathShaped(resolve4(cwd, expand(raw.replace(/[*?[{].*$/, ""))));
-    return pathShaped(raw) || pathShaped(resolve4(cwd, expand(raw)));
+      return globTargetsSecrets(raw) || pathShaped(resolve5(cwd, expand(raw.replace(/[*?[{].*$/, ""))));
+    return pathShaped(raw) || pathShaped(resolve5(cwd, expand(raw)));
   };
   const pathIsSecret = async (raw) => {
     if (argTargets(raw)) return true;
     try {
-      return pathShaped(await realpath(resolve4(cwd, expand(raw))));
+      return pathShaped(await realpath(resolve5(cwd, expand(raw))));
     } catch {
       return false;
     }
@@ -9793,8 +9917,8 @@ var init_secret_files = __esm({
     CONTROLS = ["x.txt", "x.ts", "x.md", "readme", ".gitignore"];
     GLOB_CHARS = /[*?[{]/;
     within2 = (path, root) => {
-      const rel = relative12(root, path);
-      return rel === "" || rel !== ".." && !rel.startsWith(`..${sep15}`) && !isAbsolute18(rel);
+      const rel = relative13(root, path);
+      return rel === "" || rel !== ".." && !rel.startsWith(`..${sep16}`) && !isAbsolute19(rel);
     };
     PATH_KEYS = {
       Read: ["file_path"],
@@ -9845,11 +9969,11 @@ var init_task_sessions = __esm({
 
 // src/sessions/user-guards.ts
 import { closeSync as closeSync4, constants as constants4, fstatSync, openSync as openSync4, readFileSync as readFileSync10 } from "fs";
-import { isAbsolute as isAbsolute19, join as join27 } from "path";
+import { isAbsolute as isAbsolute20, join as join27 } from "path";
 function readUserGuards(configDir) {
   const settingsFile = join27(configDir, "settings.json");
   const none = { settingsFile, preToolUseHooks: 0, denyRules: 0 };
-  if (!isAbsolute19(configDir)) return none;
+  if (!isAbsolute20(configDir)) return none;
   const text = readSmallFile(settingsFile);
   if (text === null) return none;
   let settings;
@@ -9915,8 +10039,8 @@ var init_user_guards = __esm({
 
 // src/sessions/manager.ts
 import { randomUUID as randomUUID5 } from "crypto";
-import { realpathSync as realpathSync16 } from "fs";
-import { isAbsolute as isAbsolute20, join as join28, relative as relative13, sep as sep16 } from "path";
+import { realpathSync as realpathSync17 } from "fs";
+import { isAbsolute as isAbsolute21, join as join28, relative as relative14, sep as sep17 } from "path";
 import { isDeepStrictEqual } from "util";
 function releaseCreds(creds) {
   if (creds?.state === "ok") creds.release();
@@ -9965,7 +10089,7 @@ function shrink(event) {
       return null;
   }
 }
-var READ_ONLY_TEXT, REFRESH_WITHIN_MS, betweenTurns, UNREADABLE_MARK_CREDS, roundUsd, UNIQUE_VIOLATION, ROW_WRITE_TIMEOUT_MS, ORPHANED_STATUSES, RESTARTABLE_STATUSES, isAtOrBelow3, DENY_MESSAGE_MAX, EXIT_ERROR_MAX, INITIAL_PROMPT_MAX, TASK_SKILL_LOOKUP_MS, TASK_REFUSED_MODES, OWNER_DRIVEN_KINDS, REPO_OWNER_ONLY, REPO_NO_DUPLICATE, PROVIDER_SESSION_ID, REPO_WORKTREE_GONE, TASK_ASK_TOOLS, MEMORY_PREAMBLE, MEMORY_SOURCE, wrapMemory, PATH_INPUT_TOOLS, PATH_INPUT_KEYS, isRecord, errorCode, SessionManager;
+var READ_ONLY_TEXT, REFRESH_WITHIN_MS, betweenTurns, UNREADABLE_MARK_CREDS, DRAINED_AFTER_MS, roundUsd, UNIQUE_VIOLATION, ROW_WRITE_TIMEOUT_MS, ORPHANED_STATUSES, RESTARTABLE_STATUSES, isAtOrBelow3, DENY_MESSAGE_MAX, EXIT_ERROR_MAX, INITIAL_PROMPT_MAX, TASK_SKILL_LOOKUP_MS, TASK_REFUSED_MODES, OWNER_DRIVEN_KINDS, REPO_OWNER_ONLY, REPO_NO_DUPLICATE, PROVIDER_SESSION_ID, REPO_WORKTREE_GONE, TASK_ASK_TOOLS, MEMORY_PREAMBLE, MEMORY_SOURCE, wrapMemory, PATH_INPUT_TOOLS, PATH_INPUT_KEYS, isRecord, errorCode, SessionManager;
 var init_manager = __esm({
   "src/sessions/manager.ts"() {
     "use strict";
@@ -10006,12 +10130,13 @@ var init_manager = __esm({
       state: "unavailable",
       readOnlyText: READ_ONLY_UNAVAILABLE
     };
+    DRAINED_AFTER_MS = 2e3;
     roundUsd = (usd) => Math.round(usd * 1e6) / 1e6;
     UNIQUE_VIOLATION = "23505";
     ROW_WRITE_TIMEOUT_MS = 3e4;
     ORPHANED_STATUSES = ["running", "awaiting_permission"];
     RESTARTABLE_STATUSES = /* @__PURE__ */ new Set(["idle", ...ORPHANED_STATUSES]);
-    isAtOrBelow3 = (p, dir) => p === dir || p.startsWith(dir.endsWith(sep16) ? dir : `${dir}${sep16}`);
+    isAtOrBelow3 = (p, dir) => p === dir || p.startsWith(dir.endsWith(sep17) ? dir : `${dir}${sep17}`);
     DENY_MESSAGE_MAX = 2e3;
     EXIT_ERROR_MAX = 8 * 1024;
     INITIAL_PROMPT_MAX = 2e5;
@@ -10379,7 +10504,7 @@ var init_manager = __esm({
        * chat-<hex>`. Null for any other path.
        */
       cloneOfWorktree(sessionId, worktree) {
-        const parts = relative13(this.deps.managedRoot, worktree).split(sep16);
+        const parts = relative14(this.deps.managedRoot, worktree).split(sep17);
         const [owner, name, dot, worktrees, leaf] = parts;
         if (parts.length !== 5 || owner === void 0 || name === void 0 || dot !== ".cayenne" || worktrees !== "worktrees" || leaf !== repositoryWorktreeName(sessionId) || !RepositoryRef.shape.owner.safeParse(owner).success || !RepositoryRef.shape.name.safeParse(name).success) {
           return null;
@@ -10609,6 +10734,7 @@ var init_manager = __esm({
           );
           await this.setStatus(sessionId, "running");
           live.session.prompt(text, p.clientUuid, staged);
+          this.turnHandedOver(live);
           this.deps.timings?.prompted(sessionId);
         } catch (err) {
           staged.discard();
@@ -10958,7 +11084,7 @@ var init_manager = __esm({
           if (stored === null) return false;
           if (isAtOrBelow3(stored, target)) return true;
           try {
-            return isAtOrBelow3(realpathSync16.native(stored), target);
+            return isAtOrBelow3(realpathSync17.native(stored), target);
           } catch {
             return false;
           }
@@ -10971,12 +11097,83 @@ var init_manager = __esm({
       async interrupt(sessionId) {
         const live = this.live.get(sessionId);
         if (live) {
-          await this.provider(() => live.session.interrupt());
+          const { turns } = live;
+          turns.stops = turns.owed;
+          turns.chased = false;
+          turns.early = turns.owed > 0 && !turns.begun && !live.stopping && !live.dropping;
+          if (turns.early) {
+            this.sendStop(sessionId, live);
+            if (live.status === "running") await this.setStatus(sessionId, "idle");
+            return {};
+          }
+          try {
+            await this.provider(() => live.session.interrupt());
+          } catch (err) {
+            turns.stops = 0;
+            throw err;
+          }
           return {};
         }
         await this.settleOrphans([sessionId]);
         return {};
       }
+      /**
+       * A stop nobody waits on: a provider that is starting, or between turns, may answer late.
+       * `'turn'` when it is a Stop sent again for a turn that produced output: what it covers was
+       * settled when it was asked, and a provider with a queue of its own (Codex) would take a plain
+       * stop for a new one and stop the prompts handed over since.
+       */
+      sendStop(sessionId, live, scope) {
+        void live.session.interrupt(scope).catch(
+          (err) => this.deps.log.warn(
+            { err: err instanceof Error ? err.message : String(err), sessionId },
+            "a stop sent ahead of its turn failed"
+          )
+        );
+      }
+      /** A prompt went to the provider. */
+      turnHandedOver(live) {
+        const { turns } = live;
+        const leftover = live.provider === "claude" && turns.stops === 0 && turns.drainedAt !== null && Date.now() - turns.drainedAt > DRAINED_AFTER_MS;
+        if (leftover) {
+          turns.owed = 0;
+          turns.stops = 0;
+        }
+        turns.drainedAt = null;
+        turns.owed += 1;
+      }
+      /** The provider announced a turn (`init`): if a Stop covers it, this is where it lands. */
+      turnBegan(sessionId, live) {
+        if (live.provider !== "claude") return;
+        const { turns } = live;
+        turns.drainedAt = null;
+        if (turns.owed > 0) turns.begun = true;
+        if (turns.stops > 0 && turns.early) this.sendStop(sessionId, live);
+      }
+      /**
+       * The provider produced output. For a turn stopped before it began that means the stop did not
+       * land (a backend with no `init` per turn, or a stop that was lost): it is sent once more, and
+       * `true` tells the caller the row must say `running` again, since a turn is.
+       */
+      turnOutput(sessionId, live) {
+        const { turns } = live;
+        turns.drainedAt = null;
+        if (turns.owed > 0) turns.begun = true;
+        if (turns.stops === 0 || !turns.early || turns.chased) return false;
+        turns.chased = true;
+        this.sendStop(sessionId, live, "turn");
+        return live.status === "idle";
+      }
+      /** A turn ended: whatever a Stop still covers is behind it, and has not begun. */
+      turnEnded(live) {
+        const { turns } = live;
+        turns.owed = Math.max(0, turns.owed - 1);
+        turns.stops = Math.max(0, turns.stops - 1);
+        turns.begun = false;
+        turns.drainedAt = Date.now();
+        turns.early = true;
+        turns.chased = false;
+      }
       /**
        * Put rows on this runner that claim a turn in progress back to `idle`, for the chats that have
        * no live session here — at boot every one of them, since nothing is live yet, and again when
@@ -11274,10 +11471,10 @@ var init_manager = __esm({
        */
       claudeProjectDir(cwd) {
         const configDir = sessionClaudeConfigDir(this.deps.claudeEnv);
-        if (configDir === "" || !isAbsolute20(configDir)) return null;
+        if (configDir === "" || !isAbsolute21(configDir)) return null;
         let canonical3 = configDir;
         try {
-          canonical3 = realpathSync16.native(configDir);
+          canonical3 = realpathSync17.native(configDir);
         } catch {
         }
         return join28(canonical3, "projects", claudeProjectDirName(cwd));
@@ -11500,7 +11697,7 @@ var init_manager = __esm({
        */
       fromCwd(cwd, value) {
         if (!isPlainToolPath(value)) throw new Error(notPlainPathRefusal(value));
-        return isAbsolute20(value) ? value : `${cwd}${sep16}${value}`;
+        return isAbsolute21(value) ? value : `${cwd}${sep17}${value}`;
       }
       /**
        * §2.9: a path in `updatedInput` passes the same boundary the session's `cwd` did, and the
@@ -11809,6 +12006,7 @@ var init_manager = __esm({
           permissions: /* @__PURE__ */ new Map(),
           cwd: opts.cwd,
           stopping: false,
+          turns: { owed: 0, begun: false, drainedAt: null, stops: 0, early: false, chased: false },
           dropping: null,
           inflight: /* @__PURE__ */ new Set(),
           writes: Promise.resolve(),
@@ -11975,9 +12173,12 @@ var init_manager = __esm({
           live.inflight.add(task);
           void task.finally(() => live.inflight.delete(task));
         };
-        session.on(
-          "init",
-          (init) => guard(async () => {
+        const output = () => {
+          if (this.turnOutput(sessionId, live)) guard(() => this.setStatus(sessionId, "running"))();
+        };
+        session.on("init", (init) => {
+          this.turnBegan(sessionId, live);
+          return guard(async () => {
             await this.updateSession(sessionId, {
               provider_session_id: init.providerSessionId,
               model: init.model
@@ -11988,9 +12189,10 @@ var init_manager = __esm({
               providerSessionId: init.providerSessionId,
               model: init.model
             });
-          })()
-        );
+          })();
+        });
         session.on("stream", (s) => {
+          output();
           this.deps.timings?.streamed(sessionId);
           guard(
             () => this.broadcast(sessionId, {
@@ -12001,9 +12203,9 @@ var init_manager = __esm({
             })
           )();
         });
-        session.on(
-          "message",
-          (m) => guard(async () => {
+        session.on("message", (m) => {
+          if (m.role === "assistant" || m.role === "tool") output();
+          return guard(async () => {
             if (m.role === "user" && m.providerUuid && live.echoed.has(m.providerUuid)) return;
             await this.persist(
               sessionId,
@@ -12014,8 +12216,8 @@ var init_manager = __esm({
               m.parentToolUseId,
               m.raw
             );
-          })()
-        );
+          })();
+        });
         session.on(
           "permission",
           (rawReq) => guard(async () => {
@@ -12104,6 +12306,7 @@ var init_manager = __esm({
           })()
         );
         session.on("result", (r) => {
+          this.turnEnded(live);
           this.deps.timings?.finished(sessionId);
           const lastSeq = live.writes.then(() => live.seq);
           guard(async () => {
@@ -12594,7 +12797,7 @@ var init_mirror2 = __esm({
 
 // src/skills/service.ts
 import { createHash as createHash6 } from "crypto";
-import { constants as fsConstants4, realpathSync as realpathSync17 } from "fs";
+import { constants as fsConstants4, realpathSync as realpathSync18 } from "fs";
 import { open as open4 } from "fs/promises";
 function createSkillsService(deps) {
   const log = deps.log ?? logger;
@@ -12656,7 +12859,7 @@ function createSkillsService(deps) {
     let wanted;
     if (payload.scope === "project" && payload.projectPath !== void 0) {
       try {
-        wanted = realpathSync17.native(payload.projectPath);
+        wanted = realpathSync18.native(payload.projectPath);
       } catch {
         throw missing();
       }
@@ -12814,12 +13017,12 @@ function createTerminalChannels({
       skipped: 0
     });
     try {
-      await new Promise((resolve5, reject) => {
+      await new Promise((resolve6, reject) => {
         let settled = false;
         channel.subscribe((status, err) => {
           if (status === "SUBSCRIBED") {
             settled = true;
-            resolve5();
+            resolve6();
           } else if (status === "CHANNEL_ERROR" || status === "TIMED_OUT") {
             if (settled) {
               log.warn({ terminalId, status, err: err?.message }, "terminal channel dropped");
@@ -12851,9 +13054,9 @@ var init_channels = __esm({
 });
 
 // src/terminal/env.ts
-import { readFileSync as readFileSync12, realpathSync as realpathSync18 } from "fs";
+import { readFileSync as readFileSync12, realpathSync as realpathSync19 } from "fs";
 import { lstat } from "fs/promises";
-import { dirname as dirname10, isAbsolute as isAbsolute21, relative as relative14 } from "path";
+import { dirname as dirname10, isAbsolute as isAbsolute22, relative as relative15 } from "path";
 function terminalEnv(base, { runnerOwner, claudeConfigDir }) {
   const env = {};
   for (const [key, value] of Object.entries(base)) {
@@ -12925,8 +13128,8 @@ function tryRealpath(fs, p) {
   }
 }
 function inside3(candidate, root) {
-  const rel = relative14(root, candidate);
-  return rel === "" || !rel.startsWith("..") && !isAbsolute21(rel);
+  const rel = relative15(root, candidate);
+  return rel === "" || !rel.startsWith("..") && !isAbsolute22(rel);
 }
 var SECRET_ENV, MEMBER_ENV_ALLOW, MEMBER_ENV_KEYS, LOCALE_ENV, nodeShellFs;
 var init_env2 = __esm({
@@ -12956,7 +13159,7 @@ var init_env2 = __esm({
           return "";
         }
       },
-      realpath: (p) => realpathSync18.native(p),
+      realpath: (p) => realpathSync19.native(p),
       lstat: (p) => lstat(p)
     };
   }
@@ -13034,12 +13237,12 @@ var init_process_group = __esm({
     defaultKill = (pid, signal) => {
       process.kill(pid, signal);
     };
-    defaultRun = (file, args) => new Promise((resolve5, reject) => {
+    defaultRun = (file, args) => new Promise((resolve6, reject) => {
       execFile5(
         file,
         args,
         { encoding: "utf8", timeout: 5e3, env: { LC_ALL: "C", TZ: "UTC" } },
-        (err, stdout) => err ? reject(err) : resolve5(stdout)
+        (err, stdout) => err ? reject(err) : resolve6(stdout)
       );
     });
     gone = (err) => err?.code === "ESRCH";
@@ -13099,7 +13302,7 @@ var init_ring = __esm({
 
 // src/terminal/manager.ts
 import { constants as osConstants } from "os";
-import { sep as sep17 } from "path";
+import { sep as sep18 } from "path";
 function mayHoldTerminal(userId, deps) {
   return userId === deps.runnerUserId ? deps.serves(userId) : deps.memberTerminalIds.includes(userId) && deps.serves(userId) && deps.rosterHealthy();
 }
@@ -13122,10 +13325,10 @@ var init_manager2 = __esm({
     MINUTE_MS = 6e4;
     LIST_MAX_ATTEMPTS = 3;
     LIST_RETRY_DELAY_MS = 250;
-    delay = (ms) => new Promise((resolve5) => {
-      setTimeout(resolve5, ms).unref();
+    delay = (ms) => new Promise((resolve6) => {
+      setTimeout(resolve6, ms).unref();
     });
-    isAtOrBelow4 = (path, dir) => path === dir || path.startsWith(dir.endsWith(sep17) ? dir : `${dir}${sep17}`);
+    isAtOrBelow4 = (path, dir) => path === dir || path.startsWith(dir.endsWith(sep18) ? dir : `${dir}${sep18}`);
     signalName = (n) => {
       if (!n) return null;
       for (const [name, value] of Object.entries(osConstants.signals)) if (value === n) return name;
@@ -13377,8 +13580,8 @@ var init_manager2 = __esm({
         }
         const term = this.terms.get(terminalId);
         if (!term || term.exited) return Promise.resolve({ closed: true });
-        return new Promise((resolve5) => {
-          term.waiters.push(() => resolve5({ closed: true }));
+        return new Promise((resolve6) => {
+          term.waiters.push(() => resolve6({ closed: true }));
           this.kill(terminalId, term);
         });
       }
@@ -14715,7 +14918,7 @@ var init_start = __esm({
 });
 
 // src/cli.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync10, readFileSync as readFileSync13, realpathSync as realpathSync19, rmSync as rmSync10, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync10, readFileSync as readFileSync13, realpathSync as realpathSync20, rmSync as rmSync10, writeFileSync as writeFileSync7 } from "fs";
 import { homedir as homedir7, hostname as hostname2, userInfo } from "os";
 import { dirname as dirname11, join as join31 } from "path";
 import { Command } from "commander";
@@ -14767,12 +14970,22 @@ async function doctor(deps) {
     detail: drifted ? `service uses ${deps.record?.nodePath}, current node is ${deps.execPath}` : deps.execPath,
     fix: drifted ? "Run `cayenne update` to re-pin the service to this node." : void 0
   });
-  checks.push({
-    name: "claude",
-    ok: deps.claudeOnPath !== null,
-    detail: deps.claudeOnPath ?? "not found on PATH",
-    fix: deps.claudeOnPath ? void 0 : "Install the claude CLI: https://claude.com/claude-code"
-  });
+  const recorded = deps.record?.claudePath;
+  const pinned = deps.claudeOnPath !== null && recorded !== void 0 ? recorded : null;
+  const lost = pinned === null ? null : !deps.exists(pinned) ? "which no longer exists" : deps.temporary(pinned) ? "a temporary shim that is deleted when its terminal session ends" : null;
+  checks.push(
+    lost ? {
+      name: "claude",
+      ok: false,
+      detail: `service uses ${pinned}, ${lost}`,
+      fix: "Run `cayenne update` to re-pin the service to the claude on PATH."
+    } : {
+      name: "claude",
+      ok: deps.claudeOnPath !== null,
+      detail: deps.claudeOnPath ?? "not found on PATH",
+      fix: deps.claudeOnPath ? void 0 : "Install the claude CLI: https://claude.com/claude-code"
+    }
+  );
   const loaded = await deps.launchd.isLoaded(deps.label);
   const running = loaded && await deps.launchd.isRunning(deps.label);
   checks.push({
@@ -14947,10 +15160,11 @@ async function up(deps) {
   const running = loaded && await deps.launchd.isRunning(label);
   const wantsChange = Boolean(deps.roots?.length || deps.workspaceSlug || claude.changed);
   if (!loaded && deps.cfg.runnerId) {
-    const { data } = await deps.db.from("runners").select("last_seen_at, profile").eq("id", deps.cfg.runnerId).maybeSingle();
+    const { data } = await deps.db.from("runners").select("last_seen_at, profile, status").eq("id", deps.cfg.runnerId).maybeSingle();
     const seen = data?.last_seen_at;
     const ours = data?.profile === deps.profile || data?.profile === UNCLAIMED_PROFILE;
-    if (ours && seen && Date.now() - new Date(seen).getTime() < RUNNER_ONLINE_WINDOW_MS) {
+    const fresh = seen && Date.now() - new Date(seen).getTime() < RUNNER_ONLINE_WINDOW_MS;
+    if (ours && fresh && data?.status !== "offline") {
       throw new Error(
         "a runner for this machine is already online without the service \u2014 stop the foreground `cayenne start` (or `cayenne down` elsewhere) before running `up`"
       );
@@ -15019,14 +15233,58 @@ init_profile();
 init_registry2();
 
 // src/service/install.ts
-import { chmodSync as chmodSync3, existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname2, join as join6 } from "path";
+import {
+  chmodSync as chmodSync3,
+  existsSync as existsSync3,
+  mkdirSync as mkdirSync3,
+  readFileSync as readFileSync3,
+  realpathSync as realpathSync4,
+  writeFileSync as writeFileSync3
+} from "fs";
+import { tmpdir } from "os";
+import { dirname as dirname2, isAbsolute as isAbsolute4, join as join6, relative, resolve, sep } from "path";
 var recordPath = (cayenneHome2) => join6(cayenneHome2, "app", "install.json");
 async function which(exec4, bin) {
   const r = await exec4("which", [bin]);
   const path = r.stdout.trim();
   return r.code === 0 && path ? path : null;
 }
+async function whichAll(exec4, bin) {
+  const r = await exec4("which", ["-a", bin]);
+  if (r.code !== 0) return [];
+  const paths = r.stdout.split("\n").map((line) => line.trim()).filter(Boolean);
+  return [...new Set(paths)];
+}
+function realOrSpelled(path) {
+  try {
+    return realpathSync4(path);
+  } catch {
+    return resolve(path);
+  }
+}
+var isInside = (dir, path) => {
+  const rel = relative(dir, path);
+  return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute4(rel);
+};
+function isTemporary(path, tmpDir = tmpdir()) {
+  const roots = [resolve(tmpDir), realOrSpelled(tmpDir)];
+  return [resolve(path), realOrSpelled(path)].some((p) => roots.some((root) => isInside(root, p)));
+}
+async function resolveClaude(exec4, tmpDir) {
+  const candidates = await whichAll(exec4, "claude");
+  const lasting = candidates.find((path) => !isTemporary(path, tmpDir));
+  if (lasting) return lasting;
+  if (candidates[0]) {
+    throw new Error(
+      `claude on PATH is a temporary shim: ${candidates[0]}
+It is deleted when the terminal session that made it ends, and the service would lose claude with it.
+Put the claude CLI itself on PATH, or run this from another terminal: https://claude.com/claude-code`
+    );
+  }
+  throw new Error(
+    "claude CLI not found on PATH. The runner spawns it to run sessions.\nInstall it first: https://claude.com/claude-code"
+  );
+}
 function buildPathEnv(nodePath, claudePath) {
   const dirs = ["/usr/bin", "/bin", "/usr/sbin", "/sbin", dirname2(nodePath), dirname2(claudePath)];
   return [...new Set(dirs)].join(":");
@@ -15049,12 +15307,7 @@ function readInstallRecord(cayenneHome2) {
   }
 }
 async function installApp(deps) {
-  const claudePath = await which(deps.exec, "claude");
-  if (!claudePath) {
-    throw new Error(
-      "claude CLI not found on PATH. The runner spawns it to run sessions.\nInstall it first: https://claude.com/claude-code"
-    );
-  }
+  const claudePath = await resolveClaude(deps.exec, deps.tmpDir ?? tmpdir());
   const appDir = join6(deps.cayenneHome, "app");
   mkdirSync3(appDir, { recursive: true, mode: 448 });
   const install = await deps.exec("npm", [
@@ -15101,10 +15354,10 @@ exec ${sh(nodePath)} ${sh(cliPath)} "$@"
 // src/service/launchd.ts
 import { execFile } from "child_process";
 function nodeExec() {
-  return (cmd, args) => new Promise((resolve5) => {
+  return (cmd, args) => new Promise((resolve6) => {
     execFile(cmd, args, { encoding: "utf8" }, (err, stdout, stderr) => {
       const code = err && typeof err.code === "number" ? err.code : err ? 1 : 0;
-      resolve5({ code, stdout, stderr });
+      resolve6({ code, stdout, stderr });
     });
   });
 }
@@ -15303,6 +15556,8 @@ program.command("doctor").description("Check the install and say how to fix what
     record: readInstallRecord(cayenneDir()),
     execPath: process.execPath,
     claudeOnPath: await which(exec4, "claude"),
+    exists: existsSync7,
+    temporary: (path) => isTemporary(path),
     label,
     launchd,
     backendUrl: backend?.url ?? null,
@@ -15381,8 +15636,8 @@ program.command("uninstall").description("Stop the service and remove the launch
     console.log(`removed ${label}`);
     return;
   }
-  const dir = realpathSync19(cayenneDir());
-  const home = realpathSync19(homedir7());
+  const dir = realpathSync20(cayenneDir());
+  const home = realpathSync20(homedir7());
   if (dir === "/" || dir === home || home.startsWith(`${dir}/`)) {
     throw new Error(`refusing to purge ${dir}: it is the home directory or an ancestor of it`);
   }