xcode-copilot-server 1.0.4 → 2.0.1

package/dist/tool-bridge/state.js

@@ -0,0 +1,77 @@
+import { ToolCache } from "./tool-cache.js";
+import { ToolRouter } from "./tool-router.js";
+import { ReplyTracker } from "./reply-tracker.js";
+import { SessionLifecycle } from "./session-lifecycle.js";
+export class ToolBridgeState {
+    toolCache = new ToolCache();
+    toolRouter = new ToolRouter();
+    replyTracker = new ReplyTracker();
+    session = new SessionLifecycle(this.toolRouter);
+    cacheTools(tools) {
+        this.toolCache.cacheTools(tools);
+    }
+    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();
+    }
+}
+//# sourceMappingURL=state.js.map

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

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

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

@@ -0,0 +1,10 @@
+import type { AnthropicToolDefinition } from "../schemas/anthropic.js";
+export declare class ToolCache {
+    private cachedTools;
+    cacheTools(tools: AnthropicToolDefinition[]): void;
+    getCachedTools(): AnthropicToolDefinition[];
+    resolveToolName(name: string): string;
+    normalizeArgs(toolName: string, args: Record<string, unknown>): Record<string, unknown>;
+    private resolveKey;
+    private resolveValue;
+}

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

@@ -0,0 +1,82 @@
+// The Copilot model likes to rename CLI-style flags to camelCase, so we
+// need a lookup for the ones that can't be derived automatically.
+const FLAG_ALIASES = new Map([
+    ["ignoreCase", "-i"],
+    ["caseInsensitive", "-i"],
+    ["lineNumbers", "-n"],
+    ["showLineNumbers", "-n"],
+    ["afterContext", "-A"],
+    ["linesAfter", "-A"],
+    ["beforeContext", "-B"],
+    ["linesBefore", "-B"],
+]);
+function camelToSnake(s) {
+    return s.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+}
+function snakeToCamel(s) {
+    return s.replace(/_([a-z])/g, (_, c) => c.toUpperCase());
+}
+export class ToolCache {
+    cachedTools = [];
+    cacheTools(tools) {
+        this.cachedTools = tools;
+    }
+    getCachedTools() {
+        return this.cachedTools;
+    }
+    // The model sometimes hallucinates shortened tool names like "XcodeRead"
+    // so we resolve them against the cached list to match what Xcode sent.
+    resolveToolName(name) {
+        if (this.cachedTools.some((t) => t.name === name))
+            return name;
+        const suffix = `__${name}`;
+        const matches = this.cachedTools.filter((t) => t.name.endsWith(suffix));
+        if (matches.length === 1 && matches[0])
+            return matches[0].name;
+        return name;
+    }
+    // The Copilot model doesn't always respect the exact property names or
+    // enum values in tool schemas, e.g. "ignoreCase" instead of "-i",
+    // "outputMode" instead of "output_mode", "filesWithMatches" instead of
+    // "files_with_matches". We remap these against the actual schema so the
+    // downstream executor doesn't reject them with InputValidationError.
+    normalizeArgs(toolName, args) {
+        const tool = this.cachedTools.find((t) => t.name === toolName);
+        const props = tool?.input_schema?.properties;
+        if (!props)
+            return args;
+        const schemaKeys = new Set(Object.keys(props));
+        const result = {};
+        for (const [key, value] of Object.entries(args)) {
+            const resolvedKey = this.resolveKey(key, schemaKeys);
+            result[resolvedKey] = this.resolveValue(value, props[resolvedKey]);
+        }
+        return result;
+    }
+    resolveKey(key, schemaKeys) {
+        if (schemaKeys.has(key))
+            return key;
+        const snake = camelToSnake(key);
+        if (schemaKeys.has(snake))
+            return snake;
+        const camel = snakeToCamel(key);
+        if (schemaKeys.has(camel))
+            return camel;
+        const alias = FLAG_ALIASES.get(key);
+        if (alias && schemaKeys.has(alias))
+            return alias;
+        return key;
+    }
+    resolveValue(value, schemaProp) {
+        if (typeof value !== "string" || !schemaProp?.enum)
+            return value;
+        if (schemaProp.enum.includes(value))
+            return value;
+        // e.g. "filesWithMatches" becomes "files_with_matches"
+        const snake = camelToSnake(value);
+        if (schemaProp.enum.includes(snake))
+            return snake;
+        return value;
+    }
+}
+//# sourceMappingURL=tool-cache.js.map

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

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

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

