feat(workflow-executor): add sourceId to McpToolRef for MCP tool traceability

Add sourceId to McpToolRef so that persisted execution data (pendingData,
executionParams) tracks which MCP server provided the tool. This fixes
tool lookup on re-entry (confirmation flow) when multiple servers expose
tools with the same name.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: matthv

packages/workflow-executor/src/executors/mcp-step-executor.ts

@@ -57,7 +57,8 @@ export default class McpStepExecutor extends BaseStepExecutor<McpStepDefinition>
     // Branches B & C -- First call
     const tools = this.getFilteredTools();
     const { toolName, args } = await this.selectTool(tools);
-    const target: McpToolCall = { name: toolName, input: args };
+    const selectedTool = tools.find(t => t.base.name === toolName);
+    const target: McpToolCall = { name: toolName, sourceId: selectedTool!.sourceId, input: args };
 
     if (this.context.stepDefinition.automaticExecution) {
       // Branch B -- direct execution
@@ -87,7 +88,7 @@ export default class McpStepExecutor extends BaseStepExecutor<McpStepDefinition>
     existingExecution?: McpStepExecutionData,
   ): Promise<StepExecutionResult> {
     const tools = this.getFilteredTools();
-    const tool = tools.find(t => t.base.name === target.name);
+    const tool = tools.find(t => t.base.name === target.name && t.sourceId === target.sourceId);
     if (!tool) throw new McpToolNotFoundError(target.name);
 
     let toolResult: unknown;
@@ -104,7 +105,7 @@ export default class McpStepExecutor extends BaseStepExecutor<McpStepDefinition>
       ...existingExecution,
       type: 'mcp',
       stepIndex: this.context.stepIndex,
-      executionParams: { name: target.name, input: target.input },
+      executionParams: { name: target.name, sourceId: target.sourceId, input: target.input },
       executionResult: baseExecutionResult,
     };
 

packages/workflow-executor/src/types/step-execution-data.ts

@@ -83,6 +83,7 @@ export interface TriggerRecordActionStepExecutionData extends BaseStepExecutionD
 /** Reference to an MCP tool by its sanitized name (OpenAI-safe, alphanumeric + underscores/hyphens). */
 export interface McpToolRef {
   name: string;
+  sourceId: string;
 }
 
 /** A resolved tool call: sanitized tool name + input parameters sent to the tool. */

packages/workflow-executor/test/executors/mcp-step-executor.test.ts

@@ -145,7 +145,7 @@ describe('McpStepExecutor', () => {
         expect.objectContaining({
           type: 'mcp',
           stepIndex: 0,
-          executionParams: { name: 'send_notification', input: { message: 'Hello' } },
+          executionParams: { name: 'send_notification', sourceId: 'mcp-server-1', input: { message: 'Hello' } },
           executionResult: { success: true, toolResult: { result: 'notification sent' } },
         }),
       );
@@ -292,7 +292,7 @@ describe('McpStepExecutor', () => {
         expect.objectContaining({
           type: 'mcp',
           stepIndex: 0,
-          pendingData: { name: 'send_notification', input: { message: 'Hello' } },
+          pendingData: { name: 'send_notification', sourceId: 'mcp-server-1', input: { message: 'Hello' } },
         }),
       );
     });
@@ -331,6 +331,7 @@ describe('McpStepExecutor', () => {
         stepIndex: 0,
         pendingData: {
           name: 'send_notification',
+          sourceId: 'mcp-server-1',
           input: { message: 'Hello' },
           userConfirmed: true,
         },
@@ -349,10 +350,11 @@ describe('McpStepExecutor', () => {
         'run-1',
         expect.objectContaining({
           type: 'mcp',
-          executionParams: { name: 'send_notification', input: { message: 'Hello' } },
+          executionParams: { name: 'send_notification', sourceId: 'mcp-server-1', input: { message: 'Hello' } },
           executionResult: { success: true, toolResult: 'email sent' },
           pendingData: {
             name: 'send_notification',
+            sourceId: 'mcp-server-1',
             input: { message: 'Hello' },
             userConfirmed: true,
           },
@@ -374,6 +376,7 @@ describe('McpStepExecutor', () => {
         stepIndex: 0,
         pendingData: {
           name: 'send_notification',
+          sourceId: 'mcp-server-1',
           input: { message: 'Hello' },
           userConfirmed: false,
         },
@@ -394,6 +397,7 @@ describe('McpStepExecutor', () => {
           executionResult: { skipped: true },
           pendingData: {
             name: 'send_notification',
+            sourceId: 'mcp-server-1',
             input: { message: 'Hello' },
             userConfirmed: false,
           },
@@ -463,7 +467,7 @@ describe('McpStepExecutor', () => {
       const execution: McpStepExecutionData = {
         type: 'mcp',
         stepIndex: 0,
-        pendingData: { name: 'deleted_tool', input: {}, userConfirmed: true },
+        pendingData: { name: 'deleted_tool', sourceId: 'mcp-server-1', input: {}, userConfirmed: true },
       };
       const tool = new MockRemoteTool({ name: 'other_tool', sourceId: 'mcp-server-1' });
       const runStore = makeMockRunStore({
@@ -525,6 +529,7 @@ describe('McpStepExecutor', () => {
         stepIndex: 0,
         pendingData: {
           name: 'send_notification',
+          sourceId: 'mcp-server-1',
           input: { message: 'Hello' },
           userConfirmed: true,
         },

packages/workflow-executor/test/executors/step-execution-formatters.test.ts

@@ -69,7 +69,7 @@ describe('StepExecutionFormatters', () => {
         const execution: StepExecutionData = {
           type: 'mcp',
           stepIndex: 2,
-          executionParams: { name: 'search_records', input: { query: 'foo' } },
+          executionParams: { name: 'search_records', sourceId: 'mcp-server-1', input: { query: 'foo' } },
           executionResult: {
             success: true,
             toolResult: { items: [] },
@@ -84,7 +84,7 @@ describe('StepExecutionFormatters', () => {
         const execution: StepExecutionData = {
           type: 'mcp',
           stepIndex: 2,
-          executionParams: { name: 'search_records', input: { query: 'foo' } },
+          executionParams: { name: 'search_records', sourceId: 'mcp-server-1', input: { query: 'foo' } },
           executionResult: { success: true, toolResult: { items: [] } },
         };
 
@@ -97,7 +97,7 @@ describe('StepExecutionFormatters', () => {
         const execution: StepExecutionData = {
           type: 'mcp',
           stepIndex: 2,
-          pendingData: { name: 'search_records', input: {} },
+          pendingData: { name: 'search_records', sourceId: 'mcp-server-1', input: {} },
         };
 
         expect(StepExecutionFormatters.format(execution)).toBeNull();