@yina-npm/openrouterx 0.4.80 → 0.5.9

package/src/cli/menus/cliTools.js

@@ -1,5 +1,5 @@
 const api = require("../api/client");
-const { pause } = require("../utils/input");
+const { pause, confirm } = require("../utils/input");
 const { showStatus } = require("../utils/display");
 const { selectModelFromList } = require("../utils/modelSelector");
 const { showMenuWithBack } = require("../utils/menuHelper");
@@ -100,7 +100,7 @@ async function claudeQuickSetup(port) {
  */
 async function claudeSelectModel(modelType, port) {
   const current = await getClaudeModel(modelType.envKey);
-  const selected = await selectModelFromList(`Select ${modelType.name} Model`, current);
+  const selected = await selectModelFromList(`Select ${modelType.name} Model`, current, { excludeCombos: true });
   if (!selected) return;
 
   const env = { [modelType.envKey]: selected };
@@ -216,7 +216,7 @@ async function codexQuickSetup(port) {
   }
 
   // Get model selection
-  const model = await selectModelFromList("Select Codex Model", "cx/claude-sonnet-4-5-20250929");
+  const model = await selectModelFromList("Select Codex Model", "cx/claude-sonnet-4-5-20250929", { excludeCombos: true });
   if (!model) return;
 
   const result = await api.applyCliToolSettings("codex", { baseUrl: endpoint, apiKey, model });
@@ -277,7 +277,7 @@ async function buildDroidHeader() {
     ].join("\n");
   }
 
-  // Extract OpenrouterX custom model config
+  // Extract 9Router custom model config
   const custom = settings?.customModels?.find(m => m.id === "custom:9Router-0");
   const lines = [`Status:   ${COLORS.green}✓ Configured${COLORS.reset}`];
   if (custom?.baseUrl) lines.push(`Endpoint: ${COLORS.cyan}${custom.baseUrl}${COLORS.reset}`);
@@ -299,7 +299,7 @@ async function droidQuickSetup(port) {
     return;
   }
 
-  const model = await selectModelFromList("Select Droid Model", "cc/claude-sonnet-4-5-20250929");
+  const model = await selectModelFromList("Select Droid Model", "cc/claude-sonnet-4-5-20250929", { excludeCombos: true });
   if (!model) return;
 
   const result = await api.applyCliToolSettings("droid", { baseUrl: endpoint, apiKey, model });
@@ -360,7 +360,7 @@ async function buildOpenClawHeader() {
     ].join("\n");
   }
 
-  // Extract OpenrouterX provider config
+  // Extract 9Router provider config
   const provider = settings?.models?.providers?.["9router"];
   const primary = settings?.agents?.defaults?.model?.primary || "";
   const model = primary.startsWith("9router/") ? primary.replace("9router/", "") : (provider?.models?.[0]?.id || "");
@@ -384,7 +384,7 @@ async function openClawQuickSetup(port) {
     return;
   }
 
-  const model = await selectModelFromList("Select OpenClaw Model", "cc/claude-sonnet-4-5-20250929");
+  const model = await selectModelFromList("Select OpenClaw Model", "cc/claude-sonnet-4-5-20250929", { excludeCombos: true });
   if (!model) return;
 
   const result = await api.applyCliToolSettings("openclaw", { baseUrl: endpoint, apiKey, model });
@@ -425,6 +425,154 @@ async function showOpenClawMenu(port, breadcrumb = []) {
   });
 }
 
