@evalops/maestro 0.10.18 → 0.10.20

package/dist/mcp/platform-plugin.js

@@ -1,4 +1,5 @@
 import { getStoredEvalOpsAgentMcpMetadata } from "../evalops/agent-bootstrap.js";
+import { EVALOPS_ACCESS_TOKEN_ENV_VARS, EVALOPS_INTEGRATION_PROFILE_ENV_VARS, EVALOPS_MEMORY_MODE_ENV_VARS, EVALOPS_ORGANIZATION_ID_ENV_VARS, EVALOPS_RUNTIME_OWNER_ENV_VARS, EVALOPS_SHIM_TYPE_ENV_VARS, EVALOPS_TRACE_MODE_ENV_VARS, EVALOPS_WORKSPACE_ID_ENV_VARS, } from "../evalops/env-aliases.js";
 import { getEnvValue, normalizeBaseUrl, resolveConfiguredToken, resolveWorkspaceId, } from "../platform/client.js";
 const PLATFORM_MCP_DISABLED_VALUES = new Set(["0", "false", "no", "off"]);
 const PLATFORM_MCP_ENABLED_ENV_VARS = [
@@ -22,15 +23,12 @@ const PLATFORM_MCP_MANIFEST_URL_ENV_VARS = [
 const PLATFORM_MCP_TOKEN_ENV_VARS = [
     "MAESTRO_PLATFORM_MCP_TOKEN",
     "MAESTRO_AGENT_MCP_TOKEN",
-    "MAESTRO_EVALOPS_ACCESS_TOKEN",
-    "EVALOPS_TOKEN",
+    ...EVALOPS_ACCESS_TOKEN_ENV_VARS,
 ];
 const PLATFORM_MCP_WORKSPACE_ENV_VARS = [
     "MAESTRO_WORKSPACE_ID",
-    "MAESTRO_EVALOPS_WORKSPACE_ID",
-    "MAESTRO_EVALOPS_ORG_ID",
-    "EVALOPS_ORGANIZATION_ID",
-    "MAESTRO_ENTERPRISE_ORG_ID",
+    ...EVALOPS_WORKSPACE_ID_ENV_VARS.filter((name) => name !== "MAESTRO_WORKSPACE_ID"),
+    ...EVALOPS_ORGANIZATION_ID_ENV_VARS,
 ];
 const PLATFORM_MCP_AGENT_ID_ENV_VARS = [
     "MAESTRO_AGENT_ID",
@@ -42,26 +40,11 @@ const PLATFORM_MCP_SCOPES_ENV_VARS = [
     "MAESTRO_EVALOPS_AGENT_MCP_SCOPES",
     "MAESTRO_CEREBRO_MCP_SCOPES",
 ];
-const PLATFORM_MCP_INTEGRATION_PROFILE_ENV_VARS = [
-    "MAESTRO_EVALOPS_INTEGRATION_PROFILE",
-    "MAESTRO_INTEGRATION_PROFILE",
-];
-const PLATFORM_MCP_MEMORY_MODE_ENV_VARS = [
-    "MAESTRO_EVALOPS_MEMORY_MODE",
-    "MAESTRO_MEMORY_MODE",
-];
-const PLATFORM_MCP_RUNTIME_OWNER_ENV_VARS = [
-    "MAESTRO_EVALOPS_RUNTIME_OWNER",
-    "MAESTRO_RUNTIME_OWNER",
-];
-const PLATFORM_MCP_SHIM_TYPE_ENV_VARS = [
-    "MAESTRO_EVALOPS_SHIM_TYPE",
-    "MAESTRO_SHIM_TYPE",
-];
-const PLATFORM_MCP_TRACE_MODE_ENV_VARS = [
-    "MAESTRO_EVALOPS_TRACE_MODE",
-    "MAESTRO_TRACE_MODE",
-];
+const PLATFORM_MCP_INTEGRATION_PROFILE_ENV_VARS = EVALOPS_INTEGRATION_PROFILE_ENV_VARS;
+const PLATFORM_MCP_MEMORY_MODE_ENV_VARS = EVALOPS_MEMORY_MODE_ENV_VARS;
+const PLATFORM_MCP_RUNTIME_OWNER_ENV_VARS = EVALOPS_RUNTIME_OWNER_ENV_VARS;
+const PLATFORM_MCP_SHIM_TYPE_ENV_VARS = EVALOPS_SHIM_TYPE_ENV_VARS;
+const PLATFORM_MCP_TRACE_MODE_ENV_VARS = EVALOPS_TRACE_MODE_ENV_VARS;
 const DEFAULT_PLATFORM_MCP_SERVER_NAME = "evalops";
 const AGENT_MCP_MANIFEST_PATH = "/.well-known/evalops/agent-mcp.json";
 const AGENT_MCP_PATH = "/mcp";

package/dist/mcp/platform-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform-plugin.js","sourceRoot":"","sources":["../../src/mcp/platform-plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { getStoredEvalOpsAgentMcpMetadata } from \"../evalops/agent-bootstrap.js\";\nimport {\n\tgetEnvValue,\n\tnormalizeBaseUrl,\n\tresolveConfiguredToken,\n\tresolveWorkspaceId,\n} from \"../platform/client.js\";\nimport type { McpServerConfig } from \"./types.js\";\n\nconst PLATFORM_MCP_DISABLED_VALUES = new Set([\"0\", \"false\", \"no\", \"off\"]);\nconst PLATFORM_MCP_ENABLED_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_ENABLED\",\n\t\"MAESTRO_AGENT_MCP_ENABLED\",\n] as const;\nconst PLATFORM_MCP_NAME_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_NAME\",\n\t\"MAESTRO_AGENT_MCP_NAME\",\n] as const;\nconst PLATFORM_MCP_URL_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_URL\",\n\t\"MAESTRO_AGENT_MCP_URL\",\n\t\"MAESTRO_EVALOPS_AGENT_MCP_URL\",\n] as const;\nconst PLATFORM_MCP_MANIFEST_URL_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_MANIFEST_URL\",\n\t\"MAESTRO_AGENT_MCP_MANIFEST_URL\",\n\t\"MAESTRO_EVALOPS_AGENT_MCP_MANIFEST_URL\",\n] as const;\nconst PLATFORM_MCP_TOKEN_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_TOKEN\",\n\t\"MAESTRO_AGENT_MCP_TOKEN\",\n\t\"MAESTRO_EVALOPS_ACCESS_TOKEN\",\n\t\"EVALOPS_TOKEN\",\n] as const;\nconst PLATFORM_MCP_WORKSPACE_ENV_VARS = [\n\t\"MAESTRO_WORKSPACE_ID\",\n\t\"MAESTRO_EVALOPS_WORKSPACE_ID\",\n\t\"MAESTRO_EVALOPS_ORG_ID\",\n\t\"EVALOPS_ORGANIZATION_ID\",\n\t\"MAESTRO_ENTERPRISE_ORG_ID\",\n] as const;\nconst PLATFORM_MCP_AGENT_ID_ENV_VARS = [\n\t\"MAESTRO_AGENT_ID\",\n\t\"MAESTRO_EVALOPS_AGENT_ID\",\n] as const;\nconst PLATFORM_MCP_SCOPES_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_SCOPES\",\n\t\"MAESTRO_AGENT_MCP_SCOPES\",\n\t\"MAESTRO_EVALOPS_AGENT_MCP_SCOPES\",\n\t\"MAESTRO_CEREBRO_MCP_SCOPES\",\n] as const;\nconst PLATFORM_MCP_INTEGRATION_PROFILE_ENV_VARS = [\n\t\"MAESTRO_EVALOPS_INTEGRATION_PROFILE\",\n\t\"MAESTRO_INTEGRATION_PROFILE\",\n] as const;\nconst PLATFORM_MCP_MEMORY_MODE_ENV_VARS = [\n\t\"MAESTRO_EVALOPS_MEMORY_MODE\",\n\t\"MAESTRO_MEMORY_MODE\",\n] as const;\nconst PLATFORM_MCP_RUNTIME_OWNER_ENV_VARS = [\n\t\"MAESTRO_EVALOPS_RUNTIME_OWNER\",\n\t\"MAESTRO_RUNTIME_OWNER\",\n] as const;\nconst PLATFORM_MCP_SHIM_TYPE_ENV_VARS = [\n\t\"MAESTRO_EVALOPS_SHIM_TYPE\",\n\t\"MAESTRO_SHIM_TYPE\",\n] as const;\nconst PLATFORM_MCP_TRACE_MODE_ENV_VARS = [\n\t\"MAESTRO_EVALOPS_TRACE_MODE\",\n\t\"MAESTRO_TRACE_MODE\",\n] as const;\nconst DEFAULT_PLATFORM_MCP_SERVER_NAME = \"evalops\";\nconst AGENT_MCP_MANIFEST_PATH = \"/.well-known/evalops/agent-mcp.json\";\nconst AGENT_MCP_PATH = \"/mcp\";\n\nfunction isPlatformMcpExplicitlyDisabled(): boolean {\n\tconst enabled = getEnvValue(PLATFORM_MCP_ENABLED_ENV_VARS);\n\tif (!enabled) {\n\t\treturn false;\n\t}\n\treturn PLATFORM_MCP_DISABLED_VALUES.has(enabled.trim().toLowerCase());\n}\n\nfunction buildPlatformMcpHeaders(): Record<string, string> | undefined {\n\tconst stored = getStoredEvalOpsAgentMcpMetadata();\n\tconst token =\n\t\tgetEnvValue(PLATFORM_MCP_TOKEN_ENV_VARS) ??\n\t\tstored?.apiKey ??\n\t\tresolveConfiguredToken(PLATFORM_MCP_TOKEN_ENV_VARS);\n\tconst workspaceId =\n\t\tresolveWorkspaceId(PLATFORM_MCP_WORKSPACE_ENV_VARS) ?? stored?.workspaceId;\n\tconst headers = Object.fromEntries(\n\t\tObject.entries({\n\t\t\t...(token ? { Authorization: `Bearer ${token}` } : {}),\n\t\t\t\"Mcp-Session-Id\": getEnvValue([\"MAESTRO_SESSION_ID\"]),\n\t\t\t\"X-EvalOps-Workspace-Id\": workspaceId,\n\t\t\t\"X-EvalOps-Session-Id\": getEnvValue([\"MAESTRO_SESSION_ID\"]),\n\t\t\t\"X-EvalOps-Agent-Id\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_AGENT_ID_ENV_VARS) ?? stored?.agentId,\n\t\t\t\"X-EvalOps-Agent-Run-Id\":\n\t\t\t\tgetEnvValue([\"MAESTRO_AGENT_RUN_ID\"]) ?? stored?.runId,\n\t\t\t\"X-EvalOps-Integration-Profile\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_INTEGRATION_PROFILE_ENV_VARS) ??\n\t\t\t\tstored?.integrationProfile,\n\t\t\t\"X-EvalOps-Memory-Mode\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_MEMORY_MODE_ENV_VARS) ?? stored?.memoryMode,\n\t\t\t\"X-EvalOps-Runtime-Owner\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_RUNTIME_OWNER_ENV_VARS) ??\n\t\t\t\tstored?.runtimeOwner,\n\t\t\t\"X-EvalOps-Scopes\": getEnvValue(PLATFORM_MCP_SCOPES_ENV_VARS),\n\t\t\t\"X-EvalOps-Shim-Type\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_SHIM_TYPE_ENV_VARS) ?? stored?.shimType,\n\t\t\t\"X-EvalOps-Request-Id\": getEnvValue([\"MAESTRO_REQUEST_ID\"]),\n\t\t\t\"X-EvalOps-Trace-Id\": getEnvValue([\"TRACE_ID\", \"OTEL_TRACE_ID\"]),\n\t\t\t\"X-EvalOps-Trace-Mode\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_TRACE_MODE_ENV_VARS) ?? stored?.traceMode,\n\t\t\t\"X-EvalOps-Maestro-Surface\":\n\t\t\t\tgetEnvValue([\"MAESTRO_SURFACE\"]) ?? \"maestro\",\n\t\t}).filter(\n\t\t\t(entry): entry is [string, string] =>\n\t\t\t\ttypeof entry[1] === \"string\" && entry[1].trim().length > 0,\n\t\t),\n\t);\n\treturn Object.keys(headers).length > 0 ? headers : undefined;\n}\n\nfunction normalizePlatformMcpEndpoint(url: string): string {\n\tconst normalized = normalizeBaseUrl(url);\n\ttry {\n\t\tconst parsed = new URL(normalized);\n\t\tif (\n\t\t\tparsed.pathname === \"\" ||\n\t\t\tparsed.pathname === \"/\" ||\n\t\t\tparsed.pathname === AGENT_MCP_MANIFEST_PATH\n\t\t) {\n\t\t\tparsed.pathname = AGENT_MCP_PATH;\n\t\t\tparsed.search = \"\";\n\t\t\tparsed.hash = \"\";\n\t\t\treturn normalizeBaseUrl(parsed.toString());\n\t\t}\n\t} catch {\n\t\t// Keep the existing permissive behavior for non-standard local test URLs.\n\t}\n\treturn normalized;\n}\n\nfunction resolvePlatformMcpURL(): string | undefined {\n\treturn (\n\t\tgetEnvValue(PLATFORM_MCP_URL_ENV_VARS) ??\n\t\tgetEnvValue(PLATFORM_MCP_MANIFEST_URL_ENV_VARS) ??\n\t\tgetStoredEvalOpsAgentMcpMetadata()?.endpoint\n\t);\n}\n\nexport function getPlatformMcpPluginServers(): McpServerConfig[] {\n\tif (isPlatformMcpExplicitlyDisabled()) {\n\t\treturn [];\n\t}\n\n\tconst url = resolvePlatformMcpURL();\n\tif (!url) {\n\t\treturn [];\n\t}\n\n\treturn [\n\t\t{\n\t\t\tname:\n\t\t\t\tgetEnvValue(PLATFORM_MCP_NAME_ENV_VARS) ??\n\t\t\t\tDEFAULT_PLATFORM_MCP_SERVER_NAME,\n\t\t\ttransport: \"http\",\n\t\t\turl: normalizePlatformMcpEndpoint(url),\n\t\t\theaders: buildPlatformMcpHeaders(),\n\t\t\tscope: \"plugin\",\n\t\t},\n\t];\n}\n"]}
+{"version":3,"file":"platform-plugin.js","sourceRoot":"","sources":["../../src/mcp/platform-plugin.ts"],"names":[],"mappings":"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","sourcesContent":["import { getStoredEvalOpsAgentMcpMetadata } from \"../evalops/agent-bootstrap.js\";\nimport {\n\tEVALOPS_ACCESS_TOKEN_ENV_VARS,\n\tEVALOPS_INTEGRATION_PROFILE_ENV_VARS,\n\tEVALOPS_MEMORY_MODE_ENV_VARS,\n\tEVALOPS_ORGANIZATION_ID_ENV_VARS,\n\tEVALOPS_RUNTIME_OWNER_ENV_VARS,\n\tEVALOPS_SHIM_TYPE_ENV_VARS,\n\tEVALOPS_TRACE_MODE_ENV_VARS,\n\tEVALOPS_WORKSPACE_ID_ENV_VARS,\n} from \"../evalops/env-aliases.js\";\nimport {\n\tgetEnvValue,\n\tnormalizeBaseUrl,\n\tresolveConfiguredToken,\n\tresolveWorkspaceId,\n} from \"../platform/client.js\";\nimport type { McpServerConfig } from \"./types.js\";\n\nconst PLATFORM_MCP_DISABLED_VALUES = new Set([\"0\", \"false\", \"no\", \"off\"]);\nconst PLATFORM_MCP_ENABLED_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_ENABLED\",\n\t\"MAESTRO_AGENT_MCP_ENABLED\",\n] as const;\nconst PLATFORM_MCP_NAME_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_NAME\",\n\t\"MAESTRO_AGENT_MCP_NAME\",\n] as const;\nconst PLATFORM_MCP_URL_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_URL\",\n\t\"MAESTRO_AGENT_MCP_URL\",\n\t\"MAESTRO_EVALOPS_AGENT_MCP_URL\",\n] as const;\nconst PLATFORM_MCP_MANIFEST_URL_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_MANIFEST_URL\",\n\t\"MAESTRO_AGENT_MCP_MANIFEST_URL\",\n\t\"MAESTRO_EVALOPS_AGENT_MCP_MANIFEST_URL\",\n] as const;\nconst PLATFORM_MCP_TOKEN_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_TOKEN\",\n\t\"MAESTRO_AGENT_MCP_TOKEN\",\n\t...EVALOPS_ACCESS_TOKEN_ENV_VARS,\n] as const;\nconst PLATFORM_MCP_WORKSPACE_ENV_VARS: readonly string[] = [\n\t\"MAESTRO_WORKSPACE_ID\",\n\t...EVALOPS_WORKSPACE_ID_ENV_VARS.filter(\n\t\t(name) => name !== \"MAESTRO_WORKSPACE_ID\",\n\t),\n\t...EVALOPS_ORGANIZATION_ID_ENV_VARS,\n] as const;\nconst PLATFORM_MCP_AGENT_ID_ENV_VARS = [\n\t\"MAESTRO_AGENT_ID\",\n\t\"MAESTRO_EVALOPS_AGENT_ID\",\n] as const;\nconst PLATFORM_MCP_SCOPES_ENV_VARS = [\n\t\"MAESTRO_PLATFORM_MCP_SCOPES\",\n\t\"MAESTRO_AGENT_MCP_SCOPES\",\n\t\"MAESTRO_EVALOPS_AGENT_MCP_SCOPES\",\n\t\"MAESTRO_CEREBRO_MCP_SCOPES\",\n] as const;\nconst PLATFORM_MCP_INTEGRATION_PROFILE_ENV_VARS =\n\tEVALOPS_INTEGRATION_PROFILE_ENV_VARS;\nconst PLATFORM_MCP_MEMORY_MODE_ENV_VARS = EVALOPS_MEMORY_MODE_ENV_VARS;\nconst PLATFORM_MCP_RUNTIME_OWNER_ENV_VARS = EVALOPS_RUNTIME_OWNER_ENV_VARS;\nconst PLATFORM_MCP_SHIM_TYPE_ENV_VARS = EVALOPS_SHIM_TYPE_ENV_VARS;\nconst PLATFORM_MCP_TRACE_MODE_ENV_VARS = EVALOPS_TRACE_MODE_ENV_VARS;\nconst DEFAULT_PLATFORM_MCP_SERVER_NAME = \"evalops\";\nconst AGENT_MCP_MANIFEST_PATH = \"/.well-known/evalops/agent-mcp.json\";\nconst AGENT_MCP_PATH = \"/mcp\";\n\nfunction isPlatformMcpExplicitlyDisabled(): boolean {\n\tconst enabled = getEnvValue(PLATFORM_MCP_ENABLED_ENV_VARS);\n\tif (!enabled) {\n\t\treturn false;\n\t}\n\treturn PLATFORM_MCP_DISABLED_VALUES.has(enabled.trim().toLowerCase());\n}\n\nfunction buildPlatformMcpHeaders(): Record<string, string> | undefined {\n\tconst stored = getStoredEvalOpsAgentMcpMetadata();\n\tconst token =\n\t\tgetEnvValue(PLATFORM_MCP_TOKEN_ENV_VARS) ??\n\t\tstored?.apiKey ??\n\t\tresolveConfiguredToken(PLATFORM_MCP_TOKEN_ENV_VARS);\n\tconst workspaceId =\n\t\tresolveWorkspaceId(PLATFORM_MCP_WORKSPACE_ENV_VARS) ?? stored?.workspaceId;\n\tconst headers = Object.fromEntries(\n\t\tObject.entries({\n\t\t\t...(token ? { Authorization: `Bearer ${token}` } : {}),\n\t\t\t\"Mcp-Session-Id\": getEnvValue([\"MAESTRO_SESSION_ID\"]),\n\t\t\t\"X-EvalOps-Workspace-Id\": workspaceId,\n\t\t\t\"X-EvalOps-Session-Id\": getEnvValue([\"MAESTRO_SESSION_ID\"]),\n\t\t\t\"X-EvalOps-Agent-Id\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_AGENT_ID_ENV_VARS) ?? stored?.agentId,\n\t\t\t\"X-EvalOps-Agent-Run-Id\":\n\t\t\t\tgetEnvValue([\"MAESTRO_AGENT_RUN_ID\"]) ?? stored?.runId,\n\t\t\t\"X-EvalOps-Integration-Profile\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_INTEGRATION_PROFILE_ENV_VARS) ??\n\t\t\t\tstored?.integrationProfile,\n\t\t\t\"X-EvalOps-Memory-Mode\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_MEMORY_MODE_ENV_VARS) ?? stored?.memoryMode,\n\t\t\t\"X-EvalOps-Runtime-Owner\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_RUNTIME_OWNER_ENV_VARS) ??\n\t\t\t\tstored?.runtimeOwner,\n\t\t\t\"X-EvalOps-Scopes\": getEnvValue(PLATFORM_MCP_SCOPES_ENV_VARS),\n\t\t\t\"X-EvalOps-Shim-Type\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_SHIM_TYPE_ENV_VARS) ?? stored?.shimType,\n\t\t\t\"X-EvalOps-Request-Id\": getEnvValue([\"MAESTRO_REQUEST_ID\"]),\n\t\t\t\"X-EvalOps-Trace-Id\": getEnvValue([\"TRACE_ID\", \"OTEL_TRACE_ID\"]),\n\t\t\t\"X-EvalOps-Trace-Mode\":\n\t\t\t\tgetEnvValue(PLATFORM_MCP_TRACE_MODE_ENV_VARS) ?? stored?.traceMode,\n\t\t\t\"X-EvalOps-Maestro-Surface\":\n\t\t\t\tgetEnvValue([\"MAESTRO_SURFACE\"]) ?? \"maestro\",\n\t\t}).filter(\n\t\t\t(entry): entry is [string, string] =>\n\t\t\t\ttypeof entry[1] === \"string\" && entry[1].trim().length > 0,\n\t\t),\n\t);\n\treturn Object.keys(headers).length > 0 ? headers : undefined;\n}\n\nfunction normalizePlatformMcpEndpoint(url: string): string {\n\tconst normalized = normalizeBaseUrl(url);\n\ttry {\n\t\tconst parsed = new URL(normalized);\n\t\tif (\n\t\t\tparsed.pathname === \"\" ||\n\t\t\tparsed.pathname === \"/\" ||\n\t\t\tparsed.pathname === AGENT_MCP_MANIFEST_PATH\n\t\t) {\n\t\t\tparsed.pathname = AGENT_MCP_PATH;\n\t\t\tparsed.search = \"\";\n\t\t\tparsed.hash = \"\";\n\t\t\treturn normalizeBaseUrl(parsed.toString());\n\t\t}\n\t} catch {\n\t\t// Keep the existing permissive behavior for non-standard local test URLs.\n\t}\n\treturn normalized;\n}\n\nfunction resolvePlatformMcpURL(): string | undefined {\n\treturn (\n\t\tgetEnvValue(PLATFORM_MCP_URL_ENV_VARS) ??\n\t\tgetEnvValue(PLATFORM_MCP_MANIFEST_URL_ENV_VARS) ??\n\t\tgetStoredEvalOpsAgentMcpMetadata()?.endpoint\n\t);\n}\n\nexport function getPlatformMcpPluginServers(): McpServerConfig[] {\n\tif (isPlatformMcpExplicitlyDisabled()) {\n\t\treturn [];\n\t}\n\n\tconst url = resolvePlatformMcpURL();\n\tif (!url) {\n\t\treturn [];\n\t}\n\n\treturn [\n\t\t{\n\t\t\tname:\n\t\t\t\tgetEnvValue(PLATFORM_MCP_NAME_ENV_VARS) ??\n\t\t\t\tDEFAULT_PLATFORM_MCP_SERVER_NAME,\n\t\t\ttransport: \"http\",\n\t\t\turl: normalizePlatformMcpEndpoint(url),\n\t\t\theaders: buildPlatformMcpHeaders(),\n\t\t\tscope: \"plugin\",\n\t\t},\n\t];\n}\n"]}

package/dist/mcp/schema.d.ts

@@ -5,6 +5,17 @@ export declare const mcpAuthPresetSchema: z.ZodObject<{
     headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     headersHelper: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
+export declare const mcpWorkspaceTrustModeSchema: z.ZodUnion<readonly [z.ZodLiteral<"trusted">, z.ZodLiteral<"ask">, z.ZodLiteral<"blocked">]>;
+export declare const mcpWorkspaceTrustDefaultSchema: z.ZodUnion<readonly [z.ZodLiteral<"trusted">, z.ZodLiteral<"ask">, z.ZodLiteral<"untrusted">]>;
+export declare const mcpWorkspaceTrustEntrySchema: z.ZodObject<{
+    workspaceUri: z.ZodString;
+    mode: z.ZodUnion<readonly [z.ZodLiteral<"trusted">, z.ZodLiteral<"ask">, z.ZodLiteral<"blocked">]>;
+    serverFingerprint: z.ZodOptional<z.ZodString>;
+    grantedBy: z.ZodOptional<z.ZodString>;
+    grantedAt: z.ZodOptional<z.ZodString>;
+    expiresAt: z.ZodOptional<z.ZodString>;
+    reason: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
 export declare const mcpServerSchema: z.ZodObject<{
     name: z.ZodString;
     transport: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"stdio">, z.ZodLiteral<"http">, z.ZodLiteral<"sse">]>>;
@@ -19,6 +30,7 @@ export declare const mcpServerSchema: z.ZodObject<{
     timeout: z.ZodOptional<z.ZodNumber>;
     enabled: z.ZodOptional<z.ZodBoolean>;
     disabled: z.ZodOptional<z.ZodBoolean>;
+    supportsParallelToolCalls: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
 export type McpAuthPresetInput = z.infer<typeof mcpAuthPresetSchema>;
 export type McpServerInput = z.infer<typeof mcpServerSchema>;
@@ -37,9 +49,12 @@ export declare const mcpConfigSchema: z.ZodObject<{
         timeout: z.ZodOptional<z.ZodNumber>;
         enabled: z.ZodOptional<z.ZodBoolean>;
         disabled: z.ZodOptional<z.ZodBoolean>;
+        supportsParallelToolCalls: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strict>>>;
     mcpServers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
     authPresets: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    trustedWorkspaces: z.ZodOptional<z.ZodUnknown>;
+    workspaceTrustDefault: z.ZodOptional<z.ZodUnknown>;
 }, z.core.$strip>;
 export type McpConfigInput = z.infer<typeof mcpConfigSchema>;
 //# sourceMappingURL=schema.d.ts.map

package/dist/mcp/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/mcp/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,eAAO,MAAM,kBAAkB,yFAI7B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;kBAc7B,CAAC;AAEJ,eAAO,MAAM,eAAe;;;;;;;;;;;;;;kBA2CzB,CAAC;AAEJ,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AACrE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAG7D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;iBAK1B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/mcp/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,eAAO,MAAM,kBAAkB,yFAI7B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;kBAc7B,CAAC;AAEJ,eAAO,MAAM,2BAA2B,8FAItC,CAAC;AAEH,eAAO,MAAM,8BAA8B,gGAIzC,CAAC;AAEH,eAAO,MAAM,4BAA4B;;;;;;;;kBAU/B,CAAC;AAEX,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;kBA4CzB,CAAC;AAEJ,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AACrE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAG7D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;iBAO1B,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC"}

package/dist/mcp/schema.js

@@ -23,6 +23,27 @@ export const mcpAuthPresetSchema = z
         });
     }
 });
