@swifty.js/swifty 0.0.26 → 0.0.28

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

@@ -2,6 +2,40 @@ import {
   createChildLogger
 } from "./chunk-EY7HE52Q.js";
 
+// 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/config/config.ts
 import { existsSync, readFileSync } from "fs";
 import { homedir } from "os";
@@ -38,68 +72,22 @@ var ProviderConfigSchema = z.object({
   context_window: z.coerce.number().optional(),
   max_output_tokens: z.coerce.number().optional()
 });
-var MODEL_CONTEXT_WINDOWS = [
-  // 1M-token variants (e.g. "...-1m") come first so they win over the base family.
-  ["1m", 1e6],
-  ["gpt-4.1", 1e6],
-  ["gpt-4o", 128e3],
-  ["gpt-4-turbo", 128e3],
-  ["o1", 2e5],
-  ["o3", 2e5],
-  ["o4", 2e5],
-  ["gpt-3.5", 16385],
-  ["claude", 2e5]
-];
-function lookupModelContextWindow(model) {
-  const model_ = model.toLowerCase();
-  for (const [m, window] of MODEL_CONTEXT_WINDOWS) {
-    if (model_.includes(m)) {
-      return window;
-    }
-  }
-  return model_.includes("claude") ? 2e5 : 128e3;
-}
-function getContextWindow(p) {
-  if (p.context_window && p.context_window > 0) {
-    return p.context_window;
-  }
-  return lookupModelContextWindow(p.model);
-}
-var fetchedWindowCache = /* @__PURE__ */ new Map();
-async function getContextWindowAsync(p, fetcher) {
-  if (p.context_window && p.context_window > 0) {
-    return p.context_window;
-  }
-  if (p.protocol === "anthropic") {
-    const key = `${p.name}-${p.model}`;
-    let fetched = fetchedWindowCache.get(key);
-    if (fetched === void 0) {
-      try {
-        const fn = fetcher ?? (await import("./anthropic-RYPJDHQM.js")).fetchModelContextWindow;
-        fetched = await fn(p);
-      } catch (err) {
-        log.error({ err }, "config operation failed");
-        fetched = 0;
-      }
-      fetchedWindowCache.set(key, fetched);
-    }
-    if (fetched && fetched > 0) {
-      return fetched;
-    }
-  }
-  return lookupModelContextWindow(p.model);
+var DEFAULT_PROVIDER_THINKING = true;
+var DEFAULT_CONTEXT_WINDOW = 1e6;
+var DEFAULT_MAX_OUTPUT_TOKENS = 128e3;
+function withProviderDefaults(provider) {
+  return {
+    ...provider,
+    thinking: provider.thinking ?? DEFAULT_PROVIDER_THINKING,
+    context_window: getContextWindow(provider),
+    max_output_tokens: getMaxOutputTokens(provider)
+  };
 }
-function _resetContextWindowCache() {
-  fetchedWindowCache.clear();
+function getContextWindow(provider) {
+  return Number.isSafeInteger(provider.context_window) && (provider.context_window ?? 0) > 0 ? provider.context_window ?? DEFAULT_CONTEXT_WINDOW : DEFAULT_CONTEXT_WINDOW;
 }
-function getMaxOutputTokens(p) {
-  if (p.max_output_tokens && p.max_output_tokens > 0) {
-    return p.max_output_tokens;
-  }
-  if (p.thinking) {
-    return 64e3;
-  }
-  return 8192;
+function getMaxOutputTokens(provider) {
+  return Number.isSafeInteger(provider.max_output_tokens) && (provider.max_output_tokens ?? 0) > 0 ? provider.max_output_tokens ?? DEFAULT_MAX_OUTPUT_TOKENS : DEFAULT_MAX_OUTPUT_TOKENS;
 }
 function resolveAPIKey(p) {
   if (p.api_key) {
@@ -173,10 +161,8 @@ function loadSingleFile(path) {
   if (parsed.success) {
     const data2 = parsed.data;
     return {
-      providers: data2.providers,
-      permission_mode: data2.permission_mode,
-      mcp_servers: data2.mcp_servers,
-      hooks: data2.hooks
+      ...data2,
+      providers: data2.providers.map(withProviderDefaults)
     };
   }
   log.error({ error: parsed.error }, "config error");
@@ -190,7 +176,7 @@ function loadSingleFile(path) {
   if ("providers" in raw) {
     const parsed2 = safeParse(z.array(ProviderConfigSchema), raw.providers);
     if (parsed2.success) {
-      providers = parsed2.data;
+      providers = parsed2.data.map(withProviderDefaults);
     }
   }
   if ("permission_mode" in raw && typeof raw.permission_mode === "string") {
@@ -278,7 +264,7 @@ function validateProviders(config) {
       base_url: p.base_url,
       model: p.model
     };
-    const missing = requiredFields.filter((field) => !(field in values));
+    const missing = requiredFields.filter((field) => !values[field].trim());
     if (missing.length > 0) {
       throw new ConfigError(`Provider #${String(i + 1)}: missing fields: ${missing.join(", ")}`);
     }
@@ -289,10 +275,12 @@ function validateProviders(config) {
     }
   }
 }
-function loadConfig(path) {
+function loadConfig(path, options = {}) {
   if (path) {
     const config = loadSingleFile(path);
-    validateProviders(config);
+    if (!options.allowEmptyProviders || config.providers.length > 0) {
+      validateProviders(config);
+    }
     return config;
   }
   const wd = process.cwd();
@@ -315,25 +303,90 @@ function loadConfig(path) {
     }
   }
   if (!merged) {
+    if (options.allowEmptyProviders) {
+      return { providers: [], mcp_servers: [], hooks: [] };
+    }
     throw new ConfigError(
       "No config file found, expected .swifty/config.y(a)ml under project or $HOME/.swifty/config.y(a)ml."
     );
   }
-  validateProviders(merged);
+  if (!options.allowEmptyProviders || merged.providers.length > 0) {
+    validateProviders(merged);
+  }
   return merged;
 }
 
+// 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).";
+function ensureToolPairing(messages) {
+  const out = [];
+  for (let i = 0; i < messages.length; i++) {
+    const m = messages[i];
+    if (m.role === "assistant" && m.toolUses?.length) {
+      out.push(m);
+      const pending = new Set(m.toolUses.map((tu) => tu.toolUseId));
+      const results = [];
+      const resultMessages = [];
+      while (i + 1 < messages.length) {
+        const next = messages[i + 1];
+        if (next.role !== "user" || !next.toolResults?.length || next.toolUses?.length) {
+          break;
+        }
+        i++;
+        resultMessages.push(next);
+        for (const tr of next.toolResults) {
+          if (pending.delete(tr.toolUseId)) {
+            results.push(tr);
+          }
+        }
+      }
+      for (const toolUseId of pending) {
+        results.push({ toolUseId, content: INTERRUPTED_TOOL_RESULT, isError: true });
+      }
+      out.push({
+        ...resultMessages[0] ?? { role: "user", content: "" },
+        toolResults: results
+      });
+      for (const remaining of resultMessages.slice(1)) {
+        if (remaining.content.length > 0 || remaining.thinkingBlocks?.length) {
+          out.push({ ...remaining, toolResults: [] });
+        }
+      }
+      continue;
+    }
+    if ((m.toolResults?.length ?? 0) > 0) {
+      if (m.content.length === 0 && !m.toolUses?.length && !m.thinkingBlocks?.length) {
+        continue;
+      }
+      out.push({ ...m, toolResults: [] });
+    } else {
+      out.push(m);
+    }
+  }
+  return out;
+}
+
 export {
+  LLMError,
+  AuthenticationError,
+  RateLimitError,
+  NetworkError,
+  ContextTooLongError,
   ConfigError,
   ProviderConfigSchema,
-  lookupModelContextWindow,
+  DEFAULT_PROVIDER_THINKING,
+  DEFAULT_CONTEXT_WINDOW,
+  DEFAULT_MAX_OUTPUT_TOKENS,
+  withProviderDefaults,
   getContextWindow,
-  getContextWindowAsync,
-  _resetContextWindowCache,
   getMaxOutputTokens,
   resolveAPIKey,
   HookConfigSchema,
   forkEnabled,
   mergeConfig,
-  loadConfig
+  loadConfig,
+  INTERRUPTED_TOOL_RESULT,
+  REJECTED_TOOL_RESULT,
+  ensureToolPairing
 };

package/dist/lib/chunk-IB5IQK2S.js

@@ -0,0 +1,136 @@
+// 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
+]);
+
+export {
+  normalizeToolResultContentBlock,
+  isToolResultContentBlock,
+  SKIP_DIRS
+};

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-XFSN4LMA.js → chunk-P4F46PEF.js}

@@ -1,15 +1,13 @@
-import {
-  getMaxOutputTokens,
-  resolveAPIKey
-} from "./chunk-3LU4APFB.js";
 import {
   AuthenticationError,
   ContextTooLongError,
   LLMError,
   NetworkError,
   RateLimitError,
-  ensureToolPairing
-} from "./chunk-OO2CLOEE.js";
+  ensureToolPairing,
+  getMaxOutputTokens,
+  resolveAPIKey
+} from "./chunk-FBSPZQGC.js";
 import {
   asRecord,
   asString,
@@ -82,6 +80,7 @@ var OpenAIClient = class {
       let jsonAccumulate = "";
       let reasoningId = "";
       let reasoningText = "";
+      let sawTerminalResponse = false;
       for await (const event of stream) {
         if (event.type === "response.output_text.delta") {
           yield {
@@ -139,19 +138,22 @@ var OpenAIClient = class {
             currentToolId = "";
             jsonAccumulate = "";
           }
-        } else if (event.type === "response.completed") {
+        } else if (event.type === "response.completed" || event.type === "response.incomplete") {
+          sawTerminalResponse = true;
           const usage = event.response.usage;
           if (usage) {
             outputTokens = usage.output_tokens;
-            cacheReadInputTokens = usage.input_tokens_details.cached_tokens;
+            cacheReadInputTokens = usage.input_tokens_details?.cached_tokens ?? 0;
             inputTokens = Math.max(0, usage.input_tokens - cacheReadInputTokens);
           }
           let stopReason = "end_turn";
           const resp = event.response;
-          if (resp.status === "incomplete") {
+          if (event.type === "response.incomplete" || resp.status === "incomplete") {
             const details = resp.incomplete_details;
             if (details?.reason === "max_output_tokens") {
               stopReason = "max_tokens";
+            } else {
+              throw new LLMError(`Response incomplete: ${details?.reason ?? "unknown reason"}`);
             }
           }
           yield {
@@ -165,8 +167,18 @@ var OpenAIClient = class {
               // 0
             }
           };
+        } else if (event.type === "response.failed") {
+          const error = event.response.error;
+          const message = `${error?.code ?? "unknown"}: ${error?.message ?? "Response failed"}`;
+          throw containsContextLengthError(message) ? new ContextTooLongError(message) : new LLMError(message);
+        } else if (event.type === "error") {
+          const message = `${event.code ?? "unknown"}: ${event.message}`;
+          throw containsContextLengthError(message) ? new ContextTooLongError(message) : new LLMError(message);
         }
       }
+      if (!sawTerminalResponse) {
+        throw new NetworkError("OpenAI Responses stream ended before a terminal response event");
+      }
     } catch (err) {
       log.error({ err }, "llm operation failed");
       throw classifyOpenAIError(err);
@@ -349,6 +361,9 @@ function buildOpenAIInput(messages) {
           output: toolOutputForResponses(tr)
         });
       }
+      if (m.content.length > 0) {
+        result.push({ role: "user", content: userContentsFor(m.content) });
+      }
     } else if (m.role === "assistant") {
       result.push({
         role: "assistant",
@@ -510,6 +525,9 @@ var OpenAICompatClient = class {
           }
         }
       }
+      if (finishReason === null) {
+        throw new NetworkError("Chat Completions stream ended before a finish reason");
+      }
       let stopReason;
       if (finishReason === "length") {
         stopReason = "max_tokens";
@@ -535,6 +553,9 @@ var OpenAICompatClient = class {
   }
 };
 function classifyOpenAIError(err) {
+  if (err instanceof LLMError) {
+    return err;
+  }
   if (err instanceof OpenAI.APIError) {
     if (err.status === 413 /* PromptTooLong */ || err.status === 400 /* BadRequest */ && containsContextLengthError(err.message)) {
       return new ContextTooLongError(`Context Too Long: ${err.message}`);
@@ -543,7 +564,11 @@ function classifyOpenAIError(err) {
       return new AuthenticationError(`Invalid API key: ${err.message}`);
     }
     if (err.status === 429 /* RateLimitError */) {
-      return new RateLimitError(`Rate limit error, please wait.`);
+      const headers = err.headers;
+      return new RateLimitError(
+        "Rate limit error, please wait.",
+        headers instanceof Headers ? headers.get("retry-after") ?? void 0 : void 0
+      );
     }
     return new LLMError(`OpenAI API error (${asString(err.status)}): ${err.message}`);
   }
@@ -558,16 +583,14 @@ function buildChatCompletionMessages(messages) {
       params.push({
         role: "assistant",
         content: assistantText || null,
+        ...reasoning ? { reasoning_content: reasoning } : {},
         tool_calls: m.toolUses.map((tu) => ({
           id: tu.toolUseId,
           type: "function",
           function: {
             name: tu.toolName,
             arguments: JSON.stringify(tu.arguments)
-          },
-          ...reasoning ? {
-            reasoning_content: reasoning
-          } : {}
+          }
         }))
       });
     } else if (m.toolResults && m.toolResults.length > 0) {
@@ -580,6 +603,12 @@ function buildChatCompletionMessages(messages) {
         });
         pendingRichParts.push(...collectRichParts(tr));
       }
+      if (m.content.length > 0) {
+        const content = userPartsFor(m.content);
+        pendingRichParts.push(
+          ...typeof content === "string" ? [{ type: "text", text: content }] : content
+        );
+      }
       if (pendingRichParts.length > 0) {
         params.push({
           role: "user",