@ww_nero/mini-cli 1.0.81 → 1.0.82

package/src/tools/bash.js

@@ -1,144 +1,144 @@
-const { spawn } = require('child_process');
-const { resolveWorkspacePath } = require('../utils/helpers');
-
-const executeCommand = async ({ command, workingDirectory = '.', isService = false } = {}, context = {}) => {
-  if (!command || typeof command !== 'string' || !command.trim()) {
-    return 'command 参数不能为空';
-  }
-
-  const normalizedCommand = command.replace(/\bpython3\b/g, 'python');
-
-  const outputMaxLength = context.outputMaxLength || 12000;
-  const executionTimeout = context.executionTimeout || 300000;
-  const serviceBootWindow = context.serviceBootWindow || 5000;
-
-  let cwd;
-  try {
-    cwd = resolveWorkspacePath(context.workspaceRoot, workingDirectory || '.');
-  } catch (error) {
-    return `工作目录无效: ${error.message}`;
-  }
-
-  return new Promise((resolve) => {
-    const child = spawn('bash', ['-lc', normalizedCommand], {
-      cwd,
-      env: process.env,
-      stdio: ['ignore', 'pipe', 'pipe']
-    });
-
-    let stdout = '';
-    let stderr = '';
-    let settled = false;
-
-    const cleanup = () => {
-      child.stdout.removeAllListeners();
-      child.stderr.removeAllListeners();
-    };
-
-    child.stdout.on('data', (data) => {
-      stdout += data.toString();
-      if (stdout.length > outputMaxLength) {
-        stdout = stdout.slice(0, outputMaxLength);
-      }
-    });
-
-    child.stderr.on('data', (data) => {
-      stderr += data.toString();
-      if (stderr.length > outputMaxLength) {
-        stderr = stderr.slice(0, outputMaxLength);
-      }
-    });
-
-    const handleProcessError = (error) => {
-      if (settled) return;
-      settled = true;
-      cleanup();
-      resolve(`命令执行失败: ${error.message}`);
-    };
-
-    const handleProcessClose = (code) => {
-      cleanup();
-      if (settled) return;
-      settled = true;
-      if (code === 0) {
-        const output = stdout.trim();
-        resolve(output || '命令执行成功，无额外输出');
-      } else {
-        const errOutput = stderr.trim();
-        const stdOutput = stdout.trim();
-        resolve(`命令执行失败，退出码 ${code}${errOutput ? `\n错误: ${errOutput}` : ''}${stdOutput ? `\n输出: ${stdOutput}` : ''}`);
-      }
-    };
-
-    if (isService) {
-      const timer = setTimeout(() => {
-        if (settled) return;
-        settled = true;
-        const stdOutput = stdout.trim();
-        const errOutput = stderr.trim();
-        const captured = stdOutput || errOutput ? `\n当前输出:\n${stdOutput}${errOutput ? `\n错误:\n${errOutput}` : ''}` : '\n暂无输出';
-        resolve(`已等待 ${serviceBootWindow / 1000}s，命令已在后台持续运行（PID: ${child.pid}）。${captured}`);
-      }, serviceBootWindow);
-
-      const serviceErrorHandler = (error) => {
-        clearTimeout(timer);
-        handleProcessError(error);
-      };
-
-      child.on('error', serviceErrorHandler);
-      child.on('close', (code) => {
-        clearTimeout(timer);
-        handleProcessClose(code);
-      });
-    } else {
-      child.on('error', handleProcessError);
-      child.on('close', handleProcessClose);
-
-      setTimeout(() => {
-        if (settled) return;
-        child.kill('SIGTERM');
-        cleanup();
-        resolve(`命令执行超时 (超过 ${executionTimeout / 1000}s)`);
-      }, executionTimeout);
-    }
-  });
-};
-
-const createBashToolSchema = () => {
-  const descriptionParts = ['在指定目录运行 bash 命令，支持使用 && / || 连接多个命令。'];
-  descriptionParts.push('isService=true 时在后台运行服务，等待 5 秒返回初始输出，之后服务进程继续运行；默认等待命令执行完成，超时为 300 秒。');
-
-  return {
-    type: 'function',
-    function: {
-      name: 'bash',
-      description: descriptionParts.join(' '),
-      parameters: {
-        type: 'object',
-        properties: {
-          command: {
-            type: 'string',
-            description: '要执行的 bash 命令'
-          },
-          workingDirectory: {
-            type: 'string',
-            description: '相对工作目录，默认为项目根目录',
-            default: '.'
-          },
-          isService: {
-            type: 'boolean',
-            description: '是否为启动长时间运行服务的命令。为 true 时后台运行并在 5 秒后返回捕获的输出。',
-            default: false
-          }
-        },
-        required: ['command']
-      }
-    }
-  };
-};
-
-module.exports = {
-  name: 'bash',
-  schema: createBashToolSchema,
-  handler: executeCommand
-};
+const { spawn } = require('child_process');
+const { resolveWorkspacePath } = require('../utils/helpers');
+
+const executeCommand = async ({ command, workingDirectory = '.', isService = false } = {}, context = {}) => {
+  if (!command || typeof command !== 'string' || !command.trim()) {
+    return 'command 参数不能为空';
+  }
+
+  const normalizedCommand = command.replace(/\bpython3\b/g, 'python');
+
+  const outputMaxLength = context.outputMaxLength || 12000;
+  const executionTimeout = context.executionTimeout || 300000;
+  const serviceBootWindow = context.serviceBootWindow || 5000;
+
+  let cwd;
+  try {
+    cwd = resolveWorkspacePath(context.workspaceRoot, workingDirectory || '.');
+  } catch (error) {
+    return `工作目录无效: ${error.message}`;
+  }
+
+  return new Promise((resolve) => {
+    const child = spawn('bash', ['-lc', normalizedCommand], {
+      cwd,
+      env: process.env,
+      stdio: ['ignore', 'pipe', 'pipe']
+    });
+
+    let stdout = '';
+    let stderr = '';
+    let settled = false;
+
+    const cleanup = () => {
+      child.stdout.removeAllListeners();
+      child.stderr.removeAllListeners();
+    };
+
+    child.stdout.on('data', (data) => {
+      stdout += data.toString();
+      if (stdout.length > outputMaxLength) {
+        stdout = stdout.slice(0, outputMaxLength);
+      }
+    });
+
+    child.stderr.on('data', (data) => {
+      stderr += data.toString();
+      if (stderr.length > outputMaxLength) {
+        stderr = stderr.slice(0, outputMaxLength);
+      }
+    });
+
+    const handleProcessError = (error) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolve(`命令执行失败: ${error.message}`);
+    };
+
+    const handleProcessClose = (code) => {
+      cleanup();
+      if (settled) return;
+      settled = true;
+      if (code === 0) {
+        const output = stdout.trim();
+        resolve(output || '命令执行成功，无额外输出');
+      } else {
+        const errOutput = stderr.trim();
+        const stdOutput = stdout.trim();
+        resolve(`命令执行失败，退出码 ${code}${errOutput ? `\n错误: ${errOutput}` : ''}${stdOutput ? `\n输出: ${stdOutput}` : ''}`);
+      }
+    };
+
+    if (isService) {
+      const timer = setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        const stdOutput = stdout.trim();
+        const errOutput = stderr.trim();
+        const captured = stdOutput || errOutput ? `\n当前输出:\n${stdOutput}${errOutput ? `\n错误:\n${errOutput}` : ''}` : '\n暂无输出';
+        resolve(`已等待 ${serviceBootWindow / 1000}s，命令已在后台持续运行（PID: ${child.pid}）。${captured}`);
+      }, serviceBootWindow);
+
+      const serviceErrorHandler = (error) => {
+        clearTimeout(timer);
+        handleProcessError(error);
+      };
+
+      child.on('error', serviceErrorHandler);
+      child.on('close', (code) => {
+        clearTimeout(timer);
+        handleProcessClose(code);
+      });
+    } else {
+      child.on('error', handleProcessError);
+      child.on('close', handleProcessClose);
+
+      setTimeout(() => {
+        if (settled) return;
+        child.kill('SIGTERM');
+        cleanup();
+        resolve(`命令执行超时 (超过 ${executionTimeout / 1000}s)`);
+      }, executionTimeout);
+    }
+  });
+};
+
+const createBashToolSchema = () => {
+  const descriptionParts = ['在指定目录运行 bash 命令，支持使用 && / || 连接多个命令。'];
+  descriptionParts.push('isService=true 时在后台运行服务，等待 5 秒返回初始输出，之后服务进程继续运行；默认等待命令执行完成，超时为 300 秒。');
+
+  return {
+    type: 'function',
+    function: {
+      name: 'bash',
+      description: descriptionParts.join(' '),
+      parameters: {
+        type: 'object',
+        properties: {
+          command: {
+            type: 'string',
+            description: '要执行的 bash 命令'
+          },
+          workingDirectory: {
+            type: 'string',
+            description: '相对工作目录，默认为项目根目录',
+            default: '.'
+          },
+          isService: {
+            type: 'boolean',
+            description: '是否为启动长时间运行服务的命令。为 true 时后台运行并在 5 秒后返回捕获的输出。',
+            default: false
+          }
+        },
+        required: ['command']
+      }
+    }
+  };
+};
+
+module.exports = {
+  name: 'bash',
+  schema: createBashToolSchema,
+  handler: executeCommand
+};

