feat(cli): add explicit CLI names to all tool manifests

cameroncooke · cameroncooke · commit b7683cdd7c62 · 2026-02-06T22:17:53.000Z
Add cli: names to all 70 tool manifests using human-friendly names
scoped by workflow namespace. Simple names (build, test, list) where
unique within a workflow; platform-qualified names
(start-device-log-capture, get-macos-bundle-id) only where tools
coexist in the same workflow and would otherwise clash.

Move tool catalog deduplication from the builder to the index maps
in createToolCatalog so shared tools still appear in every workflow
they belong to (for CLI grouping) while preventing ambiguous
resolution in the lookup indices.
diff --git a/manifests/tools/boot_sim.yaml b/manifests/tools/boot_sim.yaml
@@ -2,6 +2,7 @@ id: boot_sim
 module: mcp/tools/simulator/boot_sim
 names:
   mcp: boot_sim
+  cli: boot
 description: Boot iOS simulator.
 annotations:
   title: Boot Simulator
diff --git a/manifests/tools/build_device.yaml b/manifests/tools/build_device.yaml
@@ -2,6 +2,7 @@ id: build_device
 module: mcp/tools/device/build_device
 names:
   mcp: build_device
+  cli: build
 description: Build for device.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/build_macos.yaml b/manifests/tools/build_macos.yaml
@@ -2,6 +2,7 @@ id: build_macos
 module: mcp/tools/macos/build_macos
 names:
   mcp: build_macos
+  cli: build
 description: Build macOS app.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/build_run_macos.yaml b/manifests/tools/build_run_macos.yaml
@@ -2,6 +2,7 @@ id: build_run_macos
 module: mcp/tools/macos/build_run_macos
 names:
   mcp: build_run_macos
+  cli: build-and-run
 description: Build and run macOS app.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/build_run_sim.yaml b/manifests/tools/build_run_sim.yaml
@@ -2,6 +2,7 @@ id: build_run_sim
 module: mcp/tools/simulator/build_run_sim
 names:
   mcp: build_run_sim
+  cli: build-and-run
 description: Build and run iOS sim.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/build_sim.yaml b/manifests/tools/build_sim.yaml
@@ -2,6 +2,7 @@ id: build_sim
 module: mcp/tools/simulator/build_sim
 names:
   mcp: build_sim
+  cli: build
 description: Build for iOS sim.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/button.yaml b/manifests/tools/button.yaml
@@ -2,6 +2,7 @@ id: button
 module: mcp/tools/ui-automation/button
 names:
   mcp: button
+  cli: button
 description: Press simulator hardware button.
 annotations:
   title: Hardware Button
diff --git a/manifests/tools/clean.yaml b/manifests/tools/clean.yaml
@@ -2,6 +2,7 @@ id: clean
 module: mcp/tools/utilities/clean
 names:
   mcp: clean
+  cli: clean
 description: Clean build products.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/debug_attach_sim.yaml b/manifests/tools/debug_attach_sim.yaml
@@ -2,6 +2,7 @@ id: debug_attach_sim
 module: mcp/tools/debugging/debug_attach_sim
 names:
   mcp: debug_attach_sim
+  cli: attach
 description: Attach LLDB to sim app.
 routing:
   stateful: true
diff --git a/manifests/tools/debug_breakpoint_add.yaml b/manifests/tools/debug_breakpoint_add.yaml
@@ -2,6 +2,7 @@ id: debug_breakpoint_add
 module: mcp/tools/debugging/debug_breakpoint_add
 names:
   mcp: debug_breakpoint_add
+  cli: add-breakpoint
 description: Add breakpoint.
 routing:
   stateful: true
diff --git a/manifests/tools/debug_breakpoint_remove.yaml b/manifests/tools/debug_breakpoint_remove.yaml
@@ -2,6 +2,7 @@ id: debug_breakpoint_remove
 module: mcp/tools/debugging/debug_breakpoint_remove
 names:
   mcp: debug_breakpoint_remove
+  cli: remove-breakpoint
 description: Remove breakpoint.
 routing:
   stateful: true
