codex-copilot-dx 0.9.16 → 0.9.18

package/README.md

@@ -62,6 +62,8 @@ The dashboard does not poll in the background; refresh when needed.
   break continuations. Generated images and Codex transcripts are not deleted.
 - Optional image setup/maintenance never blocks the primary service. Disabled
   users get no CCDX image skill or MCP installation.
+- Image API redirects must stay on the same HTTPS origin. Returned images must
+  use public HTTPS URLs; well-known NAT64 mappings follow IPv4 address rules.
 - Keep the adapter on loopback. LAN mode is only for trusted networks; do not
   expose it to the public internet. The dashboard is not an authentication wall
   for the API. Diagnostic errors may contain sensitive upstream text.

package/bin/cli.mjs

@@ -75,11 +75,16 @@ if (CLI.command === "image") {
   }
 }
 if (CLI.command === "usage") {
-  await printUsageSummary({
-    format: CLI.outputFormat || "auto",
-    output: process.stdout,
-  });
-  process.exit(0);
+  try {
+    await printUsageSummary({
+      format: CLI.outputFormat || "auto",
+      output: process.stdout,
+    });
+    process.exit(0);
+  } catch (e) {
+    console.error(status("err", e.message));
+    process.exit(1);
+  }
 }
 if (CLI.command === "cache") {
   try {

package/docs/REFERENCE.md

@@ -203,7 +203,13 @@ ccdx disable-image
 
 `image-status` never prints the API key and performs only a local, non-generating tool-readiness check. Disabling removes the stored provider credential, the CCDX-owned MCP block, and unmodified skill, reference, and helper files; user-modified files are preserved. Cached tool calls then fail closed. The Node helper creates a new file under the task's `output/imagegen` directory by default and reports its absolute path; it never overwrites an existing file or automatically repeats a failed generation. The image endpoint is contacted only by `enable-image` validation and by explicit `generate_image` or `edit_image` tool calls. Ordinary Responses, models, authentication, Fast, Auto-review, compaction, and image-input paths remain on their existing routes.
 
-Generated image downloads must use public HTTPS addresses, do not follow redirects, are DNS-checked against private and reserved addresses, and are capped at 32 MiB. DNS resolution and downloading share one deadline and respond to cancellation; a late DNS result cannot start a cancelled download. The local MCP route accepts calls only from the same device and permits at most two concurrent image operations. It requires `application/json` and rejects browser `Origin` headers; native Codex and Node clients do not send an Origin. The tool supports new-image generation at `1024x1024`, `1536x1024`, or `1024x1536`.
+Generated image downloads must use public HTTPS addresses, do not follow redirects, are DNS-checked against private and reserved addresses, and are capped at 32 MiB. Well-known NAT64 `64:ff9b::/96` addresses apply the same IPv4 public/private rules to the embedded address, without rejecting legitimate public translations. DNS resolution and downloading share one deadline and respond to cancellation; a late DNS result cannot start a cancelled download. The local MCP route accepts calls only from the same device and permits at most two concurrent image operations. Host must name loopback, the actual local socket address (including equivalent IPv6/IPv4-mapped forms), or the explicitly configured bind hostname. Missing Host remains compatible with HTTP/1.0 and in-process clients. It requires `application/json` and rejects browser `Origin` headers; native Codex and Node clients do not send an Origin. The tool supports new-image generation at `1024x1024`, `1536x1024`, or `1024x1536`.
+
+Image API generation/editing requests retain same-origin HTTPS redirects, with Fetch's existing POST/GET rules, a 20-hop limit and one shared timeout/cancellation signal. Cross-origin, HTTPS-to-HTTP, credential-bearing or invalid redirect targets are refused before another request is sent. Use the final API base URL when a service redirects to another origin. Redirect bodies are cancelled; generation failures are not automatically retried. The provider's returned image-download URLs still never follow redirects.
+
+The Chat compatibility bridge ignores repeated complete tool names only when the name is declared and concatenation cannot be a fragment of another declared name. Overlapping fragments, delayed names and ambiguous/undeclared streams retain their existing assembly rules; argument deltas and tool-call IDs are not deduplicated. Native Responses routing and payloads are unchanged.
+
+`ccdx usage` reports genuine log-read failures with the normal error line and exit code 1, without an uncaught exception dump. Missing logs remain a successful empty summary; malformed records are skipped with a warning rather than making usage unavailable.
 
 With `qwen-image-3.0-pro` or `qwen-image-3.0` using either supported protocol, CCDX also exposes `edit_image`. Ask Codex to modify a specific CCDX-generated image; it passes that image's returned `image_id` and the edit instruction to the same configured provider. Each edit returns a new image and ID while preserving the original; omitting `size` retains the source's requested dimensions. The Qwen request contains the source image again on every edit, as required by its [single-turn image editing API](https://help.aliyun.com/zh/model-studio/qwen-image-generation-and-editing-api-reference).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.9.16",
+  "version": "0.9.18",
   "description": "Use Codex App with GitHub Copilot",
   "author": "Dale Xiao",
   "type": "module",

package/src/adapter.mjs

@@ -6,8 +6,6 @@ import {
   ADAPTER_STATUS_PATH,
   classifyAdapterRoute,
   createRequestMetrics,
-  isLoopbackAddress,
-  isLoopbackHostHeader,
   runtimeStatusPayload,
 } from "./observability.mjs";
 import { createRequestId, runWithRequestContext } from "./request-context.mjs";
@@ -26,13 +24,14 @@ import {
 } from "./cache-control.mjs";
 import { loadRuntimeConfig, parsePositiveInteger } from "./runtime-config.mjs";
 import {
-  createRequestAdmission,
   createRequestAbort,
-  httpError,
   logRequestFailure,
   readJsonBody,
   sendJsonError,
 } from "./http-transport.mjs";
+import { httpError } from "./http-errors.mjs";
+import { createRequestAdmission } from "./request-admission.mjs";
+import { isLoopbackAddress, isLoopbackHostHeader } from "./security.mjs";
 
 export {
   abortErrorStatusCode,
@@ -215,7 +214,7 @@ export function createAdapterHandler(options = {}) {
     if (pathname === "/mcp/image") {
       if (imageMcpHandler) return imageMcpHandler(req, res);
       return import("./image-mcp.mjs").then(({ createImageMcpHandler }) => {
-        imageMcpHandler ||= createImageMcpHandler();
+        imageMcpHandler ||= createImageMcpHandler({ localHostname: options.imageMcpHostname });
         return imageMcpHandler(req, res);
       });
     }
@@ -460,7 +459,7 @@ export function startAdapter(port = 2026, host = "127.0.0.1", options = {}) {
   const terminalActivity = ownsTerminalActivity
     ? createTerminalActivityIndicator({ theme: options.terminalAnimationTheme })
     : options.terminalActivity;
-  const handler = createAdapterHandler({ ...options, terminalActivity });
+  const handler = createAdapterHandler({ ...options, terminalActivity, imageMcpHostname: host });
   const server = http.createServer(handler);
   const cleanupTerminalActivity = () => {
     if (ownsTerminalActivity) terminalActivity?.cleanup?.();

package/src/auth-status.mjs

@@ -0,0 +1,175 @@
+import os from "node:os";
+import { validateGithubToken } from "./auth.mjs";
+import { AUTH_PROFILE_CODEX, readAuthProfileCredentials } from "./auth-profile.mjs";
+import { buildHeaders, FALLBACK_VSCODE_VERSION, parseApiBase } from "./copilot.mjs";
+import { MAX_UPSTREAM_MODEL_CATALOG_BYTES, readBoundedResponseText } from "./http-transport.mjs";
+import { profileRouting } from "./profile-routing.mjs";
+
+const DEFAULT_COPILOT_CATALOG_TIMEOUT_MS = 30 * 1000;
+
+function responseDetail(value) {
+  return String(value || "").replace(/\s+/g, " ").trim().slice(0, 240);
+}
+
+function abortError(signal) {
+  if (signal?.reason instanceof Error) return signal.reason;
+  const error = new Error("The operation was aborted");
+  error.name = "AbortError";
+  return error;
+}
+
+function catalogModels(payload) {
+  const models = Array.isArray(payload) ? payload : payload?.data;
+  if (!Array.isArray(models)) throw new Error("Copilot model catalog contained no model list");
+  return models;
+}
+
+async function fetchCopilotCatalog(tokenData, {
+  fetchImpl,
+  signal,
+  vscodeVersion = FALLBACK_VSCODE_VERSION,
+  timeoutMs = DEFAULT_COPILOT_CATALOG_TIMEOUT_MS,
+} = {}) {
+  const parsedTimeout = Number(timeoutMs);
+  const deadlineMs = Number.isFinite(parsedTimeout) && parsedTimeout > 0
+    ? parsedTimeout
+    : DEFAULT_COPILOT_CATALOG_TIMEOUT_MS;
+  const controller = new AbortController();
+  const onCallerAbort = () => controller.abort(signal?.reason);
+  signal?.addEventListener("abort", onCallerAbort, { once: true });
+  if (signal?.aborted) onCallerAbort();
+  const timer = setTimeout(() => controller.abort(new Error(`Copilot model catalog timed out after ${deadlineMs}ms`)), deadlineMs);
+  try {
+    const apiBase = parseApiBase(tokenData);
+    const headers = buildHeaders({
+      token: tokenData.token,
+      version: vscodeVersion,
+      initiator: "user",
+      vision: false,
+    });
+    const response = await fetchImpl(`${apiBase}/models`, {
+      headers,
+      redirect: "error",
+      signal: controller.signal,
+    });
+    const modelText = await readBoundedResponseText(response, {
+      maxBytes: MAX_UPSTREAM_MODEL_CATALOG_BYTES,
+      label: "Copilot model catalog",
+      signal: controller.signal,
+    });
+    if (!response.ok) {
+      const detail = responseDetail(modelText);
+      throw new Error(`Copilot model catalog failed with HTTP ${response.status}${detail ? `: ${detail}` : ""}`);
+    }
+
+    let catalog;
+    try {
+      catalog = JSON.parse(modelText);
+    } catch {
+      throw new Error("Copilot model catalog returned invalid JSON");
+    }
+    catalogModels(catalog);
+    return { catalog, apiBase };
+  } catch (error) {
+    if (signal?.aborted) throw abortError(signal);
+    if (controller.signal.aborted) throw abortError(controller.signal);
+    throw error;
+  } finally {
+    clearTimeout(timer);
+    signal?.removeEventListener("abort", onCallerAbort);
+  }
+}
+
+function publicProfile(credentials) {
+  return {
+    configured: credentials.configured,
+    valid: credentials.valid,
+    reason: credentials.reason,
+    login: credentials.identity?.login || "",
+    id: credentials.identity?.id || "",
+    source: "legacy",
+  };
+}
+
+function readStatusCredentials(home) {
+  try {
+    return readAuthProfileCredentials(AUTH_PROFILE_CODEX, { home });
+  } catch {
+    return {
+      profile: AUTH_PROFILE_CODEX,
+      configured: true,
+      valid: false,
+      reason: "credential_read_failed",
+      token: "",
+      identity: null,
+    };
+  }
+}
+
+export function authStatus({ home = os.homedir() } = {}) {
+  const codex = readStatusCredentials(home);
+  return {
+    profiles: { codex: publicProfile(codex) },
+    routing: profileRouting(),
+  };
+}
+
+async function inspectProfileOnline(credentials, { fetchImpl, timeoutMs } = {}) {
+  if (!credentials.valid) {
+    return { checked: false, ok: false, reason: credentials.reason || "unconfigured" };
+  }
+
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(new Error(`timed out after ${timeoutMs}ms`)), timeoutMs);
+  try {
+    const validation = await validateGithubToken(credentials.token, {
+      fetchImpl,
+      signal: controller.signal,
+    });
+    if (controller.signal.aborted) throw abortError(controller.signal);
+    if (!validation.ok) {
+      return {
+        checked: true,
+        ok: false,
+        reason: validation.reason,
+        httpStatus: validation.status || null,
+      };
+    }
+    const { catalog, apiBase } = await fetchCopilotCatalog(validation.copilotTokenData, {
+      fetchImpl,
+      signal: controller.signal,
+    });
+    let upstreamHost = "GitHub Copilot";
+    try { upstreamHost = new URL(apiBase).hostname; } catch {}
+    return {
+      checked: true,
+      ok: true,
+      login: validation.login || credentials.identity?.login || "",
+      models: catalogModels(catalog).length,
+      upstreamHost,
+    };
+  } catch (error) {
+    return {
+      checked: true,
+      ok: false,
+      reason: controller.signal.aborted ? `timed out after ${timeoutMs}ms` : error.message,
+    };
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+export async function authStatusOnline({
+  home = os.homedir(),
+  fetchImpl = fetch,
+  timeoutMs = 10000,
+} = {}) {
+  const local = authStatus({ home });
+  const online = await inspectProfileOnline(readStatusCredentials(home), { fetchImpl, timeoutMs });
+  return {
+    ...local,
+    profiles: {
+      codex: { ...local.profiles.codex, online },
+    },
+  };
+}

package/src/cli-auth.mjs

@@ -1,15 +1,4 @@
-import os from "node:os";
-import { validateGithubToken } from "./auth.mjs";
-import {
-  AUTH_PROFILE_CODEX,
-  readAuthProfileCredentials,
-} from "./auth-profile.mjs";
-import { buildHeaders, FALLBACK_VSCODE_VERSION, parseApiBase } from "./copilot.mjs";
-import {
-  MAX_UPSTREAM_MODEL_CATALOG_BYTES,
-  readBoundedResponseText,
-} from "./http-transport.mjs";
-import { profileRouting } from "./profile-routing.mjs";
+import { authStatus, authStatusOnline } from "./auth-status.mjs";
 import { status } from "./status.mjs";
 import {
   cliOutputFormat,
@@ -18,174 +7,7 @@ import {
   terminalCell,
 } from "./cli-table.mjs";
 
-const DEFAULT_COPILOT_CATALOG_TIMEOUT_MS = 30 * 1000;
-
-function responseDetail(value) {
-  return String(value || "").replace(/\s+/g, " ").trim().slice(0, 240);
-}
-
-function abortError(signal) {
-  if (signal?.reason instanceof Error) return signal.reason;
-  const error = new Error("The operation was aborted");
-  error.name = "AbortError";
-  return error;
-}
-
-function catalogModels(payload) {
-  const models = Array.isArray(payload) ? payload : payload?.data;
-  if (!Array.isArray(models)) throw new Error("Copilot model catalog contained no model list");
-  return models;
-}
-
-async function fetchCopilotCatalog(tokenData, {
-  fetchImpl,
-  signal,
-  vscodeVersion = FALLBACK_VSCODE_VERSION,
-  timeoutMs = DEFAULT_COPILOT_CATALOG_TIMEOUT_MS,
-} = {}) {
-  const parsedTimeout = Number(timeoutMs);
-  const deadlineMs = Number.isFinite(parsedTimeout) && parsedTimeout > 0
-    ? parsedTimeout
-    : DEFAULT_COPILOT_CATALOG_TIMEOUT_MS;
-  const controller = new AbortController();
-  const onCallerAbort = () => controller.abort(signal?.reason);
-  signal?.addEventListener("abort", onCallerAbort, { once: true });
-  if (signal?.aborted) onCallerAbort();
-  const timer = setTimeout(() => controller.abort(new Error(`Copilot model catalog timed out after ${deadlineMs}ms`)), deadlineMs);
-  try {
-    const apiBase = parseApiBase(tokenData);
-    const headers = buildHeaders({
-      token: tokenData.token,
-      version: vscodeVersion,
-      initiator: "user",
-      vision: false,
-    });
-    const response = await fetchImpl(`${apiBase}/models`, {
-      headers,
-      redirect: "error",
-      signal: controller.signal,
-    });
-    const modelText = await readBoundedResponseText(response, {
-      maxBytes: MAX_UPSTREAM_MODEL_CATALOG_BYTES,
-      label: "Copilot model catalog",
-      signal: controller.signal,
-    });
-    if (!response.ok) {
-      const detail = responseDetail(modelText);
-      throw new Error(`Copilot model catalog failed with HTTP ${response.status}${detail ? `: ${detail}` : ""}`);
-    }
-
-    let catalog;
-    try {
-      catalog = JSON.parse(modelText);
-    } catch {
-      throw new Error("Copilot model catalog returned invalid JSON");
-    }
-    catalogModels(catalog);
-    return { catalog, apiBase };
-  } catch (error) {
-    if (signal?.aborted) throw abortError(signal);
-    if (controller.signal.aborted) throw abortError(controller.signal);
-    throw error;
-  } finally {
-    clearTimeout(timer);
-    signal?.removeEventListener("abort", onCallerAbort);
-  }
-}
-
-function publicProfile(credentials) {
-  return {
-    configured: credentials.configured,
-    valid: credentials.valid,
-    reason: credentials.reason,
-    login: credentials.identity?.login || "",
-    id: credentials.identity?.id || "",
-    source: "legacy",
-  };
-}
-
-function readStatusCredentials(home) {
-  try {
-    return readAuthProfileCredentials(AUTH_PROFILE_CODEX, { home });
-  } catch {
-    return {
-      profile: AUTH_PROFILE_CODEX,
-      configured: true,
-      valid: false,
-      reason: "credential_read_failed",
-      token: "",
-      identity: null,
-    };
-  }
-}
-
-export function authStatus({ home = os.homedir() } = {}) {
-  const codex = readStatusCredentials(home);
-  return {
-    profiles: { codex: publicProfile(codex) },
-    routing: profileRouting(),
-  };
-}
-
-async function inspectProfileOnline(credentials, { fetchImpl, timeoutMs } = {}) {
-  if (!credentials.valid) {
-    return { checked: false, ok: false, reason: credentials.reason || "unconfigured" };
-  }
-
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(new Error(`timed out after ${timeoutMs}ms`)), timeoutMs);
-  try {
-    const validation = await validateGithubToken(credentials.token, {
-      fetchImpl,
-      signal: controller.signal,
-    });
-    if (controller.signal.aborted) throw abortError(controller.signal);
-    if (!validation.ok) {
-      return {
-        checked: true,
-        ok: false,
-        reason: validation.reason,
-        httpStatus: validation.status || null,
-      };
-    }
-    const { catalog, apiBase } = await fetchCopilotCatalog(validation.copilotTokenData, {
-      fetchImpl,
-      signal: controller.signal,
-    });
-    let upstreamHost = "GitHub Copilot";
-    try { upstreamHost = new URL(apiBase).hostname; } catch {}
-    return {
-      checked: true,
-      ok: true,
-      login: validation.login || credentials.identity?.login || "",
-      models: catalogModels(catalog).length,
-      upstreamHost,
-    };
-  } catch (error) {
-    return {
-      checked: true,
-      ok: false,
-      reason: controller.signal.aborted ? `timed out after ${timeoutMs}ms` : error.message,
-    };
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-export async function authStatusOnline({
-  home = os.homedir(),
-  fetchImpl = fetch,
-  timeoutMs = 10000,
-} = {}) {
-  const local = authStatus({ home });
-  const online = await inspectProfileOnline(readStatusCredentials(home), { fetchImpl, timeoutMs });
-  return {
-    ...local,
-    profiles: {
-      codex: { ...local.profiles.codex, online },
-    },
-  };
-}
+export { authStatus, authStatusOnline } from "./auth-status.mjs";
 
 function accountLabel(profile) {
   if (!profile.configured) return "not configured";

package/src/cli-models.mjs

@@ -1,10 +1,3 @@
-import os from "node:os";
-import { validateGithubToken } from "./auth.mjs";
-import {
-  AUTH_PROFILE_CODEX,
-  readAuthProfileCredentials,
-} from "./auth-profile.mjs";
-import { buildHeaders, FALLBACK_VSCODE_VERSION, parseApiBase } from "./copilot.mjs";
 import { status } from "./status.mjs";
 import {
   cliOutputFormat,
@@ -13,11 +6,7 @@ import {
   terminalCell,
 } from "./cli-table.mjs";
 
-const DEFAULT_MODELS_TIMEOUT_MS = 10000;
-const SUPPORTED_ENDPOINTS = [
-  ["responses", new Set(["/responses", "/v1/responses"])],
-  ["chat", new Set(["/chat/completions"])],
-];
+export { fetchLiveCopilotModels, selectableCopilotModels } from "./live-models.mjs";
 
 function safeText(value, fallback = "") {
   const text = String(value ?? "")
@@ -27,125 +16,6 @@ function safeText(value, fallback = "") {
   return text || fallback;
 }
 
-function endpointLabels(model) {
-  const advertised = new Set(Array.isArray(model?.supported_endpoints) ? model.supported_endpoints : []);
-  return SUPPORTED_ENDPOINTS
-    .filter(([, values]) => [...values].some((value) => advertised.has(value)))
-    .map(([label]) => label);
-}
-
-export function selectableCopilotModels(payload) {
-  const data = Array.isArray(payload) ? payload : payload?.data;
-  if (!Array.isArray(data)) throw new Error("Copilot models response contained no model list");
-
-  const models = [];
-  const seen = new Set();
-  for (const model of data) {
-    if (model?.model_picker_enabled !== true) continue;
-    const policyState = safeText(model?.policy?.state).toLowerCase();
-    if (policyState && policyState !== "enabled") continue;
-    const capabilityType = safeText(model?.capabilities?.type).toLowerCase();
-    if (capabilityType && capabilityType !== "chat") continue;
-
-    const id = safeText(model?.id);
-    const endpoints = endpointLabels(model);
-    if (!id.startsWith("gpt-") || id === "codex-auto-review" || !endpoints.length || seen.has(id)) continue;
-    seen.add(id);
-    models.push({
-      id,
-      vendor: safeText(model?.vendor || model?.owned_by, "Unknown"),
-      endpoints,
-      preview: model?.preview === true,
-    });
-  }
-
-  models.sort((left, right) => left.vendor.localeCompare(right.vendor, "en")
-    || left.id.localeCompare(right.id, "en"));
-  return { advertised: data.length, models };
-}
-
-function validationFailure(validation) {
-  const httpStatus = validation?.status ? ` (HTTP ${validation.status})` : "";
-  return `GitHub Copilot authentication failed: ${validation?.reason || "unknown error"}${httpStatus}`;
-}
-
-async function responseText(response) {
-  try {
-    return await response.text();
-  } catch {
-    return "";
-  }
-}
-
-function readModelCredentials(home) {
-  let credentials;
-  try {
-    credentials = readAuthProfileCredentials(AUTH_PROFILE_CODEX, { home });
-  } catch (error) {
-    throw new Error(`Could not read the GitHub token: ${error.message}`);
-  }
-  if (credentials.valid) return credentials;
-  if (!credentials.configured) throw new Error("GitHub token not found. Start ccdx once to log in.");
-  if (credentials.reason === "empty_token") throw new Error("GitHub token file is empty. Start ccdx again to log in.");
-  throw new Error(`GitHub token is unavailable (${credentials.reason || "unknown"}). Start ccdx again to log in.`);
-}
-
-export async function fetchLiveCopilotModels({
-  home = os.homedir(),
-  fetchImpl = fetch,
-  timeoutMs = DEFAULT_MODELS_TIMEOUT_MS,
-  vscodeVersion = FALLBACK_VSCODE_VERSION,
-} = {}) {
-  const credentials = readModelCredentials(home);
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const validation = await validateGithubToken(credentials.token, {
-      fetchImpl,
-      signal: controller.signal,
-    });
-    if (controller.signal.aborted) throw new Error(`Live model lookup timed out after ${timeoutMs}ms`);
-    if (!validation.ok) throw new Error(validationFailure(validation));
-
-    const tokenData = validation.copilotTokenData;
-    const apiBase = parseApiBase(tokenData);
-    const headers = buildHeaders({
-      token: tokenData.token,
-      version: vscodeVersion,
-      initiator: "user",
-      vision: false,
-    });
-    const response = await fetchImpl(`${apiBase}/models`, {
-      headers,
-      redirect: "error",
-      signal: controller.signal,
-    });
-    const body = await responseText(response);
-    if (!response.ok) {
-      const detail = safeText(body).slice(0, 240);
-      throw new Error(`Copilot models endpoint returned HTTP ${response.status}${detail ? `: ${detail}` : ""}`);
-    }
-
-    let payload;
-    try {
-      payload = JSON.parse(body);
-    } catch {
-      throw new Error("Copilot models endpoint returned invalid JSON");
-    }
-    const catalog = selectableCopilotModels(payload);
-    let upstreamHost = "GitHub Copilot";
-    try { upstreamHost = new URL(apiBase).hostname; } catch {}
-    return { ...catalog, profile: AUTH_PROFILE_CODEX, upstreamHost: safeText(upstreamHost, "GitHub Copilot") };
-  } catch (error) {
-    if (controller.signal.aborted && !/timed out/.test(error?.message || "")) {
-      throw new Error(`Live model lookup timed out after ${timeoutMs}ms`);
-    }
-    throw error;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
 function liveCatalogHeader(catalog, { commandName, models }) {
   const responses = models.filter((model) => model.endpoints.includes("responses")).length;
   const chat = models.filter((model) => model.endpoints.includes("chat")).length;

package/src/cli-table.mjs

@@ -1,4 +1,6 @@
-import { stripVTControlCharacters } from "node:util";
+import { terminalCell } from "./terminal-text.mjs";
+
+export { terminalCell } from "./terminal-text.mjs";
 
 const DEFAULT_TERMINAL_COLUMNS = 120;
 const COMBINING_MARK = /\p{Mark}/u;
@@ -50,16 +52,6 @@ function padded(value, width, align) {
   return align === "right" ? `${spaces}${value}` : `${value}${spaces}`;
 }
 
-export function terminalCell(value, { fallback = "—" } = {}) {
-  if (value === undefined || value === null) return fallback;
-  const text = stripVTControlCharacters(String(value))
-    .replace(/[\u0000-\u001f\u007f-\u009f]/g, " ")
-    .replace(/[\u061c\u200b\u200e\u200f\u202a-\u202e\u2060\u2066-\u2069\ufeff]/g, "")
-    .replace(/\s+/g, " ")
-    .trim();
-  return text || fallback;
-}
-
 export function cliOutputFormat(format = "auto", output = process.stdout) {
   if (format === "table" || format === "plain") return format;
   return output?.isTTY === true ? "table" : "plain";

package/src/copilot-responses-compat.mjs

@@ -5,10 +5,10 @@ import {
   sanitizeImageNamespaceCollisionRequest,
 } from "./copilot-responses-policy.mjs";
 import {
-  httpError,
   MAX_UPSTREAM_ERROR_BODY_BYTES,
   readBoundedResponseText,
 } from "./http-transport.mjs";
+import { httpError } from "./http-errors.mjs";
 import {
   finalizeEncryptedHistoryRebase,
   sanitizeEncryptedReasoningRequest,

package/src/dashboard-api.mjs

@@ -1,9 +1,9 @@
 import os from "node:os";
-import { fetchLiveCopilotModels } from "./cli-models.mjs";
-import { authStatus } from "./cli-auth.mjs";
+import { fetchLiveCopilotModels } from "./live-models.mjs";
+import { authStatus } from "./auth-status.mjs";
 import { redactDiagnosticText } from "./diagnostic-text.mjs";
 import { createRequestAbort, readJsonBody } from "./http-transport.mjs";
-import { isLoopbackAddress, isLoopbackHostHeader } from "./observability.mjs";
+import { isLoopbackAddress, isLoopbackHostHeader } from "./security.mjs";
 import {
   DEFAULT_TERMINAL_ANIMATION_THEME,
   getTerminalAnimationFrameDelay,
@@ -11,7 +11,7 @@ import {
   renderTerminalAnimationFrame,
   TERMINAL_ANIMATION_THEMES,
 } from "./terminal-animation.mjs";
-import { cacheReadTokens, summarizeUsageLogs, usageCacheHitRate } from "./usage.mjs";
+import { cacheReadTokens, summarizeUsageLogs, usageCacheHitRate } from "./usage-store.mjs";
 import { createUsageAnalytics } from "./usage-analytics.mjs";
 import { readUserSettings, terminalAnimationPreference, writeTerminalAnimationTheme } from "./user-settings.mjs";