@jiayunxie/aerial 0.2.3 → 0.2.5

package/docs/usage.md

@@ -105,7 +105,7 @@ If Claude Code was previously pointed at another Anthropic-compatible gateway, s
 
 For a dry inspection without touching your real config, set `HOME`/`USERPROFILE` to a temporary directory before running this command.
 
-To skip the prompts, pass `--model <messages-model-id>` and/or `--effort <low|medium|high|xhigh|max>`. Claude `settings.json` does not store an effort value; instead, `setup claude --effort <value>` updates Aerial-wide `defaultEffort` and the local proxy injects it into outgoing `/v1/messages` payloads. Precedence for the Anthropic effort applied to a Claude Opus 4.7 request, in order:
+To skip the prompts, pass `--model <messages-model-id>` and/or `--effort <low|medium|high|xhigh|max>`. `setup claude --effort <value>` writes Claude Code's native `"effortLevel": "<effort>"` setting into `settings.json` and also updates Aerial-wide `defaultEffort` as a proxy fallback. Precedence for the Anthropic effort applied to a Claude Opus 4.7 request, in order:
 
 1. An explicit `output_config.effort` in the request body is preserved verbatim.
 2. A legacy `thinking: { type: "enabled", budget_tokens }` is translated to `thinking: { type: "adaptive" }` with a derived `output_config.effort`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiayunxie/aerial",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Local GitHub Copilot proxy for Codex CLI and Claude Code with smart HTTP(S)/SOCKS5 upstream proxy support.",
   "type": "module",
   "private": false,

package/src/cli/{config-command.js → commands/config.js}

