speccore 8.3.333 → 8.3.341

package/dist/commands/execute.js

@@ -272,10 +272,10 @@ async function executeCommand(options) {
             tasks = tasks.filter(t => t.status === options.status);
         if (options.assignee)
             tasks = tasks.filter(t => t.assignee === options.assignee);
-        // v8.3.288+: 按所属功能模块筛选（模糊包含，如「支付」命中「支付模块」）
+        // v8.3.288+ / v8.3.339+: 按所属功能模块筛选（逗号分隔多值，模糊匹配单元名/模块目录名）
         if (options.module) {
             const before = tasks.length;
-            tasks = tasks.filter(t => (t.feature || '').includes(options.module));
+            tasks = (0, state_1.filterTasksByModule)(tasks, options.module);
             logger_1.logger.info(`🎯 模块筛选「${options.module}」: ${before} → ${tasks.length} 个任务`);
         }
         // v8.3.145+: 使用项目实际端名过滤，不再硬编码 backend/frontend
@@ -593,6 +593,12 @@ async function executeWithProgress(tasks, iteration, base, skip, options) {
             logger_1.logger.info(`  🌿 ${task.id}: ${branchName}`);
         }
         await generateTaskSkeleton(task, iteration);
+        // v8.3.337+: 直接执行路径同样跑完成收尾（标记 completed + 骨架体检兑底）
+        try {
+            const tDir = await resolveTaskDir(await (0, context_1.getIterationDir)(iteration), task.id);
+            await finalizeTaskCompletion(iteration, task.id, tDir);
+        }
+        catch { /* 收尾失败不阻断 */ }
         completed.push(`${task.id} - ${task.name || ''}`);
         logger_1.logger.info(`  ✅ ${task.id} completed`);
         logger_1.logger.info('');
@@ -832,6 +838,12 @@ async function processBatch(tasks, state, iteration) {
         }
         logger_1.logger.info(`  🔄 执行中...`);
         await generateTaskSkeleton(task, iteration);
+        // v8.3.337+: 批次路径同样跑完成收尾（标记 completed + 骨架体检兑底）
+        try {
+            const tDir = await resolveTaskDir(await (0, context_1.getIterationDir)(iteration), task.id);
+            await finalizeTaskCompletion(iteration, task.id, tDir);
+        }
+        catch { /* 收尾失败不阻断 */ }
         completed.push(task.id);
         // 写入任务摘要到 execution-state（文件即记忆）
         // v8.3.166+: 包含 agent 角色，供跨 Agent 状态共享
@@ -1945,7 +1957,7 @@ async function executionVerifyLoop(tasks, iteration, options) {
                         logger_1.logger.info(`   👤 L3 架构契约: ${arbResult.report.L3.passed}/${arbResult.report.L3.total} 通过, ${arbResult.report.L3.pending} 待裁决`);
                         if (arbResult.report.L3.pending > 0) {
                             logger_1.logger.warn(`      ⚠️ ${arbResult.report.L3.pending} 项需人工裁决`);
-                            logger_1.logger.info(`         执行: speccore verdict --list --task ${task.id}`);
+                            logger_1.logger.info(`         裁决入口: 任务目录 ARBITRATION_REPORT.md`);
                             allPassed = false;
                         }
                     }
@@ -2171,10 +2183,10 @@ async function listPendingTasks(iteration, options) {
     }
     // 过滤已完成的任务
     let pending = tasks.filter(t => t.status !== 'completed' && t.status !== 'archived');
-    // v8.3.288+: 按所属功能模块筛选（--module，匹配 .meta/feature）
+    // v8.3.288+ / v8.3.339+: 按所属功能模块筛选（--module 逗号分隔多值，模糊匹配单元名/模块目录名）
     if (options.module) {
         const before = pending.length;
-        pending = pending.filter(t => (t.feature || '').includes(options.module));
+        pending = (0, state_1.filterTasksByModule)(pending, options.module);
         logger_1.logger.info(`🎯 模块筛选「${options.module}」: ${before} → ${pending.length} 个任务`);
     }
     if (pending.length === 0) {
@@ -2215,8 +2227,22 @@ async function runPromptMode(iteration, options) {
         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 });
-            availableTasks = entries.filter((e) => e.isDirectory() && e.name.startsWith('Task-')).map((e) => e.name);
+            // v8.3.337+: 兼容 030-tasks 新旧布局（新布局模块目录=功能单元名，位于类型子目录层）
+            const { isTaskModuleDirName } = await Promise.resolve().then(() => __importStar(require('../core/task-paths')));
+            const collect = async (dir, depth) => {
+                const entries = await (0, fs_extra_1.readdir)(dir, { withFileTypes: true });
+                for (const e of entries) {
+                    if (!e.isDirectory())
+                        continue;
+                    if (e.name.startsWith('Task-') || (depth <= 1 && isTaskModuleDirName(e.name))) {
+                        availableTasks.push(e.name);
+                    }
+                    else if (!e.name.startsWith('.')) {
+                        await collect((0, path_1.join)(dir, e.name), depth + 1);
+                    }
+                }
+            };
+            await collect(taskDir, 0);
         }
         catch { }
         (0, prompt_builder_1.outputNeedsInfo)({
@@ -2543,6 +2569,14 @@ async function runPromptMode(iteration, options) {
                     process.stdout.write(`✅ 代码已由子 Agent 直接写入 ${dispatchResult.filesChanged.length} 个文件:\n`);
                     for (const f of dispatchResult.filesChanged)
                         process.stdout.write(`   📄 ${f}\n`);
+                    // v8.3.337+: SDK 直连路径同样跑完成收尾（标记 completed + 骨架体检兑底），
+                    // 修复子 Agent 只写代码不覆盖端级骨架时文档保持空模板的问题
+                    try {
+                        await finalizeTaskCompletion(iteration, task, taskDir);
+                    }
+                    catch (e) {
+                        logger_1.logger.debug(`[execute] SDK 直连完成收尾失败（不阻断）: ${e.message}`);
+                    }
                     process.exitCode = 0;
                     return;
                 }
@@ -2609,6 +2643,80 @@ async function runPromptMode(iteration, options) {
     process.exitCode = 10;
 }
 // ═══════════════════════════════════════════════════════════
+// 任务完成收尾（v8.3.337+）——标记 completed + 联动 TASK.md + 完成骨架体检 + 组级聚合
+// 从 runApplyMode 尾部抽出为公共函数：SDK 直连（filesChanged）、--all、批次等
+// 所有执行路径共用，确保任何路径任务完成后端级骨架都有兜底体检。
+// ═══════════════════════════════════════════════════════════
+async function finalizeTaskCompletion(iteration, task, taskDir) {
+    // 更新 PROJECT_GRAPH
+    await updateProjectGraphStatus(iteration, task);
+    // ── 标记任务状态为 completed ──
+    try {
+        const metaDir = (0, path_1.join)(taskDir, '.meta');
+        await (0, fs_extra_1.ensureDir)(metaDir);
+        await (0, fs_extra_1.writeFile)((0, path_1.join)(metaDir, 'status'), 'completed');
+    }
+    catch { }
+    // v8.3.273+: 联动 TASK.md——状态行改「已完成」+ 工作清单全勾选（修复状态与 checklist 脱节）
+    try {
+        const taskMdPath = (0, path_1.join)(taskDir, 'TASK.md');
+        if (await (0, fs_extra_1.pathExists)(taskMdPath)) {
+            let md = await (0, fs_extra_1.readFile)(taskMdPath, 'utf-8');
+            md = md.replace(/^(- \*\*状态\*\*: ).*$/m, '$1已完成');
+            md = md.replace(/^- \[ \]/gm, '- [x]');
+            await (0, fs_extra_1.writeFile)(taskMdPath, md);
+        }
+    }
+    catch { /* TASK.md 联动失败不阻断 */ }
+    // v8.3.313+: 完成骨架体检——端级文档仍含骨架占位时，先尝试 CLI 自动降级填充
+    // （REQ/TECH 从模块级 00-specs 真实规格派生端级快照），填不了的继续挂「骨架待补」待办（TASK.md + .issues.md 双账本）
+    try {
+        const residues = await (0, skeleton_residue_1.collectSkeletonResidues)(taskDir);
+        if (residues.length > 0) {
+            const filled = await (0, skeleton_residue_1.autoFillSkeletonFallback)(taskDir, residues);
+            const remain = residues.filter(r => !filled.has(r.rel));
+            if (filled.size > 0) {
+                logger_1.logger.info(`   📄 完成骨架体检：${filled.size} 份端级骨架已由 CLI 自动降级填充（模块级规格快照，可在此基础上补充端级细节）`);
+            }
+            if (remain.length > 0) {
+                logger_1.logger.warn(`   ⚠️  完成骨架体检：${remain.length} 份端级文档仍含骨架占位（无模块级规格可降级），已挂「骨架待补」待办（状态保持 completed，建议尽快补写规格）`);
+            }
+            await (0, skeleton_residue_1.appendSkeletonTodos)(taskDir, remain);
+        }
+    }
+    catch { /* 完成骨架体检失败不阻断 */ }
+    // v8.3.273+: 组级状态聚合——所属 Task 组全部子任务完成后，组级 .meta/status 同步 completed
+    // v8.3.337+: 组目录定位改用 isTaskModuleDirName（兼容新命名链 admin-web-01-xxx 与旧 Task-NNN）
+    try {
+        const parts = taskDir.split('/');
+        const taskIdx = parts.findIndex(p => (0, task_paths_1.isTaskModuleDirName)(p));
+        if (taskIdx >= 0) {
+            const groupDir = parts.slice(0, taskIdx + 1).join('/');
+            const statuses = [];
+            const collect = async (dir) => {
+                for (const e of await (0, fs_extra_1.readdir)(dir, { withFileTypes: true })) {
+                    if (!e.isDirectory())
+                        continue;
+                    const stPath = (0, path_1.join)(dir, e.name, '.meta', 'status');
+                    if (await (0, fs_extra_1.pathExists)(stPath)) {
+                        statuses.push((await (0, fs_extra_1.readFile)(stPath, 'utf-8')).trim());
+                    }
+                    else {
+                        await collect((0, path_1.join)(dir, e.name));
+                    }
+                }
+            };
+            await collect(groupDir);
+            const subtaskStatuses = statuses.filter((_, i) => i !== 0); // 排除组级自身
+            if (subtaskStatuses.length > 0 && subtaskStatuses.every(s => s === 'completed')) {
+                await (0, fs_extra_1.writeFile)((0, path_1.join)(groupDir, '.meta', 'status'), 'completed');
+                logger_1.logger.info(`   📊 组级状态已同步: ${(0, path_1.basename)(groupDir)} → completed（${subtaskStatuses.length} 个子任务全部完成）`);
+            }
+        }
+    }
+    catch { /* 组级聚合失败不阻断 */ }
+}
+// ═══════════════════════════════════════════════════════════
 // Response 模式 — 接收 AI 返回内容，写入文件
 // ═══════════════════════════════════════════════════════════
 async function runApplyMode(iteration, options) {
@@ -2880,65 +2988,9 @@ async function runApplyMode(iteration, options) {
             // 写入 .issues.md 失败不阻断
         }
     }
-    // 更新 PROJECT_GRAPH
-    await updateProjectGraphStatus(iteration, task);
-    // ── 标记任务状态为 completed ──
+    // v8.3.337+: 任务完成收尾（标记 completed + TASK.md 联动 + 骨架体检 + 组级聚合）抽为公共函数
     const taskDirForStatus = await resolveTaskDir(iterDir, task);
-    try {
-        const metaDir = (0, path_1.join)(taskDirForStatus, '.meta');
-        await (0, fs_extra_1.ensureDir)(metaDir);
-        await (0, fs_extra_1.writeFile)((0, path_1.join)(metaDir, 'status'), 'completed');
-    }
-    catch { }
-    // v8.3.273+: 联动 TASK.md——状态行改「已完成」+ 工作清单全勾选（修复状态与 checklist 脱节）
-    try {
-        const taskMdPath = (0, path_1.join)(taskDirForStatus, 'TASK.md');
-        if (await (0, fs_extra_1.pathExists)(taskMdPath)) {
-            let md = await (0, fs_extra_1.readFile)(taskMdPath, 'utf-8');
-            md = md.replace(/^(- \*\*状态\*\*: ).*$/m, '$1已完成');
-            md = md.replace(/^- \[ \]/gm, '- [x]');
-            await (0, fs_extra_1.writeFile)(taskMdPath, md);
-        }
-    }
-    catch { /* TASK.md 联动失败不阻断 */ }
-    // v8.3.313+: 完成骨架体检——端级文档仍含骨架占位时 completed 照常，但挂「骨架待补」待办（TASK.md + .issues.md 双账本）
-    try {
-        const residues = await (0, skeleton_residue_1.collectSkeletonResidues)(taskDirForStatus);
-        if (residues.length > 0) {
-            logger_1.logger.warn(`   ⚠️  完成骨架体检：${residues.length} 份端级文档仍含骨架占位，已挂「骨架待补」待办（状态保持 completed，建议尽快补写规格）`);
-            await (0, skeleton_residue_1.appendSkeletonTodos)(taskDirForStatus, residues);
-        }
-    }
-    catch { /* 完成骨架体检失败不阻断 */ }
-    // v8.3.273+: 组级状态聚合——所属 Task 组全部子任务完成后，组级 .meta/status 同步 completed
-    try {
-        const parts = taskDirForStatus.split('/');
-        const taskIdx = parts.findIndex(p => /^Task-\d+/.test(p));
-        if (taskIdx >= 0) {
-            const groupDir = parts.slice(0, taskIdx + 1).join('/');
-            const statuses = [];
-            const collect = async (dir) => {
-                for (const e of await (0, fs_extra_1.readdir)(dir, { withFileTypes: true })) {
-                    if (!e.isDirectory())
-                        continue;
-                    const stPath = (0, path_1.join)(dir, e.name, '.meta', 'status');
-                    if (await (0, fs_extra_1.pathExists)(stPath)) {
-                        statuses.push((await (0, fs_extra_1.readFile)(stPath, 'utf-8')).trim());
-                    }
-                    else {
-                        await collect((0, path_1.join)(dir, e.name));
-                    }
-                }
-            };
-            await collect(groupDir);
-            const subtaskStatuses = statuses.filter((_, i) => i !== 0); // 排除组级自身
-            if (subtaskStatuses.length > 0 && subtaskStatuses.every(s => s === 'completed')) {
-                await (0, fs_extra_1.writeFile)((0, path_1.join)(groupDir, '.meta', 'status'), 'completed');
-                logger_1.logger.info(`   📊 组级状态已同步: ${(0, path_1.basename)(groupDir)} → completed（${subtaskStatuses.length} 个子任务全部完成）`);
-            }
-        }
-    }
-    catch { /* 组级聚合失败不阻断 */ }
+    await finalizeTaskCompletion(iteration, task, taskDirForStatus);
     logger_1.logger.success(`\n📁 完成: ${writtenCount} 个文件已写入`);
     logger_1.logger.info(`   📂 位置: ${iterDir}/`);
     // v6.69.1: 记录任务执行快照，支持下次增量检测
@@ -2984,7 +3036,7 @@ function outputPostSummary(iteration, task, fileCount, filePaths) {
         logger_1.logger.info('');
         logger_1.logger.warn('🔄 检测到接口/实体变更，建议刷新全局层:');
         logger_1.logger.info(`   → speccore global analyze --with-code  # 刷新全局 FUNCTION_MAP.md / API_CONTRACT.yaml`);
-        logger_1.logger.info(`   → speccore refresh                    # 刷新检索索引`);
+        logger_1.logger.info(`   → speccore reindex                   # 重建检索索引`);
     }
     logger_1.logger.info('━'.repeat(40));
 }