openmatrix 0.2.26 → 0.2.28

package/dist/cli/commands/start.js

@@ -206,8 +206,23 @@ async function handleTasksJson(options, stateManager, state, omPath, basePath) {
         if (jsonStr.startsWith('@')) {
             const filePath = jsonStr.slice(1);
             // 如果是相对路径，转换为绝对路径
-            const resolvedPath = path.isAbsolute(filePath) ? filePath : path.join(basePath, filePath);
-            jsonStr = await fs.readFile(resolvedPath, 'utf-8');
+            let resolvedPath = path.isAbsolute(filePath) ? filePath : path.join(basePath, filePath);
+            // 特殊处理：如果文件名是 tasks-input.json 且不带路径，尝试从 runId 目录读取
+            if (filePath === 'tasks-input.json' || filePath.endsWith('/tasks-input.json')) {
+                // 先尝试从 runId 目录读取
+                const state = await stateManager.getState();
+                const runIdPath = path.join(omPath, state.runId, 'tasks-input.json');
+                try {
+                    jsonStr = await fs.readFile(runIdPath, 'utf-8');
+                }
+                catch {
+                    // 如果 runId 目录不存在，尝试原有路径
+                    jsonStr = await fs.readFile(resolvedPath, 'utf-8');
+                }
+            }
+            else {
+                jsonStr = await fs.readFile(resolvedPath, 'utf-8');
+            }
         }
         tasksInput = JSON.parse(jsonStr);
     }
@@ -241,18 +256,14 @@ async function handleTasksJson(options, stateManager, state, omPath, basePath) {
             console.log(`🔬 已加载研究领域: ${researchContext.domain}`);
         }
     }
-    // 读取独立的技术方案文档（plan.md）
+    // 读取独立的技术方案文档（从当前 runId 目录）
     let planContent;
