@gleanwork/mcp-server-tester 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/index.js

@@ -3100,7 +3100,7 @@ var init_dist3 = __esm({
   }
 });
 var MCPHostCapabilitiesSchema = z.object({
-  sampling: z.record(z.unknown()).optional(),
+  sampling: z.record(z.string(), z.unknown()).optional(),
   roots: z.object({
     listChanged: z.boolean()
   }).optional()
@@ -3159,7 +3159,7 @@ var HttpConfigSchema = z.object({
     }
     return true;
   }),
-  headers: z.record(z.string()).optional(),
+  headers: z.record(z.string(), z.string()).optional(),
   capabilities: MCPHostCapabilitiesSchema.optional(),
   connectTimeoutMs: z.number().positive().optional(),
   requestTimeoutMs: z.number().positive().optional(),
@@ -4380,7 +4380,7 @@ function escapeHtml(text) {
 
 // package.json
 var package_default = {
-  version: "1.0.0-beta.2"};
+  version: "1.0.0-beta.4"};
 
 // src/mcp/clientFactory.ts
 function getRetryAfterDelayMs(err) {
@@ -4471,7 +4471,10 @@ async function createMCPClientForConfig(config, options) {
       validatedConfig.connectTimeoutMs !== void 0 ? { timeout: validatedConfig.connectTimeoutMs } : void 0
     );
   } else if (isHttpConfig(validatedConfig)) {
-    const headers = { ...validatedConfig.headers };
+    const headers = {
+      "User-Agent": `@gleanwork/mcp-server-tester/${package_default.version}`,
+      ...validatedConfig.headers
+    };
     if (validatedConfig.auth?.clientCredentials && !options?.authProvider) {
       const ccConfig = validatedConfig.auth.clientCredentials;
       const clientId = ccConfig.clientId ?? process.env["MCP_CLIENT_ID"];
@@ -5121,7 +5124,7 @@ function validateToolCalls(response, expectation) {
   if (!isSimulationResult(response)) {
     return {
       pass: false,
-      message: "toolsTriggered expectation requires llm_host mode \u2014 response must be an LLMHostSimulationResult"
+      message: "toolsTriggered expectation requires mcp_host mode \u2014 response must be an MCPHostSimulationResult"
     };
   }
   const actual = response.toolCalls;
@@ -5181,7 +5184,7 @@ function validateToolCallCount(response, options) {
   if (!isSimulationResult(response)) {
     return {
       pass: false,
-      message: "toolCallCount expectation requires llm_host mode \u2014 response must be an LLMHostSimulationResult"
+      message: "toolCallCount expectation requires mcp_host mode \u2014 response must be an MCPHostSimulationResult"
     };
   }
   const count = response.toolCalls.length;
@@ -6303,7 +6306,7 @@ function getAuthConfigFromEnv() {
   }
   return void 0;
 }
-var LLMHostConfigSchema = z.object({
+var MCPHostConfigSchema = z.object({
   provider: z.enum([
     "openai",
     "anthropic",
@@ -6372,7 +6375,7 @@ var EvalExpectBlockSchema = z.object({
     calls: z.array(
       z.object({
         name: z.string(),
-        arguments: z.record(z.unknown()).optional(),
+        arguments: z.record(z.string(), z.unknown()).optional(),
         required: z.boolean().optional()
       })
     ),
@@ -6388,12 +6391,12 @@ var EvalExpectBlockSchema = z.object({
 var EvalCaseSchema = z.object({
   id: z.string().min(1, "id must not be empty"),
   description: z.string().optional(),
-  mode: z.enum(["direct", "llm_host"]).optional(),
+  mode: z.enum(["direct", "mcp_host"]).optional(),
   toolName: z.string().min(1, "toolName must not be empty").optional(),
-  args: z.record(z.unknown()).optional(),
+  args: z.record(z.string(), z.unknown()).optional(),
   scenario: z.string().optional(),
-  llmHostConfig: LLMHostConfigSchema.optional(),
-  metadata: z.record(z.unknown()).optional(),
+  mcpHostConfig: MCPHostConfigSchema.optional(),
+  metadata: z.record(z.string(), z.unknown()).optional(),
   iterations: z.number().int().min(1).optional(),
   accuracyThreshold: z.number().min(0).max(1).optional(),
   judgeReps: z.number().int().min(1).optional(),
@@ -6405,7 +6408,7 @@ var EvalDatasetSchema = z.object({
   name: z.string().min(1, "name must not be empty"),
   description: z.string().optional(),
   cases: z.array(EvalCaseSchema).min(1, "dataset must have at least one case"),
-  metadata: z.record(z.unknown()).optional()
+  metadata: z.record(z.string(), z.unknown()).optional()
 });
 function validateEvalCase(evalCase) {
   return EvalCaseSchema.parse(evalCase);
@@ -6443,30 +6446,30 @@ function loadEvalDatasetFromObject(data, options = {}) {
   return dataset;
 }
 
-// src/evals/llmHost/adapters/vercel.ts
+// src/evals/mcpHost/adapters/vercel.ts
 function enrichErrorMessage(err, provider) {
   const raw = err instanceof Error ? err.message : String(err);
   if (raw.includes("Cannot find module") || raw.includes("ERR_MODULE_NOT_FOUND")) {
-    return `LLM host simulation failed: required package not installed.
-Hint: run \`getMissingDependencyMessage('${provider}')\` or check docs/llm-host.md for install instructions.`;
+    return `MCP host simulation failed: required package not installed.
+Hint: run \`getMissingDependencyMessage('${provider}')\` or check docs/mcp-host.md for install instructions.`;
   }
   if (raw.includes("401") || raw.includes("Unauthorized") || raw.includes("API key") || raw.includes("api_key")) {
-    return `LLM host simulation failed: authentication error.
+    return `MCP host simulation failed: authentication error.
 Hint: check your API key environment variable (e.g. ANTHROPIC_API_KEY, GOOGLE_APPLICATION_CREDENTIALS).`;
   }
   if (raw.includes("404") || raw.includes("Not Found") || raw.toLowerCase().includes("model") && raw.toLowerCase().includes("not found")) {
-    return `LLM host simulation failed: model not found.
+    return `MCP host simulation failed: model not found.
 Hint: check the model name format for your provider. For vertex-anthropic use 'claude-3-5-haiku@20241022' (with @).`;
   }
   if (raw.includes("ENOTFOUND") || raw.includes("fetch failed") || raw.includes("ECONNREFUSED")) {
-    return `LLM host simulation failed: network error.
+    return `MCP host simulation failed: network error.
 Hint: check network connectivity and whether the provider's API endpoint is reachable from this machine.`;
   }
   if (raw.includes("429") || raw.toLowerCase().includes("rate limit") || raw.includes("Too Many Requests")) {
-    return `LLM host simulation failed: rate limited.
+    return `MCP host simulation failed: rate limited.
 Hint: reduce concurrency, add delays between iterations, or upgrade your API plan.`;
   }
-  return `LLM host simulation failed: ${raw}`;
+  return `MCP host simulation failed: ${raw}`;
 }
 async function loadModel(provider, model) {
   switch (provider) {
@@ -6596,7 +6599,7 @@ function createVercelOrchestrator() {
   };
 }
 
-// src/evals/llmHost/llmHostSimulation.ts
+// src/evals/mcpHost/mcpHostSimulation.ts
 var vercelOrchestrator = createVercelOrchestrator();
 var allProviders = [
   "openai",
@@ -6612,7 +6615,7 @@ var allProviders = [
 var simulatorRegistry = new Map(
   allProviders.map((p) => [p, vercelOrchestrator])
 );
-async function simulateLLMHost(mcp, scenario, config) {
+async function simulateMCPHost(mcp, scenario, config) {
   const simulator = simulatorRegistry.get(config.provider);
   if (!simulator) {
     throw new Error(
@@ -6634,7 +6637,7 @@ function getMissingDependencyMessage(provider) {
     deepseek: "npm install ai @ai-sdk/deepseek",
     openrouter: "npm install ai @openrouter/ai-sdk-provider",
     xai: "npm install ai @ai-sdk/xai",
-    "vertex-anthropic": "npm install ai @ai-sdk/google-vertex (requires Application Default Credentials \u2014 see docs/llm-host.md)"
+    "vertex-anthropic": "npm install ai @ai-sdk/google-vertex (requires Application Default Credentials \u2014 see docs/mcp-host.md)"
   };
   const pkg = packageMap[provider];
   return pkg ? `${String(provider)} provider requires: ${pkg}` : `Unknown provider: ${String(provider)}`;
@@ -6677,24 +6680,24 @@ async function execFileNoThrow(file, args) {
 async function executeToolCall(evalCase, mcp) {
   const mode = evalCase.mode || "direct";
   try {
-    if (mode === "llm_host") {
+    if (mode === "mcp_host") {
       if (!evalCase.scenario) {
         throw new Error(
-          `Eval case ${evalCase.id}: scenario is required for llm_host mode`
+          `Eval case ${evalCase.id}: scenario is required for mcp_host mode`
         );
       }
-      if (!evalCase.llmHostConfig) {
+      if (!evalCase.mcpHostConfig) {
         throw new Error(
-          `Eval case ${evalCase.id}: llmHostConfig is required for llm_host mode`
+          `Eval case ${evalCase.id}: mcpHostConfig is required for mcp_host mode`
         );
       }
-      const simulationResult = await simulateLLMHost(
+      const simulationResult = await simulateMCPHost(
         mcp,
         evalCase.scenario,
-        evalCase.llmHostConfig
+        evalCase.mcpHostConfig
       );
       if (!simulationResult.success) {
-        throw new Error(simulationResult.error || "LLM host simulation failed");
+        throw new Error(simulationResult.error || "MCP host simulation failed");
       }
       return { response: simulationResult };
     } else {
@@ -6836,12 +6839,16 @@ async function runExpectBlockValidations(expectBlock, response, config) {
   }
   return { expectations: results, toolPrecision, toolRecall };
 }
+function isMCPHostSimulationResult(value) {
+  return typeof value === "object" && value !== null && "success" in value && "toolCalls" in value && Array.isArray(value.toolCalls);
+}
 async function runSingleIteration(evalCase, context, options) {
   const startTime = Date.now();
   const { response, error } = await executeToolCall(evalCase, context.mcp);
   let expectationResults = {};
   let toolPrecision;
   let toolRecall;
+  let mcpHostTrace;
   if (!error && evalCase.expect) {
     const {
       expectations,
@@ -6856,6 +6863,23 @@ async function runSingleIteration(evalCase, context, options) {
     expectationResults = expectations;
     toolPrecision = tp;
     toolRecall = tr;
+    if (evalCase.expect.toolsTriggered !== void 0 && isMCPHostSimulationResult(response)) {
+      const expectedNames = new Set(
+        evalCase.expect.toolsTriggered.calls.map((c) => c.name)
+      );
+      const requiredNames = new Set(
+        evalCase.expect.toolsTriggered.calls.filter((c) => c.required !== false).map((c) => c.name)
+      );
+      const calledNames = new Set(response.toolCalls.map((c) => c.name));
+      mcpHostTrace = {
+        calls: response.toolCalls.map((call) => ({
+          name: call.name,
+          arguments: call.arguments,
+          status: expectedNames.has(call.name) ? "expected" : "unexpected"
+        })),
+        missed: Array.from(requiredNames).filter((name15) => !calledNames.has(name15)).map((name15) => ({ name: name15 }))
+      };
+    }
   }
   return {
     id: evalCase.id,
@@ -6871,7 +6895,8 @@ async function runSingleIteration(evalCase, context, options) {
     durationMs: Date.now() - startTime,
     tags: evalCase.tags,
     toolPrecision,
-    toolRecall
+    toolRecall,
+    mcpHostTrace
   };
 }
 function isInfrastructureError(err) {
@@ -6924,7 +6949,6 @@ async function runEvalCase(evalCase, context, options = {}) {
   const passCount = assertionResults.filter((r) => r.pass).length;
   const assertionPassRate = assertionResults.length > 0 ? passCount / assertionResults.length : 0;
   const infrastructureErrorRate = infraErrors.length / iterations;
-  const accuracy = assertionPassRate;
   const threshold = evalCase.accuracyThreshold ?? 1;
   const baseResult = lastResult ?? {
     id: evalCase.id,
@@ -6941,10 +6965,9 @@ async function runEvalCase(evalCase, context, options = {}) {
   };
   return {
     ...baseResult,
-    pass: accuracy >= threshold,
+    pass: assertionPassRate >= threshold,
     assertionPassRate,
     infrastructureErrorRate,
-    accuracy,
     iterationResults,
     infrastructureErrorCount: infraErrors.length,
     durationMs: iterationResults.reduce((sum, r) => sum + r.durationMs, 0)
@@ -6979,7 +7002,7 @@ async function runEvalDataset(options, context) {
     filterTags,
     saveResultsTo,
     baselineResultsFrom,
-    llmHostModel,
+    mcpHostModel,
     judgeModel
   } = options;
   const startTime = Date.now();
@@ -6989,7 +7012,7 @@ async function runEvalDataset(options, context) {
   };
   const casesToRun = filterTags && filterTags.length > 0 ? dataset.cases.filter((c) => c.tags?.some((t) => filterTags.includes(t))) : dataset.cases;
   const estimatedJudgeCalls = casesToRun.reduce((sum, c) => {
-    const effectiveIterations = c.mode === "llm_host" ? c.iterations ?? defaultLlmIterations ?? 1 : c.iterations ?? 1;
+    const effectiveIterations = c.mode === "mcp_host" ? c.iterations ?? defaultLlmIterations ?? 1 : c.iterations ?? 1;
     const judgeReps = c.expect?.passesJudge != null ? c.expect.passesJudge.reps ?? c.judgeReps ?? defaultJudgeReps ?? 1 : 0;
     return sum + effectiveIterations * judgeReps;
   }, 0);
@@ -6999,12 +7022,12 @@ async function runEvalDataset(options, context) {
     );
   }
   const tasks = casesToRun.map((evalCase) => async () => {
-    const withIterations = evalCase.mode === "llm_host" && evalCase.iterations === void 0 && defaultLlmIterations !== void 0 ? { ...evalCase, iterations: defaultLlmIterations } : evalCase;
-    if (evalCase.mode === "llm_host") {
+    const withIterations = evalCase.mode === "mcp_host" && evalCase.iterations === void 0 && defaultLlmIterations !== void 0 ? { ...evalCase, iterations: defaultLlmIterations } : evalCase;
+    if (evalCase.mode === "mcp_host") {
       const effectiveIterations = withIterations.iterations ?? 1;
       if (effectiveIterations > 1 && effectiveIterations < 10) {
         console.warn(
-          `[mcp-server-tester] Eval case "${evalCase.id}": running ${effectiveIterations} iterations in llm_host mode may not be statistically reliable. Consider using 10+ iterations for accuracy measurements you can trust.`
+          `[mcp-server-tester] Eval case "${evalCase.id}": running ${effectiveIterations} iterations in mcp_host mode may not be statistically reliable. Consider using 10+ iterations for accuracy measurements you can trust.`
         );
       }
     }
@@ -7036,7 +7059,7 @@ async function runEvalDataset(options, context) {
     gitHash,
     timestamp: (/* @__PURE__ */ new Date()).toISOString(),
     packageVersion: package_default.version,
-    ...llmHostModel !== void 0 && { llmHostModel },
+    ...mcpHostModel !== void 0 && { mcpHostModel },
     ...judgeModel !== void 0 && { judgeModel }
   };
   const result = {
@@ -7081,12 +7104,12 @@ async function runEvalDataset(options, context) {
       );
     }
   }
-  const llmHostCases = caseResults.filter(
+  const mcpHostCases = caseResults.filter(
     (r) => r.toolPrecision !== void 0 || r.toolRecall !== void 0
   );
-  if (llmHostCases.length > 0) {
-    const avgPrec = llmHostCases.reduce((s, r) => s + (r.toolPrecision ?? 0), 0) / llmHostCases.length;
-    const avgRecall = llmHostCases.reduce((s, r) => s + (r.toolRecall ?? 0), 0) / llmHostCases.length;
+  if (mcpHostCases.length > 0) {
+    const avgPrec = mcpHostCases.reduce((s, r) => s + (r.toolPrecision ?? 0), 0) / mcpHostCases.length;
+    const avgRecall = mcpHostCases.reduce((s, r) => s + (r.toolRecall ?? 0), 0) / mcpHostCases.length;
     result.datasetToolPrecision = avgPrec;
     result.datasetToolRecall = avgRecall;
     result.datasetToolF1 = avgPrec + avgRecall > 0 ? 2 * avgPrec * avgRecall / (avgPrec + avgRecall) : 0;
@@ -7154,7 +7177,6 @@ async function runServerComparison(options, contextA, contextB) {
     bWins,
     ties,
     bothFail,
-    bothFailCount: bothFail,
     decidedCases,
     failureAlignment: total > 0 ? bothFail / total : 0,
     aWinRate: decidedCases > 0 ? aWins / decidedCases : 0,
@@ -7338,6 +7360,6 @@ function formatCapabilities(capabilities) {
   return parts.length > 0 ? parts.join(", ") : "none declared";
 }
 
-export { BUILT_IN_RUBRICS, CLIOAuthClient, DiscoveryError, ENV_VAR_NAMES, EvalCaseSchema, EvalDatasetSchema, MCPConfigSchema, MCP_PROTOCOL_VERSION, PlaywrightOAuthClientProvider, SnapshotSanitizers, closeMCPClient, createJudge, createMCPClientForConfig, createMCPFixture, createTokenAuthHeaders, discoverAuthorizationServer, discoverProtectedResource, expect, extractText, getMissingDependencyMessage, getResponseSizeBytes, hasValidTokens, injectTokens, isBuiltInRubric, isHttpConfig, isProviderAvailable, isStdioConfig, isTokenExpired, isTokenExpiringSoon, loadBaseline, loadEvalDataset, loadEvalDatasetFromObject, loadTokens, loadTokensFromEnv, test2 as mcpAuthTest, normalizeToolResponse, normalizeWhitespace, performClientCredentialsFlow, performOAuthSetup, performOAuthSetupIfNeeded, resolveRubric, runConformanceChecks, runEvalCase, runEvalDataset, runServerComparison, saveBaseline, simulateLLMHost, test, validateAccessToken, validateError, validateEvalCase, validateEvalDataset, validateJudge, validateMCPConfig, validatePattern, validateResponse, validateSchema, validateSize, validateText, validateToolCallCount, validateToolCalls };
+export { BUILT_IN_RUBRICS, CLIOAuthClient, DiscoveryError, ENV_VAR_NAMES, EvalCaseSchema, EvalDatasetSchema, MCPConfigSchema, MCP_PROTOCOL_VERSION, PlaywrightOAuthClientProvider, SnapshotSanitizers, closeMCPClient, createJudge, createMCPClientForConfig, createMCPFixture, createTokenAuthHeaders, discoverAuthorizationServer, discoverProtectedResource, expect, extractText, getMissingDependencyMessage, getResponseSizeBytes, hasValidTokens, injectTokens, isBuiltInRubric, isHttpConfig, isProviderAvailable, isStdioConfig, isTokenExpired, isTokenExpiringSoon, loadBaseline, loadEvalDataset, loadEvalDatasetFromObject, loadTokens, loadTokensFromEnv, test2 as mcpAuthTest, normalizeToolResponse, normalizeWhitespace, performClientCredentialsFlow, performOAuthSetup, performOAuthSetupIfNeeded, resolveRubric, runConformanceChecks, runEvalCase, runEvalDataset, runServerComparison, saveBaseline, simulateMCPHost, test, validateAccessToken, validateError, validateEvalCase, validateEvalDataset, validateJudge, validateMCPConfig, validatePattern, validateResponse, validateSchema, validateSize, validateText, validateToolCallCount, validateToolCalls };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map