pi-supernova 0.3.2 → 0.5.0

package/src/bridge/host-bridge.js

@@ -3,10 +3,11 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { homedir } from "node:os";
 import { packageHostResult, hostResultFailed } from "../output/bottleneck.js";
-import { isString, isNumber, isFunction, isObject } from "../shared/decode.js";
+import { isString, isNumber, isFunction, isObject, looksLikePath } from "../shared/decode.js";
 import { isMutatingTool, runParallelWave, createNativeScheduler } from "../runtime/parallel.js";
 import { unknownToolMessage } from "./catalog.js";
 import { extractStructuralSurface } from "../context/surface.js";
+import { pickSpan } from "../context/spans.js";
 import { buildEditDiff, buildMultiEditDiff, buildPatchDiff, buildWriteDiff } from "../fs/diff.js";
 import { executeSnap } from "../context/snap.js";
 import { selectEvidence } from "../context/evidence.js";
@@ -16,8 +17,9 @@ import { SeenLedger } from "../context/ledger.js";
 import { quickCheck } from "../fs/check.js";
 import { declaredName } from "../context/repo-index.js";
 import { CausalVfs } from "../fs/vfs.js";
+import { MAX_JSON_BYTES, jsonProjector, sessionJsonArgs, validateJsonRead } from "../fs/json-read.js";
 import { applyPatchToText } from "../fs/patch.js";
-import { resolveWorkspacePath, runCommand, clearPathCache, relativeSlash } from "../fs/workspace.js";
+import { resolveWorkspacePath, runCommand, clearPathCache, relativeSlash, assertFilesystemPath } from "../fs/workspace.js";
 import { fuzzyFind, grepIndexed, listIndexed, listWithTools, rgGrepArgs, referencesForNames } from "../context/search.js";
 
 function textResult(text, details) {
@@ -27,14 +29,32 @@ function textResult(text, details) {
   };
 }
 
