@git-ai/cli 1.0.2 → 1.0.4

package/src/utils/ConflictUtils.mjs

@@ -1,39 +1,39 @@
-import { readFileSync } from "fs";
-
-/**
- * 查找冲突文件
- */
-export const findConflictFiles = (paths, workingPrefix = "") => {
-  const conflictFiles = [];
-  const ignoreFiles = [];
-  const pathsCopy = [...paths];
-
-  while (pathsCopy.length) {
-    const p = pathsCopy.shift();
-
-    // 如果有 workingPrefix，检查文件是否在当前工作目录下
-    // p 是相对于 Git 根目录的路径，workingPrefix 也是相对于 Git 根目录的路径
-    if (workingPrefix && !p.startsWith(workingPrefix)) {
-      ignoreFiles.push(p);
-      continue;
-    }
-
-    try {
-      const content = readFileSync(p, "utf8");
-      // 检查是否有 git 冲突标记
-      // 仅当冲突标记出现在行首时才判定为真实冲突，避免代码字符串中的误判
-      const hasStartMarker = /^<<<<<<< [^\n\r]*/m.test(content);
-      const hasMidMarker = /^=======$/m.test(content);
-      const hasEndMarker = /^>>>>>>> [^\n\r]*/m.test(content);
-
-      if (hasStartMarker && hasMidMarker && hasEndMarker) {
-        conflictFiles.push(p);
-      }
-    } catch (error) {
-      // 文件读取失败，可能是被忽略的文件
-      ignoreFiles.push(p);
-    }
-  }
-
-  return { conflictFiles, ignoreFiles };
-};
+import { readFileSync } from 'fs';
+
+/**
+ * 查找冲突文件
+ */
+export const findConflictFiles = (paths, workingPrefix = '') => {
+  const conflictFiles = [];
+  const ignoreFiles = [];
+  const pathsCopy = [...paths];
+
+  while (pathsCopy.length) {
+    const p = pathsCopy.shift();
+
+    // 如果有 workingPrefix，检查文件是否在当前工作目录下
+    // p 是相对于 Git 根目录的路径，workingPrefix 也是相对于 Git 根目录的路径
+    if (workingPrefix && !p.startsWith(workingPrefix)) {
+      ignoreFiles.push(p);
+      continue;
+    }
+
+    try {
+      const content = readFileSync(p, 'utf8');
+      // 检查是否有 git 冲突标记
+      // 仅当冲突标记出现在行首时才判定为真实冲突，避免代码字符串中的误判
+      const hasStartMarker = /^<<<<<<< [^\n\r]*/m.test(content);
+      const hasMidMarker = /^=======$/m.test(content);
+      const hasEndMarker = /^>>>>>>> [^\n\r]*/m.test(content);
+
+      if (hasStartMarker && hasMidMarker && hasEndMarker) {
+        conflictFiles.push(p);
+      }
+    } catch (error) {
+      // 文件读取失败，可能是被忽略的文件
+      ignoreFiles.push(p);
+    }
+  }
+
+  return { conflictFiles, ignoreFiles };
+};

package/src/utils/Log.mjs

