@jeffreycao/copilot-api 1.10.29 → 1.10.31

package/README.md

@@ -244,7 +244,7 @@ The following command line options are available for the `start` command:
 - **auth.adminApiKey:** Single admin key used only for `/admin/*` routes. If missing, the server generates a random key at startup and writes it back to `config.json`. Requests use the same `x-api-key` or `Authorization: Bearer` headers, but regular `auth.apiKeys` never grant access to `/admin/*`.
 - **modelMappings:** Exact `sourceModel -> targetModel` rewrites shared by top-level `POST /v1/messages`, `POST /v1/messages/count_tokens`, `POST /v1/responses`, and `POST /v1/chat/completions` requests. Omit it or leave it as `{}` to disable rewrites. Both the source and target must be non-empty strings. Targets can be regular model IDs or `provider/model` aliases such as `dashscope/qwen3.6-plus`, and the rewrite happens before provider alias parsing. These mappings are not split per interface. The admin endpoints `GET/POST /admin/config/model-mappings` read and update only this field.
 - **extraPrompts:** Map of `model -> prompt` appended to the first system prompt when translating Anthropic-style requests to Copilot. Use this to inject guardrails or guidance per model. Missing default entries are auto-added without overwriting your custom prompts. The built-in prompts for `gpt-5.3-codex` and `gpt-5.4` enable phase-aware commentary, which lets the model emit a short user-facing progress update before tools or deeper reasoning.
-- **providers:** Global upstream provider map. Each provider key (for example `dashscope`) becomes a route prefix (`/dashscope/v1/messages`). Supports `type: "anthropic"`, `type: "openai-compatible"`, and `type: "openai-responses"`. Top-level clients can also use `model: "dashscope/model-id"` with `/v1/messages`, `/v1/messages/count_tokens`, and `/v1/responses`; the gateway strips the `dashscope/` prefix before forwarding upstream. `GET /v1/models` does not aggregate provider models; use `GET /dashscope/v1/models` for provider model lists.
+- **providers:** Global upstream provider map. Each provider key (for example `dashscope`) becomes a route prefix (`/dashscope/v1/messages`). Supports `type: "anthropic"`, `type: "openai-compatible"`, and `type: "openai-responses"`. Top-level clients can also use `model: "dashscope/model-id"` with `/v1/messages`, `/v1/messages/count_tokens`, `/v1/responses`, and `/v1/chat/completions`; the gateway strips the `dashscope/` prefix before forwarding upstream. `GET /v1/models` does not aggregate provider models; use `GET /dashscope/v1/models` for provider model lists.
   - `enabled` defaults to `true` if omitted.
   - `baseUrl` should be provider API base URL without the final endpoint. For Anthropic providers, omit `/v1/messages`; for OpenAI-compatible providers, omit `/v1/chat/completions`; for OpenAI Responses providers, omit `/v1/responses`.
   - `apiKey` is used as the upstream credential value and is required for regular providers.
@@ -304,7 +304,7 @@ These endpoints mimic the OpenAI API structure.
 | Endpoint                    | Method | Description                                                      |
 | --------------------------- | ------ | ---------------------------------------------------------------- |
 | `POST /v1/responses`        | `POST` | OpenAI Most advanced interface for generating model responses. Supports `provider/model` aliases for `openai-responses` providers. |
-| `POST /v1/chat/completions` | `POST` | Creates a model response for the given chat conversation.        |
+| `POST /v1/chat/completions` | `POST` | Creates a model response for the given chat conversation. Supports `provider/model` aliases for `openai-compatible` providers. |
 | `GET /v1/models`            | `GET`  | Lists the currently available models.                            |
 | `POST /v1/embeddings`       | `POST` | Creates an embedding vector representing the input text.         |
 

package/README.zh-CN.md

