modality-ai 0.5.4 → 0.6.0

package/dist/index.js

@@ -126326,10 +126326,13 @@ function validateDownloadUrl(url2) {
       message: `Invalid URL: ${url2}`
     });
   }
+  if (parsed.protocol === "data:") {
+    return;
+  }
   if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
     throw new DownloadError({
       url: url2,
-      message: `URL scheme must be http or https, got ${parsed.protocol}`
+      message: `URL scheme must be http, https, or data, got ${parsed.protocol}`
     });
   }
   const hostname3 = parsed.hostname;
@@ -126556,7 +126559,7 @@ function withUserAgentSuffix(headers, ...userAgentSuffixParts) {
   normalizedHeaders.set("user-agent", [currentUserAgentHeader, ...userAgentSuffixParts].filter(Boolean).join(" "));
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION = "4.0.21";
+var VERSION = "4.0.22";
 var getOriginalFetch = () => globalThis.fetch;
 var getFromApi = async ({
   url: url2,
@@ -128216,7 +128219,7 @@ async function* executeTool({
 }
 
 // node_modules/@ai-sdk/google/dist/index.mjs
-var VERSION2 = "3.0.53";
+var VERSION2 = "3.0.58";
 var googleErrorDataSchema = lazySchema(() => zodSchema(exports_external.object({
   error: exports_external.object({
     code: exports_external.number().nullable(),
@@ -128595,7 +128598,7 @@ function appendLegacyToolResultParts(parts, toolName, outputValue) {
   }
 }
 function convertToGoogleGenerativeAIMessages(prompt, options) {
-  var _a16, _b16, _c, _d;
+  var _a16, _b16, _c, _d, _e, _f, _g, _h;
   const systemInstructionParts = [];
   const contents = [];
   let systemMessagesAllowed = true;
@@ -128680,6 +128683,18 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                 };
               }
               case "tool-call": {
+                const serverToolCallId = (providerOpts == null ? undefined : providerOpts.serverToolCallId) != null ? String(providerOpts.serverToolCallId) : undefined;
+                const serverToolType = (providerOpts == null ? undefined : providerOpts.serverToolType) != null ? String(providerOpts.serverToolType) : undefined;
+                if (serverToolCallId && serverToolType) {
+                  return {
+                    toolCall: {
+                      toolType: serverToolType,
+                      args: typeof part.input === "string" ? JSON.parse(part.input) : part.input,
+                      id: serverToolCallId
+                    },
+                    thoughtSignature
+                  };
+                }
                 return {
                   functionCall: {
                     name: part.toolName,
@@ -128688,6 +128703,21 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                   thoughtSignature
                 };
               }
+              case "tool-result": {
+                const serverToolCallId = (providerOpts == null ? undefined : providerOpts.serverToolCallId) != null ? String(providerOpts.serverToolCallId) : undefined;
+                const serverToolType = (providerOpts == null ? undefined : providerOpts.serverToolType) != null ? String(providerOpts.serverToolType) : undefined;
+                if (serverToolCallId && serverToolType) {
+                  return {
+                    toolResponse: {
+                      toolType: serverToolType,
+                      response: part.output.type === "json" ? part.output.value : {},
+                      id: serverToolCallId
+                    },
+                    thoughtSignature
+                  };
+                }
+                return;
+              }
             }
           }).filter((part) => part !== undefined)
         });
@@ -128700,6 +128730,26 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
           if (part.type === "tool-approval-response") {
             continue;
           }
+          const partProviderOpts = (_g = (_d = part.providerOptions) == null ? undefined : _d[providerOptionsName]) != null ? _g : providerOptionsName !== "google" ? (_e = part.providerOptions) == null ? undefined : _e.google : (_f = part.providerOptions) == null ? undefined : _f.vertex;
+          const serverToolCallId = (partProviderOpts == null ? undefined : partProviderOpts.serverToolCallId) != null ? String(partProviderOpts.serverToolCallId) : undefined;
+          const serverToolType = (partProviderOpts == null ? undefined : partProviderOpts.serverToolType) != null ? String(partProviderOpts.serverToolType) : undefined;
+          if (serverToolCallId && serverToolType) {
+            const serverThoughtSignature = (partProviderOpts == null ? undefined : partProviderOpts.thoughtSignature) != null ? String(partProviderOpts.thoughtSignature) : undefined;
+            if (contents.length > 0) {
+              const lastContent = contents[contents.length - 1];
+              if (lastContent.role === "model") {
+                lastContent.parts.push({
+                  toolResponse: {
+                    toolType: serverToolType,
+                    response: part.output.type === "json" ? part.output.value : {},
+                    id: serverToolCallId
+                  },
+                  thoughtSignature: serverThoughtSignature
+                });
+                continue;
+              }
+            }
+          }
           const output = part.output;
           if (output.type === "content") {
             if (supportsFunctionResponseParts) {
@@ -128713,7 +128763,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                 name: part.toolName,
                 response: {
                   name: part.toolName,
-                  content: output.type === "execution-denied" ? (_d = output.reason) != null ? _d : "Tool execution denied." : output.value
+                  content: output.type === "execution-denied" ? (_h = output.reason) != null ? _h : "Tool execution denied." : output.value
                 }
               }
             });
@@ -128810,14 +128860,15 @@ var googleLanguageModelOptions = lazySchema(() => zodSchema(exports_external.obj
       latitude: exports_external.number(),
       longitude: exports_external.number()
     }).optional()
-  }).optional()
+  }).optional(),
+  serviceTier: exports_external.enum(["standard", "flex", "priority"]).optional()
 })));
 function prepareTools({
   tools,
   toolChoice,
   modelId
 }) {
-  var _a16;
+  var _a16, _b16;
   tools = (tools == null ? undefined : tools.length) ? tools : undefined;
   const toolWarnings = [];
   const isLatest = [
@@ -128826,13 +128877,14 @@ function prepareTools({
     "gemini-pro-latest"
   ].some((id) => id === modelId);
   const isGemini2orNewer = modelId.includes("gemini-2") || modelId.includes("gemini-3") || modelId.includes("nano-banana") || isLatest;
+  const isGemini3orNewer = modelId.includes("gemini-3");
   const supportsFileSearch = modelId.includes("gemini-2.5") || modelId.includes("gemini-3");
   if (tools == null) {
     return { tools: undefined, toolConfig: undefined, toolWarnings };
   }
   const hasFunctionTools = tools.some((tool2) => tool2.type === "function");
   const hasProviderTools = tools.some((tool2) => tool2.type === "provider");
-  if (hasFunctionTools && hasProviderTools) {
+  if (hasFunctionTools && hasProviderTools && !isGemini3orNewer) {
     toolWarnings.push({
       type: "unsupported",
       feature: `combination of function and provider-defined tools`
@@ -128937,6 +128989,45 @@ function prepareTools({
           break;
       }
     });
+    if (hasFunctionTools && isGemini3orNewer && googleTools2.length > 0) {
+      const functionDeclarations2 = [];
+      for (const tool2 of tools) {
+        if (tool2.type === "function") {
+          functionDeclarations2.push({
+            name: tool2.name,
+            description: (_a16 = tool2.description) != null ? _a16 : "",
+            parameters: convertJSONSchemaToOpenAPISchema(tool2.inputSchema)
+          });
+        }
+      }
+      const combinedToolConfig = {
+        functionCallingConfig: { mode: "VALIDATED" },
+        includeServerSideToolInvocations: true
+      };
+      if (toolChoice != null) {
+        switch (toolChoice.type) {
+          case "auto":
+            break;
+          case "none":
+            combinedToolConfig.functionCallingConfig = { mode: "NONE" };
+            break;
+          case "required":
+            combinedToolConfig.functionCallingConfig = { mode: "ANY" };
+            break;
+          case "tool":
+            combinedToolConfig.functionCallingConfig = {
+              mode: "ANY",
+              allowedFunctionNames: [toolChoice.toolName]
+            };
+            break;
+        }
+      }
+      return {
+        tools: [...googleTools2, { functionDeclarations: functionDeclarations2 }],
+        toolConfig: combinedToolConfig,
+        toolWarnings
+      };
+    }
     return {
       tools: googleTools2.length > 0 ? googleTools2 : undefined,
       toolConfig: undefined,
@@ -128950,7 +129041,7 @@ function prepareTools({
       case "function":
         functionDeclarations.push({
           name: tool2.name,
-          description: (_a16 = tool2.description) != null ? _a16 : "",
+          description: (_b16 = tool2.description) != null ? _b16 : "",
           parameters: convertJSONSchemaToOpenAPISchema(tool2.inputSchema)
         });
         if (tool2.strict === true) {
@@ -129144,14 +129235,15 @@ var GoogleGenerativeAILanguageModel = class {
           retrievalConfig: googleOptions.retrievalConfig
         } : googleToolConfig,
         cachedContent: googleOptions == null ? undefined : googleOptions.cachedContent,
-        labels: googleOptions == null ? undefined : googleOptions.labels
+        labels: googleOptions == null ? undefined : googleOptions.labels,
+        serviceTier: googleOptions == null ? undefined : googleOptions.serviceTier
       },
       warnings: [...warnings, ...toolWarnings],
       providerOptionsName
     };
   }
   async doGenerate(options) {
-    var _a16, _b16, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a16, _b16, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const { args, warnings, providerOptionsName } = await this.getArgs(options);
     const mergedHeaders = combineHeaders(await resolve(this.config.headers), options.headers);
     const {
@@ -129172,6 +129264,7 @@ var GoogleGenerativeAILanguageModel = class {
     const parts = (_b16 = (_a16 = candidate.content) == null ? undefined : _a16.parts) != null ? _b16 : [];
     const usageMetadata = response.usageMetadata;
     let lastCodeExecutionToolCallId;
+    let lastServerToolCallId;
     for (const part of parts) {
       if ("executableCode" in part && ((_c = part.executableCode) == null ? undefined : _c.code)) {
         const toolCallId = this.config.generateId();
@@ -129238,12 +129331,56 @@ var GoogleGenerativeAILanguageModel = class {
             }
           } : undefined
         });
+      } else if ("toolCall" in part && part.toolCall) {
+        const toolCallId = (_e = part.toolCall.id) != null ? _e : this.config.generateId();
+        lastServerToolCallId = toolCallId;
+        content.push({
+          type: "tool-call",
+          toolCallId,
+          toolName: `server:${part.toolCall.toolType}`,
+          input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
+          providerExecuted: true,
+          dynamic: true,
+          providerMetadata: part.thoughtSignature ? {
+            [providerOptionsName]: {
+              thoughtSignature: part.thoughtSignature,
+              serverToolCallId: toolCallId,
+              serverToolType: part.toolCall.toolType
+            }
+          } : {
+            [providerOptionsName]: {
+              serverToolCallId: toolCallId,
+              serverToolType: part.toolCall.toolType
+            }
+          }
+        });
+      } else if ("toolResponse" in part && part.toolResponse) {
+        const responseToolCallId = (_g = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _g : this.config.generateId();
+        content.push({
+          type: "tool-result",
+          toolCallId: responseToolCallId,
+          toolName: `server:${part.toolResponse.toolType}`,
+          result: (_h = part.toolResponse.response) != null ? _h : {},
+          providerMetadata: part.thoughtSignature ? {
+            [providerOptionsName]: {
+              thoughtSignature: part.thoughtSignature,
+              serverToolCallId: responseToolCallId,
+              serverToolType: part.toolResponse.toolType
+            }
+          } : {
+            [providerOptionsName]: {
+              serverToolCallId: responseToolCallId,
+              serverToolType: part.toolResponse.toolType
+            }
+          }
+        });
+        lastServerToolCallId = undefined;
       }
     }
-    const sources = (_e = extractSources({
+    const sources = (_i = extractSources({
       groundingMetadata: candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _e : [];
+    })) != null ? _i : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -129254,18 +129391,19 @@ var GoogleGenerativeAILanguageModel = class {
           finishReason: candidate.finishReason,
           hasToolCalls: content.some((part) => part.type === "tool-call" && !part.providerExecuted)
         }),
-        raw: (_f = candidate.finishReason) != null ? _f : undefined
+        raw: (_j = candidate.finishReason) != null ? _j : undefined
       },
       usage: convertGoogleGenerativeAIUsage(usageMetadata),
       warnings,
       providerMetadata: {
         [providerOptionsName]: {
-          promptFeedback: (_g = response.promptFeedback) != null ? _g : null,
-          groundingMetadata: (_h = candidate.groundingMetadata) != null ? _h : null,
-          urlContextMetadata: (_i = candidate.urlContextMetadata) != null ? _i : null,
-          safetyRatings: (_j = candidate.safetyRatings) != null ? _j : null,
+          promptFeedback: (_k = response.promptFeedback) != null ? _k : null,
+          groundingMetadata: (_l = candidate.groundingMetadata) != null ? _l : null,
+          urlContextMetadata: (_m = candidate.urlContextMetadata) != null ? _m : null,
+          safetyRatings: (_n = candidate.safetyRatings) != null ? _n : null,
           usageMetadata: usageMetadata != null ? usageMetadata : null,
-          finishMessage: (_k = candidate.finishMessage) != null ? _k : null
+          finishMessage: (_o = candidate.finishMessage) != null ? _o : null,
+          serviceTier: (_p = response.serviceTier) != null ? _p : null
         }
       },
       request: { body: args },
@@ -129295,6 +129433,7 @@ var GoogleGenerativeAILanguageModel = class {
     let providerMetadata = undefined;
     let lastGroundingMetadata = null;
     let lastUrlContextMetadata = null;
+    let serviceTier = null;
     const generateId3 = this.config.generateId;
     let hasToolCalls = false;
     let currentTextBlockId = null;
@@ -129302,13 +129441,14 @@ var GoogleGenerativeAILanguageModel = class {
     let blockCounter = 0;
     const emittedSourceUrls = /* @__PURE__ */ new Set;
     let lastCodeExecutionToolCallId;
+    let lastServerToolCallId;
     return {
       stream: response.pipeThrough(new TransformStream({
         start(controller) {
           controller.enqueue({ type: "stream-start", warnings });
         },
         transform(chunk, controller) {
-          var _a16, _b16, _c, _d, _e, _f, _g;
+          var _a16, _b16, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           if (options.includeRawChunks) {
             controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
           }
@@ -129321,6 +129461,9 @@ var GoogleGenerativeAILanguageModel = class {
           if (usageMetadata != null) {
             usage = usageMetadata;
           }
+          if (value.serviceTier != null) {
+            serviceTier = value.serviceTier;
+          }
           const candidate = (_a16 = value.candidates) == null ? undefined : _a16[0];
           if (candidate == null) {
             return;
@@ -129460,6 +129603,42 @@ var GoogleGenerativeAILanguageModel = class {
                   data: part.inlineData.data,
                   providerMetadata: fileMeta
                 });
+              } else if ("toolCall" in part && part.toolCall) {
+                const toolCallId = (_e = part.toolCall.id) != null ? _e : generateId3();
+                lastServerToolCallId = toolCallId;
+                const serverMeta = {
+                  [providerOptionsName]: {
+                    ...part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {},
+                    serverToolCallId: toolCallId,
+                    serverToolType: part.toolCall.toolType
+                  }
+                };
+                controller.enqueue({
+                  type: "tool-call",
+                  toolCallId,
+                  toolName: `server:${part.toolCall.toolType}`,
+                  input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
+                  providerExecuted: true,
+                  dynamic: true,
+                  providerMetadata: serverMeta
+                });
+              } else if ("toolResponse" in part && part.toolResponse) {
+                const responseToolCallId = (_g = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _g : generateId3();
+                const serverMeta = {
+                  [providerOptionsName]: {
+                    ...part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {},
+                    serverToolCallId: responseToolCallId,
+                    serverToolType: part.toolResponse.toolType
+                  }
+                };
+                controller.enqueue({
+                  type: "tool-result",
+                  toolCallId: responseToolCallId,
+                  toolName: `server:${part.toolResponse.toolType}`,
+                  result: (_h = part.toolResponse.response) != null ? _h : {},
+                  providerMetadata: serverMeta
+                });
+                lastServerToolCallId = undefined;
               }
             }
             const toolCallDeltas = getToolCallsFromParts({
@@ -129507,12 +129686,13 @@ var GoogleGenerativeAILanguageModel = class {
             };
             providerMetadata = {
               [providerOptionsName]: {
-                promptFeedback: (_e = value.promptFeedback) != null ? _e : null,
+                promptFeedback: (_i = value.promptFeedback) != null ? _i : null,
                 groundingMetadata: lastGroundingMetadata,
                 urlContextMetadata: lastUrlContextMetadata,
-                safetyRatings: (_f = candidate.safetyRatings) != null ? _f : null,
+                safetyRatings: (_j = candidate.safetyRatings) != null ? _j : null,
                 usageMetadata: usageMetadata != null ? usageMetadata : null,
-                finishMessage: (_g = candidate.finishMessage) != null ? _g : null
+                finishMessage: (_k = candidate.finishMessage) != null ? _k : null,
+                serviceTier
               }
             };
           }
@@ -129715,6 +129895,22 @@ var getContentSchema = () => exports_external.object({
       thought: exports_external.boolean().nullish(),
       thoughtSignature: exports_external.string().nullish()
     }),
+    exports_external.object({
+      toolCall: exports_external.object({
+        toolType: exports_external.string(),
+        args: exports_external.unknown().nullish(),
+        id: exports_external.string()
+      }),
+      thoughtSignature: exports_external.string().nullish()
+    }),
+    exports_external.object({
+      toolResponse: exports_external.object({
+        toolType: exports_external.string(),
+        response: exports_external.unknown().nullish(),
+        id: exports_external.string()
+      }),
+      thoughtSignature: exports_external.string().nullish()
+    }),
     exports_external.object({
       executableCode: exports_external.object({
         language: exports_external.string(),
@@ -129738,13 +129934,19 @@ var getSafetyRatingSchema = () => exports_external.object({
   severityScore: exports_external.number().nullish(),
   blocked: exports_external.boolean().nullish()
 });
+var tokenDetailsSchema = exports_external.array(exports_external.object({
+  modality: exports_external.string(),
+  tokenCount: exports_external.number()
+})).nullish();
 var usageSchema = exports_external.object({
   cachedContentTokenCount: exports_external.number().nullish(),
   thoughtsTokenCount: exports_external.number().nullish(),
   promptTokenCount: exports_external.number().nullish(),
   candidatesTokenCount: exports_external.number().nullish(),
   totalTokenCount: exports_external.number().nullish(),
-  trafficType: exports_external.string().nullish()
+  trafficType: exports_external.string().nullish(),
+  promptTokensDetails: tokenDetailsSchema,
+  candidatesTokensDetails: tokenDetailsSchema
 });
 var getUrlContextMetadataSchema = () => exports_external.object({
   urlMetadata: exports_external.array(exports_external.object({
@@ -129765,7 +129967,8 @@ var responseSchema = lazySchema(() => zodSchema(exports_external.object({
   promptFeedback: exports_external.object({
     blockReason: exports_external.string().nullish(),
     safetyRatings: exports_external.array(getSafetyRatingSchema()).nullish()
-  }).nullish()
+  }).nullish(),
+  serviceTier: exports_external.string().nullish()
 })));
 var chunkSchema = lazySchema(() => zodSchema(exports_external.object({
   candidates: exports_external.array(exports_external.object({
@@ -129780,7 +129983,8 @@ var chunkSchema = lazySchema(() => zodSchema(exports_external.object({
   promptFeedback: exports_external.object({
     blockReason: exports_external.string().nullish(),
     safetyRatings: exports_external.array(getSafetyRatingSchema()).nullish()
-  }).nullish()
+  }).nullish(),
+  serviceTier: exports_external.string().nullish()
 })));
 var codeExecution = createProviderToolFactoryWithOutputSchema({
   id: "google.code_execution",
@@ -131592,7 +131796,7 @@ async function getVercelRequestId() {
   var _a92;
   return (_a92 = import_oidc.getContext().headers) == null ? undefined : _a92["x-vercel-id"];
 }
-var VERSION3 = "3.0.83";
+var VERSION3 = "3.0.88";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
   var _a92, _b92;
@@ -132369,7 +132573,7 @@ function detectMediaType({
   }
   return;
 }
-var VERSION4 = "6.0.141";
+var VERSION4 = "6.0.146";
 var download = async ({
   url: url2,
   maxBytes,
@@ -136560,7 +136764,7 @@ class ModalityClientImpl {
           await this.closeTransportAndKillProcess(this.transport);
         } catch {}
       }
-      this.close();
+      await this.close();
     }
   }
   async callOnce(method, params, autoParse = true) {
@@ -136595,7 +136799,12 @@ class ModalityClientImpl {
       }
     });
   }
-  close() {
+  async close() {
+    if (this.transport) {
+      try {
+        await this.transport.close();
+      } catch {}
+    }
     this.client.close();
     this.connected = false;
     this.transport = null;

package/dist/types/ModalityClient.d.ts

@@ -45,7 +45,7 @@ declare class ModalityClientImpl {
      */
     callOnceAndKill(method: string, params?: any, autoParse?: boolean): Promise<any>;
     callStream(method: string, params?: any, callback?: (p: any) => void): ReadableStream;
-    close(): void;
+    close(): Promise<void>;
     listTools(): Promise<ListToolsResult>;
     parseContent(toolResult: any): unknown;
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.4",
+  "version": "0.6.0",
   "name": "modality-ai",
   "repository": {
     "type": "git",
@@ -11,17 +11,17 @@
   "author": "Hill <hill@kimo.com>",
   "license": "ISC",
   "peerDependencies": {
-    "@modelcontextprotocol/sdk": "^1.28.0",
-    "modality-mcp-kit": "^1.5.0"
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "modality-mcp-kit": "^1.6.2"
   },
   "dependencies": {
-    "@ai-sdk/google": "^3.0.53",
-    "ai": "^6.0.141",
+    "@ai-sdk/google": "^3.0.58",
+    "ai": "^6.0.146",
     "ollama-ai-provider": "^1.2.0"
   },
   "devDependencies": {
     "@types/bun": "^1.3.11",
-    "modality-bun-kit": "^0.0.2",
+    "modality-bun-kit": "^0.0.4",
     "typescript": "^6.0.2"
   },
   "exports": {