@revojs/ai 0.2.32 → 0.2.33

package/dist/index.d.ts

@@ -847,7 +847,7 @@ export declare class ModelContextProtocolClient {
 export declare class ModelContextProtocolConnection {
     readonly client: ModelContextProtocolClient;
     constructor(client: ModelContextProtocolClient);
-    listTools(options?: ModelContextProtocolRequestOptions): Promise<Array<LanguageModelFunctionTool>>;
+    listTools(options?: ModelContextProtocolRequestOptions): Promise<Array<ToolDescription>>;
     executeTool(call: LanguageModelToolCall, options?: ModelContextProtocolRequestOptions): Promise<LanguageModelToolResultPart>;
     close(): Promise<void>;
 }
@@ -868,6 +868,7 @@ export declare function useModelsDev(id: string, resolve: (model: ModelsDevModel
 }>;
 export declare function modelsDevProtocol(model: ModelsDevModel, provider: ModelsDevProvider): ModelsDevProtocol | undefined;
 export declare function toToolInput(value: string | undefined): string;
+export declare function toToolParameters(schema: JsonSchema): JSONObject;
 export declare function mergeHeaders(...headers: Array<Record<string, string | undefined> | undefined>): Record<string, string>;
 export declare function postJson(url: string, body: unknown, options?: {
     headers?: Record<string, string | undefined>;

package/dist/index.js

@@ -110,7 +110,8 @@ var ModelContextProtocolClient = class {
 			headers: {
 				...this.headers,
 				"mcp-session-id": sessionId
-			}
+			},
+			redirect: "manual"
 		});
 		await response.body?.cancel();
 		if (!response.ok && response.status !== 405) throw new Error(`Model Context Protocol session termination failed with HTTP ${response.status}.`);
@@ -125,8 +126,13 @@ var ModelContextProtocolClient = class {
 			method: "POST",
 			headers,
 			body: JSON.stringify(message),
-			signal
+			signal,
+			redirect: "manual"
 		});
+		if (response.type === "opaqueredirect" || response.status >= 300 && response.status < 400) {
+			await response.body?.cancel();
+			throw new Error("Model Context Protocol server redirected the request; configure its final endpoint.");
+		}
 		if (!response.ok) {
 			await response.body?.cancel();
 			throw new Error(`Model Context Protocol request failed with HTTP ${response.status}.`);
@@ -187,7 +193,8 @@ var ModelContextProtocolConnection = class {
 				type: "function",
 				name: tool.name,
 				description: tool.description,
-				inputSchema: tool.inputSchema
+				inputSchema: tool.inputSchema,
+				annotations: tool.annotations
 			});
 			cursor = result.nextCursor;
 			if (cursor !== void 0 && cursors.has(cursor)) throw new Error("Model Context Protocol server returned a repeated tools pagination cursor.");
@@ -628,6 +635,13 @@ function modelsDevProtocol(model, provider) {
 function toToolInput(value) {
 	return value === void 0 || value.trim() === "" ? "{}" : value;
 }
+function toToolParameters(schema) {
+	const parameters = {};
+	for (const [key, value] of Object.entries(toJsonSchema(schema))) if (!TOOL_PARAMETER_ROOT_KEYWORDS.has(key)) parameters[key] = value;
+	parameters.type = "object";
+	if (parameters.properties === null || typeof parameters.properties !== "object" || Array.isArray(parameters.properties)) parameters.properties = {};
+	return parameters;
+}
 function mergeHeaders(...headers) {
 	const merged = {};
 	for (const record of headers) for (const [name, value] of Object.entries(record ?? {})) if (value !== void 0) merged[name] = value;
@@ -684,6 +698,16 @@ function toStream(read) {
 	});
 }
 var modelsDevCache = { loadedAt: 0 };
+var TOOL_PARAMETER_ROOT_KEYWORDS = /* @__PURE__ */ new Set([
+	"anyOf",
+	"oneOf",
+	"allOf",
+	"not",
+	"enum",
+	"if",
+	"then",
+	"else"
+]);
 var MODEL_CONTEXT_PROTOCOL_VERSIONS = [
 	"2025-11-25",
 	"2025-06-18",
@@ -707,4 +731,4 @@ var JSON_SCHEMA_DRAFTS = {
 	"http://json-schema.org/draft-04/schema#": "4"
 };
 //#endregion
-export { MODEL_CONTEXT_PROTOCOL_TIMEOUT, MODEL_CONTEXT_PROTOCOL_VERSIONS, ModelContextProtocolClient, ModelContextProtocolConnection, ModelContextProtocolError, ModelContextProtocolErrorCode, defineProvider, defineTool, handleModelContextProtocol, mergeHeaders, modelsDevProtocol, postJson, readDataFrames, toStream, toToolInput, useAi, useModelContextProtocol, useModelsDev, useTools };
+export { MODEL_CONTEXT_PROTOCOL_TIMEOUT, MODEL_CONTEXT_PROTOCOL_VERSIONS, ModelContextProtocolClient, ModelContextProtocolConnection, ModelContextProtocolError, ModelContextProtocolErrorCode, defineProvider, defineTool, handleModelContextProtocol, mergeHeaders, modelsDevProtocol, postJson, readDataFrames, toStream, toToolInput, toToolParameters, useAi, useModelContextProtocol, useModelsDev, useTools };

package/dist/module/index.d.ts

@@ -8,6 +8,7 @@ export interface AiConfig {
         name: string;
         version: string;
         instructions?: string;
+        route: boolean;
     };
 }
 declare const _default: import("revojs/module").Module<"ai", AiConfig, readonly [import("revojs/module").Module<"server", Record<string, never>, []>]>;

package/dist/module/index.js

@@ -11,13 +11,14 @@ var module_default = defineModule({
 		},
 		modelContextProtocol: {
 			name: "revojs",
-			version: "1.0.0"
+			version: "1.0.0",
+			route: false
 		}
 	}),
 	modules: [server],
 	setup(config) {
 		const { fromModule } = useModule(import.meta.url);
-		addRoutes(config, fromModule("../routes"));
+		if (config.ai.modelContextProtocol.route) addRoutes(config, fromModule("../routes"));
 		return {
 			variables: { server: {
 				anthropicApiKey: {

package/dist/protocols/anthropic-messages.js

@@ -1,5 +1,4 @@
-import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput } from "../index.js";
-import { toJsonSchema } from "revojs/shared";
+import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput, toToolParameters } from "../index.js";
 //#region src/protocols/anthropic-messages.ts
 function toUsage(inputTokens, cacheRead, cacheWrite, outputTokens) {
 	const raw = {};
@@ -156,7 +155,7 @@ function toBody(options, stream) {
 	else tools.push({
 		name: tool.name,
 		description: tool.description,
-		input_schema: toJsonSchema(tool.inputSchema)
+		input_schema: toToolParameters(tool.inputSchema)
 	});
 	if (cache && tools.length > 0) tools[tools.length - 1].cache_control = { type: "ephemeral" };
 	if (cache && Array.isArray(lastContent)) {

package/dist/protocols/google-models.js

@@ -1,4 +1,4 @@
-import { mergeHeaders, postJson, readDataFrames, toStream } from "../index.js";
+import { mergeHeaders, postJson, readDataFrames, toStream, toToolParameters } from "../index.js";
 import { toJsonSchema } from "revojs/shared";
 //#region src/protocols/google-models.ts
 function toBase64(data) {
@@ -135,7 +135,7 @@ function toBody(options) {
 		return [{
 			name: tool.name,
 			description: tool.description,
-			parameters: toJsonSchema(tool.inputSchema)
+			parameters: toToolParameters(tool.inputSchema)
 		}];
 	});
 	return [{

package/dist/protocols/openai-chat-completions.js

@@ -1,4 +1,4 @@
-import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput } from "../index.js";
+import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput, toToolParameters } from "../index.js";
 import { toJsonSchema } from "revojs/shared";
 //#region src/protocols/openai-chat-completions.ts
 function toMessages(prompt) {
@@ -91,7 +91,7 @@ function toBody(config, options, stream) {
 				function: {
 					name: tool.name,
 					description: tool.description,
-					parameters: toJsonSchema(tool.inputSchema),
+					parameters: toToolParameters(tool.inputSchema),
 					strict: tool.strict
 				}
 			}) } : {},
@@ -214,7 +214,7 @@ async function* readParts(response, warnings) {
 			let accumulator = tools.get(index);
 			if (accumulator === void 0) {
 				accumulator = {
-					streamId: `openai-tool-${index}`,
+					streamId: partial.id ?? `openai-tool-${index}`,
 					callId: partial.id ?? "",
 					name: "",
 					arguments: ""

package/dist/protocols/openai-responses.js

@@ -1,4 +1,4 @@
-import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput } from "../index.js";
+import { mergeHeaders, postJson, readDataFrames, toStream, toToolInput, toToolParameters } from "../index.js";
 import { toJsonSchema } from "revojs/shared";
 //#region src/protocols/openai-responses.ts
 function toUsage(usage) {
@@ -142,7 +142,7 @@ function toBody(options, stream) {
 			type: "function",
 			name: tool.name,
 			description: tool.description,
-			parameters: toJsonSchema(tool.inputSchema),
+			parameters: toToolParameters(tool.inputSchema),
 			strict: tool.strict
 		}) } : {},
 		...options.toolChoice !== void 0 ? { tool_choice: options.toolChoice.type === "tool" ? {
@@ -188,17 +188,17 @@ async function* readParts(response, warnings) {
 			continue;
 		}
 		if (event.type === "response.output_item.added" && event.item?.type === "function_call") {
-			const streamId = event.item.id ?? event.item.call_id ?? `responses-tool-${event.output_index ?? tools.size}`;
+			const itemId = event.item.id ?? event.item.call_id ?? `responses-tool-${event.output_index ?? tools.size}`;
 			const record = {
-				streamId,
+				streamId: event.item.call_id ?? itemId,
 				callId: event.item.call_id ?? "",
 				name: event.item.name ?? "",
 				arguments: ""
 			};
-			tools.set(streamId, record);
+			tools.set(itemId, record);
 			yield {
 				type: "tool-input-start",
-				id: streamId,
+				id: record.streamId,
 				toolName: record.name
 			};
 			continue;
@@ -255,7 +255,7 @@ async function* readParts(response, warnings) {
 				record.arguments += event.delta;
 				yield {
 					type: "tool-input-delta",
-					id: event.item_id,
+					id: record.streamId,
 					delta: event.delta
 				};
 			}
@@ -265,7 +265,7 @@ async function* readParts(response, warnings) {
 			const itemId = event.item.id ?? "";
 			if (event.item.type === "function_call") {
 				const record = tools.get(itemId);
-				const streamId = record?.streamId ?? itemId;
+				const streamId = record?.streamId ?? event.item.call_id ?? itemId;
 				tools.delete(itemId);
 				hasToolCall = true;
 				yield {
@@ -308,7 +308,7 @@ async function* readParts(response, warnings) {
 		type: "reasoning-end",
 		id
 	};
-	for (const [id, record] of tools) {
+	for (const record of tools.values()) {
 		yield {
 			type: "tool-input-end",
 			id: record.streamId
@@ -316,7 +316,7 @@ async function* readParts(response, warnings) {
 		hasToolCall = true;
 		yield {
 			type: "tool-call",
-			toolCallId: record.callId || id,
+			toolCallId: record.callId || record.streamId,
 			toolName: record.name,
 			input: toToolInput(record.arguments)
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revojs/ai",
-    "version": "0.2.32",
+    "version": "0.2.33",
     "license": "MIT",
     "repository": {
         "type": "git",