ref(xcode-ide): Simplify bridge tool handler wiring

Extract shared bridge handler lookup so xcode-ide tools follow one path\nfor bridge availability and fallback behavior.\n\nExtract shared remote tool serialization used by both manager and\nstandalone bridge implementations to reduce duplication and drift.\n\nUpdate bridge tool tests/mocks to align with shared exports and keep\ncoverage around standalone fallback behavior.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: cameroncooke

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-15T19:38:41.303Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-15T21:09:48.107Z UTC*

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-15T19:38:41.303Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-02-15T21:09:48.107Z UTC*

src/integrations/xcode-tools-bridge/core.ts

@@ -1,6 +1,7 @@
 import { execFile } from 'node:child_process';
 import process from 'node:process';
 import { promisify } from 'node:util';
+import type { Tool } from '@modelcontextprotocol/sdk/types.js';
 import type { XcodeToolsBridgeClientStatus } from './client.ts';
 
 const execFileAsync = promisify(execFile);
@@ -18,6 +19,17 @@ export type XcodeToolsBridgeStatus = {
   xcodeSessionId: string | null;
 };
 
+export function serializeBridgeTool(tool: Tool): Record<string, unknown> {
+  return {
+    name: tool.name,
+    title: tool.title,
+    description: tool.description,
+    inputSchema: tool.inputSchema,
+    outputSchema: tool.outputSchema,
+    annotations: tool.annotations,
+  };
+}
+
 export interface BuildXcodeToolsBridgeStatusArgs {
   workflowEnabled: boolean;
   proxiedToolCount: number;

src/integrations/xcode-tools-bridge/manager.ts

@@ -1,5 +1,4 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { Tool } from '@modelcontextprotocol/sdk/types.js';
 import { log } from '../../utils/logger.ts';
 import {
   createErrorResponse,
@@ -11,6 +10,7 @@ import {
   buildXcodeToolsBridgeStatus,
   classifyBridgeError,
   getMcpBridgeAvailability,
+  serializeBridgeTool,
   type XcodeToolsBridgeStatus,
 } from './core.ts';
 import { XcodeIdeToolService } from './tool-service.ts';
@@ -160,7 +160,7 @@ export class XcodeToolsBridgeManager {
       const tools = await this.service.listTools({ refresh: params.refresh !== false });
       const payload = {
         toolCount: tools.length,
-        tools: tools.map((tool) => this.serializeTool(tool)),
+        tools: tools.map(serializeBridgeTool),
       };
       return createTextResponse(JSON.stringify(payload, null, 2));
     } catch (error) {
@@ -200,17 +200,6 @@ export class XcodeToolsBridgeManager {
     }
   }
 
-  private serializeTool(tool: Tool): Record<string, unknown> {
-    return {
-      name: tool.name,
-      title: tool.title,
-      description: tool.description,
-      inputSchema: tool.inputSchema,
-      outputSchema: tool.outputSchema,
-      annotations: tool.annotations,
-    };
-  }
-
   private createBridgeFailureResponse(code: string, error: unknown): ToolResponse {
     const message = error instanceof Error ? error.message : String(error);
     return createErrorResponse(code, message);

src/integrations/xcode-tools-bridge/standalone.ts

@@ -3,10 +3,10 @@ import {
   createTextResponse,
   type ToolResponse,
 } from '../../utils/responses/index.ts';
-import type { Tool } from '@modelcontextprotocol/sdk/types.js';
 import {
   buildXcodeToolsBridgeStatus,
   classifyBridgeError,
+  serializeBridgeTool,
   type XcodeToolsBridgeStatus,
 } from './core.ts';
 import { XcodeIdeToolService } from './tool-service.ts';
@@ -75,7 +75,7 @@ export class StandaloneXcodeToolsBridge {
         JSON.stringify(
           {
             toolCount: tools.length,
-            tools: tools.map((tool) => this.serializeTool(tool)),
+            tools: tools.map(serializeBridgeTool),
           },
           null,
           2,
@@ -102,15 +102,4 @@ export class StandaloneXcodeToolsBridge {
       return createErrorResponse(classifyBridgeError(error, 'call'), message);
     }
   }
-
-  private serializeTool(tool: Tool): Record<string, unknown> {
-    return {
-      name: tool.name,
-      title: tool.title,
-      description: tool.description,
-      inputSchema: tool.inputSchema,
-      outputSchema: tool.outputSchema,
-      annotations: tool.annotations,
-    };
-  }
 }

src/mcp/tools/xcode-ide/__tests__/bridge_tools.test.ts

@@ -6,7 +6,9 @@ vi.mock('../../../../server/server-state.ts', () => ({
 
 vi.mock('../../../../integrations/xcode-tools-bridge/core.ts', () => ({
   buildXcodeToolsBridgeStatus: vi.fn(),
+  classifyBridgeError: vi.fn(() => 'XCODE_MCP_UNAVAILABLE'),
   getMcpBridgeAvailability: vi.fn(),
+  serializeBridgeTool: vi.fn((tool) => tool),
 }));
 
 const clientMocks = {

src/mcp/tools/xcode-ide/shared.ts

@@ -0,0 +1,15 @@
+import type { ToolResponse } from '../../../types/common.ts';
+import type { XcodeToolsBridgeToolHandler } from '../../../integrations/xcode-tools-bridge/index.ts';
+import { getServer } from '../../../server/server-state.ts';
+import { getXcodeToolsBridgeToolHandler } from '../../../integrations/xcode-tools-bridge/index.ts';
+import { createErrorResponse } from '../../../utils/responses/index.ts';
+
+export async function withBridgeToolHandler(
+  callback: (bridge: XcodeToolsBridgeToolHandler) => Promise<ToolResponse>,
+): Promise<ToolResponse> {
+  const bridge = getXcodeToolsBridgeToolHandler(getServer());
+  if (!bridge) {
+    return createErrorResponse('Bridge unavailable', 'Unable to initialize xcode tools bridge');
+  }
+  return callback(bridge);
+}

src/mcp/tools/xcode-ide/xcode_ide_call_tool.ts

@@ -1,8 +1,7 @@
 import * as z from 'zod';
 import type { ToolResponse } from '../../../types/common.ts';
-import { getServer } from '../../../server/server-state.ts';
-import { getXcodeToolsBridgeToolHandler } from '../../../integrations/xcode-tools-bridge/index.ts';
 import { createErrorResponse } from '../../../utils/responses/index.ts';
+import { withBridgeToolHandler } from './shared.ts';
 
 const schemaObject = z.object({
   remoteTool: z.string().min(1).describe('Exact remote Xcode MCP tool name.'),
@@ -23,16 +22,13 @@ const schemaObject = z.object({
 type Params = z.infer<typeof schemaObject>;
 
 export async function xcodeIdeCallToolLogic(params: Params): Promise<ToolResponse> {
-  const bridge = getXcodeToolsBridgeToolHandler(getServer());
-  if (!bridge) {
-    return createErrorResponse('Bridge unavailable', 'Unable to initialize xcode tools bridge');
-  }
-
-  return bridge.callToolTool({
-    remoteTool: params.remoteTool,
-    arguments: params.arguments ?? {},
-    timeoutMs: params.timeoutMs,
-  });
+  return withBridgeToolHandler((bridge) =>
+    bridge.callToolTool({
+      remoteTool: params.remoteTool,
+      arguments: params.arguments ?? {},
+      timeoutMs: params.timeoutMs,
+    }),
+  );
 }
 
 export const schema = schemaObject.shape;

src/mcp/tools/xcode-ide/xcode_ide_list_tools.ts

@@ -1,8 +1,7 @@
 import * as z from 'zod';
 import type { ToolResponse } from '../../../types/common.ts';
-import { getServer } from '../../../server/server-state.ts';
-import { getXcodeToolsBridgeToolHandler } from '../../../integrations/xcode-tools-bridge/index.ts';
 import { createErrorResponse } from '../../../utils/responses/index.ts';
+import { withBridgeToolHandler } from './shared.ts';
 
 const schemaObject = z.object({
   refresh: z
@@ -14,11 +13,7 @@ const schemaObject = z.object({
 type Params = z.infer<typeof schemaObject>;
 
 export async function xcodeIdeListToolsLogic(params: Params): Promise<ToolResponse> {
-  const bridge = getXcodeToolsBridgeToolHandler(getServer());
-  if (!bridge) {
-    return createErrorResponse('Bridge unavailable', 'Unable to initialize xcode tools bridge');
-  }
-  return bridge.listToolsTool({ refresh: params.refresh });
+  return withBridgeToolHandler(async (bridge) => bridge.listToolsTool({ refresh: params.refresh }));
 }
 
 export const schema = schemaObject.shape;

src/mcp/tools/xcode-ide/xcode_tools_bridge_disconnect.ts

@@ -1,14 +1,8 @@
 import type { ToolResponse } from '../../../types/common.ts';
-import { getServer } from '../../../server/server-state.ts';
-import { getXcodeToolsBridgeToolHandler } from '../../../integrations/xcode-tools-bridge/index.ts';
-import { createErrorResponse } from '../../../utils/responses/index.ts';
+import { withBridgeToolHandler } from './shared.ts';
 
 export const schema = {};
 
 export const handler = async (): Promise<ToolResponse> => {
-  const bridge = getXcodeToolsBridgeToolHandler(getServer());
-  if (!bridge) {
-    return createErrorResponse('Bridge unavailable', 'Unable to initialize xcode tools bridge');
-  }
-  return bridge.disconnectTool();
+  return withBridgeToolHandler(async (bridge) => bridge.disconnectTool());
 };