@jeffreycao/copilot-api 1.10.22 → 1.10.23

package/dist/main.js

@@ -43,7 +43,7 @@ const { auth } = await import("./auth-Qy0uU2yI.js");
 const { checkUsage } = await import("./check-usage-DDfnCA0c.js");
 const { debug } = await import("./debug-Cc-hdADF.js");
 const { mcp } = await import("./mcp-DZgcvqQY.js");
-const { start } = await import("./start-C2btrZWS.js");
+const { start } = await import("./start-B9cpzVBW.js");
 await runMain(defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server-D8xBCYdO.js → server-G5PWGqkb.js}

@@ -5169,13 +5169,17 @@ const handleResponses = async (c) => {
 	}
 	debugJson(logger$1, "Responses request payload:", payload);
 	await responsesHandlerDependencies.checkRateLimit(state);
-	const requestId = generateRequestIdFromPayload({ messages: payload.input });
+	const subagentMarker = getCodexResponsesSubagentMarker(c);
+	if (subagentMarker) debugJson(logger$1, "Detected Codex subagent headers:", subagentMarker);
+	const incomingSessionId = subagentMarker ? getIncomingResponsesSessionId(c) : void 0;
+	const sessionId = incomingSessionId ? getUUID(incomingSessionId) : void 0;
+	const requestId = generateRequestIdFromPayload({ messages: payload.input }, sessionId);
 	logger$1.debug("Generated request ID:", requestId);
-	const sessionId = getUUID(requestId);
-	logger$1.debug("Extracted session ID:", sessionId);
+	const fallbackSessionId = sessionId ?? getUUID(requestId);
+	logger$1.debug("Extracted session ID:", fallbackSessionId);
 	const recordUsage = createCopilotTokenUsageRecorder({
 		endpoint: "responses",
-		fallbackSessionId: sessionId,
+		fallbackSessionId,
 		model: payload.model
 	});
 	removeUnsupportedTools(payload);
@@ -5191,13 +5195,15 @@ const handleResponses = async (c) => {
 	if (sanitizedImageCount > 0) logger$1.warn(`Omitted ${sanitizedImageCount} oversized input image(s) before forwarding to Copilot Responses`);
 	applyResponsesApiContextManagement(payload, selectedModel?.capabilities.limits.max_prompt_tokens);
 	debugJson(logger$1, "Translated Responses payload:", payload);
-	const { vision, initiator } = getResponsesRequestOptions(payload);
+	const { vision, initiator: inferredInitiator } = getResponsesRequestOptions(payload);
+	const initiator = subagentMarker ? "agent" : inferredInitiator;
 	if (state.manualApprove) await awaitApproval();
 	const response = await responsesHandlerDependencies.createResponses(payload, {
 		vision,
 		initiator,
+		subagentMarker,
 		requestId,
-		sessionId,
+		sessionId: fallbackSessionId,
 		transport: responsesTransport
 	});
 	if (isStreamingRequested(payload) && isAsyncIterable(response)) {
@@ -5257,6 +5263,30 @@ const removeUnsupportedTools = (payload) => {
 	});
 	if (dropped.length > 0) logger$1.debug("Removed unsupported tools:", dropped);
 };
+const getIncomingResponsesSessionId = (c) => getTrimmedHeader(c, "session-id") ?? getTrimmedHeader(c, "x-session-id");
+const codexSubagentHeaderValues = new Set([
+	"collab_spawn",
+	"compact",
+	"memory_consolidation",
+	"review"
+]);
+const getCodexResponsesSubagentMarker = (c) => {
+	const agentType = getTrimmedHeader(c, "x-openai-subagent");
+	if (!agentType || !codexSubagentHeaderValues.has(agentType)) return null;
+	const threadId = getTrimmedHeader(c, "thread-id");
+	const rootSessionId = getIncomingResponsesSessionId(c);
+	const parentThreadId = getTrimmedHeader(c, "x-codex-parent-thread-id");
+	if (!threadId && !rootSessionId && !parentThreadId) return null;
+	const agentId = threadId ?? parentThreadId ?? rootSessionId ?? agentType;
+	return {
+		agent_id: agentId,
+		agent_type: agentType,
+		session_id: threadId ?? rootSessionId ?? agentId
+	};
+};
+const getTrimmedHeader = (c, name) => {
+	return c.req.header(name)?.trim() || void 0;
+};
 //#endregion
 //#region src/routes/responses/route.ts
 const responsesRoutes = new Hono();
@@ -5369,4 +5399,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-D8xBCYdO.js.map
+//# sourceMappingURL=server-G5PWGqkb.js.map