promptfoo 0.121.2 → 0.121.3

package/dist/src/{chat-DqxYYtWA.js → chat-pxmiVpWe.js}

@@ -1,13 +1,13 @@
-import { _ as getEnvBool, b as getEnvString, i as logger, v as getEnvFloat, w as state, y as getEnvInt } from "./logger-CT3IKMKA.js";
-import { r as importModule } from "./esm-Cd1AjG1D.js";
+import { C as getEnvString, D as state, S as getEnvInt, a as logger, b as getEnvBool, x as getEnvFloat } from "./logger-DO8_zM18.js";
+import { r as importModule } from "./esm-SUNIX1x3.js";
 import { i as isJavascriptFile } from "./fileExtensions-DnqA1y9x.js";
-import { d as maybeLoadToolsFromExternalFile, g as renderVarsInObject, l as maybeLoadFromExternalFileWithVars, u as maybeLoadResponseFormatFromExternalFile } from "./util-BRYkYPTd.js";
-import { C as transformTools, S as transformToolChoice, b as parseChatPrompt, p as REQUEST_TIMEOUT_MS } from "./fetch-Cwxnd8zz.js";
-import { r as fetchWithCache } from "./cache-C4Nxf52C.js";
+import { d as maybeLoadToolsFromExternalFile, g as renderVarsInObject, l as maybeLoadFromExternalFileWithVars, u as maybeLoadResponseFormatFromExternalFile } from "./util-CMMkIxfU.js";
+import { C as transformTools, S as transformToolChoice, b as parseChatPrompt, p as REQUEST_TIMEOUT_MS } from "./fetch-CVAtKnI3.js";
+import { r as fetchWithCache } from "./cache-CaT5tPgo.js";
 import { n as withGenAISpan } from "./genaiTracer-D3fD9dNV.js";
-import { C as applyQueryParams, D as renderAuthVars, E as getOAuthTokenWithExpiry, T as getAuthQueryParams, i as transformMCPToolsToOpenAi, w as getAuthHeaders } from "./transform-vNucnNr0.js";
-import { t as OpenAiGenericProvider } from "./openai-DElQ-fPX.js";
-import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-Dnmk2mBQ.js";
+import { D as getAuthQueryParams, E as getAuthHeaders, O as getOAuthTokenWithExpiry, T as applyQueryParams, i as transformMCPToolsToOpenAi, k as renderAuthVars } from "./transform-DyDAwEpE.js";
+import { t as OpenAiGenericProvider } from "./openai-BcB5KlTk.js";
+import { a as calculateOpenAICost, c as getTokenUsage, t as OPENAI_CHAT_MODELS } from "./util-CgDCK4KI.js";
 import path from "path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 //#region src/util/finishReason.ts
@@ -444,9 +444,9 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 		const isReasoningModel = this.isReasoningModel();
 		const isGPT5Model = this.isGPT5Model();
 		const maxCompletionTokens = isReasoningModel ? config.max_completion_tokens ?? getEnvInt("OPENAI_MAX_COMPLETION_TOKENS") : void 0;
-		const maxTokensDefault = config.omitDefaults ? getEnvString("OPENAI_MAX_TOKENS") !== void 0 ? getEnvInt("OPENAI_MAX_TOKENS") : void 0 : getEnvInt("OPENAI_MAX_TOKENS", 1024);
+		const maxTokensDefault = config.omitDefaults ? getEnvString("OPENAI_MAX_TOKENS") === void 0 ? void 0 : getEnvInt("OPENAI_MAX_TOKENS") : getEnvInt("OPENAI_MAX_TOKENS", 1024);
 		const maxTokens = isReasoningModel || isGPT5Model ? void 0 : config.max_tokens ?? maxTokensDefault;
-		const temperatureDefault = config.omitDefaults ? getEnvString("OPENAI_TEMPERATURE") !== void 0 ? getEnvFloat("OPENAI_TEMPERATURE") : void 0 : getEnvFloat("OPENAI_TEMPERATURE", 0);
+		const temperatureDefault = config.omitDefaults ? getEnvString("OPENAI_TEMPERATURE") === void 0 ? void 0 : getEnvFloat("OPENAI_TEMPERATURE") : getEnvFloat("OPENAI_TEMPERATURE", 0);
 		const temperature = this.supportsTemperature() ? config.temperature ?? temperatureDefault : void 0;
 		const reasoningEffort = isReasoningModel ? renderVarsInObject(config.reasoning_effort, context?.vars) : void 0;
 		const mcpTools = this.mcpClient ? transformMCPToolsToOpenAi(this.mcpClient.getAllTools()) : [];
@@ -456,10 +456,10 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 			model: this.modelName,
 			messages,
 			seed: config.seed,
