@lunaroute/cli 0.2.4 → 0.2.5

package/README.md

@@ -18,7 +18,9 @@ Requires Node.js 20+.
 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 + MCP adapter (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.
+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).
 
 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.4";
+var version = "0.2.5";
 
 // src/login.ts
 import { createServer } from "http";
@@ -359,13 +359,26 @@ function logout(profile) {
 }
 
 // src/catalog.ts
+var KeyRejectedError = class extends Error {
+};
+var NON_CHAT_CAPABILITIES = [
+  "image_generation",
+  "embeddings",
+  "rerank"
+];
+function isChatModel(m) {
+  for (const c of NON_CHAT_CAPABILITIES) {
+    if (m.capabilities?.[c] === true) return false;
+  }
+  return true;
+}
 async function fetchModels(routingUrl, key) {
   const url = `${routingUrl}/v1/models`;
   const headers = key ? { Authorization: `Bearer ${key}` } : {};
   const res = await fetch(url, { method: "GET", headers });
   if (!res.ok) {
     if (res.status === 401) {
-      throw new Error(
+      throw new KeyRejectedError(
         key ? `the routing service rejected that key (HTTP 401) \u2014 check that you copied the whole lr_ key` : `the routing service requires a key for /v1/models (HTTP 401) \u2014 run "lunaroute login" or pass --key`
       );
     }
@@ -379,9 +392,9 @@ async function fetchModels(routingUrl, key) {
     max_output_tokens: m.max_output_tokens,
     capabilities: m.capabilities,
     client_compat: m.client_compat
-  })).filter((m) => m.id.length > 0);
+  })).filter((m) => m.id.length > 0 && isChatModel(m));
   if (models.length === 0) {
-    throw new Error(`no models available from ${url}`);
+    throw new Error(`no chat models available from ${url}`);
   }
   return models.sort((a, b) => a.id.localeCompare(b.id));
 }
