@jeffreycao/copilot-api 1.13.1 → 1.13.3

package/dist/{server-s_0_JChu.js → server-BXCLiIHf.js}

@@ -1,5 +1,5 @@
 import { S as setModelMappings, a as getExtraPromptForModel, c as getModelResponsesApiCompactThreshold$1, d as getReasoningEffortForModel, f as getSmallModel, g as isResponsesApiWebSocketEnabled, h as isResponsesApiWebSearchEnabled, i as getConfig, l as getProviderConfig, m as isResponsesApiContextManagementEnabled, n as getAnthropicApiKey, o as getMessageApiWebSearchModel, p as isMessagesApiEnabled, r as getClaudeTokenMultiplier, s as getModelMappings, u as getRawProviderConfig, v as listEnabledProviders, w as PATHS, x as resolveMappedModel } from "./config-DODTXsGz.js";
-import { B as forwardError, C as prepareInteractionHeaders, D as compactMessageSections, E as compactAutoContinuePromptStarts, F as resolveTraceId$1, I as createPooledWebSocketStream, L as createWebSocketUrl, M as forwardCodexResponses, N as generateTraceId, P as requestContext, R as state, S as prepareForCompact, _ as getCopilotUsage, b as copilotHeaders, d as generateRequestIdFromPayload, f as getRootSessionId, g as sleep, h as parseUserIdMetadata, k as compactSystemPromptStarts, m as isNullish, p as getUUID, r as setupCodexToken, w as prepareMessageProxyHeaders, x as copilotWebSocketHeaders, y as copilotBaseUrl, z as HTTPError } from "./token-DigcCxDR.js";
+import { B as forwardError, C as prepareInteractionHeaders, D as compactMessageSections, E as compactAutoContinuePromptStarts, F as resolveTraceId$1, I as createPooledWebSocketStream, L as createWebSocketUrl, M as forwardCodexResponses, N as generateTraceId, P as requestContext, R as state, S as prepareForCompact, _ as getCopilotUsage, b as copilotHeaders, d as generateRequestIdFromPayload, f as getRootSessionId, g as sleep, h as parseUserIdMetadata, k as compactSystemPromptStarts, m as isNullish, p as getUUID, r as setupCodexToken, w as prepareMessageProxyHeaders, x as copilotWebSocketHeaders, y as copilotBaseUrl, z as HTTPError } from "./token-Bi8n0f86.js";
 import { a as isDeferredToolName, c as parseMcpToolSearchSentinel, d as shouldEnableResponsesToolSearch, i as isBridgeToolSearchName, l as resolveBridgeToolSearchName, o as listDeferredToolNames, r as formatToolSearchBridgeArguments, s as normalizeToolSearchBridgeArguments, t as BRIDGE_TOOL_SEARCH_NAME, u as selectDeferredToolsByNames } from "./tool-search-OX6iPJ9D.js";
 import consola from "consola";
 import { createHash } from "node:crypto";
@@ -3313,8 +3313,8 @@ const createResponsesWebSocketStreamChunk = (data) => {
 			parsed.message = parsed.error.message;
 		}
 		return {
-			data: JSON.stringify(parsed),
 			event: typeof parsed.type === "string" ? parsed.type : void 0,
+			data: JSON.stringify(parsed),
 			id: typeof parsed.id === "string" ? parsed.id : void 0
 		};
 	} catch {
@@ -3339,8 +3339,8 @@ const createResponsesErrorServerSentEventChunk = (message) => {
 		type: "error"
 	};
 	return {
-		data: JSON.stringify(errorEvent),
-		event: errorEvent.type
+		event: errorEvent.type,
+		data: JSON.stringify(errorEvent)
 	};
 };
 const getErrorMessage = (error) => {
@@ -4401,52 +4401,6 @@ const stringifyToolSearchArguments = (argumentsValue) => {
 		return;
 	}
 };