-			...maxTokens !== void 0 ? { max_tokens: maxTokens } : {},
-			...maxCompletionTokens !== void 0 ? { max_completion_tokens: maxCompletionTokens } : {},
+			...maxTokens === void 0 ? {} : { max_tokens: maxTokens },
+			...maxCompletionTokens === void 0 ? {} : { max_completion_tokens: maxCompletionTokens },
 			...reasoningEffort ? { reasoning_effort: reasoningEffort } : {},
-			...temperature !== void 0 ? { temperature } : {},
+			...temperature === void 0 ? {} : { temperature },
 			...config.top_p !== void 0 || getEnvString("OPENAI_TOP_P") ? { top_p: config.top_p ?? getEnvFloat("OPENAI_TOP_P", 1) } : {},
 			...config.presence_penalty !== void 0 || getEnvString("OPENAI_PRESENCE_PENALTY") ? { presence_penalty: config.presence_penalty ?? getEnvFloat("OPENAI_PRESENCE_PENALTY", 0) } : {},
 			...config.frequency_penalty !== void 0 || getEnvString("OPENAI_FREQUENCY_PENALTY") ? { frequency_penalty: config.frequency_penalty ?? getEnvFloat("OPENAI_FREQUENCY_PENALTY", 0) } : {},
@@ -763,4 +763,4 @@ var OpenAiChatCompletionProvider = class OpenAiChatCompletionProvider extends Op
 //#endregion
 export { normalizeFinishReason as i, MCPClient as n, FINISH_REASON_MAP as r, OpenAiChatCompletionProvider as t };
 
-//# sourceMappingURL=chat-DqxYYtWA.js.map
+//# sourceMappingURL=chat-pxmiVpWe.js.map

package/dist/src/{chatkit-65VXf5SR.js → chatkit-BYGQlHlV.js}

@@ -1,6 +1,6 @@
-import { i as logger } from "./logger-CT3IKMKA.js";
-import { t as OpenAiGenericProvider } from "./openai-DElQ-fPX.js";
-import { t as providerRegistry } from "./providerRegistry-CD8MEar9.js";
+import { a as logger } from "./logger-DO8_zM18.js";
+import { t as OpenAiGenericProvider } from "./openai-BcB5KlTk.js";
+import { t as providerRegistry } from "./providerRegistry-CUWki5mQ.js";
 import * as http$1 from "http";
 import { chromium } from "playwright";
 //#region src/providers/openai/chatkit-pool.ts
@@ -1154,4 +1154,4 @@ Original error: ${errorMessage}`);
 //#endregion
 export { OpenAiChatKitProvider };
 
-//# sourceMappingURL=chatkit-65VXf5SR.js.map
+//# sourceMappingURL=chatkit-BYGQlHlV.js.map

package/dist/src/{chatkit-DKyPi1Gs.cjs → chatkit-Cx174XI3.cjs}

@@ -1,6 +1,6 @@
-const require_logger = require("./logger-Cp1GPUjj.cjs");
-const require_openai = require("./openai-Cuif0GEt.cjs");
-const require_providerRegistry = require("./providerRegistry-Civky8Ar.cjs");
+const require_logger = require("./logger-D5iKBpu_.cjs");
+const require_openai = require("./openai-CoxGAQwn.cjs");
+const require_providerRegistry = require("./providerRegistry-BTDgfV5h.cjs");
 let http = require("http");
 http = require_logger.__toESM(http);
 let playwright = require("playwright");
@@ -1155,4 +1155,4 @@ Original error: ${errorMessage}`);
 //#endregion
 exports.OpenAiChatKitProvider = OpenAiChatKitProvider;
 
-//# sourceMappingURL=chatkit-DKyPi1Gs.cjs.map
+//# sourceMappingURL=chatkit-Cx174XI3.cjs.map

package/dist/src/{chatkit-BxFvW8KY.js → chatkit-_8eJqKcD.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { o as logger } from "./logger-KkObSCzq.js";
-import { t as OpenAiGenericProvider } from "./openai-DhbB7eWK.js";
-import { t as providerRegistry } from "./providerRegistry-B0RUOLI_.js";
+import { s as logger } from "./logger-BcJBzSSA.js";
+import { t as OpenAiGenericProvider } from "./openai-BMcwgD5C.js";
+import { t as providerRegistry } from "./providerRegistry-B9lh-_tx.js";
 import * as http$1 from "http";
 import { chromium } from "playwright";
 //#region src/providers/openai/chatkit-pool.ts
@@ -1155,4 +1155,4 @@ Original error: ${errorMessage}`);
 //#endregion
 export { OpenAiChatKitProvider };
 
-//# sourceMappingURL=chatkit-BxFvW8KY.js.map
+//# sourceMappingURL=chatkit-_8eJqKcD.js.map

package/dist/src/{chatkit-Be-Q-a9F.js → chatkit-a2D6mY6s.js}

@@ -1,6 +1,6 @@
-import { i as logger } from "./logger-DLcq4dWf.js";
-import { t as OpenAiGenericProvider } from "./openai-j-sE2O7r.js";
-import { t as providerRegistry } from "./providerRegistry-DM8rZYol.js";
+import { a as logger } from "./logger-BnkjG2jt.js";
+import { t as OpenAiGenericProvider } from "./openai-D6wITiVn.js";
+import { t as providerRegistry } from "./providerRegistry-BkzVH5Ba.js";
 import * as http$1 from "http";
 import { chromium } from "playwright";
 //#region src/providers/openai/chatkit-pool.ts
@@ -1154,4 +1154,4 @@ Original error: ${errorMessage}`);
 //#endregion
 export { OpenAiChatKitProvider };
 
