@rabbi696/ezrouter 0.6.15 → 0.6.16

package/cli.js

@@ -94,10 +94,11 @@ if (args[0] === "xai" && args[1] === "video") {
   return;
 }
 
-// `ezrouter connect <url>` configures local CLI tools against a remote server —
-// no local server, no runtime deps. Usable via `npx @rabbi696/ezrouter connect …`.
-if (args[0] === "connect") {
-  const { run } = require("./src/cli/commands/connect");
+// `ezrouter connect <url>` configures local CLI tools against a remote server, and
+// `ezrouter show` prints what they're currently set to — no local server, no
+// runtime deps. Usable via `npx @rabbi696/ezrouter …`.
+if (args[0] === "connect" || args[0] === "show") {
+  const { run } = require(args[0] === "show" ? "./src/cli/commands/show" : "./src/cli/commands/connect");
   run(args.slice(1))
     .then((code) => process.exit(code))
     .catch((err) => {
@@ -190,7 +191,8 @@ Options:
 Commands:
   connect <server-url> Configure CLI tools for a remote EzRouter server
                       (npx @rabbi696/ezrouter connect http://host:20126 — no install needed)
-  codex auth-token     Print the provider-scoped Codex bridge token
+  show [tool…]        Show each CLI tool's current EzRouter config and models
+                      (e.g. ezrouter show claude)
   xai video --prompt "..." --output video.mp4
                       Generate a Grok Imagine video via the running gateway
                       (see: ${APP_NAME} xai video --help)
@@ -777,6 +779,69 @@ function startServer(updatePromise) {
     setTimeout(() => process.exit(0), 100);
   });
 
+  function attachServerEvents() {
+    server.on("error", (err) => {
+      console.error("Failed to start server:", err.message);
+      if (!isShuttingDown) tryRestart();
+      else { cleanup(); process.exit(1); }
+    });
+
+    server.on("close", (code, signal) => {
+      if (isShuttingDown || code === 0) {
+        process.exit(code || 0);
+        return;
+      }
+      tryRestart(code, signal);
+    });
+  }
+
+  function tryRestart(code, signal) {
+    const aliveMs = Date.now() - serverStartTime;
+    // Reset counter if last run was stable
+    if (aliveMs >= RESTART_RESET_MS) restartCount = 0;
+
+    if (restartCount >= MAX_RESTARTS) {
+      console.error(`\n⚠️  Server crashed ${MAX_RESTARTS} times. Disabling MIT and restarting...`);
+      try {
+        const dbPath = path.join(os.homedir(), process.platform === "win32" ? path.join("AppData", "Roaming", "ezrouter", "db.json") : path.join(".ezrouter", "db.json"));
+        if (fs.existsSync(dbPath)) {
+          const db = JSON.parse(fs.readFileSync(dbPath, "utf-8"));
+          if (db.settings) db.settings.mitmEnabled = false;
+          fs.writeFileSync(dbPath, JSON.stringify(db, null, 2));
+        }
+      } catch { /* best effort */ }
+      restartCount = 0;
+      server = spawnServer();
+      attachServerEvents();
+      return;
+    }
+
+    restartCount++;
+    const delay = Math.min(1000 * restartCount, 10000);
+    const exitReason = code !== null && code !== undefined ? `code=${code}` : (signal ? `signal=${signal}` : "code=unknown");
+    console.error(`\n⚠️  Server exited (${exitReason}). Restarting in ${delay / 1000}s... (${restartCount}/${MAX_RESTARTS})`);
+    if (crashLog.length) {
+      const meaningfulLogs = crashLog.filter(l =>
+        !l.includes("[MODULE_TYPELESS_PACKAGE_JSON]") &&
+        !l.includes("Reparsing as ES module") &&
+        !l.includes("To eliminate this warning") &&
+        !l.includes("[DB] better-sqlite3 unavailable")
+      );
+      if (meaningfulLogs.length) {
+        console.error("\n--- Server crash log ---");
+        meaningfulLogs.forEach(l => console.error(l));
+        console.error("--- End crash log ---\n");
+      }
+    }
+
+    setTimeout(() => {
+      server = spawnServer();
+      attachServerEvents();
+    }, delay);
+  }
+
+  attachServerEvents();
+
   // Initialize tray icon (runs alongside TUI)
   const initTrayIcon = () => {
     if (homebrewManaged) {
@@ -893,7 +958,7 @@ function startServer(updatePromise) {
           });
           bgProcess.unref();
 
-          console.log(`🔔 9Router is now running in background (PID: ${bgProcess.pid})`);
+          console.log(`🔔 EzRouter is now running in background (PID: ${bgProcess.pid})`);
           console.log(`   Server: http://${displayHost}:${port}`);
           console.log(`\n💡 You can close this terminal. Right-click tray icon to quit.\n`);
 
@@ -913,67 +978,4 @@ function startServer(updatePromise) {
       process.exit(1);
     }
   });
-
-  function attachServerEvents() {
-    server.on("error", (err) => {
-      console.error("Failed to start server:", err.message);
-      if (!isShuttingDown) tryRestart();
-      else { cleanup(); process.exit(1); }
-    });
-
-    server.on("close", (code, signal) => {
-      if (isShuttingDown || code === 0) {
-        process.exit(code || 0);
-        return;
-      }
-      tryRestart(code, signal);
-    });
-  }
-
-  function tryRestart(code, signal) {
-    const aliveMs = Date.now() - serverStartTime;
-    // Reset counter if last run was stable
-    if (aliveMs >= RESTART_RESET_MS) restartCount = 0;
-
-    if (restartCount >= MAX_RESTARTS) {
-      console.error(`\n⚠️  Server crashed ${MAX_RESTARTS} times. Disabling MIT and restarting...`);
-      try {
-        const dbPath = path.join(os.homedir(), process.platform === "win32" ? path.join("AppData", "Roaming", "9router", "db.json") : path.join(".9router", "db.json"));
-        if (fs.existsSync(dbPath)) {
-          const db = JSON.parse(fs.readFileSync(dbPath, "utf-8"));
-          if (db.settings) db.settings.mitmEnabled = false;
-          fs.writeFileSync(dbPath, JSON.stringify(db, null, 2));
-        }
-      } catch { /* best effort */ }
-      restartCount = 0;
-      server = spawnServer();
-      attachServerEvents();
-      return;
-    }
-
-    restartCount++;
-    const delay = Math.min(1000 * restartCount, 10000);
-    const exitReason = code !== null && code !== undefined ? `code=${code}` : (signal ? `signal=${signal}` : "code=unknown");
-    console.error(`\n⚠️  Server exited (${exitReason}). Restarting in ${delay / 1000}s... (${restartCount}/${MAX_RESTARTS})`);
-    if (crashLog.length) {
-      const meaningfulLogs = crashLog.filter(l =>
-        !l.includes("[MODULE_TYPELESS_PACKAGE_JSON]") &&
-        !l.includes("Reparsing as ES module") &&
-        !l.includes("To eliminate this warning") &&
-        !l.includes("[DB] better-sqlite3 unavailable")
-      );
-      if (meaningfulLogs.length) {
-        console.error("\n--- Server crash log ---");
-        meaningfulLogs.forEach(l => console.error(l));
-        console.error("--- End crash log ---\n");
-      }
-    }
-
-    setTimeout(() => {
-      server = spawnServer();
-      attachServerEvents();
-    }, delay);
-  }
-
-  attachServerEvents();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabbi696/ezrouter",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "description": "EzRouter CLI - Start and manage EzRouter server (default port 20126)",
   "bin": {
     "ezrouter": "./cli.js",

package/src/cli/commands/connect.js

@@ -7,11 +7,11 @@
  * The password and API key are never printed (key is masked).
  */
 
+const fs = require("fs");
 const os = require("os");
+const path = require("path");
 const { TOOL_IDS, CLAUDE_MODELS, resolveTools } = require("./connectTools");
 
-const DEFAULT_MODEL = "cc/claude-sonnet-5";
-
 const HELP = `
 Usage: ezrouter connect <server-url> [options]
 
@@ -27,14 +27,26 @@ Options:
                          ${TOOL_IDS.join(", ")}, all
   --password <pw>        Dashboard password (or env EZROUTER_PASSWORD / NINE_ROUTER_PASSWORD;
                          prompted if omitted — preferred, keeps it out of shell history)
+  --save                 After a successful login, save the password for this server
+                         to ~/.ezrouter/connect.env (plain text, mode 600) so later
+                         runs skip the prompt. Delete that file to forget it.
   --key-name <name>      API key name to reuse/create (default: cli-<hostname>)
   --api-key <key>        Use this API key, skip login + key lookup
-  --model <model>        Model for non-Claude tools (default: ${DEFAULT_MODEL})
+  --model <model>        Model for all non-Claude tools (default: each tool's own
+                         model on the server, else the server's OpenCode model;
+                         omp needs none — it discovers every server model)
   --fable|--opus|--sonnet|--haiku <model>
                          Override Claude Code model mapping
   --print-env            Also print OpenAI-compatible env vars for other CLIs
   --reset                Remove EzRouter settings from the selected tools and exit
   -h, --help             Show this help
+
+Models come from the server's own CLI-tools config (set on its dashboard).
+Nothing is hardcoded: a Claude tier the server leaves unset is left unset,
+and a non-Claude tool with no model anywhere is skipped. Flags override:
+
+  npx @rabbi696/ezrouter connect http://<server-host>:20126 --tools claude --sonnet cc/claude-sonnet-5-5
+  npx @rabbi696/ezrouter connect http://<server-host>:20126 --tools codex,opencode --model ocg/deepseek-flash
 `;
 
 function parseArgs(argv) {
@@ -52,6 +64,7 @@ function parseArgs(argv) {
       return v;
     };
     if (a === "--password") opts.password = next();
+    else if (a === "--save") opts.save = true;
     else if (a === "--key-name") opts.keyName = next();
     else if (a === "--api-key") opts.apiKey = next();
     else if (a === "--tools") opts.tools = next().split(",");
@@ -79,6 +92,41 @@ function maskKey(key) {
   return `${key.slice(0, 6)}…${key.slice(-4)}`;
 }
 
+// Saved login (`--save`): dotenv file in the CLI data dir, bound to one server so a
+// password is never sent to a different host.
+function savedEnvPath() {
+  if (process.env.DATA_DIR) return path.join(process.env.DATA_DIR, "connect.env");
+  const base = process.platform === "win32"
+    ? path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "ezrouter")
+    : path.join(os.homedir(), ".ezrouter");
+  return path.join(base, "connect.env");
+}
+
+function loadSavedPassword(server) {
+  let text;
+  try { text = fs.readFileSync(savedEnvPath(), "utf8"); } catch { return null; }
+  const env = {};
+  for (const line of text.split(/\r?\n/)) {
+    const m = /^([A-Z_]+)=(.*)$/.exec(line);
+    if (!m) continue;
+    // Values are written JSON-quoted; accept a hand-edited bare value too
+    // rather than crashing the whole command on JSON.parse.
+    try { env[m[1]] = JSON.parse(m[2]); } catch { env[m[1]] = m[2]; }
+  }
+  const srv = env.EZROUTER_SERVER || env.NINE_ROUTER_SERVER;
+  const pw = env.EZROUTER_PASSWORD || env.NINE_ROUTER_PASSWORD;
+  return srv === server && pw ? pw : null;
+}
+
+function savePassword(server, password) {
+  const file = savedEnvPath();
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  const body = `EZROUTER_SERVER=${JSON.stringify(server)}\nEZROUTER_PASSWORD=${JSON.stringify(password)}\n`;
+  fs.writeFileSync(file, body, { mode: 0o600 });
+  fs.chmodSync(file, 0o600); // mode only applies on create; tighten a pre-existing file too
+  return file;
+}
+
 // Enquirer rejects with an empty value on Ctrl+C / Esc.
 class Cancelled extends Error {}
 const prompt = (p) => p.run().catch((err) => { throw err || new Cancelled("Cancelled"); });
@@ -141,6 +189,54 @@ async function getOrCreateApiKey(server, cookie, keyName) {
   return { key: created.data.key, created: true };
 }
 
+// Non-Claude tools that take a single model id (omp discovers all models itself).
+const needsModel = (t) => t.id !== "claude" && t.needsModel !== false;
+
+/**
+ * Model choices the server operator already made, read from the server's own
+ * cli-tools config. Only model ids are taken — never the server's baseUrl or
+ * apiKey, which belong to that host and must not be copied to this machine.
+ * Best-effort: any failure returns {} and the built-in defaults apply.
+ */
+async function fetchServerModels(server, cookie, tools) {
+  const out = { claude: {}, byTool: {}, shared: null };
+  if (!cookie) return out;
+
+  const get = async (route) => {
+    try {
+      const res = await request(`${server}/api/cli-tools/${route}`, { cookie });
+      return res.status === 200 ? res.data : null;
+    } catch {
+      return null; // unreachable/unreadable — caller keeps defaults
+    }
+  };
+
+  if (tools.some((t) => t.id === "claude")) {
+    const env = (await get("claude-settings"))?.settings?.env;
+    for (const m of CLAUDE_MODELS) {
+      if (typeof env?.[m.envKey] === "string" && env[m.envKey]) out.claude[m.flag] = env[m.envKey];
+    }
+  }
+
+  // Each tool's own server config; OpenCode doubles as the shared fallback, so
+  // fetch it even when opencode itself wasn't selected.
+  const { TOOLS } = require("./connectTools");
+  const opencodeTool = TOOLS.find((t) => t.id === "opencode");
+  const wanted = tools.filter((t) => t.route);
+  if (!wanted.includes(opencodeTool) && tools.some(needsModel)) wanted.push(opencodeTool);
+
+  await Promise.all(wanted.map(async (t) => {
+    const data = await get(t.route);
+    if (!data) return;
+    try {
+      const model = await t.serverModel(data);
+      if (model) out.byTool[t.id] = model;
+    } catch { /* malformed config on the server — skip this tool */ }
+  }));
+  out.shared = out.byTool.opencode || null;
+  return out;
+}
+
 async function listModels(server, apiKey) {
   const res = await request(`${server}/v1/models`, { apiKey });
   if (res.status === 401) throw new Error("API key rejected by server (/v1/models returned 401)");
@@ -212,37 +308,76 @@ async function runConnect(argv) {
   }
 
   let apiKey = opts.apiKey;
+  let cookie = null;
   if (apiKey) {
     console.log("• Using provided API key");
   } else {
-    const password = opts.password ?? (await promptPassword());
+    const saved = opts.password ? null : loadSavedPassword(server);
+    if (saved) console.log(`• Using saved password (${savedEnvPath()})`);
+    const password = opts.password ?? saved ?? (await promptPassword());
     console.log(`• Logging in to ${server}`);
-    const cookie = await login(server, password);
+    try {
+      cookie = await login(server, password);
+    } catch (err) {
+      if (saved) err.message += ` — saved password may be stale; delete ${savedEnvPath()} or pass --password`;
+      throw err;
+    }
+    if (opts.save && password !== saved) {
+      console.log(`• Saved password to ${savePassword(server, password)} (plain text, mode 600)`);
+    }
     const result = await getOrCreateApiKey(server, cookie, opts.keyName);
     apiKey = result.key;
     console.log(`• ${result.created ? "Created" : "Reusing"} API key "${opts.keyName}" (${maskKey(apiKey)})`);
   }
 
+  // Models always come from the server's own cli-tools config; flags override.
+  const serverModels = await fetchServerModels(server, cookie, tools);
+  if (!cookie) {
+    console.log("• --api-key given: can't read the server's models (needs a dashboard login) — pass model flags");
+  }
+
   const available = await listModels(server, apiKey);
   const warnMissing = (label, model, flag) => {
-    if (available && !available.has(model)) {
+    // Claude Code's "[1m]" context marker is part of the env value, not the model id.
+    if (available && !available.has(model.replace(/\[1m\]$/, ""))) {
       console.log(`\x1b[33m⚠ ${label}: "${model}" not listed by server — override with ${flag} <model>\x1b[0m`);
     }
   };
 
+  // Claude tier: flag > server value > unset (Claude Code then uses its own default).
   const claudeModels = {};
+  const claudeUnset = [];
   if (tools.some((t) => t.id === "claude")) {
     for (const m of CLAUDE_MODELS) {
-      claudeModels[m.envKey] = opts.models[m.flag] || m.defaultValue;
-      warnMissing(`claude ${m.flag}`, claudeModels[m.envKey], `--${m.flag}`);
+      const model = opts.models[m.flag] || serverModels.claude[m.flag] || null;
+      claudeModels[m.envKey] = model;
+      if (model) warnMissing(`claude ${m.flag}`, model, `--${m.flag}`);
+      else claudeUnset.push(m.flag);
     }
   }
-  const model = opts.model || DEFAULT_MODEL;
-  if (tools.some((t) => t.id !== "claude")) warnMissing("model", model, "--model");
+  // Other tools: --model > that tool's own server model > server's OpenCode model.
+  // No hardcoded fallback — a tool with no model anywhere is skipped.
+  const toolModels = {};
+  const fromOpencode = [];
+  for (const t of tools) {
+    if (!needsModel(t)) continue;
+    toolModels[t.id] = opts.model || serverModels.byTool[t.id] || serverModels.shared || null;
+    if (!opts.model && !serverModels.byTool[t.id] && serverModels.shared) fromOpencode.push(t.id);
+  }
+  for (const m of new Set(Object.values(toolModels).filter(Boolean))) warnMissing("model", m, "--model");
+  if (fromOpencode.length) {
+    console.log(`• ${fromOpencode.join(", ")}: no own model on the server — using its OpenCode model`);
+  }
 
-  const ctx = { baseUrl: server, apiKey, model, claudeModels };
   let failed = 0;
+  let skipped = 0;
   for (const t of tools) {
+    if (needsModel(t) && !toolModels[t.id]) {
+      skipped++;
+      console.log(`⏭  ${t.name}: no model configured on the server — skipped (pass --model <model>)`);
+      continue;
+    }
+    const ctx = { baseUrl: server, apiKey, model: toolModels[t.id], claudeModels };
     try {
       const files = await t.apply(ctx);
       console.log(`✅ ${t.name} → ${files.join(", ")}`);
@@ -253,9 +388,15 @@ async function runConnect(argv) {
   }
   console.log(`   Base URL: ${server}/v1`);
   if (tools.some((t) => t.id === "claude")) {
-    for (const m of CLAUDE_MODELS) console.log(`   ${m.envKey}=${claudeModels[m.envKey]}`);
+    for (const m of CLAUDE_MODELS) {
+      if (claudeModels[m.envKey]) console.log(`   ${m.envKey}=${claudeModels[m.envKey]}`);
+    }
+    if (claudeUnset.length) {
+      console.log(`   Claude ${claudeUnset.join(", ")}: not set on the server — Claude Code's own default applies (or pass --${claudeUnset[0]} <model>)`);
+    }
   }
-  if (tools.some((t) => t.id !== "claude")) console.log(`   Model (other tools): ${model}`);
+  for (const [id, m] of Object.entries(toolModels)) if (m) console.log(`   ${id} model: ${m}`);
+  if (tools.some((t) => t.id === "omp")) console.log("   omp models: every server model, listed under ezrouter in /model");
   console.log(`   Restart the tools to apply. Undo: npx @rabbi696/ezrouter connect --reset --tools ${tools.map((t) => t.id).join(",")}`);
 
   if (opts.printEnv) {
@@ -263,7 +404,8 @@ async function runConnect(argv) {
     console.log(`   OPENAI_BASE_URL=${server}/v1`);
     console.log(`   OPENAI_API_KEY=${apiKey}`);
   }
-  return failed ? 1 : 0;
+  // A skipped tool was not configured, so the run did not do what was asked.
+  return failed || skipped ? 1 : 0;
 }
 
-module.exports = { run, __test__: { parseArgs, normalizeServerUrl, extractAuthCookie, maskKey, Cancelled } };
+module.exports = { run, __test__: { parseArgs, normalizeServerUrl, extractAuthCookie, maskKey, Cancelled, loadSavedPassword, savedEnvPath } };