@ww_nero/mini-cli 1.0.86 → 1.0.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ww_nero/mini-cli",
-  "version": "1.0.86",
+  "version": "1.0.89",
   "description": "极简的 AI 命令行助手",
   "bin": {
     "mini": "bin/mini.js"

package/src/chat.js

@@ -3,6 +3,7 @@ const os = require('os');
 const path = require('path');
 const readline = require('readline');
 const chalk = require('chalk');
+const { diffLines } = require('diff');
 const { encode } = require('gpt-tokenizer');
 
 const { ConfigError, loadEndpointConfig, getDefaultConfigPath, ensureConfigFiles, loadSettings, DEFAULT_COMPACT_TOKEN_THRESHOLD } = require('./config');
@@ -101,42 +102,36 @@ const appendSkillsInstructions = (baseContent) => {
   };
 };
 
+const splitDisplayLines = (text = '') => {
+  const normalized = String(text || '').replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+  const lines = normalized.split('\n');
+  if (lines[lines.length - 1] === '') {
+    lines.pop();
+  }
+  return lines;
+};
+
 const formatWriteOutput = (result) => {
   if (!result || typeof result !== 'object' || !result.success) {
     return null;
   }
-  const content = result.content || '';
-  const lines = content.split('\n');
-  if (lines.length <= 20) {
-    return content;
-  }
-  return lines.slice(0, 20).join('\n') + '\n...(更多内容)';
+  return typeof result.content === 'string' ? result.content : String(result.content || '');
 };
 
 const formatEditOutput = (result) => {
   if (!result || typeof result !== 'object' || !result.success) {
     return null;
   }
-  const searchContent = result.search || '';
-  const replaceContent = result.replace || '';
-
   const lines = [];
+  const parts = diffLines(result.search || '', result.replace || '');
 
-  const searchLines = searchContent.split('\n');
-  const replaceLines = replaceContent.split('\n');
-  const maxLinesPerSide = 20;
-  const appendLimitedLines = (list, prefix, colorizer) => {
-    const limit = Math.min(list.length, maxLinesPerSide);
-    for (let i = 0; i < limit; i += 1) {
-      lines.push(colorizer(`${prefix}${list[i]}`));
+  for (const part of parts) {
+    const colorizer = part.added ? chalk.green : part.removed ? chalk.red : chalk.white;
+    const prefix = part.added ? '+ ' : part.removed ? '- ' : '';
+    for (const line of splitDisplayLines(part.value)) {
+      lines.push(colorizer(`${prefix}${line}`));
     }
-    if (list.length > maxLinesPerSide) {
-      lines.push(colorizer(`${prefix} ...(更多代码)`));
-    }
-  };
-
-  appendLimitedLines(searchLines, '-', chalk.red);
-  appendLimitedLines(replaceLines, '+', chalk.green);
+  }
 
   return lines.join('\n');
 };
@@ -1002,11 +997,6 @@ const startChatSession = async ({
               if (editOutput) {
                 console.log(editOutput);
               }
-            } else if (functionName === 'todos') {
-              // For todos, display full formatted output without truncation
-              if (toolContent) {
-                console.log(chalk.gray(`  ${toolContent}`));
-              }
             } else if (functionName === 'skills') {
               const preview = truncateForDisplay(toolContent, 200);
               if (preview) {

package/src/prompt/tool.js

@@ -6,12 +6,7 @@ const getCurrentDate = () => {
   return `${year}-${month}-${day}`;
 };
 
-const toolSystemPrompt = `<current_date>${getCurrentDate()}</current_date>
-
-<basic_rules>
-* 需要调用\`todos\`工具，来创建和更新待办事项的进度。
-*	除代码内容外，应使用简体中文作为默认语言。
-</basic_rules>`;
+const toolSystemPrompt = `<current_date>${getCurrentDate()}</current_date>`;
 
 module.exports = {
   toolSystemPrompt

package/src/tools/index.js

@@ -2,12 +2,11 @@ const bash = require('./bash');
 const read = require('./read');
 const write = require('./write');
 const edit = require('./edit');
-const todos = require('./todos');
 const skills = require('./skills');
 const { createMcpManager } = require('./mcp');
 const { loadSettings } = require('../config');
 
-const TOOL_MODULES = [bash, read, write, edit, todos, skills];
+const TOOL_MODULES = [bash, read, write, edit, skills];
 
 const createToolRuntime = async (workspaceRoot, options = {}) => {
   const defaultToolNames = TOOL_MODULES.map((tool) => tool.name);

package/src/utils/output.js

@@ -1,21 +1,64 @@
 const chalk = require('chalk');
-const { marked } = require('marked');
+const { Marked } = require('marked');
 const { markedTerminal } = require('marked-terminal');
 const { splitThinkContent, summarizeReasoning } = require('./think');
 
-// 配置markdown终端渲染器
-const renderer = markedTerminal({
+const ANSI_PATTERN = /\u001B\[[0-9;]*m/g;
+
+const createUnderlineFormatter = (char) => (text = '') => {
+  const plainText = text.replace(ANSI_PATTERN, '').trim();
+  if (!plainText) {
+    return text;
+  }
+  return `${text}\n${char.repeat(Math.max(plainText.length, 3))}`;
+};
+
+const prefixLines = (prefix, text = '') => text
+  .split('\n')
+  .map((line) => (line ? `${prefix}${line}` : line))
+  .join('\n');
+
+const createMarkdownParser = (options) => {
+  const parser = new Marked();
+  parser.use(markedTerminal(options));
+  return parser;
+};
+
+const coloredMarkdownParser = createMarkdownParser({
+  showSectionPrefix: false,
   heading: chalk.cyan.bold,
-  firstHeading: chalk.cyan.bold,
+  firstHeading: chalk.cyan.bold.underline,
   strong: chalk.bold,
   em: chalk.italic,
   blockquote: chalk.gray,
   code: chalk.yellow,
   codespan: chalk.yellow,
   table: chalk.gray,
+  link: chalk.blue,
   href: chalk.blue.underline
 });
-marked.use(renderer);
+
+const plainMarkdownParser = createMarkdownParser({
+  showSectionPrefix: false,
+  firstHeading: createUnderlineFormatter('='),
+  heading: createUnderlineFormatter('-'),
+  blockquote: (text) => prefixLines('> ', text.replace(/^ {4}/gm, '')),
+  codespan: (text) => `\`${text}\``,
+  link: (text) => text,
+  href: (text) => text
+});
+
+const shouldUseColoredMarkdown = () => Boolean(
+  process.stdout &&
+  process.stdout.isTTY &&
+  chalk.supportsColor &&
+  chalk.supportsColor.level > 0
+);
+
+const renderMarkdownToTerminal = (text) => {
+  const parser = shouldUseColoredMarkdown() ? coloredMarkdownParser : plainMarkdownParser;
+  return parser.parse(text);
+};
 
 const mergeReasoningContent = (...segments) => {
   const normalized = segments
@@ -38,8 +81,7 @@ const printAssistantContent = (text, ensureNewline) => {
     return;
   }
   ensureNewline();
-  // 使用marked渲染markdown，生成带ANSI样式的终端输出
-  const output = marked(text);
+  const output = renderMarkdownToTerminal(text);
   process.stdout.write(output);
   if (!text.endsWith('\n')) {
     process.stdout.write('\n');

package/src/utils/renderer.js

@@ -55,9 +55,6 @@ const formatHeader = (name, args, options = {}) => {
     }
   } 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)}`);

package/src/tools/todos.js

@@ -1,90 +0,0 @@
-const chalk = require('chalk');
-
-const STATUS_EMOJI = {
-  pending: '⬜',
-  in_progress: '🕒',
-  completed: '✅'
-};
-
-const formatTodosList = (todos = []) => {
-  if (!Array.isArray(todos) || todos.length === 0) {
-    return '暂无待办事项';
-  }
-
-  const lines = todos.map(item => {
-    const emoji = STATUS_EMOJI[item.status] || STATUS_EMOJI.pending;
-    const content = String(item.content || '').replace(/\s+/g, ' ').trim();
-    return `${emoji} ${content}`;
-  });
-
-  return `${lines.join('\n')}`;
-};
-
-const validateTodos = (todos) => {
-  if (!Array.isArray(todos)) {
-    return 'todos 必须是数组';
-  }
-  for (const item of todos) {
-    if (!item || typeof item !== 'object') {
-      return 'todos 中的每一项必须是对象';
-    }
-    if (!item.id || !item.content || !item.status) {
-      return '每个待办事项必须包含 id/content/status';
-    }
-    if (!['pending', 'in_progress', 'completed'].includes(item.status)) {
-      return 'status 仅支持 pending/in_progress/completed';
-    }
-  }
-  return null;
-};
-
-let lastTodos = [];
-
-const writeTodos = async ({ todos } = {}) => {
-  const error = validateTodos(todos);
-  if (error) {
-    return error;
-  }
-  lastTodos = todos;
-  const formatted = formatTodosList(todos);
-  return formatted;
-};
-
-const schema = {
-  type: 'function',
-  function: {
-    name: 'todos',
-    description: '更新任务列表（创建、修改、完成）',
-    parameters: {
-      type: 'object',
-      properties: {
-        todos: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              id: { type: 'string' },
-              content: { type: 'string' },
-              status: {
-                type: 'string',
-                enum: ['pending', 'in_progress', 'completed']
-              }
-            },
-            required: ['id', 'content', 'status']
-          },
-          description: '完整的待办事项数组'
-        }
-      },
-      required: ['todos']
-    }
-  }
-};
-
-const getLastTodos = () => lastTodos;
-
-module.exports = {
-  name: 'todos',
-  schema,
-  handler: writeTodos,
-  getLastTodos
-};