@ww_nero/mini-cli 1.0.95 → 1.0.97

package/package.json

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

package/src/chat.js

@@ -111,16 +111,35 @@ const splitDisplayLines = (text = '') => {
   return lines;
 };
 
+const isToolError = (result) => {
+  if (typeof result === 'string' && result.startsWith('[Error]')) {
+    return true;
+  }
+  if (result && typeof result === 'object' && result.success === false) {
+    return true;
+  }
+  return false;
+};
+
 const formatWriteOutput = (result) => {
+  if (isToolError(result)) {
+    const errorMsg = typeof result === 'string' ? result : (result.message || '写入失败');
+    return { isError: true, message: errorMsg.replace('[Error] ', '') };
+  }
   if (!result || typeof result !== 'object' || !result.success) {
-    return null;
+    return { isError: true, message: '写入失败' };
   }
-  return typeof result.content === 'string' ? result.content : String(result.content || '');
+  const lineCount = result.lineCount || countLines(result.content);
+  return { isError: false, lineCount };
 };
 
 const formatEditOutput = (result) => {
+  if (isToolError(result)) {
+    const errorMsg = typeof result === 'string' ? result : (result.message || '编辑失败');
+    return { isError: true, message: errorMsg.replace('[Error] ', '') };
+  }
   if (!result || typeof result !== 'object' || !result.success) {
-    return null;
+    return { isError: true, message: '编辑失败' };
   }
   const lines = [];
   const parts = diffLines(result.search || '', result.replace || '');
@@ -133,7 +152,7 @@ const formatEditOutput = (result) => {
     }
   }
 
