@lunaroute/cli 0.2.5 → 0.2.7

package/README.md

@@ -15,18 +15,18 @@ Requires Node.js 20+.
 ## Quickstart
 
 ```sh
-lunaroute setup pi       # or: opencode | claude-code | copilot-cli | generic
+lunaroute setup pi       # or: opencode | claude-code | codex | copilot-cli | generic
 ```
 
 One command from a fresh machine: `setup` asks before touching anything — for `pi` it first offers to install the LunaRoute Pi extension (recommended — models then auto-sync, and you sign in with `/login lunaroute` inside pi), then offers to start pi for you. `opencode` works the same way with its extension (`/connect` to sign in). Decline an extension — or pick a harness whose config needs a key — and `setup` offers to run `lunaroute login` right there (it opens your browser) before writing. The fallback config finishes with an `export LUNAROUTE_API_KEY=…` line — run it in your shell, then start your agent and it routes through LunaRoute.
 
-Already have a key from the dashboard? `lunaroute setup pi --key lr_… --yes` is the whole onboarding: it checks the key against the catalog, installs the Pi extension, and stores the key in `~/.pi/agent/auth.json`, so pi starts signed in with models syncing from `/v1/models`. No models.json edit and no shell export. A stale `providers.lunaroute` block from an older CLI is removed in the same run (backup kept).
+Already have a key from the dashboard? `lunaroute setup pi --key lr_… --yes` is the whole onboarding: it checks the key against the catalog, installs the Pi extension, and stores the key in `~/.pi/agent/auth.json`, so pi starts signed in with models syncing from `/v1/models`. No models.json edit and no shell export. A stale `providers.lunaroute` block from an older CLI is removed in the same run (backup kept). `lunaroute setup opencode --key lr_… --yes` works the same way: it installs the OpenCode extension and stores the key in `~/.local/share/opencode/auth.json`, so opencode starts signed in — no `/connect` needed.
 
 Prefer a script? `setup pi --extension` / `--models` pick a flow, `--yes` accepts all prompts, and `--print` previews without writing.
 
 ## What it enables
 
-- **One-command setup** — `lunaroute setup` writes the right config for `pi`, `claude-code`, `opencode`, `copilot-cli`, or `generic` (any OpenAI-compatible base URL swap).
+- **One-command setup** — `lunaroute setup` writes the right config for `pi`, `claude-code`, `codex`, `opencode`, `copilot-cli`, or `generic` (any OpenAI-compatible base URL swap).
 - **Session launches** — `lunaroute run claude` or `lunaroute run codex` starts a session wired to LunaRoute; `--model` picks from the catalog, everything after `--` passes through to the harness.
 - **The catalog, in your terminal** — `models`, `pricing`, and `usage` show what's available, what it costs (credits per million tokens), and your wallet balance plus recent ledger entries.
 - **Project memory** — `memory search` and `memory read` query your past agent conversations for the current project. `lunaroute mcp` exposes the same tools as a stdio MCP server, and `skill install` wires the memory skill + MCP into Claude Code.
@@ -38,7 +38,7 @@ Prefer a script? `setup pi --extension` / `--models` pick a flow, `--yes` accept
 | `lunaroute login` | Authorize this device via the browser and store a routing key |
 | `lunaroute whoami` | Show the signed-in user and organization |
 | `lunaroute logout` | Remove stored credentials |
-| `lunaroute setup <harness>` | Configure `opencode` \| `pi` \| `openclaw` \| `claude-code` \| `copilot-cli` \| `generic`. pi setup is interactive (asks before writing); `--extension` / `--models` pick a flow, `--yes` accepts prompts, `--print` previews |
+| `lunaroute setup <harness>` | Configure `opencode` \| `pi` \| `openclaw` \| `claude-code` \| `codex` \| `copilot-cli` \| `generic`. pi setup is interactive (asks before writing); `--extension` / `--models` pick a flow, `--yes` accepts prompts, `--print` previews |
 | `lunaroute run <harness>` | Launch `claude` \| `claude-code` \| `codex` on LunaRoute for this session |
 | `lunaroute models` | List available LunaRoute models |
 | `lunaroute pricing` | Per-model pricing (credits per million tokens) |

