@swifty.js/swifty 0.0.22 → 0.0.24

package/dist/lib/{chunk-RR2CZ6CY.js → chunk-XFSN4LMA.js}

@@ -1,7 +1,7 @@
 import {
   getMaxOutputTokens,
   resolveAPIKey
-} from "./chunk-6GOWRPYS.js";
+} from "./chunk-3LU4APFB.js";
 import {
   AuthenticationError,
   ContextTooLongError,
@@ -9,16 +9,15 @@ import {
   NetworkError,
   RateLimitError,
   ensureToolPairing
-} from "./chunk-UMFNTXKA.js";
+} from "./chunk-OO2CLOEE.js";
 import {
-  DANGEROUSLY_JSON,
   asRecord,
   asString,
   contentToText,
   createChildLogger,
   isRecord,
   strArg
-} from "./chunk-EJLGB2EJ.js";
+} from "./chunk-EY7HE52Q.js";
 
 // src/llm/openai.ts
 import OpenAI from "openai";
@@ -124,12 +123,10 @@ var OpenAIClient = class {
             if (jsonAccumulate) {
               try {
                 const parsed = JSON.parse(jsonAccumulate);
-                args = isRecord(parsed) ? asRecord(parsed) : { [DANGEROUSLY_JSON]: jsonAccumulate };
+                args = isRecord(parsed) ? asRecord(parsed) : {};
               } catch (err) {
                 log.error({ err }, "llm operation failed");
-                args = {
-                  [DANGEROUSLY_JSON]: jsonAccumulate
-                };
+                args = {};
               }
             }
             yield {
@@ -183,72 +180,104 @@ var OpenAIClient = class {
   }
 };
 function imageDataUrl(block) {
-  if (block.type !== "image") {
+  if (!isRecord(block) || block.type !== "image" || !isRecord(block.source)) {
     return null;
   }
-  const source = block.source;
-  if (!isRecord(source) || source.type !== "base64") {
+  if (block.source.type === "url") {
+    return strArg(block.source, "url") || null;
+  }
+  if (block.source.type !== "base64") {
     return null;
   }
-  const mediaType = strArg(source, "media_type");
-  const data = strArg(source, "data");
-  if (!mediaType || !data) {
+  const mediaType = strArg(block.source, "media_type");
+  const data = strArg(block.source, "data");
+  return mediaType && data ? `data:${mediaType};base64,${data}` : null;
+}
+function documentForResponses(block) {
+  if (!isRecord(block) || block.type !== "document" || !isRecord(block.source)) {
     return null;
   }
-  return `data:${mediaType};base64,${data}`;
+  const title = typeof block.title === "string" && block.title ? block.title : "tool-result";
+  if (block.source.type === "url") {
+    const fileUrl = strArg(block.source, "url");
+    return fileUrl ? { type: "input_file", file_url: fileUrl } : null;
+  }
+  if (block.source.type === "base64") {
+    const data = strArg(block.source, "data");
+    return data ? { type: "input_file", file_data: data, filename: `${title}.pdf` } : null;
+  }
+  if (block.source.type === "text") {
+    const data = strArg(block.source, "data");
+    return data ? {
+      type: "input_file",
+      file_data: Buffer.from(data, "utf-8").toString("base64"),
+      filename: `${title}.txt`
+    } : null;
+  }
+  return null;
 }
-function collectImageContents(tr) {
-  const { toolUseId, content } = tr;
-  if (typeof content === "string") {
-    return [];
+function documentForChat(block) {
+  if (!isRecord(block) || block.type !== "document" || !isRecord(block.source)) {
+    return null;
   }
-  const images = [];
-  for (const block of content) {
-    const url = imageDataUrl(block);
-    if (url) {
-      images.push({
-        type: "input_image",
-        image_url: url,
-        detail: "auto"
-      });
-    }
+  const title = typeof block.title === "string" && block.title ? block.title : "tool-result";
+  if (block.source.type === "base64") {
+    const data = strArg(block.source, "data");
+    return data ? { type: "file", file: { file_data: data, filename: `${title}.pdf` } } : null;
   }
-  if (images.length === 0) {
-    return [];
+  if (block.source.type === "text") {
+    const data = strArg(block.source, "data");
+    return data ? {
+      type: "file",
+      file: {
+        file_data: Buffer.from(data, "utf-8").toString("base64"),
+        filename: `${title}.txt`
+      }
+    } : null;
   }
-  return [
-    {
-      type: "input_text",
-      text: `[Image(s) returned by tool call ${toolUseId}]`
-    },
-    ...images
-  ];
+  return null;
 }
-function collectImageParts(tr) {
-  const { toolUseId, content } = tr;
-  if (typeof content === "string") {
+function toolOutputForResponses(tr) {
+  if (!tr.contentBlocks?.length) {
+    return tr.content;
+  }
+  const rich = [];
+  if (tr.content) {
+    rich.push({ type: "input_text", text: tr.content });
+  }
+  for (const block of tr.contentBlocks) {
+    const imageUrl = imageDataUrl(block);
+    if (imageUrl) {
+      rich.push({ type: "input_image", image_url: imageUrl, detail: "auto" });
+      continue;
+    }
+    const file = documentForResponses(block);
+    if (file) {
+      rich.push(file);
+    }
+  }
+  return rich.length > 0 ? rich : tr.content;
+}
+function collectRichParts(tr) {
+  if (!tr.contentBlocks?.length) {
     return [];
   }
-  const images = [];
-  for (const block of content) {
-    const url = imageDataUrl(block);
-    if (url) {
-      images.push({
-        type: "image_url",
-        image_url: { url }
-      });
+  const rich = [];
+  for (const block of tr.contentBlocks) {
+    const imageUrl = imageDataUrl(block);
+    if (imageUrl) {
+      rich.push({ type: "image_url", image_url: { url: imageUrl } });
+      continue;
+    }
+    const file = documentForChat(block);
+    if (file) {
+      rich.push(file);
     }
   }
-  if (images.length === 0) {
+  if (rich.length === 0) {
     return [];
   }
-  return [
-    {
-      type: "text",
-      text: `[Image(s) returned by tool call ${toolUseId}]`
-    },
-    ...images
-  ];
+  return [{ type: "text", text: `[Rich content returned by tool call ${tr.toolUseId}]` }, ...rich];
 }
 function userContentsFor(content) {
   if (typeof content === "string") {
@@ -313,19 +342,11 @@ function buildOpenAIInput(messages) {
         });
       }
     } else if (m.toolResults && m.toolResults.length > 0) {
-      const pendingImageContents = [];
       for (const tr of m.toolResults) {
         result.push({
           type: "function_call_output",
           call_id: tr.toolUseId,
-          output: contentToText(tr.content)
-        });
-        pendingImageContents.push(...collectImageContents(tr));
-      }
-      if (pendingImageContents.length > 0) {
-        result.push({
-          role: "user",
-          content: pendingImageContents
+          output: toolOutputForResponses(tr)
         });
       }
     } else if (m.role === "assistant") {
@@ -474,12 +495,10 @@ var OpenAICompatClient = class {
             if (jsonArgs) {
               try {
                 const parsed = JSON.parse(jsonArgs);
-                args = isRecord(parsed) ? asRecord(parsed) : { [DANGEROUSLY_JSON]: jsonArgs };
+                args = isRecord(parsed) ? asRecord(parsed) : {};
               } catch (err) {
                 log.error({ err }, "llm operation failed");
-                args = {
-                  [DANGEROUSLY_JSON]: jsonArgs
-                };
+                args = {};
               }
               yield {
                 type: "tool_call_complete",
@@ -552,19 +571,19 @@ function buildChatCompletionMessages(messages) {
         }))
       });
     } else if (m.toolResults && m.toolResults.length > 0) {
-      const pendingImageParts = [];
+      const pendingRichParts = [];
       for (const tr of m.toolResults) {
         params.push({
           role: "tool",
           tool_call_id: tr.toolUseId,
-          content: contentToText(tr.content)
+          content: tr.content
         });
-        pendingImageParts.push(...collectImageParts(tr));
+        pendingRichParts.push(...collectRichParts(tr));
       }
-      if (pendingImageParts.length > 0) {
+      if (pendingRichParts.length > 0) {
         params.push({
           role: "user",
-          content: pendingImageParts
+          content: pendingRichParts
         });
       }
     } else if (m.role === "assistant") {

package/dist/lib/{chunk-UHVO63Y7.js → chunk-XG6NELJH.js}

@@ -6,24 +6,19 @@ import {
   saveMessage,
   toolResultsToRecords,
   toolUsesToRecords
-} from "./chunk-C7IHCJZ3.js";
+} from "./chunk-2QILP24G.js";
 import {
   ContextTooLongError,
   REJECTED_TOOL_RESULT,
   RateLimitError
-} from "./chunk-UMFNTXKA.js";
+} from "./chunk-OO2CLOEE.js";
 import {
   asErrorString,
   asRecord,
-  asString,
-  contentToText,
   createChildLogger,
   isObject,
   strArg
-} from "./chunk-EJLGB2EJ.js";
-
-// src/agent/agent.ts
-import { readFile } from "fs/promises";
+} from "./chunk-EY7HE52Q.js";
 
 // src/compact/recovery.ts
 var RECOVERY_FILE_LIMIT = 5;
@@ -48,13 +43,29 @@ function truncateByTokens(s, tokenBudget) {
   if (maxChars <= 0 || maxChars >= s.length) {
     return s;
   }
-  return s.slice(0, maxChars) + "\n\u2026 (content truncated)";
+  const suffix = "\n\u2026 (content truncated)";
+  if (maxChars <= suffix.length) {
+    return suffix.slice(0, maxChars);
+  }
+  return s.slice(0, maxChars - suffix.length) + suffix;
 }
 var RecoveryState = class {
   files = /* @__PURE__ */ new Map();
   skills = /* @__PURE__ */ new Map();
   recordFileRead(path, content) {
-    this.files.set(path, { path, content, timestamp: Date.now() });
+    this.files.delete(path);
+    this.files.set(path, {
+      path,
+      content: truncateByTokens(content, RECOVERY_TOKENS_PER_FILE),
+      timestamp: Date.now()
+    });
+    while (this.files.size > RECOVERY_FILE_LIMIT) {
+      const oldestPath = this.files.keys().next().value;
+      if (typeof oldestPath !== "string") {
+        break;
+      }
+      this.files.delete(oldestPath);
+    }
   }
   recordSkillInvocation(name, body) {
     this.skills.set(name, { name, body, timestamp: Date.now() });
@@ -465,6 +476,7 @@ import { writeFileSync as writeFileSync2, mkdirSync as mkdirSync2 } from "fs";
 import { join as join2, resolve as resolve2 } from "path";
 var log2 = createChildLogger({ module: "tool-result" });
 var MESSAGE_AGGREGATE_LIMIT = 2e5;
+var TOOL_RESULT_PREVIEW_CHARS = 2e3;
 function spillDir(workDir, sessionId) {
   const id = sessionId || "default";
   return join2(workDir, ".swifty", "sessions", id, "tool-results");
@@ -483,11 +495,26 @@ function writeSpill(workDir, sessionId, toolUseId, content) {
   }
   return path;
 }
-var PREVIEW_CHARS = 2e3;
+function toDisplayPreview(content) {
+  if (content.length <= TOOL_RESULT_PREVIEW_CHARS) {
+    return content;
+  }
+  return content.slice(0, TOOL_RESULT_PREVIEW_CHARS) + `
+\u2026 ${String(content.length - TOOL_RESULT_PREVIEW_CHARS)} chars omitted from transcript`;
+}
+function replaceToolResultContent(result, content) {
+  result.content = content;
+  if (result.contentBlocks?.length) {
+    result.contentBlocks = [
+      { type: "text", text: content },
+      ...result.contentBlocks.filter((block) => block.type !== "text")
+    ];
+  }
+}
 function buildSpillPreview(content, spillPath) {
   const sizeKB = Math.floor(content.length / 1024);
-  const preview = content.slice(0, PREVIEW_CHARS);
-  const hasMore = content.length > PREVIEW_CHARS;
+  const preview = content.slice(0, TOOL_RESULT_PREVIEW_CHARS);
+  const hasMore = content.length > TOOL_RESULT_PREVIEW_CHARS;
   let msg = `<persisted-output>
 `;
   msg += `Output too large (${String(sizeKB)}KB). Full content saved to:
@@ -513,17 +540,11 @@ function isSpillReadback(toolName, args, workDir, sessionId) {
   return resolve2(raw).startsWith(resolve2(spillDir(workDir, sessionId)));
 }
 function applyBudget(toolResults, workDir, sessionId, exemptIds) {
-  const spillable = toolResults.filter((r) => typeof r.content === "string");
-  let total = spillable.reduce(
-    (sum, r) => sum + (typeof r.content === "string" ? r.content.length : 0),
-    0
-  );
+  let total = toolResults.reduce((sum, result) => sum + result.content.length, 0);
   if (total <= MESSAGE_AGGREGATE_LIMIT) {
     return;
   }
-  const sorted = spillable.toSorted(
-    (a, b) => asString(b.content).length - asString(a.content).length
-  );
+  const sorted = toolResults.toSorted((a, b) => b.content.length - a.content.length);
   for (const r of sorted) {
     if (total <= MESSAGE_AGGREGATE_LIMIT) {
       break;
@@ -531,8 +552,8 @@ function applyBudget(toolResults, workDir, sessionId, exemptIds) {
     if (exemptIds?.has(r.toolUseId)) {
       continue;
     }
-    const content = asString(r.content);
-    if (content.length <= PREVIEW_CHARS) {
+    const content = r.content;
+    if (content.length <= TOOL_RESULT_PREVIEW_CHARS) {
       continue;
     }
     let spillPath;
@@ -543,7 +564,7 @@ function applyBudget(toolResults, workDir, sessionId, exemptIds) {
     }
     const replacement = buildSpillPreview(content, spillPath);
     total -= content.length - replacement.length;
-    r.content = replacement;
+    replaceToolResultContent(r, replacement);
   }
 }
 function persistLargeResult(workDir, sessionId, toolUseId, content) {
@@ -959,16 +980,25 @@ var Agent = class {
           const toolResults = [];
           for (const r of results) {
             if (r.type === "tool_result") {
-              let content = r.output;
-              if (typeof content === "string" && content.length > MAX_OUTPUT_CHARS && !exemptIds.has(r.toolId)) {
-                content = persistLargeResult(this.workDir, this.sessionId, r.toolId, content);
-                exemptIds.add(r.toolId);
-              }
-              toolResults.push({
+              const toolResult = {
                 toolUseId: r.toolId,
-                content,
+                content: r.output,
+                ...r.contentBlocks?.length ? { contentBlocks: r.contentBlocks } : {},
                 isError: r.isError
-              });
+              };
+              if (toolResult.content.length > MAX_OUTPUT_CHARS && !exemptIds.has(r.toolId)) {
+                const replacement = persistLargeResult(
+                  this.workDir,
+                  this.sessionId,
+                  r.toolId,
+                  toolResult.content
+                );
+                if (replacement !== toolResult.content) {
+                  replaceToolResultContent(toolResult, replacement);
+                }
+                exemptIds.add(r.toolId);
+              }
+              toolResults.push(toolResult);
             }
           }
           applyBudget(toolResults, this.workDir, this.sessionId, exemptIds);
@@ -1158,14 +1188,11 @@ var Agent = class {
   // processToolResult handles a single executor result: records file-read
   // snapshots, emits the tool_result event, and fires post-tool hooks.
   async processToolResult(r, toolUses, events) {
-    if (!r.result.isError && r.toolName === "ReadFile" && typeof r.result.output === "string") {
+    if (!r.result.isError && r.toolName === "ReadFile" && !r.result.contentBlocks?.length) {
       const tu = toolUses.find((t) => t.toolUseId === r.toolId);
       const p = strArg(tu?.arguments ?? {}, "file_path");
       if (p) {
-        try {
-          this.recoveryState.recordFileRead(p, await readFile(p, "utf-8"));
-        } catch {
-        }
+        this.recoveryState.recordFileRead(p, r.result.output);
       }
     }
     events.push({
@@ -1173,6 +1200,7 @@ var Agent = class {
       toolName: r.toolName,
       toolId: r.toolId,
       output: r.result.output,
+      ...r.result.contentBlocks?.length ? { contentBlocks: r.result.contentBlocks } : {},
       isError: r.result.isError,
       elapsed: r.elapsed
     });
@@ -1180,7 +1208,7 @@ var Agent = class {
       const hookResults = await this.hookEngine.fire("post_tool_use", {
         event: "post_tool_use",
         toolName: r.toolName,
-        message: contentToText(r.result.output)
+        message: r.result.output
       });
       for (const hr of hookResults) {
         if (hr.output) {
@@ -1238,6 +1266,9 @@ export {
   buildPlanModeReminder,
   buildPlanModeExitReminder,
   buildPlanModeReentryReminder,
+  TOOL_RESULT_PREVIEW_CHARS,
+  toDisplayPreview,
+  replaceToolResultContent,
   isSpillReadback,
   applyBudget,
   persistLargeResult,