+// ─── OpenCode CLI ─────────────────────────────────────────────────────────────
+
+async function buildOpenCodeHeader() {
+  const result = await api.getCliToolSettings("opencode");
+  if (!result.success) return `  ${COLORS.red}Failed to load settings${COLORS.reset}`;
+
+  const { installed, has9Router, opencode } = result.data;
+  if (!installed) return `Status:   ${COLORS.red}✗ OpenCode CLI not installed${COLORS.reset}`;
+
+  if (!has9Router) {
+    return [
+      `Status:   ${COLORS.red}✗ Not configured${COLORS.reset}`,
+      `${COLORS.dim}Run "Quick Setup" to configure${COLORS.reset}`
+    ].join("\n");
+  }
+
+  const lines = [`Status:   ${COLORS.green}✓ Configured${COLORS.reset}`];
+  if (opencode?.baseURL) lines.push(`Endpoint: ${COLORS.cyan}${opencode.baseURL}${COLORS.reset}`);
+  if (opencode?.activeModel) lines.push(`Active:   ${COLORS.dim}${opencode.activeModel}${COLORS.reset}`);
+  if (Array.isArray(opencode?.models) && opencode.models.length > 0) {
+    lines.push(`Models:   ${COLORS.dim}${opencode.models.join(", ")}${COLORS.reset}`);
+  }
+  return lines.join("\n");
+}
+
+async function openCodeQuickSetup(port) {
+  const { endpoint } = await getEndpoint(port);
+  const apiKey = await getFirstApiKey();
+
+  if (!apiKey) {
+    showStatus("No API keys found. Create one in API Keys menu first.", "error");
+    await pause();
+    return;
+  }
+
+  // Pick first model (also becomes active model by default)
+  const firstModel = await selectModelFromList("Select Active Model (OpenCode)", "", { excludeCombos: true });
+  if (!firstModel) return;
+
+  const models = [firstModel];
+
+  // Optionally add more models
+  while (true) {
+    const more = await confirm(`Add another model? (current: ${models.length})`);
+    if (!more) break;
+    const next = await selectModelFromList(`Add Model #${models.length + 1}`, models.join(", "), { excludeCombos: true });
+    if (!next) break;
+    if (!models.includes(next)) models.push(next);
+  }
+
+  // Optional subagent model
+  let subagentModel = firstModel;
+  const wantSubagent = await confirm(`Set a different subagent model? (default: ${firstModel})`);
+  if (wantSubagent) {
+    const picked = await selectModelFromList("Select Subagent Model", firstModel, { excludeCombos: true });
+    if (picked) subagentModel = picked;
+  }
+
+  const result = await api.applyCliToolSettings("opencode", {
+    baseUrl: endpoint,
+    apiKey,
+    models,
+    activeModel: firstModel,
+    subagentModel,
+  });
+  showStatus(result.success ? "OpenCode setup completed!" : `Failed: ${result.error}`, result.success ? "success" : "error");
+  await pause();
+}
+
+async function openCodeReset() {
+  const result = await api.resetCliToolSettings("opencode");
+  showStatus(result.success ? "OpenCode settings reset!" : `Failed: ${result.error}`, result.success ? "success" : "error");
+  await pause();
+}
+
+async function showOpenCodeMenu(port, breadcrumb = []) {
+  await showMenuWithBack({
+    title: "💻 OpenCode CLI Settings",
+    breadcrumb,
+    headerContent: buildOpenCodeHeader,
+    refresh: async () => ({}),
+    items: [
+      { label: "⚡ Quick Setup", action: async () => { await openCodeQuickSetup(port); return true; } },
+      { label: "Reset to Default", action: async () => { await openCodeReset(); return true; } }
+    ]
+  });
+}
+
+// ─── Hermes Agent ─────────────────────────────────────────────────────────────
+
+async function buildHermesHeader() {
+  const result = await api.getCliToolSettings("hermes");
+  if (!result.success) return `  ${COLORS.red}Failed to load settings${COLORS.reset}`;
+
+  const { installed, has9Router, settings } = result.data;
+  if (!installed) return `Status:   ${COLORS.red}✗ Hermes Agent not installed${COLORS.reset}`;
+
+  if (!has9Router) {
+    return [
+      `Status:   ${COLORS.red}✗ Not configured${COLORS.reset}`,
+      `${COLORS.dim}Run "Quick Setup" to configure${COLORS.reset}`
+    ].join("\n");
+  }
+
+  const model = settings?.model || {};
+  const lines = [`Status:   ${COLORS.green}✓ Configured${COLORS.reset}`];
+  if (model.base_url) lines.push(`Endpoint: ${COLORS.cyan}${model.base_url}${COLORS.reset}`);
+  if (model.default)  lines.push(`Model:    ${COLORS.dim}${model.default}${COLORS.reset}`);
+  return lines.join("\n");
+}
+
+async function hermesQuickSetup(port) {
+  const { endpoint } = await getEndpoint(port);
+  const apiKey = await getFirstApiKey();
+
+  if (!apiKey) {
+    showStatus("No API keys found. Create one in API Keys menu first.", "error");
+    await pause();
+    return;
+  }
+
+  const model = await selectModelFromList("Select Hermes Model", "", { excludeCombos: true });
+  if (!model) return;
+
+  const result = await api.applyCliToolSettings("hermes", { baseUrl: endpoint, apiKey, model });
+  showStatus(result.success ? "Hermes setup completed!" : `Failed: ${result.error}`, result.success ? "success" : "error");
+  await pause();
+}
+
+async function hermesReset() {
+  const result = await api.resetCliToolSettings("hermes");
+  showStatus(result.success ? "Hermes settings reset!" : `Failed: ${result.error}`, result.success ? "success" : "error");
+  await pause();
+}
+
+async function showHermesMenu(port, breadcrumb = []) {
+  await showMenuWithBack({
+    title: "⚡ Hermes Agent Settings",
+    breadcrumb,
+    headerContent: buildHermesHeader,
+    refresh: async () => ({}),
+    items: [
+      { label: "⚡ Quick Setup", action: async () => { await hermesQuickSetup(port); return true; } },
+      { label: "Reset to Default", action: async () => { await hermesReset(); return true; } }
+    ]
+  });
+}
+
 // ─── Main CLI Tools Menu ──────────────────────────────────────────────────────
 
 /**
@@ -437,7 +585,7 @@ async function showCliToolsMenu(port, breadcrumb = []) {
   await showMenuWithBack({
     title: "🔧 CLI Tools",
     breadcrumb,
-    headerContent: `Configure CLI tools to use OpenrouterX\nEndpoint: ${endpoint}`,
+    headerContent: `Configure CLI tools to use 9Router\nEndpoint: ${endpoint}`,
     items: [
       {
         label: "Claude Code",
@@ -454,6 +602,14 @@ async function showCliToolsMenu(port, breadcrumb = []) {
       {
         label: "Open Claw",
         action: async () => { await showOpenClawMenu(port, [...breadcrumb, "Open Claw"]); return true; }
+      },
+      {
+        label: "OpenCode",
+        action: async () => { await showOpenCodeMenu(port, [...breadcrumb, "OpenCode"]); return true; }
+      },
+      {
+        label: "Hermes",
+        action: async () => { await showHermesMenu(port, [...breadcrumb, "Hermes"]); return true; }
       }
     ]
   });

package/src/cli/menus/providers.js

@@ -53,13 +53,15 @@ const PROVIDER_MODELS = {
     { id: "glm-4.7" },
   ],
   ag: [
-    { id: "gemini-3-pro-low" },
-    { id: "gemini-3-pro-high" },
+    { id: "gemini-3-flash-agent" },
+    { id: "gemini-3.5-flash-low" },
+    { id: "gemini-3.5-flash-extra-low" },
+    { id: "gemini-pro-agent" },
+    { id: "gemini-3.1-pro-low" },
+    { id: "claude-sonnet-4-6" },
+    { id: "claude-opus-4-6-thinking" },
+    { id: "gpt-oss-120b-medium" },
     { id: "gemini-3-flash" },
-    { id: "gemini-2.5-flash" },
-    { id: "claude-sonnet-4-5" },
-    { id: "claude-sonnet-4-5-thinking" },
-    { id: "claude-opus-4-5-thinking" },
   ],
   gh: [
     { id: "gpt-5" },
@@ -197,20 +199,39 @@ async function showProvidersMenu(breadcrumb = []) {
     });
   });
 
+  // Custom provider nodes section
+  providerItems.push({
+    label: () => `${COLORS.dim}── Custom Providers ──${COLORS.reset}`,
+    action: async () => true, // separator, no-op
+    isSeparator: true,
+  });
+  providerItems.push({
+    label: (data) => {
+      const count = data.nodeCount || 0;
+      return `Custom Providers - ${count} Configured`;
+    },
+    action: async () => {
+      await showCustomProvidersMenu([...breadcrumb, "Custom Providers"]);
+      return true;
+    }
+  });
+
   await showMenuWithBack({
     title: "🔌 Providers Management",
     breadcrumb,
     refresh: async () => {
-      const response = await api.getProviders();
-      if (!response.success) {
-        showStatus(`Failed to fetch providers: ${response.error}`, "error");
+      const [provRes, nodeRes] = await Promise.all([api.getProviders(), api.getProviderNodes()]);
+      if (!provRes.success) {
+        showStatus(`Failed to fetch providers: ${provRes.error}`, "error");
         await pause();
         return null;
       }
-      const connections = response.data.connections || [];
+      const connections = provRes.data.connections || [];
+      const nodes = nodeRes.success ? (nodeRes.data.nodes || nodeRes.data || []) : [];
       return {
         connections,
-        counts: countConnectionsByProvider(connections)
+        counts: countConnectionsByProvider(connections),
+        nodeCount: nodes.length,
       };
     },
     items: providerItems
@@ -470,7 +491,7 @@ async function handleAddOAuthConnection(providerId) {
   console.log(`  ${COLORS.bold}${COLORS.cyan}2.${COLORS.reset} Complete authorization in browser`);
   console.log();
   console.log(`  ${COLORS.bold}${COLORS.cyan}3.${COLORS.reset} Copy the callback URL from address bar`);
-  console.log(`     ${COLORS.dim}(looks like: http://localhost:20502/callback?code=...)${COLORS.reset}`);
+  console.log(`     ${COLORS.dim}(looks like: http://localhost:20128/callback?code=...)${COLORS.reset}`);
   console.log();
   
   const callbackUrl = await prompt("  Paste callback URL: ");
@@ -606,4 +627,220 @@ async function handleAddDeviceCodeConnection(providerId) {
   await pause();
 }
 
+// ============================================================================
+// CUSTOM PROVIDERS (provider nodes)
+// ============================================================================
+
+const CUSTOM_NODE_TYPES = ["openai-compatible", "anthropic-compatible"];
+const OPENAI_API_TYPES = ["chat", "responses"];
+
+/**
+ * Show custom providers section in main providers menu
+ * @param {Array} nodes - List of provider nodes
+ * @param {Array} connections - All connections
+ * @param {Array<string>} breadcrumb
+ */
+async function showCustomProvidersMenu(breadcrumb = []) {
+  const { showListMenu } = require("../utils/menuHelper");
+
+  await showListMenu({
+    title: "🔧 Custom Providers",
+    breadcrumb,
+    backLabel: "← Back to Providers",
+    fetchItems: async () => {
+      const res = await api.getProviderNodes();
+      if (!res.success) return { items: [] };
+      return { items: res.data.nodes || res.data || [] };
+    },
+    formatItem: (node) => `[${node.prefix}] ${node.name} (${node.type})`,
+    onSelect: async (node) => {
+      await showCustomNodeDetail(node, [...breadcrumb, node.name]);
+    },
+    createAction: {
+      label: "➕ Add Custom Provider",
+      action: async () => {
+        await handleAddCustomNode();
+      }
+    }
+  });
+}
+
+/**
+ * Show detail menu for a custom provider node
+ */
+async function showCustomNodeDetail(node, breadcrumb = []) {
+  await showMenuWithBack({
+    title: `🔧 ${node.name}`,
+    breadcrumb,
+    headerContent: [
+      `Type: ${node.type}`,
+      `Prefix: ${COLORS.cyan}${node.prefix}${COLORS.reset}`,
+      `Base URL: ${COLORS.dim}${node.baseUrl}${COLORS.reset}`,
+    ].join("\n"),
+    items: [
+      {
+        label: "Connections",
+        action: async () => {
+          await showCustomNodeConnections(node, breadcrumb);
+          return true;
+        }
+      },
+      {
+        label: "Edit Node",
+        action: async () => {
+          await handleEditCustomNode(node);
+          return true;
+        }
+      },
+      {
+        label: "Delete Node",
+        action: async () => {
+          const confirmed = await confirm(`Delete "${node.name}" and all its connections?`);
+          if (confirmed) {
+            const res = await api.deleteProviderNode(node.id);
+            if (res.success) {
+              showStatus("Node deleted!", "success");
+            } else {
+              showStatus(`Delete failed: ${res.error}`, "error");
+            }
+            await pause();
+            return false;
+          }
+          return true;
+        }
+      }
+    ]
+  });
+}
+
+/**
+ * Show connections for a custom provider node
+ */
+async function showCustomNodeConnections(node, breadcrumb = []) {
+  const { showListMenu } = require("../utils/menuHelper");
+
+  await showListMenu({
+    title: `🔌 ${node.name} – Connections`,
+    breadcrumb,
+    backLabel: "← Back",
+    fetchItems: async () => {
+      const res = await api.getProviders();
+      if (!res.success) return { items: [] };
+      const all = res.data.connections || [];
+      const items = all.filter(c => c.provider === node.id);
+      return { items };
+    },
+    formatItem: (conn) => {
+      const status = conn.testStatus === "active" ? "✓" : conn.testStatus === "error" ? "✗" : "?";
+      return `${conn.name || "Unnamed"} (${status})`;
+    },
+    onSelect: async (conn) => {
+      await showConnectionActions(conn, node.id, breadcrumb);
+    },
+    createAction: {
+      label: "Add API Key Connection",
+      action: async () => {
+        await handleAddCustomNodeConnection(node);
+      }
+    }
+  });
+}
+
+/**
+ * Add API key connection to a custom provider node
+ */
+async function handleAddCustomNodeConnection(node) {
+  clearScreen();
+  console.log(`\n➕ Add Connection to ${node.name}\n`);
+
+  const name = await prompt("Connection Name: ");
+  if (!name) { showStatus("Cancelled", "warning"); await pause(); return; }
+
+  const apiKey = await prompt("API Key: ");
+  if (!apiKey) { showStatus("Cancelled", "warning"); await pause(); return; }
+
+  showStatus("Creating connection...", "info");
+  const res = await api.createApiKeyProvider({ provider: node.id, name, apiKey });
+
+  showStatus(res.success ? "✓ Connection created!" : `✗ Failed: ${res.error}`, res.success ? "success" : "error");
+  await pause();
+}
+
+/**
+ * Handle adding a new custom provider node
+ */
+async function handleAddCustomNode() {
+  clearScreen();
+  console.log("\n➕ Add Custom Provider\n");
+
+  // Step 1: Select type
+  const typeChoices = CUSTOM_NODE_TYPES.map((t, i) => `  ${i + 1}. ${t}`).join("\n");
+  console.log(`Select type:\n${typeChoices}\n`);
+  const typeInput = await prompt("Type (1/2): ");
+  const typeIdx = parseInt(typeInput) - 1;
+  if (isNaN(typeIdx) || !CUSTOM_NODE_TYPES[typeIdx]) {
+    showStatus("Cancelled", "warning"); await pause(); return;
+  }
+  const type = CUSTOM_NODE_TYPES[typeIdx];
+
+  // Step 2: Inputs
+  const name = await prompt("Name: ");
+  if (!name) { showStatus("Cancelled", "warning"); await pause(); return; }
+
+  const prefix = await prompt("Prefix (used in model IDs, e.g. myapi): ");
+  if (!prefix) { showStatus("Cancelled", "warning"); await pause(); return; }
+
+  const baseUrl = await prompt("Base URL (e.g. https://api.example.com/v1): ");
+  if (!baseUrl) { showStatus("Cancelled", "warning"); await pause(); return; }
+
+  // Step 3: API type (OpenAI only)
+  let apiType;
+  if (type === "openai-compatible") {
+    const apiTypeChoices = OPENAI_API_TYPES.map((t, i) => `  ${i + 1}. ${t}`).join("\n");
+    console.log(`\nAPI Type:\n${apiTypeChoices}\n`);
+    const apiTypeInput = await prompt("API Type (1/2, default 1): ");
+    const apiTypeIdx = parseInt(apiTypeInput) - 1;
+    apiType = OPENAI_API_TYPES[apiTypeIdx] || "chat";
+  }
+
+  showStatus("Creating provider node...", "info");
+  const body = { name, prefix, baseUrl, type, ...(apiType && { apiType }) };
+  const res = await api.createProviderNode(body);
+
+  showStatus(res.success ? "✓ Provider created!" : `✗ Failed: ${res.error}`, res.success ? "success" : "error");
+  await pause();
+}
+
+/**
+ * Handle editing a custom provider node
+ */
+async function handleEditCustomNode(node) {
+  clearScreen();
+  console.log(`\n✏️  Edit ${node.name}\n`);
+  console.log(`${COLORS.dim}Leave blank to keep current value${COLORS.reset}\n`);
+
+  const name = await prompt(`Name (${node.name}): `);
+  const baseUrl = await prompt(`Base URL (${node.baseUrl}): `);
+  const prefix = await prompt(`Prefix (${node.prefix}): `);
+
+  const updates = {};
+  if (name && name.trim()) updates.name = name.trim();
+  if (baseUrl && baseUrl.trim()) updates.baseUrl = baseUrl.trim();
+  if (prefix && prefix.trim()) updates.prefix = prefix.trim();
+
+  if (!Object.keys(updates).length) {
+    showStatus("No changes", "warning"); await pause(); return;
+  }
+
+  showStatus("Updating...", "info");
+  const res = await api.updateProviderNode(node.id, updates);
+  if (res.success) {
+    Object.assign(node, updates);
+    showStatus("✓ Updated!", "success");
+  } else {
+    showStatus(`✗ Failed: ${res.error}`, "error");
+  }
+  await pause();
+}
+
 module.exports = { showProvidersMenu };