@@ -1,146 +1,138 @@
-import fs from "fs";
-import path from "path";
-import os from "os";
-import { NAME } from "../const.mjs";
-import npmlog from "npmlog";
-
-// 日志收集器
-const logCollector = [];
-const MAX_DETAIL_LENGTH = 2000;
-
-const truncate = (content = "") => {
-  if (typeof content !== "string") {
-    return content;
-  }
-  return content.length > MAX_DETAIL_LENGTH
-    ? `${content.slice(0, MAX_DETAIL_LENGTH)}\n...[truncated]`
-    : content;
-};
-
-const pushLog = (entry) => {
-  logCollector.push({
-    timestamp: new Date().toISOString(),
-    ...entry,
-  });
-};
-
-export function collectError(err, context = "") {
-  const errorMessage = (err && (err.stack || err.message)) || String(err);
-  pushLog({
-    source: "error",
-    level: "error",
-    context,
-    message: truncate(errorMessage),
-  });
-}
-
-export function collectWarning(message = "", context = "") {
-  pushLog({
-    source: "warning",
-    level: "warning",
-    context,
-    message: truncate(message),
-  });
-}
-
-export function collectGitExecLog(entry = {}) {
-  const {
-    command = "",
-    options = {},
-    status = "success",
-    output = "",
-    error = "",
-  } = entry;
-  pushLog({
-    source: "git-exec",
-    level: status,
-    command,
-    options,
-    message: truncate(output),
-    error: truncate(error),
-  });
-}
-
-export function collectLoggerLog(level, message) {
-  const payload = Array.isArray(message) ? message : [message];
-  pushLog({
-    source: "logger",
-    level,
-    message: truncate(payload.filter(Boolean).join(" ")),
-  });
-}
-
-export function collectSpinnerState(state, text = "") {
-  pushLog({
-    source: "spinner",
-    level: state,
-    message: truncate(text),
-  });
-}
-
-export function writeLogFile() {
-  if (logCollector.length === 0) {
-    return null;
-  }
-
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, "0");
-  const logDir = path.join(
-    os.homedir(),
-    ".config",
-    NAME.replace("@", "/"),
-    "logs",
-    `${year}-${month}`
-  );
-
-  if (!fs.existsSync(logDir)) {
-    fs.mkdirSync(logDir, { recursive: true });
-  }
-
-  const day = String(now.getDate()).padStart(2, "0");
-  const hour = String(now.getHours()).padStart(2, "0");
-  const minute = String(now.getMinutes()).padStart(2, "0");
-  const second = String(now.getSeconds()).padStart(2, "0");
-  const dateStr = `${year}-${month}-${day}_${hour}-${minute}-${second}`;
-  const logFile = path.join(logDir, `log-${dateStr}.txt`);
-
-  let logContent = `日志收集器\n生成时间: ${now.toLocaleString("zh-CN")}\n`;
-  logContent += `${"=".repeat(80)}\n\n`;
-
-  logCollector.forEach((item, index) => {
-    logContent += `[日志 ${index + 1}]\n`;
-    logContent += `时间: ${item.timestamp}\n`;
-    logContent += `来源: ${item.source}\n`;
-    if (item.level) {
-      logContent += `级别: ${item.level}\n`;
-    }
-    if (item.context) {
-      logContent += `上下文: ${item.context}\n`;
-    }
-    if (item.command) {
-      logContent += `命令: ${item.command}\n`;
-    }
-    if (item.options && Object.keys(item.options).length) {
-      logContent += `参数: ${JSON.stringify(item.options)}\n`;
-    }
-    if (item.message) {
-      logContent += `内容:\n${item.message}\n`;
-    }
-    if (item.error) {
-      logContent += `错误:\n${item.error}\n`;
-    }
-    logContent += `${"-".repeat(80)}\n\n`;
-  });
-
-  fs.writeFileSync(logFile, logContent, "utf8");
-
-  const errorCount = logCollector.filter(
-    (item) => item.level === "error"
-  ).length;
-  if (errorCount > 0) {
-    npmlog.verbose(`日志地址: ${logFile}`);
-  }
-
-  return logFile;
-}
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { NAME } from '../const.mjs';
+import npmlog from 'npmlog';
+
+// 日志收集器
+const logCollector = [];
+const MAX_DETAIL_LENGTH = 2000;
+
+const truncate = (content = '') => {
+  if (typeof content !== 'string') {
+    return content;
+  }
+  return content.length > MAX_DETAIL_LENGTH
+    ? `${content.slice(0, MAX_DETAIL_LENGTH)}\n...[truncated]`
+    : content;
+};
+
+const pushLog = (entry) => {
+  logCollector.push({
+    timestamp: new Date().toISOString(),
+    ...entry,
+  });
+};
+
+export function collectError(err, context = '') {
+  const errorMessage = (err && (err.stack || err.message)) || String(err);
+  pushLog({
+    source: 'error',
+    level: 'error',
+    context,
+    message: truncate(errorMessage),
+  });
+}
+
+export function collectWarning(message = '', context = '') {
+  pushLog({
+    source: 'warning',
+    level: 'warning',
+    context,
+    message: truncate(message),
+  });
+}
+
+export function collectGitExecLog(entry = {}) {
+  const { command = '', options = {}, status = 'success', output = '', error = '' } = entry;
+  pushLog({
+    source: 'git-exec',
+    level: status,
+    command,
+    options,
+    message: truncate(output),
+    error: truncate(error),
+  });
+}
+
+export function collectLoggerLog(level, message) {
+  const payload = Array.isArray(message) ? message : [message];
+  pushLog({
+    source: 'logger',
+    level,
+    message: truncate(payload.filter(Boolean).join(' ')),
+  });
+}
+
+export function collectSpinnerState(state, text = '') {
+  pushLog({
+    source: 'spinner',
+    level: state,
+    message: truncate(text),
+  });
+}
+
+export function writeLogFile() {
+  if (logCollector.length === 0) {
+    return null;
+  }
+
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const logDir = path.join(
+    os.homedir(),
+    '.config',
+    NAME.replace('@', '/'),
+    'logs',
+    `${year}-${month}`
+  );
+
+  if (!fs.existsSync(logDir)) {
+    fs.mkdirSync(logDir, { recursive: true });
+  }
+
+  const day = String(now.getDate()).padStart(2, '0');
+  const hour = String(now.getHours()).padStart(2, '0');
+  const minute = String(now.getMinutes()).padStart(2, '0');
+  const second = String(now.getSeconds()).padStart(2, '0');
+  const dateStr = `${year}-${month}-${day}_${hour}-${minute}-${second}`;
+  const logFile = path.join(logDir, `log-${dateStr}.txt`);
+
+  let logContent = `日志收集器\n生成时间: ${now.toLocaleString('zh-CN')}\n`;
+  logContent += `${'='.repeat(80)}\n\n`;
+
+  logCollector.forEach((item, index) => {
+    logContent += `[日志 ${index + 1}]\n`;
+    logContent += `时间: ${item.timestamp}\n`;
+    logContent += `来源: ${item.source}\n`;
+    if (item.level) {
+      logContent += `级别: ${item.level}\n`;
+    }
+    if (item.context) {
+      logContent += `上下文: ${item.context}\n`;
+    }
+    if (item.command) {
+      logContent += `命令: ${item.command}\n`;
+    }
+    if (item.options && Object.keys(item.options).length) {
+      logContent += `参数: ${JSON.stringify(item.options)}\n`;
+    }
+    if (item.message) {
+      logContent += `内容:\n${item.message}\n`;
+    }
+    if (item.error) {
+      logContent += `错误:\n${item.error}\n`;
+    }
+    logContent += `${'-'.repeat(80)}\n\n`;
+  });
+
+  fs.writeFileSync(logFile, logContent, 'utf8');
+
+  const errorCount = logCollector.filter((item) => item.level === 'error').length;
+  if (errorCount > 0) {
+    npmlog.verbose(`日志地址: ${logFile}`);
+  }
+
+  return logFile;
+}

