@n8n/instance-ai 1.12.2 → 1.13.0

package/dist/knowledge-base/materialize-knowledge-base.d.ts

@@ -1,6 +1,6 @@
 import { type WorkflowTechniqueType as BestPracticesGuideId } from '@n8n/workflow-sdk/prompts/best-practices';
 import type { Logger } from '../logger';
-import { KNOWLEDGE_BASE_TEMPLATES_DIR, type KnowledgeBaseTemplateEntry } from './build-templates-index';
+import { KNOWLEDGE_BASE_TEMPLATES_DIR } from './build-templates-index';
 export { KNOWLEDGE_BASE_TEMPLATES_DIR };
 import type { SandboxWorkspace } from '../workspace/sandbox-fs';
 export declare const SANDBOX_KNOWLEDGE_BASE_DIR = "knowledge-base";
@@ -35,7 +35,6 @@ export interface KnowledgeBaseRootIndex {
     };
     templates: {
         indexFile: string;
-        entries: KnowledgeBaseTemplateEntry[];
     };
     reference: {
         indexFile: string;
@@ -56,7 +55,7 @@ export interface KnowledgeBaseWorkspaceBundle {
 export interface BuildKnowledgeBaseWorkspaceBundleOptions {
     root: string;
     templatesArchive?: Buffer | null;
-    logger?: Logger;
+    logger: Logger;
 }
 interface MaterializeKnowledgeBaseOptions extends BuildKnowledgeBaseWorkspaceBundleOptions {
     workspace: SandboxWorkspace;

package/dist/knowledge-base/materialize-knowledge-base.js

@@ -26,10 +26,10 @@ exports.KNOWLEDGE_BASE_MANIFEST_SCHEMA_VERSION = 4;
 function addTemplatesToKnowledgeBaseFiles(files, rootDir, templatesArchive, logger) {
     const extracted = (0, extract_builder_templates_archive_1.extractBuilderTemplatesArchive)(templatesArchive);
     if (!extracted) {
-        logger?.warn('[knowledge-base] rejected templates archive during bundle build', {
+        logger.warn('[knowledge-base] rejected templates archive during bundle build', {
             archiveBytes: templatesArchive.byteLength,
         });
-        return [];
+        return;
     }
     const templatesIndex = (0, build_templates_index_1.buildTemplatesIndexFromArchive)(extracted);
     const templatesDir = (0, posix_1.join)(rootDir, build_templates_index_1.KNOWLEDGE_BASE_TEMPLATES_DIR);
@@ -41,7 +41,6 @@ function addTemplatesToKnowledgeBaseFiles(files, rootDir, templatesArchive, logg
     const templatesIndexPath = (0, posix_1.join)(templatesDir, exports.KNOWLEDGE_BASE_INDEX_FILE);
     files.set(templatesIndexPath, (0, workspace_file_content_1.stringifyWorkspaceJson)(templatesIndex));
     extracted.clear();
-    return templatesIndex.entries;
 }
 const KNOWLEDGE_BASE_REFERENCE_ENTRIES = [
     {
@@ -49,6 +48,11 @@ const KNOWLEDGE_BASE_REFERENCE_ENTRIES = [
         description: 'Per-trigger inputData shapes for verify-built-workflow and executions(action="run")',
         fileName: 'trigger-input-data-shapes.md',
     },
+    {
+        id: 'open-ai-output-shape',
+        description: 'OpenAI node (@n8n/n8n-nodes-langchain.openAi) output shape for downstream expressions',
+        fileName: 'open-ai-output-shape.md',
+    },
     {
         id: 'workflow-builder-guardrails',
         description: 'Workflow builder guardrails for source preservation, fan-out/fan-in, effects, and Code nodes',
@@ -110,9 +114,9 @@ async function buildKnowledgeBaseWorkspaceBundle(options) {
     const bestPracticesIndexPath = (0, posix_1.join)(rootDir, exports.KNOWLEDGE_BASE_BEST_PRACTICES_DIR, exports.KNOWLEDGE_BASE_INDEX_FILE);
     const bestPracticesIndex = { entries: bestPracticeEntries };
     files.set(bestPracticesIndexPath, (0, workspace_file_content_1.stringifyWorkspaceJson)(bestPracticesIndex));
-    const templateEntries = templatesArchive
-        ? addTemplatesToKnowledgeBaseFiles(files, rootDir, templatesArchive, logger)
-        : [];
+    if (templatesArchive) {
+        addTemplatesToKnowledgeBaseFiles(files, rootDir, templatesArchive, logger);
+    }
     const referenceEntries = await addReferenceFilesToKnowledgeBase(files, rootDir);
     const rootIndexPath = (0, posix_1.join)(rootDir, exports.KNOWLEDGE_BASE_INDEX_FILE);
     const rootIndex = {
@@ -122,7 +126,6 @@ async function buildKnowledgeBaseWorkspaceBundle(options) {
         },
         templates: {
             indexFile: (0, posix_1.join)(build_templates_index_1.KNOWLEDGE_BASE_TEMPLATES_DIR, exports.KNOWLEDGE_BASE_INDEX_FILE),
-            entries: templateEntries,
         },
         reference: {
             indexFile: (0, posix_1.join)(exports.KNOWLEDGE_BASE_REFERENCE_DIR, exports.KNOWLEDGE_BASE_INDEX_FILE),

package/dist/knowledge-base/materialize-knowledge-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"materialize-knowledge-base.js","sourceRoot":"","sources":["../../src/knowledge-base/materialize-knowledge-base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"materialize-knowledge-base.js","sourceRoot":"","sources":["../../src/knowledge-base/materialize-knowledge-base.ts"],"names":[],"mappings":";;;AA+MA,8EAuEC;AAID,0EA4BC;AAED,sFAiBC;AAzUD,6EAKkD;AAClD,2EAAiF;AACjF,+CAAqD;AACrD,yCAA0C;AAC1C,2CAAoD;AAGpD,mEAGiC;AACxB,6GAFR,oDAA4B,OAEQ;AACrC,2FAAqF;AACrF,gGAA0F;AAC1F,sFAGgD;AAEhD,gFAAkG;AAClG,wEAA0E;AAE7D,QAAA,0BAA0B,GAAG,gBAAgB,CAAC;AAC9C,QAAA,iCAAiC,GAAG,gBAAgB,CAAC;AACrD,QAAA,4BAA4B,GAAG,WAAW,CAAC;AAC3C,QAAA,yBAAyB,GAAG,YAAY,CAAC;AACzC,QAAA,qCAAqC,GAAG,IAAA,mBAAO,EAC3D,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,gBAAgB,CAChB,CAAC;AACW,QAAA,4BAA4B,GAAG,4CAAuB,CAAC;AACvD,QAAA,sCAAsC,GAAG,CAAC,CAAC;AA6DxD,SAAS,gCAAgC,CACxC,KAA0B,EAC1B,OAAe,EACf,gBAAwB,EACxB,MAAc;IAEd,MAAM,SAAS,GAAG,IAAA,kEAA8B,EAAC,gBAAgB,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,iEAAiE,EAAE;YAC9E,YAAY,EAAE,gBAAgB,CAAC,UAAU;SACzC,CAAC,CAAC;QACH,OAAO;IACR,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,sDAA8B,EAAC,SAAS,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,IAAA,YAAS,EAAC,OAAO,EAAE,oDAA4B,CAAC,CAAC;IAEtE,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,SAAS,EAAE,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,SAAS;QACpC,KAAK,CAAC,GAAG,CAAC,IAAA,YAAS,EAAC,YAAY,EAAE,IAAI,CAAC,EAAE,IAAA,4CAAmB,EAAC,OAAO,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAA,YAAS,EAAC,YAAY,EAAE,iCAAyB,CAAC,CAAC;IAC9E,KAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAA,+CAAsB,EAAC,cAAc,CAAC,CAAC,CAAC;IAItE,SAAS,CAAC,KAAK,EAAE,CAAC;AACnB,CAAC;AAED,MAAM,gCAAgC,GAMlC;IACH;QACC,EAAE,EAAE,2BAA2B;QAC/B,WAAW,EACV,qFAAqF;QACtF,QAAQ,EAAE,8BAA8B;KACxC;IACD;QACC,EAAE,EAAE,sBAAsB;QAC1B,WAAW,EACV,uFAAuF;QACxF,QAAQ,EAAE,yBAAyB;KACnC;IACD;QACC,EAAE,EAAE,6BAA6B;QACjC,WAAW,EACV,8FAA8F;QAC/F,QAAQ,EAAE,gCAAgC;KAC1C;IACD;QACC,EAAE,EAAE,uBAAuB;QAC3B,WAAW,EACV,8FAA8F;QAC/F,QAAQ,EAAE,0BAA0B;QACpC,OAAO,EAAE,sCAAsB;KAC/B;CACD,CAAC;AAEF,KAAK,UAAU,gCAAgC,CAC9C,KAA0B,EAC1B,OAAe;IAEf,MAAM,kBAAkB,GAAG,IAAA,gBAAI,EAC9B,6CAAqC,EACrC,oCAA4B,CAC5B,CAAC;IACF,MAAM,gBAAgB,GAAuC,EAAE,CAAC;IAEhE,KAAK,MAAM,KAAK,IAAI,gCAAgC,EAAE,CAAC;QACtD,MAAM,gBAAgB,GAAG,IAAA,YAAS,EAAC,oCAA4B,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjF,MAAM,OAAO,GACZ,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAA,gBAAI,EAAC,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACtF,KAAK,CAAC,GAAG,CAAC,IAAA,YAAS,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,IAAA,4CAAmB,EAAC,OAAO,CAAC,CAAC,CAAC;QAC9E,gBAAgB,CAAC,IAAI,CAAC;YACrB,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,IAAI,EAAE,gBAAgB;SACtB,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAA,YAAS,EACnC,OAAO,EACP,oCAA4B,EAC5B,iCAAyB,CACzB,CAAC;IACF,MAAM,cAAc,GAAgC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAClF,KAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAA,+CAAsB,EAAC,cAAc,CAAC,CAAC,CAAC;IAGtE,MAAM,WAAW,GAAG,CAAC,MAAM,IAAA,kBAAO,EAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/F,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,gCAAgC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACtC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACd,6CAA6C,UAAU,gDAAgD,CACvG,CAAC;QACH,CAAC;IACF,CAAC;IAED,OAAO,gBAAgB,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,iCAAiC,CACtD,OAAiD;IAEjD,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1D,MAAM,OAAO,GAAG,IAAA,YAAS,EAAC,IAAI,EAAE,kCAA0B,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxC,MAAM,mBAAmB,GAA8B,EAAE,CAAC;IAE1D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,kCAAiB,CAAC,EAAE,CAAC;QACxD,MAAM,GAAG,GAAG,sCAAqB,CAAC,OAAO,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,qCAAoB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,KAAK,GAA4B;YACtC,EAAE,EAAE,OAAO;YACX,WAAW;YACX,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC;SAC9B,CAAC;QAEF,IAAI,GAAG,EAAE,CAAC;YACT,MAAM,gBAAgB,GAAG,IAAA,YAAS,EAAC,yCAAiC,EAAE,GAAG,OAAO,KAAK,CAAC,CAAC;YACvF,KAAK,CAAC,GAAG,CAAC,IAAA,YAAS,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,IAAA,4CAAmB,EAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;YAC7F,KAAK,CAAC,IAAI,GAAG,gBAAgB,CAAC;YAC9B,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC7B,CAAC;QAED,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,sBAAsB,GAAG,IAAA,YAAS,EACvC,OAAO,EACP,yCAAiC,EACjC,iCAAyB,CACzB,CAAC;IACF,MAAM,kBAAkB,GAAoC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC7F,KAAK,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAA,+CAAsB,EAAC,kBAAkB,CAAC,CAAC,CAAC;IAE9E,IAAI,gBAAgB,EAAE,CAAC;QACtB,gCAAgC,CAAC,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,gBAAgB,GAAG,MAAM,gCAAgC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEhF,MAAM,aAAa,GAAG,IAAA,YAAS,EAAC,OAAO,EAAE,iCAAyB,CAAC,CAAC;IACpE,MAAM,SAAS,GAA2B;QACzC,aAAa,EAAE;YACd,SAAS,EAAE,IAAA,YAAS,EAAC,yCAAiC,EAAE,iCAAyB,CAAC;YAClF,OAAO,EAAE,mBAAmB;SAC5B;QACD,SAAS,EAAE;YACV,SAAS,EAAE,IAAA,YAAS,EAAC,oDAA4B,EAAE,iCAAyB,CAAC;SAC7E;QACD,SAAS,EAAE;YACV,SAAS,EAAE,IAAA,YAAS,EAAC,oCAA4B,EAAE,iCAAyB,CAAC;YAC7E,OAAO,EAAE,gBAAgB;SACzB;KACD,CAAC;IACF,KAAK,CAAC,GAAG,CAAC,aAAa,EAAE,IAAA,+CAAsB,EAAC,SAAS,CAAC,CAAC,CAAC;IAE5D,MAAM,YAAY,GAAG,IAAA,YAAS,EAAC,OAAO,EAAE,oCAA4B,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,IAAA,4DAA2B,EAAC,KAAK,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAmC;QAChD,aAAa,EAAE,8CAAsC;QACrD,WAAW;KACX,CAAC;IACF,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,IAAA,+CAAsB,EAAC,QAAQ,CAAC,CAAC,CAAC;IAE1D,OAAO;QACN,OAAO;QACP,YAAY;QACZ,SAAS,EAAE,aAAa;QACxB,KAAK;QACL,WAAW;KACX,CAAC;AACH,CAAC;AAED,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAEjD,KAAK,UAAU,+BAA+B,CACpD,OAAwC;IAExC,MAAM,MAAM,GAAG,MAAM,iCAAiC,CAAC,OAAO,CAAC,CAAC;IAEhE,OAAO,MAAM,IAAA,uDAA2B,EAAC;QACxC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,YAAY,EAAE,MAAM,CAAC,WAAW;QAChC,SAAS,EAAE,aAAa;QACxB,aAAa,EAAE,8CAAsC;QACrD,aAAa,EAAE,yBAAyB;QACxC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,yBAAyB,EAAE,mDAAmD;QAC9E,uBAAuB,EAAE,iDAAiD;QAC1E,oBAAoB,EAAE;YACrB,QAAQ,EAAE,qBAAqB;YAC/B,MAAM,EAAE,mBAAmB;SAC3B;QACD,iBAAiB,EAAE,8CAA8C;QACjE,iBAAiB,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACrC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,iBAAiB,EAAE,YAAY,CAAC,OAAO;YACvC,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI;SAClC,CAAC;QACF,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM;KACzB,CAAC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,qCAAqC,CAC1D,OAAwC;IAExC,OAAO,MAAM,IAAA,sDAA0B,EAAC;QACvC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,aAAa,EAAE,yBAAyB;QACxC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,+BAA+B,CAAC,OAAO,CAAC;QACxE,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,iCAAiC,CAAC,OAAO,CAAC;QACzE,sBAAsB,EAAE,4CAA4C;QACpE,sBAAsB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACpC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,iBAAiB,EAAE,MAAM,CAAC,OAAO;YACjC,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SAC5B,CAAC;KACF,CAAC,CAAC;AACJ,CAAC"}

package/dist/mcp/mcp-client-manager.d.ts

@@ -11,7 +11,7 @@ export declare class McpClientManager {
     private inFlightRegularByKey;
     private clientsByKey;
     constructor(ssrfValidator?: SsrfUrlValidator | undefined);
-    getRegularTools(configs: McpServerConfig[], logger?: Logger): Promise<McpToolRegistry>;
+    getRegularTools(configs: McpServerConfig[], logger: Logger, requireApproval?: boolean): Promise<McpToolRegistry>;
     disconnect(): Promise<void>;
     private getOrLoad;
     private validateConfigs;

package/dist/mcp/mcp-client-manager.js

@@ -6,7 +6,7 @@ const n8n_workflow_1 = require("n8n-workflow");
 const mcp_tool_name_validation_1 = require("../agent/mcp-tool-name-validation");
 const sanitize_mcp_schemas_1 = require("../agent/sanitize-mcp-schemas");
 const tool_registry_1 = require("../tool-registry");
-function buildNativeMcpConfigs(configs) {
+function buildNativeMcpConfigs(configs, requireApproval) {
     const servers = [];
     for (const server of configs) {
         if (server.url) {
@@ -14,7 +14,9 @@ function buildNativeMcpConfigs(configs) {
                 name: server.name,
                 url: server.url,
                 transport: server.transport,
+                toolFilter: server.toolFilter,
                 fetch: server.fetch,
+                requireApproval,
             });
         }
         else if (server.command) {
@@ -23,6 +25,8 @@ function buildNativeMcpConfigs(configs) {
                 command: server.command,
                 args: server.args,
                 env: server.env,
+                toolFilter: server.toolFilter,
+                requireApproval,
             });
         }
     }
@@ -33,7 +37,7 @@ function toolsToRegistry(tools) {
 }
 function warnSkippedMcpSchema(logger, source) {
     return (error) => {
-        logger?.warn('Skipped MCP tool with unsupported schema', {
+        logger.warn('Skipped MCP tool with unsupported schema', {
             toolName: error.details.toolName,
             source,
             path: error.details.path,
@@ -47,7 +51,7 @@ function warnSkippedMcpSchema(logger, source) {
 }
 function warnSkippedMcpTool(logger) {
     return (error) => {
-        logger?.warn('Skipped MCP tool with unsafe name', {
+        logger.warn('Skipped MCP tool with unsafe name', {
             toolName: error.toolName,
             source: error.source,
             reason: error.message,
@@ -58,7 +62,7 @@ function getSafeMcpServers(configs, logger, source) {
     return configs.filter((config) => {
         if ((0, mcp_tool_name_validation_1.isSafeMcpIdentifierName)(config.name))
             return true;
-        logger?.warn('Skipped MCP server with unsafe name', {
+        logger.warn('Skipped MCP server with unsafe name', {
             serverName: config.name,
             source,
         });
@@ -73,14 +77,14 @@ class McpClientManager {
     constructor(ssrfValidator) {
         this.ssrfValidator = ssrfValidator;
     }
-    async getRegularTools(configs, logger) {
+    async getRegularTools(configs, logger, requireApproval = true) {
         const safeConfigs = getSafeMcpServers(configs, logger, 'external MCP');
         if (safeConfigs.length === 0)
             return (0, tool_registry_1.createToolRegistry)();
-        const key = JSON.stringify(safeConfigs);
+        const key = JSON.stringify({ configs: safeConfigs, requireApproval });
         return await this.getOrLoad(this.regularToolsByKey, this.inFlightRegularByKey, key, async () => {
             await this.validateConfigs(safeConfigs);
-            return await this.connectAndListTools(safeConfigs, key, logger, 'external MCP');
+            return await this.connectAndListTools(safeConfigs, key, requireApproval, logger, 'external MCP');
         });
     }
     async disconnect() {
@@ -132,8 +136,8 @@ class McpClientManager {
             }
         }
     }
-    async connectAndListTools(configs, clientKey, logger, source) {
-        const client = new agents_1.McpClient(buildNativeMcpConfigs(configs));
+    async connectAndListTools(configs, clientKey, requireApproval, logger, source) {
+        const client = new agents_1.McpClient(buildNativeMcpConfigs(configs, requireApproval));
         this.clientsByKey.set(clientKey, client);
         const registry = toolsToRegistry(await client.listTools());
         const sanitizedTools = (0, sanitize_mcp_schemas_1.sanitizeMcpToolSchemas)(registry, {

package/dist/mcp/mcp-client-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-client-manager.js","sourceRoot":"","sources":["../../src/mcp/mcp-client-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-client-manager.js","sourceRoot":"","sources":["../../src/mcp/mcp-client-manager.ts"],"names":[],"mappings":"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"}

package/dist/runtime/memory-task-registry.d.ts

@@ -0,0 +1,8 @@
+import type { ScopedMemoryTaskEvent } from '@n8n/agents';
+import type { InstanceAiMemoryTaskSnapshot } from '@n8n/api-types';
+export declare class MemoryTaskRegistry {
+    private readonly tasksByThread;
+    handleEvent(threadId: string, event: ScopedMemoryTaskEvent): void;
+    getTasks(threadId: string): InstanceAiMemoryTaskSnapshot[];
+    clearThread(threadId: string): void;
+}

package/dist/runtime/memory-task-registry.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemoryTaskRegistry = void 0;
+class MemoryTaskRegistry {
+    tasksByThread = new Map();
+    handleEvent(threadId, event) {
+        const tasks = this.tasksByThread.get(threadId) ?? new Map();
+        const { id, taskKind } = event.task;
+        switch (event.type) {
+            case 'queued':
+                tasks.set(id, { taskId: id, taskKind, status: 'queued' });
+                break;
+            case 'started':
+                tasks.set(id, {
+                    taskId: id,
+                    taskKind,
+                    status: 'running',
+                    startedAt: event.task.startedAt?.getTime(),
+                });
+                break;
+            case 'completed':
+            case 'skipped':
+            case 'failed':
+                tasks.delete(id);
+                break;
+        }
+        if (tasks.size === 0) {
+            this.tasksByThread.delete(threadId);
+        }
+        else {
+            this.tasksByThread.set(threadId, tasks);
+        }
+    }
+    getTasks(threadId) {
+        return [...(this.tasksByThread.get(threadId)?.values() ?? [])];
+    }
+    clearThread(threadId) {
+        this.tasksByThread.delete(threadId);
+    }
+}
+exports.MemoryTaskRegistry = MemoryTaskRegistry;
+//# sourceMappingURL=memory-task-registry.js.map

package/dist/runtime/memory-task-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory-task-registry.js","sourceRoot":"","sources":["../../src/runtime/memory-task-registry.ts"],"names":[],"mappings":";;;AAOA,MAAa,kBAAkB;IACb,aAAa,GAAG,IAAI,GAAG,EAAqD,CAAC;IAE9F,WAAW,CAAC,QAAgB,EAAE,KAA4B;QACzD,MAAM,KAAK,GACV,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,EAAwC,CAAC;QAErF,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;QAEpC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,QAAQ;gBACZ,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC1D,MAAM;YACP,KAAK,SAAS;gBACb,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE;oBACb,MAAM,EAAE,EAAE;oBACV,QAAQ;oBACR,MAAM,EAAE,SAAS;oBACjB,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE;iBAC1C,CAAC,CAAC;gBACH,MAAM;YACP,KAAK,WAAW,CAAC;YACjB,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ;gBACZ,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACjB,MAAM;QACR,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC;IACF,CAAC;IAED,QAAQ,CAAC,QAAgB;QACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,WAAW,CAAC,QAAgB;QAC3B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;CACD;AA1CD,gDA0CC"}

package/dist/runtime/resumable-stream-executor.d.ts

@@ -2,6 +2,7 @@ import type { RedactionOptions } from '@n8n/agents';
 import type { InstanceAiEvent } from '@n8n/api-types';
 import type { InstanceAiEventBus } from '../event-bus';
 import type { Logger } from '../logger';
+import { type RunTokenUsage } from '../stream/usage-accumulator';
 import { type WorkSummary } from '../stream/work-summary-accumulator';
 import type { SuspensionInfo } from '../utils/stream-helpers';
 type ConfirmationRequestEvent = Extract<InstanceAiEvent, {
@@ -55,9 +56,11 @@ export interface ExecuteResumableStreamResult {
     status: TraceStatus;
     agentRunId: string;
     text?: Promise<string>;
+    error?: unknown;
     suspension?: SuspensionInfo;
     confirmationEvent?: ConfirmationRequestEvent;
     workSummary: WorkSummary;
+    usage?: RunTokenUsage;
 }
 export declare function normalizeStreamSource(result: unknown): ResumableStreamSource;
 export declare function executeResumableStream(options: ExecuteResumableStreamOptions): Promise<ExecuteResumableStreamResult>;

package/dist/runtime/resumable-stream-executor.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeStreamSource = normalizeStreamSource;
 exports.executeResumableStream = executeResumableStream;
+const utils_1 = require("@n8n/utils");
 const map_chunk_1 = require("../stream/map-chunk");
 const output_redaction_1 = require("../stream/output-redaction");
+const usage_accumulator_1 = require("../stream/usage-accumulator");
 const work_summary_accumulator_1 = require("../stream/work-summary-accumulator");
 const stream_helpers_1 = require("../utils/stream-helpers");
-function isRecord(value) {
-    return value !== null && typeof value === 'object' && !Array.isArray(value);
-}
 function isAsyncIterable(value) {
     return (value !== null &&
         typeof value === 'object' &&
@@ -20,10 +19,10 @@ function isReadableStream(value) {
         typeof Reflect.get(value, 'getReader') === 'function');
 }
 function isResumableStreamSource(value) {
-    return isRecord(value) && isAsyncIterable(value.fullStream);
+    return (0, utils_1.isRecord)(value) && isAsyncIterable(value.fullStream);
 }
 function isNativeStreamResult(value) {
-    return isRecord(value) && isReadableStream(value.stream);
+    return (0, utils_1.isRecord)(value) && isReadableStream(value.stream);
 }
 function extractContentText(content) {
     if (typeof content === 'string') {
@@ -34,7 +33,7 @@ function extractContentText(content) {
     }
     return content
         .map((part) => {
-        if (!isRecord(part) || part.type !== 'text') {
+        if (!(0, utils_1.isRecord)(part) || part.type !== 'text') {
             return '';
         }
         return typeof part.text === 'string' ? part.text : '';
@@ -50,14 +49,14 @@ async function collectNativeStreamText(stream) {
             const { done, value } = await reader.read();
             if (done)
                 return deltaText || messageText;
-            if (!isRecord(value)) {
+            if (!(0, utils_1.isRecord)(value)) {
                 continue;
             }
             if (value.type === 'text-delta' && typeof value.delta === 'string') {
                 deltaText += value.delta;
                 continue;
             }
-            if (value.type !== 'message' || !isRecord(value.message)) {
+            if (value.type !== 'message' || !(0, utils_1.isRecord)(value.message)) {
                 continue;
             }
             if (value.message.role === 'assistant') {
@@ -97,11 +96,154 @@ function normalizeStreamSource(result) {
     }
     throw new Error('Unsupported agent stream result');
 }
+function buildCancelledResult(agentRunId, text, workSummaryAccumulator, usageAccumulator) {
+    return {
+        status: 'cancelled',
+        agentRunId,
+        text,
+        workSummary: workSummaryAccumulator.toSummary(),
+        usage: usageAccumulator.hasUsage() ? usageAccumulator.toUsage() : undefined,
+    };
+}
+function recordSuspension(parsedSuspension, current, control, context) {
+    if (current) {
+        if (!isSameSuspension(parsedSuspension, current)) {
+            context.logger.warn('Additional HITL suspension encountered before resume; deferring', {
+                threadId: context.threadId,
+                runId: context.runId,
+                activeRequestId: current.requestId,
+                deferredRequestId: parsedSuspension.requestId,
+                activeToolCallId: current.toolCallId,
+                deferredToolCallId: parsedSuspension.toolCallId,
+            });
+        }
+        return { suspension: current };
+    }
+    if (control.mode === 'auto') {
+        control.onSuspension?.(parsedSuspension);
+        return {
+            suspension: parsedSuspension,
+            pendingConfirmation: control.waitForConfirmation(parsedSuspension.requestId),
+        };
+    }
+    return { suspension: parsedSuspension };
+}
+function publishRedactedEvents(events, args) {
+    const { suspension, control, context, workSummaryAccumulator } = args;
+    let confirmationEvent = args.confirmationEvent;
+    let confirmationEventPublished = args.confirmationEventPublished;
+    for (const event of events) {
+        workSummaryAccumulator.observe(event);
+        let shouldPublishEvent = true;
+        if (event.type === 'confirmation-request') {
+            const isPrimarySuspension = suspension !== undefined &&
+                event.payload.requestId === suspension.requestId &&
+                event.payload.toolCallId === suspension.toolCallId;
+            if (!isPrimarySuspension || confirmationEventPublished || confirmationEvent) {
+                shouldPublishEvent = false;
+            }
+            if (shouldPublishEvent && control.mode === 'manual') {
+                confirmationEvent = event;
+                shouldPublishEvent = false;
+            }
+            if (shouldPublishEvent) {
+                confirmationEventPublished = true;
+            }
+        }
+        if (shouldPublishEvent) {
+            context.eventBus.publish(context.threadId, event);
+        }
+    }
+    return { confirmationEvent, confirmationEventPublished };
+}
+async function consumeStreamPass(args) {
+    const { activeStream, activeAgentRunId, options, workSummaryAccumulator, usageAccumulator, outputRedactor, } = args;
+    let currentResponseId = args.currentResponseId;
+    let nativeStepIndex = args.nativeStepIndex;
+    let suspension;
+    let hasError = false;
+    let error;
+    let pendingConfirmation;
+    let confirmationEvent;
+    let confirmationEventPublished = false;
+    const drainedCorrectionsForResume = [];
+    for await (const chunk of activeStream) {
+        if (options.context.signal.aborted) {
+            usageAccumulator.observe(chunk);
+            try {
+                for await (const remaining of activeStream) {
+                    usageAccumulator.observe(remaining);
+                }
+            }
+            catch (drainError) {
+                options.context.logger.debug('Instance AI abort drain ended early', {
+                    threadId: options.context.threadId,
+                    runId: options.context.runId,
+                    error: drainError instanceof Error ? drainError.message : String(drainError),
+                });
+            }
+            return {
+                cancelled: true,
+                hasError,
+                drainedCorrectionsForResume,
+                currentResponseId,
+                nativeStepIndex,
+            };
+        }
+        options.context.onActivity?.();
+        usageAccumulator.observe(chunk);
+        if ((0, utils_1.isRecord)(chunk) && chunk.type === 'start-step') {
+            nativeStepIndex += 1;
+            const responseRunId = activeAgentRunId || options.context.runId;
+            currentResponseId = `${responseRunId}:step:${nativeStepIndex}`;
+        }
+        const parsedSuspension = (0, stream_helpers_1.parseSuspension)(chunk);
+        if (parsedSuspension) {
+            const recorded = recordSuspension(parsedSuspension, suspension, options.control, options.context);
+            suspension = recorded.suspension;
+            if (recorded.pendingConfirmation)
+                pendingConfirmation = recorded.pendingConfirmation;
+        }
+        if (isErrorChunk(chunk)) {
+            hasError = true;
+            error = chunk.error;
+        }
+        const mappedEvent = (0, map_chunk_1.mapAgentChunkToEvent)(options.context.runId, options.context.agentId, chunk, currentResponseId);
+        const events = mappedEvent ? outputRedactor.processEvent(mappedEvent) : [];
+        const published = publishRedactedEvents(events, {
+            suspension,
+            confirmationEvent,
+            confirmationEventPublished,
+            control: options.control,
+            context: options.context,
+            workSummaryAccumulator,
+        });
+        confirmationEvent = published.confirmationEvent;
+        confirmationEventPublished = published.confirmationEventPublished;
+        if (options.control.mode === 'auto' && options.control.drainCorrections) {
+            const corrections = options.control.drainCorrections();
+            publishCorrections(options.context, corrections);
+            drainedCorrectionsForResume.push(...corrections);
+        }
+    }
+    return {
+        cancelled: false,
+        suspension,
+        hasError,
+        error,
+        pendingConfirmation,
+        confirmationEvent,
+        drainedCorrectionsForResume,
+        currentResponseId,
+        nativeStepIndex,
+    };
+}
 async function executeResumableStream(options) {
     let activeStream = options.stream.fullStream;
     let activeAgentRunId = options.stream.runId ?? options.initialAgentRunId ?? '';
     let text = options.stream.text;
     const workSummaryAccumulator = new work_summary_accumulator_1.WorkSummaryAccumulator();
+    const usageAccumulator = new usage_accumulator_1.UsageAccumulator();
     const outputRedactor = new output_redaction_1.OutputRedactor({
         logger: options.context.logger,
         threadId: options.context.threadId,
@@ -112,98 +254,38 @@ async function executeResumableStream(options) {
     let currentResponseId;
     let nativeStepIndex = 0;
     while (true) {
-        let suspension;
-        let hasError = false;
-        let pendingConfirmation;
-        let confirmationEvent;
-        let confirmationEventPublished = false;
-        const drainedCorrectionsForResume = [];
-        for await (const chunk of activeStream) {
-            if (options.context.signal.aborted) {
-                return {
-                    status: 'cancelled',
-                    agentRunId: activeAgentRunId,
-                    text,
-                    workSummary: workSummaryAccumulator.toSummary(),
-                };
-            }
-            options.context.onActivity?.();
-            if (isRecord(chunk) && chunk.type === 'start-step') {
-                nativeStepIndex += 1;
-                const responseRunId = activeAgentRunId || options.context.runId;
-                currentResponseId = `${responseRunId}:step:${nativeStepIndex}`;
-            }
-            const parsedSuspension = (0, stream_helpers_1.parseSuspension)(chunk);
-            if (parsedSuspension) {
-                if (!suspension) {
-                    suspension = parsedSuspension;
-                    if (options.control.mode === 'auto') {
-                        options.control.onSuspension?.(parsedSuspension);
-                        pendingConfirmation = options.control.waitForConfirmation(parsedSuspension.requestId);
-                    }
-                }
-                else if (!isSameSuspension(parsedSuspension, suspension)) {
-                    options.context.logger.warn('Additional HITL suspension encountered before resume; deferring', {
-                        threadId: options.context.threadId,
-                        runId: options.context.runId,
-                        activeRequestId: suspension.requestId,
-                        deferredRequestId: parsedSuspension.requestId,
-                        activeToolCallId: suspension.toolCallId,
-                        deferredToolCallId: parsedSuspension.toolCallId,
-                    });
-                }
-            }
-            if (isErrorChunk(chunk)) {
-                hasError = true;
-            }
-            const mappedEvent = (0, map_chunk_1.mapAgentChunkToEvent)(options.context.runId, options.context.agentId, chunk, currentResponseId);
-            const events = mappedEvent ? outputRedactor.processEvent(mappedEvent) : [];
-            for (const event of events) {
-                workSummaryAccumulator.observe(event);
-                let shouldPublishEvent = true;
-                if (event.type === 'confirmation-request') {
-                    const isPrimarySuspension = suspension !== undefined &&
-                        event.payload.requestId === suspension.requestId &&
-                        event.payload.toolCallId === suspension.toolCallId;
-                    if (!isPrimarySuspension || confirmationEventPublished || confirmationEvent) {
-                        shouldPublishEvent = false;
-                    }
-                    if (shouldPublishEvent && options.control.mode === 'manual') {
-                        confirmationEvent = event;
-                        shouldPublishEvent = false;
-                    }
-                    if (shouldPublishEvent) {
-                        confirmationEventPublished = true;
-                    }
-                }
-                if (shouldPublishEvent) {
-                    options.context.eventBus.publish(options.context.threadId, event);
-                }
-            }
-            if (options.control.mode === 'auto' && options.control.drainCorrections) {
-                const corrections = options.control.drainCorrections();
-                publishCorrections(options.context, corrections);
-                drainedCorrectionsForResume.push(...corrections);
-            }
+        const pass = await consumeStreamPass({
+            activeStream,
+            activeAgentRunId,
+            options,
+            workSummaryAccumulator,
+            usageAccumulator,
+            outputRedactor,
+            currentResponseId,
+            nativeStepIndex,
+        });
+        currentResponseId = pass.currentResponseId;
+        nativeStepIndex = pass.nativeStepIndex;
+        if (pass.cancelled) {
+            return buildCancelledResult(activeAgentRunId, text, workSummaryAccumulator, usageAccumulator);
         }
+        const { suspension, hasError, error, pendingConfirmation, confirmationEvent } = pass;
+        const { drainedCorrectionsForResume } = pass;
         for (const flushed of outputRedactor.flush()) {
             workSummaryAccumulator.observe(flushed);
             options.context.eventBus.publish(options.context.threadId, flushed);
         }
         if (options.context.signal.aborted) {
-            return {
-                status: 'cancelled',
-                agentRunId: activeAgentRunId,
-                text,
-                workSummary: workSummaryAccumulator.toSummary(),
-            };
+            return buildCancelledResult(activeAgentRunId, text, workSummaryAccumulator, usageAccumulator);
         }
         if (!suspension) {
             return {
                 status: hasError ? 'errored' : 'completed',
                 agentRunId: activeAgentRunId,
                 text,
+                ...(error !== undefined ? { error } : {}),
                 workSummary: workSummaryAccumulator.toSummary(),
+                usage: usageAccumulator.hasUsage() ? usageAccumulator.toUsage() : undefined,
             };
         }
         if (options.control.mode === 'manual') {
@@ -213,6 +295,7 @@ async function executeResumableStream(options) {
                 text,
                 suspension,
                 workSummary: workSummaryAccumulator.toSummary(),
+                usage: usageAccumulator.hasUsage() ? usageAccumulator.toUsage() : undefined,
                 ...(confirmationEvent ? { confirmationEvent } : {}),
             };
         }
@@ -254,9 +337,7 @@ function buildCorrectionResumeData(corrections) {
     };
 }
 function isErrorChunk(chunk) {
-    return (chunk !== null &&
-        typeof chunk === 'object' &&
-        chunk.type === 'error');
+    return (0, utils_1.isRecord)(chunk) && chunk.type === 'error';
 }
 async function waitForConfirmation(signal, confirmationPromise) {
     if (signal.aborted) {