zidane 1.8.0 → 2.0.1

package/dist/{chunk-WQBKOZVI.js → chunk-FRNFVKWW.js}

@@ -5,15 +5,14 @@ import {
   toAnthropic,
   toolResultsMessage,
   userMessage
-} from "./chunk-EC7IRWVS.js";
+} from "./chunk-LN4LLLHA.js";
 import {
   matchesContextExceeded
-} from "./chunk-FFFDQHMA.js";
+} from "./chunk-7JTBBZ2U.js";
 
 // src/providers/anthropic.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { resolve as resolve2 } from "path";
-import Anthropic from "@anthropic-ai/sdk";
 
 // src/providers/oauth.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
@@ -88,6 +87,21 @@ async function resolveOAuthApiKey(options, callbacks) {
 
 // src/providers/anthropic.ts
 var CREDENTIALS_FILE2 = resolve2(process.cwd(), ".credentials.json");
+var _sdkCtor = null;
+async function loadAnthropicSdk() {
+  if (_sdkCtor)
+    return _sdkCtor;
+  try {
+    const mod = await import("@anthropic-ai/sdk");
+    _sdkCtor = mod.default;
+    return _sdkCtor;
+  } catch (err) {
+    throw new Error(
+      "The `anthropic` provider requires the `@anthropic-ai/sdk` package, which is an optional peer dependency. Install it with your package manager (e.g. `bun add @anthropic-ai/sdk`).",
+      err instanceof Error ? { cause: err } : void 0
+    );
+  }
+}
 function getConfiguredApiKey(anthropicParams) {
   if (anthropicParams?.apiKey)
     return anthropicParams.apiKey;
@@ -102,9 +116,9 @@ function getConfiguredApiKey(anthropicParams) {
   }
   throw new Error("No API key found. Run `bun run auth` first.");
 }
-function createClient(apiKey, isOAuth, baseURL) {
+function createClient(SDK, apiKey, isOAuth, baseURL) {
   const base = baseURL ? { baseURL } : {};
-  return new Anthropic(
+  return new SDK(
     isOAuth ? {
       apiKey: null,
       authToken: apiKey,
@@ -144,13 +158,19 @@ function mapStopReason(stopReason) {
       return "other";
   }
 }
+function looksLikeAnthropicApiError(err) {
+  if (!err || typeof err !== "object")
+    return false;
+  const e = err;
+  return typeof e.status === "number" && "error" in e;
+}
 function classifyAnthropicError(err) {
   if (!err || typeof err !== "object")
     return null;
   const anyErr = err;
   if (anyErr.name === "AbortError")
     return { kind: "aborted" };
-  if (!(err instanceof Anthropic.APIError))
+  if (!looksLikeAnthropicApiError(err))
     return null;
   const innerType = anyErr.error?.error?.type;
   const outerType = anyErr.error?.type;
@@ -206,7 +226,14 @@ function anthropic(anthropicParams) {
   } : void 0;
   return {
     name: "anthropic",
-    meta: { defaultModel, isOAuth },
+    meta: {
+      defaultModel,
+      isOAuth,
+      capabilities: {
+        vision: true,
+        imageInToolResult: true
+      }
+    },
     formatTools(tools) {
       return tools.map((t) => ({
         name: t.name,
@@ -246,6 +273,7 @@ function anthropic(anthropicParams) {
     promptMessage: anthropicPromptMessage,
     classifyError: classifyAnthropicError,
     async stream(options, callbacks) {
+      const SDK = await loadAnthropicSdk();
       const apiKey = await resolveOAuthApiKey(
         {
           provider: "anthropic",
@@ -269,7 +297,7 @@ function anthropic(anthropicParams) {
           }
         }
       );
-      const client = createClient(apiKey, apiKey.includes("sk-ant-oat"), anthropicParams?.baseURL);
+      const client = createClient(SDK, apiKey, apiKey.includes("sk-ant-oat"), anthropicParams?.baseURL);
       const system = isOAuth ? `You are Claude Code, Anthropic's official CLI for Claude.` : options.system;
       const messages = isOAuth && options.system ? [
         { role: "user", content: [{ type: "text", text: options.system }] },
@@ -352,7 +380,8 @@ function cerebras(params) {
     name: "cerebras",
     apiKey,
     baseURL: BASE_URL,
-    defaultModel: params?.defaultModel || "zai-glm-4.7"
+    defaultModel: params?.defaultModel || "zai-glm-4.7",
+    capabilities: params?.capabilities ?? { vision: false, imageInToolResult: false }
   });
 }
 
@@ -393,11 +422,12 @@ function toPiMessages(messages, modelId) {
     const toolResults = msg.content.filter((b) => b.type === "tool_result");
     if (toolResults.length > 0) {
       for (const result of toolResults) {
+        const content2 = typeof result.output === "string" ? [{ type: "text", text: result.output }] : result.output.map((block) => block.type === "image" ? { type: "image", data: block.data, mimeType: block.mediaType } : { type: "text", text: block.text });
         out.push({
           role: "toolResult",
           toolCallId: result.callId,
           toolName: "",
-          content: [{ type: "text", text: result.output }],
+          content: content2,
           isError: result.isError ?? false,
           timestamp: Date.now()
         });
@@ -524,7 +554,14 @@ function openai(params) {
   } : void 0;
   return {
     name: "openai",
-    meta: { defaultModel, isOAuth: true },
+    meta: {
+      defaultModel,
+      isOAuth: true,
+      capabilities: {
+        vision: true,
+        imageInToolResult: true
+      }
+    },
     formatTools,
     userMessage,
     assistantMessage,
@@ -629,7 +666,8 @@ function openrouter(params) {
     extraHeaders: {
       "HTTP-Referer": "https://github.com/Tahul/zidane",
       "X-Title": "zidane"
-    }
+    },
+    capabilities: params?.capabilities ?? { vision: true, imageInToolResult: false }
   });
 }
 

package/dist/{chunk-EC7IRWVS.js → chunk-LN4LLLHA.js}

@@ -1,6 +1,6 @@
 import {
   matchesContextExceeded
-} from "./chunk-FFFDQHMA.js";
+} from "./chunk-7JTBBZ2U.js";
 
 // src/providers/openai-compat.ts
 var TOOL_RESULTS_TAG = "__zidane_tool_results__";
@@ -84,8 +84,28 @@ async function consumeSSE(response, callbacks, signal) {
   }));
   return { text, thinking, toolCalls, finishReason, usage };
 }
-function toOAIMessages(system, messages) {
+function toImageUrlPart(img) {
+  return {
+    type: "image_url",
+    image_url: { url: `data:${img.mediaType};base64,${img.data}` }
+  };
+}
+function summarizeToolResultOutput(output) {
+  if (typeof output === "string")
+    return { text: output, images: [] };
+  const texts = [];
+  const images = [];
+  for (const block of output) {
+    if (block.type === "text")
+      texts.push(block.text);
+    else if (block.type === "image")
+      images.push({ mediaType: block.mediaType, data: block.data });
+  }
+  return { text: texts.join("\n"), images };
+}
+function toOAIMessages(system, messages, options = {}) {
   const out = [{ role: "system", content: system }];
+  const nativeImageInTool = options.imageInToolResult === true;
   for (const msg of messages) {
     const toolResults = msg.content.filter((b) => b.type === "tool_result");
     const toolCalls = msg.content.filter((b) => b.type === "tool_call");
@@ -93,7 +113,33 @@ function toOAIMessages(system, messages) {
     const imageBlocks = msg.content.filter((b) => b.type === "image");
     if (toolResults.length > 0) {
       for (const tr of toolResults) {
-        out.push({ role: "tool", tool_call_id: tr.callId, content: tr.output });
+        if (typeof tr.output === "string") {
+          out.push({ role: "tool", tool_call_id: tr.callId, content: tr.output });
+          continue;
+        }
+        if (nativeImageInTool) {
+          const parts = tr.output.map((block) => block.type === "image" ? toImageUrlPart({ mediaType: block.mediaType, data: block.data }) : { type: "text", text: block.text });
+          out.push({ role: "tool", tool_call_id: tr.callId, content: parts });
+          continue;
+        }
+        const { text, images } = summarizeToolResultOutput(tr.output);
+        if (images.length === 0) {
+          out.push({ role: "tool", tool_call_id: tr.callId, content: text });
+          continue;
+        }
+        const noun = images.length === 1 ? "image" : "images";
+        const attachedMarker = `[${images.length} ${noun} attached \u2014 see next user message]`;
+        const toolMarker = text.length > 0 ? `${text}
+
+${attachedMarker}` : attachedMarker;
+        out.push({ role: "tool", tool_call_id: tr.callId, content: toolMarker });
+        out.push({
+          role: "user",
+          content: [
+            ...images.map(toImageUrlPart),
+            { type: "text", text: `(${noun} returned by tool call ${tr.callId})` }
+          ]
+        });
       }
       continue;
     }
@@ -244,9 +290,13 @@ function openaiCompat(params) {
   const authHeaderValue = params.authHeader?.scheme ? `${params.authHeader.scheme} ${params.apiKey}` : params.authHeader ? params.apiKey : `Bearer ${params.apiKey}`;
   const extraHeaders = params.extraHeaders ?? {};
   const endpoint = `${params.baseURL.replace(TRAILING_SLASH_RE, "")}/chat/completions`;
+  const capabilities = {
+    vision: params.capabilities?.vision ?? false,
+    imageInToolResult: params.capabilities?.imageInToolResult ?? false
+  };
   return {
     name,
-    meta: { defaultModel },
+    meta: { defaultModel, capabilities },
     formatTools,
     userMessage,
     assistantMessage,
@@ -254,7 +304,9 @@ function openaiCompat(params) {
     classifyError: classifyOpenAICompatError,
     async stream(options, callbacks) {
       const modelId = options.model || defaultModel;
-      const messages = toOAIMessages(options.system, options.messages);
+      const messages = toOAIMessages(options.system, options.messages, {
+        imageInToolResult: capabilities.imageInToolResult === true
+      });
       const maxTokens = options.thinkingBudget ? options.thinkingBudget + options.maxTokens : options.maxTokens;
       const body = {
         model: modelId,
@@ -306,6 +358,48 @@ function openaiCompat(params) {
 }
 
 // src/session/messages.ts
+function decodeAnthropicToolResultContent(content) {
+  if (typeof content === "string")
+    return content;
+  if (!Array.isArray(content))
+    return JSON.stringify(content);
+  const blocks = [];
+  for (const raw of content) {
+    if (!raw || typeof raw !== "object")
+      continue;
+    const b = raw;
+    if (b.type === "text" && typeof b.text === "string") {
+      blocks.push({ type: "text", text: b.text });
+      continue;
+    }
+    if (b.type === "image" && b.source && typeof b.source === "object") {
+      const src = b.source;
+      if (src.type === "base64" && typeof src.data === "string" && typeof src.media_type === "string") {
+        blocks.push({ type: "image", mediaType: src.media_type, data: src.data });
+        continue;
+      }
+    }
+    blocks.push({ type: "text", text: JSON.stringify(raw) });
+  }
+  if (blocks.length === 0)
+    return "";
+  const hasNonText = blocks.some((b) => b.type !== "text");
+  if (!hasNonText)
+    return blocks.map((b) => b.text).join("\n");
+  return blocks;
+}
+function encodeAnthropicToolResultContent(output) {
+  if (typeof output === "string")
+    return output;
+  return output.map((b) => {
+    if (b.type === "text")
+      return { type: "text", text: b.text };
+    return {
+      type: "image",
+      source: { type: "base64", media_type: b.mediaType, data: b.data }
+    };
+  });
+}
 function fromAnthropic(msg) {
   const role = msg.role;
   const content = [];
@@ -328,7 +422,7 @@ function fromAnthropic(msg) {
       } else if (b.type === "tool_use") {
         content.push({ type: "tool_call", id: b.id, name: b.name, input: b.input });
       } else if (b.type === "tool_result") {
-        const output = typeof b.content === "string" ? b.content : JSON.stringify(b.content);
+        const output = decodeAnthropicToolResultContent(b.content);
         content.push({ type: "tool_result", callId: b.tool_use_id, output });
       } else if (b.type === "thinking") {
         content.push({ type: "thinking", text: b.thinking, signature: b.signature });
@@ -398,7 +492,7 @@ function toAnthropic(msg) {
       case "tool_call":
         return { type: "tool_use", id: block.id, name: block.name, input: block.input };
       case "tool_result":
-        return { type: "tool_result", tool_use_id: block.callId, content: block.output };
+        return { type: "tool_result", tool_use_id: block.callId, content: encodeAnthropicToolResultContent(block.output) };
       case "thinking":
         return { type: "thinking", thinking: block.text, signature: block.signature };
       default:

package/dist/chunk-LVC7NQUZ.js

@@ -0,0 +1,22 @@
+import {
+  validateSkillForWrite
+} from "./chunk-BCXXXJ3G.js";
+
+// src/skills/index.ts
+function defineSkill(config) {
+  const normalized = {
+    ...config,
+    source: config.source ?? "inline"
+  };
+  const result = validateSkillForWrite(normalized);
+  if (!result.valid) {
+    const summary = result.errors.map((e) => `  - [${e.code}] ${e.message}`).join("\n");
+    throw new Error(`Invalid skill "${normalized.name}":
+${summary}`);
+  }
+  return normalized;
+}
+
+export {
+  defineSkill
+};

package/dist/chunk-MYWDHD7C.js

@@ -0,0 +1,14 @@
+// src/types.ts
+function toolResultToText(content) {
+  if (typeof content === "string")
+    return content;
+  return content.map((block) => {
+    if (block.type === "text")
+      return block.text;
+    return `[image: ${block.mediaType} \u2014 ${block.data.length} b64 bytes]`;
+  }).join("\n");
+}
+
+export {
+  toolResultToText
+};

package/dist/{chunk-3RJOWJOJ.js → chunk-OVQ4N64O.js}

@@ -4,7 +4,7 @@ import {
   shell,
   spawn,
   writeFile
-} from "./chunk-4N5ADW7A.js";
+} from "./chunk-PASFWG7S.js";
 
 // src/harnesses/basic.ts
 var basicTools = { shell, readFile, writeFile, listFiles };