git-ai-shen 1.0.2 → 1.0.4

package/lib/core/git-operations.js

@@ -1,5 +1,6 @@
 const simpleGit = require('simple-git');
-const fs = require('fs').promises;
+const fs = require('fs');  // 导入同步版本的 fs
+const fsPromises = require('fs').promises;  // 如果需要 promise 版本，单独命名
 const path = require('path');
 const { exec } = require('child_process');
 const util = require('util');
@@ -10,6 +11,7 @@ class GitOperations {
     this.git = simpleGit(repoPath);
     this.repoPath = repoPath;
   }
+
   /**
    * 获取文件的详细变更信息（哪些行被修改）
    * @param {string} filePath 文件路径
@@ -17,45 +19,69 @@ class GitOperations {
    */
   async getFileDiff(filePath) {
     try {
-      // 获取未暂存的变更
-      const diff = await this.git.diff([filePath]);
+      // 使用 -- 分隔符明确指定是文件路径
+      const diff = await this.git.diff(['--', filePath]);
+
+      // 如果返回空，可能是因为文件没被 git 跟踪
+      if (!diff) {
+        const fullPath = path.join(this.repoPath, filePath);
+        // 使用同步的 fs.existsSync
+        if (fs.existsSync(fullPath)) {
+          // Windows 上用 NUL 代替 /dev/null
+          const noIndexDiff = await this.git.diff(['--no-index', '--', 'NUL', filePath]);
+          return this.parseDiff(noIndexDiff, filePath);
+        }
+      }
 
-      // 解析 diff 信息
       return this.parseDiff(diff, filePath);
     } catch (error) {
-      console.error(`获取 diff 失败: ${error.message}`);
-      return null;
+      console.log(`获取 diff 失败: ${error.message}`);
+      return {
+        file: filePath,
+        changes: [],
+        summary: '无变更',
+        addCount: 0,
+        deleteCount: 0
+      };
     }
   }
+
   /**
- * 获取已暂存文件的详细变更信息
- * @param {string} filePath 文件路径
- * @returns {Promise<Object>} 变更详情
- */
+   * 获取已暂存文件的详细变更信息
+   * @param {string} filePath 文件路径
+   * @returns {Promise<Object>} 变更详情
+   */
   async getStagedDiff(filePath) {
     try {
-      // 获取已暂存的变更
-      const diff = await this.git.diff(['--cached', filePath]);
-
-      // 解析 diff 信息
+      // 使用 -- 分隔符
+      const diff = await this.git.diff(['--cached', '--', filePath]);
       return this.parseDiff(diff, filePath);
     } catch (error) {
       console.error(`获取暂存 diff 失败: ${error.message}`);
-      return null;
+      return {
+        file: filePath,
+        changes: [],
+        summary: '获取失败',
+        addCount: 0,
+        deleteCount: 0
+      };
     }
   }
