xcode-copilot-server 3.4.0 → 3.4.2

package/dist/tool-bridge/state.js

@@ -5,73 +5,14 @@ import { SessionLifecycle } from "./session-lifecycle.js";
 export class ToolBridgeState {
     toolCache = new ToolCache();
     toolRouter = new ToolRouter();
-    replyTracker = new ReplyTracker();
+    replies = new ReplyTracker();
     session = new SessionLifecycle(this.toolRouter);
-    cacheTools(tools) {
-        this.toolCache.cacheTools(tools);
+    _filteredTools;
+    get filteredTools() {
+        return this._filteredTools;
     }
-    getCachedTools() {
-        return this.toolCache.getCachedTools();
-    }
-    resolveToolName(name) {
-        return this.toolCache.resolveToolName(name);
-    }
-    normalizeArgs(toolName, args) {
-        return this.toolCache.normalizeArgs(toolName, args);
-    }
-    hasPendingToolCall(toolCallId) {
-        return this.toolRouter.hasPendingToolCall(toolCallId);
-    }
-    hasExpectedTool(name) {
-        return this.toolRouter.hasExpectedTool(name);
-    }
-    registerExpected(toolCallId, toolName) {
-        this.toolRouter.registerExpected(toolCallId, toolName);
-    }
-    registerMCPRequest(name, resolve, reject) {
-        this.toolRouter.registerMCPRequest(name, resolve, reject);
-    }
-    resolveToolCall(toolCallId, result) {
-        return this.toolRouter.resolveToolCall(toolCallId, result);
-    }
-    get hasPending() {
-        return this.toolRouter.hasPending;
-    }
-    get currentReply() {
-        return this.replyTracker.currentReply;
-    }
-    setReply(reply) {
-        this.replyTracker.setReply(reply);
-    }
-    clearReply() {
-        this.replyTracker.clearReply();
-    }
-    notifyStreamingDone() {
-        this.replyTracker.notifyStreamingDone();
-    }
-    waitForStreamingDone() {
-        return this.replyTracker.waitForStreamingDone();
-    }
-    get sessionActive() {
-        return this.session.sessionActive;
-    }
-    get hadError() {
-        return this.session.hadError;
-    }
-    markSessionActive() {
-        this.session.markSessionActive();
-    }
-    markSessionErrored() {
-        this.session.markSessionErrored();
-    }
-    markSessionInactive() {
-        this.session.markSessionInactive();
-    }
-    onSessionEnd(callback) {
-        this.session.onSessionEnd(callback);
-    }
-    cleanup() {
-        this.session.cleanup();
+    setFilteredTools(tools) {
+        this._filteredTools = tools;
     }
 }
 //# sourceMappingURL=state.js.map

package/dist/tool-bridge/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/tool-bridge/state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,MAAM,OAAO,eAAe;IACjB,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;IAC9B,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IAClC,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEzD,UAAU,CAAC,KAAgC;QACzC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IACzC,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,QAAgB,EAAE,IAA6B;QAC3D,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,kBAAkB,CAAC,UAAkB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACxD,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB,CAAC,UAAkB,EAAE,QAAgB;QACnD,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IAED,kBAAkB,CAChB,IAAY,EACZ,OAAiC,EACjC,MAA4B;QAE5B,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,eAAe,CAAC,UAAkB,EAAE,MAAc;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;IACpC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;IACxC,CAAC;IAED,QAAQ,CAAC,KAAmB;QAC1B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,UAAU;QACR,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;IACjC,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;IAC1C,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;IAClD,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;IACpC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAED,iBAAiB;QACf,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;IACnC,CAAC;IAED,kBAAkB;QAChB,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IACrC,CAAC;IAED,YAAY,CAAC,QAAoB;QAC/B,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;CACF"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/tool-bridge/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,MAAM,OAAO,eAAe;IACjB,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;IAC9B,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IAC7B,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACjD,cAAc,CAAwB;IAE9C,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,KAAgB;QAC/B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC9B,CAAC;CACF"}

package/dist/tool-bridge/tool-router.d.ts

@@ -1,5 +1,6 @@
 export declare class ToolRouter {
     private readonly expectedByName;
+    private readonly expectedByCallId;
     private readonly pendingByCallId;
     hasPendingToolCall(toolCallId: string): boolean;
     hasExpectedTool(name: string): boolean;

package/dist/tool-bridge/tool-router.js

@@ -1,15 +1,15 @@
-const TOOL_TIMEOUT_MS = 5 * 60 * 1000;
+const MINUTES = 60_000;
+const TOOL_TIMEOUT_MS = 5 * MINUTES;
+// streaming-core registers expected entries when the model emits tool requests.
+// MCP route handlers promote them to pending when the SDK connects. Ordering is
+// guaranteed: the client sees the tool_use block before it can POST to /mcp/:convId.
 export class ToolRouter {
     expectedByName = new Map();
+    // Reverse lookup: toolCallId to toolName for O(1) expected-entry removal
+    expectedByCallId = new Map();
     pendingByCallId = new Map();
     hasPendingToolCall(toolCallId) {
-        if (this.pendingByCallId.has(toolCallId))
-            return true;
-        for (const [, queue] of this.expectedByName) {
-            if (queue.includes(toolCallId))
-                return true;
-        }
-        return false;
+        return this.pendingByCallId.has(toolCallId) || this.expectedByCallId.has(toolCallId);
     }
     hasExpectedTool(name) {
         const queue = this.expectedByName.get(name);
@@ -23,6 +23,7 @@ export class ToolRouter {
         else {
             this.expectedByName.set(toolName, [toolCallId]);
         }
+        this.expectedByCallId.set(toolCallId, toolName);
     }
     registerMCPRequest(name, resolve, reject) {
         const queue = this.expectedByName.get(name);
@@ -33,8 +34,11 @@ export class ToolRouter {
         const toolCallId = queue.shift();
         if (queue.length === 0)
             this.expectedByName.delete(name);
-        if (!toolCallId)
+        if (!toolCallId) {
+            reject(new Error(`Internal: expected toolCallId was falsy for "${name}"`));
             return;
+        }
+        this.expectedByCallId.delete(toolCallId);
         this.addPending(toolCallId, resolve, reject);
     }
     resolveToolCall(toolCallId, result) {
@@ -45,18 +49,20 @@ export class ToolRouter {
             pending.resolve(result);
             return true;
         }
-        // The CLI may resolve a tool without going through the MCP endpoint (e.g. if
-        // the tool name wasn't in our tools/list response and the CLI failed it
-        // immediately). Clean up the stale expected entry so it doesn't poison
-        // future registerMCPRequest calls for the same tool name.
-        for (const [name, queue] of this.expectedByName) {
-            const idx = queue.indexOf(toolCallId);
-            if (idx !== -1) {
-                queue.splice(idx, 1);
+        // The CLI can resolve a tool without hitting the MCP endpoint (e.g. the tool
+        // name wasn't in tools/list). Clean up the stale expected entry.
+        const expectedName = this.expectedByCallId.get(toolCallId);
+        if (expectedName !== undefined) {
+            this.expectedByCallId.delete(toolCallId);
+            const queue = this.expectedByName.get(expectedName);
+            if (queue) {
+                const idx = queue.indexOf(toolCallId);
+                if (idx !== -1)
+                    queue.splice(idx, 1);
                 if (queue.length === 0)
-                    this.expectedByName.delete(name);
-                return true;
+                    this.expectedByName.delete(expectedName);
             }
+            return true;
         }
         return false;
     }
@@ -65,6 +71,7 @@ export class ToolRouter {
     }
     rejectAll(reason) {
         this.expectedByName.clear();
+        this.expectedByCallId.clear();
         for (const [, pending] of this.pendingByCallId) {
             clearTimeout(pending.timeout);
             pending.reject(new Error(reason));

package/dist/tool-bridge/tool-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-router.js","sourceRoot":"","sources":["../../src/tool-bridge/tool-router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-router.js","sourceRoot":"","sources":["../../src/tool-bridge/tool-router.ts"],"names":[],"mappings":"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"}

package/dist/utils/child-process.d.ts

@@ -0,0 +1,2 @@
+export type ExecFn = (cmd: string, args: string[]) => Promise<string>;
+export declare function defaultExec(cmd: string, args: string[]): Promise<string>;

package/dist/utils/child-process.js

@@ -0,0 +1,8 @@
+import { execFile as execFileCb } from "node:child_process";
+import { promisify } from "node:util";
+const execFileAsync = promisify(execFileCb);
+export async function defaultExec(cmd, args) {
+    const { stdout } = await execFileAsync(cmd, args);
+    return stdout;
+}
+//# sourceMappingURL=child-process.js.map

package/dist/utils/child-process.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"child-process.js","sourceRoot":"","sources":["../../src/utils/child-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;AAI5C,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAW,EAAE,IAAc;IAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAClD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/utils/type-guards.d.ts

@@ -0,0 +1,2 @@
+export declare function isRecord(value: unknown): value is Record<string, unknown>;
+export declare function isErrnoException(err: unknown): err is NodeJS.ErrnoException;

package/dist/utils/type-guards.js

@@ -0,0 +1,7 @@
+export function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+export function isErrnoException(err) {
+    return err instanceof Error && "code" in err && typeof err.code === "string";
+}
+//# sourceMappingURL=type-guards.js.map

package/dist/utils/type-guards.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-guards.js","sourceRoot":"","sources":["../../src/utils/type-guards.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,OAAO,GAAG,YAAY,KAAK,IAAI,MAAM,IAAI,GAAG,IAAI,OAAQ,GAAyB,CAAC,IAAI,KAAK,QAAQ,CAAC;AACtG,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcode-copilot-server",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "OpenAI-compatible proxy API server for Xcode, powered by GitHub Copilot",
   "type": "module",
   "license": "MIT",
@@ -16,8 +16,7 @@
   },
   "files": [
     "dist/",
-    "config.json5",
-    "scripts/"
+    "config.json5"
   ],
   "scripts": {
     "build": "tsc",

package/scripts/mcpbridge-proxy.mjs

@@ -1,73 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * MCP stdio proxy for Apple's `xcrun mcpbridge`.
- *
- * mcpbridge declares output schemas on its tools but returns
- * results via the `content` field (text array) without the corresponding
- * `structuredContent` field that the MCP spec requires. The Copilot CLI
- * enforces this strictly and rejects the response with error -32600.
- *
- * So, intercept every JSON-RPC response from mcpbridge. When a response
- * carries `content` but no `structuredContent`, synthesise it from the
- * first text content item — parsing as JSON when possible, falling back
- * to a `{ text }` wrapper otherwise.
- * 
- * Source: https://rudrank.com/exploring-xcode-using-mcp-tools-cursor-external-clients
- */
-
-import { spawn, execFile } from "node:child_process";
-import { createInterface } from "node:readline";
-import { promisify } from "node:util";
-
-const execFileAsync = promisify(execFile);
-
-function patchIfNeeded(msg) {
-  const result = msg.result;
-  if (!result || typeof result !== "object") return;
-  if (!Array.isArray(result.content) || result.content.length === 0) return;
-  if (result.structuredContent !== undefined) return;
-
-  const textItem = result.content.find((c) => c.type === "text");
-  if (!textItem?.text) return;
-
-  try {
-    result.structuredContent = JSON.parse(textItem.text);
-  } catch {
-    result.structuredContent = { text: textItem.text };
-  }
-}
-
-try {
-  await execFileAsync("xcrun", ["--find", "mcpbridge"]);
-} catch (err) {
-  console.error(
-    "Error: xcrun mcpbridge not found. This requires Xcode 26.3 or later."
-  );
-  console.error(
-    "Please install Xcode 26.3+ or remove the 'xcode' MCP server from config.json5"
-  );
-  process.exit(1);
-}
-
-const bridge = spawn("xcrun", ["mcpbridge", ...process.argv.slice(2)], {
-  stdio: ["pipe", "pipe", "inherit"],
-});
-
-process.stdin.pipe(bridge.stdin);
-
-const reader = createInterface({ input: bridge.stdout, crlfDelay: Infinity });
-
-reader.on("line", (line) => {
-  try {
-    const msg = JSON.parse(line);
-    patchIfNeeded(msg);
-    process.stdout.write(JSON.stringify(msg) + "\n");
-  } catch {
-    process.stdout.write(line + "\n");
-  }
-});
-
-bridge.on("exit", (code) => process.exit(code ?? 0));
-process.on("SIGTERM", () => bridge.kill("SIGTERM"));
-process.on("SIGINT", () => bridge.kill("SIGINT"));