-//#endregion
-//#region src/lib/subagent.ts
-const subagentMarkerPrefix = "__SUBAGENT_MARKER__";
-//#endregion
-//#region src/routes/messages/subagent-marker.ts
-const parseSubagentMarkerFromFirstUser = (payload) => {
-	const firstUserMessage = payload.messages.find((msg) => msg.role === "user" && Array.isArray(msg.content));
-	if (!firstUserMessage || !Array.isArray(firstUserMessage.content)) return null;
-	for (const block of firstUserMessage.content) {
-		if (block.type !== "text") continue;
-		const marker = parseSubagentMarkerFromSystemReminder(block.text);
-		if (marker) return marker;
-	}
-	return null;
-};
-const parseSubagentMarkerFromSystemReminder = (text) => {
-	const startTag = "<system-reminder>";
-	const endTag = "</system-reminder>";
-	let searchFrom = 0;
-	while (true) {
-		const reminderStart = text.indexOf(startTag, searchFrom);
-		if (reminderStart === -1) break;
-		const contentStart = reminderStart + 17;
-		const reminderEnd = text.indexOf(endTag, contentStart);
-		if (reminderEnd === -1) break;
-		const reminderContent = text.slice(contentStart, reminderEnd);
-		const markerIndex = reminderContent.indexOf(subagentMarkerPrefix);
-		if (markerIndex === -1) {
-			searchFrom = reminderEnd + 18;
-			continue;
-		}
-		const markerJson = reminderContent.slice(markerIndex + 19).trim();
-		try {
-			const parsed = JSON.parse(markerJson);
-			if (!parsed.session_id || !parsed.agent_id || !parsed.agent_type) {
-				searchFrom = reminderEnd + 18;
-				continue;
-			}
-			return parsed;
-		} catch {
-			searchFrom = reminderEnd + 18;
-			continue;
-		}
-	}
-	return null;
-};
 const DEFAULT_RESPONSES_COMPACT_THRESHOLD_RATIO = .9;
 const responsesUtilsDependencies = {
 	getModelResponsesApiCompactThreshold: getModelResponsesApiCompactThreshold$1,
@@ -4761,6 +4715,10 @@ const prepareWebSearchResponsesPayload = (payload, options = {}) => {
 	}, options.subagentAgentId);
 	responsesPayload.tools = [buildResponsesWebSearchTool(config)];
 	responsesPayload.tool_choice = void 0;
+	responsesPayload.reasoning = {
+		effort: "medium",
+		summary: "auto"
+	};
 	return responsesPayload;
 };
 const reconstructWebSearchResponse = (payload, result, options) => {
@@ -4783,21 +4741,21 @@ const reconstructWebSearchResponse = (payload, result, options) => {
 		}
 	};
 };
