9router 0.5.86 → 0.5.95

package/src/cli/commands/connectTools.js

@@ -0,0 +1,338 @@
+/**
+ * Per-tool config writers for `9router connect`. File layout and keys mirror
+ * the dashboard routes in src/app/api/cli-tools/<tool>-settings/route.js so a
+ * tool configured here looks identical to one applied from the dashboard.
+ *
+ * Each tool: { id, name, paths(), apply(ctx) → string[] written, reset() → string[] touched }
+ * ctx: { baseUrl (origin, no /v1), apiKey, model, claudeModels: { envKey: model } }
+ */
+
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+
+const home = () => os.homedir();
+const v1 = (baseUrl) => (baseUrl.endsWith("/v1") ? baseUrl : `${baseUrl}/v1`);
+
+// Drop trailing commas (JSONC) outside string literals, so values like "a,}" survive.
+function stripTrailingCommas(text) {
+  return text.replace(/("(?:\\.|[^"\\])*")|,(\s*[}\]])/g, (m, str, tail) => str ?? tail);
+}
+
+function readJson(file) {
+  try {
+    return JSON.parse(stripTrailingCommas(fs.readFileSync(file, "utf8")));
+  } catch (err) {
+    if (err.code === "ENOENT") return null;
+    throw new Error(`Cannot parse ${file}: ${err.message}`);
+  }
+}
+
+// Files hold the API key → owner-only (0600) on POSIX; no-op on Windows.
+const SECRET_MODE = 0o600;
+
+// Rewrite an existing file on reset (no backup, existing mode kept).
+function rewriteFile(file, content) {
+  fs.writeFileSync(file, content, { mode: SECRET_MODE });
+}
+
+// One-time backup of the user's pre-9router file, then write.
+function writeFile(file, content) {
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  const backup = `${file}.bak-9router`;
+  if (fs.existsSync(file) && !fs.existsSync(backup)) {
+    fs.copyFileSync(file, backup);
+    fs.chmodSync(backup, SECRET_MODE);
+  }
+  fs.writeFileSync(file, content, { mode: SECRET_MODE });
+  fs.chmodSync(file, SECRET_MODE); // mode above only applies when creating
+}
+
+const writeJson = (file, data) => writeFile(file, JSON.stringify(data, null, 2));
+
+// confbox is ESM-only; loaded lazily so non-codex runs don't need it.
+async function toml() {
+  return import("confbox");
+}
+
+// ── Claude Code ─────────────────────────────────────────────────────────────
+const CLAUDE_MODELS = [
+  { flag: "fable", envKey: "ANTHROPIC_DEFAULT_FABLE_MODEL", defaultValue: "cc/claude-fable-5" },
+  { flag: "opus", envKey: "ANTHROPIC_DEFAULT_OPUS_MODEL", defaultValue: "cc/claude-opus-5" },
+  { flag: "sonnet", envKey: "ANTHROPIC_DEFAULT_SONNET_MODEL", defaultValue: "cc/claude-sonnet-5" },
+  { flag: "haiku", envKey: "ANTHROPIC_DEFAULT_HAIKU_MODEL", defaultValue: "cc/claude-haiku-4-5-20251001" },
+];
+const CLAUDE_RESET_KEYS = ["ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN", ...CLAUDE_MODELS.map((m) => m.envKey)];
+const claudePath = () => path.join(home(), ".claude", "settings.json");
+
+const claude = {
+  id: "claude",
+  name: "Claude Code",
+  paths: () => [claudePath()],
+  async apply({ baseUrl, apiKey, claudeModels }) {
+    const file = claudePath();
+    const cur = readJson(file) || {};
+    cur.hasCompletedOnboarding = true;
+    cur.env = { ...(cur.env || {}), ANTHROPIC_BASE_URL: v1(baseUrl), ANTHROPIC_AUTH_TOKEN: apiKey, ...claudeModels };
+    writeJson(file, cur);
+    return [file];
+  },
+  async reset() {
+    const file = claudePath();
+    const cur = readJson(file);
+    if (!cur) return [];
+    if (cur.env) {
+      CLAUDE_RESET_KEYS.forEach((k) => delete cur.env[k]);
+      if (Object.keys(cur.env).length === 0) delete cur.env;
+    }
+    rewriteFile(file, JSON.stringify(cur, null, 2));
+    return [file];
+  },
+};
+
+// ── OpenAI Codex CLI ────────────────────────────────────────────────────────
+const codexPath = () => path.join(home(), ".codex", "config.toml");
+
+const codex = {
+  id: "codex",
+  name: "OpenAI Codex CLI",
+  paths: () => [codexPath()],
+  async apply({ baseUrl, apiKey, model }) {
+    const { parseTOML, stringifyTOML } = await toml();
+    const file = codexPath();
+    let cfg = {};
+    try { cfg = parseTOML(fs.readFileSync(file, "utf8")) || {}; } catch (err) { if (err.code !== "ENOENT") throw err; }
+    cfg.model = model;
+    cfg.model_provider = "9router";
+    cfg.model_providers = cfg.model_providers || {};
+    // Custom providers ignore auth.json — key must travel as a static header.
+    cfg.model_providers["9router"] = {
+      name: "9Router",
+      base_url: v1(baseUrl),
+      wire_api: "responses",
+      http_headers: { Authorization: `Bearer ${apiKey}` },
+    };
+    cfg.agents = cfg.agents || {};
+    delete cfg.agents.subagent;
+    cfg.agents.default_subagent_model = model;
+    writeFile(file, stringifyTOML(cfg));
+    return [file];
+  },
+  async reset() {
+    const { parseTOML, stringifyTOML } = await toml();
+    const file = codexPath();
+    let cfg;
+    try { cfg = parseTOML(fs.readFileSync(file, "utf8")) || {}; } catch (err) { if (err.code === "ENOENT") return []; throw err; }
+    if (cfg.model_provider === "9router") { delete cfg.model; delete cfg.model_provider; }
+    if (cfg.model_providers) delete cfg.model_providers["9router"];
+    if (cfg.agents) { delete cfg.agents.default_subagent_model; delete cfg.agents.subagent; }
+    for (const k of ["model_providers", "agents"]) {
+      if (cfg[k] && Object.keys(cfg[k]).length === 0) delete cfg[k];
+    }
+    rewriteFile(file, stringifyTOML(cfg));
+    return [file];
+  },
+};
+
+// ── OpenCode ────────────────────────────────────────────────────────────────
+const opencodePath = () => path.join(home(), ".config", "opencode", "opencode.json");
+
+const opencode = {
+  id: "opencode",
+  name: "OpenCode",
+  paths: () => [opencodePath()],
+  async apply({ baseUrl, apiKey, model }) {
+    const file = opencodePath();
+    const cfg = readJson(file) || {};
+    cfg.provider = cfg.provider || {};
+    const p = cfg.provider["9router"] || { npm: "@ai-sdk/openai-compatible", options: {}, models: {} };
+    p.options = { ...p.options, baseURL: v1(baseUrl), apiKey };
+    p.models = p.models || {};
+    p.models[model] = { name: model, modalities: { input: ["text", "image"], output: ["text"] } };
+    cfg.provider["9router"] = p;
+    cfg.model = `9router/${model}`;
+    cfg.agent = cfg.agent || {};
+    cfg.agent.explorer = {
+      description: "Fast explorer subagent for codebase exploration",
+      mode: "subagent",
+      model: `9router/${model}`,
+    };
+    writeJson(file, cfg);
+    return [file];
+  },
+  async reset() {
+    const file = opencodePath();
+    const cfg = readJson(file);
+    if (!cfg) return [];
+    if (cfg.provider) delete cfg.provider["9router"];
+    if (cfg.model?.startsWith("9router/")) delete cfg.model;
+    if (cfg.agent?.explorer?.model?.startsWith("9router/")) {
+      delete cfg.agent.explorer;
+      if (Object.keys(cfg.agent).length === 0) delete cfg.agent;
+    }
+    rewriteFile(file, JSON.stringify(cfg, null, 2));
+    return [file];
+  },
+};
+
+// ── Factory Droid ───────────────────────────────────────────────────────────
+const droidPath = () => path.join(home(), ".factory", "settings.json");
+const isDroid9r = (m) => m.id?.startsWith("custom:9Router");
+
+const droid = {
+  id: "droid",
+  name: "Factory Droid",
+  paths: () => [droidPath()],
+  async apply({ baseUrl, apiKey, model }) {
+    const file = droidPath();
+    const cfg = readJson(file) || {};
+    const others = (cfg.customModels || []).filter((m) => !isDroid9r(m));
+    cfg.customModels = [
+      {
+        model,
+        id: "custom:9Router-0",
+        index: 0,
+        baseUrl: v1(baseUrl),
+        apiKey,
+        displayName: model,
+        maxOutputTokens: 131072,
+        noImageSupport: false,
+        provider: "openai",
+      },
+      ...others,
+    ];
+    cfg.customModels.forEach((m, i) => { m.index = i; });
+    writeJson(file, cfg);
+    return [file];
+  },
+  async reset() {
+    const file = droidPath();
+    const cfg = readJson(file);
+    if (!cfg) return [];
+    if (cfg.customModels) {
+      cfg.customModels = cfg.customModels.filter((m) => !isDroid9r(m));
+      if (cfg.customModels.length === 0) delete cfg.customModels;
+    }
+    rewriteFile(file, JSON.stringify(cfg, null, 2));
+    return [file];
+  },
+};
+
+// ── Crush ───────────────────────────────────────────────────────────────────
+const crushPath = () => path.join(process.env.XDG_CONFIG_HOME || path.join(home(), ".config"), "crush", "crush.json");
+
+const crush = {
+  id: "crush",
+  name: "Crush",
+  paths: () => [crushPath()],
+  async apply({ baseUrl, apiKey, model }) {
+    const file = crushPath();
+    const cfg = readJson(file) || {};
+    cfg.providers = cfg.providers || {};
+    cfg.providers["9router"] = {
+      type: "openai-compat",
+      base_url: v1(baseUrl),
+      api_key: apiKey,
+      models: [{ id: model, name: model, context_window: 128000 }],
+    };
+    writeJson(file, cfg);
+    return [file];
+  },
+  async reset() {
+    const file = crushPath();
+    const cfg = readJson(file);
+    if (!cfg?.providers?.["9router"]) return [];
+    delete cfg.providers["9router"];
+    if (Object.keys(cfg.providers).length === 0) delete cfg.providers;
+    rewriteFile(file, JSON.stringify(cfg, null, 2));
+    return [file];
+  },
+};
+
+// ── Kilo Code (CLI auth only; VS Code settings left to the dashboard) ───────
+const kiloPath = () => path.join(home(), ".local", "share", "kilo", "auth.json");
+
+const kilo = {
+  id: "kilo",
+  name: "Kilo Code CLI",
+  paths: () => [kiloPath()],
+  async apply({ baseUrl, apiKey, model }) {
+    const file = kiloPath();
+    const auth = readJson(file) || {};
+    auth["openai-compatible"] = { type: "api-key", apiKey, baseUrl: v1(baseUrl), model };
+    writeJson(file, auth);
+    return [file];
+  },
+  async reset() {
+    const file = kiloPath();
+    const auth = readJson(file);
+    if (!auth) return [];
+    delete auth["openai-compatible"];
+    delete auth["9router"];
+    rewriteFile(file, JSON.stringify(auth, null, 2));
+    return [file];
+  },
+};
+
+// ── Cline CLI ───────────────────────────────────────────────────────────────
+const clineDir = () => path.join(home(), ".cline", "data");
+const clineState = () => path.join(clineDir(), "globalState.json");
+const clineSecrets = () => path.join(clineDir(), "secrets.json");
+
+const cline = {
+  id: "cline",
+  name: "Cline CLI",
+  paths: () => [clineState(), clineSecrets()],
+  async apply({ baseUrl, apiKey, model }) {
+    const state = readJson(clineState()) || {};
+    state.actModeApiProvider = "openai";
+    state.planModeApiProvider = "openai";
+    state.openAiBaseUrl = baseUrl; // Cline expects base WITHOUT /v1
+    state.openAiModelId = model;
+    state.planModeOpenAiModelId = model;
+    writeJson(clineState(), state);
+    const secrets = readJson(clineSecrets()) || {};
+    secrets.openAiApiKey = apiKey;
+    writeJson(clineSecrets(), secrets);
+    return [clineState(), clineSecrets()];
+  },
+  async reset() {
+    const state = readJson(clineState());
+    if (!state) return [];
+    if (state.actModeApiProvider === "openai") {
+      delete state.openAiBaseUrl;
+      delete state.openAiModelId;
+      delete state.planModeOpenAiModelId;
+      state.actModeApiProvider = "cline";
+      state.planModeApiProvider = "cline";
+    }
+    rewriteFile(clineState(), JSON.stringify(state, null, 2));
+    const touched = [clineState()];
+    const secrets = readJson(clineSecrets());
+    if (secrets) {
+      delete secrets.openAiApiKey;
+      rewriteFile(clineSecrets(), JSON.stringify(secrets, null, 2));
+      touched.push(clineSecrets());
+    }
+    return touched;
+  },
+};
+
+const TOOLS = [claude, codex, opencode, droid, crush, kilo, cline];
+const TOOL_IDS = TOOLS.map((t) => t.id);
+const TOOL_ALIASES = { "claude-code": "claude", "claudecode": "claude", "factory": "droid", "kilocode": "kilo" };
+
+function resolveTools(list) {
+  const ids = new Set();
+  for (const raw of list) {
+    const id = String(raw).trim().toLowerCase();
+    if (!id) continue;
+    if (id === "all") { TOOL_IDS.forEach((t) => ids.add(t)); continue; }
+    const real = TOOL_ALIASES[id] || id;
+    if (!TOOL_IDS.includes(real)) throw new Error(`Unknown tool "${raw}". Supported: ${TOOL_IDS.join(", ")}, all`);
+    ids.add(real);
+  }
+  return TOOLS.filter((t) => ids.has(t.id));
+}
+
+module.exports = { TOOLS, TOOL_IDS, CLAUDE_MODELS, resolveTools, __test__: { stripTrailingCommas } };

