@swifty.js/swifty 0.0.22 → 0.0.23

package/dist/lib/agent-GHXYOARN.js

@@ -0,0 +1,9 @@
+import {
+  Agent
+} from "./chunk-MF3YLQDS.js";
+import "./chunk-BN4Q54G2.js";
+import "./chunk-OO2CLOEE.js";
+import "./chunk-EY7HE52Q.js";
+export {
+  Agent
+};

package/dist/lib/{anthropic-GFWP3ORB.js → anthropic-7YEN2QTU.js}

@@ -5,12 +5,12 @@ import {
   markLastUserTailForCache,
   markToolsForCache,
   needsToolSearchBeta
-} from "./chunk-LUEP4JMF.js";
-import "./chunk-C7IHCJZ3.js";
-import "./chunk-6GOWRPYS.js";
-import "./chunk-UMFNTXKA.js";
-import "./chunk-GNBXECZN.js";
-import "./chunk-EJLGB2EJ.js";
+} from "./chunk-7IZEK7X5.js";
+import "./chunk-BN4Q54G2.js";
+import "./chunk-CYDNMEBC.js";
+import "./chunk-OO2CLOEE.js";
+import "./chunk-PZ42NAFA.js";
+import "./chunk-EY7HE52Q.js";
 import "./chunk-GHF2PSEW.js";
 export {
   AnthropicClient,

package/dist/lib/{checker-IIXJXQCB.js → checker-6BW4222R.js}

@@ -5,9 +5,9 @@ import {
   evaluateRules,
   extractContent,
   isSafeCommand
-} from "./chunk-7URDLWQN.js";
-import "./chunk-GNBXECZN.js";
-import "./chunk-EJLGB2EJ.js";
+} from "./chunk-GNI7YX6F.js";
+import "./chunk-PZ42NAFA.js";
+import "./chunk-EY7HE52Q.js";
 import "./chunk-GHF2PSEW.js";
 export {
   PathSandbox,

package/dist/lib/{chunk-LUEP4JMF.js → chunk-7IZEK7X5.js}

@@ -1,11 +1,11 @@
 import {
   computeCompactThreshold
-} from "./chunk-C7IHCJZ3.js";
+} from "./chunk-BN4Q54G2.js";
 import {
   getContextWindow,
   getMaxOutputTokens,
   resolveAPIKey
-} from "./chunk-6GOWRPYS.js";
+} from "./chunk-CYDNMEBC.js";
 import {
   AuthenticationError,
   ContextTooLongError,
@@ -13,20 +13,19 @@ import {
   NetworkError,
   RateLimitError,
   ensureToolPairing
-} from "./chunk-UMFNTXKA.js";
+} from "./chunk-OO2CLOEE.js";
 import {
   MCP_TOOL_PREFIX,
   isMcpToolLike
-} from "./chunk-GNBXECZN.js";
+} from "./chunk-PZ42NAFA.js";
 import {
-  DANGEROUSLY_JSON,
   asErrorString,
   asRecord,
   asString,
   contentToText,
   createChildLogger,
   isRecord
-} from "./chunk-EJLGB2EJ.js";
+} from "./chunk-EY7HE52Q.js";
 
 // src/llm/anthropic.ts
 import Anthropic from "@anthropic-ai/sdk";
@@ -206,8 +205,7 @@ function buildAnthropicMessages(messages) {
           // tool result
           tool_use_id: tr.toolUseId,
           is_error: tr.isError,
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          content: tr.content
+          content: tr.contentBlocks?.length ? tr.contentBlocks : tr.content
         });
       }
       result.push({ role: "user", content: blocks });
@@ -409,12 +407,10 @@ var AnthropicClient = 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 {

package/dist/lib/{chunk-C7IHCJZ3.js → chunk-BN4Q54G2.js}

@@ -1,9 +1,12 @@
+import {
+  ContextTooLongError
+} from "./chunk-OO2CLOEE.js";
 import {
   asErrorString,
   contentToText,
   createChildLogger,
   strArg
-} from "./chunk-EJLGB2EJ.js";
+} from "./chunk-EY7HE52Q.js";
 
 // src/conversation/conversation.ts
 var ConversationManager = class {
@@ -38,11 +41,18 @@ var ConversationManager = class {
       toolUses: toolUses.length > 0 ? toolUses : void 0
     });
   }
