fix: resolve PR inline next-step template issues

cameroncooke · cameroncooke · commit 28b7b3441bc5 · 2026-02-16T22:46:10.000Z
diff --git a/src/mcp/tools/project-scaffolding/__tests__/scaffold_ios_project.test.ts b/src/mcp/tools/project-scaffolding/__tests__/scaffold_ios_project.test.ts
@@ -373,6 +373,18 @@ describe('scaffold_ios_project plugin', () => {
             ),
           },
         ],
+        nextStepParams: {
+          build_sim: {
+            workspacePath: '/tmp/test-projects/TestIOSApp.xcworkspace',
+            scheme: 'TestIOSApp',
+            simulatorName: 'iPhone 16',
+          },
+          build_run_sim: {
+            workspacePath: '/tmp/test-projects/TestIOSApp.xcworkspace',
+            scheme: 'TestIOSApp',
+            simulatorName: 'iPhone 16',
+          },
+        },
       });
     });
 
@@ -411,6 +423,18 @@ describe('scaffold_ios_project plugin', () => {
             ),
           },
         ],
+        nextStepParams: {
+          build_sim: {
+            workspacePath: '/tmp/test-projects/TestIOSApp.xcworkspace',
+            scheme: 'TestIOSApp',
+            simulatorName: 'iPhone 16',
+          },
+          build_run_sim: {
+            workspacePath: '/tmp/test-projects/TestIOSApp.xcworkspace',
+            scheme: 'TestIOSApp',
+            simulatorName: 'iPhone 16',
+          },
+        },
       });
     });
 
@@ -441,6 +465,18 @@ describe('scaffold_ios_project plugin', () => {
             ),
           },
         ],
+        nextStepParams: {
+          build_sim: {
+            workspacePath: '/tmp/test-projects/MyProject.xcworkspace',
+            scheme: 'MyProject',
+            simulatorName: 'iPhone 16',
+          },
+          build_run_sim: {
+            workspacePath: '/tmp/test-projects/MyProject.xcworkspace',
+            scheme: 'MyProject',
+            simulatorName: 'iPhone 16',
+          },
+        },
       });
     });
 
diff --git a/src/mcp/tools/project-scaffolding/__tests__/scaffold_macos_project.test.ts b/src/mcp/tools/project-scaffolding/__tests__/scaffold_macos_project.test.ts
@@ -249,6 +249,16 @@ describe('scaffold_macos_project plugin', () => {
             ),
           },
         ],
+        nextStepParams: {
+          build_macos: {
+            workspacePath: '/tmp/test-projects/TestMacApp.xcworkspace',
+            scheme: 'TestMacApp',
+          },
+          build_run_macos: {
+            workspacePath: '/tmp/test-projects/TestMacApp.xcworkspace',
+            scheme: 'TestMacApp',
+          },
+        },
       });
 
       // Verify template manager calls using manual tracking
@@ -284,6 +294,16 @@ describe('scaffold_macos_project plugin', () => {
             ),
           },
         ],
+        nextStepParams: {
+          build_macos: {
+            workspacePath: '/tmp/test-projects/MyProject.xcworkspace',
+            scheme: 'MyProject',
+          },
+          build_run_macos: {
+            workspacePath: '/tmp/test-projects/MyProject.xcworkspace',
+            scheme: 'MyProject',
+          },
+        },
       });
     });
 