diff --git a/manifests/tools/debug_continue.yaml b/manifests/tools/debug_continue.yaml
@@ -2,6 +2,7 @@ id: debug_continue
 module: mcp/tools/debugging/debug_continue
 names:
   mcp: debug_continue
+  cli: continue
 description: Continue debug session.
 routing:
   stateful: true
diff --git a/manifests/tools/debug_detach.yaml b/manifests/tools/debug_detach.yaml
@@ -2,6 +2,7 @@ id: debug_detach
 module: mcp/tools/debugging/debug_detach
 names:
   mcp: debug_detach
+  cli: detach
 description: Detach debugger.
 routing:
   stateful: true
diff --git a/manifests/tools/debug_lldb_command.yaml b/manifests/tools/debug_lldb_command.yaml
@@ -2,6 +2,7 @@ id: debug_lldb_command
 module: mcp/tools/debugging/debug_lldb_command
 names:
   mcp: debug_lldb_command
+  cli: lldb-command
 description: Run LLDB command.
 routing:
   stateful: true
diff --git a/manifests/tools/debug_stack.yaml b/manifests/tools/debug_stack.yaml
@@ -2,6 +2,7 @@ id: debug_stack
 module: mcp/tools/debugging/debug_stack
 names:
   mcp: debug_stack
+  cli: stack
 description: Get backtrace.
 routing:
   stateful: true
diff --git a/manifests/tools/debug_variables.yaml b/manifests/tools/debug_variables.yaml
@@ -2,6 +2,7 @@ id: debug_variables
 module: mcp/tools/debugging/debug_variables
 names:
   mcp: debug_variables
+  cli: variables
 description: Get frame variables.
 routing:
   stateful: true
diff --git a/manifests/tools/discover_projs.yaml b/manifests/tools/discover_projs.yaml
@@ -2,6 +2,7 @@ id: discover_projs
 module: mcp/tools/project-discovery/discover_projs
 names:
   mcp: discover_projs
+  cli: discover-projects
 description: Scans a directory (defaults to workspace root) to find Xcode project (.xcodeproj) and workspace (.xcworkspace) files.
 annotations:
   title: Discover Projects
diff --git a/manifests/tools/doctor.yaml b/manifests/tools/doctor.yaml
@@ -2,6 +2,7 @@ id: doctor
 module: mcp/tools/doctor/doctor
 names:
   mcp: doctor
+  cli: doctor
 description: MCP environment info.
 annotations:
   title: Doctor
diff --git a/manifests/tools/erase_sims.yaml b/manifests/tools/erase_sims.yaml
@@ -2,6 +2,7 @@ id: erase_sims
 module: mcp/tools/simulator-management/erase_sims
 names:
   mcp: erase_sims
+  cli: erase
 description: Erase simulator.
 annotations:
   title: Erase Simulators
diff --git a/manifests/tools/gesture.yaml b/manifests/tools/gesture.yaml
@@ -2,6 +2,7 @@ id: gesture
 module: mcp/tools/ui-automation/gesture
 names:
   mcp: gesture
+  cli: gesture
 description: Simulator gesture preset.
 annotations:
   title: Gesture
diff --git a/manifests/tools/get_app_bundle_id.yaml b/manifests/tools/get_app_bundle_id.yaml
@@ -2,6 +2,7 @@ id: get_app_bundle_id
 module: mcp/tools/project-discovery/get_app_bundle_id
 names:
   mcp: get_app_bundle_id
+  cli: get-app-bundle-id
 description: Extract bundle id from .app.
 annotations:
   title: Get App Bundle ID
diff --git a/manifests/tools/get_device_app_path.yaml b/manifests/tools/get_device_app_path.yaml
@@ -2,6 +2,7 @@ id: get_device_app_path
 module: mcp/tools/device/get_device_app_path
 names:
   mcp: get_device_app_path
+  cli: get-app-path
 description: Get device built app path.
 annotations:
   title: Get Device App Path
diff --git a/manifests/tools/get_mac_app_path.yaml b/manifests/tools/get_mac_app_path.yaml
@@ -2,6 +2,7 @@ id: get_mac_app_path
 module: mcp/tools/macos/get_mac_app_path
 names:
   mcp: get_mac_app_path
