@openhoo/hoopilot 0.7.2 → 0.7.4

package/dist/cli.js

@@ -1,7 +1,12 @@
 #!/usr/bin/env bun
 import {
-  main
-} from "./chunk-TEDEVCKM.js";
+  asRecord,
+  envValue,
+  isTrustedTokenBaseUrl,
+  main,
+  trimTrailingSlash,
+  truncatedResponseText
+} from "./chunk-7GSQVYYT.js";
 
 // src/cli.ts
 import { spawn } from "child_process";
@@ -17,10 +22,25 @@ var StoredCopilotAuthError = class extends Error {
   }
 };
 function authStorePath(env = process.env) {
-  if (env.HOOPILOT_AUTH_FILE) {
-    return env.HOOPILOT_AUTH_FILE;
+  const explicit = envValue(env.HOOPILOT_AUTH_FILE);
+  if (explicit) {
+    return explicit;
   }
-  const base = env.XDG_CONFIG_HOME ?? env.APPDATA ?? (env.HOME ? join(env.HOME, ".config") : join(process.cwd(), ".config"));
+  const xdg = envValue(env.XDG_CONFIG_HOME);
+  if (xdg) {
+    return join(xdg, "hoopilot", "auth.json");
+  }
+  const appdata = envValue(env.APPDATA);
+  if (appdata) {
+    return join(appdata, "hoopilot", "auth.json");
+  }
+  const home = envValue(env.HOME);
+  if (!home) {
+    throw new StoredCopilotAuthError(
+      "Cannot resolve Hoopilot auth file path without HOOPILOT_AUTH_FILE, XDG_CONFIG_HOME, APPDATA, or HOME."
+    );
+  }
+  const base = join(home, ".config");
   return join(base, "hoopilot", "auth.json");
 }
 function readStoredCopilotAuth(path = authStorePath()) {
@@ -77,30 +97,6 @@ function writeStoredCopilotAuth(auth, path = authStorePath()) {
   }
 }
 
-// src/util.ts
-function trimTrailingSlash(value) {
-  return value.replace(/\/+$/, "");
-}
-function isHttpsOrLoopbackUrl(rawUrl) {
-  let url;
-  try {
-    url = new URL(rawUrl);
-  } catch {
-    return false;
-  }
-  if (url.protocol === "https:") {
-    return true;
-  }
-  return url.protocol === "http:" && (url.hostname === "127.0.0.1" || url.hostname === "localhost" || url.hostname === "::1" || url.hostname === "[::1]");
-}
-async function truncatedResponseText(response, max = 500) {
-  const text = await response.text();
-  return text.slice(0, max);
-}
-function asRecord(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-
 // src/auth.ts
 var DEFAULT_COPILOT_API_BASE_URL = "https://api.githubcopilot.com";
 var REFRESH_SKEW_MS = 6e4;
@@ -114,11 +110,15 @@ var CopilotAuthError = class extends Error {
 var CopilotAuth = class {
   #authStorePath;
   #copilotApiBaseUrl;
+  #hasCopilotApiBaseUrlOverride;
   #cachedAccess;
   constructor(options = {}) {
-    this.#authStorePath = options.authStorePath ?? options.env?.HOOPILOT_AUTH_FILE;
+    const envAuthStorePath = envValue(options.env?.HOOPILOT_AUTH_FILE);
+    const envCopilotApiBaseUrl = envValue(options.env?.COPILOT_API_BASE_URL);
+    this.#authStorePath = options.authStorePath ?? envAuthStorePath;
+    this.#hasCopilotApiBaseUrlOverride = Boolean(options.copilotApiBaseUrl ?? envCopilotApiBaseUrl);
     this.#copilotApiBaseUrl = trimTrailingSlash(
-      options.copilotApiBaseUrl ?? options.env?.COPILOT_API_BASE_URL ?? DEFAULT_COPILOT_API_BASE_URL
+      options.copilotApiBaseUrl ?? envCopilotApiBaseUrl ?? DEFAULT_COPILOT_API_BASE_URL
     );
   }
   async getAccess() {
@@ -136,7 +136,9 @@ var CopilotAuth = class {
     }
     if (stored) {
       return this.#cacheAccess({
-        apiBaseUrl: trimTrailingSlash(stored.apiBaseUrl ?? this.#copilotApiBaseUrl),
+        apiBaseUrl: trimTrailingSlash(
+          this.#hasCopilotApiBaseUrlOverride ? this.#copilotApiBaseUrl : stored.apiBaseUrl ?? this.#copilotApiBaseUrl
+        ),
         expiresAtMs: Date.now() + STORED_TOKEN_TTL_MS,
         source: "github-copilot-oauth",
         token: stored.token
@@ -154,6 +156,8 @@ var CopilotAuth = class {
 
 // src/copilot.ts
 var DEFAULT_GITHUB_API_BASE_URL = "https://api.github.com";
+var ALLOWED_COPILOT_API_HOSTS = ["api.githubcopilot.com"];
+var ALLOWED_GITHUB_API_HOSTS = ["api.github.com"];
 var COPILOT_USAGE_API_VERSION = "2025-04-01";
 function applyCopilotHeaders(headers, token) {
   headers.set("accept", headers.get("accept") ?? "application/json");
@@ -177,13 +181,15 @@ function applyGithubApiHeaders(headers, token) {
 }
 var CopilotClient = class {
   #auth;
+  #allowUnsafeUpstream;
   #fetch;
   #githubApiBaseUrl;
   constructor(options = {}) {
     this.#auth = new CopilotAuth(options);
+    this.#allowUnsafeUpstream = envValue(options.env?.HOOPILOT_ALLOW_UNSAFE_UPSTREAM) === "1";
     this.#fetch = options.fetch ?? fetch;
     this.#githubApiBaseUrl = trimTrailingSlash(
-      options.githubApiBaseUrl ?? options.env?.HOOPILOT_GITHUB_API_BASE_URL ?? DEFAULT_GITHUB_API_BASE_URL
+      options.githubApiBaseUrl ?? envValue(options.env?.HOOPILOT_GITHUB_API_BASE_URL) ?? DEFAULT_GITHUB_API_BASE_URL
     );
   }
   /**
@@ -192,9 +198,13 @@ var CopilotClient = class {
    * accepted directly here — no Copilot token exchange is required to read quota.
    */
   async usage(signal) {
-    if (!isHttpsOrLoopbackUrl(this.#githubApiBaseUrl)) {
+    if (!isTrustedTokenBaseUrl(
+      this.#githubApiBaseUrl,
+      ALLOWED_GITHUB_API_HOSTS,
+      this.#allowUnsafeUpstream
+    )) {
       throw new Error(
-        `Refusing to send the GitHub OAuth token to a non-HTTPS host: ${this.#githubApiBaseUrl}`
+        `Refusing to send the GitHub OAuth token to an untrusted GitHub API host: ${this.#githubApiBaseUrl}`
       );
     }
     const access = await this.#auth.getAccess();
@@ -236,9 +246,13 @@ var CopilotClient = class {
   }
   async fetchCopilot(path, init) {
     const access = await this.#auth.getAccess();
-    if (!isHttpsOrLoopbackUrl(access.apiBaseUrl)) {
+    if (!isTrustedTokenBaseUrl(
+      access.apiBaseUrl,
+      ALLOWED_COPILOT_API_HOSTS,
+      this.#allowUnsafeUpstream
+    )) {
       throw new Error(
-        `Refusing to send the GitHub OAuth token to a non-HTTPS host: ${access.apiBaseUrl}`
+        `Refusing to send the GitHub OAuth token to an untrusted Copilot API host: ${access.apiBaseUrl}`
       );
     }
     const headers = applyCopilotHeaders(new Headers(init.headers), access.token);
@@ -324,9 +338,9 @@ async function githubCopilotDeviceLogin(options = {}) {
   const fetcher = options.fetch ?? fetch;
   const sleeper = options.sleep ?? sleep;
   const domain = normalizeDomain(
-    options.domain ?? env.HOOPILOT_GITHUB_DOMAIN ?? DEFAULT_GITHUB_DOMAIN
+    options.domain ?? envValue(env.HOOPILOT_GITHUB_DOMAIN) ?? DEFAULT_GITHUB_DOMAIN
   );
-  const clientId = options.clientId ?? env.HOOPILOT_GITHUB_CLIENT_ID ?? env.COPILOT_GITHUB_CLIENT_ID ?? DEFAULT_GITHUB_COPILOT_CLIENT_ID;
+  const clientId = options.clientId ?? envValue(env.HOOPILOT_GITHUB_CLIENT_ID) ?? envValue(env.COPILOT_GITHUB_CLIENT_ID) ?? DEFAULT_GITHUB_COPILOT_CLIENT_ID;
   const device = await requestDeviceCode(fetcher, domain, clientId);
   const verificationUrl = device.verification_uri;
   const userCode = device.user_code;
@@ -484,8 +498,8 @@ var noopLogger = {
 };
 function createHoopilotLogger(options = {}) {
   const env = options.env ?? process.env;
-  const level = parseLogLevel(options.level ?? env.HOOPILOT_LOG_LEVEL);
-  const format = parseLogFormat(options.format ?? env.HOOPILOT_LOG_FORMAT);
+  const level = parseLogLevel(options.level ?? envValue(env.HOOPILOT_LOG_LEVEL));
+  const format = parseLogFormat(options.format ?? envValue(env.HOOPILOT_LOG_FORMAT));
   const pinoOptions = {
     base: {
       service: "hoopilot",
@@ -535,7 +549,7 @@ function parseLogLevel(value) {
 }
 function shouldCreateLogger(options) {
   return Boolean(
-    options.logger || options.logFormat || options.logLevel || options.env?.HOOPILOT_LOG_FORMAT || options.env?.HOOPILOT_LOG_LEVEL
+    options.logger || options.logFormat || options.logLevel || envValue(options.env?.HOOPILOT_LOG_FORMAT) || envValue(options.env?.HOOPILOT_LOG_LEVEL)
   );
 }
 function errorDetails(error) {
@@ -557,6 +571,12 @@ function isLogLevel(value) {
 
 // src/openai.ts
 var DEFAULT_MODEL = "gpt-4.1";
+var OpenAICompatibilityError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "OpenAICompatibilityError";
+  }
+};
 function normalizeChatCompletionRequest(request) {
   return removeUndefined({
     ...request,
@@ -564,13 +584,22 @@ function normalizeChatCompletionRequest(request) {
   });
 }
 function completionsRequestToChatCompletion(request) {
+  assertSupportedLegacyCompletionRequest(request);
   return removeUndefined({
+    frequency_penalty: request.frequency_penalty,
+    logit_bias: request.logit_bias,
     max_tokens: request.max_tokens,
-    messages: [{ content: promptToText(request.prompt), role: "user" }],
+    messages: [{ content: legacyPromptToText(request.prompt), role: "user" }],
     model: normalizeRequestedModel(request.model),
+    n: request.n,
+    presence_penalty: request.presence_penalty,
+    seed: request.seed,
+    stop: request.stop,
     stream: request.stream === true,
+    stream_options: request.stream_options,
     temperature: request.temperature,
-    top_p: request.top_p
+    top_p: request.top_p,
+    user: request.user
   });
 }
 function normalizeRequestedModel(model) {
@@ -578,21 +607,21 @@ function normalizeRequestedModel(model) {
   return requested || DEFAULT_MODEL;
 }
 function chatCompletionToCompletion(completion) {
-  const choice = firstChoice(completion);
-  const message = asRecord(choice.message);
   return removeUndefined({
-    choices: [
-      {
+    choices: completionChoices(completion).map((choice, index) => {
+      const message = asRecord(choice.message);
+      return {
         finish_reason: choice.finish_reason ?? "stop",
-        index: 0,
-        logprobs: null,
-        text: contentToText(message.content)
-      }
-    ],
+        index: typeof choice.index === "number" ? choice.index : index,
+        logprobs: choice.logprobs ?? null,
+        text: contentToText(choice.text) || contentToText(message.content)
+      };
+    }),
     created: completion.created ?? epochSeconds(),
     id: completion.id ?? `cmpl_${randomId()}`,
     model: completion.model ?? DEFAULT_MODEL,
     object: "text_completion",
+    system_fingerprint: completion.system_fingerprint,
     usage: completion.usage
   });
 }
@@ -600,12 +629,15 @@ function completionStreamFromChatStream(chatStream) {
   const encoder = new TextEncoder();
   const decoder = new TextDecoder();
   let buffer = "";
-  let sawDone = false;
+  let sawTerminalEvent = false;
   return new ReadableStream({
     async start(controller) {
       const enqueue = (data) => {
         controller.enqueue(encoder.encode(encodeDataSse(data)));
       };
+      const markTerminal = () => {
+        sawTerminalEvent = true;
+      };
       const reader = chatStream.getReader();
       try {
         while (true) {
@@ -614,20 +646,17 @@ function completionStreamFromChatStream(chatStream) {
             break;
           }
           buffer += decoder.decode(result.value, { stream: true });
-          const lines = buffer.split(/\r?\n/);
-          buffer = lines.pop() ?? "";
-          for (const line of lines) {
-            processCompletionSseLine(line, enqueue, () => {
-              sawDone = true;
-            });
+          const blocks = buffer.split(/\r?\n\r?\n/);
+          buffer = blocks.pop() ?? "";
+          for (const block of blocks) {
+            processCompletionSseBlock(block, enqueue, markTerminal);
           }
         }
-        if (buffer) {
-          processCompletionSseLine(buffer, enqueue, () => {
-            sawDone = true;
-          });
+        const tail = `${buffer}${decoder.decode()}`;
+        if (tail.trim()) {
+          processCompletionSseBlock(tail, enqueue, markTerminal);
         }
-        if (!sawDone) {
+        if (!sawTerminalEvent) {
           enqueue("[DONE]");
         }
         controller.close();
@@ -665,11 +694,38 @@ function fallbackModels() {
     }
   ];
 }
-function promptToText(prompt) {
-  if (Array.isArray(prompt)) {
-    return prompt.map((item) => contentToText(item)).join("\n");
+function legacyPromptToText(prompt) {
+  if (typeof prompt === "string") {
+    return prompt;
+  }
+  if (Array.isArray(prompt) && prompt.length === 1 && typeof prompt[0] === "string") {
+    return prompt[0];
+  }
+  throw new OpenAICompatibilityError(
+    "Hoopilot legacy completions compatibility supports exactly one string prompt per request."
+  );
+}
+function assertSupportedLegacyCompletionRequest(request) {
+  if (request.echo === true) {
+    throw new OpenAICompatibilityError(
+      "Hoopilot legacy completions compatibility does not support echo=true."
+    );
+  }
+  if (typeof request.best_of === "number" && request.best_of > 1) {
+    throw new OpenAICompatibilityError(
+      "Hoopilot legacy completions compatibility does not support best_of greater than 1."
+    );
+  }
+  if (typeof request.logprobs === "number" && request.logprobs > 0) {
+    throw new OpenAICompatibilityError(
+      "Hoopilot legacy completions compatibility does not support legacy logprobs."
+    );
+  }
+  if (contentToText(request.suffix)) {
+    throw new OpenAICompatibilityError(
+      "Hoopilot legacy completions compatibility does not support suffix."
+    );
   }
-  return contentToText(prompt);
 }
 function contentToText(content) {
   if (typeof content === "string") {
@@ -727,21 +783,27 @@ function firstNumber(...values) {
   }
   return void 0;
 }
-function firstChoice(completion) {
+function completionChoices(completion) {
   const choices = Array.isArray(completion.choices) ? completion.choices : [];
-  return asRecord(choices[0]);
+  return choices.map((choice) => asRecord(choice));
 }
-function processCompletionSseLine(line, enqueue, markDone) {
-  const trimmed = line.trim();
-  if (!trimmed.startsWith("data:")) {
-    return;
+function processCompletionSseBlock(block, enqueue, markTerminal) {
+  let event = "message";
+  const dataLines = [];
+  for (const line of block.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (trimmed.startsWith("event:")) {
+      event = trimmed.slice("event:".length).trim() || event;
+    } else if (trimmed.startsWith("data:")) {
+      dataLines.push(trimmed.slice("data:".length).trim());
+    }
   }
-  const data = trimmed.slice("data:".length).trim();
+  const data = dataLines.join("\n");
   if (!data) {
     return;
   }
   if (data === "[DONE]") {
-    markDone();
+    markTerminal();
     enqueue("[DONE]");
     return;
   }
@@ -749,25 +811,34 @@ function processCompletionSseLine(line, enqueue, markDone) {
   if (!parsed) {
     return;
   }
-  const choice = firstChoice(parsed);
-  const delta = asRecord(choice.delta);
-  const text = contentToText(delta.content);
-  const finishReason = choice.finish_reason ?? null;
+  const error = completionStreamError(event, parsed);
+  if (error) {
+    markTerminal();
+    enqueue({ error });
+    return;
+  }
+  const choices = completionChoices(parsed).map((choice, index) => {
+    const delta = asRecord(choice.delta);
+    const text = contentToText(delta.content);
+    const finishReason = choice.finish_reason ?? null;
+    if (!text && finishReason === null) {
+      return void 0;
+    }
+    return {
+      finish_reason: finishReason,
+      index: typeof choice.index === "number" ? choice.index : index,
+      logprobs: choice.logprobs ?? null,
+      text
+    };
+  }).filter((choice) => choice !== void 0);
   const usage = asRecord(parsed.usage);
   const hasUsage = Object.keys(usage).length > 0;
-  if (!text && finishReason === null && !hasUsage) {
+  if (choices.length === 0 && !hasUsage) {
     return;
   }
   enqueue(
     removeUndefined({
-      choices: text || finishReason !== null ? [
-        {
-          finish_reason: finishReason,
-          index: typeof choice.index === "number" ? choice.index : 0,
-          logprobs: null,
-          text
-        }
-      ] : [],
+      choices,
       created: typeof parsed.created === "number" ? parsed.created : epochSeconds(),
       id: contentToText(parsed.id) || `cmpl_${randomId()}`,
       model: contentToText(parsed.model) || DEFAULT_MODEL,
@@ -776,6 +847,22 @@ function processCompletionSseLine(line, enqueue, markDone) {
     })
   );
 }
+function completionStreamError(event, parsed) {
+  const responseError = asRecord(asRecord(parsed.response).error);
+  const directError = asRecord(parsed.error);
+  const error = Object.keys(directError).length > 0 ? directError : Object.keys(responseError).length > 0 ? responseError : void 0;
+  if (error) {
+    return error;
+  }
+  if (event === "error" || parsed.type === "response.failed") {
+    return removeUndefined({
+      code: contentToText(parsed.code) || void 0,
+      message: contentToText(parsed.message) || "Upstream streaming request failed.",
+      type: contentToText(parsed.type) || "upstream_stream_error"
+    });
+  }
+  return void 0;
+}
 function encodeDataSse(data) {
   if (data === "[DONE]") {
     return "data: [DONE]\n\n";
@@ -1172,10 +1259,19 @@ var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_PORT = 4141;
 var FORBIDDEN_BROWSER_ORIGIN_MESSAGE = "Browser-origin requests require HOOPILOT_API_KEY unless the Origin is loopback.";
 var INVALID_JSON_MESSAGE = "Request body must be valid JSON.";
+var MAX_REQUEST_BODY_BYTES = 16 * 1024 * 1024;
+var REQUEST_ID_PATTERN = /^[A-Za-z0-9._:-]{1,128}$/;
+var REQUEST_TOO_LARGE_MESSAGE = `Request body must be ${MAX_REQUEST_BODY_BYTES} bytes or smaller.`;
 var USAGE_CACHE_TTL_MS = 6e4;
+var RequestBodyTooLargeError = class extends Error {
+  constructor() {
+    super(REQUEST_TOO_LARGE_MESSAGE);
+    this.name = "RequestBodyTooLargeError";
+  }
+};
 function createHoopilotHandler(options = {}) {
   const client = new CopilotClient(options);
-  const apiKey = options.apiKey ?? options.env?.HOOPILOT_API_KEY;
+  const apiKey = options.apiKey ?? envValue(options.env?.HOOPILOT_API_KEY);
   const logger = serverLogger(options);
   const metrics = options.metrics ?? new MetricsRegistry();
   const readUsage = createUsageReader(client, metrics);
@@ -1261,6 +1357,18 @@ function createHoopilotHandler(options = {}) {
           "request body was invalid json"
         );
         return finish(jsonError(400, "invalid_request_error", message));
+      } else if (error instanceof OpenAICompatibilityError) {
+        requestLogger.warn(
+          { err: errorDetails(error), event: "http.request.failed" },
+          "request body used unsupported OpenAI compatibility fields"
+        );
+        return finish(jsonError(400, "invalid_request_error", message));
+      } else if (error instanceof RequestBodyTooLargeError) {
+        requestLogger.warn(
+          { err: errorDetails(error), event: "http.request.failed" },
+          "request body exceeded size limit"
+        );
+        return finish(jsonError(413, "request_too_large", message));
       } else {
         requestLogger.error(
           { err: errorDetails(error), event: "http.request.failed" },
@@ -1272,10 +1380,10 @@ function createHoopilotHandler(options = {}) {
   };
 }
 function startHoopilotServer(options = {}) {
-  const host = options.host ?? options.env?.HOST ?? DEFAULT_HOST;
-  const port = normalizeServerPort(options.port ?? options.env?.PORT ?? DEFAULT_PORT);
-  const apiKey = options.apiKey ?? options.env?.HOOPILOT_API_KEY;
-  const allowUnauthenticated = options.allowUnauthenticated ?? options.env?.HOOPILOT_ALLOW_UNAUTHENTICATED === "1";
+  const host = options.host ?? envValue(options.env?.HOST) ?? DEFAULT_HOST;
+  const port = normalizeServerPort(options.port ?? envValue(options.env?.PORT) ?? DEFAULT_PORT);
+  const apiKey = options.apiKey ?? envValue(options.env?.HOOPILOT_API_KEY);
+  const allowUnauthenticated = options.allowUnauthenticated ?? envValue(options.env?.HOOPILOT_ALLOW_UNAUTHENTICATED) === "1";
   if (!isLoopbackHost(host) && !apiKey && !allowUnauthenticated) {
     throw new Error(
       "Refusing to listen on a non-loopback host without HOOPILOT_API_KEY. Set an API key or pass --allow-unauthenticated."
@@ -1293,7 +1401,7 @@ function startHoopilotServer(options = {}) {
   });
   return {
     server,
-    url: `http://${host}:${server.port}`
+    url: `http://${urlHost(host)}:${server.port}`
   };
 }
 async function handleModels(client, metrics, signal, logger) {
@@ -1402,14 +1510,15 @@ function proxyResponse(upstream) {
   });
 }
 async function readJson(request) {
+  const text = await readRequestText(request);
   try {
-    return asRecord(await request.json());
+    return asRecord(JSON.parse(text));
   } catch {
     throw new Error(INVALID_JSON_MESSAGE);
   }
 }
 async function readJsonText(request) {
-  const text = await request.text();
+  const text = await readRequestText(request);
   try {
     JSON.parse(text);
     return text;
@@ -1417,6 +1526,40 @@ async function readJsonText(request) {
     throw new Error(INVALID_JSON_MESSAGE);
   }
 }
+async function readRequestText(request) {
+  const contentLength = request.headers.get("content-length");
+  if (contentLength) {
+    const declaredBytes = Number(contentLength);
+    if (Number.isFinite(declaredBytes) && declaredBytes > MAX_REQUEST_BODY_BYTES) {
+      throw new RequestBodyTooLargeError();
+    }
+  }
+  const body = request.body;
+  if (!body) {
+    return "";
+  }
+  const reader = body.getReader();
+  const decoder = new TextDecoder();
+  let bytes = 0;
+  let text = "";
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) {
+        return `${text}${decoder.decode()}`;
+      }
+      bytes += value.byteLength;
+      if (bytes > MAX_REQUEST_BODY_BYTES) {
+        await reader.cancel().catch(() => {
+        });
+        throw new RequestBodyTooLargeError();
+      }
+      text += decoder.decode(value, { stream: true });
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
 function jsonResponse(body, status = 200) {
   return new Response(JSON.stringify(body), {
     headers: {
@@ -1489,6 +1632,9 @@ function upstreamAuthMessage(message) {
 function isLoopbackHost(host) {
   return host === "localhost" || host === "127.0.0.1" || host === "::1" || host === "[::1]";
 }
+function urlHost(host) {
+  return host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
+}
 function isLoopbackOrigin(origin) {
   try {
     return isLoopbackHost(new URL(origin).hostname.toLowerCase());
@@ -1596,7 +1742,7 @@ function logRequestCompleted(logger, status, stream, durationMs) {
 }
 function requestIdFor(request) {
   const existing = request.headers.get("x-request-id")?.trim();
-  return existing || crypto.randomUUID();
+  return existing && REQUEST_ID_PATTERN.test(existing) ? existing : crypto.randomUUID();
 }
 function canonicalApiPath(path) {
   const withoutTrailingSlash = path.length > 1 ? path.replace(/\/+$/, "") : path;
@@ -2297,6 +2443,7 @@ function errorMessage2(error) {
 }
 
 // src/cli.ts
+var ALLOWED_COPILOT_API_HOSTS2 = ["api.githubcopilot.com"];
 async function main2(argv = Bun.argv.slice(2)) {
   cleanupOldBinary();
   const command = argv[0];
@@ -2399,46 +2546,54 @@ function parseArgs(argv) {
       args.noUpdateCheck = true;
       continue;
     }
-    const [name, inlineValue] = splitOption(arg);
-    const value = inlineValue ?? rest.shift();
-    if (!value) {
-      throw new Error(`Missing value for ${arg}.`);
+    if (!arg.startsWith("-")) {
+      throw new Error(`Unknown argument: ${arg}.`);
     }
+    const [name, inlineValue] = splitOption(arg);
     switch (name) {
       case "--api-key":
-        args.apiKey = value;
+        args.apiKey = optionValue(name, inlineValue, rest);
         break;
       case "--api-key-file":
-        args.apiKey = readApiKeyFile(value);
+        args.apiKey = readApiKeyFile(optionValue(name, inlineValue, rest));
         break;
       case "--auth-file":
-        args.authStorePath = value;
+        args.authStorePath = optionValue(name, inlineValue, rest);
         break;
       case "--copilot-api-base-url":
-        args.copilotApiBaseUrl = value;
+        args.copilotApiBaseUrl = optionValue(name, inlineValue, rest);
         break;
       case "--log-format":
-        args.logFormat = parseLogFormat(value);
+        args.logFormat = parseLogFormat(optionValue(name, inlineValue, rest));
         break;
       case "--log-level":
-        args.logLevel = parseLogLevel(value);
+        args.logLevel = parseLogLevel(optionValue(name, inlineValue, rest));
         break;
       case "--host":
-        args.host = value;
+        args.host = optionValue(name, inlineValue, rest);
         break;
       case "--port":
-      case "-p":
+      case "-p": {
+        const value = optionValue(name, inlineValue, rest);
         args.port = Number(value);
         if (!Number.isInteger(args.port) || args.port <= 0 || args.port > 65535) {
           throw new Error(`Invalid port: ${value}.`);
         }
         break;
+      }
       default:
         throw new Error(`Unknown option: ${name}.`);
     }
   }
   return args;
 }
+function optionValue(name, inlineValue, rest) {
+  const value = inlineValue ?? rest.shift();
+  if (!value) {
+    throw new Error(`Missing value for ${name}.`);
+  }
+  return value;
+}
 function splitOption(arg) {
   const separator = arg.indexOf("=");
   if (separator === -1) {
@@ -2589,10 +2744,13 @@ function roundQuota(value) {
 }
 async function verifyCopilotOAuthToken(token, options = {}) {
   const apiBaseUrl = trimTrailingSlash(
-    options.copilotApiBaseUrl ?? options.env?.COPILOT_API_BASE_URL ?? DEFAULT_COPILOT_API_BASE_URL
+    options.copilotApiBaseUrl ?? envValue(options.env?.COPILOT_API_BASE_URL) ?? DEFAULT_COPILOT_API_BASE_URL
   );
-  if (!isHttpsOrLoopbackUrl(apiBaseUrl)) {
-    throw new Error(`Refusing to send the GitHub OAuth token to a non-HTTPS host: ${apiBaseUrl}`);
+  const allowUnsafeUpstream = envValue(options.env?.HOOPILOT_ALLOW_UNSAFE_UPSTREAM) === "1";
+  if (!isTrustedTokenBaseUrl(apiBaseUrl, ALLOWED_COPILOT_API_HOSTS2, allowUnsafeUpstream)) {
+    throw new Error(
+      `Refusing to send the GitHub OAuth token to an untrusted Copilot API host: ${apiBaseUrl}`
+    );
   }
   const fetcher = options.fetch ?? fetch;
   const response = await fetcher(`${apiBaseUrl}/models`, {
@@ -2700,6 +2858,7 @@ Environment:
   HOOPILOT_LOG_LEVEL                trace, debug, info, warn, error, fatal, or silent
   COPILOT_API_BASE_URL
   HOOPILOT_GITHUB_API_BASE_URL      GitHub REST base for the usage/quota lookup. Default: https://api.github.com
+  HOOPILOT_ALLOW_UNSAFE_UPSTREAM    Set to 1 to allow nonstandard HTTPS token hosts
   HOOPILOT_NO_UPDATE_CHECK          Set to disable update checks (also NO_UPDATE_NOTIFIER)
 `;
 }