@ww_nero/mini-cli 1.0.90 → 1.0.92

package/package.json

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

package/src/chat.js

@@ -26,7 +26,7 @@ const {
   mergeReasoningContent,
   renderAssistantOutput,
   sanitizeContentWithThink,
-  printUsageTokens
+  formatUsageTokens
 } = require('./utils/output');
 const {
   createHistoryFilePath,
@@ -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;
@@ -609,21 +598,29 @@ const startChatSession = async ({
   const DEFAULT_PROMPT = `${chalk.cyan('用户>')} `;
   rl.setPrompt(DEFAULT_PROMPT);
 
-  const LOADING_PROMPT_BASE_TEXT = '⌛ 回答中...（按 Esc 取消）';
+  const LOADING_PROMPT_BASE_TEXT = '思考中...';
   const FLOW_GRADIENT_COLORS = ['#FFF7CC', '#FFE58F', '#FFD666', '#FFC53D', '#FFA940', '#FF7A45'];
   const FLOW_DIM_COLOR = '#5F5F6A';
-  const loadingPromptCharacters = Array.from(LOADING_PROMPT_BASE_TEXT);
-  const loadingPromptCharCount = loadingPromptCharacters.length || 1;
   const supportsHexColor = typeof chalk.hex === 'function';
   const flowGradientFns = supportsHexColor
     ? FLOW_GRADIENT_COLORS.map((hex) => chalk.hex(hex))
     : [];
   const dimTextFn = supportsHexColor ? chalk.hex(FLOW_DIM_COLOR) : chalk.yellow;
 
+  const buildLoadingPromptText = () => {
+    if (!loadingPromptTokensText) {
+      return `${LOADING_PROMPT_BASE_TEXT}(按Esc取消)`;
+    }
+    return `${LOADING_PROMPT_BASE_TEXT}(${loadingPromptTokensText}，按Esc取消)`;
+  };
+
   const formatLoadingPrompt = (frame) => {
+    const promptText = buildLoadingPromptText();
     if (!supportsHexColor) {
-      return chalk.yellow(LOADING_PROMPT_BASE_TEXT);
+      return chalk.yellow(promptText);
     }
+    const loadingPromptCharacters = Array.from(promptText);
+    const loadingPromptCharCount = loadingPromptCharacters.length || 1;
     const gradientLength = Math.min(flowGradientFns.length, loadingPromptCharCount);
     const startIndex = frame % loadingPromptCharCount;
     return loadingPromptCharacters.map((char, index) => {
@@ -639,6 +636,7 @@ const startChatSession = async ({
   let loadingPromptFrame = 0;
   let loadingPromptTimer = null;
   let loadingPromptVisible = false;
+  let loadingPromptTokensText = '';
 
   const getCurrentLoadingPromptText = () => formatLoadingPrompt(loadingPromptFrame);
 
@@ -646,7 +644,7 @@ const startChatSession = async ({
     if (!loadingPromptVisible || !supportsHexColor) {
       return;
     }
-    loadingPromptFrame = (loadingPromptFrame + 1) % loadingPromptCharCount;
+    loadingPromptFrame += 1;
     refreshLoadingPrompt();
   };
 
@@ -692,6 +690,15 @@ const startChatSession = async ({
     writeLoadingPrompt();
   };
 
+  const updateLoadingPromptTokens = (usage) => {
+    const nextText = formatUsageTokens(usage) || '';
+    if (nextText === loadingPromptTokensText) {
+      return;
+    }
+    loadingPromptTokensText = nextText;
+    refreshLoadingPrompt();
+  };
+
   const clearLoadingPrompt = () => {
     if (!loadingPromptVisible) {
       return;
@@ -870,7 +877,6 @@ const startChatSession = async ({
       };
 
       while (true) {
-        process.stdout.write('\n');
         showLoadingPrompt();
         const streamState = {
           thinkState: createThinkParserState(),
@@ -878,13 +884,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;
           }
         };
 
@@ -921,6 +926,7 @@ const startChatSession = async ({
           tools: toolSchemas,
           onToken: handleStreamChunk,
           onReasoningToken: handleReasoningChunk,
+          onUsage: updateLoadingPromptTokens,
           onRetry: (retryCount, error) => {
             const detail = error ? `（${error.message}）` : '';
             process.stdout.write(`\n${chalk.yellow(`请求失败，${retryCount} 次重试中${detail}...`)}\n`);
@@ -928,6 +934,7 @@ const startChatSession = async ({
         });
 
         finalizeStreamState();
+        updateLoadingPromptTokens(result.usage);
 
         const rawReasoning = (reasoningFromModel || result.reasoningContent || '').trim();
         const mergedReasoning = mergeReasoningContent(
@@ -962,6 +969,7 @@ const startChatSession = async ({
               ? parsedArgs
               : { raw: typeof rawArgs === 'string' ? rawArgs : '' };
 
+            ensureNewline();
             renderToolCall({ functionName, args: displayArgs }, mcpToolNames);
 
             let toolResult;
@@ -981,8 +989,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,31 +1005,21 @@ 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,
               content: toolContent
             });
           }
-          printUsageTokens(result.usage);
           persistHistorySafely();
 
           // 检测是否需要触发 compact
@@ -1073,7 +1071,6 @@ const startChatSession = async ({
         );
         messages.push(assistantMessage);
         persistHistorySafely();
-        printUsageTokens(result.usage);
         break;
       }
     };

package/src/llm.js

@@ -68,7 +68,7 @@ const sanitizeOptions = (options = {}) => {
   }, {});
 };
 
-const chatCompletion = async ({ endpoint, messages, abortController, onToken, onReasoningToken, onRetry, onComplete, tools = [] }) => {
+const chatCompletion = async ({ endpoint, messages, abortController, onToken, onReasoningToken, onUsage, onRetry, onComplete, tools = [] }) => {
   const controller = abortController || new AbortController();
   const includeToolCalls = Array.isArray(tools) && tools.length > 0;
 
@@ -112,6 +112,11 @@ const chatCompletion = async ({ endpoint, messages, abortController, onToken, on
         onReasoningToken(chunk, aggregate);
       }
     },
+    onUsage: (usage) => {
+      if (onUsage) {
+        onUsage(usage);
+      }
+    },
     onComplete: () => {
       if (onComplete) {
         onComplete(fullContent);

package/src/request.js

@@ -88,6 +88,7 @@ const processStreamResponse = (response, options = {}) => {
   const {
     onContent = null,
     onReasoningContent = null,
+    onUsage = null,
     onComplete = null,
     abortController = null,
     includeToolCalls = false
@@ -138,6 +139,9 @@ const processStreamResponse = (response, options = {}) => {
           const payload = JSON.parse(event.data);
           if (payload.usage && typeof payload.usage === 'object') {
             usage = payload.usage;
+            if (onUsage) {
+              onUsage(usage);
+            }
           }
           const choice = payload.choices && payload.choices[0];
           if (!choice || !choice.delta) return;

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(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);
 };
 
@@ -112,23 +116,23 @@ const formatTokensToK = (totalTokens) => {
   return `${(totalTokens / 1000).toFixed(1)}k`;
 };
 
-const printUsageTokens = (usage) => {
+const formatUsageTokens = (usage) => {
   if (!usage || typeof usage !== 'object') {
-    return;
+    return null;
   }
   const totalTokens = usage.total_tokens;
   const formatted = formatTokensToK(totalTokens);
   if (!formatted) {
-    return;
+    return null;
   }
-  console.log(chalk.gray(`已使用tokens: ${formatted}`));
+  return `会话tokens: ${formatted}`;
 };
 
 module.exports = {
   mergeReasoningContent,
-  printReasoningSummary,
+  printReasoningContent,
   printAssistantContent,
   renderAssistantOutput,
   sanitizeContentWithThink,
-  printUsageTokens
+  formatUsageTokens
 };

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
 };