pitroom 0.25.0 → 0.27.0

package/dist/lib.mjs

@@ -542,7 +542,7 @@ function denyCommandRules() {
     "command(eval)"
   ];
 }
-function workerSettings(workspace, workerHome3, reads = []) {
+function workerSettings(workspace, workerHome3, reads = [], writes = false) {
   const real = (p) => {
     try {
       return fs6.realpathSync.native(p);
@@ -566,6 +566,8 @@ function workerSettings(workspace, workerHome3, reads = []) {
       allow: [
         "command(*)",
         ...both(path5.join(dataDir(workerHome3), "brain")).map((p) => `write_file(${rulePath(p)})`),
+        // agy 1.4 asks for edits in the workspace too, --mode accept-edits or not, and a headless run cannot ask
+        ...writes ? both(workspace).map((p) => `write_file(${rulePath(p)})`) : [],
         ...toolchains().flatMap(both).map((p) => `read_file(${rulePath(p)})`),
         // what the task names outside the workspace: a headless agy cannot ask, and would end the turn unanswered
         ...reads.map((r) => r.path).flatMap(both).map((p) => `read_file(${rulePath(p)})`)
@@ -691,12 +693,12 @@ function baseSettings() {
 }
 var rulePath = (p) => p.replace(/^[A-Za-z]:(?=[\\/])/, "").replace(/\\/g, "/");
 var HOMES_KEPT_DAYS = 14;
-function workerHome(workspace, reads = []) {
+function workerHome(workspace, reads = [], writes = false) {
   const root = path5.join(home(), "antigravity-home");
   const id2 = crypto3.createHash("sha256").update(path5.resolve(workspace)).digest("hex").slice(0, 16);
   const dir = path5.join(root, id2);
   fs6.mkdirSync(dataDir(dir), { recursive: true });
-  writeIfChanged(path5.join(dataDir(dir), "settings.json"), `${JSON.stringify(workerSettings(workspace, dir, reads), null, 2)}
+  writeIfChanged(path5.join(dataDir(dir), "settings.json"), `${JSON.stringify(workerSettings(workspace, dir, reads, writes), null, 2)}
 `);
   if (process.platform === "darwin") {
     fs6.mkdirSync(path5.join(dir, "Library"), { recursive: true });
@@ -753,13 +755,13 @@ function invocation(req) {
   if (model) args.push("--model", model);
   if (effort) args.push("--effort", effort);
   const { command, prefix } = resolveCommand(binary());
-  const workerDir = workerHome(req.cwd, outsideReads(prompt, req.cwd, req.project?.root));
+  const workerDir = workerHome(req.cwd, outsideReads(prompt, req.cwd, req.project?.root), req.mode !== "read");
   const env = { HOME: workerDir };
   if (process.platform === "win32") env.USERPROFILE = workerDir;
   return { command, args: [...prefix, ...args], env };
 }
 function classify(message) {
-  if (/RESOURCE_EXHAUSTED|\b429\b|quota|rate.?limit|too many requests|overloaded|\b503\b|capacity/i.test(message)) return "rate-limited";
+  if (/usage limit|session limit|RESOURCE_EXHAUSTED|\b429\b|quota|rate.?limit|too many requests|overloaded|\b503\b|capacity/i.test(message)) return "rate-limited";
   if (/not (signed|logged) in|\bsign.?in\b|\blog ?in\b|authenticat|PERMISSION_DENIED|oauth|credential|keyring|keychain|\b401\b|unauthori[sz]ed/i.test(message)) {
     return "auth";
   }
@@ -810,9 +812,10 @@ function doctor({ models, hasFallback }) {
   }
   const checks = [
     { level: "ok", message: `Antigravity CLI ${version.out.trim().split("\n")[0]} at ${binary()}` },
-    {
+    // checked on macOS (agy 1.4.7, scripts/check-worker.mjs); Linux and Windows not run yet
+    process.platform === "darwin" ? { level: "ok", message: "agy has no read-only mode for headless runs, so its read runs always read a snapshot of the project; prefer -i for changes" } : {
       level: "warn",
-      message: "the Antigravity worker is in beta (checked against agy 1.3.5). agy has no read-only mode for headless runs, so its read runs always read a snapshot of the project; prefer -i for changes"
+      message: `the Antigravity worker is in beta on ${process.platform === "win32" ? "Windows" : "Linux"} (checked on macOS only; node scripts/check-worker.mjs antigravity tries it here). agy has no read-only mode for headless runs, so its read runs always read a snapshot of the project; prefer -i for changes`
     }
   ];
   if (process.platform === "win32") {
@@ -997,7 +1000,7 @@ function classify2(message) {
   if (/authentication_failed|failed to authenticate|oauth|not logged in|\/login|invalid api key|\b40[13]\b|unauthori[sz]ed/i.test(message)) {
     return "auth";
   }
-  if (/rate.?limit|too many requests|\b429\b|\b529\b|overloaded|usage limit|limit reached|quota|capacity/i.test(message)) return "rate-limited";
+  if (/usage limit|session limit|limit reached|rate.?limit|too many requests|\b429\b|\b529\b|overloaded|quota|capacity/i.test(message)) return "rate-limited";
   if (/model[^.]*(not found|does not exist|invalid|not available)|invalid model|not_found_error/i.test(message)) return "model-unavailable";
   return "other";
 }
@@ -1198,7 +1201,7 @@ function classify3(message) {
   if (/not supported|model[^.]*(not found|does not exist|unknown|unavailable)|unsupported model|no such model/i.test(message)) {
     return "model-unavailable";
   }
-  if (/rate.?limit|too many requests|\b429\b|usage limit|quota|overloaded|\b50[23]\b|capacity/i.test(message)) return "rate-limited";
+  if (/usage limit|session limit|rate.?limit|too many requests|\b429\b|quota|overloaded|\b50[23]\b|capacity/i.test(message)) return "rate-limited";
   if (/unauthori[sz]ed|\b40[13]\b|not logged in|log ?in|api.?key|credits?\b|billing|subscription/i.test(message)) return "auth";
   return "other";
 }
@@ -1436,7 +1439,7 @@ function classify4(message) {
   if (/IneligibleTier|no longer supported for Gemini|error authenticating|not logged in|please (log ?in|sign in)|credentials|api key|UNAUTHENTICATED|PERMISSION_DENIED|\b40[13]\b|unauthori[sz]ed/i.test(message)) {
     return "auth";
   }
-  if (/RESOURCE_EXHAUSTED|\b429\b|quota|rate.?limit|too many requests|overloaded|\b503\b|exhausted your capacity|capacity/i.test(message)) return "rate-limited";
+  if (/usage limit|session limit|RESOURCE_EXHAUSTED|\b429\b|quota|rate.?limit|too many requests|overloaded|\b503\b|exhausted your capacity|capacity/i.test(message)) return "rate-limited";
   if (/model.{0,80}(not found|not available|no longer available|does not exist|unsupported|invalid)|\b404\b|NOT_FOUND|invalid model|is not supported/i.test(message)) return "model-unavailable";
   return "other";
 }
@@ -1880,7 +1883,7 @@ function majorVersion(output) {
 }
 function classify5(message) {
   if (/model not found|ModelNotFound|unknown model|no such model|deprecated/i.test(message)) return "model-unavailable";
-  if (/rate.?limit|too many requests|\b429\b|quota|overloaded|\b50[23]\b|unavailable|capacity/i.test(message)) return "rate-limited";
+  if (/usage limit|session limit|rate.?limit|too many requests|\b429\b|quota|overloaded|\b50[23]\b|unavailable|capacity/i.test(message)) return "rate-limited";
   if (/provider\.auth|FreeTierError|free tier|unauthori[sz]ed|\b40[13]\b|api.?key|insufficient|credits?\b|billing|payment/i.test(message)) {
     return "auth";
   }
@@ -2225,7 +2228,7 @@ function invocation7(req) {
 }
 function classify6(message) {
   if (/\b40[13]\b|incorrect api key|invalid api key|unauthori[sz]ed|authenticat|not logged in|no auth/i.test(message)) return "auth";
-  if (/\b429\b|rate.?limit|too many requests|quota|capacity|overloaded|\b529\b/i.test(message)) return "rate-limited";
+  if (/usage limit|session limit|\b429\b|rate.?limit|too many requests|quota|capacity|overloaded|\b529\b/i.test(message)) return "rate-limited";
   if (/model[^.]*(not found|does not exist|not available|not supported)|invalid model|model_not_found|\b404\b/i.test(message)) return "model-unavailable";
   return "other";
 }
@@ -2315,6 +2318,7 @@ var FILE_EXTENSIONS = new Set(
 );
 var SKIP_DIRS2 = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "build", "out", ".next", ".nuxt", "target", "vendor", ".venv", "venv", "__pycache__", "coverage", ".turbo", ".cache"]);
 var MAX_INDEXED = 6e4;
+var MAX_SKIPPED = 3e5;
 var EXTENSIONLESS = "Makefile|Dockerfile|Containerfile|Gemfile|Rakefile|Procfile|Justfile|Vagrantfile|BUILD|WORKSPACE";
 var REF = new RegExp(
   String.raw`(?<![\w/:.-])(\.{0,2}/?(?:[\w@.+-]+/)*(?:[\w@+-][\w@.+-]*\.[A-Za-z][A-Za-z0-9]{0,7}|${EXTENSIONLESS})):(\d+)(?:[-–](\d+))?`,
@@ -2373,13 +2377,17 @@ function verifyRefs(refs, dirs) {
     return lineCache.get(file);
   };
   let index;
+  let skipped;
   const byName = () => index ??= indexFiles(roots);
+  const inSkipped = () => skipped ??= indexFiles(roots, true);
   const candidates = (ref) => {
     const direct = resolve(ref.file, roots);
     if (direct) return [direct];
     if (path12.isAbsolute(ref.file)) return [];
     const wanted = ref.file.replace(/^(\.{1,2}\/)+/, "");
-    return (byName().get(path12.basename(wanted)) ?? []).filter((f) => f.split(path12.sep).join("/").endsWith(`/${wanted}`) || path12.basename(f) === wanted).slice(0, 20);
+    const fits = (f) => path12.basename(f) === wanted || foldersInOrder(f.split(path12.sep).join("/"), wanted);
+    const own = (byName().get(path12.basename(wanted)) ?? []).filter(fits);
+    return (own.length || !isFileName(wanted) ? own : (inSkipped().get(path12.basename(wanted)) ?? []).filter(fits)).slice(0, 20);
   };
   const check = (file, ref) => {
     const lines = load(file);
@@ -2418,10 +2426,23 @@ var isFileName = (name) => {
   const base = path12.basename(name);
   return !base.includes(".") || new RegExp(`^(${EXTENSIONLESS})$`).test(base) || FILE_EXTENSIONS.has(base.split(".").pop().toLowerCase());
 };
-function indexFiles(roots) {
+function foldersInOrder(file, wanted) {
+  const want = wanted.split("/");
+  const have = file.split("/");
+  if (have.at(-1) !== want.at(-1)) return false;
+  let i = have.length - 2;
+  for (let j = want.length - 2; j >= 0; j--) {
+    while (i >= 0 && have[i] !== want[j]) i--;
+    if (i < 0) return false;
+    i--;
+  }
+  return true;
+}
+function indexFiles(roots, skipped = false) {
   const index = /* @__PURE__ */ new Map();
+  const cap = skipped ? MAX_SKIPPED : MAX_INDEXED;
   let count = 0;
-  const walk = (dir) => {
+  const walk = (dir, within) => {
     let entries;
     try {
       entries = fs12.readdirSync(dir, { withFileTypes: true });
@@ -2429,10 +2450,12 @@ function indexFiles(roots) {
       return;
     }
     for (const e of entries) {
-      if (count >= MAX_INDEXED) return;
+      if (count >= cap) return;
       if (e.isDirectory()) {
-        if (!SKIP_DIRS2.has(e.name)) walk(path12.join(dir, e.name));
-      } else if (e.isFile()) {
+        if (e.name === ".git") continue;
+        const skip = SKIP_DIRS2.has(e.name);
+        if (skipped || !skip) walk(path12.join(dir, e.name), within || skip);
+      } else if (e.isFile() && within === skipped) {
         count++;
         const list2 = index.get(e.name);
         if (list2) list2.push(path12.join(dir, e.name));
@@ -2440,7 +2463,7 @@ function indexFiles(roots) {
       }
     }
   };
-  for (const r of roots) walk(r);
+  for (const r of roots) walk(r, false);
   return index;
 }
 function resolve(ref, roots) {
@@ -2493,6 +2516,7 @@ function fill(template, values) {
 // src/core/cooldown.ts
 var MAX_MS = 24 * 36e5;
 var OVERLOAD_MS = 20 * 6e4;
+var USAGE_MS = 36e5;
 var DAILY_MS = 4 * 36e5;
 function retryAfterMs(message) {
   const compact2 = /(?:retry|try again|resets?|available again)[^0-9]{0,24}((?:\d+(?:\.\d+)?\s*[dhms]\s*)+)/i.exec(message)?.[1];
@@ -2505,10 +2529,41 @@ function retryAfterMs(message) {
   }
   return ms > 0 ? ms : void 0;
 }
-function cooldownMs(message) {
-  const told = retryAfterMs(message);
+function wallClock(at, timeZone) {
+  const p = Object.fromEntries(
+    new Intl.DateTimeFormat("en-US", { timeZone, hourCycle: "h23", year: "numeric", month: "numeric", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric" }).formatToParts(at).map((x) => [x.type, Number(x.value)])
+  );
+  return Date.UTC(p.year, p.month - 1, p.day, p.hour, p.minute, p.second);
+}
+function retryAtMs(message, now = Date.now()) {
+  const m = /(?:try again at|resets?(?: at)?)\s+(\d{1,2})(?::(\d{2}))?\s*([ap])\.?m\b\.?(?:\s*\(([A-Za-z_]+(?:\/[A-Za-z0-9_+-]+)*)\))?/i.exec(message) ?? /(?:try again at|resets?(?: at)?)\s+(\d{1,2}):(\d{2})()(?!\d)(?:\s*\(([A-Za-z_]+(?:\/[A-Za-z0-9_+-]+)*)\))?/i.exec(message);
+  if (!m) return void 0;
+  let hour = Number(m[1]);
+  const minute = Number(m[2] ?? 0);
+  const half = m[3]?.toLowerCase();
+  if (minute > 59 || (half ? hour < 1 || hour > 12 : hour > 23)) return void 0;
+  if (half === "p" && hour < 12) hour += 12;
+  if (half === "a" && hour === 12) hour = 0;
+  let zone = m[4];
+  try {
+    if (zone) new Intl.DateTimeFormat("en-US", { timeZone: zone });
+  } catch {
+    zone = void 0;
+  }
+  const wall = wallClock(now, zone);
+  for (const day of [0, 1]) {
+    const d = new Date(wall);
+    const target = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + day, hour, minute);
+    const at = target - (wallClock(target, zone) - target);
+    if (at > now) return at - now;
+  }
+  return void 0;
+}
+function cooldownMs(message, now = Date.now()) {
+  const told = retryAfterMs(message) ?? retryAtMs(message, now);
   if (told !== void 0) return Math.min(Math.max(told, 6e4), MAX_MS);
-  return /daily|per.?day|per day|exhausted your/i.test(message) ? DAILY_MS : OVERLOAD_MS;
+  if (/daily|per.?day|per day|exhausted your/i.test(message)) return DAILY_MS;
+  return /usage limit|session limit|quota|FreeUsageLimit/i.test(message) ? USAGE_MS : OVERLOAD_MS;
 }
 
 // src/core/answers.ts
@@ -2569,7 +2624,8 @@ var SCHEMA = {
   priceFeedUrl: "string",
   priceFeedHours: "number",
   budgetDaily: "number",
-  rankWorkers: "boolean"
+  rankWorkers: "boolean",
+  autoFallback: "boolean"
 };
 function configPath() {
   if (process.env.PITROOM_CONFIG) return path15.resolve(process.env.PITROOM_CONFIG);
@@ -2679,6 +2735,7 @@ function effective(flags = {}) {
     priceFeedUrl: setting(void 0, e.PITROOM_PRICE_FEED_URL?.trim() || void 0, c.priceFeedUrl?.trim() || void 0, "https://models.dev/api.json"),
     priceFeedHours: setting(void 0, positiveInt(e.PITROOM_PRICE_FEED_HOURS), positiveInt(c.priceFeedHours), 24),
     rankWorkers: setting(void 0, flag01(e.PITROOM_RANK_WORKERS), c.rankWorkers, false),
+    autoFallback: setting(void 0, flag01(e.PITROOM_AUTO_FALLBACK), c.autoFallback, false),
     budgetDaily: setting(void 0, amount(e.PITROOM_BUDGET_DAILY), amount(c.budgetDaily), void 0)
   };
 }
@@ -2722,7 +2779,7 @@ function scoreOf(r) {
   return r.audited >= MIN_AUDITS ? ok * (r.agreed / r.audited) : ok;
 }
 var pct = (x) => `${Math.round(x * 100)}%`;
-function rankChain(chain, recordOf) {
+function rankChain(chain, recordOf, work) {
   const scored = chain.map((t, i) => ({ t, i, score: scoreOf(recordOf(t)) }));
   const slots = scored.filter((s) => s.score !== void 0);
   if (slots.length < 2) return { chain };
@@ -2733,7 +2790,7 @@ function rankChain(chain, recordOf) {
   const by = (t) => scored.find((s) => s.t === t).score;
   return {
     chain: out,
-    note: `ranked by record ("rankWorkers"): ${describeTarget(out[0])} (${pct(by(out[0]))}) goes before ${describeTarget(chain[0])} (${pct(by(chain[0]))})`
+    note: `ranked by record${work ? ` on ${work}` : ""} ("rankWorkers"): ${describeTarget(out[0])} (${pct(by(out[0]))}) goes before ${describeTarget(chain[0])} (${pct(by(chain[0]))})`
   };
 }
 
@@ -2821,11 +2878,16 @@ function savedUsd(usage, returnedTokens, price = primaryPrice()) {
   const readingTheReport = returnedTokens * price.input / 1e6;
   return Math.max(0, costAt(usage, price) - (workerCostOf(usage) ?? 0) - readingTheReport);
 }
+var SETTLING_MS = 10 * 6e4;
 function readLedger(sinceMs) {
   if (!fs16.existsSync(ledgerFile())) return [];
+  const seen = /* @__PURE__ */ new Set();
   return fs16.readFileSync(ledgerFile(), "utf8").split("\n").filter(Boolean).flatMap((l) => {
     try {
-      return [JSON.parse(l)];
+      const e = JSON.parse(l);
+      if (seen.has(e.id)) return [];
+      seen.add(e.id);
+      return [e];
     } catch {
       return [];
     }
@@ -3119,6 +3181,7 @@ function summarize(rows) {
 }
 
 // src/vcs/guard.ts
+import { spawnSync as spawnSync9 } from "node:child_process";
 import fs19 from "node:fs";
 import path18 from "node:path";
 var VERSION = 2;
@@ -3199,6 +3262,15 @@ exec "$real" "$@"
 function shimDir() {
   return path18.join(home(), "shim", `v${VERSION}`);
 }
+function scoopTarget(exe) {
+  try {
+    const text = fs19.readFileSync(exe.replace(/\.exe$/i, ".shim"), "utf8");
+    const target = /^\s*path\s*=\s*"?([^"\r\n]+?)"?\s*$/m.exec(text)?.[1];
+    return target && fs19.statSync(target).isFile() ? target : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function findRealGit(skip) {
   const same = (a, b) => WINDOWS ? a.toLowerCase() === b.toLowerCase() : a === b;
   for (const dir of (process.env.PATH ?? "").split(path18.delimiter).filter(Boolean)) {
@@ -3206,7 +3278,7 @@ function findRealGit(skip) {
     const p = path18.join(dir, WINDOWS ? "git.exe" : "git");
     try {
       fs19.accessSync(p, fs19.constants.X_OK);
-      if (fs19.statSync(p).isFile()) return p;
+      if (fs19.statSync(p).isFile()) return WINDOWS && scoopTarget(p) || p;
     } catch {
     }
   }
@@ -3225,11 +3297,85 @@ function findGitSh(realGit) {
   }
   return void 0;
 }
-var cmdShim = (sh) => `@echo off\r
-set "MSYS2_ARG_CONV_EXCL=*"\r
-"${sh}" "%~dp0git" %*\r
-exit /b %errorlevel%\r
+var cmdShim = (sh) => [
+  "@echo off",
+  "setlocal EnableExtensions DisableDelayedExpansion",
+  'set "MSYS2_ARG_CONV_EXCL=*"',
+  'set "PITROOM_SELF=%~f0"',
+  'set q=^"',
+  "setlocal EnableDelayedExpansion",
+  'set "line=!cmdcmdline!"',
+  'if not "!line: /d =!"=="!line!" goto plain',
+  'if not "!line: /s =!"=="!line!" goto plain',
+  'set "tail=!line:*/c ""%PITROOM_SELF%"=!"',
+  'if "!tail!"=="!line!" set "tail=!line:*/c "%PITROOM_SELF%=!"',
+  'if "!tail!"=="!line!" goto plain',
+  'if "!tail:~-1!"=="!q!" set "tail=!tail:~0,-1!"',
+  `"${sh}" "%~dp0git" !tail!`,
+  "exit /b !errorlevel!",
+  ":plain",
+  "endlocal",
+  `"${sh}" "%~dp0git" %*`,
+  "exit /b %errorlevel%",
+  ""
+].join("\r\n");
+var launcherSource = (sh) => `// pitroom git guard: git.exe launcher v${VERSION} (generated; edit src/vcs/guard.ts)
+using System;
+using System.Diagnostics;
+using System.IO;
+
+static class PitroomGit {
+  const string Sh = @"${sh.replace(/"/g, '""')}";
+
+  static int Main() {
+    string line = Environment.CommandLine;
+    // this program's own name, as Windows reads it: up to the closing quote when it starts with one, else to a space
+    int i = 0;
+    if (line.Length > 0 && line[0] == '"') { int q = line.IndexOf('"', 1); i = q < 0 ? line.Length : q + 1; }
+    else { while (i < line.Length && line[i] != ' ' && line[i] != '\\t') i++; }
+    string script = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "git");
+    ProcessStartInfo start = new ProcessStartInfo(Sh, "\\"" + script + "\\"" + line.Substring(i));
+    start.UseShellExecute = false;
+    start.EnvironmentVariables["MSYS2_ARG_CONV_EXCL"] = "*";
+    // Ctrl+C reaches git too: wait for it to end and pass its exit code on
+    Console.CancelKeyPress += delegate (object o, ConsoleCancelEventArgs e) { e.Cancel = true; };
+    using (Process git = Process.Start(start)) {
+      git.WaitForExit();
+      return git.ExitCode;
+    }
+  }
+}
 `;
+function findCsc() {
+  const windir = process.env.WINDIR ?? process.env.SystemRoot ?? "C:\\Windows";
+  for (const fw of ["Framework64", "Framework"]) {
+    const p = path18.join(windir, "Microsoft.NET", fw, "v4.0.30319", "csc.exe");
+    if (fs19.existsSync(p)) return p;
+  }
+  return void 0;
+}
+function buildLauncher(dir, sh) {
+  const source = launcherSource(sh);
+  const src = path18.join(dir, "git-launcher.cs");
+  const exe = path18.join(dir, "git.exe");
+  if (fs19.existsSync(exe) && fs19.existsSync(src) && fs19.readFileSync(src, "utf8") === source) return;
+  const csc = findCsc();
+  if (!csc) return;
+  const tmp = path18.join(dir, `git.${process.pid}.tmp.exe`);
+  const tmpSrc = `${src}.${process.pid}.tmp`;
+  try {
+    fs19.mkdirSync(dir, { recursive: true });
+    fs19.writeFileSync(tmpSrc, source);
+    const r = spawnSync9(csc, ["/nologo", "/optimize+", "/target:exe", `/out:${tmp}`, tmpSrc], { encoding: "utf8", timeout: 6e4, windowsHide: true });
+    if (r.status !== 0 || !fs19.existsSync(tmp)) return;
+    renameOver(tmp, exe);
+    renameOver(tmpSrc, src);
+  } catch {
+  } finally {
+    fs19.rmSync(tmp, { force: true });
+    fs19.rmSync(tmpSrc, { force: true });
+  }
+}
 var HOOK_VERSION = 1;
 var REF_HOOK = `#!/bin/sh
 # pitroom git guard (layer 2, v${HOOK_VERSION}): refuse ref updates made by workers.
@@ -3287,6 +3433,7 @@ function guardEnv(env) {
     sh = findGitSh(real);
     if (!sh) return { ...env, ...quiet };
     writeIfChanged2(path18.join(dir, "git.cmd"), cmdShim(sh));
+    buildLauncher(dir, sh);
   }
   writeIfChanged2(path18.join(dir, "git"), SHIM);
   const key = pathKey(env);
@@ -3297,6 +3444,29 @@ function shimReady() {
   return Boolean(env[pathKey(env)]?.startsWith(shimDir()));
 }
 
+// src/vcs/git.ts
+function numberDiff(diff) {
+  let next = 0;
+  let width = 0;
+  let inHunk = false;
+  return diff.split("\n").map((l) => {
+    if (l.startsWith("diff --git")) {
+      inHunk = false;
+      return l;
+    }
+    const hunk = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/.exec(l);
+    if (hunk) {
+      inHunk = true;
+      next = Number(hunk[1]);
+      width = String(next + Number(hunk[2] ?? 1)).length;
+      return l;
+    }
+    if (!inHunk || !l || !"+- ".includes(l[0])) return l;
+    if (l[0] === "-") return `-${" ".repeat(width)}| ${l.slice(1)}`;
+    return `${l[0]}${String(next++).padStart(width)}| ${l.slice(1)}`;
+  }).join("\n");
+}
+
 // src/core/slots.ts
 import crypto4 from "node:crypto";
 import fs20 from "node:fs";
@@ -3431,6 +3601,7 @@ export {
   brief,
   card,
   catalogPrice,
+  cmdShim,
   compact,
   cooldownMs,
   costAt,
@@ -3456,6 +3627,7 @@ export {
   loadTemplate,
   looksSecret,
   newRunId,
+  numberDiff,
   parseAudit,
   parsePlan,
   parsePriceSpec,
@@ -3475,11 +3647,13 @@ export {
   requestStop,
   resolveRun,
   retryAfterMs,
+  retryAtMs,
   retryCommands,
   runDir,
   runFile,
   runsDir,
   savedUsd,
+  scoopTarget,
   scoreAnswer,
   scoreOf,
   secretWarning,