openmatrix 0.1.61 → 0.1.63

package/dist/storage/state-manager.js

@@ -12,9 +12,25 @@ const DEFAULT_CONFIG = {
 class StateManager {
     store;
     stateCache = null;
+    writeLock = Promise.resolve();
     constructor(basePath) {
         this.store = new file_store_js_1.FileStore(basePath);
     }
+    /**
+     * 串行化异步写操作，防止并发 read-modify-write 竞态
+     */
+    async withLock(fn) {
+        const prev = this.writeLock;
+        let resolve;
+        this.writeLock = new Promise(r => { resolve = r; });
+        await prev;
+        try {
+            return await fn();
+        }
+        finally {
+            resolve();
+        }
+    }
     async initialize() {
         const existing = await this.store.readJson('state.json');
         if (!existing) {
@@ -47,46 +63,53 @@ class StateManager {
         return this.stateCache;
     }
     async updateState(updates) {
-        const state = await this.getState();
-        const newState = { ...state, ...updates };
-        await this.store.writeJson('state.json', newState);
-        this.stateCache = newState;
+        await this.withLock(async () => {
+            const state = await this.getState();
+            const newState = { ...state, ...updates };
+            await this.store.writeJson('state.json', newState);
+            this.stateCache = newState;
+        });
     }
     async createTask(input) {
-        const taskId = this.generateTaskId();
-        const now = new Date().toISOString();
-        const task = {
-            id: taskId,
-            title: input.title,
-            description: input.description,
-            status: 'pending',
-            priority: input.priority,
-            timeout: input.timeout,
-            dependencies: input.dependencies,
-            assignedAgent: input.assignedAgent,
-            phases: {
-                develop: { status: 'pending', duration: null },
-                verify: { status: 'pending', duration: null },
-                accept: { status: 'pending', duration: null }
-            },
-            retryCount: 0,
-            error: null,
-            createdAt: now,
-            updatedAt: now
-        };
-        await this.store.writeJson(`tasks/${taskId}/task.json`, task);
-        // Create artifacts subdirectory
-        await this.store.ensureDir(`tasks/${taskId}/artifacts`);
-        // Update statistics
-        const state = await this.getState();
-        await this.updateState({
-            statistics: {
-                ...state.statistics,
-                totalTasks: state.statistics.totalTasks + 1,
-                pending: state.statistics.pending + 1
-            }
+        return this.withLock(async () => {
+            const taskId = this.generateTaskId();
+            const now = new Date().toISOString();
+            const task = {
+                id: taskId,
+                title: input.title,
+                description: input.description,
+                status: 'pending',
+                priority: input.priority,
+                timeout: input.timeout,
+                dependencies: input.dependencies,
+                assignedAgent: input.assignedAgent,
+                phases: {
+                    develop: { status: 'pending', duration: null },
+                    verify: { status: 'pending', duration: null },
+                    accept: { status: 'pending', duration: null }
+                },
+                retryCount: 0,
+                error: null,
+                createdAt: now,
+                updatedAt: now
+            };
+            await this.store.writeJson(`tasks/${taskId}/task.json`, task);
+            // Create artifacts subdirectory
+            await this.store.ensureDir(`tasks/${taskId}/artifacts`);
+            // Update statistics
+            const state = await this.getState();
+            const newState = {
+                ...state,
+                statistics: {
+                    ...state.statistics,
+                    totalTasks: state.statistics.totalTasks + 1,
+                    pending: state.statistics.pending + 1
+                }
+            };
+            await this.store.writeJson('state.json', newState);
+            this.stateCache = newState;
+            return task;
         });
-        return task;
     }
     async getTask(taskId) {
         // Try subdirectory structure first, fall back to flat file
@@ -97,21 +120,23 @@ class StateManager {
         return task;
     }
     async updateTask(taskId, updates) {
-        const task = await this.getTask(taskId);
-        if (!task)
-            throw new Error(`Task ${taskId} not found`);
-        const oldStatus = task.status;
-        const updatedTask = {
-            ...task,
-            ...updates,
-            updatedAt: new Date().toISOString()
-        };
-        // Always write to subdirectory structure
-        await this.store.writeJson(`tasks/${taskId}/task.json`, updatedTask);
-        // Update statistics if status changed
-        if (updates.status && updates.status !== oldStatus) {
-            await this.updateTaskStatistics(oldStatus, updates.status);
-        }
+        await this.withLock(async () => {
+            const task = await this.getTask(taskId);
+            if (!task)
+                throw new Error(`Task ${taskId} not found`);
+            const oldStatus = task.status;
+            const updatedTask = {
+                ...task,
+                ...updates,
+                updatedAt: new Date().toISOString()
+            };
+            // Always write to subdirectory structure
+            await this.store.writeJson(`tasks/${taskId}/task.json`, updatedTask);
+            // Update statistics if status changed
+            if (updates.status && updates.status !== oldStatus) {
+                await this.updateTaskStatistics(oldStatus, updates.status);
+            }
+        });
     }
     async listTasks() {
         const tasks = [];
@@ -168,6 +193,7 @@ class StateManager {
         return await this.store.readMarkdown(`tasks/${taskId}/context.md`);
     }
     async updateTaskStatistics(oldStatus, newStatus) {
+        // 直接写入状态，不经过 updateState（避免重入锁死锁）
         const state = await this.getState();
         const stats = { ...state.statistics };
         // Decrement old status count
@@ -188,7 +214,9 @@ class StateManager {
             stats.completed++;
         else if (newStatus === 'failed')
             stats.failed++;
-        await this.updateState({ statistics: stats });
+        const newState = { ...state, statistics: stats };
+        await this.store.writeJson('state.json', newState);
+        this.stateCache = newState;
     }
     generateRunId() {
         const date = new Date().toISOString().slice(0, 10).replace(/-/g, '');

package/package.json

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

package/scripts/install-skills.js

@@ -7,45 +7,51 @@ const os = require('os');
 // Change to home directory to avoid cwd issues
 process.chdir(os.homedir());
 
-try {
-  // Get the package skills directory - use the path relative to this script
-  const scriptDir = __dirname;
-  const skillsDir = path.join(scriptDir, '..', 'skills');
+// Get the package skills directory - use the path relative to this script
+const scriptDir = __dirname;
+const skillsDir = path.join(scriptDir, '..', 'skills');
+
+// Target directories for different AI coding tools
+const targets = [
+  {
+    name: 'Claude Code',
+    dir: path.join(os.homedir(), '.claude', 'commands', 'om'),
+  },
+  {
+    name: 'OpenCode',
+    dir: path.join(os.homedir(), '.config', 'opencode', 'commands', 'om'),
+  },
+];
+
+if (!fs.existsSync(skillsDir)) {
+  console.log('Skills directory not found, skipping installation.');
+  process.exit(0);
+}
 
-  // Get user's .claude directory
-  const claudeDir = path.join(os.homedir(), '.claude');
-  const commandsDir = path.join(claudeDir, 'commands', 'om');
+const files = fs.readdirSync(skillsDir).filter(f => f.endsWith('.md'));
 
-  // Create commands directory if it doesn't exist
+for (const target of targets) {
   try {
-    if (!fs.existsSync(commandsDir)) {
-      fs.mkdirSync(commandsDir, { recursive: true });
+    // Create commands directory if it doesn't exist
+    if (!fs.existsSync(target.dir)) {
+      fs.mkdirSync(target.dir, { recursive: true });
     }
-  } catch (mkdirErr) {
-    console.log(`⚠️  Cannot create ${commandsDir}`);
-    console.log(`   Please run: mkdir -p ${commandsDir}`);
-    process.exit(0);
-  }
 
-  // Copy skill files
-  if (fs.existsSync(skillsDir)) {
-    const files = fs.readdirSync(skillsDir).filter(f => f.endsWith('.md'));
-
-    files.forEach(file => {
+    let installed = 0;
+    for (const file of files) {
       const src = path.join(skillsDir, file);
-      const dest = path.join(commandsDir, file);
+      const dest = path.join(target.dir, file);
       try {
         fs.copyFileSync(src, dest);
-        console.log(`✓ Installed: om:${path.basename(file, '.md')}`);
+        installed++;
       } catch (copyErr) {
-        console.log(`⚠️  Skipped: om:${path.basename(file, '.md')} (${copyErr.message})`);
+        console.log(`  ⚠️  Skipped: ${file} (${copyErr.message})`);
       }
-    });
+    }
 
-    console.log(`\n✅ OpenMatrix skills installed to ${commandsDir}`);
-  } else {
-    console.log('Skills directory not found, skipping installation.');
+    console.log(`✅ ${target.name}: ${installed} skills installed to ${target.dir}`);
+  } catch (err) {
+    console.log(`⚠️  ${target.name}: skipped (${err.message})`);
+    console.log(`   Please run: mkdir -p ${target.dir}`);
   }
-} catch (err) {
-  console.log('OpenMatrix skills installation skipped:', err.message);
 }

package/skills/approve.md

@@ -14,7 +14,7 @@ description: 审批待处理项（包括计划、合并、部署、Meeting）
 <process>
 1. **获取待审批列表**
    ```bash
-   openmatrix approve --list
+   openmatrix approve
    ```
 
 2. **如果没有待审批项**
@@ -152,9 +152,11 @@ description: 审批待处理项（包括计划、合并、部署、Meeting）
 
 5. **执行审批**
    ```bash
-   openmatrix approve <approvalId> -d <approve|reject|modify> [-c "备注"]
+   openmatrix approve <approvalId> -d <approve|reject|modify> [-c "备注"] --json
    ```
 
+   **注意**: approvalId 是位置参数，不要使用 --id。正确格式: `openmatrix approve APPR-001 -d approve --json`
+
 6. **更新状态**
 
    - 写入审批结果到 `approvals/{id}.json`
@@ -214,18 +216,13 @@ Meeting 审批需要更细致的交互:
 ## CLI 命令
 
 ```bash
-# 列出待审批
-openmatrix approve
-
-# 处理审批
-openmatrix approve APPR-001 -d approve -c "同意此方案"
-openmatrix approve APPR-001 -d reject -c "需要重新设计"
-openmatrix approve APPR-001 -d modify -c "增加测试覆盖率要求"
-
-# Meeting 专用 (使用 meeting 命令)
-openmatrix meeting APPR-002 --action provide-info --info "数据库连接字符串是..."
-openmatrix meeting APPR-002 --action skip --message "此任务可选"
-openmatrix meeting APPR-002 --action cancel --message "需求变更，停止执行"
+# 列出待审批 (不传 ID)
+openmatrix approve --json
+
+# 处理审批 (ID 是位置参数，不要用 --id)
+openmatrix approve APPR-001 -d approve -c "同意此方案" --json
+openmatrix approve APPR-001 -d reject -c "需要重新设计" --json
+openmatrix approve APPR-001 -d modify -c "增加测试覆盖率要求" --json
 ```
 
 ## 与执行循环的集成

package/skills/brainstorm.md

@@ -23,7 +23,7 @@ OpenMatrix 独立运行，不依赖外部任务编排系统。
 
    调用 CLI 创建头脑风暴会话:
    ```bash
-   openmatrix brainstorm --json
+   openmatrix brainstorm "$ARGUMENTS" --json
    ```
 
    这会返回:
@@ -269,15 +269,32 @@ $ARGUMENTS
 
 ## 问题类型
 
+### 项目配置问题（智能管道生成）
+
 | 问题 ID | 目的 | 为什么重要 |
 |---------|------|-----------|
-| core_objective | 明确核心目标 | 选择正确的实现策略 |
-| user_value | 了解用户价值 | 设计合适的接口 |
-| complexity | 评估复杂度 | 决定实施策略 |
-| tech_constraints | 技术约束 | 影响方案选择 |
-| risks | 风险评估 | 提前规划应对 |
-| acceptance | 验收标准 | 判断完成度 |
-| priority | 优先级 | 资源分配 |
+| objective | 明确任务目标（新功能/修复/重构） | 选择正确的实现策略 |
+| quality_level | 质量门禁级别（strict/balanced/fast） | 影响测试覆盖、Lint、安全扫描要求 |
+| tech_stack | 技术栈选择 | 决定使用什么框架和工具 |
+| execution_mode | 执行模式（auto/confirm-key/confirm-all） | 控制审批节点和自动化程度 |
+| test_coverage | 测试覆盖率要求 | 影响测试任务生成 |
+| documentation_level | 文档要求级别 | 影响文档任务生成 |
+| e2e_tests | 是否启用 E2E 测试 | Web/Mobile/GUI 项目适用 |
+| risks | 风险评估 | 提前规划应对策略 |
+| acceptance | 验收标准 | 判断任务完成度 |
+
+> **智能预填**：当 `SmartQuestionAnalyzer` 对某个问题有高置信度推断时，该问题会被自动跳过，不需要用户回答。
+
+### 领域分析问题（底层逻辑思考）
+
+| 问题 ID | 目的 | 为什么重要 |
+|---------|------|-----------|
+| domain_entities | 核心领域实体建模 | 决定数据模型和 API 设计的基础 |
+| data_flow | 数据流转路径分析 | 决定架构选型（请求驱动 vs 事件驱动 vs 流处理） |
+| invariants | 关键不变量/业务约束 | 决定哪里需要加锁、事务、校验 |
+| core_scenarios | 核心用户场景链路 | 决定 MVP 功能范围和优先级排序 |
+
+> **领域分析的价值**：这四个问题帮助 AI 在执行前建立对系统的深层理解，而不是机械地按需求列表编码。答案会作为上下文注入到每个 Agent 的执行提示词中。
 
 ## 与 start 的集成
 
@@ -286,12 +303,15 @@ $ARGUMENTS
 ```json
 {
   "answers": {
-    "core_objective": "实现新功能",
-    "user_value": "终端用户",
-    "complexity": "中等",
-    "risks": ["技术风险", "兼容性风险"],
-    "acceptance": ["功能完整", "测试覆盖"],
-    "priority": "中优先级"
+    "objective": "new_feature",
+    "quality_level": "balanced",
+    "tech_stack": ["typescript", "react"],
+    "execution_mode": "auto",
+    "test_coverage": "medium",
+    "documentation_level": "basic",
+    "e2e_tests": "false",
+    "risks": ["technical", "compatibility"],
+    "acceptance": ["functional", "tested"]
   },
   "insights": [
     "需要考虑安全性",