zidane 3.2.0 → 3.3.2

package/dist/{chunk-6JIVVEQQ.js → chunk-Z2E5QN5X.js}

@@ -3,9 +3,9 @@ import {
   createSkillActivationState,
   installAllowedToolsGate,
   interpolateShellCommands,
-  resolveSkillsWithCleanup,
+  resolveSkills,
   validateResourcePath
-} from "./chunk-J4ZOSNSH.js";
+} from "./chunk-X3VOTPVM.js";
 import {
   createProcessContext
 } from "./chunk-UD25QF3H.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}`;
@@ -538,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 {
     }
@@ -619,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: {
@@ -680,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;
     }
@@ -781,19 +817,20 @@ 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;
@@ -827,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.`;
       }
     }
@@ -845,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) {
@@ -881,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()
       });
     }
@@ -957,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)}`;
   }
 };
@@ -1568,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;
@@ -1675,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") {
@@ -2092,26 +2218,13 @@ 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;
@@ -2311,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 }) {
@@ -2374,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) => {
@@ -2404,7 +2519,7 @@ function createAgent({ provider, name: agentName, system: agentSystem, tools: ag
       await warmup();
     }
     if (!skillsDisabled && skillsConfig && !resolvedSkills) {
-      const bundle = await resolveSkillsWithCleanup(skillsConfig);
+      const bundle = await resolveSkills(skillsConfig);
       resolvedSkills = bundle.skills;
       skillsCleanup = bundle.cleanup;
       await hooks.callHook("skills:resolve", { skills: resolvedSkills });
@@ -2439,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}
@@ -2488,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({
@@ -2591,6 +2706,7 @@ ${skillsCatalog}`;
         compactStrategy,
         compactThreshold,
         compactKeepTurns,
+        ...elideStaleReads !== void 0 ? { elideStaleReads } : {},
         ...thinkingDecay !== void 0 ? { thinkingDecay } : {},
         runStartMs,
         runToolCounts: {}
@@ -2838,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)
@@ -3044,7 +3160,6 @@ function createSpawnTool(options = {}) {
     }
   };
 }
-var spawn = createSpawnTool();
 
 // src/tools/write-file.ts
 import { Buffer as Buffer4 } from "buffer";
@@ -3092,6 +3207,5 @@ export {
   readFile,
   shell,
   createSpawnTool,
-  spawn,
   writeFile
 };

package/dist/index.d.ts

@@ -1,12 +1,12 @@
-import { d as AgentHooks } from './agent-CE2jhpNE.js';
-export { ac as ActivationVia, ad as ActiveSkill, A as Agent, a as AgentAbortedError, b as AgentBehavior, c as AgentContextExceededError, e as AgentOptions, f as AgentProviderError, g as AgentRunOptions, h as AgentStats, i as AgentToolNotAllowedError, j as AnthropicParams, C as CONTEXT_EXCEEDED_MESSAGE_PATTERNS, k as CerebrasParams, m as ClassifiedError, n as ClassifiedErrorKind, o as CreateSessionOptions, ae as DeactivationReason, af as FileMapAdapter, ag as FileMapStoreOptions, I as ImageContent, M as McpConnection, p as McpServerConfig, q as McpToolHookContext, O as OAuthRefreshHookContext, ah as OpenAICompatAuthHeader, ai as OpenAICompatHttpError, aj as OpenAICompatParams, r as OpenAIParams, s as OpenRouterParams, P as PromptDocumentPart, t as PromptImagePart, u as PromptPart, v as PromptTextPart, w as Provider, x as ProviderCapabilities, R as RemoteStoreOptions, y as RunHookMap, S as Session, z as SessionContentBlock, B as SessionData, D as SessionEndStatus, E as SessionHookContext, F as SessionMessage, G as SessionRun, H as SessionStore, J as SessionTurn, ak as SkillActivationState, al as SkillActivationStateOptions, K as SkillConfig, am as SkillDiagnostic, L as SkillResource, an as SkillSource, N as SkillsConfig, Q as SpawnHookContext, T as StreamCallbacks, U as StreamHookContext, V as StreamOptions, W as ThinkingLevel, X as ToolCall, Y as ToolContext, Z as ToolDef, _ as ToolExecutionMode, $ as ToolHookContext, a0 as ToolMap, a1 as ToolResult, a2 as ToolResultContent, a3 as ToolResultImageContent, a4 as ToolResultTextContent, a5 as ToolSpec, a6 as TurnFinishReason, a7 as TurnResult, a8 as TurnUsage, ao as anthropic, ap as autoDetectAndConvert, aq as cerebras, ar as classifyOpenAICompatError, as as connectMcpServers, at as createAgent, au as createFileMapStore, av as createMemoryStore, aw as createRemoteStore, ax as createSession, ay as createSkillActivationState, az as fromAnthropic, aA as fromOpenAI, aB as loadSession, aC as mapOAIFinishReason, a9 as matchesContextExceeded, aD as normalizeMcpBlocks, aE as normalizeMcpServers, aF as openai, aG as openaiCompat, aH as openrouter, aI as resultToString, aJ as toAnthropic, aK as toOpenAI, aL as toTypedError, aa as toolOutputByteLength, ab as toolResultToText } from './agent-CE2jhpNE.js';
+import { d as AgentHooks } from './agent-DqEkutk4.js';
+export { ab as ActivationVia, ac as ActiveSkill, A as Agent, a as AgentAbortedError, b as AgentBehavior, c as AgentContextExceededError, e as AgentOptions, f as AgentProviderError, g as AgentRunOptions, h as AgentStats, i as AgentToolNotAllowedError, j as AnthropicParams, C as CONTEXT_EXCEEDED_MESSAGE_PATTERNS, k as CerebrasParams, m as ClassifiedError, n as ClassifiedErrorKind, o as CreateSessionOptions, ad as DeactivationReason, ae as FileMapAdapter, af as FileMapStoreOptions, M as McpConnection, p as McpServerConfig, q as McpToolHookContext, O as OAuthRefreshHookContext, ag as OpenAICompatAuthHeader, ah as OpenAICompatHttpError, ai as OpenAICompatParams, r as OpenAIParams, s as OpenRouterParams, P as PromptDocumentPart, t as PromptImagePart, u as PromptPart, v as PromptTextPart, w as Provider, x as ProviderCapabilities, R as RemoteStoreOptions, y as RunHookMap, S as Session, z as SessionContentBlock, B as SessionData, D as SessionEndStatus, E as SessionHookContext, F as SessionMessage, G as SessionRun, H as SessionStore, I as SessionTurn, aj as SkillActivationState, ak as SkillActivationStateOptions, J as SkillConfig, al as SkillDiagnostic, K as SkillResource, am as SkillSource, L as SkillsConfig, N as SpawnHookContext, Q as StreamCallbacks, T as StreamHookContext, U as StreamOptions, V as ThinkingLevel, W as ToolCall, X as ToolContext, Y as ToolDef, Z as ToolExecutionMode, _ as ToolHookContext, $ as ToolMap, a0 as ToolResult, a1 as ToolResultContent, a2 as ToolResultImageContent, a3 as ToolResultTextContent, a4 as ToolSpec, a5 as TurnFinishReason, a6 as TurnResult, a7 as TurnUsage, an as anthropic, ao as autoDetectAndConvert, ap as cerebras, aq as classifyOpenAICompatError, ar as connectMcpServers, as as createAgent, at as createFileMapStore, au as createMemoryStore, av as createRemoteStore, aw as createSession, ax as createSkillActivationState, ay as fromAnthropic, az as fromOpenAI, aA as loadSession, aB as mapOAIFinishReason, a8 as matchesContextExceeded, aC as normalizeMcpBlocks, aD as normalizeMcpServers, aE as openai, aF as openaiCompat, aG as openrouter, aH as resultToString, aI as toAnthropic, aJ as toOpenAI, aK as toTypedError, a9 as toolOutputByteLength, aa as toolResultToText } from './agent-DqEkutk4.js';
 export { createDockerContext, createProcessContext } from './contexts.js';
 export { S as SandboxProvider, c as createSandboxContext } from './sandbox-CLghrTLi.js';
 export { C as ContextCapabilities, a as ContextType, E as ExecResult, b as ExecutionContext, c as ExecutionHandle, S as SpawnConfig } from './types-vA1a_ZX7.js';
 export { Preset, basic, basicTools, definePreset } from './presets.js';
 export { IMPLICITLY_ALLOWED_SKILL_TOOLS, SkillValidationIssue, SkillValidationResult, SourcedScanPath, buildCatalog, defineSkill, discoverSkills, installAllowedToolsGate, interpolateShellCommands, isToolAllowedByUnion, matchesAllowedTool, parseAllowedToolPattern, parseSkillFile, resolveSkills, validateResourcePath, validateSkillForWrite, validateSkillName, writeSkillToDisk, writeSkillsToDisk } from './skills.js';
-export { S as SkillsReadToolOptions, a as SkillsRunScriptToolOptions, b as SkillsUseToolOptions, c as createSkillsReadTool, d as createSkillsRunScriptTool, e as createSkillsUseTool, f as edit, g as glob, h as grep, m as multiEdit } from './skills-use-CqOKEN56.js';
-export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult, c as createInteractionTool, b as createSpawnTool, s as spawn, v as validateToolArgs } from './validation-DlIURVGV.js';
+export { S as SkillsReadToolOptions, a as SkillsRunScriptToolOptions, b as SkillsUseToolOptions, c as createSkillsReadTool, d as createSkillsRunScriptTool, e as createSkillsUseTool, f as edit, g as glob, h as grep, m as multiEdit } from './skills-use-WbOh6TuS.js';
+export { C as ChildAgent, I as InteractionToolOptions, S as SpawnToolOptions, a as SpawnToolState, V as ValidationResult, c as createInteractionTool, b as createSpawnTool, v as validateToolArgs } from './validation-DTbkLXbd.js';
 import { Hookable } from 'hookable';
 import '@modelcontextprotocol/sdk/client/index.js';
 

package/dist/index.js

@@ -1,17 +1,17 @@
 import {
   defineSkill
-} from "./chunk-YPU6KVL6.js";
+} from "./chunk-LIVB5W4B.js";
 import {
   anthropic,
   cerebras,
   openai,
   openrouter
-} from "./chunk-AUBXCLUC.js";
+} from "./chunk-W57VY6DJ.js";
 import {
   basicTools,
   basic_default,
   definePreset
-} from "./chunk-HPTCF3EX.js";
+} from "./chunk-3D5Q527Y.js";
 import {
   createAgent,
   createInteractionTool,
@@ -23,9 +23,8 @@ import {
   glob,
   grep,
   multiEdit,
-  spawn,
   validateToolArgs
-} from "./chunk-6JIVVEQQ.js";
+} from "./chunk-Z2E5QN5X.js";
 import {
   IMPLICITLY_ALLOWED_SKILL_TOOLS,
   buildCatalog,
@@ -43,7 +42,7 @@ import {
   validateSkillName,
   writeSkillToDisk,
   writeSkillsToDisk
-} from "./chunk-J4ZOSNSH.js";
+} from "./chunk-X3VOTPVM.js";
 import {
   createDockerContext,
   createProcessContext,
@@ -76,7 +75,7 @@ import {
   openaiCompat,
   toAnthropic,
   toOpenAI
-} from "./chunk-QX7TDFD4.js";
+} from "./chunk-4ILGBQ23.js";
 import {
   AgentAbortedError,
   AgentContextExceededError,
@@ -255,7 +254,6 @@ export {
   parseSkillFile,
   resolveSkills,
   resultToString,
-  spawn,
   toAnthropic,
   toOpenAI,
   toTypedError,

package/dist/mcp.d.ts

@@ -1,4 +1,4 @@
 import 'hookable';
-export { M as McpConnection, p as McpServerConfig, as as connectMcpServers, aD as normalizeMcpBlocks, aE as normalizeMcpServers, aI as resultToString } from './agent-CE2jhpNE.js';
+export { M as McpConnection, p as McpServerConfig, ar as connectMcpServers, aC as normalizeMcpBlocks, aD as normalizeMcpServers, aH as resultToString } from './agent-DqEkutk4.js';
 import '@modelcontextprotocol/sdk/client/index.js';
 import './types-vA1a_ZX7.js';

package/dist/presets.d.ts

@@ -1,4 +1,4 @@
-import { Z as ToolDef, e as AgentOptions } from './agent-CE2jhpNE.js';
+import { Y as ToolDef, e as AgentOptions } from './agent-DqEkutk4.js';
 import 'hookable';
 import './types-vA1a_ZX7.js';
 import '@modelcontextprotocol/sdk/client/index.js';

package/dist/presets.js

@@ -2,9 +2,9 @@ import {
   basicTools,
   basic_default,
   definePreset
-} from "./chunk-HPTCF3EX.js";
-import "./chunk-6JIVVEQQ.js";
-import "./chunk-J4ZOSNSH.js";
+} from "./chunk-3D5Q527Y.js";
+import "./chunk-Z2E5QN5X.js";
+import "./chunk-X3VOTPVM.js";
 import "./chunk-UD25QF3H.js";
 import "./chunk-7H34OFDA.js";
 import "./chunk-JH6IAAFA.js";