@hotmeshio/long-tail 0.1.4 → 0.1.6

package/build/system/seed/tool-manifests-workflows.js

@@ -91,23 +91,28 @@ exports.CLAUDE_CODE_TOOLS = [
                 prompt: {
                     type: 'string',
                     description: 'The task prompt. Be specific and actionable.',
+                    default: 'List the files in the current directory and describe what this project does in 2 sentences.',
                 },
                 working_directory: {
                     type: 'string',
-                    description: 'Working directory for the task. Defaults to server cwd.',
+                    description: 'Working directory for the task. Defaults to /app (container root).',
+                    default: '/app',
                 },
                 allowed_tools: {
                     type: 'array',
                     items: { type: 'string' },
-                    description: 'Restrict which tools Claude Code can use (e.g., ["Read", "Grep"]).',
+                    description: 'Restrict which tools Claude Code can use (e.g., ["Read", "Grep", "Glob", "Bash"]).',
+                    default: ['Read', 'Glob', 'Grep', 'Bash'],
                 },
                 max_turns: {
                     type: 'number',
                     description: 'Maximum agentic turns before stopping.',
+                    default: 5,
                 },
                 model: {
                     type: 'string',
                     description: 'Override the Claude model (e.g., "claude-sonnet-4-6").',
+                    default: 'claude-sonnet-4-6',
                 },
                 system_prompt: {
                     type: 'string',
@@ -116,10 +121,12 @@ exports.CLAUDE_CODE_TOOLS = [
                 timeout_ms: {
                     type: 'number',
                     description: 'Execution timeout in ms. Default: 120000, max: 300000.',
+                    default: 120000,
                 },
                 credential_label: {
                     type: 'string',
-                    description: 'Label of the stored Anthropic credential to use (e.g., "subscription", "api-batch"). Default: "default".',
+                    description: 'Label of the stored Anthropic credential to use (e.g., "subscription", "api-batch").',
+                    default: 'default',
                 },
             },
             required: ['prompt'],

package/build/system/workflows/mcp-deterministic/index.js

@@ -38,7 +38,7 @@ const hotmesh_1 = require("@hotmeshio/hotmesh");
 const activities = __importStar(require("./activities"));
 const { invokeCompiledWorkflow } = hotmesh_1.Durable.workflow.proxyActivities({
     activities,
-    retryPolicy: {
+    retry: {
         maximumAttempts: 3,
         backoffCoefficient: 2,
         maximumInterval: '10 seconds',

package/build/system/workflows/mcp-query/activities/discovery.d.ts

@@ -1,31 +1,13 @@
+import { extractWorkflowInputs } from '../../shared/discovery';
 import type { WorkflowCandidate } from '../../../../types/discovery';
-/**
- * Phase 1: Ranked discovery of compiled YAML workflows.
- *
- * Uses PostgreSQL full-text search (tsvector) + tag overlap for
- * multi-signal ranked matching. Returns candidates for the LLM judge.
- */
 export declare function findCompiledWorkflows(prompt: string): Promise<{
     inventory: string;
     toolIds: string[];
     candidates: WorkflowCandidate[];
 }>;
-/**
- * Phase 2: LLM-as-judge evaluates whether any discovered workflow
- * matches the user's intent. One cheap call (mini model, ~200 tokens)
- * to potentially skip the entire agentic loop.
- */
 export declare function evaluateWorkflowMatch(prompt: string, candidates: WorkflowCandidate[]): Promise<{
     matched: boolean;
     workflowName: string | null;
     confidence: number;
 }>;
-/**
- * Phase 2b: Extract structured inputs from the user's prompt using the
- * matched workflow's input_schema. Acts as a second confirmation gate —
- * if the LLM can't map the prompt to the schema, the match is rejected.
- */
-export declare function extractWorkflowInputs(prompt: string, inputSchema: Record<string, unknown>, workflowName: string): Promise<{
-    inputs: Record<string, any> | null;
-    extracted: boolean;
-}>;
+export { extractWorkflowInputs };

package/build/system/workflows/mcp-query/activities/discovery.js

@@ -1,172 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractWorkflowInputs = void 0;
 exports.findCompiledWorkflows = findCompiledWorkflows;
 exports.evaluateWorkflowMatch = evaluateWorkflowMatch;
-exports.extractWorkflowInputs = extractWorkflowInputs;
-const llm_1 = require("../../../../services/llm");
-const defaults_1 = require("../../../../modules/defaults");
-const logger_1 = require("../../../../services/logger");
-const yamlDb = __importStar(require("../../../../services/yaml-workflow/db"));
-const prompts_1 = require("../prompts");
+const discovery_1 = require("../../shared/discovery");
+Object.defineProperty(exports, "extractWorkflowInputs", { enumerable: true, get: function () { return discovery_1.extractWorkflowInputs; } });
 const caches_1 = require("./caches");
-/**
- * Phase 1: Ranked discovery of compiled YAML workflows.
- *
- * Uses PostgreSQL full-text search (tsvector) + tag overlap for
- * multi-signal ranked matching. Returns candidates for the LLM judge.
- */
 async function findCompiledWorkflows(prompt) {
-    // Extract keywords for tag-overlap signal
-    const keywords = prompt
-        .toLowerCase()
-        .replace(/[^a-z0-9\s-]/g, ' ')
-        .split(/\s+/)
-        .filter((w) => w.length > 2 && !defaults_1.STOP_WORDS.has(w));
-    // Ranked discovery: FTS + tag overlap
-    logger_1.loggerRegistry.debug(`[mcpQuery:findCompiledWorkflows] keywords: [${keywords.join(',')}]`);
-    const workflows = await yamlDb.discoverWorkflows(prompt, keywords, undefined, 5);
-    logger_1.loggerRegistry.info(`[mcpQuery:findCompiledWorkflows] ${workflows.length} candidate(s) found`);
-    if (workflows.length === 0) {
-        return { inventory: '', toolIds: [], candidates: [] };
-    }
-    const toolIds = [];
-    const inventoryLines = [];
-    const candidates = [];
-    for (const wf of workflows) {
-        const qualifiedName = `yaml__${wf.name.replace(/[^a-zA-Z0-9]/g, '_')}`;
-        caches_1.yamlWorkflowMap.set(qualifiedName, wf.name);
-        caches_1.toolDefCache.set(qualifiedName, {
-            type: 'function',
-            function: {
-                name: qualifiedName,
-                description: `[COMPILED WORKFLOW] ${wf.description || wf.name} — deterministic, no LLM needed. ` +
-                    `Tags: ${wf.tags.join(', ')}`,
-                parameters: (wf.input_schema || { type: 'object', properties: {} }),
-            },
-        });
-        toolIds.push(qualifiedName);
-        const activityCount = wf.activity_manifest.filter((a) => a.type === 'worker').length;
-        inventoryLines.push(`★ ${wf.name} [compiled, ${activityCount} steps, tags: ${wf.tags.join(', ')}]: ${wf.description || 'deterministic workflow'}`);
-        candidates.push({
-            name: wf.name,
-            description: wf.description,
-            original_prompt: wf.original_prompt,
-            category: wf.category,
-            tags: wf.tags,
-            input_schema: wf.input_schema,
-            tool_names: wf.activity_manifest
-                .filter((a) => a.type === 'worker' && a.mcp_tool_name)
-                .map((a) => a.mcp_tool_name),
-            fts_rank: wf.fts_rank || 0,
-        });
-    }
-    return { inventory: inventoryLines.join('\n'), toolIds, candidates };
+    return (0, discovery_1.findCompiledWorkflows)(prompt, { yamlWorkflowMap: caches_1.yamlWorkflowMap, toolDefCache: caches_1.toolDefCache }, 'mcpQuery');
 }
-/**
- * Phase 2: LLM-as-judge evaluates whether any discovered workflow
- * matches the user's intent. One cheap call (mini model, ~200 tokens)
- * to potentially skip the entire agentic loop.
- */
 async function evaluateWorkflowMatch(prompt, candidates) {
-    logger_1.loggerRegistry.debug(`[mcpQuery:evaluateWorkflowMatch] ${candidates.length} candidate(s)`);
-    if (candidates.length === 0) {
-        return { matched: false, workflowName: null, confidence: 0 };
-    }
-    const candidateText = candidates.map((c, i) => `${i + 1}. **${c.name}** (category: ${c.category || 'general'})\n` +
-        `   Description: ${c.description || 'N/A'}\n` +
-        `   Original prompt: "${c.original_prompt || 'N/A'}"\n` +
-        `   Tools: ${c.tool_names.join(', ')}\n` +
-        `   Input: ${JSON.stringify(c.input_schema).slice(0, 300)}`).join('\n\n');
-    try {
-        const response = await (0, llm_1.callLLM)({
-            model: defaults_1.LLM_MODEL_SECONDARY,
-            max_tokens: 200,
-            temperature: 0,
-            messages: [
-                { role: 'system', content: prompts_1.WORKFLOW_MATCH_PROMPT },
-                { role: 'user', content: `## User Request\n${prompt}\n\n## Candidate Workflows\n${candidateText}` },
-            ],
-        });
-        const raw = response.content || '{}';
-        const cleaned = raw.replace(/^```(?:json)?\s*/m, '').replace(/\s*```$/m, '').trim();
-        const result = JSON.parse(cleaned);
-        if (result.match && result.confidence >= 0.7) {
-            logger_1.loggerRegistry.info(`[mcpQuery:evaluateWorkflowMatch] MATCHED: ${result.workflow_name} (confidence: ${result.confidence})`);
-            return { matched: true, workflowName: result.workflow_name, confidence: result.confidence };
-        }
-        logger_1.loggerRegistry.info(`[mcpQuery:evaluateWorkflowMatch] no match (confidence: ${result.confidence || 0})`);
-        return { matched: false, workflowName: null, confidence: result.confidence || 0 };
-    }
-    catch (err) {
-        logger_1.loggerRegistry.warn(`[mcpQuery:evaluateWorkflowMatch] error: ${err.message}`);
-        return { matched: false, workflowName: null, confidence: 0 };
-    }
-}
-/**
- * Phase 2b: Extract structured inputs from the user's prompt using the
- * matched workflow's input_schema. Acts as a second confirmation gate —
- * if the LLM can't map the prompt to the schema, the match is rejected.
- */
-async function extractWorkflowInputs(prompt, inputSchema, workflowName) {
-    try {
-        const response = await (0, llm_1.callLLM)({
-            model: defaults_1.LLM_MODEL_SECONDARY,
-            max_tokens: 500,
-            temperature: 0,
-            messages: [
-                { role: 'system', content: prompts_1.EXTRACT_INPUTS_PROMPT },
-                {
-                    role: 'user',
-                    content: `## User Request\n${prompt}\n\n` +
-                        `## Workflow: ${workflowName}\n` +
-                        `## Input Schema\n${JSON.stringify(inputSchema, null, 2)}`,
-                },
-            ],
-        });
-        const raw = response.content || '{}';
-        const cleaned = raw.replace(/^```(?:json)?\s*/m, '').replace(/\s*```$/m, '').trim();
-        const result = JSON.parse(cleaned);
-        if (result._extraction_failed) {
-            return { inputs: null, extracted: false };
-        }
-        // Remove the meta field before passing to the workflow
-        delete result._extraction_failed;
-        return { inputs: result, extracted: true };
-    }
-    catch {
-        return { inputs: null, extracted: false };
-    }
+    return (0, discovery_1.evaluateWorkflowMatch)(prompt, candidates, 'mcpQuery');
 }

package/build/system/workflows/mcp-query/activities/llm.d.ts

@@ -1,8 +1,2 @@
-import { type LLMResponse } from '../../../../services/llm';
-/**
- * Call the LLM with messages and optional tool IDs.
- *
- * Tool IDs are resolved from the module-level toolDefCache so that only
- * lightweight string arrays flow through the durable pipe.
- */
+import type { LLMResponse } from '../../../../services/llm';
 export declare function callQueryLLM(messages: any[], toolIds?: string[]): Promise<LLMResponse>;

package/build/system/workflows/mcp-query/activities/llm.js

@@ -1,33 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callQueryLLM = callQueryLLM;
-const llm_1 = require("../../../../services/llm");
-const defaults_1 = require("../../../../modules/defaults");
-const logger_1 = require("../../../../services/logger");
+const llm_caller_1 = require("../../shared/llm-caller");
 const caches_1 = require("./caches");
-/**
- * Call the LLM with messages and optional tool IDs.
- *
- * Tool IDs are resolved from the module-level toolDefCache so that only
- * lightweight string arrays flow through the durable pipe.
- */
 async function callQueryLLM(messages, toolIds) {
-    // Resolve full tool definitions from module-level cache
-    let tools;
-    if (toolIds?.length) {
-        tools = toolIds
-            .map((id) => caches_1.toolDefCache.get(id))
-            .filter((t) => !!t);
-    }
-    const t0 = Date.now();
-    const response = await (0, llm_1.callLLM)({
-        model: defaults_1.LLM_MODEL_PRIMARY,
-        messages,
-        temperature: 0,
-        ...(tools?.length ? { tools } : {}),
-        ...(!tools?.length ? { max_tokens: defaults_1.LLM_MAX_TOKENS_DEFAULT } : {}),
-    });
-    const usage = response.usage;
-    logger_1.loggerRegistry.info(`[mcpQuery:callLLM] ${Date.now() - t0}ms | in=${usage?.prompt_tokens} out=${usage?.completion_tokens} total=${usage?.total_tokens}`);
-    return response;
+    return (0, llm_caller_1.callWorkflowLLM)(messages, toolIds, caches_1.toolDefCache, 'mcpQuery');
 }

package/build/system/workflows/mcp-query/activities/tool-executor.d.ts

@@ -1,5 +1 @@
-/**
- * Call any tool by its qualified name — handles both YAML workflows
- * (yaml__* prefix) and raw MCP tools (server_slug__tool_name).
- */
 export declare function callMcpTool(qualifiedName: string, args: Record<string, any>): Promise<any>;

package/build/system/workflows/mcp-query/activities/tool-executor.js

@@ -1,112 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callMcpTool = callMcpTool;
-const context_1 = require("../../../../services/iam/context");
-const ephemeral_1 = require("../../../../services/iam/ephemeral");
-const mcpClient = __importStar(require("../../../../services/mcp/client"));
-const mcpDbService = __importStar(require("../../../../services/mcp/db"));
-const yamlDb = __importStar(require("../../../../services/yaml-workflow/db"));
-const yamlDeployer = __importStar(require("../../../../services/yaml-workflow/deployer"));
+const tool_executor_1 = require("../../shared/tool-executor");
 const caches_1 = require("./caches");
-/**
- * Call any tool by its qualified name — handles both YAML workflows
- * (yaml__* prefix) and raw MCP tools (server_slug__tool_name).
- */
 async function callMcpTool(qualifiedName, args) {
-    // Check if this is a compiled YAML workflow
-    const yamlWorkflowName = caches_1.yamlWorkflowMap.get(qualifiedName);
-    if (yamlWorkflowName) {
-        try {
-            const wf = await yamlDb.getYamlWorkflowByName(yamlWorkflowName);
-            if (!wf || wf.status !== 'active') {
-                return { error: `Compiled workflow "${yamlWorkflowName}" is not active` };
-            }
-            // Inject _scope from the current ToolContext so YAML workers get IAM
-            const toolCtx = (0, context_1.getToolContext)();
-            const scopedArgs = toolCtx?.principal.id
-                ? {
-                    ...args,
-                    _scope: {
-                        principal: toolCtx.principal,
-                        ...(toolCtx.initiatingPrincipal ? { initiatingPrincipal: toolCtx.initiatingPrincipal } : {}),
-                        scopes: toolCtx.credentials.scopes,
-                    },
-                }
-                : args;
-            const { job_id, result } = await yamlDeployer.invokeYamlWorkflowSync(wf.app_id, wf.graph_topic, scopedArgs, undefined, wf.graph_topic);
-            return { job_id, workflow: yamlWorkflowName, status: 'completed', result };
-        }
-        catch (err) {
-            return { error: err.message, tool: qualifiedName, args };
-        }
-    }
-    // Exchange ephemeral credential tokens (eph:v1:...) right before the MCP call.
-    // This is the latest possible moment — the LLM only ever sees opaque tokens.
-    args = await (0, ephemeral_1.exchangeTokensInArgs)(args);
-    // Standard MCP tool routing
-    const serverName = caches_1.toolServerMap.get(qualifiedName);
-    const separatorIdx = qualifiedName.indexOf('__');
-    const toolName = separatorIdx >= 0
-        ? qualifiedName.slice(separatorIdx + 2)
-        : qualifiedName;
-    // Build auth context from ToolContext (set by interceptor via IAM service)
-    const toolCtx = (0, context_1.getToolContext)();
-    const authContext = toolCtx?.principal.id
-        ? { userId: toolCtx.principal.id, delegationToken: toolCtx.credentials.delegationToken }
-        : undefined;
-    if (serverName) {
-        try {
-            return await mcpClient.callServerTool(serverName, toolName, args, authContext);
-        }
-        catch (err) {
-            return { error: err.message, tool: qualifiedName, args };
-        }
-    }
-    // Fallback: try the tool name directly against all connected servers
-    const { servers } = await mcpDbService.listMcpServers({ limit: 100 });
-    for (const server of servers) {
-        const manifest = server.tool_manifest || [];
-        if (manifest.some((t) => t.name === toolName)) {
-            try {
-                return await mcpClient.callServerTool(server.name, toolName, args, authContext);
-            }
-            catch (err) {
-                return { error: err.message, tool: qualifiedName, args };
-            }
-        }
-    }
-    return { error: `Unknown tool: ${qualifiedName} (no server found)`, tool: qualifiedName };
+    return (0, tool_executor_1.callTool)(qualifiedName, args, { toolServerMap: caches_1.toolServerMap, yamlWorkflowMap: caches_1.yamlWorkflowMap });
 }

package/build/system/workflows/mcp-query/activities/tool-loader.d.ts

@@ -1,12 +1,3 @@
-/**
- * Single activity that discovers, caches, and returns lightweight tool data.
- *
- * Full ChatCompletionTool definitions are cached in module-level toolDefCache
- * so they never flow through the durable pipe. Only tool IDs (qualified name
- * strings) and a compact inventory string are returned.
- *
- * @param tags - MCP server tags to scope by. Pass undefined to load all servers.
- */
 export declare function loadTools(tags?: string[]): Promise<{
     toolIds: string[];
     inventory: string;

package/build/system/workflows/mcp-query/activities/tool-loader.js

@@ -1,93 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadTools = loadTools;
-const mcpDbService = __importStar(require("../../../../services/mcp/db"));
-const strategy_advisors_1 = require("../strategy-advisors");
+const tool_loader_1 = require("../../shared/tool-loader");
 const caches_1 = require("./caches");
-/**
- * Single activity that discovers, caches, and returns lightweight tool data.
- *
- * Full ChatCompletionTool definitions are cached in module-level toolDefCache
- * so they never flow through the durable pipe. Only tool IDs (qualified name
- * strings) and a compact inventory string are returned.
- *
- * @param tags - MCP server tags to scope by. Pass undefined to load all servers.
- */
 async function loadTools(tags) {
-    let servers;
-    if (tags?.length) {
-        servers = await mcpDbService.findServersByTags(tags, 'any');
-    }
-    else {
-        const result = await mcpDbService.listMcpServers({ limit: 100 });
-        servers = result.servers;
-    }
-    const toolIds = [];
-    const inventoryLines = [];
-    const serverInfos = [];
-    for (const server of servers) {
-        const manifest = server.tool_manifest || [];
-        const slug = server.name.replace(/[^a-zA-Z0-9]/g, '_');
-        const serverTags = server.tags?.length ? server.tags.join(', ') : 'general';
-        const toolNames = [];
-        for (const t of manifest) {
-            const qualifiedName = `${slug}__${t.name}`;
-            caches_1.toolServerMap.set(qualifiedName, server.name);
-            caches_1.toolDefCache.set(qualifiedName, {
-                type: 'function',
-                function: {
-                    name: qualifiedName,
-                    description: `[${server.name}] ${t.description || ''}`,
-                    parameters: (t.inputSchema || { type: 'object', properties: {} }),
-                },
-            });
-            toolIds.push(qualifiedName);
-            toolNames.push(t.name);
-        }
-        inventoryLines.push(`• ${server.name} [${serverTags}] (${manifest.length} tools): ${toolNames.join(', ')}`);
-        serverInfos.push({
-            name: server.name,
-            description: server.description || null,
-            tags: server.tags || [],
-            metadata: server.metadata || null,
-            toolNames,
-            toolCount: manifest.length,
-            slug,
-        });
-    }
-    const strategy = (0, strategy_advisors_1.generateStrategySection)(serverInfos);
-    return { toolIds, inventory: inventoryLines.join('\n'), strategy };
+    return (0, tool_loader_1.loadToolsFromServers)(tags, { toolServerMap: caches_1.toolServerMap, toolDefCache: caches_1.toolDefCache }, { logPrefix: 'mcpQuery' });
 }

package/build/system/workflows/mcp-query/index.js

@@ -39,9 +39,10 @@ const defaults_1 = require("../../../modules/defaults");
 const activities = __importStar(require("./activities"));
 const interceptorActivities = __importStar(require("../../../services/interceptor/activities"));
 const prompts_1 = require("./prompts");
+const tool_result_guard_1 = require("../tool-result-guard");
 const { loadTools, callMcpTool, callQueryLLM, } = hotmesh_1.Durable.workflow.proxyActivities({
     activities,
-    retryPolicy: {
+    retry: {
         maximumAttempts: 3,
         backoffCoefficient: 2,
         maximumInterval: '10 seconds',
@@ -50,7 +51,7 @@ const { loadTools, callMcpTool, callQueryLLM, } = hotmesh_1.Durable.workflow.pro
 const { ltEnrichEscalationRouting, } = hotmesh_1.Durable.workflow.proxyActivities({
     activities: interceptorActivities,
     taskQueue: 'lt-interceptor',
-    retryPolicy: { maximumAttempts: 3 },
+    retry: { maximumAttempts: 3 },
 });
 const MAX_TOOL_ROUNDS = defaults_1.TOOL_ROUNDS_MCP_QUERY;
 /**
@@ -106,8 +107,30 @@ async function mcpQuery(envelope) {
         messages.push({ role: 'user', content: triageHints });
         messages.push({ role: 'assistant', content: 'Understood. I will use these learnings to take a more targeted approach this time.' });
     }
+    // If invoked from the help assistant, inject dashboard context
+    const dashContext = envelope.data?.context;
+    if (dashContext) {
+        const lines = [
+            `[Dashboard Context]`,
+            `Page: ${dashContext.page || 'unknown'}`,
+            dashContext.entities?.workflowId ? `Workflow: ${dashContext.entities.workflowId}` : '',
+            dashContext.entities?.workflowStatus ? `Status: ${dashContext.entities.workflowStatus}` : '',
+            dashContext.entities?.yamlContent ? `YAML:\n${dashContext.entities.yamlContent}` : '',
+            dashContext.entities?.prompt ? `Original query: ${dashContext.entities.prompt}` : '',
+            ``,
+            `IMPORTANT: This is a help assistant conversation. Always include the actual data, content, and results from tool calls in your response. Do not just confirm an action was taken — show the user what was retrieved, stored, or produced.`,
+            `[End Context]`,
+        ].filter(Boolean).join('\n');
+        messages.push({ role: 'user', content: lines });
+        messages.push({ role: 'assistant', content: 'I have the dashboard context. I will always show actual data and results, not just confirmations.' });
+    }
     messages.push({ role: 'user', content: prompt });
     let toolCallCount = 0;
+    // Repeated-error circuit breaker: if the same tool returns the same
+    // error twice in a row, the LLM is stuck — break out immediately.
+    const MAX_REPEATED_ERRORS = 2;
+    let lastErrorKey = '';
+    let repeatedErrorCount = 0;
     // Agentic loop: LLM decides → execute tools → feed back → repeat
     const BUDGET_WARNING_THRESHOLD = 3;
     for (let round = 0; round < MAX_TOOL_ROUNDS; round++) {
@@ -129,6 +152,7 @@ async function mcpQuery(envelope) {
             content: response.content,
             tool_calls: fnCalls,
         });
+        let roundHadError = false;
         for (const toolCall of fnCalls) {
             toolCallCount++;
             let args = {};
@@ -141,7 +165,7 @@ async function mcpQuery(envelope) {
             const result = await callMcpTool(toolCall.function.name, args);
             // Durable waitFor: if the tool returns a signal, pause until human responds
             if (result?.type === 'waitFor' && result?.signalId) {
-                const ctx = hotmesh_1.Durable.workflow.getContext();
+                const ctx = hotmesh_1.Durable.workflow.workflowInfo();
                 const workflowType = ctx.workflowTopic.replace(`${ctx.taskQueue}-`, '');
                 await ltEnrichEscalationRouting({
                     escalationId: result.escalationId,
@@ -153,7 +177,7 @@ async function mcpQuery(envelope) {
                     },
                     claimForUserId: envelope.lt?.userId,
                 });
-                const signalData = await hotmesh_1.Durable.workflow.waitFor(result.signalId);
+                const signalData = await hotmesh_1.Durable.workflow.condition(result.signalId);
                 messages.push({
                     role: 'tool',
                     tool_call_id: toolCall.id,
@@ -161,11 +185,37 @@ async function mcpQuery(envelope) {
                 });
                 continue;
             }
+            const resultStr = (0, tool_result_guard_1.sanitizeToolResult)(result);
             messages.push({
                 role: 'tool',
                 tool_call_id: toolCall.id,
-                content: JSON.stringify(result),
+                content: resultStr,
             });
+            // Track repeated errors: same tool + same error = stuck
+            const isError = resultStr.includes('MCP error') || resultStr.includes('"error"');
+            if (isError) {
+                roundHadError = true;
+                const errorKey = `${toolCall.function.name}::${resultStr.slice(0, 200)}`;
+                if (errorKey === lastErrorKey) {
+                    repeatedErrorCount++;
+                }
+                else {
+                    lastErrorKey = errorKey;
+                    repeatedErrorCount = 1;
+                }
+                if (repeatedErrorCount >= MAX_REPEATED_ERRORS) {
+                    messages.push({
+                        role: 'user',
+                        content: `[CIRCUIT BREAKER] The tool "${toolCall.function.name}" has returned the same error ${repeatedErrorCount} times. Stop retrying this tool. Summarize what you accomplished and what failed.`,
+                    });
+                    const bailResponse = await callQueryLLM(messages, undefined);
+                    return buildQueryReturn(bailResponse.content || 'Workflow stopped: repeated tool errors.', toolCallCount, [{ name: 'circuit_breaker', value: toolCall.function.name }]);
+                }
+            }
+        }
+        if (!roundHadError) {
+            lastErrorKey = '';
+            repeatedErrorCount = 0;
         }
     }
     // Exhausted rounds — ask LLM for diagnostic summary