@@ -0,0 +1,12 @@
+export declare class ToolRouter {
+    private readonly expectedByName;
+    private readonly pendingByCallId;
+    hasPendingToolCall(toolCallId: string): boolean;
+    hasExpectedTool(name: string): boolean;
+    registerExpected(toolCallId: string, toolName: string): void;
+    registerMCPRequest(name: string, resolve: (result: string) => void, reject: (err: Error) => void): void;
+    resolveToolCall(toolCallId: string, result: string): boolean;
+    get hasPending(): boolean;
+    rejectAll(reason: string): void;
+    private addPending;
+}

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

@@ -0,0 +1,82 @@
+const TOOL_TIMEOUT_MS = 5 * 60 * 1000;
+export class ToolRouter {
+    expectedByName = 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;
+    }
+    hasExpectedTool(name) {
+        const queue = this.expectedByName.get(name);
+        return !!queue && queue.length > 0;
+    }
+    registerExpected(toolCallId, toolName) {
+        const queue = this.expectedByName.get(toolName);
+        if (queue) {
+            queue.push(toolCallId);
+        }
+        else {
+            this.expectedByName.set(toolName, [toolCallId]);
+        }
+    }
+    registerMCPRequest(name, resolve, reject) {
+        const queue = this.expectedByName.get(name);
+        if (!queue?.length) {
+            reject(new Error(`No expected tool call for "${name}"`));
+            return;
+        }
+        const toolCallId = queue.shift();
+        if (queue.length === 0)
+            this.expectedByName.delete(name);
+        if (!toolCallId)
+            return;
+        this.addPending(toolCallId, resolve, reject);
+    }
+    resolveToolCall(toolCallId, result) {
+        const pending = this.pendingByCallId.get(toolCallId);
+        if (pending) {
+            clearTimeout(pending.timeout);
+            this.pendingByCallId.delete(toolCallId);
+            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);
+                if (queue.length === 0)
+                    this.expectedByName.delete(name);
+                return true;
+            }
+        }
+        return false;
+    }
+    get hasPending() {
+        return this.pendingByCallId.size > 0 || this.expectedByName.size > 0;
+    }
+    rejectAll(reason) {
+        this.expectedByName.clear();
+        for (const [, pending] of this.pendingByCallId) {
+            clearTimeout(pending.timeout);
+            pending.reject(new Error(reason));
+        }
+        this.pendingByCallId.clear();
+    }
+    addPending(toolCallId, resolve, reject) {
+        const timeout = setTimeout(() => {
+            this.pendingByCallId.delete(toolCallId);
+            reject(new Error(`Tool call ${toolCallId} timed out`));
+        }, TOOL_TIMEOUT_MS);
+        this.pendingByCallId.set(toolCallId, { toolCallId, resolve, reject, timeout });
+    }
+}
+//# sourceMappingURL=tool-router.js.map

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

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

package/dist/utils/anthropic-prompt.d.ts

@@ -0,0 +1,2 @@
+import type { AnthropicMessage } from "../schemas/anthropic.js";
+export declare function formatAnthropicPrompt(messages: AnthropicMessage[], excludedFilePatterns: string[]): string;

package/dist/utils/anthropic-prompt.js

@@ -0,0 +1,52 @@
+import { filterExcludedFiles } from "./prompt.js";
+function extractToolResultText(content) {
+    if (content == null)
+        return "";
+    if (typeof content === "string")
+        return content;
+    return content.map((b) => b.text).join("");
+}
+function formatBlocks(blocks, role, excludedFilePatterns, parts) {
+    for (const block of blocks) {
+        switch (block.type) {
+            case "text":
+                if (!block.text)
+                    break;
+                if (role === "user") {
+                    parts.push(`[User]: ${filterExcludedFiles(block.text, excludedFilePatterns)}`);
+                }
+                else {
+                    parts.push(`[Assistant]: ${block.text}`);
+                }
+                break;
+            case "tool_use":
+                parts.push(`[Assistant called tool ${block.name} with args: ${JSON.stringify(block.input)}]`);
+                break;
+            case "tool_result": {
+                const text = extractToolResultText(block.content);
+                parts.push(`[Tool result for ${block.tool_use_id}]: ${text}`);
+                break;
+            }
+        }
+    }
+}
+// The Copilot SDK expects a single flat prompt string, so we convert the
+// structured Anthropic messages into that format.
+export function formatAnthropicPrompt(messages, excludedFilePatterns) {
+    const parts = [];
+    for (const msg of messages) {
+        if (typeof msg.content === "string") {
+            if (msg.role === "user") {
+                parts.push(`[User]: ${filterExcludedFiles(msg.content, excludedFilePatterns)}`);
+            }
+            else {
+                parts.push(`[Assistant]: ${msg.content}`);
+            }
+        }
+        else {
+            formatBlocks(msg.content, msg.role, excludedFilePatterns, parts);
+        }
+    }
+    return parts.join("\n\n");
+}
+//# sourceMappingURL=anthropic-prompt.js.map