@@ -246,7 +246,7 @@ Copilot API 现在使用子命令结构，主要命令包括：
 - **auth.adminApiKey：** 仅用于 `/admin/*` 路由的单个 admin key。若未配置，服务会在启动时自动生成一个随机 key，并回写到 `config.json`。它同样使用 `x-api-key` 或 `Authorization: Bearer` 这两种头，但普通 `auth.apiKeys` 不能访问 `/admin/*`。
 - **modelMappings：** 用于顶层 `POST /v1/messages`、`POST /v1/messages/count_tokens`、`POST /v1/responses` 和 `POST /v1/chat/completions` 请求的精确 `sourceModel -> targetModel` 重写映射，这几类接口共用同一份规则。省略该字段或保留为 `{}` 时，不会做模型重写。`source` 和 `target` 都必须是非空字符串。`target` 可以是普通模型 ID，也可以是 `provider/model` 形式的别名，例如 `dashscope/qwen3.6-plus`；重写发生在 provider alias 解析之前。这些映射不再按接口区分。`GET/POST /admin/config/model-mappings` 管理接口读写的也只有这个字段。
 - **extraPrompts：** `model -> prompt` 的映射。把 Anthropic 风格请求翻译给 Copilot 时，会将其附加到第一条 system prompt 后面。你可以借此为不同模型注入护栏或指引。缺失的默认项会自动补齐，但不会覆盖你自定义的 prompt。内置的 `gpt-5.3-codex` 和 `gpt-5.4` prompt 会启用带阶段感知的 commentary，让模型在工具调用或更深层推理前先发出简短的用户可见进度说明。
-- **providers：** 全局上游 provider 映射。每个 provider key（例如 `dashscope`）都会变成一个路由前缀（`/dashscope/v1/messages`）。支持 `type: "anthropic"`、`type: "openai-compatible"` 和 `type: "openai-responses"`。顶层客户端也可以在 `/v1/messages`、`/v1/messages/count_tokens` 和 `/v1/responses` 中使用 `model: "dashscope/model-id"`；AI gateway 会在转发上游前移除 `dashscope/` 前缀。`GET /v1/models` 不聚合 provider 模型；provider 模型列表请使用 `GET /dashscope/v1/models`。
+- **providers：** 全局上游 provider 映射。每个 provider key（例如 `dashscope`）都会变成一个路由前缀（`/dashscope/v1/messages`）。支持 `type: "anthropic"`、`type: "openai-compatible"` 和 `type: "openai-responses"`。顶层客户端也可以在 `/v1/messages`、`/v1/messages/count_tokens`、`/v1/responses` 和 `/v1/chat/completions` 中使用 `model: "dashscope/model-id"`；AI gateway 会在转发上游前移除 `dashscope/` 前缀。`GET /v1/models` 不聚合 provider 模型；provider 模型列表请使用 `GET /dashscope/v1/models`。
   - `enabled`：可选，若省略则默认为 `true`。
   - `baseUrl`：provider API 的基础 URL，不要带结尾的 endpoint。Anthropic provider 不要带 `/v1/messages`；OpenAI 兼容 provider 不要带 `/v1/chat/completions`；OpenAI Responses provider 不要带 `/v1/responses`。
   - `apiKey`：作为上游凭据值使用；普通 provider 必须配置。
@@ -306,7 +306,7 @@ curl http://localhost:4141/admin/config/model-mappings \
 | 端点 | 方法 | 说明 |
 | --- | --- | --- |
 | `POST /v1/responses` | `POST` | OpenAI 中用于生成模型响应的高级接口。支持 `openai-responses` provider 的 `provider/model` 别名。 |
-| `POST /v1/chat/completions` | `POST` | 为给定聊天对话创建模型响应。 |
+| `POST /v1/chat/completions` | `POST` | 为给定聊天对话创建模型响应。支持 `openai-compatible` provider 的 `provider/model` 别名。 |
 | `GET /v1/models` | `GET` | 列出当前可用模型。 |
 | `POST /v1/embeddings` | `POST` | 创建表示输入文本的向量嵌入。 |
 

package/dist/main.js

@@ -43,7 +43,7 @@ const { auth } = await import("./auth-aKVIYJgv.js");
 const { checkUsage } = await import("./check-usage-VAhq_UvP.js");
 const { debug } = await import("./debug-9GrBfKqc.js");
 const { mcp } = await import("./mcp-DZgcvqQY.js");