-const collectWebSearchResponsesStreamResult = async ({ errorMessagePrefix = "Web search responses stream", parseEvent = parseWebSearchResponsesStreamEvent, upstreamResponse, logger }) => {
+const collectWebSearchResponsesStreamResult = async ({ errorMessagePrefix = "Web search responses stream", parseEvent = parseResponsesStreamEvent$1, upstreamResponse, logger }) => {
 	const state = createWebSearchResponsesStreamCollection();
 	for await (const chunk of upstreamResponse) {
-		debugJson(logger, "Received web search responses stream chunk:", chunk.data);
+		debugJson(logger, "Received web search responses stream chunk:", chunk);
 		if (chunk.event === "ping") continue;
 		if (!chunk.data || chunk.data === "[DONE]") continue;
 		const parsed = parseEvent(chunk.data);
 		if (!parsed) continue;
-		collectWebSearchResponsesStreamEvent(parsed, state);
 		if (parsed.type === "error") throw new Error(getStreamErrorMessage(parsed) ?? `${errorMessagePrefix} failed`);
-		if (isResponsesTerminalEvent(parsed)) return buildWebSearchResponsesStreamResult(state);
+		const result = collectResponsesStreamEvent(parsed, state);
+		if (result) return result;
 	}
 	throw new Error(`${errorMessagePrefix} ended without a terminal event`);
 };
-const parseWebSearchResponsesStreamEvent = (data) => {
+const parseResponsesStreamEvent$1 = (data) => {
 	try {
 		return JSON.parse(data);
 	} catch {
@@ -4807,127 +4765,29 @@ const parseWebSearchResponsesStreamEvent = (data) => {
 const isWebSearchResponsesStream = (value) => {
 	return Boolean(value) && typeof value[Symbol.asyncIterator] === "function";
 };
-const isResponsesTerminalEvent = (event) => (event.type === "response.completed" || event.type === "response.failed" || event.type === "response.incomplete") && getResponsesResult(event.response) !== void 0;
-const createWebSearchResponsesStreamCollection = () => ({
-	outputItemsByIndex: /* @__PURE__ */ new Map(),
-	textPartsByKey: /* @__PURE__ */ new Map()
-});
-const collectWebSearchResponsesStreamEvent = (event, state) => {
+const createWebSearchResponsesStreamCollection = () => ({ outputItemsByIndex: /* @__PURE__ */ new Map() });
+const collectResponsesStreamEvent = (event, state) => {
 	switch (event.type) {
-		case "response.created":
-			state.createdResponse = getResponsesResult(event.response);
-			break;
 		case "response.completed":
 		case "response.failed":
-		case "response.incomplete":
-			if (isResponsesTerminalEvent(event)) {
-				event.response.copilot_usage ??= event.copilot_usage;
-				state.terminalResponse = event.response;
-			}
-			break;
-		case "response.output_item.added":
-		case "response.output_item.done": {
-			const outputIndex = getNumber(event.output_index);
-			const item = getRecord(event.item);
-			if (outputIndex !== void 0 && item) state.outputItemsByIndex.set(outputIndex, item);
-			break;
-		}
-		case "response.output_text.delta": {
-			const part = getOrCreateOutputTextPart(event, state);
-			const delta = getString(event.delta);
-			if (part && delta) part.text += delta;
-			break;
-		}
-		case "response.output_text.done": {
-			const part = getOrCreateOutputTextPart(event, state);
-			const text = getString(event.text);
-			if (part && text !== void 0) part.text = text;
-			break;
-		}
-		case "response.output_text.annotation.added": {
-			const part = getOrCreateOutputTextPart(event, state);
-			const annotation = event.annotation;
-			if (part && annotation !== void 0) part.annotations.push(annotation);
-			break;
+		case "response.incomplete": {
+			event.response.copilot_usage ??= event.copilot_usage;
+			const response = event.response;
+			if (!response) throw new Error("Web search responses stream ended without a response");
+			const output = [...state.outputItemsByIndex.entries()].sort(([leftIndex], [rightIndex]) => leftIndex - rightIndex).map(([, item]) => item);
+			return {
+				...response,
+				output: output.length > 0 ? output : response.output
+			};
 		}
-		case "response.content_part.done":
-			collectDoneContentPart(event, state);
+		case "response.output_item.done":
+			state.outputItemsByIndex.set(event.output_index, event.item);
 			break;
 	}
 };
-const buildWebSearchResponsesStreamResult = (state) => {
-	const response = state.terminalResponse ?? state.createdResponse;
-	if (!response) throw new Error("Web search responses stream ended without a response");
-	const output = buildCollectedWebSearchOutput(state);
-	return {
-		...response,
-		output: output.length > 0 ? output : response.output
-	};
-};
-const buildCollectedWebSearchOutput = (state) => [...state.outputItemsByIndex.entries()].sort(([leftIndex], [rightIndex]) => leftIndex - rightIndex).map(([outputIndex, item]) => mergeOutputItemWithCollectedText(outputIndex, item, state));
-const mergeOutputItemWithCollectedText = (outputIndex, item, state) => {
-	if (item.type !== "message") return item;
-	const collectedParts = getCollectedTextParts(outputIndex, state);
-	if (collectedParts.length === 0) return item;
-	const content = getArray(item.content);
-	for (const part of collectedParts) {
-		const existingPart = getRecord(content[part.contentIndex]);
-		content[part.contentIndex] = {
-			...existingPart,
-			type: "output_text",
-			text: part.text,
-			annotations: mergeAnnotations(existingPart?.annotations, part.annotations)
-		};
-	}
-	return {
-		...item,
-		content
-	};
-};
-const collectDoneContentPart = (event, state) => {
-	const partRecord = getRecord(getRecord(event)?.part);
-	if (partRecord?.type !== "output_text") return;
-	const part = getOrCreateOutputTextPart(event, state);
-	if (!part) return;
-	const text = getString(partRecord.text);
-	if (text !== void 0) part.text = text;
-	const annotations = getArray(partRecord.annotations);
-	if (annotations.length > 0) part.annotations.push(...annotations);
-};
-const getOrCreateOutputTextPart = (event, state) => {
-	const eventRecord = getRecord(event);
-	const outputIndex = getNumber(eventRecord?.output_index);
-	const contentIndex = getNumber(eventRecord?.content_index);
-	if (outputIndex === void 0 || contentIndex === void 0) return;
-	const key = `${outputIndex}:${contentIndex}`;
-	let part = state.textPartsByKey.get(key);
-	if (!part) {
-		part = {
-			annotations: [],
-			contentIndex,
-			itemId: getString(eventRecord?.item_id),
-			outputIndex,
-			text: ""
-		};
-		state.textPartsByKey.set(key, part);
-	}
-	return part;
-};
-const getCollectedTextParts = (outputIndex, state) => [...state.textPartsByKey.values()].filter((part) => part.outputIndex === outputIndex).sort((left, right) => left.contentIndex - right.contentIndex || (left.itemId ?? "").localeCompare(right.itemId ?? ""));
-const mergeAnnotations = (existingAnnotations, collectedAnnotations) => {
-	const annotations = getArray(existingAnnotations);
-	annotations.push(...collectedAnnotations);
-	return annotations;
-};
-const getResponsesResult = (value) => getRecord(value);
-const getRecord = (value) => value && typeof value === "object" ? value : void 0;
-const getArray = (value) => Array.isArray(value) ? Array.from(value) : [];
 const getStreamErrorMessage = (event) => {
-	const eventRecord = getRecord(event);
-	return getString(getRecord(eventRecord?.error)?.message) ?? getString(eventRecord?.message);
+	return event.error?.message ?? event.message ?? void 0;
 };
-const getNumber = (value) => typeof value === "number" ? value : void 0;
-const getString = (value) => typeof value === "string" ? value : void 0;
 const createUsageRecorder = (payload, sessionId, webSearchModel) => webSearchFlowDependencies.createUsageRecorder(payload, sessionId, webSearchModel);
 /**
 * Entry point for web-search detection and routing on /v1/messages.
@@ -4950,17 +4810,15 @@ const tryHandleWebSearch = async (c, payload, options) => {
 		return await options.forwardToProvider(c, payload, route.alias.provider);
 	}
 	if (route.kind === "responses") {
-		const subagentMarker = parseSubagentMarkerFromFirstUser(payload);
 		let sessionId = getRootSessionId(payload, c);
 		const requestId = generateRequestIdFromPayload(payload, sessionId);
 		if (!sessionId) sessionId = getUUID(requestId);
-		const compactType = getCompactType(payload);
 		return await handleWebSearchViaResponses(c, payload, {
-			subagentMarker,
+			subagentMarker: null,
 			webSearchModel: route.model,
 			requestId,
 			sessionId,
-			compactType,
+			compactType: 0,
 			logger: options.logger
 		});
 	}
@@ -5007,10 +4865,14 @@ const handleWebSearchViaResponses = async (c, payload, options) => {
 	});
 	if (!wantsStream) return c.json(response);
 	return streamSSE(c, async (stream) => {
-		for (const event of buildSyntheticStreamEvents(response)) await stream.writeSSE({
-			event: event.type,
-			data: JSON.stringify(event)
-		});
+		for (const event of buildSyntheticStreamEvents(response)) {
+			const data = JSON.stringify(event);
+			logger.debug(`Web search stream event`, data);
+			await stream.writeSSE({
+				event: event.type,
+				data
+			});
+		}
 	});
 };
 const blockToStreamEvents = (block, index) => {
@@ -5262,11 +5124,7 @@ async function handleProviderMessagesForProvider(c, options) {
 }
 const handleOpenAIResponsesProviderWebSearchMessages = async (c, options) => {
 	const { modelConfig, payload, provider, providerConfig } = options;
-	const selectedModel = providerConfig.name === "codex" ? getModels().data.find((model) => model.id === payload.model) : void 0;
 	const responsesPayload = prepareWebSearchResponsesPayload(payload);
-	responsesPayload.stream = true;
-	applyResponsesApiContextManagement(responsesPayload, selectedModel?.capabilities.limits.max_prompt_tokens);
-	compactInputByLatestCompaction(responsesPayload);
 	debugJson(logger$6, "provider.messages.responses.web_search.request", {
 		payload: responsesPayload,
 		provider
@@ -5694,13 +5552,17 @@ const respondWebSearchProviderMessagesJson = (c, options) => {
 	const { body, modelConfig, payload, pricingCurrency, provider } = options;
 	createProviderMessagesUsageRecorder(payload, provider, modelConfig, pricingCurrency)(normalizeResponsesUsage(body.usage));
 	const { extract, response } = reconstructWebSearchResponse(payload, body, { requestId: body.id || `${provider}:${payload.model}` });
-	logger$6.debug(`provider.messages.responses.web_search: ${extract.queries.length} quer(y/ies), ${extract.sources.length} source(s)`);
+	debugJson(logger$6, `Web search via responses: ${extract.queries.length} quer(y/ies), ${extract.sources.length} source(s)`, body);
 	if (!payload.stream) return c.json(response);
 	return streamSSE(c, async (stream) => {
-		for (const event of buildSyntheticStreamEvents(response)) await stream.writeSSE({
-			event: event.type,
-			data: JSON.stringify(event)
-		});
+		for (const event of buildSyntheticStreamEvents(response)) {
+			const data = JSON.stringify(event);
+			logger$6.debug(`Web search stream event`, data);
+			await stream.writeSSE({
+				event: event.type,
+				data
+			});
+		}
 	});
 };
 const createProviderMessagesUsageRecorder = (payload, provider, modelConfig, pricingCurrency) => createProviderTokenUsageRecorder({
@@ -5998,6 +5860,52 @@ const parseAnthropicStreamEvent = (data) => {
 	}
 };
 //#endregion
+//#region src/lib/subagent.ts
+const subagentMarkerPrefix = "__SUBAGENT_MARKER__";
+//#endregion
+//#region src/routes/messages/subagent-marker.ts
+const parseSubagentMarkerFromFirstUser = (payload) => {
+	const firstUserMessage = payload.messages.find((msg) => msg.role === "user" && Array.isArray(msg.content));
+	if (!firstUserMessage || !Array.isArray(firstUserMessage.content)) return null;
+	for (const block of firstUserMessage.content) {
+		if (block.type !== "text") continue;
+		const marker = parseSubagentMarkerFromSystemReminder(block.text);
+		if (marker) return marker;
+	}
+	return null;
+};
+const parseSubagentMarkerFromSystemReminder = (text) => {
+	const startTag = "<system-reminder>";
+	const endTag = "</system-reminder>";
+	let searchFrom = 0;
+	while (true) {
+		const reminderStart = text.indexOf(startTag, searchFrom);
+		if (reminderStart === -1) break;
+		const contentStart = reminderStart + 17;
+		const reminderEnd = text.indexOf(endTag, contentStart);
+		if (reminderEnd === -1) break;
+		const reminderContent = text.slice(contentStart, reminderEnd);
+		const markerIndex = reminderContent.indexOf(subagentMarkerPrefix);
+		if (markerIndex === -1) {
+			searchFrom = reminderEnd + 18;
+			continue;
+		}
+		const markerJson = reminderContent.slice(markerIndex + 19).trim();
+		try {
+			const parsed = JSON.parse(markerJson);
+			if (!parsed.session_id || !parsed.agent_id || !parsed.agent_type) {
+				searchFrom = reminderEnd + 18;
+				continue;
+			}
+			return parsed;
+		} catch {
+			searchFrom = reminderEnd + 18;
+			continue;
+		}
+	}
+	return null;
+};
+//#endregion
 //#region src/routes/messages/handler.ts
 const logger$5 = createHandlerLogger("messages-handler");
 const messagesFlowHandlers = {
@@ -6678,4 +6586,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-s_0_JChu.js.map
+//# sourceMappingURL=server-BXCLiIHf.js.map