-//# sourceMappingURL=chatkit-Be-Q-a9F.js.map
+//# sourceMappingURL=chatkit-a2D6mY6s.js.map

package/dist/src/{claude-agent-sdk-D9Z5Pr9X.cjs → claude-agent-sdk-8ddRp1L2.cjs}

@@ -1,13 +1,13 @@
-const require_logger = require("./logger-Cp1GPUjj.cjs");
-const require_esm = require("./esm-CnNt7sI4.cjs");
-require("./pythonUtils-CTU3Y3lw.cjs");
-require("./types-C_7nyzr1.cjs");
-require("./util-B9vlHIIh.cjs");
-require("./fetch-BPkYtG8K.cjs");
-require("./cache-Dh5WtQps.cjs");
-const require_transform = require("./transform-DuHvhZpj.cjs");
-const require_util$1 = require("./util-DGNOS1db.cjs");
-const require_cometapi = require("./cometapi-C4xSqeID.cjs");
+const require_logger = require("./logger-D5iKBpu_.cjs");
+const require_esm = require("./esm-CipptfDu.cjs");
+require("./pythonUtils-dAVigVK-.cjs");
+require("./types-D8cGDZbL.cjs");
+require("./util-CuLo2pMR.cjs");
+require("./fetch-BnR9wSnm.cjs");
+require("./cache-C5yFZ4gC.cjs");
+const require_transform = require("./transform-0BwoBsvO.cjs");
+const require_util$1 = require("./util--9u9UVCt.cjs");
+const require_agentic_utils = require("./agentic-utils-DAVsChuB.cjs");
 let node_fs = require("node:fs");
 node_fs = require_logger.__toESM(node_fs);
 let node_path = require("node:path");
@@ -17,6 +17,18 @@ dedent = require_logger.__toESM(dedent);
 let node_os = require("node:os");
 node_os = require_logger.__toESM(node_os);
 //#region src/providers/claude-agent-sdk.ts
+function deriveSkillCalls(toolCalls) {
+	return toolCalls.filter((toolCall) => toolCall.name === "Skill").flatMap((toolCall) => {
+		const skillName = toolCall.input && typeof toolCall.input === "object" && typeof toolCall.input.skill === "string" ? toolCall.input.skill.trim() : "";
+		if (!skillName) return [];
+		return [{
+			name: skillName,
+			input: toolCall.input,
+			is_error: toolCall.is_error,
+			source: "tool"
+		}];
+	});
+}
 /**
 * Claude Agent SDK Provider
 *
@@ -148,7 +160,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 			if (value !== void 0) env[key] = value;
 		}
 		if (this.apiKey) env.ANTHROPIC_API_KEY = this.apiKey;
-		if (!this.apiKey && !(env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent.default`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
+		if (!this.apiKey && !(config.apiKeyRequired === false || env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent.default`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
 
         Use CLAUDE_CODE_USE_BEDROCK or CLAUDE_CODE_USE_VERTEX environment variables to use Bedrock or Vertex instead.`);
 		if (config.allow_all_tools && ("custom_allowed_tools" in config || "append_allowed_tools" in config)) throw new Error("Cannot specify both allow_all_tools and custom_allowed_tools or append_allowed_tools");
@@ -214,7 +226,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 			persistSession: config.persist_session,
 			env
 		};
-		const cacheResult = await require_cometapi.initializeAgenticCache({
+		const cacheResult = await require_agentic_utils.initializeAgenticCache({
 			cacheKeyPrefix: "anthropic:claude-agent-sdk",
 			workingDir,
 			bustCache: context?.bustCache,
@@ -224,7 +236,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 			prompt,
 			cacheKeyQueryOptions
 		});
-		const cachedResponse = await require_cometapi.getCachedResponse(cacheResult, "Claude Agent SDK");
+		const cachedResponse = await require_agentic_utils.getCachedResponse(cacheResult, "Claude Agent SDK");
 		if (cachedResponse) return cachedResponse;
 		const mcpServers = config.mcp ? await require_transform.transformMCPConfigToClaudeCode(config.mcp) : {};
 		if (workingDir) {
@@ -300,25 +312,27 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 				const cost = msg.total_cost_usd ?? 0;
 				const sessionId = msg.session_id;
 				const toolCallsArray = Array.from(toolCallsMap.values());
+				const skillCalls = deriveSkillCalls(toolCallsArray);
 				if (msg.subtype === "success") {
 					require_logger.logger.debug(`Claude Agent SDK response: ${raw}`);
 					const response = {
-						output: msg.structured_output !== void 0 ? msg.structured_output : msg.result,
+						output: msg.structured_output === void 0 ? msg.result : msg.structured_output,
 						tokenUsage,
 						cost,
 						raw,
 						sessionId,
 						metadata: {
+							skillCalls,
 							toolCalls: toolCallsArray,
 							numTurns: msg.num_turns,
 							durationMs: msg.duration_ms,
 							durationApiMs: msg.duration_api_ms,
 							modelUsage: msg.modelUsage,
 							permissionDenials: msg.permission_denials,
-							...msg.structured_output !== void 0 ? { structuredOutput: msg.structured_output } : {}
+							...msg.structured_output === void 0 ? {} : { structuredOutput: msg.structured_output }
 						}
 					};
-					await require_cometapi.cacheResponse(cacheResult, response, "Claude Agent SDK");
+					await require_agentic_utils.cacheResponse(cacheResult, response, "Claude Agent SDK");
 					return response;
 				} else return {
 					error: `Claude Agent SDK call failed: ${msg.subtype}`,
@@ -327,6 +341,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 					raw,
 					sessionId,
 					metadata: {
+						skillCalls,
 						toolCalls: toolCallsArray,
 						numTurns: msg.num_turns,
 						durationMs: msg.duration_ms,
@@ -359,6 +374,9 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 	* For normal Claude Agent SDK support, just use the Anthropic API key
 	* Users can also use Bedrock (with CLAUDE_CODE_USE_BEDROCK env var) or Vertex (with CLAUDE_CODE_USE_VERTEX env var)
 	*/
