@ww_nero/mini-cli 1.0.81 → 1.0.82

package/src/utils/model.js

@@ -1,131 +1,131 @@
-const chalk = require('chalk');
-const { promoteEndpointInConfig } = require('../config');
-
-const describeModel = (endpoint) => {
-  if (!endpoint) {
-    return '未知模型';
-  }
-  const alias = typeof endpoint.name === 'string' ? endpoint.name.trim() : '';
-  const label = alias || endpoint.model;
-  if (alias && alias !== endpoint.model) {
-    return `${label} (${endpoint.model})`;
-  }
-  return label;
-};
-
-const normalizeModelInput = (value = '') => {
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return '';
-  }
-  const quote = trimmed[0];
-  if ((quote === '"' || quote === '\'') && trimmed.endsWith(quote) && trimmed.length > 1) {
-    return trimmed.slice(1, -1).trim();
-  }
-  return trimmed;
-};
-
-const findModelIndexByName = (endpoints, name = '') => {
-  const normalized = name.toLowerCase();
-  return endpoints.findIndex((endpoint) => {
-    const candidates = [endpoint.name, endpoint.model];
-    return candidates.some((candidate) => typeof candidate === 'string' && candidate.toLowerCase() === normalized);
-  });
-};
-
-const createModelManager = (endpoints, { configPath } = {}) => {
-  let defaultEndpointIndex = 0;
-  let activeEndpointIndex = 0;
-
-  const getActiveEndpoint = () => endpoints[activeEndpointIndex];
-  const getDefaultEndpoint = () => endpoints[defaultEndpointIndex];
-  const getTotalModels = () => endpoints.length;
-  const getDefaultModelDescription = () => describeModel(getDefaultEndpoint());
-
-  const resetToDefault = () => {
-    setActiveModel(defaultEndpointIndex, { updateDefault: false, announce: false, persistConfig: false });
-  };
-
-  const setActiveModel = (
-    index,
-    { updateDefault = false, announce = true, announcePrefix = '已切换至', reason = '', persistConfig = true } = {}
-  ) => {
-    if (index < 0 || index >= endpoints.length) {
-      return false;
-    }
-    activeEndpointIndex = index;
-    if (updateDefault) {
-      defaultEndpointIndex = index;
-      if (persistConfig && configPath) {
-        const endpoint = endpoints[index];
-        if (endpoint && endpoint.signature) {
-          promoteEndpointInConfig(configPath, endpoint.signature);
-        }
-      }
-    }
-    if (announce) {
-      console.log(chalk.green(`${announcePrefix}模型 ${describeModel(endpoints[index])}`));
-      if (reason) {
-        console.log(chalk.gray(reason));
-      }
-    }
-    return true;
-  };
-
-  const applyModelByName = (rawName, { source = 'command', announceSuccess = true, showError = true } = {}) => {
-    const normalizedInput = normalizeModelInput(rawName || '');
-    if (!normalizedInput) {
-      if (showError) {
-        console.log(chalk.yellow('请输入要切换的模型名称。'));
-      }
-      return false;
-    }
-    const index = findModelIndexByName(endpoints, normalizedInput);
-    if (index === -1) {
-      if (showError) {
-        console.error(chalk.red(`未找到模型 ${normalizedInput}，已保持 ${describeModel(getDefaultEndpoint())}。`));
-      }
-      setActiveModel(defaultEndpointIndex, { updateDefault: false, announce: false, persistConfig: false });
-      return false;
-    }
-    const announcePrefix = source === 'cli' ? '已应用启动' : '已切换至';
-    setActiveModel(index, { updateDefault: true, announce: announceSuccess, announcePrefix });
-    return true;
-  };
-
-  const listModels = () => {
-    console.log(chalk.gray('可用模型列表：'));
-    endpoints.forEach((endpoint, idx) => {
-      const markers = [];
-      if (idx === activeEndpointIndex) {
-        markers.push(chalk.green('当前'));
-      }
-      if (idx === defaultEndpointIndex) {
-        markers.push(chalk.cyan('默认'));
-      }
-      const markerText = markers.length > 0 ? ` [${markers.join('/')}]` : '';
-      console.log(`  ${idx + 1}. ${describeModel(endpoint)}${markerText}`);
-    });
-    console.log(chalk.gray('使用 /model <名称|序号> 切换模型。'));
-  };
-
-  return {
-    getActiveEndpoint,
-    getDefaultEndpoint,
-    getTotalModels,
-    getDefaultModelDescription,
-    resetToDefault,
-    setActiveModel,
-    applyModelByName,
-    listModels,
-    getModels: () => endpoints,
-    getActiveIndex: () => activeEndpointIndex,
-    getDefaultIndex: () => defaultEndpointIndex,
-    describeEndpoint: (endpoint) => describeModel(endpoint)
-  };
-};
-
-module.exports = {
-  describeModel,
-  createModelManager
-};
+const chalk = require('chalk');
+const { promoteEndpointInConfig } = require('../config');
+
+const describeModel = (endpoint) => {
+  if (!endpoint) {
+    return '未知模型';
+  }
+  const alias = typeof endpoint.name === 'string' ? endpoint.name.trim() : '';
+  const label = alias || endpoint.model;
+  if (alias && alias !== endpoint.model) {
+    return `${label} (${endpoint.model})`;
+  }
+  return label;
+};
+
+const normalizeModelInput = (value = '') => {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return '';
+  }
+  const quote = trimmed[0];
+  if ((quote === '"' || quote === '\'') && trimmed.endsWith(quote) && trimmed.length > 1) {
+    return trimmed.slice(1, -1).trim();
+  }
+  return trimmed;
+};
+
+const findModelIndexByName = (endpoints, name = '') => {
+  const normalized = name.toLowerCase();
+  return endpoints.findIndex((endpoint) => {
+    const candidates = [endpoint.name, endpoint.model];
+    return candidates.some((candidate) => typeof candidate === 'string' && candidate.toLowerCase() === normalized);
+  });
+};
+
+const createModelManager = (endpoints, { configPath } = {}) => {
+  let defaultEndpointIndex = 0;
+  let activeEndpointIndex = 0;
+
+  const getActiveEndpoint = () => endpoints[activeEndpointIndex];
+  const getDefaultEndpoint = () => endpoints[defaultEndpointIndex];
+  const getTotalModels = () => endpoints.length;
+  const getDefaultModelDescription = () => describeModel(getDefaultEndpoint());
+
+  const resetToDefault = () => {
+    setActiveModel(defaultEndpointIndex, { updateDefault: false, announce: false, persistConfig: false });
+  };
+
+  const setActiveModel = (
+    index,
+    { updateDefault = false, announce = true, announcePrefix = '已切换至', reason = '', persistConfig = true } = {}
+  ) => {
+    if (index < 0 || index >= endpoints.length) {
+      return false;
+    }
+    activeEndpointIndex = index;
+    if (updateDefault) {
+      defaultEndpointIndex = index;
+      if (persistConfig && configPath) {
+        const endpoint = endpoints[index];
+        if (endpoint && endpoint.signature) {
+          promoteEndpointInConfig(configPath, endpoint.signature);
+        }
+      }
+    }
+    if (announce) {
+      console.log(chalk.green(`${announcePrefix}模型 ${describeModel(endpoints[index])}`));
+      if (reason) {
+        console.log(chalk.gray(reason));
+      }
+    }
+    return true;
+  };
+
+  const applyModelByName = (rawName, { source = 'command', announceSuccess = true, showError = true } = {}) => {
+    const normalizedInput = normalizeModelInput(rawName || '');
+    if (!normalizedInput) {
+      if (showError) {
+        console.log(chalk.yellow('请输入要切换的模型名称。'));
+      }
+      return false;
+    }
+    const index = findModelIndexByName(endpoints, normalizedInput);
+    if (index === -1) {
+      if (showError) {
+        console.error(chalk.red(`未找到模型 ${normalizedInput}，已保持 ${describeModel(getDefaultEndpoint())}。`));
+      }
+      setActiveModel(defaultEndpointIndex, { updateDefault: false, announce: false, persistConfig: false });
+      return false;
+    }
+    const announcePrefix = source === 'cli' ? '已应用启动' : '已切换至';
+    setActiveModel(index, { updateDefault: true, announce: announceSuccess, announcePrefix });
+    return true;
+  };
+
+  const listModels = () => {
+    console.log(chalk.gray('可用模型列表：'));
+    endpoints.forEach((endpoint, idx) => {
+      const markers = [];
+      if (idx === activeEndpointIndex) {
+        markers.push(chalk.green('当前'));
+      }
+      if (idx === defaultEndpointIndex) {
+        markers.push(chalk.cyan('默认'));
+      }
+      const markerText = markers.length > 0 ? ` [${markers.join('/')}]` : '';
+      console.log(`  ${idx + 1}. ${describeModel(endpoint)}${markerText}`);
+    });
+    console.log(chalk.gray('使用 /model <名称|序号> 切换模型。'));
+  };
+
+  return {
+    getActiveEndpoint,
+    getDefaultEndpoint,
+    getTotalModels,
+    getDefaultModelDescription,
+    resetToDefault,
+    setActiveModel,
+    applyModelByName,
+    listModels,
+    getModels: () => endpoints,
+    getActiveIndex: () => activeEndpointIndex,
+    getDefaultIndex: () => defaultEndpointIndex,
+    describeEndpoint: (endpoint) => describeModel(endpoint)
+  };
+};
+
+module.exports = {
+  describeModel,
+  createModelManager
+};

