@lunaroute/cli 0.2.5 → 0.2.6

package/README.md

@@ -20,7 +20,7 @@ lunaroute setup pi       # or: opencode | claude-code | 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.
 

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.6";
 
 // src/login.ts
 import { createServer } from "http";
@@ -591,6 +591,10 @@ 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");
 }
@@ -708,6 +712,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 +834,7 @@ function buildStaleProviderCleanupPlan() {
   };
 }
 var KEY_EXPIRES_MS = 10 * 365 * 24 * 60 * 60 * 1e3;
-function buildKeyPlan(key) {
+function buildKeyPlan2(key) {
   return {
     fileWrites: [
       {
@@ -1008,7 +1031,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 +1112,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 +1189,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 +1314,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)?",

package/package.json

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