@demicodes/provider-google 0.8.0 → 0.9.1

package/dist/index.mjs

@@ -107,6 +107,13 @@ function positiveInteger(value, field) {
 //#region src/provider.ts
 const DEFAULT_GOOGLE_BASE_URL = "https://generativelanguage.googleapis.com/v1beta";
 const DEFAULT_MAX_OUTPUT_TOKENS = 32e3;
+/**
+* Marks a thought signature as this provider's own. Transcripts outlive a
+* provider choice — a conversation can start on one and continue on another —
+* and each provider's signature format is private to it, so an untagged (or
+* foreign-tagged) signature must never be replayed as if it were ours.
+*/
+const SIGNATURE_TAG = "google:";
 const DEFAULT_EFFORT_BUDGET_TOKENS = {
 	low: 4096,
 	medium: 16384,
@@ -260,6 +267,7 @@ function googleThinkingConfig(thinking, options) {
 function inferenceItemsToGoogleContents(items) {
 	const contents = [];
 	const toolNames = /* @__PURE__ */ new Map();
+	const degraded = /* @__PURE__ */ new Set();
 	let pendingSignature = null;
 	const append = (role, parts) => {
 		if (parts.length === 0) return;
@@ -284,25 +292,33 @@ function inferenceItemsToGoogleContents(items) {
 			pendingSignature = null;
 			break;
 		case "assistant_thinking":
-			pendingSignature = item.signature;
+			pendingSignature = ownSignature(item.signature);
 			break;
 		case "assistant_redacted_thinking": break;
-		case "tool_use": {
+		case "tool_use":
 			toolNames.set(item.toolUseId, item.toolName);
-			const call = { functionCall: {
-				name: item.toolName,
-				args: item.input ?? {},
-				id: item.toolUseId
-			} };
-			if (pendingSignature) call.thoughtSignature = pendingSignature;
-			append("model", [call]);
+			if (!pendingSignature) {
+				degraded.add(item.toolUseId);
+				append("model", [{ text: `[called ${item.toolName} with ${stringifyToolInput(item.input)}]` }]);
+				break;
+			}
+			append("model", [{
+				functionCall: {
+					name: item.toolName,
+					args: item.input ?? {},
+					id: item.toolUseId
+				},
+				thoughtSignature: pendingSignature
+			}]);
 			pendingSignature = null;
 			break;
-		}
-		case "tool_result":
-			append("user", toolResultToGoogle(item.toolUseId, toolNames.get(item.toolUseId) ?? "tool", item.output));
+		case "tool_result": {
+			const name = toolNames.get(item.toolUseId) ?? "tool";
+			if (degraded.has(item.toolUseId)) append("user", [{ text: `[${name} returned] ${toolResultText(item.output)}` }]);
+			else append("user", toolResultToGoogle(item.toolUseId, name, item.output));
 			pendingSignature = null;
 			break;
+		}
 	}
 	return contents;
 }
@@ -339,11 +355,75 @@ function toolResultToGoogle(toolUseId, toolName, output) {
 		response: { output: text }
 	} }, ...media];
 }
+/**
+* Keywords Gemini's function-declaration schema accepts. Its `parameters` is an
+* OpenAPI 3.0 subset, not JSON Schema, and it rejects the whole request on the
+* first keyword it does not know rather than ignoring it:
+*
+*   Invalid JSON payload received. Unknown name "additionalProperties"
+*   at 'tools[0].function_declarations[3].parameters': Cannot find field.
+*
+* `additionalProperties: false` is exactly what a careful tool author writes —
+* demi's own shell tools all do — so passing schemas through verbatim breaks
+* every agent that uses them.
+*/
+const GOOGLE_SCHEMA_KEYS = /* @__PURE__ */ new Set([
+	"type",
+	"format",
+	"title",
+	"description",
+	"nullable",
+	"enum",
+	"items",
+	"properties",
+	"required",
+	"minimum",
+	"maximum",
+	"minItems",
+	"maxItems",
+	"anyOf",
+	"default"
+]);
+/**
+* Drops keywords Gemini does not accept, recursing through the containers that
+* hold nested schemas. Dropping is the right failure mode here: the discarded
+* keywords ($schema, additionalProperties, allOf…) constrain what the model may
+* send, and a slightly loose tool schema still validates on demi's side, where
+* the command parses its own input anyway. Rejecting or erroring would break
+* callers over a constraint the transport merely cannot express.
+*/
+function toGoogleSchema(schema) {
+	if (!isRecord(schema)) return {};
+	const out = {};
+	for (const [key, value] of Object.entries(schema)) {
+		if (!GOOGLE_SCHEMA_KEYS.has(key)) continue;
+		if (key === "properties" && isRecord(value)) out.properties = Object.fromEntries(Object.entries(value).map(([name, child]) => [name, toGoogleSchema(child)]));
+		else if (key === "items") out.items = toGoogleSchema(value);
+		else if (key === "anyOf" && Array.isArray(value)) out.anyOf = value.map(toGoogleSchema);
+		else out[key] = value;
+	}
+	return out;
+}
+/** Unwraps a signature this provider issued; anything else is not ours to replay. */
+function ownSignature(signature) {
+	if (!signature || !signature.startsWith(SIGNATURE_TAG)) return null;
+	return signature.slice(7) || null;
+}
+function stringifyToolInput(input) {
+	try {
+		return JSON.stringify(input ?? {}) ?? "{}";
+	} catch {
+		return "{}";
+	}
+}
+function toolResultText(output) {
+	return output.map((block) => block.type === "text" ? block.text : `[${block.source.mediaType}]`).join("\n");
+}
 function toolToGoogleFunctionDeclaration(tool) {
 	return {
 		name: tool.name,
 		description: tool.description,
-		parameters: tool.inputSchema
+		parameters: toGoogleSchema(tool.inputSchema)
 	};
 }
 async function* mapGoogleContentStream(events, signal) {
@@ -382,7 +462,7 @@ async function* mapGoogleContentStream(events, signal) {
 							thinkingOpen = true;
 							yield {
 								type: "thinking_signature",
-								signature
+								signature: `${SIGNATURE_TAG}${signature}`
 							};
 						}
 						yield {
@@ -409,7 +489,7 @@ async function* mapGoogleContentStream(events, signal) {
 					const signature = stringOrNull(part.thoughtSignature);
 					if (signature && thinkingOpen) yield {
 						type: "thinking_signature",
-						signature
+						signature: `${SIGNATURE_TAG}${signature}`
 					};
 					if (text) {
 						thinkingOpen = false;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@demicodes/provider-google",
   "description": "Google Gemini API provider adapter for Demi.",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "private": false,
   "type": "module",
   "exports": {
@@ -11,9 +11,9 @@
     }
   },
   "dependencies": {
-    "@demicodes/core": "^0.8.0",
-    "@demicodes/provider": "^0.8.0",
-    "@demicodes/utils": "^0.8.0"
+    "@demicodes/core": "^0.9.1",
+    "@demicodes/provider": "^0.9.1",
+    "@demicodes/utils": "^0.9.1"
   },
   "license": "Apache-2.0",
   "main": "./dist/index.mjs",