@zhuan-ai/zhuanspec 2.16.2 → 2.16.4

package/dist/cli/index.js

@@ -11,6 +11,7 @@ import { ViewCommand } from '../core/view.js';
 import { registerSpecCommand } from '../commands/spec.js';
 import { ChangeCommand } from '../commands/change.js';
 import { ValidateCommand } from '../commands/validate.js';
+import { ValidateReportsCommand } from '../commands/validate-reports.js';
 import { ShowCommand } from '../commands/show.js';
 import { CompletionCommand } from '../commands/completion.js';
 import { ReviewCommand } from '../commands/review.js';
@@ -524,6 +525,25 @@ program
         process.exit(1);
     }
 });
+// Top-level validate-reports command
+program
+    .command('validate-reports <change-id>')
+    .description('Validate Apply-phase task reports against apply-agent / tdd-apply-agent templates')
+    .option('--json', 'Output validation summary as JSON')
+    .action(async (changeId, options) => {
+    try {
+        const cmd = new ValidateReportsCommand();
+        await cmd.execute(changeId, options);
+        if (typeof process.exitCode === 'number' && process.exitCode !== 0) {
+            process.exit(process.exitCode);
+        }
+    }
+    catch (error) {
+        console.log();
+        ora().fail(`Error: ${error.message}`);
+        process.exit(1);
+    }
+});
 // Top-level show command
 program
     .command('show [item-name]')

package/dist/commands/progress.js