package/dist/utils/anthropic-prompt.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"anthropic-prompt.js","sourceRoot":"","sources":["../../src/utils/anthropic-prompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,SAAS,qBAAqB,CAC5B,OAA8D;IAE9D,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IAC/B,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,YAAY,CACnB,MAAsB,EACtB,IAA0B,EAC1B,oBAA8B,EAC9B,KAAe;IAEf,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,MAAM;gBACT,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,MAAM;gBACvB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;oBACpB,KAAK,CAAC,IAAI,CACR,WAAW,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAAE,CACnE,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,IAAI,CAAC,gBAAgB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3C,CAAC;gBACD,MAAM;YAER,KAAK,UAAU;gBACb,KAAK,CAAC,IAAI,CACR,0BAA0B,KAAK,CAAC,IAAI,eAAe,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAClF,CAAC;gBACF,MAAM;YAER,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,MAAM,IAAI,GAAG,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAClD,KAAK,CAAC,IAAI,CAAC,oBAAoB,KAAK,CAAC,WAAW,MAAM,IAAI,EAAE,CAAC,CAAC;gBAC9D,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,kDAAkD;AAClD,MAAM,UAAU,qBAAqB,CACnC,QAA4B,EAC5B,oBAA8B;IAE9B,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACxB,KAAK,CAAC,IAAI,CACR,WAAW,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,CAAC,EAAE,CACpE,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,IAAI,CAAC,gBAAgB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC"}

package/dist/utils/model-resolver.d.ts

@@ -0,0 +1,3 @@
+import type { ModelInfo } from "@github/copilot-sdk";
+import type { Logger } from "../logger.js";
+export declare function resolveModel(requestedModel: string, availableModels: ModelInfo[], logger?: Logger): string | undefined;

package/dist/utils/model-resolver.js

@@ -0,0 +1,45 @@
+function normalize(id) {
+    return id.replace(/-\d{8}$/, "").replace(/\./g, "-");
+}
+// We need to group models by family for fallback matching, so we grab the
+// prefix before the first digit (e.g. "claude-sonnet-4-5" becomes "claude-sonnet-").
+// This works for Claude naming but would lump all GPT models into "gpt-"
+// so it'll need reworking once we support non-Claude model families here
+// e.g. if we add Codex support.
+function extractFamily(id) {
+    const match = id.match(/^(.*?-)\d/);
+    return match?.[1] ?? id;
+}
+export function resolveModel(requestedModel, availableModels, logger) {
+    if (availableModels.some((m) => m.id === requestedModel)) {
+        return requestedModel;
+    }
+    const normalizedRequest = normalize(requestedModel);
+    const normalizedMatch = availableModels.find((m) => normalize(m.id) === normalizedRequest);
+    if (normalizedMatch) {
+        logger?.debug(`Model "${requestedModel}" resolved to "${normalizedMatch.id}" (normalized match)`);
+        return normalizedMatch.id;
+    }
+    // Requested version may not exist in Copilot yet (e.g. opus 4.6 falls back to opus 4.5),
+    // so fall back to the closest model in the same family.
+    const requestFamily = extractFamily(normalizedRequest);
+    const familyMatches = availableModels.filter((m) => extractFamily(normalize(m.id)) === requestFamily);
+    let best;
+    let bestLen = 0;
+    for (const m of familyMatches) {
+        const norm = normalize(m.id);
+        let len = 0;
+        const minLen = Math.min(normalizedRequest.length, norm.length);
+        while (len < minLen && normalizedRequest[len] === norm[len])
+            len++;
+        if (len > bestLen) {
+            bestLen = len;
+            best = m;
+        }
+    }
+    if (!best)
+        return undefined;
+    logger?.warn(`Model "${requestedModel}" not available, falling back to "${best.id}" (closest in family)`);
+    return best.id;
+}
+//# sourceMappingURL=model-resolver.js.map

