openmatrix 0.2.31 → 0.2.33

package/dist/orchestrator/executor.js

@@ -51,21 +51,30 @@ class OrchestratorExecutor {
     getPhaseExecutor() {
         return this.phaseExecutor;
     }
+    /**
+     * 设置运行 ID（同时更新 PhaseExecutor 和 AIReviewer）
+     */
+    setRunId(runId) {
+        this.phaseExecutor.setRunId(runId);
+        this.aiReviewer.setRunId(runId);
+    }
     async loadConfigFromState(stateManager) {
         try {
             const state = await stateManager.getState();
             if (state.config?.taskTimeout) {
                 this.config.taskTimeout = state.config.taskTimeout;
             }
-            // 只有在 state.config 中有明确的 agentMode 时才更新并发数
-            // 否则使用传入的 config.maxConcurrent
+            // agentMode 的优先级最高，明确指定时直接设置并发数
             if (state.config?.agentMode === 'single') {
                 this.config.maxConcurrent = 1;
             }
-            else if (state.config?.maxConcurrentAgents && state.config?.maxConcurrentAgents !== 3) {
-                // 只有当 maxConcurrentAgents 不是默认值 3 时才更新
-                this.config.maxConcurrent = state.config.maxConcurrentAgents;
+            else if (state.config?.agentMode === 'parallel') {
+                this.config.maxConcurrent = 3;
             }
+            // 注意：不再从 maxConcurrentAgents 覆盖，因为：
+            // 1. agentMode 已经明确了意图（single=1, parallel=3）
+            // 2. 构造函数传入的 maxConcurrent 用于测试等场景
+            // 3. CLI 通过 agentMode 而不是 maxConcurrentAgents 控制并发
         }
         catch {
             // use default config
@@ -516,14 +525,24 @@ class OrchestratorExecutor {
     }
     /**
      * 获取 AgentRunner 实例
+     *
+     * 注意：此方法假设 executor 已完成初始化（通过 step() 或其他方法触发）
      */
     getAgentRunner() {
+        if (!this.agentRunner) {
+            throw new Error('Executor not initialized. Call step() first or wait for initialization.');
+        }
         return this.agentRunner;
     }
     /**
      * 获取 Scheduler 实例
+     *
+     * 注意：此方法假设 executor 已完成初始化（通过 step() 或其他方法触发）
      */
     getScheduler() {
+        if (!this.scheduler) {
+            throw new Error('Executor not initialized. Call step() first or wait for initialization.');
+        }
         return this.scheduler;
     }
     // ============ Timeout Management ============

package/dist/orchestrator/phase-executor.d.ts

@@ -102,6 +102,10 @@ export declare class PhaseExecutor {
      * 设置 Run ID (用于提交信息)
      */
     setRunId(runId: string): void;
+    /**
+     * 获取当前 runId — 优先使用手动设置的值，否则从 stateManager 读取
+     */
+    private getRunId;
     /**
      * 设置质量配置
      */

package/dist/orchestrator/phase-executor.js

@@ -70,6 +70,21 @@ class PhaseExecutor {
     setRunId(runId) {
         this.runId = runId;
     }
+    /**
+     * 获取当前 runId — 优先使用手动设置的值，否则从 stateManager 读取
+     */
+    async getRunId() {
+        if (this.runId)
+            return this.runId;
+        try {
+            const state = await this.stateManager.getState();
+            this.runId = state.runId;
+        }
+        catch {
+            // fallback
+        }
+        return this.runId;
+    }
     /**
      * 设置质量配置
      */
@@ -154,6 +169,8 @@ class PhaseExecutor {
      * 准备阶段执行的 Subagent 任务
      */
     async preparePhaseExecution(task) {
+        // 确保 runId 已初始化（避免生成 .openmatrix//tasks/ 错误路径）
+        await this.getRunId();
         const currentPhase = this.getCurrentPhase(task);
         switch (currentPhase) {
             case 'tdd':
@@ -386,7 +403,7 @@ ${task.acceptanceCriteria.map((c, i) => `${i + 1}. [ ] ${c}`).join('\n')}`);
 - 圈复杂度: < 10
 
 ## 输出要求
-完成后，在 \`.openmatrix/tasks/${task.id}/artifacts/\` 目录下创建:
+完成后，在 \`.openmatrix/${this.runId}/tasks/${task.id}/artifacts/\` 目录下创建:
 - \`result.md\` - 实现说明
 - \`changes.txt\` - 变更文件列表
 
@@ -621,7 +638,7 @@ fi
 
 ## 📊 质量报告格式
 
-在 \`.openmatrix/tasks/${task.id}/artifacts/\` 目录下创建 \`quality-report.json\`:
+在 \`.openmatrix/${this.runId}/tasks/${task.id}/artifacts/\` 目录下创建 \`quality-report.json\`:
 
 \`\`\`json
 {
@@ -762,7 +779,7 @@ ${task.acceptanceCriteria.map((c, i) => `${i + 1}. [ ] ${c}`).join('\n')}`);
 ## 验收流程
 
 ### 1. 检查验证阶段结果
-读取 \`.openmatrix/tasks/${task.id}/artifacts/verify-report.md\`
+读取 \`.openmatrix/${this.runId}/tasks/${task.id}/artifacts/verify-report.md\`
 确认所有检查项已通过
 
 ### 2. 验证验收标准
@@ -821,7 +838,7 @@ fi
 - **确认代码能实际运行**（不是只编译通过）
 
 ## 输出要求
-在 \`.openmatrix/tasks/${task.id}/artifacts/\` 目录下创建:
+在 \`.openmatrix/${this.runId}/tasks/${task.id}/artifacts/\` 目录下创建:
 - \`accept-report.md\` - 验收报告
 
 ## 结果格式

package/dist/storage/file-store.js

@@ -91,6 +91,10 @@ class FileStore {
                 .map((f) => f.name);
         }
         catch (error) {
+            const nodeError = error;
+            if (nodeError.code === 'ENOENT' || nodeError.code === 'EISDIR') {
+                return [];
+            }
             (0, error_handler_js_1.logError)(error, { operation: 'listFiles', file: fullPath });
             return [];
         }
@@ -104,6 +108,10 @@ class FileStore {
                 .map((f) => f.name);
         }
         catch (error) {
+            const nodeError = error;
+            if (nodeError.code === 'ENOENT' || nodeError.code === 'EISDIR') {
+                return [];
+            }
             (0, error_handler_js_1.logError)(error, { operation: 'listDirs', file: fullPath });
             return [];
         }

package/dist/storage/state-manager.js

@@ -4,6 +4,7 @@ exports.StateManager = void 0;
 const file_store_js_1 = require("./file-store.js");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
+const error_handler_js_1 = require("../utils/error-handler.js");
 const DEFAULT_CONFIG = {
     timeout: 120,
     taskTimeout: 600000, // 10 分钟（毫秒）
@@ -271,6 +272,10 @@ class StateManager {
         });
     }
     async getTask(taskId) {
+        // 验证 taskId 格式防止路径遍历
+        if (!(0, error_handler_js_1.validateId)(taskId, 'taskId')) {
+            return null;
+        }
         let task = await this.store.readJson(`tasks/${taskId}/task.json`);
         if (!task) {
             task = await this.store.readJson(`tasks/${taskId}.json`);
@@ -324,11 +329,13 @@ class StateManager {
      * 保存 Phase 结果到任务子目录
      */
     async savePhaseResult(taskId, phase, result) {
-        await this.store.writeJson(`tasks/${taskId}/${phase}.json`, {
-            taskId,
-            phase,
-            timestamp: new Date().toISOString(),
-            ...result
+        await this.withFileLock(async () => {
+            await this.store.writeJson(`tasks/${taskId}/${phase}.json`, {
+                taskId,
+                phase,
+                timestamp: new Date().toISOString(),
+                ...result
+            });
         });
     }
     /**
@@ -341,7 +348,9 @@ class StateManager {
      * 保存 Agent 上下文到 context.md
      */
     async saveTaskContext(taskId, content) {
-        await this.store.writeMarkdown(`tasks/${taskId}/context.md`, content);
+        await this.withFileLock(async () => {
+            await this.store.writeMarkdown(`tasks/${taskId}/context.md`, content);
+        });
     }
     /**
      * 读取 Agent 上下文
@@ -420,13 +429,21 @@ class StateManager {
     }
     // ============ Approval Methods ============
     async saveApproval(approval) {
-        await this.store.writeJson(`approvals/${approval.id}.json`, approval);
+        await this.withFileLock(async () => {
+            await this.store.writeJson(`approvals/${approval.id}.json`, approval);
+        });
     }
     async getApproval(approvalId) {
+        // 验证 approvalId 格式防止路径遍历
+        if (!(0, error_handler_js_1.validateId)(approvalId, 'approvalId')) {
+            return null;
+        }
         return await this.store.readJson(`approvals/${approvalId}.json`);
     }
     async updateApproval(approval) {
-        await this.store.writeJson(`approvals/${approval.id}.json`, approval);
+        await this.withFileLock(async () => {
+            await this.store.writeJson(`approvals/${approval.id}.json`, approval);
+        });
     }
     async getApprovalsByStatus(status) {
         const files = await this.store.listFiles('approvals');
@@ -498,8 +515,10 @@ class StateManager {
      * 路径: .openmatrix/{runId}/research/session.json
      */
     async saveResearchSession(session) {
-        await this.store.ensureDir('research');
-        await this.store.writeJson('research/session.json', session);
+        await this.withFileLock(async () => {
+            await this.store.ensureDir('research');
+            await this.store.writeJson('research/session.json', session);
+        });
     }
     /**
      * 读取研究会话
@@ -511,8 +530,10 @@ class StateManager {
      * 保存研究报告
      */
     async saveResearchReport(content) {
-        await this.store.ensureDir('research');
-        await this.store.writeMarkdown('research/RESEARCH.md', content);
+        await this.withFileLock(async () => {
+            await this.store.ensureDir('research');
+            await this.store.writeMarkdown('research/RESEARCH.md', content);
+        });
     }
     /**
      * 读取研究报告
@@ -524,8 +545,10 @@ class StateManager {
      * 保存研究上下文 (供 start 使用)
      */
     async saveResearchContext(context) {
-        await this.store.ensureDir('research');
-        await this.store.writeJson('research/context.json', context);
+        await this.withFileLock(async () => {
+            await this.store.ensureDir('research');
+            await this.store.writeJson('research/context.json', context);
+        });
     }
     /**
      * 读取研究上下文
@@ -543,16 +566,20 @@ class StateManager {
      * 保存知识条目
      */
     async saveKnowledgeFinding(index, content) {
-        await this.store.ensureDir('research/knowledge');
-        await this.store.writeMarkdown(`research/knowledge/finding-${index}.md`, content);
+        await this.withFileLock(async () => {
+            await this.store.ensureDir('research/knowledge');
+            await this.store.writeMarkdown(`research/knowledge/finding-${index}.md`, content);
+        });
     }
     // ============ Brainstorm Methods ============
     /**
      * 保存头脑风暴会话
      */
     async saveBrainstormSession(session) {
-        await this.store.ensureDir('brainstorm');
-        await this.store.writeJson('brainstorm/session.json', session);
+        await this.withFileLock(async () => {
+            await this.store.ensureDir('brainstorm');
+            await this.store.writeJson('brainstorm/session.json', session);
+        });
     }
     /**
      * 读取头脑风暴会话
@@ -613,9 +640,15 @@ class StateManager {
     }
     // ============ Meeting Methods ============
     async saveMeeting(meeting) {
-        await this.store.writeJson(`meetings/${meeting.id}.json`, meeting);
+        await this.withFileLock(async () => {
+            await this.store.writeJson(`meetings/${meeting.id}.json`, meeting);
+        });
     }
     async getMeeting(meetingId) {
+        // 验证 meetingId 格式防止路径遍历
+        if (!(0, error_handler_js_1.validateId)(meetingId, 'meetingId')) {
+            return null;
+        }
         return await this.store.readJson(`meetings/${meetingId}.json`);
     }
     async getMeetingsByStatus(status) {