diff --git a/src/mcp/tools/project-scaffolding/scaffold_ios_project.ts b/src/mcp/tools/project-scaffolding/scaffold_ios_project.ts
@@ -358,6 +358,9 @@ export async function scaffold_ios_projectLogic(
     const projectParams = { ...params, platform: 'iOS' };
     const projectPath = await scaffoldProject(projectParams, commandExecutor, fileSystemExecutor);
 
+    const generatedProjectName = params.customizeNames === false ? 'MyProject' : params.projectName;
+    const workspacePath = `${projectPath}/${generatedProjectName}.xcworkspace`;
+
     const response = {
       success: true,
       projectPath,
@@ -372,6 +375,18 @@ export async function scaffold_ios_projectLogic(
           text: JSON.stringify(response, null, 2),
         },
       ],
+      nextStepParams: {
+        build_sim: {
+          workspacePath,
+          scheme: generatedProjectName,
+          simulatorName: 'iPhone 16',
+        },
+        build_run_sim: {
+          workspacePath,
+          scheme: generatedProjectName,
+          simulatorName: 'iPhone 16',
+        },
+      },
     };
   } catch (error) {
     log(
diff --git a/src/mcp/tools/project-scaffolding/scaffold_macos_project.ts b/src/mcp/tools/project-scaffolding/scaffold_macos_project.ts
@@ -332,6 +332,9 @@ export async function scaffold_macos_projectLogic(
     const projectParams = { ...params, platform: 'macOS' as const };
     const projectPath = await scaffoldProject(projectParams, commandExecutor, fileSystemExecutor);
 
+    const generatedProjectName = params.customizeNames === false ? 'MyProject' : params.projectName;
+    const workspacePath = `${projectPath}/${generatedProjectName}.xcworkspace`;
+
     const response = {
       success: true,
       projectPath,
@@ -346,6 +349,16 @@ export async function scaffold_macos_projectLogic(
           text: JSON.stringify(response, null, 2),
         },
       ],
+      nextStepParams: {
+        build_macos: {
+          workspacePath,
+          scheme: generatedProjectName,
+        },
+        build_run_macos: {
+          workspacePath,
+          scheme: generatedProjectName,
+        },
+      },
     };
   } catch (error) {
     log(
diff --git a/src/runtime/__tests__/tool-invoker.test.ts b/src/runtime/__tests__/tool-invoker.test.ts
@@ -370,6 +370,59 @@ describe('DefaultToolInvoker next steps post-processing', () => {
     ]);
   });
 
+  it('maps dynamic params to the correct template tool after catalog filtering', async () => {
+    const directHandler = vi.fn().mockResolvedValue({
+      content: [{ type: 'text', text: 'ok' }],
+      nextStepParams: {
+        stop_sim_log_cap: { logSessionId: 'session-123' },
+      },
+    } satisfies ToolResponse);
+
+    const catalog = createToolCatalog([
+      makeTool({
+        id: 'start_sim_log_cap',
+        cliName: 'start-simulator-log-capture',
+        mcpName: 'start_sim_log_cap',
+        workflow: 'logging',
+        stateful: false,
+        nextStepTemplates: [
+          {
+            label: 'Unavailable step',
+            toolId: 'missing_tool',
+          },
+          {
+            label: 'Stop capture and retrieve logs',
+            toolId: 'stop_sim_log_cap',
+            priority: 1,
+          },
+        ],
+        handler: directHandler,
+      }),
+      makeTool({
+        id: 'stop_sim_log_cap',
+        cliName: 'stop-simulator-log-capture',
+        mcpName: 'stop_sim_log_cap',
+        workflow: 'logging',
+        stateful: true,
+        handler: vi.fn().mockResolvedValue(textResponse('stop')),
+      }),
+    ]);
+
+    const invoker = new DefaultToolInvoker(catalog);
+    const response = await invoker.invoke('start-simulator-log-capture', {}, { runtime: 'cli' });
+
+    expect(response.nextSteps).toEqual([
+      {
+        tool: 'stop_sim_log_cap',
+        label: 'Stop capture and retrieve logs',
+        params: { logSessionId: 'session-123' },
+        priority: 1,
+        workflow: 'logging',
+        cliTool: 'stop-simulator-log-capture',
+      },
+    ]);
+  });
+
   it('keeps tool-provided next steps when template count does not match', async () => {
     const directHandler = vi.fn().mockResolvedValue({
       content: [{ type: 'text', text: 'ok' }],
diff --git a/src/runtime/tool-invoker.ts b/src/runtime/tool-invoker.ts
@@ -43,21 +43,28 @@ function resolveTemplateParams(
   return resolved;
 }
 
+type BuiltTemplateNextStep = {
+  step: NextStep;
+  templateToolId?: string;
+};
+
 function buildTemplateNextSteps(
   tool: ToolDefinition,
   args: Record<string, unknown>,
   catalog: ToolCatalog,
-): NextStep[] {
+): BuiltTemplateNextStep[] {
   if (!tool.nextStepTemplates || tool.nextStepTemplates.length === 0) {
     return [];
   }
 
-  const built: NextStep[] = [];
+  const built: BuiltTemplateNextStep[] = [];
   for (const template of tool.nextStepTemplates) {
     if (!template.toolId) {
       built.push({
-        label: template.label,
-        priority: template.priority,
+        step: {
+          label: template.label,
+          priority: template.priority,
+        },
       });
       continue;
     }
@@ -68,10 +75,13 @@ function buildTemplateNextSteps(
     }
 
     built.push({
-      tool: target.mcpName,
-      label: template.label,
-      params: resolveTemplateParams(template.params ?? {}, args),
-      priority: template.priority,
+      step: {
+        tool: target.mcpName,
+        label: template.label,
+        params: resolveTemplateParams(template.params ?? {}, args),
+        priority: template.priority,
+      },
+      templateToolId: template.toolId,
     });
   }
 
@@ -102,21 +112,27 @@ function consumeDynamicParams(
 }
 
 function mergeTemplateAndResponseNextSteps(
-  tool: ToolDefinition,
-  templateSteps: NextStep[],
+  templateSteps: BuiltTemplateNextStep[],
   responseParamsMap: NextStepParamsMap | undefined,
   responseSteps: NextStep[] | undefined,
 ): NextStep[] {
   const consumedCounts = new Map<string, number>();
-  const templates = tool.nextStepTemplates ?? [];
 
-  return templateSteps.map((templateStep, index) => {
-    const template = templates[index];
-    if (!template?.toolId || !templateStep.tool || hasTemplateParams(templateStep)) {
+  return templateSteps.map((builtTemplateStep, index) => {
+    const templateStep = builtTemplateStep.step;
+    if (
+      !builtTemplateStep.templateToolId ||
+      !templateStep.tool ||
+      hasTemplateParams(templateStep)
+    ) {
       return templateStep;
     }
 
-    const paramsFromMap = consumeDynamicParams(responseParamsMap, template.toolId, consumedCounts);
+    const paramsFromMap = consumeDynamicParams(
+      responseParamsMap,
+      builtTemplateStep.templateToolId,
+      consumedCounts,
+    );
     if (paramsFromMap) {
       return {
         ...templateStep,
@@ -192,7 +208,6 @@ function postProcessToolResponse(params: {
     ? {
         ...response,
         nextSteps: mergeTemplateAndResponseNextSteps(
-          tool,
           templateSteps,
           response.nextStepParams,
           response.nextSteps,
diff --git a/src/test-utils/next-step-assertions.ts b/src/test-utils/next-step-assertions.ts