+  cli: get-app-path
 description: Get macOS built app path.
 annotations:
   title: Get macOS App Path
diff --git a/manifests/tools/get_mac_bundle_id.yaml b/manifests/tools/get_mac_bundle_id.yaml
@@ -2,6 +2,7 @@ id: get_mac_bundle_id
 module: mcp/tools/project-discovery/get_mac_bundle_id
 names:
   mcp: get_mac_bundle_id
+  cli: get-macos-bundle-id
 description: Extract bundle id from macOS .app.
 annotations:
   title: Get Mac Bundle ID
diff --git a/manifests/tools/get_sim_app_path.yaml b/manifests/tools/get_sim_app_path.yaml
@@ -2,6 +2,7 @@ id: get_sim_app_path
 module: mcp/tools/simulator/get_sim_app_path
 names:
   mcp: get_sim_app_path
+  cli: get-app-path
 description: Get sim built app path.
 annotations:
   title: Get Simulator App Path
diff --git a/manifests/tools/install_app_device.yaml b/manifests/tools/install_app_device.yaml
@@ -2,6 +2,7 @@ id: install_app_device
 module: mcp/tools/device/install_app_device
 names:
   mcp: install_app_device
+  cli: install
 description: Install app on device.
 annotations:
   title: Install App Device
diff --git a/manifests/tools/install_app_sim.yaml b/manifests/tools/install_app_sim.yaml
@@ -2,6 +2,7 @@ id: install_app_sim
 module: mcp/tools/simulator/install_app_sim
 names:
   mcp: install_app_sim
+  cli: install
 description: Install app on sim.
 annotations:
   title: Install App Simulator
diff --git a/manifests/tools/key_press.yaml b/manifests/tools/key_press.yaml
@@ -2,6 +2,7 @@ id: key_press
 module: mcp/tools/ui-automation/key_press
 names:
   mcp: key_press
+  cli: key-press
 description: Press key by keycode.
 annotations:
   title: Key Press
diff --git a/manifests/tools/key_sequence.yaml b/manifests/tools/key_sequence.yaml
@@ -2,6 +2,7 @@ id: key_sequence
 module: mcp/tools/ui-automation/key_sequence
 names:
   mcp: key_sequence
+  cli: key-sequence
 description: Press a sequence of keys by their keycodes.
 annotations:
   title: Key Sequence
diff --git a/manifests/tools/launch_app_device.yaml b/manifests/tools/launch_app_device.yaml
@@ -2,6 +2,7 @@ id: launch_app_device
 module: mcp/tools/device/launch_app_device
 names:
   mcp: launch_app_device
+  cli: launch
 description: Launch app on device.
 annotations:
   title: Launch App Device
diff --git a/manifests/tools/launch_app_logs_sim.yaml b/manifests/tools/launch_app_logs_sim.yaml
@@ -2,6 +2,7 @@ id: launch_app_logs_sim
 module: mcp/tools/simulator/launch_app_logs_sim
 names:
   mcp: launch_app_logs_sim
+  cli: launch-app-with-logs
 description: Launch sim app with logs.
 routing:
   stateful: true
diff --git a/manifests/tools/launch_app_sim.yaml b/manifests/tools/launch_app_sim.yaml
@@ -2,6 +2,7 @@ id: launch_app_sim
 module: mcp/tools/simulator/launch_app_sim
 names:
   mcp: launch_app_sim
+  cli: launch-app
 description: Launch app on simulator.
 annotations:
   title: Launch App Simulator
diff --git a/manifests/tools/launch_mac_app.yaml b/manifests/tools/launch_mac_app.yaml
@@ -2,6 +2,7 @@ id: launch_mac_app
 module: mcp/tools/macos/launch_mac_app
 names:
   mcp: launch_mac_app
+  cli: launch
 description: Launch macOS app.
 annotations:
   title: Launch macOS App
diff --git a/manifests/tools/list_devices.yaml b/manifests/tools/list_devices.yaml
@@ -2,6 +2,7 @@ id: list_devices
 module: mcp/tools/device/list_devices
 names:
   mcp: list_devices