package/src/utils/output.js

@@ -1,75 +1,75 @@
-const chalk = require('chalk');
-const { splitThinkContent, summarizeReasoning } = require('./think');
-
-const mergeReasoningContent = (...segments) => {
-  const normalized = segments
-    .map((segment) => (typeof segment === 'string' ? segment.trim() : ''))
-    .filter(Boolean);
-  if (normalized.length === 0) {
-    return '';
-  }
-  return normalized.join('\n');
-};
-
-const printReasoningSummary = (text, ensureNewline) => {
-  if (!text) return;
-  ensureNewline();
-  console.log(chalk.gray(`思考：${summarizeReasoning(text)}`));
-};
-
-const printAssistantContent = (text, ensureNewline) => {
-  if (typeof text !== 'string' || !text) {
-    return;
-  }
-  ensureNewline();
-  const output = chalk.white(text);
-  process.stdout.write(output);
-  if (!text.endsWith('\n')) {
-    process.stdout.write('\n');
-  }
-};
-
-const renderAssistantOutput = (reasoning, content, ensureNewline) => {
-  printReasoningSummary(reasoning, ensureNewline);
-  printAssistantContent(content, ensureNewline);
-};
-
-const sanitizeContentWithThink = (primary = '', fallback = '') => {
-  const normalizedPrimary = typeof primary === 'string' ? primary.trim() : '';
-  if (normalizedPrimary) {
-    return normalizedPrimary;
-  }
-  if (typeof fallback !== 'string' || !fallback.trim()) {
-    return '';
-  }
-  const { content } = splitThinkContent(fallback);
-  return (content || '').trim();
-};
-
-const formatTokensToK = (totalTokens) => {
-  if (typeof totalTokens !== 'number' || Number.isNaN(totalTokens)) {
-    return null;
-  }
-  return `${(totalTokens / 1000).toFixed(1)}k`;
-};
-
-const printUsageTokens = (usage) => {
-  if (!usage || typeof usage !== 'object') {
-    return;
-  }
-  const totalTokens = usage.total_tokens;
-  const formatted = formatTokensToK(totalTokens);
-  if (!formatted) {
-    return;
-  }
-  console.log(chalk.gray(`已使用tokens: ${formatted}`));
-};
-
-module.exports = {
-  mergeReasoningContent,
-  printReasoningSummary,
-  printAssistantContent,
-  renderAssistantOutput,
-  sanitizeContentWithThink,
-  printUsageTokens
-};
+const chalk = require('chalk');
+const { splitThinkContent, summarizeReasoning } = require('./think');
+
+const mergeReasoningContent = (...segments) => {
+  const normalized = segments
+    .map((segment) => (typeof segment === 'string' ? segment.trim() : ''))
+    .filter(Boolean);
+  if (normalized.length === 0) {
+    return '';
+  }
+  return normalized.join('\n');
+};
+
+const printReasoningSummary = (text, ensureNewline) => {
+  if (!text) return;
+  ensureNewline();
+  console.log(chalk.gray(`思考：${summarizeReasoning(text)}`));
+};
+
+const printAssistantContent = (text, ensureNewline) => {
+  if (typeof text !== 'string' || !text) {
+    return;
+  }
+  ensureNewline();
+  const output = chalk.white(text);
+  process.stdout.write(output);
+  if (!text.endsWith('\n')) {
+    process.stdout.write('\n');
+  }
+};
+
+const renderAssistantOutput = (reasoning, content, ensureNewline) => {
+  printReasoningSummary(reasoning, ensureNewline);
+  printAssistantContent(content, ensureNewline);
+};
+
+const sanitizeContentWithThink = (primary = '', fallback = '') => {
+  const normalizedPrimary = typeof primary === 'string' ? primary.trim() : '';
+  if (normalizedPrimary) {
+    return normalizedPrimary;
+  }
+  if (typeof fallback !== 'string' || !fallback.trim()) {
+    return '';
+  }
+  const { content } = splitThinkContent(fallback);
+  return (content || '').trim();
+};
+
+const formatTokensToK = (totalTokens) => {
+  if (typeof totalTokens !== 'number' || Number.isNaN(totalTokens)) {
+    return null;
+  }
+  return `${(totalTokens / 1000).toFixed(1)}k`;
+};
+
+const printUsageTokens = (usage) => {
+  if (!usage || typeof usage !== 'object') {
+    return;
+  }
+  const totalTokens = usage.total_tokens;
+  const formatted = formatTokensToK(totalTokens);
+  if (!formatted) {
+    return;
+  }
+  console.log(chalk.gray(`已使用tokens: ${formatted}`));
+};
+
+module.exports = {
+  mergeReasoningContent,
+  printReasoningSummary,
+  printAssistantContent,
+  renderAssistantOutput,
+  sanitizeContentWithThink,
+  printUsageTokens
+};

