@openclaw/ai 2026.7.2-beta.2 → 2026.7.2-beta.3

package/dist/{openai-chatgpt-responses-BuH2NvsR.mjs → openai-chatgpt-responses-DP63Qt01.mjs}

@@ -3,10 +3,10 @@ import { i as formatThrownValue, n as createAssistantMessageDiagnostic, t as app
 import { t as AssistantMessageEventStream } from "./event-stream-D8n2uFee.mjs";
 import { n as getAiTransportHost, r as resolveAiTransportHeaderSentinels } from "./host-4t713IeR.mjs";
 import { t as headersToRecord } from "./headers-B_e4-1J0.mjs";
-import { C as stripSystemPromptCacheBoundary, l as buildBaseOptions } from "./transform-messages-BmS70CP5.mjs";
-import { M as supportsOpenAITemperature, a as resolveResponsesReasoningEffort, i as processResponsesStream, n as convertResponsesMessages, s as convertResponsesToolPayload } from "./openai-responses-shared-Befb4D6R.mjs";
+import { l as buildBaseOptions, w as stripSystemPromptCacheBoundary } from "./transform-messages-eb6lxDLB.mjs";
+import { M as supportsOpenAITemperature, a as resolveResponsesReasoningEffort, i as processResponsesStream, n as convertResponsesMessages, s as convertResponsesToolPayload } from "./openai-responses-shared-CwnGU0KW.mjs";
 import { i as getFirstStreamEventTimeoutMs, o as clampTimerTimeoutMs, r as getFirstStreamEventTimeoutHandler, s as resolveTimerTimeoutMs, t as createFirstStreamEventAbortController } from "./stream-first-event-timeout-RjWszj8c.mjs";
-import { a as clampOpenAIPromptCacheKey } from "./openai-tool-projection-CFqm42J2.mjs";
+import { a as clampOpenAIPromptCacheKey } from "./openai-tool-projection-WHf2nuOI.mjs";
 import { parseRetryAfterHttpDateMs } from "./internal/retry-after.mjs";
 import { i as registerSessionResourceCleanup, n as resolveOpenAICodexAccountId } from "./openai-chatgpt-jwt-DhAAzLkj.mjs";
 import { t as createSseByteGuard } from "./streaming-byte-guard-BrbkbwUu.mjs";
@@ -38,7 +38,7 @@ function loadNodeOs() {
 }
 const os = loadNodeOs();
 const DEFAULT_CODEX_BASE_URL = "https://chatgpt.com/backend-api";
-const MAX_RETRIES = 3;
+const DEFAULT_MAX_RETRIES = 3;
 const BASE_DELAY_MS = 1e3;
 const REQUEST_COMPRESSION_ZSTD_LEVEL = 3;
 const CODEX_TOOL_CALL_PROVIDERS = /* @__PURE__ */ new Set(["openai", "opencode"]);
@@ -127,8 +127,9 @@ const streamOpenAICodexResponses = (model, context, options) => {
 			let body = buildRequestBody(model, context, options);
 			const nextBody = await options?.onPayload?.(body, model);
 			if (nextBody !== void 0) body = nextBody;
-			const websocketRequestId = options?.sessionId || createCodexRequestId();
-			const sseHeaders = buildSSEHeaders(modelHeaders, optionHeaders, accountId, apiKey, options?.sessionId);
+			const sessionId = clampOpenAIPromptCacheKey(options?.sessionId);
+			const websocketRequestId = sessionId || createCodexRequestId();
+			const sseHeaders = buildSSEHeaders(modelHeaders, optionHeaders, accountId, apiKey, sessionId);
 			const websocketHeaders = buildWebSocketHeaders(modelHeaders, optionHeaders, accountId, apiKey, websocketRequestId);
 			const bodyJson = JSON.stringify(body);
 			requestTimeoutMs = resolveRequestTimeoutMs(options);
@@ -184,7 +185,8 @@ const streamOpenAICodexResponses = (model, context, options) => {
 			const sseBody = compressedBody ?? bodyJson;
 			let response;
 			let lastError;
-			for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+			const maxRetries = options?.maxRetries ?? DEFAULT_MAX_RETRIES;
+			for (let attempt = 0; attempt <= maxRetries; attempt++) {
 				if (activeSignal?.aborted) throw new Error("Request was aborted");
 				try {
 					response = await fetch(resolveCodexUrl(model.baseUrl), {
@@ -199,7 +201,7 @@ const streamOpenAICodexResponses = (model, context, options) => {
 					}, model);
 					if (response.ok) break;
 					const errorText = await readChatGptResponsesErrorTextLimited(response);
-					if (attempt < MAX_RETRIES && isRetryableError(response.status, errorText)) {
+					if (attempt < maxRetries && isRetryableError(response.status, errorText)) {
 						let delayMs = BASE_DELAY_MS * 2 ** attempt;
 						const retryAfterMs = response.headers.get("retry-after-ms");
 						if (retryAfterMs !== null) {
@@ -233,7 +235,7 @@ const streamOpenAICodexResponses = (model, context, options) => {
 						if (error.name === "TimeoutError" && requestTimeoutMs !== void 0) throw new Error(`Request timed out after ${requestTimeoutMs}ms`, { cause: error });
 					}
 					lastError = error instanceof Error ? error : new Error(String(error));
-					if (attempt < MAX_RETRIES && !lastError.message.includes("usage limit")) {
+					if (attempt < maxRetries && !lastError.message.includes("usage limit")) {
 						await sleepWithAbort(BASE_DELAY_MS * 2 ** attempt, activeSignal);
 						continue;
 					}

package/dist/{openai-completions-DPR_O2RW.mjs → openai-completions-zLDfebnN.mjs}

@@ -1,15 +1,16 @@
 import { n as getEnvApiKey, r as __exportAll } from "./env-api-keys-DnhYpc27.mjs";
 import { t as AssistantMessageEventStream } from "./event-stream-D8n2uFee.mjs";
 import { n as getAiTransportHost } from "./host-4t713IeR.mjs";
-import { n as calculateCost, r as clampThinkingLevel, t as applyProviderReportedUsageCost } from "./model-utils-Q1LSRIdo.mjs";
+import { n as calculateCost, r as clampThinkingLevel, t as applyProviderReportedUsageCost } from "./model-utils-1GiZ2_rr.mjs";
 import { t as headersToRecord } from "./headers-B_e4-1J0.mjs";
 import { n as parseStreamingJson } from "./json-parse-BvXNt1-7.mjs";
 import { t as sanitizeSurrogates } from "./sanitize-unicode-DT5o51ur.mjs";
-import { C as stripSystemPromptCacheBoundary, S as splitSystemPromptCacheBoundary, i as extractToolResultText, l as buildBaseOptions, n as describeToolResultMediaPlaceholder, o as isImageWithMediaPayload, t as transformMessages } from "./transform-messages-BmS70CP5.mjs";
+import { C as splitSystemPromptCacheBoundary, i as extractToolResultText, l as buildBaseOptions, n as describeToolResultMediaPlaceholder, o as isImageWithMediaPayload, t as transformMessages, w as stripSystemPromptCacheBoundary } from "./transform-messages-eb6lxDLB.mjs";
 import { a as resolveCacheRetention, i as resolveCloudflareBaseUrl, n as hasCopilotVisionInput, r as isCloudflareProvider, t as buildCopilotDynamicHeaders } from "./github-copilot-headers-BsH5cqGj.mjs";
+import { t as formatProviderError } from "./provider-error-LMfTEkfO.mjs";
 import { t as createReasoningTagTextPartitioner } from "./reasoning-tag-text-partitioner-BlVe67g6.mjs";
 import { a as withFirstStreamEventTimeout, i as getFirstStreamEventTimeoutMs, r as getFirstStreamEventTimeoutHandler, t as createFirstStreamEventAbortController } from "./stream-first-event-timeout-RjWszj8c.mjs";
-import { a as clampOpenAIPromptCacheKey, n as reconcileOpenAICompletionsToolChoice, t as projectOpenAITools } from "./openai-tool-projection-CFqm42J2.mjs";
+import { a as clampOpenAIPromptCacheKey, n as reconcileOpenAICompletionsToolChoice, t as projectOpenAITools } from "./openai-tool-projection-WHf2nuOI.mjs";
 import OpenAI from "openai";
 //#region packages/ai/src/providers/openai-stop-reason.ts
 function mapOpenAIStopReason(reason, options) {
@@ -72,6 +73,11 @@ function sanitizeToolResultText(text, fallback) {
 	const sanitized = sanitizeSurrogates(text);
 	return sanitized.trim().length > 0 ? sanitized : fallback;
 }
+function isEncryptedReasoningDetail(detail) {
+	if (typeof detail !== "object" || detail === null) return false;
+	const candidate = detail;
+	return candidate.type === "reasoning.encrypted" && typeof candidate.id === "string" && candidate.id.length > 0 && typeof candidate.data === "string" && candidate.data.length > 0;
+}
 const streamOpenAICompletions = (model, context, options) => {
 	const stream = new AssistantMessageEventStream();
 	(async () => {
@@ -112,7 +118,7 @@ const streamOpenAICompletions = (model, context, options) => {
 			const requestOptions = {
 				signal: firstEventAbort.signal,
 				...options?.timeoutMs !== void 0 ? { timeout: options.timeoutMs } : {},
-				...options?.maxRetries !== void 0 ? { maxRetries: options.maxRetries } : {}
+				maxRetries: options?.maxRetries ?? 0
 			};
 			const { data: openaiStream, response } = await client.chat.completions.create(params, requestOptions).withResponse();
 			await options?.onResponse?.({
@@ -129,6 +135,7 @@ const streamOpenAICompletions = (model, context, options) => {
 			const toolCallBlocksByIndex = /* @__PURE__ */ new Map();
 			const toolCallBlocksById = /* @__PURE__ */ new Map();
 			const toolCallBlocksByFirstId = /* @__PURE__ */ new Map();
+			const pendingReasoningDetailsByToolCallId = /* @__PURE__ */ new Map();
 			const blocks = output.content;
 			const finishedBlocks = /* @__PURE__ */ new Set();
 			const contentIndices = /* @__PURE__ */ new WeakMap();
@@ -138,7 +145,13 @@ const streamOpenAICompletions = (model, context, options) => {
 			};
 			const getContentIndex = (block) => contentIndices.get(block) ?? -1;
 			const rememberFirstToolCallById = (id, block) => {
-				if (!toolCallBlocksByFirstId.has(id)) toolCallBlocksByFirstId.set(id, block);
+				if (toolCallBlocksByFirstId.has(id)) return;
+				toolCallBlocksByFirstId.set(id, block);
+				const pendingDetail = pendingReasoningDetailsByToolCallId.get(id);
+				if (pendingDetail) {
+					block.thoughtSignature = pendingDetail;
+					pendingReasoningDetailsByToolCallId.delete(id);
+				}
 			};
 			const finishBlock = (block) => {
 				const contentIndex = getContentIndex(block);
@@ -341,10 +354,12 @@ const streamOpenAICompletions = (model, context, options) => {
 						}
 					}
 					const reasoningDetails = choiceDelta.reasoning_details;
-					if (reasoningDetails && Array.isArray(reasoningDetails)) {
-						for (const detail of reasoningDetails) if (detail.type === "reasoning.encrypted" && detail.id && detail.data) {
+					if (Array.isArray(reasoningDetails)) {
+						for (const detail of reasoningDetails) if (isEncryptedReasoningDetail(detail)) {
+							const serializedDetail = JSON.stringify(detail);
 							const matchingToolCall = toolCallBlocksByFirstId.get(detail.id);
-							if (matchingToolCall) matchingToolCall.thoughtSignature = JSON.stringify(detail);
+							if (matchingToolCall) matchingToolCall.thoughtSignature = serializedDetail;
+							else pendingReasoningDetailsByToolCallId.set(detail.id, serializedDetail);
 						}
 					}
 				}
@@ -373,9 +388,9 @@ const streamOpenAICompletions = (model, context, options) => {
 				delete block.streamIndex;
 			}
 			output.stopReason = options?.signal?.aborted ? "aborted" : "error";
-			output.errorMessage = error instanceof Error ? error.message : JSON.stringify(error);
+			output.errorMessage = formatProviderError(error);
 			const rawMetadata = error?.error?.metadata?.raw;
-			if (rawMetadata) output.errorMessage += `\n${rawMetadata}`;
+			if (rawMetadata && !output.errorMessage.includes(rawMetadata)) output.errorMessage += `\n${rawMetadata}`;
 			stream.push({
 				type: "error",
 				reason: output.stopReason,
@@ -412,7 +427,8 @@ function createClient(model, context, apiKey, optionsHeaders, sessionId, compat
 		});
 		Object.assign(headers, copilotHeaders);
 	}
-	if (sessionId && compat.sendSessionAffinityHeaders) {
+	if (sessionId && compat.sendSessionAffinityHeaders) if (compat.sessionAffinityFormat === "openrouter") headers["x-session-id"] = sessionId;
+	else {
 		headers.session_id = sessionId;
 		headers["x-client-request-id"] = sessionId;
 		headers["x-session-affinity"] = sessionId;
@@ -469,7 +485,10 @@ function buildParams(model, context, options, compat = getCompat(model), cacheRe
 		const toolChoice = reconcileOpenAICompletionsToolChoice(options.toolChoice, toolProjection ?? projectOpenAITools([]));
 		if (toolChoice !== void 0) params.tool_choice = toolChoice;
 	}
-	if (compat.thinkingFormat === "zai" && model.reasoning) params.thinking = { type: options?.reasoningEffort ? "enabled" : "disabled" };
+	if (compat.thinkingFormat === "zai" && model.reasoning) params.thinking = options?.reasoningEffort ? {
+		type: "enabled",
+		clear_thinking: false
+	} : { type: "disabled" };
 	else if (compat.thinkingFormat === "qwen" && model.reasoning) params.enable_thinking = Boolean(options?.reasoningEffort);
 	else if (compat.thinkingFormat === "qwen-chat-template" && model.reasoning) params.chat_template_kwargs = {
 		enable_thinking: Boolean(options?.reasoningEffort),
@@ -491,7 +510,7 @@ function buildParams(model, context, options, compat = getCompat(model), cacheRe
 		const offValue = model.thinkingLevelMap?.off;
 		if (typeof offValue === "string") params.reasoning_effort = offValue;
 	}
-	if (model.baseUrl.includes("openrouter.ai") && model.compat?.openRouterRouting) params.provider = model.compat.openRouterRouting;
+	if (model.compat?.openRouterRouting) params.provider = model.compat.openRouterRouting;
 	if (model.baseUrl.includes("ai-gateway.vercel.sh") && model.compat?.vercelGatewayRouting) {
 		const routing = model.compat.vercelGatewayRouting;
 		if (routing.only || routing.order) {
@@ -785,15 +804,18 @@ function detectCompat(model) {
 	const isMoonshot = provider === "moonshotai" || provider === "moonshotai-cn" || baseUrl.includes("api.moonshot.");
 	const isCloudflareWorkersAI = provider === "cloudflare-workers-ai" || baseUrl.includes("api.cloudflare.com");
 	const isCloudflareAiGateway = provider === "cloudflare-ai-gateway" || baseUrl.includes("gateway.ai.cloudflare.com");
+	const isOpenRouter = provider === "openrouter" || baseUrl.includes("openrouter.ai");
 	const isNonStandard = provider === "cerebras" || baseUrl.includes("cerebras.ai") || provider === "xai" || baseUrl.includes("api.x.ai") || isTogether || baseUrl.includes("chutes.ai") || baseUrl.includes("deepseek.com") || isZai || isMoonshot || provider === "opencode" || baseUrl.includes("opencode.ai") || isCloudflareWorkersAI || isCloudflareAiGateway;
 	const useMaxTokens = baseUrl.includes("chutes.ai") || isMoonshot || isCloudflareAiGateway || isTogether || isZai;
 	const isGrok = provider === "xai" || baseUrl.includes("api.x.ai");
 	const isDeepSeek = provider === "deepseek" || baseUrl.includes("deepseek.com");
 	const isXiaomi = provider === "xiaomi" || baseUrl.includes("xiaomimimo.com");
+	const supportsOpenRouterDeveloperRole = isOpenRouter && (model.id.startsWith("anthropic/") || model.id.startsWith("openai/"));
+	const usesOpenRouterSessionAffinity = isOpenRouter || model.compat?.thinkingFormat === "openrouter" || model.compat?.openRouterRouting !== void 0;
 	const cacheControlFormat = provider === "openrouter" && model.id.startsWith("anthropic/") ? "anthropic" : void 0;
 	return {
 		supportsStore: !isNonStandard,
-		supportsDeveloperRole: !isNonStandard,
+		supportsDeveloperRole: supportsOpenRouterDeveloperRole || !isNonStandard && !isOpenRouter,
 		supportsReasoningEffort: !isGrok && !isZai && !isMoonshot && !isTogether && !isCloudflareAiGateway,
 		supportsUsageInStreaming: true,
 		maxTokensField: useMaxTokens ? "max_tokens" : "max_completion_tokens",
@@ -801,13 +823,14 @@ function detectCompat(model) {
 		requiresAssistantAfterToolResult: false,
 		requiresThinkingAsText: false,
 		requiresReasoningContentOnAssistantMessages: isDeepSeek || isXiaomi,
-		thinkingFormat: isDeepSeek ? "deepseek" : isXiaomi ? "deepseek" : isZai ? "zai" : isTogether ? "together" : provider === "openrouter" || baseUrl.includes("openrouter.ai") ? "openrouter" : "openai",
+		thinkingFormat: isDeepSeek ? "deepseek" : isXiaomi ? "deepseek" : isZai ? "zai" : isTogether ? "together" : isOpenRouter ? "openrouter" : "openai",
 		openRouterRouting: {},
 		vercelGatewayRouting: {},
 		zaiToolStream: false,
 		supportsStrictMode: !isMoonshot && !isTogether && !isCloudflareAiGateway,
 		cacheControlFormat,
 		sendSessionAffinityHeaders: false,
+		sessionAffinityFormat: usesOpenRouterSessionAffinity ? "openrouter" : "openai",
 		supportsPromptCacheKey: false,
 		supportsLongCacheRetention: !(isTogether || isCloudflareWorkersAI || isCloudflareAiGateway)
 	};
@@ -836,6 +859,7 @@ function getCompat(model) {
 		supportsStrictMode: model.compat.supportsStrictMode ?? detected.supportsStrictMode,
 		cacheControlFormat: model.compat.cacheControlFormat ?? detected.cacheControlFormat,
 		sendSessionAffinityHeaders: model.compat.sendSessionAffinityHeaders ?? detected.sendSessionAffinityHeaders,
+		sessionAffinityFormat: detected.sessionAffinityFormat,
 		supportsPromptCacheKey: model.compat.supportsPromptCacheKey ?? detected.supportsPromptCacheKey,
 		supportsLongCacheRetention: model.compat.supportsLongCacheRetention ?? detected.supportsLongCacheRetention
 	};

package/dist/{openai-responses-Cov-Vdc2.mjs → openai-responses-ClspWt4I.mjs}

@@ -1,10 +1,10 @@
 import { n as getEnvApiKey, r as __exportAll } from "./env-api-keys-DnhYpc27.mjs";
 import { t as AssistantMessageEventStream } from "./event-stream-D8n2uFee.mjs";
 import { n as getAiTransportHost } from "./host-4t713IeR.mjs";
-import { l as buildBaseOptions } from "./transform-messages-BmS70CP5.mjs";
+import { l as buildBaseOptions } from "./transform-messages-eb6lxDLB.mjs";
 import { a as resolveCacheRetention, i as resolveCloudflareBaseUrl, n as hasCopilotVisionInput, r as isCloudflareProvider, t as buildCopilotDynamicHeaders } from "./github-copilot-headers-BsH5cqGj.mjs";
-import { M as supportsOpenAITemperature, a as resolveResponsesReasoningEffort, n as convertResponsesMessages, o as runResponsesStreamLifecycle, r as createResponsesAssistantOutput, t as applyCommonResponsesParams } from "./openai-responses-shared-Befb4D6R.mjs";
-import { a as clampOpenAIPromptCacheKey } from "./openai-tool-projection-CFqm42J2.mjs";
+import { M as supportsOpenAITemperature, a as resolveResponsesReasoningEffort, n as convertResponsesMessages, o as runResponsesStreamLifecycle, r as createResponsesAssistantOutput, t as applyCommonResponsesParams } from "./openai-responses-shared-CwnGU0KW.mjs";
+import { a as clampOpenAIPromptCacheKey } from "./openai-tool-projection-WHf2nuOI.mjs";
 import OpenAI from "openai";
 //#region packages/ai/src/providers/openai-responses.ts
 var openai_responses_exports = /* @__PURE__ */ __exportAll({