openmatrix 0.1.87 → 0.1.88

package/dist/orchestrator/git-commit-manager.d.ts

@@ -23,8 +23,13 @@ export interface CommitResult {
  */
 export declare class GitCommitManager {
     private repoPath;
+    private gitRoot;
     private enabled;
     constructor(repoPath?: string);
+    /**
+     * 获取 git 仓库根目录（支持 .git 在父级目录的情况）
+     */
+    private getGitRoot;
     /**
      * 设置是否启用自动提交
      */

package/dist/orchestrator/git-commit-manager.js

@@ -50,10 +50,27 @@ const execAsync = (0, util_1.promisify)(child_process_1.exec);
  */
 class GitCommitManager {
     repoPath;
+    gitRoot = null;
     enabled = true;
     constructor(repoPath = process.cwd()) {
         this.repoPath = repoPath;
     }
+    /**
+     * 获取 git 仓库根目录（支持 .git 在父级目录的情况）
+     */
+    async getGitRoot() {
+        if (this.gitRoot)
+            return this.gitRoot;
+        try {
+            const { stdout } = await execAsync('git rev-parse --show-toplevel', { cwd: this.repoPath });
+            this.gitRoot = stdout.trim();
+        }
+        catch {
+            // 不是 git 仓库，回退到 repoPath
+            this.gitRoot = this.repoPath;
+        }
+        return this.gitRoot;
+    }
     /**
      * 设置是否启用自动提交
      */
@@ -222,22 +239,21 @@ class GitCommitManager {
             // 检查是否在 Git 仓库中，如果不是则自动初始化
             if (!await this.isGitRepo()) {
                 await execAsync('git init', { cwd: this.repoPath });
-                // 确保 .gitignore 存在并包含 .openmatrix
-                const gitignorePath = path.join(this.repoPath, '.gitignore');
-                let gitignoreContent = '';
-                try {
-                    gitignoreContent = await fs.readFile(gitignorePath, 'utf-8');
-                }
-                catch {
-                    // 文件不存在
-                }
-                if (!gitignoreContent.includes('.openmatrix')) {
-                    const addition = (gitignoreContent && !gitignoreContent.endsWith('\n') ? '\n' : '') + '.openmatrix/\n';
-                    await fs.writeFile(gitignorePath, gitignoreContent + addition, 'utf-8');
-                }
-                // 初始提交
-                await execAsync('git add .gitignore', { cwd: this.repoPath });
-                await execAsync('git commit -m "initial commit" --allow-empty', { cwd: this.repoPath }).catch(() => { });
+                this.gitRoot = this.repoPath; // 刚初始化的仓库，根目录就是 repoPath
+            }
+            // 确保 .gitignore 中包含 .openmatrix（写入到 git 根目录）
+            const gitRoot = await this.getGitRoot();
+            const gitignorePath = path.join(gitRoot, '.gitignore');
+            let gitignoreContent = '';
+            try {
+                gitignoreContent = await fs.readFile(gitignorePath, 'utf-8');
+            }
+            catch {
+                // 文件不存在
+            }
+            if (!gitignoreContent.includes('.openmatrix')) {
+                const addition = (gitignoreContent && !gitignoreContent.endsWith('\n') ? '\n' : '') + '.openmatrix/\n';
+                await fs.writeFile(gitignorePath, gitignoreContent + addition, 'utf-8');
             }
             // 获取未提交的文件
             const files = await this.getUncommittedFiles();
@@ -267,7 +283,7 @@ class GitCommitManager {
                 };
             }
             // 使用临时文件传递 commit message（避免 Windows 下多行消息转义问题）
-            const tmpFile = path.join(this.repoPath, '.git', 'COMMIT_MSG_TMP');
+            const tmpFile = path.join(gitRoot, '.git', 'COMMIT_MSG_TMP');
             await fs.writeFile(tmpFile, commitMessage, 'utf-8');
             try {
                 const { stdout } = await execAsync(`git commit -F "${tmpFile}"`, { cwd: this.repoPath });

package/dist/utils/gitignore.d.ts

@@ -1,6 +1,6 @@
 /**
  * 确保指定目录被 git 忽略
- * @param basePath 项目根目录
+ * @param basePath 项目目录（可以是 git 仓库的子目录）
  * @param ignorePattern 要忽略的模式 (默认 .openmatrix/)
  */
 export declare function ensureGitignore(basePath: string, ignorePattern?: string): Promise<void>;

package/dist/utils/gitignore.js

@@ -38,13 +38,30 @@ exports.ensureOpenmatrixGitignore = ensureOpenmatrixGitignore;
 // src/utils/gitignore.ts
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
+const child_process_1 = require("child_process");
+const util_1 = require("util");
+const execAsync = (0, util_1.promisify)(child_process_1.exec);
+/**
+ * 获取 git 仓库根目录（支持 .git 在父级目录的情况）
+ */
+async function getGitRoot(basePath) {
+    try {
+        const { stdout } = await execAsync('git rev-parse --show-toplevel', { cwd: basePath });
+        return stdout.trim();
+    }
+    catch {
+        return basePath;
+    }
+}
 /**
  * 确保指定目录被 git 忽略
- * @param basePath 项目根目录
+ * @param basePath 项目目录（可以是 git 仓库的子目录）
  * @param ignorePattern 要忽略的模式 (默认 .openmatrix/)
  */
 async function ensureGitignore(basePath, ignorePattern = '.openmatrix/') {
-    const gitignorePath = path.join(basePath, '.gitignore');
+    // 写入到 git 根目录的 .gitignore
+    const gitRoot = await getGitRoot(basePath);
+    const gitignorePath = path.join(gitRoot, '.gitignore');
     try {
         const content = await fs.readFile(gitignorePath, 'utf-8');
         // 检查是否已经包含该模式

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmatrix",
-  "version": "0.1.87",
+  "version": "0.1.88",
   "description": "AI Agent task orchestration system with Claude Code Skills integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",