package/dist/index.js

@@ -4,7 +4,7 @@
 import { Command, InvalidArgumentError, Option } from "commander";
 
 // package.json
-var version = "0.2.5";
+var version = "0.2.7";
 
 // src/login.ts
 import { createServer } from "http";
@@ -591,9 +591,17 @@ function configHome() {
 function opencodeConfigPath() {
   return join2(configHome(), "opencode", "opencode.json");
 }
+function opencodeAuthPath() {
+  const dataHome = process.env.XDG_DATA_HOME || join2(homedir2(), ".local", "share");
+  return join2(dataHome, "opencode", "auth.json");
+}
 function openclawConfigPath() {
   return join2(homedir2(), ".openclaw", "openclaw.json");
 }
+function codexProfilePath() {
+  const home = process.env.CODEX_HOME || join2(homedir2(), ".codex");
+  return join2(home, "lunaroute.config.toml");
+}
 function piModelsPath() {
   return join2(homedir2(), ".pi", "agent", "models.json");
 }
@@ -708,6 +716,25 @@ function providerPlan(ctx) {
     ]
   };
 }
+function buildKeyPlan(key) {
+  return {
+    fileWrites: [
+      {
+        kind: "json",
+        path: opencodeAuthPath(),
+        merge: (existing) => {
+          const obj = existing ?? {};
+          delete obj["lunaroute/"];
+          return { ...obj, lunaroute: { type: "api", key } };
+        }
+      }
+    ],
+    exports: [],
+    notes: [
+      "opencode: key stored in ~/.local/share/opencode/auth.json \u2014 start opencode (or restart it), then /models to pick a lunaroute/* model."
+    ]
+  };
+}
 
 // src/setup/adapters/pi.ts
 import { readFileSync as readFileSync3 } from "fs";
@@ -811,7 +838,7 @@ function buildStaleProviderCleanupPlan() {
   };
 }
 var KEY_EXPIRES_MS = 10 * 365 * 24 * 60 * 60 * 1e3;
