@oh-my-pi/pi-ai 4.4.5 → 4.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-ai",
-	"version": "4.4.5",
+	"version": "4.4.8",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./src/index.ts",

package/src/providers/google-gemini-cli.ts

@@ -695,7 +695,7 @@ function buildRequest(
 	}
 
 	if (context.tools && context.tools.length > 0) {
-		request.tools = convertTools(context.tools);
+		request.tools = convertTools(context.tools, model);
 		if (options.toolChoice) {
 			request.toolConfig = {
 				functionCallingConfig: {

package/src/providers/google-shared.ts

@@ -211,51 +211,89 @@ export function sanitizeSchemaForGoogle(value: unknown): unknown {
 		return value;
 	}
 
+	const obj = value as Record<string, unknown>;
 	const result: Record<string, unknown> = {};
-	let constValue: unknown | undefined;
 
-	for (const [key, entry] of Object.entries(value)) {
-		if (UNSUPPORTED_SCHEMA_FIELDS.has(key)) {
-			continue;
+	// Collapse anyOf/oneOf of const values into enum
+	for (const combiner of ["anyOf", "oneOf"] as const) {
+		if (Array.isArray(obj[combiner])) {
+			const variants = obj[combiner] as Record<string, unknown>[];
+
+			// Check if ALL variants have a const field
+			const allHaveConst = variants.every((v) => v && typeof v === "object" && "const" in v);
+
+			if (allHaveConst && variants.length > 0) {
+				// Extract all const values into enum
+				result.enum = variants.map((v) => v.const);
+
+				// Inherit type from first variant if present
+				const firstType = variants[0]?.type;
+				if (firstType) {
+					result.type = firstType;
+				}
+
+				// Copy description and other top-level fields (not the combiner)
+				for (const [key, entry] of Object.entries(obj)) {
+					if (key !== combiner && !(key in result)) {
+						result[key] = sanitizeSchemaForGoogle(entry);
+					}
+				}
+				return result;
+			}
 		}
+	}
+
+	// Regular field processing
+	let constValue: unknown;
+	for (const [key, entry] of Object.entries(obj)) {
+		if (UNSUPPORTED_SCHEMA_FIELDS.has(key)) continue;
 		if (key === "const") {
 			constValue = entry;
 			continue;
 		}
-		if (key === "additionalProperties" && entry === false) {
-			continue;
-		}
+		if (key === "additionalProperties" && entry === false) continue;
 		result[key] = sanitizeSchemaForGoogle(entry);
 	}
 
 	if (constValue !== undefined) {
-		const existingEnum = Array.isArray(result.enum) ? [...result.enum] : undefined;
-		const enumValues = existingEnum ?? [];
-		if (!enumValues.some((item) => Object.is(item, constValue))) {
-			enumValues.push(constValue);
+		// Convert const to enum, merging with existing enum if present
+		const existingEnum = Array.isArray(result.enum) ? result.enum : [];
+		if (!existingEnum.some((item) => Object.is(item, constValue))) {
+			existingEnum.push(constValue);
+		}
+		result.enum = existingEnum;
+		if (!result.type) {
+			result.type =
+				typeof constValue === "string"
+					? "string"
+					: typeof constValue === "number"
+						? "number"
+						: typeof constValue === "boolean"
+							? "boolean"
+							: undefined;
 		}
-		result.enum = enumValues;
 	}
 
 	return result;
 }
 
+function sanitizeToolForGoogle(tool: Tool): Tool {
+	return {
+		name: tool.name,
+		description: tool.description,
+		parameters: sanitizeSchemaForGoogle(tool.parameters) as any,
+	};
+}
+
 /**
  * Convert tools to Gemini function declarations format.
  */
 export function convertTools(
 	tools: Tool[],
+	_model: Model<"google-generative-ai" | "google-gemini-cli" | "google-vertex">,
 ): { functionDeclarations: { name: string; description?: string; parameters: Schema }[] }[] | undefined {
 	if (tools.length === 0) return undefined;
-	return [
-		{
-			functionDeclarations: tools.map((tool) => ({
-				name: tool.name,
-				description: tool.description,
-				parameters: sanitizeSchemaForGoogle(tool.parameters) as Schema,
-			})),
-		},
-	];
+	return [{ functionDeclarations: tools.map(sanitizeToolForGoogle) }];
 }
 
 /**

package/src/providers/google-vertex.ts

@@ -326,7 +326,7 @@ function buildParams(
 	const config: GenerateContentConfig = {
 		...(Object.keys(generationConfig).length > 0 && generationConfig),
 		...(context.systemPrompt && { systemInstruction: sanitizeSurrogates(context.systemPrompt) }),
-		...(context.tools && context.tools.length > 0 && { tools: convertTools(context.tools) }),
+		...(context.tools && context.tools.length > 0 && { tools: convertTools(context.tools, model) }),
 	};
 
 	if (context.tools && context.tools.length > 0 && options.toolChoice) {

package/src/providers/google.ts

@@ -297,7 +297,7 @@ function buildParams(
 	const config: GenerateContentConfig = {
 		...(Object.keys(generationConfig).length > 0 && generationConfig),
 		...(context.systemPrompt && { systemInstruction: sanitizeSurrogates(context.systemPrompt) }),
-		...(context.tools && context.tools.length > 0 && { tools: convertTools(context.tools) }),
+		...(context.tools && context.tools.length > 0 && { tools: convertTools(context.tools, model) }),
 	};
 
 	if (context.tools && context.tools.length > 0 && options.toolChoice) {

package/src/utils/typebox-helpers.ts

@@ -11,7 +11,7 @@ import { type TUnsafe, Type } from "@sinclair/typebox";
  *
  * type Operation = Static<typeof OperationSchema>; // "add" | "subtract" | "multiply" | "divide"
  */
-export function StringEnum<T extends readonly string[]>(
+export function StringEnum<const T extends readonly string[]>(
 	values: T,
 	options?: { description?: string; default?: T[number] },
 ): TUnsafe<T[number]> {