@jiayunxie/aerial 0.1.3 → 0.1.4

package/README.md

@@ -91,7 +91,7 @@ Configure your local clients. This also creates Aerial's local API key and wires
 aerial setup all --model <available-copilot-model-id>
 ```
 
-On Windows, newly persisted user environment variables are visible to new terminals and newly launched apps. Restart your terminal or VS Code after the first setup if Codex was already open.
+If Codex or Claude Code was already open, restart it after setup so it rereads the updated client config.
 
 Log in to GitHub with device flow:
 
@@ -125,10 +125,15 @@ This updates `~/.codex/config.toml` and creates a timestamped backup first. If y
 [model_providers.aerial]
 base_url = "http://127.0.0.1:18181/v1"
 wire_api = "responses"
-env_key = "AERIAL_API_KEY"
+
+[model_providers.aerial.auth]
+command = "<node>"
+args = ["<aerial-cli.js>", "key", "print"]
+timeout_ms = 5000
+refresh_interval_ms = 0
 ```
 
-Aerial creates the key automatically and persists `AERIAL_API_KEY` for new user sessions when the platform supports it.
+Aerial creates and stores the local key automatically. Codex reads it through the configured helper command, so users do not need to run `aerial key generate`, copy a key, or export `AERIAL_API_KEY`.
 
 ## Claude Code Setup
 

package/docs/usage.md

@@ -26,7 +26,7 @@ node src/cli.js --help
 aerial setup all --model <model-id>
 ```
 
-Aerial creates a local API key, stores it privately, and configures supported clients to use it. On Windows, restart the terminal or VS Code after first setup so newly persisted user environment variables are visible to Codex.
+Aerial creates a local API key, stores it privately, and configures supported clients to use it. If Codex or Claude Code was already open, restart it after setup so it rereads the updated client config.
 
 ## 3. Login To GitHub
 
@@ -50,7 +50,21 @@ Default URL: `http://127.0.0.1:18181`.
 aerial setup codex --model <model-id>
 ```
 
-The setup command backs up and merges `~/.codex/config.toml`, then persists the local key for new user sessions when the platform supports it.
+The setup command backs up and merges `~/.codex/config.toml`, then configures Codex to fetch the local Aerial key through a command-backed provider auth helper:
+
+```toml
+[model_providers.aerial]
+base_url = "http://127.0.0.1:18181/v1"
+wire_api = "responses"
+
+[model_providers.aerial.auth]
+command = "<node>"
+args = ["<aerial-cli.js>", "key", "print"]
+timeout_ms = 5000
+refresh_interval_ms = 0
+```
+
+The local key is generated and stored by Aerial automatically. Users do not need to run `aerial key generate`, copy a key into `~/.codex/config.toml`, or export `AERIAL_API_KEY`.
 
 For a dry inspection without touching your real config, set `HOME`/`USERPROFILE` to a temporary directory before running this command.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiayunxie/aerial",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Local-only GitHub Copilot proxy for Codex CLI and Claude Code.",
   "type": "module",
   "private": false,

package/src/cli.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { fileURLToPath } from "node:url";
 import { startDeviceFlow, pollDeviceFlow } from "./auth.js";
 import { ensureApiKey, loadConfig, saveConfig } from "./config.js";
 import { startServer } from "./server.js";
@@ -8,6 +9,17 @@ import { doctor } from "./doctor.js";
 import { runProbe, formatProbeReport } from "./probe.js";
 import { printVersion } from "./version.js";
 
+const CLI_ENTRY = fileURLToPath(import.meta.url);
+
+function codexAuthCommand() {
+  return {
+    command: process.execPath,
+    args: [CLI_ENTRY, "key", "print"],
+    timeout_ms: 5000,
+    refresh_interval_ms: 0
+  };
+}
+
 function printHelp() {
   console.log(`Aerial local Copilot proxy
 
