@jiayunxie/aerial 0.1.11 → 0.2.1

package/src/copilot.js

@@ -3,6 +3,7 @@ import { COPILOT_API_ORIGIN, DEFAULT_ANTHROPIC_VERSION } from "./constants.js";
 import { loadConfig } from "./config.js";
 import { getCopilotToken } from "./auth.js";
 import { logEvent } from "./log.js";
+import { upstreamFetch } from "./upstream-fetch.js";
 import { isResponsesWebSocketOptIn, proxyResponsesWebSocket, shouldUseResponsesWebSocket } from "./responses-websocket.js";
 import {
   fetchModelsCatalog as fetchModelsCatalogShared,
@@ -124,11 +125,20 @@ function withDefaultPromptCache(payload) {
 
 function openAIEffortRoute(model, effort) {
   if (effort === undefined) return undefined;
-  if (/^gpt-5-mini(?:-|$)/.test(model) && ["xhigh", "max"].includes(effort)) return "high";
-  if (effort === "max") return "xhigh";
+  const normalized = normalizeProxyEffort(effort);
+  if (/^gpt-5-mini(?:-|$)/.test(model) && normalized === "xhigh") return "high";
+  if (normalized !== effort) return normalized;
   return undefined;
 }
 
+function objectOrEmpty(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+
+function normalizeProxyEffort(effort) {
+  return effort === "max" ? "xhigh" : effort;
+}
+
 function withSupportedOpenAIEffort(payload) {
   const model = typeof payload?.model === "string" ? payload.model : "";
   const reasoningEffort = payload?.reasoning && typeof payload.reasoning === "object" ? payload.reasoning.effort : undefined;
@@ -186,7 +196,7 @@ function withSupportedAnthropicEffort(payload, models) {
   const model = typeof payload?.model === "string" ? payload.model : "";
   const family = canonicalClaudeFamily(model);
   if (!family) return payload;
-  const nextEffort = effort === "max" ? "xhigh" : effort;
+  const nextEffort = normalizeProxyEffort(effort);
   if (!["low", "medium", "high", "xhigh"].includes(nextEffort)) return payload;
   const routed = findCompatibleModelShared({
     models,
@@ -220,9 +230,7 @@ function isLegacyThinkingEnabled(thinking) {
 
 function withSupportedAnthropicThinking(payload) {
   if (!isLegacyThinkingEnabled(payload?.thinking)) return payload;
-  const outputConfig = payload?.output_config && typeof payload.output_config === "object" && !Array.isArray(payload.output_config)
-    ? payload.output_config
-    : {};
+  const outputConfig = objectOrEmpty(payload?.output_config);
   const effort = outputConfig.effort ?? legacyThinkingEffort(payload.thinking);
   logEvent("anthropic_thinking_route", { model: payload.model, routedType: "adaptive", routedEffort: effort });
   return {
@@ -243,7 +251,7 @@ async function fetchModelsCatalogForCopilot() {
   return fetchModelsCatalogShared({
     tokenFingerprint: tokenFingerprintOf(token),
     fetchImpl: async () => {
-      const response = await fetch(`${COPILOT_API_ORIGIN}/models`, { method: "GET", headers: upstreamHeaders(token) });
+      const response = await upstreamFetch(`${COPILOT_API_ORIGIN}/models`, { method: "GET", headers: upstreamHeaders(token) });
       if (!response.ok) return undefined;
       const payload = await response.json().catch(() => ({}));
       return Array.isArray(payload?.data) ? payload.data : undefined;
@@ -258,9 +266,7 @@ function withDefaultAnthropicEffort(payload) {
   if (!canonicalClaudeFamily(model)) return payload;
   const config = loadConfig();
   const effort = config.defaultEffort || "medium";
-  const outputConfig = payload?.output_config && typeof payload.output_config === "object" && !Array.isArray(payload.output_config)
-    ? payload.output_config
-    : {};
+  const outputConfig = objectOrEmpty(payload?.output_config);
   logEvent("anthropic_default_effort", { model, effort });
   return { ...payload, output_config: { ...outputConfig, effort } };
 }
@@ -474,10 +480,10 @@ async function proxyFetch(path, request, { extraHeaders = {}, bodyOverride } = {
   const requestCache = cacheRequestFields(parseJsonBody(body, contentType));
   if (hasExplicitCacheRequest(requestCache)) logEvent("cache_request", { route: path, ...requestCache });
   const headers = upstreamHeaders(token, { accept, "content-type": contentType, ...extraHeaders });
-  let upstream = await fetch(`${COPILOT_API_ORIGIN}${path}`, { method: request.method, headers, body });
+  let upstream = await upstreamFetch(`${COPILOT_API_ORIGIN}${path}`, { method: request.method, headers, body });
   if (upstream.status === 401) {
     const refreshed = await getCopilotToken({ force: true });
-    upstream = await fetch(`${COPILOT_API_ORIGIN}${path}`, { method: request.method, headers: upstreamHeaders(refreshed, { accept, "content-type": contentType, ...extraHeaders }), body });
+    upstream = await upstreamFetch(`${COPILOT_API_ORIGIN}${path}`, { method: request.method, headers: upstreamHeaders(refreshed, { accept, "content-type": contentType, ...extraHeaders }), body });
   }
   if (path === "/models") {
     return new Response(upstream.body, { status: upstream.status, headers: copyResponseHeaders(upstream) });

package/src/http-utils.js

@@ -0,0 +1,9 @@
+export async function readJsonSafely(response) {
+  const text = await response.text();
+  if (!text) return {};
+  try {
+    return JSON.parse(text);
+  } catch {
+    return { raw: text };
+  }
+}

package/src/model-selection.js

@@ -1,30 +1,15 @@
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 import { proxyModels } from "./copilot.js";
+import { readJsonSafely } from "./http-utils.js";
+import { modelsForRoute } from "./model-utils.js";
+import { parseNumberChoice } from "./prompt-utils.js";
 
 const MAX_LISTED_MODELS = 20;
 const GPT_VERSION_RE = /^gpt-(\d+)(?:\.(\d+))?/i;
 const STABLE_GPT_RE = /^gpt-\d+(?:\.\d+)?$/i;
 
-async function readJson(response) {
-  const text = await response.text();
-  if (!text) return {};
-  try {
-    return JSON.parse(text);
-  } catch {
-    return { raw: text };
-  }
-}
-
-function modelRoutes(model) {
-  return Array.isArray(model?.aerial?.routes) ? model.aerial.routes : [];
-}
-
-export function modelsForRoute(models, route) {
-  return models
-    .filter((model) => typeof model?.id === "string" && modelRoutes(model).includes(route))
-    .map((model) => ({ id: model.id, routes: modelRoutes(model), notes: model.aerial?.notes || [] }));
-}
+export { modelsForRoute } from "./model-utils.js";
 
 function gptVersionScore(id) {
   const match = GPT_VERSION_RE.exec(id);
@@ -63,7 +48,7 @@ export function orderForPrompt(ranked, recommended) {
 
 export async function discoverModelsForRoute(route) {
   const response = await proxyModels(new Request("http://aerial.local/v1/models", { method: "GET" }));
-  const payload = await readJson(response);
+  const payload = await readJsonSafely(response);
   if (!response.ok) {
     const detail = payload.error || payload.raw || JSON.stringify(payload);
     throw new Error(`Could not load Copilot models (${response.status}): ${detail}`);
@@ -72,14 +57,6 @@ export async function discoverModelsForRoute(route) {
   return modelsForRoute(models, route);
 }
 
-function parseChoice(value, max) {
-  const trimmed = String(value || "").trim();
-  if (!trimmed) return 1;
-  if (!/^\d+$/.test(trimmed)) return undefined;
-  const n = Number(trimmed);
-  return n >= 1 && n <= max ? n : undefined;
-}
-
 export async function chooseSetupModel({ target, route, explicitModel, prompt = input.isTTY }) {
   if (explicitModel) return { model: explicitModel, choices: [], source: "explicit" };
   let raw;
@@ -109,7 +86,7 @@ export async function chooseSetupModel({ target, route, explicitModel, prompt =
     if (choices.length > MAX_LISTED_MODELS) output.write(`  ... ${choices.length - MAX_LISTED_MODELS} more\n`);
     while (true) {
       const answer = await rl.question(`Choose ${target} model [1-${promptListed.length}, default 1 = ${recommended}]: `);
-      const selected = parseChoice(answer, promptListed.length);
+      const selected = parseNumberChoice(answer, { max: promptListed.length, defaultIndex: 1, oneBased: true });
       if (selected) return { model: promptListed[selected - 1].id, choices, source: "prompt", displayed: true, recommended };
       output.write(`Enter a number from 1 to ${promptListed.length}, or press Enter for 1.\n`);
     }
@@ -131,9 +108,7 @@ export function formatModelChoices({ target, route, choices, selectedModel, sour
     lines.push(`  ${index + 1}. ${choice.id}${suffix}`);
   }
   if (choices.length > MAX_LISTED_MODELS) lines.push(`  ... ${choices.length - MAX_LISTED_MODELS} more`);
-  if (source === "first_available") {
-    lines.push(`No interactive terminal detected; selected ${selectedModel}. Pass --model <id> to choose a different model.`);
-  } else if (source === "recommended_stable") {
+  if (source === "first_available" || source === "recommended_stable") {
     lines.push(`No interactive terminal detected; selected ${selectedModel}. Pass --model <id> to choose a different model.`);
   } else if (source === "recommended_fallback") {
     lines.push(`No stable gpt-N.M model available; selected ${selectedModel}. Pass --model <id> to override.`);

package/src/model-utils.js

@@ -0,0 +1,20 @@
+export function aerialRoutes(model) {
+  return Array.isArray(model?.aerial?.routes) ? model.aerial.routes : [];
+}
+
+export function modelsForRoute(models, route) {
+  return models
+    .filter((model) => typeof model?.id === "string" && aerialRoutes(model).includes(route))
+    .map((model) => ({ id: model.id, routes: aerialRoutes(model), notes: model.aerial?.notes || [] }));
+}
+
+export function usageSummary(payload) {
+  const usage = payload?.usage || payload?.response?.usage || {};
+  return {
+    input: usage.input_tokens ?? usage.prompt_tokens,
+    output: usage.output_tokens ?? usage.completion_tokens,
+    cached: usage.input_tokens_details?.cached_tokens
+      ?? usage.prompt_tokens_details?.cached_tokens
+      ?? usage.cache_read_input_tokens
+  };
+}

package/src/probe.js

@@ -1,46 +1,29 @@
 import { proxyChatCompletions, proxyMessages, proxyModels, proxyResponses } from "./copilot.js";
+import { readJsonSafely } from "./http-utils.js";
+import { aerialRoutes, usageSummary } from "./model-utils.js";
 
 function modelRoutes(model) {
-  return model.aerial?.routes || [];
+  return aerialRoutes(model);
 }
 
 function firstModel(models, route) {
   return models.find((model) => modelRoutes(model).includes(route));
 }
 
-async function readJson(response) {
-  const text = await response.text();
-  if (!text) return {};
-  try {
-    return JSON.parse(text);
-  } catch {
-    return { raw: text };
-  }
-}
-
-function tokenSummary(payload) {
-  const usage = payload.usage || {};
-  return {
-    input: usage.input_tokens ?? usage.prompt_tokens,
-    output: usage.output_tokens ?? usage.completion_tokens,
-    cached: usage.input_tokens_details?.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? usage.cache_read_input_tokens
-  };
-}
-
 async function probeRoute(name, model, handler, payload, headers = {}) {
   const response = await handler(new Request(`http://aerial.local/probe/${name}`, {
     method: "POST",
     headers: { "content-type": "application/json", ...headers },
     body: JSON.stringify(payload)
   }));
-  const body = await readJson(response);
+  const body = await readJsonSafely(response);
   return {
     route: name,
     model: model.id,
     ok: response.ok,
     status: response.status,
     contentType: response.headers.get("content-type") || undefined,
-    usage: response.ok ? tokenSummary(body) : undefined,
+    usage: response.ok ? usageSummary(body) : undefined,
     error: response.ok ? undefined : body.error || body
   };
 }
@@ -52,7 +35,7 @@ function summarizeModels(models) {
     if (routes.includes("responses")) summary.responses += 1;
     if (routes.includes("messages")) summary.messages += 1;
     if (routes.includes("chat")) summary.chat += 1;
-    if (modelRoutes(model).includes("responses_websocket")) summary.websocketResponses += 1;
+    if (routes.includes("responses_websocket")) summary.websocketResponses += 1;
     if (model.aerial?.notes?.includes("embeddings_not_implemented")) summary.embeddings += 1;
     if (!model.aerial?.supported) summary.unsupported += 1;
   }
@@ -61,7 +44,7 @@ function summarizeModels(models) {
 
 export async function runProbe({ live = false } = {}) {
   const modelsResponse = await proxyModels(new Request("http://aerial.local/v1/models", { method: "GET" }));
-  const modelsPayload = await readJson(modelsResponse);
+  const modelsPayload = await readJsonSafely(modelsResponse);
   if (!modelsResponse.ok) {
     return { ok: false, generatedAt: new Date().toISOString(), error: modelsPayload.error || modelsPayload };
   }

package/src/prompt-utils.js

@@ -0,0 +1,8 @@
+export function parseNumberChoice(value, { max, defaultIndex = 0, oneBased = false } = {}) {
+  const trimmed = String(value || "").trim();
+  if (!trimmed) return defaultIndex;
+  if (!/^\d+$/.test(trimmed)) return undefined;
+  const n = Number(trimmed);
+  if (n < 1 || n > max) return undefined;
+  return oneBased ? n : n - 1;
+}

package/src/proxy-config.js

@@ -0,0 +1,51 @@
+export const PROXY_MODE_DISABLED = "disabled";
+export const PROXY_MODE_AUTO = "auto";
+
+export function normalizeProxyMode(value) {
+  return value === PROXY_MODE_AUTO ? PROXY_MODE_AUTO : PROXY_MODE_DISABLED;
+}
+
+export function normalizeProxyEndpoint(value) {
+  if (typeof value !== "string" || !value.trim()) return undefined;
+  let url;
+  try {
+    url = new URL(value.trim());
+  } catch {
+    return undefined;
+  }
+  const protocol = url.protocol === "socks:" || url.protocol === "socks5h:" ? "socks5:" : url.protocol;
+  if (!["http:", "https:", "socks5:"].includes(protocol)) return undefined;
+  if (!url.hostname) return undefined;
+  const pathPart = `${url.pathname || "/"}${url.search || ""}${url.hash || ""}`;
+  if (pathPart !== "/") return undefined;
+  const auth = url.username ? `${url.username}${url.password ? `:${url.password}` : ""}@` : "";
+  return `${protocol}//${auth}${url.host}`;
+}
+
+export function isSocksProxyEndpoint(value) {
+  const endpoint = normalizeProxyEndpoint(value);
+  return Boolean(endpoint?.startsWith("socks5://"));
+}
+
+export function redactProxyEndpoint(value) {
+  const normalized = normalizeProxyEndpoint(value);
+  const text = normalized || (typeof value === "string" ? value : undefined);
+  if (!text) return undefined;
+  try {
+    const url = new URL(text);
+    if (!url.username && !url.password) return normalized || text;
+    const protocol = url.protocol === "socks:" || url.protocol === "socks5h:" ? "socks5:" : url.protocol;
+    if (normalized) return `${protocol}//redacted@${url.host}`;
+    url.protocol = protocol;
+    url.username = "redacted";
+    url.password = "";
+    return url.toString();
+  } catch {
+    return text;
+  }
+}
+
+export function redactProxySource(value) {
+  if (typeof value !== "string") return value;
+  return value.replace(/\b(?:https?|socks5h?|socks):\/\/[^\s),]+/g, (url) => redactProxyEndpoint(url) || url);
+}

package/src/responses-websocket.js

@@ -1,5 +1,6 @@
 import { WebSocket } from "undici";
 import { COPILOT_API_ORIGIN } from "./constants.js";
+import { upstreamDispatcher } from "./upstream-fetch.js";
 
 const TERMINAL_RESPONSE_TYPES = new Set([
   "response.completed",
@@ -45,9 +46,10 @@ function isTerminalMessage(message) {
   }
 }
 
-function openWebSocket(headers) {
+async function openWebSocket(headers) {
+  const dispatcher = await upstreamDispatcher();
   return new Promise((resolve, reject) => {
-    const ws = new WebSocket(websocketUrl(), { headers });
+    const ws = new WebSocket(websocketUrl(), dispatcher ? { headers, dispatcher } : { headers });
     const cleanup = () => {
       ws.removeEventListener("open", onOpen);
       ws.removeEventListener("error", onError);