@@ -295,9 +295,13 @@ export class ProgressCommand {
         // Progress percentage
         const percentage = totalTasks > 0 ? (completedCount / totalTasks) * 100 : 0;
         const progressBar = this.generateProgressBar(percentage, 12);
-        // Duration
+        // Duration (active time)
         const durationMs = progress?.stats?.durationMs?.[phase] || 0;
         const durationMin = Math.round(durationMs / 60000);
+        const wallClockMs = progress?.stats?.wallClockMs?.[phase] || 0;
+        const wallClockMin = Math.round(wallClockMs / 60000);
+        const idleMs = progress?.stats?.idleMs?.[phase] || 0;
+        const idleMin = Math.round(idleMs / 60000);
         const estimatedRemaining = totalTasks > 0 && completedCount > 0
             ? Math.round((durationMin / completedCount) * (totalTasks - completedCount))
             : 0;
@@ -319,8 +323,16 @@ export class ProgressCommand {
             console.log('');
         }
         // Duration info
-        if (durationMin > 0) {
-            console.log(`耗时: ${durationMin}m | 预计剩余: ~${estimatedRemaining}m`);
+        if (durationMin > 0 || wallClockMin > 0) {
+            const parts = [];
+            parts.push(`活跃: ${durationMin}m`);
+            if (idleMin > 0)
+                parts.push(`空闲: ${idleMin}m`);
+            if (wallClockMin > 0)
+                parts.push(`墙钟: ${wallClockMin}m`);
+            if (estimatedRemaining > 0)
+                parts.push(`预计剩余: ~${estimatedRemaining}m`);
+            console.log(parts.join(' | '));
         }
         console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
         console.log('');

package/dist/commands/validate-reports.d.ts

@@ -0,0 +1,17 @@
+/**
+ * `zhuanspec validate-reports <change-id>` — 校验某个 change 下所有
+ * Apply 任务报告是否符合 apply-agent.md / tdd-apply-agent.md 模板。
+ *
+ * 设计要点：
+ * - 仅做静态文本/章节检测，不读取代码，零外部依赖。
+ * - JSON 输出与人类可读输出双通道，便于 hooks/CI 程序化消费。
+ * - 退出码：所有报告通过且无缺失 → 0；否则 1。
+ */
+interface ExecuteOptions {
+    json?: boolean;
+}
+export declare class ValidateReportsCommand {
+    execute(changeId: string | undefined, options?: ExecuteOptions): Promise<void>;
+}
+export {};
+//# sourceMappingURL=validate-reports.d.ts.map

package/dist/commands/validate-reports.js

@@ -0,0 +1,76 @@
+/**
+ * `zhuanspec validate-reports <change-id>` — 校验某个 change 下所有
+ * Apply 任务报告是否符合 apply-agent.md / tdd-apply-agent.md 模板。
+ *
+ * 设计要点：
+ * - 仅做静态文本/章节检测，不读取代码，零外部依赖。
+ * - JSON 输出与人类可读输出双通道，便于 hooks/CI 程序化消费。
+ * - 退出码：所有报告通过且无缺失 → 0；否则 1。
+ */
+import path from 'path';
+import chalk from 'chalk';
+import { promises as fs } from 'fs';
+import { validateTaskReports, } from '../core/validation/report-schema.js';
+export class ValidateReportsCommand {
+    async execute(changeId, options = {}) {
+        if (!changeId) {
+            console.error('Usage: zhuanspec validate-reports <change-id> [--json]');
+            process.exitCode = 1;
+            return;
+        }
+        const changeDir = path.join(process.cwd(), 'zhuanspec', 'changes', changeId);
+        try {
+            await fs.access(changeDir);
+        }
+        catch {
+            console.error(`未找到 change 目录：${changeDir}`);
+            process.exitCode = 1;
+            return;
+        }
+        const summary = await validateTaskReports(changeDir);
+        if (options.json) {
+            console.log(JSON.stringify(summary, null, 2));
+        }
+        else {
+            printHumanReadable(summary);
+        }
+        process.exitCode = summary.valid ? 0 : 1;
+    }
+}
+function printHumanReadable(summary) {
+    const { changeId, totalReports, passedReports, failedReports, missingReports } = summary;
+    console.log(`Change: ${changeId}`);
+    console.log(`Reports: total=${totalReports} passed=${passedReports} failed=${failedReports} missing=${missingReports.length}`);
+    console.log('');
+    for (const report of summary.reports) {
+        if (report.valid) {
+            console.log(`  ${chalk.green('✓')} task-${report.taskId}-report.md (${report.declaredAgentType})`);
+            continue;
+        }
+        console.log(`  ${chalk.red('✗')} task-${report.taskId}-report.md (declared=${report.declaredAgentType}, expected=${report.expectedAgentType})`);
+        for (const issue of report.issues) {
+            const tag = issue.level === 'ERROR' ? chalk.red('ERROR') : chalk.yellow('WARN');
+            console.log(`      [${tag}] ${issue.message}`);
+        }
+    }
+    if (missingReports.length > 0) {
+        console.log('');
+        console.log(chalk.red(`缺失报告（tasks.md 列出但 reports/ 中未找到）：`));
+        for (const taskId of missingReports) {
+            console.log(`  - task ${taskId}`);
+        }
+    }
+    console.log('');
+    if (summary.valid) {
+        console.log(chalk.green('All task reports conform to schema.'));
+    }
+    else {
+        console.log(chalk.red('Some task reports do NOT conform to schema. See errors above.'));
+        console.log('');
+        console.log('Hints:');
+        console.log('  - 缺章节通常意味着报告由主 agent 直写而非 subagent 产出');
+        console.log('  - 重新通过 Agent tool / spawn_agent 启动 subagent 重跑对应任务');
+        console.log('  - 如果是合理降级，请在 "Agent 选择决策" 中显式写 "TDD 适用性: 不适合（降级原因：...）"');
+    }
+}
+//# sourceMappingURL=validate-reports.js.map

package/dist/core/configurators/codex.js

@@ -38,7 +38,7 @@ import path from 'path';
 import os from 'os';
 import { promises as fs } from 'fs';
 import { FileSystemUtils } from '../../utils/file-system.js';
-import { getCodexHooksTomlBlock, getCodexDefaultHookSlots } from '../templates/codex-hooks-template.js';
+import { getCodexHooksTomlBlock, getCodexDefaultHookSlots, getCodexDefaultHookHashes } from '../templates/codex-hooks-template.js';
 import { getCodexAgentTomls, } from '../templates/codex-agents-template.js';
 import { getCodexSkillFiles } from '../templates/codex-skills-template.js';
 import { CodexSlashCommandConfigurator } from './slash/codex.js';
@@ -374,6 +374,16 @@ export class CodexConfigurator {
                     seedBySuffix.set(split.suffix, entry.hash);
                 }
             }
+            // 2b. Computed hashes take priority over cross-project seeds because
+            // seeds from a different source type (e.g. ~/.codex/hooks.json vs
+            // .codex/config.toml) may have different hook content and thus wrong
+            // hashes.  Our computed hashes replicate the exact Codex CLI fingerprint
+            // algorithm (NormalizedHookIdentity → canonical JSON → SHA-256) and are
+            // guaranteed correct for the current ZhuanSpec default hooks.
+            const computedHashes = getCodexDefaultHookHashes();
+            for (const [suffix, hash] of computedHashes) {
+                seedBySuffix.set(suffix, hash); // always overwrite cross-project seeds
+            }
             const seedAvailable = seedBySuffix.size > 0;
             // 3. Plan per-slot writes.
             const written = [];

package/dist/core/hooks/record-progress.d.ts

@@ -32,6 +32,20 @@ export declare function getBeijingTime(): string;
  * Returns format: "2026-04-21 18-35-22" (文件名安全格式)
  */
 export declare function getBeijingTimeForFilename(): string;
+/**
+ * v2.16+ 活跃耗时累加器
+ *
+ * 每次 PostToolUse 心跳到达时调用，根据 gap = now - lastActiveAt 判断：
+ *   gap < PHASE_IDLE_THRESHOLD_MS → 活跃，累加到 durationMs
+ *   gap >= PHASE_IDLE_THRESHOLD_MS → 空闲，累加到 idleMs 并 push idleSegments
+ *
+ * 同步刷新 wallClockMs、lastActiveAt、lastUpdatedAt。
+ * 返回本次增量便于调用方决定是否刷新 stats。
+ */
+export declare function tickActivePhaseDuration(entry: PhaseDurationRecord, nowEpoch?: number, nowTimestamp?: string): {
+    activeDelta: number;
+    idleDelta: number;
+};
 interface RecordProgressOptions {
     json?: boolean;
     file?: string;
@@ -143,6 +157,14 @@ interface ClarificationRecord {
 }
 /**
  * Phase duration record for tracking time spent in each phase
+ *
+ * v2.16+：字段语义反转
+ *   - durationMs：覆盖为“活跃耗时”（剔除空闲段，PHASE_IDLE_THRESHOLD_MS 内累加），
+ *     业务主指标，与上报/采集口径保持一致。
+ *   - wallClockMs：原 durationMs 的语义（endedAt|lastUpdatedAt - startedAt 墙钟差），
+ *     仅作审计/调试参考，迁移期老 progress.json 会把老的 durationMs 复制到此字段。
+ *   - idleMs / idleSegments：活跃耗时之外被剔除的空闲明细（可观测）。
+ *   - lastActiveAt：最后一次 hook 心跳的北京时间字符串，下次心跳到达时计算 gap。
  */
 export interface PhaseDurationRecord {
     phase: Phase;
@@ -152,6 +174,15 @@ export interface PhaseDurationRecord {
     durationMs: number;
     taskCount: number;
     completedTaskCount: number;
+    wallClockMs?: number;
+    idleMs?: number;
+    lastActiveAt?: string;
+    _lastActiveEpoch?: number;
+    idleSegments?: Array<{
+        from: string;
+        to: string;
+        durationMs: number;
+    }>;
 }
 /**
  * Proposal change record for tracking modifications to proposal files
@@ -322,6 +353,20 @@ export interface ProgressData {
             review: number;
             archive: number;
         };
+        wallClockMs?: {
+            techDesign: number;
+            propose: number;
+            apply: number;
+            review: number;
+            archive: number;
+        };
+        idleMs?: {
+            techDesign: number;
+            propose: number;
+            apply: number;
+            review: number;
+            archive: number;
+        };
     };
     proposalChanges: ProposalChangeRecord[];
     corrections?: CorrectionRecord[];