@lunaroute/cli 0.1.1 → 0.2.1

package/README.md

@@ -37,7 +37,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` \| `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` \| `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

@@ -3,6 +3,9 @@
 // src/index.ts
 import { Command, InvalidArgumentError, Option } from "commander";
 
+// package.json
+var version = "0.2.1";
+
 // src/login.ts
 import { createServer } from "http";
 import { hostname } from "os";
@@ -411,6 +414,9 @@ function configHome() {
 function opencodeConfigPath() {
   return join2(configHome(), "opencode", "opencode.json");
 }
+function openclawConfigPath() {
+  return join2(homedir2(), ".openclaw", "openclaw.json");
+}
 function piModelsPath() {
   return join2(homedir2(), ".pi", "agent", "models.json");
 }
@@ -441,7 +447,55 @@ function gitRepoRoot(cwd = process.cwd()) {
 }
 
 // src/setup/adapters/opencode.ts
-function buildPlan(ctx) {
+var EXTENSION = "@lunaroute/opencode-extension";
+var PROD_GATEWAY_HOST = "gw.lunaroute.com";
+function buildPlan(ctx, opts = {}) {
+  if (opts.extension) return extensionPlan(ctx);
+  return providerPlan(ctx);
+}
+function extensionPlan(ctx) {
+  return {
+    fileWrites: [
+      {
+        kind: "json",
+        path: opencodeConfigPath(),
+        merge: (existing) => {
+          const obj = existing ?? {};
+          const raw = obj.plugin;
+          const plugins = Array.isArray(raw) ? raw : typeof raw === "string" ? [raw] : [];
+          if (!plugins.includes(EXTENSION)) plugins.push(EXTENSION);
+          const next = { ...obj, plugin: plugins };
+          if (!isProdGateway(ctx.routingUrl)) {
+            const providers = objectOrEmpty(obj.provider);
+            const lr = objectOrEmpty(providers.lunaroute);
+            next.provider = {
+              ...providers,
+              lunaroute: { ...lr, options: { ...objectOrEmpty(lr.options), baseURL: `${ctx.routingUrl}/v1` } }
+            };
+          }
+          return next;
+        }
+      }
+    ],
+    // No env key: login happens in-app via /connect.
+    exports: [],
+    notes: [
+      "\nopencode: the extension installs on the next opencode start (npm plugins auto-install at startup).",
+      "Inside opencode: run /connect to log in, then /models to pick a LunaRoute model."
+    ]
+  };
+}
+function isProdGateway(url) {
+  try {
+    return new URL(url).host === PROD_GATEWAY_HOST;
+  } catch {
+    return false;
+  }
+}
+function objectOrEmpty(v) {
+  return typeof v === "object" && v !== null ? v : {};
+}
+function providerPlan(ctx) {
   const models = {};
   for (const m of ctx.models) models[m.id] = { name: m.id };
   const block = {
@@ -462,7 +516,7 @@ function buildPlan(ctx) {
         path: opencodeConfigPath(),
         merge: (existing) => {
           const obj = existing ?? {};
-          const existingProviders = typeof obj.provider === "object" && obj.provider !== null ? obj.provider : {};
+          const existingProviders = objectOrEmpty(obj.provider);
           const provider = { ...existingProviders, lunaroute: block };
           return { ...obj, provider };
         }
@@ -537,21 +591,24 @@ function buildPlan3(ctx) {
       { name: ctx.keyEnvVar, value: "__KEY__" },
       // Point at the routing root; Claude Code appends /v1/messages itself.
       { name: "ANTHROPIC_BASE_URL", value: ctx.routingUrl },
-      // Claude Code sends ANTHROPIC_API_KEY as the native x-api-key header. The
-      // routing edge recognizes the lr_ prefix, authenticates it, and strips the
-      // header before forwarding upstream — so the key never leaks and never
-      // sits in the URL path.
-      { name: "ANTHROPIC_API_KEY", value: `$${ctx.keyEnvVar}` },
+      // Claude Code sends ANTHROPIC_AUTH_TOKEN as `Authorization: Bearer`. The
+      // routing edge recognizes the lr_ prefix, authenticates it, and strips
+      // the header before forwarding upstream — so the key never leaks and
+      // never sits in the URL path. Bearer also outranks a stored claude.ai
+      // subscription OAuth login; ANTHROPIC_API_KEY does not (unapproved env
+      // keys are ignored and the OAuth token 401s through the gateway, kata
+      // 009h).
+      { name: "ANTHROPIC_AUTH_TOKEN", value: `$${ctx.keyEnvVar}` },
       { name: "ANTHROPIC_MODEL", value: firstModel }
     ],
     notes: [
       "\nClaude Code: add the exports above to your shell profile, then restart Claude Code.",
       `Change ANTHROPIC_MODEL to any of: ${ctx.models.map((m) => m.id).join(", ")}`,
-      "(Auth travels in the native x-api-key header via ANTHROPIC_API_KEY.)",
-      "If your Claude Code build requires a bearer token instead, set ANTHROPIC_AUTH_TOKEN=$LUNAROUTE_API_KEY \u2014 LunaRoute also authenticates lr_ keys sent as Authorization: Bearer.",
+      "(Auth travels in the Authorization: Bearer header via ANTHROPIC_AUTH_TOKEN.)",
+      "If your Claude Code build predates ANTHROPIC_AUTH_TOKEN support, set ANTHROPIC_API_KEY=$LUNAROUTE_API_KEY instead \u2014 LunaRoute also authenticates lr_ keys sent as x-api-key. Bearer wins whenever both are set.",
       "To set these in ~/.claude/settings.json instead, note its env values are literal \u2014 the key would be baked into the file rather than read from $LUNAROUTE_API_KEY.",
       "If Claude Code hangs or keeps retrying when connecting, your key is likely wrong \u2014 it retries auth errors silently. Debug with the curl below, which fails fast with the real error:",
-      `  curl ${ctx.routingUrl}/v1/messages -H "x-api-key: $${ctx.keyEnvVar}" -H "content-type: application/json" -d '{"model":"${firstModel}","max_tokens":16,"messages":[{"role":"user","content":"ping"}]}'`
+      `  curl ${ctx.routingUrl}/v1/messages -H "Authorization: Bearer $${ctx.keyEnvVar}" -H "content-type: application/json" -d '{"model":"${firstModel}","max_tokens":16,"messages":[{"role":"user","content":"ping"}]}'`
     ]
   };
 }
@@ -598,10 +655,94 @@ function buildPlan5(ctx) {
   };
 }
 
+// src/setup/routing-url.ts
+function validatedRoutingUrl(routingUrl) {
+  function fail(reason) {
+    throw new Error(
+      `routingUrl rejected (reason: ${reason}; <redacted URL>) \u2014 check --routing-url or the profile's routing URL`
+    );
+  }
+  if (!/^https?:\/\/[^/?#]/.test(routingUrl)) fail("invalid-url");
+  if (/[?#]/.test(routingUrl)) fail("query-or-fragment");
+  if (routingUrl !== routingUrl.trim()) fail("whitespace");
+  if (routingUrl.endsWith("/")) fail("trailing-slash");
+  let parsed;
+  try {
+    parsed = new URL(routingUrl);
+  } catch {
+    fail("invalid-url");
+  }
+  if (parsed.username !== "" || parsed.password !== "") fail("userinfo");
+  if (parsed.protocol !== "http:" && parsed.protocol !== "https:") fail("invalid-url");
+  if (parsed.hostname === "") fail("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) {
+  const base = validatedRoutingUrl(ctx.routingUrl);
+  const models = ctx.models.map((m) => ({ id: m.id, name: m.id }));
+  return {
+    fileWrites: [
+      {
+        kind: "json",
+        path: openclawConfigPath(),
+        merge: (existing) => {
+          const obj = asRecord(existing);
+          const modelsCfg = asRecord(obj.models);
+          const providers = asRecord(modelsCfg.providers);
+          const agents = asRecord(obj.agents);
+          const defaults = asRecord(agents.defaults);
+          const model = asRecord(defaults.model);
+          return {
+            ...obj,
+            models: {
+              ...modelsCfg,
+              mode: modelsCfg.mode ?? "merge",
+              providers: {
+                ...providers,
+                lunaroute: {
+                  baseUrl: `${base}/v1`,
+                  // OpenClaw interpolates the env var and sends it as
+                  // Authorization: Bearer lr_…; the edge authenticates the lr_
+                  // key and strips the header before forwarding upstream.
+                  apiKey: `\${${ctx.keyEnvVar}}`,
+                  api: "openai-completions",
+                  models
+                }
+              }
+            },
+            agents: {
+              ...agents,
+              defaults: {
+                ...defaults,
+                model: {
+                  ...model,
+                  // Preserve an existing primary model, like OpenClaw onboarding.
+                  primary: model.primary ?? `lunaroute/${ctx.models[0]?.id ?? "<model>"}`
+                }
+              }
+            }
+          };
+        }
+      }
+    ],
+    exports: [{ name: ctx.keyEnvVar, value: "__KEY__" }],
+    notes: [
+      `
+openclaw: restart the gateway, then \`openclaw models list\` and \`openclaw models set lunaroute/${ctx.models[0]?.id ?? "<model>"}\` (only if you have no default model already). If lunaroute/* models do not appear in \`openclaw models list\`, check that models.mode is merge \u2014 setup preserves whatever mode you have.`
+    ]
+  };
+}
+
 // src/commands/setup.ts
 var ADAPTERS = {
   opencode: buildPlan,
   pi: buildPlan2,
+  openclaw: buildPlan6,
   "claude-code": buildPlan3,
   "copilot-cli": buildPlan4,
   generic: buildPlan5
@@ -616,8 +757,10 @@ async function runSetup(harness, opts, deps = {
     return 1;
   }
   const adapter = ADAPTERS[harness];
-  if (!adapter) {
-    console.error(`Unknown harness "${harness}". Choose one of: ${Object.keys(ADAPTERS).join(", ")}.`);
+  if (!adapter && harness !== "hermes") {
+    console.error(
+      `Unknown harness "${harness}". Choose one of: ${[...Object.keys(ADAPTERS), "hermes"].join(", ")}.`
+    );
     return 1;
   }
   const creds = loadProfile(opts.profile);
@@ -625,14 +768,27 @@ async function runSetup(harness, opts, deps = {
     console.error('Not logged in. Run "lunaroute login" first.');
     return 1;
   }
-  const routingUrl = opts.routingUrl || creds.routing_url;
-  if (!routingUrl) {
+  const routingUrlRaw = opts.routingUrl || creds.routing_url;
+  if (!routingUrlRaw) {
     console.error("No routing URL in profile; pass --routing-url.");
     return 1;
   }
+  let routingUrl;
+  try {
+    routingUrl = validatedRoutingUrl(routingUrlRaw.replace(/\/+$/, "").trim());
+  } catch (err) {
+    console.error(err instanceof Error ? err.message : err);
+    return 1;
+  }
   if (harness === "pi" && !opts.print) {
     return runPiSetup(opts, deps);
   }
+  if (harness === "opencode") {
+    return runOpencodeSetup(creds, routingUrl, opts, deps);
+  }
+  if (harness === "hermes") {
+    return runHermesSetup(creds, routingUrl, opts, deps);
+  }
   let models;
   try {
     models = await fetchModels(routingUrl);
@@ -646,8 +802,15 @@ async function runSetup(harness, opts, deps = {
     models,
     keyEnvVar: "LUNAROUTE_API_KEY"
   };
+  let plan;
+  try {
+    plan = adapter(ctx);
+  } catch (err) {
+    console.error(err instanceof Error ? err.message : err);
+    return 1;
+  }
   try {
-    const summary = await applyPlan(adapter(ctx), { print: opts.print, key: creds.routing_key });
+    const summary = await applyPlan(plan, { print: opts.print, key: creds.routing_key });
     if (!opts.print && summary.written.length > 0) {
       console.log(`
 Wrote: ${summary.written.join(", ")}`);
@@ -699,6 +862,169 @@ async function runPiSetup(opts, deps) {
     return 1;
   }
 }
+async function runHermesSetup(creds, routingUrl, opts, deps) {
+  const commands = hermesConfigSetArgs(routingUrl, creds.routing_key);
+  try {
+    if (opts.print) {
+      console.log("\n# would run:");
+      for (const args of commands) console.log(`  hermes ${args.join(" ")}`);
+      console.log(
+        "\nThen start hermes and run /model custom:lunaroute:<model> to pick a LunaRoute model (models auto-discover from /v1/models)."
+      );
+      return 0;
+    }
+    if (await deps.confirm("Configure LunaRoute for Hermes via 'hermes config set'? (recommended \u2014 models auto-discover)", {
+      yes: opts.yes
+    })) {
+      return runHermesConfigSets(deps.spawn, routingUrl, creds.routing_key);
+    }
+    console.log("Skipped. Re-run with --yes, or configure manually:");
+    for (const args of commands) console.log(`  hermes ${args.join(" ")}`);
+    console.log("\nThen start hermes and run /model custom:lunaroute:<model> to pick a LunaRoute model.");
+    return 0;
+  } catch (err) {
+    if (err instanceof NonInteractiveTerminalError) {
+      console.error("No interactive terminal available. Re-run with --yes to accept prompts, or --print to preview.");
+      return 1;
+    }
+    console.error(err instanceof Error ? err.message : String(err));
+    return 1;
+  }
+}
+function hermesConfigSetArgs(routingUrl, key) {
+  return [
+    ["config", "set", "providers.lunaroute.api", `${routingUrl}/v1`],
+    ["config", "set", "providers.lunaroute.key_env", "LUNAROUTE_API_KEY"],
+    ["config", "set", "providers.lunaroute.transport", "chat_completions"],
+    ["config", "set", "LUNAROUTE_API_KEY", key]
+  ];
+}
+async function runHermesConfigSets(spawn3, routingUrl, key) {
+  const commands = hermesConfigSetArgs(routingUrl, key);
+  const setKeys = commands.map((c) => c[2]);
+  for (let i = 0; i < commands.length; i++) {
+    const code = await new Promise((resolve) => {
+      const child = spawn3("hermes", commands[i]);
+      child.on("error", (err) => {
+        const e = err;
+        if (e?.code === "ENOENT") {
+          console.error(
+            `Error: "hermes" not found on PATH. Install Hermes Agent first: https://hermes-agent.nousresearch.com (exit 127)`
+          );
+          resolve(127);
+          return;
+        }
+        console.error(err instanceof Error ? err.message : String(err));
+        resolve(1);
+      });
+      child.on("exit", (code2) => {
+        resolve(typeof code2 === "number" ? code2 : 1);
+      });
+    });
+    if (code !== 0) {
+      const done = setKeys.slice(0, i);
+      console.error(
+        `'hermes config set ${setKeys[i]}' failed (exit ${code}). Set so far: ${done.length ? done.join(", ") : "nothing"}. Re-run 'lunaroute setup hermes' to retry (all steps are idempotent).`
+      );
+      return code || 1;
+    }
+  }
+  console.log("\nConfigured. Start hermes (or restart it if already running), then:");
+  console.log("  /model custom:lunaroute:<model>   # switch to a LunaRoute model (models auto-discover from /v1/models)");
+  console.log("  hermes model                      # interactive provider/model picker");
+  return 0;
+}
+async function runOpencodeSetup(creds, routingUrl, opts, deps) {
+  try {
+    if (opts.print) {
+      const plan = buildPlan(
+        { routingUrl, orgId: creds.org_id, models: [], keyEnvVar: "LUNAROUTE_API_KEY" },
+        { extension: true }
+      );
+      return applyAndReport(plan, creds.routing_key, false);
+    }
+    if (await deps.confirm(
+      "Install the LunaRoute OpenCode extension (recommended \u2014 /connect login, models auto-sync)?",
+      { yes: opts.yes }
+    )) {
+      const plan = buildPlan(
+        { routingUrl, orgId: creds.org_id, models: [], keyEnvVar: "LUNAROUTE_API_KEY" },
+        { extension: true }
+      );
+      const code = await applyAndReport(plan, creds.routing_key, !opts.print);
+      if (code !== 0) return code;
+      if (await deps.confirm("Start opencode now? (if it's already open, quit and reopen it to load the extension)", {
+        yes: opts.yes
+      })) {
+        return launchOpencode(deps.spawn);
+      }
+      console.log("\nStart opencode when ready \u2014 then run /connect to log in and /models to pick a LunaRoute model.");
+      return 0;
+    }
+    const write = await deps.confirm(
+      "Merge LunaRoute provider into opencode.json instead? (backup kept, other providers preserved)",
+      { yes: opts.yes }
+    );
+    return applyOpencodeProvider(creds, routingUrl, write);
+  } catch (err) {
+    if (err instanceof NonInteractiveTerminalError) {
+      console.error(
+        "No interactive terminal available. Re-run with --yes to accept prompts, or --print to preview without writing."
+      );
+      return 1;
+    }
+    console.error(err instanceof Error ? err.message : String(err));
+    return 1;
+  }
+}
+async function applyOpencodeProvider(creds, routingUrl, write) {
+  let models;
+  try {
+    models = await fetchModels(routingUrl);
+  } catch (err) {
+    console.error(`Could not fetch the model catalog: ${err instanceof Error ? err.message : err}`);
+    return 1;
+  }
+  const plan = buildPlan({
+    routingUrl,
+    orgId: creds.org_id,
+    models,
+    keyEnvVar: "LUNAROUTE_API_KEY"
+  });
+  return applyAndReport(plan, creds.routing_key, write);
+}
+async function applyAndReport(plan, key, write) {
+  try {
+    const summary = await applyPlan(plan, { print: !write, key });
+    if (write && summary.written.length > 0) {
+      console.log(`
+Wrote: ${summary.written.join(", ")}`);
+      if (summary.backedUp.length > 0) console.log(`  Backups: ${summary.backedUp.join(", ")}`);
+    }
+    return 0;
+  } catch (err) {
+    console.error(err instanceof Error ? err.message : String(err));
+    return 1;
+  }
+}
+async function launchOpencode(spawn3) {
+  return new Promise((resolve) => {
+    const child = spawn3("opencode", []);
+    child.on("error", (err) => {
+      const e = err;
+      if (e?.code === "ENOENT") {
+        console.error(`Error: "opencode" not found on PATH. Install OpenCode first: https://opencode.ai (exit 127)`);
+        resolve(127);
+        return;
+      }
+      console.error(err instanceof Error ? err.message : String(err));
+      resolve(1);
+    });
+    child.on("exit", (code) => {
+      resolve(typeof code === "number" ? code : 1);
+    });
+  });
+}
 async function installPiExtension(spawn3) {
   for (const pkg of PI_INSTALL_PACKAGES) {
     const code = await new Promise((resolve) => {
@@ -1062,7 +1388,7 @@ async function runMcp(profile) {
     read: (p) => readMemory(ctx, p),
     resolveProjectId
   };
-  const server = new McpServer({ name: "lunaroute-memory", version: "0.1.0" });
+  const server = new McpServer({ name: "lunaroute-memory", version });
   server.registerTool(
     "search",
     {
@@ -1197,7 +1523,7 @@ function buildRunSpec(ctx) {
     args: [],
     env: {
       ANTHROPIC_BASE_URL: ctx.routingUrl,
-      ANTHROPIC_API_KEY: ctx.apiKey,
+      ANTHROPIC_AUTH_TOKEN: ctx.apiKey,
       ANTHROPIC_MODEL: ctx.model,
       // Pins the Haiku/background model so Claude Code's background tasks
       // (titles, summaries, compaction) route through LunaRoute instead of
@@ -1295,7 +1621,7 @@ async function runRun(harness, opts, deps = realDeps) {
 
 // src/index.ts
 var program = new Command();
-program.name("lunaroute").description("LunaRoute CLI \u2014 configure coding harnesses and manage your account.").version("0.1.0").option("-p, --profile <name>", "credential profile to use", "default");
+program.name("lunaroute").description("LunaRoute CLI \u2014 configure coding harnesses and manage your account.").version(version).option("-p, --profile <name>", "credential profile to use", "default");
 program.command("login").description("Authorize this device via the browser and store a routing key.").action(async () => {
   await login(program.opts().profile);
 });
@@ -1305,7 +1631,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 | claude-code | copilot-cli | 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").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 + MCP adapter").option("--models", "pi only: jump straight to writing the models.json provider block").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.1.1",
+  "version": "0.2.1",
   "description": "LunaRoute CLI — configure coding harnesses and manage your LunaRoute account.",
   "repository": {
     "type": "git",