openmatrix 0.1.88 → 0.1.90

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

@@ -39,6 +39,7 @@ const child_process_1 = require("child_process");
 const util_1 = require("util");
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
+const gitignore_js_1 = require("../utils/gitignore.js");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 /**
  * GitCommitManager - Git 自动提交管理器
@@ -242,19 +243,7 @@ class GitCommitManager {
                 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');
-            }
+            await (0, gitignore_js_1.ensureOpenmatrixGitignore)(this.repoPath);
             // 获取未提交的文件
             const files = await this.getUncommittedFiles();
             if (files.length === 0) {
@@ -283,7 +272,7 @@ class GitCommitManager {
                 };
             }
             // 使用临时文件传递 commit message（避免 Windows 下多行消息转义问题）
-            const tmpFile = path.join(gitRoot, '.git', 'COMMIT_MSG_TMP');
+            const tmpFile = path.join(await this.getGitRoot(), '.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/orchestrator/task-planner.js

@@ -46,8 +46,9 @@ class TaskPlanner {
         // 构建全局上下文块（注入到每个子任务描述中，供 agent 参考）
         const globalContext = this.buildGlobalContext(parsedTask, userContext, plan);
         // 0. 设计阶段任务 (根据复杂度判断)
+        // 如果 AI 已提供 plan，跳过设计阶段（plan 中已包含架构设计）
         let designTaskId;
-        if (this.needsDesignPhase(parsedTask)) {
+        if (!plan && this.needsDesignPhase(parsedTask)) {
             designTaskId = this.generateTaskId();
             breakdowns.push({
                 taskId: designTaskId,

package/dist/utils/gitignore.js

@@ -53,39 +53,59 @@ async function getGitRoot(basePath) {
         return basePath;
     }
 }
+/**
+ * 需要确保被忽略的条目列表
+ */
+const REQUIRED_IGNORE_ENTRIES = [
+    '.openmatrix/',
+    'node_modules/',
+    'dist/',
+];
+/**
+ * 检查 gitignore 内容中是否已包含指定模式
+ */
+function hasGitignoreEntry(content, pattern) {
+    const patternBase = pattern.replace(/\/$/, '');
+    return content.split('\n').some(line => {
+        const trimmed = line.trim();
+        return trimmed === patternBase ||
+            trimmed === `${patternBase}/` ||
+            trimmed === `/${patternBase}` ||
+            trimmed === `/${patternBase}/`;
+    });
+}
 /**
  * 确保指定目录被 git 忽略
  * @param basePath 项目目录（可以是 git 仓库的子目录）
  * @param ignorePattern 要忽略的模式 (默认 .openmatrix/)
  */
 async function ensureGitignore(basePath, ignorePattern = '.openmatrix/') {
-    // 写入到 git 根目录的 .gitignore
     const gitRoot = await getGitRoot(basePath);
     const gitignorePath = path.join(gitRoot, '.gitignore');
+    let content = '';
     try {
-        const content = await fs.readFile(gitignorePath, 'utf-8');
-        // 检查是否已经包含该模式
-        const lines = content.split('\n');
-        const patternBase = ignorePattern.replace(/\/$/, '');
-        const hasPattern = lines.some(line => {
-            const trimmed = line.trim();
-            return trimmed === patternBase ||
-                trimmed === `${patternBase}/` ||
-                trimmed === `/${patternBase}` ||
-                trimmed === `/${patternBase}/`;
-        });
-        if (!hasPattern) {
-            // 添加模式到 .gitignore
-            const newContent = content.endsWith('\n')
-                ? `${content}${ignorePattern}\n`
-                : `${content}\n\n# Auto-added by OpenMatrix\n${ignorePattern}\n`;
-            await fs.writeFile(gitignorePath, newContent);
-        }
+        content = await fs.readFile(gitignorePath, 'utf-8');
     }
     catch {
-        // .gitignore 不存在，创建一个新的
-        await fs.writeFile(gitignorePath, `# OpenMatrix state\n${ignorePattern}\n`);
+        // 文件不存在
+    }
+    // 收集所有缺失的条目
+    const missingEntries = [];
+    const entriesToCheck = ignorePattern === '.openmatrix/'
+        ? REQUIRED_IGNORE_ENTRIES // ensureOpenmatrixGitignore 时检查所有必要条目
+        : [ignorePattern]; // 其他情况只检查指定的
+    for (const entry of entriesToCheck) {
+        if (!hasGitignoreEntry(content, entry)) {
+            missingEntries.push(entry);
+        }
     }
+    if (missingEntries.length === 0)
+        return;
+    // 追加缺失的条目
+    const addition = (content && !content.endsWith('\n') ? '\n' : '') +
+        '\n# Auto-added by OpenMatrix\n' +
+        missingEntries.join('\n') + '\n';
+    await fs.writeFile(gitignorePath, content + addition, 'utf-8');
 }
 /**
  * 确保 .openmatrix 目录被 git 忽略

package/package.json

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