intentdna 1.5.13 → 1.5.15

package/dist/hooks/state-manager.js

@@ -0,0 +1,135 @@
+/**
+ * Intent DNA — DNAStateManager
+ *
+ * Class-based facade over state.ts module functions. Bundles projectDir +
+ * sessionId into a single object so call sites don't repeat those args.
+ * Adds experience chain persistence (markdown + structured JSON) and
+ * lifecycle operations (init / cleanup / isStale) that state.ts lacks.
+ *
+ * Existing state.ts functions remain the canonical I/O primitives — this
+ * class delegates to them. Prefer this class in new code; state.ts exports
+ * are @deprecated for direct use.
+ */
+import { readFile, mkdir, unlink, stat } from "node:fs/promises";
+import { join } from "node:path";
+import { resolveStateDir, readWorkflowState as rwState, writeWorkflowState as wwState, clearWorkflowState as cwState, appendAudit as aAudit, readSurgeonAttempts as rSurg, writeSurgeonAttempts as wSurg, readSessionReads as rReads, appendSessionRead as aRead, atomicWrite, } from "./state.js";
+const EXPERIENCE_JSON = "workflow/experience.json";
+const EXPERIENCE_MD = "workflow/experience.md";
+const DEFAULT_STALENESS_MS = 2 * 60 * 60 * 1000; // 2h — matches state.ts
+// ── Manager ────────────────────────────────────────────────
+export class DNAStateManager {
+    projectDir;
+    sessionId;
+    constructor(projectDir, sessionId) {
+        this.projectDir = projectDir;
+        this.sessionId = sessionId;
+    }
+    // ── Workflow state ──
+    readWorkflowState(stalenessMs = DEFAULT_STALENESS_MS) {
+        return rwState(this.projectDir, this.sessionId, stalenessMs);
+    }
+    writeWorkflowState(state) {
+        return wwState(this.projectDir, state, this.sessionId);
+    }
+    clearWorkflowState() {
+        return cwState(this.projectDir, this.sessionId);
+    }
+    // ── Audit log ──
+    appendAudit(entry) {
+        return aAudit(this.projectDir, entry);
+    }
+    // ── Surgeon attempts ──
+    readSurgeonAttempts() {
+        return rSurg(this.projectDir, this.sessionId);
+    }
+    writeSurgeonAttempts(state) {
+        return wSurg(this.projectDir, state, this.sessionId);
+    }
+    // ── Session reads ──
+    readSessionReads() {
+        return rReads(this.projectDir, this.sessionId);
+    }
+    appendSessionRead(filePath) {
+        return aRead(this.projectDir, filePath, this.sessionId);
+    }
+    // ── Experience chain (new) ──
+    async readExperienceChain() {
+        const path = this.path(EXPERIENCE_JSON);
+        try {
+            const raw = await readFile(path, "utf-8");
+            const parsed = JSON.parse(raw);
+            return Array.isArray(parsed) ? parsed : [];
+        }
+        catch {
+            return [];
+        }
+    }
+    async writeExperienceChain(chain) {
+        await atomicWrite(this.path(EXPERIENCE_JSON), JSON.stringify(chain, null, 2));
+        await atomicWrite(this.path(EXPERIENCE_MD), renderExperienceMarkdown(chain));
+    }
+    async appendExperience(entry) {
+        const chain = await this.readExperienceChain();
+        chain.push(entry);
+        await this.writeExperienceChain(chain);
+    }
+    // ── Lifecycle ──
+    /** Ensure session directory structure exists. */
+    async init() {
+        await mkdir(resolveStateDir(this.projectDir, this.sessionId), { recursive: true });
+    }
+    /**
+     * Remove this manager's state files.
+     * Callers that need trace rotation should invoke rotateTraces() from state.ts separately.
+     */
+    async cleanup() {
+        const dir = resolveStateDir(this.projectDir, this.sessionId);
+        for (const rel of ["workflow.json", EXPERIENCE_JSON, EXPERIENCE_MD, "workflow/surgeon-attempts.json", "workflow/session-reads.json"]) {
+            await unlink(join(dir, rel)).catch(() => { });
+        }
+    }
+    /** True when workflow.json started_at exceeds the staleness threshold. */
+    async isStale(stalenessMs = DEFAULT_STALENESS_MS) {
+        const wfPath = join(resolveStateDir(this.projectDir, this.sessionId), "workflow.json");
+        try {
+            const raw = await readFile(wfPath, "utf-8");
+            const state = JSON.parse(raw);
+            if (!state.started_at)
+                return false;
+            return Date.now() - new Date(state.started_at).getTime() > stalenessMs;
+        }
+        catch {
+            // No workflow.json — fall back to directory mtime for unparseable state
+            try {
+                const s = await stat(wfPath);
+                return Date.now() - s.mtimeMs > stalenessMs;
+            }
+            catch {
+                return false;
+            }
+        }
+    }
+    path(rel) {
+        return join(resolveStateDir(this.projectDir, this.sessionId), rel);
+    }
+}
+// ── Markdown rendering ────────────────────────────────────
+function renderExperienceMarkdown(chain) {
+    if (chain.length === 0) {
+        return "# Experience chain\n\n_Empty — no attempts yet._\n";
+    }
+    const lines = ["# Experience chain", ""];
+    for (const e of chain) {
+        lines.push(`## Round ${e.round} — ${e.timestamp}`);
+        lines.push("");
+        lines.push(`**Analysis:** ${e.analysis}`);
+        lines.push("");
+        lines.push(`**Attempt:** ${e.attempt}`);
+        lines.push("");
+        lines.push(`**Result:** ${e.result}`);
+        lines.push("");
+        lines.push(`**Lesson:** ${e.lesson}`);
+        lines.push("");
+    }
+    return lines.join("\n");
+}

