openmatrix 0.2.27 → 0.2.29

package/dist/cli/commands/install-skills.js

@@ -40,12 +40,16 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 exports.installSkillsCommand = new commander_1.Command('install-skills')
-    .description('Install OpenMatrix skills to ~/.claude/commands/om/')
+    .description('Install OpenMatrix skills to ~/.claude/commands/om/ and ~/.matrix/skills/om/ (if MatrixCode detected)')
     .option('-f, --force', 'Force overwrite existing skills', false)
     .action((options) => {
     const skillsDir = path.join(__dirname, '..', '..', '..', 'skills');
     const claudeDir = path.join(os.homedir(), '.claude');
-    const commandsDir = path.join(claudeDir, 'commands', 'om');
+    const claudeCommandsDir = path.join(claudeDir, 'commands', 'om');
+    // Check for MatrixCode installation
+    const matrixDir = path.join(os.homedir(), '.matrix');
+    const matrixSkillsDir = path.join(matrixDir, 'skills', 'om');
+    const hasMatrixCode = fs.existsSync(matrixDir);
     console.log('📦 OpenMatrix Skills Installer\n');
     // Check if skills directory exists
     if (!fs.existsSync(skillsDir)) {
@@ -53,106 +57,124 @@ exports.installSkillsCommand = new commander_1.Command('install-skills')
         console.error('   Make sure openmatrix is installed correctly.');
         process.exit(1);
     }
-    // Create commands directory
-    try {
-        if (!fs.existsSync(commandsDir)) {
-            fs.mkdirSync(commandsDir, { recursive: true });
-            console.log('📁 Created directory:', commandsDir);
-        }
-    }
-    catch (err) {
-        console.error('❌ Cannot create directory:', commandsDir);
-        console.error('   Error:', err instanceof Error ? err.message : String(err));
-        process.exit(1);
-    }
-    // Get skill files (excluding om.md and openmatrix.md which are handled separately)
+    // Define target directories
+    const targets = [
+        { name: 'Claude Code', dir: claudeCommandsDir, enabled: true },
+        { name: 'MatrixCode', dir: matrixSkillsDir, enabled: hasMatrixCode },
+    ];
+    // Get skill files
     const files = fs.readdirSync(skillsDir).filter(f => f.endsWith('.md') && f !== 'om.md' && f !== 'openmatrix.md');
     if (files.length === 0) {
         console.error('❌ No skill files found in:', skillsDir);
         process.exit(1);
     }
     console.log(`📋 Found ${files.length} skill files\n`);
-    let installed = 0;
-    let skipped = 0;
-    let failed = 0;
-    // Install skill files to ~/.claude/commands/om/
-    files.forEach(file => {
-        const src = path.join(skillsDir, file);
-        const dest = path.join(commandsDir, file);
+    let totalInstalled = 0;
+    let totalSkipped = 0;
+    let totalFailed = 0;
+    // Install to each target
+    for (const target of targets) {
+        if (!target.enabled) {
+            console.log(`⏭️  ${target.name}: skipped (not installed)`);
+            continue;
+        }
+        console.log(`\n🔧 Installing to ${target.name}...`);
         try {
-            // Check if file exists and not forcing
-            if (fs.existsSync(dest) && !options.force) {
-                console.log(`  ⏭️  Skipped: ${file} (already exists)`);
-                skipped++;
-                return;
+            if (!fs.existsSync(target.dir)) {
+                fs.mkdirSync(target.dir, { recursive: true });
+                console.log(`📁 Created directory: ${target.dir}`);
             }
-            fs.copyFileSync(src, dest);
-            const skillName = path.basename(file, '.md');
-            console.log(`  ✅ Installed: /om:${skillName}`);
-            installed++;
         }
         catch (err) {
-            console.log(`  ❌ Failed: ${file} (${err instanceof Error ? err.message : String(err)})`);
-            failed++;
+            console.error(`❌ Cannot create directory: ${target.dir}`);
+            console.error(`   Error: ${err instanceof Error ? err.message : String(err)}`);
+            continue;
         }
-    });
-    // Install default /om command to ~/.claude/commands/om.md
-    const omSrc = path.join(skillsDir, 'om.md');
-    const omDest = path.join(claudeDir, 'commands', 'om.md');
-    if (fs.existsSync(omSrc)) {
-        try {
-            if (fs.existsSync(omDest) && !options.force) {
-                console.log(`  ⏭️  Skipped: om.md (already exists)`);
-                skipped++;
-            }
-            else {
-                fs.copyFileSync(omSrc, omDest);
-                console.log(`  ✅ Installed: /om (default entry)`);
+        let installed = 0;
+        let skipped = 0;
+        let failed = 0;
+        // Install skill files
+        files.forEach(file => {
+            const src = path.join(skillsDir, file);
+            const dest = path.join(target.dir, file);
+            try {
+                if (fs.existsSync(dest) && !options.force) {
+                    skipped++;
+                    return;
+                }
+                fs.copyFileSync(src, dest);
                 installed++;
             }
-        }
-        catch (err) {
-            console.log(`  ❌ Failed: om.md (${err instanceof Error ? err.message : String(err)})`);
-            failed++;
-        }
-    }
-    // Install auto-detection instructions
-    const autoSrc = path.join(skillsDir, 'openmatrix.md');
-    const autoDest = path.join(claudeDir, 'commands', 'openmatrix.md');
-    if (fs.existsSync(autoSrc)) {
-        try {
-            if (fs.existsSync(autoDest) && !options.force) {
-                console.log(`  ⏭️  Skipped: openmatrix.md (already exists)`);
-                skipped++;
+            catch (err) {
+                console.log(`  ❌ Failed: ${file} (${err instanceof Error ? err.message : String(err)})`);
+                failed++;
             }
-            else {
-                fs.copyFileSync(autoSrc, autoDest);
-                console.log(`  ✅ Installed: /om:openmatrix (auto-detection)`);
-                installed++;
+        });
+        // Install om.md to parent directory for Claude Code
+        if (target.name === 'Claude Code') {
+            const omSrc = path.join(skillsDir, 'om.md');
+            const omDest = path.join(claudeDir, 'commands', 'om.md');
+            if (fs.existsSync(omSrc)) {
+                try {
+                    if (fs.existsSync(omDest) && !options.force) {
+                        skipped++;
+                    }
+                    else {
+                        fs.copyFileSync(omSrc, omDest);
+                        installed++;
+                    }
+                }
+                catch (err) {
+                    failed++;
+                }
+            }
+            // Install openmatrix.md (auto-detection)
+            const autoSrc = path.join(skillsDir, 'openmatrix.md');
+            const autoDest = path.join(claudeDir, 'commands', 'openmatrix.md');
+            if (fs.existsSync(autoSrc)) {
+                try {
+                    if (fs.existsSync(autoDest) && !options.force) {
+                        skipped++;
+                    }
+                    else {
+                        fs.copyFileSync(autoSrc, autoDest);
+                        installed++;
+                    }
+                }
+                catch (err) {
+                    failed++;
+                }
             }
         }
-        catch (err) {
-            console.log(`  ❌ Failed: openmatrix.md (${err instanceof Error ? err.message : String(err)})`);
-            failed++;
+        console.log(`   ✅ Installed: ${installed}`);
+        console.log(`   ⏭️  Skipped: ${skipped}`);
+        if (failed > 0) {
+            console.log(`   ❌ Failed: ${failed}`);
         }
+        totalInstalled += installed;
+        totalSkipped += skipped;
+        totalFailed += failed;
     }
     console.log('\n' + '─'.repeat(50));
-    console.log(`📊 Summary:`);
-    console.log(`   ✅ Installed: ${installed}`);
-    console.log(`   ⏭️  Skipped: ${skipped}`);
-    console.log(`   ❌ Failed: ${failed}`);
-    console.log(`\n📁 Skills: ${commandsDir}`);
-    console.log(`📁 Default: ${omDest}`);
-    if (installed > 0) {
+    console.log(`📊 Total Summary:`);
+    console.log(`   ✅ Installed: ${totalInstalled}`);
+    console.log(`   ⏭️  Skipped: ${totalSkipped}`);
+    console.log(`   ❌ Failed: ${totalFailed}`);
+    console.log('\n📁 Installation locations:');
+    for (const target of targets) {
+        if (target.enabled) {
+            console.log(`   ${target.name}: ${target.dir}`);
+        }
+    }
+    if (totalInstalled > 0) {
         console.log('\n🎉 Skills installed successfully!');
         console.log('   Try: /om <your task>');
         console.log('   Or:  /om:start <your task>');
-        console.log('\n💡 Auto-detection enabled!');
-        console.log('   Type task descriptions directly:');
-        console.log('   - "实现用户登录功能" → auto invokes /om:start');
-        console.log('   - "fix the login bug" → auto invokes /om:start');
     }
-    if (failed > 0) {
+    if (hasMatrixCode) {
+        console.log('\n✅ MatrixCode detected! Skills also installed to ~/.matrix/skills/om/');
+    }
+    if (totalFailed > 0) {
         process.exit(1);
     }
 });

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/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>;
+}