@zhuan-ai/zhuanspec 2.15.7 → 2.16.2

package/dist/core/hooks/summarize.js

@@ -8,10 +8,11 @@
  * 4. Generate events.json entries for key events
  */
 import path from 'path';
+import { promises as fsPromises } from 'fs';
 import { execSync } from 'child_process';
 import { FileSystemUtils } from '../../utils/file-system.js';
 import { executePostApply } from './post-apply.js';
-import { getBeijingTime, detectActiveChange } from './record-progress.js';
+import { getBeijingTime, detectActiveChange, atomicWriteJson } from './record-progress.js';
 import { computeAccuracy } from '../metrics/code-accuracy.js';
 import { detectHookHost, sanitizeCodexEnvelope } from '../../utils/hook-host.js';
 export async function summarizeHook(options) {
@@ -215,6 +216,29 @@ async function runSummarize() {
             systemMessage += `- AI产出: ${accResult.aiTotalLines} 行\n`;
             systemMessage += `- 用户纠正: ${accResult.userCorrectionLines} 行\n`;
             systemMessage += `- 准确率: ${(accResult.rate * 100).toFixed(1)}%${accResult.overridden ? ' (已手动修正)' : ''}\n`;
+            // 分阶段准确率（Task 5）：按 phase/trackedKind 展示桶级快照；历史数据无桶时降级提示
+            const buckets = progressData.accuracy.phaseAccuracy ?? [];
+            systemMessage += `\n分阶段准确率:\n`;
+            if (buckets.length === 0) {
+                systemMessage += `- —（历史数据，无分阶段指标）\n`;
+            }
+            else {
+                for (const b of buckets) {
+                    const rawPct = ((b.accuracyRateRaw ?? b.accuracyRate ?? 1) * 100).toFixed(1);
+                    const showPct = ((b.accuracyRate ?? 1) * 100).toFixed(1);
+                    const overrideCount = b.overrideHistory?.length ?? 0;
+                    const lastReason = overrideCount > 0
+                        ? b.overrideHistory[overrideCount - 1].reason
+                        : '';
+                    const confirmedTag = b.confirmed
+                        ? `✓已确认(${b.confirmed.by})`
+                        : '未确认';
+                    const overrideTag = overrideCount > 0
+                        ? ` override=${overrideCount}次(${lastReason})`
+                        : '';
+                    systemMessage += `- [${b.phase}/${b.trackedKind}] AI=${b.aiTotalLines} 纠偏=${b.userCorrectionLines} raw=${rawPct}% 展示=${showPct}%${overrideTag} ${confirmedTag}\n`;
+                }
+            }
         }
     }
     if (allTasksComplete) {
@@ -239,40 +263,63 @@ async function runSummarize() {
         && progressData.askedPitfallSaved !== true) {
         pitfallAskPending = true;
         const n = progressData.corrections.length;
-        const previews = progressData.corrections
-            .filter(c => c.event === 'detected')
-            .slice(-3)
-            .map((c, i) => `  ${i + 1}. ${c.promptPreview || '(no preview)'}`)
-            .join('\n');
         pitfallAdditionalContext = [
             '## ⚠️ ZhuanSpec 知识沉淀询问（收尾必做）',
             '',
-            `本轮会话发生过 ${n} 次用户纠偏且尚未沉淀，必须按以下顺序处理（严禁跳步，严禁自行 Write 知识文件）：`,
+            `本轮会话发生过 ${n} 次用户纠偏且尚未沉淀，必须按以下顺序处理（严禁跳步、严禁仅根据最近 N 条摘要拍脑袋决策、严禁自行 Write 知识文件）：`,
             '',
             '### 必须执行的步骤',
             '',
-            `1. **用 askUserQuestion 询问用户**（二选一）：`,
-            '   - header: "踩坑沉淀"',
-            `   - question: "本轮 Apply 阶段发生过 ${n} 次用户纠偏，是否沉淀为项目知识？"`,
-            '   - 选项 1: "是，沉淀"',
-            '   - 选项 2: "否，跳过"',
+            `1. **先生成决策清单（必须）**：运行`,
+            '   ```bash',
+            `   zhuanspec progress list-corrections ${changeId}`,
+            '   ```',
+            '   CLI 会过滤 trivial 确认词（如 "是的/好的/ok"）+ 去重（完全重复 + 子串包含）+ 启发式分类，输出到 `zhuanspec/changes/<change-id>/review/pending-corrections.md`，并在 stdout 给出 **合计 / 有效 / 过滤** 三个计数。',
             '',
-            `2. **用户选"是"**：**必须调用 \`@skill:zhuanspec:knowledge --mode=correction --correction <change-id>\`** （或等价的 \`/zhuanspec:knowledge\` slash command 并在交互中选择模式 B）完成沉淀。`,
-            `   - change-id 值为 \`${changeId}\``,
-            '   - **禁止直接 Write/Edit 创建 \`zhuanspec/knowledge/\` 下的任何文件**，禁止自行判定分类或文件名格式；所有写入由 skill 统一执行。',
-            '   - skill 将自动完成：读取 .correction-log → 分类决策树 → 去重扫描 → 套用统一 Front Matter → 写入对应分类目录 → 更新 index.md → 标记 resolve-correction。',
+            '2. **用 askUserQuestion 询问用户（三选项，禁止默认）**：',
+            '   - header: "踩坑沉淀"',
+            '   - question: "本轮有 M 条有效纠偏候选（已过滤 trivial / 去重，详见 review/pending-corrections.md），请选择沉淀范围："',
+            '   - 选项 1: "全部沉淀"',
+            '   - 选项 2: "选择性沉淀（请回复编号清单，例如 1,3,5）"',
+            '   - 选项 3: "跳过"',
             '',
-            `3. **用户选"否"**：运行 \`zhuanspec progress resolve-correction ${changeId} --mark-pitfall-saved\` 标记已处理，不写入任何知识文件。`,
+            `3. **用户选 "全部沉淀" 或 "选择性沉淀"**：必须调用 \`@skill:zhuanspec:knowledge --mode=correction --correction <change-id>\` （或 \`/zhuanspec:knowledge\` 模式 B）完成沉淀。change-id 值为 \`${changeId}\`。选择性沉淀时把用户回复的编号串以 \`--include <编号串>\` 透传给 skill。`,
+            '   - **禁止直接 Write/Edit 创建 `zhuanspec/knowledge/` 下的任何文件**，禁止自行判定分类或文件名格式；所有写入由 skill 统一执行。',
+            '   - skill 必须以 `pending-corrections.md` 作为商定范围的单一源，禁止从会话记忆里“发挥”额外条目。',
             '',
-            '### 纠偏记录摘要（最近 3 条 promptPreview）',
-            previews || '  (none)',
+            `4. **用户选 "跳过"**：运行 \`zhuanspec progress resolve-correction ${changeId} --mark-pitfall-saved\` 标记已处理，不写入任何知识文件。`,
             '',
             '### 红线提示',
             '- 禁止绕过 skill 直接 Write/Edit 知识文件（等同于绕过质量门禁）。',
+            '- 禁止跳过 list-corrections 一步，仅靠 promptPreview 拍脑袋决策。',
             '- 禁止新建 decisions/ 或三类目录以外的分类。',
             '- skill 模式 B 完成后会自动写入 askedPitfallSaved=true，无需人工重复调用 CLI。',
         ].join('\n');
-        systemMessage += `\n⚠️ 检测到 ${n} 次用户纠偏未沉淀——请按上方说明调 askUserQuestion，用户选是后必须调用 @skill:zhuanspec:knowledge 而非自行 Write。\n`;
+        systemMessage += `\n⚠️ 检测到 ${n} 次用户纠偏未沉淀——请先运行 zhuanspec progress list-corrections ${changeId}，再用 askUserQuestion 三选项决策，用户选「全部/选择性沉淀」后必须调用 @skill:zhuanspec:knowledge 而非自行 Write。\n`;
+    }
+    // === Task 0 路径 1：Stop 时按核心产出齐备度自动打 phase baseline ===
+    // 幂等：已打标则跳过；先到先得（auto-file-complete 优于 auto-stop）
+    try {
+        if (['techDesign', 'propose', 'apply', 'review'].includes(phase)) {
+            const outputsReady = await isPhaseOutputsComplete(phase, changeDir, allTasksComplete);
+            if (outputsReady && await FileSystemUtils.fileExists(progressPath)) {
+                const fullProgress = JSON.parse(await FileSystemUtils.readFile(progressPath));
+                const now = getBeijingTime();
+                fullProgress.phaseBaselines = fullProgress.phaseBaselines || {};
+                const key = phase;
+                if (!fullProgress.phaseBaselines[key]?.markedAt) {
+                    fullProgress.phaseBaselines[key] = {
+                        markedAt: now,
+                        markedBy: 'auto-file-complete',
+                        firstStopAt: now,
+                    };
+                    await atomicWriteJson(progressPath, fullProgress);
+                }
+            }
+        }
+    }
+    catch {
+        // baseline 打标失败不阻断 summarize 主流程
     }
     return {
         continue: true,
@@ -371,4 +418,44 @@ function computeWaves(tasks) {
     }
     return Array.from(wavesMap.values()).sort((a, b) => a.waveId - b.waveId);
 }
+/**
+ * 判定指定 phase 的核心产出文件是否齐备（Task 0 路径 1 auto-file-complete 的前置条件）。
+ *
+ * 判定标准：
+ * - techDesign → changes/{changeId}/techDesign/ 目录存在且至少有一份 .md 文件
+ * - propose    → proposal.md / tasks.md / design.md 全部存在
+ * - apply      → tasks.md 全部打勾
+ * - review     → review/review-report.md 存在
+ */
+async function isPhaseOutputsComplete(phase, changeDir, allTasksComplete) {
+    if (phase === 'techDesign') {
+        const techDesignDir = path.join(changeDir, 'techDesign');
+        if (!(await FileSystemUtils.directoryExists(techDesignDir)))
+            return false;
+        try {
+            const files = await fsPromises.readdir(techDesignDir);
+            return files.some(f => f.endsWith('.md'));
+        }
+        catch {
+            return false;
+        }
+    }
+    if (phase === 'propose') {
+        const required = ['proposal.md', 'tasks.md', 'design.md'];
+        for (const f of required) {
+            if (!(await FileSystemUtils.fileExists(path.join(changeDir, f)))) {
+                return false;
+            }
+        }
+        return true;
+    }
+    if (phase === 'apply') {
+        return allTasksComplete;
+    }
+    if (phase === 'review') {
+        const reviewReportPath = path.join(changeDir, 'review', 'review-report.md');
+        return await FileSystemUtils.fileExists(reviewReportPath);
+    }
+    return false;
+}
 //# sourceMappingURL=summarize.js.map

package/dist/core/hooks/user-input-hook.d.ts

@@ -1,9 +1,42 @@
 /**
  * User Input Hook
  *
- * Records user input summary during ZhuanSpec workflow.
- * Tracks user interventions, corrections, confirmations, and additional requests.
+ * 统一的 UserPromptSubmit 入口（v2.15.15 起接管 deviation-check 的纠偏/需求变更注入）：
+ *   1. 过滤 slash/bang 命令、too-short 内容、Codex Ambient Suggestions、10s 窗口重复
+ *   2. 将 prompt 归档到 user_inputs.json（含 fullPrompt + correctionSignal + postBaseline）
+ *   3. baseline 已打标时写 correctionContext（Task 0 post-baseline-prompt 语义）
+ *   4. phase='apply' + postBaseline + 命中 hard 关键词
+ *      → 注入四选一（纠偏）或 AD 两选一（需求变更）additionalContext
+ *      → 同步写 .pending-correction 供 pre-tool hook 拦截 Edit/Write
+ *
+ * 与 deviation-check 的关系：
+ *   - 本 hook 接管 UserPromptSubmit 下原 deviation-check 的全部职责（关键词 + 四选一）
+ *   - deviation-check 保留 pre-tool 分支（检测 .pending-correction → 拦截 Edit/Write）
+ *   - settings.json 模板不再挂 deviation-check 到 UserPromptSubmit；旧项目请跑 zhuanspec update
+ *
+ * v2.15.16 Sprint 3：.correction-log 写入已下线，user_inputs.json 为唯一纠偏事实源。
+ */
+/**
+ * 纠偏信号分级：
+ *  - 'hard' : 命中 USER_CORRECTION_KEYWORDS / REQUIREMENT_CHANGE_KEYWORDS 中的硬关键词
+ *  - 'soft' : 保留位，当前未使用；未来可接入语义/模式匹配
+ *  - 'none' : 无纠偏信号
  */
+export interface CorrectionSignal {
+    kind: 'hard' | 'soft' | 'none';
+    matchedKeywords: string[];
+    isRequirementChange?: boolean;
+}
+/**
+ * 用户对四选一的最终选择。由 `zhuanspec progress resolve-correction` 回写。
+ */
+export interface UserInputResolution {
+    path?: 'A' | 'B' | 'C' | 'D';
+    resolvedAt?: string;
+    note?: string;
+    /** 本条 prompt 是否真的弹了四选一（hard 信号命中即触发） */
+    triggeredFourOption?: boolean;
+}
 interface UserInputOutput {
     continue: boolean;
     systemMessage?: string;
@@ -11,6 +44,9 @@ interface UserInputOutput {
         inputRecorded: boolean;
         triggerType: string;
         summaryLength: number;
+        /** 四选一或 AD 两选一注入时附加 additionalContext/options */
+        additionalContext?: string;
+        options?: string[];
     };
 }
 /**

package/dist/core/hooks/user-input-hook.js

@@ -1,12 +1,75 @@
 /**
  * User Input Hook
  *
- * Records user input summary during ZhuanSpec workflow.
- * Tracks user interventions, corrections, confirmations, and additional requests.
+ * 统一的 UserPromptSubmit 入口（v2.15.15 起接管 deviation-check 的纠偏/需求变更注入）：
+ *   1. 过滤 slash/bang 命令、too-short 内容、Codex Ambient Suggestions、10s 窗口重复
+ *   2. 将 prompt 归档到 user_inputs.json（含 fullPrompt + correctionSignal + postBaseline）
+ *   3. baseline 已打标时写 correctionContext（Task 0 post-baseline-prompt 语义）
+ *   4. phase='apply' + postBaseline + 命中 hard 关键词
+ *      → 注入四选一（纠偏）或 AD 两选一（需求变更）additionalContext
+ *      → 同步写 .pending-correction 供 pre-tool hook 拦截 Edit/Write
+ *
+ * 与 deviation-check 的关系：
+ *   - 本 hook 接管 UserPromptSubmit 下原 deviation-check 的全部职责（关键词 + 四选一）
+ *   - deviation-check 保留 pre-tool 分支（检测 .pending-correction → 拦截 Edit/Write）
+ *   - settings.json 模板不再挂 deviation-check 到 UserPromptSubmit；旧项目请跑 zhuanspec update
+ *
+ * v2.15.16 Sprint 3：.correction-log 写入已下线，user_inputs.json 为唯一纠偏事实源。
  */
 import path from 'path';
+import fs from 'fs';
+import crypto from 'crypto';
 import { FileSystemUtils } from '../../utils/file-system.js';
-import { getBeijingTime } from './record-progress.js';
+import { getBeijingTime, atomicWriteJson, detectActiveChange } from './record-progress.js';
+import { detectHookHost, sanitizeCodexEnvelope } from '../../utils/hook-host.js';
+import { USER_CORRECTION_KEYWORDS, REQUIREMENT_CHANGE_KEYWORDS, extractProposalSummary, buildCorrectionOptionsContext, buildRequirementChangeContext, isCodexInternalPrompt, } from './deviation-check.js';
+/**
+ * Structured JSONL debug log for user-input hook.
+ * Writes to <cwd>/.user-input-debug.log; failures are swallowed to keep main flow intact.
+ * Every hook invocation MUST write exactly one line here, covering every branch
+ * (skip-*, record, baseline-miss, baseline-write) with positive reason codes.
+ */
+function logDebug(cwd, payload) {
+    try {
+        const logPath = path.join(cwd, '.user-input-debug.log');
+        const line = JSON.stringify({ ts: getBeijingTime(), ...payload }) + '\n';
+        fs.appendFileSync(logPath, line, 'utf-8');
+    }
+    catch {
+        // Logging must never block the hook
+    }
+}
+/** fullPrompt 截断长度：够写知识文件的"背景/问题/解决方案"，又不会把 user_inputs.json 撑爆 */
+const FULL_PROMPT_MAX_LEN = 2000;
+/**
+ * 基于硬关键词的 correctionSignal 判定。
+ * 规则：
+ *   - 命中任一 USER_CORRECTION_KEYWORDS → kind='hard'、isRequirementChange=false
+ *   - 命中任一 REQUIREMENT_CHANGE_KEYWORDS → kind='hard'、isRequirementChange=true（互斥优先级：纠偏 > 需求变更）
+ *   - 都没命中 → kind='none'
+ */
+function buildCorrectionSignal(content) {
+    const lowerContent = content.toLowerCase();
+    const hits = new Set();
+    for (const kw of USER_CORRECTION_KEYWORDS) {
+        if (lowerContent.includes(kw.toLowerCase()))
+            hits.add(kw);
+    }
+    const correctionHit = hits.size > 0;
+    const reqHits = new Set();
+    for (const kw of REQUIREMENT_CHANGE_KEYWORDS) {
+        if (lowerContent.includes(kw.toLowerCase()))
+            reqHits.add(kw);
+    }
+    const reqHit = reqHits.size > 0;
+    if (correctionHit) {
+        return { kind: 'hard', matchedKeywords: Array.from(hits).slice(0, 6), isRequirementChange: false };
+    }
+    if (reqHit) {
+        return { kind: 'hard', matchedKeywords: Array.from(reqHits).slice(0, 6), isRequirementChange: true };
+    }
+    return { kind: 'none', matchedKeywords: [], isRequirementChange: false };
+}
 /**
  * Detect trigger type from user input content
  */
@@ -77,44 +140,113 @@ function generateSummary(content) {
  * Main hook function - records user input
  */
 export async function userInputHook(content, responseTimeMs) {
-    const phase = process.env.ZHUANSPEC_PHASE || 'idle';
-    const changeId = process.env.ZHUANSPEC_CHANGE_ID || '';
-    // Skip if not in active phase
-    if (!changeId || phase === 'idle') {
+    const cwd = process.cwd();
+    const contentLen = (content || '').length;
+    // === Resolve active change (filesystem detection first, env as fallback) ===
+    // Claude Code / Codex do NOT propagate SessionStart env vars into UserPromptSubmit
+    // subprocess, so we cannot rely on process.env here. Mirror record-progress.ts
+    // detection strategy to stay consistent with the rest of the hook family.
+    let phase = 'idle';
+    let changeId = '';
+    let phaseSource = 'none';
+    try {
+        const active = await detectActiveChange(cwd);
+        if (active?.changeId) {
+            phase = active.phase;
+            changeId = active.changeId;
+            phaseSource = 'detect';
+        }
+        else if (process.env.ZHUANSPEC_CHANGE_ID) {
+            phase = process.env.ZHUANSPEC_PHASE || 'idle';
+            changeId = process.env.ZHUANSPEC_CHANGE_ID;
+            phaseSource = 'env';
+        }
+    }
+    catch {
+        // Detection failure falls through to env fallback below
+        if (process.env.ZHUANSPEC_CHANGE_ID) {
+            phase = process.env.ZHUANSPEC_PHASE || 'idle';
+            changeId = process.env.ZHUANSPEC_CHANGE_ID;
+            phaseSource = 'env';
+        }
+    }
+    // Skip if no active change resolved
+    if (!changeId) {
+        logDebug(cwd, { event: 'skip', reason: 'no-active-change', phaseSource, contentLen });
+        return { continue: true };
+    }
+    // Skip if phase is idle (workflow not started)
+    if (phase === 'idle') {
+        logDebug(cwd, { event: 'skip', reason: 'phase-idle', changeId, phaseSource, contentLen });
         return { continue: true };
     }
-    // Skip empty content
+    // Skip empty / too-short content
     if (!content || content.trim().length < 10) {
+        logDebug(cwd, { event: 'skip', reason: 'content-too-short', changeId, phase, phaseSource, contentLen });
+        return { continue: true };
+    }
+    // Skip slash/bang commands (e.g. /zhuanspec:proposal, /compact, /clear, !ls).
+    // 这类 prompt 是命令/workflow 触发，非“用户对 AI 产出的纠偏/濄清/补充”，
+    // 不应计入 user_inputs.json，更不应放进纠偏溯源池影响 accuracyRate。
+    const trimmedContent = content.trim();
+    if (/^[/!][A-Za-z0-9_:/@.\-]+(\s|$)/.test(trimmedContent) || /^\/[\w:\-]+$/.test(trimmedContent)) {
+        logDebug(cwd, {
+            event: 'skip',
+            reason: 'slash-command',
+            changeId,
+            phase,
+            phaseSource,
+            contentLen,
+            commandHead: trimmedContent.slice(0, 60),
+        });
+        return { continue: true };
+    }
+    // Skip Codex Ambient Suggestions（openai/codex#18541）：CLI 内部生成的“环境提示”
+    // 会被错误地走 UserPromptSubmit 通道，复用 deviation-check 同款判定。
+    if (isCodexInternalPrompt(content)) {
+        logDebug(cwd, {
+            event: 'skip',
+            reason: 'codex-ambient',
+            changeId,
+            phase,
+            phaseSource,
+            contentLen,
+        });
         return { continue: true };
     }
-    const cwd = process.cwd();
     const zhuanspecDir = path.join(cwd, 'zhuanspec');
-    const metricsDir = path.join(zhuanspecDir, 'changes', changeId, 'metrics');
+    const changeDir = path.join(zhuanspecDir, 'changes', changeId);
+    const metricsDir = path.join(changeDir, 'metrics');
+    const proposalPath = path.join(changeDir, 'proposal.md');
+    const pendingMarkerPath = path.join(changeDir, '.pending-correction');
     // Ensure metrics directory exists
     await FileSystemUtils.createDirectory(metricsDir);
     const userInputPath = path.join(metricsDir, 'user_inputs.json');
+    const progressPath = path.join(metricsDir, 'progress.json');
     // Create input record
+    const correctionSignal = buildCorrectionSignal(content);
     const inputRecord = {
         inputId: `input-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
         timestamp: getBeijingTime(),
         phase,
         summary: generateSummary(content),
+        fullPrompt: content.slice(0, FULL_PROMPT_MAX_LEN),
         triggerType: detectTriggerType(content),
         affectedFiles: extractAffectedFiles(content),
-        responseTimeMs
+        responseTimeMs,
+        correctionSignal,
     };
     // Load existing user inputs or create new
     let userInputs;
     if (await FileSystemUtils.fileExists(userInputPath)) {
         try {
             userInputs = JSON.parse(await FileSystemUtils.readFile(userInputPath));
-            userInputs.inputs.push(inputRecord);
         }
         catch {
             userInputs = {
                 changeId,
                 sessionId: `sess-${Date.now()}`,
-                inputs: [inputRecord]
+                inputs: []
             };
         }
     }
@@ -122,11 +254,191 @@ export async function userInputHook(content, responseTimeMs) {
         userInputs = {
             changeId,
             sessionId: `sess-${Date.now()}`,
-            inputs: [inputRecord]
+            inputs: []
+        };
+    }
+    // === 幂等去重：Claude Code / Codex 在 hook 输出校验失败或 sub-agent 复用时
+    // 可能对同一条用户输入多次 fire UserPromptSubmit，导致同一 prompt 被落盘多次。
+    // 规则：同 phase + 相同 summary hash + 10 秒内的记录视为重复，直接跳过。
+    const DEDUP_WINDOW_MS = 10_000;
+    const summaryHash = crypto.createHash('sha1').update(inputRecord.summary).digest('hex').slice(0, 16);
+    const nowMs = Date.now();
+    const dupLast = [...userInputs.inputs].reverse().find(i => {
+        if (i.phase !== phase)
+            return false;
+        const existingHash = crypto.createHash('sha1').update(i.summary || '').digest('hex').slice(0, 16);
+        if (existingHash !== summaryHash)
+            return false;
+        const ts = Date.parse(`${i.timestamp.replace(' ', 'T')}+08:00`);
+        if (Number.isNaN(ts))
+            return false;
+        return nowMs - ts <= DEDUP_WINDOW_MS;
+    });
+    if (dupLast) {
+        logDebug(cwd, {
+            event: 'skip',
+            reason: 'duplicate-within-window',
+            changeId,
+            phase,
+            phaseSource,
+            contentLen,
+            summaryHash,
+            dedupWindowMs: DEDUP_WINDOW_MS,
+            dupOfInputId: dupLast.inputId,
+            dupOfTimestamp: dupLast.timestamp,
+        });
+        return {
+            continue: true,
+            hookSpecificOutput: {
+                inputRecorded: false,
+                triggerType: dupLast.triggerType,
+                summaryLength: (dupLast.summary || '').length,
+            },
         };
     }
-    // Write user inputs file
+    // 计算 phaseInputIndex：当前 phase 已有条数 + 1
+    const phaseInputIndex = userInputs.inputs.filter(i => i.phase === phase).length + 1;
+    inputRecord.phaseInputIndex = phaseInputIndex;
+    // === Task 0 + Task 4：若当前 phase 的 baseline 已打标，写入 correctionContext
+    // （将后续 Write/Edit 视为纠偏）。 source='post-baseline-prompt'
+    let baselineBranch = 'baseline-phase-skip';
+    let baselineMarkedFlag = false;
+    try {
+        if (['techDesign', 'propose', 'apply', 'review'].includes(phase)
+            && await FileSystemUtils.fileExists(progressPath)) {
+            const progress = JSON.parse(await FileSystemUtils.readFile(progressPath));
+            const key = phase;
+            baselineMarkedFlag = !!progress.phaseBaselines?.[key]?.markedAt;
+            if (baselineMarkedFlag) {
+                const now = Date.now();
+                const nowIso = getBeijingTime();
+                const expiresAt = new Date(now + 30 * 60 * 1000).toISOString();
+                const snippet = content.slice(0, 120);
+                const cc = {
+                    active: true,
+                    resolvedAt: nowIso,
+                    path: 'A', // post-baseline-prompt 占位：语义上等价 “继续修改”
+                    expiresAt,
+                    phase,
+                    source: 'post-baseline-prompt',
+                    promptIndex: phaseInputIndex,
+                    promptId: inputRecord.inputId,
+                    promptSnippet: snippet,
+                };
+                progress.correctionContext = cc;
+                await atomicWriteJson(progressPath, progress);
+                baselineBranch = 'baseline-write';
+            }
+            else {
+                baselineBranch = 'baseline-miss';
+            }
+        }
+    }
+    catch {
+        baselineBranch = 'baseline-error';
+        // correctionContext 写入失败不阻断 user input 主流程
+    }
+    inputRecord.postBaseline = baselineMarkedFlag;
+    // === 四选一 / 需求变更注入（v2.15.15 接管自 deviation-check post-prompt 分支）
+    // 触发条件：apply 阶段 + baseline 已打标 + 命中硬关键词（不做冷却限制，每次命中都弹）
+    let injectedOutput = null;
+    let injectionEvent = 'no-hard-signal';
+    if (correctionSignal.kind === 'hard') {
+        if (phase !== 'apply') {
+            injectionEvent = 'phase-not-apply';
+        }
+        else if (!baselineMarkedFlag) {
+            injectionEvent = 'not-post-baseline';
+        }
+        else if (!await FileSystemUtils.fileExists(proposalPath)) {
+            injectionEvent = 'no-proposal';
+        }
+        else {
+            const isReqChange = !!correctionSignal.isRequirementChange;
+            try {
+                if (!fs.existsSync(changeDir))
+                    fs.mkdirSync(changeDir, { recursive: true });
+                // 写 .pending-correction（兼容 pre-tool hook 拦截 + resolve-correction 回写）
+                fs.writeFileSync(pendingMarkerPath, JSON.stringify({
+                    createdAt: Date.now(),
+                    prompt: content.slice(0, 500),
+                    changeId,
+                    phase,
+                    reason: isReqChange ? 'requirement-change' : undefined,
+                    promptId: inputRecord.inputId,
+                    phaseInputIndex,
+                    promptSnippet: inputRecord.summary.slice(0, 120),
+                    source: 'user-input-hook',
+                    matchedKeywords: correctionSignal.matchedKeywords,
+                }, null, 2), 'utf-8');
+                // v2.15.16 Sprint 3：.correction-log 写入已下线，纠偏详情统一由 user_inputs.json 记录。
+            }
+            catch {
+                // 文件操作失败不阻断 additionalContext 注入
+            }
+            try {
+                const proposalContent = await FileSystemUtils.readFile(proposalPath);
+                const proposalSummary = extractProposalSummary(proposalContent, 1500);
+                const additionalContext = isReqChange
+                    ? buildRequirementChangeContext(proposalSummary, changeId)
+                    : buildCorrectionOptionsContext(proposalSummary, changeId);
+                const options = isReqChange
+                    ? [
+                        'A. 先修 Spec — 先更新 proposal/tasks/specs，再改代码',
+                        'D. 取消本次需求变更',
+                    ]
+                    : [
+                        'A. 先修 Spec — 先更新 proposal/tasks/specs，再改代码',
+                        'B. Bug 修复豁免 — 直接改代码，本次不更新 Spec',
+                        'C. 纯设计细节 — 不改 Spec 不改代码，仅口头澄清',
+                        'D. 取消本次修改',
+                    ];
+                inputRecord.resolution = {
+                    ...(inputRecord.resolution ?? {}),
+                    triggeredFourOption: true,
+                };
+                injectedOutput = {
+                    continue: true,
+                    systemMessage: isReqChange
+                        ? '⚠️ 检测到需求变更信号——已注入需求变更上下文，请主 Agent 用 askUserQuestion 向用户确认。'
+                        : '⚠️ 检测到用户纠偏信号——已注入纠偏四选一上下文，请主 Agent 用 askUserQuestion 向用户展示选项。',
+                    hookSpecificOutput: {
+                        inputRecorded: true,
+                        triggerType: inputRecord.triggerType,
+                        summaryLength: inputRecord.summary.length,
+                        additionalContext,
+                        options,
+                    },
+                };
+                injectionEvent = isReqChange ? 'injected-requirement-change' : 'injected-correction';
+            }
+            catch {
+                injectionEvent = 'inject-error';
+            }
+        }
+    }
+    // Push and persist user inputs file（postBaseline / correctionSignal / resolution 一并落盘）
+    userInputs.inputs.push(inputRecord);
     await FileSystemUtils.writeFile(userInputPath, JSON.stringify(userInputs, null, 2));
+    logDebug(cwd, {
+        event: 'record',
+        changeId,
+        phase,
+        phaseSource,
+        triggerType: inputRecord.triggerType,
+        phaseInputIndex,
+        inputId: inputRecord.inputId,
+        contentLen,
+        baselineBranch,
+        baselineMarked: baselineMarkedFlag,
+        correctionKind: correctionSignal.kind,
+        matchedKeywords: correctionSignal.matchedKeywords,
+        isRequirementChange: !!correctionSignal.isRequirementChange,
+        injectionEvent,
+    });
+    if (injectedOutput) {
+        return injectedOutput;
+    }
     return {
         continue: true,
         systemMessage: `📝 User input recorded: ${inputRecord.triggerType} (${inputRecord.summary.length} chars)`,
@@ -152,7 +464,11 @@ export async function runUserInputHook() {
     catch {
         // Ignore parse errors
     }
-    const content = stdinData.user_message || '';
+    // Claude Code / Codex UserPromptSubmit 的标准字段为 `prompt`；
+    // 兼容历史调用方使用 `user_message` 传入的情况。
+    const content = (stdinData.prompt
+        || stdinData.user_message
+        || '').toString();
     const responseTimeMs = typeof stdinData.response_time_ms === 'number'
         ? stdinData.response_time_ms
         : undefined;
@@ -161,7 +477,18 @@ export async function runUserInputHook() {
         return;
     }
     const output = await userInputHook(content, responseTimeMs);
-    console.log(JSON.stringify(output));
+    // Claude Code requires `hookSpecificOutput.hookEventName` for every UserPromptSubmit
+    // hook response; omitting it fails JSON validation with the error:
+    //   "Hook JSON output validation failed — hookSpecificOutput is missing required field hookEventName"
+    // Align with deviation-check.ts envelope handling for parity across hosts.
+    const hookEvent = 'UserPromptSubmit';
+    const jsonOutput = output.hookSpecificOutput
+        ? { ...output, hookSpecificOutput: { hookEventName: hookEvent, ...output.hookSpecificOutput } }
+        : output;
+    const payload = detectHookHost() === 'codex'
+        ? sanitizeCodexEnvelope(jsonOutput, hookEvent)
+        : jsonOutput;
+    console.log(JSON.stringify(payload));
 }
 async function readStdin() {
     return new Promise((resolve) => {
@@ -172,8 +499,6 @@ async function readStdin() {
         process.stdin.on('error', () => resolve(null));
     });
 }
-// CLI execution
-if (require.main === module) {
-    runUserInputHook();
-}
+// 此文件仅作为库被 cli/hooks.ts 导入，CLI 入口由 commander 注册；
+// ESM 下无需也不应使用 require.main 判定。
 //# sourceMappingURL=user-input-hook.js.map