package/src/cli/menus/providers.js

@@ -138,11 +138,12 @@ const OAUTH_PROVIDERS = {
   iflow: { id: "iflow", alias: "if", name: "iFlow AI" },
   qwen: { id: "qwen", alias: "qw", name: "Qwen Code" },
   kiro: { id: "kiro", alias: "kr", name: "Kiro AI" },
+  glm: { id: "glm", alias: "glm", name: "Zai GLM Coding" },
 };
 
 const APIKEY_PROVIDERS = {
   openrouter: { id: "openrouter", name: "OpenRouter" },
-  glm: { id: "glm", name: "GLM Coding" },
+  glm: { id: "glm", name: "Zai GLM Coding" },
   minimax: { id: "minimax", name: "Minimax Coding" },
   kimi: { id: "kimi", name: "Kimi" },
   openai: { id: "openai", name: "OpenAI" },
@@ -399,7 +400,7 @@ async function showConnectionActions(connection, providerId, breadcrumb = []) {
  * @param {string} authType - "oauth" or "apikey"
  */
 // Providers that use Device Code Flow (terminal-based polling)
-const DEVICE_CODE_PROVIDERS = ["github", "qwen", "kiro"];
+const DEVICE_CODE_PROVIDERS = ["github", "qwen", "kiro", "glm"];
 
 /**
  * Handle adding new connection - auto-detect flow type

package/src/cli/tray/tray.js

@@ -141,11 +141,14 @@ function initWindowsTray(options) {
 /**
  * macOS/Linux tray via systray binary
  *
- * Prefers `systray2` (active fork of `systray`, ships newer
- * getlantern/systray-portable binaries that work on macOS 14+ and Apple
- * Silicon under Rosetta). Falls back to legacy `systray@1.0.5` if systray2
- * is not available, though that binary's Mach-O headers are rejected by
- * modern dyld and the icon will not appear.
+ * Prefers `systray2`, the active fork of `systray`. Both ship only an x86_64
+ * `tray_darwin_release` and select it by process.platform alone, so on Apple
+ * Silicon the tray runs under Rosetta 2 and fails with EBADARCH when Rosetta is
+ * absent. hooks/trayRuntime.js overlays a native arm64 build over that file to
+ * avoid the dependency; the fallbacks below are Intel-only.
+ *
+ * Falls back to legacy `systray@1.0.5` if systray2 is unavailable, though that
+ * binary's Mach-O headers are rejected by modern dyld and no icon will appear.
  */
 function resolveSystray() {
   let runtimeDir = null;

package/src/cli/utils/modelSelector.js

@@ -2,24 +2,26 @@ const api = require("../api/client");
 const { prompt } = require("./input");
 const { clearScreen } = require("./display");
 
-// Provider alias order: OAuth first, then API Key (matches ModelSelectModal)
+// Provider alias order: OAuth first, then Free, then API Key
 const PROVIDER_ALIAS_ORDER = [
-  "cc", "ag", "cx", "if", "qw", "gc", "gh", "kr",
+  "cc", "ag", "cx", "if", "qw", "gc", "gh", "kr", "oc",
   "openrouter", "glm", "kimi", "minimax", "openai", "anthropic", "gemini"
 ];
 
 // Alias to display name mapping
 const PROVIDER_ALIAS_NAMES = {
   cc: "Claude Code",
-  ag: "Antigravity", 
+  ag: "Antigravity",
   cx: "OpenAI Codex",
   if: "iFlow AI",
   qw: "Qwen Code",
   gc: "Gemini CLI",
   gh: "GitHub Copilot",
   kr: "Kiro AI",
+  oc: "OpenCode Free",
+  opencode: "OpenCode Free",
   openrouter: "OpenRouter",
-  glm: "GLM Coding",
+  glm: "Zai GLM Coding",
   kimi: "Kimi Coding",
   minimax: "Minimax Coding",
   openai: "OpenAI",
@@ -27,30 +29,78 @@ const PROVIDER_ALIAS_NAMES = {
   gemini: "Gemini"
 };
 
+const PROVIDER_ID_TO_ALIAS = {
+  claude: "cc",
+  codex: "cx",
+  "gemini-cli": "gc",
+  github: "gh",
+  antigravity: "ag",
+  iflow: "if",
+  qwen: "qw",
+  kiro: "kr",
+  cursor: "cu",
+  cline: "cline",
+  clinepass: "clinepass",
+  qoder: "qd",
+  "qoder-cn": "qd",
+  gitlab: "gitlab",
+  "codebuddy-cn": "cb",
+  "codebuddy-intl": "cbai",
+  kimchi: "kimchi",
+  "grok-cli": "grok-cli",
+  trae: "trae",
+  windsurf: "windsurf",
+  zed: "zed",
+  opencode: "oc",
+  "opencode-go": "ocg",
+  "opencode-zen": "ocz",
+};
+
+// Providers usable without stored credentials
+const NO_AUTH_PROVIDERS = new Set(["opencode", "oc"]);
+
 /**
- * Get all available models grouped by provider + combos
+ * Get all available models grouped by provider + combos (filtered by active connections)
  * @returns {Promise<{combos: Array, groups: Object}>}
  */
 async function getAvailableModelsGrouped() {
-  const result = await api.getAvailableModels();
-  if (!result.success) return { combos: [], groups: {} };
-  
-  const models = result.data?.data || [];
+  const [modelsResult, providersResult] = await Promise.all([
+    api.getAvailableModels(),
+    api.getProviders()
+  ]);
+
+  if (!modelsResult.success) return { combos: [], groups: {} };
+
+  const connections = providersResult.success ? (providersResult.data?.connections || []) : [];
+  const activeAliases = new Set(NO_AUTH_PROVIDERS);
+
+  connections.forEach(conn => {
+    if (conn.isActive === false) return;
+    const p = conn.provider;
+    if (!p) return;
+    activeAliases.add(p);
+    const alias = conn.providerSpecificData?.prefix || PROVIDER_ID_TO_ALIAS[p] || p;
+    activeAliases.add(alias);
+  });
+
+  const models = modelsResult.data?.data || [];
   const combos = [];
   const groups = {};
-  
+
   models.forEach(m => {
     if (m.owned_by === "combo") {
       combos.push(m.id);
     } else {
       const provider = m.owned_by;
+      // Only keep connected providers or noAuth providers
+      if (!activeAliases.has(provider)) return;
       if (!groups[provider]) {
         groups[provider] = [];
       }
       groups[provider].push(m.id);
     }
   });
-  
+
   return { combos, groups };
 }
 
@@ -68,6 +118,19 @@ async function selectModelFromList(title, currentValue = "", options = {}) {
 
   const totalModels = combos.length + Object.values(groups).flat().length;
   if (totalModels === 0) {
+    clearScreen();
+    console.log(`\n🎯 ${title}`);
+    console.log("=".repeat(50));
+    console.log("\n  No connected providers found.");
+    console.log("  Please connect a provider in Providers menu first.\n");
+    console.log("  m. ✍️  Enter custom model ID");
+    console.log("  0. Cancel\n");
+    const act = await prompt("Select option (m/0): ");
+    const trimmed = act.trim();
+    if (trimmed.toLowerCase() === "m") {
+      const custom = await prompt("Enter custom model ID: ");
+      return custom.trim() || null;
+    }
     return null;
   }