xcode-copilot-server 4.0.4 → 4.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/banner.js +1 -3
- package/dist/banner.js.map +1 -1
- package/dist/cli-validators.js +1 -1
- package/dist/cli-validators.js.map +1 -1
- package/dist/config-schema.js +20 -8
- package/dist/config-schema.js.map +1 -1
- package/dist/config.js +15 -7
- package/dist/config.js.map +1 -1
- package/dist/conversation-manager.js +12 -5
- package/dist/conversation-manager.js.map +1 -1
- package/dist/index.js +10 -3
- package/dist/index.js.map +1 -1
- package/dist/launchd/agent.js +9 -4
- package/dist/launchd/agent.js.map +1 -1
- package/dist/providers/claude/provider.js +29 -7
- package/dist/providers/claude/provider.js.map +1 -1
- package/dist/providers/claude/streaming.js +16 -2
- package/dist/providers/claude/streaming.js.map +1 -1
- package/dist/providers/claude/tool-results.js +3 -1
- package/dist/providers/claude/tool-results.js.map +1 -1
- package/dist/providers/codex/provider.js +24 -5
- package/dist/providers/codex/provider.js.map +1 -1
- package/dist/providers/codex/streaming.js +15 -3
- package/dist/providers/codex/streaming.js.map +1 -1
- package/dist/providers/codex/tool-results.d.ts +2 -2
- package/dist/providers/codex/tool-results.js.map +1 -1
- package/dist/providers/index.d.ts +0 -1
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/names.d.ts +0 -1
- package/dist/providers/names.js.map +1 -1
- package/dist/providers/openai/provider.js +1 -1
- package/dist/providers/openai/provider.js.map +1 -1
- package/dist/providers/shared/continuation.js.map +1 -1
- package/dist/providers/shared/session-config.d.ts +3 -8
- package/dist/providers/shared/session-config.js +26 -10
- package/dist/providers/shared/session-config.js.map +1 -1
- package/dist/providers/shared/streaming-core.js +16 -5
- package/dist/providers/shared/streaming-core.js.map +1 -1
- package/dist/providers/shared/streaming-orchestrator.js.map +1 -1
- package/dist/providers/shared/user-agent-guard.js +4 -1
- package/dist/providers/shared/user-agent-guard.js.map +1 -1
- package/dist/settings-patcher/claude.js +4 -4
- package/dist/settings-patcher/claude.js.map +1 -1
- package/dist/settings-patcher/codex.js +15 -4
- package/dist/settings-patcher/codex.js.map +1 -1
- package/dist/settings-patcher/index.js +12 -4
- package/dist/settings-patcher/index.js.map +1 -1
- package/dist/shutdown.js +7 -3
- package/dist/shutdown.js.map +1 -1
- package/dist/startup.d.ts +16 -0
- package/dist/startup.js +40 -11
- package/dist/startup.js.map +1 -1
- package/dist/tool-bridge/bridge-constants.d.ts +2 -0
- package/dist/tool-bridge/bridge-constants.js +3 -0
- package/dist/tool-bridge/bridge-constants.js.map +1 -0
- package/dist/tool-bridge/index.d.ts +0 -1
- package/dist/tool-bridge/index.js +0 -1
- package/dist/tool-bridge/index.js.map +1 -1
- package/dist/tool-bridge/routes.js +53 -49
- package/dist/tool-bridge/routes.js.map +1 -1
- package/dist/tool-bridge/state.d.ts +5 -2
- package/dist/tool-bridge/state.js.map +1 -1
- package/dist/tool-bridge/tool-cache.js.map +1 -1
- package/dist/tool-bridge/tool-router.js +8 -2
- package/dist/tool-bridge/tool-router.js.map +1 -1
- package/dist/utils/child-process.js.map +1 -1
- package/dist/utils/type-guards.d.ts +1 -0
- package/dist/utils/type-guards.js +6 -1
- package/dist/utils/type-guards.js.map +1 -1
- package/package.json +15 -11
- package/patches/@github+copilot-sdk+0.1.32.patch +10 -0
- package/bin/xcode-copilot-server.mjs +0 -7
package/dist/startup.js
CHANGED
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
import { CopilotService, createServer, Logger, Stats, bold, dim, createSpinner, } from "copilot-sdk-proxy";
|
|
2
|
-
import { loadConfig, loadAllProviderConfigs, resolveConfigPath } from "./config.js";
|
|
2
|
+
import { loadConfig, loadAllProviderConfigs, resolveConfigPath, } from "./config.js";
|
|
3
3
|
import { providers, createAutoProvider } from "./providers/index.js";
|
|
4
4
|
import { patchSettings } from "./settings-patcher/index.js";
|
|
5
5
|
import { parsePort, parseLogLevel, parseProviderMode, parseIdleTimeout, validateAutoPatch, } from "./cli-validators.js";
|
|
6
6
|
import { activateSocket } from "./launchd/index.js";
|
|
7
7
|
import { printProxyBanner } from "./banner.js";
|
|
8
8
|
import { registerShutdownHandlers } from "./shutdown.js";
|
|
9
|
-
function parseOptions(options) {
|
|
9
|
+
export function parseOptions(options) {
|
|
10
10
|
const logLevel = parseLogLevel(options.logLevel);
|
|
11
11
|
const logger = new Logger(logLevel);
|
|
12
12
|
const port = parsePort(options.port);
|
|
13
|
-
const proxyMode = options.proxy
|
|
14
|
-
|
|
13
|
+
const proxyMode = options.proxy
|
|
14
|
+
? parseProviderMode(options.proxy)
|
|
15
|
+
: "auto";
|
|
16
|
+
const idleTimeoutMinutes = options.idleTimeout
|
|
17
|
+
? parseIdleTimeout(options.idleTimeout)
|
|
18
|
+
: 0;
|
|
15
19
|
const launchdMode = options.launchd === true;
|
|
16
20
|
const isAuto = proxyMode === "auto";
|
|
17
21
|
const shouldPatch = isAuto
|
|
@@ -20,15 +24,31 @@ function parseOptions(options) {
|
|
|
20
24
|
if (!isAuto && !launchdMode) {
|
|
21
25
|
validateAutoPatch(proxyMode, options.autoPatch === true);
|
|
22
26
|
}
|
|
23
|
-
const configPath = options.config ??
|
|
27
|
+
const configPath = options.config ??
|
|
28
|
+
resolveConfigPath(options.cwd, process.cwd(), options.defaultConfigPath);
|
|
24
29
|
const quiet = logLevel === "none" || launchdMode;
|
|
25
|
-
return {
|
|
30
|
+
return {
|
|
31
|
+
port,
|
|
32
|
+
proxyMode,
|
|
33
|
+
logLevel,
|
|
34
|
+
logger,
|
|
35
|
+
quiet,
|
|
36
|
+
launchdMode,
|
|
37
|
+
shouldPatch,
|
|
38
|
+
idleTimeoutMinutes,
|
|
39
|
+
configPath,
|
|
40
|
+
cwd: options.cwd,
|
|
41
|
+
};
|
|
26
42
|
}
|
|
27
43
|
async function loadProvider(parsed) {
|
|
28
44
|
const { proxyMode, configPath, logger } = parsed;
|
|
29
45
|
if (proxyMode === "auto") {
|
|
30
46
|
const allConfigs = await loadAllProviderConfigs(configPath, logger);
|
|
31
|
-
return {
|
|
47
|
+
return {
|
|
48
|
+
provider: createAutoProvider(allConfigs.providers),
|
|
49
|
+
config: allConfigs.shared,
|
|
50
|
+
allConfigs,
|
|
51
|
+
};
|
|
32
52
|
}
|
|
33
53
|
const config = await loadConfig(configPath, logger, proxyMode);
|
|
34
54
|
return { provider: providers[proxyMode], config };
|
|
@@ -41,7 +61,9 @@ async function initializeService(parsed, version) {
|
|
|
41
61
|
console.log(` ${bold("xcode-copilot-server")} ${dim(`v${version}`)}`);
|
|
42
62
|
console.log();
|
|
43
63
|
}
|
|
44
|
-
const bootSpinner = quiet
|
|
64
|
+
const bootSpinner = quiet
|
|
65
|
+
? null
|
|
66
|
+
: createSpinner("Initialising Copilot SDK...");
|
|
45
67
|
await service.start();
|
|
46
68
|
bootSpinner?.succeed("Copilot SDK initialised");
|
|
47
69
|
const authSpinner = quiet ? null : createSpinner("Authenticating...");
|
|
@@ -58,7 +80,9 @@ async function initializeService(parsed, version) {
|
|
|
58
80
|
}
|
|
59
81
|
async function bindAndListen(app, parsed) {
|
|
60
82
|
const { port, quiet, launchdMode, logger } = parsed;
|
|
61
|
-
const listenSpinner = quiet
|
|
83
|
+
const listenSpinner = quiet
|
|
84
|
+
? null
|
|
85
|
+
: createSpinner(`Starting server on port ${String(port)}...`);
|
|
62
86
|
const prevPinoLevel = app.log.level;
|
|
63
87
|
app.log.level = "silent";
|
|
64
88
|
if (launchdMode) {
|
|
@@ -124,8 +148,13 @@ export async function startServer(options) {
|
|
|
124
148
|
await bindAndListen(app, parsed);
|
|
125
149
|
printBanner(parsed, provider, service, config, allConfigs);
|
|
126
150
|
registerShutdownHandlers({
|
|
127
|
-
app,
|
|
128
|
-
|
|
151
|
+
app,
|
|
152
|
+
service,
|
|
153
|
+
logger,
|
|
154
|
+
stats,
|
|
155
|
+
shouldPatch,
|
|
156
|
+
proxyMode,
|
|
157
|
+
quiet,
|
|
129
158
|
lastActivityRef: () => lastActivity,
|
|
130
159
|
idleTimeoutMinutes: parsed.idleTimeoutMinutes,
|
|
131
160
|
});
|
package/dist/startup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startup.js","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,MAAM,EACN,KAAK,EACL,IAAI,
|
|
1
|
+
{"version":3,"file":"startup.js","sourceRoot":"","sources":["../src/startup.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bridge-constants.js","sourceRoot":"","sources":["../../src/tool-bridge/bridge-constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,cAAc,CAAC;AACjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,kBAAkB,GAAG,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { FastifyInstance } from "fastify";
|
|
2
2
|
import type { Logger } from "copilot-sdk-proxy";
|
|
3
3
|
import { ConversationManager } from "../conversation-manager.js";
|
|
4
|
-
export { BRIDGE_SERVER_NAME, BRIDGE_TOOL_PREFIX } from "../bridge-constants.js";
|
|
5
4
|
export declare function registerToolBridge(app: FastifyInstance, logger: Logger, toolBridgeTimeoutMs?: number): ConversationManager;
|
|
6
5
|
export declare function resolveToolBridgeManager(app: FastifyInstance, existing: ConversationManager | undefined, logger: Logger, toolBridgeTimeoutMs?: number): ConversationManager;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ConversationManager } from "../conversation-manager.js";
|
|
2
2
|
import { registerRoutes } from "./routes.js";
|
|
3
|
-
export { BRIDGE_SERVER_NAME, BRIDGE_TOOL_PREFIX } from "../bridge-constants.js";
|
|
4
3
|
export function registerToolBridge(app, logger, toolBridgeTimeoutMs = 0) {
|
|
5
4
|
const manager = new ConversationManager(logger, toolBridgeTimeoutMs);
|
|
6
5
|
registerRoutes(app, manager, logger);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tool-bridge/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tool-bridge/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,UAAU,kBAAkB,CAChC,GAAoB,EACpB,MAAc,EACd,mBAAmB,GAAG,CAAC;IAEvB,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACrE,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACrC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB,CACtC,GAAoB,EACpB,QAAyC,EACzC,MAAc,EACd,mBAAmB,GAAG,CAAC;IAEvB,OAAO,QAAQ,IAAI,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAC1E,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import { BRIDGE_SERVER_NAME } from "
|
|
3
|
-
import { isRecord } from "../utils/type-guards.js";
|
|
2
|
+
import { BRIDGE_SERVER_NAME } from "./bridge-constants.js";
|
|
3
|
+
import { isRecord, errorMessage } from "../utils/type-guards.js";
|
|
4
4
|
import { JSONRPC_PARSE_ERROR, JSONRPC_INVALID_PARAMS, JSONRPC_METHOD_NOT_FOUND, JSONRPC_INTERNAL_ERROR, } from "./constants.js";
|
|
5
5
|
const JsonRpcRequestSchema = z.object({
|
|
6
6
|
jsonrpc: z.literal("2.0"),
|
|
@@ -22,19 +22,57 @@ const MCP_TOOL_PREFIX = /^mcp__[^_]+__/;
|
|
|
22
22
|
function stripMCPToolPrefix(name) {
|
|
23
23
|
return name.replace(MCP_TOOL_PREFIX, "");
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
25
|
+
function handleSseStream(request, reply, logger) {
|
|
26
|
+
const { convId } = request.params;
|
|
27
|
+
logger.debug(`MCP ${convId}: SSE stream opened`);
|
|
28
|
+
reply.raw.writeHead(200, {
|
|
29
|
+
"Content-Type": "text/event-stream",
|
|
30
|
+
"Cache-Control": "no-cache",
|
|
31
|
+
Connection: "keep-alive",
|
|
32
|
+
});
|
|
33
|
+
request.raw.on("close", () => {
|
|
34
|
+
logger.debug(`MCP ${convId}: SSE stream closed`);
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
async function handleToolCall(convId, id, params, stateProvider, logger) {
|
|
38
|
+
const state = stateProvider.getState(convId);
|
|
39
|
+
if (!state) {
|
|
40
|
+
logger.warn(`MCP ${convId} tools/call: conversation not found`);
|
|
41
|
+
return jsonRpcError(id, JSONRPC_INTERNAL_ERROR, "Conversation not found");
|
|
42
|
+
}
|
|
43
|
+
const rawName = params?.["name"];
|
|
44
|
+
const name = typeof rawName === "string" ? rawName : undefined;
|
|
45
|
+
const rawArgs = params?.["arguments"];
|
|
46
|
+
const args = isRecord(rawArgs) ? rawArgs : {};
|
|
47
|
+
if (!name) {
|
|
48
|
+
return jsonRpcError(id, JSONRPC_INVALID_PARAMS, "Missing tool name");
|
|
49
|
+
}
|
|
50
|
+
const resolved = state.toolCache.resolveToolName(name);
|
|
51
|
+
if (resolved !== name) {
|
|
52
|
+
logger.info(`MCP ${convId} tools/call: name="${name}" resolved to "${resolved}", args=${JSON.stringify(args)}`);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
logger.info(`MCP ${convId} tools/call: name="${name}", args=${JSON.stringify(args)}`);
|
|
56
|
+
}
|
|
57
|
+
try {
|
|
58
|
+
const result = await new Promise((resolve, reject) => {
|
|
59
|
+
state.toolRouter.registerMCPRequest(resolved, resolve, reject);
|
|
34
60
|
});
|
|
35
|
-
|
|
36
|
-
|
|
61
|
+
logger.info(`MCP ${convId} tools/call resolved: name="${name}"`);
|
|
62
|
+
return jsonRpcResult(id, {
|
|
63
|
+
content: [{ type: "text", text: result }],
|
|
37
64
|
});
|
|
65
|
+
}
|
|
66
|
+
catch (err) {
|
|
67
|
+
logger.debug(`MCP ${convId} tools/call error details:`, err);
|
|
68
|
+
const message = errorMessage(err);
|
|
69
|
+
logger.error(`MCP ${convId} tools/call error: ${message}`);
|
|
70
|
+
return jsonRpcError(id, JSONRPC_INTERNAL_ERROR, message);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
export function registerRoutes(app, stateProvider, logger) {
|
|
74
|
+
app.get("/mcp/:convId", (request, reply) => {
|
|
75
|
+
handleSseStream(request, reply, logger);
|
|
38
76
|
});
|
|
39
77
|
app.post("/mcp/:convId", async (request, reply) => {
|
|
40
78
|
const { convId } = request.params;
|
|
@@ -70,42 +108,8 @@ export function registerRoutes(app, stateProvider, logger) {
|
|
|
70
108
|
logger.debug(`MCP ${convId} tools/list: ${String(tools.length)} tools`);
|
|
71
109
|
return reply.send(jsonRpcResult(id, { tools }));
|
|
72
110
|
}
|
|
73
|
-
case "tools/call":
|
|
74
|
-
|
|
75
|
-
if (!state) {
|
|
76
|
-
logger.warn(`MCP ${convId} tools/call: conversation not found`);
|
|
77
|
-
return reply.send(jsonRpcError(id, JSONRPC_INTERNAL_ERROR, "Conversation not found"));
|
|
78
|
-
}
|
|
79
|
-
const rawName = params?.["name"];
|
|
80
|
-
const name = typeof rawName === "string" ? rawName : undefined;
|
|
81
|
-
const rawArgs = params?.["arguments"];
|
|
82
|
-
const args = isRecord(rawArgs) ? rawArgs : {};
|
|
83
|
-
if (!name) {
|
|
84
|
-
return reply.send(jsonRpcError(id, JSONRPC_INVALID_PARAMS, "Missing tool name"));
|
|
85
|
-
}
|
|
86
|
-
const resolved = state.toolCache.resolveToolName(name);
|
|
87
|
-
if (resolved !== name) {
|
|
88
|
-
logger.info(`MCP ${convId} tools/call: name="${name}" resolved to "${resolved}", args=${JSON.stringify(args)}`);
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
logger.info(`MCP ${convId} tools/call: name="${name}", args=${JSON.stringify(args)}`);
|
|
92
|
-
}
|
|
93
|
-
try {
|
|
94
|
-
const result = await new Promise((resolve, reject) => {
|
|
95
|
-
state.toolRouter.registerMCPRequest(resolved, resolve, reject);
|
|
96
|
-
});
|
|
97
|
-
logger.info(`MCP ${convId} tools/call resolved: name="${name}"`);
|
|
98
|
-
return await reply.send(jsonRpcResult(id, {
|
|
99
|
-
content: [{ type: "text", text: result }],
|
|
100
|
-
}));
|
|
101
|
-
}
|
|
102
|
-
catch (err) {
|
|
103
|
-
logger.debug(`MCP ${convId} tools/call error details:`, err);
|
|
104
|
-
const message = err instanceof Error ? err.message : String(err);
|
|
105
|
-
logger.error(`MCP ${convId} tools/call error: ${message}`);
|
|
106
|
-
return reply.send(jsonRpcError(id, JSONRPC_INTERNAL_ERROR, message));
|
|
107
|
-
}
|
|
108
|
-
}
|
|
111
|
+
case "tools/call":
|
|
112
|
+
return reply.send(await handleToolCall(convId, id, params, stateProvider, logger));
|
|
109
113
|
default:
|
|
110
114
|
return reply.send(jsonRpcError(id, JSONRPC_METHOD_NOT_FOUND, `Method not found: ${method}`));
|
|
111
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/tool-bridge/routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/tool-bridge/routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import type { filterFunctionTools } from "copilot-sdk-proxy";
|
|
1
2
|
import { ToolCache } from "./tool-cache.js";
|
|
2
3
|
import { ToolRouter } from "./tool-router.js";
|
|
3
4
|
import { ReplyTracker } from "./reply-tracker.js";
|
|
4
5
|
import { SessionLifecycle } from "./session-lifecycle.js";
|
|
6
|
+
type FunctionTool = ReturnType<typeof filterFunctionTools>[number];
|
|
5
7
|
export declare class ToolBridgeState {
|
|
6
8
|
readonly toolCache: ToolCache;
|
|
7
9
|
readonly toolRouter: ToolRouter;
|
|
@@ -9,6 +11,7 @@ export declare class ToolBridgeState {
|
|
|
9
11
|
readonly session: SessionLifecycle;
|
|
10
12
|
private _filteredTools;
|
|
11
13
|
constructor(toolBridgeTimeoutMs?: number);
|
|
12
|
-
get filteredTools():
|
|
13
|
-
setFilteredTools(tools:
|
|
14
|
+
get filteredTools(): FunctionTool[] | undefined;
|
|
15
|
+
setFilteredTools(tools: FunctionTool[]): void;
|
|
14
16
|
}
|
|
17
|
+
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/tool-bridge/state.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/tool-bridge/state.ts"],"names":[],"mappings":"AACA,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;AAI1D,MAAM,OAAO,eAAe;IACjB,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAC5B,UAAU,CAAa;IACvB,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IAC7B,OAAO,CAAmB;IAC3B,cAAc,CAA6B;IAEnD,YAAY,mBAAmB,GAAG,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,mBAAmB,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,KAAqB;QACpC,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC9B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-cache.js","sourceRoot":"","sources":["../../src/tool-bridge/tool-cache.ts"],"names":[],"mappings":"AAEA,wEAAwE;AACxE,kEAAkE;AAClE,MAAM,YAAY,GAAgC,IAAI,GAAG,CAAC;IACxD,CAAC,YAAY,EAAE,IAAI,CAAC;IACpB,CAAC,iBAAiB,EAAE,IAAI,CAAC;IACzB,CAAC,aAAa,EAAE,IAAI,CAAC;IACrB,CAAC,iBAAiB,EAAE,IAAI,CAAC;IACzB,CAAC,cAAc,EAAE,IAAI,CAAC;IACtB,CAAC,YAAY,EAAE,IAAI,CAAC;IACpB,CAAC,eAAe,EAAE,IAAI,CAAC;IACvB,CAAC,aAAa,EAAE,IAAI,CAAC;CACtB,CAAC,CAAC;AAEH,SAAS,YAAY,CAAC,CAAS;IAC7B,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,YAAY,CAAC,CAAS;IAC7B,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AACnE,CAAC;AAOD,MAAM,OAAO,SAAS;IACZ,WAAW,GAA8B,EAAE,CAAC;IAEpD,UAAU,CAAC,KAAgC;QACzC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,yEAAyE;IACzE,uEAAuE;IACvE,eAAe,CAAC,IAAY;QAC1B,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAE/D,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACxE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC;YAAE,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE/D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uEAAuE;IACvE,kEAAkE;IAClE,uEAAuE;IACvE,wEAAwE;IACxE,qEAAqE;IACrE,aAAa,CACX,QAAgB,EAChB,IAA6B;QAE7B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAC/D,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"tool-cache.js","sourceRoot":"","sources":["../../src/tool-bridge/tool-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,8 @@ export class ToolRouter {
|
|
|
11
11
|
this.timeoutMs = timeoutMs;
|
|
12
12
|
}
|
|
13
13
|
hasPendingToolCall(toolCallId) {
|
|
14
|
-
return this.pendingByCallId.has(toolCallId) ||
|
|
14
|
+
return (this.pendingByCallId.has(toolCallId) ||
|
|
15
|
+
this.expectedByCallId.has(toolCallId));
|
|
15
16
|
}
|
|
16
17
|
hasExpectedTool(name) {
|
|
17
18
|
const queue = this.expectedByName.get(name);
|
|
@@ -89,7 +90,12 @@ export class ToolRouter {
|
|
|
89
90
|
reject(new Error(`Tool call ${toolCallId} timed out after ${String(this.timeoutMs)}ms`));
|
|
90
91
|
}, this.timeoutMs)
|
|
91
92
|
: undefined;
|
|
92
|
-
this.pendingByCallId.set(toolCallId, {
|
|
93
|
+
this.pendingByCallId.set(toolCallId, {
|
|
94
|
+
toolCallId,
|
|
95
|
+
resolve,
|
|
96
|
+
reject,
|
|
97
|
+
timeout,
|
|
98
|
+
});
|
|
93
99
|
}
|
|
94
100
|
}
|
|
95
101
|
//# sourceMappingURL=tool-router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-router.js","sourceRoot":"","sources":["../../src/tool-bridge/tool-router.ts"],"names":[],"mappings":"AAOA,gFAAgF;AAChF,gFAAgF;AAChF,qFAAqF;AACrF,MAAM,OAAO,UAAU;IACJ,SAAS,CAAS;IAClB,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC9D,yEAAyE;IACxD,gBAAgB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC7C,eAAe,GAAG,IAAI,GAAG,EAA6B,CAAC;IAExE,YAAY,SAAS,GAAG,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,kBAAkB,CAAC,UAAkB;QACnC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"tool-router.js","sourceRoot":"","sources":["../../src/tool-bridge/tool-router.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAC/B,GAAW,EACX,IAAc;IAEd,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAClD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
export function isRecord(value) {
|
|
2
2
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
3
3
|
}
|
|
4
|
+
export function errorMessage(err) {
|
|
5
|
+
return err instanceof Error ? err.message : String(err);
|
|
6
|
+
}
|
|
4
7
|
export function isErrnoException(err) {
|
|
5
|
-
return err instanceof Error &&
|
|
8
|
+
return (err instanceof Error &&
|
|
9
|
+
"code" in err &&
|
|
10
|
+
typeof err.code === "string");
|
|
6
11
|
}
|
|
7
12
|
//# sourceMappingURL=type-guards.js.map
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,YAAY,CAAC,GAAY;IACvC,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAY;IAC3C,OAAO,CACL,GAAG,YAAY,KAAK;QACpB,MAAM,IAAI,GAAG;QACb,OAAQ,GAAyB,CAAC,IAAI,KAAK,QAAQ,CACpD,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xcode-copilot-server",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.5",
|
|
4
4
|
"description": "OpenAI-compatible proxy API server for Xcode, powered by GitHub Copilot",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -12,40 +12,44 @@
|
|
|
12
12
|
"node": "25.6.0"
|
|
13
13
|
},
|
|
14
14
|
"bin": {
|
|
15
|
-
"xcode-copilot-server": "
|
|
15
|
+
"xcode-copilot-server": "dist/index.js"
|
|
16
16
|
},
|
|
17
17
|
"files": [
|
|
18
|
-
"bin/",
|
|
19
18
|
"dist/",
|
|
19
|
+
"patches/",
|
|
20
20
|
"config.json5"
|
|
21
21
|
],
|
|
22
22
|
"scripts": {
|
|
23
|
+
"postinstall": "npx patch-package",
|
|
23
24
|
"build": "tsc",
|
|
24
25
|
"start": "node dist/index.js",
|
|
25
26
|
"dev": "tsx src/index.ts",
|
|
26
27
|
"test": "vitest run",
|
|
27
28
|
"test:watch": "vitest",
|
|
28
|
-
"
|
|
29
|
+
"fmt": "oxfmt --write src/ test/",
|
|
30
|
+
"fmt:check": "oxfmt --check src/ test/",
|
|
31
|
+
"lint": "oxlint",
|
|
29
32
|
"typecheck": "tsc -p tsconfig.check.json",
|
|
30
33
|
"prepublishOnly": "npm run build"
|
|
31
34
|
},
|
|
32
35
|
"dependencies": {
|
|
33
36
|
"commander": "14.0.3",
|
|
34
|
-
"copilot-sdk-proxy": "
|
|
37
|
+
"copilot-sdk-proxy": "4.0.4",
|
|
35
38
|
"fastify": "5.8.2",
|
|
36
39
|
"json5": "2.2.3",
|
|
37
|
-
"koffi": "2.15.
|
|
40
|
+
"koffi": "2.15.2",
|
|
38
41
|
"plist": "3.1.0",
|
|
39
42
|
"zod": "4.3.6"
|
|
40
43
|
},
|
|
41
44
|
"devDependencies": {
|
|
42
|
-
"@
|
|
43
|
-
"@types/node": "25.3.5",
|
|
45
|
+
"@types/node": "25.5.0",
|
|
44
46
|
"@types/plist": "3.0.5",
|
|
45
|
-
"
|
|
47
|
+
"llm-mock-server": "1.0.4",
|
|
48
|
+
"oxfmt": "0.40.0",
|
|
49
|
+
"oxlint": "1.55.0",
|
|
50
|
+
"patch-package": "8.0.1",
|
|
46
51
|
"tsx": "4.21.0",
|
|
47
52
|
"typescript": "5.9.3",
|
|
48
|
-
"
|
|
49
|
-
"vitest": "4.0.18"
|
|
53
|
+
"vitest": "4.1.0"
|
|
50
54
|
}
|
|
51
55
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
diff --git a/node_modules/@github/copilot-sdk/dist/session.js b/node_modules/@github/copilot-sdk/dist/session.js
|
|
2
|
+
index 1b92b45..ae64f5d 100644
|
|
3
|
+
--- a/node_modules/@github/copilot-sdk/dist/session.js
|
|
4
|
+
+++ b/node_modules/@github/copilot-sdk/dist/session.js
|
|
5
|
+
@@ -1,4 +1,4 @@
|
|
6
|
+
-import { ConnectionError, ResponseError } from "vscode-jsonrpc/node";
|
|
7
|
+
+import { ConnectionError, ResponseError } from "vscode-jsonrpc/node.js";
|
|
8
|
+
import { createSessionRpc } from "./generated/rpc.js";
|
|
9
|
+
class CopilotSession {
|
|
10
|
+
/**
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
|
|
3
|
-
// Register the ESM resolution hook before loading the main entry point.
|
|
4
|
-
// This must happen via dynamic import() so the hook is active when
|
|
5
|
-
// @github/copilot-sdk's static imports are resolved.
|
|
6
|
-
import "../dist/fix-jsonrpc-import.js";
|
|
7
|
-
await import("../dist/index.js");
|