xcode-copilot-server 2.2.0 → 3.0.0
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/README.md +83 -26
- package/config.json5 +13 -8
- package/dist/cli-validators.js +2 -2
- package/dist/cli-validators.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/conversation-manager.d.ts +2 -1
- package/dist/conversation-manager.js +20 -1
- package/dist/conversation-manager.js.map +1 -1
- package/dist/handlers/responses/streaming.d.ts +6 -0
- package/dist/handlers/responses/streaming.js +265 -0
- package/dist/handlers/responses/streaming.js.map +1 -0
- package/dist/handlers/responses/tool-result-handler.d.ts +4 -0
- package/dist/handlers/responses/tool-result-handler.js +9 -0
- package/dist/handlers/responses/tool-result-handler.js.map +1 -0
- package/dist/handlers/responses.d.ts +4 -0
- package/dist/handlers/responses.js +164 -0
- package/dist/handlers/responses.js.map +1 -0
- package/dist/handlers/streaming-utils.d.ts +1 -0
- package/dist/handlers/streaming-utils.js +3 -0
- package/dist/handlers/streaming-utils.js.map +1 -1
- package/dist/index.js +23 -108
- package/dist/index.js.map +1 -1
- package/dist/providers/claude/count-tokens.d.ts +3 -0
- package/dist/providers/claude/count-tokens.js +72 -0
- package/dist/providers/claude/count-tokens.js.map +1 -0
- package/dist/providers/claude/handler.d.ts +4 -0
- package/dist/providers/claude/handler.js +150 -0
- package/dist/providers/claude/handler.js.map +1 -0
- package/dist/providers/claude/prompt.d.ts +2 -0
- package/dist/providers/claude/prompt.js +52 -0
- package/dist/providers/claude/prompt.js.map +1 -0
- package/dist/providers/claude/provider.d.ts +5 -0
- package/dist/providers/claude/provider.js +28 -0
- package/dist/providers/claude/provider.js.map +1 -0
- package/dist/providers/claude/schemas.d.ts +140 -0
- package/dist/providers/claude/schemas.js +58 -0
- package/dist/providers/claude/schemas.js.map +1 -0
- package/dist/providers/claude/streaming.d.ts +6 -0
- package/dist/providers/claude/streaming.js +116 -0
- package/dist/providers/claude/streaming.js.map +1 -0
- package/dist/providers/claude/tool-results.d.ts +4 -0
- package/dist/providers/claude/tool-results.js +19 -0
- package/dist/providers/claude/tool-results.js.map +1 -0
- package/dist/providers/codex/handler.d.ts +4 -0
- package/dist/providers/codex/handler.js +164 -0
- package/dist/providers/codex/handler.js.map +1 -0
- package/dist/providers/codex/prompt.d.ts +4 -0
- package/dist/providers/codex/prompt.js +58 -0
- package/dist/providers/codex/prompt.js.map +1 -0
- package/dist/providers/codex/provider.d.ts +5 -0
- package/dist/providers/codex/provider.js +24 -0
- package/dist/providers/codex/provider.js.map +1 -0
- package/dist/providers/codex/schemas.d.ts +122 -0
- package/dist/providers/codex/schemas.js +55 -0
- package/dist/providers/codex/schemas.js.map +1 -0
- package/dist/providers/codex/streaming.d.ts +9 -0
- package/dist/providers/codex/streaming.js +172 -0
- package/dist/providers/codex/streaming.js.map +1 -0
- package/dist/providers/codex/tool-results.d.ts +4 -0
- package/dist/providers/codex/tool-results.js +9 -0
- package/dist/providers/codex/tool-results.js.map +1 -0
- package/dist/providers/codex.d.ts +5 -0
- package/dist/providers/codex.js +24 -0
- package/dist/providers/codex.js.map +1 -0
- package/dist/providers/index.d.ts +6 -1
- package/dist/providers/index.js +5 -3
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai/handler.d.ts +4 -0
- package/dist/providers/openai/handler.js +120 -0
- package/dist/providers/openai/handler.js.map +1 -0
- package/dist/providers/openai/models.d.ts +3 -0
- package/dist/providers/openai/models.js +28 -0
- package/dist/providers/openai/models.js.map +1 -0
- package/dist/providers/openai/prompt.d.ts +3 -0
- package/dist/providers/openai/prompt.js +38 -0
- package/dist/providers/openai/prompt.js.map +1 -0
- package/dist/providers/openai/provider.d.ts +5 -0
- package/dist/providers/openai/provider.js +25 -0
- package/dist/providers/openai/provider.js.map +1 -0
- package/dist/providers/openai/schemas.d.ts +98 -0
- package/dist/providers/openai/schemas.js +76 -0
- package/dist/providers/openai/schemas.js.map +1 -0
- package/dist/providers/openai/streaming.d.ts +4 -0
- package/dist/providers/openai/streaming.js +121 -0
- package/dist/providers/openai/streaming.js.map +1 -0
- package/dist/providers/shared/errors.d.ts +5 -0
- package/dist/providers/shared/errors.js +10 -0
- package/dist/providers/shared/errors.js.map +1 -0
- package/dist/providers/shared/model-resolver.d.ts +3 -0
- package/dist/providers/shared/model-resolver.js +45 -0
- package/dist/providers/shared/model-resolver.js.map +1 -0
- package/dist/providers/shared/prompt-utils.d.ts +1 -0
- package/dist/providers/shared/prompt-utils.js +15 -0
- package/dist/providers/shared/prompt-utils.js.map +1 -0
- package/dist/providers/shared/session-config.d.ts +15 -0
- package/dist/providers/shared/session-config.js +98 -0
- package/dist/providers/shared/session-config.js.map +1 -0
- package/dist/providers/shared/streaming-core.d.ts +19 -0
- package/dist/providers/shared/streaming-core.js +176 -0
- package/dist/providers/shared/streaming-core.js.map +1 -0
- package/dist/providers/shared/streaming-utils.d.ts +10 -0
- package/dist/providers/shared/streaming-utils.js +28 -0
- package/dist/providers/shared/streaming-utils.js.map +1 -0
- package/dist/schemas/config.d.ts +19 -1
- package/dist/schemas/config.js +2 -1
- package/dist/schemas/config.js.map +1 -1
- package/dist/schemas/responses.d.ts +122 -0
- package/dist/schemas/responses.js +54 -0
- package/dist/schemas/responses.js.map +1 -0
- package/dist/server.js +1 -2
- package/dist/server.js.map +1 -1
- package/dist/settings-patcher/anthropic.d.ts +5 -0
- package/dist/{settings-patcher.js → settings-patcher/anthropic.js} +3 -7
- package/dist/settings-patcher/anthropic.js.map +1 -0
- package/dist/settings-patcher/claude.d.ts +5 -0
- package/dist/settings-patcher/claude.js +75 -0
- package/dist/settings-patcher/claude.js.map +1 -0
- package/dist/settings-patcher/codex.d.ts +23 -0
- package/dist/settings-patcher/codex.js +114 -0
- package/dist/settings-patcher/codex.js.map +1 -0
- package/dist/settings-patcher/index.d.ts +15 -0
- package/dist/settings-patcher/index.js +9 -0
- package/dist/settings-patcher/index.js.map +1 -0
- package/dist/{settings-patcher.d.ts → settings-patcher/types.d.ts} +1 -5
- package/dist/settings-patcher/types.js +2 -0
- package/dist/settings-patcher/types.js.map +1 -0
- package/dist/startup.d.ts +11 -0
- package/dist/startup.js +154 -0
- package/dist/startup.js.map +1 -0
- package/dist/tool-bridge/constants.d.ts +2 -0
- package/dist/tool-bridge/constants.js +3 -0
- package/dist/tool-bridge/constants.js.map +1 -0
- package/dist/tool-bridge/index.d.ts +1 -0
- package/dist/tool-bridge/index.js +1 -0
- package/dist/tool-bridge/index.js.map +1 -1
- package/dist/tool-bridge/routes.js +2 -1
- package/dist/tool-bridge/routes.js.map +1 -1
- package/dist/tool-bridge/session-lifecycle.js +1 -1
- package/dist/tool-bridge/state.d.ts +1 -1
- package/dist/tool-bridge/tool-cache.d.ts +1 -1
- package/dist/ui.d.ts +7 -0
- package/dist/ui.js +8 -0
- package/dist/ui.js.map +1 -1
- package/dist/utils/responses-prompt.d.ts +4 -0
- package/dist/utils/responses-prompt.js +58 -0
- package/dist/utils/responses-prompt.js.map +1 -0
- package/package.json +1 -1
- package/dist/settings-patcher.js.map +0 -1
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { formatCompaction, SSE_HEADERS } from "../shared/streaming-utils.js";
|
|
2
|
+
import { currentTimestamp } from "./schemas.js";
|
|
3
|
+
const REQUEST_TIMEOUT_MS = 5 * 60 * 1000;
|
|
4
|
+
export async function handleStreaming(reply, session, prompt, model, logger) {
|
|
5
|
+
reply.raw.writeHead(200, SSE_HEADERS);
|
|
6
|
+
const completionId = `chatcmpl-${String(Date.now())}`;
|
|
7
|
+
function sendChunk(delta, finishReason) {
|
|
8
|
+
const chunk = {
|
|
9
|
+
id: completionId,
|
|
10
|
+
object: "chat.completion.chunk",
|
|
11
|
+
created: currentTimestamp(),
|
|
12
|
+
model,
|
|
13
|
+
choices: [
|
|
14
|
+
{
|
|
15
|
+
index: 0,
|
|
16
|
+
delta,
|
|
17
|
+
finish_reason: finishReason,
|
|
18
|
+
},
|
|
19
|
+
],
|
|
20
|
+
};
|
|
21
|
+
reply.raw.write(`data: ${JSON.stringify(chunk)}\n\n`);
|
|
22
|
+
}
|
|
23
|
+
sendChunk({ role: "assistant" }, null);
|
|
24
|
+
const { promise, resolve } = Promise.withResolvers();
|
|
25
|
+
let done = false;
|
|
26
|
+
function cleanup() {
|
|
27
|
+
done = true;
|
|
28
|
+
clearTimeout(timeout);
|
|
29
|
+
unsubscribe();
|
|
30
|
+
}
|
|
31
|
+
reply.raw.on("close", () => {
|
|
32
|
+
if (!done) {
|
|
33
|
+
logger.info("Client disconnected, aborting session");
|
|
34
|
+
cleanup();
|
|
35
|
+
session.abort().catch((err) => {
|
|
36
|
+
logger.error("Failed to abort session:", err);
|
|
37
|
+
});
|
|
38
|
+
resolve(false);
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
const timeout = setTimeout(() => {
|
|
42
|
+
logger.warn("Stream timed out after 5 minutes");
|
|
43
|
+
cleanup();
|
|
44
|
+
reply.raw.end();
|
|
45
|
+
resolve(false);
|
|
46
|
+
}, REQUEST_TIMEOUT_MS);
|
|
47
|
+
// Buffer deltas so we can drop intermediate narration before tool calls
|
|
48
|
+
let pendingDeltas = [];
|
|
49
|
+
const toolNames = new Map();
|
|
50
|
+
function flushPending() {
|
|
51
|
+
for (const text of pendingDeltas) {
|
|
52
|
+
sendChunk({ content: text }, null);
|
|
53
|
+
}
|
|
54
|
+
pendingDeltas = [];
|
|
55
|
+
}
|
|
56
|
+
const unsubscribe = session.on((event) => {
|
|
57
|
+
if (event.type === "tool.execution_start") {
|
|
58
|
+
const d = event.data;
|
|
59
|
+
toolNames.set(d.toolCallId, d.toolName);
|
|
60
|
+
logger.debug(`Running ${d.toolName} (${JSON.stringify(d.arguments)})`);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
if (event.type === "tool.execution_complete") {
|
|
64
|
+
const d = event.data;
|
|
65
|
+
const name = toolNames.get(d.toolCallId) ?? d.toolCallId;
|
|
66
|
+
toolNames.delete(d.toolCallId);
|
|
67
|
+
const detail = d.success
|
|
68
|
+
? JSON.stringify(d.result?.content)
|
|
69
|
+
: d.error?.message ?? "failed";
|
|
70
|
+
logger.debug(`${name} done (${detail})`);
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
switch (event.type) {
|
|
74
|
+
case "assistant.message_delta":
|
|
75
|
+
if (event.data.deltaContent) {
|
|
76
|
+
pendingDeltas.push(event.data.deltaContent);
|
|
77
|
+
}
|
|
78
|
+
break;
|
|
79
|
+
case "assistant.message":
|
|
80
|
+
if (event.data.toolRequests && event.data.toolRequests.length > 0) {
|
|
81
|
+
logger.debug(`Calling tools (dropping buffered text): ${event.data.toolRequests.map((tr) => tr.name).join(", ")}`);
|
|
82
|
+
pendingDeltas = [];
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
flushPending();
|
|
86
|
+
}
|
|
87
|
+
break;
|
|
88
|
+
case "session.idle":
|
|
89
|
+
logger.info("Done, wrapping up stream");
|
|
90
|
+
flushPending();
|
|
91
|
+
cleanup();
|
|
92
|
+
sendChunk({}, "stop");
|
|
93
|
+
reply.raw.write("data: [DONE]\n\n");
|
|
94
|
+
reply.raw.end();
|
|
95
|
+
resolve(true);
|
|
96
|
+
break;
|
|
97
|
+
case "session.compaction_start":
|
|
98
|
+
logger.info("Compacting context...");
|
|
99
|
+
break;
|
|
100
|
+
case "session.compaction_complete":
|
|
101
|
+
logger.info(`Context compacted: ${formatCompaction(event.data)}`);
|
|
102
|
+
break;
|
|
103
|
+
case "session.error":
|
|
104
|
+
logger.error(`Session error: ${event.data.message}`);
|
|
105
|
+
cleanup();
|
|
106
|
+
reply.raw.end();
|
|
107
|
+
resolve(false);
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
session.send({ prompt }).catch((err) => {
|
|
112
|
+
logger.error("Failed to send prompt:", err);
|
|
113
|
+
if (!done) {
|
|
114
|
+
cleanup();
|
|
115
|
+
reply.raw.end();
|
|
116
|
+
}
|
|
117
|
+
resolve(false);
|
|
118
|
+
});
|
|
119
|
+
return promise;
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=streaming.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../src/providers/openai/streaming.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { FastifyReply } from "fastify";
|
|
2
|
+
type ErrorType = "invalid_request_error" | "api_error";
|
|
3
|
+
export declare function sendOpenAIError(reply: FastifyReply, status: number, type: ErrorType, message: string): void;
|
|
4
|
+
export declare function sendAnthropicError(reply: FastifyReply, status: number, type: ErrorType, message: string): void;
|
|
5
|
+
export {};
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export function sendOpenAIError(reply, status, type, message) {
|
|
2
|
+
reply.status(status).send({ error: { message, type } });
|
|
3
|
+
}
|
|
4
|
+
export function sendAnthropicError(reply, status, type, message) {
|
|
5
|
+
reply.status(status).send({
|
|
6
|
+
type: "error",
|
|
7
|
+
error: { type, message },
|
|
8
|
+
});
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/providers/shared/errors.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,eAAe,CAC7B,KAAmB,EACnB,MAAc,EACd,IAAe,EACf,OAAe;IAEf,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,KAAmB,EACnB,MAAc,EACd,IAAe,EACf,OAAe;IAEf,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;QACxB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;KACzB,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
function normalize(id) {
|
|
2
|
+
return id.replace(/-\d{8}$/, "").replace(/\./g, "-");
|
|
3
|
+
}
|
|
4
|
+
// We need to group models by family for fallback matching, so we grab the
|
|
5
|
+
// prefix before the first digit (e.g. "claude-sonnet-4-5" becomes "claude-sonnet-").
|
|
6
|
+
// This works for Claude naming but would lump all GPT models into "gpt-"
|
|
7
|
+
// so it'll need reworking once we support non-Claude model families here
|
|
8
|
+
// e.g. if we add Codex support.
|
|
9
|
+
function extractFamily(id) {
|
|
10
|
+
const match = id.match(/^(.*?-)\d/);
|
|
11
|
+
return match?.[1] ?? id;
|
|
12
|
+
}
|
|
13
|
+
export function resolveModel(requestedModel, availableModels, logger) {
|
|
14
|
+
if (availableModels.some((m) => m.id === requestedModel)) {
|
|
15
|
+
return requestedModel;
|
|
16
|
+
}
|
|
17
|
+
const normalizedRequest = normalize(requestedModel);
|
|
18
|
+
const normalizedMatch = availableModels.find((m) => normalize(m.id) === normalizedRequest);
|
|
19
|
+
if (normalizedMatch) {
|
|
20
|
+
logger?.debug(`Model "${requestedModel}" resolved to "${normalizedMatch.id}" (normalized match)`);
|
|
21
|
+
return normalizedMatch.id;
|
|
22
|
+
}
|
|
23
|
+
// Requested version may not exist in Copilot yet (e.g. opus 4.6 falls back to opus 4.5),
|
|
24
|
+
// so fall back to the closest model in the same family.
|
|
25
|
+
const requestFamily = extractFamily(normalizedRequest);
|
|
26
|
+
const familyMatches = availableModels.filter((m) => extractFamily(normalize(m.id)) === requestFamily);
|
|
27
|
+
let best;
|
|
28
|
+
let bestLen = 0;
|
|
29
|
+
for (const m of familyMatches) {
|
|
30
|
+
const norm = normalize(m.id);
|
|
31
|
+
let len = 0;
|
|
32
|
+
const minLen = Math.min(normalizedRequest.length, norm.length);
|
|
33
|
+
while (len < minLen && normalizedRequest[len] === norm[len])
|
|
34
|
+
len++;
|
|
35
|
+
if (len > bestLen) {
|
|
36
|
+
bestLen = len;
|
|
37
|
+
best = m;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
if (!best)
|
|
41
|
+
return undefined;
|
|
42
|
+
logger?.warn(`Model "${requestedModel}" not available, falling back to "${best.id}" (closest in family)`);
|
|
43
|
+
return best.id;
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=model-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../../src/providers/shared/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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function filterExcludedFiles(s: string, patterns: string[]): string;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
function escapeRegex(s) {
|
|
2
|
+
return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
3
|
+
}
|
|
4
|
+
// Xcode's search results can include full file contents for every match, so
|
|
5
|
+
// some files end up being thousands of lines and add nothing useful. We strip
|
|
6
|
+
// fenced code blocks whose header matches the excluded patterns (Xcode formats
|
|
7
|
+
// them as ```swift:/path/to/File.swift).
|
|
8
|
+
export function filterExcludedFiles(s, patterns) {
|
|
9
|
+
if (patterns.length === 0)
|
|
10
|
+
return s;
|
|
11
|
+
const joined = patterns.map(escapeRegex).join("|");
|
|
12
|
+
const re = new RegExp("```\\w*:[^\\n]*(?:" + joined + ")[^\\n]*\\n.*?\\n```\\n?", "gis");
|
|
13
|
+
return s.replace(re, "");
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=prompt-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompt-utils.js","sourceRoot":"","sources":["../../../src/providers/shared/prompt-utils.ts"],"names":[],"mappings":"AAAA,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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { SessionConfig } from "@github/copilot-sdk";
|
|
2
|
+
import type { ServerConfig } from "../../config.js";
|
|
3
|
+
import type { Logger } from "../../logger.js";
|
|
4
|
+
export interface SessionConfigOptions {
|
|
5
|
+
model: string;
|
|
6
|
+
systemMessage?: string | undefined;
|
|
7
|
+
logger: Logger;
|
|
8
|
+
config: ServerConfig;
|
|
9
|
+
supportsReasoningEffort: boolean;
|
|
10
|
+
cwd?: string | undefined;
|
|
11
|
+
hasToolBridge?: boolean;
|
|
12
|
+
port?: number | undefined;
|
|
13
|
+
conversationId?: string | undefined;
|
|
14
|
+
}
|
|
15
|
+
export declare function createSessionConfig({ model, systemMessage, logger, config, supportsReasoningEffort, cwd, hasToolBridge, port, conversationId, }: SessionConfigOptions): SessionConfig;
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { BRIDGE_SERVER_NAME, BRIDGE_TOOL_PREFIX } from "../../tool-bridge/index.js";
|
|
2
|
+
const SDK_BUILT_IN_TOOLS = [
|
|
3
|
+
// shell
|
|
4
|
+
"bash", "write_bash", "read_bash", "stop_bash", "list_bash",
|
|
5
|
+
// file ops
|
|
6
|
+
"view", "apply_patch",
|
|
7
|
+
// search
|
|
8
|
+
"rg", "glob",
|
|
9
|
+
// agents / task management
|
|
10
|
+
"task", "update_todo", "report_intent",
|
|
11
|
+
// interaction
|
|
12
|
+
"ask_user",
|
|
13
|
+
// misc
|
|
14
|
+
"skill", "web_fetch", "fetch_copilot_cli_documentation",
|
|
15
|
+
];
|
|
16
|
+
function isApproved(rule, kind) {
|
|
17
|
+
if (typeof rule === "boolean")
|
|
18
|
+
return rule;
|
|
19
|
+
return rule.some((k) => k === kind);
|
|
20
|
+
}
|
|
21
|
+
export function createSessionConfig({ model, systemMessage, logger, config, supportsReasoningEffort, cwd, hasToolBridge, port, conversationId, }) {
|
|
22
|
+
const hasBridge = !!hasToolBridge;
|
|
23
|
+
return {
|
|
24
|
+
model,
|
|
25
|
+
streaming: true,
|
|
26
|
+
infiniteSessions: { enabled: true },
|
|
27
|
+
workingDirectory: cwd ?? process.cwd(),
|
|
28
|
+
...(systemMessage && {
|
|
29
|
+
systemMessage: {
|
|
30
|
+
mode: "replace",
|
|
31
|
+
content: systemMessage,
|
|
32
|
+
},
|
|
33
|
+
}),
|
|
34
|
+
mcpServers: {
|
|
35
|
+
...Object.fromEntries(Object.entries(config.mcpServers).map(([name, server]) => [
|
|
36
|
+
name,
|
|
37
|
+
{ ...server, tools: ["*"] },
|
|
38
|
+
])),
|
|
39
|
+
...(hasBridge && {
|
|
40
|
+
[BRIDGE_SERVER_NAME]: {
|
|
41
|
+
type: "http",
|
|
42
|
+
url: `http://127.0.0.1:${String(port ?? 8080)}/mcp/${conversationId ?? ""}`,
|
|
43
|
+
tools: ["*"],
|
|
44
|
+
},
|
|
45
|
+
}),
|
|
46
|
+
},
|
|
47
|
+
// When the tool bridge is active, exclude SDK built-in tools so the
|
|
48
|
+
// model uses bridge tools instead (forwarded to Xcode). Tools the user
|
|
49
|
+
// explicitly allows via allowedCliTools are kept. MCP server tools
|
|
50
|
+
// (e.g. github-mcp-server-*) are unaffected by this list.
|
|
51
|
+
...(hasBridge && {
|
|
52
|
+
excludedTools: SDK_BUILT_IN_TOOLS.filter((t) => !config.allowedCliTools.includes("*") && !config.allowedCliTools.includes(t)),
|
|
53
|
+
}),
|
|
54
|
+
...(!hasBridge && config.allowedCliTools.length > 0 && {
|
|
55
|
+
availableTools: config.allowedCliTools,
|
|
56
|
+
}),
|
|
57
|
+
...(config.reasoningEffort && supportsReasoningEffort && {
|
|
58
|
+
reasoningEffort: config.reasoningEffort,
|
|
59
|
+
}),
|
|
60
|
+
onUserInputRequest: (request) => {
|
|
61
|
+
logger.debug(`User input requested: "${request.question}"`);
|
|
62
|
+
return Promise.resolve({
|
|
63
|
+
answer: "User input is not available. Ask your question in your response instead.",
|
|
64
|
+
wasFreeform: true,
|
|
65
|
+
});
|
|
66
|
+
},
|
|
67
|
+
onPermissionRequest: (request) => {
|
|
68
|
+
const approved = isApproved(config.autoApprovePermissions, request.kind);
|
|
69
|
+
logger.debug(`Permission "${request.kind}": ${approved ? "approved" : "denied"}`);
|
|
70
|
+
return Promise.resolve(approved
|
|
71
|
+
? { kind: "approved" }
|
|
72
|
+
: { kind: "denied-by-rules" });
|
|
73
|
+
},
|
|
74
|
+
hooks: {
|
|
75
|
+
onPreToolUse: (input) => {
|
|
76
|
+
const toolName = input.toolName;
|
|
77
|
+
if (hasBridge && toolName.startsWith(BRIDGE_TOOL_PREFIX)) {
|
|
78
|
+
logger.debug(`Tool "${toolName}": allowed (bridge)`);
|
|
79
|
+
return Promise.resolve({ permissionDecision: "allow" });
|
|
80
|
+
}
|
|
81
|
+
if (config.allowedCliTools.includes("*") || config.allowedCliTools.includes(toolName)) {
|
|
82
|
+
logger.debug(`Tool "${toolName}": allowed (CLI)`);
|
|
83
|
+
return Promise.resolve({ permissionDecision: "allow" });
|
|
84
|
+
}
|
|
85
|
+
for (const [serverName, server] of Object.entries(config.mcpServers)) {
|
|
86
|
+
const allowlist = server.allowedTools ?? [];
|
|
87
|
+
if (allowlist.includes("*") || allowlist.includes(toolName)) {
|
|
88
|
+
logger.debug(`Tool "${toolName}": allowed (${serverName})`);
|
|
89
|
+
return Promise.resolve({ permissionDecision: "allow" });
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
logger.debug(`Tool "${toolName}": denied (not in any allowlist)`);
|
|
93
|
+
return Promise.resolve({ permissionDecision: "deny" });
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=session-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-config.js","sourceRoot":"","sources":["../../../src/providers/shared/session-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { FastifyReply } from "fastify";
|
|
2
|
+
import type { CopilotSession } from "@github/copilot-sdk";
|
|
3
|
+
import type { Logger } from "../../logger.js";
|
|
4
|
+
import type { ToolBridgeState } from "../../tool-bridge/state.js";
|
|
5
|
+
export declare function stripBridgePrefix(name: string): string;
|
|
6
|
+
export interface StrippedToolRequest {
|
|
7
|
+
toolCallId: string;
|
|
8
|
+
name: string;
|
|
9
|
+
arguments?: unknown;
|
|
10
|
+
}
|
|
11
|
+
export interface StreamProtocol {
|
|
12
|
+
flushDeltas(reply: FastifyReply, deltas: string[]): void;
|
|
13
|
+
emitToolsAndFinish(reply: FastifyReply, tools: StrippedToolRequest[]): void;
|
|
14
|
+
sendCompleted(reply: FastifyReply): void;
|
|
15
|
+
sendFailed(reply: FastifyReply): void;
|
|
16
|
+
teardown(): void;
|
|
17
|
+
reset(): void;
|
|
18
|
+
}
|
|
19
|
+
export declare function runSessionStreaming(state: ToolBridgeState, session: CopilotSession, prompt: string, logger: Logger, hasBridge: boolean, protocol: StreamProtocol, initialReply: FastifyReply): Promise<void>;
|
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
import { BRIDGE_TOOL_PREFIX } from "../../tool-bridge/index.js";
|
|
2
|
+
import { formatCompaction } from "./streaming-utils.js";
|
|
3
|
+
// Xcode doesn't know about the bridge prefix so we strip it
|
|
4
|
+
export function stripBridgePrefix(name) {
|
|
5
|
+
return name.startsWith(BRIDGE_TOOL_PREFIX) ? name.slice(BRIDGE_TOOL_PREFIX.length) : name;
|
|
6
|
+
}
|
|
7
|
+
export async function runSessionStreaming(state, session, prompt, logger, hasBridge, protocol, initialReply) {
|
|
8
|
+
state.markSessionActive();
|
|
9
|
+
let pendingDeltas = [];
|
|
10
|
+
let sessionDone = false;
|
|
11
|
+
const toolNames = new Map();
|
|
12
|
+
function getReply() {
|
|
13
|
+
return state.currentReply;
|
|
14
|
+
}
|
|
15
|
+
function flushToProtocol() {
|
|
16
|
+
if (pendingDeltas.length === 0)
|
|
17
|
+
return;
|
|
18
|
+
const r = getReply();
|
|
19
|
+
if (!r)
|
|
20
|
+
return;
|
|
21
|
+
protocol.flushDeltas(r, pendingDeltas);
|
|
22
|
+
pendingDeltas = [];
|
|
23
|
+
}
|
|
24
|
+
const unsubscribe = session.on((event) => {
|
|
25
|
+
logger.debug(`Session event: ${event.type}`);
|
|
26
|
+
if (event.type === "tool.execution_start") {
|
|
27
|
+
const d = event.data;
|
|
28
|
+
toolNames.set(d.toolCallId, d.toolName);
|
|
29
|
+
logger.debug(`Running ${d.toolName} (id=${d.toolCallId}, args=${JSON.stringify(d.arguments)})`);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
if (event.type === "tool.execution_complete") {
|
|
33
|
+
const d = event.data;
|
|
34
|
+
const name = toolNames.get(d.toolCallId) ?? d.toolCallId;
|
|
35
|
+
toolNames.delete(d.toolCallId);
|
|
36
|
+
const detail = d.success
|
|
37
|
+
? JSON.stringify(d.result?.content)
|
|
38
|
+
: d.error?.message ?? "failed";
|
|
39
|
+
logger.debug(`${name} done (success=${String(d.success)}, ${detail})`);
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
switch (event.type) {
|
|
43
|
+
case "assistant.message_delta":
|
|
44
|
+
if (event.data.deltaContent) {
|
|
45
|
+
logger.debug(`Delta: ${event.data.deltaContent}`);
|
|
46
|
+
pendingDeltas.push(event.data.deltaContent);
|
|
47
|
+
}
|
|
48
|
+
break;
|
|
49
|
+
case "assistant.message": {
|
|
50
|
+
logger.debug(`assistant.message: toolRequests=${String(event.data.toolRequests?.length ?? 0)}`);
|
|
51
|
+
if (event.data.toolRequests && event.data.toolRequests.length > 0) {
|
|
52
|
+
const bridgeRequests = hasBridge
|
|
53
|
+
? event.data.toolRequests.filter((tr) => tr.name.startsWith(BRIDGE_TOOL_PREFIX))
|
|
54
|
+
: event.data.toolRequests;
|
|
55
|
+
if (hasBridge && bridgeRequests.length < event.data.toolRequests.length) {
|
|
56
|
+
const skipped = event.data.toolRequests.length - bridgeRequests.length;
|
|
57
|
+
logger.debug(`Skipped ${String(skipped)} non-bridge tool request(s) (handled internally by CLI)`);
|
|
58
|
+
}
|
|
59
|
+
const stripped = bridgeRequests.map((tr) => {
|
|
60
|
+
const resolved = state.resolveToolName(stripBridgePrefix(tr.name));
|
|
61
|
+
return {
|
|
62
|
+
toolCallId: tr.toolCallId,
|
|
63
|
+
name: resolved,
|
|
64
|
+
arguments: state.normalizeArgs(resolved, (tr.arguments ?? {})),
|
|
65
|
+
};
|
|
66
|
+
});
|
|
67
|
+
if (stripped.length > 0) {
|
|
68
|
+
for (const tr of stripped) {
|
|
69
|
+
logger.info(`Tool request: name="${tr.name}", id="${tr.toolCallId}", args=${JSON.stringify(tr.arguments)}`);
|
|
70
|
+
state.registerExpected(tr.toolCallId, tr.name);
|
|
71
|
+
}
|
|
72
|
+
const r = getReply();
|
|
73
|
+
if (r) {
|
|
74
|
+
flushToProtocol();
|
|
75
|
+
protocol.emitToolsAndFinish(r, stripped);
|
|
76
|
+
r.raw.end();
|
|
77
|
+
state.clearReply();
|
|
78
|
+
protocol.reset();
|
|
79
|
+
state.notifyStreamingDone();
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
logger.debug("Tool requests but no reply (internal retry), registered expected tools");
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
logger.debug("All tool requests were non-bridge, none emitted");
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
const r = getReply();
|
|
91
|
+
if (r) {
|
|
92
|
+
logger.debug(`Flushing ${String(pendingDeltas.length)} pending deltas`);
|
|
93
|
+
flushToProtocol();
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
break;
|
|
97
|
+
}
|
|
98
|
+
case "session.idle": {
|
|
99
|
+
logger.info(`Done, wrapping up stream (pendingDeltas=${String(pendingDeltas.length)})`);
|
|
100
|
+
sessionDone = true;
|
|
101
|
+
state.markSessionInactive();
|
|
102
|
+
flushToProtocol();
|
|
103
|
+
const r = getReply();
|
|
104
|
+
if (r) {
|
|
105
|
+
protocol.sendCompleted(r);
|
|
106
|
+
protocol.teardown();
|
|
107
|
+
r.raw.end();
|
|
108
|
+
state.clearReply();
|
|
109
|
+
state.notifyStreamingDone();
|
|
110
|
+
}
|
|
111
|
+
unsubscribe();
|
|
112
|
+
break;
|
|
113
|
+
}
|
|
114
|
+
case "session.compaction_start":
|
|
115
|
+
logger.info("Compacting context...");
|
|
116
|
+
break;
|
|
117
|
+
case "session.compaction_complete":
|
|
118
|
+
logger.info(`Context compacted: ${formatCompaction(event.data)}`);
|
|
119
|
+
break;
|
|
120
|
+
case "session.error": {
|
|
121
|
+
logger.error(`Session error: ${event.data.message}`);
|
|
122
|
+
sessionDone = true;
|
|
123
|
+
state.markSessionErrored();
|
|
124
|
+
state.markSessionInactive();
|
|
125
|
+
const r = getReply();
|
|
126
|
+
if (r) {
|
|
127
|
+
protocol.sendFailed(r);
|
|
128
|
+
protocol.teardown();
|
|
129
|
+
r.raw.end();
|
|
130
|
+
state.clearReply();
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
protocol.teardown();
|
|
134
|
+
}
|
|
135
|
+
state.notifyStreamingDone();
|
|
136
|
+
unsubscribe();
|
|
137
|
+
break;
|
|
138
|
+
}
|
|
139
|
+
default:
|
|
140
|
+
logger.debug(`Unhandled event: ${event.type}, data=${JSON.stringify(event.data)}`);
|
|
141
|
+
break;
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
initialReply.raw.on("close", () => {
|
|
145
|
+
if (!sessionDone && state.currentReply === initialReply) {
|
|
146
|
+
logger.info("Client disconnected, aborting session");
|
|
147
|
+
protocol.teardown();
|
|
148
|
+
protocol.reset();
|
|
149
|
+
state.markSessionErrored();
|
|
150
|
+
state.cleanup();
|
|
151
|
+
unsubscribe();
|
|
152
|
+
session.abort().catch((err) => {
|
|
153
|
+
logger.error("Failed to abort session:", err);
|
|
154
|
+
});
|
|
155
|
+
state.notifyStreamingDone();
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
const done = state.waitForStreamingDone();
|
|
159
|
+
session.send({ prompt }).catch((err) => {
|
|
160
|
+
if (sessionDone)
|
|
161
|
+
return;
|
|
162
|
+
logger.error("Failed to send prompt:", err);
|
|
163
|
+
sessionDone = true;
|
|
164
|
+
protocol.teardown();
|
|
165
|
+
protocol.reset();
|
|
166
|
+
const r = getReply();
|
|
167
|
+
if (r) {
|
|
168
|
+
r.raw.end();
|
|
169
|
+
state.clearReply();
|
|
170
|
+
}
|
|
171
|
+
unsubscribe();
|
|
172
|
+
state.notifyStreamingDone();
|
|
173
|
+
});
|
|
174
|
+
return done;
|
|
175
|
+
}
|
|
176
|
+
//# sourceMappingURL=streaming-core.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"streaming-core.js","sourceRoot":"","sources":["../../../src/providers/shared/streaming-core.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { FastifyReply } from "fastify";
|
|
2
|
+
export declare const SSE_HEADERS: {
|
|
3
|
+
readonly "Content-Type": "text/event-stream";
|
|
4
|
+
readonly "Cache-Control": "no-cache";
|
|
5
|
+
readonly Connection: "keep-alive";
|
|
6
|
+
readonly "X-Accel-Buffering": "no";
|
|
7
|
+
};
|
|
8
|
+
export declare function sendSSEEvent(reply: FastifyReply, type: string, data: object, sequenceNumber?: number): void;
|
|
9
|
+
export declare function sendSSEComment(reply: FastifyReply): void;
|
|
10
|
+
export declare function formatCompaction(data: unknown): string;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export const SSE_HEADERS = {
|
|
2
|
+
"Content-Type": "text/event-stream",
|
|
3
|
+
"Cache-Control": "no-cache",
|
|
4
|
+
Connection: "keep-alive",
|
|
5
|
+
"X-Accel-Buffering": "no",
|
|
6
|
+
};
|
|
7
|
+
export function sendSSEEvent(reply, type, data, sequenceNumber) {
|
|
8
|
+
if (sequenceNumber != null) {
|
|
9
|
+
const payload = { ...data, type, sequence_number: sequenceNumber };
|
|
10
|
+
reply.raw.write(`event: ${type}\ndata: ${JSON.stringify(payload)}\n\n`);
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
reply.raw.write(`event: ${type}\ndata: ${JSON.stringify(data)}\n\n`);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export function sendSSEComment(reply) {
|
|
17
|
+
reply.raw.write(": keepalive\n\n");
|
|
18
|
+
}
|
|
19
|
+
export function formatCompaction(data) {
|
|
20
|
+
if (!data ||
|
|
21
|
+
typeof data !== "object" ||
|
|
22
|
+
!("preCompactionTokens" in data) ||
|
|
23
|
+
!("postCompactionTokens" in data)) {
|
|
24
|
+
return "compaction data unavailable";
|
|
25
|
+
}
|
|
26
|
+
return `${String(data.preCompactionTokens)} to ${String(data.postCompactionTokens)} tokens`;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=streaming-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"streaming-utils.js","sourceRoot":"","sources":["../../../src/providers/shared/streaming-utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,cAAc,EAAE,mBAAmB;IACnC,eAAe,EAAE,UAAU;IAC3B,UAAU,EAAE,YAAY;IACxB,mBAAmB,EAAE,IAAI;CACgB,CAAC;AAE5C,MAAM,UAAU,YAAY,CAC1B,KAAmB,EACnB,IAAY,EACZ,IAAY,EACZ,cAAuB;IAEvB,IAAI,cAAc,IAAI,IAAI,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,EAAE,GAAI,IAAgC,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;QAChG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,WAAW,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAmB;IAChD,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,IACE,CAAC,IAAI;QACL,OAAO,IAAI,KAAK,QAAQ;QACxB,CAAC,CAAC,qBAAqB,IAAI,IAAI,CAAC;QAChC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,EACjC,CAAC;QACD,OAAO,6BAA6B,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;AAC9F,CAAC"}
|
package/dist/schemas/config.d.ts
CHANGED
|
@@ -88,7 +88,25 @@ export declare const ServerConfigSchema: z.ZodObject<{
|
|
|
88
88
|
timeout: z.ZodOptional<z.ZodNumber>;
|
|
89
89
|
}, z.core.$strip>]>>>;
|
|
90
90
|
}, z.core.$strip>>;
|
|
91
|
-
|
|
91
|
+
claude: z.ZodDefault<z.ZodObject<{
|
|
92
|
+
toolBridge: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
93
|
+
mcpServers: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodObject<{
|
|
94
|
+
type: z.ZodUnion<readonly [z.ZodLiteral<"local">, z.ZodLiteral<"stdio">]>;
|
|
95
|
+
command: z.ZodString;
|
|
96
|
+
args: z.ZodArray<z.ZodString>;
|
|
97
|
+
env: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
98
|
+
cwd: z.ZodOptional<z.ZodString>;
|
|
99
|
+
allowedTools: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
100
|
+
timeout: z.ZodOptional<z.ZodNumber>;
|
|
101
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
102
|
+
type: z.ZodUnion<readonly [z.ZodLiteral<"http">, z.ZodLiteral<"sse">]>;
|
|
103
|
+
url: z.ZodURL;
|
|
104
|
+
headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
|
|
105
|
+
allowedTools: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
106
|
+
timeout: z.ZodOptional<z.ZodNumber>;
|
|
107
|
+
}, z.core.$strip>]>>>;
|
|
108
|
+
}, z.core.$strip>>;
|
|
109
|
+
codex: z.ZodDefault<z.ZodObject<{
|
|
92
110
|
toolBridge: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
93
111
|
mcpServers: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodObject<{
|
|
94
112
|
type: z.ZodUnion<readonly [z.ZodLiteral<"local">, z.ZodLiteral<"stdio">]>;
|