-    const planPath = path.join(omPath, 'plan.md');
-    try {
-        planContent = await fs.readFile(planPath, 'utf-8');
-        if (!options.json) {
-            console.log(`📄 已加载技术方案: plan.md`);
-        }
-    }
-    catch {
-        // plan.md 不存在时继续（可能由 AI 后续生成或无 plan）
+    planContent = await stateManager.getPlan();
+    if (planContent && !options.json) {
+        console.log(`📄 已加载技术方案: plan.md`);
     }
+    // 转换为 string | undefined（供 TaskPlanner 使用）
+    const planContentForPlanner = planContent || undefined;
     // 构建 ParsedTask
     const parsedTask = {
         title: resolvedInput.title || tasksInput.title,
@@ -285,7 +296,7 @@ async function handleTasksJson(options, stateManager, state, omPath, basePath) {
     }
     // 使用 TaskPlanner 拆分（保持原有拆分逻辑）
     const planner = new task_planner_js_1.TaskPlanner();
-    const subTasks = planner.breakdown(parsedTask, extraAnswers, qualityConfig, planContent);
+    const subTasks = planner.breakdown(parsedTask, extraAnswers, qualityConfig, planContentForPlanner);
     // 创建任务到状态管理器，并建立 ID 映射
     // TaskPlanner 生成的 taskId 和 StateManager 创建的 id 不同，
     // 需要映射后才能正确设置 dependencies

package/dist/cli/commands/status.js

@@ -70,7 +70,19 @@ async function showStatus(manager, reporter, options) {
         const state = await manager.getState();
         const tasks = await manager.listTasks();
         if (options.json) {
-            console.log(JSON.stringify({ state, tasks }, null, 2));
+            // 添加文件状态字段
+            const hasPlan = await manager.hasPlan();
+            const hasTasksInput = await manager.hasTasksInput();
+            const hasResearchContext = await manager.hasResearchContext();
+            console.log(JSON.stringify({
+                state,
+                tasks,
+                files: {
+                    hasPlan,
+                    hasTasksInput,
+                    hasResearchContext
+                }
+            }, null, 2));
             return;
         }
         // Header

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

@@ -1,4 +1,5 @@
 import type { Task } from '../types/index.js';
+import { WorktreeSyncManager } from '../utils/worktree-sync.js';
 export interface CommitInfo {
     taskId: string;
     taskTitle: string;
@@ -25,6 +26,7 @@ export declare class GitCommitManager {
     private repoPath;
     private gitRoot;
     private enabled;
+    private worktreeSyncManager;
     constructor(repoPath?: string);
     /**
      * 获取 git 仓库根目录（支持 .git 在父级目录的情况）
@@ -107,4 +109,15 @@ export declare class GitCommitManager {
      * 提交验收阶段完成
      */
     commitAcceptComplete(task: Task, runId: string): Promise<CommitResult>;
+    /**
+     * 同步 worktree 改动到主工作树
+     *
+     * 当 Agent 在 worktree 中工作时，改动会提交到 worktree 的分支。
+     * 此方法将这些改动同步回主工作树，确保提交可见。
+     */
+    private syncWorktreeChanges;
+    /**
+     * 获取 WorktreeSyncManager 实例（供外部调用）
+     */
+    getWorktreeSyncManager(): WorktreeSyncManager;
 }

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

@@ -41,6 +41,7 @@ const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
 const gitignore_js_1 = require("../utils/gitignore.js");
 const error_handler_js_1 = require("../utils/error-handler.js");
+const worktree_sync_js_1 = require("../utils/worktree-sync.js");
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 /**
  * GitCommitManager - Git 自动提交管理器
@@ -54,8 +55,10 @@ class GitCommitManager {
     repoPath;
     gitRoot = null;
     enabled = true;
+    worktreeSyncManager;
     constructor(repoPath = process.cwd()) {
         this.repoPath = repoPath;
+        this.worktreeSyncManager = new worktree_sync_js_1.WorktreeSyncManager(repoPath);
     }
     /**
      * 获取 git 仓库根目录（支持 .git 在父级目录的情况）
@@ -329,6 +332,8 @@ class GitCommitManager {
             }
             // 确保 .gitignore 中包含 .openmatrix（写入到 git 根目录）
             await (0, gitignore_js_1.ensureOpenmatrixGitignore)(this.repoPath);
+            // 🔄 同步 worktree 改动到主工作树（关键步骤）
+            await this.syncWorktreeChanges();
             // 获取未提交的文件（用于生成 commit message，在 git add 之前获取）
             const files = await this.getUncommittedFiles();
             if (files.length === 0) {
@@ -449,5 +454,57 @@ class GitCommitManager {
             impactScope: []
         });
     }
+    /**
+     * 同步 worktree 改动到主工作树
+     *
+     * 当 Agent 在 worktree 中工作时，改动会提交到 worktree 的分支。
+     * 此方法将这些改动同步回主工作树，确保提交可见。
+     */
+    async syncWorktreeChanges() {
+        try {
+            // 检查是否有 Agent worktree
+            const hasChanges = await this.worktreeSyncManager.hasUnsyncedChanges();
+            if (!hasChanges) {
+                console.log('✅ 未检测到 worktree 改动，跳过同步');
+                return;
+            }
+            console.log('🔄 检测到 worktree 改动，开始同步...');
+            // 执行完整同步
+            const { syncResults, cleanupResults } = await this.worktreeSyncManager.fullSync();
+            // 输出同步结果
+            for (const result of syncResults) {
+                if (result.success && result.syncedFiles.length > 0) {
+                    console.log(`✅ 同步成功: ${result.syncedFiles.length} 个文件`);
+                    console.log(`   文件: ${result.syncedFiles.slice(0, 5).join(', ')}${result.syncedFiles.length > 5 ? '...' : ''}`);
+                    if (result.commitHash) {
+                        console.log(`   来源提交: ${result.commitHash}`);
+                    }
+                }
+                else if (result.error) {
+                    console.log(`⚠️ 同步跳过: ${result.error}`);
+                }
+            }
+            // 输出清理结果
+            for (const cleanup of cleanupResults) {
+                if (cleanup.success) {
+                    console.log(`🧹 清理 worktree: ${cleanup.path}`);
+                }
+                else {
+                    console.log(`⚠️ 清理失败: ${cleanup.path}`);
+                }
+            }
+        }
+        catch (error) {
+            // 同步失败不应该阻止提交，但需要记录警告
+            console.warn('⚠️ Worktree 同步失败:', error instanceof Error ? error.message : String(error));
+            (0, error_handler_js_1.logError)(error, { operation: 'syncWorktreeChanges', file: this.repoPath });
+        }
+    }
+    /**
+     * 获取 WorktreeSyncManager 实例（供外部调用）
+     */
+    getWorktreeSyncManager() {
+        return this.worktreeSyncManager;
+    }
 }
 exports.GitCommitManager = GitCommitManager;

package/dist/storage/state-manager.d.ts

@@ -62,6 +62,114 @@ export declare class StateManager {
     updateApproval(approval: Approval): Promise<void>;
     getApprovalsByStatus(status: ApprovalStatus): Promise<Approval[]>;
     getAllApprovals(): Promise<Approval[]>;
+    /**
+     * 保存技术方案文档 (plan.md)
+     * 路径: .openmatrix/{runId}/plan.md
+     */
+    savePlan(content: string): Promise<void>;
+    /**
+     * 读取技术方案文档
+     * @returns plan.md 内容，不存在返回 null
+     */
+    getPlan(): Promise<string | null>;
+    /**
+     * 检查 plan.md 是否存在
+     */
+    hasPlan(): Promise<boolean>;
+    /**
+     * 保存任务输入元数据
+     * 路径: .openmatrix/{runId}/tasks-input.json
+     */
+    saveTasksInput(data: {
+        title: string;
+        description?: string;
+        goals: string[];
+        goalTypes?: string[];
+        goalComplexity?: ('low' | 'medium' | 'high')[];
+        constraints?: string[];
+        deliverables?: string[];
+        answers?: Record<string, string>;
+    }): Promise<void>;
+    /**
+     * 读取任务输入元数据
+     * @returns tasks-input.json 数据，不存在返回 null
+     */
+    getTasksInput(): Promise<{
+        title: string;
+        description?: string;
+        goals: string[];
+        goalTypes?: string[];
+        goalComplexity?: ('low' | 'medium' | 'high')[];
+        constraints?: string[];
+        deliverables?: string[];
+        answers?: Record<string, string>;
+    } | null>;
+    /**
+     * 检查 tasks-input.json 是否存在
+     */
+    hasTasksInput(): Promise<boolean>;
+    /**
+     * 保存研究会话
+     * 路径: .openmatrix/{runId}/research/session.json
+     */
+    saveResearchSession(session: Record<string, unknown>): Promise<void>;
+    /**
+     * 读取研究会话
+     */
+    getResearchSession(): Promise<Record<string, unknown> | null>;
+    /**
+     * 保存研究报告
+     */
+    saveResearchReport(content: string): Promise<void>;
+    /**
+     * 读取研究报告
+     */
+    getResearchReport(): Promise<string | null>;
+    /**
+     * 保存研究上下文 (供 start 使用)
+     */
+    saveResearchContext(context: {
+        topic: string;
+        domain: string;
+        goals?: string[];
+        constraints?: string[];
+        deliverables?: string[];
+        reportPath?: string;
+        knowledgePath?: string;
+    }): Promise<void>;
+    /**
+     * 读取研究上下文
+     */
+    getResearchContext(): Promise<{
+        topic: string;
+        domain: string;
+        goals?: string[];
+        constraints?: string[];
+        deliverables?: string[];
+        reportPath?: string;
+        knowledgePath?: string;
+    } | null>;
+    /**
+     * 检查研究上下文是否存在
+     */
+    hasResearchContext(): Promise<boolean>;
+    /**
+     * 保存知识条目
+     */
+    saveKnowledgeFinding(index: number, content: string): Promise<void>;
+    /**
+     * 保存头脑风暴会话
+     */
+    saveBrainstormSession(session: Record<string, unknown>): Promise<void>;
+    /**
+     * 读取头脑风暴会话
+     */
+    getBrainstormSession(): Promise<Record<string, unknown> | null>;
+    /**
+     * 迁移旧版本文件到 runId 目录
+     * 只在首次检测到旧文件时执行
+     */
+    migrateFromLegacy(): Promise<void>;
     saveMeeting(meeting: Meeting): Promise<void>;
     getMeeting(meetingId: string): Promise<Meeting | null>;
     getMeetingsByStatus(status: MeetingStatus): Promise<Meeting[]>;

package/dist/storage/state-manager.js

@@ -110,6 +110,8 @@ class StateManager {
                     retry_queue: existing.statistics?.retry_queue ?? 0
                 };
                 this.stateCache = existing;
+                // 迁移旧版本文件到 runId 目录
+                await this.migrateFromLegacy();
                 return;
             }
         }
@@ -151,12 +153,17 @@ class StateManager {
         if (oldRunId) {
             await this.rootStore.removeDir(oldRunId);
         }
-        // 兼容旧版本的目录
+        // 兼容旧版本的目录和文件（根目录）
         await this.rootStore.removeDir('tasks');
         await this.rootStore.removeDir('approvals');
         await this.rootStore.removeDir('meetings');
         await this.rootStore.removeDir('runs');
+        await this.rootStore.removeDir('research');
+        await this.rootStore.removeDir('brainstorm');
         await this.rootStore.removeFile('context.md');
+        await this.rootStore.removeFile('plan.md');
+        await this.rootStore.removeFile('tasks-input.json');
+        await this.rootStore.removeFile('state.json');
         // 创建新运行
         const runId = this.generateRunId();
         this.store = new file_store_js_1.FileStore((0, path_1.join)(this.basePath, runId));
@@ -443,6 +450,167 @@ class StateManager {
         }
         return approvals.sort((a, b) => a.createdAt.localeCompare(b.createdAt));
     }
+    // ============ Plan Methods ============
+    /**
+     * 保存技术方案文档 (plan.md)
+     * 路径: .openmatrix/{runId}/plan.md
+     */
+    async savePlan(content) {
+        await this.store.writeMarkdown('plan.md', content);
+    }
+    /**
+     * 读取技术方案文档
+     * @returns plan.md 内容，不存在返回 null
+     */
+    async getPlan() {
+        return await this.store.readMarkdown('plan.md');
+    }
+    /**
+     * 检查 plan.md 是否存在
+     */
+    async hasPlan() {
+        return await this.store.exists('plan.md');
+    }
+    // ============ TasksInput Methods ============
+    /**
+     * 保存任务输入元数据
+     * 路径: .openmatrix/{runId}/tasks-input.json
+     */
+    async saveTasksInput(data) {
+        await this.store.writeJson('tasks-input.json', data);
+    }
+    /**
+     * 读取任务输入元数据
+     * @returns tasks-input.json 数据，不存在返回 null
+     */
+    async getTasksInput() {
+        return await this.store.readJson('tasks-input.json');
+    }
+    /**
+     * 检查 tasks-input.json 是否存在
+     */
+    async hasTasksInput() {
+        return await this.store.exists('tasks-input.json');
+    }
+    // ============ Research Methods ============
+    /**
+     * 保存研究会话
+     * 路径: .openmatrix/{runId}/research/session.json
+     */
+    async saveResearchSession(session) {
+        await this.store.ensureDir('research');
+        await this.store.writeJson('research/session.json', session);
+    }
+    /**
+     * 读取研究会话
+     */
+    async getResearchSession() {
+        return await this.store.readJson('research/session.json');
+    }
+    /**
+     * 保存研究报告
+     */
+    async saveResearchReport(content) {
+        await this.store.ensureDir('research');
+        await this.store.writeMarkdown('research/RESEARCH.md', content);
+    }
+    /**
+     * 读取研究报告
+     */
+    async getResearchReport() {
+        return await this.store.readMarkdown('research/RESEARCH.md');
+    }
+    /**
+     * 保存研究上下文 (供 start 使用)
+     */
+    async saveResearchContext(context) {
+        await this.store.ensureDir('research');
+        await this.store.writeJson('research/context.json', context);
+    }
+    /**
+     * 读取研究上下文
+     */
+    async getResearchContext() {
+        return await this.store.readJson('research/context.json');
+    }
+    /**
+     * 检查研究上下文是否存在
+     */
+    async hasResearchContext() {
+        return await this.store.exists('research/context.json');
+    }
+    /**
+     * 保存知识条目
+     */
+    async saveKnowledgeFinding(index, content) {
+        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);
+    }
+    /**
+     * 读取头脑风暴会话
+     */
+    async getBrainstormSession() {
+        return await this.store.readJson('brainstorm/session.json');
+    }
+    // ============ Legacy Migration Methods ============
+    /**
+     * 迁移旧版本文件到 runId 目录
+     * 只在首次检测到旧文件时执行
+     */
+    async migrateFromLegacy() {
+        // Check if migration already done
+        if (await this.store.exists('plan.md')) {
+            return; // Already migrated
+        }
+        // Move plan.md from root to runId
+        const rootPlan = await this.rootStore.readMarkdown('plan.md');
+        if (rootPlan) {
+            await this.store.writeMarkdown('plan.md', rootPlan);
+            await this.rootStore.removeFile('plan.md');
+        }
+        // Move tasks-input.json from root to runId
+        const rootTasksInput = await this.rootStore.readJson('tasks-input.json');
+        if (rootTasksInput) {
+            await this.store.writeJson('tasks-input.json', rootTasksInput);
+            await this.rootStore.removeFile('tasks-input.json');
+        }
+        // Move research directory from root to runId
+        const rootResearchSession = await this.rootStore.readJson('research/session.json');
+        if (rootResearchSession) {
+            await this.store.ensureDir('research/knowledge');
+            // Copy session.json
+            if (rootResearchSession) {
+                await this.store.writeJson('research/session.json', rootResearchSession);
+            }
+            // Copy context.json
+            const rootContext = await this.rootStore.readJson('research/context.json');
+            if (rootContext) {
+                await this.store.writeJson('research/context.json', rootContext);
+            }
+            // Copy RESEARCH.md
+            const rootReport = await this.rootStore.readMarkdown('research/RESEARCH.md');
+            if (rootReport) {
+                await this.store.writeMarkdown('research/RESEARCH.md', rootReport);
+            }
+            // Remove old directory
+            await this.rootStore.removeDir('research');
+        }
+        // Move brainstorm directory from root to runId
+        const rootBrainstormSession = await this.rootStore.readJson('brainstorm/session.json');
+        if (rootBrainstormSession) {
+            await this.store.ensureDir('brainstorm');
+            await this.store.writeJson('brainstorm/session.json', rootBrainstormSession);
+            await this.rootStore.removeDir('brainstorm');
+        }
+    }
     // ============ Meeting Methods ============
     async saveMeeting(meeting) {
         await this.store.writeJson(`meetings/${meeting.id}.json`, meeting);

package/dist/utils/gitignore.js

@@ -124,6 +124,8 @@ const GITIGNORE_TEMPLATES = {
     ],
     openmatrix: [
         '.openmatrix/',
+        '.claude/worktrees/',
+        '.playwright-mcp/',
     ],
 };
 /**

package/dist/utils/worktree-sync.d.ts

@@ -0,0 +1,100 @@
+/**
+ * Worktree 同步结果
+ */
+export interface WorktreeSyncResult {
+    success: boolean;
+    syncedFiles: string[];
+    commitHash?: string;
+    branch?: string;
+    error?: string;
+}
+/**
+ * Worktree 信息
+ */
+export interface WorktreeInfo {
+    path: string;
+    branch: string;
+    commit: string;
+    isMain: boolean;
+}
+/**
+ * WorktreeSyncManager - 管理 Git Worktree 同步
+ *
+ * 当 Agent 在 worktree 中工作时，改动会提交到 worktree 的分支。
+ * 此类负责将这些改动同步回主工作树。
+ *
+ * 同步策略：
+ * 1. 检测 Agent 创建的 worktree
+ * 2. 获取 worktree 中的提交和改动文件
+ * 3. 将改动文件复制到主工作树（或 cherry-pick 提交）
+ * 4. 清理临时 worktree
+ */
+export declare class WorktreeSyncManager {
+    private repoPath;
+    private gitRoot;
+    constructor(repoPath?: string);
+    /**
+     * 获取 git 仓库根目录
+     */
+    private getGitRoot;
+    /**
+     * 列出所有 worktree
+     */
+    listWorktrees(): Promise<WorktreeInfo[]>;
+    /**
+     * 获取 Agent worktree 目录
+     *
+     * Claude Code 创建的 worktree 通常在 .claude/worktrees/ 目录下
+     */
+    getAgentWorktrees(): Promise<WorktreeInfo[]>;
+    /**
+     * 获取 worktree 相对于主工作树的改动
+     */
+    getWorktreeChanges(worktreePath: string): Promise<string[]>;
+    /**
+     * 获取 worktree 中最新提交的改动文件
+     */
+    getLatestCommitChanges(worktreePath: string): Promise<string[]>;
+    /**
+     * 同步 worktree 改动到主工作树
+     *
+     * 策略：
+     * 1. 获取 worktree 中已提交但未同步的改动
+     * 2. 将改动文件复制到主工作树
+     * 3. 在主工作树中暂存这些文件
+     *
+     * @param worktreePath worktree 路径（可选，不提供则自动检测所有 Agent worktree）
+     */
+    syncWorktreeToMain(worktreePath?: string): Promise<WorktreeSyncResult[]>;
+    /**
+     * Cherry-pick worktree 的提交到主工作树
+     *
+     * 替代方案：直接 cherry-pick worktree 的提交
+     * 适用于：改动较大、需要保留完整提交历史的场景
+     */
+    cherryPickWorktreeCommit(worktreePath: string): Promise<WorktreeSyncResult>;
+    /**
+     * 清理已同步的 worktree
+     */
+    cleanupWorktree(worktreePath: string): Promise<boolean>;
+    /**
+     * 完整的同步流程
+     *
+     * 1. 检测所有 Agent worktree
+     * 2. 同步改动到主工作树
+     * 3. 清理 worktree
+     *
+     * @returns 同步结果
+     */
+    fullSync(): Promise<{
+        syncResults: WorktreeSyncResult[];
+        cleanupResults: {
+            path: string;
+            success: boolean;
+        }[];
+    }>;
+    /**
+     * 检查是否有未同步的 worktree 改动
+     */
+    hasUnsyncedChanges(): Promise<boolean>;
+}