+function resultDiff(response) {
+  let details = response?.details;
+
+  if (isString(details)) {
+    try {
+      details = JSON.parse(details);
+    } catch {
+      return undefined;
+    }
+  }
+
+  return isObject(details) ? details.diff : undefined;
+}
+
 /** 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;
 }
 
@@ -43,68 +63,135 @@ function sliceLines(text, offset, limit) {
   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 looksLikePath(target) {
-  return (
-    isString(target) &&
-    (target.includes("/") ||
-      target.includes("\\") ||
-      target.startsWith(".") ||
-      (!/\s/.test(target) && path.extname(target).length > 0))
-  );
+  return lines.slice(startIndex, startIndex + count).join("\n");
 }
 
 function resolveReadPath(cwd, target) {
   if (!isString(target) || !target.trim()) throw new Error("read requires path");
-  const input = target.trim();
+  const input = assertFilesystemPath(target, "read");
+
   return path.resolve(cwd, input === "~" ? homedir() : input.startsWith("~/") ? path.join(homedir(), input.slice(2)) : input);
 }
 
 async function probeExistingPath(cwd, targetParam, vfs) {
   const targetPath = resolveReadPath(cwd, targetParam);
+
   if (vfs.getOverlay(targetPath) !== undefined) return { path: targetPath, directory: false };
+
   try {
     const st = await fs.stat(targetPath);
+
     return { path: targetPath, directory: st.isDirectory() };
   } catch (err) {
     if (err?.code !== "ENOENT" && err?.code !== "ENOTDIR") throw err;
+
     if (vfs.getOverlayPaths().some(file => file.startsWith(targetPath + path.sep))) return { path: targetPath, directory: true };
+
     return null;
   }
 }
 
+const EDIT_PREVIEW_LINES = 16;
+
+function sourceLines(content) {
+  const raw = content.split("\n");
+
+  if (raw.at(-1) === "") raw.pop();
+
+  return raw;
+}
+
+function lineNumberAt(content, index) {
+  let line = 1;
+
+  for (let i = 0; i < index; i++) if (content.charCodeAt(i) === 10) line++;
+
+  return line;
+}
+
+function formatNumberedLine(n, text) {
+  return String(n).padStart(5) + " " + text;
+}
+
+function numberedPreview(content, cap = EDIT_PREVIEW_LINES) {
+  const lines = sourceLines(content);
+
+  if (lines.length === 0) return "0 lines";
+  const shown = lines.slice(0, cap);
+  const body = shown.map((line, i) => formatNumberedLine(i + 1, line)).join("\n");
+  const suffix = lines.length > cap ? lines.length + " lines total" : lines.length + " lines";
+
+  return body + "\n" + suffix;
+}
+
 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");
     }
+
     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)`);
+      throw new Error("edit target not found in " + target + ": oldText must match the file byte-for-byte\n" + numberedPreview(content));
     }
-    if (content.indexOf(replacement.oldText, index + 1) >= 0) {
-      throw new Error(`edit target is not unique in ${target}: include more surrounding lines in oldText, or pass edits:[{oldText,newText},…]`);
+    const second = content.indexOf(replacement.oldText, index + 1);
+
+    if (second >= 0) {
+      const lines = sourceLines(content);
+      const a = lineNumberAt(content, index);
+      const b = lineNumberAt(content, second);
+
+      throw new Error("edit target is not unique in " + target + ": lines " + a + " and " + b + "; include more surrounding lines in oldText, or pass edits:[{oldText,newText},…]\n" + formatNumberedLine(a, lines[a - 1] ?? "") + "\n" + formatNumberedLine(b, lines[b - 1] ?? ""));
     }
+
     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);
   }
+
   return { updated, matches };
 }
 
+function applyViewReplace(target, content, start, end, oldText, newText) {
+  const current = sliceLines(content, start, end - start + 1);
+
+  if (current !== oldText) {
+    const shown = current.length ? current : content;
+
+    throw new Error("edit view is stale in " + target + ": lines " + start + "-" + end + " changed\n" + numberedPreview(shown));
+  }
+
+  const hadTrail = content.endsWith("\n");
+  const lines = content.split("\n");
+
+  if (hadTrail && lines.at(-1) === "") lines.pop();
+  const insert = newText.split("\n");
+
+  if (newText.endsWith("\n") && insert.at(-1) === "") insert.pop();
+  const updated = [...lines.slice(0, start - 1), ...insert, ...lines.slice(end)].join("\n") + (hadTrail ? "\n" : "");
+
+  return { updated, oldText, newText };
+}
+
 function formatDirectoryEntry(name, type, size = 0) {
   const sizeSuffix = size ? `, ${size} bytes` : "";
+
   return `${name}${type === "dir" ? "/" : ""} (${type}${sizeSuffix})`;
 }
 
@@ -113,37 +200,48 @@ async function formatLsEntry(dirPath, entry) {
   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 {}
+
   return formatDirectoryEntry(entry.name, typeLabel, size);
 }
 
 function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
   const reads = createNativeScheduler();
+
   async function sourceRead(query, searchDir, signal, params = {}) {
+    params = { ...params, resolve: params.resolve !== false };
     const cwd = getCwd();
+
     const includeHidden = path.relative(cwd, searchDir).split(path.sep)
       .some(segment => segment.startsWith(".") && segment.length > 1);
+
     const result = await executeSnap({ query, searchDir, root: cwd, includeHidden,
       pathContext: { frecency: index.frecency, currentFile: index.lastTouched },
       overlayText: p => vfs.getOverlay(p), pendingPaths: vfs.getOverlayPaths(), signal });
-    return openSource(result, params, signal);
+
+    return openSource(result, params, signal, undefined, query);
   }
 
-  async function openSource(result, params, signal, resolvedPath) {
+  async function openSource(result, params, signal, resolvedPath, query) {
     const cwd = getCwd();
+
     if (result.status !== "found") return textResult(JSON.stringify(result), { isSnap: true });
     signal?.throwIfAborted();
-    const opened = await readFile(resolvedPath ?? path.resolve(cwd, result.path), { ...params, about: undefined }, result.line, result.path);
+    const opened = await readFile(resolvedPath ?? path.resolve(cwd, result.path), { ...params, about: undefined }, result.line, result.path, query);
     const block = opened.content[0];
+
     if (block.type !== "text") throw new Error("source resolution requires a text file; read the image path directly");
     const { firstLine, lastLine, sourceChars, nextOffset, complete } = opened.details;
+
     const source = { status: "found", path: result.path, line: result.line, lines: [firstLine, lastLine],
       text: block.text.slice(0, sourceChars), complete, nextOffset };
+
     return textResult(params.resolve ? JSON.stringify(source) : "// " + result.path + ":" + firstLine + "-" + lastLine + "\n" + block.text,
       { ...opened.details, isSnap: true });
   }
@@ -151,20 +249,26 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
   async function readDirectory(dirPath, signal) {
     signal?.throwIfAborted();
     const rows = new Map();
+
     for (const file of vfs.getOverlayPaths()) {
       const relative = path.relative(dirPath, file);
+
       if (!relative || relative === ".." || relative.startsWith(".." + path.sep) || path.isAbsolute(relative)) continue;
       const [name, child] = relative.split(path.sep);
       rows.set(name, child === undefined
         ? formatDirectoryEntry(name, "file", Buffer.byteLength(vfs.getOverlay(file), "utf8"))
         : formatDirectoryEntry(name, "dir"));
     }
+
     let entries;
+
     try { entries = await fs.readdir(dirPath, { withFileTypes: true }); } catch (error) {
       if (error.code !== "ENOENT" || rows.size === 0) throw error;
       entries = [];
     }
+
     for (const entry of entries) if (!rows.has(entry.name)) rows.set(entry.name, await formatLsEntry(dirPath, entry));
+
     return textResult([...rows.values()].join("\n"), { path: dirPath, count: rows.size });
   }
 
@@ -172,126 +276,216 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
     signal?.throwIfAborted();
     const cwd = getCwd();
     const targetParam = params?.path ?? params?.target;
+
     if (Array.isArray(targetParam)) {
-      if (targetParam.some(p => !isString(p) || !p.trim())) throw new Error("read paths must be non-empty strings");
       if (targetParam.length > 64) throw new Error("read accepts at most 64 paths per batch");
+
+      for (const p of targetParam) if (!isString(p) || !p.trim()) throw new Error("read paths must be non-empty strings");
+
       const results = await Promise.all(targetParam.map(async p => {
         try {
           const block = (await readAdapter({ ...params, path: p }, signal)).content[0];
+
           return { text: block.type === "image" ? block : block.text };
         } catch (error) {
           signal?.throwIfAborted();
+
           return { text: `[read error: ${p}] ${error.message}`, error: { path: p, message: error.message } };
         }
       }));
+
       signal?.throwIfAborted();
       const response = textResult("", { count: results.length, batch: true, independent: params._independent === true, items: results.map(r => r.text), itemErrors: results.map(r => r.error?.message ?? null), errors: results.filter(r => r.error).map(r => r.error) });
       response.isError = params._independent !== true && results.some(r => r.error);
+
       return response;
     }
+
     return reads.schedule("read", () => readSingle(params, cwd, targetParam, signal), signal);
   }
 
   async function resolveSessionResource(uri, signal) {
     const match = /^(agent|artifact):\/\/([^/?#]+)$/i.exec(uri);
+
     if (!match) throw new Error("session resource reads support bare agent://<id> and artifact://<number>; use offset/limit for pagination");
     const kind = match[1].toLowerCase();
     const id = decodeURIComponent(match[2]);
+
     if (!id || id === "." || id === ".." || (/[/\\]/u.test(id) || Array.from(id).some(char => char.charCodeAt(0) < 32)) || (kind === "artifact" && !/^\d+$/.test(id))) throw new Error("invalid session resource ID");
     const dir = hooks.artifactsDir?.();
+
     if (!isString(dir) || !dir) throw new Error("this host session does not expose an artifacts directory for " + uri);
     signal?.throwIfAborted();
     const root = await fs.realpath(dir);
     let file = id + ".md";
+
     if (kind === "artifact") {
       const matches = [];
       let count = 0;
+
       for await (const entry of await fs.opendir(root)) {
         signal?.throwIfAborted();
+
         if (++count > 4096) throw new Error("session artifact lookup exceeded its directory budget");
+
         if (entry.name.startsWith(id + ".") && !entry.isDirectory()) matches.push(entry.name);
       }
+
       if (matches.length !== 1) throw new Error(matches.length ? "ambiguous session artifact: " + uri : "session artifact not found: " + uri);
       file = matches[0];
     }
+
     const target = await fs.realpath(path.join(root, file));
+
     if (!target.startsWith(root + path.sep)) throw new Error("session resource escapes its artifacts directory");
+
     if (!(await fs.stat(target)).isFile()) throw new Error("session resource is not a file: " + uri);
     signal?.throwIfAborted();
+
     return target;
   }
 
   async function readSingle(params, cwd, targetParam, signal) {
+    params = sessionJsonArgs({ ...params, path: targetParam });
+    validateJsonRead(params);
+    targetParam = params.path;
+
     if (isString(targetParam) && /^(?:agent|artifact):\/\//i.test(targetParam)) {
       const target = await resolveSessionResource(targetParam, signal);
+
       return params.resolve
         ? openSource({status:"found",path:targetParam,line:params.offset ?? 1}, params, signal, target)
         : readFile(target, params, undefined, targetParam);
     }
+
     if (isString(params?.query)) {
       const scope = targetParam && targetParam !== params.query ? resolveReadPath(cwd, targetParam) : cwd;
+
       return sourceRead(params.query, scope, signal, params);
     }
+
     const existing = await probeExistingPath(cwd, targetParam, vfs);
+
     if (existing) {
       if (!existing.directory) return params.resolve
         ? openSource({ status: "found", path: relativeSlash(cwd, existing.path), line: params.offset ?? 1 }, params, signal)
         : readFile(existing.path, params);
+
+      if (params.json !== undefined) throw new Error("JSON read requires a file, not a directory");
+
       return isString(params?.about) ? sourceRead(params.about, existing.path, signal, params) : readDirectory(existing.path, signal);
     }
-    if (!looksLikePath(targetParam)) return sourceRead(targetParam, cwd, signal, params);
+
+    if (params.json === undefined && !looksLikePath(targetParam)) return sourceRead(targetParam, cwd, signal, params);
     const targetPath = resolveReadPath(cwd, targetParam);
+
     return readFile(targetPath, params);
   }
 
   /** Plain text, a line window, or (with `about`) a relevance-folded outline of the whole file. */
