@steve31415/baselib 3.33.0 → 3.33.1

package/dist/llm/providers/gemini.js

@@ -15,21 +15,47 @@ function classifyFinish(finishReason) {
         return 'complete';
     return 'other';
 }
-/** Recursively strip fields that Gemini's API doesn't support (e.g. additionalProperties). */
-function stripUnsupportedSchemaFields(schema) {
-    if (Array.isArray(schema)) {
-        return schema.map(stripUnsupportedSchemaFields);
-    }
-    if (schema !== null && typeof schema === 'object') {
-        const result = {};
-        for (const [key, value] of Object.entries(schema)) {
-            if (key === 'additionalProperties')
-                continue;
-            result[key] = stripUnsupportedSchemaFields(value);
+/**
+ * Transform a portable JSON schema into the dialect Gemini's `responseSchema`
+ * accepts — an OpenAPI-subset proto, not full JSON Schema:
+ * - `additionalProperties` is dropped (Gemini rejects it).
+ * - A `type` array (JSON Schema's union; usually the nullable union
+ *   `['string', 'null']`) becomes one `type`, or an `anyOf` of single types
+ *   for a multi-type union, plus `nullable: true` when `'null'` was a member.
+ *   The proto's `type` holds a single value, so an array is rejected with a
+ *   400 before the model runs ("Proto field is not repeating, cannot start
+ *   list"; verified live on 3.5 Flash-Lite, 3.6 Flash and 3.1 Pro, 2026-10-09).
+ * Returns a deep copy — the caller's schema object is reused across failover
+ * attempts.
+ */
+function toGeminiSchema(schema) {
+    if (Array.isArray(schema))
+        return schema.map(toGeminiSchema);
+    if (schema === null || typeof schema !== 'object')
+        return schema;
+    const result = {};
+    for (const [key, value] of Object.entries(schema)) {
+        if (key === 'additionalProperties')
+            continue;
+        // Only a keyword `type` is ever an array: a property named `type` (an
+        // entry of a `properties` map) has a schema object as its value.
+        if (key === 'type' && Array.isArray(value)) {
+            Object.assign(result, singleGeminiType(value));
+            continue;
         }
-        return result;
+        result[key] = toGeminiSchema(value);
     }
-    return schema;
+    return result;
+}
+/** A JSON Schema type array as Gemini's single `type` / `anyOf` plus `nullable`. */
+function singleGeminiType(types) {
+    const nonNull = types.filter((type) => type !== 'null');
+    if (nonNull.length === 0)
+        return { type: 'null' };
+    const nullable = nonNull.length < types.length ? { nullable: true } : {};
+    if (nonNull.length === 1)
+        return { type: nonNull[0], ...nullable };
+    return { anyOf: nonNull.map((type) => ({ type })), ...nullable };
 }
 export const geminiProvider = {
     name: 'gemini',
@@ -50,7 +76,7 @@ export const geminiProvider = {
         }
         if (request.jsonSchema) {
             generationConfig.responseMimeType = 'application/json';
-            generationConfig.responseSchema = stripUnsupportedSchemaFields(request.jsonSchema.schema);
+            generationConfig.responseSchema = toGeminiSchema(request.jsonSchema.schema);
         }
         // Gemini thinking models reason before answering; the reasoning tokens
         // count against maxOutputTokens. `effort` (pre-gated and clamped in

package/dist/llm/providers/openai.js

@@ -38,7 +38,7 @@ function makeNullable(propSchema) {
  * Outputs mode requires: every object must set `additionalProperties: false`
  * and list ALL of its properties in `required`. Callers author one portable
  * schema; this keeps the OpenAI-specific dialect local to this adapter,
- * mirroring the Gemini adapter's `stripUnsupportedSchemaFields` and the
+ * mirroring the Gemini adapter's `toGeminiSchema` and the
  * Anthropic adapter's `toAnthropicStrictSchema` (which closes objects but keeps
  * optional fields optional). Returns a deep copy — the
  * caller's schema object is never mutated (it is reused across failover attempts).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steve31415/baselib",
-  "version": "3.33.0",
+  "version": "3.33.1",
   "description": "Plasticine new-world shared platform library: logging, auth, service-to-service auth, db, HTTP, sync, app updates",
   "type": "module",
   "license": "MIT",