refactor: extract shared classifyBridgeError into core utility

De-duplicates nearly identical error classification logic from
StandaloneXcodeToolsBridge and XcodeToolsBridgeManager into a single
exported function in core.ts with an optional connected parameter.

Author: cameroncooke

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

@@ -68,3 +68,35 @@ export async function isXcodeRunning(): Promise<boolean | null> {
     return null;
   }
 }
+
+export function classifyBridgeError(
+  error: unknown,
+  operation: 'list' | 'call',
+  opts?: { connected?: boolean },
+): string {
+  const message = (error instanceof Error ? error.message : String(error)).toLowerCase();
+
+  if (message.includes('mcpbridge not available')) {
+    return 'MCPBRIDGE_NOT_FOUND';
+  }
+  if (message.includes('workflow is not enabled')) {
+    return 'XCODE_MCP_UNAVAILABLE';
+  }
+  if (message.includes('timed out') || message.includes('timeout')) {
+    if (opts?.connected === false) {
+      return 'BRIDGE_CONNECT_TIMEOUT';
+    }
+    return operation === 'list' ? 'BRIDGE_LIST_TIMEOUT' : 'BRIDGE_CALL_TIMEOUT';
+  }
+  if (message.includes('permission') || message.includes('not allowed')) {
+    return 'XCODE_APPROVAL_REQUIRED';
+  }
+  if (
+    message.includes('connection closed') ||
+    message.includes('closed') ||
+    message.includes('disconnected')
+  ) {
+    return 'XCODE_SESSION_NOT_READY';
+  }
+  return 'XCODE_MCP_UNAVAILABLE';
+}

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

@@ -9,6 +9,7 @@ import {
 import { XcodeToolsProxyRegistry, type ProxySyncResult } from './registry.ts';
 import {
   buildXcodeToolsBridgeStatus,
+  classifyBridgeError,
   getMcpBridgeAvailability,
   type XcodeToolsBridgeStatus,
 } from './core.ts';
@@ -163,7 +164,12 @@ export class XcodeToolsBridgeManager {
       };
       return createTextResponse(JSON.stringify(payload, null, 2));
     } catch (error) {
-      return this.createBridgeFailureResponse(this.classifyBridgeError(error, 'list'), error);
+      return this.createBridgeFailureResponse(
+        classifyBridgeError(error, 'list', {
+          connected: this.service.getClientStatus().connected,
+        }),
+        error,
+      );
     }
   }
 
@@ -185,7 +191,12 @@ export class XcodeToolsBridgeManager {
       });
       return response as ToolResponse;
     } catch (error) {
-      return this.createBridgeFailureResponse(this.classifyBridgeError(error, 'call'), error);
+      return this.createBridgeFailureResponse(
+        classifyBridgeError(error, 'call', {
+          connected: this.service.getClientStatus().connected,
+        }),
+        error,
+      );
     }
   }
 
@@ -204,33 +215,4 @@ export class XcodeToolsBridgeManager {
     const message = error instanceof Error ? error.message : String(error);
     return createErrorResponse(code, message);
   }
-
-  private classifyBridgeError(error: unknown, operation: 'list' | 'call'): string {
-    const message = (error instanceof Error ? error.message : String(error)).toLowerCase();
-    const clientStatus = this.service.getClientStatus();
-
-    if (message.includes('mcpbridge not available')) {
-      return 'MCPBRIDGE_NOT_FOUND';
-    }
-    if (message.includes('workflow is not enabled')) {
-      return 'XCODE_MCP_UNAVAILABLE';
-    }
-    if (message.includes('timed out') || message.includes('timeout')) {
-      if (!clientStatus.connected) {
-        return 'BRIDGE_CONNECT_TIMEOUT';
-      }
-      return operation === 'list' ? 'BRIDGE_LIST_TIMEOUT' : 'BRIDGE_CALL_TIMEOUT';
-    }
-    if (message.includes('permission') || message.includes('not allowed')) {
-      return 'XCODE_APPROVAL_REQUIRED';
-    }
-    if (
-      message.includes('connection closed') ||
-      message.includes('closed') ||
-      message.includes('disconnected')
-    ) {
-      return 'XCODE_SESSION_NOT_READY';
-    }
-    return 'XCODE_MCP_UNAVAILABLE';
-  }
 }

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

@@ -3,7 +3,11 @@ import {
   createTextResponse,
   type ToolResponse,
 } from '../../utils/responses/index.ts';
-import { buildXcodeToolsBridgeStatus, type XcodeToolsBridgeStatus } from './core.ts';
+import {
+  buildXcodeToolsBridgeStatus,
+  classifyBridgeError,
+  type XcodeToolsBridgeStatus,
+} from './core.ts';
 import { XcodeIdeToolService } from './tool-service.ts';
 
 export class StandaloneXcodeToolsBridge {
@@ -78,7 +82,7 @@ export class StandaloneXcodeToolsBridge {
       );
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      return createErrorResponse(this.classifyBridgeError(error, 'list'), message);
+      return createErrorResponse(classifyBridgeError(error, 'list'), message);
     }
   }
 
@@ -94,32 +98,7 @@ export class StandaloneXcodeToolsBridge {
       return response as ToolResponse;
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      return createErrorResponse(this.classifyBridgeError(error, 'call'), message);
-    }
-  }
-
-  private classifyBridgeError(error: unknown, operation: 'list' | 'call'): string {
-    const message = (error instanceof Error ? error.message : String(error)).toLowerCase();
-
-    if (message.includes('mcpbridge not available')) {
-      return 'MCPBRIDGE_NOT_FOUND';
-    }
-    if (message.includes('workflow is not enabled')) {
-      return 'XCODE_MCP_UNAVAILABLE';
-    }
-    if (message.includes('timed out') || message.includes('timeout')) {
-      return operation === 'list' ? 'BRIDGE_LIST_TIMEOUT' : 'BRIDGE_CALL_TIMEOUT';
-    }
-    if (message.includes('permission') || message.includes('not allowed')) {
-      return 'XCODE_APPROVAL_REQUIRED';
-    }
-    if (
-      message.includes('connection closed') ||
-      message.includes('closed') ||
-      message.includes('disconnected')
-    ) {
-      return 'XCODE_SESSION_NOT_READY';
+      return createErrorResponse(classifyBridgeError(error, 'call'), message);
     }
-    return 'XCODE_MCP_UNAVAILABLE';
   }
 }