@jiayunxie/aerial 0.2.1 → 0.2.2

package/src/{setup.js → setup/clients.js}

@@ -2,15 +2,13 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { parse as parseToml } from "smol-toml";
-import { ensureApiKey, loadConfig, saveConfig } from "./config.js";
-import { apiKeyPath, githubTokenPath } from "./paths.js";
-import { gitHubTokenSource } from "./auth.js";
-import { logEvent } from "./log.js";
-import { assertValidEffort, normalizeEffort } from "./setup-selection.js";
+import { ensureApiKey, loadConfig, saveConfig } from "../shared/config.js";
+import { logEvent } from "../shared/log.js";
+import { atomicWriteFile } from "../shared/file-utils.js";
+import { assertValidEffort, normalizeEffort } from "../shared/effort.js";
+import { backupIfExists, backupPathsFor } from "./backup.js";
+import { setTomlRootString, upsertTomlSection } from "./toml.js";
 
-const BACKUP_PREFIX = ".aerial-backup-";
-const PRE_RESTORE_PREFIX = ".aerial-pre-restore-";
-const ISO_STAMP_RE = /^\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z$/;
 const DEFAULT_CODEX_AUTH = Object.freeze({
   command: "aerial",
   args: ["key", "print"],
@@ -19,59 +17,10 @@ const DEFAULT_CODEX_AUTH = Object.freeze({
 });
 const DEFAULT_CLAUDE_API_KEY_HELPER = "aerial key print";
 
-function backupIfExists(file) {
-  if (!fs.existsSync(file)) return undefined;
-  const backup = `${file}.aerial-backup-${new Date().toISOString().replace(/[:.]/g, "-")}`;
-  fs.copyFileSync(file, backup);
-  return backup;
-}
-
 function ensureParent(file) {
   fs.mkdirSync(path.dirname(file), { recursive: true });
 }
 
-function tomlValue(value) {
-  if (Array.isArray(value)) return `[${value.map(tomlValue).join(", ")}]`;
-  if (typeof value === "number" || typeof value === "boolean") return String(value);
-  return JSON.stringify(String(value));
-}
-
-function escapeRegExp(value) {
-  return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function setTomlRootString(content, key, value) {
-  const line = `${key} = ${tomlValue(value)}`;
-  const source = content.split(/\r?\n/);
-  const firstSection = source.findIndex((sourceLine) => /^\s*\[.*\]\s*(?:#.*)?$/.test(sourceLine));
-  const rootLines = firstSection === -1 ? source : source.slice(0, firstSection);
-  const restLines = firstSection === -1 ? [] : source.slice(firstSection);
-  const root = rootLines.join("\n");
-  const rest = restLines.join("\n");
-  const re = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=.*$`, "m");
-  const nextRoot = re.test(root) ? root.replace(re, line) : `${root.trimEnd()}${root.trimEnd() ? "\n" : ""}${line}`;
-  if (!rest) return `${nextRoot.trimEnd()}\n`;
-  return `${nextRoot.trimEnd()}\n${rest}`;
-}
-
-function upsertTomlSection(content, section, values) {
-  const heading = `[${section}]`;
-  const lines = Object.entries(values).map(([key, value]) => `${key} = ${tomlValue(value)}`).join("\n");
-  const block = `${heading}\n${lines}\n`;
-  const source = content.split(/\r?\n/);
-  const start = source.findIndex((line) => line.trim() === heading);
-  if (start === -1) return `${content.trimEnd()}\n\n${block}`;
-  let end = source.length;
-  for (let i = start + 1; i < source.length; i += 1) {
-    if (/^\s*\[.*\]\s*$/.test(source[i])) {
-      end = i;
-      break;
-    }
-  }
-  source.splice(start, end - start, ...block.trimEnd().split("\n"));
-  return `${source.join("\n").trimEnd()}\n`;
-}
-
 function claudeEnvForAerial(currentEnv, config) {
   const {
     ANTHROPIC_API_KEY,
@@ -96,7 +45,7 @@ export function setupCodex({ model, effort, authCommand = DEFAULT_CODEX_AUTH } =
   if (!selectedModel) {
     throw new Error("setupCodex requires a model id; pass --model or let `aerial setup codex` select one from live Copilot models.");
   }
-  const file = path.join(os.homedir(), ".codex", "config.toml");
+  const file = codexConfigFile();
   ensureParent(file);
   const backup = backupIfExists(file);
   let content = fs.existsSync(file) ? fs.readFileSync(file, "utf8") : "";
@@ -116,7 +65,7 @@ export function setupCodex({ model, effort, authCommand = DEFAULT_CODEX_AUTH } =
   const profileValues = { model_provider: "aerial", model: selectedModel };
   if (normalizedEffort) profileValues.model_reasoning_effort = normalizedEffort;
   content = upsertTomlSection(content, "profiles.aerial", profileValues);
-  fs.writeFileSync(file, content, "utf8");
+  atomicWriteFile(file, content);
   if (normalizedEffort && config.defaultEffort !== normalizedEffort) {
     saveConfig({ ...config, defaultEffort: normalizedEffort });
   }
@@ -129,8 +78,7 @@ export function setupClaude({ model, effort, apiKeyHelper = DEFAULT_CLAUDE_API_K
   ensureApiKey();
   const config = loadConfig();
   const selectedModel = model || config.defaultModel;
-  const dir = path.join(os.homedir(), ".claude");
-  const file = path.join(dir, "settings.json");
+  const file = claudeSettingsFile();
   ensureParent(file);
   const backup = backupIfExists(file);
   const current = fs.existsSync(file) ? JSON.parse(fs.readFileSync(file, "utf8")) : {};
@@ -140,7 +88,7 @@ export function setupClaude({ model, effort, apiKeyHelper = DEFAULT_CLAUDE_API_K
     env: claudeEnvForAerial(current.env, config)
   };
   if (selectedModel) next.model = selectedModel;
-  fs.writeFileSync(file, `${JSON.stringify(next, null, 2)}\n`, "utf8");
+  atomicWriteFile(file, `${JSON.stringify(next, null, 2)}\n`);
   if (normalizedEffort && config.defaultEffort !== normalizedEffort) {
     saveConfig({ ...config, defaultEffort: normalizedEffort });
   }
@@ -156,32 +104,6 @@ function claudeSettingsFile() {
   return path.join(os.homedir(), ".claude", "settings.json");
 }
 
-function listBackups(file) {
-  const dir = path.dirname(file);
-  const base = path.basename(file);
-  if (!fs.existsSync(dir)) return [];
-  const prefix = `${base}${BACKUP_PREFIX}`;
-  const entries = fs.readdirSync(dir);
-  const matches = [];
-  for (const entry of entries) {
-    if (!entry.startsWith(prefix)) continue;
-    const stamp = entry.slice(prefix.length);
-    if (!ISO_STAMP_RE.test(stamp)) continue;
-    matches.push({ name: entry, path: path.join(dir, entry), stamp });
-  }
-  matches.sort((a, b) => (a.stamp < b.stamp ? -1 : a.stamp > b.stamp ? 1 : 0));
-  return matches;
-}
-
-export function findLatestBackup(file) {
-  const all = listBackups(file);
-  return all.length ? all[all.length - 1] : undefined;
-}
-
-function backupPathsFor(file) {
-  return listBackups(file).map((entry) => entry.path);
-}
-
 function codexStateFromDoc(doc, expectedBaseUrl) {
   const providerSection = doc && typeof doc === "object" ? doc.model_providers?.aerial : undefined;
   const providerSet = doc?.model_provider === "aerial";
@@ -275,7 +197,7 @@ function validateJsonBackup(content) {
   }
 }
 
-const CLIENTS = Object.freeze({
+export const CLIENTS = Object.freeze({
   codex: Object.freeze({
     target: "codex",
     file: codexConfigFile,
@@ -289,112 +211,3 @@ const CLIENTS = Object.freeze({
     validateBackup: validateJsonBackup
   })
 });
-
-function clientDescriptor(target) {
-  const descriptor = CLIENTS[target];
-  if (!descriptor) throw new Error(`Unknown restore target: ${target}. Use codex, claude, or all.`);
-  return descriptor;
-}
-
-export function setupStatus() {
-  const config = loadConfig();
-  const apiKeyFile = apiKeyPath();
-  const githubTokenFile = githubTokenPath();
-  return {
-    schema: "aerial.setup-status.v1",
-    platform: process.platform,
-    config: { host: config.host, port: config.port },
-    auth: {
-      api_key: { file: apiKeyFile, exists: fs.existsSync(apiKeyFile) },
-      github_token: (() => {
-        const source = gitHubTokenSource();
-        return { file: githubTokenFile, exists: source !== "missing", source };
-      })()
-    },
-    clients: Object.fromEntries(Object.entries(CLIENTS).map(([target, client]) => [target, client.status()]))
-  };
-}
-
-function clientFile(target) {
-  return clientDescriptor(target).file();
-}
-
-function resolveWritePath(file) {
-  if (!fs.existsSync(file)) return file;
-  try {
-    return fs.realpathSync(file);
-  } catch {
-    return file;
-  }
-}
-
-function validateBackupContent(target, content) {
-  clientDescriptor(target).validateBackup(content);
-}
-
-function resolveRestoreMode(writePath, backupPath, targetExisted) {
-  if (process.platform === "win32") return undefined;
-  let preserved;
-  if (targetExisted) {
-    try { preserved = fs.statSync(writePath).mode & 0o777; } catch { preserved = undefined; }
-  }
-  if (preserved === undefined) {
-    try { preserved = fs.statSync(backupPath).mode & 0o777; } catch { preserved = 0o600; }
-  }
-  return preserved & 0o600;
-}
-
-export function restoreClient(target, { now = () => new Date() } = {}) {
-  const file = clientFile(target);
-  const writePath = resolveWritePath(file);
-  const latest = findLatestBackup(file);
-  if (!latest) {
-    return { target, ok: true, restored: false, reason: "no_backup", file };
-  }
-  let backupContent;
-  try {
-    backupContent = fs.readFileSync(latest.path);
-  } catch (err) {
-    throw new Error(`Restore failed: cannot read backup ${latest.path}: ${err.message}`);
-  }
-  validateBackupContent(target, backupContent);
-  const targetExisted = fs.existsSync(writePath);
-  const mode = resolveRestoreMode(writePath, latest.path, targetExisted);
-  let snapshot;
-  if (targetExisted) {
-    const stamp = now().toISOString().replace(/[:.]/g, "-");
-    snapshot = `${writePath}${PRE_RESTORE_PREFIX}${stamp}`;
-    fs.copyFileSync(writePath, snapshot);
-  }
-  ensureParent(writePath);
-  const tmp = `${writePath}.aerial-restore-tmp-${process.pid}-${Math.random().toString(36).slice(2)}`;
-  const writeOpts = mode !== undefined ? { mode } : undefined;
-  fs.writeFileSync(tmp, backupContent, writeOpts);
-  try {
-    fs.renameSync(tmp, writePath);
-  } catch (err) {
-    try { fs.unlinkSync(tmp); } catch {}
-    if (err.code === "EXDEV") {
-      throw new Error(`Restore failed: backup and target on different filesystems (EXDEV). File: ${writePath}. Move the backup next to the target and retry.`);
-    }
-    throw err;
-  }
-  if (mode !== undefined) {
-    try { fs.chmodSync(writePath, mode); } catch {}
-  }
-  logEvent("setup_restore", { target, file: writePath, from: latest.path, snapshot, mode });
-  return { target, ok: true, restored: true, file: writePath, from: latest.path, snapshot, mode };
-}
-
-export function restoreAllClients(opts) {
-  const results = {};
-  for (const target of Object.keys(CLIENTS)) {
-    try {
-      results[target] = restoreClient(target, opts);
-    } catch (err) {
-      results[target] = { target, ok: false, error: err.message };
-    }
-  }
-  const ok = Object.values(results).every((r) => r.ok);
-  return { ok, results };
-}

package/src/setup/index.js

@@ -0,0 +1,4 @@
+export { findLatestBackup } from "./backup.js";
+export { setupCodex, setupClaude, codexStatus, claudeStatus } from "./clients.js";
+export { setupStatus } from "./status.js";
+export { restoreClient, restoreAllClients } from "./restore.js";

package/src/setup/restore.js

@@ -0,0 +1,90 @@
+import fs from "node:fs";
+import { logEvent } from "../shared/log.js";
+import { atomicWriteFile } from "../shared/file-utils.js";
+import { findLatestBackup } from "./backup.js";
+import { CLIENTS } from "./clients.js";
+
+const PRE_RESTORE_PREFIX = ".aerial-pre-restore-";
+
+function clientDescriptor(target) {
+  const descriptor = CLIENTS[target];
+  if (!descriptor) throw new Error(`Unknown restore target: ${target}. Use codex, claude, or all.`);
+  return descriptor;
+}
+
+function clientFile(target) {
+  return clientDescriptor(target).file();
+}
+
+function resolveWritePath(file) {
+  if (!fs.existsSync(file)) return file;
+  try {
+    return fs.realpathSync(file);
+  } catch {
+    return file;
+  }
+}
+
+function validateBackupContent(target, content) {
+  clientDescriptor(target).validateBackup(content);
+}
+
+function resolveRestoreMode(writePath, backupPath, targetExisted) {
+  if (process.platform === "win32") return undefined;
+  let preserved;
+  if (targetExisted) {
+    try { preserved = fs.statSync(writePath).mode & 0o777; } catch { preserved = undefined; }
+  }
+  if (preserved === undefined) {
+    try { preserved = fs.statSync(backupPath).mode & 0o777; } catch { preserved = 0o600; }
+  }
+  return preserved & 0o600;
+}
+
+export function restoreClient(target, { now = () => new Date() } = {}) {
+  const file = clientFile(target);
+  const writePath = resolveWritePath(file);
+  const latest = findLatestBackup(file);
+  if (!latest) {
+    return { target, ok: true, restored: false, reason: "no_backup", file };
+  }
+  let backupContent;
+  try {
+    backupContent = fs.readFileSync(latest.path);
+  } catch (err) {
+    throw new Error(`Restore failed: cannot read backup ${latest.path}: ${err.message}`);
+  }
+  validateBackupContent(target, backupContent);
+  const targetExisted = fs.existsSync(writePath);
+  const mode = resolveRestoreMode(writePath, latest.path, targetExisted);
+  let snapshot;
+  if (targetExisted) {
+    const stamp = now().toISOString().replace(/[:.]/g, "-");
+    snapshot = `${writePath}${PRE_RESTORE_PREFIX}${stamp}`;
+    fs.copyFileSync(writePath, snapshot);
+  }
+  const writeOpts = mode !== undefined ? { mode } : undefined;
+  try {
+    atomicWriteFile(writePath, backupContent, writeOpts);
+  } catch (err) {
+    if (err.code === "EXDEV") {
+      throw new Error(`Restore failed: backup and target on different filesystems (EXDEV). File: ${writePath}. Move the backup next to the target and retry.`);
+    }
+    throw err;
+  }
+  logEvent("setup_restore", { target, file: writePath, from: latest.path, snapshot, mode });
+  return { target, ok: true, restored: true, file: writePath, from: latest.path, snapshot, mode };
+}
+
+export function restoreAllClients(opts) {
+  const results = {};
+  for (const target of Object.keys(CLIENTS)) {
+    try {
+      results[target] = restoreClient(target, opts);
+    } catch (err) {
+      results[target] = { target, ok: false, error: err.message };
+    }
+  }
+  const ok = Object.values(results).every((r) => r.ok);
+  return { ok, results };
+}

package/src/setup/status.js

@@ -0,0 +1,24 @@
+import fs from "node:fs";
+import { loadConfig } from "../shared/config.js";
+import { apiKeyPath, githubTokenPath } from "../shared/paths.js";
+import { gitHubTokenSource } from "../shared/auth.js";
+import { CLIENTS } from "./clients.js";
+
+export function setupStatus() {
+  const config = loadConfig();
+  const apiKeyFile = apiKeyPath();
+  const githubTokenFile = githubTokenPath();
+  return {
+    schema: "aerial.setup-status.v1",
+    platform: process.platform,
+    config: { host: config.host, port: config.port },
+    auth: {
+      api_key: { file: apiKeyFile, exists: fs.existsSync(apiKeyFile) },
+      github_token: (() => {
+        const source = gitHubTokenSource();
+        return { file: githubTokenFile, exists: source !== "missing", source };
+      })()
+    },
+    clients: Object.fromEntries(Object.entries(CLIENTS).map(([target, client]) => [target, client.status()]))
+  };
+}

package/src/setup/toml.js

@@ -0,0 +1,41 @@
+function tomlValue(value) {
+  if (Array.isArray(value)) return `[${value.map(tomlValue).join(", ")}]`;
+  if (typeof value === "number" || typeof value === "boolean") return String(value);
+  return JSON.stringify(String(value));
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+export function setTomlRootString(content, key, value) {
+  const line = `${key} = ${tomlValue(value)}`;
+  const source = content.split(/\r?\n/);
+  const firstSection = source.findIndex((sourceLine) => /^\s*\[.*\]\s*(?:#.*)?$/.test(sourceLine));
+  const rootLines = firstSection === -1 ? source : source.slice(0, firstSection);
+  const restLines = firstSection === -1 ? [] : source.slice(firstSection);
+  const root = rootLines.join("\n");
+  const rest = restLines.join("\n");
+  const re = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=.*$`, "m");
+  const nextRoot = re.test(root) ? root.replace(re, line) : `${root.trimEnd()}${root.trimEnd() ? "\n" : ""}${line}`;
+  if (!rest) return `${nextRoot.trimEnd()}\n`;
+  return `${nextRoot.trimEnd()}\n${rest}`;
+}
+
+export function upsertTomlSection(content, section, values) {
+  const heading = `[${section}]`;
+  const lines = Object.entries(values).map(([key, value]) => `${key} = ${tomlValue(value)}`).join("\n");
+  const block = `${heading}\n${lines}\n`;
+  const source = content.split(/\r?\n/);
+  const start = source.findIndex((line) => line.trim() === heading);
+  if (start === -1) return `${content.trimEnd()}\n\n${block}`;
+  let end = source.length;
+  for (let i = start + 1; i < source.length; i += 1) {
+    if (/^\s*\[.*\]\s*$/.test(source[i])) {
+      end = i;
+      break;
+    }
+  }
+  source.splice(start, end - start, ...block.trimEnd().split("\n"));
+  return `${source.join("\n").trimEnd()}\n`;
+}

package/src/{auth.js → shared/auth.js}

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import { COPILOT_TOKEN_URL, GITHUB_CLIENT_ID } from "./constants.js";
 import { githubTokenPath, writePrivateFile } from "./paths.js";
 import { logEvent } from "./log.js";
-import { upstreamFetch } from "./upstream-fetch.js";
+import { upstreamFetch } from "../upstream/fetch.js";
 
 let cachedCopilotToken;
 let refreshPromise;

package/src/{config.js → shared/config.js}

@@ -2,8 +2,8 @@ import fs from "node:fs";
 import { CONFIG_VERSION, DEFAULT_HOST, DEFAULT_PORT, DEFAULT_VERSIONS } from "./constants.js";
 import { apiKeyPath, configPath, readJsonIfExists, writeJsonPrivate, writePrivateFile } from "./paths.js";
 import { hashApiKey, randomApiKey, verifyApiKey } from "./crypto.js";
-import { DEFAULT_EFFORT, normalizeEffort } from "./setup-selection.js";
-import { PROXY_MODE_AUTO, normalizeProxyEndpoint, normalizeProxyMode } from "./proxy-config.js";
+import { DEFAULT_EFFORT, normalizeEffort } from "./effort.js";
+import { PROXY_MODE_AUTO, normalizeProxyEndpoint, normalizeProxyMode } from "../upstream/proxy-config.js";
 
 export function defaultConfig() {
   return {

package/src/shared/effort.js

@@ -0,0 +1,19 @@
+export const EFFORT_VALUES = Object.freeze(["low", "medium", "high", "xhigh"]);
+export const DEFAULT_EFFORT = "medium";
+
+export function normalizeEffort(value) {
+  if (value === undefined || value === null) return undefined;
+  const trimmed = String(value).trim().toLowerCase();
+  if (!trimmed) return undefined;
+  if (trimmed === "max") return "xhigh";
+  if (EFFORT_VALUES.includes(trimmed)) return trimmed;
+  return undefined;
+}
+
+export function assertValidEffort(raw) {
+  const normalized = normalizeEffort(raw);
+  if (!normalized) {
+    throw new Error(`Invalid --effort ${JSON.stringify(raw)}. Allowed: ${EFFORT_VALUES.join(", ")} (or alias 'max' for xhigh).`);
+  }
+  return normalized;
+}

package/src/shared/file-utils.js

@@ -0,0 +1,31 @@
+import fs from "node:fs";
+import path from "node:path";
+
+function ensureParentDir(file) {
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+}
+
+export function atomicWriteFile(file, content, { mode } = {}) {
+  ensureParentDir(file);
+  const tmp = `${file}.aerial-tmp-${process.pid}-${Math.random().toString(36).slice(2)}`;
+  const opts = mode !== undefined ? { mode } : undefined;
+  try {
+    fs.writeFileSync(tmp, content, opts);
+    try {
+      fs.renameSync(tmp, file);
+    } catch (err) {
+      if (process.platform === "win32" && fs.existsSync(file) && (err.code === "EEXIST" || err.code === "EPERM")) {
+        fs.unlinkSync(file);
+        fs.renameSync(tmp, file);
+        return;
+      }
+      throw err;
+    }
+    if (process.platform !== "win32" && mode !== undefined) {
+      fs.chmodSync(file, mode);
+    }
+  } catch (err) {
+    try { fs.unlinkSync(tmp); } catch {}
+    throw err;
+  }
+}

package/src/{paths.js → shared/paths.js}

@@ -1,6 +1,7 @@
 import os from "node:os";
 import path from "node:path";
 import fs from "node:fs";
+import { atomicWriteFile } from "./file-utils.js";
 
 export function configDir() {
   if (process.env.AERIAL_CONFIG_DIR) return process.env.AERIAL_CONFIG_DIR;
@@ -30,9 +31,7 @@ export function ensureDir(dir = configDir()) {
 }
 
 export function writePrivateFile(file, content) {
-  ensureDir(path.dirname(file));
-  fs.writeFileSync(file, content, { mode: 0o600 });
-  if (process.platform !== "win32") fs.chmodSync(file, 0o600);
+  atomicWriteFile(file, content, { mode: 0o600 });
 }
 
 export function readJsonIfExists(file) {

package/src/{upstream-fetch.js → upstream/fetch.js}

@@ -1,6 +1,6 @@
 import { spawnSync } from "node:child_process";
 import { ProxyAgent } from "undici";
-import { loadConfig, saveConfig } from "./config.js";
+import { loadConfig, saveConfig } from "../shared/config.js";
 import { PROXY_MODE_AUTO, PROXY_MODE_DISABLED, isSocksProxyEndpoint, normalizeProxyEndpoint, normalizeProxyMode } from "./proxy-config.js";
 import { startSocks5Bridge, _closeSocks5BridgesForTests } from "./socks5-bridge.js";