add-coder 0.3.26 → 0.3.27

package/templates/adapters/trae/hooks/lib/state-detect.sh

@@ -1,117 +1,10 @@
 #!/bin/bash
-# state-detect.sh — ADD 活跃流程检测 + dev action 追踪
-# 共享库
-
-PROJECT_DIR="$PWD"
-
-# 动态探测 MAGIC_DIR（兼容多 adapter，source 自 hook 脚本时继承调用者的 HOOK_DIR）
-if [ -z "${MAGIC_DIR:-}" ]; then
-  if [ -n "${HOOK_DIR:-}" ]; then
-    MAGIC_DIR="$(basename "$(dirname "$HOOK_DIR")")"
-  else
-    for m in ".claude" ".qoder" ".vscode" ".add"; do
-      [ -d "$PROJECT_DIR/$m" ] && { MAGIC_DIR="$m"; break; }
-    done
-    MAGIC_DIR="${MAGIC_DIR:-.add}"
-  fi
+# state-detect.sh — 兼容入口；状态裁决统一委托 common.sh，禁止维护第二套 magicDir 探测。
+# 协议层契约（Review P1 #5）: 仅当前 magicDir scope；禁止跨端扫描与 .add fallback；
+# 禁止 adapter 名称默认值（入口注入 MAGIC_DIR 或物理位置推导）。
+
+if ! type detect_active_add >/dev/null 2>&1; then
+  HOOK_LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  # shellcheck source=common.sh
+  source "$HOOK_LIB_DIR/common.sh"
 fi
-
-MAGIC_PATH="$PROJECT_DIR/$MAGIC_DIR"
-PLANS_DIR="$MAGIC_PATH/plans"
-
-# dev action 标记文件（项目级，PreToolUse 写入，Stop 读取）
-DEV_FLAG="/tmp/add_dev_$(echo "$PROJECT_DIR" | md5sum 2>/dev/null | cut -c1-8 || echo "default")"
-
-# 检测活跃 ADD 流程
-# 返回: "plan_keyword::step_x/total::round_n/total_r::handoff_path::add_route_path" 或 ""
-detect_active_add() {
-  local handoff=""
-  local today_dir="$PLANS_DIR/$(date +%Y-%m)"
-  [ -d "$today_dir" ] && handoff=$(find "$today_dir" -name "*handoff*.md" -mtime -7 -type f 2>/dev/null | head -1)
-  [ -z "$handoff" ] && handoff=$(find "$PLANS_DIR" -name "*handoff*.md" -mtime -7 -type f 2>/dev/null | head -1)
-  [ -z "$handoff" ] && return 1
-
-  local plan_kw=$(basename "$handoff" | sed 's/-handoff.*//')
-
-  # add-route
-  local add_route=$(find "$PLANS_DIR" -name "*add-route*.md" -type f 2>/dev/null | head -1)
-
-  # Step 统计（从 add-route）
-  local step_info="?"
-  if [ -f "$add_route" ]; then
-    local ck=$(grep -c '\[x\]' "$add_route" 2>/dev/null || true)
-    local uc=$(grep -c '\[ \]' "$add_route" 2>/dev/null || true)
-    ck=${ck:-0}; uc=${uc:-0}
-    local total=$((ck + uc))
-    [ "$total" -gt 0 ] && step_info="${ck}/${total}"
-  fi
-
-  # 轮次统计（从 handoff）
-  local round_info="?"
-  if grep -q '<第[0-9]轮>' "$handoff" 2>/dev/null; then
-    local ck=$(grep -c '\[x\]' "$handoff" 2>/dev/null || true); ck=${ck:-0}
-    local total=$(grep -c '<第[0-9]轮>' "$handoff" 2>/dev/null || true); total=${total:-0}
-    [ "$total" -gt 0 ] && round_info="${ck}/${total}"
-  else
-    round_info="1/1"
-  fi
-
-  echo "${plan_kw}::${step_info}::${round_info}::${handoff}::${add_route:-none}"
-}
-
-# 标记 dev action
-mark_dev_action() {
-  touch "$DEV_FLAG" 2>/dev/null || true
-}
-
-# 检测 dev action
-has_dev_action() {
-  [ -f "$DEV_FLAG" ]
-}
-
-# 清理 dev action 标记（验收闭环后调用）
-clear_dev_action() {
-  rm -f "$DEV_FLAG" 2>/dev/null || true
-}
-
-# 检查验收完整度，返回 issues 文本
-check_add_completeness() {
-  local handoff="$1" add_route="$2"
-  local issues=""
-
-  # devlog（内容已回流至 handoff，检查 handoff 是否含验收结果）
-  if [ -f "$handoff" ] && ! grep -qE '验收|收敛|闭环|本轮改了什么|devlog' "$handoff" 2>/dev/null; then
-    issues="${issues}  [ ] devlog 缺失（handoff 无验收记录）\n"
-  fi
-
-  # handoff 验证标准
-  if [ -f "$handoff" ]; then
-    local uc=$(grep -c '\[ \]' "$handoff" 2>/dev/null || echo "0")
-    [ "$uc" -gt 0 ] && issues="${issues}  [ ] handoff ${uc} 项未勾选\n"
-  fi
-
-  # add-route Step
-  if [ -f "$add_route" ]; then
-    local uc=$(grep -c '\[ \]' "$add_route" 2>/dev/null || echo "0")
-    [ "$uc" -gt 0 ] && issues="${issues}  [ ] add-route ${uc} Step 未闭环\n"
-  fi
-
-  echo -e "$issues"
-}
-
-# 检查是否已验收（幂等保护）
-# 返回 0 = 未验收，1 = 已验收
-is_already_accepted() {
-  local add_route="$1" handoff="$2"
-  # add-route Step 8 是否已 [x]
-  if [ -f "$add_route" ]; then
-    # 检查 Step 8 产出项是否勾选
-    if grep -A 10 'Step 8' "$add_route" 2>/dev/null | grep -q '\[x\].*验证并更新项目状态'; then
-      # handoff 是否有验收记录
-      if [ -f "$handoff" ] && grep -qE '✅.*验收|收敛|全部闭环|全部.*完成' "$handoff" 2>/dev/null; then
-        return 0
-      fi
-    fi
-  fi
-  return 1
-}