@@ -91,11 +103,10 @@ async function main() {
 
   if (command === "setup") {
     if (subcommand === "codex") {
-      const result = setupCodex({ model: argValue(rest, "--model") });
+      const result = setupCodex({ model: argValue(rest, "--model"), authCommand: codexAuthCommand() });
       console.log(`Updated Codex config: ${result.file}`);
       if (result.backup) console.log(`Backup: ${result.backup}`);
-      if (result.env?.persisted) console.log(`Configured ${result.env.name} for new user sessions.`);
-      else if (result.env?.reason) console.log(`Note: ${result.env.name} is available in this process, but was not persisted (${result.env.reason}).`);
+      console.log("Configured Codex to read the local Aerial key automatically.");
       return;
     }
     if (subcommand === "claude") {
@@ -107,11 +118,10 @@ async function main() {
     }
     if (subcommand === "all") {
       const model = argValue(rest, "--model");
-      const codex = setupCodex({ model });
+      const codex = setupCodex({ model, authCommand: codexAuthCommand() });
       const claude = setupClaude({ model });
       console.log(`Updated Codex config: ${codex.file}`);
-      if (codex.env?.persisted) console.log(`Configured ${codex.env.name} for new user sessions.`);
-      else if (codex.env?.reason) console.log(`Note: ${codex.env.name} is available in this process, but was not persisted (${codex.env.reason}).`);
+      console.log("Configured Codex to read the local Aerial key automatically.");
       console.log(`Updated Claude settings: ${claude.file}`);
       if (claude.model) console.log(`Configured Claude default model: ${claude.model}`);
       return;

package/src/setup.js

@@ -1,16 +1,20 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { spawnSync } from "node:child_process";
 import { parse as parseToml } from "smol-toml";
 import { ensureApiKey, loadConfig } from "./config.js";
 import { apiKeyPath, githubTokenPath } from "./paths.js";
 import { logEvent } from "./log.js";
 
-const AERIAL_ENV_KEY = "AERIAL_API_KEY";
 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"],
+  timeout_ms: 5000,
+  refresh_interval_ms: 0
+});
 
 function backupIfExists(file) {
   if (!fs.existsSync(file)) return undefined;
@@ -23,15 +27,21 @@ 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 setTomlString(content, key, value) {
-  const line = `${key} = "${value}"`;
+  const line = `${key} = ${tomlValue(value)}`;
   const re = new RegExp(`^${key}\\s*=.*$`, "m");
   return re.test(content) ? content.replace(re, line) : `${content.trimEnd()}\n${line}\n`;
 }
 
 function upsertTomlSection(content, section, values) {
   const heading = `[${section}]`;
-  const lines = Object.entries(values).map(([key, value]) => `${key} = "${value}"`).join("\n");
+  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);
@@ -47,25 +57,6 @@ function upsertTomlSection(content, section, values) {
   return `${source.join("\n").trimEnd()}\n`;
 }
 
-function persistUserEnv(name, value) {
-  process.env[name] = value;
-  if (process.env.AERIAL_SKIP_ENV_PERSIST === "1") return { persisted: false, reason: "skipped" };
-  if (process.platform === "win32") {
-    const escaped = String(value).replace(/'/g, "''");
-    const command = `[Environment]::SetEnvironmentVariable('${name}', '${escaped}', 'User')`;
-    const { status, error } = spawnSync("powershell.exe", ["-NoProfile", "-Command", command], { stdio: "ignore" });
-    if (status === 0) return { persisted: true, target: "user" };
-    return { persisted: false, reason: error?.message || `powershell exited ${status}` };
-  }
-  return { persisted: false, reason: "unsupported_platform" };
-}
-
-function ensureClientApiKeyEnv() {
-  const result = ensureApiKey();
-  if (!result.apiKey) return { ...result, env: { name: AERIAL_ENV_KEY, persisted: false, reason: "raw_key_unavailable" } };
-  return { ...result, env: { name: AERIAL_ENV_KEY, ...persistUserEnv(AERIAL_ENV_KEY, result.apiKey) } };
-}
-
 function claudeEnvForAerial(currentEnv, config) {
   const {
     ANTHROPIC_API_KEY,
@@ -82,8 +73,8 @@ function claudeEnvForAerial(currentEnv, config) {
   };
 }
 
-export function setupCodex({ model } = {}) {
-  const apiKey = ensureClientApiKeyEnv();
+export function setupCodex({ model, authCommand = DEFAULT_CODEX_AUTH } = {}) {
+  ensureApiKey();
   const config = loadConfig();
   const selectedModel = model || config.defaultModel || "gpt-4.1";
   const file = path.join(os.homedir(), ".codex", "config.toml");
@@ -95,13 +86,18 @@ export function setupCodex({ model } = {}) {
   content = upsertTomlSection(content, "model_providers.aerial", {
     name: "Aerial Copilot Local",
     base_url: `http://${config.host}:${config.port}/v1`,
-    wire_api: "responses",
-    env_key: AERIAL_ENV_KEY
+    wire_api: "responses"
+  });
+  content = upsertTomlSection(content, "model_providers.aerial.auth", {
+    command: authCommand.command,
+    args: authCommand.args || [],
+    timeout_ms: authCommand.timeout_ms || DEFAULT_CODEX_AUTH.timeout_ms,
+    refresh_interval_ms: authCommand.refresh_interval_ms ?? DEFAULT_CODEX_AUTH.refresh_interval_ms
   });
   content = upsertTomlSection(content, "profiles.aerial", { model_provider: "aerial", model: selectedModel });
   fs.writeFileSync(file, content, "utf8");
-  logEvent("setup_write", { target: "codex", file, backup, env: apiKey.env });
-  return { file, backup, model: selectedModel, env: apiKey.env };
+  logEvent("setup_write", { target: "codex", file, backup, auth: "command" });
+  return { file, backup, model: selectedModel, auth: { type: "command", command: authCommand.command, args: authCommand.args || [] } };
 }
 
 export function setupClaude({ model } = {}) {
@@ -161,9 +157,13 @@ function backupPathsFor(file) {
 function codexStateFromDoc(doc, expectedBaseUrl) {
   const providerSection = doc && typeof doc === "object" ? doc.model_providers?.aerial : undefined;
   const providerSet = doc?.model_provider === "aerial";
+  const authArgs = Array.isArray(providerSection?.auth?.args) ? providerSection.auth.args : [];
+  const authLooksAerial = typeof providerSection?.auth?.command === "string"
+    && providerSection.auth.command.trim()
+    && authArgs.slice(-2).join(" ") === "key print";
   const providerShapeComplete = providerSection
     && providerSection.wire_api === "responses"
-    && providerSection.env_key === AERIAL_ENV_KEY
+    && (authLooksAerial || providerSection.env_key === "AERIAL_API_KEY")
     && typeof providerSection.base_url === "string";
   const providerBaseMatches = providerSection?.base_url === expectedBaseUrl;
   if (!providerSection && !providerSet) return "not-aerial";