modality-ai 0.2.0 → 0.3.0

package/dist/index.js

@@ -18664,7 +18664,7 @@ var require_stream = __commonJS((exports, module) => {
     Object.defineProperty(exports2, "__esModule", { value: true });
     var eventTargetShim = require_event_target_shim();
 
-    class AbortSignal extends eventTargetShim.EventTarget {
+    class AbortSignal2 extends eventTargetShim.EventTarget {
       constructor() {
         super();
         throw TypeError("AbortSignal cannot be constructed directly");
@@ -18676,9 +18676,9 @@ var require_stream = __commonJS((exports, module) => {
         return aborted2;
       }
     }
-    eventTargetShim.defineEventAttribute(AbortSignal.prototype, "abort");
+    eventTargetShim.defineEventAttribute(AbortSignal2.prototype, "abort");
     function createAbortSignal() {
-      let signal = Object.create(AbortSignal.prototype);
+      let signal = Object.create(AbortSignal2.prototype);
       return eventTargetShim.EventTarget.call(signal), abortedFlags.set(signal, false), signal;
     }
     function abortSignal(signal) {
@@ -18687,9 +18687,9 @@ var require_stream = __commonJS((exports, module) => {
       abortedFlags.set(signal, true), signal.dispatchEvent({ type: "abort" });
     }
     var abortedFlags = new WeakMap;
-    Object.defineProperties(AbortSignal.prototype, { aborted: { enumerable: true } });
+    Object.defineProperties(AbortSignal2.prototype, { aborted: { enumerable: true } });
     if (typeof Symbol === "function" && typeof Symbol.toStringTag === "symbol")
-      Object.defineProperty(AbortSignal.prototype, Symbol.toStringTag, { configurable: true, value: "AbortSignal" });
+      Object.defineProperty(AbortSignal2.prototype, Symbol.toStringTag, { configurable: true, value: "AbortSignal" });
 
     class AbortController2 {
       constructor() {
@@ -18713,14 +18713,14 @@ var require_stream = __commonJS((exports, module) => {
     if (typeof Symbol === "function" && typeof Symbol.toStringTag === "symbol")
       Object.defineProperty(AbortController2.prototype, Symbol.toStringTag, { configurable: true, value: "AbortController" });
     exports2.AbortController = AbortController2;
-    exports2.AbortSignal = AbortSignal;
+    exports2.AbortSignal = AbortSignal2;
     exports2.default = AbortController2;
     module2.exports = AbortController2;
     module2.exports.AbortController = module2.exports.default = AbortController2;
-    module2.exports.AbortSignal = AbortSignal;
+    module2.exports.AbortSignal = AbortSignal2;
   });
   var require_util = __commonJS2((exports2, module2) => {
-    var bufferModule = (init_buffer(), __toCommonJS(exports_buffer)), { format: format2, inspect: inspect2 } = require_inspect(), { codes: { ERR_INVALID_ARG_TYPE: ERR_INVALID_ARG_TYPE3 } } = require_errors(), { kResistStopPropagation, AggregateError: AggregateError2, SymbolDispose } = require_primordials(), AbortSignal = globalThis.AbortSignal || require_abort_controller().AbortSignal, AbortController2 = globalThis.AbortController || require_abort_controller().AbortController, AsyncFunction = Object.getPrototypeOf(async function() {}).constructor, Blob3 = globalThis.Blob || bufferModule.Blob, isBlob = typeof Blob3 < "u" ? function(b) {
+    var bufferModule = (init_buffer(), __toCommonJS(exports_buffer)), { format: format2, inspect: inspect2 } = require_inspect(), { codes: { ERR_INVALID_ARG_TYPE: ERR_INVALID_ARG_TYPE3 } } = require_errors(), { kResistStopPropagation, AggregateError: AggregateError2, SymbolDispose } = require_primordials(), AbortSignal2 = globalThis.AbortSignal || require_abort_controller().AbortSignal, AbortController2 = globalThis.AbortController || require_abort_controller().AbortController, AsyncFunction = Object.getPrototypeOf(async function() {}).constructor, Blob3 = globalThis.Blob || bufferModule.Blob, isBlob = typeof Blob3 < "u" ? function(b) {
       return b instanceof Blob3;
     } : function(b) {
       return false;
@@ -18774,7 +18774,7 @@ var require_stream = __commonJS((exports, module) => {
         var _removeEventListener;
         (_removeEventListener = removeEventListener) === null || _removeEventListener === undefined || _removeEventListener();
       } };
-    }, AbortSignalAny: AbortSignal.any || function(signals) {
+    }, AbortSignalAny: AbortSignal2.any || function(signals) {
       if (signals.length === 1)
         return signals[0];
       let ac = new AbortController2, abort = () => ac.abort();
@@ -70738,7 +70738,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
       }
     }
   };
-}, visitFull = (node, visit) => {
+}, visitFull = (node, visit2) => {
   let current = node;
   let stack = undefined;
   let done6 = false;
@@ -70747,7 +70747,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
       stack = make11(current, stack);
       current = current.left;
     } else if (stack != null) {
-      const value2 = visit(stack.value.key, stack.value.value);
+      const value2 = visit2(stack.value.key, stack.value.value);
       if (isSome2(value2)) {
         return value2;
       }
@@ -70758,7 +70758,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
     }
   }
   return none2();
-}, visitGreaterThanEqual = (node, min7, ord, visit) => {
+}, visitGreaterThanEqual = (node, min7, ord, visit2) => {
   let current = node;
   let stack = undefined;
   let done6 = false;
@@ -70772,7 +70772,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
       }
     } else if (stack !== undefined) {
       if (ord(min7, stack.value.key) <= 0) {
-        const value2 = visit(stack.value.key, stack.value.value);
+        const value2 = visit2(stack.value.key, stack.value.value);
         if (isSome2(value2)) {
           return value2;
         }
@@ -70784,7 +70784,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
     }
   }
   return none2();
-}, visitLessThan = (node, max7, ord, visit) => {
+}, visitLessThan = (node, max7, ord, visit2) => {
   let current = node;
   let stack = undefined;
   let done6 = false;
@@ -70793,7 +70793,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
       stack = make11(current, stack);
       current = current.left;
     } else if (stack !== undefined && ord(max7, stack.value.key) > 0) {
-      const value2 = visit(stack.value.key, stack.value.value);
+      const value2 = visit2(stack.value.key, stack.value.value);
       if (isSome2(value2)) {
         return value2;
       }
@@ -70804,7 +70804,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
     }
   }
   return none2();
-}, visitBetween = (node, min7, max7, ord, visit) => {
+}, visitBetween = (node, min7, max7, ord, visit2) => {
   let current = node;
   let stack = undefined;
   let done6 = false;
@@ -70818,7 +70818,7 @@ var RedBlackTreeSymbolKey = "effect/RedBlackTree", RedBlackTreeTypeId, redBlackT
       }
     } else if (stack !== undefined && ord(max7, stack.value.key) > 0) {
       if (ord(min7, stack.value.key) <= 0) {
-        const value2 = visit(stack.value.key, stack.value.value);
+        const value2 = visit2(stack.value.key, stack.value.value);
         if (isSome2(value2)) {
           return value2;
         }
@@ -91617,9 +91617,9 @@ var init_Graph = __esm(() => {
   Walker = class Walker {
     [Symbol.iterator];
     visit;
-    constructor(visit) {
-      this.visit = visit;
-      this[Symbol.iterator] = visit((index, data) => [index, data])[Symbol.iterator];
+    constructor(visit2) {
+      this.visit = visit2;
+      this[Symbol.iterator] = visit2((index, data) => [index, data])[Symbol.iterator];
     }
   };
 });
@@ -114945,7 +114945,7 @@ function withUserAgentSuffix(headers, ...userAgentSuffixParts) {
   normalizedHeaders.set("user-agent", [currentUserAgentHeader, ...userAgentSuffixParts].filter(Boolean).join(" "));
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION = "4.0.2";
+var VERSION = "4.0.4";
 var getOriginalFetch = () => globalThis.fetch;
 var getFromApi = async ({
   url: url2,
@@ -115118,24 +115118,40 @@ function secureJsonParse(text) {
   }
 }
 function addAdditionalPropertiesToJsonSchema(jsonSchema2) {
-  if (jsonSchema2.type === "object") {
+  if (jsonSchema2.type === "object" || Array.isArray(jsonSchema2.type) && jsonSchema2.type.includes("object")) {
     jsonSchema2.additionalProperties = false;
-    const properties = jsonSchema2.properties;
+    const { properties } = jsonSchema2;
     if (properties != null) {
-      for (const property in properties) {
-        properties[property] = addAdditionalPropertiesToJsonSchema(properties[property]);
+      for (const key of Object.keys(properties)) {
+        properties[key] = visit(properties[key]);
       }
     }
   }
-  if (jsonSchema2.type === "array" && jsonSchema2.items != null) {
-    if (Array.isArray(jsonSchema2.items)) {
-      jsonSchema2.items = jsonSchema2.items.map((item) => addAdditionalPropertiesToJsonSchema(item));
-    } else {
-      jsonSchema2.items = addAdditionalPropertiesToJsonSchema(jsonSchema2.items);
+  if (jsonSchema2.items != null) {
+    jsonSchema2.items = Array.isArray(jsonSchema2.items) ? jsonSchema2.items.map(visit) : visit(jsonSchema2.items);
+  }
+  if (jsonSchema2.anyOf != null) {
+    jsonSchema2.anyOf = jsonSchema2.anyOf.map(visit);
+  }
+  if (jsonSchema2.allOf != null) {
+    jsonSchema2.allOf = jsonSchema2.allOf.map(visit);
+  }
+  if (jsonSchema2.oneOf != null) {
+    jsonSchema2.oneOf = jsonSchema2.oneOf.map(visit);
+  }
+  const { definitions } = jsonSchema2;
+  if (definitions != null) {
+    for (const key of Object.keys(definitions)) {
+      definitions[key] = visit(definitions[key]);
     }
   }
   return jsonSchema2;
 }
+function visit(def) {
+  if (typeof def === "boolean")
+    return def;
+  return addAdditionalPropertiesToJsonSchema(def);
+}
 var ignoreOverride = Symbol("Let zodToJsonSchema decide on which parser to use");
 var defaultOptions = {
   name: undefined,
@@ -116587,7 +116603,7 @@ async function* executeTool({
 }
 
 // node_modules/@ai-sdk/google/dist/index.mjs
-var VERSION2 = "3.0.2";
+var VERSION2 = "3.0.5";
 var googleErrorDataSchema = lazySchema(() => zodSchema(exports_external.object({
   error: exports_external.object({
     code: exports_external.number().nullable(),
@@ -117091,7 +117107,7 @@ function prepareTools({
   ].some((id) => id === modelId);
   const isGemini2orNewer = modelId.includes("gemini-2") || modelId.includes("gemini-3") || isLatest;
   const supportsDynamicRetrieval = modelId.includes("gemini-1.5-flash") && !modelId.includes("-8b");
-  const supportsFileSearch = modelId.includes("gemini-2.5");
+  const supportsFileSearch = modelId.includes("gemini-2.5") || modelId.includes("gemini-3");
   if (tools == null) {
     return { tools: undefined, toolConfig: undefined, toolWarnings };
   }
@@ -117164,7 +117180,7 @@ function prepareTools({
             toolWarnings.push({
               type: "unsupported",
               feature: `provider-defined tool ${tool2.id}`,
-              details: "The file search tool is only supported with Gemini 2.5 models."
+              details: "The file search tool is only supported with Gemini 2.5 models and Gemini 3 models."
             });
           }
           break;
@@ -118766,6 +118782,8 @@ var GatewayImageModel = class {
     size,
     aspectRatio,
     seed,
+    files,
+    mask,
     providerOptions,
     headers,
     abortSignal
@@ -118786,7 +118804,11 @@ var GatewayImageModel = class {
           ...size && { size },
           ...aspectRatio && { aspectRatio },
           ...seed && { seed },
-          ...providerOptions && { providerOptions }
+          ...providerOptions && { providerOptions },
+          ...files && {
+            files: files.map((file2) => maybeEncodeImageFile(file2))
+          },
+          ...mask && { mask: maybeEncodeImageFile(mask) }
         },
         successfulResponseHandler: createJsonResponseHandler(gatewayImageResponseSchema),
         failedResponseHandler: createJsonErrorResponseHandler({
@@ -118820,6 +118842,15 @@ var GatewayImageModel = class {
     };
   }
 };
+function maybeEncodeImageFile(file2) {
+  if (file2.type === "file" && file2.data instanceof Uint8Array) {
+    return {
+      ...file2,
+      data: convertUint8ArrayToBase64(file2.data)
+    };
+  }
+  return file2;
+}
 var providerMetadataEntrySchema = exports_external.object({
   images: exports_external.array(exports_external.unknown()).optional()
 }).catchall(exports_external.unknown());
@@ -118835,7 +118866,7 @@ async function getVercelRequestId() {
   var _a82;
   return (_a82 = import_oidc.getContext().headers) == null ? undefined : _a82["x-vercel-id"];
 }
-var VERSION3 = "3.0.5";
+var VERSION3 = "3.0.9";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
   var _a82, _b82;
@@ -120239,7 +120270,7 @@ function detectMediaType({
   }
   return;
 }
-var VERSION5 = "6.0.6";
+var VERSION5 = "6.0.14";
 var download = async ({ url: url2 }) => {
   var _a16;
   const urlText = url2.toString();
@@ -122507,6 +122538,26 @@ async function toResponseMessages({
   }
   return responseMessages;
 }
+function mergeAbortSignals(...signals) {
+  const validSignals = signals.filter((signal) => signal != null);
+  if (validSignals.length === 0) {
+    return;
+  }
+  if (validSignals.length === 1) {
+    return validSignals[0];
+  }
+  const controller = new AbortController;
+  for (const signal of validSignals) {
+    if (signal.aborted) {
+      controller.abort(signal.reason);
+      return controller.signal;
+    }
+    signal.addEventListener("abort", () => {
+      controller.abort(signal.reason);
+    }, { once: true });
+  }
+  return controller.signal;
+}
 var originalGenerateId = createIdGenerator({
   prefix: "aitxt",
   size: 24
@@ -122520,6 +122571,7 @@ async function generateText({
   messages,
   maxRetries: maxRetriesArg,
   abortSignal,
+  timeout,
   headers,
   stopWhen = stepCountIs(1),
   experimental_output,
@@ -122543,9 +122595,10 @@ async function generateText({
 }) {
   const model = resolveLanguageModel(modelArg);
   const stopConditions = asArray(stopWhen);
+  const mergedAbortSignal = mergeAbortSignals(abortSignal, timeout != null ? AbortSignal.timeout(timeout) : undefined);
   const { maxRetries, retry } = prepareRetries({
     maxRetries: maxRetriesArg,
-    abortSignal
+    abortSignal: mergedAbortSignal
   });
   const callSettings = prepareCallSettings(settings);
   const headersWithUserAgent = withUserAgentSuffix(headers != null ? headers : {}, `ai/${VERSION5}`);
@@ -122593,7 +122646,7 @@ async function generateText({
             tracer,
             telemetry,
             messages: initialMessages,
-            abortSignal,
+            abortSignal: mergedAbortSignal,
             experimental_context
           });
           const toolContent = [];
@@ -122726,7 +122779,7 @@ async function generateText({
                   responseFormat: await (output == null ? undefined : output.responseFormat),
                   prompt: promptMessages,
                   providerOptions: stepProviderOptions,
-                  abortSignal,
+                  abortSignal: mergedAbortSignal,
                   headers: headersWithUserAgent
                 });
                 const responseData = {
@@ -122789,7 +122842,7 @@ async function generateText({
                 input: toolCall.input,
                 toolCallId: toolCall.toolCallId,
                 messages: stepInputMessages,
-                abortSignal,
+                abortSignal: mergedAbortSignal,
                 experimental_context
               });
             }
@@ -122826,7 +122879,7 @@ async function generateText({
               tracer,
               telemetry,
               messages: stepInputMessages,
-              abortSignal,
+              abortSignal: mergedAbortSignal,
               experimental_context
             }));
           }
@@ -125235,6 +125288,23 @@ class ModalityClientImpl {
         return "unknown-transport";
     }
   }
+  async closeTransportAndKillProcess(transport) {
+    await transport.close();
+    if (this.transportConfig.type === "stdio") {
+      const stdioBased = transport;
+      const pid2 = stdioBased.pid;
+      if (pid2) {
+        try {
+          process.kill(pid2, "SIGTERM");
+          await new Promise((resolve2) => setTimeout(resolve2, 50));
+          try {
+            process.kill(pid2, 0);
+            process.kill(pid2, "SIGKILL");
+          } catch {}
+        } catch {}
+      }
+    }
+  }
   async call(method, params, autoParse = true) {
     try {
       const client = this.client;
@@ -125265,6 +125335,37 @@ class ModalityClientImpl {
     this.client.close();
     return result;
   }
+  async callOnceAndKill(method, params, autoParse = true) {
+    let transport = null;
+    try {
+      const client = this.client;
+      transport = this.createTransport();
+      await client.connect(transport);
+      const result = await client.callTool({
+        name: method,
+        arguments: params
+      }, undefined, { timeout: this.timeout });
+      await this.closeTransportAndKillProcess(transport);
+      client.close();
+      if (autoParse) {
+        return this.parseContent(result);
+      } else {
+        return result;
+      }
+    } catch (error48) {
+      if (transport) {
+        try {
+          await this.closeTransportAndKillProcess(transport);
+        } catch (closeError) {}
+      }
+      try {
+        this.client.close();
+      } catch {}
+      const transportId = this.getTransportIdentifier();
+      logger6.error(`${transportId}-callOnceAndKill-failed`, error48);
+      throw error48;
+    }
+  }
   callStream(method, params, callback) {
     try {
       const client = this.client;
@@ -126590,17 +126691,23 @@ var createStdioToHttpClient = (options) => {
     args: optionArgs = [],
     env: optionEnv,
     pkg,
-    timeout: timeout6 = 120000
+    timeout: timeout6 = 120000,
+    quiet = false
   } = options || {};
   const args2 = pkg ? [pkg, ...optionArgs] : optionArgs;
   const env = {
     ...Object.fromEntries(Object.entries(process.env).filter((entry) => entry[1] !== undefined)),
     ...optionEnv || {}
   };
+  if (quiet) {
+    env.QUIET = "true";
+    env.DEBUG = "";
+  }
   const client = ModalityClient.stdio({
     command,
     args: args2,
-    env
+    env,
+    stderr: quiet ? "ignore" : "inherit"
   }, timeout6);
   return client;
 };

package/dist/types/ModalityClient.d.ts

@@ -25,8 +25,18 @@ declare class ModalityClientImpl {
     constructor(config: TransportConfig, timeout?: number);
     private createTransport;
     private getTransportIdentifier;
+    /**
+     * Close transport and kill subprocess (for stdio transports only)
+     * Useful for one-off CLI operations where the subprocess should not persist
+     */
+    private closeTransportAndKillProcess;
     call(method: string, params?: any, autoParse?: boolean): Promise<any>;
     callOnce(method: string, params?: any, autoParse?: boolean): Promise<any>;
+    /**
+     * Call a tool once and kill the subprocess (for stdio transports only)
+     * Useful for one-off CLI operations where the subprocess should not persist
+     */
+    callOnceAndKill(method: string, params?: any, autoParse?: boolean): Promise<any>;
     callStream(method: string, params?: any, callback?: (p: any) => void): ReadableStream;
     close(): void;
     listTools(): Promise<ListToolsResult>;

package/dist/types/setupStdioToHttpTools.d.ts

@@ -6,6 +6,7 @@ export interface StdioToHttpOptions {
     env?: Record<string, string>;
     pkg?: string;
     timeout?: number;
+    quiet?: boolean;
 }
 export declare const createStdioToHttpClient: (options?: StdioToHttpOptions) => ModalityClientInstance;
 /**

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.0",
+  "version": "0.3.0",
   "name": "modality-ai",
   "repository": {
     "type": "git",
@@ -12,15 +12,12 @@
   "license": "ISC",
   "peerDependencies": {
     "@modelcontextprotocol/sdk": "^1.25.1",
-    "modality-mcp-kit": "^1.x"
+    "modality-mcp-kit": "^1.0.0"
   },
   "dependencies": {
-    "@ai-sdk/google": "^3.0.2",
-    "@valibot/to-json-schema": "^1.5.0",
-    "ai": "^6.0.6",
-    "effect": "^3.19.14",
-    "ollama-ai-provider": "^1.2.0",
-    "sury": "^11.0.0-alpha.4"
+    "@ai-sdk/google": "^3.0.5",
+    "ai": "^6.0.14",
+    "ollama-ai-provider": "^1.2.0"
   },
   "devDependencies": {
     "@types/bun": "^1.3.5",