🐛 fix(cli): resolve correct tool via direct invocation instead of flat catalog lookup

CLI tool subcommands like `simulator list` were resolving to the wrong
handler because multiple workflows share the same CLI name (e.g. "list",
"build", "test"). The flat byCliName map meant last-inserted won.

Instead of re-resolving by name, pass the ToolDefinition directly from
the workflow-scoped yargs handler via a new invokeDirect() method. For
daemon wire communication, use mcpName (unique within the catalog) instead
of the ambiguous cliName.

Also skip the bridge availability check (xcrun --find mcpbridge) in CLI
mode since xcode-ide has availability.cli: false, avoiding an unwanted
Xcode authorization prompt.

Author: cameroncooke

src/cli/register-tool-commands.ts

@@ -175,7 +175,7 @@ function registerToolSubcommand(
       const args = { ...toolParams, ...jsonArgs };
 
       // Invoke the tool
-      const response = await invoker.invoke(tool.cliName, args, {
+      const response = await invoker.invokeDirect(tool, args, {
         runtime: 'cli',
         cliExposedWorkflowIds,
         socketPath,

src/runtime/__tests__/tool-invoker.test.ts

@@ -115,7 +115,7 @@ describe('DefaultToolInvoker CLI routing', () => {
         env: undefined,
       }),
     );
-    expect(daemonClientMock.invokeTool).toHaveBeenCalledWith('start-sim-log-cap', {
+    expect(daemonClientMock.invokeTool).toHaveBeenCalledWith('start_sim_log_cap', {
       value: 'hello',
     });
     expect(directHandler).not.toHaveBeenCalled();

src/runtime/tool-catalog.ts

@@ -12,7 +12,6 @@ import {
 } from '../visibility/exposure.ts';
 import { getConfig } from '../utils/config-store.ts';
 import { log } from '../utils/logging/index.ts';
-import { getMcpBridgeAvailability } from '../integrations/xcode-tools-bridge/core.ts';
 
 export function createToolCatalog(tools: ToolDefinition[]): ToolCatalog {
   // Build lookup maps for fast resolution, deduplicating by mcpName so that
@@ -232,12 +231,14 @@ export async function buildDaemonToolCatalogFromManifest(opts?: {
 }
 
 async function buildCliPredicateContext(): Promise<PredicateContext> {
-  const bridge = await getMcpBridgeAvailability();
+  // Skip bridge availability check in CLI mode — xcode-ide workflow has
+  // availability.cli: false so the bridge result is unused, and the
+  // xcrun --find mcpbridge call triggers an unwanted Xcode auth prompt.
   return {
     runtime: 'cli',
     config: getConfig(),
     runningUnderXcode: false,
     xcodeToolsActive: false,
-    xcodeToolsAvailable: bridge.available,
+    xcodeToolsAvailable: false,
   };
 }

src/runtime/tool-invoker.ts

@@ -1,4 +1,4 @@
-import type { ToolCatalog, ToolInvoker, InvokeOptions } from './types.ts';
+import type { ToolCatalog, ToolDefinition, ToolInvoker, InvokeOptions } from './types.ts';
 import type { ToolResponse } from '../types/common.ts';
 import { createErrorResponse } from '../utils/responses/index.ts';
 import { DaemonClient } from '../cli/daemon-client.ts';
@@ -64,8 +64,27 @@ export class DefaultToolInvoker implements ToolInvoker {
       );
     }
 
-    const tool = resolved.tool;
+    return this.executeTool(resolved.tool, args, opts);
+  }
 
+  /**
+   * Invoke a tool directly, bypassing catalog resolution.
+   * Used by CLI where the correct ToolDefinition is already known
+   * from workflow-scoped yargs routing.
+   */
+  async invokeDirect(
+    tool: ToolDefinition,
+    args: Record<string, unknown>,
+    opts: InvokeOptions,
+  ): Promise<ToolResponse> {
+    return this.executeTool(tool, args, opts);
+  }
+
+  private async executeTool(
+    tool: ToolDefinition,
+    args: Record<string, unknown>,
+    opts: InvokeOptions,
+  ): Promise<ToolResponse> {
     const xcodeIdeRemoteToolName = tool.xcodeIdeRemoteToolName;
     const isDynamicXcodeIdeTool =
       tool.workflow === 'xcode-ide' && typeof xcodeIdeRemoteToolName === 'string';
@@ -149,7 +168,7 @@ export class DefaultToolInvoker implements ToolInvoker {
         }
 
         try {
-          const response = await client.invokeTool(tool.cliName, args);
+          const response = await client.invokeTool(tool.mcpName, args);
           return opts.runtime === 'cli' ? enrichNextStepsForCli(response, this.catalog) : response;
         } catch (error) {
           return createErrorResponse(