9router 0.2.49 → 0.2.50

package/src/cli/utils/modelSelector.js

@@ -0,0 +1,133 @@
+const api = require("../api/client");
+const { prompt } = require("./input");
+const { clearScreen } = require("./display");
+
+// Provider alias order: OAuth first, then API Key (matches ModelSelectModal)
+const PROVIDER_ALIAS_ORDER = [
+  "cc", "ag", "cx", "if", "qw", "gc", "gh", "kr",
+  "openrouter", "glm", "kimi", "minimax", "openai", "anthropic", "gemini"
+];
+
+// Alias to display name mapping
+const PROVIDER_ALIAS_NAMES = {
+  cc: "Claude Code",
+  ag: "Antigravity", 
+  cx: "OpenAI Codex",
+  if: "iFlow AI",
+  qw: "Qwen Code",
+  gc: "Gemini CLI",
+  gh: "GitHub Copilot",
+  kr: "Kiro AI",
+  openrouter: "OpenRouter",
+  glm: "GLM Coding",
+  kimi: "Kimi Coding",
+  minimax: "Minimax Coding",
+  openai: "OpenAI",
+  anthropic: "Anthropic",
+  gemini: "Gemini"
+};
+
+/**
+ * Get all available models grouped by provider + combos
+ * @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 combos = [];
+  const groups = {};
+  
+  models.forEach(m => {
+    if (m.owned_by === "combo") {
+      combos.push(m.id);
+    } else {
+      const provider = m.owned_by;
+      if (!groups[provider]) {
+        groups[provider] = [];
+      }
+      groups[provider].push(m.id);
+    }
+  });
+  
+  return { combos, groups };
+}
+
+/**
+ * Display model list and prompt for selection
+ * @param {string} title - Title to display
+ * @param {string} currentValue - Current selected value (optional)
+ * @returns {Promise<string|null>} Selected model ID or null if cancelled
+ */
+async function selectModelFromList(title, currentValue = "") {
+  const { combos, groups } = await getAvailableModelsGrouped();
+  
+  const totalModels = combos.length + Object.values(groups).flat().length;
+  if (totalModels === 0) {
+    return null;
+  }
+  
+  // Build flat list for selection
+  const allModels = [];
+  
+  // Display
+  clearScreen();
+  console.log(`\n🎯 ${title}`);
+  console.log("=".repeat(50));
+  if (currentValue) {
+    console.log(`Current: ${currentValue}\n`);
+  } else {
+    console.log();
+  }
+  
+  let idx = 1;
+  
+  // Combos first
+  if (combos.length > 0) {
+    console.log("[Combos]");
+    combos.forEach(combo => {
+      console.log(`  ${idx}. ${combo}`);
+      allModels.push(combo);
+      idx++;
+    });
+    console.log();
+  }
+  
+  // Provider groups in order (by alias)
+  const sortedProviders = Object.keys(groups).sort((a, b) => {
+    const idxA = PROVIDER_ALIAS_ORDER.indexOf(a);
+    const idxB = PROVIDER_ALIAS_ORDER.indexOf(b);
+    return (idxA === -1 ? 999 : idxA) - (idxB === -1 ? 999 : idxB);
+  });
+  
+  sortedProviders.forEach(provider => {
+    const providerName = PROVIDER_ALIAS_NAMES[provider] || provider;
+    console.log(`[${providerName}]`);
+    groups[provider].forEach(model => {
+      console.log(`  ${idx}. ${model}`);
+      allModels.push(model);
+      idx++;
+    });
+    console.log();
+  });
+  
+  console.log("  0. Cancel\n");
+  
+  // Prompt for number input
+  const input = await prompt("Enter number: ");
+  const num = parseInt(input, 10);
+  
+  if (isNaN(num) || num === 0 || num < 0 || num > allModels.length) {
+    return null;
+  }
+  
+  return allModels[num - 1];
+}
+
+module.exports = {
+  selectModelFromList,
+  getAvailableModelsGrouped,
+  PROVIDER_ALIAS_ORDER,
+  PROVIDER_ALIAS_NAMES
+};

package/hooks/model-websearch.cjs

