@matthesketh/utopia-ai 0.4.0 → 0.7.0

package/dist/adapters/ollama.cjs

@@ -20,12 +20,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/adapters/ollama.ts
 var ollama_exports = {};
 __export(ollama_exports, {
+  TRAILING_SLASH_RE: () => TRAILING_SLASH_RE,
   ollamaAdapter: () => ollamaAdapter
 });
 module.exports = __toCommonJS(ollama_exports);
+var TRAILING_SLASH_RE = /\/$/;
 var ollamaToolCallCounter = 0;
 function ollamaAdapter(config = {}) {
-  const baseURL = (config.baseURL ?? "http://localhost:11434").replace(/\/$/, "");
+  const baseURL = (config.baseURL ?? "http://localhost:11434").replace(TRAILING_SLASH_RE, "");
   return {
     async chat(request) {
       const model = request.model ?? config.defaultModel ?? "llama3.2";
@@ -194,5 +196,6 @@ function toOllamaTool(tool) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  TRAILING_SLASH_RE,
   ollamaAdapter
 });

package/dist/adapters/ollama.d.cts

@@ -1,5 +1,7 @@
 import { O as OllamaConfig, A as AIAdapter } from '../types-FSnS43LM.cjs';
 
+/** Matches a trailing slash for URL normalization. */
+declare const TRAILING_SLASH_RE: RegExp;
 /**
  * Create an Ollama adapter for local models.
  *
@@ -14,4 +16,4 @@ import { O as OllamaConfig, A as AIAdapter } from '../types-FSnS43LM.cjs';
  */
 declare function ollamaAdapter(config?: OllamaConfig): AIAdapter;
 
-export { ollamaAdapter };
+export { TRAILING_SLASH_RE, ollamaAdapter };

package/dist/adapters/ollama.d.ts

@@ -1,5 +1,7 @@
 import { O as OllamaConfig, A as AIAdapter } from '../types-FSnS43LM.js';
 
+/** Matches a trailing slash for URL normalization. */
+declare const TRAILING_SLASH_RE: RegExp;
 /**
  * Create an Ollama adapter for local models.
  *
@@ -14,4 +16,4 @@ import { O as OllamaConfig, A as AIAdapter } from '../types-FSnS43LM.js';
  */
 declare function ollamaAdapter(config?: OllamaConfig): AIAdapter;
 
-export { ollamaAdapter };
+export { TRAILING_SLASH_RE, ollamaAdapter };

package/dist/adapters/ollama.js

@@ -1,7 +1,8 @@
 // src/adapters/ollama.ts
+var TRAILING_SLASH_RE = /\/$/;
 var ollamaToolCallCounter = 0;
 function ollamaAdapter(config = {}) {
-  const baseURL = (config.baseURL ?? "http://localhost:11434").replace(/\/$/, "");
+  const baseURL = (config.baseURL ?? "http://localhost:11434").replace(TRAILING_SLASH_RE, "");
   return {
     async chat(request) {
       const model = request.model ?? config.defaultModel ?? "llama3.2";
@@ -169,5 +170,6 @@ function toOllamaTool(tool) {
   };
 }
 export {
+  TRAILING_SLASH_RE,
   ollamaAdapter
 };

package/dist/mcp/index.cjs

@@ -139,9 +139,11 @@ function createMCPServer(config) {
   }
   return { handleRequest, info: () => serverInfo };
 }
+var REGEX_SPECIAL_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
+var TEMPLATE_PLACEHOLDER_RE = /\\\{[^\\}]+\\\}/g;
 function matchesTemplate(pattern, uri) {
-  const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const regex = escaped.replace(/\\\{[^\\}]+\\\}/g, "([^/]+)");
+  const escaped = pattern.replace(REGEX_SPECIAL_CHARS_RE, "\\$&");
+  const regex = escaped.replace(TEMPLATE_PLACEHOLDER_RE, "([^/]+)");
   return new RegExp(`^${regex}$`).test(uri);
 }
 function makeError(code, message) {
@@ -236,9 +238,10 @@ function createMCPClient(config) {
 }
 
 // src/mcp/handler.ts
-function createMCPHandler(server) {
+function createMCPHandler(server, options) {
+  const corsOrigin = options?.corsOrigin ?? "*";
   return async (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", "*");
+    res.setHeader("Access-Control-Allow-Origin", corsOrigin);
     res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
     if (req.method === "OPTIONS") {
@@ -267,6 +270,7 @@ async function handlePost(server, req, res) {
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(JSON.stringify(response));
   } catch (err) {
+    const data = err instanceof SyntaxError ? err.message : "Invalid request";
     res.writeHead(400, { "Content-Type": "application/json" });
     res.end(
       JSON.stringify({
@@ -275,7 +279,7 @@ async function handlePost(server, req, res) {
         error: {
           code: -32700,
           message: "Parse error",
-          data: err instanceof Error ? err.message : String(err)
+          data
         }
       })
     );

package/dist/mcp/index.d.cts

@@ -172,6 +172,9 @@ interface MCPClient {
 }
 declare function createMCPClient(config: MCPClientConfig): MCPClient;
 
+interface MCPHandlerOptions {
+    corsOrigin?: string;
+}
 /**
  * Create a Node.js HTTP handler for an MCP server.
  *
@@ -186,12 +189,12 @@ declare function createMCPClient(config: MCPClientConfig): MCPClient;
  * import { createMCPHandler } from '@matthesketh/utopia-ai/mcp';
  *
  * const mcp = createMCPServer({ name: 'my-app', tools: [...] });
- * const handler = createMCPHandler(mcp);
+ * const handler = createMCPHandler(mcp, { corsOrigin: 'https://example.com' });
  *
  * http.createServer(handler).listen(3001);
  * // or use as middleware: app.use('/mcp', handler);
  * ```
  */
-declare function createMCPHandler(server: MCPServer): (req: IncomingMessage, res: ServerResponse) => void;
+declare function createMCPHandler(server: MCPServer, options?: MCPHandlerOptions): (req: IncomingMessage, res: ServerResponse) => void;
 
 export { type JsonRpcError, type JsonRpcNotification, type JsonRpcRequest, type JsonRpcResponse, type MCPClient, type MCPClientConfig, type MCPContent, type MCPPromptArgument, type MCPPromptDefinition, type MCPPromptHandler, type MCPPromptResult, type MCPResourceContent, type MCPResourceDefinition, type MCPResourceHandler, type MCPServer, type MCPServerConfig, type MCPServerInfo, type MCPToolDefinition, type MCPToolHandler, type MCPToolResult, createMCPClient, createMCPHandler, createMCPServer };

package/dist/mcp/index.d.ts

@@ -172,6 +172,9 @@ interface MCPClient {
 }
 declare function createMCPClient(config: MCPClientConfig): MCPClient;
 
+interface MCPHandlerOptions {
+    corsOrigin?: string;
+}
 /**
  * Create a Node.js HTTP handler for an MCP server.
  *
@@ -186,12 +189,12 @@ declare function createMCPClient(config: MCPClientConfig): MCPClient;
  * import { createMCPHandler } from '@matthesketh/utopia-ai/mcp';
  *
  * const mcp = createMCPServer({ name: 'my-app', tools: [...] });
- * const handler = createMCPHandler(mcp);
+ * const handler = createMCPHandler(mcp, { corsOrigin: 'https://example.com' });
  *
  * http.createServer(handler).listen(3001);
  * // or use as middleware: app.use('/mcp', handler);
  * ```
  */
-declare function createMCPHandler(server: MCPServer): (req: IncomingMessage, res: ServerResponse) => void;
+declare function createMCPHandler(server: MCPServer, options?: MCPHandlerOptions): (req: IncomingMessage, res: ServerResponse) => void;
 
 export { type JsonRpcError, type JsonRpcNotification, type JsonRpcRequest, type JsonRpcResponse, type MCPClient, type MCPClientConfig, type MCPContent, type MCPPromptArgument, type MCPPromptDefinition, type MCPPromptHandler, type MCPPromptResult, type MCPResourceContent, type MCPResourceDefinition, type MCPResourceHandler, type MCPServer, type MCPServerConfig, type MCPServerInfo, type MCPToolDefinition, type MCPToolHandler, type MCPToolResult, createMCPClient, createMCPHandler, createMCPServer };

package/dist/mcp/index.js

@@ -111,9 +111,11 @@ function createMCPServer(config) {
   }
   return { handleRequest, info: () => serverInfo };
 }
+var REGEX_SPECIAL_CHARS_RE = /[.*+?^${}()|[\]\\]/g;
+var TEMPLATE_PLACEHOLDER_RE = /\\\{[^\\}]+\\\}/g;
 function matchesTemplate(pattern, uri) {
-  const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const regex = escaped.replace(/\\\{[^\\}]+\\\}/g, "([^/]+)");
+  const escaped = pattern.replace(REGEX_SPECIAL_CHARS_RE, "\\$&");
+  const regex = escaped.replace(TEMPLATE_PLACEHOLDER_RE, "([^/]+)");
   return new RegExp(`^${regex}$`).test(uri);
 }
 function makeError(code, message) {
@@ -208,9 +210,10 @@ function createMCPClient(config) {
 }
 
 // src/mcp/handler.ts
-function createMCPHandler(server) {
+function createMCPHandler(server, options) {
+  const corsOrigin = options?.corsOrigin ?? "*";
   return async (req, res) => {
-    res.setHeader("Access-Control-Allow-Origin", "*");
+    res.setHeader("Access-Control-Allow-Origin", corsOrigin);
     res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
     if (req.method === "OPTIONS") {
@@ -239,6 +242,7 @@ async function handlePost(server, req, res) {
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(JSON.stringify(response));
   } catch (err) {
+    const data = err instanceof SyntaxError ? err.message : "Invalid request";
     res.writeHead(400, { "Content-Type": "application/json" });
     res.end(
       JSON.stringify({
@@ -247,7 +251,7 @@ async function handlePost(server, req, res) {
         error: {
           code: -32700,
           message: "Parse error",
-          data: err instanceof Error ? err.message : String(err)
+          data
         }
       })
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matthesketh/utopia-ai",
-  "version": "0.4.0",
+  "version": "0.7.0",
   "description": "AI adapters and MCP support for UtopiaJS",
   "type": "module",
   "license": "MIT",