@jheavenknows/bluerouter 1.0.53 → 1.0.54

package/src/cli/utils/menuHelper.js

@@ -1,156 +1,156 @@
-const { selectMenu } = require("./input");
-
-/**
- * Show a menu with back button at top and handle selection
- * @param {Object} config - Menu configuration
- * @param {string} config.title - Menu title
- * @param {string} config.headerContent - Optional header content
- * @param {Array<{label: string, action: Function}>} config.items - Menu items with actions
- * @param {string} config.backLabel - Back button label (default: "← Back")
- * @param {number} config.defaultIndex - Default selected index (default: 0)
- * @param {Function} config.refresh - Optional refresh function to call after each action
- * @param {Array<string>} config.breadcrumb - Optional breadcrumb path
- * @returns {Promise<void>}
- */
-async function showMenuWithBack(config) {
-  const {
-    title,
-    headerContent = "",
-    items,
-    backLabel = "← Back",
-    defaultIndex = 0,
-    refresh = null,
-    breadcrumb = []
-  } = config;
-
-  while (true) {
-    // Call refresh if provided
-    let refreshedData = null;
-    if (refresh) {
-      refreshedData = await refresh();
-      if (refreshedData === null) {
-        // Refresh failed, exit menu
-        return;
-      }
-    }
-
-    // Build menu items with back at top
-    const menuItems = [
-      { label: backLabel, icon: "☆" },
-      ...items.map(item => ({
-        label: typeof item.label === "function" ? item.label(refreshedData) : item.label,
-        icon: "☆"
-      }))
-    ];
-
-    // Resolve headerContent if it's a function
-    const resolvedHeader = typeof headerContent === "function" 
-      ? await headerContent(refreshedData) 
-      : headerContent;
-
-    const selected = await selectMenu(
-      title,
-      menuItems,
-      defaultIndex,
-      "",
-      resolvedHeader,
-      breadcrumb
-    );
-
-    // Back or ESC
-    if (selected === -1 || selected === 0) {
-      return;
-    }
-
-    // Execute action for selected item
-    const actionIndex = selected - 1;
-    const item = items[actionIndex];
-    
-    if (item && item.action) {
-      const shouldContinue = await item.action(refreshedData);
-      // If action returns false, exit menu
-      if (shouldContinue === false) {
-        return;
-      }
-    }
-  }
-}
-
-/**
- * Show a list menu where items are fetched dynamically
- * @param {Object} config - Menu configuration
- * @param {string} config.title - Menu title
- * @param {string} config.headerContent - Optional header content
- * @param {Function} config.fetchItems - Async function to fetch items array
- * @param {Function} config.formatItem - Function to format each item to {label, data}
- * @param {Function} config.onSelect - Action when item is selected
- * @param {Object} config.createAction - Optional create action {label, action}
- * @param {string} config.backLabel - Back button label
- * @param {Array<string>} config.breadcrumb - Optional breadcrumb path
- * @returns {Promise<void>}
- */
-async function showListMenu(config) {
-  const {
-    title,
-    headerContent = "",
-    fetchItems,
-    formatItem,
-    onSelect,
-    createAction = null,
-    backLabel = "← Back",
-    breadcrumb = []
-  } = config;
-
-  while (true) {
-    // Fetch items
-    const result = await fetchItems();
-    if (!result) {
-      return;
-    }
-
-    const items = result.items || [];
-    const metadata = result.metadata || {};
-
-    // Build menu items
-    const menuItems = [{ label: backLabel, icon: "☆" }];
-    
-    if (createAction) {
-      menuItems.push({ label: createAction.label, icon: "☆" });
-    }
-
-    items.forEach(item => {
-      const formatted = formatItem(item);
-      menuItems.push({ label: formatted, icon: "☆" });
-    });
-
-    const header = typeof headerContent === "function" 
-      ? await headerContent(metadata) 
-      : headerContent;
-
-    const selected = await selectMenu(title, menuItems, 0, "", header, breadcrumb);
-
-    // Back or ESC
-    if (selected === -1 || selected === 0) {
-      return;
-    }
-
-    // Create action
-    if (createAction && selected === 1) {
-      await createAction.action();
-      continue;
-    }
-
-    // Select item
-    const offset = createAction ? 2 : 1;
-    const itemIndex = selected - offset;
-    
-    if (itemIndex >= 0 && itemIndex < items.length) {
-      await onSelect(items[itemIndex]);
-    }
-  }
-}
-
-module.exports = {
-  showMenuWithBack,
-  showListMenu
-};
+const { selectMenu } = require("./input");
+
+/**
+ * Show a menu with back button at top and handle selection
+ * @param {Object} config - Menu configuration
+ * @param {string} config.title - Menu title
+ * @param {string} config.headerContent - Optional header content
+ * @param {Array<{label: string, action: Function}>} config.items - Menu items with actions
+ * @param {string} config.backLabel - Back button label (default: "← Back")
+ * @param {number} config.defaultIndex - Default selected index (default: 0)
+ * @param {Function} config.refresh - Optional refresh function to call after each action
+ * @param {Array<string>} config.breadcrumb - Optional breadcrumb path
+ * @returns {Promise<void>}
+ */
+async function showMenuWithBack(config) {
+  const {
+    title,
+    headerContent = "",
+    items,
+    backLabel = "← Back",
+    defaultIndex = 0,
+    refresh = null,
+    breadcrumb = []
+  } = config;
+
+  while (true) {
+    // Call refresh if provided
+    let refreshedData = null;
+    if (refresh) {
+      refreshedData = await refresh();
+      if (refreshedData === null) {
+        // Refresh failed, exit menu
+        return;
+      }
+    }
+
+    // Build menu items with back at top
+    const menuItems = [
+      { label: backLabel, icon: "☆" },
+      ...items.map(item => ({
+        label: typeof item.label === "function" ? item.label(refreshedData) : item.label,
+        icon: "☆"
+      }))
+    ];
+
+    // Resolve headerContent if it's a function
+    const resolvedHeader = typeof headerContent === "function" 
+      ? await headerContent(refreshedData) 
+      : headerContent;
+
+    const selected = await selectMenu(
+      title,
+      menuItems,
+      defaultIndex,
+      "",
+      resolvedHeader,
+      breadcrumb
+    );
+
+    // Back or ESC
+    if (selected === -1 || selected === 0) {
+      return;
+    }
+
+    // Execute action for selected item
+    const actionIndex = selected - 1;
+    const item = items[actionIndex];
+    
+    if (item && item.action) {
+      const shouldContinue = await item.action(refreshedData);
+      // If action returns false, exit menu
+      if (shouldContinue === false) {
+        return;
+      }
+    }
+  }
+}
+
+/**
+ * Show a list menu where items are fetched dynamically
+ * @param {Object} config - Menu configuration
+ * @param {string} config.title - Menu title
+ * @param {string} config.headerContent - Optional header content
+ * @param {Function} config.fetchItems - Async function to fetch items array
+ * @param {Function} config.formatItem - Function to format each item to {label, data}
+ * @param {Function} config.onSelect - Action when item is selected
+ * @param {Object} config.createAction - Optional create action {label, action}
+ * @param {string} config.backLabel - Back button label
+ * @param {Array<string>} config.breadcrumb - Optional breadcrumb path
+ * @returns {Promise<void>}
+ */
+async function showListMenu(config) {
+  const {
+    title,
+    headerContent = "",
+    fetchItems,
+    formatItem,
+    onSelect,
+    createAction = null,
+    backLabel = "← Back",
+    breadcrumb = []
+  } = config;
+
+  while (true) {
+    // Fetch items
+    const result = await fetchItems();
+    if (!result) {
+      return;
+    }
+
+    const items = result.items || [];
+    const metadata = result.metadata || {};
+
+    // Build menu items
+    const menuItems = [{ label: backLabel, icon: "☆" }];
+    
+    if (createAction) {
+      menuItems.push({ label: createAction.label, icon: "☆" });
+    }
+
+    items.forEach(item => {
+      const formatted = formatItem(item);
+      menuItems.push({ label: formatted, icon: "☆" });
+    });
+
+    const header = typeof headerContent === "function" 
+      ? await headerContent(metadata) 
+      : headerContent;
+
+    const selected = await selectMenu(title, menuItems, 0, "", header, breadcrumb);
+
+    // Back or ESC
+    if (selected === -1 || selected === 0) {
+      return;
+    }
+
+    // Create action
+    if (createAction && selected === 1) {
+      await createAction.action();
+      continue;
+    }
+
+    // Select item
+    const offset = createAction ? 2 : 1;
+    const itemIndex = selected - offset;
+    
+    if (itemIndex >= 0 && itemIndex < items.length) {
+      await onSelect(items[itemIndex]);
+    }
+  }
+}
+
+module.exports = {
+  showMenuWithBack,
+  showListMenu
+};

package/src/cli/utils/modelSelector.js

@@ -1,136 +1,136 @@
-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)
- * @param {Object} options - { excludeCombos?: boolean }
- * @returns {Promise<string|null>} Selected model ID or null if cancelled
- */
-async function selectModelFromList(title, currentValue = "", options = {}) {
-  const { excludeCombos = false } = options;
-  const { combos: rawCombos, groups } = await getAvailableModelsGrouped();
-  const combos = excludeCombos ? [] : rawCombos;
-
-  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 (skipped when excludeCombos is true)
-  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
-};
+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)
+ * @param {Object} options - { excludeCombos?: boolean }
+ * @returns {Promise<string|null>} Selected model ID or null if cancelled
+ */
+async function selectModelFromList(title, currentValue = "", options = {}) {
+  const { excludeCombos = false } = options;
+  const { combos: rawCombos, groups } = await getAvailableModelsGrouped();
+  const combos = excludeCombos ? [] : rawCombos;
+
+  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 (skipped when excludeCombos is true)
+  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
+};