-  addToolResultMessage(toolUseId, content, isError) {
+  addToolResultMessage(toolUseId, content, isError, contentBlocks) {
     this.history.push({
       role: "user",
       content: "",
-      toolResults: [{ toolUseId, content, isError }]
+      toolResults: [
+        {
+          toolUseId,
+          content,
+          ...contentBlocks?.length ? { contentBlocks } : {},
+          isError
+        }
+      ]
     });
   }
   addToolResultsMessage(results) {
@@ -108,6 +118,9 @@ ${body}
     this.history.unshift({ role: "user", content: wrapped });
     this.longTermMemoryInjected = true;
   }
+  appendMessages(msgs) {
+    this.history.push(...msgs);
+  }
   len() {
     return this.history.length;
   }
@@ -168,6 +181,137 @@ ${body}
   }
 };
 
+// src/tools/types.ts
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var IMAGE_MEDIA_TYPES = /* @__PURE__ */ new Set([
+  "image/jpeg",
+  "image/png",
+  "image/gif",
+  "image/webp"
+]);
+function isImageMediaType(value) {
+  return IMAGE_MEDIA_TYPES.has(value);
+}
+function normalizeTextBlock(value) {
+  return isRecord(value) && value.type === "text" && typeof value.text === "string" ? { type: "text", text: value.text } : null;
+}
+function normalizeImageBlock(value) {
+  if (!isRecord(value) || value.type !== "image" || !isRecord(value.source)) {
+    return null;
+  }
+  if (value.source.type === "url" && typeof value.source.url === "string") {
+    return { type: "image", source: { type: "url", url: value.source.url } };
+  }
+  if (value.source.type === "base64" && typeof value.source.media_type === "string" && isImageMediaType(value.source.media_type) && typeof value.source.data === "string") {
+    return {
+      type: "image",
+      source: {
+        type: "base64",
+        media_type: value.source.media_type,
+        data: value.source.data
+      }
+    };
+  }
+  return null;
+}
+function normalizeDocumentBlock(value) {
+  if (value.type !== "document" || !isRecord(value.source)) {
+    return null;
+  }
+  let source = null;
+  if (value.source.type === "url" && typeof value.source.url === "string") {
+    source = { type: "url", url: value.source.url };
+  } else if (value.source.type === "base64" && value.source.media_type === "application/pdf" && typeof value.source.data === "string") {
+    source = { type: "base64", media_type: "application/pdf", data: value.source.data };
+  } else if (value.source.type === "text" && value.source.media_type === "text/plain" && typeof value.source.data === "string") {
+    source = { type: "text", media_type: "text/plain", data: value.source.data };
+  } else if (value.source.type === "content") {
+    if (typeof value.source.content === "string") {
+      source = { type: "content", content: value.source.content };
+    } else if (Array.isArray(value.source.content)) {
+      const content = [];
+      for (const raw of value.source.content) {
+        const block = normalizeTextBlock(raw) ?? normalizeImageBlock(raw);
+        if (!block) {
+          return null;
+        }
+        content.push(block);
+      }
+      source = { type: "content", content };
+    }
+  }
+  if (!source) {
+    return null;
+  }
+  return {
+    type: "document",
+    source,
+    ...typeof value.title === "string" || value.title === null ? { title: value.title } : {},
+    ...typeof value.context === "string" || value.context === null ? { context: value.context } : {}
+  };
+}
+function normalizeToolResultContentBlock(value) {
+  const text = normalizeTextBlock(value);
+  if (text) {
+    return text;
+  }
+  const image = normalizeImageBlock(value);
+  if (image) {
+    return image;
+  }
+  if (!isRecord(value)) {
+    return null;
+  }
+  if (value.type === "tool_reference" && typeof value.tool_name === "string") {
+    return { type: "tool_reference", tool_name: value.tool_name };
+  }
+  if (value.type === "search_result" && typeof value.source === "string" && typeof value.title === "string" && Array.isArray(value.content)) {
+    const content = [];
+    for (const raw of value.content) {
+      const block = normalizeTextBlock(raw);
+      if (!block) {
+        return null;
+      }
+      content.push(block);
+    }
+    return { type: "search_result", source: value.source, title: value.title, content };
+  }
+  return normalizeDocumentBlock(value);
+}
+function isToolResultContentBlock(value) {
+  return normalizeToolResultContentBlock(value) !== null;
+}
+var SKIP_DIRS = /* @__PURE__ */ new Set([
+  ".claude",
+  // Claude Code
+  ".git",
+  // Git
+  ".swifty",
+  // Swifty
+  ".next",
+  // Next.js
+  ".venv",
+  // Python venv
+  ".mypy_cache",
+  // Python mypy
+  ".tox",
+  // Python tox
+  "__pycache__",
+  // Python
+  "build",
+  // C++
+  "dist",
+  // Webpack, Vite
+  "node_modules",
+  // Node.js
+  "vendor",
+  // Go
+  "venv"
+  // Python venv
+]);
+
 // src/session/session.ts
 import { randomBytes } from "crypto";
 import {
@@ -193,6 +337,7 @@ var ContentSchema = z.union([z.string(), z.array(z.record(z.string(), z.unknown(
 var ToolResultRecordSchema = z.object({
   tool_use_id: z.string(),
   content: ContentSchema,
+  content_blocks: z.array(z.unknown()).optional(),
   is_error: z.boolean().optional()
 });
 var SessionMessageSchema = z.object({
@@ -220,6 +365,7 @@ function toolResultsToRecords(toolResults) {
   return (toolResults ?? []).map((tr) => ({
     tool_use_id: tr.toolUseId,
     content: tr.content,
+    ...tr.contentBlocks?.length ? { content_blocks: tr.contentBlocks } : {},
     ...tr.isError ? { is_error: true } : {}
   }));
 }
@@ -293,12 +439,30 @@ function recordsToCamelUses(recs) {
     arguments: tu.arguments
   }));
 }
+function validContentBlocks(value) {
+  if (!value) {
+    return void 0;
+  }
+  const blocks = [];
+  for (const raw of value) {
+    const block = normalizeToolResultContentBlock(raw);
+    if (block) {
+      blocks.push(block);
+    }
+  }
+  return blocks.length > 0 ? blocks : void 0;
+}
 function recordsToCamelResults(recs) {
-  return recs?.map((tr) => ({
-    toolUseId: tr.tool_use_id,
-    content: tr.content,
-    isError: tr.is_error
-  }));
+  return recs?.map((tr) => {
+    const legacyBlocks = Array.isArray(tr.content) ? validContentBlocks(tr.content) : void 0;
+    const contentBlocks = validContentBlocks(tr.content_blocks) ?? legacyBlocks;
+    return {
+      toolUseId: tr.tool_use_id,
+      content: typeof tr.content === "string" ? tr.content : contentToText(tr.content),
+      ...contentBlocks ? { contentBlocks } : {},
+      isError: tr.is_error ?? false
+    };
+  });
 }
 function rebuildFromSession(saved) {
   let lastBoundary = -1;
@@ -495,6 +659,35 @@ function contentChars(content) {
   }
   return chars;
 }
+function toolResultBlocksChars(blocks) {
+  let textChars = 0;
+  let richChars = 0;
+  for (const block of blocks) {
+    if (block.type === "text") {
+      textChars += block.text.length;
+    } else if (block.type === "image") {
+      richChars += IMAGE_CHAR_EQUIV;
+    } else if (block.type === "tool_reference") {
+      richChars += block.tool_name.length;
+    } else if (block.type === "search_result") {
+      richChars += block.source.length + block.title.length;
+      richChars += block.content.reduce((sum, content) => sum + content.text.length, 0);
+    } else if (block.source.type === "base64") {
+      richChars += IMAGE_CHAR_EQUIV;
+    } else if (block.source.type === "url") {
+      richChars += block.source.url.length;
+    } else if (block.source.type === "text") {
+      richChars += block.source.data.length;
+    } else if (typeof block.source.content === "string") {
+      richChars += block.source.content.length;
+    } else {
+      for (const content of block.source.content) {
+        richChars += content.type === "text" ? content.text.length : IMAGE_CHAR_EQUIV;
+      }
+    }
+  }
+  return { textChars, richChars };
+}
 function estimateMessages(messages) {
   let totalChars = 0;
   for (const msg of messages) {
@@ -504,7 +697,12 @@ function estimateMessages(messages) {
     }
     if (msg.toolResults) {
       for (const tr of msg.toolResults) {
-        totalChars += contentChars(tr.content);
+        if (tr.contentBlocks?.length) {
+          const blockChars = toolResultBlocksChars(tr.contentBlocks);
+          totalChars += Math.max(tr.content.length, blockChars.textChars) + blockChars.richChars;
+        } else {
+          totalChars += tr.content.length;
+        }
       }
     }
     if (msg.thinkingBlocks) {
@@ -743,10 +941,49 @@ function serializePrefixText(messages) {
     if (m.toolUses) {
       text += `
 [tools: ${m.toolUses.map((t) => t.toolName).join(", ")}]`;
+    }
+    if (m.toolResults) {
+      text += `
+[tool results]
+${m.toolResults.map((result) => result.content).join("\n")}`;
     }
     return text;
   }).join("\n\n");
 }
+function formatCompactSummary(raw) {
+  const summaryMatch = /<summary>([\s\S]*?)<\/summary>/.exec(raw);
+  if (summaryMatch) {
+    return summaryMatch[1].trim();
+  }
+  const analysisMatch = /<analysis>[\s\S]*?<\/analysis>/.exec(raw);
+  if (analysisMatch) {
+    return raw.replace(analysisMatch[0], "").trim();
+  }
+  return raw.trim();
+}
+async function callSummaryWithCacheSharing(client, messages, toolSchemas) {
+  let lastAssistant = -1;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i].role === "assistant") {
+      lastAssistant = i;
+      break;
+    }
+  }
+  if (lastAssistant < 0) {
+    throw new Error("no assistant message found for cache-sharing compact");
+  }
+  const summaryConv = new ConversationManager();
+  summaryConv.appendMessages(messages.slice(0, lastAssistant + 1));
+  summaryConv.addUserMessage(SUMMARY_SYSTEM_PROMPT);
+  let summaryText = "";
+  const stream = client.stream(summaryConv, toolSchemas);
+  for await (const event of stream) {
+    if (event.type === "text_delta") {
+      summaryText += event.text;
+    }
+  }
+  return formatCompactSummary(summaryText);
+}
 async function requestSummaryWithPTLRetry(client, prefix, toolSchemas) {
   let currentPrefix = prefix;
   for (let attempt = 0; ; attempt++) {
@@ -761,8 +998,7 @@ async function requestSummaryWithPTLRetry(client, prefix, toolSchemas) {
           summaryText += event.text;
         }
       }
-      const match = /<summary>([\s\S]*?)<\/summary>/.exec(summaryText);
-      return match ? match[1].trim() : summaryText;
+      return formatCompactSummary(summaryText);
     } catch (e) {
       const msg = e instanceof Error ? e.message.toLowerCase() : "";
       const isPTL = msg.includes("prompt") && msg.includes("long") || msg.includes("too many") || msg.includes("context_length");
@@ -789,7 +1025,15 @@ async function doCompact(conv, client, recoveryState, toolSchemaNames, toolSchem
   }
   const toSummarize = estimationMessages.slice(0, keepStart);
   const toKeep = estimationMessages.slice(keepStart);
-  const summary = await requestSummaryWithPTLRetry(client, toSummarize, toolSchemas);
+  let summary;
+  try {
+    summary = await callSummaryWithCacheSharing(client, estimationMessages, toolSchemas);
+  } catch (err) {
+    if (!(err instanceof ContextTooLongError)) {
+      throw err;
+    }
+    summary = await requestSummaryWithPTLRetry(client, toSummarize, toolSchemas);
+  }
   const recoveryAttachment = recoveryState ? recoveryState.buildRecoveryAttachment(toolSchemaNames) : "";
   let summaryContent = "This session continues from a previous conversation, which has been compressed due to context limitations. Here is a summary of the earlier messages:\n\n" + summary;
   if (toKeep.length > 0) {
@@ -827,6 +1071,9 @@ ${recoveryAttachment}`;
 
 export {
   ConversationManager,
+  normalizeToolResultContentBlock,
+  isToolResultContentBlock,
+  SKIP_DIRS,
   COMPACT_BOUNDARY,
   toolUsesToRecords,
   toolResultsToRecords,