package/dist/utils/model-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/utils/model-resolver.ts"],"names":[],"mappings":"AAGA,SAAS,SAAS,CAAC,EAAU;IAC3B,OAAO,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACvD,CAAC;AAED,0EAA0E;AAC1E,qFAAqF;AACrF,yEAAyE;AACzE,yEAAyE;AACzE,gCAAgC;AAChC,SAAS,aAAa,CAAC,EAAU;IAC/B,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACpC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,cAAsB,EACtB,eAA4B,EAC5B,MAAe;IAEf,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,cAAc,CAAC,EAAE,CAAC;QACzD,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,iBAAiB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,eAAe,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,iBAAiB,CAC7C,CAAC;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,EAAE,KAAK,CACX,UAAU,cAAc,kBAAkB,eAAe,CAAC,EAAE,sBAAsB,CACnF,CAAC;QACF,OAAO,eAAe,CAAC,EAAE,CAAC;IAC5B,CAAC;IAED,yFAAyF;IACzF,wDAAwD;IACxD,MAAM,aAAa,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG,eAAe,CAAC,MAAM,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,aAAa,CACxD,CAAC;IAEF,IAAI,IAA2B,CAAC;IAChC,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/D,OAAO,GAAG,GAAG,MAAM,IAAI,iBAAiB,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC;YAAE,GAAG,EAAE,CAAC;QACnE,IAAI,GAAG,GAAG,OAAO,EAAE,CAAC;YAClB,OAAO,GAAG,GAAG,CAAC;YACd,IAAI,GAAG,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAE5B,MAAM,EAAE,IAAI,CACV,UAAU,cAAc,qCAAqC,IAAI,CAAC,EAAE,uBAAuB,CAC5F,CAAC;IACF,OAAO,IAAI,CAAC,EAAE,CAAC;AACjB,CAAC"}

package/dist/utils/prompt.d.ts

@@ -1,15 +1,3 @@
-import type { Message } from "../types.js";
-/**
- * Strips fenced code blocks whose header contains any of the given patterns
- * (case-insensitive). Xcode formats search results as fenced blocks with a
- * header like ` ```swift:/path/to/File.swift `, so the patterns are matched
- * against the file path in that header.
- *
- * Xcode's search results can include full file contents for every match, so
- * some files can be thousands of lines and add nothing useful to the prompt.
- * For example, a mock data file might match the search query but its contents
- * aren't helpful for generating a useful response.
- */
+import { type ChatCompletionMessage } from "../schemas/openai.js";
 export declare function filterExcludedFiles(s: string, patterns: string[]): string;
-/** System/developer messages are skipped — they're passed via `SessionConfig.systemMessage`. */
-export declare function formatPrompt(messages: Message[], excludedFilePatterns: string[]): string;
+export declare function formatPrompt(messages: ChatCompletionMessage[], excludedFilePatterns: string[]): string;

package/dist/utils/prompt.js

