openmatrix 0.1.50 → 0.1.52

package/dist/agents/agent-runner.d.ts

@@ -1,4 +1,4 @@
-import type { Task, AgentType, AgentResult } from '../types/index.js';
+import type { Task, AgentType, AgentResult, SubagentTask, ClaudeCodeSubagentType } from '../types/index.js';
 import { StateManager } from '../storage/state-manager.js';
 import { ApprovalManager } from '../orchestrator/approval-manager.js';
 export interface AgentRunnerConfig {
@@ -10,31 +10,6 @@ export interface SubagentPrompt {
     context: string;
     instructions: string;
 }
-/**
- * Claude Code Subagent 类型
- */
-export type ClaudeCodeSubagentType = 'general-purpose' | 'Explore' | 'Plan';
-/**
- * Subagent 任务配置 - 用于 Agent 工具调用
- */
-export interface SubagentTask {
-    /** Subagent 类型 */
-    subagent_type: ClaudeCodeSubagentType;
-    /** 简短描述 (3-5 词) */
-    description: string;
-    /** 完整任务提示词 */
-    prompt: string;
-    /** 是否使用隔离 worktree */
-    isolation?: 'worktree';
-    /** 任务 ID (用于追踪) */
-    taskId: string;
-    /** 原始 Agent 类型 */
-    agentType: AgentType;
-    /** 超时时间 (ms) */
-    timeout: number;
-    /** 是否需要审批 */
-    needsApproval: boolean;
-}
 /**
  * 用户上下文信息
  */

package/dist/cli/commands/meeting.js

@@ -38,6 +38,7 @@ exports.meetingCommand = void 0;
 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 meeting_manager_js_1 = require("../../orchestrator/meeting-manager.js");
 const path = __importStar(require("path"));
 exports.meetingCommand = new commander_1.Command('meeting')
     .description('查看和处理待确认的 Meeting')
@@ -55,23 +56,26 @@ exports.meetingCommand = new commander_1.Command('meeting')
     const stateManager = new state_manager_js_1.StateManager(omPath);
     await stateManager.initialize();
     const approvalManager = new approval_manager_js_1.ApprovalManager(stateManager);
+    const meetingManager = new meeting_manager_js_1.MeetingManager(stateManager, approvalManager);
     try {
-        // 获取所有 pending 的 meeting
+        // 获取所有 pending 的 meeting approvals
         const pendingApprovals = await stateManager.getApprovalsByStatus('pending');
-        const meetings = pendingApprovals.filter(a => a.type === 'meeting');
+        const meetingApprovals = pendingApprovals.filter(a => a.type === 'meeting');
         // 列出所有 Meeting
         if (options.list || (!meetingId && !options.skipAll)) {
-            if (meetings.length === 0) {
+            // 同时获取 MeetingManager 中的详细 Meeting 信息
+            const pendingMeetings = await meetingManager.getPendingMeetings();
+            if (meetingApprovals.length === 0 && pendingMeetings.length === 0) {
                 console.log('✅ 没有待处理的 Meeting\n');
-                console.log('当前状态:');
                 const allApprovals = await stateManager.getApprovalsByStatus('approved');
-                const meetingApprovals = allApprovals.filter(a => a.type === 'meeting');
-                console.log(`  - 已解决: ${meetingApprovals.length}`);
-                console.log(`  - 总计: ${meetingApprovals.length}`);
+                const resolvedMeetings = allApprovals.filter(a => a.type === 'meeting');
+                console.log('当前状态:');
+                console.log(`  - 已解决: ${resolvedMeetings.length}`);
+                console.log(`  - 总计: ${resolvedMeetings.length}`);
                 return;
             }
-            console.log(`\n📋 待处理 Meeting (${meetings.length}个)\n`);
-            meetings.forEach((meeting, index) => {
+            console.log(`\n📋 待处理 Meeting (${meetingApprovals.length}个)\n`);
+            meetingApprovals.forEach((meeting, index) => {
                 const icon = meeting.title.includes('决策') ? '🤔' : '🔴';
                 const shortTitle = meeting.title.slice(0, 40);
                 console.log(`  [${index + 1}] ${icon} ${meeting.id} - ${shortTitle}`);
@@ -87,8 +91,8 @@ exports.meetingCommand = new commander_1.Command('meeting')
         }
         // 批量跳过
         if (options.skipAll) {
-            console.log(`\n⏭️  批量跳过 ${meetings.length} 个 Meeting...\n`);
-            for (const meeting of meetings) {
+            console.log(`\n⏭️  批量跳过 ${meetingApprovals.length} 个 Meeting...\n`);
+            for (const meeting of meetingApprovals) {
                 await approvalManager.processDecision({
                     approvalId: meeting.id,
                     decision: 'approve',
@@ -96,6 +100,16 @@ exports.meetingCommand = new commander_1.Command('meeting')
                     decidedBy: 'user',
                     decidedAt: new Date().toISOString()
                 });
+                // 尝试通过 MeetingManager 解决关联的 Meeting
+                try {
+                    const parsed = JSON.parse(meeting.content || '{}');
+                    if (parsed.meetingId) {
+                        await meetingManager.cancelMeeting(parsed.meetingId, options.message || '批量跳过');
+                    }
+                }
+                catch {
+                    // content 可能不是 JSON，跳过 Meeting 更新
+                }
                 // 更新关联任务状态为 skipped
                 const task = await stateManager.getTask(meeting.taskId);
                 if (task) {
@@ -114,7 +128,7 @@ exports.meetingCommand = new commander_1.Command('meeting')
             console.log('❌ 请指定 Meeting ID 或使用 --list');
             return;
         }
-        const meeting = meetings.find(m => m.id === meetingId);
+        const meeting = meetingApprovals.find(m => m.id === meetingId);
         if (!meeting) {
             console.log(`❌ Meeting ${meetingId} 不存在或已处理`);
             return;
@@ -123,7 +137,7 @@ exports.meetingCommand = new commander_1.Command('meeting')
         console.log(`\n📋 Meeting: ${meeting.id}`);
         console.log(`🎯 任务: ${meeting.taskId}`);
         console.log(`\n## 详情\n`);
-        console.log(meeting.content || '无详细内容');
+        console.log(meeting.description || '无详细内容');
         console.log('');
         // 执行操作
         const action = options.action;
@@ -137,6 +151,15 @@ exports.meetingCommand = new commander_1.Command('meeting')
             console.log('  --action cancel --message "..."');
             return;
         }
+        // 解析关联的 Meeting ID
+        let internalMeetingId;
+        try {
+            const parsed = JSON.parse(meeting.content || '{}');
+            internalMeetingId = parsed.meetingId;
+        }
+        catch {
+            // content 可能不是 JSON
+        }
         switch (action) {
             case 'provide-info':
                 if (!options.info) {
@@ -150,6 +173,10 @@ exports.meetingCommand = new commander_1.Command('meeting')
                     decidedBy: 'user',
                     decidedAt: new Date().toISOString()
                 });
+                // 通过 MeetingManager 解决关联 Meeting
+                if (internalMeetingId) {
+                    await meetingManager.resolveMeeting(internalMeetingId, `提供信息: ${options.info}`);
+                }
                 console.log('✅ 信息已记录，任务将恢复执行');
                 break;
             case 'skip':
@@ -160,6 +187,9 @@ exports.meetingCommand = new commander_1.Command('meeting')
                     decidedBy: 'user',
                     decidedAt: new Date().toISOString()
                 });
+                if (internalMeetingId) {
+                    await meetingManager.cancelMeeting(internalMeetingId, options.message || '跳过');
+                }
                 // 标记任务为跳过
                 const skipTask = await stateManager.getTask(meeting.taskId);
                 if (skipTask) {
@@ -178,6 +208,9 @@ exports.meetingCommand = new commander_1.Command('meeting')
                     decidedBy: 'user',
                     decidedAt: new Date().toISOString()
                 });
+                if (internalMeetingId) {
+                    await meetingManager.resolveMeeting(internalMeetingId, '重试任务');
+                }
                 // 重置任务状态
                 await stateManager.updateTask(meeting.taskId, {
                     status: 'retry_queue',
@@ -197,6 +230,9 @@ exports.meetingCommand = new commander_1.Command('meeting')
                     decidedBy: 'user',
                     decidedAt: new Date().toISOString()
                 });
+                if (internalMeetingId) {
+                    await meetingManager.resolveMeeting(internalMeetingId, `修改方案: ${options.newPlan}`);
+                }
                 // 更新任务描述
                 const modifyTask = await stateManager.getTask(meeting.taskId);
                 if (modifyTask) {
@@ -216,6 +252,9 @@ exports.meetingCommand = new commander_1.Command('meeting')
                     decidedBy: 'user',
                     decidedAt: new Date().toISOString()
                 });
+                if (internalMeetingId) {
+                    await meetingManager.resolveMeeting(internalMeetingId, `决策: ${options.reason || '已做出决策'}`);
+                }
                 console.log('✅ 决策已记录');
                 break;
             case 'cancel':
@@ -226,6 +265,9 @@ exports.meetingCommand = new commander_1.Command('meeting')
                     decidedBy: 'user',
                     decidedAt: new Date().toISOString()
                 });
+                if (internalMeetingId) {
+                    await meetingManager.cancelMeeting(internalMeetingId, options.message || '用户取消');
+                }
                 // 标记任务为失败
                 await stateManager.updateTask(meeting.taskId, {
                     status: 'failed',

package/dist/cli/commands/start.js

@@ -58,6 +58,7 @@ exports.startCommand = new commander_1.Command('start')
     .option('-q, --quality <level>', '质量级别 (strict|balanced|fast)')
     .option('-t, --tech-stack <stack>', '技术栈 (逗号分隔，如 "TypeScript,Vue.js,PostgreSQL")')
     .option('--docs <level>', '文档级别 (full|basic|minimal|none)')
+    .option('--tasks-json <json>', 'AI 已拆分的任务 JSON (跳过自动解析)')
     .action(async (input, options) => {
     const basePath = process.cwd();
     const omPath = path.join(basePath, '.openmatrix');
@@ -101,9 +102,198 @@ exports.startCommand = new commander_1.Command('start')
         }
         return;
     }
+    // ============================
+    // 路径 A: AI 已拆分 (--tasks-json)
+    // ============================
+    if (options.tasksJson) {
+        await handleTasksJson(options, stateManager, state, omPath);
+        return;
+    }
+    // ============================
+    // 路径 B: 自动解析 (fallback)
+    // ============================
+    await handleAutoParse(input, options, stateManager, state);
+});
+/**
+ * 处理 AI 解析的任务 (--tasks-json)
+ * AI 提供 ParsedTask 格式的结构化数据，仍由 TaskPlanner 做拆分
+ */
+async function handleTasksJson(options, stateManager, state, omPath) {
+    let tasksInput;
+    try {
+        // 支持 @file 语法读取文件
+        let jsonStr = options.tasksJson;
+        if (jsonStr.startsWith('@')) {
+            jsonStr = await fs.readFile(jsonStr.slice(1), 'utf-8');
+        }
+        tasksInput = JSON.parse(jsonStr);
+    }
+    catch (e) {
+        if (options.json) {
+            console.log(JSON.stringify({
+                status: 'error',
+                message: `--tasks-json 解析失败: ${e instanceof Error ? e.message : e}`
+            }));
+        }
+        else {
+            console.log(`❌ --tasks-json 解析失败: ${e instanceof Error ? e.message : e}`);
+        }
+        return;
+    }
+    if (!tasksInput.goals || tasksInput.goals.length === 0) {
+        if (options.json) {
+            console.log(JSON.stringify({ status: 'error', message: '--tasks-json 中 goals 为空' }));
+        }
+        else {
+            console.log('❌ --tasks-json 中 goals 为空');
+        }
+        return;
+    }
+    // 保存 AI 生成的执行计划
+    if (tasksInput.plan) {
+        await fs.writeFile(path.join(omPath, 'plan.md'), tasksInput.plan, 'utf-8');
+    }
+    // 构建 ParsedTask
+    const parsedTask = {
+        title: tasksInput.title,
+        description: tasksInput.description || '',
+        goals: tasksInput.goals,
+        constraints: tasksInput.constraints || [],
+        deliverables: tasksInput.deliverables || [],
+        rawContent: ''
+    };
+    // 解析质量配置
+    const qualityLevel = tasksInput.quality || options.quality || 'balanced';
+    const qualityConfig = index_js_1.QUALITY_PRESETS[qualityLevel.toLowerCase()] || index_js_1.QUALITY_PRESETS.balanced;
+    if (!options.json) {
+        console.log(`\n📋 任务: ${parsedTask.title}`);
+        console.log(`   目标: ${parsedTask.goals.join(', ')}`);
+        console.log('\n🔧 拆解任务...');
+    }
+    // 使用 TaskPlanner 拆分（保持原有拆分逻辑）
+    const answers = tasksInput.answers || {};
+    const planner = new task_planner_js_1.TaskPlanner();
+    const subTasks = planner.breakdown(parsedTask, answers, qualityConfig, tasksInput.plan);
+    // 创建任务到状态管理器，并建立 ID 映射
+    // TaskPlanner 生成的 taskId 和 StateManager 创建的 id 不同，
+    // 需要映射后才能正确设置 dependencies
+    const taskIdMap = new Map();
+    for (const task of subTasks) {
+        const created = await stateManager.createTask({
+            title: task.title,
+            description: task.description,
+            priority: task.priority,
+            timeout: task.estimatedComplexity === 'high' ? 300000 :
+                task.estimatedComplexity === 'medium' ? 180000 : 120000,
+            dependencies: [], // 先创建，稍后更新依赖
+            assignedAgent: task.assignedAgent
+        });
+        taskIdMap.set(task.taskId, created.id);
+    }
+    // 映射并更新依赖关系
+    for (const task of subTasks) {
+        const actualId = taskIdMap.get(task.taskId);
+        const resolvedDeps = task.dependencies
+            .map(dep => taskIdMap.get(dep))
+            .filter((id) => id !== undefined);
+        if (resolvedDeps.length > 0) {
+            await stateManager.updateTask(actualId, { dependencies: resolvedDeps });
+        }
+    }
+    // 解析执行模式
+    const executionMode = tasksInput.mode || options.mode || 'confirm-key';
+    const approvalPoints = resolveApprovalPoints(executionMode);
+    await stateManager.updateState({
+        status: 'running',
+        currentPhase: 'execution',
+        config: {
+            ...state.config,
+            approvalPoints: approvalPoints,
+            quality: qualityConfig
+        }
+    });
+    // 创建审批请求（如果有审批点）
+    const approvalManager = new approval_manager_js_1.ApprovalManager(stateManager);
+    if (approvalPoints.includes('plan')) {
+        const approval = await approvalManager.createPlanApproval('plan-approval', `# 执行计划\n\n${subTasks.map((t, i) => `${i + 1}. ${t.title} (${t.assignedAgent})`).join('\n')}`);
+        await stateManager.updateState({ status: 'paused' });
+        if (options.json) {
+            console.log(JSON.stringify({
+                status: 'waiting_approval',
+                approvalId: approval.id,
+                approvalType: 'plan',
+                message: '等待计划审批',
+                tasks: subTasks.map((t, i) => ({
+                    index: i + 1,
+                    title: t.title,
+                    priority: t.priority,
+                    assignedAgent: t.assignedAgent
+                })),
+                taskInfo: {
+                    title: tasksInput.title,
+                    description: tasksInput.description,
+                    quality: qualityLevel
+                }
+            }));
+        }
+        else {
+            console.log(`\n📋 ${tasksInput.title} - ${subTasks.length} 个子任务:\n`);
+            subTasks.forEach((task, i) => {
+                console.log(`  ${i + 1}. ${task.title} (${task.priority}, ${task.assignedAgent})`);
+            });
+            console.log(`\n🎯 执行模式: ${executionMode}`);
+            console.log(`⏸️  等待计划审批 (ID: ${approval.id})`);
+        }
+        return;
+    }
+    // 无审批点，直接开始执行
+    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);
+        if (executionMode === 'auto') {
+            phaseExecutor.setAutoMode(true);
+        }
+    }
+    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
+            })),
+            taskInfo: {
+                title: tasksInput.title,
+                description: tasksInput.description,
+                quality: qualityLevel
+            }
+        }));
+    }
+    else {
+        console.log(`\n📋 ${tasksInput.title} - ${subTasks.length} 个子任务已创建`);
+        console.log(`🎯 执行模式: ${executionMode}`);
+        console.log(`   质量级别: ${qualityLevel}`);
+        console.log('\n🚀 开始执行...');
+        console.log('   使用 /om:status 查看进度');
+    }
+}
+/**
+ * 处理自动解析 (fallback，无 AI 时使用)
+ */
+async function handleAutoParse(input, options, stateManager, state) {
     // 构建任务内容
     let taskContent = input;
-    // 如果提供了 --title 和 --description，构建任务内容
     if (options.title || options.description) {
         const title = options.title || '未命名任务';
         const description = options.description || '';
@@ -111,9 +301,8 @@ exports.startCommand = new commander_1.Command('start')
         const docs = options.docs ? `\n文档要求: ${options.docs}` : '';
         taskContent = `# ${title}\n\n${description}${techStack}${docs}`;
     }
-    // 如果没有任务内容，尝试读取默认文件
     if (!taskContent) {
-        const defaultPath = path.join(basePath, 'TASK.md');
+        const defaultPath = path.join(process.cwd(), 'TASK.md');
         try {
             taskContent = await fs.readFile(defaultPath, 'utf-8');
             if (!options.json) {
@@ -122,34 +311,21 @@ exports.startCommand = new commander_1.Command('start')
         }
         catch {
             if (options.json) {
-                console.log(JSON.stringify({
-                    status: 'error',
-                    message: '请提供任务文件路径或描述'
-                }));
+                console.log(JSON.stringify({ status: 'error', message: '请提供任务文件路径或描述' }));
             }
             else {
                 console.log('❌ 请提供任务文件路径或描述');
-                console.log('   用法: openmatrix start <task.md>');
-                console.log('   或创建 TASK.md 文件');
-                console.log('   或使用 --title 和 --description 选项');
             }
             return;
         }
     }
     else if (taskContent.endsWith('.md')) {
-        // 读取文件
         try {
             taskContent = await fs.readFile(taskContent, 'utf-8');
-            if (!options.json) {
-                console.log(`📄 读取任务文件: ${input}`);
-            }
         }
         catch {
             if (options.json) {
-                console.log(JSON.stringify({
-                    status: 'error',
-                    message: `无法读取文件: ${input}`
-                }));
+                console.log(JSON.stringify({ status: 'error', message: `无法读取文件: ${input}` }));
             }
             else {
                 console.log(`❌ 无法读取文件: ${input}`);
@@ -157,7 +333,6 @@ exports.startCommand = new commander_1.Command('start')
             return;
         }
     }
-    // 解析任务
     if (!options.json) {
         console.log('\n🔍 解析任务...');
     }
@@ -167,50 +342,44 @@ exports.startCommand = new commander_1.Command('start')
         console.log(`\n📋 任务: ${parsedTask.title}`);
         console.log(`   目标: ${parsedTask.goals.join(', ')}`);
     }
-    // 拆解任务
     if (!options.json) {
         console.log('\n🔧 拆解任务...');
     }
+    let qualityConfig;
+    if (options.quality) {
+        const qualityLevel = options.quality.toLowerCase();
+        if (['strict', 'balanced', 'fast'].includes(qualityLevel)) {
+            qualityConfig = index_js_1.QUALITY_PRESETS[qualityLevel];
+        }
+    }
     const planner = new task_planner_js_1.TaskPlanner();
-    const subTasks = planner.breakdown(parsedTask, {});
-    // 创建任务到状态管理器
+    const subTasks = planner.breakdown(parsedTask, {}, qualityConfig);
+    // 创建任务，并建立 TaskPlanner ID → StateManager ID 的映射
+    const taskIdMap = new Map();
     for (const subTask of subTasks) {
-        await stateManager.createTask({
+        const created = await stateManager.createTask({
             title: subTask.title,
             description: subTask.description,
             priority: subTask.priority,
             timeout: subTask.estimatedComplexity === 'high' ? 300000 :
                 subTask.estimatedComplexity === 'medium' ? 180000 : 120000,
-            dependencies: subTask.dependencies,
+            dependencies: [],
             assignedAgent: subTask.assignedAgent
         });
+        taskIdMap.set(subTask.taskId, created.id);
     }
-    // 确定执行模式
-    const executionMode = options.mode || 'confirm-key';
-    let approvalPoints = [];
-    // 根据模式设置审批点
-    switch (executionMode) {
-        case 'confirm-all':
-            approvalPoints = ['plan', 'phase', 'merge', 'deploy'];
-            break;
-        case 'confirm-key':
-            approvalPoints = ['plan', 'merge', 'deploy'];
-            break;
-        case 'auto':
-            approvalPoints = [];
-            break;
-        default:
-            approvalPoints = ['plan', 'merge'];
-    }
-    // 处理质量配置
-    let qualityConfig;
-    if (options.quality) {
-        const qualityLevel = options.quality.toLowerCase();
-        if (['strict', 'balanced', 'fast'].includes(qualityLevel)) {
-            qualityConfig = index_js_1.QUALITY_PRESETS[qualityLevel];
+    // 映射并更新依赖关系
+    for (const subTask of subTasks) {
+        const actualId = taskIdMap.get(subTask.taskId);
+        const resolvedDeps = subTask.dependencies
+            .map(dep => taskIdMap.get(dep))
+            .filter((id) => id !== undefined);
+        if (resolvedDeps.length > 0) {
+            await stateManager.updateTask(actualId, { dependencies: resolvedDeps });
         }
     }
-    // 更新状态
+    const executionMode = options.mode || 'confirm-key';
+    const approvalPoints = resolveApprovalPoints(executionMode);
     await stateManager.updateState({
         status: 'running',
         currentPhase: 'execution',
@@ -220,7 +389,6 @@ exports.startCommand = new commander_1.Command('start')
             quality: qualityConfig || state.config.quality
         }
     });
-    // 创建审批请求（如果有审批点）
     const approvalManager = new approval_manager_js_1.ApprovalManager(stateManager);
     if (approvalPoints.includes('plan')) {
         const approval = await approvalManager.createPlanApproval('plan-approval', `# 执行计划\n\n${subTasks.map((t, i) => `${i + 1}. ${t.title}`).join('\n')}`);
@@ -231,12 +399,7 @@ exports.startCommand = new commander_1.Command('start')
                 approvalId: approval.id,
                 approvalType: 'plan',
                 message: '等待计划审批',
-                tasks: subTasks.map((t, i) => ({
-                    index: i + 1,
-                    title: t.title,
-                    priority: t.priority
-                })),
-                // 额外信息供 Skill 使用
+                tasks: subTasks.map((t, i) => ({ index: i + 1, title: t.title, priority: t.priority })),
                 taskInfo: {
                     title: options.title || parsedTask.title,
                     description: options.description,
@@ -252,25 +415,14 @@ exports.startCommand = new commander_1.Command('start')
                 console.log(`  ${i + 1}. ${task.title} (${task.priority})`);
             });
             console.log(`\n🎯 执行模式: ${executionMode}`);
-            console.log(`   审批点: ${approvalPoints.join(', ')}`);
-            if (options.quality) {
-                console.log(`   质量级别: ${options.quality}`);
-            }
-            if (options.techStack) {
-                console.log(`   技术栈: ${options.techStack}`);
-            }
-            console.log(`\n⏸️  等待计划审批`);
-            console.log(`   审批ID: ${approval.id}`);
-            console.log(`   使用 /om:approve ${approval.id} 审批`);
+            console.log(`⏸️  等待计划审批 (ID: ${approval.id})`);
         }
         return;
     }
-    // 创建执行器并获取第一批任务
     const executor = new executor_js_1.OrchestratorExecutor(stateManager, approvalManager, {
         maxConcurrent: state.config.maxConcurrentAgents,
         taskTimeout: state.config.timeout * 1000
     });
-    // 设置 PhaseExecutor 的自动模式和 RunId
     const phaseExecutor = executor.getPhaseExecutor();
     if (phaseExecutor) {
         phaseExecutor.setRunId(state.runId);
@@ -280,7 +432,6 @@ exports.startCommand = new commander_1.Command('start')
     }
     const result = await executor.step();
     if (options.json) {
-        // JSON 输出供 Skill 解析
         console.log(JSON.stringify({
             status: result.status,
             message: result.message,
@@ -294,7 +445,6 @@ exports.startCommand = new commander_1.Command('start')
                 agentType: t.agentType,
                 timeout: t.timeout
             })),
-            // 额外信息供 Skill 使用
             taskInfo: {
                 title: options.title || parsedTask.title,
                 description: options.description,
@@ -305,19 +455,20 @@ exports.startCommand = new commander_1.Command('start')
         }));
     }
     else {
-        console.log(`\n📋 生成 ${subTasks.length} 个子任务:\n`);
-        subTasks.forEach((task, i) => {
-            console.log(`  ${i + 1}. ${task.title} (${task.priority})`);
-        });
-        console.log(`\n🎯 执行模式: ${executionMode}`);
-        console.log(`   审批点: ${approvalPoints.length > 0 ? approvalPoints.join(', ') : '无 (全自动)'}`);
-        if (options.quality) {
-            console.log(`   质量级别: ${options.quality}`);
-        }
-        if (options.techStack) {
-            console.log(`   技术栈: ${options.techStack}`);
-        }
+        console.log(`\n📋 生成 ${subTasks.length} 个子任务`);
+        console.log(`🎯 执行模式: ${executionMode}`);
         console.log('\n🚀 开始执行...');
         console.log('   使用 /om:status 查看进度');
     }
-});
+}
+/**
+ * 根据执行模式解析审批点
+ */
+function resolveApprovalPoints(mode) {
+    switch (mode) {
+        case 'confirm-all': return ['plan', 'phase', 'merge', 'deploy'];
+        case 'confirm-key': return ['plan', 'merge', 'deploy'];
+        case 'auto': return [];
+        default: return ['plan', 'merge'];
+    }
+}

package/dist/orchestrator/executor.d.ts

@@ -1,5 +1,6 @@
 import { Scheduler } from './scheduler.js';
-import { AgentRunner, type SubagentTask } from '../agents/agent-runner.js';
+import { AgentRunner } from '../agents/agent-runner.js';
+import type { SubagentTask } from '../types/index.js';
 import { StateManager } from '../storage/state-manager.js';
 import { ApprovalManager } from './approval-manager.js';
 import { PhaseExecutor } from './phase-executor.js';

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

@@ -1,6 +1,7 @@
 import { StateManager } from '../storage/state-manager.js';
 import { ApprovalManager } from './approval-manager.js';
-import { AgentRunner, type SubagentTask, type UserContext } from '../agents/agent-runner.js';
+import { AgentRunner, type UserContext } from '../agents/agent-runner.js';
+import type { SubagentTask } from '../types/index.js';
 import { GitCommitManager } from './git-commit-manager.js';
 import type { Task, QualityConfig, QualityReport } from '../types/index.js';
 export type Phase = 'develop' | 'verify' | 'accept' | 'tdd';