openmatrix 0.1.47 → 0.1.49

package/dist/cli/commands/complete.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export declare const completeCommand: Command;

package/dist/cli/commands/complete.js

@@ -0,0 +1,100 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.completeCommand = void 0;
+// src/cli/commands/complete.ts
+const commander_1 = require("commander");
+const state_manager_js_1 = require("../../storage/state-manager.js");
+const approval_manager_js_1 = require("../../orchestrator/approval-manager.js");
+const executor_js_1 = require("../../orchestrator/executor.js");
+const path = __importStar(require("path"));
+exports.completeCommand = new commander_1.Command('complete')
+    .description('标记任务完成或失败')
+    .argument('<taskId>', '任务 ID')
+    .option('--success', '标记为成功')
+    .option('--failed', '标记为失败')
+    .option('--error <message>', '错误信息')
+    .option('--output <text>', '执行输出')
+    .option('--json', 'JSON 输出')
+    .action(async (taskId, options) => {
+    const basePath = process.cwd();
+    const omPath = path.join(basePath, '.openmatrix');
+    const stateManager = new state_manager_js_1.StateManager(omPath);
+    await stateManager.initialize();
+    const state = await stateManager.getState();
+    // 构建执行器
+    const approvalManager = new approval_manager_js_1.ApprovalManager(stateManager);
+    const executor = new executor_js_1.OrchestratorExecutor(stateManager, approvalManager, {
+        maxConcurrent: state.config.maxConcurrentAgents,
+        taskTimeout: state.config.timeout * 1000
+    });
+    const success = options.success || !options.failed;
+    // 标记任务完成
+    await executor.completeTask(taskId, {
+        success,
+        output: options.output,
+        error: options.error
+    });
+    if (options.json) {
+        // 获取下一批可执行任务
+        const nextResult = await executor.step();
+        const updatedTask = await stateManager.getTask(taskId);
+        console.log(JSON.stringify({
+            status: success ? 'completed' : 'failed',
+            taskId,
+            taskStatus: updatedTask?.status,
+            nextBatch: {
+                status: nextResult.status,
+                subagentTasks: nextResult.subagentTasks.map(t => ({
+                    subagent_type: t.subagent_type,
+                    description: t.description,
+                    prompt: t.prompt,
+                    isolation: t.isolation,
+                    taskId: t.taskId,
+                    agentType: t.agentType,
+                    timeout: t.timeout
+                })),
+                statistics: nextResult.statistics
+            }
+        }));
+    }
+    else {
+        const emoji = success ? '✅' : '❌';
+        console.log(`${emoji} 任务 ${taskId} ${success ? '完成' : '失败'}`);
+        if (!success && options.error) {
+            console.log(`   错误: ${options.error}`);
+        }
+    }
+});

package/dist/cli/commands/start.js

@@ -313,7 +313,8 @@ exports.startCommand = new commander_1.Command('start')
             timeout: subTask.estimatedComplexity === 'high' ? 300000 :
                 subTask.estimatedComplexity === 'medium' ? 180000 : 120000,
             dependencies: subTask.dependencies,
-            assignedAgent: subTask.assignedAgent
+            assignedAgent: subTask.assignedAgent,
+            id: subTask.taskId
         });
     }
     // 确定执行模式

package/dist/cli/commands/step.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export declare const stepCommand: Command;

package/dist/cli/commands/step.js