+
   /**
- * 解析 git diff 输出
- * @param {string} diff git diff 的输出
- * @param {string} filePath 文件路径
- * @returns {Object} 解析后的变更信息
- */
+   * 解析 git diff 输出
+   * @param {string} diff git diff 的输出
+   * @param {string} filePath 文件路径
+   * @returns {Object} 解析后的变更信息
+   */
   parseDiff(diff, filePath) {
     if (!diff) {
       return {
         file: filePath,
         changes: [],
-        summary: '无变更'
+        summary: '无变更',
+        addCount: 0,
+        deleteCount: 0
       };
     }
 
@@ -63,9 +89,7 @@ class GitOperations {
     const changes = [];
     let currentHunk = null;
 
-    // 解析 diff 的每一行
     for (const line of lines) {
-      // 匹配 hunk 头信息，例如：@@ -1,4 +1,5 @@
       const hunkMatch = line.match(/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@/);
       if (hunkMatch) {
         currentHunk = {
@@ -81,21 +105,18 @@ class GitOperations {
 
       if (currentHunk) {
         if (line.startsWith('+')) {
-          // 新增的行
           currentHunk.changes.push({
             type: 'add',
             content: line.substring(1),
             lineNumber: currentHunk.newStart + currentHunk.changes.filter(c => c.type !== 'delete').length
           });
         } else if (line.startsWith('-')) {
-          // 删除的行
           currentHunk.changes.push({
             type: 'delete',
             content: line.substring(1),
             lineNumber: currentHunk.oldStart + currentHunk.changes.filter(c => c.type !== 'add').length
           });
         } else if (!line.startsWith('\\')) {
-          // 上下文行
           currentHunk.changes.push({
             type: 'context',
             content: line.substring(1)
@@ -104,7 +125,6 @@ class GitOperations {
       }
     }
 
-    // 生成变更摘要
     const addCount = changes.flatMap(h => h.changes).filter(c => c.type === 'add').length;
     const deleteCount = changes.flatMap(h => h.changes).filter(c => c.type === 'delete').length;
 
@@ -116,6 +136,7 @@ class GitOperations {
       deleteCount
     };
   }
+
   /**
    * 获取所有变更文件的详细 diff
    * @param {Array<string>} files 文件列表
@@ -124,7 +145,6 @@ class GitOperations {
    */
   async getDiffs(files, staged = false) {
     const diffs = {};
-
     for (const file of files) {
       if (staged) {
         diffs[file] = await this.getStagedDiff(file);
@@ -132,9 +152,9 @@ class GitOperations {
         diffs[file] = await this.getFileDiff(file);
       }
     }
-
     return diffs;
   }
+
   async isGitRepo() {
     try {
       return await this.git.checkIsRepo();
@@ -174,29 +194,15 @@ class GitOperations {
 
   async pull(remote = 'origin', branch = null, sshPassword = null) {
     try {
-      if (!branch) {
-        branch = await this.getCurrentBranch();
-      }
-
-      // 如果有 SSH 密码，使用 expect 脚本处理
-      if (sshPassword) {
-        return await this.pullWithPassword(remote, branch, sshPassword);
-      }
-
-      // 正常拉取
+      if (!branch) branch = await this.getCurrentBranch();
+      if (sshPassword) return await this.pullWithPassword(remote, branch, sshPassword);
       await this.git.pull(remote, branch);
       return { success: true };
-      
     } catch (error) {
-      // 检查是否是 SSH 密钥密码错误
       if (error.message.includes('Permission denied') || 
           error.message.includes('authenticity') ||
           error.message.includes('password')) {
-        return { 
-          success: false, 
-          needPassword: true,
-          error: error.message 
-        };
+        return { success: false, needPassword: true, error: error.message };
       }
       return { success: false, error: error.message };
     }
@@ -204,7 +210,6 @@ class GitOperations {
 
   async pullWithPassword(remote, branch, password) {
     try {
-      // 使用 expect 脚本自动输入 SSH 密码
       const command = `
         expect << 'EOF'
         spawn git pull ${remote} ${branch}
@@ -215,7 +220,6 @@ class GitOperations {
         expect eof
         EOF
       `;
-      
       await execAsync(command);
       return { success: true };
     } catch (error) {
@@ -225,28 +229,15 @@ class GitOperations {
 
   async push(remote = 'origin', branch = null, sshPassword = null) {
     try {
-      if (!branch) {
-        branch = await this.getCurrentBranch();
-      }
-
-      // 如果有 SSH 密码，使用 expect 脚本处理
-      if (sshPassword) {
-        return await this.pushWithPassword(remote, branch, sshPassword);
-      }
-
+      if (!branch) branch = await this.getCurrentBranch();
+      if (sshPassword) return await this.pushWithPassword(remote, branch, sshPassword);
       await this.git.push(remote, branch);
       return { success: true };
-      
     } catch (error) {
-      // 检查是否是 SSH 密钥密码错误
       if (error.message.includes('Permission denied') || 
           error.message.includes('authenticity') ||
           error.message.includes('password')) {
-        return { 
-          success: false, 
-          needPassword: true,
-          error: error.message 
-        };
+        return { success: false, needPassword: true, error: error.message };
       }
       return { success: false, error: error.message };
     }
@@ -264,7 +255,6 @@ class GitOperations {
         expect eof
         EOF
       `;
-      
       await execAsync(command);
       return { success: true };
     } catch (error) {
@@ -275,7 +265,8 @@ class GitOperations {
   async getFileContent(filePath) {
     try {
       const fullPath = path.join(this.repoPath, filePath);
-      return await fs.readFile(fullPath, 'utf-8');
+      // 使用 fsPromises 读取文件内容
+      return await fsPromises.readFile(fullPath, 'utf-8');
     } catch {
       return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-ai-shen",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "智能Git提交工具，支持行级代码审查和AI生成提交信息",
   "main": "bin/git-ai.js",
   "bin": {