+	requiresApiKey() {
+		return !(this.env?.CLAUDE_CODE_USE_BEDROCK || this.env?.CLAUDE_CODE_USE_VERTEX || require_logger.getEnvString("CLAUDE_CODE_USE_BEDROCK") || require_logger.getEnvString("CLAUDE_CODE_USE_VERTEX"));
+	}
 	getApiKey() {
 		return this.config?.apiKey || this.env?.ANTHROPIC_API_KEY || require_logger.getEnvString("ANTHROPIC_API_KEY");
 	}
@@ -367,4 +385,4 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 //#endregion
 exports.ClaudeCodeSDKProvider = ClaudeCodeSDKProvider;
 
-//# sourceMappingURL=claude-agent-sdk-D9Z5Pr9X.cjs.map
+//# sourceMappingURL=claude-agent-sdk-8ddRp1L2.cjs.map

package/dist/src/{claude-agent-sdk-DfCoW0E6.js → claude-agent-sdk-Bq5EArsX.js}

@@ -1,20 +1,32 @@
 #!/usr/bin/env node
-import { C as getEnvString, O as state, o as logger } from "./logger-KkObSCzq.js";
-import "./fetch-Dxpd4_sr.js";
-import "./cloud-C0dlstV_.js";
-import "./types-Cbd8uOMq.js";
-import "./cache-BVeDlD87.js";
-import "./util-C1CeHl-P.js";
-import { i as resolvePackageEntryPoint, o as safeResolve, r as importModule } from "./esm-C03C-mv3.js";
-import "./pythonUtils-C3py6GC1.js";
-import { t as transformMCPConfigToClaudeCode } from "./transform-D5HsjduX.js";
-import { t as ANTHROPIC_MODELS } from "./util-B3xGByQh.js";
-import { i as initializeAgenticCache, r as getCachedResponse, t as cacheResponse } from "./agentic-utils-DS1g3GLF.js";
+import { E as getEnvString, j as state, s as logger } from "./logger-BcJBzSSA.js";
+import "./fetch-DoVRJZhJ.js";
+import "./cloud-z8KZpUoa.js";
+import "./types-CIhFeUC4.js";
+import "./cache-DSqR6ezl.js";
+import "./util-Bm3E9jpK.js";
+import { i as resolvePackageEntryPoint, o as safeResolve, r as importModule } from "./esm-7UIl0pPM.js";
+import "./pythonUtils-wIqk7zAf.js";
+import { t as transformMCPConfigToClaudeCode } from "./transform-DrleutM3.js";
+import { t as ANTHROPIC_MODELS } from "./util-DMFeUvLz.js";
+import { i as initializeAgenticCache, r as getCachedResponse, t as cacheResponse } from "./agentic-utils-36epdqwB.js";
 import fs from "node:fs";
 import path from "node:path";
 import dedent from "dedent";
 import os from "node:os";
 //#region src/providers/claude-agent-sdk.ts
