@neutrome/open-ai-router 0.1.15 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neutrome/open-ai-router",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "exports": {
     ".": "./src/index.ts"

package/src/index.ts

@@ -57,7 +57,7 @@ export type {
 } from "./router/index.ts";
 export {
   createRemoteMcpToolSet,
-  createSseMcpClient,
+  createStreamableHttpMcpClient,
   stringifyMcpToolResult,
   wireToolName,
 } from "./router/index.ts";

package/src/observer.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vitest";
+import { createTraceCollector } from "./observer.ts";
+
+describe("createTraceCollector", () => {
+  it("prefixes raw trace chunks with event comments", () => {
+    const collector = createTraceCollector("00000000-0000-4000-8000-000000000001");
+
+    collector.observe({
+      kind: "request.received",
+      requestId: "request-1",
+      executionId: "request-1",
+      timestamp: "2026-06-24T12:00:00.000Z",
+      data: { lilText: "MSG_START" },
+    });
+    collector.observe({
+      kind: "provider.started",
+      requestId: "request-1",
+      executionId: "provider-1",
+      timestamp: "2026-06-24T12:00:01.000Z",
+      data: { lilText: "SET_MODEL \"gpt-4o\"" },
+    });
+
+    expect(collector.getTrace().rawTrace).toBe(
+      ';request:0\nMSG_START\n\n;provider:1\nSET_MODEL "gpt-4o"',
+    );
+  });
+});

package/src/observer.ts

@@ -45,6 +45,7 @@ export function createTraceCollector(spanId = crypto.randomUUID()): {
   const executorSpans = new Map<string, TraceSpan>();
   const rawSegments: string[] = [];
   const startedAt = new Date().toISOString();
+  let rawSegmentIndex = 0;
   let finishedAt: string | undefined;
   let error: string | undefined;
 
@@ -152,10 +153,14 @@ export function createTraceCollector(spanId = crypto.randomUUID()): {
   function appendLilSegment(event: AuditEvent): void {
     const lilText = asString(event.data?.lilText)?.trim();
     if (!lilText) return;
-    rawSegments.push(lilText);
+    rawSegments.push(`;${traceSegmentLabel(event)}:${rawSegmentIndex++}\n${lilText}`);
   }
 }
 
+function traceSegmentLabel(event: AuditEvent): string {
+  return event.kind.split(".", 1)[0] || "trace";
+}
+
 export function renderProgramAsLil(program: Program): string {
   return program.code
     .map((instruction) => {

package/src/router/config.ts

@@ -38,7 +38,7 @@ export type RemoteMcpToolConfig = {
 };
 
 export type RemoteMcpServerConfig = {
-  type: "mcp_sse";
+  type: "mcp_streamable_http";
   url: string;
   headers?: Record<string, string>;
   tools: RemoteMcpToolConfig[];

package/src/router/execute.test.ts

@@ -118,8 +118,8 @@ describe("router execution", () => {
         },
         mcps: {
           crm: {
-            type: "mcp_sse",
-            url: "https://mcp.example.test/sse",
+            type: "mcp_streamable_http",
+            url: "https://mcp.example.test/mcp",
             headers: { authorization: "Bearer static" },
             tools: [{
               name: "lookup",

package/src/router/index.ts

@@ -13,7 +13,7 @@ export {
 export { listConfiguredModels, resolveInvocationTarget, resolveInvocationTargets } from "./resolve.ts";
 export {
   createRemoteMcpToolSet,
-  createSseMcpClient,
+  createStreamableHttpMcpClient,
   stringifyMcpToolResult,
   wireToolName,
 } from "./mcp.ts";

package/src/router/mcp.ts

@@ -1,5 +1,6 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import type { ExecutionContext, Tool } from "@neutrome/lil-engine";
 import type { RemoteMcpServerRuntime, RouterRuntime } from "./runtime.ts";
 
@@ -24,7 +25,7 @@ export function createRemoteMcpToolSet(
   factory?: RemoteMcpClientFactory,
 ): RemoteMcpToolSet {
   const pool = new RemoteMcpSessionPool(
-    factory ?? ((server, signal) => createSseMcpClient(server, signal, runtime.fetchImpl)),
+    factory ?? ((server, signal) => createStreamableHttpMcpClient(server, signal, runtime.fetchImpl)),
   );
   const tools: Tool[] = [];
   const usedNames = new Map<string, number>();
@@ -55,18 +56,18 @@ export function createRemoteMcpToolSet(
   return { tools, close: () => pool.closeAll() };
 }
 
-export async function createSseMcpClient(
+export async function createStreamableHttpMcpClient(
   server: RemoteMcpServerRuntime,
   signal?: AbortSignal,
   fetchImpl?: typeof fetch,
 ): Promise<RemoteMcpToolCallClient> {
   const client = new Client({ name: "open-ai-router", version: "0.1.0" });
-  const transport = new SSEClientTransport(new URL(server.url), {
+  const transport = new StreamableHTTPClientTransport(new URL(server.url), {
     requestInit: { headers: server.headers ?? {} },
     ...(fetchImpl ? { fetch: fetchImpl } : {}),
   });
   signal?.addEventListener("abort", () => void client.close(), { once: true });
-  await client.connect(transport);
+  await client.connect(transport as Transport);
   return {
     callTool(name, args) {
       return client.callTool({ name, arguments: args });