package/templates/adapters/trae/hooks/lib/vocabulary.sh

@@ -1,15 +1,21 @@
 #!/bin/bash
 # vocabulary.sh — 从 vocabulary markdown 表格加载触发词
-# 单一数据源: .qoder/vocabulary/add-governance-vocabulary.md §类别 A-F 表格
+# 单一数据源: {MAGIC_DIR}/vocabulary/add-governance-vocabulary.md §类别 A-F 表格
+# 协议层契约（Review P1 #5）: 仅当前 magicDir scope；入口注入 MAGIC_DIR 或物理位置推导；
+# 禁止跨端扫描与 .add fallback，禁止 adapter 名称默认值。
 
-# 动态探测 MAGIC_DIR
+# MAGIC_DIR 解析: 入口注入优先；未注入时从脚本物理位置（<magicDir>/hooks/lib/）反推
 if [ -z "${MAGIC_DIR:-}" ]; then
-  for m in ".claude" ".qoder" ".vscode" ".add"; do
-    [ -d "${PROJECT_DIR:-$PWD}/$m" ] && { MAGIC_DIR="$m"; break; }
-  done
-  MAGIC_DIR="${MAGIC_DIR:-.add}"
+  if [ -n "${HOOK_DIR:-}" ]; then
+    MAGIC_DIR="$(basename "$(dirname "$HOOK_DIR")")"
+  else
+    # 无注入且无物理位置 → 无法判定 → 返回空（调用方 fail-closed，禁止猜测 adapter）
+    VOCABULARY_FILE=""
+  fi
+fi
+if [ -n "${MAGIC_DIR:-}" ]; then
+  VOCABULARY_FILE="${PROJECT_DIR:-$PWD}/$MAGIC_DIR/vocabulary/add-governance-vocabulary.md"
 fi
