@ww_nero/mini-cli 1.0.89 → 1.0.91

package/package.json

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

package/src/chat.js

@@ -151,42 +151,31 @@ const enforceToolOutputLimit = (text, tokenLimit) => {
   const content = typeof text === 'string' ? text : stringifyToolResult(text);
   const safeContent = typeof content === 'string' ? content : '';
   try {
-    const tokens = encode(safeContent);
-    const tokenCount = tokens.length;
-    if (tokenCount > tokenLimit) {
-      return {
-        content: '输出内容太长,请优化工具调用方式。',
-        truncated: true,
-        originalTokenCount: tokenCount,
-        limit: tokenLimit
-      };
+    if (encode(safeContent).length > tokenLimit) {
+      return '输出内容太长,请优化工具调用方式。';
     }
-    return {
-      content: safeContent,
-      truncated: false,
-      tokenCount
-    };
+    return safeContent;
   } catch (_) {
     // 忽略分词异常，保持原始输出
-    return {
-      content: safeContent,
-      truncated: false,
-      tokenCount: null
-    };
+    return safeContent;
   }
 };
 
-const truncateForDisplay = (text, maxLength = 100) => {
-  if (!text || typeof text !== 'string') {
+const formatToolResultForDisplay = (text, maxLength = 100) => {
+  if (typeof text !== 'string') {
     return '';
   }
-  const normalized = text.replace(/\s+/g, ' ').trim();
-  if (normalized.length <= maxLength) {
-    return normalized;
+  const normalized = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
+  if (!normalized) {
+    return '';
   }
-  return normalized.substring(0, maxLength) + '...';
+  return normalized.length > maxLength ? 'Done' : normalized;
 };
 
+const indentToolResult = (text = '') => splitDisplayLines(text)
+  .map((line) => `  ${line}`)
+  .join('\n');
+
 const supportsCursorControl = () => Boolean(process.stdout && process.stdout.isTTY);
 
 let loadingCursorActive = false;
@@ -870,7 +859,6 @@ const startChatSession = async ({
       };
 
       while (true) {
-        process.stdout.write('\n');
         showLoadingPrompt();
         const streamState = {
           thinkState: createThinkParserState(),
@@ -878,13 +866,12 @@ const startChatSession = async ({
           reasoningFromThink: ''
         };
         let reasoningFromModel = '';
-        let printedNewline = false;
+        let outputStarted = false;
 
         const ensureNewline = () => {
-          if (!printedNewline) {
+          if (!outputStarted) {
             clearLoadingPrompt();
-            process.stdout.write('\n');
-            printedNewline = true;
+            outputStarted = true;
           }
         };
 
@@ -962,6 +949,7 @@ const startChatSession = async ({
               ? parsedArgs
               : { raw: typeof rawArgs === 'string' ? rawArgs : '' };
 
+            ensureNewline();
             renderToolCall({ functionName, args: displayArgs }, mcpToolNames);
 
             let toolResult;
@@ -981,8 +969,8 @@ const startChatSession = async ({
               }
             }
 
-            const resultInfo = enforceToolOutputLimit(stringifyToolResult(toolResult), toolOutputTokenLimit);
-            const toolContent = resultInfo.content;
+            const rawToolContent = stringifyToolResult(toolResult);
+            const toolContent = enforceToolOutputLimit(rawToolContent, toolOutputTokenLimit);
 
             // Display tool output
             if (functionName === 'write') {
@@ -997,24 +985,15 @@ const startChatSession = async ({
               if (editOutput) {
                 console.log(editOutput);
               }
-            } else if (functionName === 'skills') {
-              const preview = truncateForDisplay(toolContent, 200);
-              if (preview) {
-                console.log(chalk.gray(`  ${preview}`));
-              }
             } else {
-              // For other tools, show preview in gray
-              const preview = truncateForDisplay(toolContent, 100);
-              if (preview) {
-                console.log(chalk.gray(`  ${preview}`));
-              }
-
-              // If truncated, show warning
-              if (resultInfo.truncated) {
-                console.log(chalk.yellow(`  ⚠ 输出已截断 (${resultInfo.originalTokenCount} tokens > ${resultInfo.limit} limit)`));
+              const displayResult = formatToolResultForDisplay(rawToolContent, 100);
+              if (displayResult) {
+                console.log(chalk.gray(indentToolResult(displayResult)));
               }
             }
 
+            process.stdout.write('\n');
+
             messages.push({
               role: 'tool',
               tool_call_id: toolCall.id,

package/src/tools/edit.js

@@ -1,35 +1,13 @@
-const { diffLines } = require('diff');
 const {
   resolveWorkspacePath,
   readTextFile,
   writeTextFile,
   normalizeLineBreaks,
   isCodeIdentical,
-  processContent
+  processContent,
+  computeDiffStats
 } = require('../utils/helpers');
 
-const countLines = (text = '') => {
-  if (!text) return 0;
-  const normalized = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-  const lines = normalized.split('\n');
-  if (lines[lines.length - 1] === '') {
-    lines.pop();
-  }
-  return lines.length;
-};
-
-const computeDiffStats = (before = '', after = '') => {
-  const parts = diffLines(before, after);
-  return parts.reduce((acc, part) => {
-    if (part.added) {
-      acc.added += countLines(part.value);
-    } else if (part.removed) {
-      acc.removed += countLines(part.value);
-    }
-    return acc;
-  }, { added: 0, removed: 0 });
-};
-
 const editFile = async ({ filePath, search, replace } = {}, context = {}) => {
   if (!filePath || typeof filePath !== 'string') {
     return 'filePath 参数不能为空';

package/src/utils/helpers.js

@@ -1,3 +1,4 @@
+const { diffLines } = require('diff');
 const fsPromises = require('fs/promises');
 const path = require('path');
 
@@ -7,6 +8,28 @@ const normalizeLineBreaks = (text = '') => {
   return /^\n*$/.test(normalized) ? '' : normalized;
 };
 
+const countLines = (text = '') => {
+  if (!text) return 0;
+  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.length;
+};
+
+const computeDiffStats = (before = '', after = '') => {
+  const parts = diffLines(String(before || ''), String(after || ''));
+  return parts.reduce((acc, part) => {
+    if (part.added) {
+      acc.added += countLines(part.value);
+    } else if (part.removed) {
+      acc.removed += countLines(part.value);
+    }
+    return acc;
+  }, { added: 0, removed: 0 });
+};
+
 const resolveWorkspacePath = (workspaceRoot, targetPath = '.', options = {}) => {
   if (!workspaceRoot) {
     throw new Error('未找到工作区目录');
@@ -83,6 +106,8 @@ const safeJsonParse = (text) => {
 };
 
 module.exports = {
+  countLines,
+  computeDiffStats,
   normalizeLineBreaks,
   resolveWorkspacePath,
   readTextFile,

package/src/utils/output.js

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 const { Marked } = require('marked');
 const { markedTerminal } = require('marked-terminal');
-const { splitThinkContent, summarizeReasoning } = require('./think');
+const { splitThinkContent } = require('./think');
 
 const ANSI_PATTERN = /\u001B\[[0-9;]*m/g;
 
@@ -70,10 +70,14 @@ const mergeReasoningContent = (...segments) => {
   return normalized.join('\n');
 };
 
-const printReasoningSummary = (text, ensureNewline) => {
-  if (!text) return;
+const printReasoningContent = (text, ensureNewline) => {
+  const normalized = typeof text === 'string'
+    ? text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim()
+    : '';
+
+  if (!normalized) return;
   ensureNewline();
-  console.log(chalk.gray(`思考：${summarizeReasoning(text)}`));
+  console.log(chalk.gray(`思考：\n${normalized}`));
 };
 
 const printAssistantContent = (text, ensureNewline) => {
@@ -89,7 +93,7 @@ const printAssistantContent = (text, ensureNewline) => {
 };
 
 const renderAssistantOutput = (reasoning, content, ensureNewline) => {
-  printReasoningSummary(reasoning, ensureNewline);
+  printReasoningContent(reasoning, ensureNewline);
   printAssistantContent(content, ensureNewline);
 };
 
@@ -126,7 +130,7 @@ const printUsageTokens = (usage) => {
 
 module.exports = {
   mergeReasoningContent,
-  printReasoningSummary,
+  printReasoningContent,
   printAssistantContent,
   renderAssistantOutput,
   sanitizeContentWithThink,

package/src/utils/renderer.js

@@ -1,4 +1,5 @@
 const chalk = require('chalk');
+const { countLines, computeDiffStats } = require('./helpers');
 
 const truncateText = (text, maxLength = 200) => {
   if (!text || typeof text !== 'string') {
@@ -10,15 +11,6 @@ const truncateText = (text, maxLength = 200) => {
   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);
@@ -27,9 +19,8 @@ const formatWriteHeader = (args = {}) => {
 
 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 { added, removed } = computeDiffStats(args.search, args.replace);
+  return ` (${filePath}, ${chalk.green(`+${added}`)} ${chalk.red(`-${removed}`)})`;
 };
 
 const formatHeader = (name, args, options = {}) => {

package/src/utils/think.js

@@ -194,21 +194,10 @@ const splitThinkContent = (text = '') => {
   return { content, reasoning };
 };
 
-const summarizeReasoning = (text = '', maxLength = 100) => {
-  if (!text) return '';
-  const normalized = text.replace(/\s+/g, ' ').trim();
-  if (!normalized) return '';
-  if (normalized.length > maxLength) {
-    return normalized.substring(0, maxLength) + '...';
-  }
-  return normalized;
-};
-
 module.exports = {
   THINK_TAGS,
   createThinkParserState,
   processThinkChunk,
   flushThinkState,
-  splitThinkContent,
-  summarizeReasoning
+  splitThinkContent
 };