@@ -1,18 +1,11 @@
-import { extractContentText } from "../schemas.js";
+import { extractContentText } from "../schemas/openai.js";
 function escapeRegex(s) {
     return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-/**
- * Strips fenced code blocks whose header contains any of the given patterns
- * (case-insensitive). Xcode formats search results as fenced blocks with a
- * header like ` ```swift:/path/to/File.swift `, so the patterns are matched
- * against the file path in that header.
- *
- * Xcode's search results can include full file contents for every match, so
- * some files can be thousands of lines and add nothing useful to the prompt.
- * For example, a mock data file might match the search query but its contents
- * aren't helpful for generating a useful response.
- */
+// Xcode's search results can include full file contents for every match, so
+// some files end up being thousands of lines and add nothing useful. We strip
+// fenced code blocks whose header matches the excluded patterns (Xcode formats
+// them as ```swift:/path/to/File.swift).
 export function filterExcludedFiles(s, patterns) {
     if (patterns.length === 0)
         return s;
@@ -20,7 +13,8 @@ export function filterExcludedFiles(s, patterns) {
     const re = new RegExp("```\\w*:[^\\n]*(?:" + joined + ")[^\\n]*\\n.*?\\n```\\n?", "gis");
     return s.replace(re, "");
 }
-/** System/developer messages are skipped — they're passed via `SessionConfig.systemMessage`. */
+// System/developer messages are skipped because they're passed separately via
+// SessionConfig.systemMessage.
 export function formatPrompt(messages, excludedFilePatterns) {
     const parts = [];
     for (const msg of messages) {
@@ -28,7 +22,6 @@ export function formatPrompt(messages, excludedFilePatterns) {
         switch (msg.role) {
             case "system":
             case "developer":
-                // Handled via SessionConfig.systemMessage
                 continue;
             case "user":
                 parts.push(`[User]: ${filterExcludedFiles(content, excludedFilePatterns)}`);
@@ -46,6 +39,10 @@ export function formatPrompt(messages, excludedFilePatterns) {
             case "tool":
                 parts.push(`[Tool result for ${msg.tool_call_id ?? "unknown"}]: ${content}`);
                 break;
+            case undefined:
+                break;
+            default:
+                throw msg.role;
         }
     }
     return parts.join("\n\n");

package/dist/utils/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/utils/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAGnD,SAAS,WAAW,CAAC,CAAS;IAC5B,OAAO,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAAC,CAAS,EAAE,QAAkB;IAC/D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,EAAE,GAAG,IAAI,MAAM,CACnB,oBAAoB,GAAG,MAAM,GAAG,0BAA0B,EAC1D,KAAK,CACN,CAAC;IACF,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC3B,CAAC;AAED,gGAAgG;AAChG,MAAM,UAAU,YAAY,CAC1B,QAAmB,EACnB,oBAA8B;IAE9B,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,QAAQ,CAAC;YACd,KAAK,WAAW;gBACd,0CAA0C;gBAC1C,SAAS;YAEX,KAAK,MAAM;gBACT,KAAK,CAAC,IAAI,CAAC,WAAW,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC;gBAC5E,MAAM;YAER,KAAK,WAAW;gBACd,IAAI,OAAO,EAAE,CAAC;oBACZ,KAAK,CAAC,IAAI,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;gBACxC,CAAC;gBACD,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;oBACnB,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;wBAChC,KAAK,CAAC,IAAI,CACR,0BAA0B,EAAE,CAAC,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC,QAAQ,CAAC,SAAS,GAAG,CAClF,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,MAAM;YAER,KAAK,MAAM;gBACT,KAAK,CAAC,IAAI,CAAC,oBAAoB,GAAG,CAAC,YAAY,IAAI,SAAS,MAAM,OAAO,EAAE,CAAC,CAAC;gBAC7E,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/utils/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA8B,MAAM,sBAAsB,CAAC;AAEtF,SAAS,WAAW,CAAC,CAAS;IAC5B,OAAO,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,4EAA4E;AAC5E,8EAA8E;AAC9E,+EAA+E;AAC/E,yCAAyC;AACzC,MAAM,UAAU,mBAAmB,CAAC,CAAS,EAAE,QAAkB;IAC/D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,EAAE,GAAG,IAAI,MAAM,CACnB,oBAAoB,GAAG,MAAM,GAAG,0BAA0B,EAC1D,KAAK,CACN,CAAC;IACF,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAC3B,CAAC;AAED,8EAA8E;AAC9E,+BAA+B;AAC/B,MAAM,UAAU,YAAY,CAC1B,QAAiC,EACjC,oBAA8B;IAE9B,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,QAAQ,CAAC;YACd,KAAK,WAAW;gBACd,SAAS;YAEX,KAAK,MAAM;gBACT,KAAK,CAAC,IAAI,CAAC,WAAW,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC;gBAC5E,MAAM;YAER,KAAK,WAAW;gBACd,IAAI,OAAO,EAAE,CAAC;oBACZ,KAAK,CAAC,IAAI,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;gBACxC,CAAC;gBACD,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;oBACnB,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;wBAChC,KAAK,CAAC,IAAI,CACR,0BAA0B,EAAE,CAAC,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC,QAAQ,CAAC,SAAS,GAAG,CAClF,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,MAAM;YAER,KAAK,MAAM;gBACT,KAAK,CAAC,IAAI,CAAC,oBAAoB,GAAG,CAAC,YAAY,IAAI,SAAS,MAAM,OAAO,EAAE,CAAC,CAAC;gBAC7E,MAAM;YAER,KAAK,SAAS;gBACZ,MAAM;YAER;gBACE,MAAM,GAAG,CAAC,IAAoB,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcode-copilot-server",
-  "version": "1.0.4",
+  "version": "2.0.1",
   "description": "OpenAI-compatible proxy API server for Xcode, powered by GitHub Copilot",
   "type": "module",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "lint": "eslint .",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc -p tsconfig.check.json",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
@@ -34,15 +34,16 @@
     "@github/copilot-sdk": "0.1.23",
     "fastify": "5.7.4",
     "json5": "2.2.3",
+    "tokenx": "1.3.0",
     "zod": "4.3.6"
   },
   "devDependencies": {
     "@eslint/js": "9.39.2",
-    "@types/node": "25.2.1",
+    "@types/node": "25.2.3",
     "eslint": "9.39.2",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.54.0",
+    "typescript-eslint": "8.55.0",
     "vitest": "4.0.18"
   }
 }