-VOCABULARY_FILE="${PROJECT_DIR:-$PWD}/$MAGIC_DIR/vocabulary/add-governance-vocabulary.md"
 
 # 输出格式: 优先级::触发词正则::响应文本（:: 避免与触发词内的 | 冲突）
 load_triggers() {

package/templates/adapters/trae/hooks/pre-tool-use.sh

@@ -62,8 +62,9 @@ EOF
     exit 2
   fi
 
-  # 检测 2: sed -i 原地编辑
-  if echo "$command" | grep -qE '\bsed\b.*-i'; then
+  # 检测 2: sed -i 原地编辑（精确判定：`-i` 必须是 sed 独立 option；不把路径子串如 session-init 误判）
+  # 协议层契约（Review P0 #3/命令分类）: 与 codex 已实现版本同契约语义
+  if echo "$command" | grep -qE '(^|[;&|][[:space:]]*)sed[[:space:]]+([^;&|]*[[:space:]])?(-[[:alpha:]]*i[^[:space:];&|]*|--in-place(=[^[:space:];&|]*)?)([[:space:];&|]|$)'; then
     _reason="禁止通过 sed -i 直接编辑文件。请使用 SearchReplace 工具。"
     cat >&2 <<'EOF'
 ⛔ [ADD PreToolUse §A] 阻断: 禁止通过 sed -i 原地编辑文件。
@@ -136,7 +137,8 @@ if [ "$tool_name" = "Write" ] || [ "$tool_name" = "Edit" ] || [ "$tool_name" = "
   file_path=$(echo "$input" | jq -r '.tool_input.file_path // empty')
   [ -z "$file_path" ] && exit 0
 
-  if echo "$file_path" | grep -qE '\.(qoder|claude|add)/(plans|specs|reviews)/'; then
+  # §B: 写入守卫按当前 magicDir 限域（Review P1 #5: 禁止多端路径正则）
+  if echo "$file_path" | grep -qE "${MAGIC_DIR}/(plans|specs|reviews)/"; then
     if type detect_active_add >/dev/null 2>&1; then
       state=$(detect_active_add 2>/dev/null || true)
       if [ -z "$state" ]; then
@@ -154,8 +156,8 @@ if [ "$tool_name" = "Write" ] || [ "$tool_name" = "Edit" ] || [ "$tool_name" = "
     exit 2
   fi
 
-  # §C: 模板类型前置注入 — plans/ 写入前提示应选模板
-  if echo "$file_path" | grep -qE '\.(qoder|claude|add|vscode|trae)/(plans)/'; then
+  # §C: 模板类型前置注入 — 仅当前 magicDir plans/ 写入前提示应选模板
+  if echo "$file_path" | grep -qE "${MAGIC_DIR}/(plans)/"; then
     fname=$(basename "$file_path")
     if echo "$fname" | grep -qE 'plan-v[0-9]'; then
       echo "💡 [ADD PreToolUse] 写入 Plan → 模板: standard-plan-template.md（标准）或 simple-plan-template.md（≤3文件）" >&2
@@ -177,13 +179,13 @@ if [ "$tool_name" = "Write" ] || [ "$tool_name" = "Edit" ] || [ "$tool_name" = "
   # implementation/runtime review 不需要 HITL，走 §B 活跃 Plan 检查
   # handoff 是 Step 8 收敛产物（多轮交接手册），不经 HITL 审批，同样豁免
   # TODO 应该caijuehub管理
-  if echo "$file_path" | grep -qE '\.(qoder|claude|add|vscode|trae)/(plans)/'; then
+  if echo "$file_path" | grep -qE "${MAGIC_DIR}/(plans)/"; then
     if echo "$file_path" | grep -qE '\-handoff'; then
       _do_hitl=false  # handoff 不被 HITL 拦截（Step 8 产物，无独立审批）
     else
       _do_hitl=true
     fi
-  elif echo "$file_path" | grep -qE '\.(qoder|claude|add|vscode|trae)/(reviews)/'; then
+  elif echo "$file_path" | grep -qE "${MAGIC_DIR}/(reviews)/"; then
     if echo "$file_path" | grep -qE '-(implementation|runtime)'; then
       _do_hitl=false  # implementation/runtime review 不被 HITL 拦截
     else
@@ -194,7 +196,11 @@ if [ "$tool_name" = "Write" ] || [ "$tool_name" = "Edit" ] || [ "$tool_name" = "
   fi
 
   if [ "$_do_hitl" = true ]; then
-    _relative=$(echo "$file_path" | sed 's|.*/\.\(qoder\|claude\|add\|vscode\|trae\)/\(plans\|reviews\)/||')
+    _relative=$(echo "$file_path" | sed "s|.*/\.\(qoder\|claude\|add\|vscode\|trae\)/\(plans\|reviews\)/||")
+    # 限域: 仅当前 magicDir 下的 plans/reviews 触发 HITL 门禁
+    if ! echo "$file_path" | grep -qE "${MAGIC_DIR}/(plans|reviews)/"; then
+      _do_hitl=false
+    fi
     _planName=$(basename "$_relative" .md | sed 's/\.hitl$//;s/-plan-v[0-9]*$//;s/-add-route-v[0-9]*$//;s/-review-v[0-9]*$//;s/-review-implementation$//;s/-review-runtime$//')
     if [ -n "$_planName" ]; then
       _tongyi_marker="${PROJECT_DIR}/${MAGIC_DIR}/hitl/.tongyi-${_planName}"

package/templates/adapters/trae/hooks/stop-check.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 # stop-check.sh — Claude Code Stop：四象限分流 + 验收检查（few-shot 上下文注入）
 # 治理卡位 #7: 验收检查 + devlog + 阻断
+# DB lifecycle 真相源（协议层）：DB 不可用时 fail-closed，禁止回退 Handoff/add-route 猜测
 set -euo pipefail
 
 HOOK_DIR="$(cd "$(dirname "$0")" && pwd)"
 export CURRENT_MAGIC=$(basename "$(dirname "$HOOK_DIR")")
+export MAGIC_DIR=$(basename "$(dirname "$HOOK_DIR")")
 COMMON_LIB="$HOOK_DIR/lib/common.sh"
 [ -f "$COMMON_LIB" ] && source "$COMMON_LIB"
 
@@ -13,6 +15,13 @@ export PROJECT_DIR="$PWD"
 state=$(detect_active_add 2>/dev/null || true)
 has_dev=$(has_dev_action 2>/dev/null && echo "true" || echo "false")
 
+# ═══════ Q0: DB 不可用 → fail closed（禁止当“无 Plan”） ═══════
+if [ "${state%%::*}" = "__STATUS_UNAVAILABLE__" ]; then
+  reason=$(echo "$state" | awk -F'::' '{print $2}')
+  echo "[ADD Stop] ⛔ Plan status 暂不可用（${reason}）。未回退 Handoff/add-route 猜测，请恢复数据库或 MCP resolver 后重试。" >&2
+  exit "${EXIT_BLOCK:-2}"
+fi
+
 # ═══════ Q1: 无 ADD + 无 dev → 正常停 ═══════
 if [ -z "$state" ] && [ "$has_dev" != "true" ]; then
   exit 0

package/templates/adapters/vscode/hooks/doc-format-guard.sh

@@ -62,43 +62,52 @@ fi
 PROJECT_DIR="$PWD"
 TEMPLATES_DIR="$PROJECT_DIR/$MAGIC_DIR/templates"
 
-# 通过 filename 匹配模板名
+# 文件名类型 token 匹配（特异性排序，取代子串 grep；R5/Task 1.4）
+# review/handoff 不在此层绑定（需内容特征细分单多轮/运行时），留给下方探测链
 TEMPLATE_NAME=""
-for tmpl in "$TEMPLATES_DIR"/*.md; do
-  base=$(basename "$tmpl")
-  if echo "$file_path" | grep -q "$base"; then
-    TEMPLATE_NAME="$base"
-    break
-  fi
-done
+base=$(basename "$file_path")
+base=${base%-v[0-9]*}
+case "$base" in
+  *add-route*heavy*) TEMPLATE_NAME="add-route-template-heavyweight.md" ;;
+  *add-route*)       TEMPLATE_NAME="add-route-template.md" ;;
+  *hitl*)            TEMPLATE_NAME="hitl-template.md" ;;
+  *handoff*)         : ;;  # R15: 跳过 token 层，交内容探测链；必须在 *report* 前，防含 report 的 handoff 被误吞
+  *checklist*)       TEMPLATE_NAME="checklist-template.md" ;;
+  *fix-verif*)       TEMPLATE_NAME="fix-verification-template.md" ;;
+  *report*runtime*)  TEMPLATE_NAME="runtime-report-template.md" ;;
+  *report*)          TEMPLATE_NAME="report-template.md" ;;
+  *tasks*)           TEMPLATE_NAME="tasks-template.md" ;;
+  *spec*)            TEMPLATE_NAME="spec-template.md" ;;
+  *plan*)            TEMPLATE_NAME="standard-plan-template.md" ;;
+esac
 
 # 退一步：根据文件内容特征猜测模板类型
 if [ -z "$TEMPLATE_NAME" ]; then
-  if echo "$CONTENT" | grep -q "## 四、Handoff"; then
+  if grep -q "## 四、Handoff" <<< "$CONTENT"; then
     TEMPLATE_NAME="simple-standard-plan-template.md"
-  elif echo "$CONTENT" | grep -q "## PLAN 元信息"; then
+  elif grep -q "## PLAN 元信息" <<< "$CONTENT"; then
     TEMPLATE_NAME="standard-plan-template.md"
-  elif echo "$CONTENT" | grep -q "## Review 元信息"; then
-    if echo "$CONTENT" | grep -q "运行时验证"; then
+  elif grep -q "## Review 元信息" <<< "$CONTENT"; then
+    if grep -q "运行时验证" <<< "$CONTENT"; then
       TEMPLATE_NAME="review-runtime-template.md"
-    elif echo "$CONTENT" | grep -q "跨仓库格式契约"; then
+    elif grep -q "跨仓库格式契约" <<< "$CONTENT"; then
       TEMPLATE_NAME="review-implementation-template.md"
     else
       TEMPLATE_NAME="review-template.md"
     fi
-  elif echo "$CONTENT" | grep -q "## Why"; then
+  elif grep -q "## Why" <<< "$CONTENT"; then
     TEMPLATE_NAME="spec-template.md"
-  elif echo "$CONTENT" | grep -q "## Preconditions"; then
+  elif grep -q "## Preconditions" <<< "$CONTENT"; then
     TEMPLATE_NAME="tasks-template.md"
-  elif echo "$CONTENT" | grep -q "审计链（证据→devlog→checklist）"; then
+  elif grep -q "审计链（证据→devlog→checklist）" <<< "$CONTENT"; then
     TEMPLATE_NAME="checklist-template.md"
   else
     case "$file_path" in
       *handoff*)
         # ★ 按内容特征区分单/多轮 handoff，不依赖文件名
-        if echo "$CONTENT" | grep -qF "## 全局元信息"; then
+        if grep -qF "## 全局元信息" <<< "$CONTENT"; then
           TEMPLATE_NAME="handoff-multi-round-template.md"
-        elif echo "$CONTENT" | grep -qF "## 1. 交接前状态"; then
+        elif grep -qF "## 1. 交接前状态" <<< "$CONTENT"; then
           TEMPLATE_NAME="handoff-single-round-template.md"
         else
           echo "⛔ handoff 文件内容无法识别模板类型（缺 '## 全局元信息' 或 '## 1. 交接前状态'），拒绝写入" >&2
@@ -107,18 +116,19 @@ if [ -z "$TEMPLATE_NAME" ]; then
           exit 2
         fi
         ;;
-      *plan*)            TEMPLATE_NAME="standard-plan-template.md" ;;
       *add-route*heavy*) TEMPLATE_NAME="add-route-template-heavyweight.md" ;;
       *add-route*)       TEMPLATE_NAME="add-route-template.md" ;;
+      *plan*)            TEMPLATE_NAME="standard-plan-template.md" ;;
       *tasks*)           TEMPLATE_NAME="tasks-template.md" ;;
       *spec*)            TEMPLATE_NAME="spec-template.md" ;;
       *checklist*)       TEMPLATE_NAME="checklist-template.md" ;;
       *report*runtime*)  TEMPLATE_NAME="runtime-report-template.md" ;;
       *report*)          TEMPLATE_NAME="report-template.md" ;;
       *fix-verif*)       TEMPLATE_NAME="fix-verification-template.md" ;;
+      *hitl*)           TEMPLATE_NAME="hitl-template.md" ;;
       *) 
         # 增量修订识别：包含 ~~删除线~~ / → 新增标记 / [修订日期] 任意一个 → 视为增量更新，放行
-        if echo "$CONTENT" | grep -qE '~~.+~~|→|\[[0-9]{4}-[0-9]{2}-[0-9]{2}\s+修订'; then
+        if grep -qE '~~.+~~|→|\[[0-9]{4}-[0-9]{2}-[0-9]{2}\s+修订' <<< "$CONTENT"; then
           echo "[doc-format-guard] 检测到增量修订格式，跳过完整章节校验" >&2
           exit 0
         fi
@@ -150,17 +160,54 @@ ISSUES=""
 TMPFILE="$PROJECT_DIR/$MAGIC_DIR/.doc-guard-issues.tmp"
 : > "$TMPFILE"
 trap "rm -f $TMPFILE" EXIT
+
+# ── 锚定校验（锚定制：schema 声明 anchor，参照内容从模板现场提取；Task 1.2）──
+# 锚点不在模板 → 跳过该规则 + stderr 告警（不阻塞写入，冒烟巡检兑底）
+# within 前缀匹配；heading 缺失 → 跳过规则 + 告警（不误拦）
+if [ "$IS_SEARCH_REPLACE" != "true" ]; then
+  jq -r '.sections[] | select(.anchor != null) | .id + "|" + .anchor + "|" + (.within // "")' "$SCHEMA_FILE" 2>/dev/null | while IFS='|' read -r aid anchor within; do
+    [ -z "$anchor" ] && continue
+    ref_line=$(grep -m1 -F "$anchor" "$TEMPLATES_DIR/$TEMPLATE_NAME" 2>/dev/null || true)
+    if [ -z "$ref_line" ]; then
+      echo "[doc-format-guard] anchor_miss: schema ${aid} 声明的 anchor '${anchor}' 在 ${TEMPLATE_NAME} 中未定位，跳过该规则（冒烟巡检兑底）" >&2
+      continue
+    fi
+    tokens=$(echo "$ref_line" | tr '#*`|(){' '         ' | tr -s ' ' '\n' | grep -v '^$' | grep -vF '{' | sort -u)
+    [ -z "$tokens" ] && continue
+    scope="$CONTENT"
+    if [ -n "$within" ]; then
+      if grep -q "^${within}" <<< "$CONTENT"; then
+        scope=$(sed -n "/^${within}/,/^## /p" <<< "$CONTENT")
+      else
+        echo "[doc-format-guard] within_miss: schema ${aid} 的 within '${within}' 在文档中未定位，跳过该规则" >&2
+        continue
+      fi
+    fi
+    # 声明级缺失统计：一个锚点声明的必选 token 有任一缺失即记 1 条规则缺失（struct_score 精确语义）
+    miss_tokens=""
+    for tok in $tokens; do
+      if ! grep -qF "$tok" <<< "$scope"; then
+        miss_tokens="${miss_tokens}${tok} "
+      fi
+    done
+    # if 语句（非 && 链）：miss_tokens 为空时返回 0，避免 while 管道退出码非零触发 set -e
+    if [ -n "$miss_tokens" ]; then
+      echo "  缺锚点(${aid}): ${miss_tokens}"
+    fi
+  done >> "$TMPFILE"
+fi
+
 # SearchReplace 只传 patch → 跳过章节/子章节校验（无法从 patch 推断完整文档结构）
 if [ "$IS_SEARCH_REPLACE" != "true" ]; then
-  jq -r '.sections[] | select(.required == true) | .heading' "$SCHEMA_FILE" 2>/dev/null | while IFS= read -r heading; do
-    if ! echo "$CONTENT" | grep -qF "$heading"; then
+  jq -r '.sections[] | select(.required == true) | select(.heading != null) | .heading' "$SCHEMA_FILE" 2>/dev/null | while IFS= read -r heading; do
+    if ! grep -qF "$heading" <<< "$CONTENT"; then
       echo "  缺章节: $heading"
     fi
-  done > "$TMPFILE"
+  done >> "$TMPFILE"
 
   # 子章节
-  jq -r '.sections[].subsections[]?.heading' "$SCHEMA_FILE" 2>/dev/null | while IFS= read -r sub; do
-    if ! echo "$CONTENT" | grep -qF "$sub"; then
+  jq -r '.sections[].subsections[]? | select(.heading != null) | .heading' "$SCHEMA_FILE" 2>/dev/null | while IFS= read -r sub; do
+    if ! grep -qF "$sub" <<< "$CONTENT"; then
       echo "  缺子章节: $sub"
     fi
   done >> "$TMPFILE"
@@ -168,26 +215,57 @@ fi
 
 # ── 占位符校验 ──
 jq -r '.placeholders[]?' "$SCHEMA_FILE" 2>/dev/null | while IFS= read -r ph; do
-  if echo "$CONTENT" | grep -qF "$ph"; then
+  if grep -qF "$ph" <<< "$CONTENT"; then
     echo "  未替换占位符: $ph"
   fi
 done >> "$TMPFILE"
 
-# ── 禁止词校验 ──
+# ── 结构位禁词校验（仅标题行 + schema 声明的 groupColumn；正文叙述免疫；Task 1.2）──
+struct_text=$(grep -E '^#{2,}[[:space:]]' <<< "$CONTENT")
+col=$(jq -r '.groupColumn // empty' "$SCHEMA_FILE" 2>/dev/null)
+if [ -n "$col" ]; then
+  struct_text="${struct_text}
+$(awk -F'|' -v c="$col" 'NF>c {gsub(/^[[:space:]]+|[[:space:]]+$/, "", $(c+1)); print $(c+1)}' <<< "$CONTENT")"
+fi
 jq -r '.forbidden_terms[]?' "$SCHEMA_FILE" 2>/dev/null | while IFS= read -r term; do
-  if echo "$CONTENT" | grep -qw "$term"; then
-    echo "  禁止词: $term"
+  # 结构位（标题行/分组列）是原子单元：定串匹配即可命中；正文不参与（豁免由提取范围保证）
+  if grep -qF "$term" <<< "$struct_text"; then
+    echo "  结构位禁词: $term"
   fi
 done >> "$TMPFILE"
 
 ISSUES=$(cat "$TMPFILE" 2>/dev/null)
 
+# ── 判定回流 extra（Task 1.5 数据契约：anchor_hit/struct_score 精确语义；override 由上层 hook 在人类推翻时追加）──
+# struct_score = (适用规则数 - 缺失规则数) / 适用规则数 × 100，适用规则从 schema 实况计数
+anchor_total=$(jq -r '[.sections[] | select(.anchor != null)] | length' "$SCHEMA_FILE" 2>/dev/null || echo 0)
+heading_total=$(jq -r '[.sections[] | select(.required == true and .heading != null)] | length' "$SCHEMA_FILE" 2>/dev/null || echo 0)
+sub_total=$(jq -r '[.sections[].subsections[]? | select(.heading != null)] | length' "$SCHEMA_FILE" 2>/dev/null || echo 0)
+term_total=$(jq -r '.forbidden_terms | length' "$SCHEMA_FILE" 2>/dev/null || echo 0)
+if [ "$IS_SEARCH_REPLACE" = "true" ]; then
+  applied=$term_total  # patch 路径仅禁词规则适用
+else
+  applied=$(( anchor_total + heading_total + sub_total + term_total ))
+fi
+missed=$(wc -l < "$TMPFILE" 2>/dev/null | tr -d ' ')
+missed=${missed:-0}
+anchor_hit=true
+grep -q "缺锚点" "$TMPFILE" 2>/dev/null && anchor_hit=false
+struct_score=100
+if [ "$applied" -gt 0 ] 2>/dev/null && [ "$missed" -gt 0 ] 2>/dev/null; then
+  struct_score=$(( (applied - missed) * 100 / applied ))
+  [ "$struct_score" -lt 0 ] && struct_score=0
+fi
+BACKFLOW_EXTRA="\"anchor_hit\":${anchor_hit},\"struct_score\":${struct_score}"
+
 # ── 阻断或放行 ──
 if [ -n "$ISSUES" ]; then
   echo "⛔ $TEMPLATE_NAME 校验不通过:
 $ISSUES" >&2
-  echo "{\"hookSpecificOutput\":{\"hookEventName\":\"PreToolUse\",\"permissionDecision\":\"ask\",\"permissionDecisionReason\":\"文档格式校验不通过，请对照模板修正\"}}"
-  write_hook_event "doc-format-guard" "deny" "$file_path" "文档格式校验不通过" "$PLAN_KEYWORD" "$PLAN_STATUS" 2>/dev/null || true
+  # 明细注入 stdout reason（去引号防 JSON 破坏，截断 180 字），让被拦方第一时间知道改什么
+  ISSUES_BRIEF=$(printf '%s' "$ISSUES" | tr '\n' ' ' | tr -d '"' | tr -s ' ' | cut -c1-180)
+  echo "{\"hookSpecificOutput\":{\"hookEventName\":\"PreToolUse\",\"permissionDecision\":\"ask\",\"permissionDecisionReason\":\"文档格式校验不通过: ${ISSUES_BRIEF}\"}}"
+  write_hook_event "doc-format-guard" "deny" "$file_path" "文档格式校验不通过" "$PLAN_KEYWORD" "$PLAN_STATUS" "$BACKFLOW_EXTRA" 2>/dev/null || true
   exit 2
 fi
 
@@ -198,4 +276,7 @@ if echo "$file_path" | grep -q "$MAGIC_DIR/plans/"; then
   fi
 fi
 
+# 放行回流（Task 1.5：anchor_hit/struct_score 正样本底座）
+write_hook_event "doc-format-guard" "allow" "$file_path" "校验通过" "$PLAN_KEYWORD" "$PLAN_STATUS" "$BACKFLOW_EXTRA" 2>/dev/null || true
+
 exit 0

package/templates/adapters/vscode/hooks/lib/common.sh

@@ -34,99 +34,58 @@ json_get() {
 
 # ── ADD 活跃 Plan 检测（裁决定逻辑，SKILL §0.7.1） ──
 #
-# 活跃判定标准：
-#   1. magicDir 优先级: 由 Hook 脚本自身的路径推断（.claude/hooks/xxx.sh → .claude）→ .add → stderr 提示全局搜索
-#   2. 索引优先: 先读 plans/index.md 匹配 → 无匹配才 glob *-handoff*.md
-#   3. 活跃定义: add-route 中存在 [ ] 未勾选项 = 活跃；全部 [x] = 已收敛
-#   4. 多 Plan 冲突: 取 add-route 最近 mtime
-#   5. 无 add-route: Plan 初始态，视为活跃
+# lifecycle 的唯一真相源是 scoped DB。短生命周期 Hook 不常驻 LISTEN；每次触发
+# 都通过当前 adapter 生成态的机器桥（plan-status-bridge）调用 shared resolver。
+# Handoff/add-route 不再参与 active 裁决，禁止跨 adapter 或文件系统 fallback
+# （含 .add 回退与 mtime/勾选数推断）。
+#
+# magicDir 解析（Review P1 #5）: 入口必须注入自身 magicDir；未注入时从生成态
+# 脚本物理位置（<magicDir>/hooks/...）反推；推导失败 → STATUS_UNAVAILABLE，
+# 禁止任何 adapter 名称默认值。
 #
 # 前置条件: 调用方需设置 PROJECT_DIR 环境变量（项目根目录）
-# 返回: "plan_keyword::step_n/total::round_n/total::handoff_path::add_route_path" 或 ""
-
-detect_active_add() {
-  local plans_dir=""
-
-  # 1. magicDir 回退: 当前 IDE（CURRENT_MAGIC）→ 目录检测 → .add → 提示全局搜索
-  local magic_dirs=()
-  if [ -n "${CURRENT_MAGIC:-}" ]; then
-    magic_dirs+=("$CURRENT_MAGIC")
+# 返回: "plan_keyword::step_n/total::round_n/total::handoff_path::add_route_path"
+#       或 "__STATUS_UNAVAILABLE__::reason::database::none::none"（调用方必须 fail-closed）
+
+query_plan_status() {
+  local bridge=""
+  if [ -n "${MAGIC_DIR:-}" ]; then
+    bridge="${PROJECT_DIR:-$PWD}/${MAGIC_DIR}/scripts/plan-status-bridge.ts"
+  elif [ -n "${HOOK_DIR:-}" ]; then
+    # 物理位置反推: <magicDir>/hooks/lib/common.sh → <magicDir>
+    bridge="${PROJECT_DIR:-$PWD}/$(basename "$(dirname "$(dirname "$HOOK_DIR")")")/scripts/plan-status-bridge.ts"
   else
-    # 兜底: 检测 PROJECT_DIR 下哪个 magicDir 存在
-    for m in ".claude" ".qoder" ".vscode" ".trae"; do
-      [ -d "${PROJECT_DIR:-$PWD}/$m" ] && { magic_dirs+=("$m"); break; }
-    done
-  fi
-  magic_dirs+=(".add")
-
-  for magic in "${magic_dirs[@]}"; do
-    if [ -d "${PROJECT_DIR:-$PWD}/$magic/plans" ]; then
-      plans_dir="${PROJECT_DIR:-$PWD}/$magic/plans"
-      break
-    fi
-  done
-
-  if [ -z "$plans_dir" ]; then
-    echo "[ADD detect] 未在当前 IDE magicDir 和 .add 中找到 plans 目录。是否需要全局搜索所有 magicDir？" >&2
-    return 1
-  fi
-
-  local handoff=""
-  local add_route=""
-
-  # 2. 索引优先: 先读 index.md
-  if [ -f "$plans_dir/index.md" ]; then
-    # 从 index.md 表格提取最近一个 handoff 相对路径
-    # 表格格式: | YYYY-MM/DD/path-to-handoff.md | ...
-    handoff=$(grep -oE '[0-9]{4}-[0-9]{2}/[0-9]{2}/[^|]*handoff[^|]*\.md' "$plans_dir/index.md" 2>/dev/null | head -1 | xargs)
-    if [ -n "$handoff" ] && [ -f "$plans_dir/$handoff" ]; then
-      handoff="$plans_dir/$handoff"
-    else
-      handoff=""
-    fi
+    echo '{"availability":"STATUS_UNAVAILABLE","source":"database","reason":"magicDir 未注入且无法从物理位置推导"}'
+    return 3
   fi
-
-  # 3. 退路: glob handoff 文件（mtime 7 天内）
-  if [ -z "$handoff" ]; then
-    local today_dir="$plans_dir/$(date +%Y-%m)"
-    [ -d "$today_dir" ] && handoff=$(find "$today_dir" -name "*handoff*.md" -mtime -7 -type f 2>/dev/null | head -1)
-    [ -z "$handoff" ] && handoff=$(find "$plans_dir" -name "*handoff*.md" -mtime -7 -type f 2>/dev/null | head -1)
+  if [ ! -f "$bridge" ]; then
+    echo '{"availability":"STATUS_UNAVAILABLE","source":"database","reason":"plan-status bridge missing"}'
+    return 3
   fi
-  [ -z "$handoff" ] && return 1
-
-  # 提取 plan keyword
-  local plan_kw=$(basename "$handoff" | sed 's/-handoff.*//')
-
-  # 查找 add-route
-  local handoff_dir=$(dirname "$handoff")
-  add_route=$(find "$handoff_dir" -name "*add-route*.md" -type f 2>/dev/null | head -1)
-  [ -z "$add_route" ] && add_route=$(find "$plans_dir" -name "*add-route*.md" -type f 2>/dev/null | head -1)
+  node --import tsx "$bridge"
+}
 
-  # 4. 活跃判定: 读 add-route，存在 [ ] 未勾选项 = 活跃
-  local step_info="?"
-  if [ -f "$add_route" ]; then
-    local ck=$(grep -c '\[x\]' "$add_route" 2>/dev/null || true)
-    local uc=$(grep -c '\[ \]' "$add_route" 2>/dev/null || true)
-    ck=${ck:-0}; uc=${uc:-0}
-    local total=$((ck + uc))
-    [ "$total" -gt 0 ] && step_info="${ck}/${total}"
-    # 全部 [x] → 已收敛（但 handoff 还存在 → 可能是遗留，仍返回但标记）
-  else
-    # 无 add-route → Plan 初始态，视为活跃
-    step_info="init"
+# 兼容既有 Hook 字段协议：
+# "planName::done/total::approvalStatus::none::none"；后两个路径不参与 active 判定。
+# DB 不可用/不可判定时返回特殊首字段，调用方必须 fail closed，不能当作“无 Plan”。
+detect_active_add() {
+  local snapshot="" rc=0
+  snapshot="$(query_plan_status 2>/dev/null)" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    local reason
+    reason=$(printf '%s' "$snapshot" | jq -r '.reason // "database status unavailable"' 2>/dev/null || echo "database status unavailable")
+    echo "__STATUS_UNAVAILABLE__::${reason}::database::none::none"
+    return 0
   fi
-
-  # 5. 轮次统计（从 handoff）
-  local round_info="?"
-  if grep -q '<第[0-9]轮>' "$handoff" 2>/dev/null; then
-    local ck=$(grep -c '\[x\]' "$handoff" 2>/dev/null || true); ck=${ck:-0}
-    local total=$(grep -c '<第[0-9]轮>' "$handoff" 2>/dev/null || true); total=${total:-0}
-    [ "$total" -gt 0 ] && round_info="${ck}/${total}"
-  else
-    round_info="1/1"
+  if ! printf '%s' "$snapshot" | jq -e '.availability == "READY" and .isActive == true' >/dev/null 2>&1; then
+    return 1
   fi
-
-  echo "${plan_kw}::${step_info}::${round_info}::${handoff}::${add_route:-none}"
+  local plan done total approval
+  plan=$(printf '%s' "$snapshot" | jq -r '.planName')
+  done=$(printf '%s' "$snapshot" | jq -r '.progress.doneTasks // 0')
+  total=$(printf '%s' "$snapshot" | jq -r '.progress.totalTasks // 0')
+  approval=$(printf '%s' "$snapshot" | jq -r '.approvalStatus // "none"')
+  echo "${plan}::${done}/${total}::${approval}::none::none"
 }
 
 # ── Dev Action 追踪 ──
@@ -223,8 +182,8 @@ Plan 不是"文档开销"——它是代码治理的基础设施。跳过 Plan
 方案 B — 补不上则回滚:
   如果改动太复杂无法追溯生成 Plan，则:
   ① git diff 确认改动范围
-  ② git checkout -- <改动的文件> 撤回
-  ③ 告知用户 "以下改动已回滚，请先走 ADD 流程再重新实施: <文件列表>"
+  ② 仅对已确认属于本轮的文件生成反向 apply_patch
+  ③ 无法安全确认改动所有权时停止，并请求用户决定
 
 无论选 A 还是 B，完成后告诉用户下次执行 session-init 恢复上下文。
 EOF

package/templates/adapters/vscode/hooks/lib/context-inject.sh

@@ -45,8 +45,8 @@ Plan 不是"文档开销"——它是代码治理的基础设斻。跳过 Plan
 方案 B — 补不上则回滚:
   如果改动太复杂无法追溯生成 Plan，则:
   ① git diff 确认改动范围
-  ② git checkout -- <改动的文件> 撤回
-  ③ 告知用户 "以下改动已回滚，请先走 ADD 流程再重新实施: <文件列表>"
+  ② 仅对已确认属于本轮的文件生成反向 apply_patch
+  ③ 无法安全确认改动所有权时停止，并请求用户决定
 
 无论选 A 还是 B，完成后告诉用户下次执行 session-init 恢复上下文。
 EOF