copilot-relay 0.0.7 → 0.0.9

package/dist/main.js

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from "citty";
 import fs from "node:fs/promises";
-import { inspect } from "node:util";
+import { inspect, promisify } from "node:util";
 import consola from "consola";
 import os from "node:os";
 import path, { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { execFile } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { events } from "fetch-event-stream";
 import { readFileSync } from "node:fs";
-import { serve } from "@hono/node-server";
+import { createAdaptorServer } from "@hono/node-server";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { streamSSE } from "hono/streaming";
@@ -56,6 +57,7 @@ const copilotTokenPath = path.join(appDir, "copilot_token.json");
 const githubTokenPath = path.join(appDir, "github_token");
 const logsDir = path.join(appDir, "logs");
 const logPath = path.join(logsDir, "copilot-relay.log");
+const pidPath = path.join(appDir, "copilot-relay.pid");
 const paths = {
 	appDir,
 	configPath,
@@ -68,7 +70,8 @@ const paths = {
 	],
 	legacyCopilotTokenPaths,
 	logPath,
-	logsDir
+	logsDir,
+	pidPath
 };
 async function ensurePaths() {
 	await fs.mkdir(paths.appDir, { recursive: true });
@@ -167,7 +170,7 @@ const standardHeaders = () => ({
 	accept: "application/json",
 	"content-type": "application/json"
 });
-const sleep = (ms) => new Promise((resolve$1) => {
+const sleep$1 = (ms) => new Promise((resolve$1) => {
 	setTimeout(resolve$1, ms);
 });
 const readGitHubToken = async () => {
@@ -245,12 +248,12 @@ const pollAccessToken = async (deviceCode) => {
 			})
 		});
 		if (!response.ok) {
-			await sleep(sleepDuration);
+			await sleep$1(sleepDuration);
 			continue;
 		}
 		const json = await response.json();
 		if (json.access_token) return json.access_token;
-		await sleep(sleepDuration);
+		await sleep$1(sleepDuration);
 	}
 };
 const getGitHubUser = async (githubToken, vsCodeVersion) => {
@@ -372,6 +375,7 @@ const defaultConfig = {
 	opusModel: "claude-opus-4.8",
 	port: 4142,
 	thinkEffort: defaultReasoningEffort,
+	upstreamTimeoutSeconds: 180,
 	webSearchBackend: void 0
 };
 const isLogLevelName = (value) => typeof value === "string" && logLevels.includes(value.toLowerCase());
@@ -403,6 +407,12 @@ const normalizeThinkEffort = (value) => {
 	const normalized = value.toLowerCase() === "minimal" ? "low" : value.toLowerCase();
 	return isReasoningEffort(normalized) ? normalized : void 0;
 };
+const normalizeUpstreamTimeoutSeconds = (value) => {
+	if (value === void 0) return;
+	const timeout = normalizePositiveInteger(value);
+	if (timeout === void 0) throw new Error("Invalid upstreamTimeoutSeconds: expected a positive integer");
+	return timeout;
+};
 const readRawConfig = async () => {
 	try {
 		return parseConfigYaml(await fs.readFile(paths.configPath, "utf8"));
@@ -476,6 +486,10 @@ const parseConfigYaml = (content) => {
 			case "think_effort":
 				config.thinkEffort = unquoteYamlScalar(value);
 				break;
+			case "upstreamTimeoutSeconds":
+			case "upstream_timeout_seconds":
+				config.upstreamTimeoutSeconds = unquoteYamlScalar(value);
+				break;
 			case "webSearchBackend":
 			case "web_search_backend":
 				config.webSearchBackend = unquoteYamlScalar(value);
@@ -522,6 +536,9 @@ const serializeConfig = (config) => [
 	"# Default upstream thinking/reasoning effort: none, low, medium, high, xhigh.",
 	`thinkEffort: ${config.thinkEffort}`,
 	"",
+	"# Max seconds to wait for a single Claude request's upstream Copilot calls.",
+	`upstreamTimeoutSeconds: ${config.upstreamTimeoutSeconds}`,
+	"",
 	"# Copilot model used for bridge-managed Claude WebSearch. Empty uses gptModel.",
 	`webSearchBackend: ${config.webSearchBackend ?? ""}`,
 	"",
@@ -542,6 +559,7 @@ async function readAppConfig() {
 	const logRetentionDays$1 = normalizePositiveInteger(raw.logRetentionDays);
 	const port = normalizePort(raw.port);
 	const thinkEffort = normalizeThinkEffort(raw.thinkEffort);
+	const upstreamTimeoutSeconds = normalizeUpstreamTimeoutSeconds(raw.upstreamTimeoutSeconds);
 	const config = {
 		claudeSetup: claudeSetup ?? defaultConfig.claudeSetup,
 		copilotBaseUrl: normalizeString(raw.copilotBaseUrl) ?? defaultConfig.copilotBaseUrl,
@@ -552,6 +570,7 @@ async function readAppConfig() {
 		opusModel: normalizeString(raw.opusModel) ?? defaultConfig.opusModel,
 		port: port ?? defaultConfig.port,
 		thinkEffort: thinkEffort ?? defaultConfig.thinkEffort,
+		upstreamTimeoutSeconds: upstreamTimeoutSeconds ?? defaultConfig.upstreamTimeoutSeconds,
 		webSearchBackend: normalizeString(raw.webSearchBackend)
 	};
 	await writeConfig(config);
@@ -590,6 +609,7 @@ const readProxyConfig = (config) => ({
 	copilotToken: void 0,
 	host: config.host,
 	port: config.port,
+	upstreamTimeoutMs: config.upstreamTimeoutSeconds * 1e3,
 	vsCodeVersion: vscodeVersion,
 	webSearchBackend: config.webSearchBackend
 });
@@ -610,6 +630,179 @@ const auth = defineCommand({
 	}
 });
 
+//#endregion
+//#region src/lib/lifecycle.ts
+const execFileAsync = promisify(execFile);
+const stopTimeoutMs = 5e3;
+const stopPollMs = 100;
+const isNodeErrno = (error) => typeof error === "object" && error !== null && "code" in error;
+const sleep = (ms) => new Promise((resolve$1) => {
+	setTimeout(resolve$1, ms);
+});
+const parsePid = (value) => {
+	const pid = typeof value === "number" ? value : typeof value === "string" ? Number.parseInt(value.trim(), 10) : NaN;
+	return Number.isInteger(pid) && pid > 0 ? pid : void 0;
+};
+const readCommandOutput = async (file, args) => {
+	try {
+		const { stdout } = await execFileAsync(file, args, {
+			maxBuffer: 1024 * 1024,
+			windowsHide: true
+		});
+		return String(stdout);
+	} catch (error) {
+		if (typeof error === "object" && error !== null && "stdout" in error && (typeof error.stdout === "string" || Buffer.isBuffer(error.stdout))) return String(error.stdout);
+		return "";
+	}
+};
+const parsePidLines = (output) => output.split(/\r?\n/).map((line) => parsePid(line)).filter((pid) => pid !== void 0);
+const isRelayStartProcess = (command, cwd) => {
+	const normalizedCommand = command.replaceAll("\\", "/");
+	const normalizedCwd = cwd?.replaceAll("\\", "/");
+	if (!/(?:^|\s)start(?:\s|$)/.test(normalizedCommand)) return false;
+	if (normalizedCommand.includes("copilot-relay")) return true;
+	const usesNode = /(?:^|\s|\/)node(?:\.exe)?(?:\s|$)/i.test(normalizedCommand);
+	const usesDistMain = /(?:^|\s|\/)dist\/main\.js(?:\s|$)/.test(normalizedCommand);
+	return Boolean(usesNode && usesDistMain && normalizedCwd && normalizedCwd.split("/").some((part) => part.includes("copilot-relay")));
+};
+const isProcessAlive = (pid) => {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch (error) {
+		return isNodeErrno(error) && error.code === "EPERM";
+	}
+};
+const readRelayPidFile = async () => {
+	try {
+		const trimmed = (await fs.readFile(paths.pidPath, "utf8")).trim();
+		if (!trimmed) return;
+		if (trimmed.startsWith("{")) return parsePid(JSON.parse(trimmed).pid);
+		return parsePid(trimmed);
+	} catch (error) {
+		if (isNodeErrno(error) && error.code === "ENOENT") return;
+		throw error;
+	}
+};
+const writeRelayPidFile = async (config) => {
+	await fs.mkdir(paths.appDir, { recursive: true });
+	const payload = {
+		host: config.host,
+		pid: process.pid,
+		port: config.port,
+		startedAt: (/* @__PURE__ */ new Date()).toISOString()
+	};
+	await fs.writeFile(paths.pidPath, `${JSON.stringify(payload, null, 2)}\n`, { mode: 384 });
+};
+const clearRelayPidFile = async (pid = process.pid, options = {}) => {
+	const currentPid = await readRelayPidFile();
+	if (!options.force && currentPid !== void 0 && currentPid !== pid) return;
+	await fs.unlink(paths.pidPath).catch((error) => {
+		if (!isNodeErrno(error) || error.code !== "ENOENT") throw error;
+	});
+};
+const getProcessCommand = async (pid) => {
+	if (process.platform === "win32") return (await readCommandOutput("powershell.exe", [
+		"-NoProfile",
+		"-Command",
+		`Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}" | Select-Object -ExpandProperty CommandLine`
+	])).trim() || void 0;
+	return (await readCommandOutput("ps", [
+		"-p",
+		String(pid),
+		"-o",
+		"command="
+	])).trim() || void 0;
+};
+const getProcessCwd = async (pid) => {
+	if (process.platform === "win32") return;
+	return (await readCommandOutput("lsof", [
+		"-a",
+		"-p",
+		String(pid),
+		"-d",
+		"cwd",
+		"-Fn"
+	])).split(/\r?\n/).find((line) => line.startsWith("n"))?.slice(1);
+};
+const getPortListenerPids = async (port) => {
+	if (process.platform === "win32") return parsePidLines(await readCommandOutput("powershell.exe", [
+		"-NoProfile",
+		"-Command",
+		`Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | Select-Object -ExpandProperty OwningProcess -Unique`
+	]));
+	return parsePidLines(await readCommandOutput("lsof", [
+		"-nP",
+		`-iTCP:${port}`,
+		"-sTCP:LISTEN",
+		"-t"
+	]));
+};
+const getProcessList = async () => {
+	return (process.platform === "win32" ? await readCommandOutput("powershell.exe", [
+		"-NoProfile",
+		"-Command",
+		"Get-CimInstance Win32_Process | ForEach-Object { \"$($_.ProcessId)`t$($_.CommandLine)\" }"
+	]) : await readCommandOutput("ps", ["-axo", "pid=,command="])).split(/\r?\n/).flatMap((line) => {
+		const match = process.platform === "win32" ? line.match(/^(\d+)\t(.+)$/) : line.match(/^\s*(\d+)\s+(.+)$/);
+		const pid = parsePid(match?.[1]);
+		const command = match?.[2]?.trim();
+		return pid && command ? [{
+			command,
+			pid
+		}] : [];
+	});
+};
+const isRelayPid = async (pid) => {
+	if (pid === process.pid || !isProcessAlive(pid)) return false;
+	const command = await getProcessCommand(pid);
+	if (!command) return false;
+	return isRelayStartProcess(command, await getProcessCwd(pid));
+};
+const findRelayProcessIds = async (config) => {
+	const candidates = /* @__PURE__ */ new Set();
+	const storedPid = await readRelayPidFile();
+	if (storedPid) candidates.add(storedPid);
+	for (const pid of await getPortListenerPids(config.port)) candidates.add(pid);
+	for (const { command, pid } of await getProcessList()) {
+		if (pid === process.pid) continue;
+		if (command.includes("copilot-relay") || command.includes("dist/main.js")) {
+			if (isRelayStartProcess(command, await getProcessCwd(pid))) candidates.add(pid);
+		}
+	}
+	const relayPids = [];
+	for (const pid of candidates) if (await isRelayPid(pid)) relayPids.push(pid);
+	return [...new Set(relayPids)].sort((left, right) => left - right);
+};
+const waitForExit = async (pid, timeoutMs) => {
+	const deadline = Date.now() + timeoutMs;
+	while (Date.now() < deadline) {
+		if (!isProcessAlive(pid)) return true;
+		await sleep(stopPollMs);
+	}
+	return !isProcessAlive(pid);
+};
+const stopProcess = async (pid) => {
+	if (!isProcessAlive(pid)) return;
+	log.info(`Stopping existing copilot-relay process pid=${pid}`);
+	process.kill(pid, "SIGTERM");
+	if (await waitForExit(pid, stopTimeoutMs)) return;
+	log.error(`copilot-relay process pid=${pid} did not stop; forcing termination`);
+	process.kill(pid, "SIGKILL");
+	if (!await waitForExit(pid, stopTimeoutMs)) throw new Error(`Could not stop copilot-relay process pid=${pid}`);
+};
+const stopExistingRelay = async (config) => {
+	const relayPids = await findRelayProcessIds(config);
+	if (relayPids.length === 0) {
+		log.info("No existing copilot-relay instance found");
+		await clearRelayPidFile(0, { force: true });
+		return [];
+	}
+	for (const pid of relayPids) await stopProcess(pid);
+	await clearRelayPidFile(0, { force: true });
+	return relayPids;
+};
+
 //#endregion
 //#region src/lib/claude-settings.ts
 /**
@@ -674,13 +867,51 @@ const editorPluginVersion = `copilot-chat/${copilotVersion}`;
 const userAgent = `GitHubCopilotChat/${copilotVersion}`;
 const apiVersion = "2025-04-01";
 const maxFetchAttempts = 2;
+const copilotRequestTimeoutMs = 18e4;
 const getCopilotProviderContext = (config) => ({
 	baseUrl: config.copilotBaseUrl,
 	token: config.copilotToken,
 	vsCodeVersion: config.vsCodeVersion
 });
 const shouldRetryResponse = (response) => response.status >= 500 && response.status <= 599;
-const buildHeaders = (provider, init, options) => {
+const createCopilotRequestSignal = (signal, timeoutMs = copilotRequestTimeoutMs) => {
+	const signals = [signal, timeoutMs > 0 ? AbortSignal.timeout(timeoutMs) : void 0].filter((value) => value !== void 0);
+	if (signals.length === 0) return;
+	return signals.length === 1 ? signals[0] : AbortSignal.any(signals);
+};
+const getAbortName = (value) => typeof value === "object" && value !== null && "name" in value && typeof value.name === "string" ? value.name : void 0;
+const isAbortLikeError = (error) => {
+	const name = getAbortName(error);
+	return name === "AbortError" || name === "TimeoutError";
+};
+const toCopilotAbortHTTPError = (error, signal, timeoutMs = copilotRequestTimeoutMs) => {
+	if (!signal?.aborted && !isAbortLikeError(error)) return;
+	const timedOut = getAbortName(signal?.reason) === "TimeoutError" || getAbortName(error) === "TimeoutError";
+	const message = timedOut ? `Copilot upstream request timed out after ${Math.round(timeoutMs / 1e3)}s.` : "Client request cancelled before Copilot upstream completed.";
+	const code = timedOut ? "upstream_timeout" : "request_cancelled";
+	return new HTTPError(message, new Response(JSON.stringify({ error: {
+		message,
+		code
+	} }), {
+		status: timedOut ? 504 : 499,
+		headers: { "content-type": "application/json" }
+	}), message);
+};
+const readCopilotJson = async (response, signal, timeoutMs = copilotRequestTimeoutMs) => {
+	try {
+		return await response.json();
+	} catch (error) {
+		throw toCopilotAbortHTTPError(error, signal, timeoutMs) ?? error;
+	}
+};
+const readCopilotText = async (response, signal, timeoutMs = copilotRequestTimeoutMs) => {
+	try {
+		return await response.text();
+	} catch (error) {
+		throw toCopilotAbortHTTPError(error, signal, timeoutMs) ?? error;
+	}
+};
+const buildHeaders = (provider, init, options, upstreamRequestId) => {
 	const headers = new Headers(init.headers);
 	headers.set("authorization", `Bearer ${provider.token}`);
 	headers.set("copilot-integration-id", "vscode-chat");
@@ -689,7 +920,7 @@ const buildHeaders = (provider, init, options) => {
 	headers.set("user-agent", userAgent);
 	headers.set("openai-intent", "conversation-panel");
 	headers.set("x-github-api-version", apiVersion);
-	headers.set("x-request-id", randomUUID());
+	headers.set("x-request-id", upstreamRequestId);
 	headers.set("x-vscode-user-agent-library-version", "electron-fetch");
 	if (options.vision) headers.set("copilot-vision-request", "true");
 	if (options.initiator) headers.set("x-initiator", options.initiator);
@@ -697,23 +928,48 @@ const buildHeaders = (provider, init, options) => {
 	if (!headers.has("accept")) headers.set("accept", "application/json");
 	return headers;
 };
+const formatRequestId = (requestId) => requestId ? `request_id=${requestId} ` : "";
+const logUpstreamLifecycle = (requestId, message) => {
+	if (requestId) {
+		log.info(`${formatRequestId(requestId)}${message}`);
+		return;
+	}
+	log.debug(message);
+};
 const fetchCopilot = async (provider, path$1, init, options = {}) => {
 	if (!provider.token) throw new ProxyNotImplementedError("Copilot token is not configured for copilot-relay.");
+	const timeoutMs = options.timeoutMs ?? copilotRequestTimeoutMs;
+	const signal = createCopilotRequestSignal(options.signal, timeoutMs);
 	let lastError;
-	for (let attempt = 1; attempt <= maxFetchAttempts; attempt++) try {
-		const started = performance.now();
-		const response = await fetch(`${provider.baseUrl}${path$1}`, {
-			...init,
-			headers: buildHeaders(provider, init, options)
-		});
-		const ms = Math.round(performance.now() - started);
-		log.debug(`Copilot ${init.method ?? "GET"} ${path$1} -> ${response.status} ${ms}ms (attempt ${attempt})`);
-		if (!shouldRetryResponse(response) || attempt === maxFetchAttempts) return response;
-		log.error(`Copilot ${path$1} returned ${response.status}; retrying (${attempt}/${maxFetchAttempts})`);
-	} catch (error) {
-		lastError = error;
-		if (attempt === maxFetchAttempts) throw error;
-		log.error(`Copilot ${path$1} request failed; retrying (${attempt}/${maxFetchAttempts})`, error);
+	for (let attempt = 1; attempt <= maxFetchAttempts; attempt++) {
+		const upstreamRequestId = randomUUID();
+		try {
+			const started = performance.now();
+			logUpstreamLifecycle(options.requestId, `send upstream method=${init.method ?? "GET"} path=${path$1} attempt=${attempt} upstream_request_id=${upstreamRequestId}`);
+			const response = await fetch(`${provider.baseUrl}${path$1}`, {
+				...init,
+				headers: buildHeaders(provider, init, options, upstreamRequestId),
+				signal
+			});
+			const ms = Math.round(performance.now() - started);
+			logUpstreamLifecycle(options.requestId, `return from upstream method=${init.method ?? "GET"} path=${path$1} status=${response.status} ms=${ms} attempt=${attempt} upstream_request_id=${upstreamRequestId}`);
+			log.debug(`${formatRequestId(options.requestId)}Copilot ${init.method ?? "GET"} ${path$1} -> ${response.status} ${ms}ms (attempt ${attempt}) upstream_request_id=${upstreamRequestId}`);
+			if (!shouldRetryResponse(response) || attempt === maxFetchAttempts) return response;
+			log.error(`${formatRequestId(options.requestId)}Copilot ${path$1} returned ${response.status}; retrying (${attempt}/${maxFetchAttempts}) upstream_request_id=${upstreamRequestId}`);
+		} catch (error) {
+			const abortError = toCopilotAbortHTTPError(error, signal, timeoutMs);
+			if (abortError) {
+				logUpstreamLifecycle(options.requestId, `upstream failed method=${init.method ?? "GET"} path=${path$1} attempt=${attempt} upstream_request_id=${upstreamRequestId}`);
+				throw abortError;
+			}
+			logUpstreamLifecycle(options.requestId, `upstream failed method=${init.method ?? "GET"} path=${path$1} attempt=${attempt} upstream_request_id=${upstreamRequestId}`);
+			lastError = error;
+			if (attempt === maxFetchAttempts) {
+				log.error(`${formatRequestId(options.requestId)}Copilot ${path$1} request failed after ${attempt} attempts upstream_request_id=${upstreamRequestId}`, error);
+				throw error;
+			}
+			log.error(`${formatRequestId(options.requestId)}Copilot ${path$1} request failed; retrying (${attempt}/${maxFetchAttempts}) upstream_request_id=${upstreamRequestId}`, error);
+		}
 	}
 	throw lastError;
 };
@@ -1086,6 +1342,7 @@ function getFinishReason(response, hasFunctionCalls) {
 //#endregion
 //#region src/copilot/chat.ts
 const usesMaxCompletionTokens = (modelId) => modelId.startsWith("gpt-5");
+const continuePrefillPrompt$1 = "Continue the assistant response from the previous assistant message.";
 const maxUserLength = 64;
 const sanitizeReasoningEffortForModel = (_modelId, reasoningEffort) => {
 	return reasoningEffort ?? void 0;
@@ -1112,6 +1369,38 @@ const buildRequestPayload = (payload) => {
 		user: sanitizeUserIdentifier(payload.user)
 	};
 };
+const normalizeFinalAssistantPrefill$1 = (payload) => {
+	const lastMessage = payload.messages.at(-1);
+	if (lastMessage?.role !== "assistant") return payload;
+	const messages = [...payload.messages];
+	if (typeof lastMessage.content !== "string") {
+		messages.pop();
+		return {
+			...payload,
+			messages
+		};
+	}
+	const content = lastMessage.content.trimEnd();
+	if (!content) {
+		messages.pop();
+		return {
+			...payload,
+			messages
+		};
+	}
+	messages[messages.length - 1] = {
+		...lastMessage,
+		content
+	};
+	messages.push({
+		role: "user",
+		content: continuePrefillPrompt$1
+	});
+	return {
+		...payload,
+		messages
+	};
+};
 const isAgentInitiator = (messages) => messages.some((msg) => msg.role === "assistant" || msg.role === "tool") ? "agent" : "user";
 const messagesIncludeImage = (messages) => messages.some((msg) => typeof msg.content !== "string" && msg.content?.some((part) => part.type === "image_url"));
 const createChatCompletions = async (config, payload, options = {}) => {
@@ -1119,53 +1408,67 @@ const createChatCompletions = async (config, payload, options = {}) => {
 	const requestedModel = options.requestedModel ?? payload.model;
 	const requestedThinkEffort = options.requestedThinkEffort ?? payload.reasoning_effort ?? "none";
 	const requestedThinking = options.requestedThinking ?? "none";
+	const signal = createCopilotRequestSignal(options.signal, options.timeoutMs);
 	const upstreamModelId = routeModelId(payload.model);
 	const upstreamPayload = upstreamModelId === payload.model ? payload : {
 		...payload,
 		model: upstreamModelId
 	};
+	const useResponsesApi = shouldUseResponsesApiForModel(upstreamPayload.model);
+	const compatiblePayload = useResponsesApi ? upstreamPayload : normalizeFinalAssistantPrefill$1(upstreamPayload);
 	const provider = getCopilotProviderContext(config);
-	const enableVision = messagesIncludeImage(upstreamPayload.messages);
-	const initiator = isAgentInitiator(upstreamPayload.messages);
-	const requestPayload = buildRequestPayload(upstreamPayload);
+	const enableVision = messagesIncludeImage(compatiblePayload.messages);
+	const initiator = isAgentInitiator(compatiblePayload.messages);
+	const requestPayload = buildRequestPayload(compatiblePayload);
 	log.debug([
 		"Model request",
 		`client=${client}`,
 		`requested_model=${requestedModel}`,
-		`upstream_model=${upstreamPayload.model}`,
+		...options.requestId ? [`request_id=${options.requestId}`] : [],
+		`upstream_model=${compatiblePayload.model}`,
 		`requested_think_effort=${requestedThinkEffort}`,
 		`requested_thinking=${requestedThinking}`,
 		`effective_think_effort=${requestPayload.reasoning_effort ?? "none"}`
 	].join(" "));
 	log.debug("Full request payload", { payload: requestPayload });
-	if (shouldUseResponsesApiForModel(upstreamPayload.model)) return createResponses(provider, upstreamPayload, {
+	if (useResponsesApi) return createResponses(provider, compatiblePayload, {
 		vision: enableVision,
-		initiator
+		initiator,
+		requestId: options.requestId,
+		signal,
+		timeoutMs: options.timeoutMs
 	});
 	const response = await fetchCopilot(provider, "/chat/completions", {
 		method: "POST",
 		headers: {
-			accept: upstreamPayload.stream ? "text/event-stream" : "application/json",
+			accept: compatiblePayload.stream ? "text/event-stream" : "application/json",
 			"content-type": "application/json"
 		},
 		body: JSON.stringify(requestPayload)
 	}, {
 		vision: enableVision,
-		initiator
+		initiator,
+		requestId: options.requestId,
+		signal,
+		timeoutMs: options.timeoutMs
 	});
 	if (!response.ok) {
-		if (await shouldRetryWithResponses(response)) return createResponses(provider, upstreamPayload, {
+		if (await shouldRetryWithResponses(response, signal, options.timeoutMs)) return createResponses(provider, compatiblePayload, {
 			vision: enableVision,
-			initiator
+			initiator,
+			requestId: options.requestId,
+			signal,
+			timeoutMs: options.timeoutMs
 		});
 		throw new HTTPError("Failed to create chat completions", response, await logUpstreamError("Failed to create chat completions", response, {
 			model: payload.model,
 			request: requestPayload,
-			route: "/chat/completions"
-		}));
+			route: "/chat/completions",
+			requestId: options.requestId
+		}, signal, options.timeoutMs));
 	}
-	if (upstreamPayload.stream) return events(response);
-	return await response.json();
+	if (compatiblePayload.stream) return events(response);
+	return readCopilotJson(response, signal, options.timeoutMs);
 };
 async function createResponses(provider, payload, options) {
 	const requestPayload = buildResponsesRequestPayload(payload, getRequestedReasoningEffort(payload));
@@ -1178,23 +1481,28 @@ async function createResponses(provider, payload, options) {
 		body: JSON.stringify(requestPayload)
 	}, {
 		vision: options.vision,
-		initiator: options.initiator
+		initiator: options.initiator,
+		requestId: options.requestId,
+		signal: options.signal,
+		timeoutMs: options.timeoutMs
 	});
 	if (!response.ok) throw new HTTPError("Failed to create responses", response, await logUpstreamError("Failed to create responses", response, {
 		model: payload.model,
 		request: requestPayload,
-		route: "/responses"
-	}));
+		route: "/responses",
+		requestId: options.requestId
+	}, options.signal, options.timeoutMs));
 	if (payload.stream) return translateResponsesStreamToChatCompletionStream(events(response));
-	return translateResponsesToChatCompletion(await response.json());
+	return translateResponsesToChatCompletion(await readCopilotJson(response, options.signal, options.timeoutMs));
 }
-async function logUpstreamError(message, response, context) {
-	const errorBody = await response.clone().text().catch(() => "");
+async function logUpstreamError(message, response, context, signal, timeoutMs) {
+	const errorBody = await readCopilotText(response.clone(), signal, timeoutMs).catch(() => "");
 	const detail = getUpstreamErrorDetail(response, errorBody);
-	log.error(`${message}: route=${context.route} model=${context.model} status=${response.status}`, {
+	log.error(`${message}: route=${context.route} model=${context.model} status=${response.status}${context.requestId ? ` request_id=${context.requestId}` : ""}`, {
 		message,
 		route: context.route,
 		model: context.model,
+		requestId: context.requestId,
 		request: context.request,
 		response: {
 			status: response.status,
@@ -1215,9 +1523,9 @@ function getUpstreamErrorDetail(response, body) {
 		return body.slice(0, 240);
 	}
 }
-async function shouldRetryWithResponses(response) {
+async function shouldRetryWithResponses(response, signal, timeoutMs) {
 	try {
-		return (await response.clone().json()).error?.code === "unsupported_api_for_model";
+		return (await readCopilotJson(response.clone(), signal, timeoutMs)).error?.code === "unsupported_api_for_model";
 	} catch {
 		return false;
 	}
@@ -1226,12 +1534,17 @@ async function shouldRetryWithResponses(response) {
 //#endregion
 //#region src/lib/preflight.ts
 const getUpstreamModelIds = async (config) => {
-	const response = await fetchCopilot(getCopilotProviderContext(config), "/models", {
+	const provider = getCopilotProviderContext(config);
+	const signal = createCopilotRequestSignal(void 0, config.upstreamTimeoutMs);
+	const response = await fetchCopilot(provider, "/models", {
 		method: "GET",
 		headers: { accept: "application/json" }
+	}, {
+		signal,
+		timeoutMs: config.upstreamTimeoutMs
 	});
 	if (!response.ok) throw new HTTPError("Failed to validate upstream models", response);
-	const payload = await response.json();
+	const payload = await readCopilotJson(response, signal, config.upstreamTimeoutMs);
 	return new Set((payload.data ?? []).map((model) => model.id).filter((id) => typeof id === "string" && id.length > 0));
 };
 const ensureRequiredModels = async (config) => {
@@ -1254,7 +1567,8 @@ const validateModelRequest = async (config, model, thinkEffort) => {
 	try {
 		const response = await createChatCompletions(config, createProbePayload(model), {
 			client: "generic",
-			requestedModel: model
+			requestedModel: model,
+			timeoutMs: config.upstreamTimeoutMs
 		});
 		if (typeof response !== "object" || response === null || !("choices" in response)) throw new Error(`Preflight request for ${model} unexpectedly streamed`);
 		log.info(`Preflight OK: model=${model} think_effort=${thinkEffort}`);
@@ -1871,8 +2185,9 @@ const createFailedSearchExecution = (payload, requestedQuery, model, message) =>
 	results: [],
 	text: message
 });
-const createClaudeWebSearchExecution = async (config, payload, requestedQuery) => {
+const createClaudeWebSearchExecution = async (config, payload, requestedQuery, options = {}) => {
 	const backendModel = getWebSearchBackendModel(config);
+	const signal = createCopilotRequestSignal(options.signal, options.timeoutMs);
 	const response = await fetchCopilot(getCopilotProviderContext(config), "/responses", {
 		method: "POST",
 		headers: {
@@ -1880,12 +2195,17 @@ const createClaudeWebSearchExecution = async (config, payload, requestedQuery) =
 			"content-type": "application/json"
 		},
 		body: JSON.stringify(buildWebSearchRequestPayload(payload, requestedQuery, backendModel))
-	}, { initiator: "agent" });
+	}, {
+		initiator: "agent",
+		requestId: options.requestId,
+		signal,
+		timeoutMs: options.timeoutMs
+	});
 	if (!response.ok) {
-		const detail = await response.text().catch(() => "");
+		const detail = await readCopilotText(response, signal, options.timeoutMs).catch(() => "");
 		return createFailedSearchExecution(payload, requestedQuery, backendModel, [`Copilot web search is not available for model ${backendModel}.`, detail ? `Upstream response: ${detail}` : ""].filter(Boolean).join("\n"));
 	}
-	const upstream = await response.json();
+	const upstream = await readCopilotJson(response, signal, options.timeoutMs);
 	const text = getResponseText(upstream);
 	const query = getSearchQuery(upstream, requestedQuery);
 	const results = parseSearchResults(text);
@@ -2232,7 +2552,9 @@ claudeRoutes.get("/models", (c) => c.json({
 }));
 claudeRoutes.post("/messages", async (c) => {
 	const config = c.get("config");
+	const requestId = c.get("requestId");
 	const claudePayload = await c.req.json();
+	const requestSignal = createCopilotRequestSignal(c.req.raw.signal, config.upstreamTimeoutMs);
 	log.debug("Full Claude request payload", { payload: claudePayload });
 	try {
 		const upstreamModel = translateModelName(claudePayload.model);
@@ -2245,13 +2567,20 @@ claudeRoutes.post("/messages", async (c) => {
 			client: "claude",
 			requestedModel: claudePayload.model,
 			requestedThinkEffort: getClaudeRequestedThinkEffort(claudePayload),
-			requestedThinking: getClaudeRequestedThinking(claudePayload)
+			requestedThinking: getClaudeRequestedThinking(claudePayload),
+			requestId,
+			signal: requestSignal,
+			timeoutMs: config.upstreamTimeoutMs
 		});
 		if (isNonStreamingResponse(response)) {
 			const webSearchToolCall = shouldLetModelDecideWebSearch ? getClaudeWebSearchToolCallFromChatResponse(response, toolNameMapper) : void 0;
 			let claudeResponse;
 			if (webSearchToolCall) {
-				const search = await createClaudeWebSearchExecution(config, claudePayload, webSearchToolCall.query);
+				const search = await createClaudeWebSearchExecution(config, claudePayload, webSearchToolCall.query, {
+					requestId,
+					signal: requestSignal,
+					timeoutMs: config.upstreamTimeoutMs
+				});
 				const searchResponse = createClaudeWebSearchResponse(search);
 				if (search.results.length === 0) claudeResponse = searchResponse;
 				else {
@@ -2259,7 +2588,10 @@ claudeRoutes.post("/messages", async (c) => {
 						client: "claude",
 						requestedModel: claudePayload.model,
 						requestedThinkEffort: getClaudeRequestedThinkEffort(claudePayload),
-						requestedThinking: getClaudeRequestedThinking(claudePayload)
+						requestedThinking: getClaudeRequestedThinking(claudePayload),
+						requestId,
+						signal: requestSignal,
+						timeoutMs: config.upstreamTimeoutMs
 					});
 					if (!isNonStreamingResponse(finalResponse)) throw new HTTPError("Claude web search final answer request unexpectedly streamed", new Response("Claude web search final answer request unexpectedly streamed", {
 						status: 502,
@@ -2375,25 +2707,35 @@ const getLoggedHeaders = (request) => Object.fromEntries(loggedRequestHeaders.fl
 	const value = request.headers.get(name);
 	return value ? [[name, value]] : [];
 }));
-const formatStatusLog = (method, path$1, status, ms, errorMessage) => {
-	const base = `${method} ${path$1} -> ${status} ${ms}ms`;
+const formatStatusLog = (requestId, method, path$1, status, ms, errorMessage) => {
+	const base = `request_id=${requestId} ${method} ${path$1} -> ${status} ${ms}ms`;
 	return status >= 400 && errorMessage ? `${base} error=${JSON.stringify(errorMessage)}` : base;
 };
 const createServer = (config) => {
 	const app = new Hono();
-	app.use("*", cors());
 	app.use("*", async (c, next) => {
+		const requestId = randomUUID();
 		c.set("config", config);
+		c.set("requestId", requestId);
+		c.header("x-copilot-relay-request-id", requestId);
+		log.info(`request_id=${requestId} request received method=${c.req.method} path=${c.req.path}`);
 		const started = performance.now();
 		try {
 			await next();
 		} finally {
 			const ms = Math.round(performance.now() - started);
-			log.info(formatStatusLog(c.req.method, c.req.path, c.res.status, ms, c.get("requestErrorMessage")));
+			log.info(formatStatusLog(requestId, c.req.method, c.req.path, c.res.status, ms, c.get("requestErrorMessage")));
 		}
 	});
+	app.use("*", cors());
 	app.onError((error, c) => {
 		c.set("requestErrorMessage", error.message);
+		log.error("Unhandled Claude API request error", {
+			method: c.req.method,
+			path: c.req.path,
+			requestId: c.get("requestId"),
+			error
+		});
 		return c.json({ error: { message: "Internal server error" } }, 500);
 	});
 	app.get("/", (c) => c.json({
@@ -2408,6 +2750,7 @@ const createServer = (config) => {
 		log.error("Unsupported Claude API request", {
 			method: c.req.method,
 			path: c.req.path,
+			requestId: c.get("requestId"),
 			headers: getLoggedHeaders(c.req.raw),
 			payload: await readRequestPayloadForLog(c.req.raw)
 		});
@@ -2415,76 +2758,131 @@ const createServer = (config) => {
 	});
 	return app;
 };
-const startServer = (config) => serve({
-	fetch: createServer(config).fetch,
-	hostname: config.host,
-	port: config.port
+const startServer = (config) => new Promise((resolve$1, reject) => {
+	const server = createAdaptorServer({
+		fetch: createServer(config).fetch,
+		hostname: config.host,
+		port: config.port
+	});
+	const onError = (error) => {
+		server.off("listening", onListening);
+		reject(error);
+	};
+	const onListening = () => {
+		server.off("error", onError);
+		resolve$1(server);
+	};
+	server.once("error", onError);
+	server.once("listening", onListening);
+	server.listen(config.port, config.host);
 });
 
 //#endregion
 //#region src/start.ts
+async function startRelay(appConfig) {
+	appConfig ??= await readAppConfig();
+	setLogLevel(appConfig.logLevel);
+	await cleanupLogs(appConfig.logRetentionDays);
+	const claudeConfigPath$1 = claudeConfigPath;
+	const config = readProxyConfig(appConfig);
+	const applyRuntimeConfig = (nextConfig) => {
+		setLogLevel(nextConfig.logLevel);
+		cleanupLogs(nextConfig.logRetentionDays);
+		runtimeState.debug = nextConfig.logLevel === "debug";
+		runtimeState.thinkEffort = nextConfig.thinkEffort;
+		config.copilotBaseUrl = nextConfig.copilotBaseUrl;
+		config.host = nextConfig.host;
+		config.port = nextConfig.port;
+		config.upstreamTimeoutMs = nextConfig.upstreamTimeoutSeconds * 1e3;
+		config.webSearchBackend = nextConfig.webSearchBackend;
+		runtimeState.modelRouting = {
+			gptModel: nextConfig.gptModel,
+			opusModel: nextConfig.opusModel
+		};
+	};
+	applyRuntimeConfig(appConfig);
+	log.info(`Log level: ${appConfig.logLevel}`);
+	log.info(`Think effort: ${appConfig.thinkEffort}`);
+	log.info(`Upstream timeout: ${appConfig.upstreamTimeoutSeconds}s`);
+	log.info(`Exposed models: ${getExposedModelIds().join(", ")}`);
+	const authSession = await setupProxyAuth(config);
+	try {
+		await validateUpstream(config, appConfig.thinkEffort);
+	} catch (error) {
+		log.error("Startup preflight failed:", error);
+		process.exit(1);
+	}
+	const server = await startServer(config);
+	await writeRelayPidFile(config);
+	log.info(`copilot-relay version: ${appVersion}`);
+	if (authSession.githubLogin) log.info(`GitHub user: ${authSession.githubLogin}`);
+	else log.error("GitHub user: unavailable");
+	log.info(`copilot-relay listening on http://${config.host}:${config.port}`);
+	log.info(`copilot base url: ${config.copilotBaseUrl}`);
+	const baseUrl = `http://${config.host}:${config.port}`;
+	if (appConfig.claudeSetup) try {
+		const claudeResult = await applyClaudeConfig({
+			baseUrl,
+			configPath: claudeConfigPath$1
+		});
+		if (claudeResult.changed) {
+			log.info(`claude settings ${claudeResult.created ? "created" : "updated"}: ${claudeResult.configPath}`);
+			if (claudeResult.previousBaseUrl && claudeResult.previousBaseUrl !== baseUrl) log.info(`ANTHROPIC_BASE_URL: ${claudeResult.previousBaseUrl} → ${baseUrl}`);
+		} else log.info(`claude settings already up to date: ${claudeResult.configPath}`);
+	} catch (error) {
+		log.error(`Could not update claude settings (${claudeConfigPath$1}):`, error);
+	}
+	watchAppConfig((nextConfig) => {
+		applyRuntimeConfig(nextConfig);
+		log.info(`Config reloaded: logLevel=${nextConfig.logLevel} thinkEffort=${nextConfig.thinkEffort} upstreamTimeoutSeconds=${nextConfig.upstreamTimeoutSeconds}`);
+	});
+	const shutdown = (signal) => {
+		log.info(`Received ${signal}; shutting down copilot-relay`);
+		server.close((error) => {
+			if (error) {
+				log.error("Error while shutting down copilot-relay:", error);
+				process.exitCode = 1;
+			}
+		});
+	};
+	process.once("SIGINT", shutdown);
+	process.once("SIGTERM", shutdown);
+	try {
+		await new Promise((resolve$1, reject) => {
+			server.on("close", resolve$1);
+			server.on("error", reject);
+		});
+	} finally {
+		process.off("SIGINT", shutdown);
+		process.off("SIGTERM", shutdown);
+		await clearRelayPidFile();
+	}
+}
 const start = defineCommand({
 	meta: {
 		name: "start",
 		description: "Start the copilot-relay HTTP server."
 	},
+	async run() {
+		await startRelay();
+	}
+});
+
+//#endregion
+//#region src/restart.ts
+const restart = defineCommand({
+	meta: {
+		name: "restart",
+		description: "Stop any existing copilot-relay instance and start a new one."
+	},
 	async run() {
 		const appConfig = await readAppConfig();
 		setLogLevel(appConfig.logLevel);
 		await cleanupLogs(appConfig.logRetentionDays);
-		const claudeConfigPath$1 = claudeConfigPath;
-		const config = readProxyConfig(appConfig);
-		const applyRuntimeConfig = (nextConfig) => {
-			setLogLevel(nextConfig.logLevel);
-			cleanupLogs(nextConfig.logRetentionDays);
-			runtimeState.debug = nextConfig.logLevel === "debug";
-			runtimeState.thinkEffort = nextConfig.thinkEffort;
-			config.copilotBaseUrl = nextConfig.copilotBaseUrl;
-			config.host = nextConfig.host;
-			config.port = nextConfig.port;
-			runtimeState.modelRouting = {
-				gptModel: nextConfig.gptModel,
-				opusModel: nextConfig.opusModel
-			};
-		};
-		applyRuntimeConfig(appConfig);
-		log.info(`Log level: ${appConfig.logLevel}`);
-		log.info(`Think effort: ${appConfig.thinkEffort}`);
-		log.info(`Exposed models: ${getExposedModelIds().join(", ")}`);
-		const authSession = await setupProxyAuth(config);
-		try {
-			await validateUpstream(config, appConfig.thinkEffort);
-		} catch (error) {
-			log.error("Startup preflight failed:", error);
-			process.exit(1);
-		}
-		const server = startServer(config);
-		log.info(`copilot-relay version: ${appVersion}`);
-		if (authSession.githubLogin) log.info(`GitHub user: ${authSession.githubLogin}`);
-		else log.error("GitHub user: unavailable");
-		log.info(`copilot-relay listening on http://${config.host}:${config.port}`);
-		log.info(`copilot base url: ${config.copilotBaseUrl}`);
-		const baseUrl = `http://${config.host}:${config.port}`;
-		if (appConfig.claudeSetup) try {
-			const claudeResult = await applyClaudeConfig({
-				baseUrl,
-				configPath: claudeConfigPath$1
-			});
-			if (claudeResult.changed) {
-				log.info(`claude settings ${claudeResult.created ? "created" : "updated"}: ${claudeResult.configPath}`);
-				if (claudeResult.previousBaseUrl && claudeResult.previousBaseUrl !== baseUrl) log.info(`ANTHROPIC_BASE_URL: ${claudeResult.previousBaseUrl} → ${baseUrl}`);
-			} else log.info(`claude settings already up to date: ${claudeResult.configPath}`);
-		} catch (error) {
-			log.error(`Could not update claude settings (${claudeConfigPath$1}):`, error);
-		}
-		watchAppConfig((nextConfig) => {
-			applyRuntimeConfig(nextConfig);
-			log.info(`Config reloaded: logLevel=${nextConfig.logLevel} thinkEffort=${nextConfig.thinkEffort}`);
-		});
-		await new Promise((resolve$1, reject) => {
-			server.on("close", resolve$1);
-			server.on("error", reject);
-		});
+		const stopped = await stopExistingRelay(readProxyConfig(appConfig));
+		if (stopped.length > 0) log.info(`Stopped copilot-relay pid(s): ${stopped.join(", ")}`);
+		log.info("Starting copilot-relay");
+		await startRelay(appConfig);
 	}
 });
 
@@ -2497,6 +2895,7 @@ await runMain(defineCommand({
 	},
 	subCommands: {
 		auth,
+		restart,
 		start
 	}
 }));