fix(xcode-ide): route CLI gateway tools via daemon

Author: cameroncooke

docs/TOOLS-CLI.md

@@ -206,4 +206,4 @@ XcodeBuildMCP provides 76 canonical tools organized into 14 workflow groups.
 
 ---
 
-*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-03-07T20:50:55.840Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-03-16T20:47:13.697Z UTC*

docs/TOOLS.md

@@ -222,4 +222,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-03-07T20:50:55.840Z UTC*
+*This documentation is automatically generated by `scripts/update-tools-docs.ts` from the tools manifest. Last updated: 2026-03-16T20:47:13.697Z UTC*

manifests/tools/xcode_ide_call_tool.yaml

@@ -4,8 +4,8 @@ names:
   mcp: xcode_ide_call_tool
   cli: call-tool
 description: Call a remote Xcode IDE MCP tool.
-predicates:
-  - mcpRuntimeOnly
+routing:
+  stateful: true
 annotations:
   title: Call Xcode IDE Tool
   readOnlyHint: false

manifests/tools/xcode_ide_list_tools.yaml

@@ -4,8 +4,8 @@ names:
   mcp: xcode_ide_list_tools
   cli: list-tools
 description: "Lists Xcode-IDE-only MCP capabilities (Use for: SwiftUI previews image capture, code snippet execution, issue Navigator/build logs, and window/tab context)."
-predicates:
-  - mcpRuntimeOnly
+routing:
+  stateful: true
 annotations:
   title: List Xcode IDE Tools
   readOnlyHint: true

manifests/workflows/xcode-ide.yaml

@@ -2,7 +2,7 @@ id: xcode-ide
 title: Xcode IDE Integration
 description: Bridge tools for connecting to Xcode's built-in MCP server (mcpbridge) to access IDE-specific functionality.
 availability:
-  cli: false
+  cli: true
 predicates:
   - hideWhenXcodeAgentMode
 tools:

src/core/manifest/__tests__/load-manifest.test.ts

@@ -94,11 +94,11 @@ describe('load-manifest', () => {
       expect(xcodeIde?.predicates).not.toContain('debugEnabled');
     });
 
-    it('should keep xcode bridge debug tools gated by debugEnabled', () => {
+    it('should keep xcode bridge gateway tools daemon-routed and debug tools gated', () => {
       const manifest = loadManifest();
 
-      expect(manifest.tools.get('xcode_ide_list_tools')?.predicates).toContain('mcpRuntimeOnly');
-      expect(manifest.tools.get('xcode_ide_call_tool')?.predicates).toContain('mcpRuntimeOnly');
+      expect(manifest.tools.get('xcode_ide_list_tools')?.routing?.stateful).toBe(true);
+      expect(manifest.tools.get('xcode_ide_call_tool')?.routing?.stateful).toBe(true);
       expect(manifest.tools.get('xcode_tools_bridge_status')?.predicates).toContain('debugEnabled');
       expect(manifest.tools.get('xcode_tools_bridge_sync')?.predicates).toContain('debugEnabled');
       expect(manifest.tools.get('xcode_tools_bridge_disconnect')?.predicates).toContain(

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

@@ -84,6 +84,8 @@ export class StandaloneXcodeToolsBridge {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       return createErrorResponse(classifyBridgeError(error, 'list'), message);
+    } finally {
+      await this.service.disconnect();
     }
   }
 
@@ -100,6 +102,8 @@ export class StandaloneXcodeToolsBridge {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       return createErrorResponse(classifyBridgeError(error, 'call'), message);
+    } finally {
+      await this.service.disconnect();
     }
   }
 }

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

@@ -108,11 +108,13 @@ describe('xcode-ide bridge tools (standalone fallback)', () => {
     expect(payload.toolCount).toBe(2);
     expect(payload.tools).toHaveLength(2);
     expect(clientMocks.listTools).toHaveBeenCalledOnce();
+    expect(clientMocks.disconnect).toHaveBeenCalledOnce();
   });
 
   it('call handler forwards remote tool calls without MCP server instance', async () => {
     const result = await callHandler({ remoteTool: 'toolA', arguments: { foo: 'bar' } });
     expect(result.isError).toBe(false);
     expect(clientMocks.callTool).toHaveBeenCalledWith('toolA', { foo: 'bar' }, {});
+    expect(clientMocks.disconnect).toHaveBeenCalledOnce();
   });
 });