add-coder 0.3.26 → 0.3.27

package/templates/core/prisma/add.prisma

@@ -1,43 +1,54 @@
 // add.prisma — ADD 治理模型，独立于用户业务表
 
 model AddUser {
-  id              String          @id @default(cuid())
-  username        String          @unique
-  email           String?
-  devOperations   DevOperation[]
-  auditLogs       AuditLog[]
+  id            String         @id @default(cuid())
+  username      String         @unique
+  email         String?
+  devOperations DevOperation[]
+  auditLogs     AuditLog[]
 }
 
 model DevOperation {
-  id          String   @id @default(cuid())
-  userId      String
-  user        AddUser  @relation(fields: [userId], references: [id], onDelete: Cascade)
-  planKeyword String
-  action      String
-  targetType  String
-  targetId    String
-  beforeState Json?
-  afterState  Json?
-  reason      String?
-  createdAt   DateTime @default(now())
+  id                 String   @id @default(cuid())
+  userId             String
+  user               AddUser  @relation(fields: [userId], references: [id], onDelete: Cascade)
+  projectKey         String   @default("legacy-unknown")
+  producerAdapterKey String   @default("legacy-unknown")
+  contextId          String   @default("legacy-unknown")
+  toolName           String   @default("record_dev_operation")
+  operationKey       String   @default(cuid())
+  planKeyword        String
+  action             String
+  targetType         String
+  targetId           String
+  beforeState        Json?
+  afterState         Json?
+  reason             String?
+  createdAt          DateTime @default(now())
 
+  @@unique([projectKey, producerAdapterKey, toolName, operationKey])
   @@index([planKeyword])
+  @@index([projectKey, producerAdapterKey, planKeyword])
 }
 
 model AuditLog {
-  id          String   @id @default(cuid())
-  userId      String
-  user        AddUser  @relation(fields: [userId], references: [id], onDelete: Cascade)
-  action      String
-  targetType  String
-  targetId    String
-  traceId     String?
-  beforeState Json?
-  afterState  Json?
-  reason      String?
-  createdAt   DateTime @default(now())
+  id                 String   @id @default(cuid())
+  userId             String
+  user               AddUser  @relation(fields: [userId], references: [id], onDelete: Cascade)
+  projectKey         String   @default("legacy-unknown")
+  producerAdapterKey String   @default("legacy-unknown")
+  contextId          String   @default("legacy-unknown")
+  action             String
+  targetType         String
+  targetId           String
+  traceId            String?
+  beforeState        Json?
+  afterState         Json?
+  reason             String?
+  createdAt          DateTime @default(now())
 
   @@index([traceId])
+  @@index([projectKey, producerAdapterKey, contextId])
 }
 
 // ===== HITL 人机审核架构 =====
@@ -61,65 +72,85 @@ enum ReviewType {
   RUNTIME
 }
 
