ref(next-steps): Keep list_schemes manifest-driven after rebase

cameroncooke · claude · cameroncooke · commit 4e4e34d96069 · 2026-02-17T16:19:30.000Z
Move list_schemes back to manifest-driven next steps while preserving\nmainline guidance improvements for run intent and compile-only flows.\n\nUpdate the manifest ordering/labels, return dynamic nextStepParams from\nthe tool, align tests, and regenerate tool docs so rendered guidance\nmatches runtime behavior.

Co-Authored-By: Claude &lt;noreply@anthropic.com&gt;
diff --git a/docs/TOOLS-CLI.md b/docs/TOOLS-CLI.md
@@ -189,4 +189,4 @@ XcodeBuildMCP provides 73 canonical tools organized into 13 workflow groups.
 
 ---
 
-*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T21:53:02.251Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T22:19:28.295Z UTC*
diff --git a/docs/TOOLS.md b/docs/TOOLS.md
@@ -204,4 +204,4 @@ This document lists MCP tool names as exposed to MCP clients. XcodeBuildMCP prov
 
 ---
 
-*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T21:53:02.251Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T22:19:28.295Z UTC*
diff --git a/manifests/tools/list_schemes.yaml b/manifests/tools/list_schemes.yaml
@@ -11,9 +11,12 @@ nextSteps:
   - label: Build for macOS
     toolId: build_macos
     priority: 1
-  - label: Build for iOS Simulator
-    toolId: build_sim
+  - label: Build and run on iOS Simulator (default for run intent)
+    toolId: build_run_sim
     priority: 2
+  - label: Build for iOS Simulator (compile-only)
+    toolId: build_sim
+    priority: 3
   - label: Show build settings
     toolId: show_build_settings
-    priority: 3
+    priority: 4
diff --git a/src/mcp/tools/project-discovery/__tests__/list_schemes.test.ts b/src/mcp/tools/project-discovery/__tests__/list_schemes.test.ts
@@ -71,40 +71,20 @@ describe('list_schemes plugin', () => {
             text: 'Hint: Consider saving a default scheme with session-set-defaults { scheme: "MyProject" } to avoid repeating it.',
           },
         ],
-        nextSteps: [
-          {
-            tool: 'build_macos',
-            label: 'Build for macOS',
-            params: { projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyProject' },
-            priority: 1,
-          },
-          {
-            tool: 'build_run_sim',
-            label: 'Build and run on iOS Simulator (default for run intent)',
-            params: {
-              projectPath: '/path/to/MyProject.xcodeproj',
-              scheme: 'MyProject',
-              simulatorName: 'iPhone 16',
-            },
-            priority: 2,
+        nextStepParams: {
+          build_macos: { projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyProject' },
+          build_run_sim: {
+            projectPath: '/path/to/MyProject.xcodeproj',
+            scheme: 'MyProject',
+            simulatorName: 'iPhone 16',
           },
-          {
-            tool: 'build_sim',
-            label: 'Build for iOS Simulator (compile-only)',
-            params: {
-              projectPath: '/path/to/MyProject.xcodeproj',
-              scheme: 'MyProject',
-              simulatorName: 'iPhone 16',
-            },
-            priority: 3,
+          build_sim: {
+            projectPath: '/path/to/MyProject.xcodeproj',
+            scheme: 'MyProject',
+            simulatorName: 'iPhone 16',
           },
-          {
-            tool: 'show_build_settings',
-            label: 'Show build settings',
-            params: { projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyProject' },
-            priority: 4,
-          },
-        ],
+          show_build_settings: { projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyProject' },
+        },
         isError: false,
       });
     });
@@ -175,7 +155,6 @@ describe('list_schemes plugin', () => {
             text: '',
           },
         ],
-        nextSteps: [],
         isError: false,
       });
     });
@@ -319,40 +298,20 @@ describe('list_schemes plugin', () => {
             text: 'Hint: Consider saving a default scheme with session-set-defaults { scheme: "MyApp" } to avoid repeating it.',
           },
         ],
