toyon 0.4.0 → 0.4.1

package/dist/daemon.js

@@ -1,6 +1,6 @@
 // @bun
 // ../daemon/src/index.ts
-import { rmSync as rmSync6, writeFileSync as writeFileSync9 } from "fs";
+import { rmSync as rmSync6, writeFileSync as writeFileSync10 } from "fs";
 import { dirname as dirname9 } from "path";
 import { fileURLToPath } from "url";
 
@@ -297,7 +297,7 @@ var PAIR_TTL_MS = 120000;
 var pairLink = (host, code) => `https://${host}/#pair=${code}`;
 
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 58;
+var PROTOCOL_VERSION = 60;
 var FILE_MAX_CHARS = 5000000;
 var IMAGE_MIME_TYPES = ["image/png", "image/jpeg", "image/gif", "image/webp"];
 var IMAGE_MAX_EDGE = 2576;
@@ -7722,7 +7722,7 @@ function slug(s) {
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.4.0",
+  version: "0.4.1",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -12694,6 +12694,29 @@ async function excludeFromGit(cwd, pattern) {
 ` : ""}${pattern}
 `);
 }
+async function excludeBlock(cwd, name, patterns) {
+  const file = await excludeFile(cwd);
+  if (!file)
+    return;
+  const open = `# toyon ${name}`;
+  const close = `# toyon end ${name}`;
+  const current = existsSync3(file) ? readFileSync3(file, "utf8") : "";
+  const lines = current.split(`
+`);
+  const from = lines.indexOf(open);
+  const to = lines.indexOf(close);
+  const kept = from >= 0 && to > from ? [...lines.slice(0, from), ...lines.slice(to + 1)] : lines;
+  while (kept.length > 0 && kept[kept.length - 1] === "")
+    kept.pop();
+  const next = [...kept, ...patterns.length > 0 ? [open, ...patterns, close] : []];
+  const text = next.length > 0 ? `${next.join(`
+`)}
+` : "";
+  if (text === current)
+    return;
+  mkdirSync2(dirname(file), { recursive: true });
+  writeFileSync(file, text);
+}
 async function unexcludeFromGit(cwd, pattern) {
   const file = await excludeFile(cwd);
   if (!file || !existsSync3(file))
@@ -14417,17 +14440,18 @@ class AcpSession {
     }
     return pickOption(params.options, verdict);
   }
