@frontmcp/sdk 0.3.0 → 0.4.0

package/src/tool/flows/tools-list.flow.js

@@ -7,6 +7,7 @@ require("reflect-metadata");
 const zod_1 = require("zod");
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
 const zod_to_json_schema_1 = require("zod-to-json-schema");
+const errors_1 = require("../../errors");
 const inputSchema = zod_1.z.object({
     request: types_js_1.ListToolsRequestSchema,
     ctx: zod_1.z.any(),
@@ -40,10 +41,19 @@ let ToolsListFlow = class ToolsListFlow extends common_1.FlowBase {
     }
     async parseInput() {
         this.logger.verbose('parseInput:start');
-        const { request: { method, params }, } = inputSchema.parse(this.rawInput);
+        let method;
+        let params;
+        try {
+            const inputData = inputSchema.parse(this.rawInput);
+            method = inputData.request.method;
+            params = inputData.request.params;
+        }
+        catch (e) {
+            throw new errors_1.InvalidInputError('Invalid request format', e instanceof zod_1.z.ZodError ? e.errors : undefined);
+        }
         if (method !== 'tools/list') {
             this.logger.warn(`parseInput: invalid method "${method}"`);
-            throw new Error('Invalid method');
+            throw new errors_1.InvalidMethodError(method, 'tools/list');
         }
         const cursor = params?.cursor;
         if (cursor)
@@ -53,63 +63,80 @@ let ToolsListFlow = class ToolsListFlow extends common_1.FlowBase {
     }
     async findTools() {
         this.logger.info('findTools:start');
-        const apps = this.scope.apps.getApps();
-        this.logger.info(`findTools: discovered ${apps.length} app(s)`);
-        const tools = [];
-        const scopeTools = this.scope.tools.getTools();
-        this.logger.verbose(`findTools: scope tools=${scopeTools.length}`);
-        for (const tool of scopeTools) {
-            tools.push({ appName: tool.owner.id, tool });
+        try {
+            const apps = this.scope.apps.getApps();
+            this.logger.info(`findTools: discovered ${apps.length} app(s)`);
+            const tools = [];
+            const scopeTools = this.scope.tools.getTools();
+            this.logger.verbose(`findTools: scope tools=${scopeTools.length}`);
+            for (const tool of scopeTools) {
+                tools.push({ appName: tool.owner.id, tool });
+            }
+            this.logger.info(`findTools: total tools collected=${tools.length}`);
+            if (tools.length === 0) {
+                this.logger.warn('findTools: no tools found across apps');
+            }
+            this.state.set('tools', tools);
+            this.logger.verbose('findTools:done');
         }
-        this.logger.info(`findTools: total tools collected=${tools.length}`);
-        if (tools.length === 0) {
-            this.logger.warn('findTools: no tools found across apps');
+        catch (error) {
+            this.logger.error('findTools: failed to collect tools', error);
+            throw error;
         }
-        this.state.set('tools', tools);
-        this.logger.verbose('findTools:done');
     }
     async resolveConflicts() {
         this.logger.verbose('resolveConflicts:start');
-        const found = this.state.required.tools;
-        const counts = new Map();
-        for (const { tool } of found) {
-            const baseName = tool.metadata.id ?? tool.metadata.name;
-            counts.set(baseName, (counts.get(baseName) ?? 0) + 1);
-        }
-        const conflicts = new Set([...counts.entries()].filter(([, n]) => n > 1).map(([k]) => k));
-        if (conflicts.size > 0) {
-            const preview = this.sample(Array.from(conflicts)).join(', ');
-            const extra = conflicts.size > 5 ? `, +${conflicts.size - 5} more` : '';
-            this.logger.warn(`resolveConflicts: ${conflicts.size} name conflict(s) detected: ${preview}${extra}`);
+        try {
+            const found = this.state.required.tools;
+            const counts = new Map();
+            for (const { tool } of found) {
+                const baseName = tool.metadata.id ?? tool.metadata.name;
+                counts.set(baseName, (counts.get(baseName) ?? 0) + 1);
+            }
+            const conflicts = new Set([...counts.entries()].filter(([, n]) => n > 1).map(([k]) => k));
+            if (conflicts.size > 0) {
+                const preview = this.sample(Array.from(conflicts)).join(', ');
+                const extra = conflicts.size > 5 ? `, +${conflicts.size - 5} more` : '';
+                this.logger.warn(`resolveConflicts: ${conflicts.size} name conflict(s) detected: ${preview}${extra}`);
+            }
+            else {
+                this.logger.info('resolveConflicts: no name conflicts detected');
+            }
+            const resolved = found.map(({ appName, tool }) => {
+                const baseName = tool.metadata.id ?? tool.metadata.name;
+                const finalName = conflicts.has(baseName) ? `${appName}:${baseName}` : baseName;
+                return { appName, tool, finalName };
+            });
+            this.state.set('resolvedTools', resolved);
+            this.logger.verbose('resolveConflicts:done');
         }
-        else {
-            this.logger.info('resolveConflicts: no name conflicts detected');
+        catch (error) {
+            this.logger.error('resolveConflicts: failed to resolve conflicts', error);
+            throw error;
         }
-        const resolved = found.map(({ appName, tool }) => {
-            const baseName = tool.metadata.id ?? tool.metadata.name;
-            const finalName = conflicts.has(baseName) ? `${appName}:${baseName}` : baseName;
-            return { appName, tool, finalName };
-        });
-        this.state.set('resolvedTools', resolved);
-        this.logger.verbose('resolveConflicts:done');
     }
     async parseTools() {
         this.logger.verbose('parseTools:start');
-        const resolved = this.state.required.resolvedTools;
-        const tools = resolved.map(({ finalName, tool }) => ({
-            name: finalName,
-            title: tool.metadata.name,
-            description: tool.metadata.description,
-            annotations: tool.metadata.annotations,
-            inputSchema: tool.metadata.rawInputSchema ??
-                (0, zod_to_json_schema_1.zodToJsonSchema)(zod_1.z.object(tool.metadata.inputSchema)),
-        }));
-        const preview = this.sample(tools.map(t => t.name)).join(', ');
-        const extra = tools.length > 5 ? `, +${tools.length - 5} more` : '';
-        this.logger.info(`parseTools: prepared ${tools.length} tool descriptor(s): ${preview}${extra}`);
-        this.respond({ tools });
-        this.logger.info('parseTools: response sent');
-        this.logger.verbose('parseTools:done');
+        try {
+            const resolved = this.state.required.resolvedTools;
+            const tools = resolved.map(({ finalName, tool }) => ({
+                name: finalName,
+                title: tool.metadata.name,
+                description: tool.metadata.description,
+                annotations: tool.metadata.annotations,
+                inputSchema: tool.metadata.rawInputSchema ?? (0, zod_to_json_schema_1.zodToJsonSchema)(zod_1.z.object(tool.metadata.inputSchema)),
+            }));
+            const preview = this.sample(tools.map((t) => t.name)).join(', ');
+            const extra = tools.length > 5 ? `, +${tools.length - 5} more` : '';
+            this.logger.info(`parseTools: prepared ${tools.length} tool descriptor(s): ${preview}${extra}`);
+            this.respond({ tools });
+            this.logger.info('parseTools: response sent');
+            this.logger.verbose('parseTools:done');
+        }
+        catch (error) {
+            this.logger.error('parseTools: failed to parse tools', error);
+            throw error;
+        }
     }
 };
 tslib_1.__decorate([

package/src/tool/flows/tools-list.flow.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools-list.flow.js","sourceRoot":"","sources":["../../../../src/tool/flows/tools-list.flow.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,yCAA8F;AAC9F,4BAA0B;AAC1B,6BAAsB;AACtB,iEAAiG;AACjG,2DAAmD;AAEnD,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,OAAO,EAAE,iCAAsB;IAC/B,GAAG,EAAE,OAAC,CAAC,GAAG,EAAE;CACb,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,gCAAqB,CAAC;AAE3C,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,KAAK,EAAE,OAAC,CAAC,KAAK,CACZ,OAAC,CAAC,MAAM,CAAC;QACP,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;QACnB,IAAI,EAAE,OAAC,CAAC,UAAU,CAAC,kBAAS,CAAC;KAC9B,CAAC,CACH;IACD,aAAa,EAAE,OAAC,CAAC,KAAK,CACpB,OAAC,CAAC,MAAM,CAAC;QACP,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;QACnB,IAAI,EAAE,OAAC,CAAC,UAAU,CAAC,kBAAS,CAAC;QAC7B,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;KACtB,CAAC,CACH;CACF,CAAC,CAAC;AAIH,mCAAmC;AACnC,4CAA4C;AAC5C,MAAM,IAAI,GAAG;IACX,GAAG,EAAE,CAAC,YAAY,CAAC;IACnB,OAAO,EAAE,CAAC,WAAW,EAAE,kBAAkB,CAAC;IAC1C,IAAI,EAAE,CAAC,YAAY,CAAC;CACe,CAAC;AActC,MAAM,IAAI,GAAG,kBAA2B,CAAC;AACzC,MAAM,EAAC,KAAK,EAAC,GAAG,IAAA,oBAAW,EAAC,kBAAkB,CAAC,CAAC;AASjC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,iBAAqB;IAC9D,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAEzC,MAAM,CAAI,GAAQ,EAAE,CAAC,GAAG,CAAC;QAC/B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACxC,MAAM,EACJ,OAAO,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,GAC1B,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErC,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,MAAM,GAAG,CAAC,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC;QAC9B,IAAI,MAAM;YAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,sBAAsB,MAAM,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACzC,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS;QACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC;QAEhE,MAAM,KAAK,GAAgD,EAAE,CAAC;QAE9D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,0BAA0B,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnE,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACrE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACxC,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;QAExC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QACzC,KAAK,MAAM,EAAC,IAAI,EAAC,IAAI,KAAK,EAAE,CAAC;YAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACxD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAC/D,CAAC;QAEF,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACxE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,SAAS,CAAC,IAAI,+BAA+B,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC;QACxG,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,EAAE,EAAE;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACxD,MAAM,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;YAChF,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC;QAEnD,MAAM,KAAK,GAAuB,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,EAAE,EAAE,CAAC,CAAC;YACrE,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;YACzB,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;YACtC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW;YACtC,WAAW,EACR,IAAI,CAAC,QAAgB,CAAC,cAAc;gBACpC,IAAA,oCAAe,EAAC,OAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAQ,CAAS;SACvE,CAAC,CAAC,CAAC;QAEJ,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,KAAK,CAAC,MAAM,wBAAwB,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC;QAEhG,IAAI,CAAC,OAAO,CAAC,EAAC,KAAK,EAAC,CAAC,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEzC,CAAC;CACF,CAAA;AAjGO;IADL,KAAK,CAAC,YAAY,CAAC;;;;+CAgBnB;AAGK;IADL,KAAK,CAAC,WAAW,CAAC;;;;8CAqBlB;AAGK;IADL,KAAK,CAAC,kBAAkB,CAAC;;;;qDA+BzB;AAGK;IADL,KAAK,CAAC,YAAY,CAAC;;;;+CAuBnB;AAxGkB,aAAa;IAPjC,IAAA,aAAI,EAAC;QACJ,IAAI;QACJ,IAAI;QACJ,WAAW;QACX,YAAY;QACZ,MAAM,EAAE,YAAY;KACrB,CAAC;GACmB,aAAa,CAyGjC;kBAzGoB,aAAa","sourcesContent":["// tools/flows/list-tools.flow.ts\nimport {Flow, FlowBase, FlowHooksOf, FlowPlan, FlowRunOptions, ToolEntry} from '../../common';\nimport 'reflect-metadata';\nimport {z} from 'zod';\nimport {ListToolsRequestSchema, ListToolsResultSchema} from '@modelcontextprotocol/sdk/types.js';\nimport {zodToJsonSchema} from 'zod-to-json-schema';\n\nconst inputSchema = z.object({\n  request: ListToolsRequestSchema,\n  ctx: z.any(),\n});\n\nconst outputSchema = ListToolsResultSchema;\n\nconst stateSchema = z.object({\n  cursor: z.string().optional(),\n  tools: z.array(\n    z.object({\n      appName: z.string(),\n      tool: z.instanceof(ToolEntry),\n    })\n  ),\n  resolvedTools: z.array(\n    z.object({\n      appName: z.string(),\n      tool: z.instanceof(ToolEntry),\n      finalName: z.string(),\n    })\n  ),\n});\n\ntype ResponseToolItem = z.infer<typeof outputSchema>['tools'][number];\n\n// TODO: add support for pagination\n// TODO: add support for session based tools\nconst plan = {\n  pre: ['parseInput'],\n  execute: ['findTools', 'resolveConflicts'],\n  post: ['parseTools'],\n} as const satisfies FlowPlan<string>;\n\ndeclare global {\n    interface ExtendFlows {\n      'tools:list-tools': FlowRunOptions<\n        ToolsListFlow,\n        typeof plan,\n        typeof inputSchema,\n        typeof outputSchema,\n        typeof stateSchema\n      >;\n    }\n}\n\nconst name = 'tools:list-tools' as const;\nconst {Stage} = FlowHooksOf('tools:list-tools');\n\n@Flow({\n  name,\n  plan,\n  inputSchema,\n  outputSchema,\n  access: 'authorized',\n})\nexport default class ToolsListFlow extends FlowBase<typeof name> {\n  logger = this.scopeLogger.child('ToolsListFlow');\n\n  private sample<T>(arr: T[], n = 5): T[] {\n    return arr.slice(0, n);\n  }\n\n  @Stage('parseInput')\n  async parseInput() {\n    this.logger.verbose('parseInput:start');\n    const {\n      request: {method, params},\n    } = inputSchema.parse(this.rawInput);\n\n    if (method !== 'tools/list') {\n      this.logger.warn(`parseInput: invalid method \"${method}\"`);\n      throw new Error('Invalid method');\n    }\n\n    const cursor = params?.cursor;\n    if (cursor) this.logger.verbose(`parseInput: cursor=${cursor}`);\n    this.state.set('cursor', cursor);\n    this.logger.verbose('parseInput:done');\n  }\n\n  @Stage('findTools')\n  async findTools() {\n    this.logger.info('findTools:start');\n    const apps = this.scope.apps.getApps();\n    this.logger.info(`findTools: discovered ${apps.length} app(s)`);\n\n    const tools: Array<{ appName: string; tool: ToolEntry }> = [];\n\n    const scopeTools = this.scope.tools.getTools();\n    this.logger.verbose(`findTools: scope tools=${scopeTools.length}`);\n\n    for (const tool of scopeTools) {\n      tools.push({appName: tool.owner.id, tool});\n    }\n    this.logger.info(`findTools: total tools collected=${tools.length}`);\n    if (tools.length === 0) {\n      this.logger.warn('findTools: no tools found across apps');\n    }\n\n    this.state.set('tools', tools);\n    this.logger.verbose('findTools:done');\n  }\n\n  @Stage('resolveConflicts')\n  async resolveConflicts() {\n    this.logger.verbose('resolveConflicts:start');\n    const found = this.state.required.tools;\n\n    const counts = new Map<string, number>();\n    for (const {tool} of found) {\n      const baseName = tool.metadata.id ?? tool.metadata.name;\n      counts.set(baseName, (counts.get(baseName) ?? 0) + 1);\n    }\n\n    const conflicts = new Set<string>(\n      [...counts.entries()].filter(([, n]) => n > 1).map(([k]) => k)\n    );\n\n    if (conflicts.size > 0) {\n      const preview = this.sample(Array.from(conflicts)).join(', ');\n      const extra = conflicts.size > 5 ? `, +${conflicts.size - 5} more` : '';\n      this.logger.warn(`resolveConflicts: ${conflicts.size} name conflict(s) detected: ${preview}${extra}`);\n    } else {\n      this.logger.info('resolveConflicts: no name conflicts detected');\n    }\n\n    const resolved = found.map(({appName, tool}) => {\n      const baseName = tool.metadata.id ?? tool.metadata.name;\n      const finalName = conflicts.has(baseName) ? `${appName}:${baseName}` : baseName;\n      return {appName, tool, finalName};\n    });\n\n    this.state.set('resolvedTools', resolved);\n    this.logger.verbose('resolveConflicts:done');\n  }\n\n  @Stage('parseTools')\n  async parseTools() {\n    this.logger.verbose('parseTools:start');\n    const resolved = this.state.required.resolvedTools;\n\n    const tools: ResponseToolItem[] = resolved.map(({finalName, tool}) => ({\n      name: finalName,\n      title: tool.metadata.name,\n      description: tool.metadata.description,\n      annotations: tool.metadata.annotations,\n      inputSchema:\n        (tool.metadata as any).rawInputSchema ??\n        (zodToJsonSchema(z.object(tool.metadata.inputSchema) as any) as any),\n    }));\n\n    const preview = this.sample(tools.map(t => t.name)).join(', ');\n    const extra = tools.length > 5 ? `, +${tools.length - 5} more` : '';\n    this.logger.info(`parseTools: prepared ${tools.length} tool descriptor(s): ${preview}${extra}`);\n\n    this.respond({tools});\n    this.logger.info('parseTools: response sent');\n    this.logger.verbose('parseTools:done');\n\n  }\n}\n"]}
+{"version":3,"file":"tools-list.flow.js","sourceRoot":"","sources":["../../../../src/tool/flows/tools-list.flow.ts"],"names":[],"mappings":"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","sourcesContent":["// tools/flows/list-tools.flow.ts\nimport { Flow, FlowBase, FlowHooksOf, FlowPlan, FlowRunOptions, ToolEntry } from '../../common';\nimport 'reflect-metadata';\nimport { z } from 'zod';\nimport { ListToolsRequestSchema, ListToolsResultSchema } from '@modelcontextprotocol/sdk/types.js';\nimport { zodToJsonSchema } from 'zod-to-json-schema';\nimport { InvalidMethodError, InvalidInputError } from '../../errors';\n\nconst inputSchema = z.object({\n  request: ListToolsRequestSchema,\n  ctx: z.any(),\n});\n\nconst outputSchema = ListToolsResultSchema;\n\nconst stateSchema = z.object({\n  cursor: z.string().optional(),\n  tools: z.array(\n    z.object({\n      appName: z.string(),\n      tool: z.instanceof(ToolEntry),\n    }),\n  ),\n  resolvedTools: z.array(\n    z.object({\n      appName: z.string(),\n      tool: z.instanceof(ToolEntry),\n      finalName: z.string(),\n    }),\n  ),\n});\n\ntype ResponseToolItem = z.infer<typeof outputSchema>['tools'][number];\n\n// TODO: add support for pagination\n// TODO: add support for session based tools\nconst plan = {\n  pre: ['parseInput'],\n  execute: ['findTools', 'resolveConflicts'],\n  post: ['parseTools'],\n} as const satisfies FlowPlan<string>;\n\ndeclare global {\n  interface ExtendFlows {\n    'tools:list-tools': FlowRunOptions<\n      ToolsListFlow,\n      typeof plan,\n      typeof inputSchema,\n      typeof outputSchema,\n      typeof stateSchema\n    >;\n  }\n}\n\nconst name = 'tools:list-tools' as const;\nconst { Stage } = FlowHooksOf('tools:list-tools');\n\n@Flow({\n  name,\n  plan,\n  inputSchema,\n  outputSchema,\n  access: 'authorized',\n})\nexport default class ToolsListFlow extends FlowBase<typeof name> {\n  logger = this.scopeLogger.child('ToolsListFlow');\n\n  private sample<T>(arr: T[], n = 5): T[] {\n    return arr.slice(0, n);\n  }\n\n  @Stage('parseInput')\n  async parseInput() {\n    this.logger.verbose('parseInput:start');\n\n    let method!: string;\n    let params: any;\n    try {\n      const inputData = inputSchema.parse(this.rawInput);\n      method = inputData.request.method;\n      params = inputData.request.params;\n    } catch (e) {\n      throw new InvalidInputError('Invalid request format', e instanceof z.ZodError ? e.errors : undefined);\n    }\n\n    if (method !== 'tools/list') {\n      this.logger.warn(`parseInput: invalid method \"${method}\"`);\n      throw new InvalidMethodError(method, 'tools/list');\n    }\n\n    const cursor = params?.cursor;\n    if (cursor) this.logger.verbose(`parseInput: cursor=${cursor}`);\n    this.state.set('cursor', cursor);\n    this.logger.verbose('parseInput:done');\n  }\n\n  @Stage('findTools')\n  async findTools() {\n    this.logger.info('findTools:start');\n\n    try {\n      const apps = this.scope.apps.getApps();\n      this.logger.info(`findTools: discovered ${apps.length} app(s)`);\n\n      const tools: Array<{ appName: string; tool: ToolEntry }> = [];\n\n      const scopeTools = this.scope.tools.getTools();\n      this.logger.verbose(`findTools: scope tools=${scopeTools.length}`);\n\n      for (const tool of scopeTools) {\n        tools.push({ appName: tool.owner.id, tool });\n      }\n\n      this.logger.info(`findTools: total tools collected=${tools.length}`);\n      if (tools.length === 0) {\n        this.logger.warn('findTools: no tools found across apps');\n      }\n\n      this.state.set('tools', tools);\n      this.logger.verbose('findTools:done');\n    } catch (error) {\n      this.logger.error('findTools: failed to collect tools', error);\n      throw error;\n    }\n  }\n\n  @Stage('resolveConflicts')\n  async resolveConflicts() {\n    this.logger.verbose('resolveConflicts:start');\n\n    try {\n      const found = this.state.required.tools;\n\n      const counts = new Map<string, number>();\n      for (const { tool } of found) {\n        const baseName = tool.metadata.id ?? tool.metadata.name;\n        counts.set(baseName, (counts.get(baseName) ?? 0) + 1);\n      }\n\n      const conflicts = new Set<string>([...counts.entries()].filter(([, n]) => n > 1).map(([k]) => k));\n\n      if (conflicts.size > 0) {\n        const preview = this.sample(Array.from(conflicts)).join(', ');\n        const extra = conflicts.size > 5 ? `, +${conflicts.size - 5} more` : '';\n        this.logger.warn(`resolveConflicts: ${conflicts.size} name conflict(s) detected: ${preview}${extra}`);\n      } else {\n        this.logger.info('resolveConflicts: no name conflicts detected');\n      }\n\n      const resolved = found.map(({ appName, tool }) => {\n        const baseName = tool.metadata.id ?? tool.metadata.name;\n        const finalName = conflicts.has(baseName) ? `${appName}:${baseName}` : baseName;\n        return { appName, tool, finalName };\n      });\n\n      this.state.set('resolvedTools', resolved);\n      this.logger.verbose('resolveConflicts:done');\n    } catch (error) {\n      this.logger.error('resolveConflicts: failed to resolve conflicts', error);\n      throw error;\n    }\n  }\n\n  @Stage('parseTools')\n  async parseTools() {\n    this.logger.verbose('parseTools:start');\n\n    try {\n      const resolved = this.state.required.resolvedTools;\n\n      const tools: ResponseToolItem[] = resolved.map(({ finalName, tool }) => ({\n        name: finalName,\n        title: tool.metadata.name,\n        description: tool.metadata.description,\n        annotations: tool.metadata.annotations,\n        inputSchema:\n          (tool.metadata as any).rawInputSchema ?? (zodToJsonSchema(z.object(tool.metadata.inputSchema) as any) as any),\n      }));\n\n      const preview = this.sample(tools.map((t) => t.name)).join(', ');\n      const extra = tools.length > 5 ? `, +${tools.length - 5} more` : '';\n      this.logger.info(`parseTools: prepared ${tools.length} tool descriptor(s): ${preview}${extra}`);\n\n      this.respond({ tools });\n      this.logger.info('parseTools: response sent');\n      this.logger.verbose('parseTools:done');\n    } catch (error) {\n      this.logger.error('parseTools: failed to parse tools', error);\n      throw error;\n    }\n  }\n}\n"]}

package/src/tool/tool.instance.d.ts

@@ -1,15 +1,34 @@
-import { EntryOwnerRef, ToolCallArgs, ToolCallExtra, ToolContext, ToolEntry, ToolRecord } from '../common';
+import { EntryOwnerRef, ToolCallArgs, ToolCallExtra, ToolContext, ToolEntry, ToolInputType, ToolOutputType, ToolRecord, ParsedToolResult, ToolInputOf, ToolOutputOf, SafeTransformResult } from '../common';
 import ProviderRegistry from '../provider/provider.registry';
-import { z } from "zod";
-import HookRegistry from "../hooks/hook.registry";
-import { Scope } from "../scope";
-export declare class ToolInstance<In extends object = any, Out extends object = any> extends ToolEntry<In, Out> {
+import { z } from 'zod';
+import HookRegistry from '../hooks/hook.registry';
+import { Scope } from '../scope';
+import type { CallToolRequest } from '@modelcontextprotocol/sdk/types.js';
+export declare class ToolInstance<InSchema extends ToolInputType = ToolInputType, OutSchema extends ToolOutputType = ToolOutputType, In = ToolInputOf<{
+    inputSchema: InSchema;
+}>, Out = ToolOutputOf<{
+    outputSchema: OutSchema;
+}>> extends ToolEntry<InSchema, OutSchema, In, Out> {
     private readonly providers;
-    readonly name: string;
     readonly scope: Scope;
     readonly hooks: HookRegistry;
     constructor(record: ToolRecord, providers: ProviderRegistry, owner: EntryOwnerRef);
     protected initialize(): Promise<void>;
-    getMetadata(): import("../common").ToolMetadata<z.ZodRawShape, z.ZodRawShape>;
-    create(input: ToolCallArgs, ctx: ToolCallExtra): ToolContext<In, Out>;
+    getMetadata(): import("../common").ToolMetadata<z.ZodRawShape, ToolOutputType>;
+    getOutputSchema(): OutSchema | undefined;
+    create(input: ToolCallArgs, ctx: ToolCallExtra): ToolContext<InSchema, OutSchema, In, Out>;
+    parseInput(input: CallToolRequest['params']): CallToolRequest['params']['arguments'];
+    /**
+     * Turn the raw tool function result into an MCP-compliant CallToolResult:
+     *   - `content`: list of ContentBlocks (text / image / audio / resource / resource_link)
+     *   - `structuredContent`: sanitized JSON when outputSchema is "json-like"
+     *
+     * Rules:
+     *   - If outputSchema is a JS array → multiple content items, each with its own type.
+     *   - Primitive → stringifies into a TextContent block.
+     *   - image/audio/resource/resource_link → passed through as-is.
+     *   - JSON / structured → JSON.stringify for text, and full sanitized JSON in structuredContent.
+     */
+    parseOutput(raw: Out | Partial<Out> | any): ParsedToolResult;
+    safeParseOutput(raw: Out | Partial<Out> | any): SafeTransformResult<ParsedToolResult>;
 }

package/src/tool/tool.instance.js

@@ -1,12 +1,13 @@
 "use strict";
+// file: libs/sdk/src/tool/tool.instance.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToolInstance = void 0;
 const common_1 = require("../common");
 const zod_1 = require("zod");
 const hooks_utils_1 = require("../hooks/hooks.utils");
+const tool_utils_1 = require("./tool.utils");
 class ToolInstance extends common_1.ToolEntry {
     providers;
-    name;
     scope;
     hooks;
     constructor(record, providers, owner) {
@@ -14,17 +15,20 @@ class ToolInstance extends common_1.ToolEntry {
         this.owner = owner;
         this.providers = providers;
         this.name = record.metadata.id || record.metadata.name;
+        this.fullName = this.owner.id + ':' + this.name;
         this.scope = this.providers.getActiveScope();
         this.hooks = this.scope.providers.getHooksRegistry();
         const schema = record.metadata.inputSchema;
-        this.inputSchema = typeof schema.parse === 'function' ? schema : zod_1.z.object(schema);
+        // Support both Zod objects and raw ZodRawShape
+        this.inputSchema = schema instanceof zod_1.z.ZodObject ? schema.shape : schema ?? {};
+        // Whatever JSON schema representation you’re storing for inputs
         this.rawInputSchema = record.metadata.rawInputSchema;
-        this.outputSchema = record.metadata.outputSchema ? zod_1.z.object(record.metadata.outputSchema) : zod_1.z.object({}).passthrough();
+        // IMPORTANT: keep the *raw* outputSchema (string literal, zod, raw shape, or array)
+        this.outputSchema = record.metadata.outputSchema;
         this.ready = this.initialize();
     }
     async initialize() {
-        const hooks = (0, hooks_utils_1.normalizeHooksFromCls)(this.record.provide)
-            .filter(hook => hook.metadata.flow === 'tools:call-tool' || hook.metadata.flow === 'tools:list-tools');
+        const hooks = (0, hooks_utils_1.normalizeHooksFromCls)(this.record.provide).filter((hook) => hook.metadata.flow === 'tools:call-tool' || hook.metadata.flow === 'tools:list-tools');
         if (hooks.length > 0) {
             await this.hooks.registerHooks(true, ...hooks);
         }
@@ -33,6 +37,9 @@ class ToolInstance extends common_1.ToolEntry {
     getMetadata() {
         return this.record.metadata;
     }
+    getOutputSchema() {
+        return this.outputSchema;
+    }
     create(input, ctx) {
         const metadata = this.metadata;
         const providers = this.providers;
@@ -53,6 +60,34 @@ class ToolInstance extends common_1.ToolEntry {
                 return new FunctionToolContext(this.record, toolCtorArgs);
         }
     }
+    parseInput(input) {
+        const inputSchema = zod_1.z.object(this.inputSchema);
+        return inputSchema.parse(input.arguments);
+    }
+    /**
+     * Turn the raw tool function result into an MCP-compliant CallToolResult:
+     *   - `content`: list of ContentBlocks (text / image / audio / resource / resource_link)
+     *   - `structuredContent`: sanitized JSON when outputSchema is "json-like"
+     *
+     * Rules:
+     *   - If outputSchema is a JS array → multiple content items, each with its own type.
+     *   - Primitive → stringifies into a TextContent block.
+     *   - image/audio/resource/resource_link → passed through as-is.
+     *   - JSON / structured → JSON.stringify for text, and full sanitized JSON in structuredContent.
+     */
+    parseOutput(raw) {
+        const descriptor = this.outputSchema;
+        return (0, tool_utils_1.buildParsedToolResult)(descriptor, raw);
+    }
+    safeParseOutput(raw) {
+        const descriptor = this.outputSchema;
+        try {
+            return { success: true, data: (0, tool_utils_1.buildParsedToolResult)(descriptor, raw) };
+        }
+        catch (error) {
+            return { success: false, error };
+        }
+    }
 }
 exports.ToolInstance = ToolInstance;
 class FunctionToolContext extends common_1.ToolContext {

package/src/tool/tool.instance.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool.instance.js","sourceRoot":"","sources":["../../../src/tool/tool.instance.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  EntryOwnerRef, ToolCallArgs, ToolCallExtra, ToolContext,\n  ToolCtorArgs, ToolEntry, ToolFunctionTokenRecord, ToolKind, ToolRecord\n} from '../common';\nimport ProviderRegistry from '../provider/provider.registry';\nimport {z} from \"zod\";\nimport HookRegistry from \"../hooks/hook.registry\";\nimport {Scope} from \"../scope\";\nimport {normalizeHooksFromCls} from \"../hooks/hooks.utils\";\n\n\nexport class ToolInstance<In extends object = any, Out extends object = any> extends ToolEntry<In, Out> {\n  private readonly providers: ProviderRegistry;\n  readonly name: string;\n  readonly scope: Scope;\n  readonly hooks: HookRegistry;\n\n  constructor(record: ToolRecord, providers: ProviderRegistry, owner: EntryOwnerRef) {\n    super(record);\n    this.owner = owner;\n    this.providers = providers;\n    this.name = record.metadata.id || record.metadata.name;\n    this.scope = this.providers.getActiveScope()\n    this.hooks = this.scope.providers.getHooksRegistry();\n\n    const schema: any = record.metadata.inputSchema\n    this.inputSchema = typeof schema.parse === 'function' ? schema : z.object(schema);\n    this.rawInputSchema = record.metadata.rawInputSchema as any;\n    this.outputSchema = record.metadata.outputSchema ? z.object(record.metadata.outputSchema) : z.object({}).passthrough();\n    this.ready = this.initialize();\n  }\n\n  protected async initialize() {\n    const hooks = normalizeHooksFromCls(this.record.provide)\n      .filter(hook => hook.metadata.flow === 'tools:call-tool' || hook.metadata.flow === 'tools:list-tools')\n    if (hooks.length > 0) {\n      await this.hooks.registerHooks(true, ...hooks)\n    }\n    return Promise.resolve();\n  }\n\n  getMetadata() {\n    return this.record.metadata;\n  }\n\n  override create(input: ToolCallArgs, ctx: ToolCallExtra): ToolContext<In, Out> {\n    const metadata = this.metadata;\n    const providers = this.providers;\n    const scope = this.providers.getActiveScope();\n    const logger = scope.logger;\n    const authInfo = ctx.authInfo;\n\n    const toolCtorArgs: ToolCtorArgs<In> = {\n      metadata,\n      input: input as In,\n      providers,\n      logger,\n      authInfo,\n    }\n    switch (this.record.kind) {\n      case ToolKind.CLASS_TOKEN:\n        return new this.record.provide(toolCtorArgs);\n      case ToolKind.FUNCTION:\n        return new FunctionToolContext<In, Out>(this.record, toolCtorArgs);\n    }\n  }\n}\n\nclass FunctionToolContext<In extends object = any, Out extends object = any> extends ToolContext<In, Out> {\n  constructor(\n    private readonly record: ToolFunctionTokenRecord,\n    args: ToolCtorArgs<In>\n  ) {\n    super(args);\n  }\n\n  execute(input: In): Promise<Out> {\n    return this.record.provide(input, this);\n  }\n}\n\n"]}
+{"version":3,"file":"tool.instance.js","sourceRoot":"","sources":["../../../src/tool/tool.instance.ts"],"names":[],"mappings":"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","sourcesContent":["// file: libs/sdk/src/tool/tool.instance.ts\n\nimport {\n  EntryOwnerRef,\n  ToolCallArgs,\n  ToolCallExtra,\n  ToolContext,\n  ToolCtorArgs,\n  ToolEntry,\n  ToolFunctionTokenRecord,\n  ToolInputType,\n  ToolKind,\n  ToolOutputType,\n  ToolRecord,\n  ParsedToolResult,\n  ToolInputOf,\n  ToolOutputOf,\n  SafeTransformResult,\n} from '../common';\nimport ProviderRegistry from '../provider/provider.registry';\nimport { z } from 'zod';\nimport HookRegistry from '../hooks/hook.registry';\nimport { Scope } from '../scope';\nimport { normalizeHooksFromCls } from '../hooks/hooks.utils';\nimport type { CallToolRequest } from '@modelcontextprotocol/sdk/types.js';\nimport { buildParsedToolResult } from './tool.utils';\n\nexport class ToolInstance<\n  InSchema extends ToolInputType = ToolInputType,\n  OutSchema extends ToolOutputType = ToolOutputType,\n  In = ToolInputOf<{ inputSchema: InSchema }>,\n  Out = ToolOutputOf<{ outputSchema: OutSchema }>,\n> extends ToolEntry<InSchema, OutSchema, In, Out> {\n  private readonly providers: ProviderRegistry;\n  readonly scope: Scope;\n  readonly hooks: HookRegistry;\n\n  constructor(record: ToolRecord, providers: ProviderRegistry, owner: EntryOwnerRef) {\n    super(record);\n    this.owner = owner;\n    this.providers = providers;\n    this.name = record.metadata.id || record.metadata.name;\n    this.fullName = this.owner.id + ':' + this.name;\n    this.scope = this.providers.getActiveScope();\n    this.hooks = this.scope.providers.getHooksRegistry();\n\n    const schema: any = record.metadata.inputSchema;\n    // Support both Zod objects and raw ZodRawShape\n    this.inputSchema = schema instanceof z.ZodObject ? schema.shape : schema ?? {};\n\n    // Whatever JSON schema representation you’re storing for inputs\n    this.rawInputSchema = record.metadata.rawInputSchema;\n\n    // IMPORTANT: keep the *raw* outputSchema (string literal, zod, raw shape, or array)\n    this.outputSchema = record.metadata.outputSchema as OutSchema;\n\n    this.ready = this.initialize();\n  }\n\n  protected async initialize() {\n    const hooks = normalizeHooksFromCls(this.record.provide).filter(\n      (hook) => hook.metadata.flow === 'tools:call-tool' || hook.metadata.flow === 'tools:list-tools',\n    );\n    if (hooks.length > 0) {\n      await this.hooks.registerHooks(true, ...hooks);\n    }\n    return Promise.resolve();\n  }\n\n  getMetadata() {\n    return this.record.metadata;\n  }\n\n  override getOutputSchema() {\n    return this.outputSchema;\n  }\n\n  override create(input: ToolCallArgs, ctx: ToolCallExtra): ToolContext<InSchema, OutSchema, In, Out> {\n    const metadata = this.metadata;\n    const providers = this.providers;\n    const scope = this.providers.getActiveScope();\n    const logger = scope.logger;\n    const authInfo = ctx.authInfo;\n\n    const toolCtorArgs: ToolCtorArgs<In> = {\n      metadata,\n      input: input as In,\n      providers,\n      logger,\n      authInfo,\n    };\n    switch (this.record.kind) {\n      case ToolKind.CLASS_TOKEN:\n        return new this.record.provide(toolCtorArgs) as ToolContext<InSchema, OutSchema, In, Out>;\n      case ToolKind.FUNCTION:\n        return new FunctionToolContext<InSchema, OutSchema, In, Out>(this.record, toolCtorArgs);\n    }\n  }\n\n  override parseInput(input: CallToolRequest['params']): CallToolRequest['params']['arguments'] {\n    const inputSchema = z.object(this.inputSchema);\n    return inputSchema.parse(input.arguments);\n  }\n  /**\n   * Turn the raw tool function result into an MCP-compliant CallToolResult:\n   *   - `content`: list of ContentBlocks (text / image / audio / resource / resource_link)\n   *   - `structuredContent`: sanitized JSON when outputSchema is \"json-like\"\n   *\n   * Rules:\n   *   - If outputSchema is a JS array → multiple content items, each with its own type.\n   *   - Primitive → stringifies into a TextContent block.\n   *   - image/audio/resource/resource_link → passed through as-is.\n   *   - JSON / structured → JSON.stringify for text, and full sanitized JSON in structuredContent.\n   */\n  override parseOutput(raw: Out | Partial<Out> | any): ParsedToolResult {\n    const descriptor = this.outputSchema as any;\n\n    return buildParsedToolResult(descriptor, raw);\n  }\n\n  override safeParseOutput(raw: Out | Partial<Out> | any): SafeTransformResult<ParsedToolResult> {\n    const descriptor = this.outputSchema as any;\n    try {\n      return { success: true, data: buildParsedToolResult(descriptor, raw) };\n    } catch (error: any) {\n      return { success: false, error };\n    }\n  }\n}\n\nclass FunctionToolContext<\n  InSchema extends ToolInputType,\n  OutSchema extends ToolOutputType,\n  In = ToolInputOf<{ inputSchema: InSchema }>,\n  Out = ToolOutputOf<{ outputSchema: OutSchema }>,\n> extends ToolContext<InSchema, OutSchema, In, Out> {\n  constructor(private readonly record: ToolFunctionTokenRecord, args: ToolCtorArgs<In>) {\n    super(args);\n  }\n\n  execute(input: In): Promise<Out> {\n    return this.record.provide(input, this);\n  }\n}\n"]}

package/src/tool/tool.registry.js

@@ -74,17 +74,21 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
             this.localRows.push(row);
         }
         const childAppRegistries = this.providers.getRegistries('AppRegistry');
-        childAppRegistries.forEach(appRegistry => {
+        childAppRegistries.forEach((appRegistry) => {
             const apps = appRegistry.getApps();
             for (const app of apps) {
                 const appToolsRegistries = app.providers.getRegistries('ToolRegistry');
-                appToolsRegistries.filter(t => t.owner.kind === 'app').forEach(appToolRegistry => {
+                appToolsRegistries
+                    .filter((t) => t.owner.kind === 'app')
+                    .forEach((appToolRegistry) => {
                     this.adoptFromChild(appToolRegistry, appToolRegistry.owner);
                 });
             }
         });
         const childToolRegistries = this.providers.getRegistries('ToolRegistry');
-        childToolRegistries.filter(t => t != this).forEach(toolRegistry => {
+        childToolRegistries
+            .filter((t) => t != this)
+            .forEach((toolRegistry) => {
             this.adoptFromChild(toolRegistry, toolRegistry.owner);
         });
         // Build effective indexes from (locals + already adopted children)
@@ -107,12 +111,12 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
             return;
         const childRows = child.listAllIndexed(); // includes child's lineage
         const prepend = this.owner ? [this.owner] : [];
-        const adoptedRows = childRows.map(r => this.relineage(r, prepend));
+        const adoptedRows = childRows.map((r) => this.relineage(r, prepend));
         this.adopted.set(child, adoptedRows);
         this.children.add(child);
         // keep live if child changes
         child.subscribe({ immediate: false }, () => {
-            const latest = child.listAllIndexed().map(r => this.relineage(r, prepend));
+            const latest = child.listAllIndexed().map((r) => this.relineage(r, prepend));
             this.adopted.set(child, latest);
             this.reindex();
             this.bump('reset');
@@ -161,11 +165,11 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
     }
     /** List all instances (locals + adopted). */
     listAllInstances() {
-        return this.listAllIndexed().map(r => r.instance);
+        return this.listAllIndexed().map((r) => r.instance);
     }
     /** List instances by owner path (e.g. "app:Portal/plugin:Okta") */
     listByOwner(ownerPath) {
-        return (this.byOwner.get(ownerPath) ?? []).map(r => r.instance);
+        return (this.byOwner.get(ownerPath) ?? []).map((r) => r.instance);
     }
     /* -------------------- Conflict-aware exported names -------------------- */
     /**
@@ -177,7 +181,7 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
      */
     exportResolvedNames(opts) {
         const cfg = { ...tool_types_1.DEFAULT_EXPORT_OPTS, ...(opts ?? {}) };
-        const rows = this.listAllIndexed().map(r => {
+        const rows = this.listAllIndexed().map((r) => {
             const base = (0, tool_utils_1.normalizeSegment)(r.baseName, cfg.case);
             const isLocal = r.source === this;
             const provider = (0, tool_utils_1.normalizeProviderId)(this.providerIdOf(r.instance), cfg.case);
@@ -198,8 +202,8 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
                 out.set((0, tool_utils_1.ensureMaxLen)(base, cfg.maxLen), g.row.instance);
                 continue;
             }
-            const locals = group.filter(g => g.isLocal);
-            const children = group.filter(g => !g.isLocal);
+            const locals = group.filter((g) => g.isLocal);
+            const children = group.filter((g) => !g.isLocal);
             if (cfg.prefixChildrenOnConflict && locals.length > 0) {
                 // Locals
                 if (locals.length === 1) {
@@ -215,9 +219,7 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
                 }
                 // Children
                 for (const c of children) {
-                    const pre = cfg.prefixSource === 'provider'
-                        ? (c.provider ?? c.ownerPath)
-                        : c.ownerPath;
+                    const pre = cfg.prefixSource === 'provider' ? c.provider ?? c.ownerPath : c.ownerPath;
                     const name = (0, tool_utils_1.ensureMaxLen)(`${pre}${(0, tool_utils_1.sepFor)(cfg.case)}${base}`, cfg.maxLen);
                     out.set(disambiguate(name, out, cfg), c.row.instance);
                 }
@@ -225,17 +227,13 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
             else {
                 // Prefix everyone by source
                 for (const r of group) {
-                    const pre = cfg.prefixSource === 'provider'
-                        ? (r.provider ?? r.ownerPath)
-                        : r.ownerPath;
+                    const pre = cfg.prefixSource === 'provider' ? r.provider ?? r.ownerPath : r.ownerPath;
                     const name = (0, tool_utils_1.ensureMaxLen)(`${pre}${(0, tool_utils_1.sepFor)(cfg.case)}${base}`, cfg.maxLen);
                     out.set(disambiguate(name, out, cfg), r.row.instance);
                 }
             }
         }
-        return [...out.entries()]
-            .sort((a, b) => a[0].localeCompare(b[0]))
-            .map(([name, instance]) => ({ name, instance }));
+        return [...out.entries()].sort((a, b) => a[0].localeCompare(b[0])).map(([name, instance]) => ({ name, instance }));
         function disambiguate(candidate, pool, cfg) {
             if (!pool.has(candidate))
                 return candidate;
@@ -251,7 +249,7 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
     /** Lookup by the exported (resolved) name. */
     getExported(name, opts) {
         const pairs = this.exportResolvedNames(opts);
-        return pairs.find(p => p.name === name)?.instance;
+        return pairs.find((p) => p.name === name)?.instance;
     }
     /* -------------------- Subscriptions -------------------- */
     subscribe(opts, cb) {
@@ -305,7 +303,7 @@ class ToolRegistry extends regsitry_1.RegistryAbstract {
             const maybe = meta?.providerId ?? meta?.provider ?? meta?.ownerId ?? undefined;
             if (typeof maybe === 'string' && maybe.length)
                 return maybe;
-            const cls = (meta && meta.cls) ? meta.cls : undefined;
+            const cls = meta && meta.cls ? meta.cls : undefined;
             if (cls) {
                 const id = (0, metadata_utils_1.getMetadata)('id', cls);
                 if (typeof id === 'string' && id.length)