+function deriveSkillCalls(toolCalls) {
+	return toolCalls.filter((toolCall) => toolCall.name === "Skill").flatMap((toolCall) => {
+		const skillName = toolCall.input && typeof toolCall.input === "object" && typeof toolCall.input.skill === "string" ? toolCall.input.skill.trim() : "";
+		if (!skillName) return [];
+		return [{
+			name: skillName,
+			input: toolCall.input,
+			is_error: toolCall.is_error,
+			source: "tool"
+		}];
+	});
+}
 /**
 * Claude Agent SDK Provider
 *
@@ -146,7 +158,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 			if (value !== void 0) env[key] = value;
 		}
 		if (this.apiKey) env.ANTHROPIC_API_KEY = this.apiKey;
-		if (!this.apiKey && !(env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
+		if (!this.apiKey && !(config.apiKeyRequired === false || env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
 
         Use CLAUDE_CODE_USE_BEDROCK or CLAUDE_CODE_USE_VERTEX environment variables to use Bedrock or Vertex instead.`);
 		if (config.allow_all_tools && ("custom_allowed_tools" in config || "append_allowed_tools" in config)) throw new Error("Cannot specify both allow_all_tools and custom_allowed_tools or append_allowed_tools");
@@ -298,22 +310,24 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 				const cost = msg.total_cost_usd ?? 0;
 				const sessionId = msg.session_id;
 				const toolCallsArray = Array.from(toolCallsMap.values());
+				const skillCalls = deriveSkillCalls(toolCallsArray);
 				if (msg.subtype === "success") {
 					logger.debug(`Claude Agent SDK response: ${raw}`);
 					const response = {
-						output: msg.structured_output !== void 0 ? msg.structured_output : msg.result,
+						output: msg.structured_output === void 0 ? msg.result : msg.structured_output,
 						tokenUsage,
 						cost,
 						raw,
 						sessionId,
 						metadata: {
+							skillCalls,
 							toolCalls: toolCallsArray,
 							numTurns: msg.num_turns,
 							durationMs: msg.duration_ms,
 							durationApiMs: msg.duration_api_ms,
 							modelUsage: msg.modelUsage,
 							permissionDenials: msg.permission_denials,
-							...msg.structured_output !== void 0 ? { structuredOutput: msg.structured_output } : {}
+							...msg.structured_output === void 0 ? {} : { structuredOutput: msg.structured_output }
 						}
 					};
 					await cacheResponse(cacheResult, response, "Claude Agent SDK");
@@ -325,6 +339,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 					raw,
 					sessionId,
 					metadata: {
+						skillCalls,
 						toolCalls: toolCallsArray,
 						numTurns: msg.num_turns,
 						durationMs: msg.duration_ms,
@@ -357,6 +372,9 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 	* For normal Claude Agent SDK support, just use the Anthropic API key
 	* Users can also use Bedrock (with CLAUDE_CODE_USE_BEDROCK env var) or Vertex (with CLAUDE_CODE_USE_VERTEX env var)
 	*/
+	requiresApiKey() {
+		return !(this.env?.CLAUDE_CODE_USE_BEDROCK || this.env?.CLAUDE_CODE_USE_VERTEX || getEnvString("CLAUDE_CODE_USE_BEDROCK") || getEnvString("CLAUDE_CODE_USE_VERTEX"));
+	}
 	getApiKey() {
 		return this.config?.apiKey || this.env?.ANTHROPIC_API_KEY || getEnvString("ANTHROPIC_API_KEY");
 	}
@@ -365,4 +383,4 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 //#endregion
 export { ClaudeCodeSDKProvider };
 
-//# sourceMappingURL=claude-agent-sdk-DfCoW0E6.js.map
+//# sourceMappingURL=claude-agent-sdk-Bq5EArsX.js.map

package/dist/src/{claude-agent-sdk-Apiy0iaz.js → claude-agent-sdk-CMjh4LFH.js}

@@ -1,18 +1,30 @@
-import { b as getEnvString, i as logger, w as state } from "./logger-DLcq4dWf.js";
-import "./fetch-HaqdX7U1.js";
-import { i as resolvePackageEntryPoint, o as safeResolve, r as importModule } from "./esm-CaIwzWR5.js";
-import "./types-CzW2QFyi.js";
-import "./cache-i1P6crbO.js";
-import "./pythonUtils-D6fwaDSg.js";
-import "./util-ZzmqNPlg.js";
-import { t as transformMCPConfigToClaudeCode } from "./transform-uAytVuyX.js";
-import { t as ANTHROPIC_MODELS } from "./util-Bv6uGDfH.js";
-import { i as initializeAgenticCache, r as getCachedResponse, t as cacheResponse } from "./cloudflare-gateway-CKDb4dJ8.js";
-import fs from "node:fs";
+import { C as getEnvString, D as state, a as logger } from "./logger-DO8_zM18.js";
+import { i as resolvePackageEntryPoint, o as safeResolve, r as importModule } from "./esm-SUNIX1x3.js";
+import "./pythonUtils-Cpo0Ez1p.js";
+import "./types-q8GXGF65.js";
+import "./util-CMMkIxfU.js";
+import "./fetch-CVAtKnI3.js";
+import "./cache-CaT5tPgo.js";
+import { t as transformMCPConfigToClaudeCode } from "./transform-DyDAwEpE.js";
+import { t as ANTHROPIC_MODELS } from "./util-vNmDL5DT.js";
+import { i as initializeAgenticCache, r as getCachedResponse, t as cacheResponse } from "./agentic-utils-D8yXo5Lm.js";
 import path from "node:path";
