xcode-copilot-server 3.0.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/dist/cli-validators.d.ts +2 -0
- package/dist/cli-validators.js +8 -1
- package/dist/cli-validators.js.map +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/index.js +48 -2
- 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/startup.d.ts +2 -0
- package/dist/startup.js +44 -5
- package/dist/startup.js.map +1 -1
- package/package.json +8 -5
- package/LICENSE +0 -21
- package/README.md +0 -269
- 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.d.ts +0 -4
- package/dist/handlers/completions/streaming.js +0 -121
- package/dist/handlers/completions/streaming.js.map +0 -1
- package/dist/handlers/completions.d.ts +0 -4
- package/dist/handlers/completions.js +0 -120
- package/dist/handlers/completions.js.map +0 -1
- package/dist/handlers/errors.d.ts +0 -5
- package/dist/handlers/errors.js +0 -10
- package/dist/handlers/errors.js.map +0 -1
- package/dist/handlers/messages/count-tokens.d.ts +0 -3
- package/dist/handlers/messages/count-tokens.js +0 -72
- package/dist/handlers/messages/count-tokens.js.map +0 -1
- package/dist/handlers/messages/streaming.d.ts +0 -6
- package/dist/handlers/messages/streaming.js +0 -274
- package/dist/handlers/messages/streaming.js.map +0 -1
- package/dist/handlers/messages/tool-result-handler.d.ts +0 -4
- package/dist/handlers/messages/tool-result-handler.js +0 -19
- package/dist/handlers/messages/tool-result-handler.js.map +0 -1
- package/dist/handlers/messages.d.ts +0 -4
- package/dist/handlers/messages.js +0 -150
- package/dist/handlers/messages.js.map +0 -1
- package/dist/handlers/models.d.ts +0 -3
- package/dist/handlers/models.js +0 -28
- package/dist/handlers/models.js.map +0 -1
- package/dist/handlers/responses/streaming.d.ts +0 -6
- package/dist/handlers/responses/streaming.js +0 -265
- package/dist/handlers/responses/streaming.js.map +0 -1
- package/dist/handlers/responses/tool-result-handler.d.ts +0 -4
- package/dist/handlers/responses/tool-result-handler.js +0 -9
- package/dist/handlers/responses/tool-result-handler.js.map +0 -1
- package/dist/handlers/responses.d.ts +0 -4
- package/dist/handlers/responses.js +0 -164
- package/dist/handlers/responses.js.map +0 -1
- package/dist/handlers/session-config.d.ts +0 -15
- package/dist/handlers/session-config.js +0 -79
- package/dist/handlers/session-config.js.map +0 -1
- package/dist/handlers/streaming-utils.d.ts +0 -10
- package/dist/handlers/streaming-utils.js +0 -22
- package/dist/handlers/streaming-utils.js.map +0 -1
- package/dist/providers/anthropic.d.ts +0 -5
- package/dist/providers/anthropic.js +0 -28
- package/dist/providers/anthropic.js.map +0 -1
- package/dist/providers/codex.d.ts +0 -5
- package/dist/providers/codex.js +0 -24
- package/dist/providers/codex.js.map +0 -1
- package/dist/providers/openai.d.ts +0 -5
- package/dist/providers/openai.js +0 -25
- package/dist/providers/openai.js.map +0 -1
- package/dist/schemas/anthropic.d.ts +0 -140
- package/dist/schemas/anthropic.js +0 -58
- package/dist/schemas/anthropic.js.map +0 -1
- package/dist/schemas/openai.d.ts +0 -98
- package/dist/schemas/openai.js +0 -76
- package/dist/schemas/openai.js.map +0 -1
- package/dist/schemas/responses.d.ts +0 -122
- package/dist/schemas/responses.js +0 -54
- package/dist/schemas/responses.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/anthropic.d.ts +0 -5
- package/dist/settings-patcher/anthropic.js +0 -75
- package/dist/settings-patcher/anthropic.js.map +0 -1
- package/dist/types.d.ts +0 -83
- package/dist/types.js +0 -2
- package/dist/types.js.map +0 -1
- package/dist/utils/anthropic-prompt.d.ts +0 -2
- package/dist/utils/anthropic-prompt.js +0 -52
- package/dist/utils/anthropic-prompt.js.map +0 -1
- package/dist/utils/model-resolver.d.ts +0 -3
- package/dist/utils/model-resolver.js +0 -45
- package/dist/utils/model-resolver.js.map +0 -1
- package/dist/utils/prompt.d.ts +0 -3
- package/dist/utils/prompt.js +0 -50
- package/dist/utils/prompt.js.map +0 -1
- package/dist/utils/responses-prompt.d.ts +0 -4
- package/dist/utils/responses-prompt.js +0 -58
- package/dist/utils/responses-prompt.js.map +0 -1
|
@@ -1,150 +0,0 @@
|
|
|
1
|
-
import { AnthropicMessagesRequestSchema, extractAnthropicSystem, } from "../schemas/anthropic.js";
|
|
2
|
-
import { formatAnthropicPrompt } from "../utils/anthropic-prompt.js";
|
|
3
|
-
import { resolveModel } from "../utils/model-resolver.js";
|
|
4
|
-
import { createSessionConfig } from "./session-config.js";
|
|
5
|
-
import { resolveToolResults } from "./messages/tool-result-handler.js";
|
|
6
|
-
import { handleAnthropicStreaming, startReply } from "./messages/streaming.js";
|
|
7
|
-
import { sendAnthropicError as sendError } from "./errors.js";
|
|
8
|
-
export function createMessagesHandler({ service, logger, config, port }, manager) {
|
|
9
|
-
return async function handleMessages(request, reply) {
|
|
10
|
-
const parseResult = AnthropicMessagesRequestSchema.safeParse(request.body);
|
|
11
|
-
if (!parseResult.success) {
|
|
12
|
-
const firstIssue = parseResult.error.issues[0];
|
|
13
|
-
sendError(reply, 400, "invalid_request_error", firstIssue?.message ?? "Invalid request body");
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
const req = parseResult.data;
|
|
17
|
-
const existingConv = manager.findByContinuation(req.messages);
|
|
18
|
-
if (existingConv) {
|
|
19
|
-
const state = existingConv.state;
|
|
20
|
-
logger.info(`Continuation for conversation ${existingConv.id} (hasPending=${String(state.hasPending)}, sessionActive=${String(state.sessionActive)})`);
|
|
21
|
-
state.setReply(reply);
|
|
22
|
-
startReply(reply, req.model);
|
|
23
|
-
// TODO: the continuation doesn't own the session so we can't abort it
|
|
24
|
-
// here. The original streaming handler will let it run to idle harmlessly
|
|
25
|
-
// because it guards against null replies, but ideally we'd abort it too.
|
|
26
|
-
reply.raw.on("close", () => {
|
|
27
|
-
if (state.currentReply === reply) {
|
|
28
|
-
logger.info("Client disconnected during continuation");
|
|
29
|
-
state.cleanup();
|
|
30
|
-
state.notifyStreamingDone();
|
|
31
|
-
}
|
|
32
|
-
});
|
|
33
|
-
resolveToolResults(req.messages, state, logger);
|
|
34
|
-
await state.waitForStreamingDone();
|
|
35
|
-
existingConv.sentMessageCount = req.messages.length;
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
const { conversation, isReuse } = manager.findForNewRequest();
|
|
39
|
-
const state = conversation.state;
|
|
40
|
-
state.markSessionActive();
|
|
41
|
-
logger.info(isReuse
|
|
42
|
-
? `Reusing primary conversation ${conversation.id}`
|
|
43
|
-
: `New conversation ${conversation.id}`);
|
|
44
|
-
// SDK doesn't support switching models mid-session (github/copilot-sdk#409)
|
|
45
|
-
if (isReuse && conversation.model && conversation.model !== req.model) {
|
|
46
|
-
logger.warn(`Model mismatch: session uses "${conversation.model}" but request sent "${req.model}" (SDK does not support mid-session model switching)`);
|
|
47
|
-
}
|
|
48
|
-
const tools = req.tools;
|
|
49
|
-
const hasTools = !!tools?.length;
|
|
50
|
-
const hasBridge = hasTools && config.toolBridge;
|
|
51
|
-
if (tools?.length) {
|
|
52
|
-
state.cacheTools(tools);
|
|
53
|
-
}
|
|
54
|
-
let prompt;
|
|
55
|
-
try {
|
|
56
|
-
prompt = formatAnthropicPrompt(req.messages.slice(conversation.sentMessageCount), config.excludedFilePatterns);
|
|
57
|
-
}
|
|
58
|
-
catch (err) {
|
|
59
|
-
sendError(reply, 400, "invalid_request_error", err instanceof Error ? err.message : String(err));
|
|
60
|
-
if (isReuse) {
|
|
61
|
-
state.markSessionInactive();
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
manager.remove(conversation.id);
|
|
65
|
-
}
|
|
66
|
-
return;
|
|
67
|
-
}
|
|
68
|
-
logger.debug(`Prompt (${isReuse ? "incremental" : "full"}): ${String(prompt.length)} chars`);
|
|
69
|
-
if (!isReuse) {
|
|
70
|
-
const systemMessage = extractAnthropicSystem(req.system);
|
|
71
|
-
logger.debug(`System message length: ${String(systemMessage?.length ?? 0)} chars`);
|
|
72
|
-
logger.debug(`Tools in request: ${tools ? String(tools.length) : "0"}`);
|
|
73
|
-
if (tools) {
|
|
74
|
-
logger.debug(`Tool names: ${tools.map((t) => t.name).join(", ")}`);
|
|
75
|
-
}
|
|
76
|
-
let copilotModel = req.model;
|
|
77
|
-
let supportsReasoningEffort = false;
|
|
78
|
-
try {
|
|
79
|
-
const models = await service.listModels();
|
|
80
|
-
const resolved = resolveModel(req.model, models, logger);
|
|
81
|
-
if (!resolved) {
|
|
82
|
-
sendError(reply, 400, "invalid_request_error", `Model "${req.model}" is not available. Available models: ${models.map((m) => m.id).join(", ")}`);
|
|
83
|
-
manager.remove(conversation.id);
|
|
84
|
-
return;
|
|
85
|
-
}
|
|
86
|
-
copilotModel = resolved;
|
|
87
|
-
if (config.reasoningEffort) {
|
|
88
|
-
const modelInfo = models.find((m) => m.id === copilotModel);
|
|
89
|
-
supportsReasoningEffort =
|
|
90
|
-
modelInfo?.capabilities.supports.reasoningEffort ?? false;
|
|
91
|
-
if (!supportsReasoningEffort) {
|
|
92
|
-
logger.debug(`Model "${copilotModel}" does not support reasoning effort, ignoring config`);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
catch (err) {
|
|
97
|
-
logger.warn("Failed to list models, passing model through as-is:", err);
|
|
98
|
-
}
|
|
99
|
-
conversation.model = copilotModel;
|
|
100
|
-
if (hasBridge) {
|
|
101
|
-
logger.info("Tool bridge active (in-process MCP)");
|
|
102
|
-
}
|
|
103
|
-
const sessionConfig = createSessionConfig({
|
|
104
|
-
model: copilotModel,
|
|
105
|
-
systemMessage,
|
|
106
|
-
logger,
|
|
107
|
-
config,
|
|
108
|
-
supportsReasoningEffort,
|
|
109
|
-
cwd: service.cwd,
|
|
110
|
-
hasToolBridge: hasBridge,
|
|
111
|
-
port,
|
|
112
|
-
conversationId: conversation.id,
|
|
113
|
-
});
|
|
114
|
-
try {
|
|
115
|
-
conversation.session = await service.createSession(sessionConfig);
|
|
116
|
-
}
|
|
117
|
-
catch (err) {
|
|
118
|
-
logger.error("Creating session failed:", err);
|
|
119
|
-
sendError(reply, 500, "api_error", "Failed to create session");
|
|
120
|
-
manager.remove(conversation.id);
|
|
121
|
-
return;
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
if (!conversation.session) {
|
|
125
|
-
logger.error("Primary conversation has no session, clearing");
|
|
126
|
-
manager.clearPrimary();
|
|
127
|
-
sendError(reply, 500, "api_error", "Session lost, please retry");
|
|
128
|
-
return;
|
|
129
|
-
}
|
|
130
|
-
state.setReply(reply);
|
|
131
|
-
try {
|
|
132
|
-
logger.info(`Streaming response for conversation ${conversation.id}`);
|
|
133
|
-
await handleAnthropicStreaming(state, conversation.session, prompt, req.model, logger, hasBridge);
|
|
134
|
-
conversation.sentMessageCount = req.messages.length;
|
|
135
|
-
if (conversation.isPrimary && state.hadError) {
|
|
136
|
-
manager.clearPrimary();
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
catch (err) {
|
|
140
|
-
logger.error("Request failed:", err);
|
|
141
|
-
if (conversation.isPrimary) {
|
|
142
|
-
manager.clearPrimary();
|
|
143
|
-
}
|
|
144
|
-
if (!reply.sent) {
|
|
145
|
-
sendError(reply, 500, "api_error", err instanceof Error ? err.message : "Internal error");
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
};
|
|
149
|
-
}
|
|
150
|
-
//# sourceMappingURL=messages.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/handlers/messages.ts"],"names":[],"mappings":"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"}
|
package/dist/handlers/models.js
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
import { currentTimestamp } from "../schemas/openai.js";
|
|
2
|
-
export function createModelsHandler({ service, logger }) {
|
|
3
|
-
return async function handleModels(_request, reply) {
|
|
4
|
-
try {
|
|
5
|
-
const models = await service.listModels();
|
|
6
|
-
const response = {
|
|
7
|
-
object: "list",
|
|
8
|
-
data: models.map((m) => ({
|
|
9
|
-
id: m.id,
|
|
10
|
-
object: "model",
|
|
11
|
-
created: currentTimestamp(),
|
|
12
|
-
owned_by: "github-copilot",
|
|
13
|
-
})),
|
|
14
|
-
};
|
|
15
|
-
reply.send(response);
|
|
16
|
-
}
|
|
17
|
-
catch (err) {
|
|
18
|
-
logger.error("Couldn't fetch models:", err);
|
|
19
|
-
reply.status(500).send({
|
|
20
|
-
error: {
|
|
21
|
-
message: "Failed to list models",
|
|
22
|
-
type: "api_error",
|
|
23
|
-
},
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
};
|
|
27
|
-
}
|
|
28
|
-
//# sourceMappingURL=models.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/handlers/models.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,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,6 +0,0 @@
|
|
|
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 startResponseStream(reply: FastifyReply, responseId: string, model: string): void;
|
|
6
|
-
export declare function handleResponsesStreaming(state: ToolBridgeState, session: CopilotSession, prompt: string, model: string, logger: Logger, hasBridge: boolean, responseId: string): Promise<void>;
|
|
@@ -1,265 +0,0 @@
|
|
|
1
|
-
import { currentTimestamp, genId } from "../../schemas/responses.js";
|
|
2
|
-
import { formatCompaction, SSE_HEADERS, sendSSEEvent as sendEvent, sendSSEComment } from "../streaming-utils.js";
|
|
3
|
-
const MCP_PREFIX = "xcode-bridge-";
|
|
4
|
-
export function startResponseStream(reply, responseId, model) {
|
|
5
|
-
reply.raw.writeHead(200, SSE_HEADERS);
|
|
6
|
-
const response = {
|
|
7
|
-
id: responseId,
|
|
8
|
-
object: "response",
|
|
9
|
-
created_at: currentTimestamp(),
|
|
10
|
-
model,
|
|
11
|
-
status: "in_progress",
|
|
12
|
-
output: [],
|
|
13
|
-
};
|
|
14
|
-
sendEvent(reply, "response.created", { response });
|
|
15
|
-
sendEvent(reply, "response.in_progress", { response });
|
|
16
|
-
}
|
|
17
|
-
export async function handleResponsesStreaming(state, session, prompt, model, logger, hasBridge, responseId) {
|
|
18
|
-
const reply = state.currentReply;
|
|
19
|
-
if (!reply)
|
|
20
|
-
throw new Error("No reply set on bridge state");
|
|
21
|
-
startResponseStream(reply, responseId, model);
|
|
22
|
-
state.markSessionActive();
|
|
23
|
-
let pendingDeltas = [];
|
|
24
|
-
let sessionDone = false;
|
|
25
|
-
// Send keepalive comments every 15s to prevent client timeouts
|
|
26
|
-
// during long internal tool execution periods.
|
|
27
|
-
const keepaliveInterval = setInterval(() => {
|
|
28
|
-
const r = state.currentReply;
|
|
29
|
-
if (r)
|
|
30
|
-
sendSSEComment(r);
|
|
31
|
-
}, 15_000);
|
|
32
|
-
// lazily created on first text delta
|
|
33
|
-
let messageItem = null;
|
|
34
|
-
let messageStarted = false;
|
|
35
|
-
let outputIndex = 0;
|
|
36
|
-
const outputItems = [];
|
|
37
|
-
const accumulatedText = [];
|
|
38
|
-
const toolNames = new Map();
|
|
39
|
-
function getReply() {
|
|
40
|
-
return state.currentReply;
|
|
41
|
-
}
|
|
42
|
-
function ensureMessageItem(r) {
|
|
43
|
-
if (!messageStarted) {
|
|
44
|
-
messageItem = {
|
|
45
|
-
type: "message",
|
|
46
|
-
id: genId("msg"),
|
|
47
|
-
status: "in_progress",
|
|
48
|
-
role: "assistant",
|
|
49
|
-
content: [],
|
|
50
|
-
};
|
|
51
|
-
sendEvent(r, "response.output_item.added", {
|
|
52
|
-
output_index: outputIndex,
|
|
53
|
-
item: messageItem,
|
|
54
|
-
});
|
|
55
|
-
sendEvent(r, "response.content_part.added", {
|
|
56
|
-
item_id: messageItem.id,
|
|
57
|
-
output_index: outputIndex,
|
|
58
|
-
content_index: 0,
|
|
59
|
-
part: { type: "output_text", text: "", annotations: [] },
|
|
60
|
-
});
|
|
61
|
-
messageStarted = true;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
function flushPending() {
|
|
65
|
-
const r = getReply();
|
|
66
|
-
if (!r || pendingDeltas.length === 0)
|
|
67
|
-
return;
|
|
68
|
-
ensureMessageItem(r);
|
|
69
|
-
for (const text of pendingDeltas) {
|
|
70
|
-
sendEvent(r, "response.output_text.delta", {
|
|
71
|
-
item_id: messageItem.id,
|
|
72
|
-
output_index: outputIndex,
|
|
73
|
-
content_index: 0,
|
|
74
|
-
delta: text,
|
|
75
|
-
});
|
|
76
|
-
accumulatedText.push(text);
|
|
77
|
-
}
|
|
78
|
-
pendingDeltas = [];
|
|
79
|
-
}
|
|
80
|
-
function closeMessageItem(r) {
|
|
81
|
-
if (!messageStarted || !messageItem)
|
|
82
|
-
return;
|
|
83
|
-
const fullText = accumulatedText.join("");
|
|
84
|
-
sendEvent(r, "response.output_text.done", {
|
|
85
|
-
item_id: messageItem.id,
|
|
86
|
-
output_index: outputIndex,
|
|
87
|
-
content_index: 0,
|
|
88
|
-
text: fullText,
|
|
89
|
-
});
|
|
90
|
-
sendEvent(r, "response.content_part.done", {
|
|
91
|
-
item_id: messageItem.id,
|
|
92
|
-
output_index: outputIndex,
|
|
93
|
-
content_index: 0,
|
|
94
|
-
part: { type: "output_text", text: fullText, annotations: [] },
|
|
95
|
-
});
|
|
96
|
-
messageItem.status = "completed";
|
|
97
|
-
messageItem.content = [{ type: "output_text", text: fullText, annotations: [] }];
|
|
98
|
-
outputItems.push(messageItem);
|
|
99
|
-
sendEvent(r, "response.output_item.done", {
|
|
100
|
-
output_index: outputIndex,
|
|
101
|
-
item: messageItem,
|
|
102
|
-
});
|
|
103
|
-
outputIndex++;
|
|
104
|
-
messageStarted = false;
|
|
105
|
-
messageItem = null;
|
|
106
|
-
}
|
|
107
|
-
function finishReply(r, status) {
|
|
108
|
-
clearInterval(keepaliveInterval);
|
|
109
|
-
const response = {
|
|
110
|
-
id: responseId,
|
|
111
|
-
object: "response",
|
|
112
|
-
created_at: currentTimestamp(),
|
|
113
|
-
model,
|
|
114
|
-
status,
|
|
115
|
-
output: outputItems,
|
|
116
|
-
};
|
|
117
|
-
sendEvent(r, `response.${status}`, { response });
|
|
118
|
-
r.raw.end();
|
|
119
|
-
state.clearReply();
|
|
120
|
-
state.notifyStreamingDone();
|
|
121
|
-
// reset for potential continuation
|
|
122
|
-
messageStarted = false;
|
|
123
|
-
messageItem = null;
|
|
124
|
-
outputIndex = 0;
|
|
125
|
-
outputItems.length = 0;
|
|
126
|
-
accumulatedText.length = 0;
|
|
127
|
-
}
|
|
128
|
-
const unsubscribe = session.on((event) => {
|
|
129
|
-
logger.debug(`Session event: ${event.type}`);
|
|
130
|
-
if (event.type === "tool.execution_start") {
|
|
131
|
-
const d = event.data;
|
|
132
|
-
toolNames.set(d.toolCallId, d.toolName);
|
|
133
|
-
logger.debug(`Running ${d.toolName} (id=${d.toolCallId}, args=${JSON.stringify(d.arguments)})`);
|
|
134
|
-
return;
|
|
135
|
-
}
|
|
136
|
-
if (event.type === "tool.execution_complete") {
|
|
137
|
-
const d = event.data;
|
|
138
|
-
const name = toolNames.get(d.toolCallId) ?? d.toolCallId;
|
|
139
|
-
toolNames.delete(d.toolCallId);
|
|
140
|
-
const detail = d.success
|
|
141
|
-
? JSON.stringify(d.result?.content)
|
|
142
|
-
: d.error?.message ?? "failed";
|
|
143
|
-
logger.debug(`${name} done (success=${String(d.success)}, ${detail})`);
|
|
144
|
-
return;
|
|
145
|
-
}
|
|
146
|
-
switch (event.type) {
|
|
147
|
-
case "assistant.message_delta":
|
|
148
|
-
if (event.data.deltaContent) {
|
|
149
|
-
logger.debug(`Delta: ${event.data.deltaContent}`);
|
|
150
|
-
pendingDeltas.push(event.data.deltaContent);
|
|
151
|
-
}
|
|
152
|
-
break;
|
|
153
|
-
case "assistant.message": {
|
|
154
|
-
logger.debug(`assistant.message: toolRequests=${String(event.data.toolRequests?.length ?? 0)}`);
|
|
155
|
-
if (event.data.toolRequests && event.data.toolRequests.length > 0) {
|
|
156
|
-
const bridgeRequests = hasBridge
|
|
157
|
-
? event.data.toolRequests.filter((tr) => tr.name.startsWith(MCP_PREFIX))
|
|
158
|
-
: event.data.toolRequests;
|
|
159
|
-
if (hasBridge && bridgeRequests.length < event.data.toolRequests.length) {
|
|
160
|
-
const skipped = event.data.toolRequests.length - bridgeRequests.length;
|
|
161
|
-
logger.debug(`Skipped ${String(skipped)} non-bridge tool request(s)`);
|
|
162
|
-
}
|
|
163
|
-
if (bridgeRequests.length > 0) {
|
|
164
|
-
// Xcode's Codex client does not process function_call items
|
|
165
|
-
// (it won't send function_call_output back), so emitting them
|
|
166
|
-
// breaks the conversation protocol. Instead we let the SDK
|
|
167
|
-
// handle bridge tools via MCP internally. The MCP tools/call
|
|
168
|
-
// will fail fast (no expected entry registered), prompting the
|
|
169
|
-
// model to fall back to its built-in tools.
|
|
170
|
-
const names = bridgeRequests.map((tr) => tr.name).join(", ");
|
|
171
|
-
logger.debug(`Bridge tool(s) requested (${names}), handled via MCP internally`);
|
|
172
|
-
}
|
|
173
|
-
else {
|
|
174
|
-
logger.debug("All tool requests were non-bridge, none emitted");
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
else {
|
|
178
|
-
const r = getReply();
|
|
179
|
-
if (r) {
|
|
180
|
-
logger.debug(`Flushing ${String(pendingDeltas.length)} pending deltas`);
|
|
181
|
-
flushPending();
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
break;
|
|
185
|
-
}
|
|
186
|
-
case "session.idle": {
|
|
187
|
-
logger.info(`Done, wrapping up stream (pendingDeltas=${String(pendingDeltas.length)})`);
|
|
188
|
-
sessionDone = true;
|
|
189
|
-
state.markSessionInactive();
|
|
190
|
-
flushPending();
|
|
191
|
-
const r = getReply();
|
|
192
|
-
if (r) {
|
|
193
|
-
if (!messageStarted) {
|
|
194
|
-
ensureMessageItem(r);
|
|
195
|
-
}
|
|
196
|
-
closeMessageItem(r);
|
|
197
|
-
finishReply(r, "completed");
|
|
198
|
-
}
|
|
199
|
-
unsubscribe();
|
|
200
|
-
break;
|
|
201
|
-
}
|
|
202
|
-
case "session.compaction_start":
|
|
203
|
-
logger.info("Compacting context...");
|
|
204
|
-
break;
|
|
205
|
-
case "session.compaction_complete":
|
|
206
|
-
logger.info(`Context compacted: ${formatCompaction(event.data)}`);
|
|
207
|
-
break;
|
|
208
|
-
case "session.error": {
|
|
209
|
-
logger.error(`Session error: ${event.data.message}`);
|
|
210
|
-
sessionDone = true;
|
|
211
|
-
state.markSessionErrored();
|
|
212
|
-
state.markSessionInactive();
|
|
213
|
-
const r = getReply();
|
|
214
|
-
if (r) {
|
|
215
|
-
if (messageStarted) {
|
|
216
|
-
closeMessageItem(r);
|
|
217
|
-
}
|
|
218
|
-
finishReply(r, "failed");
|
|
219
|
-
}
|
|
220
|
-
else {
|
|
221
|
-
// finishReply not called, so notify manually
|
|
222
|
-
clearInterval(keepaliveInterval);
|
|
223
|
-
state.notifyStreamingDone();
|
|
224
|
-
}
|
|
225
|
-
unsubscribe();
|
|
226
|
-
break;
|
|
227
|
-
}
|
|
228
|
-
default:
|
|
229
|
-
logger.debug(`Unhandled event: ${event.type}, data=${JSON.stringify(event.data)}`);
|
|
230
|
-
break;
|
|
231
|
-
}
|
|
232
|
-
});
|
|
233
|
-
reply.raw.on("close", () => {
|
|
234
|
-
if (!sessionDone && state.currentReply === reply) {
|
|
235
|
-
logger.info("Client disconnected, aborting session");
|
|
236
|
-
clearInterval(keepaliveInterval);
|
|
237
|
-
messageStarted = false;
|
|
238
|
-
messageItem = null;
|
|
239
|
-
state.markSessionErrored();
|
|
240
|
-
state.cleanup();
|
|
241
|
-
unsubscribe();
|
|
242
|
-
session.abort().catch((err) => {
|
|
243
|
-
logger.error("Failed to abort session:", err);
|
|
244
|
-
});
|
|
245
|
-
state.notifyStreamingDone();
|
|
246
|
-
}
|
|
247
|
-
});
|
|
248
|
-
const done = state.waitForStreamingDone();
|
|
249
|
-
session.send({ prompt }).catch((err) => {
|
|
250
|
-
logger.error("Failed to send prompt:", err);
|
|
251
|
-
clearInterval(keepaliveInterval);
|
|
252
|
-
sessionDone = true;
|
|
253
|
-
messageStarted = false;
|
|
254
|
-
messageItem = null;
|
|
255
|
-
const r = getReply();
|
|
256
|
-
if (r) {
|
|
257
|
-
r.raw.end();
|
|
258
|
-
state.clearReply();
|
|
259
|
-
}
|
|
260
|
-
unsubscribe();
|
|
261
|
-
state.notifyStreamingDone();
|
|
262
|
-
});
|
|
263
|
-
return done;
|
|
264
|
-
}
|
|
265
|
-
//# sourceMappingURL=streaming.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../src/handlers/responses/streaming.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { FunctionCallOutputInput } from "../../schemas/responses.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;
|
|
@@ -1,9 +0,0 @@
|
|
|
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-result-handler.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tool-result-handler.js","sourceRoot":"","sources":["../../../src/handlers/responses/tool-result-handler.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"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import type { FastifyRequest, FastifyReply } from "fastify";
|
|
2
|
-
import type { AppContext } from "../context.js";
|
|
3
|
-
import type { ConversationManager } from "../conversation-manager.js";
|
|
4
|
-
export declare function createResponsesHandler({ service, logger, config, port }: AppContext, manager: ConversationManager): (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
|