amalgm 0.1.72 → 0.1.73

package/runtime/scripts/amalgm-mcp/toolbox/tools.js

@@ -2,71 +2,8 @@
 
 const { textResult } = require('../lib/tool-result');
 const {
-  deleteTool,
-  deleteToolAction,
-  getTool,
-  getToolAction,
-  readToolbox,
-  updateTool,
-  updateToolAction,
-  upsertTool,
-  upsertToolAction,
-} = require('./store');
-const { toolboxMcpToolName } = require('./runner');
-
-function compactAction(action) {
-  return {
-    id: action.id,
-    name: action.name,
-    ref: `${action.toolId}.${action.name}`,
-    status: action.status,
-    description: action.description,
-    mcpToolName: toolboxMcpToolName(action),
-  };
-}
-
-function compactTool(tool, actions) {
-  return {
-    id: tool.id,
-    name: tool.name,
-    type: tool.type,
-    owner: tool.owner,
-    origin: tool.origin,
-    status: tool.status,
-    discovery: tool.discovery,
-    actions: actions.map(compactAction),
-    actionCount: actions.length,
-    source: tool.source,
-    guide: tool.guide,
-    display: tool.display,
-    policy: tool.policy,
-  };
-}
-
-function listPayload(args = {}) {
-  const toolbox = readToolbox();
-  const actionsByTool = new Map();
-  for (const action of Object.values(toolbox.toolActions || {})) {
-    const existing = actionsByTool.get(action.toolId) || [];
-    existing.push(action);
-    actionsByTool.set(action.toolId, existing);
-  }
-
-  const tools = Object.values(toolbox.tools || {})
-    .filter((tool) => !args.type || tool.type === args.type)
-    .filter((tool) => !args.owner || tool.owner === args.owner)
-    .filter((tool) => !args.origin || tool.origin === args.origin)
-    .map((tool) => compactTool(tool, actionsByTool.get(tool.id) || []));
-
-  const payload = {
-    version: toolbox.version,
-    tools,
-    ...(args.include_actions
-      ? { toolActions: toolbox.toolActions }
-      : {}),
-  };
-  return payload;
-}
+  defaultToolboxService: toolboxService,
+} = require('./service');
 
 module.exports = [
   {
@@ -82,7 +19,7 @@ module.exports = [
       },
     },
     async handler(args) {
-      return textResult(JSON.stringify(listPayload(args || {}), null, 2));
+      return textResult(JSON.stringify(toolboxService.listTools(args || {}), null, 2));
     },
   },
   {
@@ -97,7 +34,7 @@ module.exports = [
       required: ['id'],
     },
     async handler(args) {
-      const payload = getTool(args?.id, { includeActions: args?.include_actions !== false });
+      const payload = toolboxService.getTool(args?.id, { includeActions: args?.include_actions !== false });
       return textResult(JSON.stringify(payload, null, 2));
     },
   },
@@ -140,7 +77,7 @@ module.exports = [
       required: ['id', 'name', 'type'],
     },
     async handler(args) {
-      const saved = upsertTool(args || {});
+      const saved = toolboxService.registerTool(args || {});
       return textResult(JSON.stringify({ ok: true, ...saved }, null, 2));
     },
   },
@@ -180,7 +117,7 @@ module.exports = [
       required: ['id'],
     },
     async handler(args) {
-      const saved = updateTool(args || {});
+      const saved = toolboxService.updateTool(args || {});
       return textResult(JSON.stringify({ ok: true, ...saved }, null, 2));
     },
   },
@@ -195,7 +132,7 @@ module.exports = [
       required: ['id'],
     },
     async handler(args) {
-      const payload = getToolAction(args?.id);
+      const payload = toolboxService.getAction(args?.id);
       return textResult(JSON.stringify(payload, null, 2));
     },
   },
@@ -221,7 +158,7 @@ module.exports = [
       required: ['toolId', 'name'],
     },
     async handler(args) {
-      const action = upsertToolAction(args || {});
+      const action = toolboxService.registerAction(args || {});
       return textResult(JSON.stringify({ ok: true, action }, null, 2));
     },
   },
@@ -247,7 +184,7 @@ module.exports = [
       required: ['id'],
     },
     async handler(args) {
-      const action = updateToolAction(args || {});
+      const action = toolboxService.updateAction(args || {});
       return textResult(JSON.stringify({ ok: true, action }, null, 2));
     },
   },
@@ -262,7 +199,7 @@ module.exports = [
       required: ['id'],
     },
     async handler(args) {
-      return textResult(JSON.stringify(deleteTool(args?.id), null, 2));
+      return textResult(JSON.stringify(toolboxService.deleteTool(args?.id), null, 2));
     },
   },
   {
@@ -276,7 +213,7 @@ module.exports = [
       required: ['id'],
     },
     async handler(args) {
-      return textResult(JSON.stringify(deleteToolAction(args?.id), null, 2));
+      return textResult(JSON.stringify(toolboxService.deleteAction(args?.id), null, 2));
     },
   },
 ];

package/runtime/scripts/amalgm-mcp/workflows/compiler.js

@@ -136,7 +136,7 @@ function makeBuilders() {
     const args = isObject(promptOrArgs)
       ? { agent, ...promptOrArgs }
       : { agent, prompt: String(promptOrArgs || '') };
-    return builders.tool(name, 'amalgm.talk_to_agent', args, options);
+    return builders.tool(name, 'amalgm.agents.talk_to_agent', args, options);
   };
 
   builders.workflow = (definition) => definition;

package/runtime/scripts/amalgm-mcp/workflows/runner.js

@@ -10,7 +10,7 @@ const { recordEventRun } = require('../events/store');
 const { compileWorkflowText } = require('./compiler');
 const { loadWorkflows } = require('./store');
 const { callToolboxMcpTool, toolboxMcpToolName } = require('../toolbox/runner');
-const { resolveAmalgmCoreTool, resolveToolboxAction, suggestWorkflowToolActions } = require('../automations/tool-actions');
+const { resolveFirstPartyToolAction, resolveToolboxAction, suggestWorkflowToolActions } = require('../automations/tool-actions');
 
 const DEFAULT_CELL_TIMEOUT_MS = 120_000;
 const DEFAULT_CODE_TIMEOUT_MS = 15_000;
@@ -290,10 +290,9 @@ async function runToolCell(cell, args, allowlist) {
     return runHttpTool(args);
   }
 
-  if (cell.toolId === 'amalgm') {
-    const coreTool = resolveAmalgmCoreTool(cell.actionName);
-    if (!coreTool?.handler) throw new Error(`Amalgm action not found: ${cell.actionName}.`);
-    const result = await coreTool.handler(args, {
+  const firstPartyAction = resolveFirstPartyToolAction(cell.toolId, cell.actionName);
+  if (firstPartyAction) {
+    const result = await firstPartyAction.tool.handler(args, {
       workflow: true,
       sessionMetadata: {
         origin: 'event-workflow',