+import fs from "node:fs";
 import dedent from "dedent";
 import os from "node:os";
 //#region src/providers/claude-agent-sdk.ts
+function deriveSkillCalls(toolCalls) {
+	return toolCalls.filter((toolCall) => toolCall.name === "Skill").flatMap((toolCall) => {
+		const skillName = toolCall.input && typeof toolCall.input === "object" && typeof toolCall.input.skill === "string" ? toolCall.input.skill.trim() : "";
+		if (!skillName) return [];
+		return [{
+			name: skillName,
+			input: toolCall.input,
+			is_error: toolCall.is_error,
+			source: "tool"
+		}];
+	});
+}
 /**
 * Claude Agent SDK Provider
 *
@@ -144,7 +156,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 			if (value !== void 0) env[key] = value;
 		}
 		if (this.apiKey) env.ANTHROPIC_API_KEY = this.apiKey;
-		if (!this.apiKey && !(env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
+		if (!this.apiKey && !(config.apiKeyRequired === false || env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
 
         Use CLAUDE_CODE_USE_BEDROCK or CLAUDE_CODE_USE_VERTEX environment variables to use Bedrock or Vertex instead.`);
 		if (config.allow_all_tools && ("custom_allowed_tools" in config || "append_allowed_tools" in config)) throw new Error("Cannot specify both allow_all_tools and custom_allowed_tools or append_allowed_tools");
@@ -296,22 +308,24 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 				const cost = msg.total_cost_usd ?? 0;
 				const sessionId = msg.session_id;
 				const toolCallsArray = Array.from(toolCallsMap.values());
+				const skillCalls = deriveSkillCalls(toolCallsArray);
 				if (msg.subtype === "success") {
 					logger.debug(`Claude Agent SDK response: ${raw}`);
 					const response = {
-						output: msg.structured_output !== void 0 ? msg.structured_output : msg.result,
+						output: msg.structured_output === void 0 ? msg.result : msg.structured_output,
 						tokenUsage,
 						cost,
 						raw,
 						sessionId,
 						metadata: {
+							skillCalls,
 							toolCalls: toolCallsArray,
 							numTurns: msg.num_turns,
 							durationMs: msg.duration_ms,
 							durationApiMs: msg.duration_api_ms,
 							modelUsage: msg.modelUsage,
 							permissionDenials: msg.permission_denials,
-							...msg.structured_output !== void 0 ? { structuredOutput: msg.structured_output } : {}
+							...msg.structured_output === void 0 ? {} : { structuredOutput: msg.structured_output }
 						}
 					};
 					await cacheResponse(cacheResult, response, "Claude Agent SDK");
@@ -323,6 +337,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 					raw,
 					sessionId,
 					metadata: {
+						skillCalls,
 						toolCalls: toolCallsArray,
 						numTurns: msg.num_turns,
 						durationMs: msg.duration_ms,
@@ -355,6 +370,9 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 	* For normal Claude Agent SDK support, just use the Anthropic API key
 	* Users can also use Bedrock (with CLAUDE_CODE_USE_BEDROCK env var) or Vertex (with CLAUDE_CODE_USE_VERTEX env var)
 	*/
+	requiresApiKey() {
+		return !(this.env?.CLAUDE_CODE_USE_BEDROCK || this.env?.CLAUDE_CODE_USE_VERTEX || getEnvString("CLAUDE_CODE_USE_BEDROCK") || getEnvString("CLAUDE_CODE_USE_VERTEX"));
+	}
 	getApiKey() {
 		return this.config?.apiKey || this.env?.ANTHROPIC_API_KEY || getEnvString("ANTHROPIC_API_KEY");
 	}
@@ -363,4 +381,4 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 //#endregion
 export { ClaudeCodeSDKProvider };
 
-//# sourceMappingURL=claude-agent-sdk-Apiy0iaz.js.map
+//# sourceMappingURL=claude-agent-sdk-CMjh4LFH.js.map

package/dist/src/{claude-agent-sdk-D2bJee9S.js → claude-agent-sdk-HgbFioFw.js}

