Merge pull request #71 from runbasehq/dev

New property executionId on NormalizedChunks

Author: jeresrc

packages/mcp-check/CHANGELOG.md

@@ -1,5 +1,11 @@
 # mcp-testing-library
 
+## 0.4.8
+
+### Patch Changes
+
+- Add new property executionId on NormalizedChunks
+
 ## 0.4.7
 
 ### Patch Changes

packages/mcp-check/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcp-check",
   "module": "dist/src/index.js",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

packages/mcp-check/src/chunks/types.ts

@@ -244,6 +244,8 @@ export type NormalizedChunkType =
 export interface BaseNormalizedChunk {
   /** The type of chunk being processed */
   type: NormalizedChunkType;
+  /** Unique execution ID for this streaming session */
+  executionId: string;
   /** Timestamp when the chunk was received */
   timestamp: number;
   /** Index of the chunk within the stream */

packages/mcp-check/src/providers/anthropic.ts

@@ -13,6 +13,7 @@ import type {
   BetaRawContentBlockStopEvent,
 } from "@anthropic-ai/sdk/resources/beta.js";
 import type { BetaRateLimitError } from "@anthropic-ai/sdk/resources";
+import { nanoid } from "../utils/nanoid.js";
 
 type AnthropicChunk =
   | BetaRawContentBlockDeltaEvent
@@ -33,8 +34,8 @@ type AnthropicChunk =
 
 type OnlyLiteralStrings<T> = T extends string
   ? string extends T
-    ? never
-    : T
+  ? never
+  : T
   : never;
 
 export type AnthropicModel = OnlyLiteralStrings<Anthropic.Model>;
@@ -71,6 +72,8 @@ export class AnthropicProvider extends Provider {
   private content: string = "";
   /** Current model being used for the request */
   private currentModel: string = "";
+  /** Unique execution ID for this streaming session */
+  private executionId: string = "";
 
   /**
    * Creates a new AnthropicProvider instance.
@@ -132,6 +135,7 @@ export class AnthropicProvider extends Provider {
     this.currentToolName = null;
     this.content = "";
     this.currentModel = model;
+    this.executionId = nanoid();
 
     const stream = this.client.beta.messages.stream({
       model: model.replace("anthropic/", "") as Anthropic.Model,
@@ -236,9 +240,12 @@ export class AnthropicProvider extends Provider {
   protected normalizeChunk(chunk: AnthropicChunk): NormalizedChunk | null {
     const timestamp = Date.now();
 
+    console.log(chunk);
+
     if (chunk.type === "rate_limit_error") {
       return {
         provider: "anthropic",
+        executionId: this.executionId,
         timestamp,
         index: -1,
         type: "error",
@@ -249,9 +256,10 @@ export class AnthropicProvider extends Provider {
 
     const baseChunk: Pick<
       NormalizedChunkAnthropic,
-      "provider" | "timestamp" | "index" | "originalChunk"
+      "provider" | "executionId" | "timestamp" | "index" | "originalChunk"
     > = {
       provider: "anthropic",
+      executionId: this.executionId,
       timestamp,
       index: chunk.index,
       originalChunk: chunk,

packages/mcp-check/src/providers/openai.ts

@@ -4,6 +4,7 @@ import { Provider } from "./provider.js";
 import type { StreamResult, NormalizedChunk, NormalizedChunkOpenAI } from "../chunks/types.js";
 import type { ProviderConfig } from "./types.js";
 import type { McpServer } from "../index.js";
+import { nanoid } from "../utils/nanoid.js";
 
 type OpenAIChunk = Responses.ResponseOutputItemDoneEvent | Responses.ResponseContentPartAddedEvent | Responses.ResponseTextDeltaEvent | Responses.ResponseMcpCallArgumentsDeltaEvent | Responses.ResponseOutputItemAddedEvent | Responses.ResponseErrorEvent;
 
@@ -50,6 +51,8 @@ export class OpenAIProvider extends Provider {
   private content: string = "";
   /** Current model being used for the request */
   private currentModel: string = "";
+  /** Unique execution ID for this streaming session */
+  private executionId: string = "";
 
   /**
    * Creates a new OpenAIProvider instance.
@@ -110,6 +113,7 @@ export class OpenAIProvider extends Provider {
     this.toolCalls = {};
     this.content = "";
     this.currentModel = model;
+    this.executionId = nanoid();
 
     const response = await this.client.responses.create({
       model: model.replace("openai/", "") as ChatModel,
@@ -203,6 +207,7 @@ export class OpenAIProvider extends Provider {
     if (chunk.type === "error") {
       return {
         provider: "openai",
+        executionId: this.executionId,
         timestamp,
         index: -1,
         type: "error",
@@ -211,8 +216,9 @@ export class OpenAIProvider extends Provider {
       };
     }
 
-    const baseChunk: Pick<NormalizedChunkOpenAI, "provider" | "timestamp" | "index" | "originalChunk"> = {
+    const baseChunk: Pick<NormalizedChunkOpenAI, "provider" | "executionId" | "timestamp" | "index" | "originalChunk"> = {
       provider: "openai",
+      executionId: this.executionId,
       timestamp,
       index: chunk.output_index,
       originalChunk: chunk,

packages/mcp-check/src/providers/openrouter.ts

@@ -14,6 +14,7 @@ import type {
   NormalizedChunk,
   NormalizedChunkOpenAI,
 } from "../chunks/types.js";
+import { nanoid } from "../utils/nanoid.js";
 
 /**
  * Type alias for OpenRouter model names.
@@ -69,6 +70,8 @@ export class OpenRouterProvider extends Provider {
   private content: string = "";
   /** Current model being used for the request */
   private currentModel: string = "";
+  /** Unique execution ID for this streaming session */
+  private executionId: string = "";
 
   /**
    * Creates a new OpenRouterProvider instance.
@@ -135,6 +138,7 @@ export class OpenRouterProvider extends Provider {
     this.toolCalls = {};
     this.content = "";
     this.currentModel = model;
+    this.executionId = nanoid();
 
     const mcp = await this.connectMcp();
     const tools = await this.listAndConvertTools(mcp);
@@ -531,6 +535,7 @@ export class OpenRouterProvider extends Provider {
     if (chunk.type === "error") {
       return {
         provider: "openrouter",
+        executionId: this.executionId,
         timestamp,
         index: -1,
         type: "error",
@@ -541,9 +546,10 @@ export class OpenRouterProvider extends Provider {
 
     const baseChunk: Pick<
       NormalizedChunkOpenAI,
-      "provider" | "timestamp" | "index" | "originalChunk"
+      "provider" | "executionId" | "timestamp" | "index" | "originalChunk"
     > = {
       provider: "openrouter",
+      executionId: this.executionId,
       timestamp,
       index: chunk.output_index,
       originalChunk: chunk,

packages/mcp-check/src/utils/nanoid.ts

@@ -0,0 +1,34 @@
+/* @ts-self-types="./index.d.ts" */
+
+// This alphabet uses `A-Za-z0-9_-` symbols.
+// The order of characters is optimized for better gzip and brotli compression.
+// References to the same file (works both for gzip and brotli):
+// `'use`, `andom`, and `rict'`
+// References to the brotli default dictionary:
+// `-26T`, `1983`, `40px`, `75px`, `bush`, `jack`, `mind`, `very`, and `wolf`
+let urlAlphabet =
+  'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
+
+export let customAlphabet = (alphabet: string, defaultSize = 21) => {
+  return (size = defaultSize) => {
+    let id = ''
+    // A compact alternative for `for (var i = 0; i < step; i++)`.
+    let i = size | 0
+    while (i--) {
+      // `| 0` is more compact and faster than `Math.floor()`.
+      id += alphabet[(Math.random() * alphabet.length) | 0]
+    }
+    return id
+  }
+}
+
+export let nanoid = (size = 21) => {
+  let id = ''
+  // A compact alternative for `for (var i = 0; i < step; i++)`.
+  let i = size | 0
+  while (i--) {
+    // `| 0` is more compact and faster than `Math.floor()`.
+    id += urlAlphabet[(Math.random() * 64) | 0]
+  }
+  return id
+}