@swifty.js/swifty 0.0.22 → 0.0.24

package/dist/lib/{chunk-C7IHCJZ3.js → chunk-2QILP24G.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,59 @@ function contentChars(content) {
   }
   return chars;
 }
+function toolResultBlocksChars(blocks) {
+  let textChars = 0;
+  let richChars = 0;
+  for (const block of blocks) {
+    switch (block.type) {
+      case "text": {
+        textChars += block.text.length;
+        break;
+      }
+      case "image": {
+        richChars += IMAGE_CHAR_EQUIV;
+        break;
+      }
+      case "tool_reference": {
+        richChars += block.tool_name.length;
+        break;
+      }
+      case "search_result": {
+        richChars += block.source.length + block.title.length;
+        richChars += block.content.reduce((sum, content) => sum + content.text.length, 0);
+        break;
+      }
+      case "document": {
+        switch (block.source.type) {
+          case "base64": {
+            richChars += IMAGE_CHAR_EQUIV;
+            break;
+          }
+          case "url": {
+            richChars += block.source.url.length;
+            break;
+          }
+          case "text": {
+            richChars += block.source.data.length;
+            break;
+          }
+          case "content": {
+            if (typeof block.source.content === "string") {
+              richChars += block.source.content.length;
+              break;
+            }
+            for (const content of block.source.content) {
+              richChars += content.type === "text" ? content.text.length : IMAGE_CHAR_EQUIV;
+            }
+            break;
+          }
+        }
+        break;
+      }
+    }
+  }
+  return { textChars, richChars };
+}
 function estimateMessages(messages) {
   let totalChars = 0;
   for (const msg of messages) {
@@ -504,7 +721,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 +965,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 +1022,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 +1049,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 +1095,9 @@ ${recoveryAttachment}`;
 
 export {
   ConversationManager,
+  normalizeToolResultContentBlock,
+  isToolResultContentBlock,
+  SKIP_DIRS,
   COMPACT_BOUNDARY,
   toolUsesToRecords,
   toolResultsToRecords,

package/dist/lib/{chunk-6GOWRPYS.js → chunk-3LU4APFB.js}

@@ -1,6 +1,6 @@
 import {
   createChildLogger
-} from "./chunk-EJLGB2EJ.js";
+} from "./chunk-EY7HE52Q.js";
 
 // src/config/config.ts
 import { existsSync, readFileSync } from "fs";
@@ -75,7 +75,7 @@ async function getContextWindowAsync(p, fetcher) {
     let fetched = fetchedWindowCache.get(key);
     if (fetched === void 0) {
       try {
-        const fn = fetcher ?? (await import("./anthropic-GFWP3ORB.js")).fetchModelContextWindow;
+        const fn = fetcher ?? (await import("./anthropic-RYPJDHQM.js")).fetchModelContextWindow;
         fetched = await fn(p);
       } catch (err) {
         log.error({ err }, "config operation failed");

package/dist/lib/{chunk-EJLGB2EJ.js → chunk-EY7HE52Q.js}

@@ -230,7 +230,6 @@ function errSerializer(err) {
 
 // src/utils/index.ts
 var log = createChildLogger({ module: "utils" });
-var DANGEROUSLY_JSON = "dangerouslyJson";
 function contentToText(content) {
   if (typeof content === "string") {
     return content;
@@ -238,12 +237,21 @@ function contentToText(content) {
   const parts = [];
   for (const block of content) {
     if (block.type === "text" && typeof block.text === "string") {
-      const b = block;
-      parts.push(b.text);
-    } else if (block.type === "image" && typeof block.source === "object") {
-      const b = block;
-      const mediaType = b.source.type === "base64" ? b.source.media_type : "image";
+      parts.push(block.text);
+    } else if (block.type === "image" && isRecord(block.source)) {
+      const mediaType = block.source.type === "base64" && typeof block.source.media_type === "string" ? block.source.media_type : "image";
       parts.push(`[Image: ${mediaType}]`);
+    } else if (block.type === "tool_reference" && typeof block.tool_name === "string") {
+      parts.push(`[Tool reference: ${block.tool_name}]`);
+    } else if (block.type === "search_result") {
+      const title = typeof block.title === "string" ? block.title : "search result";
+      const source = typeof block.source === "string" ? ` (${block.source})` : "";
+      const nested = Array.isArray(block.content) ? contentToText(block.content.filter(isRecord)) : "";
+      parts.push(`${title}${source}${nested ? `
+${nested}` : ""}`);
+    } else if (block.type === "document") {
+      const title = typeof block.title === "string" ? block.title : "document";
+      parts.push(`[Document: ${title}]`);
     }
   }
   return parts.join("\n");
@@ -359,7 +367,6 @@ export {
   closeLogger,
   logger,
   createChildLogger,
-  DANGEROUSLY_JSON,
   contentToText,
   isRecord,
   asRecord,

package/dist/lib/{chunk-7URDLWQN.js → chunk-GNI7YX6F.js}

@@ -1,10 +1,10 @@
 import {
   mcpCallPermissionContent
-} from "./chunk-GNBXECZN.js";
+} from "./chunk-PZ42NAFA.js";
 import {
   createChildLogger,
   strArg
-} from "./chunk-EJLGB2EJ.js";
+} from "./chunk-EY7HE52Q.js";
 import {
   MCP_CALL_TOOL_NAME
 } from "./chunk-GHF2PSEW.js";

package/dist/lib/{chunk-UMFNTXKA.js → chunk-OO2CLOEE.js}

@@ -1,3 +1,37 @@
+// src/llm/errors.ts
+var LLMError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "LLMError";
+  }
+};
+var AuthenticationError = class extends LLMError {
+  constructor(message) {
+    super(message);
+    this.name = "AuthenticationError";
+  }
+};
+var RateLimitError = class extends LLMError {
+  retryAfter;
+  constructor(message, retryAfter) {
+    super(message);
+    this.name = "RateLimitError";
+    this.retryAfter = retryAfter;
+  }
+};
+var NetworkError = class extends LLMError {
+  constructor(message) {
+    super(message);
+    this.name = "NetworkError";
+  }
+};
+var ContextTooLongError = class extends LLMError {
+  constructor(message) {
+    super(message);
+    this.name = "ContextTooLongError";
+  }
+};
+
 // src/conversation/pairing.ts
 var INTERRUPTED_TOOL_RESULT = "Tool execution was interrupted. The tool may or may not have completed; verify before relying on its effects.";
 var REJECTED_TOOL_RESULT = "The user rejected this tool use. Nothing was changed (for file edits, the new content was NOT written).";
@@ -42,47 +76,13 @@ function ensureToolPairing(messages) {
   return out;
 }
 
-// src/llm/errors.ts
-var LLMError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "LLMError";
-  }
-};
-var AuthenticationError = class extends LLMError {
-  constructor(message) {
-    super(message);
-    this.name = "AuthenticationError";
-  }
-};
-var RateLimitError = class extends LLMError {
-  retryAfter;
-  constructor(message, retryAfter) {
-    super(message);
-    this.name = "RateLimitError";
-    this.retryAfter = retryAfter;
-  }
-};
-var NetworkError = class extends LLMError {
-  constructor(message) {
-    super(message);
-    this.name = "NetworkError";
-  }
-};
-var ContextTooLongError = class extends LLMError {
-  constructor(message) {
-    super(message);
-    this.name = "ContextTooLongError";
-  }
-};
-
 export {
-  INTERRUPTED_TOOL_RESULT,
-  REJECTED_TOOL_RESULT,
-  ensureToolPairing,
   LLMError,
   AuthenticationError,
   RateLimitError,
   NetworkError,
-  ContextTooLongError
+  ContextTooLongError,
+  INTERRUPTED_TOOL_RESULT,
+  REJECTED_TOOL_RESULT,
+  ensureToolPairing
 };

package/dist/lib/{chunk-GNBXECZN.js → chunk-PZ42NAFA.js}

@@ -3,7 +3,7 @@ import {
   asRecord,
   createChildLogger,
   strArg
-} from "./chunk-EJLGB2EJ.js";
+} from "./chunk-EY7HE52Q.js";
 import {
   MCP_CALL_TOOL_NAME
 } from "./chunk-GHF2PSEW.js";
@@ -56,8 +56,7 @@ var MCPToolWrapper = class {
   }
   async execute(_ctx, args) {
     try {
-      const { output, isError } = await this.client.callTool(this.originalName, args);
-      return { output, isError };
+      return await this.client.callTool(this.originalName, args);
     } catch (err) {
       log.error({ err }, "mcp operation failed");
       return {