@lowdefy/ai-utils 5.5.1 → 5.6.0

package/dist/buildAgentTools.js

@@ -16,7 +16,7 @@
 import { createMCPClient } from '@ai-sdk/mcp';
 import { Experimental_StdioMCPTransport } from '@ai-sdk/mcp/mcp-stdio';
 import { ConfigError } from '@lowdefy/errors';
-import { serializer, translate } from '@lowdefy/helpers';
+import { getKey, isReserved, serializer, setKey, translate } from '@lowdefy/helpers';
 import listFiles from './fileSystem/listFiles.js';
 import readFile from './fileSystem/readFile.js';
 import searchFiles from './fileSystem/searchFiles.js';
@@ -30,7 +30,7 @@ import RESERVED_PLATFORM_TOOL_NAMES from './reservedToolNames.js';
 function cleanBuildArtifact(obj) {
     return JSON.parse(JSON.stringify(serializer.deserialize(obj)));
 }
-function assertNotReserved(name, kind, i18n) {
+function assertNotPlatformToolName(name, kind, i18n) {
     if (RESERVED_PLATFORM_TOOL_NAMES.includes(name)) {
         throw new ConfigError(translate({
             key: 'agent.runtime.reservedToolName',
@@ -59,11 +59,20 @@ async function buildAgentTools({ agent, context, depth = 0 }) {
     // Build endpoint tools
     for (const toolConfig of agent.tools ?? []){
         const { endpointId, confirm } = toolConfig;
-        assertNotReserved(endpointId, 'Endpoint tool', context.i18n);
+        assertNotPlatformToolName(endpointId, 'Endpoint tool', context.i18n);
+        // A second, disjoint list: RESERVED_PLATFORM_TOOL_NAMES are the tools Lowdefy itself registers,
+        // isReserved are the prototype-pollution keys setKey refuses. A name can pass one gate and fail
+        // the other, so both checks are needed. The build rejects reserved key names, so this only fires
+        // for a stale or hand-edited build artifact. Skip the tool rather than fail the whole agent, as
+        // the MCP name cases below do.
+        if (isReserved(endpointId)) {
+            console.warn(`Endpoint tool "${endpointId}" uses a reserved key name — skipped.`);
+            continue;
+        }
         const endpointConfig = await context.getEndpointConfig({
             endpointId
         });
-        tools[endpointId] = tool({
+        setKey(tools, endpointId, tool({
             description: endpointConfig.description,
             inputSchema: jsonSchema(cleanBuildArtifact(endpointConfig.payloadSchema)),
             ...confirm ? {
@@ -83,7 +92,7 @@ async function buildAgentTools({ agent, context, depth = 0 }) {
                 }
                 return cleanBuildArtifact(result.response);
             }
-        });
+        }));
     }
     // Build MCP clients and merge their tools
     for (const mcpSource of agent.mcp ?? []){
@@ -132,18 +141,20 @@ async function buildAgentTools({ agent, context, depth = 0 }) {
                     console.warn(`MCP tool "${name}" from ${source.url ?? source.command} ` + `uses a reserved platform tool name — skipped.`);
                     continue;
                 }
-                if (tools[name]) {
-                    console.warn(`MCP tool "${name}" from ${source.url ?? source.command} ` + `conflicts with endpoint tool — skipped.`);
+                // Same policy as the reserved-platform-name and collision cases above:
+                // MCP tool names are not under app control, so warn and skip.
+                if (isReserved(name)) {
+                    console.warn(`MCP tool "${name}" from ${source.url ?? source.command} ` + `uses a reserved key name — skipped.`);
                     continue;
                 }
-                if (source.confirm) {
-                    tools[name] = {
-                        ...mcpTool,
-                        needsApproval: true
-                    };
-                } else {
-                    tools[name] = mcpTool;
+                if (getKey(tools, name)) {
+                    console.warn(`MCP tool "${name}" from ${source.url ?? source.command} ` + `conflicts with endpoint tool — skipped.`);
+                    continue;
                 }
+                setKey(tools, name, source.confirm ? {
+                    ...mcpTool,
+                    needsApproval: true
+                } : mcpTool);
             }
         } catch (err) {
             const label = source.transport === 'stdio' ? source.command : source.url;
@@ -152,7 +163,13 @@ async function buildAgentTools({ agent, context, depth = 0 }) {
     }
     // Build sub-agent tools
     for (const subAgentRef of agent.agents ?? []){
-        assertNotReserved(subAgentRef.agentId, 'Sub-agent', context.i18n);
+        assertNotPlatformToolName(subAgentRef.agentId, 'Sub-agent', context.i18n);
+        // Same policy as the endpoint tool name above: unreachable from valid config, so skip rather
+        // than fail the whole agent.
+        if (isReserved(subAgentRef.agentId)) {
+            console.warn(`Sub-agent tool "${subAgentRef.agentId}" uses a reserved key name — skipped.`);
+            continue;
+        }
         const subAgentConfig = await context.getAgentConfig({
             agentId: subAgentRef.agentId
         });
@@ -192,7 +209,7 @@ async function buildAgentTools({ agent, context, depth = 0 }) {
                 'task'
             ]
         });
-        tools[subAgentRef.agentId] = tool({
+        setKey(tools, subAgentRef.agentId, tool({
             description,
             inputSchema,
             execute: async (input, { abortSignal })=>{
@@ -213,7 +230,7 @@ async function buildAgentTools({ agent, context, depth = 0 }) {
                     type: 'text',
                     value: output.text ?? String(output)
                 })
-        });
+        }));
     }
     // Build fileSystem tools
     if (agent.properties?.fileSystem) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/ai-utils",
-  "version": "5.5.1",
+  "version": "5.6.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -17,8 +17,8 @@
   ],
   "dependencies": {
     "@ai-sdk/mcp": "1.0.41",
-    "@lowdefy/errors": "5.5.1",
-    "@lowdefy/helpers": "5.5.1",
+    "@lowdefy/errors": "5.6.0",
+    "@lowdefy/helpers": "5.6.0",
     "ai": "6.0.176",
     "glob": "13.0.6"
   },