@inspectr/mcplab 1.6.0 → 1.8.0

package/dist/app-server/scenario-assistant-domain.d.ts

@@ -3,162 +3,156 @@ import { McpClientManager } from '@inspectr/mcplab-core';
 import { readLibraries } from './libraries-store.js';
 export { truncateJson } from './assistant-common.js';
 interface ScenarioAssistantContextInput {
-  configSnapshotPolicy?: {
-    enabled?: boolean;
-    mode?: 'warn' | 'fail_on_drift';
-    baselineSnapshotId?: string;
-  };
-  scenario: {
-    id: string;
-    name?: string;
-    prompt: string;
-    serverNames: string[];
-    evalRules: Array<{
-      type: string;
-      value: string;
+    configSnapshotPolicy?: {
+        enabled?: boolean;
+        mode?: 'warn' | 'fail_on_drift';
+        baselineSnapshotId?: string;
+    };
+    scenario: {
+        id: string;
+        name?: string;
+        prompt: string;
+        serverNames: string[];
+        evalRules: Array<{
+            type: string;
+            value?: string;
+            path?: string;
+            equals?: string | number | boolean;
+        }>;
+        extractRules: Array<{
+            name: string;
+            pattern: string;
+        }>;
+        snapshotEval?: {
+            enabled?: boolean;
+            baselineSnapshotId?: string;
+        };
+    };
+    availableServers?: Array<{
+        name: string;
+        url?: string;
     }>;
-    extractRules: Array<{
-      name: string;
-      pattern: string;
+    availableAgents?: Array<{
+        name: string;
+        provider: string;
+        model: string;
     }>;
-    snapshotEval?: {
-      enabled?: boolean;
-      baselineSnapshotId?: string;
-    };
-  };
-  availableServers?: Array<{
-    name: string;
-    url?: string;
-  }>;
-  availableAgents?: Array<{
-    name: string;
-    provider: string;
-    model: string;
-  }>;
 }
 interface ScenarioAssistantSuggestionBundle {
-  prompt?: {
-    replacement: string;
-    rationale?: string;
-  };
-  evalRules?: {
-    replacement: Array<{
-      type: string;
-      value: string;
-    }>;
-    rationale?: string;
-  };
-  extractRules?: {
-    replacement: Array<{
-      name: string;
-      pattern: string;
-    }>;
-    rationale?: string;
-  };
-  snapshotEval?: {
-    patch: {
-      enabled?: boolean;
-      baselineSnapshotId?: string;
+    prompt?: {
+        replacement: string;
+        rationale?: string;
+    };
+    evalRules?: {
+        replacement: Array<{
+            type: string;
+            value?: string;
+            path?: string;
+            equals?: string | number | boolean;
+        }>;
+        rationale?: string;
+    };
+    extractRules?: {
+        replacement: Array<{
+            name: string;
+            pattern: string;
+        }>;
+        rationale?: string;
+    };
+    snapshotEval?: {
+        patch: {
+            enabled?: boolean;
+            baselineSnapshotId?: string;
+        };
+        rationale?: string;
     };
-    rationale?: string;
-  };
-  notes?: string[];
+    notes?: string[];
+}
+interface ScenarioAssistantEvalRuleSuggestion {
+    type: string;
+    value?: string;
+    path?: string;
+    equals?: string | number | boolean;
 }
 interface AssistantPendingToolCall {
-  id: string;
-  server: string;
-  tool: string;
-  publicToolName: string;
-  arguments: unknown;
-  status: 'pending' | 'approved' | 'denied' | 'error';
-  createdAt: string;
-  resultPreview?: string;
-  error?: string;
+    id: string;
+    server: string;
+    tool: string;
+    publicToolName: string;
+    arguments: unknown;
+    status: 'pending' | 'approved' | 'denied' | 'error';
+    createdAt: string;
+    resultPreview?: string;
+    error?: string;
 }
 interface AssistantChatMessage {
-  id: string;
-  role: 'user' | 'assistant' | 'tool' | 'system';
-  text: string;
-  createdAt: string;
-  suggestions?: ScenarioAssistantSuggestionBundle;
-  pendingToolCallId?: string;
-  pendingToolCallIds?: string[];
-  toolRequestServer?: string;
-  toolRequestName?: string;
-  toolRequestPublicName?: string;
+    id: string;
+    role: 'user' | 'assistant' | 'tool' | 'system';
+    text: string;
+    createdAt: string;
+    suggestions?: ScenarioAssistantSuggestionBundle;
+    pendingToolCallId?: string;
+    pendingToolCallIds?: string[];
+    toolRequestServer?: string;
+    toolRequestName?: string;
+    toolRequestPublicName?: string;
 }
 export interface ScenarioAssistantSession {
-  id: string;
-  createdAt: number;
-  lastTouchedAt: number;
-  configPath?: string;
-  selectedAssistantAgentName: string;
-  context: ScenarioAssistantContextInput;
-  agentConfig: AgentConfig;
-  mcp: McpClientManager;
-  tools: ToolDef[];
-  toolPublicMap: Map<
-    string,
-    {
-      server: string;
-      tool: string;
-    }
-  >;
-  pendingToolCalls: AssistantPendingToolCall[];
-  chatMessages: AssistantChatMessage[];
-  llmMessages: LlmMessage[];
-  warnings: string[];
-  systemPromptCache?: string;
+    id: string;
+    createdAt: number;
+    lastTouchedAt: number;
+    configPath?: string;
+    selectedAssistantAgentName: string;
+    context: ScenarioAssistantContextInput;
+    agentConfig: AgentConfig;
+    mcp: McpClientManager;
+    tools: ToolDef[];
+    toolPublicMap: Map<string, {
+        server: string;
+        tool: string;
+    }>;
+    pendingToolCalls: AssistantPendingToolCall[];
+    chatMessages: AssistantChatMessage[];
+    llmMessages: LlmMessage[];
+    warnings: string[];
+    systemPromptCache?: string;
 }
-export declare function cleanupAssistantSessions(
-  sessions: Map<string, ScenarioAssistantSession>,
-  now?: number
-): void;
+export declare function cleanupAssistantSessions(sessions: Map<string, ScenarioAssistantSession>, now?: number): void;
 export declare function touchAssistantSession(session: ScenarioAssistantSession): void;
 export declare function assistantSessionView(session: ScenarioAssistantSession): {
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  selectedAssistantAgentName: string;
-  model: string;
-  provider: 'openai' | 'anthropic' | 'azure_openai';
-  warnings: string[];
-  toolsLoaded: number;
-  toolServers: string[];
-  messages: AssistantChatMessage[];
-  pendingToolCalls: AssistantPendingToolCall[];
+    id: string;
+    createdAt: string;
+    updatedAt: string;
+    selectedAssistantAgentName: string;
+    model: string;
+    provider: "openai" | "anthropic" | "azure_openai";
+    warnings: string[];
+    toolsLoaded: number;
+    toolServers: string[];
+    messages: AssistantChatMessage[];
+    pendingToolCalls: AssistantPendingToolCall[];
 };
-export declare function preloadAssistantTools(
-  session: ScenarioAssistantSession,
-  serversByName: Record<string, EvalConfig['servers'][string]>,
-  selectedServerNames: string[]
-): Promise<void>;
+export declare function preloadAssistantTools(session: ScenarioAssistantSession, serversByName: Record<string, EvalConfig['servers'][string]>, selectedServerNames: string[], options?: {
+    serverAuthHeaders?: Record<string, Record<string, string>>;
+}): Promise<void>;
+export declare function normalizeScenarioAssistantEvalRules(replacement: ScenarioAssistantEvalRuleSuggestion[]): ScenarioAssistantEvalRuleSuggestion[];
 export declare function continueAssistantTurn(session: ScenarioAssistantSession): Promise<{
-  session: ReturnType<typeof assistantSessionView>;
-  response: {
-    type: 'assistant_message' | 'tool_call_request';
-    text: string;
-    suggestions?: ScenarioAssistantSuggestionBundle;
-    pendingToolCall?: AssistantPendingToolCall;
-    pendingToolCalls?: AssistantPendingToolCall[];
-  };
+    session: ReturnType<typeof assistantSessionView>;
+    response: {
+        type: 'assistant_message' | 'tool_call_request';
+        text: string;
+        suggestions?: ScenarioAssistantSuggestionBundle;
+        pendingToolCall?: AssistantPendingToolCall;
+        pendingToolCalls?: AssistantPendingToolCall[];
+    };
 }>;
-export declare function executeAssistantToolCall(
-  session: ScenarioAssistantSession,
-  pending: AssistantPendingToolCall
-): Promise<unknown>;
+export declare function executeAssistantToolCall(session: ScenarioAssistantSession, pending: AssistantPendingToolCall): Promise<unknown>;
 export declare function summarizeToolResultForAssistant(result: unknown): string;
-export declare function resolveAssistantAgentFromConfig(
-  config: EvalConfig,
-  selectedAssistantAgentName: string
-): AgentConfig;
-export declare function resolveAssistantAgentFromLibraries(
-  libraries: ReturnType<typeof readLibraries>,
-  selectedAssistantAgentName: string
-): AgentConfig;
+export declare function resolveAssistantAgentFromConfig(config: EvalConfig, selectedAssistantAgentName: string): AgentConfig;
+export declare function resolveAssistantAgentFromLibraries(libraries: ReturnType<typeof readLibraries>, selectedAssistantAgentName: string): AgentConfig;
 export declare function pickDefaultAssistantAgentName(params: {
-  requested?: string;
-  settingsDefault?: string;
-  agentNames: string[];
+    requested?: string;
+    settingsDefault?: string;
+    agentNames: string[];
 }): string;
-//# sourceMappingURL=scenario-assistant-domain.d.ts.map
+//# sourceMappingURL=scenario-assistant-domain.d.ts.map

package/dist/app-server/scenario-assistant-domain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scenario-assistant-domain.d.ts","sourceRoot":"","sources":["../../src/app-server/scenario-assistant-domain.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scenario-assistant-domain.d.ts","sourceRoot":"","sources":["../../src/app-server/scenario-assistant-domain.ts"],"names":[],"mappings":"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"}

package/dist/app-server/scenario-assistant-domain.js

@@ -44,12 +44,16 @@ function assistantSystemPrompt(session) {
         `{"type":"tool_call_request","text":"...","toolCall":{"name":"PUBLIC_TOOL_NAME","arguments":{}},"suggestions":{...optional...}}`,
         'For suggestions, use keys: prompt, evalRules, extractRules, snapshotEval, notes.',
         'prompt: { replacement: string, rationale?: string }',
-        'evalRules: { replacement: [{ type, value }...], rationale?: string }',
+        'evalRules: { replacement: [{ type, value?, path?, equals? }...], rationale?: string }',
         'extractRules: { replacement: [{ name, pattern }...], rationale?: string }',
         'snapshotEval: { patch: { enabled?: boolean, baselineSnapshotId?: string }, rationale?: string }',
         'If you propose any edits to the scenario (prompt, Checks, Value Capture Rules, or snapshot settings), you MUST include the corresponding structured suggestions payload.',
         'Do not describe "suggested updates" in text only. Include suggestions so the UI can render Apply actions.',
-        'Keep rule types limited to: required_tool, forbidden_tool, response_contains, response_not_contains.',
+        'Keep rule types limited to: required_tool, forbidden_tool, response_contains, response_not_contains, response_starts_with, response_ends_with, response_equals, response_regex, response_jsonpath, response_jsonpath_exists, response_jsonpath_not_exists.',
+        'Preference policy: prefer non-regex checks first (response_contains, response_not_contains, response_starts_with, response_ends_with, response_equals).',
+        'Use response_regex only for genuinely variable/complex patterns (IDs, dates, currency, alternation, optional tokens, quantifiers, character classes).',
+        'Never include both response_regex and an equivalent literal check for the same intent.',
+        'Prefer concise, positive checks over brittle near-miss negatives. Avoid paired off-by-one guards like "not 8 tags" and "not 10 tags" when "contains 9 tags" captures intent.',
         'IMPORTANT: For required_tool and forbidden_tool eval rules, use the raw MCP tool name (the "tool=" value shown in the tool listing), NOT the prefixed public name. For example, use "value_based_search" not "trendminer__value_based_search".',
         'Ask clarifying questions if the scenario intent is unclear.',
         `Scenario context: ${JSON.stringify({
@@ -82,7 +86,7 @@ function formatAssistantMcpPreloadError(serverName, error) {
     }
     return `Scenario Assistant MCP preload failed for server '${serverName}': ${raw}`;
 }
-export async function preloadAssistantTools(session, serversByName, selectedServerNames) {
+export async function preloadAssistantTools(session, serversByName, selectedServerNames, options) {
     const usedNames = new Set();
     for (const serverName of selectedServerNames) {
         const server = serversByName[serverName];
@@ -91,7 +95,9 @@ export async function preloadAssistantTools(session, serversByName, selectedServ
             continue;
         }
         try {
-            await session.mcp.connectAll({ [serverName]: server });
+            await session.mcp.connectAll({ [serverName]: server }, undefined, {
+                serverAuthHeaders: options?.serverAuthHeaders
+            });
             const tools = await session.mcp.listTools(serverName);
             for (const tool of tools) {
                 const publicName = makeAssistantToolPublicName(serverName, tool.name, usedNames);
@@ -112,7 +118,7 @@ function normalizeEvalRuleToolNames(suggestions, toolPublicMap) {
     if (!suggestions?.evalRules?.replacement)
         return;
     for (const rule of suggestions.evalRules.replacement) {
-        if (rule.type === 'required_tool' || rule.type === 'forbidden_tool') {
+        if ((rule.type === 'required_tool' || rule.type === 'forbidden_tool') && rule.value) {
             const mapping = toolPublicMap.get(rule.value);
             if (mapping) {
                 rule.value = mapping.tool;
@@ -120,6 +126,264 @@ function normalizeEvalRuleToolNames(suggestions, toolPublicMap) {
         }
     }
 }
+function tryParseRegexAsLiteral(pattern) {
+    const trimmed = pattern.trim();
+    if (!trimmed)
+        return null;
+    const anchoredStart = trimmed.startsWith('^');
+    const anchoredEnd = trimmed.endsWith('$');
+    const body = anchoredStart || anchoredEnd
+        ? trimmed.slice(anchoredStart ? 1 : 0, anchoredEnd ? -1 : undefined)
+        : trimmed;
+    const regexSpecial = new Set(['.', '^', '$', '*', '+', '?', '(', ')', '[', ']', '{', '}', '|']);
+    const complexEscapes = new Set(['d', 'D', 's', 'S', 'w', 'W', 'b', 'B', 'p', 'P']);
+    let literal = '';
+    let escaped = false;
+    for (const char of body) {
+        if (escaped) {
+            if (complexEscapes.has(char))
+                return null;
+            literal += char;
+            escaped = false;
+            continue;
+        }
+        if (char === '\\') {
+            escaped = true;
+            continue;
+        }
+        if (regexSpecial.has(char)) {
+            return null;
+        }
+        literal += char;
+    }
+    if (escaped)
+        return null;
+    return { literal, anchored: anchoredStart && anchoredEnd };
+}
+function evalRuleKey(rule) {
+    return `${rule.type}::${rule.value ?? ''}::${rule.path ?? ''}::${rule.equals === undefined ? '' : String(rule.equals)}`;
+}
+function hasEquivalentLiteralRule(rules, literalValue) {
+    return rules.some((rule) => (rule.type === 'response_contains' ||
+        rule.type === 'response_not_contains' ||
+        rule.type === 'response_starts_with' ||
+        rule.type === 'response_ends_with' ||
+        rule.type === 'response_equals') &&
+        rule.value === literalValue);
+}
+function parseCountWithSuffix(value) {
+    const trimmed = value.trim();
+    const match = trimmed.match(/^(\d+)(\s+.+)$/);
+    if (!match)
+        return null;
+    return {
+        count: Number.parseInt(match[1], 10),
+        suffix: match[2]
+    };
+}
+function collapseOffByOneCountGuards(rules) {
+    const removeIndices = new Set();
+    const replaceContains = new Map();
+    for (let i = 0; i < rules.length; i += 1) {
+        const rule = rules[i];
+        if (rule.type !== 'response_contains' || !rule.value)
+            continue;
+        const explicitPositive = parseCountWithSuffix(rule.value);
+        const numericOnly = !explicitPositive && rule.value.trim().match(/^\d+$/);
+        if (!explicitPositive && !numericOnly)
+            continue;
+        const count = explicitPositive
+            ? explicitPositive.count
+            : Number.parseInt(rule.value.trim(), 10);
+        const preferredSuffix = explicitPositive?.suffix;
+        const offByOneCandidates = new Map();
+        for (let j = 0; j < rules.length; j += 1) {
+            const candidate = rules[j];
+            if (candidate.type !== 'response_not_contains' || !candidate.value)
+                continue;
+            const parsed = parseCountWithSuffix(candidate.value);
+            if (!parsed)
+                continue;
+            if (preferredSuffix && parsed.suffix !== preferredSuffix)
+                continue;
+            if (parsed.count !== count - 1 && parsed.count !== count + 1)
+                continue;
+            const bucket = offByOneCandidates.get(parsed.suffix) ?? {};
+            if (parsed.count === count - 1)
+                bucket.lowerIdx = j;
+            if (parsed.count === count + 1)
+                bucket.upperIdx = j;
+            offByOneCandidates.set(parsed.suffix, bucket);
+        }
+        const selected = [...offByOneCandidates.entries()].find(([, pair]) => pair.lowerIdx !== undefined && pair.upperIdx !== undefined);
+        if (!selected)
+            continue;
+        const [suffix, pair] = selected;
+        removeIndices.add(pair.lowerIdx);
+        removeIndices.add(pair.upperIdx);
+        if (!explicitPositive) {
+            replaceContains.set(i, `${count}${suffix}`);
+        }
+    }
+    const result = [];
+    for (let i = 0; i < rules.length; i += 1) {
+        if (removeIndices.has(i))
+            continue;
+        const rule = rules[i];
+        const replacement = replaceContains.get(i);
+        if (replacement) {
+            result.push({ ...rule, value: replacement });
+            continue;
+        }
+        result.push(rule);
+    }
+    return result;
+}
+function normalizeIntentValue(value) {
+    return value.trim().toLowerCase().replace(/\s+/g, ' ');
+}
+function positiveLiteralRank(type) {
+    switch (type) {
+        case 'response_equals':
+            return 4;
+        case 'response_starts_with':
+        case 'response_ends_with':
+            return 3;
+        case 'response_contains':
+            return 2;
+        default:
+            return 1;
+    }
+}
+function intentDeduplicateEvalRules(rules) {
+    const result = [];
+    const positiveByIntent = new Map();
+    const containsIndices = [];
+    for (const rule of rules) {
+        if ((rule.type === 'response_contains' ||
+            rule.type === 'response_starts_with' ||
+            rule.type === 'response_ends_with' ||
+            rule.type === 'response_equals') &&
+            rule.value) {
+            const intent = normalizeIntentValue(rule.value);
+            const existingIdx = positiveByIntent.get(intent);
+            if (existingIdx !== undefined) {
+                const existing = result[existingIdx];
+                if (positiveLiteralRank(rule.type) > positiveLiteralRank(existing.type)) {
+                    result[existingIdx] = rule;
+                    if (existing.type === 'response_contains' && rule.type !== 'response_contains') {
+                        const containsIndex = containsIndices.indexOf(existingIdx);
+                        if (containsIndex >= 0)
+                            containsIndices.splice(containsIndex, 1);
+                    }
+                }
+                continue;
+            }
+            if (rule.type === 'response_contains') {
+                const newIntent = intent;
+                let droppedAsMoreSpecific = false;
+                for (const idx of containsIndices) {
+                    const existing = result[idx];
+                    if (!existing?.value)
+                        continue;
+                    const existingIntent = normalizeIntentValue(existing.value);
+                    if (newIntent.includes(existingIntent)) {
+                        droppedAsMoreSpecific = true;
+                        break;
+                    }
+                    if (existingIntent.includes(newIntent)) {
+                        positiveByIntent.delete(existingIntent);
+                        result[idx] = rule;
+                        positiveByIntent.set(newIntent, idx);
+                        droppedAsMoreSpecific = true;
+                        break;
+                    }
+                }
+                if (droppedAsMoreSpecific) {
+                    continue;
+                }
+            }
+            const idx = result.push(rule) - 1;
+            positiveByIntent.set(intent, idx);
+            if (rule.type === 'response_contains')
+                containsIndices.push(idx);
+            continue;
+        }
+        result.push(rule);
+    }
+    return result;
+}
+function lintContradictoryEvalRules(rules) {
+    const requiredTools = new Set();
+    const positiveLiteralIntents = new Set();
+    const existingJsonPaths = new Set();
+    for (const rule of rules) {
+        if (rule.type === 'required_tool' && rule.value) {
+            requiredTools.add(rule.value.trim());
+        }
+        if ((rule.type === 'response_contains' ||
+            rule.type === 'response_starts_with' ||
+            rule.type === 'response_ends_with' ||
+            rule.type === 'response_equals') &&
+            rule.value) {
+            positiveLiteralIntents.add(normalizeIntentValue(rule.value));
+        }
+        if (rule.type === 'response_jsonpath_exists' && rule.path) {
+            existingJsonPaths.add(rule.path.trim());
+        }
+    }
+    return rules.filter((rule) => {
+        if (rule.type === 'forbidden_tool' && rule.value) {
+            return !requiredTools.has(rule.value.trim());
+        }
+        if (rule.type === 'response_not_contains' && rule.value) {
+            return !positiveLiteralIntents.has(normalizeIntentValue(rule.value));
+        }
+        if (rule.type === 'response_jsonpath_not_exists' && rule.path) {
+            return !existingJsonPaths.has(rule.path.trim());
+        }
+        return true;
+    });
+}
+export function normalizeScenarioAssistantEvalRules(replacement) {
+    const normalized = [];
+    for (const rawRule of replacement) {
+        const rule = {
+            ...rawRule,
+            ...(typeof rawRule.value === 'string' ? { value: rawRule.value.trim() } : {}),
+            ...(typeof rawRule.path === 'string' ? { path: rawRule.path.trim() } : {})
+        };
+        if (rule.type === 'response_regex' && rule.value) {
+            const parsed = tryParseRegexAsLiteral(rule.value);
+            if (parsed) {
+                if (hasEquivalentLiteralRule(normalized, parsed.literal)) {
+                    continue;
+                }
+                normalized.push({
+                    type: parsed.anchored ? 'response_equals' : 'response_contains',
+                    value: parsed.literal
+                });
+                continue;
+            }
+        }
+        normalized.push(rule);
+    }
+    const deduped = [];
+    const seen = new Set();
+    for (const rule of normalized) {
+        const key = evalRuleKey(rule);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        deduped.push(rule);
+    }
+    return lintContradictoryEvalRules(intentDeduplicateEvalRules(collapseOffByOneCountGuards(deduped)));
+}
+function normalizeEvalRuleSuggestions(suggestions) {
+    if (!suggestions?.evalRules?.replacement)
+        return;
+    suggestions.evalRules.replacement = normalizeScenarioAssistantEvalRules(suggestions.evalRules.replacement);
+}
 function parseAssistantModelOutput(text) {
     const cleaned = text.trim();
     let parsed;
@@ -180,6 +444,7 @@ export async function continueAssistantTurn(session) {
     }
     const modelOutput = await assistantChatModel(session);
     normalizeEvalRuleToolNames(modelOutput.suggestions, session.toolPublicMap);
+    normalizeEvalRuleSuggestions(modelOutput.suggestions);
     if (modelOutput.type === 'tool_call_request') {
         const requestedCalls = 'toolCalls' in modelOutput && Array.isArray(modelOutput.toolCalls)
             ? modelOutput.toolCalls