openzoo 0.48.76 → 0.48.78

package/lib/spill.js

@@ -495,6 +495,58 @@ export function looksLikeFileView(command) {
 /** Tool result larger than this is "fat" — stub it in the forwarded tail. */
 export const FAT_TOOL_CHARS = 400;
 
+/**
+ * Bound-file matching used to stub any size, including a 461-byte Read the
+ * model had just fetched. Stay under this floor unless we are over budget
+ * *and* the result is not this turn's current tool round.
+ */
+export const KEEP_TOOL_CHARS = 4096;
+
+function toolCallIds(m) {
+  if (!m || typeof m !== 'object') return [];
+  const ids = [];
+  if (Array.isArray(m.tool_calls)) {
+    for (const c of m.tool_calls) {
+      const id = c?.id || c?.tool_call_id;
+      if (id) ids.push(id);
+    }
+  }
+  if (m.function_call) {
+    const id = m.function_call.id || m.function_call.tool_call_id;
+    if (id) ids.push(id);
+  }
+  if (Array.isArray(m.content)) {
+    for (const b of m.content) {
+      if (b?.type === 'tool_use' && b.id) ids.push(b.id);
+    }
+  }
+  return ids;
+}
+
+/**
+ * Last assistant that issued tool_calls / tool_use, plus those ids.
+ *
+ * Claude Code / OpenAI put *this turn's* Read/Bash/WebSearch results in
+ * `role:tool` (or tool_result blocks) AFTER the last user ask. Those are
+ * in-flight — the model's current eyes — and must never be stubbed, even
+ * when large. A completed round (tools, then a follow-up ask) may still
+ * be stubbed; that is the 0.48.76 storm savings. The last round's small
+ * bodies still use KEEP_TOOL_CHARS so a 461-byte Read survives.
+ */
+export function currentToolRound(msgs, { lastUser = -1 } = {}) {
+  let index = -1;
+  const ids = new Set();
+  if (!Array.isArray(msgs)) return { index, ids, inFlight: false };
+  for (let i = 0; i < msgs.length; i++) {
+    const here = toolCallIds(msgs[i]);
+    if (!here.length) continue;
+    index = i;
+    ids.clear();
+    for (const id of here) ids.add(id);
+  }
+  return { index, ids, inFlight: index >= 0 && index > lastUser };
+}
+
 export function fileBoundStub(paths, n) {
   const list = [...new Set((paths || []).filter(Boolean))].join(' ');
   const mark = Number.isFinite(n) && n > 0 ? `[bound, ${n} chars]` : '[bound]';
@@ -586,7 +638,12 @@ function resolveBoundPath(raw, cwd, boundAbs) {
  *
  * `fromIndex` limits the rewrite to the forwarded tail so the spilled prefix
  * that becomes the conversation corpus is unchanged. The last user ask is
- * never rewritten.
+ * never rewritten. The current tool round — last assistant with tool_calls
+ * / tool_use and every matching role:tool / tool_result — is never rewritten
+ * when that assistant sits after the last user ask (this turn's eyes).
+ * Bodies under KEEP_TOOL_CHARS on that last round also stay, even when the
+ * ask follows the results, so a 461-byte Read is not replaced with
+ * `[bound, 461 chars]`.
  */
 export function stubBoundFileResults(msgs, {
   boundFiles,
@@ -659,15 +716,19 @@ export function stubBoundFileResults(msgs, {
   const firstSpillable = firstSpillableIndex(msgs);
   let lastUser = lastUserAskIndex(msgs, firstSpillable);
   const fatLimit = Number.isFinite(Number(fatChars)) ? Number(fatChars) : FAT_TOOL_CHARS;
+  const keepFloor = KEEP_TOOL_CHARS;
   const slimArgs = aggressive || wantBudget;
+  let round = currentToolRound(msgs, { lastUser });
 
   const stubFor = (id, n) => {
     const paths = idPaths.get(id);
     return paths?.length ? fileBoundStub(paths, n) : toolResultStub(n);
   };
 
-  const shouldStubBody = (id, n) => {
+  const shouldStubBody = (id, n, { overBudget = false } = {}) => {
     if (!n || isStubText(typeof n === 'number' ? '' : n)) return false;
+    if (id && round.inFlight && round.ids.has(id)) return false;
+    if (n < keepFloor && (!overBudget || (id && round.ids.has(id)))) return false;
     if (stubIds.has(id)) return true;
     if (slimArgs && n >= fatLimit) return true;
     return false;
@@ -686,8 +747,11 @@ export function stubBoundFileResults(msgs, {
       firstSpillable,
     });
     lastUser = lastUserAskIndex(messages, firstSpillableIndex(messages));
+    round = currentToolRound(messages, { lastUser });
   }
 
+  const skipSlimCalls = (i) => round.inFlight && i === round.index;
+
   messages = messages.map((m, i) => {
     if (i < fromIndex || !m || i === lastUser) return m;
     if (m.role === 'tool') {
@@ -698,7 +762,7 @@ export function stubBoundFileResults(msgs, {
       return { ...m, content: stubFor(m.tool_call_id, n) };
     }
     let next = m;
-    if (Array.isArray(m.tool_calls) && slimArgs) {
+    if (Array.isArray(m.tool_calls) && slimArgs && !skipSlimCalls(i)) {
       let changed = false;
       const calls = m.tool_calls.map((tc) => {
         const n = toolCallArgLength(tc);
@@ -711,7 +775,7 @@ export function stubBoundFileResults(msgs, {
       });
       if (changed) next = { ...next, tool_calls: calls };
     }
-    if (next.function_call && slimArgs) {
+    if (next.function_call && slimArgs && !skipSlimCalls(i)) {
       const n = toolCallArgLength(next.function_call);
       const raw = next.function_call.arguments;
       if (n >= fatLimit && !isStubText(typeof raw === 'string' ? raw : '')) {
@@ -751,7 +815,7 @@ export function stubBoundFileResults(msgs, {
         if (m.role === 'tool') {
           if (isStubText(m.content)) continue;
           const n = toolContentLength(m.content);
-          if (!n) continue;
+          if (!shouldStubBody(m.tool_call_id, n, { overBudget: true })) continue;
           const stub = stubFor(m.tool_call_id, n);
           if (stub.length >= n) continue;
           used = used - n + stub.length;
@@ -760,7 +824,7 @@ export function stubBoundFileResults(msgs, {
           dropped += n;
           continue;
         }
-        if (Array.isArray(m.tool_calls)) {
+        if (Array.isArray(m.tool_calls) && !skipSlimCalls(i)) {
           let changed = false;
           const calls = m.tool_calls.map((tc) => {
             if (used <= cap) return tc;
@@ -784,7 +848,7 @@ export function stubBoundFileResults(msgs, {
         const blocks = cur.content.map((b) => {
           if (b?.type !== 'tool_result' || used <= cap || isStubText(b.content)) return b;
           const n = toolContentLength(b.content);
-          if (!n) return b;
+          if (!shouldStubBody(b.tool_use_id, n, { overBudget: true })) return b;
           const stub = stubFor(b.tool_use_id, n);
           if (stub.length >= n) return b;
           used = used - n + stub.length;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "openzoo",
-  "version": "0.48.76",
-  "description": "Local x402-paying proxy + MCP server for openzoo.fun \u2014 point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
+  "version": "0.48.78",
+  "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",
   "bin": {