refactor(cli): use manifest-declared CLI names instead of prefix stripping

- Add explicit cli: names to 6 swift-package manifests
- Remove getBaseToolName() from output.ts and register-tool-commands.ts
- Remove global CLI name uniqueness check from loadManifest

Author: cameroncooke

manifests/tools/swift_package_build.yaml

@@ -2,6 +2,7 @@ id: swift_package_build
 module: mcp/tools/swift-package/swift_package_build
 names:
   mcp: swift_package_build
+  cli: build
 description: swift package target build.
 predicates:
   - hideWhenXcodeAgentMode

manifests/tools/swift_package_clean.yaml

@@ -2,6 +2,7 @@ id: swift_package_clean
 module: mcp/tools/swift-package/swift_package_clean
 names:
   mcp: swift_package_clean
+  cli: clean
 description: swift package clean.
 annotations:
   title: Swift Package Clean

manifests/tools/swift_package_list.yaml

@@ -2,6 +2,7 @@ id: swift_package_list
 module: mcp/tools/swift-package/swift_package_list
 names:
   mcp: swift_package_list
+  cli: list
 description: List SwiftPM processes.
 routing:
   stateful: true

manifests/tools/swift_package_run.yaml

@@ -2,6 +2,7 @@ id: swift_package_run
 module: mcp/tools/swift-package/swift_package_run
 names:
   mcp: swift_package_run
+  cli: run
 description: swift package target run.
 routing:
   stateful: true

manifests/tools/swift_package_stop.yaml

@@ -2,6 +2,7 @@ id: swift_package_stop
 module: mcp/tools/swift-package/swift_package_stop
 names:
   mcp: swift_package_stop
+  cli: stop
 description: Stop SwiftPM run.
 routing:
   stateful: true

manifests/tools/swift_package_test.yaml

@@ -2,6 +2,7 @@ id: swift_package_test
 module: mcp/tools/swift-package/swift_package_test
 names:
   mcp: swift_package_test
+  cli: test
 description: Run swift package target tests.
 predicates:
   - hideWhenXcodeAgentMode

src/cli/output.ts

@@ -52,18 +52,6 @@ function printToolResponseText(response: ToolResponse): void {
   }
 }
 
-/**
- * Get the base tool name without workflow prefix.
- * For disambiguated tools, strips the workflow prefix.
- */
-function getBaseToolName(cliName: string, workflow: string): string {
-  const prefix = `${workflow}-`;
-  if (cliName.startsWith(prefix)) {
-    return cliName.slice(prefix.length);
-  }
-  return cliName;
-}
-
 /**
  * Format a tool list for display.
  */
@@ -74,7 +62,6 @@ export function formatToolList(
   const lines: string[] = [];
 
   if (options.grouped) {
-    // Group by workflow - show subcommand names
     const byWorkflow = new Map<string, typeof tools>();
     for (const tool of tools) {
       const existing = byWorkflow.get(tool.workflow) ?? [];
@@ -85,37 +72,28 @@ export function formatToolList(
     for (const workflow of sortedWorkflows) {
       lines.push(`\n${workflow}:`);
       const workflowTools = byWorkflow.get(workflow) ?? [];
-      // Sort by base name (without prefix)
-      const sortedTools = workflowTools.sort((a, b) => {
-        const aBase = getBaseToolName(a.cliName, a.workflow);
-        const bBase = getBaseToolName(b.cliName, b.workflow);
-        return aBase.localeCompare(bBase);
-      });
+      const sortedTools = workflowTools.sort((a, b) => a.cliName.localeCompare(b.cliName));
 
       for (const tool of sortedTools) {
-        // Show subcommand name (without workflow prefix)
-        const toolName = getBaseToolName(tool.cliName, tool.workflow);
         const statefulMarker = tool.stateful ? ' [stateful]' : '';
         if (options.verbose && tool.description) {
-          lines.push(`  ${toolName}${statefulMarker}`);
+          lines.push(`  ${tool.cliName}${statefulMarker}`);
           lines.push(`    ${tool.description}`);
         } else {
           const desc = tool.description ? ` - ${truncate(tool.description, 60)}` : '';
-          lines.push(`  ${toolName}${statefulMarker}${desc}`);
+          lines.push(`  ${tool.cliName}${statefulMarker}${desc}`);
         }
       }
     }
   } else {
-    // Flat list - show full workflow-scoped command
     const sortedTools = [...tools].sort((a, b) => {
-      const aFull = `${a.workflow} ${getBaseToolName(a.cliName, a.workflow)}`;
-      const bFull = `${b.workflow} ${getBaseToolName(b.cliName, b.workflow)}`;
+      const aFull = `${a.workflow} ${a.cliName}`;
+      const bFull = `${b.workflow} ${b.cliName}`;
       return aFull.localeCompare(bFull);
     });
 
     for (const tool of sortedTools) {
-      const toolName = getBaseToolName(tool.cliName, tool.workflow);
-      const fullCommand = `${tool.workflow} ${toolName}`;
+      const fullCommand = `${tool.workflow} ${tool.cliName}`;
       const statefulMarker = tool.stateful ? ' [stateful]' : '';
       if (options.verbose && tool.description) {
         lines.push(`${fullCommand}${statefulMarker}`);

src/cli/register-tool-commands.ts

@@ -95,8 +95,7 @@ function registerToolSubcommand(
   const yargsOptions = schemaToYargsOptions(tool.cliSchema);
   const unsupportedKeys = getUnsupportedSchemaKeys(tool.cliSchema);
 
-  // Use the base CLI name without workflow prefix since it's already scoped
-  const commandName = getBaseToolName(tool);
+  const commandName = tool.cliName;
 
   yargs.command(
     commandName,
@@ -188,15 +187,3 @@ function registerToolSubcommand(
     },
   );
 }
-
-/**
- * Get the base tool name without any workflow prefix.
- * For tools that were disambiguated with workflow prefix, strip it.
- */
-function getBaseToolName(tool: ToolDefinition): string {
-  const prefix = `${tool.workflow}-`;
-  if (tool.cliName.startsWith(prefix)) {
-    return tool.cliName.slice(prefix.length);
-  }
-  return tool.cliName;
-}

src/core/manifest/load-manifest.ts

@@ -13,7 +13,6 @@ import {
   type ToolManifestEntry,
   type WorkflowManifestEntry,
   type ResolvedManifest,
-  getEffectiveCliName,
 } from './schema.ts';
 
 // Re-export types for consumers
@@ -226,20 +225,6 @@ export function loadManifest(): ResolvedManifest {
     mcpNames.set(tool.names.mcp, toolId);
   }
 
-  // Validate CLI name uniqueness (after derivation)
-  const cliNames = new Map<string, string>(); // cliName -> toolId
-  for (const [toolId, tool] of tools) {
-    const cliName = getEffectiveCliName(tool);
-    const existing = cliNames.get(cliName);
-    if (existing) {
-      throw new ManifestValidationError(
-        `Duplicate CLI name '${cliName}' used by tools '${existing}' and '${toolId}'. ` +
-          `Set explicit 'names.cli' in one of the tool manifests to resolve.`,
-      );
-    }
-    cliNames.set(cliName, toolId);
-  }
-
   return { tools, workflows };
 }