+  cli: list
 description: List connected devices.
 annotations:
   title: List Devices
diff --git a/manifests/tools/list_schemes.yaml b/manifests/tools/list_schemes.yaml
@@ -2,6 +2,7 @@ id: list_schemes
 module: mcp/tools/project-discovery/list_schemes
 names:
   mcp: list_schemes
+  cli: list-schemes
 description: List Xcode schemes.
 annotations:
   title: List Schemes
diff --git a/manifests/tools/list_sims.yaml b/manifests/tools/list_sims.yaml
@@ -2,6 +2,7 @@ id: list_sims
 module: mcp/tools/simulator/list_sims
 names:
   mcp: list_sims
+  cli: list
 description: List iOS simulators.
 annotations:
   title: List Simulators
diff --git a/manifests/tools/long_press.yaml b/manifests/tools/long_press.yaml
@@ -2,6 +2,7 @@ id: long_press
 module: mcp/tools/ui-automation/long_press
 names:
   mcp: long_press
+  cli: long-press
 description: Long press at coords.
 annotations:
   title: Long Press
diff --git a/manifests/tools/manage_workflows.yaml b/manifests/tools/manage_workflows.yaml
@@ -2,6 +2,7 @@ id: manage_workflows
 module: mcp/tools/workflow-discovery/manage_workflows
 names:
   mcp: manage-workflows
+  cli: manage-workflows
 description: Workflows are groups of tools exposed by XcodeBuildMCP. By default, not all workflows (and therefore tools) are enabled; only simulator tools are enabled by default. Some workflows are mandatory and can't be disabled.
 availability:
-  cli: false
+  cli: true
diff --git a/manifests/tools/open_sim.yaml b/manifests/tools/open_sim.yaml
@@ -2,6 +2,7 @@ id: open_sim
 module: mcp/tools/simulator/open_sim
 names:
   mcp: open_sim
+  cli: open
 description: Open Simulator app.
 annotations:
   title: Open Simulator
diff --git a/manifests/tools/record_sim_video.yaml b/manifests/tools/record_sim_video.yaml
@@ -2,6 +2,7 @@ id: record_sim_video
 module: mcp/tools/simulator/record_sim_video
 names:
   mcp: record_sim_video
+  cli: record-video
 description: Record sim video.
 routing:
   stateful: true
diff --git a/manifests/tools/reset_sim_location.yaml b/manifests/tools/reset_sim_location.yaml
@@ -2,6 +2,7 @@ id: reset_sim_location
 module: mcp/tools/simulator-management/reset_sim_location
 names:
   mcp: reset_sim_location
+  cli: reset-location
 description: Reset sim location.
 annotations:
   title: Reset Simulator Location
diff --git a/manifests/tools/scaffold_ios_project.yaml b/manifests/tools/scaffold_ios_project.yaml
@@ -2,6 +2,7 @@ id: scaffold_ios_project
 module: mcp/tools/project-scaffolding/scaffold_ios_project
 names:
   mcp: scaffold_ios_project
+  cli: scaffold-ios
 description: Scaffold iOS project.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/scaffold_macos_project.yaml b/manifests/tools/scaffold_macos_project.yaml
@@ -2,6 +2,7 @@ id: scaffold_macos_project
 module: mcp/tools/project-scaffolding/scaffold_macos_project
 names:
   mcp: scaffold_macos_project
+  cli: scaffold-macos
 description: Scaffold macOS project.
 predicates:
   - hideWhenXcodeAgentMode
diff --git a/manifests/tools/screenshot.yaml b/manifests/tools/screenshot.yaml
@@ -2,6 +2,7 @@ id: screenshot
 module: mcp/tools/ui-automation/screenshot
 names:
   mcp: screenshot
+  cli: screenshot
 description: Capture screenshot.
 annotations:
   title: Screenshot
diff --git a/manifests/tools/session_clear_defaults.yaml b/manifests/tools/session_clear_defaults.yaml
@@ -2,9 +2,8 @@ id: session_clear_defaults
 module: mcp/tools/session-management/session_clear_defaults
 names:
   mcp: session_clear_defaults
