zidane 3.1.2 → 3.3.0

package/dist/{chunk-2AE3VM5O.js → chunk-Z2E5QN5X.js}

@@ -5,10 +5,10 @@ import {
   interpolateShellCommands,
   resolveSkills,
   validateResourcePath
-} from "./chunk-TPXPVEH6.js";
+} from "./chunk-X3VOTPVM.js";
 import {
   createProcessContext
-} from "./chunk-IUBBVF53.js";
+} from "./chunk-UD25QF3H.js";
 import {
   connectMcpServers
 } from "./chunk-7H34OFDA.js";
@@ -69,6 +69,26 @@ function desanitize(s) {
     out = out.replaceAll(from, to);
   return out;
 }
+var LINE_NUMBER_PREFIX_RE = /^[ \t]*\d{1,9}[\t|\u2192]/gm;
+function stripLineNumberPrefixes(s) {
+  return s.replace(LINE_NUMBER_PREFIX_RE, "");
+}
+function locateAndCount(haystack, normFile, target, via) {
+  const idx = normFile.indexOf(target);
+  if (idx === -1)
+    return null;
+  const actual = haystack.slice(idx, idx + target.length);
+  let occ = 0;
+  let cursor = 0;
+  while (true) {
+    const next = normFile.indexOf(target, cursor);
+    if (next === -1)
+      break;
+    occ++;
+    cursor = next + target.length;
+  }
+  return { actual, occurrences: occ, via };
+}
 function resolveOldString(haystack, needle) {
   const exact = countExactMatches(haystack, needle);
   if (exact > 0)
@@ -76,20 +96,9 @@ function resolveOldString(haystack, needle) {
   const normNeedle = normalizeQuotes(needle);
   const normFile = normalizeQuotes(haystack);
   if (normNeedle !== needle || normFile !== haystack) {
-    const idx = normFile.indexOf(normNeedle);
-    if (idx !== -1) {
-      const actual = haystack.slice(idx, idx + normNeedle.length);
-      let occ = 0;
-      let cursor = 0;
-      while (true) {
-        const next = normFile.indexOf(normNeedle, cursor);
-        if (next === -1)
-          break;
-        occ++;
-        cursor = next + normNeedle.length;
-      }
-      return { actual, occurrences: occ, via: "quotes" };
-    }
+    const m = locateAndCount(haystack, normFile, normNeedle, "quotes");
+    if (m)
+      return m;
   }
   const desan = desanitize(needle);
   if (desan !== needle) {
@@ -99,23 +108,34 @@ function resolveOldString(haystack, needle) {
   }
   const combo = desanitize(normNeedle);
   if (combo !== needle) {
-    const idx = normFile.indexOf(combo);
-    if (idx !== -1) {
-      const actual = haystack.slice(idx, idx + combo.length);
-      let occ = 0;
-      let cursor = 0;
-      while (true) {
-        const next = normFile.indexOf(combo, cursor);
-        if (next === -1)
-          break;
-        occ++;
-        cursor = next + combo.length;
-      }
-      return { actual, occurrences: occ, via: "quotes+desanitize" };
+    const m = locateAndCount(haystack, normFile, combo, "quotes+desanitize");
+    if (m)
+      return m;
+  }
+  const stripped = stripLineNumberPrefixes(needle);
+  if (stripped !== needle && stripped.trim().length > 0) {
+    const count = countExactMatches(haystack, stripped);
+    if (count > 0)
+      return { actual: stripped, occurrences: count, via: "line-numbers" };
+    const strippedNorm = normalizeQuotes(stripped);
+    if (strippedNorm !== stripped || normFile !== haystack) {
+      const m = locateAndCount(haystack, normFile, strippedNorm, "quotes+line-numbers");
+      if (m)
+        return m;
     }
   }
   return null;
 }
+function styleReplacementForVia(replacement, via, actual) {
+  let out = replacement;
+  if (via === "desanitize" || via === "quotes+desanitize")
+    out = desanitize(out);
+  if (via === "line-numbers" || via === "quotes+line-numbers")
+    out = stripLineNumberPrefixes(out);
+  if (via === "quotes" || via === "quotes+desanitize" || via === "quotes+line-numbers")
+    out = preserveQuoteStyle(actual, out);
+  return out;
+}
 function preserveQuoteStyle(actual, replacement) {
   const hasDouble = actual.includes(LEFT_DOUBLE_CURLY_QUOTE) || actual.includes(RIGHT_DOUBLE_CURLY_QUOTE);
   const hasSingle = actual.includes(LEFT_SINGLE_CURLY_QUOTE) || actual.includes(RIGHT_SINGLE_CURLY_QUOTE);
@@ -221,7 +241,7 @@ function hashContent(text) {
 var edit = {
   spec: {
     name: "edit",
-    description: "Replace exact `old_string` with `new_string` in a file. Fails if `old_string` is not unique unless `replace_all: true`. Prefer over `write_file` for surgical changes \u2014 preserves the rest of the file.",
+    description: "Replace exact `old_string` with `new_string` in a file. Fails if `old_string` is not unique unless `replace_all: true`. Prefer over `write_file` for surgical changes \u2014 preserves the rest of the file. Tolerates `read_file` line-number prefixes (`<N>\\t\u2026`, `<N>|\u2026`, or `<N>\u2192\u2026`) in `old_string` / `new_string` \u2014 they are stripped before matching/writing, so you can paste a numbered chunk verbatim.",
     inputSchema: {
       type: "object",
       properties: {
@@ -266,9 +286,7 @@ var edit = {
     const { actual, occurrences, via } = match;
     if (occurrences > 1 && !replaceAll)
       return `Edit error: old_string appears ${occurrences} times in ${target}. Pass replace_all=true or expand old_string for uniqueness.`;
-    let styledReplacement = via === "desanitize" || via === "quotes+desanitize" ? desanitize(replacement) : replacement;
-    if (via === "quotes" || via === "quotes+desanitize")
-      styledReplacement = preserveQuoteStyle(actual, styledReplacement);
+    const styledReplacement = styleReplacementForVia(replacement, via, actual);
     const updated = replaceAll ? original.split(actual).join(styledReplacement) : original.replace(actual, styledReplacement);
     if (updated === original)
       return `Edit error: replacement produced no change in ${target}.`;
@@ -285,7 +303,8 @@ var edit = {
   }
 };
 function nearestMatchPreview(haystack, needle) {
-  const needleFirstLine = needle.split("\n")[0];
+  const normalizedNeedle = stripLineNumberPrefixes(needle);
+  const needleFirstLine = normalizedNeedle.split("\n")[0];
   if (needleFirstLine.length < 3)
     return null;
   const lines = haystack.split("\n");
@@ -312,6 +331,8 @@ function sharedPrefixLength(a, b) {
 }
 
 // src/tools/glob.ts
+import { stat } from "fs/promises";
+import { resolve } from "path";
 var DEFAULT_LIMIT = 1e3;
 var SAFE_GLOB_PATTERN_RE = /^[\w./*?[\]{}!,^@+-]+$/;
 async function globInProcess(pattern, cwd, limit) {
@@ -338,7 +359,7 @@ async function globViaShell(pattern, ctx, limit) {
 var glob = {
   spec: {
     name: "glob",
-    description: "Match files by glob pattern (supports **, *, ?). Relative to the execution context cwd. Returns a newline-separated list of matching paths, sorted.",
+    description: "Match files by glob pattern (supports **, *, ?). Relative to the execution context cwd. By default each row is `<path>\\t<size-bytes>\\t<mtime-iso>`; set `metadata: false` for a plain newline-separated list of paths. Always sorted.",
     inputSchema: {
       type: "object",
       properties: {
@@ -349,17 +370,34 @@ var glob = {
         limit: {
           type: "number",
           description: `Maximum number of matches to return. Default: ${DEFAULT_LIMIT}.`
+        },
+        metadata: {
+          type: "boolean",
+          description: "Append size (bytes) and mtime (ISO) per row, tab-separated. Default: true. In-process only \u2014 non-process execution contexts always return paths."
         }
       },
       required: ["pattern"]
     }
   },
-  async execute({ pattern, limit }, ctx) {
+  async execute({ pattern, limit, metadata }, ctx) {
     const pat = pattern;
     const max = typeof limit === "number" && limit > 0 ? limit : DEFAULT_LIMIT;
+    const wantMetadata = metadata !== false;
     try {
       const entries = ctx.execution.type === "process" ? await globInProcess(pat, ctx.handle.cwd, max) : await globViaShell(pat, ctx, max);
-      return entries.length > 0 ? entries.join("\n") : "(no matches)";
+      if (entries.length === 0)
+        return "(no matches)";
+      if (!wantMetadata || ctx.execution.type !== "process")
+        return entries.join("\n");
+      const rows = await Promise.all(entries.map(async (rel) => {
+        try {
+          const s = await stat(resolve(ctx.handle.cwd, rel));
+          return `${rel}	${s.size}	${new Date(s.mtimeMs).toISOString()}`;
+        } catch {
+          return `${rel}		`;
+        }
+      }));
+      return rows.join("\n");
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       return `Glob error: ${message}`;
@@ -367,6 +405,18 @@ var glob = {
   }
 };
 
+// src/tools/shell-quote.ts
+var SAFE_TOKEN_RE = /^[\w@%+=:,./-]+$/;
+var SINGLE_QUOTE_RE = /'/g;
+function shellQuote(arg) {
+  if (SAFE_TOKEN_RE.test(arg))
+    return arg;
+  return `'${arg.replace(SINGLE_QUOTE_RE, "'\\''")}'`;
+}
+function alwaysQuote(arg) {
+  return `'${arg.replace(SINGLE_QUOTE_RE, "'\\''")}'`;
+}
+
 // src/tools/grep.ts
 var DEFAULT_HEAD_LIMIT = 250;
 var DEFAULT_OUTPUT_MODE = "files_with_matches";
@@ -442,11 +492,6 @@ async function runViaRipgrep(input, ctx) {
   }
   return formatPaginated(result.stdout, input);
 }
-function shellQuote(arg) {
-  if (/^[\w@%+=:,./-]+$/.test(arg))
-    return arg;
-  return `'${arg.replace(/'/g, "'\\''")}'`;
-}
 async function runInProcess(input, ctx) {
   const mode = input.output_mode ?? DEFAULT_OUTPUT_MODE;
   const flags = `${input["-i"] ? "i" : ""}${input.multiline ? "s" : ""}${mode !== "content" ? "" : "g"}`;
@@ -531,8 +576,8 @@ async function enumerateFiles(input, ctx) {
   const root = input.path ?? ".";
   if (input.path && !input.path.includes("*") && !input.path.includes("?")) {
     try {
-      const stat = await ctx.execution.exec(ctx.handle, `test -f ${shellQuote(input.path)} && echo file || echo dir`);
-      if (stat.stdout.trim() === "file")
+      const stat2 = await ctx.execution.exec(ctx.handle, `test -f ${shellQuote(input.path)} && echo file || echo dir`);
+      if (stat2.stdout.trim() === "file")
         return [input.path];
     } catch {
     }
@@ -612,7 +657,7 @@ var listFiles = {
 var multiEdit = {
   spec: {
     name: "multi_edit",
-    description: "Apply a sequential list of edits to a file atomically. Each edit operates on the result of the previous edit. All edits must succeed for any to be written. Prefer this over multiple `edit` calls when several non-overlapping changes are needed in the same file.",
+    description: "Apply a sequential list of edits to a file atomically. Each edit operates on the result of the previous edit. All edits must succeed for any to be written. Prefer this over multiple `edit` calls when several non-overlapping changes are needed in the same file. Each step tolerates `read_file` line-number prefixes (`<N>\\t\u2026`, `<N>|\u2026`, or `<N>\u2192\u2026`) in `old_string` / `new_string`.",
     inputSchema: {
       type: "object",
       properties: {
@@ -673,9 +718,7 @@ var multiEdit = {
       const { actual, occurrences, via } = match;
       if (occurrences > 1 && !replaceAll)
         return `multi_edit error: edit #${i + 1} old_string appears ${occurrences} times. Pass replace_all=true on this edit or expand old_string for uniqueness.`;
-      let styledReplacement = via === "desanitize" || via === "quotes+desanitize" ? desanitize(replacement) : replacement;
-      if (via === "quotes" || via === "quotes+desanitize")
-        styledReplacement = preserveQuoteStyle(actual, styledReplacement);
+      const styledReplacement = styleReplacementForVia(replacement, via, actual);
       current = replaceAll ? current.split(actual).join(styledReplacement) : current.replace(actual, styledReplacement);
       applied += occurrences;
     }
@@ -695,6 +738,33 @@ var multiEdit = {
 // src/tools/read-file.ts
 import { Buffer as Buffer2 } from "buffer";
 
+// src/tools/binary-detect.ts
+var SNIFF_BYTES = 8192;
+var REPLACEMENT_RATIO_THRESHOLD = 0.01;
+var REPLACEMENT_MIN_COUNT = 5;
+function containsNullByte(text, sniffBytes = SNIFF_BYTES) {
+  const sample = text.length > sniffBytes ? text.slice(0, sniffBytes) : text;
+  for (let i = 0; i < sample.length; i++) {
+    if (sample.charCodeAt(i) === 0)
+      return true;
+  }
+  return false;
+}
+function looksBinary(text, sniffBytes = SNIFF_BYTES) {
+  const sample = text.length > sniffBytes ? text.slice(0, sniffBytes) : text;
+  if (sample.length === 0)
+    return false;
+  let replacementCount = 0;
+  for (let i = 0; i < sample.length; i++) {
+    const code = sample.charCodeAt(i);
+    if (code === 0)
+      return true;
+    if (code === 65533)
+      replacementCount++;
+  }
+  return replacementCount >= REPLACEMENT_MIN_COUNT && replacementCount / sample.length > REPLACEMENT_RATIO_THRESHOLD;
+}
+
 // src/tools/binary-read.ts
 import { Buffer } from "buffer";
 function imageMediaTypeFor(path) {
@@ -722,38 +792,45 @@ async function readFileAsBase64(execution, handle, path) {
     const b642 = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString("base64");
     return { base64: b642, byteLength: bytes.byteLength };
   }
-  const cmd = `base64 < ${shellQuote2(path)}`;
+  const cmd = `base64 < ${alwaysQuote(path)}`;
   const result = await execution.exec(handle, cmd);
   if (result.exitCode !== 0)
     throw new Error(`base64 read failed: ${result.stderr || `exit ${result.exitCode}`}`);
   const b64 = result.stdout.replace(/\s+/g, "");
-  return { base64: b64, byteLength: Math.floor(b64.length * 3 / 4) };
+  return { base64: b64, byteLength: decodedBase64ByteLength(b64) };
 }
-function shellQuote2(s) {
-  return `'${s.replace(/'/g, "'\\''")}'`;
+function decodedBase64ByteLength(b64) {
+  if (b64.length === 0)
+    return 0;
+  let pad = 0;
+  if (b64.endsWith("=="))
+    pad = 2;
+  else if (b64.endsWith("="))
+    pad = 1;
+  return Math.max(0, b64.length * 3 / 4 - pad);
 }
 
 // src/tools/read-file.ts
 var DEFAULT_LINE_LIMIT = 2e3;
 var DEFAULT_BYTE_CAP = 65536;
-var BINARY_PROBE_BYTES = 8e3;
 var DEFAULT_IMAGE_BYTE_CAP = 5 * 1024 * 1024;
 var readFile = {
   spec: {
     name: "read_file",
-    description: "Read a file by path. Returns lines [offset..offset+limit). Default offset=1, limit=2000. A trailing footer explains how to read the rest when truncated. Binary files return a short marker rather than mojibake.",
+    description: "Read a file by path. Returns lines [offset..offset+limit). Default offset=1, limit=2000. Each line is prefixed with its 1-indexed line number followed by a tab (e.g. `42\\tconst foo = bar`); the prefix is metadata, not part of the file. Mirrors Claude Code's `cat -n`-style compact output for token efficiency. A trailing footer explains how to read the rest when truncated. Binary files return a short marker rather than mojibake.",
     inputSchema: {
       type: "object",
       properties: {
         path: { type: "string", description: "Relative file path." },
         offset: { type: "integer", description: "1-indexed line number to start from. Default: 1." },
         limit: { type: "integer", description: "Max lines to return. Default: 2000. Set 0 for unlimited." },
-        maxBytes: { type: "integer", description: "Hard byte cap regardless of line count. Default: 65536. Set 0 for unlimited." }
+        maxBytes: { type: "integer", description: "Hard byte cap on file content read, regardless of line count. Default: 65536. Set 0 for unlimited. The rendered output may be slightly larger than this cap when `lineNumbers` is on (each line carries a `<N>\\t` prefix)." },
+        lineNumbers: { type: "boolean", description: "Prefix each line with its 1-indexed line number. Default: true. Override the agent-wide `behavior.readLineNumbers` for this call." }
       },
       required: ["path"]
     }
   },
-  async execute({ path, offset, limit, maxBytes }, ctx) {
+  async execute({ path, offset, limit, maxBytes, lineNumbers }, ctx) {
     const imgMedia = imageMediaTypeFor(path);
     if (imgMedia) {
       const sizeCap = maxBytes !== void 0 ? normalizeInteger(maxBytes, DEFAULT_IMAGE_BYTE_CAP) : DEFAULT_IMAGE_BYTE_CAP;
@@ -787,10 +864,11 @@ var readFile = {
     const offsetForKey = normalizeInteger(offset, 1);
     const limitForKey = normalizeInteger(limit, DEFAULT_LINE_LIMIT);
     const maxBytesForKey = normalizeInteger(maxBytes, DEFAULT_BYTE_CAP);
+    const showLineNumbers = typeof lineNumbers === "boolean" ? lineNumbers : ctx.behavior?.readLineNumbers ?? true;
     const currentHash = readState ? hashContent(raw) : "";
     if (readState) {
       const prior = readState.get(absKey);
-      if (prior && prior.contentHash === currentHash && prior.offset === offsetForKey && prior.limit === limitForKey && prior.maxBytes === maxBytesForKey) {
+      if (prior && prior.contentHash === currentHash && prior.offset === offsetForKey && prior.limit === limitForKey && prior.maxBytes === maxBytesForKey && prior.lineNumbers === showLineNumbers) {
         return `File ${path} unchanged since the previous read in this session \u2014 the prior result is still current.`;
       }
     }
@@ -805,10 +883,10 @@ var readFile = {
     const startIdx = Math.max(0, offsetN - 1);
     const endIdx = limitN > 0 ? Math.min(totalLines, startIdx + limitN) : totalLines;
     let slice = lines.slice(startIdx, endIdx);
-    let bytesUsed = 0;
     let bytesCut = false;
     if (maxBytesN > 0) {
       const truncatedSlice = [];
+      let bytesUsed = 0;
       for (const line of slice) {
         const lineBytes = Buffer2.byteLength(line) + 1;
         if (bytesUsed + lineBytes > maxBytesN && truncatedSlice.length > 0) {
@@ -841,15 +919,16 @@ var readFile = {
         bytesCut = true;
       }
     }
-    const body = slice.join("\n");
     const linesReturned = slice.length;
     const lastLineRead = startIdx + linesReturned;
+    const body = showLineNumbers ? slice.map((line, i) => `${startIdx + i + 1}	${line}`).join("\n") : slice.join("\n");
     if (readState) {
       readState.set(absKey, {
         contentHash: currentHash,
         offset: offsetN,
         limit: limitN,
         maxBytes: maxBytesN,
+        lineNumbers: showLineNumbers,
         mtimeMs: Date.now()
       });
     }
@@ -879,21 +958,6 @@ function normalizeInteger(value, fallback) {
     return fallback;
   return Math.floor(value);
 }
-var REPLACEMENT_RATIO_THRESHOLD = 0.01;
-var REPLACEMENT_MIN_COUNT = 5;
-function looksBinary(text) {
-  const sample = text.length > BINARY_PROBE_BYTES ? text.slice(0, BINARY_PROBE_BYTES) : text;
-  if (sample.includes("\0"))
-    return true;
-  if (sample.length === 0)
-    return false;
-  let replacementCount = 0;
-  for (let i = 0; i < sample.length; i++) {
-    if (sample.charCodeAt(i) === 65533)
-      replacementCount++;
-  }
-  return replacementCount >= REPLACEMENT_MIN_COUNT && replacementCount / sample.length > REPLACEMENT_RATIO_THRESHOLD;
-}
 
 // src/tools/shell.ts
 import { Buffer as Buffer3 } from "buffer";
@@ -932,37 +996,54 @@ var DEFAULT_MAX_OUTPUT_BYTES = 8192;
 var shell = {
   spec: {
     name: "shell",
-    description: "Execute a shell command in the project root and return its combined stdout/stderr. Output is tail-priority truncated at 8 KB by default; errors and exit-code summaries live in the tail. Set maxOutputBytes=0 to disable truncation.",
+    description: "Execute a shell command in the project root and return its combined stdout/stderr. Output is tail-priority truncated at 8 KB by default; errors and exit-code summaries live in the tail. By default each call appends a `(exit N, Nms)` footer and surfaces non-empty stderr in a separate section even on success \u2014 set `metadata: false` to return only stdout. Set maxOutputBytes=0 to disable truncation.",
     inputSchema: {
       type: "object",
       properties: {
         command: { type: "string", description: "Shell command to run." },
         timeout: { type: "integer", description: "Per-call timeout in milliseconds." },
-        maxOutputBytes: { type: "integer", description: "Truncate combined stdout+stderr beyond this many bytes. Default: 8192. Set 0 for unlimited." }
+        maxOutputBytes: { type: "integer", description: "Truncate combined stdout+stderr beyond this many bytes. Default: 8192. Set 0 for unlimited." },
+        metadata: { type: "boolean", description: "Append `(exit N, Nms)` footer and surface non-empty stderr on success. Default: true." }
       },
       required: ["command"]
     }
   },
-  async execute({ command, timeout, maxOutputBytes }, ctx) {
+  async execute({ command, timeout, maxOutputBytes, metadata }, ctx) {
     const execOpts = {};
     if (typeof timeout === "number" && Number.isFinite(timeout) && timeout > 0)
       execOpts.timeout = Math.max(1, Math.ceil(timeout / 1e3));
     const cmd = command;
+    const wantMetadata = metadata !== false;
+    const startedAt = Date.now();
     const result = await ctx.execution.exec(ctx.handle, cmd, execOpts);
+    const durationMs = Date.now() - startedAt;
     const cap = normalizeCap(maxOutputBytes);
     const semantic = interpretShellResult(cmd, result.exitCode);
-    if (result.exitCode === 0)
-      return truncateTail(result.stdout || "(no output)", cap);
+    if (result.exitCode === 0) {
+      const stdoutTail = truncateTail(result.stdout || "(no output)", cap);
+      if (!wantMetadata)
+        return stdoutTail;
+      const stderrTrimmed = result.stderr.trim();
+      const stderrSection = stderrTrimmed ? `
+[stderr]
+${truncateTail(stderrTrimmed, Math.min(cap, 2048))}` : "";
+      return `${stdoutTail}${stderrSection}
+(exit 0, ${durationMs}ms)`;
+    }
     if (!semantic.isError) {
       const body = (result.stdout || result.stderr || "").trim();
       const tail = truncateTail(body, cap);
-      const footer = semantic.message ? `
+      const semanticFooter = semantic.message ? `
 (${semantic.message})` : "";
-      return tail.length > 0 ? `${tail}${footer}` : semantic.message ?? "(no output)";
+      const timingFooter = wantMetadata ? `
+(exit ${result.exitCode}, ${durationMs}ms)` : "";
+      const head = tail.length > 0 ? tail : semantic.message ?? "(no output)";
+      return `${head}${semanticFooter}${timingFooter}`;
     }
     const combined = `${result.stdout}
 ${result.stderr}`.trim();
-    return `Exit code ${result.exitCode}
+    const header = wantMetadata ? `Exit code ${result.exitCode} (${durationMs}ms)` : `Exit code ${result.exitCode}`;
+    return `${header}
 ${truncateTail(combined, cap)}`;
   }
 };
@@ -996,15 +1077,6 @@ ${tail}`;
 }
 
 // src/tools/skills-read.ts
-var SNIFF_BYTES = 8192;
-function looksBinary2(text) {
-  const len = Math.min(text.length, SNIFF_BYTES);
-  for (let i = 0; i < len; i++) {
-    if (text.charCodeAt(i) === 0)
-      return true;
-  }
-  return false;
-}
 function createSkillsReadTool(options) {
   const byName = new Map(options.catalog.map((s) => [s.name, s]));
   return {
@@ -1049,7 +1121,7 @@ function createSkillsReadTool(options) {
         const message = err instanceof Error ? err.message : String(err);
         return `Error reading "${relPath}" in skill "${skillName}": ${message}`;
       }
-      if (looksBinary2(content)) {
+      if (containsNullByte(content)) {
         return JSON.stringify({
           kind: "binary-unsupported",
           path: validated.absolutePath,
@@ -1062,12 +1134,8 @@ function createSkillsReadTool(options) {
 }
 
 // src/tools/skills-run-script.ts
-var SINGLE_QUOTE_RE = /'/g;
 var ABS_WINDOWS_RE = /^[a-z]:[\\/]/i;
 var COLLAPSE_SLASHES_RE = /\/+/g;
-function quoteShellArg(arg) {
-  return `'${arg.replace(SINGLE_QUOTE_RE, `'\\''`)}'`;
-}
 function createSkillsRunScriptTool(options) {
   const byName = new Map(options.catalog.map((s) => [s.name, s]));
   const timeoutMs = options.scriptTimeoutMs ?? 6e4;
@@ -1114,7 +1182,7 @@ function createSkillsRunScriptTool(options) {
       const validated = validateResourcePath(joinedPath, skill.baseDir);
       if (!validated.valid)
         return `Error: ${validated.error}`;
-      const cmd = [validated.absolutePath, ...args].map(quoteShellArg).join(" ");
+      const cmd = [validated.absolutePath, ...args].map(alwaysQuote).join(" ");
       try {
         const result = await ctx.execution.exec(ctx.handle, cmd, {
           timeout: Math.max(1, Math.round(timeoutMs / 1e3))
@@ -1556,6 +1624,74 @@ function applyTailCompaction(messages, threshold, keepTurns) {
   }
   return changed ? out : messages;
 }
+var STALE_READ_STUB = "[\u2026elided: file edited later in this run; re-read if still needed.]";
+function applyStaleReadElision(messages) {
+  if (messages.length === 0)
+    return messages;
+  const resultByCallId = /* @__PURE__ */ new Map();
+  for (const msg of messages) {
+    for (const block of msg.content) {
+      if (block.type === "tool_result" && typeof block.output === "string")
+        resultByCallId.set(block.callId, block.output);
+    }
+  }
+  const maxMutationIdxByPath = /* @__PURE__ */ new Map();
+  const readCallInfo = /* @__PURE__ */ new Map();
+  for (let i = 0; i < messages.length; i++) {
+    for (const block of messages[i].content) {
+      if (block.type !== "tool_call")
+        continue;
+      const path = block.input.path;
+      if (typeof path !== "string")
+        continue;
+      if (block.name === "read_file") {
+        readCallInfo.set(block.id, { path, msgIdx: i });
+        continue;
+      }
+      const isEdit = block.name === "edit" || block.name === "multi_edit";
+      const isWrite = block.name === "write_file";
+      if (!isEdit && !isWrite)
+        continue;
+      const result = resultByCallId.get(block.id);
+      if (typeof result !== "string")
+        continue;
+      const succeeded = isEdit ? result.startsWith("Edited ") : result.startsWith("Created ") || result.startsWith("Updated ");
+      if (!succeeded)
+        continue;
+      const prior = maxMutationIdxByPath.get(path);
+      if (prior === void 0 || i > prior)
+        maxMutationIdxByPath.set(path, i);
+    }
+  }
+  if (maxMutationIdxByPath.size === 0)
+    return messages;
+  const staleCallIds = /* @__PURE__ */ new Set();
+  for (const [callId, info] of readCallInfo) {
+    const lastMutationIdx = maxMutationIdxByPath.get(info.path);
+    if (typeof lastMutationIdx === "number" && info.msgIdx < lastMutationIdx)
+      staleCallIds.add(callId);
+  }
+  if (staleCallIds.size === 0)
+    return messages;
+  let changed = false;
+  const out = messages.slice();
+  for (let i = 0; i < out.length; i++) {
+    const msg = out[i];
+    let msgChanged = false;
+    const newContent = msg.content.map((block) => {
+      if (block.type !== "tool_result" || !staleCallIds.has(block.callId))
+        return block;
+      if (block.output === STALE_READ_STUB)
+        return block;
+      msgChanged = true;
+      changed = true;
+      return { ...block, output: STALE_READ_STUB };
+    });
+    if (msgChanged)
+      out[i] = { ...msg, content: newContent };
+  }
+  return changed ? out : messages;
+}
 function sanitizeStoredToolResults(provider, messages) {
   if (provider.meta.capabilities?.vision !== false)
     return messages;
@@ -1663,7 +1799,9 @@ function wrapProviderError(err, ctx) {
 }
 async function executeTurn(ctx, turn) {
   const turnId = await ctx.generateTurnId();
-  const canonicalMessages = turnsToMessages(ctx.turns);
+  let canonicalMessages = turnsToMessages(ctx.turns);
+  if (ctx.elideStaleReads === true)
+    canonicalMessages = applyStaleReadElision(canonicalMessages);
   const wireMessages = rewriteMessagesToWire(canonicalMessages, ctx.aliasMaps);
   let sanitizedMessages = sanitizeStoredToolResults(ctx.provider, wireMessages);
   if (ctx.compactStrategy === "tail") {
@@ -1718,11 +1856,12 @@ async function executeTurn(ctx, turn) {
     );
   } catch (err) {
     const errorUsage = { input: 0, output: 0 };
+    const errorContent = currentText ? [{ type: "text", text: currentText }] : [{ type: "text", text: "[provider error before any output]" }];
     const errorTurn = {
       id: turnId,
       runId: ctx.runId,
       role: "assistant",
-      content: currentText ? [{ type: "text", text: currentText }] : [],
+      content: errorContent,
       usage: errorUsage,
       createdAt: Date.now()
     };
@@ -2055,28 +2194,10 @@ async function executeToolsSequential(ctx, toolCalls, turnId) {
     if (ctx.signal.aborted)
       break;
     if (ctx.steeringQueue.length > 0) {
-      const steerMsg = ctx.steeringQueue.shift();
-      await ctx.hooks.callHook("steer:inject", { message: steerMsg });
-      for (const skipped of toolCalls.slice(toolCalls.indexOf(call))) {
-        results.push({ id: skipped.id, content: "Skipped: steering message received" });
-      }
-      const toolResultMsg = ctx.provider.toolResultsMessage(results);
-      ctx.turns.push({
-        id: await ctx.generateTurnId(),
-        runId: ctx.runId,
-        role: toolResultMsg.role,
-        content: toolResultMsg.content,
-        createdAt: Date.now()
-      });
-      const steerUserMsg = ctx.provider.userMessage(steerMsg);
-      ctx.turns.push({
-        id: await ctx.generateTurnId(),
-        runId: ctx.runId,
-        role: steerUserMsg.role,
-        content: steerUserMsg.content,
-        createdAt: Date.now()
-      });
-      return [];
+      const fromIdx = toolCalls.indexOf(call);
+      for (let i = fromIdx; i < toolCalls.length; i++)
+        results.push({ id: toolCalls[i].id, content: "Skipped: steering message received" });
+      return results;
     }
     const { result } = await executeSingleTool(ctx, call, turnId);
     results.push(result);
@@ -2097,29 +2218,25 @@ async function executeToolsParallel(ctx, toolCalls, turnId) {
 }
 
 // src/prompt.ts
-function canonicalizePrompt(prompt, legacyImages) {
+function canonicalizePrompt(prompt) {
   if (prompt === void 0)
     return void 0;
   if (typeof prompt === "string") {
-    const hasImages = legacyImages && legacyImages.length > 0;
-    if (prompt.length === 0 && !hasImages)
+    if (prompt.length === 0)
       return void 0;
-    const parts = [];
-    if (prompt.length > 0)
-      parts.push({ type: "text", text: prompt });
-    if (hasImages) {
-      for (const img of legacyImages) {
-        parts.push({
-          type: "image",
-          mediaType: img.source.media_type,
-          data: img.source.data
-        });
-      }
-    }
-    return parts;
+    return [{ type: "text", text: prompt }];
   }
   if (prompt.length === 0)
     return void 0;
+  for (const part of prompt) {
+    if (!part || typeof part !== "object" || typeof part.type !== "string") {
+      throw new Error("Invalid PromptPart: each part must be an object with a `type` field.");
+    }
+    const type = part.type;
+    if (type !== "text" && type !== "image" && type !== "document") {
+      throw new Error(`Invalid PromptPart type "${type}". Expected "text" | "image" | "document".`);
+    }
+  }
   const hasMeaningfulPart = prompt.some((part) => part.type === "text" && part.text.length > 0 || part.type === "image" || part.type === "document");
   if (!hasMeaningfulPart)
     return void 0;
@@ -2307,7 +2424,9 @@ function resolveBehavior(agentBehavior, runBehavior) {
     dedupReads: runBehavior?.dedupReads ?? agentBehavior?.dedupReads,
     dedupTools: runBehavior?.dedupTools ?? agentBehavior?.dedupTools,
     requireReadBeforeEdit: runBehavior?.requireReadBeforeEdit ?? agentBehavior?.requireReadBeforeEdit,
-    toolBudgets: runBehavior?.toolBudgets ?? agentBehavior?.toolBudgets
+    toolBudgets: runBehavior?.toolBudgets ?? agentBehavior?.toolBudgets,
+    readLineNumbers: runBehavior?.readLineNumbers ?? agentBehavior?.readLineNumbers,
+    elideStaleReads: runBehavior?.elideStaleReads ?? agentBehavior?.elideStaleReads
   };
 }
 function createAgent({ provider, name: agentName, system: agentSystem, tools: agentTools, toolAliases, behavior: agentBehavior, execution, mcpServers, session, skills: agentSkills, mcpConnector, eager }) {
@@ -2331,6 +2450,8 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
   const skillsDisabled = skillsEnabledValue === false || Array.isArray(skillsEnabledValue) && skillsEnabledValue.length === 0;
   let resolvedSkills = null;
   let skillsCatalog = null;
+  let skillsCleanup = () => {
+  };
   const skillActivationState = createSkillActivationState({
     maxActive: skillsConfig?.maxActive
   });
@@ -2368,8 +2489,8 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
         options.signal.addEventListener("abort", onExternalAbort, { once: true });
       }
     }
-    idlePromise = new Promise((resolve) => {
-      idleResolve = resolve;
+    idlePromise = new Promise((resolve2) => {
+      idleResolve = resolve2;
     });
     const childrenStats = [];
     const unregisterSpawnHook = hooks.hook("spawn:complete", (ctx) => {
@@ -2398,7 +2519,9 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
       await warmup();
     }
     if (!skillsDisabled && skillsConfig && !resolvedSkills) {
-      resolvedSkills = await resolveSkills(skillsConfig);
+      const bundle = await resolveSkills(skillsConfig);
+      resolvedSkills = bundle.skills;
+      skillsCleanup = bundle.cleanup;
       await hooks.callHook("skills:resolve", { skills: resolvedSkills });
       const skillsToolRegistered = skillsConfig?.tool !== false && resolvedSkills.length > 0;
       const catalogCtx = {
@@ -2431,7 +2554,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
     const thinking = options.thinking ?? "off";
     const model = options.model ?? provider.meta.defaultModel;
     const resolvedBehavior = resolveBehavior(agentBehavior, options.behavior);
-    const { toolExecution, maxTurns, maxTokens, thinkingBudget, schema, cache, toolOutputBudget, compactStrategy, compactThreshold, compactKeepTurns, thinkingDecay, dedupTools, toolBudgets } = resolvedBehavior;
+    const { toolExecution, maxTurns, maxTokens, thinkingBudget, schema, cache, toolOutputBudget, compactStrategy, compactThreshold, compactKeepTurns, thinkingDecay, dedupTools, toolBudgets, elideStaleReads } = resolvedBehavior;
     let system = options.system || agentSystem || "You are a helpful assistant.";
     if (skillsCatalog) {
       system = `${system}
@@ -2480,7 +2603,7 @@ ${skillsCatalog}`;
     if (options.system) {
       await hooks.callHook("system:before", { system: options.system });
     }
-    const promptParts = canonicalizePrompt(options.prompt, options.images);
+    const promptParts = canonicalizePrompt(options.prompt);
     if (promptParts) {
       const promptMsg = buildPromptMessage(provider, promptParts);
       turns.push({
@@ -2583,6 +2706,7 @@ ${skillsCatalog}`;
         compactStrategy,
         compactThreshold,
         compactKeepTurns,
+        ...elideStaleReads !== void 0 ? { elideStaleReads } : {},
         ...thinkingDecay !== void 0 ? { thinkingDecay } : {},
         runStartMs,
         runToolCounts: {}
@@ -2655,6 +2779,11 @@ ${skillsCatalog}`;
     return idlePromise ?? Promise.resolve();
   }
   async function reset() {
+    if (running) {
+      throw new Error(
+        "Cannot reset() while the agent is running. Call `agent.abort()` and `await agent.waitForIdle()` first."
+      );
+    }
     conversationTurns = [];
     steeringQueue.length = 0;
     followUpQueue.length = 0;
@@ -2743,6 +2872,9 @@ ${skillsCatalog}`;
       await executionContext.destroy(executionHandle);
       executionHandle = null;
     }
+    skillsCleanup();
+    skillsCleanup = () => {
+    };
   }
   if (eager && allMcpServers.length > 0) {
     void warmup().catch(() => {
@@ -2822,9 +2954,9 @@ async function raceWithTimeout(task, timeoutMs) {
     return task;
   let timer;
   try {
-    return await new Promise((resolve, reject) => {
+    return await new Promise((resolve2, reject) => {
       timer = setTimeout(() => reject(new SpawnTimeoutError(timeoutMs)), timeoutMs);
-      task.then(resolve, reject);
+      task.then(resolve2, reject);
     });
   } finally {
     if (timer)
@@ -3028,7 +3160,6 @@ function createSpawnTool(options = {}) {
     }
   };
 }
-var spawn = createSpawnTool();
 
 // src/tools/write-file.ts
 import { Buffer as Buffer4 } from "buffer";
@@ -3076,6 +3207,5 @@ export {
   readFile,
   shell,
   createSpawnTool,
-  spawn,
   writeFile
 };