@@ -1,7 +1,7 @@
-import { defaultConfig, loadConfig, saveConfig } from "../shared/config.js";
-import { configPath } from "../shared/paths.js";
-import { assertValidEffort } from "../shared/effort.js";
-import { parseConfigHost, parseConfigPort } from "./args.js";
+import { defaultConfig, loadConfig, saveConfig } from "../../shared/config.js";
+import { configPath } from "../../shared/paths.js";
+import { assertValidEffort } from "../../shared/effort.js";
+import { parseConfigHost, parseConfigPort } from "../args.js";
 
 export function runConfigCli(subcommand, rest) {
   if (subcommand === "reset") {

package/src/cli/{disable-command.js → commands/disable.js}

@@ -1,7 +1,7 @@
-import { restoreAllClients } from "../setup/index.js";
-import { serviceUninstall } from "../service/index.js";
-import { printRestoreResults } from "./output.js";
-import { printServiceUninstallResult } from "./service-command.js";
+import { restoreAllClients } from "../../setup/index.js";
+import { serviceUninstall } from "../../service/index.js";
+import { printRestoreResults } from "../output.js";
+import { printServiceUninstallResult } from "./service.js";
 
 export function runDisableCli() {
   const { ok: restoreOk, results } = restoreAllClients();

package/src/cli/{key-command.js → commands/key.js}

@@ -1,4 +1,4 @@
-import { ensureApiKey } from "../shared/config.js";
+import { ensureApiKey } from "../../shared/config.js";
 
 export function runKeyCli(subcommand) {
   if (subcommand === "generate") {

package/src/cli/{login-command.js → commands/login.js}

@@ -1,4 +1,4 @@
-import { gitHubTokenSource, pollDeviceFlow, startDeviceFlow } from "../shared/auth.js";
+import { gitHubTokenSource, pollDeviceFlow, startDeviceFlow } from "../../shared/auth.js";
 
 export async function runLoginCli(args) {
   const force = args.includes("--force");

package/src/cli/{proxy-command.js → commands/proxy.js}

@@ -1,8 +1,8 @@
-import { loadConfig } from "../shared/config.js";
-import { disableUpstreamProxy, enableUpstreamProxy, probeEgress, upstreamProxyState } from "../upstream/fetch.js";
-import { redactProxyEndpoint, redactProxySource } from "../upstream/proxy-config.js";
-import { runProbe } from "./probe.js";
-import { formatEgress } from "./output.js";
+import { loadConfig } from "../../shared/config.js";
+import { disableUpstreamProxy, enableUpstreamProxy, probeEgress, upstreamProxyState } from "../../upstream/fetch.js";
+import { redactProxyEndpoint, redactProxySource } from "../../upstream/proxy-config.js";
+import { runProbe } from "../probe.js";
+import { formatEgress } from "../output.js";
 
 async function proxyRouteSummary() {
   try {

package/src/cli/{service-command.js → commands/service.js}

@@ -1,5 +1,5 @@
-import { serviceInstall, serviceRestart, serviceStart, serviceStatus, serviceStop, serviceUninstall } from "../service/index.js";
-import { printServiceDiagnostics, printServiceWarning } from "./output.js";
+import { serviceInstall, serviceRestart, serviceStart, serviceStatus, serviceStop, serviceUninstall } from "../../service/index.js";
+import { printServiceDiagnostics, printServiceWarning } from "../output.js";
 
 export function printServiceUninstallResult(r, { prefix = "Service uninstall" } = {}) {
   if (r.note === "no service installed") console.log(`${prefix}: no service installed`);

package/src/cli/{setup-command.js → commands/setup.js}

@@ -1,11 +1,11 @@
-import { loadConfig } from "../shared/config.js";
-import { configPath } from "../shared/paths.js";
-import { restoreAllClients, restoreClient, setupClaude, setupCodex, setupStatus } from "../setup/index.js";
-import { chooseSetupModel, formatModelChoices } from "./model-selection.js";
-import { assertValidEffort, chooseSetupEffort, formatEffortSelection } from "./setup-selection.js";
-import { requiredArgValue } from "./args.js";
-import { claudeApiKeyHelper, codexAuthCommand } from "./runtime-auth.js";
-import { printRestoreResults, printSetupCompletionSummary } from "./output.js";
+import { loadConfig } from "../../shared/config.js";
+import { configPath } from "../../shared/paths.js";
+import { restoreAllClients, restoreClient, setupClaude, setupCodex, setupStatus } from "../../setup/index.js";
+import { chooseSetupModel, formatModelChoices } from "../model-selection.js";
+import { assertValidEffort, chooseSetupEffort, formatEffortSelection } from "../setup-selection.js";
+import { requiredArgValue } from "../args.js";
+import { claudeApiKeyHelper, codexAuthCommand } from "../runtime-auth.js";
+import { printRestoreResults, printSetupCompletionSummary } from "../output.js";
 
 async function selectSetupOptions(target, route, args) {
   const explicitEffort = requiredArgValue(args, "--effort");
@@ -83,7 +83,7 @@ export async function runSetupCli(subcommand, rest) {
       aerialDefaultEffort: config.defaultEffort || "missing",
       backup: result.backup,
       auth: "apiKeyHelper local Aerial key",
-      notes: ["effort is applied via Aerial defaultEffort and proxy fallback; Claude settings.json does not store an effort value."]
+      notes: ["effort is written to Claude settings.json effortLevel and mirrored to Aerial defaultEffort for proxy fallback."]
     });
     return;
   }

package/src/cli/{start-command.js → commands/start.js}

@@ -1,6 +1,6 @@
-import { ensureApiKey, loadConfig } from "../shared/config.js";
-import { startServer } from "../proxy/server.js";
-import { argValue } from "./args.js";
+import { ensureApiKey, loadConfig } from "../../shared/config.js";
+import { startServer } from "../../proxy/server.js";
+import { argValue } from "../args.js";
 
 export function runStartCli(args) {
   const config = loadConfig();

package/src/cli/{status-command.js → commands/status.js}

@@ -1,7 +1,7 @@
-import { setupStatus } from "../setup/index.js";
-import { serviceStatus } from "../service/index.js";
-import { computeAppStatus } from "./app-status.js";
-import { printServiceSummary, printSetupSummary } from "./output.js";
+import { setupStatus } from "../../setup/index.js";
+import { serviceStatus } from "../../service/index.js";
+import { computeAppStatus } from "../app-status.js";
+import { printServiceSummary, printSetupSummary } from "../output.js";
 
 export async function appStatus({ json = false } = {}) {
   const setup = setupStatus();

package/src/cli/index.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import { printVersion } from "./version.js";
 import { printHelp } from "./help.js";
-import { appStatus } from "./status-command.js";
-import { runConfigCli } from "./config-command.js";
-import { runDisableCli } from "./disable-command.js";
-import { runKeyCli } from "./key-command.js";
-import { runLoginCli } from "./login-command.js";
-import { runProxyCli } from "./proxy-command.js";
-import { runServiceCli } from "./service-command.js";
-import { runSetupCli } from "./setup-command.js";
-import { runStartCli } from "./start-command.js";
+import { appStatus } from "./commands/status.js";
+import { runConfigCli } from "./commands/config.js";
+import { runDisableCli } from "./commands/disable.js";
+import { runKeyCli } from "./commands/key.js";
+import { runLoginCli } from "./commands/login.js";
+import { runProxyCli } from "./commands/proxy.js";
+import { runServiceCli } from "./commands/service.js";
+import { runSetupCli } from "./commands/setup.js";
+import { runStartCli } from "./commands/start.js";
 import { doctor, renderDoctorText } from "./doctor.js";
 import { formatProbeReport, runProbe } from "./probe.js";
 

package/src/proxy/cache-telemetry.js

@@ -2,6 +2,8 @@ import { logEvent } from "../shared/log.js";
 import { copyResponseHeaders } from "./headers.js";
 import { countCacheControlBlocks } from "./cache-policy.js";
 
+const SSE_FRAME_BOUNDARY = /\r?\n\r?\n/;
+
 export function parseJsonBody(body, contentType) {
   if (!body || !contentType.includes("json")) return undefined;
   try {
@@ -19,7 +21,7 @@ export function cacheRequestFields(payload) {
     hasPromptCacheKey: payload.prompt_cache_key !== undefined,
     cacheControlBlocks: countCacheControlBlocks(payload)
   };
-  return Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== undefined && value !== false && value !== 0));
+  return Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== undefined && value !== false));
 }
 
 function responseItems(payload) {
@@ -103,8 +105,7 @@ export function createSseCacheObserver(route, requestCache) {
 
   const consume = () => {
     let match;
-    const boundary = /\r?\n\r?\n/;
-    while ((match = boundary.exec(buffer)) !== null) {
+    while ((match = SSE_FRAME_BOUNDARY.exec(buffer)) !== null) {
       const frame = buffer.slice(0, match.index);
       buffer = buffer.slice(match.index + match[0].length);
       for (const payload of sseJsonPayloads(frame)) {

package/src/proxy/{effort.js → effort-routing.js}

@@ -1,17 +1,15 @@
 import { loadConfig } from "../shared/config.js";
 import { logEvent } from "../shared/log.js";
+import { EFFORT_VALUES, normalizeEffort } from "../shared/effort.js";
 import { canonicalClaudeFamily, findCompatibleModel as findCompatibleModelShared } from "./model-catalog.js";
 import { withDefaultAnthropicCache, withDefaultPromptCache } from "./cache-policy.js";
 
-function normalizeProxyEffort(effort) {
-  return effort === "max" ? "xhigh" : effort;
-}
-
 function openAIEffortRoute(model, effort) {
   if (effort === undefined) return undefined;
-  const normalized = normalizeProxyEffort(effort);
+  const normalized = normalizeEffort(effort);
+  if (!normalized) return undefined;
   if (/^gpt-5-mini(?:-|$)/.test(model) && normalized === "xhigh") return "high";
-  if (normalized !== effort) return normalized;
+  if (normalized !== String(effort).trim().toLowerCase()) return normalized;
   return undefined;
 }
 
@@ -47,8 +45,8 @@ function withSupportedAnthropicEffort(payload, models) {
   const model = typeof payload?.model === "string" ? payload.model : "";
   const family = canonicalClaudeFamily(model);
   if (!family) return payload;
-  const nextEffort = normalizeProxyEffort(effort);
-  if (!["low", "medium", "high", "xhigh"].includes(nextEffort)) return payload;
+  const nextEffort = normalizeEffort(effort);
+  if (!nextEffort || !EFFORT_VALUES.includes(nextEffort)) return payload;
   const routed = findCompatibleModelShared({
     models,
     family,

package/src/proxy/index.js

@@ -4,7 +4,7 @@ import { logEvent } from "../shared/log.js";
 import { isResponsesWebSocketOptIn, proxyResponsesWebSocket, shouldUseResponsesWebSocket } from "./responses-websocket.js";
 import { annotateModelsResponse } from "./models.js";
 import { upstreamHeaders } from "./headers.js";
-import { withAnthropicDefaults, withOpenAIDefaults } from "./effort.js";
+import { withAnthropicDefaults, withOpenAIDefaults } from "./effort-routing.js";
 import {
   cacheRequestFields,
   createSseCacheObserver,

package/src/proxy/models.js

@@ -1,3 +1,5 @@
+import { copyResponseHeaders } from "./headers.js";
+
 export function aerialSupportForModel(model) {
   const endpoints = Array.isArray(model.supported_endpoints) ? model.supported_endpoints : [];
   const routes = [];
@@ -19,9 +21,9 @@ export async function annotateModelsResponse(response) {
   const contentType = response.headers.get("content-type") || "";
   if (!response.ok || !contentType.includes("application/json")) return response;
   const payload = await response.json();
-  if (!Array.isArray(payload.data)) return Response.json(payload, { status: response.status, headers: response.headers });
+  if (!Array.isArray(payload.data)) return Response.json(payload, { status: response.status, headers: copyResponseHeaders(response) });
   return Response.json({
     ...payload,
     data: payload.data.map((model) => ({ ...model, aerial: aerialSupportForModel(model) }))
-  }, { status: response.status });
+  }, { status: response.status, headers: copyResponseHeaders(response) });
 }

package/src/proxy/responses-websocket.js

@@ -93,6 +93,7 @@ export async function proxyResponsesWebSocket(payload, headers, { initiator = "u
       };
       ws.addEventListener("message", async (event) => {
         const message = await normalizeMessageData(event.data);
+        if (!message) return;
         controller.enqueue(encoder.encode(toSseFrame(message)));
         if (isTerminalMessage(message)) {
           controller.close();

package/src/proxy/server.js

@@ -99,7 +99,7 @@ async function readBody(req, maxBytes = MAX_BODY_BYTES) {
 
 async function handle(fetchRequest, runtime = {}) {
   const url = new URL(fetchRequest.url);
-  const config = loadConfig();
+  const config = runtime.config || loadConfig();
   if (fetchRequest.method === "GET" && url.pathname === "/health") {
     return Response.json({ ok: true, service: "aerial", host: runtime.host || config.host, port: runtime.port || config.port });
   }
@@ -157,8 +157,9 @@ export function createServer(runtime = {}) {
     try {
       logEvent("request_start", { method: req.method, path: req.url });
       let localAuthValidated = false;
+      let config;
       if (!publicRoute(req)) {
-        const config = loadConfig();
+        config = loadConfig();
         if (!validateLocalAuth(nodeHeaderObject(req.headers), config)) {
           const fetchResponse = json(401, { error: { type: "authentication_error", message: "Invalid or missing Aerial API key" } });
           await writeNodeResponse(res, fetchResponse, controller.signal);
@@ -169,7 +170,7 @@ export function createServer(runtime = {}) {
       }
       const body = await readBody(req);
       const fetchRequest = nodeRequestToFetch(req, body, controller.signal);
-      const fetchResponse = await handle(fetchRequest, { ...runtime, localAuthValidated });
+      const fetchResponse = await handle(fetchRequest, { ...runtime, localAuthValidated, config });
       await writeNodeResponse(res, fetchResponse, controller.signal);
       logEvent("request_end", { method: req.method, path: req.url, status: fetchResponse.status, ms: Date.now() - started });
     } catch (error) {

package/src/setup/clients.js

@@ -88,6 +88,7 @@ export function setupClaude({ model, effort, apiKeyHelper = DEFAULT_CLAUDE_API_K
     env: claudeEnvForAerial(current.env, config)
   };
   if (selectedModel) next.model = selectedModel;
+  if (normalizedEffort) next.effortLevel = normalizedEffort;
   atomicWriteFile(file, `${JSON.stringify(next, null, 2)}\n`);
   if (normalizedEffort && config.defaultEffort !== normalizedEffort) {
     saveConfig({ ...config, defaultEffort: normalizedEffort });
@@ -167,17 +168,19 @@ export function claudeStatus() {
   const expectedBaseUrl = `http://${config.host}:${config.port}`;
   const file = claudeSettingsFile();
   const backups = backupPathsFor(file);
-  const effort = typeof config.defaultEffort === "string" && config.defaultEffort.trim() ? config.defaultEffort.trim() : "missing";
-  if (!fs.existsSync(file)) return { target: "claude", state: "missing", file, backups, effort };
+  const fallbackEffort = typeof config.defaultEffort === "string" && config.defaultEffort.trim() ? config.defaultEffort.trim() : "missing";
+  if (!fs.existsSync(file)) return { target: "claude", state: "missing", file, backups, effort: fallbackEffort };
   let doc;
   try {
     doc = JSON.parse(fs.readFileSync(file, "utf8"));
   } catch (err) {
-    return { target: "claude", state: "invalid", file, backups, error: err.message, effort };
+    return { target: "claude", state: "invalid", file, backups, error: err.message, effort: fallbackEffort };
   }
   const state = claudeStateFromDoc(doc, expectedBaseUrl);
   const model = typeof doc?.model === "string" ? doc.model : undefined;
   const baseUrl = doc?.env?.ANTHROPIC_BASE_URL;
+  const settingsEffort = typeof doc?.effortLevel === "string" ? normalizeEffort(doc.effortLevel) : undefined;
+  const effort = settingsEffort || fallbackEffort;
   return { target: "claude", state, file, backups, model, baseUrl, effort };
 }
 

package/src/shared/file-utils.js

@@ -22,7 +22,7 @@ export function atomicWriteFile(file, content, { mode } = {}) {
       throw err;
     }
     if (process.platform !== "win32" && mode !== undefined) {
-      fs.chmodSync(file, mode);
+      try { fs.chmodSync(file, mode); } catch {}
     }
   } catch (err) {
     try { fs.unlinkSync(tmp); } catch {}