package/src/utils/renderer.js

@@ -1,102 +1,102 @@
-const chalk = require('chalk');
-
-const truncateText = (text, maxLength = 200) => {
-  if (!text || typeof text !== 'string') {
-    return text;
-  }
-  if (text.length <= maxLength) {
-    return text;
-  }
-  return text.substring(0, maxLength) + '...';
-};
-
-const countLines = (text = '') => {
-  if (!text) return 0;
-  const normalized = text.replace(/\r/g, '');
-  const newlineMatches = normalized.match(/\n/g);
-  const newlineCount = Array.isArray(newlineMatches) ? newlineMatches.length : 0;
-  const endsWithNewline = normalized.endsWith('\n');
-  return endsWithNewline ? newlineCount : newlineCount + 1;
-};
-
-const formatWriteHeader = (args = {}) => {
-  const filePath = args.filePath || '';
-  const lineCount = countLines(args.content);
-  return ` (${filePath}, ${chalk.green(`+${lineCount}`)})`;
-};
-
-const formatEditHeader = (args = {}) => {
-  const filePath = args.filePath || '';
-  const searchLines = countLines(args.search);
-  const replaceLines = countLines(args.replace);
-  return ` (${filePath}, ${chalk.green(`+${replaceLines}`)} ${chalk.red(`-${searchLines}`)})`;
-};
-
-const formatHeader = (name, args, options = {}) => {
-  const statusTag = options.statusTag || '';
-  const extraMeta = Array.isArray(options.extraMeta) ? options.extraMeta : [];
-  const labelBase = `${chalk.yellow('🔧')} ${chalk.yellow(name)}`;
-
-  let specialHeader = '';
-  if (name === 'write') {
-    specialHeader = formatWriteHeader(args);
-  } else if (name === 'edit') {
-    specialHeader = formatEditHeader(args);
-  }
-
-  const labelWithInfo = `${labelBase}${specialHeader}`;
-  const label = statusTag ? `${labelWithInfo}${statusTag}` : labelWithInfo;
-  const metaParts = [...extraMeta];
-
-  if (name === 'bash') {
-    if (args.command) metaParts.push(`command="${truncateText(args.command)}"`);
-    if (args.workingDirectory && args.workingDirectory !== '.') {
-      metaParts.push(`dir=${args.workingDirectory}`);
-    }
-  } else if (name === 'read') {
-    if (args.filePath) metaParts.push(args.filePath);
-  } else if (name === 'todos') {
-    const count = Array.isArray(args.todos) ? args.todos.length : 0;
-    metaParts.push(`${count} items`);
-  } else if (name === 'convert') {
-    if (typeof args.input === 'string') {
-      metaParts.push(`input=${truncateText(args.input, 160)}`);
-    } else if (Array.isArray(args.input)) {
-      metaParts.push(`input=${truncateText(args.input.join(', '), 160)}`);
-    }
-    if (args.output) {
-      metaParts.push(`output=${truncateText(String(args.output), 160)}`);
-    }
-  }
-
-  const meta = metaParts.length > 0 ? ` (${metaParts.join(', ')})` : '';
-  return `${label}${meta}`;
-};
-
-const safeStringify = (value) => {
-  try {
-    return JSON.stringify(value);
-  } catch (_) {
-    return String(value);
-  }
-};
-
-const compactText = (text) => String(text || '').replace(/\s+/g, ' ').trim();
-
-const renderToolCall = ({ functionName, args = {} }, mcpToolNames = new Set()) => {
-  const isMcpTool = mcpToolNames.has(functionName);
-
-  const extraMeta = [];
-  if (isMcpTool) {
-    const argsPreview = truncateText(compactText(safeStringify(args) || ''), 200);
-    if (argsPreview) {
-      extraMeta.push(argsPreview);
-    }
-  }
-
-  console.log(formatHeader(functionName, args, { extraMeta }));
-};
-
-module.exports = {
-  renderToolCall
-};
+const chalk = require('chalk');
+
+const truncateText = (text, maxLength = 200) => {
+  if (!text || typeof text !== 'string') {
+    return text;
+  }
+  if (text.length <= maxLength) {
+    return text;
+  }
+  return text.substring(0, maxLength) + '...';
+};
+
+const countLines = (text = '') => {
+  if (!text) return 0;
+  const normalized = text.replace(/\r/g, '');
+  const newlineMatches = normalized.match(/\n/g);
+  const newlineCount = Array.isArray(newlineMatches) ? newlineMatches.length : 0;
+  const endsWithNewline = normalized.endsWith('\n');
+  return endsWithNewline ? newlineCount : newlineCount + 1;
+};
+
+const formatWriteHeader = (args = {}) => {
+  const filePath = args.filePath || '';
+  const lineCount = countLines(args.content);
+  return ` (${filePath}, ${chalk.green(`+${lineCount}`)})`;
+};
+
+const formatEditHeader = (args = {}) => {
+  const filePath = args.filePath || '';
+  const searchLines = countLines(args.search);
+  const replaceLines = countLines(args.replace);
+  return ` (${filePath}, ${chalk.green(`+${replaceLines}`)} ${chalk.red(`-${searchLines}`)})`;
+};
+
+const formatHeader = (name, args, options = {}) => {
+  const statusTag = options.statusTag || '';
+  const extraMeta = Array.isArray(options.extraMeta) ? options.extraMeta : [];
+  const labelBase = `${chalk.yellow('🔧')} ${chalk.yellow(name)}`;
+
+  let specialHeader = '';
+  if (name === 'write') {
+    specialHeader = formatWriteHeader(args);
+  } else if (name === 'edit') {
+    specialHeader = formatEditHeader(args);
+  }
+
+  const labelWithInfo = `${labelBase}${specialHeader}`;
+  const label = statusTag ? `${labelWithInfo}${statusTag}` : labelWithInfo;
+  const metaParts = [...extraMeta];
+
+  if (name === 'bash') {
+    if (args.command) metaParts.push(`command="${truncateText(args.command)}"`);
+    if (args.workingDirectory && args.workingDirectory !== '.') {
+      metaParts.push(`dir=${args.workingDirectory}`);
+    }
+  } else if (name === 'read') {
+    if (args.filePath) metaParts.push(args.filePath);
+  } else if (name === 'todos') {
+    const count = Array.isArray(args.todos) ? args.todos.length : 0;
+    metaParts.push(`${count} items`);
+  } else if (name === 'convert') {
+    if (typeof args.input === 'string') {
+      metaParts.push(`input=${truncateText(args.input, 160)}`);
+    } else if (Array.isArray(args.input)) {
+      metaParts.push(`input=${truncateText(args.input.join(', '), 160)}`);
+    }
+    if (args.output) {
+      metaParts.push(`output=${truncateText(String(args.output), 160)}`);
+    }
+  }
+
+  const meta = metaParts.length > 0 ? ` (${metaParts.join(', ')})` : '';
+  return `${label}${meta}`;
+};
+
+const safeStringify = (value) => {
+  try {
+    return JSON.stringify(value);
+  } catch (_) {
+    return String(value);
+  }
+};
+
+const compactText = (text) => String(text || '').replace(/\s+/g, ' ').trim();
+
+const renderToolCall = ({ functionName, args = {} }, mcpToolNames = new Set()) => {
+  const isMcpTool = mcpToolNames.has(functionName);
+
+  const extraMeta = [];
+  if (isMcpTool) {
+    const argsPreview = truncateText(compactText(safeStringify(args) || ''), 200);
+    if (argsPreview) {
+      extraMeta.push(argsPreview);
+    }
+  }
+
+  console.log(formatHeader(functionName, args, { extraMeta }));
+};
+
+module.exports = {
+  renderToolCall
+};