@openclaw/ai 2026.9.5 → 2026.9.7

package/dist/{google-messages-CyWnYlh0.mjs → google-messages-CtjVtVot.mjs}

@@ -1,7 +1,7 @@
-import { r as appendAssistantThinking } from "./event-stream-D8PARQfL.mjs";
-import { _ as isImageWithMediaPayload, d as describeToolResultMediaPlaceholder, j as calculateCost, m as extractToolResultText, v as sanitizeSurrogates } from "./host-B4MeUNBc.mjs";
-import { v as sortPromptCacheToolsByName } from "./simple-options-C6cFWj_f.mjs";
-import { _ as sanitizeTransportPayloadText, r as coerceTransportToolCallArguments, v as transportAbortError } from "./transport-stream-shared-D-6FQSHm.mjs";
+import { r as appendAssistantThinking } from "./event-stream-vd9UnCAU.mjs";
+import { k as isImageWithMediaPayload, w as calculateCost } from "./host-CHi3X87F.mjs";
+import { a as createEmptyTransportUsage, b as transportAbortError, j as sanitizeSurrogates, r as coerceTransportToolCallArguments, v as sanitizeTransportPayloadText } from "./transport-stream-shared-Dh5qKJ8e.mjs";
+import { D as sortPromptCacheToolsByName, d as describeToolResultMediaPlaceholder, m as extractToolResultText } from "./simple-options-CGAkCwtM.mjs";
 import { t as notifyLlmRequestActivity } from "./llm-request-activity-BjtkplhG.mjs";
 //#region packages/ai/src/transports/google-thinking-level.ts
 /** Returns whether a Gemini Flash model accepts the MINIMAL thinking level. */
