speccore 5.70.0 → 5.74.0

package/dist/commands/execute.js

@@ -42,15 +42,30 @@ const child_process_1 = require("child_process");
 const logger_1 = require("../utils/logger");
 const context_1 = require("../core/context");
 const state_1 = require("../core/state");
+const resolver_1 = require("../core/resolver");
 const transaction_1 = require("../core/transaction");
 const spec_rules_1 = require("../core/spec-rules");
 const operation_log_1 = require("../core/operation-log");
 const next_steps_1 = require("../core/next-steps");
 const question_checklist_1 = require("../core/question-checklist");
 const plan_store_1 = require("../core/plan-store");
+const plan_1 = require("./plan");
+const plan_html_1 = require("../core/plan-html");
+const retro_1 = require("./retro");
+const package_json_1 = require("../../package.json");
 const execution_state_1 = require("../core/execution-state");
 const git_integration_1 = require("../core/git-integration");
 const prompt_builder_1 = require("../core/prompt-builder");
+const verify_engine_1 = require("../core/verify-engine");
+const unified_config_1 = require("../core/unified-config");
+/**
+ * 解析任务目录路径：优先 030-tasks/，兼容旧布局（迭代根目录）
+ */
+async function resolveTaskDir(iterDir, taskId) {
+    const tasksDir = (0, path_1.join)(iterDir, '030-tasks');
+    const base = (await (0, fs_extra_1.pathExists)(tasksDir)) ? tasksDir : iterDir;
+    return taskId ? (0, path_1.join)(base, taskId) : base;
+}
 async function executeCommand(options) {
     try {
         const iteration = await (0, context_1.getDefaultIteration)(options.iteration);
@@ -80,19 +95,24 @@ async function executeCommand(options) {
         }
         // Apply filters
         if (options.task) {
-            // Support both exact match and prefix match (Task-001 → Task-001-用户登录)
-            const filtered = tasks.filter(t => t.id === options.task);
-            if (filtered.length > 0) {
-                tasks = filtered;
+            // 使用统一 resolver 解析任务名（支持短名、关键词、前缀匹配）
+            const taskResult = await (0, resolver_1.resolveTask)(options.task, iteration);
+            if (taskResult.exact && taskResult.value) {
+                if (taskResult.matchType !== 'exact') {
+                    const hint = (0, resolver_1.formatResolveResult)(taskResult, 'Task');
+                    if (hint)
+                        logger_1.logger.info(hint);
+                }
+                tasks = tasks.filter(t => t.id === taskResult.value.id);
+            }
+            else if (taskResult.candidates.length > 1) {
+                // 多候选时展示列表，让用户选择
+                logger_1.logger.warn(taskResult.hint || '找到多个匹配任务，请指定更精确的名称');
+                return;
             }
             else {
-                const prefixMatch = tasks.filter(t => t.id && t.id.startsWith(options.task));
-                if (prefixMatch.length > 0) {
-                    tasks = prefixMatch;
-                }
-                else {
-                    logger_1.logger.warn(`Task "${options.task}" not found. Available: ${tasks.map(t => t.id).join(', ')}`);
-                }
+                logger_1.logger.warn(taskResult.hint || `Task "${options.task}" not found`);
+                return;
             }
         }
         if (options.type)
@@ -113,6 +133,14 @@ async function executeCommand(options) {
             logger_1.logger.warn('No tasks match the specified filters');
             return;
         }
+        // ── --auto: 未指定任务时自动选择第一个待执行任务 ──
+        if (options.auto && !options.task && !options.all) {
+            const pendingTask = tasks.find(t => t.status === 'pending');
+            if (pendingTask) {
+                logger_1.logger.info(`🤖 Auto 模式: 自动选择 ${pendingTask.id}`);
+                tasks = tasks.filter(t => t.id === pendingTask.id);
+            }
+        }
         let sortedTasks = (0, state_1.topologicalSort)(tasks);
         // 检测并警告循环依赖
         const cycles = detectCycles(sortedTasks);
@@ -126,7 +154,7 @@ async function executeCommand(options) {
             : `Execute-${iteration}-${new Date().toISOString().slice(0, 16).replace('T', ' ')}`;
         const planTasks = sortedTasks.map(t => t.id);
         if (planTasks.length > 0) {
-            await (0, plan_store_1.savePlan)({
+            const saved = await (0, plan_store_1.savePlan)({
                 name: planName,
                 iteration,
                 tasks: planTasks,
@@ -141,6 +169,31 @@ async function executeCommand(options) {
                     frontend: options.frontend,
                 },
             });
+            // ── 多任务时自动生成 PLAN.md + HTML 可视化 ──
+            if (sortedTasks.length > 1) {
+                const iterDir = await (0, context_1.getIterationDir)(iteration);
+                const planDir = (0, path_1.join)(iterDir, '000-overview', 'plans');
+                await (0, fs_extra_1.ensureDir)(planDir);
+                const planEntries = (0, plan_1.generatePlan)(sortedTasks, parseInt(options.batchSize || '3', 10), 'auto');
+                const planMd = (0, plan_1.formatPlanMarkdown)(planEntries, iteration, sortedTasks);
+                // 写入 PLAN.md（最新版）
+                const latestPath = (0, path_1.join)(planDir, 'PLAN.md');
+                await (0, fs_extra_1.writeFile)(latestPath, planMd, 'utf-8');
+                // 写入带时间戳的版本
+                const ts = new Date().toISOString().replace(/T/, '-').replace(/:/g, '').slice(0, 17);
+                const versionedPath = (0, path_1.join)(planDir, `PLAN-${ts}-auto.md`);
+                await (0, fs_extra_1.writeFile)(versionedPath, planMd, 'utf-8');
+                // 生成 HTML 可视化
+                const htmlData = sortedTasks.map(t => ({
+                    id: t.id, name: t.name, priority: t.priority, status: t.status,
+                    owner: t.assignee || undefined, dependsOn: t.dependencies || [],
+                }));
+                const html = (0, plan_html_1.generatePlanHtml)(htmlData, { version: package_json_1.version, iteration, planName });
+                const htmlPath = (0, path_1.join)(planDir, 'speccore-plan.html');
+                await (0, fs_extra_1.writeFile)(htmlPath, html, 'utf-8');
+                logger_1.logger.info(`📝 计划已生成: ${planDir}/PLAN.md`);
+                logger_1.logger.info(`📊 可视化: ${htmlPath}`);
+            }
         }
         // === Interactive mode ===
         if (options.interactive) {
@@ -150,9 +203,9 @@ async function executeCommand(options) {
         // === 显示执行计划 ===
         const batchSize = parseInt(options.batchSize || '3', 10);
         printExecutionPreview(sortedTasks, iteration, batchSize);
-        // === Preview (default, unless --force) ===
-        if (!options.force) {
-            logger_1.logger.info('💡 使用 --force 直接执行，或 --interactive 选择执行');
+        // === Preview (default, unless --force or --auto) ===
+        if (!options.force && !options.auto) {
+            logger_1.logger.info('💡 使用 --force 或 --auto 直接执行，或 --interactive 选择执行');
             return;
         }
         logger_1.logger.info('🚀 开始执行...\n');
@@ -303,29 +356,11 @@ async function executeWithProgress(tasks, iteration, base, skip, options) {
         logger_1.logger.info('  ✅ 没有需要执行的任务');
         return;
     }
-    // Create branches for each task (dependency-aware)
-    if (tasks.length > 0) {
-        let defaultBase = base || (0, git_integration_1.detectDefaultBranch)(iteration);
-        for (const task of tasks) {
-            let taskBase = base;
-            // Auto-detect dependency per task from IMPACT.md
-            if (!taskBase) {
-                taskBase = await detectDependencyBase(iteration, task.id);
-            }
-            const branch = (0, git_integration_1.createTaskBranch)(task.id, task.name || task.id, taskBase, iteration);
-            if (branch) {
-                const baseInfo = taskBase ? ` (from ${taskBase})` : ` (from ${defaultBase || 'HEAD'})`;
-                logger_1.logger.info(`🌿 ${task.id}: ${branch}${baseInfo}`);
-            }
-            // 切回基础分支，避免下个任务从上个任务分支上拉代码
-            if (defaultBase) {
-                try {
-                    (0, child_process_1.execSync)(`git checkout "${defaultBase}"`, { stdio: 'pipe' });
-                }
-                catch { }
-            }
-        }
-    }
+    // ── 分支策略：懒创建 + 依赖合并 ──
+    // 每个任务的分支在执行前才创建，确保依赖任务的代码已存在
+    // 有依赖的任务会 merge 依赖分支，拿到前序任务的代码
+    const defaultBase = base || (0, git_integration_1.detectDefaultBranch)(iteration);
+    const createdBranches = new Map(); // taskId → branchName
     // ── Agent mode: output optimized context for external AI ──
     if (options?.agent) {
         const agentCtx = buildAgentContext(tasks, options.agent);
@@ -348,6 +383,11 @@ async function executeWithProgress(tasks, iteration, base, skip, options) {
         // Report current batch
         logger_1.logger.info(`[${String(i + 1).padStart(2, '0')}/${total}] ${bar} ${progress}%`);
         logger_1.logger.info(`  🔄 ${task.id} ${task.name || ''} (${task.type || 'feature'})`);
+        // ── 懒创建分支 + 合并依赖 ──
+        const branchName = prepareTaskBranch(task, iteration, defaultBase, createdBranches);
+        if (branchName) {
+            logger_1.logger.info(`  🌿 ${task.id}: ${branchName}`);
+        }
         await generateTaskSkeleton(task, iteration);
         completed.push(`${task.id} - ${task.name || ''}`);
         logger_1.logger.info(`  ✅ ${task.id} completed`);
@@ -377,6 +417,74 @@ async function executeWithProgress(tasks, iteration, base, skip, options) {
     const postQs = await (0, question_checklist_1.extractQuestions)(await (0, context_1.getIterationDir)(iteration));
     if (postQs.length > 0)
         (0, question_checklist_1.showQuestionChecklist)(postQs, '执行后审查');
+    // 自动生成任务回顾报告
+    const iterDirForRetro = await (0, context_1.getIterationDir)(iteration);
+    for (const task of tasks) {
+        try {
+            await (0, retro_1.generateReport)(task.id, iterDirForRetro);
+            logger_1.logger.info(`  📝 回顾报告已生成: ${task.id}/RETRO.md`);
+        }
+        catch { }
+    }
+    // ── 强制质量门禁：execute 后自动运行，不可跳过 ──
+    // 设计：编译失败时输出 [SPECCORE_EXEC] 标签，由外部 Skill 编排重新执行（最多 3 轮）
+    // 每轮独立运行门禁，轮次状态通过 .verify-state.json 持久化
+    {
+        const config = await (0, unified_config_1.loadConfig)();
+        const codePath = config.code_scope?.[0] || process.cwd();
+        const absCodePath = codePath.startsWith('/') ? codePath : (0, path_1.join)(process.cwd(), codePath);
+        for (const task of tasks) {
+            const taskDir = (0, path_1.join)(iterDirForRetro, '030-tasks', task.id);
+            const taskCodePath = (await (0, fs_extra_1.pathExists)((0, path_1.join)(taskDir, 'code'))) ? (0, path_1.join)(taskDir, 'code') : absCodePath;
+            // 读取上一轮修复状态（如果有）
+            const statePath = (0, path_1.join)(taskDir, '99-artifacts', '.verify-state.json');
+            let currentRound = 1;
+            if (await (0, fs_extra_1.pathExists)(statePath)) {
+                try {
+                    const state = JSON.parse(await (0, fs_extra_1.readFile)(statePath, 'utf-8'));
+                    currentRound = (state.round || 0) + 1;
+                }
+                catch { }
+            }
+            const gate = await (0, verify_engine_1.runQualityGate)(task.id, taskCodePath, taskDir);
+            if (gate.passed) {
+                if (currentRound > 1)
+                    logger_1.logger.info(`  ✅ ${task.id}: 第 ${currentRound} 轮修复后通过`);
+                // 清除轮次状态
+                if (await (0, fs_extra_1.pathExists)(statePath)) {
+                    const { unlink } = await Promise.resolve().then(() => __importStar(require('fs/promises')));
+                    try {
+                        await unlink(statePath);
+                    }
+                    catch { }
+                }
+            }
+            else {
+                // 有阻塞性失败
+                logger_1.logger.warn(`  ❌ ${task.id}: 第 ${currentRound} 轮质量门禁未通过`);
+                for (const f of gate.blockingFailed) {
+                    logger_1.logger.warn(`     ❌ ${f.name}: ${f.details}`);
+                }
+                const MAX_ROUNDS = 3;
+                if (currentRound < MAX_ROUNDS) {
+                    // 保存轮次状态 + 输出 [SPECCORE_EXEC] 让 AI 修复
+                    const { ensureDir } = await Promise.resolve().then(() => __importStar(require('fs-extra')));
+                    await ensureDir((0, path_1.join)(taskDir, '99-artifacts'));
+                    await (0, fs_extra_1.writeFile)(statePath, JSON.stringify({ round: currentRound, taskId: task.id, timestamp: new Date().toISOString() }));
+                    logger_1.logger.info(`     🤖 请求 AI 修复（第 ${currentRound}/${MAX_ROUNDS} 轮）...`);
+                    (0, verify_engine_1.outputFixTag)(gate.report, taskDir, currentRound);
+                }
+                else {
+                    // 3 轮都失败
+                    logger_1.logger.error(`  💀 ${task.id}: ${MAX_ROUNDS} 轮修复后质量门禁仍未通过`);
+                    logger_1.logger.info(`     📄 报告: ${(0, path_1.join)(taskDir, '99-artifacts', 'VERIFY_REPORT.md')}`);
+                    logger_1.logger.info(`     💡 请人工检查并修复`);
+                }
+            }
+            // 输出非阻塞警告
+            // （质量门禁内部已经打印了，这里不需要重复）
+        }
+    }
     (0, operation_log_1.logOperation)('speccore execute done', `completed ${total} tasks in ${totalElapsed}s`);
 }
 // ============================================================
@@ -404,6 +512,17 @@ async function executeResume(iteration) {
         state = (0, execution_state_1.loadExecutionState)();
     }
     logger_1.logger.success('All batches completed!');
+    // 自动生成任务回顾报告
+    const iterDirForRetro = await (0, context_1.getIterationDir)(iteration);
+    for (const taskId of state.completedTasks) {
+        try {
+            await (0, retro_1.generateReport)(taskId, iterDirForRetro);
+        }
+        catch { }
+    }
+    if (state.completedTasks.length > 0) {
+        logger_1.logger.info(`📝 已生成 ${state.completedTasks.length} 份回顾报告`);
+    }
     (0, execution_state_1.clearExecutionState)();
 }
 // ============================================================
@@ -433,6 +552,15 @@ async function executeBatchMode(tasks, iteration, batchSize, options) {
     }
     logger_1.logger.success('All batches completed!');
     (0, operation_log_1.logOperation)('speccore execute --batch-size', `${tasks.length} tasks in ${state.totalBatches} batches`);
+    // 自动生成任务回顾报告
+    const iterDirForRetro = await (0, context_1.getIterationDir)(iteration);
+    for (const task of tasks) {
+        try {
+            await (0, retro_1.generateReport)(task.id, iterDirForRetro);
+        }
+        catch { }
+    }
+    logger_1.logger.info(`📝 已生成 ${tasks.length} 份回顾报告`);
     (0, execution_state_1.clearExecutionState)();
 }
 // ============================================================
@@ -457,7 +585,7 @@ async function processBatch(tasks, state, iteration) {
     for (const task of tasks) {
         logger_1.logger.info(`   ${task.id}:`);
         for (const f of ['REQ.md', 'TECH.md', 'TASK.md']) {
-            const p = (0, path_1.join)(iterDir, task.id, 'backend', f);
+            const p = (0, path_1.join)(await resolveTaskDir(iterDir), task.id, '00-specs', f);
             if (await (0, fs_extra_1.pathExists)(p)) {
                 const content = await (0, fs_extra_1.readFile)(p, 'utf-8');
                 const summary = content.slice(0, 80).replace(/\n/g, ' ');
@@ -526,7 +654,7 @@ function printExecutionPreview(tasks, iteration, batchSize = 3) {
 // Task execution (transaction protected)
 // ============================================================
 async function generateTaskSkeleton(task, iteration) {
-    const taskDir = (0, path_1.join)(await (0, context_1.getIterationDir)(iteration), task.id);
+    const taskDir = await resolveTaskDir(await (0, context_1.getIterationDir)(iteration), task.id);
     let filesUpdated = 0;
     if (await (0, fs_extra_1.pathExists)(taskDir)) {
         const tx = new transaction_1.FileTransaction();
@@ -535,9 +663,9 @@ async function generateTaskSkeleton(task, iteration) {
         const techStack = await (0, spec_rules_1.loadTechStack)();
         logger_1.logger.info(`   Tech Stack: ${techStack.backendFramework} + ${techStack.frontendFramework}`);
         // 读取后端 Spec 生成代码骨架
-        const backendDir = (0, path_1.join)(taskDir, 'backend');
+        const backendDir = (0, path_1.join)(taskDir, '10-backend');
         if (await (0, fs_extra_1.pathExists)(backendDir)) {
-            const reqPath = (0, path_1.join)(backendDir, 'REQ.md');
+            const reqPath = (0, path_1.join)(taskDir, '00-specs', 'REQ.md');
             let className = convertToClassName(task.name || task.id);
             // 从 CONSTITUTION.md 读取包名，回退到默认值
             let packageName = `com.example.${className.toLowerCase()}`;
@@ -549,26 +677,28 @@ async function generateTaskSkeleton(task, iteration) {
                     packageName = `${pkgMatch[1]}.${className.toLowerCase()}`;
                 }
             }
+            const srcDir = (0, path_1.join)(backendDir, 'src');
+            await (0, fs_extra_1.ensureDir)(srcDir);
             // 生成 Controller 骨架
             if (await (0, fs_extra_1.pathExists)(reqPath)) {
                 const req = await (0, fs_extra_1.readFile)(reqPath, 'utf-8');
                 const controllerCode = generateJavaController(className, packageName, req, specRules);
-                const ctrlPath = (0, path_1.join)(backendDir, `${className}Controller.java`);
+                const ctrlPath = (0, path_1.join)(srcDir, `${className}Controller.java`);
                 tx.write(ctrlPath, controllerCode);
                 filesUpdated++;
             }
             // 生成 Service 骨架
             const serviceCode = generateJavaService(className, packageName);
-            const svcPath = (0, path_1.join)(backendDir, `${className}Service.java`);
+            const svcPath = (0, path_1.join)(srcDir, `${className}Service.java`);
             tx.write(svcPath, serviceCode);
             filesUpdated++;
             // 生成 Repository 骨架
             const repoCode = generateJavaRepository(className, packageName);
-            const repoPath = (0, path_1.join)(backendDir, `${className}Repository.java`);
+            const repoPath = (0, path_1.join)(srcDir, `${className}Repository.java`);
             tx.write(repoPath, repoCode);
             filesUpdated++;
             // 更新 TASK.md 状态
-            const taskMdPath = (0, path_1.join)(backendDir, 'TASK.md');
+            const taskMdPath = (0, path_1.join)(taskDir, '00-specs', 'TASK.md');
             if (await (0, fs_extra_1.pathExists)(taskMdPath)) {
                 const content = await (0, fs_extra_1.readFile)(taskMdPath, 'utf-8');
                 const updated = content.replace('状态: 🔲 待开发', '状态: 🔄 进行中');
@@ -577,7 +707,7 @@ async function generateTaskSkeleton(task, iteration) {
             }
         }
         // 前端各平台代码生成
-        const frontendDir = (0, path_1.join)(taskDir, 'frontend');
+        const frontendDir = (0, path_1.join)(taskDir, '20-frontend');
         if (await (0, fs_extra_1.pathExists)(frontendDir)) {
             const { readdir: rd } = await Promise.resolve().then(() => __importStar(require('fs-extra')));
             const platformDirs = await rd(frontendDir, { withFileTypes: true });
@@ -585,7 +715,9 @@ async function generateTaskSkeleton(task, iteration) {
                 if (pd.isDirectory()) {
                     const componentName = convertToClassName(task.name || task.id);
                     const vueCode = generateVueComponent(componentName);
-                    const vuePath = (0, path_1.join)(frontendDir, pd.name, `${componentName}.vue`);
+                    const srcDir = (0, path_1.join)(frontendDir, pd.name, 'src');
+                    await (0, fs_extra_1.ensureDir)(srcDir);
+                    const vuePath = (0, path_1.join)(srcDir, `${componentName}.vue`);
                     tx.write(vuePath, vueCode);
                     filesUpdated++;
                     const ftaskPath = (0, path_1.join)(frontendDir, pd.name, 'TASK.md');
@@ -782,7 +914,7 @@ async function filterByPlatform(tasks, iteration, platform) {
     const filtered = [];
     const iterDir = await (0, context_1.getIterationDir)(iteration);
     for (const task of tasks) {
-        const platformDir = (0, path_1.join)(iterDir, task.id, 'frontend', platform);
+        const platformDir = (0, path_1.join)(await resolveTaskDir(iterDir), task.id, 'frontend', platform);
         if (await (0, fs_extra_1.pathExists)(platformDir))
             filtered.push(task);
     }
@@ -826,11 +958,11 @@ async function preFlightCheck(tasks, iteration, options) {
     logger_1.logger.info('╚══════════════════════════════════════════════╝\n');
     const approved = [];
     for (const task of tasks) {
-        const taskDir = (0, path_1.join)(iterDir, '030-tasks', task.id);
+        const taskDir = await resolveTaskDir(iterDir, task.id);
         logger_1.logger.info(`\n── ${task.id} ──`);
         let issues = [];
         // 1. Requirement completeness
-        const reqPath = (0, path_1.join)(taskDir, 'backend', 'REQ.md');
+        const reqPath = (0, path_1.join)(taskDir, '00-specs', 'REQ.md');
         if (await (0, fs_extra_1.pathExists)(reqPath)) {
             const req = await (0, fs_extra_1.readFile)(reqPath, 'utf-8');
             const sections = (req.match(/^###?\s+.+/gm) || []).length;
@@ -843,7 +975,7 @@ async function preFlightCheck(tasks, iteration, options) {
             issues.push('缺少 REQ.md');
         }
         // 2. Tech plan
-        const techPath = (0, path_1.join)(taskDir, 'backend', 'TECH.md');
+        const techPath = (0, path_1.join)(taskDir, '00-specs', 'TECH.md');
         if (await (0, fs_extra_1.pathExists)(techPath)) {
             const tech = await (0, fs_extra_1.readFile)(techPath, 'utf-8');
             const s = [tech.includes('数据库') && 'DB', tech.includes('Redis') && 'Redis', tech.includes('MQ') && 'MQ'].filter(Boolean).join('/');
@@ -853,18 +985,18 @@ async function preFlightCheck(tasks, iteration, options) {
             issues.push('缺少 TECH.md');
         }
         // 3. Test cases
-        const testPath = (0, path_1.join)(taskDir, 'backend', 'TEST.md');
+        const testPath = (0, path_1.join)(taskDir, '99-artifacts', 'TEST.md');
         if (await (0, fs_extra_1.pathExists)(testPath)) {
             const test = await (0, fs_extra_1.readFile)(testPath, 'utf-8');
             const n = (test.match(/⬜|✅|❌/g) || []).length;
             logger_1.logger.info(`  3. 测试: ${n} 用例`);
         }
         // 4. Review
-        logger_1.logger.info(`  4. 审查: ${await (0, fs_extra_1.pathExists)((0, path_1.join)(taskDir, 'backend', 'REVIEW.md')) ? '✅' : '❌'}`);
+        logger_1.logger.info(`  4. 审查: ${await (0, fs_extra_1.pathExists)((0, path_1.join)(taskDir, '99-artifacts', 'REVIEW.md')) ? '✅' : '❌'}`);
         // 5. API
         logger_1.logger.info(`  5. 契约: ${await (0, fs_extra_1.pathExists)((0, path_1.join)(taskDir, '_shared', 'API_CONTRACT.yaml')) ? '✅' : '⚠️'}`);
         // 6. Platform
-        const fd = (0, path_1.join)(taskDir, 'frontend');
+        const fd = (0, path_1.join)(taskDir, '20-frontend');
         if (await (0, fs_extra_1.pathExists)(fd)) {
             const pf = (0, fs_1.readdirSync)(fd, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
             logger_1.logger.info(`  6. 端: ${pf.join(', ')}`);
@@ -920,6 +1052,65 @@ async function preFlightCheck(tasks, iteration, options) {
     logger_1.logger.info('\n✅ 开始执行...\n');
     return approved;
 }
+/**
+ * 懒创建任务分支 + 合并依赖分支
+ * 每个任务的分支在执行前才创建，确保依赖任务的代码已存在
+ */
+function prepareTaskBranch(task, iteration, defaultBase, createdBranches) {
+    const base = defaultBase || 'HEAD';
+    // 1. 切回 base 分支（允许从保护分支拉分支，但 hook 会阻止直接 commit）
+    if (defaultBase && (0, git_integration_1.isProtectedBranch)(defaultBase)) {
+        logger_1.logger.info(`  ℹ️ base 分支 '${defaultBase}' 受保护，任务分支将独立工作`);
+    }
+    try {
+        (0, child_process_1.execSync)(`git checkout "${base}"`, { stdio: 'pipe' });
+    }
+    catch {
+        // base 分支不存在时从 HEAD 创建
+        try {
+            (0, child_process_1.execSync)('git checkout -', { stdio: 'pipe' });
+        }
+        catch { }
+    }
+    // 2. 创建任务分支
+    const branch = (0, git_integration_1.createTaskBranch)(task.id, task.name || task.id, undefined, iteration);
+    if (!branch)
+        return null;
+    createdBranches.set(task.id, branch);
+    // 3. 检测依赖并合并
+    // 同步方式检测 IMPACT.md 中的依赖
+    let depTaskIds = [];
+    const impactPath = (0, path_1.join)(`Iteration-${iteration}`, 'IMPACT.md');
+    try {
+        if (require('fs').existsSync(impactPath)) {
+            const impact = require('fs').readFileSync(impactPath, 'utf-8');
+            for (const line of impact.split('\n')) {
+                if (line.includes('→') && line.includes(task.id)) {
+                    const match = line.match(/→\s*\|\s*([^|]+)/);
+                    if (match) {
+                        const depId = match[1].trim().split(':')[0].trim();
+                        depTaskIds.push(depId);
+                    }
+                }
+            }
+        }
+    }
+    catch { }
+    // 合并已完成的依赖任务分支
+    for (const depId of depTaskIds) {
+        const depBranch = createdBranches.get(depId);
+        if (depBranch) {
+            try {
+                (0, child_process_1.execSync)(`git merge "${depBranch}" --no-edit --no-ff`, { stdio: 'pipe' });
+                logger_1.logger.info(`  🔗 合并依赖分支: ${depBranch}`);
+            }
+            catch (e) {
+                logger_1.logger.warn(`  ⚠️ 合并 ${depBranch} 冲突，需要手动解决`);
+            }
+        }
+    }
+    return branch;
+}
 /**
  * 从 IMPACT.md 检测任务依赖，返回应作为 base 的依赖任务 ID
  */
@@ -975,17 +1166,17 @@ function buildAgentContext(tasks, agent) {
         ctx += `Status: ${task.status} | Priority: ${task.priority} | Type: ${task.type}\n\n`;
         // Progressive loading order
         ctx += `**Read in this order (progressive disclosure):**\n`;
-        ctx += `1. \`Iteration-*/${task.id}/backend/TASK.md\` — task overview + deliverables checklist\n`;
-        ctx += `2. \`Iteration-*/${task.id}/backend/REQ.md\` — requirements + acceptance criteria\n`;
-        ctx += `3. \`Iteration-*/${task.id}/backend/TECH.md\` — tech design + architecture\n`;
+        ctx += `1. \`Iteration-*/${task.id}/00-specs/TASK.md\` — task overview + deliverables checklist\n`;
+        ctx += `2. \`Iteration-*/${task.id}/00-specs/REQ.md\` — requirements + acceptance criteria\n`;
+        ctx += `3. \`Iteration-*/${task.id}/00-specs/TECH.md\` — tech design + architecture\n`;
         ctx += `4. \`Iteration-*/${task.id}/_shared/API_CONTRACT.yaml\` — API contract (if exists)\n\n`;
         ctx += `**Supplementary (read only if needed):**\n`;
-        ctx += `- TEST.md (test cases) | REVIEW.md (review checklist)\n`;
-        ctx += `- SCHEMA.md (DB schema) | ADR.md (arch decisions)\n`;
-        ctx += `- RISK.md (risks+rollback) | DEPS.md (dependencies) | MONITOR.md (monitoring)\n`;
-        ctx += `- ERROR_CODES.md (error codes) | DEPLOY.md (deployment)\n\n`;
+        ctx += `- 99-artifacts/TEST.md (test cases) | 99-artifacts/REVIEW.md (review checklist)\n`;
+        ctx += `- 00-specs/SCHEMA.md (DB schema) | 99-artifacts/ADR.md (arch decisions)\n`;
+        ctx += `- 99-artifacts/RISK.md (risks+rollback) | 99-artifacts/DEPS.md (dependencies) | 99-artifacts/MONITOR.md (monitoring)\n`;
+        ctx += `- 99-artifacts/ERROR_CODES.md (error codes) | 99-artifacts/DEPLOY.md (deployment)\n\n`;
         ctx += `**Frontend (if exists):**\n`;
-        ctx += `- frontend/{platform}/COMPONENT_TREE.md | ROUTES.md | STATE.md | STYLE_GUIDE.md\n\n`;
+        ctx += `- 20-20-frontend/{platform}/COMPONENT_TREE.md | ROUTES.md | STATE.md | STYLE_GUIDE.md\n\n`;
     }
     // 3. Global rules (load last, only if needed)
     ctx += `### Step N: Global rules (load last)\n`;
@@ -1003,15 +1194,14 @@ async function executionVerifyLoop(tasks, iteration, options) {
     const iterDir = await (0, context_1.getIterationDir)(iteration);
     for (const task of tasks) {
         logger_1.logger.info(`\n🔍 验证 ${task.id}...`);
-        const taskDir = (0, path_1.join)(iterDir, '030-tasks', task.id);
-        const backendDir = (0, path_1.join)(taskDir, 'backend');
+        const taskDir = await resolveTaskDir(iterDir, task.id);
         let allPassed = true;
         for (let round = 1; round <= maxRounds; round++) {
             if (round > 1)
                 logger_1.logger.info(`   🔄 第 ${round} 轮修复...`);
             allPassed = true;
             // 1. 检查 TEST.md
-            const testPath = (0, path_1.join)(backendDir, 'TEST.md');
+            const testPath = (0, path_1.join)(taskDir, '99-artifacts', 'TEST.md');
             if (await (0, fs_extra_1.pathExists)(testPath)) {
                 const testContent = await (0, fs_extra_1.readFile)(testPath, 'utf-8');
                 const total = (testContent.match(/\[[ x]\]/g) || []).length;
@@ -1028,7 +1218,7 @@ async function executionVerifyLoop(tasks, iteration, options) {
                 }
             }
             // 2. 检查 REVIEW.md
-            const reviewPath = (0, path_1.join)(backendDir, 'REVIEW.md');
+            const reviewPath = (0, path_1.join)(taskDir, '99-artifacts', 'REVIEW.md');
             if (await (0, fs_extra_1.pathExists)(reviewPath)) {
                 const reviewContent = await (0, fs_extra_1.readFile)(reviewPath, 'utf-8');
                 const total = (reviewContent.match(/\[[ x]\]/g) || []).length;
@@ -1045,7 +1235,7 @@ async function executionVerifyLoop(tasks, iteration, options) {
                 }
             }
             // 3. 检查 DEPLOY.md
-            const deployPath = (0, path_1.join)(backendDir, 'DEPLOY.md');
+            const deployPath = (0, path_1.join)(taskDir, '99-artifacts', 'DEPLOY.md');
             if (await (0, fs_extra_1.pathExists)(deployPath)) {
                 const depContent = await (0, fs_extra_1.readFile)(deployPath, 'utf-8');
                 const total = (depContent.match(/\[[ x]\]/g) || []).length;
@@ -1127,7 +1317,9 @@ async function runPromptMode(iteration, options) {
     const task = options.task || '';
     // ── 缺参数检测 ──
     if (!task) {
-        const taskDir = (0, path_1.join)(await (0, context_1.getIterationDir)(iteration), '030-tasks');
+        const iterDir = await (0, context_1.getIterationDir)(iteration);
+        const tasksDir30 = (0, path_1.join)(iterDir, '030-tasks');
+        const taskDir = (await (0, fs_extra_1.pathExists)(tasksDir30)) ? tasksDir30 : iterDir;
         let availableTasks = [];
         try {
             const entries = await (0, fs_extra_1.readdir)(taskDir, { withFileTypes: true });
@@ -1143,15 +1335,18 @@ async function runPromptMode(iteration, options) {
         });
         return;
     }
-    const taskDir = (0, path_1.join)(await (0, context_1.getIterationDir)(iteration), '030-tasks', task);
+    const taskDir = await resolveTaskDir(await (0, context_1.getIterationDir)(iteration), task);
     // ── 前置检查：任务必须有有效需求或分析内容 ──
-    const analysisFile = (0, path_1.join)(taskDir, 'ANALYSIS.md');
-    const requirementFile = (0, path_1.join)(taskDir, 'REQUIREMENT.md');
-    // 读取文件内容验证有效性（接受 ANALYSIS.md 或 REQUIREMENT.md）
-    // Bug 任务的 REQUIREMENT.md（问题描述）本身就可以作为AI生成代码的依据
+    // 优先检查 00-specs/（新路径），兼容旧路径（Task 根目录）
+    const analysisFile = (0, path_1.join)(taskDir, '00-specs', 'ANALYSIS.md');
+    const requirementFile = (0, path_1.join)(taskDir, '00-specs', 'REQ.md');
+    const legacyAnalysis = (0, path_1.join)(taskDir, 'ANALYSIS.md');
+    const legacyRequirement = (0, path_1.join)(taskDir, 'REQUIREMENT.md');
+    // 读取文件内容验证有效性（接受 ANALYSIS.md / REQ.md / REQUIREMENT.md）
+    // Bug 任务的 REQ.md（问题描述）本身就可以作为AI生成代码的依据
     let effectiveAnalysis = false;
     let contentPreview = '';
-    for (const f of [analysisFile, requirementFile]) {
+    for (const f of [analysisFile, requirementFile, legacyAnalysis, legacyRequirement]) {
         if (await (0, fs_extra_1.pathExists)(f)) {
             const content = (await (0, fs_extra_1.readFile)(f, 'utf-8')).trim();
             // 有效内容：>80字符 且 不是纯占位符
@@ -1165,7 +1360,7 @@ async function runPromptMode(iteration, options) {
         }
     }
     if (!effectiveAnalysis) {
-        const reason = `任务 ${task} 缺少有效的需求或分析内容\n（ANALYSIS.md / REQUIREMENT.md 不存在或内容无效）`;
+        const reason = `任务 ${task} 缺少有效的需求或分析内容\n（00-specs/ANALYSIS.md 或 00-specs/REQ.md 不存在或内容无效）`;
         (0, prompt_builder_1.outputNeedsInfo)({
             command: 'execute',
             missing: ['analysis'],