-const { start } = await import("./start-BDPLLHaw.js");
+const { start } = await import("./start-CJzLIzWp.js");
 await runMain(defineCommand({
 	meta: {
 		name: "copilot-api",

package/dist/{server-BDu1gVes.js → server-81bhucad.js}

@@ -273,6 +273,36 @@ const createHandlerLogger = (name) => {
 	return instance;
 };
 //#endregion
+//#region src/lib/provider-model.ts
+const parseProviderModelAlias = (model) => {
+	const separatorIndex = model.indexOf("/");
+	if (separatorIndex <= 0 || separatorIndex === model.length - 1) return null;
+	const provider = model.slice(0, separatorIndex).trim();
+	const providerModel = model.slice(separatorIndex + 1).trim();
+	if (!provider || !providerModel) return null;
+	return {
+		model: providerModel,
+		provider
+	};
+};
+const createFallbackModel = (modelId) => ({
+	capabilities: {
+		family: "provider",
+		limits: {},
+		object: "model_capabilities",
+		supports: {},
+		tokenizer: "o200k_base",
+		type: "chat"
+	},
+	id: modelId,
+	model_picker_enabled: false,
+	name: modelId,
+	object: "model",
+	preview: false,
+	vendor: "provider",
+	version: "unknown"
+});
+//#endregion
 //#region src/lib/rate-limit.ts
 async function checkRateLimit(state) {
 	if (state.rateLimitSeconds === void 0) return;
@@ -920,6 +950,188 @@ function mergeAnthropicUsage(current, next) {
 	};
 }
 //#endregion
+//#region src/lib/provider-resolver.ts
+function isMissingCodexCredentialsError(error) {
+	return error instanceof Error && error.message === "Codex credentials not found. Run `copilot-api auth login --provider codex` first.";
+}
+async function resolveProviderConfig(providerName) {
+	const normalizedProviderName = providerName.trim();
+	if (!normalizedProviderName) return null;
+	if (normalizedProviderName === "codex") {
+		if (getRawProviderConfig(normalizedProviderName)?.enabled === false) return null;
+		try {
+			await setupCodexToken();
+		} catch (error) {
+			if (isMissingCodexCredentialsError(error)) return null;
+			throw error;
+		}
+		const providerConfig = getProviderConfig(normalizedProviderName);
+		if (!providerConfig) return null;
+		return {
+			...providerConfig,
+			apiKey: state.codexAccessToken ?? providerConfig.apiKey
+		};
+	}
+	return getProviderConfig(normalizedProviderName);
+}
+//#endregion
+//#region src/services/providers/provider-proxy.ts
+const SHARED_FORWARDABLE_HEADERS = ["accept", "user-agent"];
+const ANTHROPIC_FORWARDABLE_HEADERS = ["anthropic-version", "anthropic-beta"];
+const STRIPPED_RESPONSE_HEADERS = [
+	"connection",
+	"content-encoding",
+	"content-length",
+	"keep-alive",
+	"proxy-authenticate",
+	"proxy-authorization",
+	"te",
+	"trailer",
+	"transfer-encoding",
+	"upgrade"
+];
+function buildProviderUpstreamHeaders(providerConfig, requestHeaders) {
+	const authHeaders = {};
+	if (providerConfig.authType === "x-api-key") authHeaders["x-api-key"] = providerConfig.apiKey;
+	else authHeaders.authorization = `Bearer ${providerConfig.apiKey}`;
+	const headers = {
+		"content-type": "application/json",
+		accept: "application/json",
+		...authHeaders
+	};
+	for (const headerName of SHARED_FORWARDABLE_HEADERS) {
+		const headerValue = requestHeaders.get(headerName);
+		if (headerValue) headers[headerName] = headerValue;
+	}
+	if (providerConfig.type !== "anthropic") return headers;
+	for (const headerName of ANTHROPIC_FORWARDABLE_HEADERS) {
+		const headerValue = requestHeaders.get(headerName);
+		if (headerValue) headers[headerName] = headerValue;
+	}
+	return headers;
+}
+function createProviderProxyResponse(upstreamResponse, body) {
+	const headers = new Headers(upstreamResponse.headers);
+	for (const headerName of STRIPPED_RESPONSE_HEADERS) headers.delete(headerName);
+	return new Response(body ?? upstreamResponse.body, {
+		headers,
+		status: upstreamResponse.status,
+		statusText: upstreamResponse.statusText
+	});
+}
+async function forwardProviderMessages(providerConfig, payload, requestHeaders) {
+	return await fetch(`${providerConfig.baseUrl}/v1/messages`, {
+		method: "POST",
+		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
+		body: JSON.stringify(payload)
+	});
+}
+async function forwardProviderChatCompletions(providerConfig, payload, requestHeaders) {
+	return await fetch(`${providerConfig.baseUrl}/v1/chat/completions`, {
+		method: "POST",
+		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
+		body: JSON.stringify(payload)
+	});
+}
+async function forwardProviderResponses(providerConfig, payload, requestHeaders) {
+	return await fetch(`${providerConfig.baseUrl}/v1/responses`, {
+		method: "POST",
+		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
+		body: JSON.stringify(payload)
+	});
+}
+async function forwardProviderModels(providerConfig, requestHeaders) {
+	return await fetch(`${providerConfig.baseUrl}/v1/models`, {
+		method: "GET",
+		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders)
+	});
+}
+//#endregion
+//#region src/routes/provider/chat-completions/handler.ts
+const logger$8 = createHandlerLogger("provider-chat-completions-handler");
+async function handleProviderChatCompletionsForProvider(c, options) {
+	const { payload, provider } = options;
+	const providerConfig = await resolveProviderConfig(provider);
+	if (providerConfig?.type !== "openai-compatible") return c.json({ error: {
+		message: `Provider '${provider}' does not support the /v1/chat/completions endpoint`,
+		type: "invalid_request_error"
+	} }, 400);
+	const modelConfig = providerConfig.models?.[payload.model];
+	applyProviderModelDefaults(payload, modelConfig);
+	applyMissingExtraBody$1(payload, { extraBody: modelConfig?.extraBody });
+	applyProviderStreamOptions(payload);
+	debugJson(logger$8, "provider.chat_completions.request", {
+		payload,
+		provider
+	});
+	const upstreamResponse = await forwardProviderChatCompletions(providerConfig, payload, c.req.raw.headers);
+	if (!upstreamResponse.ok) {
+		logger$8.error("Failed to create provider chat completions", {
+			provider,
+			statusCode: upstreamResponse.status
+		});
+		throw new HTTPError(`Failed to create ${provider} chat completions`, upstreamResponse);
+	}
+	const recordUsage = createProviderChatCompletionsUsageRecorder(payload, provider);
+	const contentType = upstreamResponse.headers.get("content-type") ?? "";
+	if (Boolean(payload.stream) && contentType.includes("text/event-stream")) return streamProviderChatCompletions(c, upstreamResponse, {
+		provider,
+		recordUsage
+	});
+	const responseBody = await upstreamResponse.clone().json();
+	recordUsage(normalizeOpenAIUsage(responseBody.usage));
+	debugJson(logger$8, "provider.chat_completions.response", responseBody);
+	return createProviderProxyResponse(upstreamResponse);
+}
+const applyProviderModelDefaults = (payload, modelConfig) => {
+	payload.temperature ??= modelConfig?.temperature;
+	payload.top_p ??= modelConfig?.topP;
+	payload.top_k ??= modelConfig?.topK;
+};
+const applyMissingExtraBody$1 = (payload, options) => {
+	for (const [key, value] of Object.entries(options.extraBody ?? {})) if (!Object.hasOwn(payload, key)) payload[key] = value;
+};
+const applyProviderStreamOptions = (payload) => {
+	if (!payload.stream) return;
+	payload.stream_options = {
+		...payload.stream_options ?? {},
+		include_usage: true
+	};
+};
+const createProviderChatCompletionsUsageRecorder = (payload, provider) => createProviderTokenUsageRecorder({
+	endpoint: "chat_completions",
+	model: payload.model,
+	providerName: provider
+});
+const streamProviderChatCompletions = (c, upstreamResponse, options) => {
+	logger$8.debug("provider.chat_completions.streaming", { provider: options.provider });
+	return streamSSE(c, async (stream) => {
+		let usage = {};
+		try {
+			for await (const chunk of events(upstreamResponse)) {
+				debugJson(logger$8, "provider.chat_completions.stream_chunk", chunk);
+				if (chunk.data && chunk.data !== "[DONE]") {
+					const parsedChunk = parseChatCompletionChunkData(chunk.data);
+					if (parsedChunk?.usage) usage = normalizeOpenAIUsage(parsedChunk.usage);
+				}
+				await stream.writeSSE({
+					event: chunk.event,
+					data: chunk.data ?? ""
+				});
+			}
+		} finally {
+			options.recordUsage(usage);
+		}
+	});
+};
+const parseChatCompletionChunkData = (data) => {
+	try {
+		return JSON.parse(data);
+	} catch {
+		return null;
+	}
+};
+//#endregion
 //#region src/lib/copilot-rate-limit.ts
 const copilotRateLimitTypes = ["session", "weekly"];
 const copilotRateLimitHeaders = {
@@ -1029,12 +1241,17 @@ async function handleCompletion$1(c) {
 	let payload = await c.req.json();
 	const requestedModel = payload.model;
 	payload.model = resolveMappedModel(payload.model);
-	if (payload.model !== requestedModel) logger$7.debug(`Resolved model mapping: ${requestedModel} -> ${payload.model}`);
+	if (payload.model !== requestedModel) consola.debug(`Resolved model mapping: ${requestedModel} -> ${payload.model}`);
+	const providerModelAlias = parseProviderModelAlias(payload.model);
+	if (providerModelAlias) {
+		payload.model = providerModelAlias.model;
+		return await handleProviderChatCompletionsForProvider(c, {
+			payload,
+			provider: providerModelAlias.provider
+		});
+	}
 	await checkRateLimit(state);
-	debugJsonTail(logger$7, "Request payload:", {
-		value: payload,
-		tailLength: 400
-	});
+	debugJson(logger$7, "Request payload:", payload);
 	const selectedModel = state.models?.data.find((model) => model.id === payload.model);
 	if (selectedModel?.id === "gpt-5.4") return c.json({ error: {
 		message: "Please use `/v1/responses` or `/v1/messages` API",
@@ -1156,36 +1373,6 @@ embeddingRoutes.post("/", async (c) => {
 	}
 });
 //#endregion
-//#region src/lib/provider-model.ts
-const parseProviderModelAlias = (model) => {
-	const separatorIndex = model.indexOf("/");
-	if (separatorIndex <= 0 || separatorIndex === model.length - 1) return null;
-	const provider = model.slice(0, separatorIndex).trim();
-	const providerModel = model.slice(separatorIndex + 1).trim();
-	if (!provider || !providerModel) return null;
-	return {
-		model: providerModel,
-		provider
-	};
-};
-const createFallbackModel = (modelId) => ({
-	capabilities: {
-		family: "provider",
-		limits: {},
-		object: "model_capabilities",
-		supports: {},
-		tokenizer: "o200k_base",
-		type: "chat"
-	},
-	id: modelId,
-	model_picker_enabled: false,
-	name: modelId,
-	object: "model",
-	preview: false,
-	vendor: "provider",
-	version: "unknown"
-});
-//#endregion
 //#region src/lib/tokenizer.ts
 const ENCODING_MAP = {
 	o200k_base: () => import("gpt-tokenizer/encoding/o200k_base"),
@@ -1403,31 +1590,6 @@ const getTokenCount = async (payload, model) => {
 	};
 };
 //#endregion
-//#region src/lib/provider-resolver.ts
-function isMissingCodexCredentialsError(error) {
-	return error instanceof Error && error.message === "Codex credentials not found. Run `copilot-api auth login --provider codex` first.";
-}
-async function resolveProviderConfig(providerName) {
-	const normalizedProviderName = providerName.trim();
-	if (!normalizedProviderName) return null;
-	if (normalizedProviderName === "codex") {
-		if (getRawProviderConfig(normalizedProviderName)?.enabled === false) return null;
-		try {
-			await setupCodexToken();
-		} catch (error) {
-			if (isMissingCodexCredentialsError(error)) return null;
-			throw error;
-		}
-		const providerConfig = getProviderConfig(normalizedProviderName);
-		if (!providerConfig) return null;
-		return {
-			...providerConfig,
-			apiKey: state.codexAccessToken ?? providerConfig.apiKey
-		};
-	}
-	return getProviderConfig(normalizedProviderName);
-}
-//#endregion
 //#region src/routes/messages/utils.ts
 function mapOpenAIStopReasonToAnthropic(finishReason) {
 	if (finishReason === null) return null;
@@ -4022,78 +4184,6 @@ function getModels() {
 	};
 }
 //#endregion
-//#region src/services/providers/provider-proxy.ts
-const SHARED_FORWARDABLE_HEADERS = ["accept", "user-agent"];
-const ANTHROPIC_FORWARDABLE_HEADERS = ["anthropic-version", "anthropic-beta"];
-const STRIPPED_RESPONSE_HEADERS = [
-	"connection",
-	"content-encoding",
-	"content-length",
-	"keep-alive",
-	"proxy-authenticate",
-	"proxy-authorization",
-	"te",
-	"trailer",
-	"transfer-encoding",
-	"upgrade"
-];
-function buildProviderUpstreamHeaders(providerConfig, requestHeaders) {
-	const authHeaders = {};
-	if (providerConfig.authType === "x-api-key") authHeaders["x-api-key"] = providerConfig.apiKey;
-	else authHeaders.authorization = `Bearer ${providerConfig.apiKey}`;
-	const headers = {
-		"content-type": "application/json",
-		accept: "application/json",
-		...authHeaders
-	};
-	for (const headerName of SHARED_FORWARDABLE_HEADERS) {
-		const headerValue = requestHeaders.get(headerName);
-		if (headerValue) headers[headerName] = headerValue;
-	}
-	if (providerConfig.type !== "anthropic") return headers;
-	for (const headerName of ANTHROPIC_FORWARDABLE_HEADERS) {
-		const headerValue = requestHeaders.get(headerName);
-		if (headerValue) headers[headerName] = headerValue;
-	}
-	return headers;
-}
-function createProviderProxyResponse(upstreamResponse, body) {
-	const headers = new Headers(upstreamResponse.headers);
-	for (const headerName of STRIPPED_RESPONSE_HEADERS) headers.delete(headerName);
-	return new Response(body ?? upstreamResponse.body, {
-		headers,
-		status: upstreamResponse.status,
-		statusText: upstreamResponse.statusText
-	});
-}
-async function forwardProviderMessages(providerConfig, payload, requestHeaders) {
-	return await fetch(`${providerConfig.baseUrl}/v1/messages`, {
-		method: "POST",
-		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
-		body: JSON.stringify(payload)
-	});
-}
-async function forwardProviderChatCompletions(providerConfig, payload, requestHeaders) {
-	return await fetch(`${providerConfig.baseUrl}/v1/chat/completions`, {
-		method: "POST",
-		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
-		body: JSON.stringify(payload)
-	});
-}
-async function forwardProviderResponses(providerConfig, payload, requestHeaders) {
-	return await fetch(`${providerConfig.baseUrl}/v1/responses`, {
-		method: "POST",
-		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders),
-		body: JSON.stringify(payload)
-	});
-}
-async function forwardProviderModels(providerConfig, requestHeaders) {
-	return await fetch(`${providerConfig.baseUrl}/v1/models`, {
-		method: "GET",
-		headers: buildProviderUpstreamHeaders(providerConfig, requestHeaders)
-	});
-}
-//#endregion
 //#region src/routes/provider/messages/handler.ts
 const logger$5 = createHandlerLogger("provider-messages-handler");
 const OPENAI_COMPATIBLE_CONTEXT_CACHE_MARKER_LIMIT = 4;
@@ -4877,7 +4967,7 @@ async function handleCompletion(c) {
 	const anthropicPayload = await c.req.json();
 	const requestedModel = anthropicPayload.model;
 	anthropicPayload.model = resolveMappedModel(anthropicPayload.model);
-	if (anthropicPayload.model !== requestedModel) logger$4.debug(`Resolved model mapping: ${requestedModel} -> ${anthropicPayload.model}`);
+	if (anthropicPayload.model !== requestedModel) consola.debug(`Resolved model mapping: ${requestedModel} -> ${anthropicPayload.model}`);
 	const providerModelAlias = parseProviderModelAlias(anthropicPayload.model);
 	if (providerModelAlias) {
 		anthropicPayload.model = providerModelAlias.model;
@@ -4892,8 +4982,7 @@ async function handleCompletion(c) {
 	sanitizeIdeTools(anthropicPayload);
 	const subagentMarker = parseSubagentMarkerFromFirstUser(anthropicPayload);
 	if (subagentMarker) debugJson(logger$4, "Detected Subagent marker:", subagentMarker);
-	const sessionId = getRootSessionId(anthropicPayload, c);
-	logger$4.debug("Extracted session ID:", sessionId);
+	let sessionId = getRootSessionId(anthropicPayload, c);
 	const compactType = getCompactType(anthropicPayload);
 	const anthropicBeta = c.req.header("anthropic-beta");
 	logger$4.debug("Anthropic Beta header:", anthropicBeta);
@@ -4906,6 +4995,8 @@ async function handleCompletion(c) {
 	applyLastMessageCacheControl(anthropicPayload, lastMessageCacheControl);
 	const requestId = generateRequestIdFromPayload(anthropicPayload, sessionId);
 	logger$4.debug("Generated request ID:", requestId);
+	if (!sessionId) sessionId = getUUID(requestId);
+	logger$4.debug("Extracted session ID:", sessionId);
 	if (state.manualApprove) await awaitApproval();
 	const selectedModel = findEndpointModel(anthropicPayload.model);
 	anthropicPayload.model = selectedModel?.id ?? anthropicPayload.model;
@@ -5194,7 +5285,7 @@ const handleResponses = async (c) => {
 	const payload = await c.req.json();
 	const requestedModel = payload.model;
 	payload.model = resolveMappedModel(payload.model);
-	if (payload.model !== requestedModel) logger$1.debug(`Resolved model mapping: ${requestedModel} -> ${payload.model}`);
+	if (payload.model !== requestedModel) consola.debug(`Resolved model mapping: ${requestedModel} -> ${payload.model}`);
 	const providerModelAlias = parseProviderModelAlias(payload.model);
 	if (providerModelAlias) {
 		payload.model = providerModelAlias.model;
@@ -5207,7 +5298,7 @@ const handleResponses = async (c) => {
 	await responsesHandlerDependencies.checkRateLimit(state);
 	const subagentMarker = getCodexResponsesSubagentMarker(c);
 	if (subagentMarker) debugJson(logger$1, "Detected Codex subagent headers:", subagentMarker);
-	const incomingSessionId = subagentMarker ? getIncomingResponsesSessionId(c) : void 0;
+	const incomingSessionId = getIncomingResponsesSessionId(c);
 	const sessionId = incomingSessionId ? getUUID(incomingSessionId) : void 0;
 	const requestId = generateRequestIdFromPayload({ messages: payload.input }, sessionId);
 	logger$1.debug("Generated request ID:", requestId);
@@ -5436,4 +5527,4 @@ server.route("/:provider/v1/models", providerModelRoutes);
 //#endregion
 export { server };
 
-//# sourceMappingURL=server-BDu1gVes.js.map
+//# sourceMappingURL=server-81bhucad.js.map