@ww_nero/mini-cli 1.0.62 → 1.0.67

package/src/config.js

@@ -18,8 +18,13 @@ const DEFAULT_ALLOWED_COMMANDS = [
   'false', 'pip', 'python', 'ps', 'lsof', 'git', 'pandoc'
 ];
 
-const DEFAULT_MAX_TOOL_TOKENS = 65536;
+const DEFAULT_TOOL_RESPONSE_MAX_TOKENS = 65536;
 const DEFAULT_COMPACT_TOKEN_THRESHOLD = 65536;
+const DEFAULT_MCP_TOOL_TIMEOUT_MS = 10 * 60 * 1000;
+const DEFAULT_OUTPUT_MAX_LENGTH = 12000;
+const DEFAULT_EXECUTION_TIMEOUT = 300000;
+const DEFAULT_SERVICE_BOOT_WINDOW = 5000;
+const DEFAULT_LARGE_FILE_LINE_THRESHOLD = 2000;
 const COMPACT_SUMMARY_PROMPT = `请对以下对话进行总结，用于上下文压缩。请按以下格式输出：
 
 ## 问题背景
@@ -86,10 +91,14 @@ const DEFAULT_SETTINGS = {
   mcpServers: {},
   tools: {},
   commands: [],
-  maxToolTokens: DEFAULT_MAX_TOOL_TOKENS,
+  maxToolTokens: DEFAULT_TOOL_RESPONSE_MAX_TOKENS,
   compactTokenThreshold: DEFAULT_COMPACT_TOKEN_THRESHOLD,
   allowedCommands: [...DEFAULT_ALLOWED_COMMANDS],
-  worktrees: 2
+  mcpToolTimeout: DEFAULT_MCP_TOOL_TIMEOUT_MS,
+  outputMaxLength: DEFAULT_OUTPUT_MAX_LENGTH,
+  executionTimeout: DEFAULT_EXECUTION_TIMEOUT,
+  serviceBootWindow: DEFAULT_SERVICE_BOOT_WINDOW,
+  largeFileLineThreshold: DEFAULT_LARGE_FILE_LINE_THRESHOLD
 };
 
 const DEFAULT_MINI_CONTENT = '# 在此填写全局系统指令。\n';
@@ -187,7 +196,11 @@ const normalizePositiveInteger = (value, fallback) => {
 
 const normalizeField = (value) => (typeof value === 'string' ? value.trim() : '');
 const createEndpointSignature = (entry = {}) => {
-  const pick = (key) => normalizeField(entry[key]).toLowerCase();
+  const nameVal = normalizeField(entry.alias || entry.name || entry.model);
+  const pick = (key) => {
+    if (key === 'name') return nameVal.toLowerCase();
+    return normalizeField(entry[key]).toLowerCase();
+  };
   return ['name', 'model', 'baseUrl', 'key'].map(pick).join('::');
 };
 
@@ -336,7 +349,7 @@ const loadSettings = ({ defaultTools = [] } = {}) => {
     commandPath: detectCommandPath(),
     maxToolTokens: normalizePositiveInteger(
       parsed.maxToolTokens,
-      DEFAULT_MAX_TOOL_TOKENS
+      DEFAULT_TOOL_RESPONSE_MAX_TOKENS
     ),
     allowedCommands: (() => {
       const list = ensureArrayOfStrings(parsed.allowedCommands);
@@ -346,9 +359,25 @@ const loadSettings = ({ defaultTools = [] } = {}) => {
       parsed.compactTokenThreshold,
       DEFAULT_COMPACT_TOKEN_THRESHOLD
     ),
-    worktrees: normalizePositiveInteger(
-      parsed.worktrees,
-      DEFAULT_SETTINGS.worktrees
+    mcpToolTimeout: normalizePositiveInteger(
+      parsed.mcpToolTimeout,
+      DEFAULT_MCP_TOOL_TIMEOUT_MS
+    ),
+    outputMaxLength: normalizePositiveInteger(
+      parsed.outputMaxLength,
+      DEFAULT_OUTPUT_MAX_LENGTH
+    ),
+    executionTimeout: normalizePositiveInteger(
+      parsed.executionTimeout,
+      DEFAULT_EXECUTION_TIMEOUT
+    ),
+    serviceBootWindow: normalizePositiveInteger(
+      parsed.serviceBootWindow,
+      DEFAULT_SERVICE_BOOT_WINDOW
+    ),
+    largeFileLineThreshold: normalizePositiveInteger(
+      parsed.largeFileLineThreshold,
+      DEFAULT_LARGE_FILE_LINE_THRESHOLD
     )
   };
 
@@ -370,7 +399,7 @@ module.exports = {
   ensureConfigFiles,
   getConfigPath,
   DEFAULT_ALLOWED_COMMANDS,
-  DEFAULT_MAX_TOOL_TOKENS,
+  DEFAULT_TOOL_RESPONSE_MAX_TOKENS,
   DEFAULT_COMPACT_TOKEN_THRESHOLD,
   COMPACT_SUMMARY_PROMPT
 };

package/src/tools/bash.js

@@ -2,10 +2,6 @@ const { spawn } = require('child_process');
 const { resolveWorkspacePath } = require('../utils/helpers');
 const { DEFAULT_ALLOWED_COMMANDS } = require('../config');
 
-const OUTPUT_MAX_LENGTH = 12000;
-const EXECUTION_TIMEOUT = 300000;
-const SERVICE_RETURN_DELAY = 5000;
-
 // Git 只读命令白名单
 const GIT_READONLY_COMMANDS = ['show', 'diff', 'log', 'status', 'branch', 'tag', 'ls-files', 'ls-tree', 'rev-parse', 'reflog', 'blame', 'shortlog', 'describe', 'config --get', 'config --list', 'remote', 'ls-remote', 'fetch --dry-run', 'grep'];
 
@@ -86,6 +82,10 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
   const allowedCommands = Array.isArray(context.allowedCommands) && context.allowedCommands.length > 0
     ? context.allowedCommands
     : DEFAULT_ALLOWED_COMMANDS;
+
+  const outputMaxLength = context.outputMaxLength || 12000;
+  const executionTimeout = context.executionTimeout || 300000;
+  const serviceBootWindow = context.serviceBootWindow || 5000;
   const commands = splitShellCommands(normalizedCommand);
   if (commands.length === 0) {
     return '未找到有效的命令';
@@ -129,15 +129,15 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
 
     child.stdout.on('data', (data) => {
       stdout += data.toString();
-      if (stdout.length > OUTPUT_MAX_LENGTH) {
-        stdout = stdout.slice(0, OUTPUT_MAX_LENGTH);
+      if (stdout.length > outputMaxLength) {
+        stdout = stdout.slice(0, outputMaxLength);
       }
     });
 
     child.stderr.on('data', (data) => {
       stderr += data.toString();
-      if (stderr.length > OUTPUT_MAX_LENGTH) {
-        stderr = stderr.slice(0, OUTPUT_MAX_LENGTH);
+      if (stderr.length > outputMaxLength) {
+        stderr = stderr.slice(0, outputMaxLength);
       }
     });
 
@@ -169,8 +169,8 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
         const stdOutput = stdout.trim();
         const errOutput = stderr.trim();
         const captured = stdOutput || errOutput ? `\n当前输出:\n${stdOutput}${errOutput ? `\n错误:\n${errOutput}` : ''}` : '\n暂无输出';
-        resolve(`已等待 ${SERVICE_RETURN_DELAY / 1000}s，命令已在后台持续运行（PID: ${child.pid}）。${captured}`);
-      }, SERVICE_RETURN_DELAY);
+        resolve(`已等待 ${serviceBootWindow / 1000}s，命令已在后台持续运行（PID: ${child.pid}）。${captured}`);
+      }, serviceBootWindow);
 
       const serviceErrorHandler = (error) => {
         clearTimeout(timer);
@@ -190,8 +190,8 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
         if (settled) return;
         child.kill('SIGTERM');
         cleanup();
-        resolve('命令执行超时 (超过 300s)');
-      }, EXECUTION_TIMEOUT);
+        resolve(`命令执行超时 (超过 ${executionTimeout / 1000}s)`);
+      }, executionTimeout);
     }
   });
 };

package/src/tools/index.js

@@ -15,7 +15,15 @@ const createToolRuntime = async (workspaceRoot, options = {}) => {
   const enabledMcps = Array.isArray(settings.mcps) ? settings.mcps : [];
   const allowedCommands = settings.allowedCommands;
 
-  const context = { workspaceRoot, allowedCommands, ...options };
+  const context = {
+    workspaceRoot,
+    allowedCommands,
+    outputMaxLength: settings.outputMaxLength,
+    executionTimeout: settings.executionTimeout,
+    serviceBootWindow: settings.serviceBootWindow,
+    largeFileLineThreshold: settings.largeFileLineThreshold,
+    ...options
+  };
 
   const tools = [];
   const handlers = {};
@@ -35,7 +43,9 @@ const createToolRuntime = async (workspaceRoot, options = {}) => {
 
   TOOL_MODULES.forEach(registerTool);
 
-  const mcpManager = await createMcpManager(workspaceRoot, enabledMcps);
+  const mcpManager = await createMcpManager(workspaceRoot, enabledMcps, {
+    mcpToolTimeout: settings.mcpToolTimeout
+  });
   let mcpConfigPath = null;
   const mcpToolNames = new Set(); // 记录所有 MCP 工具名称
   const enabledMcpNames = []; // 记录启用的 MCP 服务器名称

package/src/tools/mcp.js

@@ -305,9 +305,10 @@ const formatMcpContent = (content) => {
 };
 
 class McpManager {
-  constructor(workspaceRoot, allowedMcpNames = null) {
+  constructor(workspaceRoot, allowedMcpNames = null, options = {}) {
     this.workspaceRoot = workspaceRoot;
     this.allowedMcpNames = Array.isArray(allowedMcpNames) ? allowedMcpNames : null;
+    this.mcpToolTimeout = options.mcpToolTimeout || 600000;
     this.clients = [];
   }
 
@@ -407,7 +408,7 @@ class McpManager {
               },
               undefined,
               {
-                timeout: 600000 // 10 分钟超时
+                timeout: this.mcpToolTimeout
               }
             );
             const isError = Boolean(result && result.isError);
@@ -460,11 +461,11 @@ class McpManager {
   }
 }
 
-const createMcpManager = async (workspaceRoot, allowedMcpNames = null) => {
+const createMcpManager = async (workspaceRoot, allowedMcpNames = null, options = {}) => {
   if (Array.isArray(allowedMcpNames) && allowedMcpNames.length === 0) {
     return null;
   }
-  const manager = new McpManager(workspaceRoot, allowedMcpNames);
+  const manager = new McpManager(workspaceRoot, allowedMcpNames, options);
   await manager.initialize();
   const tools = manager.getTools();
   if (!tools || tools.length === 0) {

package/src/utils/commands.js

@@ -1,89 +1,119 @@
-const chalk = require('chalk');
-
-const SLASH_COMMANDS = [
-  { key: 'model', value: '/model', description: '查看或切换模型' },
-  { key: 'clear', value: '/clear', description: '清空上下文' },
-  { key: 'resume', value: '/resume', description: '查看或恢复历史会话' },
-  { key: 'exit', value: '/exit', description: '退出对话' }
-];
-
-const getSlashCommandListText = () => SLASH_COMMANDS.map((entry) => entry.value).join('、');
-
-const createCommandHandler = ({ modelManager, resetMessages, closeSession, handleResume }) => {
-  const handleClearCommand = () => {
-    resetMessages();
-    console.log(chalk.green('已清空上下文。'));
-  };
-
-  const handleModelCommand = (rawArgs = '') => {
-    const args = rawArgs.trim();
-    if (!args || ['list', 'ls'].includes(args.toLowerCase())) {
-      modelManager.listModels();
-      return;
-    }
-
-    const numeric = Number.parseInt(args, 10);
-    if (!Number.isNaN(numeric) && String(numeric) === args) {
-      const index = numeric - 1;
-      if (!modelManager.setActiveModel(index, { updateDefault: true, announce: true })) {
-        console.error(chalk.red(`序号 ${args} 不在 1-${modelManager.getTotalModels()} 范围内，已保持 ${modelManager.getDefaultModelDescription()}。`));
-        modelManager.resetToDefault();
-      }
-      return;
-    }
-
-    modelManager.applyModelByName(args, { source: 'command', announceSuccess: true, showError: true });
-  };
-
-  const handleResumeCommand = (rawArgs = '') => {
-    if (typeof handleResume === 'function') {
-      handleResume(rawArgs);
-    } else {
-      console.log(chalk.yellow('当前构建未启用历史记录功能。'));
-    }
-  };
-
-  const handleSlashCommand = (raw = '') => {
-    if (!raw.startsWith('/')) {
-      return { handled: false, shouldExit: false };
-    }
-    const trimmed = raw.slice(1).trim();
-    const availableCommandsText = getSlashCommandListText() || '/model、/clear、/exit';
-    if (!trimmed) {
-      console.log(chalk.yellow(`请输入完整命令，例如 ${availableCommandsText}。`));
-      return { handled: true, shouldExit: false };
-    }
-    const [command] = trimmed.split(' ');
-    const args = trimmed.slice(command.length).trim();
-    switch ((command || '').toLowerCase()) {
-      case 'model':
-        handleModelCommand(args);
-        return { handled: true, shouldExit: false };
-      case 'clear':
-        handleClearCommand();
-        return { handled: true, shouldExit: false };
-      case 'resume':
-        handleResumeCommand(args);
-        return { handled: true, shouldExit: false };
-      case 'exit':
-        closeSession();
-        return { handled: true, shouldExit: true };
-      default:
-        console.log(chalk.yellow(`未识别的命令 /${command}，可用命令：${availableCommandsText}。`));
-        return { handled: true, shouldExit: false };
-    }
-  };
-
-  return {
-    handleSlashCommand,
-    handleClearCommand,
-    handleModelCommand,
-    handleResumeCommand
-  };
-};
-
-module.exports = {
-  SLASH_COMMANDS,
-  getSlashCommandListText,
-  createCommandHandler
-};
+const chalk = require('chalk');
+const { selectFromList } = require('./menu');
+
+const SLASH_COMMANDS = [
+  { key: 'model', value: '/model', description: '查看或切换模型' },
+  { key: 'clear', value: '/clear', description: '清空上下文' },
+  { key: 'resume', value: '/resume', description: '查看或恢复历史会话' },
+  { key: 'exit', value: '/exit', description: '退出对话' }
+];
+
+const getSlashCommandListText = () => SLASH_COMMANDS.map((entry) => entry.value).join('、');
+
+const createCommandHandler = ({ modelManager, resetMessages, closeSession, handleResume, pauseSession, resumeSession }) => {
+  const handleClearCommand = () => {
+    resetMessages();
+    console.log(chalk.green('已清空上下文。'));
+  };
+
+  const handleModelCommand = async (rawArgs = '') => {
+    const args = rawArgs.trim();
+    if (!args || ['list', 'ls'].includes(args.toLowerCase())) {
+      const endpoints = modelManager.getModels();
+      const activeIndex = modelManager.getActiveIndex();
+      const defaultIndex = modelManager.getDefaultIndex();
+
+      if (pauseSession) pauseSession();
+      const selectedIndex = await selectFromList(endpoints, {
+        title: chalk.gray('请选择要切换的模型:'),
+        renderItem: (endpoint, idx, isSelected) => {
+          const markers = [];
+          if (idx === activeIndex) {
+            markers.push(chalk.green('当前'));
+          }
+          if (idx === defaultIndex) {
+            markers.push(chalk.cyan('默认'));
+          }
+          const markerText = markers.length > 0 ? ` [${markers.join('/')}]` : '';
+          const description = modelManager.describeEndpoint(endpoint);
+          const text = `${idx + 1}. ${description}${markerText}`;
+          return isSelected ? chalk.cyan(`> ${text}`) : `  ${text}`;
+        }
+      });
+      if (resumeSession) resumeSession();
+
+      if (selectedIndex !== null) {
+        if (selectedIndex !== activeIndex) {
+          modelManager.setActiveModel(selectedIndex, { updateDefault: true, announce: true });
+        } else {
+          console.log(chalk.gray('已保持当前模型。'));
+        }
+      }
+      return;
+    }
+
+    const numeric = Number.parseInt(args, 10);
+    if (!Number.isNaN(numeric) && String(numeric) === args) {
+      const index = numeric - 1;
+      if (!modelManager.setActiveModel(index, { updateDefault: true, announce: true })) {
+        console.error(chalk.red(`序号 ${args} 不在 1-${modelManager.getTotalModels()} 范围内，已保持 ${modelManager.getDefaultModelDescription()}。`));
+        modelManager.resetToDefault();
+      }
+      return;
+    }
+
+    modelManager.applyModelByName(args, { source: 'command', announceSuccess: true, showError: true });
+  };
+
+  const handleResumeCommand = async (rawArgs = '') => {
+    if (typeof handleResume === 'function') {
+      await handleResume(rawArgs);
+    } else {
+      console.log(chalk.yellow('当前构建未启用历史记录功能。'));
+    }
+  };
+
+  const handleSlashCommand = async (raw = '') => {
+    if (!raw.startsWith('/')) {
+      return { handled: false, shouldExit: false };
+    }
+    const trimmed = raw.slice(1).trim();
+    const availableCommandsText = getSlashCommandListText() || '/model、/clear、/exit';
+    if (!trimmed) {
+      console.log(chalk.yellow(`请输入完整命令，例如 ${availableCommandsText}。`));
+      return { handled: true, shouldExit: false };
+    }
+    const [command] = trimmed.split(' ');
+    const args = trimmed.slice(command.length).trim();
+    switch ((command || '').toLowerCase()) {
+      case 'model':
+        await handleModelCommand(args);
+        return { handled: true, shouldExit: false };
+      case 'clear':
+        handleClearCommand();
+        return { handled: true, shouldExit: false };
+      case 'resume':
+        await handleResumeCommand(args);
+        return { handled: true, shouldExit: false };
+      case 'exit':
+        closeSession();
+        return { handled: true, shouldExit: true };
+      default:
+        console.log(chalk.yellow(`未识别的命令 /${command}，可用命令：${availableCommandsText}。`));
+        return { handled: true, shouldExit: false };
+    }
+  };
+
+  return {
+    handleSlashCommand,
+    handleClearCommand,
+    handleModelCommand,
+    handleResumeCommand
+  };
+};
+
+module.exports = {
+  SLASH_COMMANDS,
+  getSlashCommandListText,
+  createCommandHandler
+};

package/src/utils/menu.js

@@ -0,0 +1,156 @@
+const readline = require('readline');
+const chalk = require('chalk');
+
+// 简单的 ANSI 码去除正则
+const stripAnsi = (str) => str.replace(
+  /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+  ''
+);
+
+// 计算字符串在终端显示的实际行数（考虑中文宽度和终端宽度）
+const measureLines = (str) => {
+  const termWidth = process.stdout.columns || 80;
+  const clean = stripAnsi(str);
+  let width = 0;
+  for (let i = 0; i < clean.length; i++) {
+    const code = clean.charCodeAt(i);
+    // 简单的宽字符判断：ASCII 范围外视为 2 个宽度
+    width += (code > 255) ? 2 : 1;
+  }
+  return Math.ceil(width / termWidth) || 1;
+};
+
+/**
+ * 交互式列表选择
+ * @param {Array} items - 待选择的项数组
+ * @param {Object} options - 配置项
+ * @param {Function} options.renderItem - 渲染每项的回调 (item, index, isSelected) => string
+ * @param {number} options.pageSize - 每页显示的条数
+ * @param {string} options.title - 标题
+ * @returns {Promise<number|null>} - 返回选中的索引，取消则返回 null
+ */
+const selectFromList = (items, options = {}) => {
+  return new Promise((resolve) => {
+    const {
+      renderItem = (item, idx, isSelected) => (isSelected ? chalk.cyan(`> ${item}`) : `  ${item}`),
+      pageSize = 10,
+      title = '',
+      exitOnInput = false
+    } = options;
+
+    if (!items || items.length === 0) {
+      resolve(null);
+      return;
+    }
+
+    let selectedIndex = 0;
+    let scrollOffset = 0;
+    const total = items.length;
+    let linesRendered = 0;
+    
+    // 隐藏光标
+    process.stdout.write('\x1B[?25l');
+
+    if (title) {
+      console.log(title);
+    }
+
+    const render = () => {
+      // 清除之前渲染的行
+      if (linesRendered > 0) {
+        readline.moveCursor(process.stdout, 0, -(linesRendered - 1));
+        readline.cursorTo(process.stdout, 0);
+        readline.clearScreenDown(process.stdout);
+      }
+
+      const windowSize = Math.min(pageSize, total);
+      
+      // 调整滚动偏移
+      if (selectedIndex < scrollOffset) {
+        scrollOffset = selectedIndex;
+      } else if (selectedIndex >= scrollOffset + windowSize) {
+        scrollOffset = selectedIndex - windowSize + 1;
+      }
+
+      const visibleItems = items.slice(scrollOffset, scrollOffset + windowSize);
+      
+      linesRendered = 0;
+      visibleItems.forEach((item, index) => {
+        const actualIndex = scrollOffset + index;
+        const isSelected = actualIndex === selectedIndex;
+        const line = renderItem(item, actualIndex, isSelected);
+        
+        // 计算该行实际占用的物理行数
+        const lineCount = measureLines(line);
+        process.stdout.write(line + '\n');
+        linesRendered += lineCount;
+      });
+      
+      // 底部提示
+      const footerText = chalk.gray('  (↑/↓ 选择, Enter 确认, Esc 取消)');
+      const footerLines = measureLines(footerText);
+      process.stdout.write(footerText);
+      linesRendered += footerLines;
+    };
+
+    render();
+
+    const cleanup = () => {
+      process.stdout.write('\x1B[?25h'); // 恢复光标
+      
+      // 清除菜单显示
+      if (linesRendered > 0) {
+         readline.moveCursor(process.stdout, 0, -(linesRendered - 1));
+         readline.cursorTo(process.stdout, 0);
+         readline.clearScreenDown(process.stdout);
+      }
+
+      // 清除 title 行（如果有）
+      if (title) {
+        // 计算 title 占用的行数
+        const titleLines = measureLines(title);
+        // 上移 titleLines 行
+        readline.moveCursor(process.stdout, 0, -titleLines);
+        readline.cursorTo(process.stdout, 0);
+        readline.clearScreenDown(process.stdout);
+      }
+      
+      process.stdin.removeListener('keypress', handleKeypress);
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(false);
+        // 不要 pause stdin，因为外层 readline 需要它
+        // process.stdin.pause(); 
+      }
+    };
+
+    const handleKeypress = (str, key) => {
+      if (!key) return;
+
+      if (key.name === 'up') {
+        selectedIndex = (selectedIndex - 1 + total) % total;
+        render();
+      } else if (key.name === 'down') {
+        selectedIndex = (selectedIndex + 1) % total;
+        render();
+      } else if (key.name === 'return') {
+        cleanup();
+        resolve(exitOnInput ? { action: 'select', index: selectedIndex } : selectedIndex);
+      } else if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+        cleanup();
+        resolve(exitOnInput ? { action: 'cancel' } : null);
+      } else if (exitOnInput) {
+        cleanup();
+        const inputVal = key.sequence || str || key.name;
+        resolve({ action: 'input', input: inputVal });
+      }
+    };
+
+    if (process.stdin.isTTY) {
+      process.stdin.setRawMode(true);
+      process.stdin.resume();
+    }
+    process.stdin.on('keypress', handleKeypress);
+  });
+};
+
+module.exports = { selectFromList };

package/src/utils/model.js

@@ -117,7 +117,11 @@ const createModelManager = (endpoints, { configPath } = {}) => {
     resetToDefault,
     setActiveModel,
     applyModelByName,
-    listModels
+    listModels,
+    getModels: () => endpoints,
+    getActiveIndex: () => activeEndpointIndex,
+    getDefaultIndex: () => defaultEndpointIndex,
+    describeEndpoint: (endpoint) => describeModel(endpoint)
   };
 };