xcode-copilot-server 2.2.0 → 3.1.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/config.json5 +13 -8
- package/dist/cli-validators.d.ts +2 -0
- package/dist/cli-validators.js +10 -3
- package/dist/cli-validators.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.js +2 -2
- 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/index.js +66 -105
- package/dist/index.js.map +1 -1
- package/dist/launchd/agent.d.ts +52 -0
- package/dist/launchd/agent.js +185 -0
- package/dist/launchd/agent.js.map +1 -0
- package/dist/launchd/index.d.ts +4 -0
- package/dist/launchd/index.js +3 -0
- package/dist/launchd/index.js.map +1 -0
- package/dist/launchd/socket.d.ts +5 -0
- package/dist/launchd/socket.js +31 -0
- package/dist/launchd/socket.js.map +1 -0
- package/dist/launchd-agent.d.ts +50 -0
- package/dist/launchd-agent.js +175 -0
- package/dist/launchd-agent.js.map +1 -0
- package/dist/launchd-socket.d.ts +5 -0
- package/dist/launchd-socket.js +33 -0
- package/dist/launchd-socket.js.map +1 -0
- package/dist/{handlers/messages → providers/claude}/count-tokens.js +2 -2
- package/dist/providers/claude/count-tokens.js.map +1 -0
- package/dist/{handlers/messages.d.ts → providers/claude/handler.d.ts} +2 -2
- package/dist/{handlers/messages.js → providers/claude/handler.js} +8 -8
- package/dist/providers/claude/handler.js.map +1 -0
- package/dist/{utils/anthropic-prompt.d.ts → providers/claude/prompt.d.ts} +1 -1
- package/dist/{utils/anthropic-prompt.js → providers/claude/prompt.js} +2 -2
- package/dist/providers/claude/prompt.js.map +1 -0
- package/dist/providers/{anthropic.d.ts → claude/provider.d.ts} +2 -2
- package/dist/providers/{anthropic.js → claude/provider.js} +8 -8
- package/dist/providers/claude/provider.js.map +1 -0
- package/dist/{schemas/anthropic.js → providers/claude/schemas.js} +1 -1
- package/dist/providers/claude/schemas.js.map +1 -0
- package/dist/providers/claude/streaming.js +116 -0
- package/dist/providers/claude/streaming.js.map +1 -0
- package/dist/{handlers/messages/tool-result-handler.d.ts → providers/claude/tool-results.d.ts} +1 -1
- package/dist/{handlers/messages/tool-result-handler.js → providers/claude/tool-results.js} +1 -1
- 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/index.d.ts +6 -1
- package/dist/providers/index.js +5 -3
- package/dist/providers/index.js.map +1 -1
- package/dist/{handlers/completions.d.ts → providers/openai/handler.d.ts} +2 -2
- package/dist/{handlers/completions.js → providers/openai/handler.js} +6 -6
- package/dist/providers/openai/handler.js.map +1 -0
- package/dist/{handlers → providers/openai}/models.d.ts +1 -1
- package/dist/{handlers → providers/openai}/models.js +1 -1
- package/dist/providers/openai/models.js.map +1 -0
- package/dist/providers/openai/prompt.d.ts +3 -0
- package/dist/{utils → providers/openai}/prompt.js +3 -15
- package/dist/providers/openai/prompt.js.map +1 -0
- package/dist/providers/{openai.d.ts → openai/provider.d.ts} +1 -1
- package/dist/providers/{openai.js → openai/provider.js} +4 -4
- package/dist/providers/openai/provider.js.map +1 -0
- package/dist/{schemas/openai.js → providers/openai/schemas.js} +1 -1
- package/dist/providers/openai/schemas.js.map +1 -0
- package/dist/{handlers/completions → providers/openai}/streaming.js +3 -3
- package/dist/providers/openai/streaming.js.map +1 -0
- package/dist/providers/shared/errors.js.map +1 -0
- package/dist/{utils → providers/shared}/model-resolver.d.ts +1 -1
- 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/{handlers → providers/shared}/session-config.d.ts +2 -2
- package/dist/{handlers → providers/shared}/session-config.js +24 -5
- 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/{handlers → providers/shared}/streaming-utils.d.ts +2 -1
- package/dist/{handlers → providers/shared}/streaming-utils.js +11 -2
- 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/server.js +1 -2
- package/dist/server.js.map +1 -1
- package/dist/settings-patcher/claude.d.ts +5 -0
- package/dist/{settings-patcher.js → settings-patcher/claude.js} +4 -8
- 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.map +1 -0
- package/dist/startup.d.ts +13 -0
- package/dist/startup.js +193 -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/package.json +8 -5
- package/LICENSE +0 -21
- package/README.md +0 -212
- package/dist/config-schema.d.ts +0 -85
- package/dist/config-schema.js +0 -38
- package/dist/config-schema.js.map +0 -1
- package/dist/handlers/completions/session-config.d.ts +0 -12
- package/dist/handlers/completions/session-config.js +0 -63
- package/dist/handlers/completions/session-config.js.map +0 -1
- package/dist/handlers/completions/streaming.js.map +0 -1
- package/dist/handlers/completions.js.map +0 -1
- package/dist/handlers/errors.js.map +0 -1
- package/dist/handlers/messages/count-tokens.js.map +0 -1
- package/dist/handlers/messages/streaming.js +0 -274
- package/dist/handlers/messages/streaming.js.map +0 -1
- package/dist/handlers/messages/tool-result-handler.js.map +0 -1
- package/dist/handlers/messages.js.map +0 -1
- package/dist/handlers/models.js.map +0 -1
- package/dist/handlers/session-config.js.map +0 -1
- package/dist/handlers/streaming-utils.js.map +0 -1
- package/dist/providers/anthropic.js.map +0 -1
- package/dist/providers/openai.js.map +0 -1
- package/dist/schemas/anthropic.js.map +0 -1
- package/dist/schemas/openai.js.map +0 -1
- package/dist/schemas.d.ts +0 -49
- package/dist/schemas.js +0 -75
- package/dist/schemas.js.map +0 -1
- package/dist/settings-patcher.js.map +0 -1
- package/dist/types.d.ts +0 -83
- package/dist/types.js.map +0 -1
- package/dist/utils/anthropic-prompt.js.map +0 -1
- package/dist/utils/model-resolver.js.map +0 -1
- package/dist/utils/prompt.d.ts +0 -3
- package/dist/utils/prompt.js.map +0 -1
- /package/dist/{handlers/messages → providers/claude}/count-tokens.d.ts +0 -0
- /package/dist/{schemas/anthropic.d.ts → providers/claude/schemas.d.ts} +0 -0
- /package/dist/{handlers/messages → providers/claude}/streaming.d.ts +0 -0
- /package/dist/{schemas/openai.d.ts → providers/openai/schemas.d.ts} +0 -0
- /package/dist/{handlers/completions → providers/openai}/streaming.d.ts +0 -0
- /package/dist/{handlers → providers/shared}/errors.d.ts +0 -0
- /package/dist/{handlers → providers/shared}/errors.js +0 -0
- /package/dist/{utils → providers/shared}/model-resolver.js +0 -0
- /package/dist/{types.js → settings-patcher/types.js} +0 -0
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
const ResponsesInputMessageSchema = z.object({
|
|
4
|
+
type: z.literal("message").optional(),
|
|
5
|
+
role: z.enum(["user", "assistant", "system", "developer"]),
|
|
6
|
+
content: z.union([z.string(), z.array(z.record(z.string(), z.unknown()))]),
|
|
7
|
+
});
|
|
8
|
+
const FunctionCallInputSchema = z.object({
|
|
9
|
+
type: z.literal("function_call"),
|
|
10
|
+
id: z.string().optional(),
|
|
11
|
+
call_id: z.string(),
|
|
12
|
+
name: z.string(),
|
|
13
|
+
arguments: z.string(),
|
|
14
|
+
});
|
|
15
|
+
const FunctionCallOutputInputSchema = z.object({
|
|
16
|
+
type: z.literal("function_call_output"),
|
|
17
|
+
call_id: z.string(),
|
|
18
|
+
output: z.string(),
|
|
19
|
+
});
|
|
20
|
+
const InputItemSchema = z.union([
|
|
21
|
+
ResponsesInputMessageSchema,
|
|
22
|
+
FunctionCallInputSchema,
|
|
23
|
+
FunctionCallOutputInputSchema,
|
|
24
|
+
]);
|
|
25
|
+
/** Accept any tool shape in the request; we only process function tools. */
|
|
26
|
+
const RawToolSchema = z.record(z.string(), z.unknown());
|
|
27
|
+
const FunctionToolSchema = z.object({
|
|
28
|
+
type: z.literal("function"),
|
|
29
|
+
name: z.string(),
|
|
30
|
+
description: z.string().optional(),
|
|
31
|
+
parameters: z.record(z.string(), z.unknown()).optional(),
|
|
32
|
+
strict: z.boolean().optional(),
|
|
33
|
+
});
|
|
34
|
+
/** Narrow to function tools only (ignore web_search, code_interpreter, etc.) */
|
|
35
|
+
export function filterFunctionTools(tools) {
|
|
36
|
+
return tools
|
|
37
|
+
.filter((t) => t.type === "function")
|
|
38
|
+
.map((t) => FunctionToolSchema.parse(t));
|
|
39
|
+
}
|
|
40
|
+
export const ResponsesRequestSchema = z.object({
|
|
41
|
+
model: z.string().min(1, "Model is required"),
|
|
42
|
+
input: z.union([z.string(), z.array(InputItemSchema)]),
|
|
43
|
+
instructions: z.string().optional(),
|
|
44
|
+
tools: z.array(RawToolSchema).optional(),
|
|
45
|
+
stream: z.boolean().optional(),
|
|
46
|
+
temperature: z.number().optional(),
|
|
47
|
+
previous_response_id: z.string().optional(),
|
|
48
|
+
});
|
|
49
|
+
export function currentTimestamp() {
|
|
50
|
+
return Math.floor(Date.now() / 1000);
|
|
51
|
+
}
|
|
52
|
+
export function genId(prefix) {
|
|
53
|
+
return `${prefix}_${randomUUID()}`;
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=schemas.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../src/providers/codex/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
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 interface SeqCounter {
|
|
6
|
+
value: number;
|
|
7
|
+
}
|
|
8
|
+
export declare function startResponseStream(reply: FastifyReply, responseId: string, model: string, seq?: SeqCounter): SeqCounter;
|
|
9
|
+
export declare function handleResponsesStreaming(state: ToolBridgeState, session: CopilotSession, prompt: string, model: string, logger: Logger, hasBridge: boolean, responseId: string): Promise<void>;
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
import { currentTimestamp, genId } from "./schemas.js";
|
|
2
|
+
import { SSE_HEADERS, sendSSEEvent as sendEvent, sendSSEComment } from "../shared/streaming-utils.js";
|
|
3
|
+
import { runSessionStreaming } from "../shared/streaming-core.js";
|
|
4
|
+
function nextSeq(counter) {
|
|
5
|
+
return counter.value++;
|
|
6
|
+
}
|
|
7
|
+
export function startResponseStream(reply, responseId, model, seq) {
|
|
8
|
+
const counter = seq ?? { value: 0 };
|
|
9
|
+
reply.raw.writeHead(200, SSE_HEADERS);
|
|
10
|
+
const response = {
|
|
11
|
+
id: responseId,
|
|
12
|
+
object: "response",
|
|
13
|
+
created_at: currentTimestamp(),
|
|
14
|
+
model,
|
|
15
|
+
status: "in_progress",
|
|
16
|
+
output: [],
|
|
17
|
+
};
|
|
18
|
+
sendEvent(reply, "response.created", { response }, nextSeq(counter));
|
|
19
|
+
sendEvent(reply, "response.in_progress", { response }, nextSeq(counter));
|
|
20
|
+
return counter;
|
|
21
|
+
}
|
|
22
|
+
function createResponsesProtocol(responseId, model, seq, getReply) {
|
|
23
|
+
let messageItem = null;
|
|
24
|
+
let messageStarted = false;
|
|
25
|
+
let outputIndex = 0;
|
|
26
|
+
const outputItems = [];
|
|
27
|
+
const accumulatedText = [];
|
|
28
|
+
// Keepalive every 15s so the client doesn't time out while
|
|
29
|
+
// waiting for internal tool execution to finish
|
|
30
|
+
const keepaliveInterval = setInterval(() => {
|
|
31
|
+
const r = getReply();
|
|
32
|
+
if (r)
|
|
33
|
+
sendSSEComment(r);
|
|
34
|
+
}, 15_000);
|
|
35
|
+
function ensureMessageItem(r) {
|
|
36
|
+
if (!messageStarted) {
|
|
37
|
+
messageItem = {
|
|
38
|
+
type: "message",
|
|
39
|
+
id: genId("msg"),
|
|
40
|
+
status: "in_progress",
|
|
41
|
+
role: "assistant",
|
|
42
|
+
content: [],
|
|
43
|
+
};
|
|
44
|
+
sendEvent(r, "response.output_item.added", {
|
|
45
|
+
output_index: outputIndex,
|
|
46
|
+
item: messageItem,
|
|
47
|
+
}, nextSeq(seq));
|
|
48
|
+
sendEvent(r, "response.content_part.added", {
|
|
49
|
+
item_id: messageItem.id,
|
|
50
|
+
output_index: outputIndex,
|
|
51
|
+
content_index: 0,
|
|
52
|
+
part: { type: "output_text", text: "", annotations: [] },
|
|
53
|
+
}, nextSeq(seq));
|
|
54
|
+
messageStarted = true;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
function closeMessageItem(r) {
|
|
58
|
+
if (!messageStarted || !messageItem)
|
|
59
|
+
return;
|
|
60
|
+
const fullText = accumulatedText.join("");
|
|
61
|
+
sendEvent(r, "response.output_text.done", {
|
|
62
|
+
item_id: messageItem.id,
|
|
63
|
+
output_index: outputIndex,
|
|
64
|
+
content_index: 0,
|
|
65
|
+
text: fullText,
|
|
66
|
+
}, nextSeq(seq));
|
|
67
|
+
sendEvent(r, "response.content_part.done", {
|
|
68
|
+
item_id: messageItem.id,
|
|
69
|
+
output_index: outputIndex,
|
|
70
|
+
content_index: 0,
|
|
71
|
+
part: { type: "output_text", text: fullText, annotations: [] },
|
|
72
|
+
}, nextSeq(seq));
|
|
73
|
+
messageItem.status = "completed";
|
|
74
|
+
messageItem.content = [{ type: "output_text", text: fullText, annotations: [] }];
|
|
75
|
+
outputItems.push(messageItem);
|
|
76
|
+
sendEvent(r, "response.output_item.done", {
|
|
77
|
+
output_index: outputIndex,
|
|
78
|
+
item: messageItem,
|
|
79
|
+
}, nextSeq(seq));
|
|
80
|
+
outputIndex++;
|
|
81
|
+
messageStarted = false;
|
|
82
|
+
messageItem = null;
|
|
83
|
+
}
|
|
84
|
+
function emitFunctionCallItems(r, toolRequests) {
|
|
85
|
+
for (const tr of toolRequests) {
|
|
86
|
+
const callId = tr.toolCallId;
|
|
87
|
+
const itemId = genId("fc");
|
|
88
|
+
const argsJson = tr.arguments != null ? JSON.stringify(tr.arguments) : "{}";
|
|
89
|
+
const fcItem = {
|
|
90
|
+
type: "function_call",
|
|
91
|
+
id: itemId,
|
|
92
|
+
call_id: callId,
|
|
93
|
+
name: tr.name,
|
|
94
|
+
arguments: argsJson,
|
|
95
|
+
status: "in_progress",
|
|
96
|
+
};
|
|
97
|
+
sendEvent(r, "response.output_item.added", {
|
|
98
|
+
output_index: outputIndex,
|
|
99
|
+
item: fcItem,
|
|
100
|
+
}, nextSeq(seq));
|
|
101
|
+
const doneItem = { ...fcItem, status: "completed" };
|
|
102
|
+
sendEvent(r, "response.output_item.done", {
|
|
103
|
+
output_index: outputIndex,
|
|
104
|
+
item: doneItem,
|
|
105
|
+
}, nextSeq(seq));
|
|
106
|
+
outputItems.push(doneItem);
|
|
107
|
+
outputIndex++;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
function sendResponseEnvelope(r, status) {
|
|
111
|
+
const response = {
|
|
112
|
+
id: responseId,
|
|
113
|
+
object: "response",
|
|
114
|
+
created_at: currentTimestamp(),
|
|
115
|
+
model,
|
|
116
|
+
status,
|
|
117
|
+
output: outputItems,
|
|
118
|
+
};
|
|
119
|
+
sendEvent(r, `response.${status}`, { response }, nextSeq(seq));
|
|
120
|
+
}
|
|
121
|
+
return {
|
|
122
|
+
flushDeltas(r, deltas) {
|
|
123
|
+
ensureMessageItem(r);
|
|
124
|
+
if (!messageItem)
|
|
125
|
+
return;
|
|
126
|
+
for (const text of deltas) {
|
|
127
|
+
sendEvent(r, "response.output_text.delta", {
|
|
128
|
+
item_id: messageItem.id,
|
|
129
|
+
output_index: outputIndex,
|
|
130
|
+
content_index: 0,
|
|
131
|
+
delta: text,
|
|
132
|
+
}, nextSeq(seq));
|
|
133
|
+
accumulatedText.push(text);
|
|
134
|
+
}
|
|
135
|
+
},
|
|
136
|
+
emitToolsAndFinish(r, tools) {
|
|
137
|
+
closeMessageItem(r);
|
|
138
|
+
emitFunctionCallItems(r, tools);
|
|
139
|
+
sendResponseEnvelope(r, "completed");
|
|
140
|
+
},
|
|
141
|
+
sendCompleted(r) {
|
|
142
|
+
if (!messageStarted)
|
|
143
|
+
ensureMessageItem(r);
|
|
144
|
+
closeMessageItem(r);
|
|
145
|
+
sendResponseEnvelope(r, "completed");
|
|
146
|
+
},
|
|
147
|
+
sendFailed(r) {
|
|
148
|
+
if (messageStarted)
|
|
149
|
+
closeMessageItem(r);
|
|
150
|
+
sendResponseEnvelope(r, "failed");
|
|
151
|
+
},
|
|
152
|
+
teardown() {
|
|
153
|
+
clearInterval(keepaliveInterval);
|
|
154
|
+
},
|
|
155
|
+
reset() {
|
|
156
|
+
messageStarted = false;
|
|
157
|
+
messageItem = null;
|
|
158
|
+
outputIndex = 0;
|
|
159
|
+
outputItems.length = 0;
|
|
160
|
+
accumulatedText.length = 0;
|
|
161
|
+
},
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
export async function handleResponsesStreaming(state, session, prompt, model, logger, hasBridge, responseId) {
|
|
165
|
+
const reply = state.currentReply;
|
|
166
|
+
if (!reply)
|
|
167
|
+
throw new Error("No reply set on bridge state");
|
|
168
|
+
const seq = startResponseStream(reply, responseId, model);
|
|
169
|
+
const protocol = createResponsesProtocol(responseId, model, seq, () => state.currentReply);
|
|
170
|
+
return runSessionStreaming(state, session, prompt, logger, hasBridge, protocol, reply);
|
|
171
|
+
}
|
|
172
|
+
//# sourceMappingURL=streaming.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../src/providers/codex/streaming.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { FunctionCallOutputInput } from "./schemas.js";
|
|
2
|
+
import type { ToolBridgeState } from "../../tool-bridge/state.js";
|
|
3
|
+
import type { Logger } from "../../logger.js";
|
|
4
|
+
export declare function resolveResponsesToolResults(outputs: FunctionCallOutputInput[], state: ToolBridgeState, logger: Logger): void;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export function resolveResponsesToolResults(outputs, state, logger) {
|
|
2
|
+
for (const item of outputs) {
|
|
3
|
+
logger.debug(`Resolving tool result for ${item.call_id}`);
|
|
4
|
+
if (!state.resolveToolCall(item.call_id, item.output)) {
|
|
5
|
+
logger.warn(`No pending MCP request for call_id ${item.call_id}`);
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=tool-results.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-results.js","sourceRoot":"","sources":["../../../src/providers/codex/tool-results.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,2BAA2B,CACzC,OAAkC,EAClC,KAAsB,EACtB,MAAc;IAEd,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,MAAM,CAAC,IAAI,CAAC,sCAAsC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -6,7 +6,12 @@ export declare const providers: {
|
|
|
6
6
|
routes: string[];
|
|
7
7
|
register(app: import("fastify").FastifyInstance<import("fastify").RawServerDefault, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>, ctx: import("../context.js").AppContext): void;
|
|
8
8
|
};
|
|
9
|
-
|
|
9
|
+
claude: {
|
|
10
|
+
name: string;
|
|
11
|
+
routes: string[];
|
|
12
|
+
register(app: import("fastify").FastifyInstance<import("fastify").RawServerDefault, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>, ctx: import("../context.js").AppContext): void;
|
|
13
|
+
};
|
|
14
|
+
codex: {
|
|
10
15
|
name: string;
|
|
11
16
|
routes: string[];
|
|
12
17
|
register(app: import("fastify").FastifyInstance<import("fastify").RawServerDefault, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>, ctx: import("../context.js").AppContext): void;
|
package/dist/providers/index.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import { openaiProvider } from "./openai.js";
|
|
2
|
-
import {
|
|
1
|
+
import { openaiProvider } from "./openai/provider.js";
|
|
2
|
+
import { claudeProvider } from "./claude/provider.js";
|
|
3
|
+
import { codexProvider } from "./codex/provider.js";
|
|
3
4
|
export const providers = {
|
|
4
5
|
openai: openaiProvider,
|
|
5
|
-
|
|
6
|
+
claude: claudeProvider,
|
|
7
|
+
codex: codexProvider,
|
|
6
8
|
};
|
|
7
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAKpD,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,KAAK,EAAE,aAAa;CACc,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { FastifyRequest, FastifyReply } from "fastify";
|
|
2
|
-
import type { AppContext } from "
|
|
3
|
-
import type { ConversationManager } from "
|
|
2
|
+
import type { AppContext } from "../../context.js";
|
|
3
|
+
import type { ConversationManager } from "../../conversation-manager.js";
|
|
4
4
|
export declare function createCompletionsHandler({ service, logger, config }: AppContext, manager: ConversationManager): (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ChatCompletionRequestSchema, extractContentText } from "
|
|
2
|
-
import { formatPrompt } from "
|
|
3
|
-
import { createSessionConfig } from "
|
|
4
|
-
import { handleStreaming } from "./
|
|
5
|
-
import { sendOpenAIError as sendError } from "
|
|
1
|
+
import { ChatCompletionRequestSchema, extractContentText } from "./schemas.js";
|
|
2
|
+
import { formatPrompt } from "./prompt.js";
|
|
3
|
+
import { createSessionConfig } from "../shared/session-config.js";
|
|
4
|
+
import { handleStreaming } from "./streaming.js";
|
|
5
|
+
import { sendOpenAIError as sendError } from "../shared/errors.js";
|
|
6
6
|
export function createCompletionsHandler({ service, logger, config }, manager) {
|
|
7
7
|
return async function handleCompletions(request, reply) {
|
|
8
8
|
const parseResult = ChatCompletionRequestSchema.safeParse(request.body);
|
|
@@ -117,4 +117,4 @@ export function createCompletionsHandler({ service, logger, config }, manager) {
|
|
|
117
117
|
}
|
|
118
118
|
};
|
|
119
119
|
}
|
|
120
|
-
//# sourceMappingURL=
|
|
120
|
+
//# sourceMappingURL=handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/providers/openai/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { FastifyRequest, FastifyReply } from "fastify";
|
|
2
|
-
import type { AppContext } from "
|
|
2
|
+
import type { AppContext } from "../../context.js";
|
|
3
3
|
export declare function createModelsHandler({ service, logger }: AppContext): (_request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/providers/openai/models.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,UAAU,mBAAmB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAc;IACjE,OAAO,KAAK,UAAU,YAAY,CAChC,QAAwB,EACxB,KAAmB;QAEnB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;YAE1C,MAAM,QAAQ,GAAG;gBACf,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACvB,EAAE,EAAE,CAAC,CAAC,EAAE;oBACR,MAAM,EAAE,OAAgB;oBACxB,OAAO,EAAE,gBAAgB,EAAE;oBAC3B,QAAQ,EAAE,gBAAgB;iBAC3B,CAAC,CAAC;aACqB,CAAC;YAE3B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC5C,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACrB,KAAK,EAAE;oBACL,OAAO,EAAE,uBAAuB;oBAChC,IAAI,EAAE,WAAW;iBAClB;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,18 +1,6 @@
|
|
|
1
|
-
import { extractContentText } from "
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
}
|
|
5
|
-
// Xcode's search results can include full file contents for every match, so
|
|
6
|
-
// some files end up being thousands of lines and add nothing useful. We strip
|
|
7
|
-
// fenced code blocks whose header matches the excluded patterns (Xcode formats
|
|
8
|
-
// them as ```swift:/path/to/File.swift).
|
|
9
|
-
export function filterExcludedFiles(s, patterns) {
|
|
10
|
-
if (patterns.length === 0)
|
|
11
|
-
return s;
|
|
12
|
-
const joined = patterns.map(escapeRegex).join("|");
|
|
13
|
-
const re = new RegExp("```\\w*:[^\\n]*(?:" + joined + ")[^\\n]*\\n.*?\\n```\\n?", "gis");
|
|
14
|
-
return s.replace(re, "");
|
|
15
|
-
}
|
|
1
|
+
import { extractContentText } from "./schemas.js";
|
|
2
|
+
import { filterExcludedFiles } from "../shared/prompt-utils.js";
|
|
3
|
+
export { filterExcludedFiles } from "../shared/prompt-utils.js";
|
|
16
4
|
// System/developer messages are skipped because they're passed separately via
|
|
17
5
|
// SessionConfig.systemMessage.
|
|
18
6
|
export function formatPrompt(messages, excludedFilePatterns) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/providers/openai/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA8B,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const openaiProvider: {
|
|
2
2
|
name: string;
|
|
3
3
|
routes: string[];
|
|
4
|
-
register(app: import("fastify").FastifyInstance<import("fastify").RawServerDefault, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>, ctx: import("
|
|
4
|
+
register(app: import("fastify").FastifyInstance<import("fastify").RawServerDefault, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>, ctx: import("../../context.js").AppContext): void;
|
|
5
5
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { createModelsHandler } from "
|
|
2
|
-
import { createCompletionsHandler } from "
|
|
3
|
-
import { ConversationManager } from "
|
|
1
|
+
import { createModelsHandler } from "./models.js";
|
|
2
|
+
import { createCompletionsHandler } from "./handler.js";
|
|
3
|
+
import { ConversationManager } from "../../conversation-manager.js";
|
|
4
4
|
export const openaiProvider = {
|
|
5
5
|
name: "OpenAI",
|
|
6
6
|
routes: ["GET /v1/models", "POST /v1/chat/completions"],
|
|
@@ -22,4 +22,4 @@ export const openaiProvider = {
|
|
|
22
22
|
app.post("/v1/chat/completions", createCompletionsHandler(ctx, manager));
|
|
23
23
|
},
|
|
24
24
|
};
|
|
25
|
-
//# sourceMappingURL=
|
|
25
|
+
//# sourceMappingURL=provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/providers/openai/provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,CAAC,gBAAgB,EAAE,2BAA2B,CAAC;IAEvD,QAAQ,CAAC,GAAG,EAAE,GAAG;QACf,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAChD,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAC/C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,gDAAgD,EAAE,EAAE,CACrD,CAAC;gBACF,KAAK,KAAK;qBACP,IAAI,CAAC,GAAG,CAAC;qBACT,IAAI,CAAC,kBAAkB,CAAC;qBACxB,IAAI,CAAC,yBAAyB,CAAC,CAAC;gBACnC,OAAO;YACT,CAAC;YAED,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpD,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;QAChD,GAAG,CAAC,IAAI,CAAC,sBAAsB,EAAE,wBAAwB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3E,CAAC;CACiB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../src/providers/openai/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { formatCompaction, SSE_HEADERS } from "../streaming-utils.js";
|
|
2
|
-
import { currentTimestamp } from "
|
|
1
|
+
import { formatCompaction, SSE_HEADERS } from "../shared/streaming-utils.js";
|
|
2
|
+
import { currentTimestamp } from "./schemas.js";
|
|
3
3
|
const REQUEST_TIMEOUT_MS = 5 * 60 * 1000;
|
|
4
4
|
export async function handleStreaming(reply, session, prompt, model, logger) {
|
|
5
5
|
reply.raw.writeHead(200, SSE_HEADERS);
|
|
@@ -44,7 +44,7 @@ export async function handleStreaming(reply, session, prompt, model, logger) {
|
|
|
44
44
|
reply.raw.end();
|
|
45
45
|
resolve(false);
|
|
46
46
|
}, REQUEST_TIMEOUT_MS);
|
|
47
|
-
//
|
|
47
|
+
// Buffer deltas so we can drop intermediate narration before tool calls
|
|
48
48
|
let pendingDeltas = [];
|
|
49
49
|
const toolNames = new Map();
|
|
50
50
|
function flushPending() {
|
|
@@ -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 @@
|
|
|
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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { ModelInfo } from "@github/copilot-sdk";
|
|
2
|
-
import type { Logger } from "
|
|
2
|
+
import type { Logger } from "../../logger.js";
|
|
3
3
|
export declare function resolveModel(requestedModel: string, availableModels: ModelInfo[], logger?: Logger): string | undefined;
|
|
@@ -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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { SessionConfig } from "@github/copilot-sdk";
|
|
2
|
-
import type { ServerConfig } from "
|
|
3
|
-
import type { Logger } from "
|
|
2
|
+
import type { ServerConfig } from "../../config.js";
|
|
3
|
+
import type { Logger } from "../../logger.js";
|
|
4
4
|
export interface SessionConfigOptions {
|
|
5
5
|
model: string;
|
|
6
6
|
systemMessage?: string | undefined;
|
|
@@ -1,3 +1,18 @@
|
|
|
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
|
+
];
|
|
1
16
|
function isApproved(rule, kind) {
|
|
2
17
|
if (typeof rule === "boolean")
|
|
3
18
|
return rule;
|
|
@@ -22,16 +37,20 @@ export function createSessionConfig({ model, systemMessage, logger, config, supp
|
|
|
22
37
|
{ ...server, tools: ["*"] },
|
|
23
38
|
])),
|
|
24
39
|
...(hasBridge && {
|
|
25
|
-
|
|
40
|
+
[BRIDGE_SERVER_NAME]: {
|
|
26
41
|
type: "http",
|
|
27
42
|
url: `http://127.0.0.1:${String(port ?? 8080)}/mcp/${conversationId ?? ""}`,
|
|
28
43
|
tools: ["*"],
|
|
29
44
|
},
|
|
30
45
|
}),
|
|
31
46
|
},
|
|
32
|
-
// When the tool bridge is active,
|
|
33
|
-
//
|
|
34
|
-
//
|
|
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
|
+
}),
|
|
35
54
|
...(!hasBridge && config.allowedCliTools.length > 0 && {
|
|
36
55
|
availableTools: config.allowedCliTools,
|
|
37
56
|
}),
|
|
@@ -55,7 +74,7 @@ export function createSessionConfig({ model, systemMessage, logger, config, supp
|
|
|
55
74
|
hooks: {
|
|
56
75
|
onPreToolUse: (input) => {
|
|
57
76
|
const toolName = input.toolName;
|
|
58
|
-
if (hasBridge && toolName.startsWith(
|
|
77
|
+
if (hasBridge && toolName.startsWith(BRIDGE_TOOL_PREFIX)) {
|
|
59
78
|
logger.debug(`Tool "${toolName}": allowed (bridge)`);
|
|
60
79
|
return Promise.resolve({ permissionDecision: "allow" });
|
|
61
80
|
}
|
|
@@ -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>;
|