@matthesketh/utopia-ai 0.0.5 → 0.2.0

package/dist/adapters/anthropic.cjs

@@ -37,16 +37,16 @@ function anthropicAdapter(config) {
   let client = null;
   async function getClient() {
     if (client) return client;
-    let Anthropic;
+    let AnthropicCtor;
     try {
       const mod = await import("@anthropic-ai/sdk");
-      Anthropic = mod.Anthropic ?? mod.default;
+      AnthropicCtor = mod.Anthropic ?? mod.default;
     } catch {
       throw new Error(
         '@matthesketh/utopia-ai: "@anthropic-ai/sdk" package is required for the Anthropic adapter. Install it with: npm install @anthropic-ai/sdk'
       );
     }
-    client = new Anthropic({
+    client = new AnthropicCtor({
       apiKey: config.apiKey,
       ...config.baseURL ? { baseURL: config.baseURL } : {}
     });
@@ -73,17 +73,22 @@ function anthropicAdapter(config) {
           body.tool_choice = toAnthropicToolChoice(request.toolChoice);
         }
       }
-      const response = await anthropic.messages.create(body);
-      const textContent = response.content.filter((b) => b.type === "text").map((b) => b.text).join("");
-      const toolCalls = response.content.filter((b) => b.type === "tool_use").map((b) => ({
-        id: b.id,
-        name: b.name,
-        arguments: b.input ?? {}
-      }));
+      const response = await anthropic.messages.create(
+        body
+      );
+      if (!response.content || !Array.isArray(response.content)) {
+        throw new Error("Anthropic returned invalid response: missing content array");
+      }
+      const contentBlocks = response.content;
+      const textContent = contentBlocks.filter((b) => b.type === "text").map((b) => b.text).join("");
+      const toolCalls = contentBlocks.filter((b) => b.type === "tool_use").map((b) => {
+        const tu = b;
+        return { id: tu.id, name: tu.name, arguments: tu.input ?? {} };
+      });
       return {
         content: textContent,
         toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
-        finishReason: mapStopReason(response.stop_reason),
+        finishReason: mapStopReason(response.stop_reason ?? ""),
         usage: response.usage ? {
           promptTokens: response.usage.input_tokens,
           completionTokens: response.usage.output_tokens,
@@ -113,7 +118,9 @@ function anthropicAdapter(config) {
           body.tool_choice = toAnthropicToolChoice(request.toolChoice);
         }
       }
-      const stream = anthropic.messages.stream(body);
+      const stream = anthropic.messages.stream(
+        body
+      );
       let promptTokens = 0;
       for await (const event of stream) {
         if (event.type === "message_start" && event.message?.usage) {
@@ -144,7 +151,7 @@ function anthropicAdapter(config) {
           const outputTokens = event.usage?.output_tokens ?? 0;
           yield {
             delta: "",
-            finishReason: mapStopReason(event.delta.stop_reason),
+            finishReason: mapStopReason(event.delta.stop_reason ?? ""),
             usage: event.usage ? {
               promptTokens,
               completionTokens: outputTokens,

package/dist/adapters/anthropic.js

@@ -3,16 +3,16 @@ function anthropicAdapter(config) {
   let client = null;
   async function getClient() {
     if (client) return client;
-    let Anthropic;
+    let AnthropicCtor;
     try {
       const mod = await import("@anthropic-ai/sdk");
-      Anthropic = mod.Anthropic ?? mod.default;
+      AnthropicCtor = mod.Anthropic ?? mod.default;
     } catch {
       throw new Error(
         '@matthesketh/utopia-ai: "@anthropic-ai/sdk" package is required for the Anthropic adapter. Install it with: npm install @anthropic-ai/sdk'
       );
     }
-    client = new Anthropic({
+    client = new AnthropicCtor({
       apiKey: config.apiKey,
       ...config.baseURL ? { baseURL: config.baseURL } : {}
     });
@@ -39,17 +39,22 @@ function anthropicAdapter(config) {
           body.tool_choice = toAnthropicToolChoice(request.toolChoice);
         }
       }
-      const response = await anthropic.messages.create(body);
-      const textContent = response.content.filter((b) => b.type === "text").map((b) => b.text).join("");
-      const toolCalls = response.content.filter((b) => b.type === "tool_use").map((b) => ({
-        id: b.id,
-        name: b.name,
-        arguments: b.input ?? {}
-      }));
+      const response = await anthropic.messages.create(
+        body
+      );
+      if (!response.content || !Array.isArray(response.content)) {
+        throw new Error("Anthropic returned invalid response: missing content array");
+      }
+      const contentBlocks = response.content;
+      const textContent = contentBlocks.filter((b) => b.type === "text").map((b) => b.text).join("");
+      const toolCalls = contentBlocks.filter((b) => b.type === "tool_use").map((b) => {
+        const tu = b;
+        return { id: tu.id, name: tu.name, arguments: tu.input ?? {} };
+      });
       return {
         content: textContent,
         toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
-        finishReason: mapStopReason(response.stop_reason),
+        finishReason: mapStopReason(response.stop_reason ?? ""),
         usage: response.usage ? {
           promptTokens: response.usage.input_tokens,
           completionTokens: response.usage.output_tokens,
@@ -79,7 +84,9 @@ function anthropicAdapter(config) {
           body.tool_choice = toAnthropicToolChoice(request.toolChoice);
         }
       }
-      const stream = anthropic.messages.stream(body);
+      const stream = anthropic.messages.stream(
+        body
+      );
       let promptTokens = 0;
       for await (const event of stream) {
         if (event.type === "message_start" && event.message?.usage) {
@@ -110,7 +117,7 @@ function anthropicAdapter(config) {
           const outputTokens = event.usage?.output_tokens ?? 0;
           yield {
             delta: "",
-            finishReason: mapStopReason(event.delta.stop_reason),
+            finishReason: mapStopReason(event.delta.stop_reason ?? ""),
             usage: event.usage ? {
               promptTokens,
               completionTokens: outputTokens,

package/dist/adapters/google.cjs

@@ -33,6 +33,7 @@ __export(google_exports, {
   googleAdapter: () => googleAdapter
 });
 module.exports = __toCommonJS(google_exports);
+var toolCallCounter = 0;
 function googleAdapter(config) {
   let genAI = null;
   async function getGenAI() {
@@ -72,13 +73,16 @@ function googleAdapter(config) {
       const response = result.response;
       const candidate = response.candidates?.[0];
       const parts = candidate?.content?.parts ?? [];
-      const textParts = parts.filter((p) => p.text).map((p) => p.text);
-      const fnCalls = parts.filter((p) => p.functionCall);
-      const toolCalls = fnCalls.map((p) => ({
-        id: `call_${crypto.randomUUID()}`,
-        name: p.functionCall.name,
-        arguments: p.functionCall.args ?? {}
-      }));
+      const textParts = parts.filter((p) => "text" in p && p.text).map((p) => p.text);
+      const fnCalls = parts.filter((p) => "functionCall" in p && p.functionCall);
+      const toolCalls = fnCalls.map((p) => {
+        const fc = p.functionCall;
+        return {
+          id: `call_${++toolCallCounter}_${Date.now().toString(36)}`,
+          name: fc.name,
+          arguments: fc.args ?? {}
+        };
+      });
       return {
         content: textParts.join(""),
         toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
@@ -112,7 +116,7 @@ function googleAdapter(config) {
       });
       for await (const chunk of result.stream) {
         const parts = chunk.candidates?.[0]?.content?.parts ?? [];
-        const text = parts.filter((p) => p.text).map((p) => p.text).join("");
+        const text = parts.filter((p) => "text" in p && p.text).map((p) => p.text).join("");
         const finishReason = chunk.candidates?.[0]?.finishReason;
         yield {
           delta: text,
@@ -132,9 +136,11 @@ function googleAdapter(config) {
       });
       const inputs = Array.isArray(request.input) ? request.input : [request.input];
       const result = await model.batchEmbedContents({
-        requests: inputs.map((text) => ({
-          content: { parts: [{ text }] }
-        }))
+        requests: inputs.map(
+          (text) => ({
+            content: { parts: [{ text }], role: "user" }
+          })
+        )
       });
       return {
         embeddings: result.embeddings.map((e) => e.values),

package/dist/adapters/google.js

@@ -1,4 +1,5 @@
 // src/adapters/google.ts
+var toolCallCounter = 0;
 function googleAdapter(config) {
   let genAI = null;
   async function getGenAI() {
@@ -38,13 +39,16 @@ function googleAdapter(config) {
       const response = result.response;
       const candidate = response.candidates?.[0];
       const parts = candidate?.content?.parts ?? [];
-      const textParts = parts.filter((p) => p.text).map((p) => p.text);
-      const fnCalls = parts.filter((p) => p.functionCall);
-      const toolCalls = fnCalls.map((p) => ({
-        id: `call_${crypto.randomUUID()}`,
-        name: p.functionCall.name,
-        arguments: p.functionCall.args ?? {}
-      }));
+      const textParts = parts.filter((p) => "text" in p && p.text).map((p) => p.text);
+      const fnCalls = parts.filter((p) => "functionCall" in p && p.functionCall);
+      const toolCalls = fnCalls.map((p) => {
+        const fc = p.functionCall;
+        return {
+          id: `call_${++toolCallCounter}_${Date.now().toString(36)}`,
+          name: fc.name,
+          arguments: fc.args ?? {}
+        };
+      });
       return {
         content: textParts.join(""),
         toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
@@ -78,7 +82,7 @@ function googleAdapter(config) {
       });
       for await (const chunk of result.stream) {
         const parts = chunk.candidates?.[0]?.content?.parts ?? [];
-        const text = parts.filter((p) => p.text).map((p) => p.text).join("");
+        const text = parts.filter((p) => "text" in p && p.text).map((p) => p.text).join("");
         const finishReason = chunk.candidates?.[0]?.finishReason;
         yield {
           delta: text,
@@ -98,9 +102,11 @@ function googleAdapter(config) {
       });
       const inputs = Array.isArray(request.input) ? request.input : [request.input];
       const result = await model.batchEmbedContents({
-        requests: inputs.map((text) => ({
-          content: { parts: [{ text }] }
-        }))
+        requests: inputs.map(
+          (text) => ({
+            content: { parts: [{ text }], role: "user" }
+          })
+        )
       });
       return {
         embeddings: result.embeddings.map((e) => e.values),

package/dist/adapters/ollama.cjs

@@ -23,41 +23,42 @@ __export(ollama_exports, {
   ollamaAdapter: () => ollamaAdapter
 });
 module.exports = __toCommonJS(ollama_exports);
+var ollamaToolCallCounter = 0;
 function ollamaAdapter(config = {}) {
   const baseURL = (config.baseURL ?? "http://localhost:11434").replace(/\/$/, "");
   return {
     async chat(request) {
       const model = request.model ?? config.defaultModel ?? "llama3.2";
+      const options = {};
+      if (request.temperature !== void 0) options.temperature = request.temperature;
+      if (request.topP !== void 0) options.top_p = request.topP;
+      if (request.maxTokens !== void 0) options.num_predict = request.maxTokens;
+      if (request.stop) options.stop = request.stop;
       const body = {
         model,
         messages: toOllamaMessages(request.messages),
         stream: false,
-        options: {}
+        options
       };
-      if (request.temperature !== void 0) body.options.temperature = request.temperature;
-      if (request.topP !== void 0) body.options.top_p = request.topP;
-      if (request.maxTokens !== void 0) body.options.num_predict = request.maxTokens;
-      if (request.stop) body.options.stop = request.stop;
       if (request.tools?.length) {
         body.tools = request.tools.map(toOllamaTool);
       }
       const response = await fetch(`${baseURL}/api/chat`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(6e4)
       });
       if (!response.ok) {
         const text = await response.text();
         throw new Error(`Ollama error ${response.status}: ${text}`);
       }
       const data = await response.json();
-      const toolCalls = (data.message?.tool_calls ?? []).map(
-        (tc, i) => ({
-          id: `call_${i}`,
-          name: tc.function.name,
-          arguments: tc.function.arguments ?? {}
-        })
-      );
+      const toolCalls = (data.message?.tool_calls ?? []).map((tc) => ({
+        id: `call_${++ollamaToolCallCounter}_${Date.now().toString(36)}`,
+        name: tc.function.name,
+        arguments: tc.function.arguments ?? {}
+      }));
       return {
         content: data.message?.content ?? "",
         toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
@@ -72,28 +73,33 @@ function ollamaAdapter(config = {}) {
     },
     async *stream(request) {
       const model = request.model ?? config.defaultModel ?? "llama3.2";
+      const streamOptions = {};
+      if (request.temperature !== void 0) streamOptions.temperature = request.temperature;
+      if (request.topP !== void 0) streamOptions.top_p = request.topP;
+      if (request.maxTokens !== void 0) streamOptions.num_predict = request.maxTokens;
+      if (request.stop) streamOptions.stop = request.stop;
       const body = {
         model,
         messages: toOllamaMessages(request.messages),
         stream: true,
-        options: {}
+        options: streamOptions
       };
-      if (request.temperature !== void 0) body.options.temperature = request.temperature;
-      if (request.topP !== void 0) body.options.top_p = request.topP;
-      if (request.maxTokens !== void 0) body.options.num_predict = request.maxTokens;
-      if (request.stop) body.options.stop = request.stop;
       if (request.tools?.length) {
         body.tools = request.tools.map(toOllamaTool);
       }
       const response = await fetch(`${baseURL}/api/chat`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(6e4)
       });
       if (!response.ok) {
         const text = await response.text();
         throw new Error(`Ollama error ${response.status}: ${text}`);
       }
+      if (!response.body) {
+        throw new Error("Response body is null \u2014 streaming not supported");
+      }
       const reader = response.body.getReader();
       const decoder = new TextDecoder();
       let buffer = "";
@@ -105,7 +111,12 @@ function ollamaAdapter(config = {}) {
         buffer = lines.pop() ?? "";
         for (const line of lines) {
           if (!line.trim()) continue;
-          const data = JSON.parse(line);
+          let data;
+          try {
+            data = JSON.parse(line);
+          } catch {
+            continue;
+          }
           yield {
             delta: data.message?.content ?? "",
             finishReason: data.done ? "stop" : void 0,

package/dist/adapters/ollama.js

@@ -1,39 +1,40 @@
 // src/adapters/ollama.ts
+var ollamaToolCallCounter = 0;
 function ollamaAdapter(config = {}) {
   const baseURL = (config.baseURL ?? "http://localhost:11434").replace(/\/$/, "");
   return {
     async chat(request) {
       const model = request.model ?? config.defaultModel ?? "llama3.2";
+      const options = {};
+      if (request.temperature !== void 0) options.temperature = request.temperature;
+      if (request.topP !== void 0) options.top_p = request.topP;
+      if (request.maxTokens !== void 0) options.num_predict = request.maxTokens;
+      if (request.stop) options.stop = request.stop;
       const body = {
         model,
         messages: toOllamaMessages(request.messages),
         stream: false,
-        options: {}
+        options
       };
-      if (request.temperature !== void 0) body.options.temperature = request.temperature;
-      if (request.topP !== void 0) body.options.top_p = request.topP;
-      if (request.maxTokens !== void 0) body.options.num_predict = request.maxTokens;
-      if (request.stop) body.options.stop = request.stop;
       if (request.tools?.length) {
         body.tools = request.tools.map(toOllamaTool);
       }
       const response = await fetch(`${baseURL}/api/chat`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(6e4)
       });
       if (!response.ok) {
         const text = await response.text();
         throw new Error(`Ollama error ${response.status}: ${text}`);
       }
       const data = await response.json();
-      const toolCalls = (data.message?.tool_calls ?? []).map(
-        (tc, i) => ({
-          id: `call_${i}`,
-          name: tc.function.name,
-          arguments: tc.function.arguments ?? {}
-        })
-      );
+      const toolCalls = (data.message?.tool_calls ?? []).map((tc) => ({
+        id: `call_${++ollamaToolCallCounter}_${Date.now().toString(36)}`,
+        name: tc.function.name,
+        arguments: tc.function.arguments ?? {}
+      }));
       return {
         content: data.message?.content ?? "",
         toolCalls: toolCalls.length > 0 ? toolCalls : void 0,
@@ -48,28 +49,33 @@ function ollamaAdapter(config = {}) {
     },
     async *stream(request) {
       const model = request.model ?? config.defaultModel ?? "llama3.2";
+      const streamOptions = {};
+      if (request.temperature !== void 0) streamOptions.temperature = request.temperature;
+      if (request.topP !== void 0) streamOptions.top_p = request.topP;
+      if (request.maxTokens !== void 0) streamOptions.num_predict = request.maxTokens;
+      if (request.stop) streamOptions.stop = request.stop;
       const body = {
         model,
         messages: toOllamaMessages(request.messages),
         stream: true,
-        options: {}
+        options: streamOptions
       };
-      if (request.temperature !== void 0) body.options.temperature = request.temperature;
-      if (request.topP !== void 0) body.options.top_p = request.topP;
-      if (request.maxTokens !== void 0) body.options.num_predict = request.maxTokens;
-      if (request.stop) body.options.stop = request.stop;
       if (request.tools?.length) {
         body.tools = request.tools.map(toOllamaTool);
       }
       const response = await fetch(`${baseURL}/api/chat`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(body)
+        body: JSON.stringify(body),
+        signal: AbortSignal.timeout(6e4)
       });
       if (!response.ok) {
         const text = await response.text();
         throw new Error(`Ollama error ${response.status}: ${text}`);
       }
+      if (!response.body) {
+        throw new Error("Response body is null \u2014 streaming not supported");
+      }
       const reader = response.body.getReader();
       const decoder = new TextDecoder();
       let buffer = "";
@@ -81,7 +87,12 @@ function ollamaAdapter(config = {}) {
         buffer = lines.pop() ?? "";
         for (const line of lines) {
           if (!line.trim()) continue;
-          const data = JSON.parse(line);
+          let data;
+          try {
+            data = JSON.parse(line);
+          } catch {
+            continue;
+          }
           yield {
             delta: data.message?.content ?? "",
             finishReason: data.done ? "stop" : void 0,

package/dist/adapters/openai.cjs

@@ -37,16 +37,16 @@ function openaiAdapter(config) {
   let client = null;
   async function getClient() {
     if (client) return client;
-    let OpenAI;
+    let OpenAICtor;
     try {
       const mod = await import("openai");
-      OpenAI = mod.OpenAI ?? mod.default;
+      OpenAICtor = mod.OpenAI ?? mod.default;
     } catch {
       throw new Error(
         '@matthesketh/utopia-ai: "openai" package is required for the OpenAI adapter. Install it with: npm install openai'
       );
     }
-    client = new OpenAI({
+    client = new OpenAICtor({
       apiKey: config.apiKey,
       baseURL: config.baseURL,
       organization: config.organization
@@ -72,11 +72,20 @@ function openaiAdapter(config) {
           body.tool_choice = toOpenAIToolChoice(request.toolChoice);
         }
       }
-      const response = await openai.chat.completions.create(body);
+      const response = await openai.chat.completions.create(
+        body
+      );
+      if (!response.choices?.length) {
+        throw new Error("OpenAI returned empty choices array");
+      }
       const choice = response.choices[0];
       return {
         content: choice.message.content ?? "",
-        toolCalls: choice.message.tool_calls?.map(fromOpenAIToolCall),
+        toolCalls: choice.message.tool_calls?.map(
+          (tc) => fromOpenAIToolCall(
+            tc
+          )
+        ),
         finishReason: mapFinishReason(choice.finish_reason),
         usage: response.usage ? {
           promptTokens: response.usage.prompt_tokens,
@@ -106,7 +115,9 @@ function openaiAdapter(config) {
           body.tool_choice = toOpenAIToolChoice(request.toolChoice);
         }
       }
-      const stream = await openai.chat.completions.create(body);
+      const stream = await openai.chat.completions.create(
+        body
+      );
       for await (const chunk of stream) {
         const delta = chunk.choices?.[0]?.delta;
         const finishReason = chunk.choices?.[0]?.finish_reason;
@@ -218,7 +229,7 @@ function toOpenAIToolChoice(choice) {
   if (choice && typeof choice === "object" && "name" in choice) {
     return { type: "function", function: { name: choice.name } };
   }
-  return choice;
+  return void 0;
 }
 function fromOpenAIToolCall(tc) {
   return {

package/dist/adapters/openai.js

@@ -3,16 +3,16 @@ function openaiAdapter(config) {
   let client = null;
   async function getClient() {
     if (client) return client;
-    let OpenAI;
+    let OpenAICtor;
     try {
       const mod = await import("openai");
-      OpenAI = mod.OpenAI ?? mod.default;
+      OpenAICtor = mod.OpenAI ?? mod.default;
     } catch {
       throw new Error(
         '@matthesketh/utopia-ai: "openai" package is required for the OpenAI adapter. Install it with: npm install openai'
       );
     }
-    client = new OpenAI({
+    client = new OpenAICtor({
       apiKey: config.apiKey,
       baseURL: config.baseURL,
       organization: config.organization
@@ -38,11 +38,20 @@ function openaiAdapter(config) {
           body.tool_choice = toOpenAIToolChoice(request.toolChoice);
         }
       }
-      const response = await openai.chat.completions.create(body);
+      const response = await openai.chat.completions.create(
+        body
+      );
+      if (!response.choices?.length) {
+        throw new Error("OpenAI returned empty choices array");
+      }
       const choice = response.choices[0];
       return {
         content: choice.message.content ?? "",
-        toolCalls: choice.message.tool_calls?.map(fromOpenAIToolCall),
+        toolCalls: choice.message.tool_calls?.map(
+          (tc) => fromOpenAIToolCall(
+            tc
+          )
+        ),
         finishReason: mapFinishReason(choice.finish_reason),
         usage: response.usage ? {
           promptTokens: response.usage.prompt_tokens,
@@ -72,7 +81,9 @@ function openaiAdapter(config) {
           body.tool_choice = toOpenAIToolChoice(request.toolChoice);
         }
       }
-      const stream = await openai.chat.completions.create(body);
+      const stream = await openai.chat.completions.create(
+        body
+      );
       for await (const chunk of stream) {
         const delta = chunk.choices?.[0]?.delta;
         const finishReason = chunk.choices?.[0]?.finish_reason;
@@ -184,7 +195,7 @@ function toOpenAIToolChoice(choice) {
   if (choice && typeof choice === "object" && "name" in choice) {
     return { type: "function", function: { name: choice.name } };
   }
-  return choice;
+  return void 0;
 }
 function fromOpenAIToolCall(tc) {
   return {

package/dist/index.cjs

@@ -44,7 +44,10 @@ function createAI(adapter, options) {
         }
         return response;
       } catch (err) {
-        hooks?.onError?.(err, { method: "chat", request: req });
+        hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+          method: "chat",
+          request: req
+        });
         throw err;
       }
     },
@@ -58,7 +61,10 @@ function createAI(adapter, options) {
         try {
           yield* source.call(adapter, req);
         } catch (err) {
-          hooks?.onError?.(err, { method: "stream", request: req });
+          hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+            method: "stream",
+            request: req
+          });
           throw err;
         }
       };
@@ -71,12 +77,7 @@ function createAI(adapter, options) {
       return adapter.embeddings(request);
     },
     async run(options2) {
-      const {
-        tools,
-        maxRounds = 10,
-        onToolCall,
-        ...requestBase
-      } = options2;
+      const { tools, maxRounds = 10, onToolCall, ...requestBase } = options2;
       const messages = [...options2.messages];
       const toolDefs = tools.map((t) => t.definition);
       const handlerMap = new Map(tools.map((t) => [t.definition.name, t.handler]));
@@ -95,7 +96,10 @@ function createAI(adapter, options) {
         try {
           response = await withRetry(() => adapter.chat(req2), retry);
         } catch (err) {
-          hooks?.onError?.(err, { method: "run", request: req2 });
+          hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+            method: "run",
+            request: req2
+          });
           throw err;
         }
         if (hooks?.onAfterChat) {
@@ -124,19 +128,21 @@ function createAI(adapter, options) {
             try {
               result = await handler(call.arguments);
             } catch (err) {
-              result = err.message ?? String(err);
+              result = err instanceof Error ? err.message : String(err);
               isError = true;
             }
           }
           onToolCall?.(call, result);
           messages.push({
             role: "tool",
-            content: [{
-              type: "tool_result",
-              id: call.id,
-              content: typeof result === "string" ? result : JSON.stringify(result),
-              isError
-            }]
+            content: [
+              {
+                type: "tool_result",
+                id: call.id,
+                content: typeof result === "string" ? result : JSON.stringify(result),
+                isError
+              }
+            ]
           });
         }
       }
@@ -154,7 +160,10 @@ function createAI(adapter, options) {
       try {
         finalResponse = await withRetry(() => adapter.chat(req), retry);
       } catch (err) {
-        hooks?.onError?.(err, { method: "run", request: req });
+        hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+          method: "run",
+          request: req
+        });
         throw err;
       }
       if (hooks?.onAfterChat) {
@@ -173,8 +182,8 @@ async function withRetry(fn, config) {
     try {
       return await fn();
     } catch (err) {
-      lastError = err;
-      if (attempt < maxRetries && shouldRetry(err)) {
+      lastError = err instanceof Error ? err : new Error(String(err));
+      if (attempt < maxRetries && shouldRetry(lastError)) {
         await sleep(baseDelay * Math.pow(2, attempt));
         continue;
       }
@@ -204,17 +213,20 @@ async function streamSSE(res, stream, options) {
   res.writeHead(200, {
     "Content-Type": "text/event-stream",
     "Cache-Control": "no-cache",
-    "Connection": "keep-alive",
+    Connection: "keep-alive",
     "X-Accel-Buffering": "no"
   });
-  for await (const chunk of stream) {
-    options?.onChunk?.(chunk);
-    res.write(`data: ${JSON.stringify(chunk)}
+  try {
+    for await (const chunk of stream) {
+      options?.onChunk?.(chunk);
+      res.write(`data: ${JSON.stringify(chunk)}
 
 `);
+    }
+    res.write("data: [DONE]\n\n");
+  } finally {
+    res.end();
   }
-  res.write("data: [DONE]\n\n");
-  res.end();
 }
 async function collectStream(stream) {
   let result = "";
@@ -224,25 +236,33 @@ async function collectStream(stream) {
   return result;
 }
 async function* parseSSEStream(response) {
+  if (!response.body) {
+    throw new Error("Response body is null \u2014 streaming not supported");
+  }
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
   let buffer = "";
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split("\n");
-    buffer = lines.pop() ?? "";
-    for (const line of lines) {
-      if (line.startsWith("data: ")) {
-        const data = line.slice(6).trim();
-        if (data === "[DONE]") return;
-        try {
-          yield JSON.parse(data);
-        } catch {
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        if (line.startsWith("data: ")) {
+          const data = line.slice(6).trim();
+          if (data === "[DONE]") return;
+          try {
+            yield JSON.parse(data);
+          } catch {
+          }
         }
       }
     }
+  } finally {
+    reader.cancel().catch(() => {
+    });
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.js

@@ -15,7 +15,10 @@ function createAI(adapter, options) {
         }
         return response;
       } catch (err) {
-        hooks?.onError?.(err, { method: "chat", request: req });
+        hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+          method: "chat",
+          request: req
+        });
         throw err;
       }
     },
@@ -29,7 +32,10 @@ function createAI(adapter, options) {
         try {
           yield* source.call(adapter, req);
         } catch (err) {
-          hooks?.onError?.(err, { method: "stream", request: req });
+          hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+            method: "stream",
+            request: req
+          });
           throw err;
         }
       };
@@ -42,12 +48,7 @@ function createAI(adapter, options) {
       return adapter.embeddings(request);
     },
     async run(options2) {
-      const {
-        tools,
-        maxRounds = 10,
-        onToolCall,
-        ...requestBase
-      } = options2;
+      const { tools, maxRounds = 10, onToolCall, ...requestBase } = options2;
       const messages = [...options2.messages];
       const toolDefs = tools.map((t) => t.definition);
       const handlerMap = new Map(tools.map((t) => [t.definition.name, t.handler]));
@@ -66,7 +67,10 @@ function createAI(adapter, options) {
         try {
           response = await withRetry(() => adapter.chat(req2), retry);
         } catch (err) {
-          hooks?.onError?.(err, { method: "run", request: req2 });
+          hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+            method: "run",
+            request: req2
+          });
           throw err;
         }
         if (hooks?.onAfterChat) {
@@ -95,19 +99,21 @@ function createAI(adapter, options) {
             try {
               result = await handler(call.arguments);
             } catch (err) {
-              result = err.message ?? String(err);
+              result = err instanceof Error ? err.message : String(err);
               isError = true;
             }
           }
           onToolCall?.(call, result);
           messages.push({
             role: "tool",
-            content: [{
-              type: "tool_result",
-              id: call.id,
-              content: typeof result === "string" ? result : JSON.stringify(result),
-              isError
-            }]
+            content: [
+              {
+                type: "tool_result",
+                id: call.id,
+                content: typeof result === "string" ? result : JSON.stringify(result),
+                isError
+              }
+            ]
           });
         }
       }
@@ -125,7 +131,10 @@ function createAI(adapter, options) {
       try {
         finalResponse = await withRetry(() => adapter.chat(req), retry);
       } catch (err) {
-        hooks?.onError?.(err, { method: "run", request: req });
+        hooks?.onError?.(err instanceof Error ? err : new Error(String(err)), {
+          method: "run",
+          request: req
+        });
         throw err;
       }
       if (hooks?.onAfterChat) {
@@ -144,8 +153,8 @@ async function withRetry(fn, config) {
     try {
       return await fn();
     } catch (err) {
-      lastError = err;
-      if (attempt < maxRetries && shouldRetry(err)) {
+      lastError = err instanceof Error ? err : new Error(String(err));
+      if (attempt < maxRetries && shouldRetry(lastError)) {
         await sleep(baseDelay * Math.pow(2, attempt));
         continue;
       }
@@ -175,17 +184,20 @@ async function streamSSE(res, stream, options) {
   res.writeHead(200, {
     "Content-Type": "text/event-stream",
     "Cache-Control": "no-cache",
-    "Connection": "keep-alive",
+    Connection: "keep-alive",
     "X-Accel-Buffering": "no"
   });
-  for await (const chunk of stream) {
-    options?.onChunk?.(chunk);
-    res.write(`data: ${JSON.stringify(chunk)}
+  try {
+    for await (const chunk of stream) {
+      options?.onChunk?.(chunk);
+      res.write(`data: ${JSON.stringify(chunk)}
 
 `);
+    }
+    res.write("data: [DONE]\n\n");
+  } finally {
+    res.end();
   }
-  res.write("data: [DONE]\n\n");
-  res.end();
 }
 async function collectStream(stream) {
   let result = "";
@@ -195,25 +207,33 @@ async function collectStream(stream) {
   return result;
 }
 async function* parseSSEStream(response) {
+  if (!response.body) {
+    throw new Error("Response body is null \u2014 streaming not supported");
+  }
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
   let buffer = "";
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    buffer += decoder.decode(value, { stream: true });
-    const lines = buffer.split("\n");
-    buffer = lines.pop() ?? "";
-    for (const line of lines) {
-      if (line.startsWith("data: ")) {
-        const data = line.slice(6).trim();
-        if (data === "[DONE]") return;
-        try {
-          yield JSON.parse(data);
-        } catch {
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n");
+      buffer = lines.pop() ?? "";
+      for (const line of lines) {
+        if (line.startsWith("data: ")) {
+          const data = line.slice(6).trim();
+          if (data === "[DONE]") return;
+          try {
+            yield JSON.parse(data);
+          } catch {
+          }
         }
       }
     }
+  } finally {
+    reader.cancel().catch(() => {
+    });
   }
 }
 export {

package/dist/mcp/index.cjs

@@ -47,13 +47,14 @@ function createMCPServer(config) {
       const result = await dispatch(request);
       return { jsonrpc: "2.0", id: request.id, result };
     } catch (err) {
+      const rpcErr = err;
       return {
         jsonrpc: "2.0",
         id: request.id,
         error: {
-          code: err.code ?? -32603,
-          message: err.message ?? "Internal error",
-          data: err.data
+          code: rpcErr.code ?? -32603,
+          message: rpcErr.message ?? "Internal error",
+          data: rpcErr.data
         }
       };
     }
@@ -139,7 +140,8 @@ function createMCPServer(config) {
   return { handleRequest, info: () => serverInfo };
 }
 function matchesTemplate(pattern, uri) {
-  const regex = pattern.replace(/\{[^}]+\}/g, "([^/]+)");
+  const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const regex = escaped.replace(/\\\{[^\\}]+\\\}/g, "([^/]+)");
   return new RegExp(`^${regex}$`).test(uri);
 }
 function makeError(code, message) {
@@ -162,7 +164,8 @@ function createMCPClient(config) {
         "Content-Type": "application/json",
         ...config.headers
       },
-      body: JSON.stringify(request)
+      body: JSON.stringify(request),
+      signal: AbortSignal.timeout(3e4)
     });
     if (!response.ok) {
       const text = await response.text();
@@ -170,29 +173,28 @@ function createMCPClient(config) {
     }
     const result = await response.json();
     if (result.error) {
-      const err = new Error(result.error.message);
-      err.code = result.error.code;
-      err.data = result.error.data;
+      const err = Object.assign(new Error(result.error.message), {
+        code: result.error.code,
+        data: result.error.data
+      });
       throw err;
     }
     return result.result;
   }
   return {
     async initialize() {
-      const result = await rpc("initialize", {
+      return rpc("initialize", {
         protocolVersion: "2024-11-05",
         capabilities: {},
         clientInfo: { name: "utopia-mcp-client", version: "1.0.0" }
       });
-      return result;
     },
     async listTools() {
       const result = await rpc("tools/list");
       return result.tools ?? [];
     },
     async callTool(name, args) {
-      const result = await rpc("tools/call", { name, arguments: args });
-      return result;
+      return rpc("tools/call", { name, arguments: args });
     },
     async listResources() {
       const result = await rpc("resources/list");
@@ -207,27 +209,28 @@ function createMCPClient(config) {
       return result.prompts ?? [];
     },
     async getPrompt(name, args) {
-      const result = await rpc("prompts/get", { name, arguments: args });
-      return result;
+      return rpc("prompts/get", { name, arguments: args });
     },
     async toToolHandlers() {
       const tools = await this.listTools();
-      return tools.map((tool) => ({
-        definition: {
-          name: tool.name,
-          description: tool.description,
-          parameters: tool.inputSchema
-        },
-        handler: async (args) => {
-          const result = await this.callTool(tool.name, args);
-          if (result.isError) {
-            throw new Error(
-              result.content.map((c) => c.text ?? "").join("\n") || "Tool call failed"
-            );
+      return tools.map(
+        (tool) => ({
+          definition: {
+            name: tool.name,
+            description: tool.description,
+            parameters: tool.inputSchema
+          },
+          handler: async (args) => {
+            const result = await this.callTool(tool.name, args);
+            if (result.isError) {
+              throw new Error(
+                result.content.map((c) => c.text ?? "").join("\n") || "Tool call failed"
+              );
+            }
+            return result.content.map((c) => c.text ?? "").join("\n");
           }
-          return result.content.map((c) => c.text ?? "").join("\n");
-        }
-      }));
+        })
+      );
     }
   };
 }
@@ -265,18 +268,24 @@ async function handlePost(server, req, res) {
     res.end(JSON.stringify(response));
   } catch (err) {
     res.writeHead(400, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({
-      jsonrpc: "2.0",
-      id: null,
-      error: { code: -32700, message: "Parse error", data: err.message }
-    }));
+    res.end(
+      JSON.stringify({
+        jsonrpc: "2.0",
+        id: null,
+        error: {
+          code: -32700,
+          message: "Parse error",
+          data: err instanceof Error ? err.message : String(err)
+        }
+      })
+    );
   }
 }
 function handleSSE(server, _req, res) {
   res.writeHead(200, {
     "Content-Type": "text/event-stream",
     "Cache-Control": "no-cache",
-    "Connection": "keep-alive"
+    Connection: "keep-alive"
   });
   const endpointUrl = "./";
   res.write(`event: endpoint

package/dist/mcp/index.d.cts

@@ -170,27 +170,6 @@ interface MCPClient {
      */
     toToolHandlers(): Promise<ToolHandler[]>;
 }
-/**
- * Create an MCP client that connects to an MCP server over HTTP.
- *
- * ```ts
- * import { createMCPClient } from '@matthesketh/utopia-ai/mcp';
- *
- * const client = createMCPClient({ url: 'http://localhost:3001/mcp' });
- * await client.initialize();
- *
- * const tools = await client.listTools();
- * const result = await client.callTool('get_weather', { city: 'NYC' });
- *
- * // Bridge MCP tools into AI tool loop
- * const ai = createAI(openaiAdapter({ apiKey: '...' }));
- * const toolHandlers = await client.toToolHandlers();
- * const response = await ai.run({
- *   messages: [{ role: 'user', content: 'What is the weather?' }],
- *   tools: toolHandlers,
- * });
- * ```
- */
 declare function createMCPClient(config: MCPClientConfig): MCPClient;
 
 /**

package/dist/mcp/index.d.ts

@@ -170,27 +170,6 @@ interface MCPClient {
      */
     toToolHandlers(): Promise<ToolHandler[]>;
 }
-/**
- * Create an MCP client that connects to an MCP server over HTTP.
- *
- * ```ts
- * import { createMCPClient } from '@matthesketh/utopia-ai/mcp';
- *
- * const client = createMCPClient({ url: 'http://localhost:3001/mcp' });
- * await client.initialize();
- *
- * const tools = await client.listTools();
- * const result = await client.callTool('get_weather', { city: 'NYC' });
- *
- * // Bridge MCP tools into AI tool loop
- * const ai = createAI(openaiAdapter({ apiKey: '...' }));
- * const toolHandlers = await client.toToolHandlers();
- * const response = await ai.run({
- *   messages: [{ role: 'user', content: 'What is the weather?' }],
- *   tools: toolHandlers,
- * });
- * ```
- */
 declare function createMCPClient(config: MCPClientConfig): MCPClient;
 
 /**

package/dist/mcp/index.js

@@ -19,13 +19,14 @@ function createMCPServer(config) {
       const result = await dispatch(request);
       return { jsonrpc: "2.0", id: request.id, result };
     } catch (err) {
+      const rpcErr = err;
       return {
         jsonrpc: "2.0",
         id: request.id,
         error: {
-          code: err.code ?? -32603,
-          message: err.message ?? "Internal error",
-          data: err.data
+          code: rpcErr.code ?? -32603,
+          message: rpcErr.message ?? "Internal error",
+          data: rpcErr.data
         }
       };
     }
@@ -111,7 +112,8 @@ function createMCPServer(config) {
   return { handleRequest, info: () => serverInfo };
 }
 function matchesTemplate(pattern, uri) {
-  const regex = pattern.replace(/\{[^}]+\}/g, "([^/]+)");
+  const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const regex = escaped.replace(/\\\{[^\\}]+\\\}/g, "([^/]+)");
   return new RegExp(`^${regex}$`).test(uri);
 }
 function makeError(code, message) {
@@ -134,7 +136,8 @@ function createMCPClient(config) {
         "Content-Type": "application/json",
         ...config.headers
       },
-      body: JSON.stringify(request)
+      body: JSON.stringify(request),
+      signal: AbortSignal.timeout(3e4)
     });
     if (!response.ok) {
       const text = await response.text();
@@ -142,29 +145,28 @@ function createMCPClient(config) {
     }
     const result = await response.json();
     if (result.error) {
-      const err = new Error(result.error.message);
-      err.code = result.error.code;
-      err.data = result.error.data;
+      const err = Object.assign(new Error(result.error.message), {
+        code: result.error.code,
+        data: result.error.data
+      });
       throw err;
     }
     return result.result;
   }
   return {
     async initialize() {
-      const result = await rpc("initialize", {
+      return rpc("initialize", {
         protocolVersion: "2024-11-05",
         capabilities: {},
         clientInfo: { name: "utopia-mcp-client", version: "1.0.0" }
       });
-      return result;
     },
     async listTools() {
       const result = await rpc("tools/list");
       return result.tools ?? [];
     },
     async callTool(name, args) {
-      const result = await rpc("tools/call", { name, arguments: args });
-      return result;
+      return rpc("tools/call", { name, arguments: args });
     },
     async listResources() {
       const result = await rpc("resources/list");
@@ -179,27 +181,28 @@ function createMCPClient(config) {
       return result.prompts ?? [];
     },
     async getPrompt(name, args) {
-      const result = await rpc("prompts/get", { name, arguments: args });
-      return result;
+      return rpc("prompts/get", { name, arguments: args });
     },
     async toToolHandlers() {
       const tools = await this.listTools();
-      return tools.map((tool) => ({
-        definition: {
-          name: tool.name,
-          description: tool.description,
-          parameters: tool.inputSchema
-        },
-        handler: async (args) => {
-          const result = await this.callTool(tool.name, args);
-          if (result.isError) {
-            throw new Error(
-              result.content.map((c) => c.text ?? "").join("\n") || "Tool call failed"
-            );
+      return tools.map(
+        (tool) => ({
+          definition: {
+            name: tool.name,
+            description: tool.description,
+            parameters: tool.inputSchema
+          },
+          handler: async (args) => {
+            const result = await this.callTool(tool.name, args);
+            if (result.isError) {
+              throw new Error(
+                result.content.map((c) => c.text ?? "").join("\n") || "Tool call failed"
+              );
+            }
+            return result.content.map((c) => c.text ?? "").join("\n");
           }
-          return result.content.map((c) => c.text ?? "").join("\n");
-        }
-      }));
+        })
+      );
     }
   };
 }
@@ -237,18 +240,24 @@ async function handlePost(server, req, res) {
     res.end(JSON.stringify(response));
   } catch (err) {
     res.writeHead(400, { "Content-Type": "application/json" });
-    res.end(JSON.stringify({
-      jsonrpc: "2.0",
-      id: null,
-      error: { code: -32700, message: "Parse error", data: err.message }
-    }));
+    res.end(
+      JSON.stringify({
+        jsonrpc: "2.0",
+        id: null,
+        error: {
+          code: -32700,
+          message: "Parse error",
+          data: err instanceof Error ? err.message : String(err)
+        }
+      })
+    );
   }
 }
 function handleSSE(server, _req, res) {
   res.writeHead(200, {
     "Content-Type": "text/event-stream",
     "Cache-Control": "no-cache",
-    "Connection": "keep-alive"
+    Connection: "keep-alive"
   });
   const endpointUrl = "./";
   res.write(`event: endpoint

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matthesketh/utopia-ai",
-  "version": "0.0.5",
+  "version": "0.2.0",
   "description": "AI adapters and MCP support for UtopiaJS",
   "type": "module",
   "license": "MIT",
@@ -67,9 +67,9 @@
     "dist"
   ],
   "peerDependencies": {
-    "@anthropic-ai/sdk": "^0.30.0",
-    "@google/generative-ai": "^0.21.0",
-    "openai": "^4.0.0"
+    "@anthropic-ai/sdk": "^0.30.0 || ^0.74.0",
+    "@google/generative-ai": "^0.21.0 || ^0.24.0",
+    "openai": "^4.0.0 || ^5.0.0 || ^6.0.0"
   },
   "peerDependenciesMeta": {
     "openai": {