-        nextSteps: [
-          {
-            tool: 'build_macos',
-            label: 'Build for macOS',
-            params: { workspacePath: '/path/to/MyProject.xcworkspace', scheme: 'MyApp' },
-            priority: 1,
-          },
-          {
-            tool: 'build_run_sim',
-            label: 'Build and run on iOS Simulator (default for run intent)',
-            params: {
-              workspacePath: '/path/to/MyProject.xcworkspace',
-              scheme: 'MyApp',
-              simulatorName: 'iPhone 16',
-            },
-            priority: 2,
+        nextStepParams: {
+          build_macos: { workspacePath: '/path/to/MyProject.xcworkspace', scheme: 'MyApp' },
+          build_run_sim: {
+            workspacePath: '/path/to/MyProject.xcworkspace',
+            scheme: 'MyApp',
+            simulatorName: 'iPhone 16',
           },
-          {
-            tool: 'build_sim',
-            label: 'Build for iOS Simulator (compile-only)',
-            params: {
-              workspacePath: '/path/to/MyProject.xcworkspace',
-              scheme: 'MyApp',
-              simulatorName: 'iPhone 16',
-            },
-            priority: 3,
+          build_sim: {
+            workspacePath: '/path/to/MyProject.xcworkspace',
+            scheme: 'MyApp',
+            simulatorName: 'iPhone 16',
           },
-          {
-            tool: 'show_build_settings',
-            label: 'Show build settings',
-            params: { workspacePath: '/path/to/MyProject.xcworkspace', scheme: 'MyApp' },
-            priority: 4,
-          },
-        ],
+          show_build_settings: { workspacePath: '/path/to/MyProject.xcworkspace', scheme: 'MyApp' },
+        },
         isError: false,
       });
     });
diff --git a/src/mcp/tools/project-discovery/list_schemes.ts b/src/mcp/tools/project-discovery/list_schemes.ts
@@ -79,52 +79,27 @@ export async function listSchemesLogic(
     const schemeLines = schemesMatch[1].trim().split('\n');
     const schemes = schemeLines.map((line) => line.trim()).filter((line) => line);
 
-    // Prepare next steps with the first scheme if available
-    const nextSteps: Array<{
-      tool: string;
-      label: string;
-      params: Record<string, string | number | boolean>;
-      priority?: number;
-    }> = [];
+    // Prepare next-step params with the first scheme if available
+    let nextStepParams: Record<string, Record<string, string | number | boolean>> | undefined;
     let hintText = '';
 
     if (schemes.length > 0) {
       const firstScheme = schemes[0];
 
-      nextSteps.push(
-        {
-          tool: 'build_macos',
-          label: 'Build for macOS',
-          params: { [`${projectOrWorkspace}Path`]: path!, scheme: firstScheme },
-          priority: 1,
+      nextStepParams = {
+        build_macos: { [`${projectOrWorkspace}Path`]: path!, scheme: firstScheme },
+        build_run_sim: {
+          [`${projectOrWorkspace}Path`]: path!,
+          scheme: firstScheme,
+          simulatorName: 'iPhone 16',
         },
-        {
-          tool: 'build_run_sim',
-          label: 'Build and run on iOS Simulator (default for run intent)',
-          params: {
-            [`${projectOrWorkspace}Path`]: path!,
-            scheme: firstScheme,
-            simulatorName: 'iPhone 16',
-          },
-          priority: 2,
+        build_sim: {
+          [`${projectOrWorkspace}Path`]: path!,
+          scheme: firstScheme,
+          simulatorName: 'iPhone 16',
         },
-        {
-          tool: 'build_sim',
-          label: 'Build for iOS Simulator (compile-only)',
-          params: {
-            [`${projectOrWorkspace}Path`]: path!,
-            scheme: firstScheme,
-            simulatorName: 'iPhone 16',
-          },
-          priority: 3,
-        },
-        {
-          tool: 'show_build_settings',
-          label: 'Show build settings',
-          params: { [`${projectOrWorkspace}Path`]: path!, scheme: firstScheme },
-          priority: 4,
-        },
-      );
+        show_build_settings: { [`${projectOrWorkspace}Path`]: path!, scheme: firstScheme },
+      };
 
       hintText =
         `Hint: Consider saving a default scheme with session-set-defaults ` +
@@ -138,7 +113,7 @@ export async function listSchemesLogic(
 
     return {
       content,
-      nextSteps,
+      ...(nextStepParams ? { nextStepParams } : {}),
       isError: false,
     };
   } catch (error) {

Original file line number	Diff line number	Diff line change
`@@ -189,4 +189,4 @@ XcodeBuildMCP provides 73 canonical tools organized into 13 workflow groups.`
`189`	`189`
`190`	`190`	`---`
`191`	`191`
`192`		-This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T21:53:02.251Z UTC
	`192`	+This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T22:19:28.295Z UTC
Original file line number	Diff line number	Diff line change
`@@ -204,4 +204,4 @@ This document lists MCP tool names as exposed to MCP clients. XcodeBuildMCP prov`
`204`	`204`
`205`	`205`	`---`
`206`	`206`
`207`		-This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T21:53:02.251Z UTC
	`207`	+This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-16T22:19:28.295Z UTC