+enum PlanLifecycleStatus {
+  DRAFT
+  ACTIVE
+  BLOCKED
+  REJECTED
+  CLOSED
+  ABANDONED
+}
+
 model HitlRecord {
-  id           String      @id @default(cuid())
+  id           String     @id @default(cuid())
+  projectKey   String     @default("legacy-unknown")
+  adapterKey   String     @default("legacy-unknown")
   planName     String
-  plan         PlanRecord  @relation(fields: [planName], references: [planName])
-  round        Int         @default(1)
-  type         HitlType    @default(PLAN)
-  status       HitlStatus  @default(DRAFT)
+  plan         PlanRecord @relation(fields: [projectKey, adapterKey, planName], references: [projectKey, adapterKey, planName], onDelete: Cascade)
+  round        Int        @default(1)
+  type         HitlType   @default(PLAN)
+  status       HitlStatus @default(DRAFT)
   proposalPath String?
   approvedAt   DateTime?
   rejectedAt   DateTime?
   rejectReason String?
-  createdBy    String      @default("ai-assistant")
-  createdAt    DateTime    @default(now())
-  updatedAt    DateTime    @updatedAt
+  createdBy    String     @default("ai-assistant")
+  createdAt    DateTime   @default(now())
+  updatedAt    DateTime   @updatedAt
 
-  @@unique([planName, round])
-  @@index([planName])
+  @@unique([projectKey, adapterKey, planName, type, round])
+  @@index([projectKey, adapterKey, planName])
   @@index([status])
 }
 
 model PlanRecord {
-  id             String        @id @default(cuid())
-  planName       String        @unique
-  planPath       String
-  specPath       String?
-  tasksPath      String?
-  checklistPath  String?
-  addRoutePath   String?
-  totalTasks     Int           @default(0)
-  doneTasks      Int           @default(0)
-  checklistT     Int           @default(0)
-  checklistTDone Int           @default(0)
-  checklistR     Int           @default(0)
-  planKeyword    String?
+  id               String                     @id @default(cuid())
+  projectKey       String                     @default("legacy-unknown")
+  adapterKey       String                     @default("legacy-unknown")
+  planName         String
+  lifecycle        PlanLifecycleStatus        @default(DRAFT)
+  revision         Int                        @default(0)
+  planPath         String
+  specPath         String?
+  tasksPath        String?
+  checklistPath    String?
+  addRoutePath     String?
+  totalTasks       Int                        @default(0)
+  doneTasks        Int                        @default(0)
+  checklistT       Int                        @default(0)
+  checklistTDone   Int                        @default(0)
+  checklistR       Int                        @default(0)
+  planKeyword      String?
   // 并发协作契约：该 Plan 在契约中的角色（MASTER=总控 / SUB=子 Plan）
-  contractRole   ContractRole?
+  contractRole     ContractRole?
   // 所属契约名（与 CollabContract.contractName 对应，反查用）
-  contractName   String?
+  contractName     String?
   // 作为总控 Plan 持有的契约（masterPlanName 外键方向）
-  masterContract CollabContract?
+  masterContract   CollabContract?            @relation("MasterPlan")
+  contractBindings CollaborationPlanBinding[]
   // DPS 四维评分历史（check_dps 调用后回写，供 FFT 自适应权重消费）
-  dpsSemScore    Int?          // 语义相关性 0-100
-  dpsEntropyScore Int?         // 信息熵匹配 0-100
-  dpsCpmScore    Int?          // CPM 关键路径 0-100
-  dpsStructScore Int?          // 结构完整度 0-100
-  dpsComposite   Int?          // 加权 DPS 总分 0-100
-  hitls          HitlRecord[]
-  reviews        ReviewRecord[]
-  createdAt      DateTime      @default(now())
-  updatedAt      DateTime      @updatedAt
-
+  dpsSemScore      Int? // 语义相关性 0-100
+  dpsEntropyScore  Int? // 信息熵匹配 0-100
+  dpsCpmScore      Int? // CPM 关键路径 0-100
+  dpsStructScore   Int? // 结构完整度 0-100
+  dpsComposite     Int? // 加权 DPS 总分 0-100
+  hitls            HitlRecord[]
+  reviews          ReviewRecord[]
+  createdAt        DateTime                   @default(now())
+  updatedAt        DateTime                   @updatedAt
+
+  @@unique([projectKey, adapterKey, planName])
   @@index([planKeyword])
   @@index([contractName])
+  @@index([projectKey, adapterKey, lifecycle])
 }
 
 model ReviewRecord {
   id           String     @id @default(cuid())
+  projectKey   String     @default("legacy-unknown")
+  adapterKey   String     @default("legacy-unknown")
   planName     String
-  plan         PlanRecord @relation(fields: [planName], references: [planName], onDelete: Cascade)
+  plan         PlanRecord @relation(fields: [projectKey, adapterKey, planName], references: [projectKey, adapterKey, planName], onDelete: Cascade)
   type         ReviewType @default(PLAN_REVIEW)
   reviewPath   String?
   p0Count      Int        @default(0)
@@ -128,33 +159,60 @@ model ReviewRecord {
   createdAt    DateTime   @default(now())
   updatedAt    DateTime   @updatedAt
 
-  @@index([planName])
+  @@index([projectKey, adapterKey, planName])
   @@index([type])
 }
 
 enum ContractRole {
-  MASTER  // 总控 Plan（契约持有者）
-  SUB     // 子 Plan（契约实施单元）
+  MASTER // 总控 Plan（契约持有者）
+  SUB // 子 Plan（契约实施单元）
+}
+
+enum CollaborationBindingRole {
+  MASTER
+  MEMBER
 }
 
 // 并发协作契约（多智能体并行实施规则集，对应 collab-contract 文档）
 model CollabContract {
-  id                 String   @id @default(cuid())
-  contractName       String   @unique
+  id                 String                     @id @default(cuid())
+  projectKey         String                     @default("legacy-unknown")
+  ownerAdapterKey    String                     @default("legacy-unknown")
+  contractName       String
   contractPath       String
   // 外键：总控 Plan（契约持有者，ContractRole=MASTER，一对一）
-  masterPlanName     String   @unique
-  masterPlan         PlanRecord @relation(fields: [masterPlanName], references: [planName], onDelete: Restrict)
-  participants       Json     // [{role, platformEntity, boundPlan, planKeyword, description}]
-  abilityMatrix      Json?    // {能力: {专家: boolean}}
-  stages             Json     // [{stage, expert, trigger, parallelism}]
-  dependencyGraph    String?  // ASCII 图 + 机器可读声明
-  fileBoundaries     Json     // [{expert, exclusiveDomain, forbidden, isolationMode}]  isolationMode: file/worktree
-  completionCriteria Json?    // {专家: 完成标志}
-  status             String   @default("ACTIVE") // ACTIVE / SUPERSEDED
-  version            Int      @default(1)
-  createdAt          DateTime @default(now())
-  updatedAt          DateTime @updatedAt
+  masterProjectKey   String                     @default("legacy-unknown")
+  masterAdapterKey   String                     @default("legacy-unknown")
+  masterPlanName     String
+  masterPlan         PlanRecord                 @relation("MasterPlan", fields: [masterProjectKey, masterAdapterKey, masterPlanName], references: [projectKey, adapterKey, planName], onDelete: Restrict)
+  bindings           CollaborationPlanBinding[]
+  participants       Json // [{role, platformEntity, boundPlan, planKeyword, description}]
+  abilityMatrix      Json? // {能力: {专家: boolean}}
+  stages             Json // [{stage, expert, trigger, parallelism}]
+  dependencyGraph    String? // ASCII 图 + 机器可读声明
+  fileBoundaries     Json // [{expert, exclusiveDomain, forbidden, isolationMode}]  isolationMode: file/worktree
+  completionCriteria Json? // {专家: 完成标志}
+  status             String                     @default("ACTIVE") // ACTIVE / SUPERSEDED
+  version            Int                        @default(1)
+  createdAt          DateTime                   @default(now())
+  updatedAt          DateTime                   @updatedAt
+
+  @@unique([projectKey, contractName])
+  @@unique([masterProjectKey, masterAdapterKey, masterPlanName])
+  @@index([projectKey, ownerAdapterKey])
+}
 
-  @@index([masterPlanName])
+model CollaborationPlanBinding {
+  id         String                   @id @default(cuid())
+  contractId String
+  contract   CollabContract           @relation(fields: [contractId], references: [id], onDelete: Cascade)
+  projectKey String
+  adapterKey String
+  planName   String
+  plan       PlanRecord               @relation(fields: [projectKey, adapterKey, planName], references: [projectKey, adapterKey, planName], onDelete: Cascade)
+  role       CollaborationBindingRole @default(MEMBER)
+  createdAt  DateTime                 @default(now())
+
+  @@unique([contractId, projectKey, adapterKey, planName])
+  @@index([projectKey, adapterKey, planName])
 }

package/templates/core/rules/project_rules.md

@@ -26,8 +26,8 @@
 | P2 | ADD-13 DPS 上游文档质量闸门 | Plan 概括度 → Review 注意力稀释 → Specs 遗漏 → 实现偏差。`check_dps`（DPS ≥ {{dpsPass}}）在 Step 0 末尾量化阻断 | ✅ 已实现 | 2026-06-11 引入 |
 | P2 | ADD-14 RAHS 下游执行健康度闸门 | 范围保真度 + 类型安全 + 审计完整度 + Spec 合规 + 阶段对称性。`check_rahs`（RAHS ≥ 90）在 Step 4/8 量化阻断 | ✅ 已实现 | 2026-06-11 引入 |
 | P2 | ADD-15 add-route 闭环自检 | Step 3 代码完成后必须调用 `check_add_route_completeness` 扫描 add-route Step 完成度，防止执行遗漏。返回 complete 方可进入 Step 3.5 | ✅ 已实现 | 2026-06-11 引入 |
-| P2 | ADD-17 HITL 磋商临时文件机制 | doc-format-guard 要求 Plan/Review 文件包含完整章节才放行，HITL 第一步只写总览表会被 guard 阻断。用 `{name}.temporary.md` 做磋商（不受 guard 检查），人类拍板后再写正式文件并删除 temporary.md | ✅ 已实现 | 2026-07-23 引入 |
-| P2 | ADD-18 HITL 人机审核强制规则 | Plan/Review 必须经过 HITL 审批（`create_hitl` → 人工 tongyi/bohui → `update_hitl` 确认）。无 `.hitl-tongyi-{planName}` 哨兵时 pre-tool-use hook 阻断写入正式文件。提案文件按 hitl-template.md 生成 + schema 校验 | ✅ 已实现 | 2026-07-27 引入 |
+| P2 | ADD-17 HITL 提案载体与状态机 | `create_hitl` 接收 `dimensions`，创建 `HitlRecord(DRAFT)` 与 `*.hitl.md` 提案；人工拍板后由 `update_hitl` 写入终态，正式文档仅在 `status_hitl=TONGYI` 后生成 | ✅ 已实现 | 2026-07-23 引入，2026-08-12 对齐 MCP 实现 |
+| P2 | ADD-18 HITL 人机审核强制规则 | Plan、方案 Review、实现 Review 必须经过 `create_hitl` → 人工 tongyi/bohui → `update_hitl`；`TONGYI` 同步写 DB、提案状态和 `.tongyi-{planName}` 哨兵 | ✅ 已实现 | 2026-07-27 引入 |
 
 
 ### P0 规则：不可跳过
@@ -68,7 +68,7 @@ AI 助手必须先恢复到基线、找到对应的 SKILL 文件并按步骤执
 | ADD-14 | `add-paradigm` Step 4 末端 + Step 8 收敛 + MCP `check_rahs` | Step 4 合规检查 / Step 8 收敛判定 |
 | ADD-15 | `add-paradigm` Step 3.6 + MCP `check_add_route_completeness` | Step 3 代码完成后自检 |
 | ADD-16 | `add-paradigm` Step 9 | runtime-fix plan 收敛后，关闭 gateway.md 运行时发现 |
-| ADD-17 | `add-paradigm` 独立能力：生成 Plan / Step 0 | Plan/Review HITL 磋商时（写入 temporary.md 绕过 guard，拍板后写正式文件） |
+| ADD-17 | `add-paradigm` 独立能力：生成 Plan / Step 0 / Step 3.5 | Plan/Review HITL：整理 dimensions → create_hitl 生成提案 → update_hitl 拍板 → status_hitl 校验终态 |
 | ADD-18 | `add-paradigm` 独立能力：生成 Plan + Step 0 + pre-tool-use §C | HITL 审批强制：create_hitl → 人工 tongyi/bohui → update_hitl 确认；hook 哨兵检查 |
 
 ---
@@ -783,45 +783,47 @@ ADD-0.1 要求"文档先行"（先改文档再改代码）。ADD-16 是对 ADD-0
 
 ---
 
-## ADD-17：HITL 磋商临时文件机制
+## ADD-17：HITL 提案载体与状态机
 
-**Plan 和 Review 的 HITL 磋商必须在写入正式文件之前完成，但 doc-format-guard 要求 `.qoder/plans/` 和 `.qoder/reviews/` 下的文件包含完整章节才放行。HITL 第一步只写总览表、不写正文——会被 guard 阻断。**
+**Plan、方案 Review 和实现 Review 在写入正式文件前，必须通过 `create_hitl` 建立结构化审批提案。`*.hitl.md` 与 `HitlRecord` 是同一轮审批的文件/数据库双通道载体；正式文档不得替代审批提案。**
 
 ### 流程
 
 ```
-① AI 写 {name}.temporary.md（只含 HITL 总览表，放项目根目录，不受 guard 检查）
-② 人类审阅 HITL 表 → 逐行拍板（同意/调整）
-③ AI 根据确认后的 HITL 表生成完整 Plan/Review → 写入正式路径（guard 放行）
-④ 删除 temporary.md
+① AI 读取对应模板并将待拍板发现整理为 dimensions
+② create_hitl({ planName, type, dimensions }) → HitlRecord(DRAFT) + plans/{YYYY-MM}/{DD}/{planName}.hitl.md
+③ 人类审阅提案并逐项拍板 → update_hitl({ planName, type, status })
+④ status_hitl 确认 TONGYI → 生成完整 Plan/Review 并写入正式路径
+⑤ BOHUI → 修订 dimensions 后调用 create_hitl 创建 round+1
 ```
 
 ### 适用范围
 
-| 文档类型 | temporary 磋商 | 正式写入路径 |
+| 文档类型 | HITL type | 正式写入路径 |
 |---------|:---:|------|
-| Plan（标准版/精简版） | ✅ 需要 | `.qoder/plans/{YYYY-MM}/{DD}/` |
-| Review（方案/实现） | ✅ 需要 | `.qoder/reviews/` |
-| Spec / Tasks / Checklist | ❌ 不需要 | 直接写入 `.qoder/specs/` |
-| Handoff | ❌ 不需要 | 直接写入 `.qoder/plans/` |
+| Plan（标准版/精简版） | `PLAN` | `{{magicDir}}/plans/{YYYY-MM}/{DD}/` |
+| Review（方案/实现） | `PLAN_REVIEW` | `{{magicDir}}/reviews/` |
+| Runtime Review | 不需要 | `[T]` 全部通过后直接写入 `{{magicDir}}/reviews/` |
+| Spec / Tasks / Checklist | 不需要 | 直接写入 `{{magicDir}}/specs/` |
+| Handoff | 不需要 | 直接写入 `{{magicDir}}/plans/` |
 
 ### 与 ADD-0.1 的关系
 
-ADD-0.1 要求"文档先行"——HITL 磋商本身就是文档先行的一种形式（先对齐方向再产出文档）。temporary.md 机制确保 HITL 的"先拍板再展开"哲学不因 guard 的"完整章节校验"而被破坏。
+ADD-0.1 要求“文档先行”。`create_hitl` 先持久化决策维度与审批状态，再展开正式文档，使“先拍板、后展开”具备可查询、可追溯的事实源。
 
 ---
 
 ## ADD-18：HITL 人机审核强制规则
 
-**Plan 和 PLAN_REVIEW 类型 Review 在写入正式文件前，必须经过 HITL 审批。** 审批通过后生成 `.hitl-tongyi-{planName}` 哨兵文件，pre-tool-use hook 以此判断是否允许写入。
+**Plan、方案 Review 和实现 Review 在写入正式文件前，必须经过 HITL 审批。** 审批通过后，`update_hitl` 更新数据库与 `*.hitl.md` 状态，并在 `{{magicDir}}/hitl/` 生成 `.tongyi-{planName}` 哨兵。pre-tool-use hook 对 Plan/方案 Review 执行哨兵门禁；实现 Review 由 `add-paradigm` Step 3.5 与 `status_hitl` 门禁约束。
 
 ### 强制流程
 
 ```
-① create_hitl({ planName, type }) → HitlRecord DRAFT，生成 hitl.md 提案文件
-② 人类审阅 hitl.md → 逐行拍板
-③ update_hitl({ planName, status: "TONGYI" }) → 写 .hitl-tongyi-{planName} 哨兵
-   或 update_hitl({ planName, status: "BOHUI", reason }) → 提案驳回
+① create_hitl({ planName, type, dimensions }) → HitlRecord DRAFT，生成 *.hitl.md 提案文件
+② 人类审阅 *.hitl.md → 逐行拍板
+③ update_hitl({ planName, type, status: "TONGYI" }) → 更新 DB/提案并写 .tongyi-{planName} 哨兵
+   或 update_hitl({ planName, type, status: "BOHUI", reason }) → 更新 DB/提案并写 .bohui-{planName} 哨兵
 ④ TONGYI 后：正式写入 Plan/Review 文件（hook §C 放行）
 ⑤ BOHUI 后：create_hitl 新建 round+1，重新审批
 ```
@@ -830,15 +832,16 @@ ADD-0.1 要求"文档先行"——HITL 磋商本身就是文档先行的一种
 
 | 文档类型 | HITL 审批 | 依据 |
 |---------|:--------:|------|
-| Plan | ✅ 必须 | pre-tool-use §C 拦截 plans/ 目录 |
-| Review（PLAN_REVIEW） | ✅ 必须 | pre-tool-use §C 拦截 reviews/ 目录（不含 implementation/runtime） |
-| Review（implementation/runtime） | ❌ 不需要 | 走 §B 活跃 Plan 检查 |
+| Plan | ✅ 必须 | pre-tool-use §C 哨兵门禁 |
+| 方案 Review | ✅ 必须 | pre-tool-use §C 哨兵门禁 |
+| Implementation Review | ✅ 必须 | `add-paradigm` Step 3.5 + `status_hitl` |
+| Runtime Review | ❌ 不需要 | `[T]` 全部通过后直接生成 |
 | Spec / Tasks / Checklist | ❌ 不需要 | 直接写 |
 | Handoff | ❌ 不需要 | 直接写 |
 
 ### 与 ADD-17 的关系
 
-ADD-17 定义 HITL 如何在 guard 约束下运作（temporary.md 绕过 guard 完成磋商）。ADD-18 定义 HITL 审批本身是强制的——不经过 create_hitl→update_hitl 流程，hook 阻止写入。两者互补：ADD-17 是"怎么做 HITL"，ADD-18 是"必须做 HITL"。
+ADD-17 定义审批提案的载体、维度和状态流转；ADD-18 定义哪些正式文档必须先取得 `TONGYI`。两者共同以 `create_hitl → update_hitl → status_hitl` 为事实链，文件、数据库和哨兵相互校验。
 
 ---
 

package/templates/core/scripts/db-ensure.sh

@@ -156,6 +156,14 @@ apply_atlas_diff() {
 # ⑦ Atlas 同步主流程（探测 → dev-url → 目标 → baseline → diff → apply）
 atlas_sync() {
   [ "$ENGINE" = "sqlite" ] && return 0
+  # 迁移锁（进程层契约 v2 §6）：多 IDE 并发 init 时仅一个进程执行迁移
+  # 非阻塞拿锁（pg_try_advisory_lock），会话级锁——脚本退出连接断开自动释放
+  LOCK_KEY="0xADD001"
+  LOCKED="$(podman exec "${PROJECT_NAME:-add-project}-postgres" psql -U "${DATABASE_USER:-admin}" -d "${PROJECT_NAME:-add-project}" -tAc "SELECT pg_try_advisory_lock(${LOCK_KEY});" 2>/dev/null || true)"
+  if [ "$LOCKED" != "t" ]; then
+    echo "!!! 另一个进程正在迁移，请稍后重试"
+    return 1
+  fi
   if ! atlas_cmd version > /dev/null 2>&1; then
     echo "!!! Atlas 不可用。add-coder sync --patch 可自动安装 @ariga/atlas；或手动: pnpm add -D @ariga/atlas"
     echo "    降级路径: prisma-diff（免 shadow）→ db-push + 强制备份；文档: README「Atlas 数据库同步能力」"

package/templates/core/scripts/gen-plan-index.sh

@@ -1,24 +1,13 @@
 #!/bin/bash
 # 生成 {MAGIC_DIR}/plans/index.md 总览清单 — 按日期分层，每日自动更新
-# 自动探测 MAGIC_DIR（.qoder / .claude / .vscode / .trae / .codex / .add）
+# MAGIC_DIR 由脚本自身的物理目录确定，各 adapter 自治。
 set -e
 
-# 探测 MAGIC_DIR：在当前目录向上查找包含 plans/ 的隐藏目录
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-CURRENT="$SCRIPT_DIR"
-MAGIC_DIR=""
-while [ "$CURRENT" != "/" ]; do
-  for d in "$CURRENT"/.qoder "$CURRENT"/.claude "$CURRENT"/.vscode "$CURRENT"/.trae "$CURRENT"/.codex "$CURRENT"/.add; do
-    if [ -d "$d/plans" ]; then
-      MAGIC_DIR="$d"
-      break 2
-    fi
-  done
-  CURRENT="$(dirname "$CURRENT")"
-done
+MAGIC_DIR="$(dirname "$SCRIPT_DIR")"
 
-if [ -z "$MAGIC_DIR" ]; then
-  echo "❌ 未找到 MAGIC_DIR（.qoder / .claude / .vscode / .trae / .codex / .add 均无 plans/ 子目录）" >&2
+if [ ! -d "$MAGIC_DIR/plans" ]; then
+  echo "❌ 当前 adapter 不存在 plans/: $MAGIC_DIR" >&2
   exit 1
 fi
 

package/templates/core/scripts/mcp-server/notifications/hitl.ts

@@ -3,8 +3,10 @@ import { join } from "path"
 import { existsSync } from "fs"
 import { readFileSafe, readdirRecursive, PROJECT_ROOT, MAGIC_DIR } from "../shared/fs.js"
 import { prisma } from "../shared/prisma.js"
+import { getRuntimeContext } from "../shared/env.js"
 
 export function registerHitlNotifications(server: McpServer) {
+  const runtimeContext = getRuntimeContext()
   // ── HITL 表扫描 ──
   const scanHitl = async () => {
     const plansDir = join(PROJECT_ROOT, MAGIC_DIR, "plans")
@@ -29,7 +31,13 @@ export function registerHitlNotifications(server: McpServer) {
       const ops = prisma.devOperation as Record<string, (...a: unknown[]) => unknown>
       const since = new Date(Date.now() - 24 * 60 * 60 * 1000)
       const count = await ops.count({
-        where: { action: "HOOK_INTERCEPT", planKeyword: "no-active-plan", createdAt: { gte: since } },
+        where: {
+          action: "HOOK_INTERCEPT",
+          planKeyword: "no-active-plan",
+          projectKey: runtimeContext.projectKey,
+          producerAdapterKey: runtimeContext.adapterKey,
+          createdAt: { gte: since },
+        },
       }) as number
       if (count >= 10 && count !== lastWarnedCount) {
         lastWarnedCount = count

package/templates/core/scripts/mcp-server/notifications/hook.ts

@@ -1,9 +1,21 @@
 import type { McpServer } from "@modelcontextprotocol/server"
 import { join } from "path"
-import { existsSync, watch, readFileSync, statSync } from "fs"
+import {
+  appendFileSync,
+  closeSync,
+  existsSync,
+  mkdirSync,
+  openSync,
+  readSync,
+  statSync,
+  watch,
+  writeFileSync,
+} from "fs"
 import { readFile } from "fs/promises"
+import { createHash } from "crypto"
 import { PROJECT_ROOT, MAGIC_DIR } from "../shared/fs.js"
 import { prisma } from "../shared/prisma.js"
+import { getRuntimeContext } from "../shared/env.js"
 
 // ── 类型定义 ──
 interface HookEvent {
@@ -29,6 +41,7 @@ interface QueueState {
 const REPORT_DIR = join(PROJECT_ROOT, MAGIC_DIR, "reports")
 const JSONL_FILE = join(REPORT_DIR, "hook-events.jsonl")
 const OVERFLOW_FILE = join(REPORT_DIR, "hook-events-overflow.jsonl")
+const runtimeContext = getRuntimeContext()
 
 // ── 内存缓冲队列 ──
 const MAX_QUEUE = 50
@@ -98,6 +111,13 @@ async function flushToDB(events: HookEvent[]): Promise<number> {
     const ops = prisma.devOperation as Record<string, (...a: unknown[]) => unknown>
     const data = unique.map(e => ({
       userId,
+      projectKey: runtimeContext.projectKey,
+      producerAdapterKey: runtimeContext.adapterKey,
+      contextId: runtimeContext.contextId,
+      toolName: "hook-event-notification",
+      operationKey: createHash("sha256")
+        .update(`${runtimeContext.contextId}\0${dedupKey(e)}\0${e.decision}\0${e.cmd}`)
+        .digest("hex"),
       action: "HOOK_INTERCEPT",
       targetType: e.hook,
       targetId: e.cmd.substring(0, 500),
@@ -106,7 +126,7 @@ async function flushToDB(events: HookEvent[]): Promise<number> {
       afterState: JSON.stringify({ planStatus: e.planStatus }),
     }))
 
-    await ops.createMany({ data })
+    await ops.createMany({ data, skipDuplicates: true })
     return unique.length
   } catch (err) {
     console.error("[hook-notify] flushToDB 失败:", err instanceof Error ? err.message : String(err))
@@ -125,7 +145,6 @@ async function drainOverflowFile(): Promise<HookEvent[]> {
       if (ev) events.push(ev)
     }
     // 清空溢出文件
-    const { writeFileSync } = await import("fs")
     writeFileSync(OVERFLOW_FILE, "", "utf-8")
   } catch {
     // 忽略，下次 flush 重试
@@ -145,7 +164,6 @@ async function doFlush(): Promise<void> {
 
   const count = await flushToDB(allEvents)
   if (count > 0 && serverRef) {
-    const noPlanCount = allEvents.filter(e => e.planKeyword === "no-active-plan").length
     const msg = `[Hook] ${count} 条拦截事件已审计落库（计划: ${[...new Set(allEvents.map(e => e.planKeyword))].join(", ")}）`
     serverRef.sendLoggingMessage({ level: "warning" as const, data: msg }).catch(() => {})
   }
@@ -156,7 +174,6 @@ function enqueue(event: HookEvent): void {
   if (q.events.length >= MAX_QUEUE) {
     // 降级写入溢出文件
     try {
-      const { appendFileSync } = require("fs") as typeof import("fs")
       appendFileSync(OVERFLOW_FILE, JSON.stringify(event) + "\n", "utf-8")
     } catch { /* 静默 */ }
     return
@@ -191,10 +208,10 @@ function readNewLines(): void {
     if (st.size <= q.bytesRead) return
 
     // 只读增量部分
-    const fd = require("fs").openSync(JSONL_FILE, "r")
+    const fd = openSync(JSONL_FILE, "r")
     const buf = Buffer.alloc(st.size - q.bytesRead)
-    require("fs").readSync(fd, buf, 0, buf.length, q.bytesRead)
-    require("fs").closeSync(fd)
+    readSync(fd, buf, 0, buf.length, q.bytesRead)
+    closeSync(fd)
 
     const text = buf.toString("utf-8")
     for (const line of text.split("\n")) {
@@ -242,7 +259,6 @@ export function registerHookNotifications(server: McpServer) {
   void initialScan().then(() => {
     // 确保 jsonl 文件存在（fs.watch 要求文件已存在）
     try {
-      const { mkdirSync, writeFileSync } = require("fs") as typeof import("fs")
       mkdirSync(REPORT_DIR, { recursive: true })
       if (!existsSync(JSONL_FILE)) writeFileSync(JSONL_FILE, "", "utf-8")
     } catch { /* ok */ }

package/templates/core/scripts/mcp-server/resources/hitl-approval-widget.ts

@@ -0,0 +1,34 @@
+import type { McpServer } from "@modelcontextprotocol/server"
+import { existsSync, readFileSync } from "fs"
+import { join } from "path"
+import { PROJECT_ROOT, MAGIC_DIR } from "../shared/fs.js"
+import {
+  HITL_APPROVAL_WIDGET_FILE,
+  HITL_APPROVAL_WIDGET_MIME,
+  HITL_APPROVAL_WIDGET_URI,
+} from "../shared/hitl-ui.js"
+
+export function registerHitlApprovalWidgetResource(server: McpServer) {
+  server.registerResource(
+    "hitl-approval-widget",
+    HITL_APPROVAL_WIDGET_URI,
+    {
+      title: "ADD HITL Approval",
+      description: "逐项审核 ADD HITL 提案的 core 标准 widget",
+      mimeType: HITL_APPROVAL_WIDGET_MIME,
+    },
+    (uri) => {
+      const widgetPath = join(PROJECT_ROOT, MAGIC_DIR, "templates", HITL_APPROVAL_WIDGET_FILE)
+      if (!existsSync(widgetPath)) {
+        throw new Error(`HITL widget 缺失: ${widgetPath}。请重新执行 add-coder sync。`)
+      }
+      return {
+        contents: [{
+          uri: uri.href,
+          mimeType: HITL_APPROVAL_WIDGET_MIME,
+          text: readFileSync(widgetPath, "utf-8"),
+        }],
+      }
+    },
+  )
+}

package/templates/core/scripts/mcp-server/resources/hook-events-report.ts

@@ -1,7 +1,9 @@
 import type { McpServer } from "@modelcontextprotocol/server"
 import { prisma } from "../shared/prisma.js"
+import { getRuntimeContext } from "../shared/env.js"
 
 export function registerHookEventResources(server: McpServer) {
+  const runtimeContext = getRuntimeContext()
 
   // ── 日报 Resource ──
   server.registerResource("hook-events-daily", "add-coder://report/hook-events/daily",
@@ -11,7 +13,12 @@ export function registerHookEventResources(server: McpServer) {
       const ops = prisma.devOperation as Record<string, (...a: unknown[]) => unknown>
       const since = new Date(Date.now() - 24 * 60 * 60 * 1000)
       const logs = await ops.findMany({
-        where: { action: "HOOK_INTERCEPT", createdAt: { gte: since } },
+        where: {
+          action: "HOOK_INTERCEPT",
+          projectKey: runtimeContext.projectKey,
+          producerAdapterKey: runtimeContext.adapterKey,
+          createdAt: { gte: since },
+        },
         orderBy: { createdAt: "desc" },
         take: 500,
       }) as Array<Record<string, unknown>>
@@ -60,7 +67,12 @@ export function registerHookEventResources(server: McpServer) {
       const ops = prisma.devOperation as Record<string, (...a: unknown[]) => unknown>
       const since = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000)
       const logs = await ops.findMany({
-        where: { action: "HOOK_INTERCEPT", createdAt: { gte: since } },
+        where: {
+          action: "HOOK_INTERCEPT",
+          projectKey: runtimeContext.projectKey,
+          producerAdapterKey: runtimeContext.adapterKey,
+          createdAt: { gte: since },
+        },
         orderBy: { createdAt: "desc" },
         take: 2000,
       }) as Array<Record<string, unknown>>

package/templates/core/scripts/mcp-server/resources/index.ts

@@ -3,10 +3,12 @@ import { registerAddStateResources } from "./add-state.js"
 import { registerRoundTaskResources } from "./round-task.js"
 import { registerVersionResource } from "./add-coder-version.js"
 import { registerHookEventResources } from "./hook-events-report.js"
+import { registerHitlApprovalWidgetResource } from "./hitl-approval-widget.js"
 
 export function registerAllResources(server: McpServer) {
   registerAddStateResources(server)
   registerRoundTaskResources(server)
   registerVersionResource(server)
   registerHookEventResources(server)  // 2 resources: hook-events/{daily,weekly}
+  registerHitlApprovalWidgetResource(server)
 }