-  async function readFile(targetPath, params, sourceLine, displayPath) {
+  async function readFile(targetPath, params, sourceLine, displayPath, query) {
     const cwd = getCwd();
     const rel = displayPath ?? relativeSlash(cwd, targetPath);
+
+    if (params.json !== undefined) {
+      const project = jsonProjector(params.json);
+      const text = await vfs.read(targetPath, { maxBytes: MAX_JSON_BYTES });
+      let document;
+
+      try { document = JSON.parse(text); }
+      catch { throw new Error("invalid JSON in " + rel + "; the entire document must parse before projection"); }
+
+      const many = Array.isArray(params.json);
+      let remaining = Math.max(1, Math.min(config.maxCallResultChars ?? 65536, config.maxReturnChars ?? 32000) - 256) - (many ? params.json.length + 1 : 0);
+      const parts = [];
+
+      for (const value of project(document)) {
+        const encoded = JSON.stringify(value);
+        remaining -= encoded.length;
+
+        if (remaining < 0) throw new Error("JSON selection exceeds the read budget; select narrower fields or an array slice such as .items[0:10]");
+        parts.push(encoded);
+      }
+
+      return textResult(many ? "[" + parts.join(",") + "]" : parts[0], { path: targetPath, json: true, complete: true });
+    }
+
     const mime = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp", ".bmp": "image/bmp" }[path.extname(targetPath).toLowerCase()];
+
     if (mime) {
       if ((await fs.stat(targetPath)).size > 20 * 1024 * 1024) throw new Error("image exceeds 20 MiB; resize it before reading");
       const staged = vfs.getOverlay(targetPath);
       const bytes = staged === undefined ? await fs.readFile(targetPath) : Buffer.from(staged);
+
       return { content: [{ type: "image", mimeType: mime, data: bytes.toString("base64") }], details: { path: targetPath } };
     }
+
     const text = await vfs.read(targetPath);
     index.touch(rel);
+
     if (isString(params?.about)) {
       const entry = WorkspaceIndex.fromText(targetPath, text);
       const outline = entry && outlineFile(entry, rel, params.about, outlineOptions(params, await referenceFinder(cwd, targetPath)));
+
       if (outline) {
         recordOutlineOrigins(rel, outline.text);
+
         return textResult(outline.text, { path: targetPath, outline: true, expanded: outline.expanded, declarations: outline.declarations });
       }
     }
+
     const explicit = isNumber(params?.offset) || isNumber(params?.limit);
     const budget = Math.max(1, Math.min(config.maxCallResultChars ?? 65536, config.maxReturnChars ?? 32000) - (params.resolve ? 1024 : 256));
-    const offset = params?.offset ?? (sourceLine && text.length > budget ? Math.max(1, sourceLine - 2) : 1);
+    let offset = params?.offset;
+    let limit = params?.limit;
+
+    if (!explicit && params.resolve) {
+      const spans = WorkspaceIndex.spansOf(WorkspaceIndex.fromText(targetPath, text));
+      const span = pickSpan(spans, { line: sourceLine, name: query });
+
+      if (span) {
+        offset = span.start;
+        limit = span.end - span.start + 1;
+      }
+    }
+
+    offset ??= sourceLine && text.length > budget ? Math.max(1, sourceLine - 2) : 1;
     const firstLine = isNumber(offset) ? Math.max(1, Math.floor(offset)) : 1;
-    const sliced = sliceLines(text, offset, params?.limit);
+    const sliced = sliceLines(text, offset, limit);
+
     if (params.complete === true && (sliced !== text || sliced.length > budget || (params.resolve && JSON.stringify(sliced).length > budget))) {
-      throw new Error(`incomplete read of ${rel}: complete:true requires the entire file within the read budget; use edit() for replacements or reconstruct resolve:true source windows`);
+      throw new Error(`incomplete read of ${rel}: complete:true requires the entire file within the read budget; use json:".field" for JSON reports, about for text selection, edit() for replacements, or reconstruct resolve:true source windows`);
     }
+
     if (sliced.length > budget || (params.resolve && JSON.stringify(sliced).length > budget)) {
+      if (!explicit && !params.resolve && path.extname(targetPath).toLowerCase() === ".json") throw new Error("incomplete JSON read of " + rel + "; use the json selector option to parse the whole document before projection, or explicit offset/limit for raw text windows");
       let cap = budget - 160;
+
       if (params.resolve) {
         // Budget the actual JSON string, not a pessimistic fixed escape multiplier.
         let low = 0, high = Math.max(0, cap);
+
         while (low < high) {
           const mid = Math.ceil((low + high) / 2);
+
           if (JSON.stringify(sliced.slice(0, mid)).length <= budget - 160) low = mid;
           else high = mid - 1;
         }
+
         cap = low;
       }
+
       const end = sliced.lastIndexOf("\n", cap);
+
       if (end < 0) throw new Error(`line ${firstLine} exceeds the read budget; use bash to inspect a bounded substring`);
       const body = sliced.slice(0, end + 1);
       const next = firstLine + body.split("\n").length - 1;
+
       return textResult(body + `\n[read truncated; continue with read({path:${JSON.stringify(rel)}, offset:${next}})]`, { path: targetPath, outputTruncated: true, nextOffset: next, firstLine, lastLine: next - 1, sourceChars: body.length, complete: false });
     }
+
     ledger.recordOrigin(rel, firstLine, sliced.split("\n"), explicit);
+
     return textResult(sliced, { path: targetPath, firstLine, lastLine: firstLine + sliced.split("\n").length - 1 - Number(sliced.endsWith("\n")), sourceChars: sliced.length, complete: sliced === text });
   }
 
@@ -300,31 +494,45 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
    * lines with numbers, a quick structural check, and bounded lexical reference hints.
    * These do not replace tests or semantic caller resolution.
    */
-  async function editSummary(cwd, target, original, updated, diff, signal) {
+  async function editSummary(cwd, target, original, updated, diff, signal, span) {
     const rel = relativeSlash(cwd, target);
     const newLines = updated.split("\n");
     const ranges = [];
-    const positions = diff.lines.filter(row => row.type !== "context")
-      .map(row => Math.min(newLines.length, row.newLineNum ?? row.lineNum)).sort((a, b) => a - b);
-    for (const line of positions) {
-      const start = Math.max(1, line - 2), end = Math.min(newLines.length, line + 2);
-      if (ranges.length && start <= ranges.at(-1).end + 1) ranges.at(-1).end = Math.max(ranges.at(-1).end, end);
-      else ranges.push({ start, end });
+
+    if (span && Number.isInteger(span.start) && Number.isInteger(span.end) && span.start >= 1 && span.end >= span.start) {
+      ranges.push({ start: span.start, end: Math.min(newLines.length, span.end) });
+    } else {
+      const positions = diff.lines.filter(row => row.type !== "context")
+        .map(row => Math.min(newLines.length, row.newLineNum ?? row.lineNum)).sort((a, b) => a - b);
+
+      for (const line of positions) {
+        const start = Math.max(1, line - 2), end = Math.min(newLines.length, line + 2);
+
+        if (ranges.length && start <= ranges.at(-1).end + 1) ranges.at(-1).end = Math.max(ranges.at(-1).end, end);
+        else ranges.push({ start, end });
+      }
     }
+
     const blocks = [];
     const perRange = Math.max(1, Math.floor(40 / Math.max(1, ranges.length)));
+
     for (const { start, end } of ranges) {
       const last = Math.min(end, start + perRange - 1);
       const lines = newLines.slice(start - 1, last);
       ledger.recordOrigin(rel, start, lines);
       blocks.push("edited " + rel + ":" + start + "-" + last + "\n" + lines.map((line, i) => String(start + i).padStart(5) + " " + line).join("\n"));
+
       if (last < end) blocks.push("[continue with read({path:" + JSON.stringify(rel) + ",offset:" + (last + 1) + ",limit:" + (end - last) + "})]");
     }
+
     let out = blocks.join("\n");
     const check = quickCheck(updated, path.extname(target));
+
     if (check && !check.ok) out += `\ncheck: ${check.message}`;
     const refs = await changedDeclarationRefs(cwd, target, original, updated, diff, signal);
+
     if (refs) out += `\n${refs}`;
+
     return out;
   }
 
@@ -334,30 +542,41 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
     const newLines = updated.split("\n");
     const names = new Set();
     const spans = new Map();
+
     for (const l of diff.lines) {
       if (l.type === "context") continue;
       const number = l.type === "remove" ? l.lineNum : l.newLineNum ?? l.lineNum;
       const name = declaredName((l.type === "remove" ? oldLines : newLines)[number - 1] ?? "");
+
       if (name) names.add(name);
       else {
         if (!spans.has(l.type)) spans.set(l.type, WorkspaceIndex.spansOf(WorkspaceIndex.fromText(target, l.type === "remove" ? original : updated)));
         const owner = spans.get(l.type).find(span => span.start <= number && number <= span.end);
+
         if (owner?.name) names.add(owner.name);
       }
+
       if (names.size >= 3) break;
     }
+
     if (names.size === 0) return "";
+
     try {
       const { references, incomplete } = await referencesForNames({ root: cwd, names: [...names].slice(0, 3),
         excludePath: target, overlayText: file => vfs.getOverlay(file), pendingPaths: vfs.getOverlayPaths(), signal });
+
       const parts = [];
+
       for (const [name, refs] of references) {
         if (refs.length) parts.push(name + " also referenced in " + refs.slice(0, 6).join(", ") + (refs.length > 6 ? " (more matches)" : ""));
       }
+
       if (incomplete) parts.push("references incomplete: search budget reached");
+
       return parts.join("\n");
     } catch (error) {
       signal?.throwIfAborted();
+
       return "references unavailable: " + error.message;
     }
   }
@@ -368,20 +587,27 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
   async function sourceWindow(cwd, commandCwd, file, lineNo) {
     const candidate = path.resolve(commandCwd, file);
     let text, rel;
+
     try {
       const root = await fs.realpath(cwd);
+
       if (!candidate.startsWith(path.resolve(cwd) + path.sep) && !candidate.startsWith(root + path.sep)) return null;
       const real = await fs.realpath(candidate);
+
       if (!real.startsWith(root + path.sep) || (await fs.stat(real)).size > 1024 * 1024) return null;
       text = await fs.readFile(real, "utf8");
       rel = relativeSlash(root, real);
     } catch { return null; }
+
     const raw = text.split("\n");
+
     if (lineNo < 1 || lineNo > raw.length) return null;
     const start = Math.max(1, lineNo - 2);
     const rows = [];
+
     for (let l = start; l <= Math.min(raw.length, lineNo + 2); l++) rows.push((l === lineNo ? "►" : " ") + String(l).padStart(4) + " " + raw[l - 1]);
     ledger.recordOrigin(rel, start, rows);
+
     return rel + ":" + lineNo + "\n" + rows.join("\n");
   }
 
@@ -389,20 +615,27 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
   async function sourceForReferences(cwd, commandCwd, output) {
     const seen = new Set();
     const blocks = [];
+
     for (const m of output.matchAll(SOURCE_REF)) {
       const key = m[1] + ":" + m[2];
+
       if (seen.has(key)) continue;
+
       if (seen.size >= 4) break;
       seen.add(key);
       const block = await sourceWindow(cwd, commandCwd, m[1], Number(m[2]));
+
       if (block) blocks.push(block);
     }
+
     return blocks.length ? "\n--- source\n" + blocks.join("\n") : "";
   }
 
   function outlineOptions(params, references) {
     const options = { references };
+
     if (params?.maxChars) options.maxChars = params.maxChars;
+
     return options;
   }
 
@@ -410,6 +643,7 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
   function recordOutlineOrigins(rel, outlineText) {
     for (const line of outlineText.split("\n")) {
       const m = /^\s*(\d+) (.*)$/.exec(line);
+
       if (m && !/ … \d+ lines$/.test(line)) ledger.recordOrigin(rel, Number(m[1]), [line]);
     }
   }
@@ -417,11 +651,14 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
   /** Where else a name appears (declaration line excluded), for outlines and edit results. */
   async function referenceFinder(cwd, targetPath) {
     const files = [...new Set([...await index.files(cwd), ...vfs.getOverlayPaths()])];
+
     if (!index.canScan(files)) return () => [];
+
     return (name, excludeLine) => {
       if (!name || name.length < 3) return [];
       const escaped = name.replace(/[$]/g, (c) => "\\" + c);
       const regex = new RegExp("\\b" + escaped + "\\b");
+
       return index
         .grepRows(files, regex, cwd, file => vfs.getOverlay(file))
         .filter((r) => !(r.line === excludeLine && r.rel === relativeSlash(cwd, targetPath)))
@@ -430,22 +667,30 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
   }
 
   hooks.summarizeEdit = editSummary;
+
   return {
     read: readAdapter,
     async write(params, signal) {
       const cwd = getCwd();
       const target = await resolveWorkspacePath(cwd, params?.path, "write", false);
+
       if (signal?.aborted) throw new Error("aborted");
+
       if (!isString(params?.content)) throw new Error("write requires string content");
+
       if (params.append !== undefined && params.append !== true && params.append !== false) throw new Error("write append must be a boolean");
       let content = params.content;
+
       if (params.allowReadArtifacts !== true && /\[read truncated;|…\[(?:host-result|output|value) truncated \d+ chars\]…/u.test(content)) {
         throw new Error("refusing to write truncated read output; use edit() or reconstruct complete source windows. Set allowReadArtifacts:true only to intentionally write literal truncation-marker text");
       }
+
       let prevText = "";
+
       try {
         prevText = await vfs.read(target, { preserveRead: true });
       } catch (error) { if (error.code !== "ENOENT") throw error; }
+
       if (params.append === true) content = prevText + content;
       const { speculative } = await vfs.write(target, content);
       index.touch(relativeSlash(cwd, target));
@@ -453,38 +698,66 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
       const tag = speculative ? " (speculative)" : "";
       const check = quickCheck(content, path.extname(target));
       const warning = check && !check.ok ? "\ncheck: " + check.message : "";
+
       return textResult(`wrote ${target}${tag}${warning}`, { path: target, speculative, diff });
     },
     async edit(params, signal) {
       const cwd = getCwd();
       const target = await resolveWorkspacePath(cwd, params?.path, "edit", false);
+
       if (signal?.aborted) throw new Error("aborted");
 
+      const content = await vfs.read(target);
+
+      if (isNumber(params?.viewStart) && isNumber(params?.viewEnd) && isString(params?.viewText) && isString(params?.newText)) {
+        const windowNext = isString(params.oldText)
+          ? applyReplacements(target, params.viewText, [{ oldText: params.oldText, newText: params.newText }]).updated
+          : params.newText;
+        const { updated } = applyViewReplace(target, content, params.viewStart, params.viewEnd, params.viewText, windowNext);
+        const { speculative } = await vfs.write(target, updated);
+        index.touch(relativeSlash(cwd, target));
+        const diffFrom = isString(params.oldText) ? params.oldText : params.viewText;
+        const diffTo = isString(params.oldText) ? params.newText : windowNext;
+        const diff = buildEditDiff(target, content, diffFrom, diffTo);
+        const inserted = sourceLines(windowNext);
+        const spanEnd = params.viewStart + Math.max(inserted.length, 1) - 1;
+        const summary = await editSummary(cwd, target, content, updated, diff, signal, { start: params.viewStart, end: spanEnd });
+
+        return textResult(summary, { path: target, speculative, diff });
+      }
+
       const requestedEdits = Array.isArray(params?.edits)
         ? params.edits
         : [{ oldText: params?.oldText, newText: params?.newText }];
-      const content = await vfs.read(target);
       const { updated, matches } = applyReplacements(target, content, requestedEdits);
       const { speculative } = await vfs.write(target, updated);
       index.touch(relativeSlash(cwd, target));
+
       const diff =
         matches.length === 1
           ? buildEditDiff(target, content, matches[0].oldText, matches[0].newText)
           : buildMultiEditDiff(target, content, matches);
+
       const summary = await editSummary(cwd, target, content, updated, diff, signal);
+
       return textResult(summary, { path: target, speculative, diff });
     },
     async apply_patch(params, signal) {
       const cwd = getCwd();
       let inputPath = params?.path;
+
       if (!inputPath && isString(params?.patch)) {
         const headerMatch = /^\+\+\+\s+[ab]\/(.+)$/m.exec(params.patch) || /^---\s+[ab]\/(.+)$/m.exec(params.patch);
+
         if (headerMatch) inputPath = headerMatch[1].trim();
       }
+
       const target = await resolveWorkspacePath(cwd, inputPath, "apply_patch", false);
+
       if (!isString(params?.patch) || !params.patch.trim()) {
         throw new Error("apply_patch requires patch");
       }
+
       if (signal?.aborted) throw new Error("aborted");
 
       const original = await vfs.read(target);
@@ -493,6 +766,7 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
       const diff = buildPatchDiff(target, params.patch);
       index.touch(relativeSlash(cwd, target));
       const summary = await editSummary(cwd, target, original, resultText, diff, signal);
+
       return textResult(summary, {
         path: target,
         hunks: hunkCount,
@@ -502,15 +776,19 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
     },
     async snap(params, signal) {
       const cwd = getCwd();
+
       if (!isString(params?.query) || !params.query.trim()) {
         throw new Error("snap requires query");
       }
+
       if (signal?.aborted) throw new Error("aborted");
       const snapTarget = params?.path ? await resolveWorkspacePath(cwd, params.path, "snap", true) : cwd;
       const relativeRoot = path.relative(cwd, snapTarget);
+
       const includeHidden = Boolean(params?.path) && relativeRoot
         .split(path.sep)
         .some((segment) => segment.startsWith(".") && segment.length > 1);
+
       const res = await executeSnap({
         query: params.query,
         searchDir: snapTarget,
@@ -520,34 +798,45 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
         pendingPaths: vfs.getOverlayPaths(),
         signal,
       });
+
       return textResult(JSON.stringify(res, null, 2), res);
     },
     async evidence(params, signal) {
       const cwd = getCwd();
+
       if (!isString(params?.query) || !params.query.trim()) throw new Error("evidence requires query");
+
       if (signal?.aborted) throw new Error("aborted");
       const searchDir = params?.path ? await resolveWorkspacePath(cwd, params.path, "evidence", true) : cwd;
       const options = {};
+
       if (Number.isInteger(params?.k) && params.k > 0) options.k = params.k;
+
       if (Number.isInteger(params?.maxChars) && params.maxChars > 0) options.maxChars = params.maxChars;
       const res = await selectEvidence({ query: params.query, root: cwd, searchDir, index, overlayText: (p) => vfs.getOverlay(p), pendingPaths: vfs.getOverlayPaths(), options });
+
       for (const span of res.spans) ledger.recordOrigin(span.path, span.lines[0], span.text.split("\n"));
+
       return textResult(JSON.stringify(res), { route: res.route, count: res.spans.length });
     },
     async surface(params, signal) {
       const cwd = getCwd();
       const target = await resolveWorkspacePath(cwd, params?.path, "surface", false);
+
       if (signal?.aborted) throw new Error("aborted");
       const text = await vfs.read(target);
       const ext = path.extname(target);
       const outline = extractStructuralSurface(text, ext);
+
       return textResult(JSON.stringify(outline, null, 2), { path: target, count: outline.items.length });
     },
     async bash(params, signal) {
       const cwd = getCwd();
-      const literal = params?._directArgv === true;
+      const literal = Array.isArray(params?.args) && process.platform !== "win32" && params.args.length === Object.keys(params.args).length && params.args.every(isString);
+
       if (literal && (!isString(params.command) || !Array.isArray(params.args) || params.args.some(arg => !isString(arg)))) throw new Error("bash argv requires a command string and an array of string args");
       const command = literal ? String(params.command) : unwrapIfFullyQuoted(String(params?.command ?? "").trim());
+
       if (!command.trim()) throw new Error("bash requires command");
       const targetCwd = params?.cwd ? await resolveWorkspacePath(cwd, params.cwd, "bash cwd", true) : cwd;
 
@@ -556,6 +845,7 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
 
       const transactionBarrier = await vfs.prepareExternalMutation("bash");
       let res;
+
       try {
         res = await runCommand(argv, {
           cwd: targetCwd,
@@ -574,9 +864,12 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
         clearPathCache();
         hooks.workspaceChanged();
       }
+
       const { stdout, stderr } = res;
       let text = stdout && stderr ? stdout + (stdout.endsWith("\n") ? "" : "\n") + stderr : stdout || stderr;
+
       if (res.exitCode !== 0) text += await sourceForReferences(cwd, targetCwd, text);
+
       return {
         content: [{ type: "text", text }],
         details: { exitCode: res.exitCode, signal: res.signal, outputTruncated: res.outputTruncated, transactionBarrier },
@@ -586,66 +879,90 @@ function createNativeAdapters(getCwd, vfs, config, index, ledger, hooks) {
     async grep(params, signal) {
       const cwd = getCwd();
       const pattern = String(params?.pattern || "");
+
       if (!pattern) throw new Error("grep requires pattern");
       const searchPath = params?.path ? await resolveWorkspacePath(cwd, params.path, "grep", true) : cwd;
       const indexed = await grepIndexed(index, pattern, params, searchPath, cwd);
+
       if (indexed !== null) return textResult(indexed, { exitCode: indexed ? 0 : 1, via: "index" });
       // Large tree: real rg keeps its own output format.
       const res = await runCommand(["rg", ...rgGrepArgs(pattern, params, searchPath)], { cwd, timeoutMs: 30_000, signal });
+
       if (res.exitCode !== 0 && res.exitCode !== 1) {
         throw new Error(res.stderr.trim() || `rg exited ${res.exitCode}`);
       }
+
       return textResult(res.stdout, { exitCode: res.exitCode });
     },
     async glob(params, signal) {
       const cwd = getCwd();
       const pattern = String(params?.pattern || "");
+
       if (!pattern) throw new Error("glob requires pattern");
       const fuzzy = await fuzzyFind(index, cwd, cwd, pattern);
+
       if (fuzzy !== null) return textResult(fuzzy, { via: "fuzzy" });
       const indexed = await listIndexed(index, cwd, cwd, pattern);
+
       if (indexed !== null) return textResult(indexed, { via: "index" });
+
       const rg = await runCommand(["rg", "--files", "-g", pattern], { cwd, timeoutMs: 30_000, signal }).catch(
         () => null,
       );
+
       if (rg && (rg.exitCode === 0 || rg.exitCode === 1)) {
         return textResult(rg.stdout, { via: "rg" });
       }
+
       const findPattern = pattern.startsWith("./") ? pattern : `./${pattern}`;
+
       const fallback = await runCommand(["find", ".", "-type", "f", "-path", findPattern], {
         cwd,
         timeoutMs: 30_000,
         signal,
       });
+
       return textResult(fallback.stdout, { via: "find" });
     },
     async find(params, signal) {
       const cwd = getCwd();
       const searchDir = params?.path ? await resolveWorkspacePath(cwd, params.path, "find", true) : cwd;
       const pattern = params?.pattern || params?.glob;
+
       if (signal?.aborted) throw new Error("aborted");
       const globPattern = pattern ? String(pattern) : null;
       const fuzzy = await fuzzyFind(index, searchDir, cwd, globPattern);
+
       if (fuzzy !== null) return textResult(fuzzy, { via: "fuzzy" });
       const indexed = await listIndexed(index, searchDir, cwd, globPattern);
+
       if (indexed !== null) return textResult(indexed, { via: "index" });
+
       return listWithTools(searchDir, globPattern, cwd, signal);
     },
     async ls(params, signal) {
       const cwd = getCwd();
       const dirPath = params?.path ? await resolveWorkspacePath(cwd, params.path, "ls", true) : cwd;
+
       return readDirectory(dirPath, signal);
     },
   };
 }
 
-export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedger }) {
+/**
+ * Fused INVOKE kernel. Guest RPC is the only caller; fuel is cwd + vfs + signal.
+ * BIND stays downward (see tests/contracts/layers.test.mjs). Do not split this
+ * closure into pass-through files that re-import each other.
+ */
+export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedger, budget }) {
   const index = registry?.index ?? new WorkspaceIndex((argv, opts) => runCommand(argv, opts));
-  const ledger = runLedger ?? new SeenLedger({ window: config.seenWindow ?? 40 });
+  const ledger = runLedger ?? new SeenLedger({ window: config.seenWindow ?? 0 });
+
   const vfs = new CausalVfs(paths => {
     index.invalidate();
     notifyWorkspaceChanged(paths);
   }, target => resolveWorkspacePath(getCwd(), target, "commit", false, true));
+
   const executors = registry?.executors ?? new Map();
   const definitions = registry?.definitions ?? new Map();
   const sharedRegistry = registry ?? { executors, definitions, index, callSeq: 0 };
@@ -660,20 +977,25 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
   let trace = [];
   let callListener = null;
   const scheduler = createNativeScheduler();
+
   // Advisory host event, not a tool or a transaction participant. Consumers
   // invalidate synchronously; failures must never affect committed bytes.
   function notifyWorkspaceChanged(paths = null) {
     if (!isFunction(pi?.events?.emit)) return;
+
     const event = Object.freeze({
       version: 1, cwd: path.resolve(getCwd()),
       paths: paths === null ? null : Object.freeze([...new Set(paths)]),
     });
+
     try { pi.events.emit("workspace:changed", event)?.catch?.(() => {}); } catch {}
   }
+
   hooks.workspaceChanged = notifyWorkspaceChanged;
   hooks.artifactsDir = () => activeCtx?.sessionManager?.getArtifactsDir?.();
   hooks.commandEnv = () => {
     const env = { ...process.env };
+
     const current = {
       PI_SESSION_ID: activeCtx?.sessionManager?.getSessionId?.(),
       PI_SESSION_FILE: activeCtx?.sessionManager?.getSessionFile?.(),
@@ -681,10 +1003,12 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
       PI_MODEL: activeCtx?.model?.id,
       PI_REASONING_LEVEL: activeCtx?.thinkingLevel,
     };
+
     for (const [key, value] of Object.entries(current)) {
       if (isString(value)) env[key] = value;
       else delete env[key];
     }
+
     return env;
   };
 
@@ -702,6 +1026,7 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
         executors.set(tool.name, tool.execute.bind(tool));
         definitions.set(tool.name, tool);
       }
+
       return original(tool);
     };
   }
@@ -721,33 +1046,45 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
   function hostTool(name) {
     if (!hostSession) return undefined;
     const metadata = definitions.get(name);
+
     // Keep Supernova's transactional adapters for ordinary built-ins. Respect overrides.
     if (Object.hasOwn(natives, name) && metadata?.sourceInfo?.source === "builtin") return undefined;
+
     return hostSession.getToolForEvalBridge?.(name);
   }
 
   function isCallable(name) {
     if (name === "supernova" || (config.excludeTools ?? []).includes(name)) return false;
+
     if (hostSession && (hostSession.isDisposed || hostSession.sessionManager.getSessionId() !== boundSessionId)) return false;
+
     // An internal adapter belongs to Supernova, not the host's visible tool list.
     const nativeOwned = Object.hasOwn(natives, name) && !executors.has(name)
       && (!hostSession || !definitions.has(name) || definitions.get(name).sourceInfo?.source === "builtin");
+
     if (nativeOwned) return true;
+
     if (hostSession) {
       if (!hostSession.getEvalBridgeToolNames().includes(name) && definitions.has(name)) return false;
+
       return !!hostTool(name) || (Object.hasOwn(natives, name) && (!definitions.has(name) || definitions.get(name).sourceInfo?.source === "builtin"));
     }
+
     if (definitions.has(name) && isFunction(pi?.getActiveTools) && !pi.getActiveTools().includes(name)) return false;
+
     return executors.has(name) || Object.hasOwn(natives, name);
   }
 
   function refreshTools() {
     const tools = pi?.getAllTools?.() ?? [];
+
     for (const tool of tools) {
       if (!isString(tool?.name)) continue;
       definitions.set(tool.name, { ...definitions.get(tool.name), ...tool });
+
       if (!hostSession && isFunction(tool.execute)) executors.set(tool.name, tool.execute.bind(tool));
     }
+
     return [...definitions.values()].filter(tool => isCallable(tool.name));
   }
 
@@ -785,20 +1122,9 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
     return vfs.rollback();
   }
 
-  function resultDiff(response) {
-    let details = response?.details;
-    if (isString(details)) {
-      try {
-        details = JSON.parse(details);
-      } catch {
-        return undefined;
-      }
-    }
-    return isObject(details) ? details.diff : undefined;
-  }
-
   function notifyCall(record) {
     if (!callListener) return;
+
     try {
       callListener(record, [...trace]);
     } catch {}
@@ -807,19 +1133,25 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
   function checkCallBudget(name) {
     if (closed) throw new Error("program is already complete");
     const maxCalls = config.maxBridgeCalls ?? 256;
+
+    if (budget && ++budget.calls > maxCalls) throw new Error("host call budget exceeded (" + maxCalls + " calls per program batch): split the batch");
     callCount += 1;
+
     if (callCount > maxCalls) {
       throw new Error(
         `host call budget exceeded (${maxCalls} calls per program): 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)) {
       throw new Error(
         `${name} is blocked (excluded / non-reentrant).`,
@@ -831,17 +1163,20 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
     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);
   }
@@ -850,6 +1185,7 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
     checkCallBudget(name);
     const callId = ++sharedRegistry.callSeq;
     assertCallableTarget(name);
+
     if (!isCallable(name)) throw new Error(unknownToolMessage(name, [...definitions.keys(), ...Object.keys(natives)].filter(isCallable)));
 
     const command = { apply_patch: "edit", surface: "read", evidence: "read", snap: "read" }[name] ?? name;
@@ -860,18 +1196,28 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
     try {
       const delegated = hostTool(name);
       const exec = delegated ? delegated.execute.bind(delegated) : hostSession ? undefined : executors.get(name);
-      if (exec) {
+      const argvOwned = name === "bash" && Array.isArray(args?.args) && process.platform !== "win32" && args.args.length === Object.keys(args.args).length && args.args.every(isString);
+
+      if (exec && !argvOwned) {
+        if (name === "read" && (args?.json !== undefined || /^(agent|artifact):\/\/.*\?/i.test(String(args?.path)))) throw new Error("JSON projection requires the Supernova-owned read adapter, not an external override");
+
         if (name === "write" && args?.append === true) throw new Error("append requires the Supernova-owned write adapter, not an external override");
         const fallbackDiff = await writeFallbackDiff(name, args);
         const mutating = isMutatingTool(name, config, args, definitions.get(name));
+
         if (mutating) await vfs.prepareExternalMutation(name);
+
         if (activeSignal?.aborted || closed) throw new Error("aborted");
+
         if (!isCallable(name)) throw new Error("tool is no longer enabled in this session: " + name);
+
         try {
           const res = await exec(`supernova:${name}:${callId}`, args || {}, activeSignal, undefined, delegated
             ? { ...activeCtx, settings: hostSession.settings, toolNames: hostSession.getEvalBridgeToolNames(), autoApprove: false }
             : activeCtx);
+
           completeRecord(record, res, fallbackDiff);
+
           return res;
         } finally {
           if (mutating) { vfs.invalidateCache(); index.invalidate(); clearPathCache(); notifyWorkspaceChanged(); }
@@ -879,9 +1225,11 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
       }
 
       const native = Object.hasOwn(natives, name) ? natives[name] : undefined;
+
       if (native) {
         const res = await native(args || {}, activeSignal);
         completeRecord(record, res);
+
         return res;
       }
 
@@ -899,25 +1247,36 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
     record.ms = Date.now() - record.time;
     record.ok = !hostResultFailed(res);
     const exitCode = isObject(res?.details) ? res.details.exitCode : undefined;
+
     if (Number.isInteger(exitCode) && exitCode !== 0) record.exitCode = exitCode;
+    const text = isObject(res) && Array.isArray(res.content)
+      ? res.content.filter(part => part?.type === "text" && isString(part.text)).map(part => part.text).join("\n")
+      : undefined;
+
+    if (text) record.resultText = text;
   }
 
   async function call(name, args) {
     if (!isString(name) || !name) throw new Error("nova.call requires a tool name");
     const invoke = async () => packageHostResult(await invokeRaw(name, args), config);
     const kind = isMutatingTool(name, config, args, definitions.get(name)) ? "write" : "read";
+
     return scheduler.schedule(kind, invoke, activeSignal);
   }
 
   async function callMany(calls) {
     if (!Array.isArray(calls)) throw new TypeError("nova.callMany requires an array");
     const list = calls;
+
     if (list.some(item => !isString(item?.name) || !item.name)) throw new TypeError("nova.callMany entries require a tool name");
+
     const thunks = list.map((item) => {
       const n = item?.name;
       const a = item?.args;
+
       return () => call(n, a);
     });
+
     const names = list.map((item) => item?.name).filter((n) => isString(n));
     const wave = await runParallelWave(thunks, { names, calls: list, definitions: names.map(name => definitions.get(name)) }, { mode: "auto", config });
     // Return a results array that also carries .mode/.reason, and is directly
@@ -928,6 +1287,7 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
       reason: { value: wave.reason, enumerable: false },
       results: { value: results, enumerable: false },
     });
+
     return results;
   }
 
@@ -955,12 +1315,13 @@ export function createHostBridge({ pi, config, getCwd, registry, ledger: runLedg
       },
     },
     fork(options) {
-      return createHostBridge({ pi, config, getCwd: options.getCwd, registry: sharedRegistry, ledger: ledger.fork() });
+      return createHostBridge({ pi, config, getCwd: options.getCwd, registry: sharedRegistry, ledger: ledger.fork(), budget: options.budget });
     },
     close() { closed = true; vfs.closed = true; },
     bindCallContext,
     resetCallBudget,
     getTrace,
+    getMutations: () => ({ ...vfs.mutations }),
     setCallListener,
     barrier: run => scheduler.schedule("write", run, activeSignal),
     beginSpeculation,