-  return lines.join('\n');
+  return { isError: false, diff: lines.join('\n') };
 };
 
 const stringifyToolResult = (value) => {
@@ -172,6 +191,22 @@ const formatToolResultForDisplay = (text, maxLength = 100) => {
   return normalized.length > maxLength ? 'Done' : normalized;
 };
 
+const getReadableErrorMessage = (error) => {
+  if (error && typeof error.message === 'string' && error.message.trim()) {
+    return error.message.trim();
+  }
+  if (typeof error === 'string' && error.trim()) {
+    return error.trim();
+  }
+  return '未知错误';
+};
+
+const buildEmptyAssistantResponseNotice = (usage) => {
+  const usageText = formatUsageTokens(usage);
+  const usageSuffix = usageText ? `（${usageText}）` : '';
+  return `本次请求已结束，但模型未返回可显示内容${usageSuffix}。可能是接口返回空响应、只返回了空白内容，或流式输出在正文前结束。请重试，必要时检查模型服务日志。`;
+};
+
 const indentToolResult = (text = '') => splitDisplayLines(text)
   .map((line) => `  ${line}`)
   .join('\n');
@@ -928,7 +963,8 @@ const startChatSession = async ({
           onReasoningToken: handleReasoningChunk,
           onUsage: updateLoadingPromptTokens,
           onRetry: (retryCount, error) => {
-            const detail = error ? `（${error.message}）` : '';
+            const detailMessage = error ? getReadableErrorMessage(error) : '';
+            const detail = detailMessage ? `（${detailMessage}）` : '';
             process.stdout.write(`\n${chalk.yellow(`请求失败，${retryCount} 次重试中${detail}...`)}\n`);
           }
         });
@@ -983,7 +1019,7 @@ const startChatSession = async ({
               try {
                 toolResult = await handler(parsedArgs);
               } catch (toolError) {
-                toolResult = `工具执行异常: ${toolError.message}`;
+                toolResult = `[Error] 工具执行异常: ${toolError.message}`;
               } finally {
                 clearLoadingPrompt();
               }
@@ -994,30 +1030,33 @@ const startChatSession = async ({
 
             // Display tool output
             if (functionName === 'write') {
-              // For write, display full content in white
               const writeOutput = formatWriteOutput(toolResult);
-              if (writeOutput) {
-                console.log(writeOutput);
+              if (writeOutput.isError) {
+                console.log(chalk.red(indentToolResult(writeOutput.message)));
+              } else {
+                console.log(chalk.gray(`已写入，共${writeOutput.lineCount}行`));
               }
             } else if (functionName === 'edit') {
-              // For edit, display diff-style output
               const editOutput = formatEditOutput(toolResult);
-              if (editOutput) {
-                console.log(editOutput);
+              if (editOutput.isError) {
+                console.log(chalk.red(indentToolResult(editOutput.message)));
+              } else if (editOutput.diff) {
+                console.log(editOutput.diff);
               }
             } else if (functionName === 'read') {
-              // read 工具特殊处理：成功时显示行数，失败时显示错误信息
-              const normalized = rawToolContent.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
-              const lineCount = countLines(normalized);
-              if (normalized && !normalized.startsWith('读取失败') && !normalized.startsWith('无效路径') && !normalized.startsWith('filePath 参数不能为空')) {
-                console.log(chalk.gray(`已读取，共${lineCount}行`));
+              const isError = rawToolContent.startsWith('[Error]');
+              if (isError) {
+                console.log(chalk.red(indentToolResult(rawToolContent.replace('[Error] ', ''))));
               } else {
-                console.log(chalk.gray(indentToolResult(rawToolContent)));
+                const normalized = rawToolContent.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trim();
+                const lineCount = countLines(normalized);
+                console.log(chalk.gray(`已读取，共${lineCount}行`));
               }
             } else {
+              const isError = rawToolContent.startsWith('[Error]');
               const displayResult = formatToolResultForDisplay(rawToolContent, 100);
               if (displayResult) {
-                console.log(chalk.gray(indentToolResult(displayResult)));
+                console.log((isError ? chalk.red : chalk.gray)(indentToolResult(displayResult.replace('[Error] ', ''))));
               }
             }
 
@@ -1070,8 +1109,18 @@ const startChatSession = async ({
           continue;
         }
 
-        conversationAdvanced = true;
         const finalText = sanitizeContentWithThink(streamState.content, result.content);
+        if (!mergedReasoning && !finalText) {
+          if (messages[messages.length - 1] === userMessage) {
+            messages.pop();
+            persistHistorySafely();
+          }
+          ensureNewline();
+          console.log(chalk.yellow(buildEmptyAssistantResponseNotice(result.usage)));
+          break;
+        }
+
+        conversationAdvanced = true;
         renderAssistantOutput(mergedReasoning, finalText, ensureNewline);
         const assistantMessage = buildHistoryAssistantMessage(
           result.message,
@@ -1102,7 +1151,7 @@ const startChatSession = async ({
           console.log(chalk.yellow('对话已取消。'));
         }
       } else {
-        console.error(chalk.red(`请求失败: ${error.message}`));
+        console.error(chalk.red(`请求失败: ${getReadableErrorMessage(error)}`));
       }
     } finally {
       clearLoadingPrompt();

package/src/tools/bash.js

@@ -3,7 +3,7 @@ const { resolveWorkspacePath } = require('../utils/helpers');
 
 const executeCommand = async ({ command, workingDirectory = '.', isService = false } = {}, context = {}) => {
   if (!command || typeof command !== 'string' || !command.trim()) {
-    return 'command 参数不能为空';
+    return '[Error] command 参数不能为空';
   }
 
   const normalizedCommand = command.replace(/\bpython3\b/g, 'python');
@@ -16,7 +16,7 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
   try {
     cwd = resolveWorkspacePath(context.workspaceRoot, workingDirectory || '.');
   } catch (error) {
-    return `工作目录无效: ${error.message}`;
+    return `[Error] 工作目录无效: ${error.message}`;
   }
 
   return new Promise((resolve) => {
@@ -53,7 +53,7 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
       if (settled) return;
       settled = true;
       cleanup();
-      resolve(`命令执行失败: ${error.message}`);
+      resolve(`[Error] 命令执行失败: ${error.message}`);
     };
 
     const handleProcessClose = (code) => {
@@ -66,7 +66,7 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
       } else {
         const errOutput = stderr.trim();
         const stdOutput = stdout.trim();
-        resolve(`命令执行失败，退出码 ${code}${errOutput ? `\n错误: ${errOutput}` : ''}${stdOutput ? `\n输出: ${stdOutput}` : ''}`);
+        resolve(`[Error] 命令执行失败，退出码 ${code}${errOutput ? `\n错误: ${errOutput}` : ''}${stdOutput ? `\n输出: ${stdOutput}` : ''}`);
       }
     };
 
@@ -98,7 +98,7 @@ const executeCommand = async ({ command, workingDirectory = '.', isService = fal
         if (settled) return;
         child.kill('SIGTERM');
         cleanup();
-        resolve(`命令执行超时 (超过 ${executionTimeout / 1000}s)`);
+        resolve(`[Error] 命令执行超时 (超过 ${executionTimeout / 1000}s)`);
       }, executionTimeout);
     }
   });

package/src/tools/edit.js

@@ -10,27 +10,27 @@ const {
 
 const editFile = async ({ filePath, search, replace } = {}, context = {}) => {
   if (!filePath || typeof filePath !== 'string') {
-    return 'filePath 参数不能为空';
+    return '[Error] filePath 参数不能为空';
   }
   if (typeof search !== 'string' || search.trim() === '') {
-    return 'search 参数不能为空';
+    return '[Error] search 参数不能为空';
   }
   if (typeof replace !== 'string') {
-    return 'replace 参数必须是字符串，可为空字符串表示删除';
+    return '[Error] replace 参数必须是字符串，可为空字符串表示删除';
   }
 
   let absolutePath;
   try {
     absolutePath = resolveWorkspacePath(context.workspaceRoot, filePath);
   } catch (error) {
-    return `无效路径: ${error.message}`;
+    return `[Error] 无效路径: ${error.message}`;
   }
 
   let originCode;
   try {
     originCode = await readTextFile(absolutePath);
   } catch (error) {
-    return `读取文件失败 ${filePath}: ${error.message}`;
+    return `[Error] 读取文件失败 ${filePath}: ${error.message}`;
   }
 
   const normalizedOrigin = normalizeLineBreaks(originCode);
@@ -38,7 +38,7 @@ const editFile = async ({ filePath, search, replace } = {}, context = {}) => {
   let normalizedReplace = normalizeLineBreaks(replace);
 
   if (!normalizedSearch) {
-    return 'search 参数规范化后为空';
+    return '[Error] search 参数规范化后为空';
   }
 
   if (normalizedReplace) {
@@ -58,12 +58,12 @@ const editFile = async ({ filePath, search, replace } = {}, context = {}) => {
   }
 
   if (!normalizedOrigin.includes(searchPattern)) {
-    return `在文件 ${filePath} 中未找到要搜索的内容`;
+    return `[Error] 在文件 ${filePath} 中未找到要搜索的内容`;
   }
 
   const updated = normalizedOrigin.replaceAll(searchPattern, normalizedReplace);
   if (isCodeIdentical(originCode, updated)) {
-    return `修改前后内容相同: ${filePath}`;
+    return `[Error] 修改前后内容相同: ${filePath}`;
   }
 
   const processed = processContent(updated);
@@ -78,7 +78,7 @@ const editFile = async ({ filePath, search, replace } = {}, context = {}) => {
       replace: normalizedReplace
     };
   } catch (error) {
-    return `搜索替换失败 ${filePath}: ${error.message}`;
+    return `[Error] 搜索替换失败 ${filePath}: ${error.message}`;
   }
 };
 

package/src/tools/mcp.js

@@ -319,7 +319,7 @@ const resolveImageSource = (workspaceRoot, args = {}) => {
   const resolved = path.resolve(root, imageSource);
   const relative = path.relative(root, resolved);
   if (relative.startsWith('..') || path.isAbsolute(relative) || !fs.existsSync(resolved)) {
-    return { error: '找不到图片' };
+    return { error: '[Error] 找不到图片' };
   }
   return { args: { ...args, image_source: resolved } };
 };
@@ -438,11 +438,11 @@ class McpManager {
             const isError = Boolean(result && result.isError);
             const output = formatMcpContent(result && result.content);
             if (isError) {
-              return output ? `MCP 工具返回错误：${output}` : 'MCP 工具返回错误';
+              return output ? `[Error] MCP 工具返回错误：${output}` : '[Error] MCP 工具返回错误';
             }
             return output || 'MCP 工具无输出';
           } catch (error) {
-            return `调用 MCP 工具失败：${error.message}`;
+            return `[Error] 调用 MCP 工具失败：${error.message}`;
           }
         }
       };

package/src/tools/read.js

@@ -2,20 +2,20 @@ const { resolveWorkspacePath, readTextFile } = require('../utils/helpers');
 
 const readFile = async ({ filePath } = {}, context = {}) => {
   if (!filePath || typeof filePath !== 'string') {
-    return 'filePath 参数不能为空';
+    return '[Error] filePath 参数不能为空';
   }
 
   let absolutePath;
   try {
     absolutePath = resolveWorkspacePath(context.workspaceRoot, filePath);
   } catch (error) {
-    return `无效路径: ${error.message}`;
+    return `[Error] 无效路径: ${error.message}`;
   }
 
   try {
     return await readTextFile(absolutePath);
   } catch (error) {
-    return `读取失败 ${filePath}: ${error.message}`;
+    return `[Error] 读取失败 ${filePath}: ${error.message}`;
   }
 };
 

package/src/tools/skills.js

@@ -16,7 +16,7 @@ const handler = async ({ skillName, filePath } = {}) => {
       content: result.content
     };
   } catch (error) {
-    return `读取 skill 失败：${error.message}`;
+    return `[Error] 读取 skill 失败：${error.message}`;
   }
 };
 

package/src/tools/write.js

@@ -11,17 +11,17 @@ const countLines = (text = '') => {
 
 const writeFile = async ({ filePath, content } = {}, context = {}) => {
   if (!filePath || typeof filePath !== 'string') {
-    return 'filePath 参数不能为空';
+    return '[Error] filePath 参数不能为空';
   }
   if (typeof content !== 'string') {
-    return 'content 必须是字符串';
+    return '[Error] content 必须是字符串';
   }
 
   let absolutePath;
   try {
     absolutePath = resolveWorkspacePath(context.workspaceRoot, filePath);
   } catch (error) {
-    return `无效路径: ${error.message}`;
+    return `[Error] 无效路径: ${error.message}`;
   }
 
   try {
@@ -33,7 +33,7 @@ const writeFile = async ({ filePath, content } = {}, context = {}) => {
       lineCount: countLines(content)
     };
   } catch (error) {
-    return `写入失败 ${filePath}: ${error.message}`;
+    return `[Error] 写入失败 ${filePath}: ${error.message}`;
   }
 };