@@ -1,18 +1,30 @@
-import { b as getEnvString, i as logger, w as state } from "./logger-CT3IKMKA.js";
-import { i as resolvePackageEntryPoint, o as safeResolve, r as importModule } from "./esm-Cd1AjG1D.js";
-import "./pythonUtils-D5nxkQ0P.js";
-import "./types-DmyIJ-sR.js";
-import "./util-BRYkYPTd.js";
-import "./fetch-Cwxnd8zz.js";
-import "./cache-C4Nxf52C.js";
-import { t as transformMCPConfigToClaudeCode } from "./transform-vNucnNr0.js";
-import { t as ANTHROPIC_MODELS } from "./util-BHGHw5G1.js";
-import { i as initializeAgenticCache, r as getCachedResponse, t as cacheResponse } from "./cometapi-CUQq3H_a.js";
-import path from "node:path";
+import { C as getEnvString, D as state, a as logger } from "./logger-BnkjG2jt.js";
+import "./fetch-BiYv2BZc.js";
+import { i as resolvePackageEntryPoint, o as safeResolve, r as importModule } from "./esm-CKWP3u_P.js";
+import "./types-Cd3ygw8W.js";
+import "./cache-HP0NP4k3.js";
+import "./pythonUtils-Bzwbgpbg.js";
+import "./util-BLvy9qfE.js";
+import { t as transformMCPConfigToClaudeCode } from "./transform-B2-jIv68.js";
+import { t as ANTHROPIC_MODELS } from "./util-DbVG-yZU.js";
+import { i as initializeAgenticCache, r as getCachedResponse, t as cacheResponse } from "./agentic-utils-DIYAAYE7.js";
 import fs from "node:fs";
+import path from "node:path";
 import dedent from "dedent";
 import os from "node:os";
 //#region src/providers/claude-agent-sdk.ts
+function deriveSkillCalls(toolCalls) {
+	return toolCalls.filter((toolCall) => toolCall.name === "Skill").flatMap((toolCall) => {
+		const skillName = toolCall.input && typeof toolCall.input === "object" && typeof toolCall.input.skill === "string" ? toolCall.input.skill.trim() : "";
+		if (!skillName) return [];
+		return [{
+			name: skillName,
+			input: toolCall.input,
+			is_error: toolCall.is_error,
+			source: "tool"
+		}];
+	});
+}
 /**
 * Claude Agent SDK Provider
 *
@@ -144,7 +156,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 			if (value !== void 0) env[key] = value;
 		}
 		if (this.apiKey) env.ANTHROPIC_API_KEY = this.apiKey;
-		if (!this.apiKey && !(env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
+		if (!this.apiKey && !(config.apiKeyRequired === false || env.CLAUDE_CODE_USE_BEDROCK || env.CLAUDE_CODE_USE_VERTEX)) throw new Error(dedent`Anthropic API key is not set. Set the ANTHROPIC_API_KEY environment variable or add "apiKey" to the provider config.
 
         Use CLAUDE_CODE_USE_BEDROCK or CLAUDE_CODE_USE_VERTEX environment variables to use Bedrock or Vertex instead.`);
 		if (config.allow_all_tools && ("custom_allowed_tools" in config || "append_allowed_tools" in config)) throw new Error("Cannot specify both allow_all_tools and custom_allowed_tools or append_allowed_tools");
@@ -296,22 +308,24 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 				const cost = msg.total_cost_usd ?? 0;
 				const sessionId = msg.session_id;
 				const toolCallsArray = Array.from(toolCallsMap.values());
+				const skillCalls = deriveSkillCalls(toolCallsArray);
 				if (msg.subtype === "success") {
 					logger.debug(`Claude Agent SDK response: ${raw}`);
 					const response = {
-						output: msg.structured_output !== void 0 ? msg.structured_output : msg.result,
+						output: msg.structured_output === void 0 ? msg.result : msg.structured_output,
 						tokenUsage,
 						cost,
 						raw,
 						sessionId,
 						metadata: {
+							skillCalls,
 							toolCalls: toolCallsArray,
 							numTurns: msg.num_turns,
 							durationMs: msg.duration_ms,
 							durationApiMs: msg.duration_api_ms,
 							modelUsage: msg.modelUsage,
 							permissionDenials: msg.permission_denials,
-							...msg.structured_output !== void 0 ? { structuredOutput: msg.structured_output } : {}
+							...msg.structured_output === void 0 ? {} : { structuredOutput: msg.structured_output }
 						}
 					};
 					await cacheResponse(cacheResult, response, "Claude Agent SDK");
@@ -323,6 +337,7 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 					raw,
 					sessionId,
 					metadata: {
+						skillCalls,
 						toolCalls: toolCallsArray,
 						numTurns: msg.num_turns,
 						durationMs: msg.duration_ms,
@@ -355,6 +370,9 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 	* For normal Claude Agent SDK support, just use the Anthropic API key
 	* Users can also use Bedrock (with CLAUDE_CODE_USE_BEDROCK env var) or Vertex (with CLAUDE_CODE_USE_VERTEX env var)
 	*/