package/src/tools/edit.js

@@ -1,137 +1,137 @@
-const { diffLines } = require('diff');
-const {
-  resolveWorkspacePath,
-  readTextFile,
-  writeTextFile,
-  normalizeLineBreaks,
-  isCodeIdentical,
-  processContent
-} = 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 参数不能为空';
-  }
-  if (typeof search !== 'string' || search.trim() === '') {
-    return 'search 参数不能为空';
-  }
-  if (typeof replace !== 'string') {
-    return 'replace 参数必须是字符串，可为空字符串表示删除';
-  }
-
-  let absolutePath;
-  try {
-    absolutePath = resolveWorkspacePath(context.workspaceRoot, filePath);
-  } catch (error) {
-    return `无效路径: ${error.message}`;
-  }
-
-  let originCode;
-  try {
-    originCode = await readTextFile(absolutePath);
-  } catch (error) {
-    return `读取文件失败 ${filePath}: ${error.message}`;
-  }
-
-  const normalizedOrigin = normalizeLineBreaks(originCode);
-  const normalizedSearch = normalizeLineBreaks(search);
-  let normalizedReplace = normalizeLineBreaks(replace);
-
-  if (!normalizedSearch) {
-    return 'search 参数规范化后为空';
-  }
-
-  if (normalizedReplace) {
-    normalizedReplace = normalizedReplace.replace(/\n+$/, '');
-    if (/\n$/.test(replace)) {
-      normalizedReplace += '\n';
-    }
-  }
-
-  let searchPattern = normalizedSearch;
-  if (!normalizedReplace || normalizedReplace.trim() === '') {
-    if (normalizedOrigin.includes(normalizedSearch + '\n')) {
-      searchPattern = normalizedSearch + '\n';
-    } else if (normalizedOrigin.includes('\n' + normalizedSearch)) {
-      searchPattern = '\n' + normalizedSearch;
-    }
-  }
-
-  if (!normalizedOrigin.includes(searchPattern)) {
-    return `在文件 ${filePath} 中未找到要搜索的内容`;
-  }
-
-  const updated = normalizedOrigin.replaceAll(searchPattern, normalizedReplace);
-  if (isCodeIdentical(originCode, updated)) {
-    return `修改前后内容相同: ${filePath}`;
-  }
-
-  const processed = processContent(updated);
-  try {
-    await writeTextFile(absolutePath, processed);
-    const diffStats = computeDiffStats(normalizedOrigin, normalizeLineBreaks(processed));
-    return {
-      success: true,
-      message: `搜索替换成功: ${filePath}`,
-      diffStats,
-      search: normalizedSearch,
-      replace: normalizedReplace
-    };
-  } catch (error) {
-    return `搜索替换失败 ${filePath}: ${error.message}`;
-  }
-};
-
-const schema = {
-  type: 'function',
-  function: {
-    name: 'edit',
-    description: '在文件中搜索并替换指定的代码片段（简单字符串匹配，非正则）',
-    parameters: {
-      type: 'object',
-      properties: {
-        filePath: {
-          type: 'string',
-          description: '文件的相对路径'
-        },
-        search: {
-          type: 'string',
-          description: '原始代码片段（完整拷贝，勿省略）'
-        },
-        replace: {
-          type: 'string',
-          description: '替换后的代码片段，可为空字符串表示删除'
-        }
-      },
-      required: ['filePath', 'search', 'replace']
-    }
-  }
-};
-
-module.exports = {
-  name: 'edit',
-  schema,
-  handler: editFile
-};
+const { diffLines } = require('diff');
+const {
+  resolveWorkspacePath,
+  readTextFile,
+  writeTextFile,
+  normalizeLineBreaks,
+  isCodeIdentical,
+  processContent
+} = 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 参数不能为空';
+  }
+  if (typeof search !== 'string' || search.trim() === '') {
+    return 'search 参数不能为空';
+  }
+  if (typeof replace !== 'string') {
+    return 'replace 参数必须是字符串，可为空字符串表示删除';
+  }
+
+  let absolutePath;
+  try {
+    absolutePath = resolveWorkspacePath(context.workspaceRoot, filePath);
+  } catch (error) {
+    return `无效路径: ${error.message}`;
+  }
+
+  let originCode;
+  try {
+    originCode = await readTextFile(absolutePath);
+  } catch (error) {
+    return `读取文件失败 ${filePath}: ${error.message}`;
+  }
+
+  const normalizedOrigin = normalizeLineBreaks(originCode);
+  const normalizedSearch = normalizeLineBreaks(search);
+  let normalizedReplace = normalizeLineBreaks(replace);
+
+  if (!normalizedSearch) {
+    return 'search 参数规范化后为空';
+  }
+
+  if (normalizedReplace) {
+    normalizedReplace = normalizedReplace.replace(/\n+$/, '');
+    if (/\n$/.test(replace)) {
+      normalizedReplace += '\n';
+    }
+  }
+
+  let searchPattern = normalizedSearch;
+  if (!normalizedReplace || normalizedReplace.trim() === '') {
+    if (normalizedOrigin.includes(normalizedSearch + '\n')) {
+      searchPattern = normalizedSearch + '\n';
+    } else if (normalizedOrigin.includes('\n' + normalizedSearch)) {
+      searchPattern = '\n' + normalizedSearch;
+    }
+  }
+
+  if (!normalizedOrigin.includes(searchPattern)) {
+    return `在文件 ${filePath} 中未找到要搜索的内容`;
+  }
+
+  const updated = normalizedOrigin.replaceAll(searchPattern, normalizedReplace);
+  if (isCodeIdentical(originCode, updated)) {
+    return `修改前后内容相同: ${filePath}`;
+  }
+
+  const processed = processContent(updated);
+  try {
+    await writeTextFile(absolutePath, processed);
+    const diffStats = computeDiffStats(normalizedOrigin, normalizeLineBreaks(processed));
+    return {
+      success: true,
+      message: `搜索替换成功: ${filePath}`,
+      diffStats,
+      search: normalizedSearch,
+      replace: normalizedReplace
+    };
+  } catch (error) {
+    return `搜索替换失败 ${filePath}: ${error.message}`;
+  }
+};
+
+const schema = {
+  type: 'function',
+  function: {
+    name: 'edit',
+    description: '在文件中搜索并替换指定的代码片段（简单字符串匹配，非正则）',
+    parameters: {
+      type: 'object',
+      properties: {
+        filePath: {
+          type: 'string',
+          description: '文件的相对路径'
+        },
+        search: {
+          type: 'string',
+          description: '原始代码片段（完整拷贝，勿省略）'
+        },
+        replace: {
+          type: 'string',
+          description: '替换后的代码片段，可为空字符串表示删除'
+        }
+      },
+      required: ['filePath', 'search', 'replace']
+    }
+  }
+};
+
+module.exports = {
+  name: 'edit',
+  schema,
+  handler: editFile
+};