@git-ai/cli 1.0.0

package/src/services/GitService.mjs

@@ -0,0 +1,388 @@
+import { execSync } from "child_process";
+import { collectGitExecLog } from "../utils/Log.mjs";
+import Logger from "../utils/Logger.mjs";
+
+const sanitizeExecOptions = (options = {}) => {
+  return Object.entries(options).reduce((acc, [key, value]) => {
+    if (typeof value === "function") {
+      acc[key] = `[Function ${value.name || "anonymous"}]`;
+      return acc;
+    }
+    if (value instanceof Buffer) {
+      acc[key] = `[Buffer length=${value.length}]`;
+      return acc;
+    }
+    acc[key] = value;
+    return acc;
+  }, {});
+};
+
+/**
+ * Git 操作服务类
+ * 封装所有 Git 相关操作
+ */
+export class GitService {
+  constructor() {}
+
+  /**
+   * 执行 Git 命令
+   */
+  exec(command, options = {}) {
+    const execOptions = {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "ignore"],
+      ...options,
+    };
+
+    try {
+      const result = execSync(command, execOptions);
+      collectGitExecLog({
+        command,
+        options: sanitizeExecOptions(execOptions),
+        status: "success",
+        output: typeof result === "string" ? result : "",
+      });
+      return result;
+    } catch (error) {
+      collectGitExecLog({
+        command,
+        options: sanitizeExecOptions(execOptions),
+        status: "error",
+        error: error && error.message ? error.message : String(error),
+      });
+      throw error;
+    }
+  }
+
+  /**
+   * 检查是否安装 Git
+   */
+  checkInstalled() {
+    try {
+      const hasGit = this.exec("git --version").toString().trim();
+      if (!hasGit) {
+        throw "当前没有安装 git，请先安装 git...";
+      }
+    } catch (error) {
+      throw error && error.message ? error.message : error;
+    }
+  }
+
+  /**
+   * 检查是否为 Git 仓库
+   */
+  checkRepository() {
+    try {
+      this.exec("git rev-parse --is-inside-work-tree");
+    } catch (error) {
+      throw `当前目录不是 git 仓库，请先初始化 git 仓库...\n${
+        error && error.message ? error.message : error
+      }`;
+    }
+  }
+
+  /**
+   * 获取工作目录前缀
+   */
+  getWorkingPrefix() {
+    try {
+      const workingPrefix =
+        this.exec("git rev-parse --show-prefix", {
+          stdio: ["pipe", "pipe", "ignore"],
+        }) || "";
+      return workingPrefix.trim();
+    } catch (error) {
+      Logger.warn(`${error && error.message ? error.message : error}`);
+      return "";
+    }
+  }
+
+  /**
+   * 执行 git add
+   */
+  add() {
+    this.exec("git add .", { stdio: ["pipe", "pipe", "ignore"] });
+  }
+
+  /**
+   * 获取用户名
+   */
+  getUserName() {
+    return this.exec("git config user.name").toString().trim();
+  }
+
+  /**
+   * 获取差异字符串
+   */
+  getDiff(maxToken) {
+    try {
+      let diffString = this.exec("git diff --staged -U0", {
+        stdio: ["pipe", "pipe", "ignore"],
+      }).toString();
+
+      if (!diffString || diffString.length <= maxToken) {
+        return diffString.trim();
+      }
+      return this.exec("git diff --staged --stat", {
+        stdio: ["pipe", "pipe", "ignore"],
+      })
+        .toString()
+        .trim();
+    } catch (e) {
+      return this.exec("git diff --staged --stat", {
+        stdio: ["pipe", "pipe", "ignore"],
+      })
+        .toString()
+        .trim();
+    }
+  }
+
+  /**
+   * 获取 Git 状态
+   */
+  getStatus() {
+    return this.exec("git status --porcelain");
+  }
+
+  /**
+   * 执行 commit
+   */
+  async commit(commitMessage) {
+    return new Promise((resolve, reject) => {
+      try {
+        execSync(commitMessage, {
+          encoding: "utf8",
+          stdio: ["pipe", "pipe", "pipe"],
+        });
+        resolve();
+      } catch (error) {
+        const stdout = this.normalizeExecOutput(error && error.stdout);
+        const stderr = this.normalizeExecOutput(error && error.stderr);
+        const messageParts = [
+          error && error.message ? error.message : "",
+          stderr,
+          stdout,
+        ].filter(Boolean);
+        error.stdout = stdout;
+        error.stderr = stderr;
+        error.message = messageParts.join("\n").trim() || "git commit 失败";
+        reject(error);
+      }
+    });
+  }
+
+  normalizeExecOutput(output) {
+    if (!output) {
+      return "";
+    }
+    if (typeof output === "string") {
+      return output.trim();
+    }
+    if (Buffer.isBuffer(output)) {
+      return output.toString("utf8").trim();
+    }
+    return "";
+  }
+
+  /**
+   * 重置暂存区
+   */
+  reset() {
+    this.exec("git reset", { stdio: ["pipe", "pipe", "ignore"] });
+  }
+
+  /**
+   * 获取当前分支名
+   */
+  getCurrentBranch() {
+    return this.exec("git rev-parse --abbrev-ref HEAD").trim();
+  }
+
+  /**
+   * 获取远程仓库名称
+   */
+  async getRemoteName(currentBranch) {
+    return new Promise((resolve, reject) => {
+      let remoteName = "";
+
+      // 优先从当前分支配置中读取 remote
+      try {
+        remoteName = this.exec(
+          `git config --get branch.${currentBranch}.remote`,
+          {
+            stdio: ["pipe", "pipe", "ignore"],
+          }
+        ).trim();
+      } catch {}
+
+      if (!remoteName) {
+        try {
+          const upstream = this.exec(
+            "git rev-parse --abbrev-ref --symbolic-full-name @{u}",
+            {
+              stdio: ["pipe", "pipe", "ignore"],
+            }
+          ).trim();
+          if (upstream && upstream.includes("/")) {
+            remoteName = upstream.split("/")[0];
+          }
+        } catch {}
+      }
+
+      // 回退：选择已存在的 remote（优先 origin）
+      if (!remoteName) {
+        try {
+          const remotesOutput = this.exec("git remote", {
+            stdio: ["pipe", "pipe", "ignore"],
+          }).trim();
+          const remotes = remotesOutput
+            ? remotesOutput.split("\n").filter(Boolean)
+            : [];
+          if (remotes.includes("origin")) {
+            remoteName = "origin";
+          } else if (remotes.length > 0) {
+            remoteName = remotes[0];
+          }
+        } catch (error) {
+          reject(error);
+        }
+      }
+
+      if (!remoteName) {
+        reject("未找到任何远程仓库配置");
+      }
+
+      try {
+        // 验证 remote 是否存在
+        this.exec(`git remote show ${remoteName}`, {
+          stdio: ["pipe", "pipe", "ignore"],
+        });
+        // 返回 remote
+        resolve(remoteName);
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+  /**
+   * 检查是否处于合并状态
+   */
+  isMerging() {
+    try {
+      this.exec("git rev-parse --verify --quiet MERGE_HEAD", {
+        stdio: ["pipe", "pipe", "ignore"],
+      });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * 完成合并
+   */
+  finishMerge() {
+    this.exec("git commit --no-edit", {
+      stdio: ["pipe", "pipe", "ignore"],
+    });
+  }
+
+  /**
+   * Fetch 远程分支
+   */
+  fetch(remoteName) {
+    this.exec(`git fetch ${remoteName}`, {
+      stdio: ["pipe", "pipe", "ignore"],
+    });
+  }
+
+  /**
+   * 合并远程分支
+   */
+  merge(remoteName, currentBranch) {
+    this.exec(`git merge ${remoteName}/${currentBranch}`, {
+      stdio: ["pipe", "pipe", "ignore"],
+    });
+  }
+
+  /**
+   * 获取本地领先远程的提交数
+   */
+  getAheadCount(remoteName, currentBranch) {
+    const aheadOutput = this.exec(
+      `git log --oneline HEAD..${remoteName}/${currentBranch}`,
+      {
+        stdio: ["pipe", "pipe", "ignore"],
+      }
+    ).trim();
+    return aheadOutput
+      ? aheadOutput.split("\n").filter((line) => line.trim()).length
+      : 0;
+  }
+
+  /**
+   * 获取需要推送的提交数
+   */
+  getPushCount(remoteName, currentBranch) {
+    // 先验证远程分支是否存在
+    try {
+      this.exec(
+        `git rev-parse --verify --quiet ${remoteName}/${currentBranch}`,
+        {
+          stdio: ["pipe", "pipe", "ignore"],
+        }
+      );
+    } catch {
+      return -1;
+    }
+
+    try {
+      const pushOutput = this.exec(
+        `git log --oneline ${remoteName}/${currentBranch}..HEAD`,
+        {
+          encoding: "utf8",
+          stdio: ["pipe", "pipe", "ignore"],
+        }
+      ).trim();
+      return pushOutput
+        ? pushOutput.split("\n").filter((line) => line.trim()).length
+        : 0;
+    } catch {
+      return 0;
+    }
+  }
+
+  /**
+   * 推送到远程
+   */
+  push(remoteName, currentBranch) {
+    return new Promise((resolve, reject) => {
+      try {
+        this.exec(`git push -u ${remoteName} ${currentBranch}`, {
+          stdio: ["pipe", "pipe", "ignore"],
+        });
+        resolve();
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+  /**
+   * 检查远程分支是否存在
+   */
+  remoteHasBranch(remoteName, currentBranch) {
+    try {
+      this.exec(
+        `git rev-parse --verify --quiet ${remoteName}/${currentBranch}`,
+        {
+          stdio: ["pipe", "pipe", "ignore"],
+        }
+      );
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}

package/src/utils/ConflictUtils.mjs

@@ -0,0 +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 };
+};

package/src/utils/Log.mjs

@@ -0,0 +1,146 @@
+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

@@ -0,0 +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;