+	requiresApiKey() {
+		return !(this.env?.CLAUDE_CODE_USE_BEDROCK || this.env?.CLAUDE_CODE_USE_VERTEX || getEnvString("CLAUDE_CODE_USE_BEDROCK") || getEnvString("CLAUDE_CODE_USE_VERTEX"));
+	}
 	getApiKey() {
 		return this.config?.apiKey || this.env?.ANTHROPIC_API_KEY || getEnvString("ANTHROPIC_API_KEY");
 	}
@@ -363,4 +381,4 @@ var ClaudeCodeSDKProvider = class ClaudeCodeSDKProvider {
 //#endregion
 export { ClaudeCodeSDKProvider };
 
-//# sourceMappingURL=claude-agent-sdk-D2bJee9S.js.map
+//# sourceMappingURL=claude-agent-sdk-HgbFioFw.js.map

package/dist/src/cloud-DE3t1-ZI.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+import "./logger-BcJBzSSA.js";
+import { a as cloudConfig } from "./cloud-z8KZpUoa.js";
+export { cloudConfig };

package/dist/src/{cloud-C0dlstV_.js → cloud-z8KZpUoa.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as getEnvString, o as logger, v as getConfigDirectoryPath } from "./logger-KkObSCzq.js";
+import { E as getEnvString, s as logger, x as getConfigDirectoryPath } from "./logger-BcJBzSSA.js";
 import * as fs$1 from "fs";
 import * as path$1 from "path";
 import yaml from "js-yaml";
@@ -134,7 +134,7 @@ var CloudConfig = class {
 	}
 	async validateAndSetApiToken(token, apiHost) {
 		try {
-			const { fetchWithProxy } = await import("./fetch-BxNb_Lp3.js");
+			const { fetchWithProxy } = await import("./fetch-UWU706qb.js");
 			const response = await fetchWithProxy(`${apiHost}/api/v1/users/me`, { headers: { Authorization: `Bearer ${token}` } });
 			if (!response.ok) {
 				const errorMessage = await response.text();
@@ -210,4 +210,4 @@ const cloudConfig = new CloudConfig();
 //#endregion
 export { cloudConfig as a, writeGlobalConfigPartial as c, SHARING_CUTOFF_DATE as i, CLOUD_API_HOST as n, readGlobalConfig as o, CloudConfig as r, writeGlobalConfig as s, API_HOST as t };
 
-//# sourceMappingURL=cloud-C0dlstV_.js.map
+//# sourceMappingURL=cloud-z8KZpUoa.js.map

package/dist/src/{cloudflare-ai-g7PB6VHR.js → cloudflare-ai-BGyXlpXJ.js}

@@ -1,17 +1,17 @@
-import { b as getEnvString } from "./logger-DLcq4dWf.js";
-import "./fetch-HaqdX7U1.js";
+import { C as getEnvString } from "./logger-BnkjG2jt.js";
+import "./fetch-BiYv2BZc.js";
 import { t as invariant } from "./invariant-vgHWClmd.js";
-import "./esm-CaIwzWR5.js";
-import "./types-CzW2QFyi.js";
-import "./cache-i1P6crbO.js";
+import "./esm-CKWP3u_P.js";
+import "./types-Cd3ygw8W.js";
+import "./cache-HP0NP4k3.js";
 import "./genaiTracer-70Z8BIuV.js";
-import "./pythonUtils-D6fwaDSg.js";
-import "./util-ZzmqNPlg.js";
-import { t as OpenAiChatCompletionProvider } from "./chat-DJIw17u0.js";
-import "./transform-uAytVuyX.js";
-import "./openai-j-sE2O7r.js";
-import "./util-BV4XUC0n.js";
-import { n as OpenAiEmbeddingProvider, t as OpenAiCompletionProvider } from "./completion-qRoZAYRB.js";
+import "./pythonUtils-Bzwbgpbg.js";
+import "./util-BLvy9qfE.js";
+import { t as OpenAiChatCompletionProvider } from "./chat-B0iaWhoh.js";
+import "./transform-B2-jIv68.js";
+import "./openai-D6wITiVn.js";
+import "./util-BtoGs5Cb.js";
+import { n as OpenAiEmbeddingProvider, t as OpenAiCompletionProvider } from "./completion-BCimtq-h.js";
 //#region src/providers/cloudflare-ai.ts
 function getCloudflareApiConfig(config, env) {
 	const apiTokenCandidate = config?.apiKey || (config?.apiKeyEnvar ? getEnvString(config.apiKeyEnvar) || env?.[config.apiKeyEnvar] : void 0) || env?.CLOUDFLARE_API_KEY || getEnvString("CLOUDFLARE_API_KEY");
@@ -168,4 +168,4 @@ function createCloudflareAiProvider(providerPath, options = {}) {
 //#endregion
 export { createCloudflareAiProvider };
 
-//# sourceMappingURL=cloudflare-ai-g7PB6VHR.js.map
+//# sourceMappingURL=cloudflare-ai-BGyXlpXJ.js.map