pi-supernova 0.0.6 → 0.0.8

package/host-bridge.js

@@ -1,13 +1,16 @@
 
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { spawn } from "node:child_process";
 import { packageHostResult } from "./bottleneck.js";
 import { isString, isNumber, isFunction, isObject } from "./decode.js";
 import { isMutatingTool, runParallelWave } from "./parallel.js";
+import { unknownToolMessage } from "./catalog.js";
 import { extractStructuralSurface } from "./surface.js";
 import { buildEditDiff, buildMultiEditDiff, buildPatchDiff, buildWriteDiff } from "./diff.js";
 import { executeSnap } from "./snap.js";
+import { CausalVfs } from "./vfs.js";
+import { applyPatchToText } from "./patch.js";
+import { resolveWorkspacePath, runCommand } from "./workspace.js";
 
 function textResult(text, details) {
   return {
@@ -16,338 +19,98 @@ function textResult(text, details) {
   };
 }
 
-let cachedCwd = null;
-let cachedResolvedCwd = null;
-
-function getResolvedCwd(cwd) {
-  if (cwd === cachedCwd && cachedResolvedCwd) return cachedResolvedCwd;
-  cachedCwd = cwd;
-  cachedResolvedCwd = path.resolve(cwd);
-  return cachedResolvedCwd;
+/** Unwrap a single matching quote pair around the whole string (`'git status'`). */
+function unwrapIfFullyQuoted(s) {
+  if (s.length < 2) return s;
+  const q = s[0];
+  if (q !== "'" && q !== '"') return s;
+  if (s[s.length - 1] !== q) return s;
+  const inner = s.slice(1, -1);
+  if (inner.includes(q)) return s;
+  return inner;
 }
 
-async function resolveWorkspacePath(cwd, inputPath, opName, allowRoot = false) {
-  if (inputPath == null || !isString(inputPath) || !inputPath.trim()) {
-    throw new Error(`${opName} requires path`);
-  }
-  const resolvedCwd = getResolvedCwd(cwd);
-  const target = path.resolve(resolvedCwd, inputPath.trim());
-  const rel = path.relative(resolvedCwd, target);
-  if (rel === ".." || rel.startsWith(`..${path.sep}`) || path.isAbsolute(rel)) {
-    throw new Error(`${opName} path escapes workspace`);
-  }
-  if (!allowRoot && target === resolvedCwd) {
-    throw new Error(`${opName} path cannot be the workspace root directory`);
-  }
-
-  const realRoot = await fs.realpath(resolvedCwd);
-  let probe = target;
-  while (true) {
-    try {
-      probe = await fs.realpath(probe);
-      break;
-    } catch (err) {
-      if (err?.code !== "ENOENT" && err?.code !== "ENOTDIR") throw err;
-      const parent = path.dirname(probe);
-      if (parent === probe) throw err;
-      probe = parent;
-    }
-  }
-  const realRel = path.relative(realRoot, probe);
-  if (realRel === ".." || realRel.startsWith(`..${path.sep}`) || path.isAbsolute(realRel)) {
-    throw new Error(`${opName} path escapes workspace through symlink`);
-  }
-  return target;
-}
-
-async function runCommand(argv, options = {}) {
-  const cwd = options.cwd || process.cwd();
-  const timeoutMs = options.timeoutMs ?? 60_000;
-  const maxOutputChars = options.maxOutputChars ?? 2 * 1024 * 1024;
-  return await new Promise((resolve, reject) => {
-    const child = spawn(argv[0], argv.slice(1), {
-      cwd,
-      env: process.env,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-    let stdout = "";
-    let stderr = "";
-    let settled = false;
-    let outputTruncated = false;
-    let onAbort;
-
-    const cleanup = () => {
-      clearTimeout(timer);
-      if (options.signal && onAbort) options.signal.removeEventListener("abort", onAbort);
-    };
-    const fail = (err) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      reject(err);
-    };
-    const append = (current, chunk) => {
-      const remaining = Math.max(0, maxOutputChars - current.length);
-      if (chunk.length > remaining) outputTruncated = true;
-      return remaining > 0 ? current + chunk.slice(0, remaining) : current;
-    };
-    const timer = setTimeout(() => {
-      child.kill("SIGTERM");
-      fail(new Error(`command timed out after ${timeoutMs}ms: ${argv.join(" ")}`));
-    }, timeoutMs);
-
-    child.stdout.setEncoding("utf8");
-    child.stderr.setEncoding("utf8");
-    child.stdout.on("data", (chunk) => {
-      stdout = append(stdout, chunk);
-    });
-    child.stderr.on("data", (chunk) => {
-      stderr = append(stderr, chunk);
-    });
-    child.on("error", fail);
-    child.on("close", (code) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      resolve({ stdout, stderr, exitCode: code ?? 0, outputTruncated });
-    });
-    if (options.signal) {
-      onAbort = () => {
-        child.kill("SIGTERM");
-        fail(new Error("aborted"));
-      };
-      if (options.signal.aborted) onAbort();
-      else options.signal.addEventListener("abort", onAbort, { once: true });
-    }
-  });
+function sliceLines(text, offset, limit) {
+  if (!isNumber(offset) && !isNumber(limit)) return text;
+  const lines = text.split("\n");
+  const startIndex = (isNumber(offset) ? Math.max(1, Math.floor(offset)) : 1) - 1;
+  const count = isNumber(limit) ? Math.max(0, Math.floor(limit)) : lines.length;
+  return lines.slice(startIndex, startIndex + count).join("\n");
 }
 
-function parseHunkHeader(line) {
-  const match = /^@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@/.exec(line);
-  if (!match) return null;
-  return {
-    oldStart: parseInt(match[1], 10),
-    oldLength: match[2] !== undefined ? parseInt(match[2], 10) : 1,
-    newStart: parseInt(match[3], 10),
-    newLength: match[4] !== undefined ? parseInt(match[4], 10) : 1,
-    lines: [],
-  };
+function looksLikePath(target) {
+  return (
+    isString(target) &&
+    (target.includes("/") ||
+      target.includes("\\") ||
+      target.startsWith(".") ||
+      (!/\s/.test(target) && path.extname(target).length > 0))
+  );
 }
 
-export function parsePatchHunks(patchText) {
-  const patchLines = patchText.replace(/\r\n/g, "\n").split("\n");
-  const hunks = [];
-  let current = null;
-
-  for (const line of patchLines) {
-    const header = parseHunkHeader(line);
-    if (header) {
-      if (current) hunks.push(current);
-      current = header;
-    } else if (current && (line.startsWith("+") || line.startsWith("-") || line.startsWith(" "))) {
-      current.lines.push(line);
-    }
-  }
-  if (current) hunks.push(current);
-  if (hunks.length === 0) {
-    throw new Error("no valid patch hunks found (expected @@ -old,len +new,len @@)");
+async function probeExistingFile(cwd, targetParam, vfs) {
+  const targetPath = await resolveWorkspacePath(cwd, targetParam, "read", false);
+  if (vfs.getOverlay(targetPath) !== undefined || vfs.cache.has(targetPath)) return targetPath;
+  try {
+    const st = await fs.stat(targetPath);
+    if (st.isDirectory()) throw new Error(`read path is a directory, not a file: ${targetPath} (use ls)`);
+    return targetPath;
+  } catch (err) {
+    if (err?.code !== "ENOENT" && err?.code !== "ENOTDIR") throw err;
+    return null;
   }
-  return hunks;
 }
 
-function findHunkMatch(fileLines, expectedOld, nominal) {
-  const matchAt = (idx) => {
-    if (idx < 0 || idx + expectedOld.length > fileLines.length) return false;
-    for (let j = 0; j < expectedOld.length; j++) {
-      if (fileLines[idx + j] !== expectedOld[j]) return false;
-    }
-    return true;
-  };
-
-  if (matchAt(nominal)) return nominal;
-  const maxDelta = Math.max(fileLines.length, 100);
-  for (let delta = 1; delta <= maxDelta; delta++) {
-    if (matchAt(nominal + delta)) return nominal + delta;
-    if (matchAt(nominal - delta)) return nominal - delta;
-  }
-  return -1;
+function patchModeOf(params) {
+  return (
+    isString(params?.patch) ||
+    (params?.newText === undefined &&
+      isString(params?.oldText) &&
+      (params.oldText.includes("@@ -") || params.oldText.startsWith("---")))
+  );
 }
 
-export function applyPatchToText(originalText, patchText) {
-  if (!isString(patchText) || !patchText.trim()) {
-    throw new Error("apply_patch requires non-empty patch");
-  }
-
-  const hunks = parsePatchHunks(patchText);
-  let fileLines = originalText.replace(/\r\n/g, "\n").split("\n");
-  const hasTrailingNewline = originalText.endsWith("\n");
-  let offsetShift = 0;
-
-  for (let h = 0; h < hunks.length; h++) {
-    const hunk = hunks[h];
-    const expectedOld = [];
-    const newLines = [];
-
-    for (const hLine of hunk.lines) {
-      if (hLine.startsWith("-")) {
-        expectedOld.push(hLine.slice(1));
-      } else if (hLine.startsWith("+")) {
-        newLines.push(hLine.slice(1));
-      } else {
-        const val = hLine.startsWith(" ") ? hLine.slice(1) : "";
-        expectedOld.push(val);
-        newLines.push(val);
-      }
-    }
-
-    if (expectedOld.length !== hunk.oldLength || newLines.length !== hunk.newLength) {
-      throw new Error(`patch hunk ${h + 1} length does not match its header`);
+function applyReplacements(target, content, requestedEdits) {
+  if (requestedEdits.length === 0) throw new Error("edit requires at least one replacement");
+  const matches = requestedEdits.map((replacement) => {
+    if (!isString(replacement?.oldText) || replacement.oldText.length === 0) {
+      throw new Error("edit requires non-empty oldText");
     }
-
-    const nominal = Math.max(0, hunk.oldStart - 1 + offsetShift);
-    const matchIdx = findHunkMatch(fileLines, expectedOld, nominal);
-    if (matchIdx === -1) {
-      throw new Error(`patch hunk ${h + 1} rejected at line ${hunk.oldStart}: context did not match`);
+    if (!isString(replacement?.newText)) throw new Error("edit requires newText");
+    const index = content.indexOf(replacement.oldText);
+    if (index < 0) {
+      throw new Error(`edit target not found in ${target}: oldText must match the file byte-for-byte (read() it first; check whitespace and quotes)`);
     }
-
-    fileLines.splice(matchIdx, expectedOld.length, ...newLines);
-    offsetShift += (matchIdx - nominal) + (newLines.length - expectedOld.length);
-  }
-
-  let resultText = fileLines.join("\n");
-  if (hasTrailingNewline && !resultText.endsWith("\n")) resultText += "\n";
-  return { resultText, hunkCount: hunks.length };
-}
-
-const VFS_CACHE_MAX = 1024;
-
-class CausalVfs {
-  constructor() {
-    this.cache = new Map();
-    this.overlays = [];
-  }
-
-  setCache(target, content) {
-    if (this.cache.size >= VFS_CACHE_MAX && !this.cache.has(target)) {
-      const oldest = this.cache.keys().next().value;
-      if (oldest !== undefined) this.cache.delete(oldest);
-    }
-    this.cache.set(target, content);
-  }
-
-  getOverlay(target) {
-    for (let i = this.overlays.length - 1; i >= 0; i--) {
-      if (this.overlays[i].has(target)) return this.overlays[i].get(target);
-    }
-    return undefined;
-  }
-
-  getOverlayPaths() {
-    const paths = new Set();
-    for (const overlay of this.overlays) {
-      for (const target of overlay.keys()) paths.add(target);
-    }
-    return [...paths];
-  }
-
-  async read(target) {
-    const overlay = this.getOverlay(target);
-    if (overlay !== undefined) return overlay;
-
-    const cached = this.cache.get(target);
-    if (cached !== undefined) return cached;
-
-    try {
-      const text = await fs.readFile(target, "utf8");
-      this.setCache(target, text);
-      return text;
-    } catch (err) {
-      if (err.code === "EISDIR") {
-        throw new Error(`read path is a directory, not a file: ${target}`);
-      }
-      throw err;
-    }
-  }
-
-  async write(target, content) {
-    if (this.overlays.length > 0) {
-      this.overlays[this.overlays.length - 1].set(target, content);
-      return { speculative: true };
+    if (content.indexOf(replacement.oldText, index + replacement.oldText.length) >= 0) {
+      throw new Error(`edit target is not unique in ${target}: include more surrounding lines in oldText, or pass edits:[{oldText,newText},…]`);
     }
-
-    try {
-      const stat = await fs.stat(target);
-      if (stat.isDirectory()) {
-        throw new Error(`cannot write to a directory: ${target}`);
-      }
-    } catch (err) {
-      if (err.code !== "ENOENT") throw err;
-    }
-
-    await fs.mkdir(path.dirname(target), { recursive: true });
-    await fs.writeFile(target, content, "utf8");
-    this.setCache(target, content);
-    return { speculative: false };
-  }
-
-  begin() {
-    this.overlays.push(new Map());
-    return this.overlays.length;
-  }
-
-  async commit() {
-    if (this.overlays.length === 0) return { committed: 0, depth: 0 };
-    const top = this.overlays.pop();
-    if (this.overlays.length > 0) {
-      const parent = this.overlays[this.overlays.length - 1];
-      for (const [k, v] of top.entries()) parent.set(k, v);
-      return { committed: top.size, depth: this.overlays.length };
-    }
-    for (const [filePath, fileContent] of top.entries()) {
-      await fs.mkdir(path.dirname(filePath), { recursive: true });
-      await fs.writeFile(filePath, fileContent, "utf8");
-      this.setCache(filePath, fileContent);
-    }
-    return { committed: top.size, depth: 0 };
+    return { ...replacement, index, end: index + replacement.oldText.length };
+  });
+  matches.sort((a, b) => a.index - b.index);
+  for (let i = 1; i < matches.length; i++) {
+    if (matches[i].index < matches[i - 1].end) throw new Error(`edit targets overlap in ${target}`);
   }
-
-  rollback() {
-    if (this.overlays.length === 0) return { rolledBack: 0, depth: 0 };
-    const top = this.overlays.pop();
-    return { rolledBack: top.size, depth: this.overlays.length };
+  let updated = content;
+  for (let i = matches.length - 1; i >= 0; i--) {
+    const match = matches[i];
+    updated = updated.slice(0, match.index) + match.newText + updated.slice(match.end);
   }
+  return { updated, matches };
+}
 
-  async prepareExternalMutation(name) {
-    if (this.overlays.length > 1) {
-      throw new Error(`${name} cannot run inside nova.speculate because external mutations cannot be rolled back`);
-    }
-    if (this.overlays.length === 0) return false;
-    const pending = this.overlays[0];
-    for (const [filePath, fileContent] of pending.entries()) {
-      await fs.mkdir(path.dirname(filePath), { recursive: true });
-      await fs.writeFile(filePath, fileContent, "utf8");
-      this.setCache(filePath, fileContent);
+async function formatLsEntry(dirPath, entry) {
+  const isDir = entry.isDirectory();
+  const isSym = entry.isSymbolicLink();
+  const typeLabel = isDir ? "dir" : isSym ? "sym" : "file";
+  let size = 0;
+  try {
+    if (!isDir && !isSym) {
+      const st = await fs.stat(path.join(dirPath, entry.name));
+      size = st.size;
     }
-    this.overlays[0] = new Map();
-    return pending.size > 0;
-  }
-
-  invalidateCache() {
-    this.cache.clear();
-  }
-
-  clear() {
-    this.invalidateCache();
-    this.overlays.length = 0;
-  }
-
-  getCacheSize() {
-    return this.cache.size;
-  }
-
-  getOverlayDepth() {
-    return this.overlays.length;
-  }
+  } catch {}
+  const sizeSuffix = size ? `, ${size} bytes` : "";
+  return `${entry.name}${isDir ? "/" : ""} (${typeLabel}${sizeSuffix})`;
 }
 
 function createNativeAdapters(getCwd, vfs, config) {
@@ -359,57 +122,20 @@ function createNativeAdapters(getCwd, vfs, config) {
         const results = await Promise.all(
           targetParam.map((p) => readAdapter({ path: p, offset: params?.offset, limit: params?.limit }, signal)),
         );
-        return textResult(results.map((r) => r.value).join("\n---\n"), {
-          count: results.length,
-          batch: true,
-          items: results.map((r) => r.value),
-        });
+        const items = results.map((r) => r.content[0].text);
+        return textResult(items.join("\n---\n"), { count: results.length, batch: true, items });
       }
 
-      const looksLikePath =
-        isString(targetParam) &&
-        (targetParam.includes("/") ||
-          targetParam.includes("\\") ||
-          targetParam.startsWith(".") ||
-          (!/\s/.test(targetParam) && path.extname(targetParam).length > 0));
-
-      if (looksLikePath) {
+      if (looksLikePath(targetParam)) {
         const targetPath = await resolveWorkspacePath(cwd, targetParam, "read", false);
-        let text = await vfs.read(targetPath);
-        if (isNumber(params?.offset) || isNumber(params?.limit)) {
-          const lines = text.split("\n");
-          const offset = isNumber(params?.offset) ? Math.max(1, Math.floor(params.offset)) : 1;
-          const startIndex = offset - 1;
-          const limit = isNumber(params?.limit) ? Math.max(0, Math.floor(params.limit)) : lines.length;
-          text = lines.slice(startIndex, startIndex + limit).join("\n");
-        }
-        return textResult(text, { path: targetPath });
-      }
-
-      let isExistingFile = false;
-      let targetPath = await resolveWorkspacePath(cwd, targetParam, "read", false);
-      const overlay = vfs.getOverlay(targetPath);
-      if (overlay !== undefined || vfs.cache.has(targetPath)) {
-        isExistingFile = true;
-      } else {
-        try {
-          const st = await fs.stat(targetPath);
-          isExistingFile = !st.isDirectory();
-        } catch (err) {
-          if (err?.code !== "ENOENT" && err?.code !== "ENOTDIR") throw err;
-        }
+        const text = await vfs.read(targetPath);
+        return textResult(sliceLines(text, params?.offset, params?.limit), { path: targetPath });
       }
 
-      if (isExistingFile) {
-        let text = await vfs.read(targetPath);
-        if (isNumber(params?.offset) || isNumber(params?.limit)) {
-          const lines = text.split("\n");
-          const offset = isNumber(params?.offset) ? Math.max(1, Math.floor(params.offset)) : 1;
-          const startIndex = offset - 1;
-          const limit = isNumber(params?.limit) ? Math.max(0, Math.floor(params.limit)) : lines.length;
-          text = lines.slice(startIndex, startIndex + limit).join("\n");
-        }
-        return textResult(text, { path: targetPath });
+      const existing = await probeExistingFile(cwd, targetParam, vfs);
+      if (existing) {
+        const text = await vfs.read(existing);
+        return textResult(sliceLines(text, params?.offset, params?.limit), { path: existing });
       }
 
       if (isString(targetParam) && targetParam.trim()) {
@@ -424,17 +150,9 @@ function createNativeAdapters(getCwd, vfs, config) {
         } catch {}
       }
 
-      targetPath = await resolveWorkspacePath(cwd, targetParam, "read", false);
-
-      let text = await vfs.read(targetPath);
-      if (isNumber(params?.offset) || isNumber(params?.limit)) {
-        const lines = text.split("\n");
-        const offset = isNumber(params?.offset) ? Math.max(1, Math.floor(params.offset)) : 1;
-        const startIndex = offset - 1;
-        const limit = isNumber(params?.limit) ? Math.max(0, Math.floor(params.limit)) : lines.length;
-        text = lines.slice(startIndex, startIndex + limit).join("\n");
-      }
-      return textResult(text, { path: targetPath });
+      const targetPath = await resolveWorkspacePath(cwd, targetParam, "read", false);
+      const text = await vfs.read(targetPath);
+      return textResult(sliceLines(text, params?.offset, params?.limit), { path: targetPath });
   }
 
   return {
@@ -458,11 +176,7 @@ function createNativeAdapters(getCwd, vfs, config) {
       const target = await resolveWorkspacePath(cwd, params?.path, "edit", false);
       if (signal?.aborted) throw new Error("aborted");
 
-      const isPatchMode =
-        isString(params?.patch) ||
-        (params?.newText === undefined && isString(params?.oldText) && (params.oldText.includes("@@ -") || params.oldText.startsWith("---")));
-
-      if (isPatchMode) {
+      if (patchModeOf(params)) {
         const patchContent = params.patch || params.oldText;
         const original = await vfs.read(target);
         const { resultText, hunkCount } = applyPatchToText(original, patchContent);
@@ -480,31 +194,8 @@ function createNativeAdapters(getCwd, vfs, config) {
       const requestedEdits = Array.isArray(params?.edits)
         ? params.edits
         : [{ oldText: params?.oldText, newText: params?.newText }];
-      if (requestedEdits.length === 0) throw new Error("edit requires at least one replacement");
-
       const content = await vfs.read(target);
-      const matches = requestedEdits.map((replacement) => {
-        if (!isString(replacement?.oldText) || replacement.oldText.length === 0) {
-          throw new Error("edit requires non-empty oldText");
-        }
-        if (!isString(replacement?.newText)) throw new Error("edit requires newText");
-        const index = content.indexOf(replacement.oldText);
-        if (index < 0) throw new Error(`edit target not found in ${target}`);
-        if (content.indexOf(replacement.oldText, index + replacement.oldText.length) >= 0) {
-          throw new Error(`edit target is not unique in ${target}`);
-        }
-        return { ...replacement, index, end: index + replacement.oldText.length };
-      });
-      matches.sort((a, b) => a.index - b.index);
-      for (let i = 1; i < matches.length; i++) {
-        if (matches[i].index < matches[i - 1].end) throw new Error(`edit targets overlap in ${target}`);
-      }
-
-      let updated = content;
-      for (let i = matches.length - 1; i >= 0; i--) {
-        const match = matches[i];
-        updated = updated.slice(0, match.index) + match.newText + updated.slice(match.end);
-      }
+      const { updated, matches } = applyReplacements(target, content, requestedEdits);
       const { speculative } = await vfs.write(target, updated);
       const diff =
         matches.length === 1
@@ -576,12 +267,13 @@ function createNativeAdapters(getCwd, vfs, config) {
     },
     async bash(params, signal) {
       const cwd = getCwd();
-      const command = String(params?.command ?? "").trim();
+      const command = unwrapIfFullyQuoted(String(params?.command ?? "").trim());
       if (!command) throw new Error("bash requires command");
       const targetCwd = params?.cwd ? await resolveWorkspacePath(cwd, params.cwd, "bash cwd", true) : cwd;
 
-      const hasShellMeta = /[|><&;*$()'"]/.test(command) || command.includes("`");
-      const argv = hasShellMeta ? ["bash", "-c", command] : command.split(/\s+/);
+      // Always shell. Splitting on spaces treated `git status` / quoted `exec("git status")`
+      // as a single binary name (`bash: git status: command not found`).
+      const argv = ["bash", "-c", command];
 
       const transactionBarrier = await vfs.prepareExternalMutation("bash");
       let res;
@@ -595,7 +287,8 @@ function createNativeAdapters(getCwd, vfs, config) {
       } finally {
         vfs.invalidateCache();
       }
-      const text = [res.stdout, res.stderr].filter(Boolean).join("\n");
+      const { stdout, stderr } = res;
+      const text = stdout && stderr ? stdout + (stdout.endsWith("\n") ? "" : "\n") + stderr : stdout || stderr;
       return {
         content: [{ type: "text", text }],
         details: { exitCode: res.exitCode, outputTruncated: res.outputTruncated, transactionBarrier },
@@ -658,17 +351,7 @@ function createNativeAdapters(getCwd, vfs, config) {
       const entries = await fs.readdir(dirPath, { withFileTypes: true });
       const lines = [];
       for (const entry of entries) {
-        const isDir = entry.isDirectory();
-        const isSym = entry.isSymbolicLink();
-        const typeLabel = isDir ? "dir" : isSym ? "sym" : "file";
-        let size = 0;
-        try {
-          if (!isDir && !isSym) {
-            const st = await fs.stat(path.join(dirPath, entry.name));
-            size = st.size;
-          }
-        } catch {}
-        lines.push(`${entry.name}${isDir ? "/" : ""} (${typeLabel}${size ? `, ${size} bytes` : ""})`);
+        lines.push(await formatLsEntry(dirPath, entry));
       }
       return textResult(lines.join("\n"), { path: dirPath, count: entries.length });
     },
@@ -710,6 +393,8 @@ export function createHostBridge({ pi, config, getCwd }) {
   function resetCallBudget() {
     callCount = 0;
     trace = [];
+    // Files may change between programs (editor, git); never serve a stale run.
+    vfs.invalidateCache();
   }
 
   function getTrace() {
@@ -759,15 +444,19 @@ export function createHostBridge({ pi, config, getCwd }) {
     } catch {}
   }
 
-  async function invokeRaw(name, args) {
+  function checkCallBudget(name) {
     const maxCalls = config.maxBridgeCalls ?? 256;
     callCount += 1;
     if (callCount > maxCalls) {
-      throw new Error(`supernova host call budget exceeded (${maxCalls})`);
+      throw new Error(
+        `host call budget exceeded (${maxCalls} calls per program): batch with read([paths]) or nova.callMany, or split the work across programs`,
+      );
     }
     if (activeSignal?.aborted) throw new Error("aborted");
     if (!isString(name) || !name) throw new Error("tool name required");
+  }
 
+  function assertCallableTarget(name) {
     // Never re-enter supernova or other excluded composition tools via the bridge.
     const excluded = new Set(config.excludeTools || []);
     if (name === "supernova" || excluded.has(name)) {
@@ -775,6 +464,30 @@ export function createHostBridge({ pi, config, getCwd }) {
         `nova.call("${name}") is blocked (excluded / non-reentrant). Use nova.search/describe for discovery, or call a concrete host tool.`,
       );
     }
+  }
+
+  async function writeFallbackDiff(name, args) {
+    if (name !== "write" || !isString(args?.path) || !isString(args?.content)) return undefined;
+    const target = await resolveWorkspacePath(getCwd(), args.path, "write", false);
+    let previous = "";
+    try {
+      previous = await vfs.read(target);
+    } catch (error) {
+      if (error?.code !== "ENOENT") throw error;
+    }
+    return buildWriteDiff(target, previous, args.content);
+  }
+
+  function completeRecord(record, res, fallbackDiff) {
+    const diff = resultDiff(res) || fallbackDiff;
+    finishRecord(record, res);
+    if (diff && record.ok) record.diff = diff;
+    notifyCall(record);
+  }
+
+  async function invokeRaw(name, args) {
+    checkCallBudget(name);
+    assertCallableTarget(name);
 
     const record = { name, args: args || {}, time: Date.now() };
     trace.push(record);
@@ -783,46 +496,36 @@ export function createHostBridge({ pi, config, getCwd }) {
     try {
       const exec = executors.get(name);
       if (exec) {
-        let fallbackDiff;
-        if (name === "write" && isString(args?.path) && isString(args?.content)) {
-          const target = await resolveWorkspacePath(getCwd(), args.path, "write", false);
-          let previous = "";
-          try {
-            previous = await vfs.read(target);
-          } catch (error) {
-            if (error?.code !== "ENOENT") throw error;
-          }
-          fallbackDiff = buildWriteDiff(target, previous, args.content);
-        }
+        const fallbackDiff = await writeFallbackDiff(name, args);
         if (isMutatingTool(name, config)) await vfs.prepareExternalMutation(name);
         const res = await exec(`supernova:${name}:${callCount}`, args || {}, activeSignal, undefined, activeCtx);
-        const diff = resultDiff(res) || fallbackDiff;
-        record.ok = res?.isError !== true && res?.details?.ok !== false;
-        if (diff && record.ok) record.diff = diff;
-        notifyCall(record);
+        completeRecord(record, res, fallbackDiff);
         return res;
       }
 
       const native = natives[name];
       if (native) {
         const res = await native(args || {}, activeSignal);
-        const diff = resultDiff(res);
-        record.ok = res?.isError !== true && res?.details?.ok !== false;
-        if (diff && record.ok) record.diff = diff;
-        notifyCall(record);
+        completeRecord(record, res);
         return res;
       }
 
-      throw new Error(
-        `no executor for tool "${name}" (not captured via registerTool and no native adapter). Use nova.describe to inspect; ensure pi-supernova loads before other extensions, or call a core adapter: ${Object.keys(natives).join(", ")}`,
-      );
+      throw new Error(unknownToolMessage(name, [...executors.keys(), ...Object.keys(natives)]));
     } catch (error) {
       record.ok = false;
+      record.ms = Date.now() - record.time;
       notifyCall(record);
       throw error;
     }
   }
 
+  function finishRecord(record, res) {
+    record.ms = Date.now() - record.time;
+    record.ok = res?.isError !== true && res?.details?.ok !== false;
+    const exitCode = isObject(res?.details) ? res.details.exitCode : undefined;
+    if (Number.isInteger(exitCode) && exitCode !== 0) record.exitCode = exitCode;
+  }
+
   async function call(name, args) {
     if (!isString(name) || !name) throw new Error("nova.call requires a tool name");
     const raw = await invokeRaw(name, args);