-  askPermission(params) {
+  async askPermission(params) {
     const plan = params.toolCall.kind === "switch_mode";
-    if (plan)
-      this.d.onPlan?.();
+    const detail = permissionDetail(params);
+    const planPath = plan ? await this.d.onPlan?.(detail) ?? null : null;
     const offered = plan ? params.options : params.options.filter((o) => o.kind !== "allow_always");
     const choices = offered.map((o) => ({ id: o.optionId, name: o.name, kind: o.kind }));
     return this.openAsk((id) => ({
       type: "agent-permission",
       id,
       title: params.toolCall.title ?? params.toolCall.name ?? "the agent needs a decision",
-      ...permissionDetail(params) ? { detail: permissionDetail(params) } : {},
+      ...detail ? { detail } : {},
+      ...planPath ? { plan: planPath } : {},
       choices,
       ...params.toolCall.toolCallId ? { toolId: params.toolCall.toolCallId } : {},
       ts: Date.now()
@@ -14438,10 +14462,17 @@ class AcpSession {
         return { outcome: { outcome: "cancelled" } };
       if (plan && (choice.kind === "allow_once" || choice.kind === "allow_always")) {
         this.d.setMode?.(modeAfterPlan(choice.name));
+        if (planPath)
+          fireAndForget(this.d.worktreeId, this.sayPlanEdited(detail, planPath), "edited plan");
       }
       return { outcome: { outcome: "selected", optionId: choice.id } };
     });
   }
+  async sayPlanEdited(proposed, path) {
+    if (!await this.d.planEdited?.(proposed))
+      return;
+    this.send(`I edited the plan before approving it. Build what is in ${path}, not the plan you proposed.`);
+  }
   onElicit(params, signal) {
     const live = this.live;
     if (!live || !("sessionId" in params) || params.sessionId !== live.sessionId) {
@@ -14593,6 +14624,35 @@ function sameCommands(a, b) {
   return a.length === b.length && a.every((c, i) => c.name === b[i]?.name && c.description === b[i]?.description && c.hint === b[i]?.hint);
 }
 
+// ../daemon/src/agent/planDoc.ts
+import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync4 } from "fs";
+import { join as join7 } from "path";
+var PLAN_REL = join7(".toyon", "plan.md");
+async function writePlanDoc(cwd, markdown) {
+  try {
+    mkdirSync5(join7(cwd, ".toyon"), { recursive: true });
+    writeFileSync4(join7(cwd, PLAN_REL), markdown.endsWith(`
+`) ? markdown : `${markdown}
+`);
+  } catch (e) {
+    log.warn(cwd, `could not write ${PLAN_REL}; the plan stays on the card`, e);
+    return null;
+  }
+  await excludeFromGit(cwd, PLAN_REL);
+  return PLAN_REL;
+}
+function planEdited(cwd, proposed) {
+  const file = join7(cwd, PLAN_REL);
+  if (!existsSync8(file))
+    return false;
+  try {
+    return readFileSync7(file, "utf8").trim() !== proposed.trim();
+  } catch (e) {
+    log.warn(cwd, `could not read ${PLAN_REL}`, e);
+    return false;
+  }
+}
+
 // ../daemon/src/runtime/ports.ts
 var allocated = new Set;
 var range = cloud.proxyPorts;
@@ -14705,7 +14765,7 @@ function expandEnv(env, vars) {
 
 // ../daemon/src/core/remote.ts
 import { createHmac, timingSafeEqual } from "crypto";
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync8 } from "fs";
 function loadRemote(file, env = process.env) {
   if (env.TOYON_CLOUD === "1") {
     const host = (env.TOYON_PUBLIC_HOST ?? "").toLowerCase();
@@ -14718,9 +14778,9 @@ function loadRemote(file, env = process.env) {
       throw new Error(`TOYON_PREVIEWS: ${why}`);
     return { host, previews, front: "edge" };
   }
-  if (!existsSync8(file))
+  if (!existsSync9(file))
     return null;
-  const view = parseRemote(readFileSync7(file, "utf8"));
+  const view = parseRemote(readFileSync8(file, "utf8"));
   if (!view) {
     log.warn("remote", `${file} names no valid host or previews; remote access is off`);
     return null;
@@ -15512,13 +15572,15 @@ function defaultAgent(wt, d, preview) {
       d.state.save();
       d.hub.emit("worktreesChanged");
     },
-    onPlan: () => {
+    onPlan: async (markdown) => {
       const w = d.state.worktree(wt.id);
-      if (!w || w.planned)
-        return;
-      w.planned = true;
-      d.state.save();
+      if (w && !w.planned) {
+        w.planned = true;
+        d.state.save();
+      }
+      return markdown.trim() ? writePlanDoc(wt.path, markdown) : null;
     },
+    planEdited: async (proposed) => planEdited(wt.path, proposed),
     option: (category) => d.state.requireWorktree(wt.id)[OPTION_FIELDS[category]],
     onOptionsLearned: (category, choices) => {
       const agentId = d.state.requireWorktree(wt.id).agent ?? "";
@@ -16389,20 +16451,20 @@ function makePlanner(agents) {
 }
 
 // ../daemon/src/core/assets.ts
-import { existsSync as existsSync9, readdirSync as readdirSync2, rmSync, statSync as statSync2 } from "fs";
-import { join as join7, resolve as resolve5 } from "path";
+import { existsSync as existsSync10, readdirSync as readdirSync2, rmSync, statSync as statSync2 } from "fs";
+import { join as join8, resolve as resolve5 } from "path";
 function locateAssets(here, env = process.env) {
-  const packaged = existsSync9(join7(here, "shell", "index.html"));
+  const packaged = existsSync10(join8(here, "shell", "index.html"));
   return {
-    shellDist: env.TOYON_SHELL_DIST ?? (packaged ? join7(here, "shell") : join7(here, "../../shell/dist")),
-    bridgeJs: env.TOYON_BRIDGE_JS ?? (packaged ? join7(here, "bridge.js") : join7(here, "../../bridge/dist/bridge.js")),
+    shellDist: env.TOYON_SHELL_DIST ?? (packaged ? join8(here, "shell") : join8(here, "../../shell/dist")),
+    bridgeJs: env.TOYON_BRIDGE_JS ?? (packaged ? join8(here, "bridge.js") : join8(here, "../../bridge/dist/bridge.js")),
     sourceRoot: packaged ? null : resolve5(here, "../../.."),
-    packageJson: packaged ? join7(here, "..", "package.json") : null
+    packageJson: packaged ? join8(here, "..", "package.json") : null
   };
 }
 var KEEP_MS = 3 * 24 * 60 * 60 * 1000;
 function pruneAssets(shellDist) {
-  const dir = join7(shellDist, "assets");
+  const dir = join8(shellDist, "assets");
   let names;
   try {
     names = readdirSync2(dir);
@@ -16411,7 +16473,7 @@ function pruneAssets(shellDist) {
   }
   const found = [];
   for (const name of names) {
-    const path = join7(dir, name);
+    const path = join8(dir, name);
     try {
       found.push({ path, mtime: statSync2(path).mtimeMs });
     } catch {}
@@ -16432,7 +16494,7 @@ function pruneAssets(shellDist) {
 }
 
 // ../daemon/src/core/dialog.ts
-import { existsSync as existsSync10 } from "fs";
+import { existsSync as existsSync11 } from "fs";
 import { homedir as homedir4 } from "os";
 var PROMPTS = {
   location: "Choose where the new project goes",
@@ -16450,7 +16512,7 @@ function folderDialog() {
   let cancelled = false;
   const ask = async (start, purpose) => {
     const typed = start === "~" || start.startsWith("~/") ? `${homedir4()}${start.slice(1)}` : start;
-    const from = typed.startsWith("/") && existsSync10(typed) ? typed : homedir4();
+    const from = typed.startsWith("/") && existsSync11(typed) ? typed : homedir4();
     cancelled = false;
     const p = Bun.spawn(["osascript", ...SCRIPT.flatMap((line) => ["-e", line]), PROMPTS[purpose], from], {
       stdout: "pipe",
@@ -16667,17 +16729,17 @@ class SelfWatch {
 
 // ../daemon/src/core/state.ts
 import { randomBytes } from "crypto";
-import { existsSync as existsSync11, readFileSync as readFileSync8, renameSync as renameSync2, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync12, readFileSync as readFileSync9, renameSync as renameSync2, writeFileSync as writeFileSync5 } from "fs";
 var SEEN_WORKTREES = 50;
 var empty = { repos: [], worktrees: [], sessions: {} };
 function loadState(paths) {
   ensureDirs(paths);
   const STATE_FILE = paths.stateFile;
-  if (!existsSync11(STATE_FILE))
+  if (!existsSync12(STATE_FILE))
     return structuredClone(empty);
   let raw;
   try {
-    raw = readFileSync8(STATE_FILE, "utf8");
+    raw = readFileSync9(STATE_FILE, "utf8");
   } catch (e) {
     log.error("state", `cannot read ${STATE_FILE}; starting empty`, e);
     return structuredClone(empty);
@@ -16688,7 +16750,7 @@ function loadState(paths) {
   } catch (e) {
     const backup = `${STATE_FILE}.corrupt-${Date.now()}`;
     try {
-      writeFileSync4(backup, raw);
+      writeFileSync5(backup, raw);
     } catch (be) {
       log.warn("state", "could not write the corrupt-state backup", be);
     }
@@ -16715,16 +16777,16 @@ function loadState(paths) {
 }
 function saveState(paths, state) {
   const tmp = `${paths.stateFile}.tmp`;
-  writeFileSync4(tmp, JSON.stringify(state, null, 2));
+  writeFileSync5(tmp, JSON.stringify(state, null, 2));
   renameSync2(tmp, paths.stateFile);
 }
 function loadOrCreateToken(paths) {
   ensureDirs(paths);
   const TOKEN_FILE = paths.tokenFile;
-  if (existsSync11(TOKEN_FILE))
-    return readFileSync8(TOKEN_FILE, "utf8").trim();
+  if (existsSync12(TOKEN_FILE))
+    return readFileSync9(TOKEN_FILE, "utf8").trim();
   const token = randomBytes(32).toString("hex");
-  writeFileSync4(TOKEN_FILE, token, { mode: 384 });
+  writeFileSync5(TOKEN_FILE, token, { mode: 384 });
   return token;
 }
 
@@ -16878,7 +16940,7 @@ class StateStore {
 }
 
 // ../daemon/src/design/service.ts
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 
 // ../daemon/src/design/scan.ts
 var COLOR = /^(#|rgba?\(|hsla?\(|oklch\(|oklab\(|lab\(|lch\(|color\(|color-mix\(|light-dark\()/i;
@@ -17328,7 +17390,7 @@ class DesignService {
 async function readAll(root, paths) {
   const out = [];
   for (const path of paths) {
-    const file = Bun.file(join8(root, path));
+    const file = Bun.file(join9(root, path));
     if (file.size === 0 || file.size > MAX_FILE_BYTES)
       continue;
     try {
@@ -17443,14 +17505,14 @@ function typicalUse(classes) {
 var normal = (s) => s.replace(/[-_]/g, "").toLowerCase();
 async function loadProjectTypescript(root) {
   try {
-    return await import(join8(root, "node_modules", "typescript", "lib", "typescript.js"));
+    return await import(join9(root, "node_modules", "typescript", "lib", "typescript.js"));
   } catch {
     return null;
   }
 }
 
 // ../daemon/src/drafts/store.ts
-import { existsSync as existsSync12, readFileSync as readFileSync9, renameSync as renameSync3, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync13, readFileSync as readFileSync10, renameSync as renameSync3, writeFileSync as writeFileSync6 } from "fs";
 var SAVE_DELAY_MS = 1000;
 
 class DraftStore {
@@ -17459,10 +17521,10 @@ class DraftStore {
   saveTimer = null;
   constructor(d) {
     this.d = d;
-    if (!existsSync12(d.file))
+    if (!existsSync13(d.file))
       return;
     try {
-      const raw = JSON.parse(readFileSync9(d.file, "utf8"));
+      const raw = JSON.parse(readFileSync10(d.file, "utf8"));
       if (!raw || typeof raw !== "object")
         return;
       for (const [id, text] of Object.entries(raw)) {
@@ -17522,7 +17584,7 @@ class DraftStore {
   write() {
     const tmp = `${this.d.file}.tmp`;
     try {
-      writeFileSync5(tmp, JSON.stringify(this.drafts));
+      writeFileSync6(tmp, JSON.stringify(this.drafts));
       renameSync3(tmp, this.d.file);
     } catch (e) {
       log.error("drafts", "could not write the drafts", e);
@@ -17687,7 +17749,7 @@ function withRepoLock(repoPath, fn) {
 var fileLockKey = (absPath) => `file:${absPath}`;
 
 // ../daemon/src/git/status.ts
-import { join as join9 } from "path";
+import { join as join10 } from "path";
 async function treeFingerprint(worktreePath) {
   const [head, diff, untracked] = await Promise.all([
     git(worktreePath, "rev-parse", "HEAD"),
@@ -17697,7 +17759,7 @@ async function treeFingerprint(worktreePath) {
   const others = await Promise.all(untracked.out.split(`
 `).filter(Boolean).map(async (p) => {
     try {
-      const f = Bun.file(join9(worktreePath, p));
+      const f = Bun.file(join10(worktreePath, p));
       const body = f.size > 2000000 ? String(f.size) : Bun.hash(await f.arrayBuffer()).toString(36);
       return `${p}:${body}`;
     } catch {
@@ -17748,7 +17810,7 @@ async function numstat(worktreePath, ...range) {
 }
 async function untrackedLines(worktreePath, file) {
   try {
-    const f = Bun.file(join9(worktreePath, file));
+    const f = Bun.file(join10(worktreePath, file));
     if (f.size > 2000000)
       return {};
     const buf = new Uint8Array(await f.arrayBuffer());
@@ -17767,14 +17829,16 @@ async function untrackedLines(worktreePath, file) {
     return {};
   }
 }
+var MAX_UNTRACKED_COUNTED = 500;
 async function statusFilesWithCounts(worktreePath) {
   const files = await statusFiles(worktreePath);
   if (files.length === 0)
     return files;
   const counts = files.some((f) => f.xy !== "??") ? await numstat(worktreePath, "HEAD") : new Map;
+  const countUntracked = files.filter((f) => f.xy === "??").length <= MAX_UNTRACKED_COUNTED;
   return Promise.all(files.map(async (f) => ({
     ...f,
-    ...f.xy === "??" ? await untrackedLines(worktreePath, f.path) : counts.get(f.path) ?? {}
+    ...f.xy === "??" ? countUntracked ? await untrackedLines(worktreePath, f.path) : {} : counts.get(f.path) ?? {}
   })));
 }
 async function committedFiles(worktreePath, defaultBr) {
@@ -18504,9 +18568,9 @@ class AfterLand {
 }
 
 // ../daemon/src/repos/registry.ts
-import { existsSync as existsSync17, mkdirSync as mkdirSync5, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync18, mkdirSync as mkdirSync6, rmSync as rmSync2, writeFileSync as writeFileSync7 } from "fs";
 import { homedir as homedir7 } from "os";
-import { basename as basename3, dirname as dirname6, join as join14 } from "path";
+import { basename as basename3, dirname as dirname6, join as join15 } from "path";
 
 // ../daemon/src/worktrees/naming.ts
 import { randomBytes as randomBytes2 } from "crypto";
@@ -18532,13 +18596,13 @@ function variantLens(index) {
 }
 
 // ../daemon/src/repos/browse.ts
-import { existsSync as existsSync13, statSync as statSync3 } from "fs";
+import { existsSync as existsSync14, statSync as statSync3 } from "fs";
 import { readdir } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { dirname as dirname4, join as join10 } from "path";
+import { dirname as dirname4, join as join11 } from "path";
 var MAX_ENTRIES = 40;
 function expandTilde(raw) {
-  return raw === "~" || raw.startsWith("~/") ? join10(homedir5(), raw.slice(1)) : raw;
+  return raw === "~" || raw.startsWith("~/") ? join11(homedir5(), raw.slice(1)) : raw;
 }
 function collapseTilde(abs) {
   const home = homedir5();
@@ -18549,7 +18613,7 @@ function holdsNothing(names) {
 }
 async function describeFolder(abs) {
   const path = collapseTilde(abs);
-  if (existsSync13(join10(abs, ".git")))
+  if (existsSync14(join11(abs, ".git")))
     return { path, kind: "project" };
   try {
     return { path, kind: holdsNothing(await readdir(abs)) ? "empty" : "folder" };
@@ -18564,10 +18628,10 @@ function describe2(typed, parent) {
     isDir = statSync3(typed).isDirectory();
   } catch {}
   return {
-    exists: existsSync13(typed),
+    exists: existsSync14(typed),
     isDir,
-    isRepo: isDir && existsSync13(join10(typed, ".git")),
-    parentExists: existsSync13(parent)
+    isRepo: isDir && existsSync14(join11(typed, ".git")),
+    parentExists: existsSync14(parent)
   };
 }
 async function browsePath(raw) {
@@ -18591,16 +18655,16 @@ async function browsePath(raw) {
       continue;
     if (!name.toLowerCase().startsWith(prefix))
       continue;
-    const abs = join10(dir, name);
-    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync13(join10(abs, ".git")) });
+    const abs = join11(dir, name);
+    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync14(join11(abs, ".git")) });
   }
   entries.sort((a, b) => a.isRepo !== b.isRepo ? a.isRepo ? -1 : 1 : a.name.localeCompare(b.name));
   return { entries: entries.slice(0, MAX_ENTRIES), target };
 }
 
 // ../daemon/src/repos/config.ts
-import { closeSync, existsSync as existsSync14, openSync as openSync2, readdirSync as readdirSync3, readFileSync as readFileSync10, readSync } from "fs";
-import { join as join11 } from "path";
+import { closeSync, existsSync as existsSync15, openSync as openSync2, readdirSync as readdirSync3, readFileSync as readFileSync11, readSync } from "fs";
+import { join as join12 } from "path";
 
 // ../../node_modules/.bun/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
 function createScanner(text, ignoreTrivia = false) {
@@ -19964,7 +20028,7 @@ function applyEdits(text, edits) {
 
 // ../daemon/src/repos/config.ts
 var PLACES = [CONFIG_FILES.folder, CONFIG_FILES.root];
-var present = (repoPath, place) => [place.shared, place.local].filter((rel) => existsSync14(join11(repoPath, rel)));
+var present = (repoPath, place) => [place.shared, place.local].filter((rel) => existsSync15(join12(repoPath, rel)));
 var isObject2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 function parseSettings(text) {
   const errors = [];
@@ -19989,7 +20053,7 @@ function readConfigFile(repoPath) {
   for (const rel of files) {
     let raw;
     try {
-      raw = parseSettings(readFileSync10(join11(repoPath, rel), "utf8"));
+      raw = parseSettings(readFileSync11(join12(repoPath, rel), "utf8"));
     } catch (e) {
       return { ok: false, reason: `${rel} is not valid JSON: ${e instanceof Error ? e.message : String(e)}` };
     }
@@ -20046,12 +20110,12 @@ function configTarget(repoPath, made) {
 }
 function configBody(repoPath, rel, config) {
   const place = PLACES.find((p) => p.local === rel);
-  const abs = place && join11(repoPath, place.shared);
-  if (!abs || !existsSync14(abs))
+  const abs = place && join12(repoPath, place.shared);
+  if (!abs || !existsSync15(abs))
     return config;
   let shared;
   try {
-    shared = parseSettings(readFileSync10(abs, "utf8"));
+    shared = parseSettings(readFileSync11(abs, "utf8"));
   } catch {
     return config;
   }
@@ -20064,7 +20128,7 @@ function configText(repoPath, rel, config) {
   let text;
   let was;
   try {
-    text = readFileSync10(join11(repoPath, rel), "utf8");
+    text = readFileSync11(join12(repoPath, rel), "utf8");
     was = parseSettings(text);
   } catch {
     return fresh;
@@ -20094,9 +20158,9 @@ function detectConfig(repoPath) {
     return { config: explicit.config, needsSetup: false };
   if (explicit)
     log.warn("config", `${repoPath}: ${explicit.reason}; detecting instead`);
-  const pkgPath = join11(repoPath, "package.json");
-  if (existsSync14(pkgPath)) {
-    const pkg = JSON.parse(readFileSync10(pkgPath, "utf8"));
+  const pkgPath = join12(repoPath, "package.json");
+  if (existsSync15(pkgPath)) {
+    const pkg = JSON.parse(readFileSync11(pkgPath, "utf8"));
     const scripts = pkg.scripts ?? {};
     const runner = detectRunner(repoPath, pkg.packageManager);
     const pages = detectPages(repoPath, scripts, runner);
@@ -20117,7 +20181,7 @@ function detectConfig(repoPath) {
       };
     }
   }
-  if (existsSync14(join11(repoPath, "start.sh"))) {
+  if (existsSync15(join12(repoPath, "start.sh"))) {
     return { config: { run: { app: "./start.sh" } }, needsSetup: true, from: "start.sh" };
   }
   const assumed = assumeNothingToRun(repoPath);
@@ -20160,7 +20224,7 @@ function assumeNothingToRun(repoPath) {
   return marker && !servesPage(repoPath) ? marker : undefined;
 }
 function markerIn(repoPath) {
-  const named = NO_PAGE_MARKERS.find((f) => existsSync14(join11(repoPath, f)));
+  const named = NO_PAGE_MARKERS.find((f) => existsSync15(join12(repoPath, f)));
   if (named)
     return named;
   let entries;
@@ -20172,12 +20236,12 @@ function markerIn(repoPath) {
   return entries.find((f) => NO_PAGE_EXTENSIONS.some((ext) => f.endsWith(ext)));
 }
 function servesPage(repoPath) {
-  if (WEB_FILES.some((f) => existsSync14(join11(repoPath, f))))
+  if (WEB_FILES.some((f) => existsSync15(join12(repoPath, f))))
     return true;
-  if (/^web:/m.test(head(join11(repoPath, "Procfile"))))
+  if (/^web:/m.test(head(join12(repoPath, "Procfile"))))
     return true;
   for (const [files, names] of WEB_DEPENDENCIES) {
-    const text = files.map((f) => head(join11(repoPath, f))).join(`
+    const text = files.map((f) => head(join12(repoPath, f))).join(`
 `);
     if (text.trim() && names.some((n) => mentions(text, n)))
       return true;
@@ -20194,7 +20258,7 @@ function frontEndBeside(repoPath) {
   return dirs.some((d) => {
     if (!d.isDirectory() || d.name.startsWith(".") || NOT_A_PACKAGE.has(d.name))
       return false;
-    const pkg = head(join11(repoPath, d.name, "package.json"));
+    const pkg = head(join12(repoPath, d.name, "package.json"));
     if (!pkg)
       return false;
     try {
@@ -20209,7 +20273,7 @@ function mentions(text, name) {
   return new RegExp(`(?<![\\w-])${escaped}(?![\\w-])`, "i").test(text);
 }
 function head(path) {
-  if (!existsSync14(path))
+  if (!existsSync15(path))
     return "";
   try {
     const fd = openSync2(path, "r");
@@ -20237,31 +20301,31 @@ function procCommand(runner, script, body) {
   return `${base}${runner === "npm" ? " --" : ""} ${flag}`;
 }
 function detectPages(repoPath, scripts, runner) {
-  if (!scripts.build || !existsSync14(join11(repoPath, "functions")))
+  if (!scripts.build || !existsSync15(join12(repoPath, "functions")))
     return null;
-  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join11(repoPath, f)).find((f) => existsSync14(f));
+  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join12(repoPath, f)).find((f) => existsSync15(f));
   if (!cfg)
     return null;
-  const out = readFileSync10(cfg, "utf8").match(/pages_build_output_dir"?\s*[:=]\s*"([^"]+)"/)?.[1];
+  const out = readFileSync11(cfg, "utf8").match(/pages_build_output_dir"?\s*[:=]\s*"([^"]+)"/)?.[1];
   if (!out)
     return null;
   return { web: `${runner} run build && npx wrangler pages dev ${out} --ip 127.0.0.1 --port $PORT` };
 }
 function detectRunner(repoPath, packageManager) {
-  if (existsSync14(join11(repoPath, "bun.lock")) || existsSync14(join11(repoPath, "bun.lockb")))
+  if (existsSync15(join12(repoPath, "bun.lock")) || existsSync15(join12(repoPath, "bun.lockb")))
     return "bun";
-  if (existsSync14(join11(repoPath, "pnpm-lock.yaml")))
+  if (existsSync15(join12(repoPath, "pnpm-lock.yaml")))
     return "pnpm";
-  if (existsSync14(join11(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
+  if (existsSync15(join12(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
     return "yarn";
   return "npm";
 }
 
 // ../daemon/src/repos/create.ts
-import { existsSync as existsSync15, readdirSync as readdirSync4, realpathSync as realpathSync2, statSync as statSync4 } from "fs";
+import { existsSync as existsSync16, readdirSync as readdirSync4, realpathSync as realpathSync2, statSync as statSync4 } from "fs";
 import { appendFile as appendFile2, mkdir as mkdir2, rm } from "fs/promises";
 import { homedir as homedir6 } from "os";
-import { dirname as dirname5, join as join12, resolve as resolve7 } from "path";
+import { dirname as dirname5, join as join13, resolve as resolve7 } from "path";
 function isInside(dir, parent) {
   const p = parent.replace(/\/+$/, "");
   return dir === p || dir.startsWith(`${p}/`);
@@ -20272,27 +20336,27 @@ function planProject(opts, home = homedir6()) {
     throw new UserError(nameError);
   const first = firstProjectsFolder(opts.parent, home);
   const parent = first ?? resolveParent(opts.parent);
-  const dir = join12(parent, opts.name.trim());
-  if (existsSync15(dir))
+  const dir = join13(parent, opts.name.trim());
+  if (existsSync16(dir))
     throw new UserError(`${dir} already exists`);
   return { parent, dir, makeParent: first !== null };
 }
 function firstProjectsFolder(raw, home) {
   const typed = expandTilde(raw.trim()).replace(/\/+$/, "");
-  if (typed !== join12(home, PROJECTS_FOLDER) || existsSync15(typed) || !existsSync15(home))
+  if (typed !== join13(home, PROJECTS_FOLDER) || existsSync16(typed) || !existsSync16(home))
     return null;
-  return join12(realpathSync2(home), PROJECTS_FOLDER);
+  return join13(realpathSync2(home), PROJECTS_FOLDER);
 }
 function planInPlace(opts) {
   const name = opts.name.trim();
   if (!name || name === "." || name === ".." || name.includes("/")) {
     throw new UserError(`${opts.name} is not a folder name`);
   }
-  const typed = join12(resolveParent(opts.parent), name);
-  if (!existsSync15(typed) || !statSync4(typed).isDirectory())
+  const typed = join13(resolveParent(opts.parent), name);
+  if (!existsSync16(typed) || !statSync4(typed).isDirectory())
     throw new UserError(`${typed} is not a folder`);
   const dir = realpathSync2(typed);
-  if (existsSync15(join12(dir, ".git")))
+  if (existsSync16(join13(dir, ".git")))
     throw new UserError(`${dir} is already a project; open it instead`);
   if (!holdsNothing(readdirSync4(dir))) {
     throw new UserError(`${dir} is not empty; only an empty folder can become a project where it is`);
@@ -20303,7 +20367,7 @@ function resolveParent(raw) {
   const typed = expandTilde(raw.trim());
   if (!typed.startsWith("/"))
     throw new UserError(`${raw} is not a folder path`);
-  if (!existsSync15(typed))
+  if (!existsSync16(typed))
     throw new UserError(`${raw} does not exist; make it first`);
   if (!statSync4(typed).isDirectory())
     throw new UserError(`${raw} is not a folder`);
@@ -20383,13 +20447,13 @@ async function undoCreate(dir) {
 }
 async function undoInit(dir) {
   try {
-    await rm(join12(dir, ".git"), { recursive: true, force: true });
+    await rm(join13(dir, ".git"), { recursive: true, force: true });
   } catch (e) {
     log.warn(dir, "could not take back a half-made .git", e);
   }
 }
 async function unmakeProject(dir, made) {
-  const target = made === "folder" ? dir : join12(dir, ".git");
+  const target = made === "folder" ? dir : join13(dir, ".git");
   try {
     await rm(target, { recursive: true, force: true });
   } catch (e) {
@@ -20419,8 +20483,8 @@ async function ok(p, what) {
 }
 
 // ../daemon/src/repos/watcher.ts
-import { existsSync as existsSync16, watch } from "fs";
-import { basename as basename2, join as join13 } from "path";
+import { existsSync as existsSync17, watch } from "fs";
+import { basename as basename2, join as join14 } from "path";
 function watchDefaultBranch(repoPath, branch, onMove) {
   let last = null;
   fireAndForget(repoPath, git(repoPath, "rev-parse", branch).then((r) => {
@@ -20450,8 +20514,8 @@ function watchDefaultBranch(repoPath, branch, onMove) {
       log.debug(repoPath, `not watching ${p}`, e);
     }
   };
-  tryWatch(join13(repoPath, ".git"));
-  tryWatch(join13(repoPath, ".git", "refs", "heads"));
+  tryWatch(join14(repoPath, ".git"));
+  tryWatch(join14(repoPath, ".git", "refs", "heads"));
   return () => {
     for (const w of watchers)
       w.close();
@@ -20473,7 +20537,7 @@ function watchWorktreeDir(repoPath, onChange) {
     }, 300);
   };
   const arm = (commonDir) => {
-    const dir = join13(commonDir, "worktrees");
+    const dir = join14(commonDir, "worktrees");
     const armInner = () => {
       inner?.close();
       inner = null;
@@ -20516,7 +20580,7 @@ function watchWorktreeDir(repoPath, onChange) {
 function watchConfigFile(repoPath, onChange) {
   const atRoot = new Set([CONFIG_FILES.root.shared, CONFIG_FILES.root.local, CONFIG_DIR]);
   const inDir = new Set([CONFIG_FILES.folder.shared, CONFIG_FILES.folder.local].map((rel) => basename2(rel)));
-  const dir = join13(repoPath, CONFIG_DIR);
+  const dir = join14(repoPath, CONFIG_DIR);
   let timer = null;
   let outer = null;
   let inner = null;
@@ -20531,7 +20595,7 @@ function watchConfigFile(repoPath, onChange) {
   const armInner = () => {
     inner?.close();
     inner = null;
-    if (!existsSync16(dir))
+    if (!existsSync17(dir))
       return;
     try {
       inner = watch(dir, (_event, filename) => {
@@ -20585,7 +20649,7 @@ class RepoRegistry {
   }
   async boot() {
     const { state } = this.d;
-    const gone = state.worktrees.filter((wt) => !existsSync17(wt.path) || !state.repos.some((r) => r.id === wt.repoId));
+    const gone = state.worktrees.filter((wt) => !existsSync18(wt.path) || !state.repos.some((r) => r.id === wt.repoId));
     for (const wt of gone)
       await this.d.worktrees.forgetGone(wt);
     for (const repo of state.repos) {
@@ -20652,7 +20716,7 @@ class RepoRegistry {
       return `${repo.name} is set up now`;
     if (main.promptedAt || main.lastTurn)
       return `${repo.name} has a chat now`;
-    if (existsSync17(join14(repo.path, ".claude")))
+    if (existsSync18(join15(repo.path, ".claude")))
       return `an agent has already run in ${repo.name}`;
     if ((await statusFiles(repo.path)).length > 0 || !await treeEmpty(repo.path)) {
       return `${repo.name} has files in it now`;
@@ -20729,7 +20793,7 @@ class RepoRegistry {
   }
   async register(rawPath, made) {
     const path = expandTilde(rawPath);
-    if (!existsSync17(path))
+    if (!existsSync18(path))
       throw new UserError(`${path} does not exist`);
     if (!await isGitRepo(path))
       throw new UserError(`${path} is not a git repository`);
@@ -20802,10 +20866,10 @@ class RepoRegistry {
       throw new UserError(current.reason);
     const was = configTarget(repo.path, !!repo.made);
     const rel = configSibling(was, kind);
-    const moved = rel !== was && existsSync17(join14(repo.path, was));
+    const moved = rel !== was && existsSync18(join15(repo.path, was));
     if (moved && !(kind === "local" && await isTracked(repo.path, was))) {
       try {
-        rmSync2(join14(repo.path, was));
+        rmSync2(join15(repo.path, was));
       } catch (e) {
         log.warn(repoId, `could not remove ${was}`, e);
       }
@@ -20814,10 +20878,10 @@ class RepoRegistry {
     }
     if (isLocalConfigFile(rel))
       await excludeFromGit(repo.path, rel);
-    const file = join14(repo.path, rel);
+    const file = join15(repo.path, rel);
     try {
-      mkdirSync5(dirname6(file), { recursive: true });
-      writeFileSync6(file, configText(repo.path, rel, config));
+      mkdirSync6(dirname6(file), { recursive: true });
+      writeFileSync7(file, configText(repo.path, rel, config));
     } catch (e) {
       log.warn(repoId, `could not write ${rel}`, e);
     }
@@ -20891,7 +20955,7 @@ class RepoRegistry {
   }
   placeConfig(repo) {
     const rel = configTarget(repo.path, !!repo.made);
-    if (isLocalConfigFile(rel) && existsSync17(join14(repo.path, rel))) {
+    if (isLocalConfigFile(rel) && existsSync18(join15(repo.path, rel))) {
       fireAndForget(repo.id, excludeFromGit(repo.path, rel), "exclude local settings");
     }
     if (repo.configFile === rel)
@@ -20966,7 +21030,7 @@ class RepoRegistry {
 }
 
 // ../daemon/src/routes/service.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 
 // ../daemon/src/routes/fileRouters.ts
 var SKIP = /(^|\/)(node_modules|dist|build|out|coverage|\.next|\.nuxt|\.output|\.svelte-kit|\.vercel|\.netlify)\//;
@@ -22166,7 +22230,7 @@ class RouteService {
     return mergeRoutes(fileRoutes(paths, roots), code);
   }
   async cachedRead(root, path, had, kept, decode) {
-    const abs = join15(root, path);
+    const abs = join16(root, path);
     const stat = await this.fs.stat(abs);
     if (!stat)
       return null;
@@ -22191,7 +22255,7 @@ class RouteService {
     }
   }
   async hash(root, file) {
-    const abs = join15(root, file);
+    const abs = join16(root, file);
     const stat = await this.fs.stat(abs);
     if (!stat)
       return null;
@@ -22235,7 +22299,7 @@ class RouteService {
 }
 
 // ../daemon/src/runtime/bridge-script.ts
-import { existsSync as existsSync18, readFileSync as readFileSync11, statSync as statSync5 } from "fs";
+import { existsSync as existsSync19, readFileSync as readFileSync12, statSync as statSync5 } from "fs";
 var LEARNED_MAX = 8;
 
 class BridgeScript {
@@ -22265,7 +22329,7 @@ class BridgeScript {
     this.cache = null;
   }
   get() {
-    if (!existsSync18(this.path))
+    if (!existsSync19(this.path))
       return "// toyon bridge not built";
     const s = statSync5(this.path);
     const stamp = `${s.mtimeMs}:${s.size}`;
@@ -22274,7 +22338,7 @@ class BridgeScript {
     this.stamp = stamp;
     const origins = [...this.origins, ...this.learned];
     this.cache = `window.__toyonShellOrigins=${JSON.stringify(origins)};
-${readFileSync11(this.path, "utf8")}`;
+${readFileSync12(this.path, "utf8")}`;
     return this.cache;
   }
 }
@@ -22647,50 +22711,50 @@ class PairCodes {
 }
 
 // ../daemon/src/agent/config.ts
-import { existsSync as existsSync19, readFileSync as readFileSync12 } from "fs";
+import { existsSync as existsSync20, readFileSync as readFileSync13 } from "fs";
 import { homedir as homedir8 } from "os";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 function agentConfigFiles(spec, repoPath, home = homedir8()) {
   const file = (id, label, path) => ({
     id,
     label,
     path,
-    exists: existsSync19(path)
+    exists: existsSync20(path)
   });
   if (spec.id === "claude") {
     return [
-      file("user-config", "user config (MCP servers, projects)", join16(home, ".claude.json")),
-      file("user-settings", "user settings (permissions, hooks)", join16(home, ".claude", "settings.json")),
-      ...repoPath ? [file("project-mcp", "project MCP servers", join16(repoPath, ".mcp.json"))] : [],
-      ...repoPath ? [file("project-settings", "project settings", join16(repoPath, ".claude", "settings.json"))] : []
+      file("user-config", "user config (MCP servers, projects)", join17(home, ".claude.json")),
+      file("user-settings", "user settings (permissions, hooks)", join17(home, ".claude", "settings.json")),
+      ...repoPath ? [file("project-mcp", "project MCP servers", join17(repoPath, ".mcp.json"))] : [],
+      ...repoPath ? [file("project-settings", "project settings", join17(repoPath, ".claude", "settings.json"))] : []
     ];
   }
   if (spec.id === "codex")
-    return [file("user-config", "config", join16(home, ".codex", "config.toml"))];
+    return [file("user-config", "config", join17(home, ".codex", "config.toml"))];
   return [];
 }
 function describeAgentConfig(spec, repoPath, home = homedir8()) {
   const files = agentConfigFiles(spec, repoPath, home);
   const servers = [];
   if (spec.id === "claude") {
-    const user = readJson(join16(home, ".claude.json"));
+    const user = readJson(join17(home, ".claude.json"));
     servers.push(...serversOf(user?.mcpServers, "user"));
     if (repoPath) {
       const projects = user?.projects;
       const mine = projects?.[repoPath];
       servers.push(...serversOf(mine?.mcpServers, "local"));
-      servers.push(...serversOf(readJson(join16(repoPath, ".mcp.json"))?.mcpServers, "project"));
+      servers.push(...serversOf(readJson(join17(repoPath, ".mcp.json"))?.mcpServers, "project"));
     }
   } else if (spec.id === "codex") {
-    servers.push(...codexServers(join16(home, ".codex", "config.toml")));
+    servers.push(...codexServers(join17(home, ".codex", "config.toml")));
   }
   return { agent: spec.id, files, servers };
 }
 function readJson(path) {
-  if (!existsSync19(path))
+  if (!existsSync20(path))
     return null;
   try {
-    const v = JSON.parse(readFileSync12(path, "utf8"));
+    const v = JSON.parse(readFileSync13(path, "utf8"));
     return v && typeof v === "object" && !Array.isArray(v) ? v : null;
   } catch (e) {
     log.warn("agent-config", `${path} is not valid JSON`, e);
@@ -22708,11 +22772,11 @@ function serversOf(raw, scope) {
   });
 }
 function codexServers(path) {
-  if (!existsSync19(path))
+  if (!existsSync20(path))
     return [];
   const out = [];
   let current = null;
-  for (const raw of readFileSync12(path, "utf8").split(`
+  for (const raw of readFileSync13(path, "utf8").split(`
 `)) {
     const line = raw.trim();
     const header = /^\[mcp_servers\.("?)([^\]"]+)\1\]$/.exec(line);
@@ -23698,8 +23762,8 @@ async function dispatch(msg, ctx, s) {
 }
 
 // ../daemon/src/server/http.ts
-import { existsSync as existsSync20 } from "fs";
-import { join as join17 } from "path";
+import { existsSync as existsSync21 } from "fs";
+import { join as join18 } from "path";
 var IMMUTABLE = "private, max-age=31536000, immutable";
 var NO_STORE = "no-store";
 function createFetch(opts) {
@@ -23821,7 +23885,7 @@ function createFetch(opts) {
         return new Response("unauthorized", { status: 401 });
       const [worktreeId, file, extra] = url.pathname.slice("/attachments/".length).split("/");
       const places = worktreeId && file && !extra ? [opts.attachments.fileFor(worktreeId, file), opts.archivedAttachment(worktreeId, file)] : [];
-      const path = places.find((p) => !!p && existsSync20(p));
+      const path = places.find((p) => !!p && existsSync21(p));
       if (!path)
         return new Response("not found", { status: 404 });
       return new Response(Bun.file(path), { headers: { "cache-control": IMMUTABLE } });
@@ -23842,15 +23906,15 @@ function createFetch(opts) {
       });
     }
     const rel = url.pathname === "/" ? "/index.html" : url.pathname;
-    const file = join17(opts.shellDist, rel.replaceAll("..", ""));
+    const file = join18(opts.shellDist, rel.replaceAll("..", ""));
     const hashed = rel.startsWith("/assets/");
-    if (existsSync20(file) && Bun.file(file).size > 0) {
+    if (existsSync21(file) && Bun.file(file).size > 0) {
       return new Response(Bun.file(file), { headers: { "cache-control": hashed ? IMMUTABLE : NO_STORE } });
     }
     if (hashed)
       return new Response("not found", { status: 404 });
-    const index = join17(opts.shellDist, "index.html");
-    if (existsSync20(index))
+    const index = join18(opts.shellDist, "index.html");
+    if (existsSync21(index))
       return new Response(Bun.file(index), { headers: { "cache-control": NO_STORE } });
     return new Response("Toyon daemon running; shell not built (run: bun run build)", { status: 200 });
   };
@@ -24218,16 +24282,16 @@ function startServer(opts) {
 }
 
 // ../daemon/src/themes/store.ts
-import { existsSync as existsSync21, readdirSync as readdirSync5, readFileSync as readFileSync13, statSync as statSync6, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync22, readdirSync as readdirSync5, readFileSync as readFileSync14, statSync as statSync6, writeFileSync as writeFileSync8 } from "fs";
 import { homedir as homedir10 } from "os";
-import { basename as basename4, dirname as dirname7, join as join18, resolve as resolve8 } from "path";
+import { basename as basename4, dirname as dirname7, join as join19, resolve as resolve8 } from "path";
 var home = homedir10();
 var defaultExtensionDirs = [
-  join18(home, ".vscode", "extensions"),
-  join18(home, ".vscode-insiders", "extensions"),
-  join18(home, ".vscode-oss", "extensions"),
-  join18(home, ".cursor", "extensions"),
-  join18(home, ".windsurf", "extensions"),
+  join19(home, ".vscode", "extensions"),
+  join19(home, ".vscode-insiders", "extensions"),
+  join19(home, ".vscode-oss", "extensions"),
+  join19(home, ".cursor", "extensions"),
+  join19(home, ".windsurf", "extensions"),
   "/Applications/Visual Studio Code.app/Contents/Resources/app/extensions",
   "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/extensions",
   "/Applications/Cursor.app/Contents/Resources/app/extensions",
@@ -24311,14 +24375,14 @@ class ThemeStore {
       name: json?.name ?? base,
       source: "file"
     });
-    writeFileSync7(join18(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
+    writeFileSync8(join19(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
 `);
     this.load();
     return theme;
   }
 }
 function readJsonc(file) {
-  return parse6(readFileSync13(file, "utf8"), [], { allowTrailingComma: true });
+  return parse6(readFileSync14(file, "utf8"), [], { allowTrailingComma: true });
 }
 function readVscodeTheme(file, depth = 0) {
   const json = readJsonc(file);
@@ -24340,13 +24404,13 @@ function readVscodeTheme(file, depth = 0) {
   return t;
 }
 function loadDir(dir) {
-  if (!existsSync21(dir))
+  if (!existsSync22(dir))
     return [];
   const out = [];
   for (const f of readdirSync5(dir)) {
     if (!/\.jsonc?$/i.test(f))
       continue;
-    const file = join18(dir, f);
+    const file = join19(dir, f);
     const id = `file:${slug(f.replace(/\.(json|jsonc)$/i, ""))}`;
     try {
       const json = readJsonc(file);
@@ -24362,7 +24426,7 @@ function loadDir(dir) {
   return out;
 }
 function discover(dir) {
-  if (!existsSync21(dir))
+  if (!existsSync22(dir))
     return [];
   const out = [];
   let entries;
@@ -24372,21 +24436,21 @@ function discover(dir) {
     return out;
   }
   for (const name of entries) {
-    const extDir = join18(dir, name);
-    const pkgFile = join18(extDir, "package.json");
+    const extDir = join19(dir, name);
+    const pkgFile = join19(extDir, "package.json");
     try {
-      if (!statSync6(extDir).isDirectory() || !existsSync21(pkgFile))
+      if (!statSync6(extDir).isDirectory() || !existsSync22(pkgFile))
         continue;
-      const pkg = JSON.parse(readFileSync13(pkgFile, "utf8"));
+      const pkg = JSON.parse(readFileSync14(pkgFile, "utf8"));
       const themes = pkg.contributes?.themes;
       if (!Array.isArray(themes))
         continue;
       const ext = `${pkg.publisher ?? "local"}.${pkg.name ?? name}`;
       let nls = {};
-      const nlsFile = join18(extDir, "package.nls.json");
-      if (existsSync21(nlsFile)) {
+      const nlsFile = join19(extDir, "package.nls.json");
+      if (existsSync22(nlsFile)) {
         try {
-          nls = JSON.parse(readFileSync13(nlsFile, "utf8"));
+          nls = JSON.parse(readFileSync14(nlsFile, "utf8"));
         } catch {}
       }
       for (const c of themes) {
@@ -25210,8 +25274,8 @@ function rankRefs({ refs, merged, prs, query, defaultBranch, rowIdForPath }) {
 }
 
 // ../daemon/src/worktrees/service.ts
-import { existsSync as existsSync23, lstatSync, readlinkSync, rmSync as rmSync5, symlinkSync, unlinkSync } from "fs";
-import { basename as basename6, dirname as dirname8, join as join21 } from "path";
+import { existsSync as existsSync24, lstatSync, readFileSync as readFileSync16, readlinkSync, rmSync as rmSync5, symlinkSync, unlinkSync } from "fs";
+import { basename as basename6, dirname as dirname8, join as join22 } from "path";
 
 // ../daemon/src/git/archive.ts
 import { rmSync as rmSync3 } from "fs";
@@ -25220,12 +25284,16 @@ async function keepState(repoPath, wtPath, ref, indexFile) {
   const head = await git(wtPath, "rev-parse", "--verify", "HEAD");
   if (!head.ok)
     return null;
-  const status = await git(wtPath, "status", "--porcelain");
-  const dirty = !status.ok || status.out !== "";
+  const status = await gitRaw(wtPath, "status", "--porcelain", "-uall");
+  const files = status.ok ? parsePorcelain(status.out).length : null;
+  const dirty = files === null || files > 0;
   const snapshot = dirty ? await snapshotCommit(wtPath, head.out, indexFile) : null;
   if (!(await git(repoPath, "update-ref", ref, snapshot ?? head.out)).ok)
     return null;
-  return { head: head.out, ...snapshot ? { snapshot } : dirty ? { lost: true } : {} };
+  return {
+    head: head.out,
+    ...snapshot ? { snapshot, ...files ? { dirty: files } : {} } : dirty ? { lost: true } : {}
+  };
 }
 async function snapshotCommit(wtPath, head, indexFile) {
   const env = { GIT_INDEX_FILE: indexFile };
@@ -25497,20 +25565,20 @@ function compareUrl(remoteUrl, base, branch) {
 }
 
 // ../daemon/src/worktrees/archive.ts
-import { existsSync as existsSync22, mkdirSync as mkdirSync6, readdirSync as readdirSync6, readFileSync as readFileSync14, renameSync as renameSync4, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "fs";
-import { join as join19 } from "path";
+import { existsSync as existsSync23, mkdirSync as mkdirSync7, readdirSync as readdirSync6, readFileSync as readFileSync15, renameSync as renameSync4, rmSync as rmSync4, writeFileSync as writeFileSync9 } from "fs";
+import { join as join20 } from "path";
 class WorktreeArchive {
   dir;
   records = new Map;
   constructor(dir) {
     this.dir = dir;
-    mkdirSync6(dir, { recursive: true });
+    mkdirSync7(dir, { recursive: true });
     for (const id of readdirSync6(dir)) {
       const file = this.filesOf(id).record;
-      if (!existsSync22(file))
+      if (!existsSync23(file))
         continue;
       try {
-        this.records.set(id, JSON.parse(readFileSync14(file, "utf8")));
+        this.records.set(id, JSON.parse(readFileSync15(file, "utf8")));
       } catch (e) {
         log.warn("archive", `skipped an unreadable record: ${file}`, e);
       }
@@ -25521,10 +25589,10 @@ class WorktreeArchive {
   }
   put(rec, from) {
     const at = this.filesOf(rec.worktree.id);
-    mkdirSync6(at.dir, { recursive: true });
+    mkdirSync7(at.dir, { recursive: true });
     move(from.transcript, at.transcript);
     move(from.attachments, at.attachments);
-    writeFileSync8(at.record, JSON.stringify(rec, null, 2));
+    writeFileSync9(at.record, JSON.stringify(rec, null, 2));
     this.records.set(rec.worktree.id, rec);
   }
   take(id, to) {
@@ -25551,12 +25619,12 @@ class WorktreeArchive {
     return { transcript: at.transcript, attachments: at.attachments };
   }
   filesOf(id) {
-    const dir = join19(this.dir, id);
+    const dir = join20(this.dir, id);
     return {
       dir,
-      record: join19(dir, "record.json"),
-      transcript: join19(dir, "transcript.jsonl"),
-      attachments: join19(dir, "attachments")
+      record: join20(dir, "record.json"),
+      transcript: join20(dir, "transcript.jsonl"),
+      attachments: join20(dir, "attachments")
     };
   }
 }
@@ -25571,16 +25639,16 @@ function summarize(r, repoId) {
     archivedAt: r.archivedAt,
     ...r.prompt ? { prompt: r.prompt } : {},
     restorable: !!r.kept,
-    ...r.kept?.snapshot ? { uncommitted: true } : {},
+    ...r.kept?.snapshot ? { uncommitted: true, ...r.kept.dirty ? { dirty: r.kept.dirty } : {} } : {},
     ...r.worktree.landed ? { landed: true } : {},
     ...r.cost !== undefined ? { cost: r.cost } : {},
     ...r.auto ? { auto: r.auto } : {}
   };
 }
 function lastUsage(transcript) {
-  if (!existsSync22(transcript))
+  if (!existsSync23(transcript))
     return null;
-  const lines = readFileSync14(transcript, "utf8").split(`
+  const lines = readFileSync15(transcript, "utf8").split(`
 `);
   for (let i = lines.length - 1;i >= 0; i--) {
     if (!lines[i]?.includes('"usage"'))
@@ -25594,9 +25662,9 @@ function lastUsage(transcript) {
   return null;
 }
 function firstPrompt(transcript) {
-  if (!existsSync22(transcript))
+  if (!existsSync23(transcript))
     return;
-  for (const line of readFileSync14(transcript, "utf8").split(`
+  for (const line of readFileSync15(transcript, "utf8").split(`
 `)) {
     if (!line.includes('"user-message"'))
       continue;
@@ -25609,7 +25677,7 @@ function firstPrompt(transcript) {
   return;
 }
 function move(from, to) {
-  if (!existsSync22(from))
+  if (!existsSync23(from))
     return;
   rmSync4(to, { recursive: true, force: true });
   renameSync4(from, to);
@@ -25673,7 +25741,7 @@ class ArchivedGit {
 }
 
 // ../daemon/src/worktrees/spare.ts
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 class SparePool {
   d;
   spares = new Map;
@@ -25722,7 +25790,7 @@ class SparePool {
     this.spares.set(repoId, entry);
     try {
       const slug = `wt-${shortId().slice(0, 4)}`;
-      const wtPath = join20(this.d.paths.worktreesDir, repo.name, slug);
+      const wtPath = join21(this.d.paths.worktreesDir, repo.name, slug);
       await withRepoLock(repo.path, () => gitOrThrow(repo.path, "worktree", "add", "--detach", wtPath, repo.defaultBranch));
       const wt = {
         id: shortId(),
@@ -25953,6 +26021,7 @@ function stopOf(prev, next) {
 
 // ../daemon/src/worktrees/service.ts
 var LOCAL_CONFIG_FILES = [".env", ".env.local", ".env.development", ".env.development.local", ".dev.vars"];
+var BASE_IGNORE = "base .gitignore";
 function withoutAttachments(event) {
   if (event.type !== "user-message")
     return event;
@@ -25973,6 +26042,7 @@ class WorktreeService {
   spare;
   archive;
   archiving = new Map;
+  going = new Set;
   countsCache = new Map;
   discoverCache = new Map;
   usage = new Map;
@@ -26055,7 +26125,7 @@ class WorktreeService {
         throw new UserError(carried.unmoved);
       return claimed;
     }
-    const wtPath = join21(this.d.paths.worktreesDir, repo.name, slug);
+    const wtPath = join22(this.d.paths.worktreesDir, repo.name, slug);
     await withRepoLock(repo.path, () => gitOrThrow(repo.path, "worktree", "add", "-b", branch, wtPath, repo.defaultBranch));
     const wt = {
       id: shortId(),
@@ -26106,6 +26176,9 @@ class WorktreeService {
 `).indexOf(sha);
         return i < 0 ? null : `stash@{${i}}`;
       };
+      const carried = await git(repo.path, "ls-tree", "-r", "--name-only", `${sha}^3`);
+      const restored = (carried.ok ? carried.out.split(`
+`).filter(Boolean) : []).filter((p) => !existsSync24(join22(wt.path, p)));
       const applied = await git(wt.path, "stash", "apply", sha);
       if (applied.ok) {
         const ref = await entry();
@@ -26115,7 +26188,9 @@ class WorktreeService {
       }
       log.warn(wt.id, `moving ${main}'s changes failed`, applied.err);
       await git(wt.path, "reset", "--hard");
-      await git(wt.path, "clean", "-fd");
+      for (let i = 0;i < restored.length; i += 100) {
+        await git(wt.path, "--literal-pathspecs", "clean", "-fd", "--", ...restored.slice(i, i + 100));
+      }
       const ref = await entry();
       const back = ref ? await git(repo.path, "stash", "pop", ref) : null;
       return back?.ok ? `the changes on ${main} did not apply in ${wt.title}, so they stayed on ${main}` : `the changes on ${main} did not apply in ${wt.title}; they are kept in git stash as "toyon: into ${wt.title}"`;
@@ -26139,9 +26214,9 @@ class WorktreeService {
     const branch = kind === "pr" ? `pr/${number}` : ref;
     const title = kind === "pr" ? `pr-${number}` : cleanTitle2(ref) || "branch";
     let slug = title;
-    if (existsSync23(join21(this.d.paths.worktreesDir, repo.name, slug)))
+    if (existsSync24(join22(this.d.paths.worktreesDir, repo.name, slug)))
       slug = `${slug}-${shortId().slice(0, 4)}`;
-    const wtPath = join21(this.d.paths.worktreesDir, repo.name, slug);
+    const wtPath = join22(this.d.paths.worktreesDir, repo.name, slug);
     await withRepoLock(repo.path, async () => {
       const out = (await listWorktrees(repo.path)).find((w) => w.branch === branch);
       if (out)
@@ -26317,6 +26392,14 @@ class WorktreeService {
     this.d.drafts?.drop(worktreeId);
   }
   async takeDown(wt, archive, reason) {
+    this.going.add(wt.id);
+    try {
+      return await this.removeAndRecord(wt, archive, reason);
+    } finally {
+      this.going.delete(wt.id);
+    }
+  }
+  async removeAndRecord(wt, archive, reason) {
     const worktreeId = wt.id;
     const repo = this.d.state.requireRepo(wt.repoId);
     await this.d.runtime.stop(worktreeId);
@@ -26348,7 +26431,7 @@ class WorktreeService {
     return archived;
   }
   async keep(repo, wt) {
-    const index = join21(this.d.paths.archiveDir, `${wt.id}.index`);
+    const index = join22(this.d.paths.archiveDir, `${wt.id}.index`);
     const kept = await keepState(repo.path, wt.path, archiveRef(wt.id), index);
     if (!kept)
       log.warn(wt.id, "could not keep its git state");
@@ -26436,7 +26519,7 @@ class WorktreeService {
   }
   archivedAttachment(archiveId, file) {
     const files = this.archive.chatFiles(archiveId);
-    return files && isAttachmentFile(file) ? join21(files.attachments, file) : null;
+    return files && isAttachmentFile(file) ? join22(files.attachments, file) : null;
   }
   archivedGit(archiveId) {
     const rec = this.archive.get(archiveId);
@@ -26476,7 +26559,7 @@ class WorktreeService {
       throw new UserError(`${old.title} was archived without its commits, so there is nothing to restore`);
     if (rec.auto)
       log.info(old.id, `restoring a worktree that archived itself (${rec.auto})`);
-    const path = existsSync23(old.path) ? join21(dirname8(old.path), `${basename6(old.path)}-${shortId().slice(0, 4)}`) : old.path;
+    const path = existsSync24(old.path) ? join22(dirname8(old.path), `${basename6(old.path)}-${shortId().slice(0, 4)}`) : old.path;
     const branch = await withRepoLock(repo.path, async () => {
       if (!await commitOf(repo.path, archiveRef(old.id))) {
         throw new UserError(`${old.title}'s kept commits are gone from git`);
@@ -26536,12 +26619,12 @@ class WorktreeService {
       return;
     const repo = this.repoOf(rec);
     const repoPath = repo?.path ?? rec.repoPath;
-    if (rec.kept && existsSync23(repoPath)) {
+    if (rec.kept && existsSync24(repoPath)) {
       const r = await git(repoPath, "update-ref", "-d", archiveRef(archiveId));
       if (!r.ok)
         log.warn(archiveId, `could not drop its archive ref: ${r.err}`);
     }
-    if (rec.worktree.lands?.length && existsSync23(repoPath))
+    if (rec.worktree.lands?.length && existsSync24(repoPath))
       await dropLandRefs(repoPath, archiveId);
     this.archive.delete(archiveId);
     this.d.drafts?.drop(archiveId);
@@ -26579,7 +26662,7 @@ class WorktreeService {
     if (!hasOwnBranch(wt))
       return;
     const name = wt.branch.replace(/^toyon\//, "");
-    const desired = wt.kind === "worktree" ? join21(dirname8(wt.path), name) : wt.path;
+    const desired = wt.kind === "worktree" ? join22(dirname8(wt.path), name) : wt.path;
     if (wt.linkPath && wt.linkPath !== desired)
       this.dropLink(wt);
     if (desired === wt.path)
@@ -26671,10 +26754,18 @@ class WorktreeService {
       this.d.runtime.markSetup(wt.id, false);
     }
   }
+  async mirrorBaseIgnore(wt, repo, depsSource) {
+    const src = join22(depsSource, ".gitignore");
+    const mirror = existsSync24(src) && !existsSync24(join22(wt.path, ".gitignore"));
+    const lines = mirror ? readFileSync16(src, "utf8").split(`
+`).filter((l) => l.trim() !== "") : [];
+    await excludeBlock(repo.path, BASE_IGNORE, lines);
+  }
   async setupThenStart(wt, repo, depsSource, { setupCommands = true }) {
-    const srcNm = join21(depsSource, "node_modules");
-    const dstNm = join21(wt.path, "node_modules");
-    if (existsSync23(srcNm) && !existsSync23(dstNm)) {
+    await this.mirrorBaseIgnore(wt, repo, depsSource);
+    const srcNm = join22(depsSource, "node_modules");
+    const dstNm = join22(wt.path, "node_modules");
+    if (existsSync24(srcNm) && !existsSync24(dstNm)) {
       const started = Date.now();
       const attempts = [
         ["clonefile", ["-Rc", srcNm, dstNm]],
@@ -26690,10 +26781,10 @@ class WorktreeService {
       }
     }
     for (const f of LOCAL_CONFIG_FILES) {
-      const src = join21(depsSource, f);
-      if (!existsSync23(src) || existsSync23(join21(wt.path, f)))
+      const src = join22(depsSource, f);
+      if (!existsSync24(src) || existsSync24(join22(wt.path, f)))
         continue;
-      const r = await run("cp", [src, join21(wt.path, f)], wt.path);
+      const r = await run("cp", [src, join22(wt.path, f)], wt.path);
       if (r.ok)
         this.d.hub.emit("log", wt.id, "setup", `copied ${f}`);
       else
@@ -27004,9 +27095,14 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     const cached = this.countsCache.get(id);
     if (cached && Date.now() - cached.at < 1e4)
       return cached;
+    if (this.going.has(id))
+      return cached ?? {};
     try {
       const ab = countable ? await aheadBehind(path, defaultBranch) : await this.mainCounts(path);
-      const fresh = { ...ab, dirty: (await statusFiles(path)).length, at: Date.now() };
+      const dirty = (await statusFiles(path)).length;
+      if (this.going.has(id))
+        return cached ?? {};
+      const fresh = { ...ab, dirty, at: Date.now() };
       this.countsCache.set(id, fresh);
       return fresh;
     } catch {
@@ -27044,6 +27140,8 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     };
   }
   async gitStatus(worktreeId) {
+    if (this.going.has(worktreeId))
+      return null;
     const r = this.readable(worktreeId);
     if (!r)
       return this.archivedStatus(worktreeId);
@@ -27065,6 +27163,8 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
         this.setLanding(r.wt.id, undefined);
       if (r.wt && isMain)
         this.setEmpty(r.wt, files.length === 0 ? await treeEmpty(r.path) : false);
+      if (this.going.has(worktreeId))
+        return null;
       this.noteCounts(worktreeId, isMain, files.length, counts);
       return { files, committed, head: head.ok ? head.out : undefined, ...counts };
     } catch (e) {
@@ -27449,7 +27549,7 @@ bridge.setShellOrigins([
   ],
   ...remote ? [`https://${remote.host}`] : []
 ]);
-writeFileSync9(paths.pidFile, `${process.pid}
+writeFileSync10(paths.pidFile, `${process.pid}
 `);
 var stopLagSampler = startLagSampler();
 await repos.boot();