@@ -0,0 +1,102 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stepCommand = void 0;
+// src/cli/commands/step.ts
+const commander_1 = require("commander");
+const state_manager_js_1 = require("../../storage/state-manager.js");
+const approval_manager_js_1 = require("../../orchestrator/approval-manager.js");
+const executor_js_1 = require("../../orchestrator/executor.js");
+const path = __importStar(require("path"));
+exports.stepCommand = new commander_1.Command('step')
+    .description('获取下一批可执行任务')
+    .option('--json', 'JSON 输出')
+    .action(async (options) => {
+    const basePath = process.cwd();
+    const omPath = path.join(basePath, '.openmatrix');
+    const stateManager = new state_manager_js_1.StateManager(omPath);
+    await stateManager.initialize();
+    const state = await stateManager.getState();
+    if (state.status !== 'running') {
+        if (options.json) {
+            console.log(JSON.stringify({
+                status: 'error',
+                message: '没有正在执行的任务',
+                currentState: state.status
+            }));
+        }
+        else {
+            console.log('⚠️  没有正在执行的任务');
+            console.log(`   当前状态: ${state.status}`);
+        }
+        return;
+    }
+    const approvalManager = new approval_manager_js_1.ApprovalManager(stateManager);
+    const executor = new executor_js_1.OrchestratorExecutor(stateManager, approvalManager, {
+        maxConcurrent: state.config.maxConcurrentAgents,
+        taskTimeout: state.config.timeout * 1000
+    });
+    const phaseExecutor = executor.getPhaseExecutor();
+    if (phaseExecutor) {
+        phaseExecutor.setRunId(state.runId);
+    }
+    const result = await executor.step();
+    if (options.json) {
+        console.log(JSON.stringify({
+            status: result.status,
+            message: result.message,
+            statistics: result.statistics,
+            subagentTasks: result.subagentTasks.map(t => ({
+                subagent_type: t.subagent_type,
+                description: t.description,
+                prompt: t.prompt,
+                isolation: t.isolation,
+                taskId: t.taskId,
+                agentType: t.agentType,
+                timeout: t.timeout
+            }))
+        }));
+    }
+    else {
+        console.log(`状态: ${result.status}`);
+        console.log(`消息: ${result.message}`);
+        if (result.subagentTasks.length > 0) {
+            console.log(`\n📋 待执行任务 (${result.subagentTasks.length}):`);
+            result.subagentTasks.forEach((t, i) => {
+                console.log(`  ${i + 1}. [${t.agentType}] ${t.description.slice(0, 60)}`);
+            });
+        }
+    }
+});

package/dist/cli/index.js

@@ -15,6 +15,8 @@ const check_js_1 = require("./commands/check.js");
 const check_gitignore_js_1 = require("./commands/check-gitignore.js");
 const analyze_js_1 = require("./commands/analyze.js");
 const brainstorm_js_1 = require("./commands/brainstorm.js");
+const complete_js_1 = require("./commands/complete.js");
+const step_js_1 = require("./commands/step.js");
 const program = new commander_1.Command();
 program
     .name('openmatrix')
@@ -34,5 +36,7 @@ program.addCommand(check_js_1.checkCommand);
 program.addCommand(check_gitignore_js_1.checkGitignoreCommand);
 program.addCommand(analyze_js_1.analyzeCommand);
 program.addCommand(brainstorm_js_1.brainstormCommand);
+program.addCommand(complete_js_1.completeCommand);
+program.addCommand(step_js_1.stepCommand);
 // 默认帮助
 program.parse();

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

@@ -13,6 +13,7 @@ export declare class StateManager {
         timeout: number;
         dependencies: string[];
         assignedAgent: string;
+        id?: string;
     }): Promise<Task>;
     getTask(taskId: string): Promise<Task | null>;
     updateTask(taskId: string, updates: Partial<Task>): Promise<void>;

package/dist/storage/state-manager.js

@@ -53,7 +53,7 @@ class StateManager {
         this.stateCache = newState;
     }
     async createTask(input) {
-        const taskId = this.generateTaskId();
+        const taskId = input.id || this.generateTaskId();
         const now = new Date().toISOString();
         const task = {
             id: taskId,

package/package.json

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

package/skills/start.md

@@ -77,14 +77,33 @@ CLI 返回 SubagentTask 列表。展示任务摘要后立即进入 Step 3。
 
 **从此步骤开始，除非遇到风险操作或 Meeting，不得暂停询问用户。**
 
+**从 Step 2 CLI 返回的 subagentTasks 开始执行。每完成一个任务后必须调用 complete + step 获取下一批:**
+
 ```
-while (有待执行任务) {
-  1. Agent 工具执行 SubagentTask
-  2. openmatrix complete <taskId> --success/--failed
-  3. Git 自动提交
+// Step 2 返回的 subagentTasks 直接执行
+for (const task of subagentTasks) {
+  1. Agent 工具执行 task
+  2. openmatrix complete <taskId> --success --json
+  // complete 返回 nextBatch.subagentTasks，如果有新任务继续执行
+}
+
+// 如果 complete 返回了新任务，继续执行
+while (nextBatch.subagentTasks.length > 0) {
+  for (const task of nextBatch.subagentTasks) {
+    1. Agent 工具执行 task
+    2. openmatrix complete <taskId> --success --json
+    // 更新 nextBatch
+  }
 }
+
+// 或者在任意时刻调用 openmatrix step --json 获取下一批
 ```
 
+**关键命令:**
+- `openmatrix complete <taskId> --success --json` — 标记完成并返回下一批任务
+- `openmatrix complete <taskId> --failed --error "原因" --json` — 标记失败
+- `openmatrix step --json` — 手动获取下一批可执行任务
+
 - **失败任务**: 自动跳过并记录，执行结束后统一提示
 - **阻塞任务**: 记录到 Meeting，暂停用 AskUserQuestion 处理