+  cli: clear-defaults
 description: Clear session defaults.
-availability:
-  cli: false
 annotations:
   title: Clear Session Defaults
   destructiveHint: true
diff --git a/manifests/tools/session_set_defaults.yaml b/manifests/tools/session_set_defaults.yaml
@@ -2,9 +2,8 @@ id: session_set_defaults
 module: mcp/tools/session-management/session_set_defaults
 names:
   mcp: session_set_defaults
+  cli: set-defaults
 description: Set the session defaults, should be called at least once to set tool defaults.
-availability:
-  cli: false
 annotations:
   title: Set Session Defaults
   destructiveHint: true
diff --git a/manifests/tools/session_show_defaults.yaml b/manifests/tools/session_show_defaults.yaml
@@ -2,9 +2,8 @@ id: session_show_defaults
 module: mcp/tools/session-management/session_show_defaults
 names:
   mcp: session_show_defaults
+  cli: show-defaults
 description: Show session defaults.
-availability:
-  cli: false
 annotations:
   title: Show Session Defaults
   readOnlyHint: true
diff --git a/manifests/tools/set_sim_appearance.yaml b/manifests/tools/set_sim_appearance.yaml
@@ -2,6 +2,7 @@ id: set_sim_appearance
 module: mcp/tools/simulator-management/set_sim_appearance
 names:
   mcp: set_sim_appearance
+  cli: set-appearance
 description: Set sim appearance.
 annotations:
   title: Set Simulator Appearance
diff --git a/manifests/tools/set_sim_location.yaml b/manifests/tools/set_sim_location.yaml
diff --git a/manifests/tools/show_build_settings.yaml b/manifests/tools/show_build_settings.yaml
diff --git a/manifests/tools/sim_statusbar.yaml b/manifests/tools/sim_statusbar.yaml
diff --git a/manifests/tools/snapshot_ui.yaml b/manifests/tools/snapshot_ui.yaml
diff --git a/manifests/tools/start_device_log_cap.yaml b/manifests/tools/start_device_log_cap.yaml
diff --git a/manifests/tools/start_sim_log_cap.yaml b/manifests/tools/start_sim_log_cap.yaml
diff --git a/manifests/tools/stop_app_device.yaml b/manifests/tools/stop_app_device.yaml
diff --git a/manifests/tools/stop_app_sim.yaml b/manifests/tools/stop_app_sim.yaml
diff --git a/manifests/tools/stop_device_log_cap.yaml b/manifests/tools/stop_device_log_cap.yaml
diff --git a/manifests/tools/stop_mac_app.yaml b/manifests/tools/stop_mac_app.yaml
diff --git a/manifests/tools/stop_sim_log_cap.yaml b/manifests/tools/stop_sim_log_cap.yaml
diff --git a/manifests/tools/swipe.yaml b/manifests/tools/swipe.yaml
diff --git a/manifests/tools/sync_xcode_defaults.yaml b/manifests/tools/sync_xcode_defaults.yaml
diff --git a/manifests/tools/tap.yaml b/manifests/tools/tap.yaml
diff --git a/manifests/tools/test_device.yaml b/manifests/tools/test_device.yaml
diff --git a/manifests/tools/test_macos.yaml b/manifests/tools/test_macos.yaml
diff --git a/manifests/tools/test_sim.yaml b/manifests/tools/test_sim.yaml
diff --git a/manifests/tools/touch.yaml b/manifests/tools/touch.yaml
diff --git a/manifests/tools/type_text.yaml b/manifests/tools/type_text.yaml
diff --git a/manifests/tools/xcode_tools_bridge_disconnect.yaml b/manifests/tools/xcode_tools_bridge_disconnect.yaml
diff --git a/manifests/tools/xcode_tools_bridge_status.yaml b/manifests/tools/xcode_tools_bridge_status.yaml
diff --git a/manifests/tools/xcode_tools_bridge_sync.yaml b/manifests/tools/xcode_tools_bridge_sync.yaml
diff --git a/src/runtime/tool-catalog.ts b/src/runtime/tool-catalog.ts
