@usabledev/usable-chat 1.168.2 → 1.168.4

package/cli.js

@@ -160107,23 +160107,28 @@ var init_bridge = __esm({
 // src/integrations/mcp/schema-adapter.ts
 function isOpenAICompatModel(modelId) {
   const isClaude = modelId.startsWith("anthropic/") || modelId.includes("claude");
-  const isGemini = modelId.startsWith("google/gemini");
+  const isGemini = isGeminiModel(modelId);
   return !isClaude && !isGemini;
 }
+function isGeminiModel(modelId) {
+  return modelId.startsWith("google/gemini");
+}
 function adaptToolSchemasForProvider(tools, modelId) {
-  if (!tools || !isOpenAICompatModel(modelId)) return tools;
+  if (!tools) return tools;
+  const adapter = isGeminiModel(modelId) ? "gemini" : isOpenAICompatModel(modelId) ? "openai" : null;
+  if (!adapter) return tools;
   const toolCount = Array.isArray(tools) ? tools.length : Object.keys(tools).length;
   logger.debug("schema-adapter", `adapting ${toolCount} tools for model ${modelId}`);
   if (Array.isArray(tools)) {
-    return tools.map((tool2) => adaptTool(tool2));
+    return tools.map((tool2) => adaptTool(tool2, adapter));
   }
   const adapted = {};
   for (const [key, tool2] of Object.entries(tools)) {
-    adapted[key] = adaptTool(tool2);
+    adapted[key] = adaptTool(tool2, adapter);
   }
   return adapted;
 }
-function adaptTool(tool2) {
+function adaptTool(tool2, adapter) {
   const t14 = tool2;
   if (t14.type === "function" && t14.function && typeof t14.function === "object") {
     const fn4 = t14.function;
@@ -160132,7 +160137,7 @@ function adaptTool(tool2) {
         ...t14,
         function: {
           ...fn4,
-          parameters: adaptSchemaForOpenAI({ ...fn4.parameters })
+          parameters: adaptSchema({ ...fn4.parameters }, adapter)
         }
       };
     }
@@ -160141,11 +160146,49 @@ function adaptTool(tool2) {
   if (t14.parameters && typeof t14.parameters === "object") {
     return {
       ...t14,
-      parameters: adaptSchemaForOpenAI({ ...t14.parameters })
+      parameters: adaptSchema({ ...t14.parameters }, adapter)
     };
   }
   return tool2;
 }
+function adaptSchema(schema, adapter) {
+  if (adapter === "gemini") return adaptSchemaForGemini(schema);
+  return adaptSchemaForOpenAI(schema);
+}
+function adaptSchemaForGemini(schema) {
+  const cloned = JSON.parse(JSON.stringify(schema));
+  normalizeSchemaForGemini(cloned);
+  return cloned;
+}
+function normalizeSchemaForGemini(schema) {
+  const properties = isJsonSchemaRecord(schema.properties) ? schema.properties : void 0;
+  if (Array.isArray(schema.enum)) {
+    schema.enum = schema.enum.map((enumValue) => String(enumValue));
+  }
+  if (Array.isArray(schema.required)) {
+    schema.required = properties ? schema.required.filter(
+      (name18) => typeof name18 === "string" && Object.prototype.hasOwnProperty.call(properties, name18)
+    ) : [];
+  }
+  if (properties) {
+    for (const propSchema of Object.values(properties)) {
+      if (isJsonSchemaRecord(propSchema)) normalizeSchemaForGemini(propSchema);
+    }
+  }
+  if (isJsonSchemaRecord(schema.items)) {
+    normalizeSchemaForGemini(schema.items);
+  }
+  for (const key of ["anyOf", "oneOf", "allOf"]) {
+    const schemas = schema[key];
+    if (!Array.isArray(schemas)) continue;
+    for (const childSchema of schemas) {
+      if (isJsonSchemaRecord(childSchema)) normalizeSchemaForGemini(childSchema);
+    }
+  }
+}
+function isJsonSchemaRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
 function adaptSchemaForOpenAI(schema) {
   const properties = schema.properties;
   if (!properties || Object.keys(properties).length === 0) return schema;
@@ -199361,7 +199404,11 @@ function sanitizeSchemaForGemini(schema) {
   const sanitized = {};
   for (const [key, value] of Object.entries(inputSchema)) {
     if (key === "const") {
-      sanitized.enum = [value];
+      sanitized.enum = [String(value)];
+      continue;
+    }
+    if (key === "enum" && Array.isArray(value)) {
+      sanitized.enum = value.map((enumValue) => String(enumValue));
       continue;
     }
     if (key === "anyOf" || key === "oneOf") {
@@ -199427,8 +199474,18 @@ function sanitizeSchemaForGemini(schema) {
   if (sanitized.type === "array" && !sanitized.items) {
     sanitized.items = { type: "string" };
   }
+  pruneRequiredFieldsForGemini(sanitized);
   return sanitized;
 }
+function pruneRequiredFieldsForGemini(schema) {
+  if (!Array.isArray(schema.required)) return;
+  if (!schema.properties) {
+    schema.required = [];
+    return;
+  }
+  const propertyNames = new Set(Object.keys(schema.properties));
+  schema.required = schema.required.filter((name18) => propertyNames.has(name18));
+}
 function convertToolsToFunctionDeclarations(aiTools) {
   const declarations = [];
   for (const [name18, tool2] of Object.entries(aiTools)) {
@@ -309040,7 +309097,7 @@ init_tui_select();
 init_model_registry();
 
 // package.json
-var version2 = "1.168.2";
+var version2 = "1.168.4";
 
 // src/adapters/cli/model-catalog.ts
 init_codex_auth();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usabledev/usable-chat",
-  "version": "1.168.2",
+  "version": "1.168.4",
   "description": "usable-chat — terminal harness for usable-chat (headless + TUI)",
   "type": "module",
   "bin": {