@@ -1,319 +0,0 @@
-#!/usr/bin/env node
-/**
- * 9ROUTER WebSearch Hook - Model-based WebSearch via API
- *
- * Intercepts Claude's WebSearch tool and executes search via 9ROUTER API.
- * Reads configuration from ~/.claude/settings.json (set by dashboard).
- *
- * Environment Variables (from settings.json):
- *   ANTHROPIC_BASE_URL     - API endpoint URL
- *   ANTHROPIC_AUTH_TOKEN   - API authentication token
- *   9ROUTER_WEBSEARCH_MODEL   - Model to use for search (e.g., gemini/gemini-2.5-flash)
- *
- * Exit codes:
- *   0 - Allow tool (pass-through to native WebSearch)
- *   2 - Block tool (deny with results/message)
- */
-
-const https = require("https");
-const http = require("http");
-const fs = require("fs");
-const path = require("path");
-const os = require("os");
-
-// ============================================================================
-// CONFIGURATION
-// ============================================================================
-
-const SEARCH_PROMPT = `You are a helpful assistant. Answer the following question directly using your knowledge. Do NOT use any tools, do NOT output tool calls, do NOT output XML tags like <tool_code> or <invoke>. Just provide a direct, comprehensive text answer.
-
-Instructions:
-1. Provide current, accurate information based on your knowledge
-2. Include relevant URLs/sources when available
-3. Be concise but thorough - prioritize key facts
-4. Focus on factual information from reliable sources
-5. If information may be outdated, note the discrepancy
-6. Format output clearly with sections if the topic is complex
-7. IMPORTANT: Output plain text only, no tool calls
-
-Question: `;
-
-const MIN_VALID_RESPONSE_LENGTH = 20;
-const DEFAULT_TIMEOUT_MS = 60000;
-
-// ============================================================================
-// SETTINGS READER
-// ============================================================================
-
-function getClaudeSettingsPath() {
-  return path.join(os.homedir(), ".claude", "settings.json");
-}
-
-function readSettings() {
-  try {
-    const settingsPath = getClaudeSettingsPath();
-    const content = fs.readFileSync(settingsPath, "utf-8");
-    return JSON.parse(content);
-  } catch {
-    return null;
-  }
-}
-
-function getConfig() {
-  const settings = readSettings();
-  const env = settings?.env || {};
-
-  return {
-    baseUrl: env.ANTHROPIC_BASE_URL || process.env.ANTHROPIC_BASE_URL,
-    authToken: env.ANTHROPIC_AUTH_TOKEN || process.env.ANTHROPIC_AUTH_TOKEN,
-    model: env.9ROUTER_WEBSEARCH_MODEL || process.env.9ROUTER_WEBSEARCH_MODEL || "gemini/gemini-2.5-flash",
-  };
-}
-
-// ============================================================================
-// API CLIENT
-// ============================================================================
-
-function makeRequest(url, options, body) {
-  return new Promise((resolve, reject) => {
-    const urlObj = new URL(url);
-    const isHttps = urlObj.protocol === "https:";
-    const client = isHttps ? https : http;
-
-    const req = client.request(url, options, (res) => {
-      let data = "";
-      res.on("data", (chunk) => (data += chunk));
-      res.on("end", () => {
-        resolve({ status: res.statusCode, data });
-      });
-    });
-
-    req.on("error", reject);
-    req.on("timeout", () => {
-      req.destroy();
-      reject(new Error("Request timeout"));
-    });
-
-    if (body) {
-      req.write(body);
-    }
-    req.end();
-  });
-}
-
-async function searchWithModel(query, config) {
-  const { baseUrl, authToken, model } = config;
-
-  if (!baseUrl) {
-    return { success: false, error: "ANTHROPIC_BASE_URL not configured" };
-  }
-
-  const apiUrl = `${baseUrl}/api/v1/chat/completions`;
-  const prompt = SEARCH_PROMPT + query;
-
-  const requestBody = JSON.stringify({
-    model: model,
-    messages: [{ role: "user", content: prompt }],
-    stream: false,
-    max_tokens: 4096,
-    tool_choice: "none", // Disable tool use, return text directly
-  });
-
-  const headers = {
-    "Content-Type": "application/json",
-    "Content-Length": Buffer.byteLength(requestBody),
-  };
-
-  if (authToken) {
-    headers["Authorization"] = `Bearer ${authToken}`;
-  }
-
-  try {
-    const response = await makeRequest(
-      apiUrl,
-      {
-        method: "POST",
-        headers,
-        timeout: DEFAULT_TIMEOUT_MS,
-      },
-      requestBody
-    );
-
-    if (response.status !== 200) {
-      return {
-        success: false,
-        error: `API returned ${response.status}: ${response.data.slice(0, 200)}`,
-      };
-    }
-
-    const result = JSON.parse(response.data);
-    
-    // Support both OpenAI and Claude response formats
-    let content = "";
-    
-    // OpenAI format: choices[0].message.content
-    if (result.choices?.[0]?.message?.content) {
-      content = result.choices[0].message.content;
-    }
-    // Claude format: content array with type "text"
-    else if (Array.isArray(result.content)) {
-      const textBlock = result.content.find(c => c.type === "text");
-      content = textBlock?.text || "";
-    }
-    // Direct content string
-    else if (typeof result.content === "string") {
-      content = result.content;
-    }
-
-    if (!content || content.length < MIN_VALID_RESPONSE_LENGTH) {
-      return { success: false, error: "Empty or too short response" };
-    }
-
-    return { success: true, content, model };
-  } catch (err) {
-    return { success: false, error: err.message || "Unknown error" };
-  }
-}
-
-// ============================================================================
-// OUTPUT FORMATTERS
-// ============================================================================
-
-function formatSearchResults(query, content, model) {
-  // Keep it simple - just the content, Claude will see the context
-  return content;
-}
-
-function outputSuccess(query, content, model) {
-  const formattedResults = `[WebSearch via ${model}]\nQuery: "${query}"\n\n${content}`;
-
-  // Block tool with results, suppress duplicate output
-  const output = {
-    decision: "block",
-    reason: formattedResults,
-    suppressOutput: true,
-  };
-
-  console.log(JSON.stringify(output));
-  process.exit(0);
-}
-
-function outputError(query, error, model) {
-  const message = [
-    `[WebSearch - ${model} Error]`,
-    "",
-    `Error: ${error}`,
-    "",
-    `Query: "${query}"`,
-    "",
-    "Troubleshooting:",
-    "  - Check ANTHROPIC_BASE_URL in ~/.claude/settings.json",
-    "  - Verify the model is available in your providers",
-    "  - Run 9router dashboard to configure settings",
-  ].join("\n");
-
-  const output = {
-    decision: "block",
-    reason: `WebSearch failed: ${error}`,
-    hookSpecificOutput: {
-      hookEventName: "PreToolUse",
-      permissionDecision: "deny",
-      permissionDecisionReason: message,
-    },
-  };
-
-  console.log(JSON.stringify(output));
-  process.exit(2);
-}
-
-function outputNotConfigured(query) {
-  const message = [
-    "[WebSearch - Not Configured]",
-    "",
-    "WebSearch model is not configured.",
-    "",
-    "To configure:",
-    "  1. Run 9router (or npm run dev)",
-    "  2. Go to Dashboard > CLI Tools",
-    "  3. Set WebSearch Model (e.g., gemini/gemini-2.5-flash)",
-    "  4. Click Apply",
-    "",
-    `Query: "${query}"`,
-  ].join("\n");
-
-  const output = {
-    decision: "block",
-    reason: "WebSearch not configured",
-    hookSpecificOutput: {
-      hookEventName: "PreToolUse",
-      permissionDecision: "deny",
-      permissionDecisionReason: message,
-    },
-  };
-
-  console.log(JSON.stringify(output));
-  process.exit(2);
-}
-
-// ============================================================================
-// MAIN HOOK LOGIC
-// ============================================================================
-
-let input = "";
-process.stdin.setEncoding("utf8");
-process.stdin.on("data", (chunk) => {
-  input += chunk;
-});
-process.stdin.on("end", () => {
-  processHook();
-});
-process.stdin.on("error", () => {
-  process.exit(0);
-});
-
-async function processHook() {
-  try {
-    const data = JSON.parse(input);
-
-    // Only handle WebSearch tool
-    if (data.tool_name !== "WebSearch") {
-      process.exit(0);
-    }
-
-    const query = data.tool_input?.query || "";
-    if (!query) {
-      process.exit(0);
-    }
-
-    const config = getConfig();
-
-    if (!config.baseUrl || !config.model) {
-      outputNotConfigured(query);
-      return;
-    }
-
-    if (process.env.9ROUTER_DEBUG) {
-      console.error(`[9ROUTER Hook] Searching with model: ${config.model}`);
-      console.error(`[9ROUTER Hook] API URL: ${config.baseUrl}`);
-    }
-
-    const result = await searchWithModel(query, config);
-
-    if (result.success) {
-      outputSuccess(query, result.content, result.model);
-    } else {
-      // Fallback to native WebSearch when API fails
-      if (process.env.9ROUTER_DEBUG) {
-        console.error(`[9ROUTER Hook] API failed: ${result.error}, falling back to native WebSearch`);
-      }
-      process.exit(0);
-    }
-  } catch (err) {
-    if (process.env.9ROUTER_DEBUG) {
-      console.error("[9ROUTER Hook] Parse error:", err.message);
-    }
-    // Fallback to native WebSearch on any error
-    process.exit(0);
-  }
-}
-