@@ -66,16 +66,10 @@ async function consumeGoogleGenerateContentStream(params) {
 	const blockIndex = () => blocks.length - 1;
 	const endCurrentBlock = () => {
 		if (!currentBlock) return;
-		if (currentBlock.type === "text") params.stream.push({
-			type: "text_end",
+		params.stream.push({
+			type: currentBlock.type === "text" ? "text_end" : "thinking_end",
 			contentIndex: blockIndex(),
-			content: currentBlock.text,
-			partial: params.output
-		});
-		else params.stream.push({
-			type: "thinking_end",
-			contentIndex: blockIndex(),
-			content: currentBlock.thinking,
+			content: currentBlock.type === "text" ? currentBlock.text : currentBlock.thinking,
 			partial: params.output
 		});
 		currentBlock = null;
@@ -101,18 +95,11 @@ async function consumeGoogleGenerateContentStream(params) {
 			const toolUsePromptTokens = knownUsage.toolUsePromptTokenCount;
 			const outputTokens = knownUsage.candidatesTokenCount + knownUsage.thoughtsTokenCount;
 			params.output.usage = {
+				...createEmptyTransportUsage(),
 				input: Math.max(0, promptTokens - cacheRead) + toolUsePromptTokens,
 				output: outputTokens,
 				cacheRead,
-				cacheWrite: 0,
-				totalTokens: chunk.usageMetadata.totalTokenCount ?? promptTokens + outputTokens + toolUsePromptTokens,
-				cost: {
-					input: 0,
-					output: 0,
-					cacheRead: 0,
-					cacheWrite: 0,
-					total: 0
-				}
+				totalTokens: chunk.usageMetadata.totalTokenCount ?? promptTokens + outputTokens + toolUsePromptTokens
 			};
 			calculateCost(params.model, params.output.usage);
 		}
@@ -153,51 +140,35 @@ async function consumeGoogleGenerateContentStream(params) {
 				const isThinking = part.thought === true || !preserveParts && !hasText;
 				if (!currentBlock || isThinking && currentBlock.type !== "thinking" || !isThinking && currentBlock.type !== "text") {
 					endCurrentBlock();
-					if (isThinking) {
-						currentBlock = {
-							type: "thinking",
-							thinking: "",
-							...preserveParts ? { thinkingSignature: void 0 } : {}
-						};
-						params.output.content.push(currentBlock);
-						params.stream.push({
-							type: "thinking_start",
-							contentIndex: blockIndex(),
-							partial: params.output
-						});
-					} else {
-						currentBlock = {
-							type: "text",
-							text: ""
-						};
-						params.output.content.push(currentBlock);
-						params.stream.push({
-							type: "text_start",
-							contentIndex: blockIndex(),
-							partial: params.output
-						});
-					}
+					currentBlock = isThinking ? {
+						type: "thinking",
+						thinking: "",
+						...preserveParts ? { thinkingSignature: void 0 } : {}
+					} : {
+						type: "text",
+						text: ""
+					};
+					params.output.content.push(currentBlock);
+					params.stream.push({
+						type: isThinking ? "thinking_start" : "text_start",
+						contentIndex: blockIndex(),
+						partial: params.output
+					});
 				}
 				const delta = hasText ? text : "";
 				if (currentBlock.type === "thinking") {
 					appendAssistantThinking(currentBlock, delta);
 					currentBlock.thinkingSignature = retainThoughtSignature(currentBlock.thinkingSignature, part.thoughtSignature);
-					params.stream.push({
-						type: "thinking_delta",
-						contentIndex: blockIndex(),
-						delta,
-						partial: params.output
-					});
 				} else {
 					currentBlock.text += delta;
 					currentBlock.textSignature = retainThoughtSignature(currentBlock.textSignature, part.thoughtSignature);
-					params.stream.push({
-						type: "text_delta",
-						contentIndex: blockIndex(),
-						delta,
-						partial: params.output
-					});
 				}
+				params.stream.push({
+					type: currentBlock.type === "thinking" ? "thinking_delta" : "text_delta",
+					contentIndex: blockIndex(),
+					delta,
+					partial: params.output
+				});
 				if (signatureOnly) endCurrentBlock();
 			}
 			if (part.functionCall) {
@@ -352,22 +323,15 @@ function projectGoogleMessages(params) {
 			let sawFunctionCall = false;
 			const nextReplaySignatures = /* @__PURE__ */ new Map();
 			const isSameProviderAndModel = msg.provider === model.provider && msg.api === model.api && msg.model === model.id;
-			for (const block of msg.content) if (block.type === "text") {
-				const thoughtSignature = isSameProviderAndModel ? signature(block.textSignature) : void 0;
-				if ((!block.text || block.text.trim() === "") && (managed || !thoughtSignature)) continue;
+			for (const block of msg.content) if (block.type === "text" || block.type === "thinking") {
+				const text = block.type === "text" ? block.text : block.thinking;
+				const thoughtSignature = isSameProviderAndModel ? signature(block.type === "text" ? block.textSignature : block.thinkingSignature) : void 0;
+				if ((!text || text.trim() === "") && (managed || !thoughtSignature)) continue;
 				parts.push({
-					text: sanitizeText(block.text),
-					...thoughtSignature && { thoughtSignature }
-				});
-			} else if (block.type === "thinking") {
-				const thoughtSignature = isSameProviderAndModel ? signature(block.thinkingSignature) : void 0;
-				if ((!block.thinking || block.thinking.trim() === "") && (managed || !thoughtSignature)) continue;
-				if (isSameProviderAndModel) parts.push({
-					thought: true,
-					text: sanitizeText(block.thinking),
+					...block.type === "thinking" && isSameProviderAndModel ? { thought: true } : {},
+					text: sanitizeText(text),
 					...thoughtSignature && { thoughtSignature }
 				});
-				else parts.push({ text: sanitizeText(block.thinking) });
 			} else if (block.type === "toolCall") {
 				if (isSameProviderAndModel && (managed || model.provider !== "google-gemini-cli")) sameRouteToolCallIds.add(block.id);
 				const args = coerceTransportToolCallArguments(block.arguments);

package/dist/{google-shared-BT5ZeNer.mjs → google-shared-Y2YfotEu.mjs}

@@ -1,13 +1,10 @@
-import { M as clampThinkingLevel, v as sanitizeSurrogates } from "./host-B4MeUNBc.mjs";
-import { m as stripSystemPromptCacheBoundary } from "./simple-options-C6cFWj_f.mjs";
-import { m as notifyProviderStreamOpened, n as assignTransportErrorDetails, v as transportAbortError } from "./transport-stream-shared-D-6FQSHm.mjs";
-import { a as googleFlashSupportsMinimalThinking, i as consumeGoogleGenerateContentStream, n as projectGoogleMessages, r as requiresGoogleToolCallId, t as convertGoogleTools } from "./google-messages-CyWnYlh0.mjs";
-import { t as transformProviderMessages } from "./provider-transcript-transform-BsRAhuWJ.mjs";
+import { T as clampThinkingLevel } from "./host-CHi3X87F.mjs";
+import { b as transportAbortError, c as failTransportStream, h as notifyProviderStreamOpened, j as sanitizeSurrogates } from "./transport-stream-shared-Dh5qKJ8e.mjs";
+import { C as stripSystemPromptCacheBoundary } from "./simple-options-CGAkCwtM.mjs";
+import { t as transformProviderMessages } from "./provider-transcript-transform-JbFbHV8h.mjs";
+import { a as googleFlashSupportsMinimalThinking, i as consumeGoogleGenerateContentStream, n as projectGoogleMessages, r as requiresGoogleToolCallId, t as convertGoogleTools } from "./google-messages-CtjVtVot.mjs";
 import { FunctionCallingConfigMode, ThinkingLevel } from "@google/genai";
 //#region packages/ai/src/providers/google-shared.ts
-/**
-* Shared utilities for Google Generative AI and Google Vertex providers.
-*/
 function convertMessages(model, context) {
 	return projectGoogleMessages({
 		model,
@@ -53,23 +50,20 @@ async function runGoogleGenerateContentLifecycle(params) {
 	} catch (error) {
 		for (const block of output.content) if ("index" in block) delete block.index;
 		const failure = options?.signal?.aborted ? transportAbortError(options.signal) : error;
-		assignTransportErrorDetails(output, failure, options?.signal);
-		stream.push({
-			type: "error",
-			reason: output.stopReason === "aborted" ? "aborted" : "error",
-			error: output
+		failTransportStream({
+			stream,
+			output,
+			error: failure,
+			signal: options?.signal
 		});
-		stream.end();
 	}
 }
 function buildGoogleGenerateContentParams(model, context, options = {}) {
 	const contents = convertMessages(model, context);
-	const generationConfig = {};
-	if (options.temperature !== void 0) generationConfig.temperature = options.temperature;
-	if (options.maxTokens !== void 0) generationConfig.maxOutputTokens = options.maxTokens;
-	if (options.stop !== void 0 && options.stop.length > 0) generationConfig.stopSequences = options.stop;
 	const config = {
-		...Object.keys(generationConfig).length > 0 && generationConfig,
+		...options.temperature !== void 0 && { temperature: options.temperature },
+		...options.maxTokens !== void 0 && { maxOutputTokens: options.maxTokens },
+		...options.stop !== void 0 && options.stop.length > 0 && { stopSequences: options.stop },
 		...context.systemPrompt && { systemInstruction: sanitizeSurrogates(stripSystemPromptCacheBoundary(context.systemPrompt)) },
 		...context.tools && context.tools.length > 0 && { tools: convertGoogleTools(context.tools) }
 	};
@@ -122,6 +116,28 @@ function buildGoogleSimpleThinking(model, options) {
 		budgetTokens: getGoogleBudget(model, effort, options.thinkingBudgets)
 	};
 }
+function buildGoogleInteractionsSimpleThinking(model, options) {
+	const thinking = buildGoogleSimpleThinking(model, options);
+	if (!thinking.enabled) {
+		if (!model.reasoning) return thinking;
+		const disabled = getDisabledGoogleThinkingConfig(model);
+		return {
+			enabled: false,
+			...disabled.thinkingLevel ? { level: disabled.thinkingLevel } : {}
+		};
+	}
+	if (thinking.level !== void 0 || !options?.reasoning || isAdaptiveGoogleReasoningLevel(options.reasoning)) return thinking;
+	const clampedReasoning = clampThinkingLevel(model, options.reasoning);
+	if (clampedReasoning === "off") return { enabled: false };
+	if (clampedReasoning === "xhigh" || clampedReasoning === "max") return {
+		enabled: true,
+		level: getGoogleThinkingLevel("high", model)
+	};
+	return {
+		enabled: true,
+		level: getGoogleThinkingLevel(clampedReasoning, model)
+	};
+}
 function getDisabledGoogleThinkingConfig(model) {
 	if (isGemini3ProModel(model)) return { thinkingLevel: ThinkingLevel.LOW };
 	if (isGemini3FlashModel(model)) return { thinkingLevel: googleFlashSupportsMinimalThinking(model.id) ? ThinkingLevel.MINIMAL : ThinkingLevel.LOW };
@@ -139,18 +155,9 @@ function isGemini3FlashModel(model) {
 	return /gemini-(?:3(?:\.\d+)?-flash|flash(?:-lite)?-latest)/.test(model.id.toLowerCase());
 }
 function getGoogleThinkingLevel(effort, model) {
-	if (isGemini3ProModel(model)) switch (effort) {
-		case "minimal":
-		case "low": return ThinkingLevel.LOW;
-		case "medium":
-		case "high": return ThinkingLevel.HIGH;
-	}
-	if (isGemma4Model(model)) switch (effort) {
-		case "minimal":
-		case "low": return ThinkingLevel.MINIMAL;
-		case "medium":
-		case "high": return ThinkingLevel.HIGH;
-	}
+	const lowEffort = effort === "minimal" || effort === "low";
+	if (isGemini3ProModel(model)) return lowEffort ? ThinkingLevel.LOW : ThinkingLevel.HIGH;
+	if (isGemma4Model(model)) return lowEffort ? ThinkingLevel.MINIMAL : ThinkingLevel.HIGH;
 	switch (effort) {
 		case "minimal": return isGemini3FlashModel(model) && !googleFlashSupportsMinimalThinking(model.id) ? ThinkingLevel.LOW : ThinkingLevel.MINIMAL;
 		case "low": return ThinkingLevel.LOW;
@@ -161,25 +168,14 @@ function getGoogleThinkingLevel(effort, model) {
 }
 function getGoogleBudget(model, effort, customBudgets) {
 	if (customBudgets?.[effort] !== void 0) return customBudgets[effort];
-	if (model.id.includes("2.5-pro")) return {
-		minimal: 128,
-		low: 2048,
-		medium: 8192,
-		high: 32768
-	}[effort];
-	if (model.id.includes("2.5-flash-lite")) return {
-		minimal: 512,
-		low: 2048,
-		medium: 8192,
-		high: 24576
-	}[effort];
-	if (model.id.includes("2.5-flash")) return {
-		minimal: 128,
+	const isPro = model.id.includes("2.5-pro");
+	if (isPro || model.id.includes("2.5-flash")) return {
+		minimal: !isPro && model.id.includes("2.5-flash-lite") ? 512 : 128,
 		low: 2048,
 		medium: 8192,
-		high: 24576
+		high: isPro ? 32768 : 24576
 	}[effort];
 	return -1;
 }
 //#endregion
-export { buildGoogleSimpleThinking as n, runGoogleGenerateContentLifecycle as r, buildGoogleGenerateContentParams as t };
+export { runGoogleGenerateContentLifecycle as i, buildGoogleInteractionsSimpleThinking as n, buildGoogleSimpleThinking as r, buildGoogleGenerateContentParams as t };

package/dist/{google-vertex-C7EplRvt.mjs → google-vertex-Dov4kBWu.mjs}

@@ -1,9 +1,9 @@
-import { t as AssistantMessageEventStream } from "./event-stream-D8PARQfL.mjs";
+import { t as AssistantMessageEventStream } from "./event-stream-vd9UnCAU.mjs";
+import { n as getAiTransportHost, r as resolveAiTransportHeaderSentinels } from "./host-CHi3X87F.mjs";
 import { a as normalizeOptionalString } from "./string-coerce-fsri9iCu.mjs";
-import { n as getAiTransportHost, r as resolveAiTransportHeaderSentinels } from "./host-B4MeUNBc.mjs";
-import { n as buildBaseOptions } from "./simple-options-C6cFWj_f.mjs";
-import { t as createAssistantOutput } from "./assistant-output-BsEkB-vU.mjs";
-import { n as buildGoogleSimpleThinking, r as runGoogleGenerateContentLifecycle, t as buildGoogleGenerateContentParams } from "./google-shared-BT5ZeNer.mjs";
+import { n as buildBaseOptions } from "./simple-options-CGAkCwtM.mjs";
+import { n as createAssistantOutput } from "./provider-transcript-transform-JbFbHV8h.mjs";
+import { i as runGoogleGenerateContentLifecycle, r as buildGoogleSimpleThinking, t as buildGoogleGenerateContentParams } from "./google-shared-Y2YfotEu.mjs";
 import { GoogleGenAI, ResourceScope } from "@google/genai";
 //#region packages/ai/src/providers/google-vertex.ts
 const API_VERSION = "v1";
@@ -17,11 +17,8 @@ const streamGoogleVertex = (model, context, options) => {
 		model,
 		output,
 		options,
-		createClient: () => {
-			const apiKey = resolveApiKey(options);
-			return apiKey ? createClientWithApiKey(model, apiKey, options?.headers) : createClient(model, resolveProject(options), resolveLocation(options), options?.headers);
-		},
-		buildParams: () => buildParams(model, context, options),
+		createClient: () => createClient(model, options),
+		buildParams: () => buildGoogleGenerateContentParams(model, context, options),
 		nextToolCallId: (name) => `${name}_${Date.now()}_${++toolCallCounter}`
 	});
 	return stream;
@@ -33,22 +30,17 @@ const streamSimpleGoogleVertex = (model, context, options) => {
 		thinking: buildGoogleSimpleThinking(model, options)
 	});
 };
-function createClient(model, project, location, optionsHeaders) {
+function createClient(model, options) {
+	const apiKey = resolveApiKey(options);
+	const credentials = apiKey ? { apiKey: getAiTransportHost().resolveSecretSentinel(apiKey) } : {
+		project: resolveProject(options),
+		location: resolveLocation(options)
+	};
 	return new GoogleGenAI({
 		vertexai: true,
-		project,
-		location,
+		...credentials,
 		apiVersion: API_VERSION,
-		httpOptions: buildHttpOptions(model, optionsHeaders)
-	});
-}
-function createClientWithApiKey(model, apiKey, optionsHeaders) {
-	const resolvedApiKey = getAiTransportHost().resolveSecretSentinel(apiKey);
-	return new GoogleGenAI({
-		vertexai: true,
-		apiKey: resolvedApiKey,
-		apiVersion: API_VERSION,
-		httpOptions: buildHttpOptions(model, optionsHeaders)
+		httpOptions: buildHttpOptions(model, options?.headers)
 	});
 }
 function buildHttpOptions(model, optionsHeaders) {
@@ -79,12 +71,9 @@ function baseUrlIncludesApiVersion(baseUrl) {
 }
 function resolveApiKey(options) {
 	const apiKey = options?.apiKey?.trim() || process.env.GOOGLE_CLOUD_API_KEY?.trim();
-	if (!apiKey || apiKey === GCP_VERTEX_CREDENTIALS_MARKER || isPlaceholderApiKey(apiKey)) return;
+	if (!apiKey || apiKey === GCP_VERTEX_CREDENTIALS_MARKER || /^<[^>]+>$/.test(apiKey)) return;
 	return apiKey;
 }
-function isPlaceholderApiKey(apiKey) {
-	return /^<[^>]+>$/.test(apiKey);
-}
 function resolveProject(options) {
 	const project = normalizeOptionalString(options?.project) || normalizeOptionalString(process.env.GOOGLE_CLOUD_PROJECT) || normalizeOptionalString(process.env.GCLOUD_PROJECT);
 	if (!project) throw new Error("Vertex AI requires a project ID. Set GOOGLE_CLOUD_PROJECT/GCLOUD_PROJECT or pass project in options.");
@@ -95,8 +84,5 @@ function resolveLocation(options) {
 	if (!location) throw new Error("Vertex AI requires a location. Set GOOGLE_CLOUD_LOCATION or pass location in options.");
 	return location;
 }
-function buildParams(model, context, options = {}) {
-	return buildGoogleGenerateContentParams(model, context, options);
-}
 //#endregion
 export { streamGoogleVertex, streamSimpleGoogleVertex };