+export const mcpWorkspaceTrustModeSchema = z.union([
+    z.literal("trusted"),
+    z.literal("ask"),
+    z.literal("blocked"),
+]);
+export const mcpWorkspaceTrustDefaultSchema = z.union([
+    z.literal("trusted"),
+    z.literal("ask"),
+    z.literal("untrusted"),
+]);
+export const mcpWorkspaceTrustEntrySchema = z
+    .object({
+    workspaceUri: z.string().min(1),
+    mode: mcpWorkspaceTrustModeSchema,
+    serverFingerprint: z.string().optional(),
+    grantedBy: z.string().optional(),
+    grantedAt: z.string().optional(),
+    expiresAt: z.string().optional(),
+    reason: z.string().optional(),
+})
+    .strict();
 export const mcpServerSchema = z
     .object({
     name: mcpNameSchema,
@@ -41,6 +62,7 @@ export const mcpServerSchema = z
     timeout: z.number().int().positive().optional(),
     enabled: z.boolean().optional(),
     disabled: z.boolean().optional(),
+    supportsParallelToolCalls: z.boolean().optional(),
 })
     .strict()
     .superRefine((cfg, ctx) => {
@@ -73,5 +95,7 @@ export const mcpConfigSchema = z.object({
     // allow loose objects; we normalize/validate per-entry later
     mcpServers: z.record(z.string(), z.unknown()).optional(),
     authPresets: z.record(z.string(), z.unknown()).optional(),
+    trustedWorkspaces: z.unknown().optional(),
+    workspaceTrustDefault: z.unknown().optional(),
 });
 //# sourceMappingURL=schema.js.map

package/dist/mcp/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/mcp/schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from \"zod\";\n\nconst mcpNameSchema = z\n\t.string()\n\t.min(1)\n\t.regex(/^[a-zA-Z0-9_-]+$/, \"Name must use letters, numbers, _ or -\");\n\nexport const mcpTransportSchema = z.union([\n\tz.literal(\"stdio\"),\n\tz.literal(\"http\"),\n\tz.literal(\"sse\"),\n]);\n\nexport const mcpAuthPresetSchema = z\n\t.object({\n\t\tname: mcpNameSchema,\n\t\theaders: z.record(z.string(), z.string()).optional(),\n\t\theadersHelper: z.string().optional(),\n\t})\n\t.strict()\n\t.superRefine((cfg, ctx) => {\n\t\tif (!cfg.headers && !cfg.headersHelper) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tmessage: \"Auth preset requires headers and/or headersHelper\",\n\t\t\t});\n\t\t}\n\t});\n\nexport const mcpServerSchema = z\n\t.object({\n\t\tname: mcpNameSchema,\n\t\ttransport: mcpTransportSchema.optional(),\n\t\t// stdio\n\t\tcommand: z.string().optional(),\n\t\targs: z.array(z.string()).optional(),\n\t\tenv: z.record(z.string(), z.string()).optional(),\n\t\tcwd: z.string().optional(),\n\t\t// http/sse\n\t\turl: z.string().url().optional(),\n\t\theaders: z.record(z.string(), z.string()).optional(),\n\t\theadersHelper: z.string().optional(),\n\t\tauthPreset: mcpNameSchema.optional(),\n\t\t// common\n\t\ttimeout: z.number().int().positive().optional(),\n\t\tenabled: z.boolean().optional(),\n\t\tdisabled: z.boolean().optional(),\n\t})\n\t.strict()\n\t.superRefine((cfg, ctx) => {\n\t\tconst transport = cfg.transport ?? (cfg.url ? \"http\" : \"stdio\");\n\t\tif (transport === \"stdio\" && !cfg.command) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tpath: [\"command\"],\n\t\t\t\tmessage: \"Stdio transport requires command\",\n\t\t\t});\n\t\t}\n\t\tif ((transport === \"http\" || transport === \"sse\") && !cfg.url) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tpath: [\"url\"],\n\t\t\t\tmessage: \"HTTP/SSE transport requires url\",\n\t\t\t});\n\t\t}\n\t\tif (transport === \"stdio\" && cfg.authPreset) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tpath: [\"authPreset\"],\n\t\t\t\tmessage: \"Stdio transport does not support auth presets\",\n\t\t\t});\n\t\t}\n\t});\n\nexport type McpAuthPresetInput = z.infer<typeof mcpAuthPresetSchema>;\nexport type McpServerInput = z.infer<typeof mcpServerSchema>;\n\n// Accept both array format and Claude-style { mcpServers: { name: {...} } }\nexport const mcpConfigSchema = z.object({\n\tservers: z.array(mcpServerSchema).optional(),\n\t// allow loose objects; we normalize/validate per-entry later\n\tmcpServers: z.record(z.string(), z.unknown()).optional(),\n\tauthPresets: z.record(z.string(), z.unknown()).optional(),\n});\n\nexport type McpConfigInput = z.infer<typeof mcpConfigSchema>;\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/mcp/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,aAAa,GAAG,CAAC;KACrB,MAAM,EAAE;KACR,GAAG,CAAC,CAAC,CAAC;KACN,KAAK,CAAC,kBAAkB,EAAE,wCAAwC,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC;IACzC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;IAClB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACjB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;CAChB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC;KAClC,MAAM,CAAC;IACP,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpD,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACpC,CAAC;KACD,MAAM,EAAE;KACR,WAAW,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACzB,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACxC,GAAG,CAAC,QAAQ,CAAC;YACZ,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;YAC3B,OAAO,EAAE,mDAAmD;SAC5D,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAAC;IAClD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACpB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAChB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAAC;IACrD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;IACpB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAChB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;CACtB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC;KAC3C,MAAM,CAAC;IACP,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,IAAI,EAAE,2BAA2B;IACjC,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC7B,CAAC;KACD,MAAM,EAAE,CAAC;AAEX,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;KAC9B,MAAM,CAAC;IACP,IAAI,EAAE,aAAa;IACnB,SAAS,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACxC,QAAQ;IACR,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAChD,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,WAAW;IACX,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAChC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpD,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACpC,UAAU,EAAE,aAAa,CAAC,QAAQ,EAAE;IACpC,SAAS;IACT,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC/C,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC/B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAChC,yBAAyB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACjD,CAAC;KACD,MAAM,EAAE;KACR,WAAW,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACzB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAChE,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAC3C,GAAG,CAAC,QAAQ,CAAC;YACZ,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;YAC3B,IAAI,EAAE,CAAC,SAAS,CAAC;YACjB,OAAO,EAAE,kCAAkC;SAC3C,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QAC/D,GAAG,CAAC,QAAQ,CAAC;YACZ,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;YAC3B,IAAI,EAAE,CAAC,KAAK,CAAC;YACb,OAAO,EAAE,iCAAiC;SAC1C,CAAC,CAAC;IACJ,CAAC;IACD,IAAI,SAAS,KAAK,OAAO,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QAC7C,GAAG,CAAC,QAAQ,CAAC;YACZ,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;YAC3B,IAAI,EAAE,CAAC,YAAY,CAAC;YACpB,OAAO,EAAE,+CAA+C;SACxD,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC,CAAC;AAKJ,4EAA4E;AAC5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;IAC5C,6DAA6D;IAC7D,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACxD,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACzD,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACzC,qBAAqB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CAC7C,CAAC,CAAC","sourcesContent":["import { z } from \"zod\";\n\nconst mcpNameSchema = z\n\t.string()\n\t.min(1)\n\t.regex(/^[a-zA-Z0-9_-]+$/, \"Name must use letters, numbers, _ or -\");\n\nexport const mcpTransportSchema = z.union([\n\tz.literal(\"stdio\"),\n\tz.literal(\"http\"),\n\tz.literal(\"sse\"),\n]);\n\nexport const mcpAuthPresetSchema = z\n\t.object({\n\t\tname: mcpNameSchema,\n\t\theaders: z.record(z.string(), z.string()).optional(),\n\t\theadersHelper: z.string().optional(),\n\t})\n\t.strict()\n\t.superRefine((cfg, ctx) => {\n\t\tif (!cfg.headers && !cfg.headersHelper) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tmessage: \"Auth preset requires headers and/or headersHelper\",\n\t\t\t});\n\t\t}\n\t});\n\nexport const mcpWorkspaceTrustModeSchema = z.union([\n\tz.literal(\"trusted\"),\n\tz.literal(\"ask\"),\n\tz.literal(\"blocked\"),\n]);\n\nexport const mcpWorkspaceTrustDefaultSchema = z.union([\n\tz.literal(\"trusted\"),\n\tz.literal(\"ask\"),\n\tz.literal(\"untrusted\"),\n]);\n\nexport const mcpWorkspaceTrustEntrySchema = z\n\t.object({\n\t\tworkspaceUri: z.string().min(1),\n\t\tmode: mcpWorkspaceTrustModeSchema,\n\t\tserverFingerprint: z.string().optional(),\n\t\tgrantedBy: z.string().optional(),\n\t\tgrantedAt: z.string().optional(),\n\t\texpiresAt: z.string().optional(),\n\t\treason: z.string().optional(),\n\t})\n\t.strict();\n\nexport const mcpServerSchema = z\n\t.object({\n\t\tname: mcpNameSchema,\n\t\ttransport: mcpTransportSchema.optional(),\n\t\t// stdio\n\t\tcommand: z.string().optional(),\n\t\targs: z.array(z.string()).optional(),\n\t\tenv: z.record(z.string(), z.string()).optional(),\n\t\tcwd: z.string().optional(),\n\t\t// http/sse\n\t\turl: z.string().url().optional(),\n\t\theaders: z.record(z.string(), z.string()).optional(),\n\t\theadersHelper: z.string().optional(),\n\t\tauthPreset: mcpNameSchema.optional(),\n\t\t// common\n\t\ttimeout: z.number().int().positive().optional(),\n\t\tenabled: z.boolean().optional(),\n\t\tdisabled: z.boolean().optional(),\n\t\tsupportsParallelToolCalls: z.boolean().optional(),\n\t})\n\t.strict()\n\t.superRefine((cfg, ctx) => {\n\t\tconst transport = cfg.transport ?? (cfg.url ? \"http\" : \"stdio\");\n\t\tif (transport === \"stdio\" && !cfg.command) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tpath: [\"command\"],\n\t\t\t\tmessage: \"Stdio transport requires command\",\n\t\t\t});\n\t\t}\n\t\tif ((transport === \"http\" || transport === \"sse\") && !cfg.url) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tpath: [\"url\"],\n\t\t\t\tmessage: \"HTTP/SSE transport requires url\",\n\t\t\t});\n\t\t}\n\t\tif (transport === \"stdio\" && cfg.authPreset) {\n\t\t\tctx.addIssue({\n\t\t\t\tcode: z.ZodIssueCode.custom,\n\t\t\t\tpath: [\"authPreset\"],\n\t\t\t\tmessage: \"Stdio transport does not support auth presets\",\n\t\t\t});\n\t\t}\n\t});\n\nexport type McpAuthPresetInput = z.infer<typeof mcpAuthPresetSchema>;\nexport type McpServerInput = z.infer<typeof mcpServerSchema>;\n\n// Accept both array format and Claude-style { mcpServers: { name: {...} } }\nexport const mcpConfigSchema = z.object({\n\tservers: z.array(mcpServerSchema).optional(),\n\t// allow loose objects; we normalize/validate per-entry later\n\tmcpServers: z.record(z.string(), z.unknown()).optional(),\n\tauthPresets: z.record(z.string(), z.unknown()).optional(),\n\ttrustedWorkspaces: z.unknown().optional(),\n\tworkspaceTrustDefault: z.unknown().optional(),\n});\n\nexport type McpConfigInput = z.infer<typeof mcpConfigSchema>;\n"]}

package/dist/mcp/tool-bridge.d.ts

@@ -1,6 +1,7 @@
 import type { Tool as McpTool } from "@modelcontextprotocol/sdk/types.js";
 import { type TSchema } from "@sinclair/typebox";
-import type { AgentTool } from "../agent/types.js";
+import type { AgentTool, ToolAnnotations } from "../agent/types.js";
+import type { McpToolParallelSafety } from "./types.js";
 interface McpToolDetails {
     server: string;
     tool: string;
@@ -8,8 +9,25 @@ interface McpToolDetails {
     structuredContent?: unknown;
     isError?: boolean;
     governedOutcome?: McpGovernedOutcome;
+    toolExecutionState?: McpGovernedToolExecutionState;
 }
-interface McpGovernedOutcome {
+export declare const MCP_GOVERNED_TOOL_EXECUTION_SCHEMA = "evalops.maestro.mcp-governed-tool-execution.v1";
+export type McpGovernedClassification = "approval_required" | "approval_pending" | "authentication_required" | "denied" | "rate_limited";
+export type McpGovernedToolExecutionStateKind = "waiting_approval" | "blocked_authentication" | "blocked_retry_later" | "denied";
+export interface McpGovernedToolExecutionState {
+    schemaVersion: typeof MCP_GOVERNED_TOOL_EXECUTION_SCHEMA;
+    authority: "mcp_result_adapter";
+    state: McpGovernedToolExecutionStateKind;
+    terminal: boolean;
+    classification: McpGovernedClassification;
+    approvalRequestId?: string;
+    retryAfterMs?: number;
+    message?: string;
+    reasons?: string[];
+    code?: string;
+    riskLevel?: string;
+}
+export interface McpGovernedOutcome {
     classification: "approval_required" | "approval_pending" | "authentication_required" | "denied" | "rate_limited";
     decision?: string;
     riskLevel?: string;
@@ -22,12 +40,17 @@ interface McpGovernedOutcome {
     retryAfterMs?: number;
     retryAfterSeconds?: number;
 }
-export declare function createMcpToolWrapper(serverName: string, mcpTool: McpTool): Readonly<{
+export declare function normalizeMcpGovernedToolExecution(outcome: McpGovernedOutcome | undefined): McpGovernedToolExecutionState | undefined;
+export declare function createMcpToolWrapper(serverName: string, mcpTool: McpTool, options?: {
+    supportsParallelToolCalls?: boolean;
+    parallelSafety?: McpToolParallelSafety;
+}): Readonly<{
     name: string;
     label: string;
     description: string;
     parameters: TSchema;
-    annotations: import("../agent/types.js").ToolAnnotations | undefined;
+    annotations: ToolAnnotations | undefined;
+    source: import("../agent/types.js").McpToolSourceMetadata | undefined;
     toolType: string | undefined;
     inputExamples: unknown[] | undefined;
     allowedCallers: string[] | undefined;
@@ -60,7 +83,8 @@ export declare const listMcpResourcesTool: Readonly<{
     parameters: import("@sinclair/typebox").TObject<{
         server: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     }>;
-    annotations: import("../agent/types.js").ToolAnnotations | undefined;
+    annotations: ToolAnnotations | undefined;
+    source: import("../agent/types.js").McpToolSourceMetadata | undefined;
     toolType: string | undefined;
     inputExamples: unknown[] | undefined;
     allowedCallers: string[] | undefined;
@@ -95,7 +119,8 @@ export declare const readMcpResourceTool: Readonly<{
         server: import("@sinclair/typebox").TString;
         uri: import("@sinclair/typebox").TString;
     }>;
-    annotations: import("../agent/types.js").ToolAnnotations | undefined;
+    annotations: ToolAnnotations | undefined;
+    source: import("../agent/types.js").McpToolSourceMetadata | undefined;
     toolType: string | undefined;
     inputExamples: unknown[] | undefined;
     allowedCallers: string[] | undefined;
@@ -126,7 +151,8 @@ export declare const listMcpPromptsTool: Readonly<{
     parameters: import("@sinclair/typebox").TObject<{
         server: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     }>;
-    annotations: import("../agent/types.js").ToolAnnotations | undefined;
+    annotations: ToolAnnotations | undefined;
+    source: import("../agent/types.js").McpToolSourceMetadata | undefined;
     toolType: string | undefined;
     inputExamples: unknown[] | undefined;
     allowedCallers: string[] | undefined;
@@ -162,7 +188,8 @@ export declare const getMcpPromptTool: Readonly<{
         name: import("@sinclair/typebox").TString;
         args: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
     }>;
-    annotations: import("../agent/types.js").ToolAnnotations | undefined;
+    annotations: ToolAnnotations | undefined;
+    source: import("../agent/types.js").McpToolSourceMetadata | undefined;
     toolType: string | undefined;
     inputExamples: unknown[] | undefined;
     allowedCallers: string[] | undefined;
@@ -187,7 +214,8 @@ export declare function getMcpResourceTools(): (Readonly<{
     parameters: import("@sinclair/typebox").TObject<{
         server: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     }>;
-    annotations: import("../agent/types.js").ToolAnnotations | undefined;
+    annotations: ToolAnnotations | undefined;
+    source: import("../agent/types.js").McpToolSourceMetadata | undefined;
     toolType: string | undefined;
     inputExamples: unknown[] | undefined;
     allowedCallers: string[] | undefined;
@@ -209,7 +237,8 @@ export declare function getMcpResourceTools(): (Readonly<{
         server: import("@sinclair/typebox").TString;
         uri: import("@sinclair/typebox").TString;
     }>;
-    annotations: import("../agent/types.js").ToolAnnotations | undefined;
+    annotations: ToolAnnotations | undefined;
+    source: import("../agent/types.js").McpToolSourceMetadata | undefined;
     toolType: string | undefined;
     inputExamples: unknown[] | undefined;
     allowedCallers: string[] | undefined;

package/dist/mcp/tool-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-bridge.d.ts","sourceRoot":"","sources":["../../src/mcp/tool-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,KAAK,OAAO,EAAQ,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAUnD,UAAU,cAAc;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACrC;AAED,UAAU,kBAAkB;IAC3B,cAAc,EACX,mBAAmB,GACnB,kBAAkB,GAClB,yBAAyB,GACzB,QAAQ,GACR,cAAc,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC3B;AA6RD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;;;;;;;;;;;;;;;;;;;GA2DxE;AAED,wBAAgB,cAAc,IAAI,SAAS,EAAE,CAM5C;AAED,wBAAgB,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CActD;AAMD,UAAU,sBAAsB;IAC/B,OAAO,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC,CAAC;CACH;AAWD;;GAEG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;EA8C/B,CAAC;AAEH,UAAU,sBAAsB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,KAAK,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC,CAAC;CACH;AAWD;;GAEG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;EA+C9B,CAAC;AAEH,UAAU,oBAAoB;IAC7B,OAAO,EAAE,KAAK,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC,CAAC;CACH;AAWD;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;EA8C7B,CAAC;AAEH,UAAU,gBAAgB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD;AAmBD;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;EA6C3B,CAAC;AAEH;;GAEG;AACH,wBAAgB,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAElC"}
+{"version":3,"file":"tool-bridge.d.ts","sourceRoot":"","sources":["../../src/mcp/tool-bridge.ts"],"names":[],"mappings":"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"}

package/dist/mcp/tool-bridge.js

@@ -1,8 +1,52 @@
 import { Type } from "@sinclair/typebox";
 import { trackToolApprovalRequired, trackToolBlocked, } from "../telemetry/security-events.js";
 import { createTool } from "../tools/tool-dsl.js";
+import { promptSafeText } from "../utils/prompt-safe-text.js";
 import { mcpManager } from "./manager.js";
 import { buildMcpToolName } from "./names.js";
+export const MCP_GOVERNED_TOOL_EXECUTION_SCHEMA = "evalops.maestro.mcp-governed-tool-execution.v1";
+export function normalizeMcpGovernedToolExecution(outcome) {
+    if (!outcome) {
+        return undefined;
+    }
+    let state;
+    let terminal = true;
+    switch (outcome.classification) {
+        case "approval_required":
+        case "approval_pending":
+            state = "waiting_approval";
+            terminal = false;
+            break;
+        case "authentication_required":
+            state = "blocked_authentication";
+            break;
+        case "rate_limited":
+            state = "blocked_retry_later";
+            break;
+        case "denied":
+            state = "denied";
+            break;
+    }
+    const retryAfterMs = outcome.retryAfterMs ??
+        (outcome.retryAfterSeconds !== undefined
+            ? outcome.retryAfterSeconds * 1000
+            : undefined);
+    return {
+        schemaVersion: MCP_GOVERNED_TOOL_EXECUTION_SCHEMA,
+        authority: "mcp_result_adapter",
+        state,
+        terminal,
+        classification: outcome.classification,
+        ...(outcome.approvalRequestId
+            ? { approvalRequestId: outcome.approvalRequestId }
+            : {}),
+        ...(retryAfterMs !== undefined ? { retryAfterMs } : {}),
+        ...(outcome.message ? { message: outcome.message } : {}),
+        ...(outcome.reasons ? { reasons: outcome.reasons } : {}),
+        ...(outcome.code ? { code: outcome.code } : {}),
+        ...(outcome.riskLevel ? { riskLevel: outcome.riskLevel } : {}),
+    };
+}
 function normalizeObject(value) {
     return value && typeof value === "object" && !Array.isArray(value)
         ? value
@@ -116,7 +160,7 @@ function classifyGovernedOutcome(payload) {
     }
     return undefined;
 }
-function formatGovernedOutcomeSummary(outcome) {
+function formatGovernedOutcomeSummary(outcome, toolExecutionState) {
     if (!outcome) {
         return undefined;
     }
@@ -147,6 +191,9 @@ function formatGovernedOutcomeSummary(outcome) {
     if (outcome.approvalRequestId) {
         lines.push(`Approval request: ${outcome.approvalRequestId}`);
     }
+    if (toolExecutionState) {
+        lines.push(`ToolExecution state: ${toolExecutionState.state} (${toolExecutionState.authority}).`);
+    }
     if (outcome.state && outcome.classification !== "approval_pending") {
         lines.push(`State: ${outcome.state}`);
     }
@@ -191,17 +238,20 @@ function convertJsonSchemaToTypebox(schema) {
     }
     const s = schema;
     const type = s.type;
+    const description = typeof s.description === "string"
+        ? (promptSafeText(s.description) ?? undefined)
+        : undefined;
     switch (type) {
         case "string":
-            return Type.String({ description: s.description });
+            return Type.String({ description });
         case "number":
         case "integer":
-            return Type.Number({ description: s.description });
+            return Type.Number({ description });
         case "boolean":
-            return Type.Boolean({ description: s.description });
+            return Type.Boolean({ description });
         case "array":
             return Type.Array(convertJsonSchemaToTypebox(s.items), {
-                description: s.description,
+                description,
             });
         case "object": {
             const properties = s.properties;
@@ -217,38 +267,57 @@ function convertJsonSchemaToTypebox(schema) {
                     : Type.Optional(converted);
             }
             return Type.Object(props, {
-                description: s.description,
+                description,
             });
         }
         default:
-            return Type.Unknown({ description: s.description });
+            return Type.Unknown({ description });
     }
 }
-export function createMcpToolWrapper(serverName, mcpTool) {
+export function createMcpToolWrapper(serverName, mcpTool, options) {
     const toolName = buildMcpToolName(serverName, mcpTool.name);
     const schema = mcpTool.inputSchema
         ? convertJsonSchemaToTypebox(mcpTool.inputSchema)
         : Type.Object({});
     // Extract MCP tool annotations for approval decisions
     const mcpAnnotations = mcpTool.annotations;
+    const supportsParallelToolCalls = options?.parallelSafety?.supportsParallelToolCalls === true ||
+        options?.supportsParallelToolCalls === true;
+    const parallelSafetyProvenance = options?.parallelSafety?.provenance ??
+        (options?.supportsParallelToolCalls === true ? "static_config" : "none");
+    const parallelMaxConcurrency = options?.parallelSafety?.maxConcurrency;
+    const advertisedParallelReadOnly = supportsParallelToolCalls && options?.parallelSafety?.readOnlyHint === true;
+    const annotations = mcpAnnotations || advertisedParallelReadOnly
+        ? {
+            readOnlyHint: mcpAnnotations?.readOnlyHint ??
+                (advertisedParallelReadOnly ? true : undefined),
+            destructiveHint: mcpAnnotations?.destructiveHint,
+            idempotentHint: mcpAnnotations?.idempotentHint,
+            openWorldHint: mcpAnnotations?.openWorldHint,
+        }
+        : undefined;
+    const source = {
+        type: "mcp",
+        server: serverName,
+        tool: mcpTool.name,
+        supportsParallelToolCalls,
+        parallelSafetyProvenance,
+        ...(parallelMaxConcurrency ? { parallelMaxConcurrency } : {}),
+    };
     return createTool({
         name: toolName,
         label: `${serverName}/${mcpTool.name}`,
-        description: mcpTool.description ?? `MCP tool from ${serverName}: ${mcpTool.name}`,
+        description: promptSafeText(mcpTool.description) ??
+            `MCP tool from ${serverName}: ${mcpTool.name}`,
         schema,
-        annotations: mcpAnnotations
-            ? {
-                readOnlyHint: mcpAnnotations.readOnlyHint,
-                destructiveHint: mcpAnnotations.destructiveHint,
-                idempotentHint: mcpAnnotations.idempotentHint,
-                openWorldHint: mcpAnnotations.openWorldHint,
-            }
-            : undefined,
+        annotations,
+        source,
         async run(params, { respond }) {
             const result = await mcpManager.callTool(serverName, mcpTool.name, params);
             const governedOutcome = classifyGovernedOutcome(resolveGovernedPayload(result));
+            const toolExecutionState = normalizeMcpGovernedToolExecution(governedOutcome);
             emitGovernedOutcomeTelemetry(mcpTool.name, governedOutcome);
-            const output = formatGovernedOutcomeSummary(governedOutcome) ??
+            const output = formatGovernedOutcomeSummary(governedOutcome, toolExecutionState) ??
                 extractMcpTextContent(result.content) ??
                 JSON.stringify(result.structuredContent ?? result.content, null, 2);
             const response = result.isError
@@ -261,6 +330,7 @@ export function createMcpToolWrapper(serverName, mcpTool) {
                 structuredContent: result.structuredContent,
                 isError: result.isError,
                 governedOutcome,
+                toolExecutionState,
             });
         },
     });
@@ -268,7 +338,10 @@ export function createMcpToolWrapper(serverName, mcpTool) {
 export function getAllMcpTools() {
     const mcpTools = mcpManager.getAllTools();
     return [
-        ...mcpTools.map(({ server, tool }) => createMcpToolWrapper(server, tool)),
+        ...mcpTools.map(({ server, tool, supportsParallelToolCalls, parallelSafety }) => createMcpToolWrapper(server, tool, {
+            supportsParallelToolCalls,
+            parallelSafety,
+        })),
         ...getMcpHelperTools(),
     ];
 }
@@ -278,8 +351,11 @@ export function getMcpToolMap() {
     for (const tool of getMcpHelperTools()) {
         map.set(tool.name, tool);
     }
-    for (const { server, tool } of mcpTools) {
-        const wrapper = createMcpToolWrapper(server, tool);
+    for (const { server, tool, supportsParallelToolCalls, parallelSafety, } of mcpTools) {
+        const wrapper = createMcpToolWrapper(server, tool, {
+            supportsParallelToolCalls,
+            parallelSafety,
+        });
         map.set(wrapper.name, wrapper);
     }
     return map;
@@ -451,8 +527,9 @@ export const getMcpPromptTool = createTool({
         try {
             const result = await mcpManager.getPrompt(server, name, args);
             const lines = [`Prompt: ${name}`];
-            if (result.description) {
-                lines.push(`Description: ${result.description}`);
+            const description = promptSafeText(result.description);
+            if (description) {
+                lines.push(`Description: ${description}`);
             }
             if (result.messages.length === 0) {
                 lines.push("");
@@ -469,7 +546,7 @@ export const getMcpPromptTool = createTool({
             return respond.text(lines.join("\n").trimEnd()).detail({
                 server,
                 name,
-                description: result.description,
+                description: description ?? undefined,
                 messages: result.messages,
             });
         }