assistant-cloud 0.1.27 → 0.1.29

package/dist/instrumentMcpSampling.js

@@ -1,73 +1,66 @@
+//#region src/instrumentMcpSampling.ts
 /**
- * MCP sampling instrumentation utility.
- *
- * Wraps an MCP client's sampling handler to capture nested LLM calls
- * (sampling/createMessage requests) made during tool execution.
- * The captured data can be reported as child generation spans.
- */
-/**
- * Wraps an MCP sampling handler to intercept and measure sampling calls.
- *
- * @param handler - The original sampling handler from the MCP client
- * @param onSamplingCall - Callback invoked with metrics for each sampling call
- * @returns A wrapped handler that transparently captures sampling metrics
- *
- * @example
- * ```ts
- * const samplingCalls: SamplingCallData[] = [];
- * const wrapped = wrapSamplingHandler(
- *   originalHandler,
- *   (data) => samplingCalls.push(data),
- * );
- * // Use `wrapped` as the MCP client's sampling handler
- * // After tool execution, `samplingCalls` contains metrics for all nested LLM calls
- * ```
- */
-export function wrapSamplingHandler(handler, onSamplingCall) {
-    return async (request) => {
-        const startTime = Date.now();
-        const response = await handler(request);
-        const durationMs = Date.now() - startTime;
-        const modelId = response.model ?? request.params.modelPreferences?.hints?.[0]?.name;
-        const inputTokens = response.usage?.inputTokens ?? response.usage?.promptTokens;
-        const outputTokens = response.usage?.outputTokens ?? response.usage?.completionTokens;
-        const reasoningTokens = response.usage?.reasoningTokens;
-        const cachedInputTokens = response.usage?.cachedInputTokens;
-        onSamplingCall({
-            ...(modelId ? { model_id: modelId } : undefined),
-            ...(inputTokens != null ? { input_tokens: inputTokens } : undefined),
-            ...(outputTokens != null ? { output_tokens: outputTokens } : undefined),
-            ...(reasoningTokens != null
-                ? { reasoning_tokens: reasoningTokens }
-                : undefined),
-            ...(cachedInputTokens != null
-                ? { cached_input_tokens: cachedInputTokens }
-                : undefined),
-            duration_ms: durationMs,
-        });
-        return response;
-    };
+* Wraps an MCP sampling handler to intercept and measure sampling calls.
+*
+* @param handler - The original sampling handler from the MCP client
+* @param onSamplingCall - Callback invoked with metrics for each sampling call
+* @returns A wrapped handler that transparently captures sampling metrics
+*
+* @example
+* ```ts
+* const samplingCalls: SamplingCallData[] = [];
+* const wrapped = wrapSamplingHandler(
+*   originalHandler,
+*   (data) => samplingCalls.push(data),
+* );
+* // Use `wrapped` as the MCP client's sampling handler
+* // After tool execution, `samplingCalls` contains metrics for all nested LLM calls
+* ```
+*/
+function wrapSamplingHandler(handler, onSamplingCall) {
+	return async (request) => {
+		const startTime = Date.now();
+		const response = await handler(request);
+		const durationMs = Date.now() - startTime;
+		const modelId = response.model ?? request.params.modelPreferences?.hints?.[0]?.name;
+		const inputTokens = response.usage?.inputTokens ?? response.usage?.promptTokens;
+		const outputTokens = response.usage?.outputTokens ?? response.usage?.completionTokens;
+		const reasoningTokens = response.usage?.reasoningTokens;
+		const cachedInputTokens = response.usage?.cachedInputTokens;
+		onSamplingCall({
+			...modelId ? { model_id: modelId } : void 0,
+			...inputTokens != null ? { input_tokens: inputTokens } : void 0,
+			...outputTokens != null ? { output_tokens: outputTokens } : void 0,
+			...reasoningTokens != null ? { reasoning_tokens: reasoningTokens } : void 0,
+			...cachedInputTokens != null ? { cached_input_tokens: cachedInputTokens } : void 0,
+			duration_ms: durationMs
+		});
+		return response;
+	};
 }
 /**
- * Creates a collector that accumulates sampling call data during tool execution.
- * Use with `wrapSamplingHandler` to capture all sampling calls for a tool invocation.
- *
- * @example
- * ```ts
- * const collector = createSamplingCollector();
- * const wrappedHandler = wrapSamplingHandler(handler, collector.collect);
- * // ... execute MCP tool ...
- * const calls = collector.getCalls(); // SamplingCallData[]
- * ```
- */
-export function createSamplingCollector() {
-    const calls = [];
-    return {
-        collect: (data) => calls.push(data),
-        getCalls: () => [...calls],
-        reset: () => {
-            calls.length = 0;
-        },
-    };
+* Creates a collector that accumulates sampling call data during tool execution.
+* Use with `wrapSamplingHandler` to capture all sampling calls for a tool invocation.
+*
+* @example
+* ```ts
+* const collector = createSamplingCollector();
+* const wrappedHandler = wrapSamplingHandler(handler, collector.collect);
+* // ... execute MCP tool ...
+* const calls = collector.getCalls(); // SamplingCallData[]
+* ```
+*/
+function createSamplingCollector() {
+	const calls = [];
+	return {
+		collect: (data) => calls.push(data),
+		getCalls: () => [...calls],
+		reset: () => {
+			calls.length = 0;
+		}
+	};
 }
+//#endregion
+export { createSamplingCollector, wrapSamplingHandler };
+
 //# sourceMappingURL=instrumentMcpSampling.js.map

package/dist/instrumentMcpSampling.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentMcpSampling.js","sourceRoot":"","sources":["../src/instrumentMcpSampling.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAuCH;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAA2B,EAC3B,cAAgD;IAEhD,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;QAE1C,MAAM,OAAO,GACX,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;QAEtE,MAAM,WAAW,GACf,QAAQ,CAAC,KAAK,EAAE,WAAW,IAAI,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;QAC9D,MAAM,YAAY,GAChB,QAAQ,CAAC,KAAK,EAAE,YAAY,IAAI,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;QACnE,MAAM,eAAe,GAAG,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;QACxD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;QAE5D,cAAc,CAAC;YACb,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAChD,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YACvE,GAAG,CAAC,eAAe,IAAI,IAAI;gBACzB,CAAC,CAAC,EAAE,gBAAgB,EAAE,eAAe,EAAE;gBACvC,CAAC,CAAC,SAAS,CAAC;YACd,GAAG,CAAC,iBAAiB,IAAI,IAAI;gBAC3B,CAAC,CAAC,EAAE,mBAAmB,EAAE,iBAAiB,EAAE;gBAC5C,CAAC,CAAC,SAAS,CAAC;YACd,WAAW,EAAE,UAAU;SACxB,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,uBAAuB;IACrC,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,OAAO;QACL,OAAO,EAAE,CAAC,IAAsB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QACrD,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;QAC1B,KAAK,EAAE,GAAG,EAAE;YACV,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"instrumentMcpSampling.js","names":[],"sources":["../src/instrumentMcpSampling.ts"],"sourcesContent":["/**\n * MCP sampling instrumentation utility.\n *\n * Wraps an MCP client's sampling handler to capture nested LLM calls\n * (sampling/createMessage requests) made during tool execution.\n * The captured data can be reported as child generation spans.\n */\n\nexport type SamplingCallData = {\n  model_id?: string;\n  input_tokens?: number;\n  output_tokens?: number;\n  reasoning_tokens?: number;\n  cached_input_tokens?: number;\n  duration_ms?: number;\n};\n\nexport type McpSamplingHandler = (\n  request: McpSamplingRequest,\n) => Promise<McpSamplingResponse>;\n\nexport type McpSamplingRequest = {\n  method: \"sampling/createMessage\";\n  params: {\n    messages: unknown[];\n    modelPreferences?: { hints?: { name?: string }[] };\n    maxTokens?: number;\n    [key: string]: unknown;\n  };\n};\n\nexport type McpSamplingResponse = {\n  model?: string;\n  content: unknown;\n  usage?: {\n    inputTokens?: number;\n    outputTokens?: number;\n    promptTokens?: number;\n    completionTokens?: number;\n    reasoningTokens?: number;\n    cachedInputTokens?: number;\n  };\n  [key: string]: unknown;\n};\n\n/**\n * Wraps an MCP sampling handler to intercept and measure sampling calls.\n *\n * @param handler - The original sampling handler from the MCP client\n * @param onSamplingCall - Callback invoked with metrics for each sampling call\n * @returns A wrapped handler that transparently captures sampling metrics\n *\n * @example\n * ```ts\n * const samplingCalls: SamplingCallData[] = [];\n * const wrapped = wrapSamplingHandler(\n *   originalHandler,\n *   (data) => samplingCalls.push(data),\n * );\n * // Use `wrapped` as the MCP client's sampling handler\n * // After tool execution, `samplingCalls` contains metrics for all nested LLM calls\n * ```\n */\nexport function wrapSamplingHandler(\n  handler: McpSamplingHandler,\n  onSamplingCall: (data: SamplingCallData) => void,\n): McpSamplingHandler {\n  return async (request) => {\n    const startTime = Date.now();\n    const response = await handler(request);\n    const durationMs = Date.now() - startTime;\n\n    const modelId =\n      response.model ?? request.params.modelPreferences?.hints?.[0]?.name;\n\n    const inputTokens =\n      response.usage?.inputTokens ?? response.usage?.promptTokens;\n    const outputTokens =\n      response.usage?.outputTokens ?? response.usage?.completionTokens;\n    const reasoningTokens = response.usage?.reasoningTokens;\n    const cachedInputTokens = response.usage?.cachedInputTokens;\n\n    onSamplingCall({\n      ...(modelId ? { model_id: modelId } : undefined),\n      ...(inputTokens != null ? { input_tokens: inputTokens } : undefined),\n      ...(outputTokens != null ? { output_tokens: outputTokens } : undefined),\n      ...(reasoningTokens != null\n        ? { reasoning_tokens: reasoningTokens }\n        : undefined),\n      ...(cachedInputTokens != null\n        ? { cached_input_tokens: cachedInputTokens }\n        : undefined),\n      duration_ms: durationMs,\n    });\n\n    return response;\n  };\n}\n\n/**\n * Creates a collector that accumulates sampling call data during tool execution.\n * Use with `wrapSamplingHandler` to capture all sampling calls for a tool invocation.\n *\n * @example\n * ```ts\n * const collector = createSamplingCollector();\n * const wrappedHandler = wrapSamplingHandler(handler, collector.collect);\n * // ... execute MCP tool ...\n * const calls = collector.getCalls(); // SamplingCallData[]\n * ```\n */\nexport function createSamplingCollector() {\n  const calls: SamplingCallData[] = [];\n  return {\n    collect: (data: SamplingCallData) => calls.push(data),\n    getCalls: () => [...calls],\n    reset: () => {\n      calls.length = 0;\n    },\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AA+DA,SAAgB,oBACd,SACA,gBACoB;CACpB,OAAO,OAAO,YAAY;EACxB,MAAM,YAAY,KAAK,IAAI;EAC3B,MAAM,WAAW,MAAM,QAAQ,OAAO;EACtC,MAAM,aAAa,KAAK,IAAI,IAAI;EAEhC,MAAM,UACJ,SAAS,SAAS,QAAQ,OAAO,kBAAkB,QAAQ,IAAI;EAEjE,MAAM,cACJ,SAAS,OAAO,eAAe,SAAS,OAAO;EACjD,MAAM,eACJ,SAAS,OAAO,gBAAgB,SAAS,OAAO;EAClD,MAAM,kBAAkB,SAAS,OAAO;EACxC,MAAM,oBAAoB,SAAS,OAAO;EAE1C,eAAe;GACb,GAAI,UAAU,EAAE,UAAU,QAAQ,IAAI,KAAA;GACtC,GAAI,eAAe,OAAO,EAAE,cAAc,YAAY,IAAI,KAAA;GAC1D,GAAI,gBAAgB,OAAO,EAAE,eAAe,aAAa,IAAI,KAAA;GAC7D,GAAI,mBAAmB,OACnB,EAAE,kBAAkB,gBAAgB,IACpC,KAAA;GACJ,GAAI,qBAAqB,OACrB,EAAE,qBAAqB,kBAAkB,IACzC,KAAA;GACJ,aAAa;EACf,CAAC;EAED,OAAO;CACT;AACF;;;;;;;;;;;;;AAcA,SAAgB,0BAA0B;CACxC,MAAM,QAA4B,CAAC;CACnC,OAAO;EACL,UAAU,SAA2B,MAAM,KAAK,IAAI;EACpD,gBAAgB,CAAC,GAAG,KAAK;EACzB,aAAa;GACX,MAAM,SAAS;EACjB;CACF;AACF"}

package/dist/tests/setup.d.ts

@@ -1,2 +1 @@
-export {};
-//# sourceMappingURL=setup.d.ts.map
+export { };

package/dist/tests/setup.js

@@ -1,10 +1,9 @@
-// This file contains setup code for tests
 import { vi } from "vitest";
-// Set up globalThis mocks if needed
-// Using a fixed date to avoid recursive calls
+//#region src/tests/setup.ts
 const OriginalDate = globalThis.Date;
 const fixedDate = new OriginalDate("2023-01-01");
 globalThis.Date = vi.fn(() => fixedDate);
 globalThis.Date.now = vi.fn(() => fixedDate.getTime());
-// Add any other globalThis setup needed for tests
+//#endregion
+
 //# sourceMappingURL=setup.js.map

package/dist/tests/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/tests/setup.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE5B,oCAAoC;AACpC,8CAA8C;AAC9C,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC;AACrC,MAAM,SAAS,GAAG,IAAI,YAAY,CAAC,YAAY,CAAC,CAAC;AACjD,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAQ,CAAC;AAChD,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;AAEvD,kDAAkD"}
+{"version":3,"file":"setup.js","names":[],"sources":["../../src/tests/setup.ts"],"sourcesContent":["// This file contains setup code for tests\nimport { vi } from \"vitest\";\n\n// Set up globalThis mocks if needed\n// Using a fixed date to avoid recursive calls\nconst OriginalDate = globalThis.Date;\nconst fixedDate = new OriginalDate(\"2023-01-01\");\nglobalThis.Date = vi.fn(() => fixedDate) as any;\nglobalThis.Date.now = vi.fn(() => fixedDate.getTime());\n\n// Add any other globalThis setup needed for tests\n"],"mappings":";;AAKA,MAAM,eAAe,WAAW;AAChC,MAAM,YAAY,IAAI,aAAa,YAAY;AAC/C,WAAW,OAAO,GAAG,SAAS,SAAS;AACvC,WAAW,KAAK,MAAM,GAAG,SAAS,UAAU,QAAQ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistant-cloud",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Cloud integration for assistant-ui",
   "keywords": [
     "assistant",
@@ -27,12 +27,12 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "assistant-stream": "^0.3.12"
+    "assistant-stream": "^0.3.16"
   },
   "devDependencies": {
-    "@types/node": "^25.6.0",
-    "vitest": "^4.1.5",
-    "@assistant-ui/x-buildutils": "0.0.6"
+    "@types/node": "^25.9.1",
+    "vitest": "^4.1.7",
+    "@assistant-ui/x-buildutils": "0.0.9"
   },
   "publishConfig": {
     "access": "public",

package/src/AssistantCloudAPI.ts

@@ -24,6 +24,7 @@ export type AssistantCloudConfig = (
       authToken: () => Promise<string | null>;
     }
   | {
+      baseUrl?: string;
       apiKey: string;
       userId: string;
       workspaceId: string;
@@ -70,7 +71,9 @@ export class AssistantCloudAPI {
       this._baseUrl = config.baseUrl;
       this._auth = new AssistantCloudJWTAuthStrategy(config.authToken);
     } else if ("apiKey" in config) {
-      this._baseUrl = "https://backend.assistant-api.com";
+      this._baseUrl = (
+        config.baseUrl ?? "https://backend.assistant-api.com"
+      ).replace(/\/$/, "");
       this._auth = new AssistantCloudAPIKeyAuthStrategy(
         config.apiKey,
         config.userId,

package/src/tests/AssistantCloudAPI.test.ts

@@ -48,6 +48,48 @@ describe("AssistantCloudAPI", () => {
     expect(init.body).toBe(JSON.stringify({ hello: "world" }));
   });
 
+  it("uses custom baseUrl when provided with apiKey config", async () => {
+    const fetchMock = vi.fn().mockResolvedValue({
+      ok: true,
+      headers: new Headers(),
+      json: vi.fn().mockResolvedValue({}),
+    });
+    vi.stubGlobal("fetch", fetchMock);
+
+    const api = new AssistantCloudAPI({
+      baseUrl: "https://custom.example.com",
+      apiKey: "test-key",
+      userId: "u-1",
+      workspaceId: "w-1",
+    });
+
+    await api.makeRawRequest("/threads");
+
+    const [url] = fetchMock.mock.calls[0]!;
+    expect(url.toString()).toBe("https://custom.example.com/v1/threads");
+  });
+
+  it("strips a trailing slash from a custom baseUrl", async () => {
+    const fetchMock = vi.fn().mockResolvedValue({
+      ok: true,
+      headers: new Headers(),
+      json: vi.fn().mockResolvedValue({}),
+    });
+    vi.stubGlobal("fetch", fetchMock);
+
+    const api = new AssistantCloudAPI({
+      baseUrl: "https://custom.example.com/",
+      apiKey: "test-key",
+      userId: "u-1",
+      workspaceId: "w-1",
+    });
+
+    await api.makeRawRequest("/threads");
+
+    const [url] = fetchMock.mock.calls[0]!;
+    expect(url.toString()).toBe("https://custom.example.com/v1/threads");
+  });
+
   it("rejects before fetch when auth token callback returns null", async () => {
     const fetchMock = vi.fn();
     vi.stubGlobal("fetch", fetchMock);

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,YAAY,EAAE,0CAAuC;AACnE,YAAY,EAAE,6BAA6B,EAAE,+BAA4B;AACzE,YAAY,EAAE,uBAAuB,EAAE,gCAA6B;AACpE,OAAO,EAAE,cAAc,EAAE,4BAAyB;AAClD,OAAO,EAAE,uBAAuB,EAAE,qCAAkC;AACpE,OAAO,EACL,0BAA0B,EAC1B,KAAK,oBAAoB,GAC1B,uCAAoC;AACrC,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,GACxB,mCAAgC"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,4BAAyB;AAClD,OAAO,EAAE,uBAAuB,EAAE,qCAAkC;AACpE,OAAO,EACL,0BAA0B,GAE3B,uCAAoC;AACrC,OAAO,EACL,mBAAmB,EACnB,uBAAuB,GAGxB,mCAAgC"}

package/dist/tests/setup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/tests/setup.ts"],"names":[],"mappings":""}