@swifty.js/swifty 0.0.27 → 0.0.29

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

@@ -54,9 +54,9 @@ var MCPToolWrapper = class {
       input_schema: this.inputSchema
     };
   }
-  async execute(_ctx, args) {
+  async execute(ctx, args) {
     try {
-      return await this.client.callTool(this.originalName, args);
+      return await this.client.callTool(this.originalName, args, ctx.abortSignal);
     } catch (err) {
       log.error({ err }, "mcp operation failed");
       return {
@@ -82,7 +82,7 @@ function coerceScalar(value, want) {
       return value;
     }
     const parsed = want === "integer" ? Number.parseInt(text, 10) : Number.parseFloat(text);
-    return Number.isNaN(parsed) ? value : parsed;
+    return Number.isFinite(parsed) ? parsed : value;
   }
   if (want === "boolean" && typeof value === "string") {
     const low = value.trim().toLowerCase();
@@ -177,21 +177,15 @@ var McpCallTool = class {
       }
     };
   }
-  /**
-   * Try in order: full name / server+short name / unique short-name suffix match.
-   *
-   * The model very often passes only the short name (roughly three in ten calls in
-   * practice), so this must be tolerant — otherwise it needlessly costs a retry
-   * round.
-   */
-  resolve(server, tool) {
-    const direct = this.registry.get(tool) ?? this.registry.get(buildMcpToolName(server, tool));
-    if (direct) {
-      return direct;
+  resolveTarget(args) {
+    const server = strArg(args, "server");
+    const name = strArg(args, "tool");
+    if (!server || !name) {
+      return void 0;
     }
-    const suffix = MCP_NAME_SEP + sanitizeSegment(tool);
-    const matches = this.registry.listTools().filter((t) => t.name.startsWith(MCP_TOOL_PREFIX) && t.name.endsWith(suffix));
-    return matches.length === 1 ? matches[0] : void 0;
+    const fullName = name.startsWith(MCP_TOOL_PREFIX) ? name : buildMcpToolName(server, name);
+    const target = this.registry.get(fullName);
+    return target && isMcpToolLike(target) && sanitizeSegment(target.mcpServerName) === sanitizeSegment(server) ? target : void 0;
   }
   availableNames() {
     return this.registry.listTools().filter((t) => t.name.startsWith(MCP_TOOL_PREFIX)).map((t) => t.name).sort();
@@ -202,7 +196,7 @@ var McpCallTool = class {
     if (tool === "") {
       return { output: "McpCall requires a 'tool' name", isError: true };
     }
-    const target = this.resolve(server, tool);
+    const target = this.resolveTarget(args);
     if (!target) {
       const names = this.availableNames();
       const hint = names.length > 0 ? names.join(", ") : "(none connected)";
@@ -211,10 +205,13 @@ var McpCallTool = class {
         isError: true
       };
     }
-    let inner = {};
-    if (typeof args.arguments === "object" && args.arguments !== null && !Array.isArray(args.arguments)) {
-      inner = asRecord(args.arguments);
+    if (typeof args.arguments !== "object" || args.arguments === null || Array.isArray(args.arguments)) {
+      return {
+        output: "McpCall requires an 'arguments' object matching the target schema",
+        isError: true
+      };
     }
+    let inner = asRecord(args.arguments);
     if (isMcpToolLike(target)) {
       const schema = target.mcpInputSchema();
       if (Object.keys(schema).length > 0) {
@@ -224,6 +221,7 @@ var McpCallTool = class {
         }
       }
     }
+    ctx.abortSignal?.throwIfAborted();
     return target.execute(ctx, inner);
   }
 };

package/dist/lib/{chunk-2AUSNVIB.js → chunk-KZSBR4FO.js}

@@ -1,30 +1,30 @@
 import {
-  computeCompactThreshold
-} from "./chunk-2QILP24G.js";
-import {
-  getContextWindow,
-  getMaxOutputTokens,
-  resolveAPIKey
-} from "./chunk-3LU4APFB.js";
+  normalizeToolResultContentBlock
+} from "./chunk-PIL7M52F.js";
 import {
   AuthenticationError,
   ContextTooLongError,
   LLMError,
   NetworkError,
   RateLimitError,
-  ensureToolPairing
-} from "./chunk-OO2CLOEE.js";
+  ensureToolPairing,
+  getMaxOutputTokens,
+  getThinkingLevel,
+  resolveAPIKey,
+  thinkingBudgetForLevel
+} from "./chunk-Z4CYHTII.js";
 import {
   MCP_TOOL_PREFIX,
   isMcpToolLike
-} from "./chunk-PZ42NAFA.js";
+} from "./chunk-KG4MJGKQ.js";
 import {
   asErrorString,
   asRecord,
   asString,
   contentToText,
   createChildLogger,
-  isRecord
+  isRecord,
+  strArg
 } from "./chunk-EY7HE52Q.js";
 
 // src/llm/anthropic.ts
@@ -96,6 +96,8 @@ function decideAndApply(registry, baseUrl, contextWindow) {
 }
 
 // src/llm/anthropic.ts
+var MIN_THINKING_BUDGET_TOKENS = 1024;
+var MIN_ANSWER_TOKENS = 1024;
 function markToolsForCache(tools) {
   for (let i = tools.length - 1; i >= 0; i--) {
     const t = tools[i];
@@ -152,14 +154,17 @@ async function fetchModelContextWindow(config) {
     clearTimeout(timer);
   }
 }
-function supportsAdaptiveThinking() {
-  return true;
-}
 function userBlocksFor(content) {
   if (typeof content === "string") {
     return [{ type: "text", text: content }];
   }
-  return content;
+  return content.map((raw) => {
+    const block = normalizeToolResultContentBlock(raw);
+    if (!block || block.type === "tool_reference") {
+      throw new Error(`Unsupported user content block: ${strArg(raw, "type", "unknown")}`);
+    }
+    return block;
+  });
 }
 function buildAnthropicMessages(messages) {
   const result = [];
@@ -208,6 +213,9 @@ function buildAnthropicMessages(messages) {
           content: tr.contentBlocks?.length ? tr.contentBlocks : tr.content
         });
       }
+      if (m.content.length > 0) {
+        blocks.push(...userBlocksFor(m.content));
+      }
       result.push({ role: "user", content: blocks });
     } else {
       if (result.length === 0) {
@@ -248,18 +256,17 @@ var AnthropicClient = class {
   client;
   model;
   /**
-   * Whether supports/enable thinking, default false
+   * PI-equivalent thinking level; maps to a thinking token budget.
    */
-  thinking;
+  thinkingLevel;
   systemPrompt;
   maxOutputTokens;
   /** Currently not used */
-  contextWindow;
   constructor(config, systemPrompt) {
     const apiKey = resolveAPIKey(config);
     if (!apiKey) {
       throw new AuthenticationError(
-        "Anthropic API key not found, set ANTHROPIC_API_KEY in .swifty/config.y(a)ml, or via ANTHROPIC_API_KEY env variable."
+        "Anthropic API key not found, set ANTHROPIC_API_KEY in ~/.swifty/config.yaml, or via ANTHROPIC_API_KEY env variable."
       );
     }
     this.client = new Anthropic({
@@ -267,10 +274,9 @@ var AnthropicClient = class {
       baseURL: config.base_url
     });
     this.model = config.model;
-    this.thinking = config.thinking ?? true;
+    this.thinkingLevel = getThinkingLevel(config);
     this.systemPrompt = systemPrompt;
     this.maxOutputTokens = getMaxOutputTokens(config);
-    this.contextWindow = getContextWindow(config);
   }
   setSystemPrompt(prompt) {
     this.systemPrompt = prompt;
@@ -278,6 +284,12 @@ var AnthropicClient = class {
   setMaxOutputTokens(maxTokens) {
     this.maxOutputTokens = maxTokens;
   }
+  setThinkingLevel(level) {
+    this.thinkingLevel = level;
+  }
+  getThinkingLevel() {
+    return this.thinkingLevel;
+  }
   async *stream(conversation, toolSchemas, abortSignal) {
     const messages = buildAnthropicMessages(ensureToolPairing(conversation.getMessages()));
     const sendToolSearchBeta = needsToolSearchBeta(toolSchemas);
@@ -316,19 +328,11 @@ var AnthropicClient = class {
       messages,
       ...antToolSchemas.length > 0 ? { tools: antToolSchemas } : {}
     };
-    if (this.thinking) {
-      if (supportsAdaptiveThinking()) {
-        params.thinking = {
-          type: "enabled",
-          budget_tokens: computeCompactThreshold(this.contextWindow, this.maxOutputTokens)
-        };
-      }
-    } else {
-      params.thinking = {
-        type: "enabled",
-        budget_tokens: computeCompactThreshold(this.contextWindow, this.maxOutputTokens)
-      };
-    }
+    const budgetCeiling = this.maxOutputTokens - MIN_ANSWER_TOKENS;
+    params.thinking = this.thinkingLevel !== "off" && budgetCeiling >= MIN_THINKING_BUDGET_TOKENS ? {
+      type: "enabled",
+      budget_tokens: Math.min(thinkingBudgetForLevel(this.thinkingLevel), budgetCeiling)
+    } : { type: "disabled" };
     let inputTokens = 0;
     let outputTokens = 0;
     let cacheReadInputTokens = 0;
@@ -377,7 +381,7 @@ var AnthropicClient = class {
                 text: delta.thinking
               };
             } else if (delta.type === "signature_delta") {
-              thinkingSignature = delta.signature;
+              thinkingSignature += delta.signature;
             } else if (delta.type === "text_delta") {
               yield {
                 type: "text_delta",
@@ -497,6 +501,7 @@ function markLastUserTailForCache(messages) {
     Reflect.set(last, "cache_control", {
       type: "ephemeral"
     });
+    return;
   }
 }
 function classifyAnthropicError(err) {
@@ -508,14 +513,16 @@ function classifyAnthropicError(err) {
       return new AuthenticationError(`Invalid API key: ${err.message}`);
     }
     if (err.status === 429 /* RateLimitError */) {
-      const retryAfter = asRecord(err.headers)["retry-after"];
+      const headers = err.headers;
+      const retryAfter = headers instanceof Headers ? headers.get("retry-after") : void 0;
       let message = "Rate Limited";
       if (retryAfter) {
         const s = Number.parseInt(asString(retryAfter));
         if (Number.isNaN(s)) {
           message += ", please wait.";
+        } else {
+          message += `, retry after ${asString(s)}s.`;
         }
-        message += `, retry after ${asString(s)}s.`;
       } else {
         message += ", please wait.";
       }

package/dist/lib/chunk-PIL7M52F.js

@@ -0,0 +1,127 @@
+// 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([
+  ".agents",
+  ".git",
+  // Git
+  ".swifty",
+  // Swifty
+  ".next",
+  // Next.js
+  ".venv",
+  // Python venv
+  ".mypy_cache",
+  // Python mypy
+  "__pycache__",
+  // Python
+  "dist",
+  // Webpack, Vite
+  "node_modules"
+  // Node.js
+]);
+
+export {
+  normalizeToolResultContentBlock,
+  isToolResultContentBlock,
+  SKIP_DIRS
+};