@@ -584,6 +597,9 @@ function openclawConfigPath() {
 function piModelsPath() {
   return join2(homedir2(), ".pi", "agent", "models.json");
 }
+function piAuthPath() {
+  return join2(homedir2(), ".pi", "agent", "auth.json");
+}
 var LUNAROUTE_SKILL_NAME = "lunaroute-memory";
 function claudeUserConfigPath() {
   return join2(homedir2(), ".claude.json");
@@ -694,15 +710,17 @@ function providerPlan(ctx) {
 }
 
 // src/setup/adapters/pi.ts
+import { readFileSync as readFileSync3 } from "fs";
 function buildPiModelEntry(m) {
+  if (!m.context_window_tokens || !m.max_output_tokens) return null;
   const reasoning = m.capabilities?.reasoning === true;
   const entry = {
     id: m.id,
     name: m.display_name ?? m.id,
     reasoning,
     input: m.capabilities?.vision ? ["text", "image"] : ["text"],
-    contextWindow: m.context_window_tokens ?? 0,
-    maxTokens: m.max_output_tokens ?? 0
+    contextWindow: m.context_window_tokens,
+    maxTokens: m.max_output_tokens
   };
   if (!reasoning) return entry;
   const pi = m.client_compat?.pi;
@@ -718,13 +736,32 @@ function buildPiModelEntry(m) {
   return entry;
 }
 function buildPlan2(ctx) {
+  const skipped = [];
+  const models = [];
+  for (const m of ctx.models) {
+    const entry = buildPiModelEntry(m);
+    if (entry) models.push(entry);
+    else skipped.push(m.id);
+  }
+  if (models.length === 0) {
+    throw new Error(
+      `no LunaRoute model has a context window in the catalog${skipped.length ? ` (skipped: ${skipped.join(", ")})` : ""}`
+    );
+  }
   const block = {
     baseUrl: `${ctx.routingUrl}/v1`,
     api: "openai-completions",
     // Real key; rides the native Authorization: Bearer header.
     apiKey: `$${ctx.keyEnvVar}`,
-    models: ctx.models.map(buildPiModelEntry)
+    models
   };
+  const notes = [
+    "\npi: open /model to pick a LunaRoute model (models.json hot-reloads).",
+    "Tip: the lunaroute-pi-extension auto-registers models from /v1/models so you can skip this file \u2014 `pi install npm:@lunaroute/pi-extension` then `/login lunaroute`."
+  ];
+  if (skipped.length > 0) {
+    notes.push(`Skipped (no context window in the catalog): ${skipped.join(", ")}`);
+  }
   return {
     fileWrites: [
       {
@@ -739,12 +776,60 @@ function buildPlan2(ctx) {
       }
     ],
     exports: [{ name: ctx.keyEnvVar, value: "__KEY__" }],
+    notes
+  };
+}
+function stalePiProviderExists() {
+  try {
+    const obj = JSON.parse(readFileSync3(piModelsPath(), "utf8"));
+    return Boolean(obj.providers?.lunaroute);
+  } catch {
+    return false;
+  }
+}
+function buildStaleProviderCleanupPlan() {
+  return {
+    fileWrites: [
+      {
+        kind: "json",
+        path: piModelsPath(),
+        merge: (existing) => {
+          const obj = existing ?? {};
+          const providers = { ...obj.providers };
+          delete providers.lunaroute;
+          const next = { ...obj };
+          if (Object.keys(providers).length > 0) next.providers = providers;
+          else delete next.providers;
+          return next;
+        }
+      }
+    ],
+    exports: [],
     notes: [
-      "\npi: open /model to pick a LunaRoute model (models.json hot-reloads).",
-      "Tip: the lunaroute-pi-extension auto-registers models from /v1/models so you can skip this file \u2014 `pi install npm:@lunaroute/pi-extension` then `/login lunaroute`."
+      "pi: removed the stale providers.lunaroute block from ~/.pi/agent/models.json (backup kept) \u2014 the extension syncs models live."
     ]
   };
 }
+var KEY_EXPIRES_MS = 10 * 365 * 24 * 60 * 60 * 1e3;
+function buildKeyPlan(key) {
+  return {
+    fileWrites: [
+      {
+        kind: "json",
+        path: piAuthPath(),
+        merge: (existing) => {
+          const obj = existing ?? {};
+          return {
+            ...obj,
+            lunaroute: { type: "oauth", access: key, refresh: "", expires: Date.now() + KEY_EXPIRES_MS }
+          };
+        }
+      }
+    ],
+    exports: [],
+    notes: ["pi: key stored in ~/.pi/agent/auth.json \u2014 start pi, then /model to pick a lunaroute/* model."]
+  };
+}
 
 // src/setup/adapters/claudeCode.ts
 function buildPlan3(ctx) {
@@ -911,7 +996,8 @@ var ADAPTERS = {
   "copilot-cli": buildPlan4,
   generic: buildPlan5
 };
-var PI_INSTALL_PACKAGES = ["npm:@lunaroute/pi-extension", "npm:pi-mcp-adapter"];
+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)";
 async function runSetup(harness, opts, deps = {
   confirm,
   spawn: makeRealSpawn(),
@@ -921,6 +1007,10 @@ async function runSetup(harness, opts, deps = {
     console.error("Choose one of --extension or --models.");
     return 1;
   }
+  if (opts.key && (opts.extension || opts.models)) {
+    console.error("--key runs the full pi flow; drop --extension/--models.");
+    return 1;
+  }
   const adapter = ADAPTERS[harness];
   if (!adapter && harness !== "hermes") {
     console.error(
@@ -930,22 +1020,11 @@ async function runSetup(harness, opts, deps = {
   }
   let stored = loadProfile(opts.profile);
   const settings = resolveSettings(opts.profile);
-  if (opts.key) {
-    if (!LR_KEY_RE.test(opts.key)) {
-      console.error(
-        "Invalid key: a LunaRoute routing key starts with lr_ (copy the whole key from the dashboard)."
-      );
-      return 1;
-    }
-    saveProfile(opts.profile, {
-      api_url: settings.api_url,
-      routing_url: opts.routingUrl || settings.routing_url,
-      front_url: settings.front_url,
-      org_id: stored?.org_id ?? "",
-      user_email: stored?.user_email ?? "",
-      routing_key: opts.key
-    });
-    stored = loadProfile(opts.profile);
+  if (opts.key && !LR_KEY_RE.test(opts.key)) {
+    console.error(
+      "Invalid key: a LunaRoute routing key starts with lr_ (copy the whole key from the dashboard)."
+    );
+    return 1;
   }
   const routingUrlRaw = opts.routingUrl || stored?.routing_url || settings.routing_url;
   if (!routingUrlRaw) {
@@ -959,6 +1038,29 @@ async function runSetup(harness, opts, deps = {
     console.error(err instanceof Error ? err.message : err);
     return 1;
   }
+  if (opts.key) {
+    try {
+      await fetchModels(routingUrl, opts.key);
+    } catch (err) {
+      if (err instanceof KeyRejectedError) {
+        console.error(err.message);
+        return 1;
+      }
+      console.warn(`Note: ${err instanceof Error ? err.message : err}`);
+      console.warn(
+        "Continuing without a synced catalog. If your organization has no chat models enabled yet, contact hello@lunaroute.com \u2014 models appear on the next refresh once they are on."
+      );
+    }
+    saveProfile(opts.profile, {
+      api_url: settings.api_url,
+      routing_url: opts.routingUrl || settings.routing_url,
+      front_url: settings.front_url,
+      org_id: stored?.org_id ?? "",
+      user_email: stored?.user_email ?? "",
+      routing_key: opts.key
+    });
+    stored = loadProfile(opts.profile);
+  }
   if (harness === "pi" && !opts.print) {
     return runPiSetup(opts, stored, routingUrl, deps);
   }
@@ -987,7 +1089,7 @@ async function runSetup(harness, opts, deps = {
   };
   let plan;
   try {
-    plan = adapter(ctx);
+    plan = harness === "pi" && opts.key ? buildKeyPlan("<your-api-key>") : adapter(ctx);
   } catch (err) {
     console.error(err instanceof Error ? err.message : err);
     return 1;
@@ -1043,38 +1145,36 @@ async function runPiSetup(opts, stored, routingUrl, deps) {
     if (opts.key) {
       const creds2 = await requireCreds(opts, deps, stored);
       if (!creds2) return 1;
-      let models = [];
-      let modelsSynced = true;
-      try {
-        models = await fetchModels(routingUrl, creds2.routing_key);
-      } catch (err) {
-        modelsSynced = false;
-        console.warn(
-          `Note: ${err instanceof Error ? err.message : err}`
-        );
-        console.warn(
-          "Writing the provider block with no models. Your organization has no models enabled yet \u2014 contact hello@lunaroute.com to get them turned on, then re-run this command to sync them."
+      const install = await deps.confirm(
+        "Install the LunaRoute Pi extension via 'pi install'?",
+        { yes: opts.yes }
+      );
+      if (!install) {
+        return applyPiModels(
+          creds2,
+          routingUrl,
+          await deps.confirm("Merge LunaRoute provider into ~/.pi/agent/models.json (backup kept, other providers preserved)?", { yes: opts.yes })
         );
       }
-      const plan = buildPlan2({
-        routingUrl,
-        orgId: creds2.org_id,
-        models,
-        keyEnvVar: "LUNAROUTE_API_KEY"
-      });
-      const write = await deps.confirm(
-        "Merge LunaRoute provider into ~/.pi/agent/models.json (backup kept, other providers preserved)?",
+      const code = await installPiPackages(deps);
+      if (code !== 0) return code;
+      const store = await deps.confirm(
+        "Store the key in ~/.pi/agent/auth.json (replaces any existing LunaRoute login; other credentials preserved)?",
         { yes: opts.yes }
       );
-      const code = await applyAndReport(plan, creds2.routing_key, write);
-      if (code === 0 && modelsSynced) {
-        console.log("\nDone. Start pi \u2014 it is signed in. Pick a model with /model.");
+      if (!store) {
+        console.log("\nSkipped. Inside pi, run /login lunaroute to sign in.");
+        return 0;
       }
-      return code;
+      const plan = combinePlans(buildKeyPlan(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.");
+      return 0;
     }
     if (opts.extension) {
       const ok = await deps.confirm(
-        "Install the LunaRoute Pi extension + MCP adapter via 'pi install'?",
+        "Install the LunaRoute Pi extension via 'pi install'?",
         { yes: opts.yes }
       );
       if (!ok) {
@@ -1094,7 +1194,7 @@ async function runPiSetup(opts, stored, routingUrl, deps) {
       );
     }
     if (await deps.confirm(
-      "Install the LunaRoute Pi extension + MCP adapter via 'pi install' (recommended \u2014 auto-registers models)?",
+      "Install the LunaRoute Pi extension via 'pi install' (recommended \u2014 auto-registers models)?",
       { yes: opts.yes }
     )) {
       return installPiExtension(deps, opts);
@@ -1249,6 +1349,14 @@ async function applyOpencodeProvider(creds, routingUrl, write) {
   });
   return applyAndReport(plan, creds.routing_key, write);
 }
+function combinePlans(a, b) {
+  if (!b) return a;
+  return {
+    fileWrites: [...a.fileWrites, ...b.fileWrites],
+    exports: [...a.exports, ...b.exports],
+    notes: [...a.notes, ...b.notes]
+  };
+}
 async function applyAndReport(plan, key, write) {
   try {
     const summary = await applyPlan(plan, { print: !write, key });
@@ -1280,16 +1388,12 @@ async function launchOpencode(spawn) {
     });
   });
 }
-async function installPiExtension(deps, opts) {
+async function installPiPackages(deps) {
   for (const pkg of PI_INSTALL_PACKAGES) {
     const code = await new Promise((resolve) => {
       const child = deps.spawn("pi", ["install", pkg]);
       child.on("error", (err) => {
-        const { message, exitCode } = describeSpawnError(
-          "pi",
-          "Install pi first: https://pi.dev",
-          err
-        );
+        const { message, exitCode } = describeSpawnError("pi", PI_INSTALL_HINT, err);
         console.error(message);
         resolve(exitCode);
       });
@@ -1300,11 +1404,26 @@ async function installPiExtension(deps, opts) {
     if (code !== 0) {
       const done = PI_INSTALL_PACKAGES.slice(0, PI_INSTALL_PACKAGES.indexOf(pkg));
       console.error(
-        `'pi install ${pkg}' failed (exit ${code}). Installed so far: ${done.length ? done.join(", ") : "nothing"}. Re-run 'lunaroute setup pi --extension' to retry.`
+        `'pi install ${pkg}' failed (exit ${code}). Installed so far: ${done.length ? done.join(", ") : "nothing"}. Re-run the same command to retry.`
       );
       return code || 1;
     }
   }
+  return 0;
+}
+async function installPiExtension(deps, opts) {
+  const code = await installPiPackages(deps);
+  if (code !== 0) return code;
+  if (stalePiProviderExists()) {
+    const remove = await deps.confirm(
+      "Remove the stale LunaRoute block from ~/.pi/agent/models.json (backup kept, other providers preserved)?",
+      { yes: opts.yes }
+    );
+    if (remove) {
+      const ccode = await applyAndReport(buildStaleProviderCleanupPlan(), "", true);
+      if (ccode !== 0) return ccode;
+    }
+  }
   if (await deps.confirm("Start pi now? (then run /login lunaroute to sign in)", { yes: opts.yes })) {
     return launchPi(deps.spawn);
   }
@@ -1317,11 +1436,7 @@ async function launchPi(spawn) {
   return new Promise((resolve) => {
     const child = spawn("pi", []);
     child.on("error", (err) => {
-      const { message, exitCode } = describeSpawnError(
-        "pi",
-        "Install pi first: https://pi.dev",
-        err
-      );
+      const { message, exitCode } = describeSpawnError("pi", PI_INSTALL_HINT, err);
       console.error(message);
       resolve(exitCode);
     });
@@ -1991,7 +2106,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 + MCP adapter").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 | 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,

package/package.json

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