-function buildKeyPlan(key) {
+function buildKeyPlan2(key) {
   return {
     fileWrites: [
       {
@@ -862,8 +889,57 @@ function buildPlan3(ctx) {
   };
 }
 
-// src/setup/adapters/copilotCli.ts
+// src/setup/routing-url.ts
+function validatedRoutingUrl(routingUrl) {
+  function fail2(reason) {
+    throw new Error(
+      `routingUrl rejected (reason: ${reason}; <redacted URL>) \u2014 check --routing-url or the profile's routing URL`
+    );
+  }
+  if (!/^https?:\/\/[^/?#]/.test(routingUrl)) fail2("invalid-url");
+  if (/[?#]/.test(routingUrl)) fail2("query-or-fragment");
+  if (routingUrl !== routingUrl.trim()) fail2("whitespace");
+  if (routingUrl.endsWith("/")) fail2("trailing-slash");
+  let parsed;
+  try {
+    parsed = new URL(routingUrl);
+  } catch {
+    fail2("invalid-url");
+  }
+  if (parsed.username !== "" || parsed.password !== "") fail2("userinfo");
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") fail2("invalid-url");
+  if (parsed.hostname === "") fail2("invalid-url");
+  return routingUrl;
+}
+
+// src/setup/adapters/codex.ts
 function buildPlan4(ctx) {
+  const base = validatedRoutingUrl(ctx.routingUrl);
+  const model = ctx.models[0]?.id ?? "<model>";
+  const content = [
+    `model = "${model}"`,
+    'model_provider = "lunaroute"',
+    "",
+    "[model_providers.lunaroute]",
+    'name = "LunaRoute"',
+    `base_url = "${base}/v1"`,
+    'env_key = "LUNAROUTE_API_KEY"',
+    'wire_api = "responses"'
+  ].join("\n") + "\n";
+  return {
+    fileWrites: [{ kind: "text", path: codexProfilePath(), content }],
+    exports: [{ name: ctx.keyEnvVar, value: "__KEY__" }],
+    notes: [
+      "\nCodex: add the export above to your shell profile, then start Codex with `codex --profile lunaroute`.",
+      `Change model to any of: ${ctx.models.map((m) => m.id).join(", ")}, or pass \`--model <id>\` for one session.`,
+      "The key rides the Authorization: Bearer header via env_key; LunaRoute authenticates the lr_ key at the edge and never forwards it upstream.",
+      "One file: the model and the named provider live in the profile file \u2014 your ~/.codex/config.toml is untouched."
+    ]
+  };
+}
+
+// src/setup/adapters/copilotCli.ts
+function buildPlan5(ctx) {
   const firstModel = ctx.models[0]?.id ?? "<model>";
   return {
     fileWrites: [],
@@ -889,7 +965,7 @@ function buildPlan4(ctx) {
 }
 
 // src/setup/adapters/generic.ts
-function buildPlan5(ctx) {
+function buildPlan6(ctx) {
   return {
     fileWrites: [],
     exports: [{ name: ctx.keyEnvVar, value: "__KEY__" }],
@@ -904,34 +980,11 @@ function buildPlan5(ctx) {
   };
 }
 
-// src/setup/routing-url.ts
-function validatedRoutingUrl(routingUrl) {
-  function fail2(reason) {
-    throw new Error(
-      `routingUrl rejected (reason: ${reason}; <redacted URL>) \u2014 check --routing-url or the profile's routing URL`
-    );
-  }
-  if (!/^https?:\/\/[^/?#]/.test(routingUrl)) fail2("invalid-url");
-  if (/[?#]/.test(routingUrl)) fail2("query-or-fragment");
-  if (routingUrl !== routingUrl.trim()) fail2("whitespace");
-  if (routingUrl.endsWith("/")) fail2("trailing-slash");
-  let parsed;
-  try {
-    parsed = new URL(routingUrl);
-  } catch {
-    fail2("invalid-url");
-  }
-  if (parsed.username !== "" || parsed.password !== "") fail2("userinfo");
-  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") fail2("invalid-url");
-  if (parsed.hostname === "") fail2("invalid-url");
-  return routingUrl;
-}
-
 // src/setup/adapters/openclaw.ts
 function asRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v) ? v : {};
 }
-function buildPlan6(ctx) {
+function buildPlan7(ctx) {
   const base = validatedRoutingUrl(ctx.routingUrl);
   const models = ctx.models.map((m) => ({ id: m.id, name: m.id }));
   return {
@@ -991,10 +1044,11 @@ openclaw: restart the gateway, then \`openclaw models list\` and \`openclaw mode
 var ADAPTERS = {
   opencode: buildPlan,
   pi: buildPlan2,
-  openclaw: buildPlan6,
+  openclaw: buildPlan7,
   "claude-code": buildPlan3,
-  "copilot-cli": buildPlan4,
-  generic: buildPlan5
+  codex: buildPlan4,
+  "copilot-cli": buildPlan5,
+  generic: buildPlan6
 };
 var PI_INSTALL_PACKAGES = ["npm:@lunaroute/pi-extension"];
 var PI_INSTALL_HINT = "Install pi first: npm install -g --ignore-scripts @earendil-works/pi-coding-agent (https://pi.dev)";
@@ -1008,7 +1062,7 @@ async function runSetup(harness, opts, deps = {
     return 1;
   }
   if (opts.key && (opts.extension || opts.models)) {
-    console.error("--key runs the full pi flow; drop --extension/--models.");
+    console.error("--key runs the full pi or opencode flow; drop --extension/--models.");
     return 1;
   }
   const adapter = ADAPTERS[harness];
@@ -1089,7 +1143,7 @@ async function runSetup(harness, opts, deps = {
   };
   let plan;
   try {
-    plan = harness === "pi" && opts.key ? buildKeyPlan("<your-api-key>") : adapter(ctx);
+    plan = harness === "pi" && opts.key ? buildKeyPlan2("<your-api-key>") : adapter(ctx);
   } catch (err) {
     console.error(err instanceof Error ? err.message : err);
     return 1;
@@ -1166,7 +1220,7 @@ async function runPiSetup(opts, stored, routingUrl, deps) {
         console.log("\nSkipped. Inside pi, run /login lunaroute to sign in.");
         return 0;
       }
-      const plan = combinePlans(buildKeyPlan(creds2.routing_key), stalePiProviderExists() ? buildStaleProviderCleanupPlan() : null);
+      const plan = combinePlans(buildKeyPlan2(creds2.routing_key), stalePiProviderExists() ? buildStaleProviderCleanupPlan() : null);
       const wcode = await applyAndReport(plan, creds2.routing_key, true);
       if (wcode !== 0) return wcode;
       console.log("\nDone. Start pi \u2014 it is signed in. Pick a model with /model.");
@@ -1291,11 +1345,48 @@ async function runHermesConfigSets(spawn, routingUrl, key) {
 async function runOpencodeSetup(stored, settings, routingUrl, opts, deps) {
   try {
     if (opts.print) {
+      const plan = combinePlans(
+        buildPlan(
+          { routingUrl, orgId: settings.org_id, models: [], keyEnvVar: "LUNAROUTE_API_KEY" },
+          { extension: true }
+        ),
+        opts.key ? buildKeyPlan("<your-api-key>") : null
+      );
+      return applyAndReport(plan, stored?.routing_key ?? "", false);
+    }
+    if (opts.key) {
+      const creds2 = await requireCreds(opts, deps, stored);
+      if (!creds2) return 1;
+      const install = await deps.confirm("Install the LunaRoute OpenCode extension?", {
+        yes: opts.yes
+      });
+      if (!install) {
+        return applyOpencodeProvider(
+          creds2,
+          routingUrl,
+          await deps.confirm("Merge LunaRoute provider into opencode.json (backup kept, other providers preserved)?", {
+            yes: opts.yes
+          })
+        );
+      }
       const plan = buildPlan(
         { routingUrl, orgId: settings.org_id, models: [], keyEnvVar: "LUNAROUTE_API_KEY" },
         { extension: true }
       );
-      return applyAndReport(plan, stored?.routing_key ?? "", false);
+      const code = await applyAndReport(plan, creds2.routing_key, true);
+      if (code !== 0) return code;
+      const store = await deps.confirm(
+        "Store the key in ~/.local/share/opencode/auth.json (replaces any existing LunaRoute login; other credentials preserved)?",
+        { yes: opts.yes }
+      );
+      if (!store) {
+        console.log("\nSkipped. Inside opencode, run /connect to sign in.");
+        return 0;
+      }
+      const wcode = await applyAndReport(buildKeyPlan(creds2.routing_key), creds2.routing_key, true);
+      if (wcode !== 0) return wcode;
+      console.log("\nDone. Start opencode \u2014 it is signed in. Pick a model with /models.");
+      return 0;
     }
     if (await deps.confirm(
       "Install the LunaRoute OpenCode extension (recommended \u2014 /connect login, models auto-sync)?",
@@ -2014,12 +2105,19 @@ function buildRunSpec(ctx) {
 
 // src/run/adapters/codex.ts
 function buildRunSpec2(ctx) {
+  const provider = `{name="LunaRoute",base_url="${ctx.routingUrl}/v1",env_key="LUNAROUTE_API_KEY",wire_api="responses"}`;
   return {
     command: "codex",
-    args: ["--model", ctx.model],
+    args: [
+      "-c",
+      'model_provider="lunaroute"',
+      "-c",
+      `model_providers.lunaroute=${provider}`,
+      "-c",
+      `model="${ctx.model}"`
+    ],
     env: {
-      OPENAI_BASE_URL: `${ctx.routingUrl}/v1`,
-      OPENAI_API_KEY: ctx.apiKey
+      LUNAROUTE_API_KEY: ctx.apiKey
     }
   };
 }
@@ -2106,7 +2204,7 @@ program.command("whoami").description("Show the signed-in user and organization.
 program.command("logout").description("Remove stored credentials for the active profile.").action(() => {
   logout(program.opts().profile);
 });
-program.command("setup <harness>").description("Configure a coding harness (opencode | pi | hermes | claude-code | copilot-cli | openclaw | generic).").option("--print", "print the config instead of writing files", false).option("--routing-url <url>", "override the routing base URL").option("--yes", "accept all confirmation prompts without a TTY (for scripts)", false).option("--extension", "pi only: jump straight to installing the Pi extension").option("--models", "pi only: jump straight to writing the models.json provider block").option("--key <key>", "a LunaRoute routing key (lr_\u2026), e.g. from the dashboard's onboarding page \u2014 stores it and skips the browser login").action(async (harness, opts) => {
+program.command("setup <harness>").description("Configure a coding harness (opencode | pi | hermes | claude-code | codex | copilot-cli | openclaw | generic).").option("--print", "print the config instead of writing files", false).option("--routing-url <url>", "override the routing base URL").option("--yes", "accept all confirmation prompts without a TTY (for scripts)", false).option("--extension", "pi only: jump straight to installing the Pi extension").option("--models", "pi only: jump straight to writing the models.json provider block").option("--key <key>", "a LunaRoute routing key (lr_\u2026), e.g. from the dashboard's onboarding page \u2014 stores it and skips the browser login").action(async (harness, opts) => {
   const code = await runSetup(harness, {
     profile: program.opts().profile,
     print: opts.print,
@@ -2118,14 +2216,19 @@ program.command("setup <harness>").description("Configure a coding harness (open
   });
   if (code !== 0) process.exit(code);
 });
-program.command("run <harness>").description("Launch a coding harness (claude | claude-code | codex) configured to use LunaRoute for this session.").option("--model <id>", "model id to launch on (default: first model in the catalog)").allowUnknownOption(true).action(async (harness, opts) => {
-  const raw = process.argv;
-  const ddIdx = raw.indexOf("--");
-  const runIdx = raw.indexOf("run");
-  const passthrough = ddIdx > runIdx && ddIdx !== -1 ? raw.slice(ddIdx + 1) : [];
+program.command("run <harness>").description("Launch a coding harness (claude | claude-code | codex) configured to use LunaRoute for this session.").option("--model <id>", "model id to launch on (default: first model in the catalog)").argument("[extra...]").action(async (harness, extra, opts) => {
+  const sep = process.argv.indexOf("--");
+  const post = sep !== -1 ? process.argv.slice(sep + 1) : [];
+  const before = post.length <= extra.length ? extra.slice(0, extra.length - post.length) : extra;
+  if (before.length > 0) {
+    console.error(
+      `Unexpected argument "${before[0]}" \u2014 harness flags go after "--": lunaroute run ${harness} -- ${before.join(" ")}`
+    );
+    process.exit(1);
+  }
   const code = await runRun(
     harness,
-    { profile: program.opts().profile, model: opts.model, passthrough }
+    { profile: program.opts().profile, model: opts.model, passthrough: post }
   );
   if (code !== 0) process.exit(code);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunaroute/cli",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "LunaRoute CLI — configure coding harnesses and manage your LunaRoute account.",
   "repository": {
     "type": "git",