package/src/utils/Logger.mjs

@@ -1,34 +1,34 @@
-import npmlog from "npmlog";
-import { BIN } from "../const.mjs";
-import { collectLoggerLog } from "./Log.mjs";
-
-npmlog.level = "info";
-npmlog.heading = BIN.replace(" ", "-"); // 修改前缀
-npmlog.headingStyle = { fg: "red", bg: "black" }; // 修改前缀样式
-npmlog.addLevel("success", 2000, { fg: "green", bold: true }); // 添加自定义命令
-npmlog.addLevel("verbose", 2000, { fg: "blue", bg: "black" }, "verb"); // 添加自定义命令，Number 数字1000会无法显示，建议2000
-
-const levelsToWrap = [
-  "info",
-  "warn",
-  "error",
-  "success",
-  "verb",
-  "verbose",
-  "silly",
-  "http",
-  "notice",
-];
-
-levelsToWrap.forEach((level) => {
-  if (typeof npmlog[level] !== "function") {
-    return;
-  }
-  const original = npmlog[level].bind(npmlog);
-  npmlog[level] = (...args) => {
-    collectLoggerLog(level, args);
-    return original(...args);
-  };
-});
-
-export default npmlog;
+import npmlog from 'npmlog';
+import { BIN } from '../const.mjs';
+import { collectLoggerLog } from './Log.mjs';
+
+npmlog.level = 'info';
+npmlog.heading = BIN.replace(' ', '-'); // 修改前缀
+npmlog.headingStyle = { fg: 'red', bg: 'black' }; // 修改前缀样式
+npmlog.addLevel('success', 2000, { fg: 'green', bold: true }); // 添加自定义命令
+npmlog.addLevel('verbose', 2000, { fg: 'blue', bg: 'black' }, 'verb'); // 添加自定义命令，Number 数字1000会无法显示，建议2000
+
+const levelsToWrap = [
+  'info',
+  'warn',
+  'error',
+  'success',
+  'verb',
+  'verbose',
+  'silly',
+  'http',
+  'notice',
+];
+
+levelsToWrap.forEach((level) => {
+  if (typeof npmlog[level] !== 'function') {
+    return;
+  }
+  const original = npmlog[level].bind(npmlog);
+  npmlog[level] = (...args) => {
+    collectLoggerLog(level, args);
+    return original(...args);
+  };
+});
+
+export default npmlog;