package/dist/hooks/state.d.ts

@@ -56,20 +56,24 @@ export interface SurgeonAttemptState {
 export declare function resolveStateDir(projectDir: string, sessionId?: string): string;
 /**
  * Read current workflow state. Returns null if not found or stale.
+ * @deprecated Prefer `new DNAStateManager(projectDir, sessionId).readWorkflowState()`.
  */
 export declare function readWorkflowState(projectDir: string, sessionId?: string, stalenessMs?: number): Promise<DNAWorkflowState | null>;
 /**
  * Write workflow state atomically.
+ * @deprecated Prefer `DNAStateManager.writeWorkflowState()`.
  */
 export declare function writeWorkflowState(projectDir: string, state: DNAWorkflowState, sessionId?: string): Promise<void>;
 /**
  * Clear workflow state (workflow complete).
+ * @deprecated Prefer `DNAStateManager.clearWorkflowState()`.
  */
 export declare function clearWorkflowState(projectDir: string, sessionId?: string): Promise<void>;
 /**
  * Append an entry to the audit log with dedup protection.
  * Dedup key: event + tool_name + timestamp (second-level).
  * Log file: `.dna/audit/violations-YYYY-MM-DD.log` (JSON Lines format)
+ * @deprecated Prefer `DNAStateManager.appendAudit()`.
  */
 export declare function appendAudit(projectDir: string, entry: AuditEntry): Promise<void>;
 /**
@@ -84,10 +88,12 @@ export declare function appendCompletedArtifact(projectDir: string, stepId: stri
 export declare function atomicWrite(filePath: string, data: string): Promise<void>;
 /**
  * Read surgeon attempt state. Returns default state if not found.
+ * @deprecated Prefer `DNAStateManager.readSurgeonAttempts()`.
  */
 export declare function readSurgeonAttempts(projectDir: string, sessionId?: string): Promise<SurgeonAttemptState>;
 /**
  * Write surgeon attempt state atomically.
+ * @deprecated Prefer `DNAStateManager.writeSurgeonAttempts()`.
  */
 export declare function writeSurgeonAttempts(projectDir: string, state: SurgeonAttemptState, sessionId?: string): Promise<void>;
 /** Tracks which files a session has Read — for context gate enforcement */
@@ -97,6 +103,7 @@ export interface SessionReadsState {
 }
 /**
  * Read session reads state. Returns empty reads if not found.
+ * @deprecated Prefer `DNAStateManager.readSessionReads()`.
  */
 export declare function readSessionReads(projectDir: string, sessionId?: string): Promise<SessionReadsState>;
 /**
@@ -105,6 +112,7 @@ export declare function readSessionReads(projectDir: string, sessionId?: string)
 export declare function writeSessionReads(projectDir: string, state: SessionReadsState, sessionId?: string): Promise<void>;
 /**
  * Append a file path to session reads (dedup).
+ * @deprecated Prefer `DNAStateManager.appendSessionRead()`.
  */
 export declare function appendSessionRead(projectDir: string, filePath: string, sessionId?: string): Promise<void>;
 /** Trace entry for hook call observability */

package/dist/hooks/state.js

@@ -30,6 +30,7 @@ export function resolveStateDir(projectDir, sessionId) {
 // ── Workflow State ─────────────────────────────────────────
 /**
  * Read current workflow state. Returns null if not found or stale.
+ * @deprecated Prefer `new DNAStateManager(projectDir, sessionId).readWorkflowState()`.
  */
 export async function readWorkflowState(projectDir, sessionId, stalenessMs = DEFAULT_STALENESS_MS) {
     const stateDir = resolveStateDir(projectDir, sessionId);
@@ -51,6 +52,7 @@ export async function readWorkflowState(projectDir, sessionId, stalenessMs = DEF
 }
 /**
  * Write workflow state atomically.
+ * @deprecated Prefer `DNAStateManager.writeWorkflowState()`.
  */
 export async function writeWorkflowState(projectDir, state, sessionId) {
     const stateDir = resolveStateDir(projectDir, sessionId);
@@ -60,6 +62,7 @@ export async function writeWorkflowState(projectDir, state, sessionId) {
 }
 /**
  * Clear workflow state (workflow complete).
+ * @deprecated Prefer `DNAStateManager.clearWorkflowState()`.
  */
 export async function clearWorkflowState(projectDir, sessionId) {
     const stateDir = resolveStateDir(projectDir, sessionId);
@@ -76,6 +79,7 @@ export async function clearWorkflowState(projectDir, sessionId) {
  * Append an entry to the audit log with dedup protection.
  * Dedup key: event + tool_name + timestamp (second-level).
  * Log file: `.dna/audit/violations-YYYY-MM-DD.log` (JSON Lines format)
+ * @deprecated Prefer `DNAStateManager.appendAudit()`.
  */
 export async function appendAudit(projectDir, entry) {
     const auditDir = join(projectDir, ".dna", "audit");
@@ -153,6 +157,7 @@ function defaultSurgeonState() {
 }
 /**
  * Read surgeon attempt state. Returns default state if not found.
+ * @deprecated Prefer `DNAStateManager.readSurgeonAttempts()`.
  */
 export async function readSurgeonAttempts(projectDir, sessionId) {
     const stateDir = resolveStateDir(projectDir, sessionId);
@@ -167,6 +172,7 @@ export async function readSurgeonAttempts(projectDir, sessionId) {
 }
 /**
  * Write surgeon attempt state atomically.
+ * @deprecated Prefer `DNAStateManager.writeSurgeonAttempts()`.
  */
 export async function writeSurgeonAttempts(projectDir, state, sessionId) {
     const stateDir = resolveStateDir(projectDir, sessionId);
@@ -176,6 +182,7 @@ export async function writeSurgeonAttempts(projectDir, state, sessionId) {
 const SESSION_READS_FILE = "workflow/session-reads.json";
 /**
  * Read session reads state. Returns empty reads if not found.
+ * @deprecated Prefer `DNAStateManager.readSessionReads()`.
  */
 export async function readSessionReads(projectDir, sessionId) {
     const stateDir = resolveStateDir(projectDir, sessionId);
@@ -198,6 +205,7 @@ export async function writeSessionReads(projectDir, state, sessionId) {
 }
 /**
  * Append a file path to session reads (dedup).
+ * @deprecated Prefer `DNAStateManager.appendSessionRead()`.
  */
 export async function appendSessionRead(projectDir, filePath, sessionId) {
     const state = await readSessionReads(projectDir, sessionId);

package/dist/mcp/tools-enforce.js

@@ -66,6 +66,10 @@ const VALID_EVENTS = new Set([
     "SubagentStop", "PreCompact", "Notification", "SessionStart",
 ]);
 function dispatchEnforce(event, ir, input, roles) {
+    const result = dispatchEnforceInner(event, ir, input, roles);
+    return result?.output ?? { continue: true, suppressOutput: true };
+}
+function dispatchEnforceInner(event, ir, input, roles) {
     switch (event) {
         case "PreToolUse":
             return enforcePreToolUse(ir, {
@@ -100,10 +104,10 @@ function dispatchEnforce(event, ir, input, roles) {
         case "SessionStart":
             return enforceSessionStart(ir, {
                 cwd: typeof input.cwd === "string" ? input.cwd : undefined,
-                session_id: typeof input.session_id === "string" ? input.session_id : undefined,
+                sessionId: typeof input.session_id === "string" ? input.session_id : undefined,
             });
         default:
-            return { continue: true, suppressOutput: true };
+            return null;
     }
 }
 // ── Tool Registration ───────────────────────────────────────

package/dist/templates/flutter-rewrite.dna.yaml

@@ -131,9 +131,9 @@ context_files:
       - "docs/behavior/{{ARGUMENTS}}.md"
     analysis_reviewer:
       - "docs/behavior/{{ARGUMENTS}}.md"
-      - ".omc/specs/diagnosis-{{ARGUMENTS}}.md"
+      - ".dna/specs/diagnosis-{{ARGUMENTS}}.md"
     surgeon:
-      - ".omc/specs/diagnosis-{{ARGUMENTS}}.md"
+      - ".dna/specs/diagnosis-{{ARGUMENTS}}.md"
     test_runner:
       - "docs/behavior/{{ARGUMENTS}}.md"
 
@@ -201,7 +201,7 @@ roles:
       read: ["**/*"]
       write: ["lib/**", "v2/**", "test/**"]
     instructions:
-      - "REQUIRED FIRST: Read context files — CLAUDE.md, docs/refactoring-workflow-v2.md, v2/docs/PROVIDER_DESIGN.md, and the diagnosis spec (.omc/specs/diagnosis-$ARGUMENTS.md). Then read v1 corresponding file before any Edit. Hook will block Edit if context files are not read."
+      - "REQUIRED FIRST: Read context files — CLAUDE.md, docs/refactoring-workflow-v2.md, v2/docs/PROVIDER_DESIGN.md, and the diagnosis spec (.dna/specs/diagnosis-$ARGUMENTS.md). Then read v1 corresponding file before any Edit. Hook will block Edit if context files are not read."
       - Fix only the identified breakpoint or missing implementation
       - Read v1 to understand intent, rewrite in v2 framework style
       - Do not copy v1 code verbatim — adapt to v2 architecture
@@ -235,17 +235,17 @@ roles:
 
   # ── v2 角色: diagnosis + fix workflow ──
   analyzer:
-    description: "Reads code and classifies failing tests. Read-only."
+    description: "Reads code and classifies failing tests. Writes diagnosis spec only."
     tool_permissions:
-      allow: [Read, Grep, Glob]
-      deny: [Bash, Edit, Write, NotebookEdit]
+      allow: [Read, Grep, Glob, Write]
+      deny: [Bash, Edit, NotebookEdit]
     scope:
       read: ["**/*"]
-      write: []
+      write: [".dna/specs/**"]
     instructions:
       - "REQUIRED FIRST: Read all context files listed in SKILL.md"
-      - "For each failing test: read test code + v1 impl + v2 impl"
-      - "Classify each failure as BUG / INFRA / REMOVED / TEST_BUG"
+      - "For each failing, skipped, and hung test: read test code + v1 impl + v2 impl"
+      - "Classify each as BUG / UNIMPLEMENTED / INFRA / REMOVED / TEST_BUG (skipped tests are usually UNIMPLEMENTED)"
       - "Output diagnosis spec with v1 code snippets + v2 current state"
       - "DO NOT run tests. DO NOT edit code. Analysis only."
 
@@ -324,6 +324,10 @@ workflows:
           - Do NOT use `sleep N && check` polling — run commands in foreground
           - Do NOT use `timeout Nm flutter test` — let tests run to completion
           - Do NOT rewrite existing test files from scratch — update incrementally
+
+          Report results and STOP.
+
+          Next step for user: Run /dna-frw-diagnosis $ARGUMENTS to analyze failing tests.
         handoff:
           consumes:
             - type: file
@@ -514,19 +518,19 @@ workflows:
           For module $ARGUMENTS, analyze failing tests in baseline:
           1. Read behavior doc: docs/behavior/$ARGUMENTS.md
           2. Read test results from last behavior-lock run
-          3. For each failing test:
+          3. For each failing, skipped, and hung test:
              a. Read test code (what behavior does it expect?)
              b. Read v1 implementation (how did v1 do this?)
              c. Read v2 current state (what's missing/wrong?)
-             d. Classify: BUG / INFRA / REMOVED / TEST_BUG
-          4. Write .omc/specs/diagnosis-$ARGUMENTS.md with:
+             d. Classify: BUG / UNIMPLEMENTED / INFRA / REMOVED / TEST_BUG
+          4. Write .dna/specs/diagnosis-$ARGUMENTS.md with:
              - For each failure: v1 code snippet + v2 current state + classification
              - NO fix prescriptions (surgeon decides how to implement)
              - NO running tests (analysis only)
         handoff:
           produces:
             - type: file
-              path: ".omc/specs/diagnosis-$ARGUMENTS.md"
+              path: ".dna/specs/diagnosis-$ARGUMENTS.md"
               description: "Diagnosis spec for module"
 
       - id: review
@@ -535,7 +539,7 @@ workflows:
         max_attempts: 2
         description: "Review analyzer output quality"
         prompt: |
-          Read context files + .omc/specs/diagnosis-$ARGUMENTS.md
+          Read context files + .dna/specs/diagnosis-$ARGUMENTS.md
 
           Verify:
           1. All failing tests from baseline covered?
@@ -548,7 +552,7 @@ workflows:
         handoff:
           consumes:
             - type: file
-              path: ".omc/specs/diagnosis-$ARGUMENTS.md"
+              path: ".dna/specs/diagnosis-$ARGUMENTS.md"
               description: "Diagnosis spec from analyzer"
           produces:
             - type: summary
@@ -572,11 +576,12 @@ workflows:
 
           Read context + diagnosis spec first.
 
-          Process issues in priority order: INFRA → BUG → TEST_BUG
+          Process issues in priority order: INFRA → BUG → UNIMPLEMENTED → TEST_BUG
           (REMOVED skipped — needs user confirmation)
 
           For each issue:
           - BUG: read v1 file, edit v2 (use Riverpod per refactoring-workflow-v2.md)
+          - UNIMPLEMENTED: read v1 impl, implement in v2 style, remove skip marker from test
           - INFRA: edit test_helpers only, do NOT touch v2/lib
           - TEST_BUG: re-read v1, edit test to match v1 behavior
 
@@ -588,7 +593,7 @@ workflows:
         handoff:
           consumes:
             - type: file
-              path: ".omc/specs/diagnosis-$ARGUMENTS.md"
+              path: ".dna/specs/diagnosis-$ARGUMENTS.md"
               description: "Diagnosis spec"
           produces:
             - type: git_commit

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intentdna",
-  "version": "1.5.13",
+  "version": "1.5.15",
   "description": "Intent DNA — Declarative policy layer for AI agent behavior",
   "type": "module",
   "main": "dist/index.js",
@@ -20,7 +20,7 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/lushan1314/intentdna.git"
+    "url": "git+https://github.com/lushan1314/intentdna-repo.git"
   },
   "keywords": [
     "ai",
@@ -41,6 +41,7 @@
   ],
   "devDependencies": {
     "@types/node": "^25.3.3",
+    "fast-check": "^4.7.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   }

package/spec/hooks-infra-harness-hardening.md

@@ -93,6 +93,8 @@ npm test
 **测试**: +20
 **破坏性**: 无（纯增量）
 
+**实施状态（2026-04-20 更新）**: 与 Phase 1B 合并完成，产出 +108 测试（schema+contract ≈18 属 1A，其余属 1B 断言重写）。评审 GO with reservations。未提交，3 个 blocker 待修（见本 spec 末尾"Phase 1A+1B 合并 Followup"章节）。
+
 ### 1A.1 新建 src/hooks/schema.ts
 
 ```typescript
@@ -163,6 +165,8 @@ npm test  # 全绿，+20 新测试
 **破坏性**: 是（限定在此 phase）
 **依赖**: Phase 1A
 
+**实施状态（2026-04-20 更新）**: 与 Phase 1A 一起完成（autopilot 超范围）。类型/签名/断言重写都到位，未提交。
+
 ### 1B.1 protocol.ts 新增类型
 
 ```typescript
@@ -261,13 +265,15 @@ npm test  # 全绿，+15 新测试
 
 ---
 
-## Phase 2A: DNAStateManager
+## Phase 2A: DNAStateManager ✓ (2026-04-21)
 
 **目标**: 统一所有 state 操作，支持 session reads + surgeon attempts + experience chain
-**测试**: +20
+**测试**: +21 (state-manager.test.ts)
 **破坏性**: 无（旧函数 @deprecated 保留）
 **可与 Phase 1A 并行**
 
+**实施**: `src/hooks/state-manager.ts` — 类 facade 封装 workflow / audit / surgeon / session reads，新增 experience chain (json + markdown dual-write) 和 init/cleanup/isStale 生命周期。state.ts 全部被 manager 替代的函数加 `@deprecated`。1076 tests pass (1055 existing + 21 new)。
+
 ### 2A.1 新建 src/hooks/state-manager.ts
 
 ```typescript
@@ -343,13 +349,15 @@ npm test  # 全绿，+20 新测试
 
 ---
 
-## Phase 2B: Context Gate + Reflection Gate + Workflow Boundary
+## Phase 2B: Context Gate + Reflection Gate + Workflow Boundary ✓ (2026-04-21)
 
 **目标**: 3 个核心 Harness 加固机制
-**测试**: +15
+**测试**: +18 (hooks-harness.test.ts)
 **破坏性**: 无
 **依赖**: Phase 1B (EnforceResult) + Phase 2A (StateManager)
 
+**实施**: `src/hooks/cli.ts:handlePreToolGates()` — PreToolUse 前置门，按优先级评估 workflow_boundary 和 context_gate。Context gate 已从 v1.5.12 的 PostToolUse warn 模式迁移到 PreToolUse block 模式（spec 已确认去掉 warn 过渡期）。Reflection gate 保持 v1.5.10 PostToolUse 实现。Session-read 追踪由 PostToolUse Read 路径写入 `.dna/state/sessions/<id>/workflow/session-reads.json`。1094 tests pass (1076 + 18 new)。
+
 ### 2B.1 Context Gate — src/hooks/cli.ts
 
 在 PreToolUse 处理中新增：
@@ -508,13 +516,20 @@ npm test  # 全绿，+15 新测试
 
 ---
 
-## Phase 3: Stop Hook 智能编排 + Integration Tests
+## Phase 3: Stop Hook 智能编排 + Property Tests ✓ (2026-04-21)
 
-**目标**: Stop hook 从"继续工作"升级为"输出下一步 Agent 调用"；全链路集成测试
-**测试**: +25
+**目标**: Stop hook 从"继续工作"升级为"输出下一步 Agent 调用"；property-based 不变量验证
+**测试**: +22 (9 stop-guidance + 13 property)
 **破坏性**: 无
 **依赖**: Phase 2B
 
+**实施**:
+- `src/hooks/cli.ts:buildWorkflowGuidance()` — Stop hook 读 workflow state + reflection-config sidecar + surgeon attempts，按 (完成 / surgeon 停滞 / 正常) 三种情况输出 STOP 指令或 `Agent(subagent_type=..., prompt=...)` 调用模板。
+- `test/property/enforce-invariants.test.ts` — fast-check 属性测试 13 条，覆盖 checkContextReadiness 幂等性、checkReflectionLimit 三种分支边界、checkWorkflowBoundary completed=true/false 对偶、extractBashWritePaths / validateHookInput 不抛错 + 归一化一致性。
+- **跳过**: subprocess integration tests（`spawn dist/hooks/cli.js` 全链路）— 需要预先 `npm run build`，留待后续补充。不影响 gate 逻辑验证，因为 buildWorkflowGuidance / handlePreToolGates 都是可直接导入的纯/半纯函数，已有完整单测。
+
+1116 tests pass.
+
 ### 3.1 Stop Hook 智能编排 — src/hooks/cli.ts
 
 在 enforceStop 中，读 workflow state 后输出明确的下一步指令：
@@ -669,27 +684,58 @@ dna sync                        # 新 agent/skill 生成
 - [ ] trace metadata 不进入 HookOutput（CC 协议边界）
 - [ ] mcp/tools-enforce.ts 同步更新
 
-### Phase 2A
-- [ ] DNAStateManager class 实现
-- [ ] Session reads 追踪
-- [ ] Surgeon attempts 追踪
-- [ ] Experience chain 读写
-- [ ] init/cleanup 生命周期
-- [ ] state.ts 旧函数 @deprecated 保留
-
-### Phase 2B
-- [ ] Context gate: block Edit/Bash/Write if context files not read
-- [ ] Reflection gate: detect no-progress, warn/handoff/skip
-- [ ] Workflow boundary: block Skill() after workflow completed
-- [ ] PostToolUse Read → appendSessionRead
-- [ ] parseGreenCount 支持 3 种格式 + null 安全
-
-### Phase 3
-- [ ] Stop hook 读 workflow state 输出 Agent() 调用指令
-- [ ] Integration tests: spawn dna-hook 全链路
-- [ ] Property tests: 7 个不变量
+### Phase 2A ✓
+- [x] DNAStateManager class 实现
+- [x] Session reads 追踪
+- [x] Surgeon attempts 追踪
+- [x] Experience chain 读写（json + markdown dual-write）
+- [x] init/cleanup/isStale 生命周期
+- [x] state.ts 旧函数 @deprecated 保留
+
+### Phase 2B ✓
+- [x] Context gate: block Edit/Bash/Write if context files not read (PreToolUse, block mode)
+- [x] Reflection gate: detect no-progress, warn/handoff/skip (PostToolUse, v1.5.10+)
+- [x] Workflow boundary: block Skill() after workflow completed (wfState.active=false)
+- [x] PostToolUse Read → appendSessionRead
+- [x] parseGreenCount 支持 3 种格式 + null 安全 (v1.5.10+ TEST_PASSED_RE)
+
+### Phase 3 ✓ (partial — integration tests deferred)
+- [x] Stop hook 读 workflow state 输出 Agent() 调用指令 (buildWorkflowGuidance)
+- [ ] Integration tests: spawn dna-hook 全链路 (deferred — 需 build 先行)
+- [x] Property tests: 13 个不变量 (fast-check)
 
 ### Phase 4
 - [ ] dna verify --health 通过
 - [ ] lwk_flutter diagnosis → fix 流程验证
 - [ ] 发版
+
+---
+
+## Phase 1A+1B 合并 Followup（2026-04-20 评审产出 → 2026-04-21 已修）
+
+autopilot 超范围将 1A+1B 一并完成，3 个 blocker 均已修复：
+
+### Blocker 1: schema.ts 接入 cli.ts ✓
+
+**实施**: `src/hooks/cli.ts:24,125-137` — 在 `readStdin` 后、任何业务逻辑前调用 `validateHookInput(event, rawStdin)`；无效输入 fail-open（stderr 警告 + silent exit），有效输入使用 `validation.normalized` 作为后续 `rawInput`（session_id 已归一化为 sessionId）。
+
+### Blocker 2: matched_rule 语义修正 ✓
+
+**实施**: `src/hooks/protocol.ts:100` — MatchedRule 枚举新增 `"validator"`；`src/hooks/enforce.ts:155-160` — audit-only 路径使用 `"validator"`，bash scope 违规仍用 `"scope"`（真实路径匹配）。
+
+### Blocker 3: commit 信息如实 ✓
+
+**实施**: commit message 明确标注 "Phase 1A+1B 合并（autopilot 超范围）+ 3 blocker 修复"。
+
+### Phase 1A/1B 验收全 PASS
+
+- [x] schema.ts validateHookInput() 实现 + 接入 cli.ts
+- [x] 8 个真实 CC fixture 文件 + contract tests 全链路通过
+- [x] SessionStartInput snake_case bug 已修
+- [x] EnforceResult + TraceMetadata 类型定义
+- [x] matched_rule 包含 context_gate / reflection_gate / workflow_boundary / validator
+- [x] 8 个 enforce 函数返回 EnforceResult
+- [x] cli.ts 不再猜 decision（读 `result.output`）
+- [x] trace metadata 不进入 HookOutput（CC 协议边界）
+- [x] mcp/tools-enforce.ts 同步更新
+- [x] 全量测试 1055 passed