@minonl/dia 0.0.2-beta.0 → 0.0.2

package/packages/wt/bin/dia-wt

@@ -118,7 +118,7 @@ dia_wt_data_root() {
 
 # ── 授权推导的**输入**：产出 scope.json（设计 §4.5 D0–D6；消费方 = dsh 引擎 / P3 兜底插件）──
 #   为什么在这里产出：迭代入口天然知道"本次任务仓库是哪个"，而权限层不知道（这是越权写的根因之一）。
-#   ⚠️ 关键判定：**是否 git 仓库** —— 非 git 仓库（如 ~/repos/leyan 根）**不派生** worktree 同级目录，
+#   ⚠️ 关键判定：**是否 git 仓库** —— 非 git 仓库（如 ~/repos/example 根）**不派生** worktree 同级目录，
 #      否则会把兄弟目录（repos/local 等）误算进作用域（用户 2026-10-15 明确）。
 write_scope() {   # write_scope <repo-or-worktree-path> [feature] [session]
   local target="$1" feature="${2:-}" session="${3:-}"
@@ -214,8 +214,29 @@ console.log(`   repo=${d.repo}｜ gitRepo=${d.gitRepo}｜ writable=` + (d.writab
 JS
 }
 
+# adopt 写入的路径模板（<git-common-dir>/dia/config.json 的 template）；未 adopt → 空
+wt_repo_template() {
+  local repo="$1" common cfg
+  common="$(wt_common_dir "$repo" 2>/dev/null)" || return 1
+  cfg="$common/dia/config.json"
+  [ -f "$cfg" ] || return 1
+  python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("template") or "")' "$cfg" 2>/dev/null
+}
+wt_expand_template() {
+  local tmpl="$1" repo="$2" feature="$3"
+  local parent base
+  parent="$(cd "$(dirname "$repo")" && pwd)"; base="$(basename "$repo")"
+  printf '%s' "$tmpl" | sed -e "s|{{parent}}|$parent|g" -e "s|{{repo}}|$base|g" \
+                              -e "s|{{wtRoot}}|$repo/.worktrees|g" -e "s|{{feature}}|$feature|g"
+}
 wt_path() {
-  local repo="$1" feature="$2" form="$3"
+  local repo="$1" feature="$2" form="$3" tmpl dest
+  # 模板优先（adopt 后策略即 SSOT）；未 adopt 维持凭 form 推导（默认平级，零迁移）
+  if tmpl="$(wt_repo_template "$repo")" && [ -n "$tmpl" ]; then
+    dest="$(wt_expand_template "$tmpl" "$repo" "$feature")"
+    case "$dest" in /*) ;; *) dest="$repo/$dest" ;; esac
+    printf '%s' "$dest"; return 0
+  fi
   local parent; parent="$(cd "$(dirname "$repo")" && pwd)"
   local base;   base="$(basename "$repo")"
   if [ "$form" = hidden ]; then printf '%s/.worktrees/%s' "$repo" "$feature"
@@ -368,7 +389,7 @@ cmd_status() {
       [ -n "$ST_FILES" ] && printf '%s\n' "$ST_FILES" | sed 's/^/        · /'
       [ -n "$ST_FILES" ] && dirty_map="${dirty_map}${p}"$'\t'"$(printf '%s' "$ST_FILES" | tr '\n' ',')"$'\n'
     fi
-  done < <(git -C "$repo" worktree list --porcelain 2>/dev/null | sed -n 's/^worktree //p')
+  done < <(git -C "$repo" -c core.quotePath=false worktree list --porcelain 2>/dev/null | sed -n 's/^worktree //p')
 
   # 重叠检测（设计 D6）：**同一仓内**两个以上 worktree 改同一**仓内相对路径**。
   # 不跨仓比较 —— 不同仓的同名相对路径属巧合，报出来是噪音。
@@ -415,7 +436,7 @@ cmd_list() {
 #   · 删前逐个打印「分支名 + 最后提交日期 + 标题」，可回溯。
 #
 # 用法：prune-merged [<repo>] [--all] [--apply] [--base <ref>] [--protect a,b] [--quiet]
-#   --all  扫已知仓根（数据根 repos/、$DIA_WT_REPOS_ROOT 默认 ~/repos/leyan）下的主 checkout
+#   --all  扫已知仓根（数据根 repos/、$DIA_WT_REPOS_ROOT 默认 ~/repos/example）下的主 checkout
 # 退出码：0 = 无待清理 / 已全部清理；1 = 仍有残留（dry-run 发现待清理时也是 1）
 # ═══════════════════════════════════════════════════════════════════════════
 cmd_prune_merged() {
@@ -586,7 +607,7 @@ prune_one() {
 #      判据不区分 → 一旦启用 GVS 全仓误报；判据不查 → 违规静默破坏。
 #
 # 用法：check [<repo>...] [--all] [--deep] [--quiet]
-#   --all    扫已知仓根（`$YAN_DATA_ROOT/repos`、`$DIA_WT_REPOS_ROOT`（默认 `~/repos/leyan`））下的主 checkout
+#   --all    扫已知仓根（`$YAN_DATA_ROOT/repos`、`$DIA_WT_REPOS_ROOT`（默认 `~/repos/example`））下的主 checkout
 #            （跳过 `*-worktree--*`：它们的 worktree 由主仓 `worktree list` 覆盖）+ 仓根杂散 node_modules 检测
 #   --deep   递归扫 node_modules 全树（默认只扫顶层；大仓全树需数秒）
 #   --quiet  只输出有问题的 checkout
@@ -939,7 +960,7 @@ cmd_clean() {
 # 配置读取（**数据根为准**，可与个人仓基线合并；三个名单键取**并集**：本地只能增、不能删）：
 #   $YAN_ROUTE_CONFIG                           显式指定（最高优先，一般不用）
 #   $YAN_DATA_ROOT/route.json                   本机主入口 —— **可以是软链**，指向个人仓里的版本化文件
-#   $PERSONAL_AGENT_DIR/config/yan-route.json   个人仓基线（跨设备可版本化，默认 ~/repos/leyan/personal-agent）
+#   $PERSONAL_AGENT_DIR/config/yan-route.json   个人仓基线（跨设备可版本化，默认 ~/repos/example/personal-agent）
 #   格式：{ "my_namespaces": ["example-user"], "direct": ["yan-agent"], "mr": [] }
 #   ⚠️ `my_namespaces` 缺失时**绝不瞎猜**（不拿 git author 的 email 前缀自动当命名空间）：
 #      只在输出里给「推测 + 如何确认」，由人核对（glab auth status）后写进配置。
@@ -1015,7 +1036,7 @@ cmd_route() {
   else
     name="$(basename "$repo")"
   fi
-  case "$name" in *-worktree--*) name="${name%%-worktree--*}"; repo="$(dirname "$repo")/$name" ;; esac
+case "$name" in *-worktree--*) name="${name%%-worktree--*}"; repo="$(dirname "$repo")/$name" ;; esac
 
   # ── 配置驱动判定（**不再硬编码仓名**；判定来源会被打印出来，可审计）──
   local cfg ns=""
@@ -1093,6 +1114,330 @@ EOS
   esac
 }
 
+# ── adopt / doctor / gate（2026-11-05）──────────────────────────────────────
+# 设计：core/docs/compose/spec/dia-wt-adopt-design.md
+# 纪律靠闸不靠 chmod：主 checkout 上 pre-commit/pre-push 拒绝 protected 分支；
+# 配置落 <git-common-dir>/dia/config.json；默认模板与现网 -worktree-- 布局一致（零迁移）。
+
+wt_common_dir() {
+  local repo="$1" d
+  d="$(git -C "$repo" rev-parse --git-common-dir 2>/dev/null)" || return 1
+  case "$d" in /*) printf '%s\n' "$d" ;; *) ( cd "$repo" && cd "$d" 2>/dev/null && pwd -P ) ;; esac
+}
+wt_is_main_checkout() {
+  local repo="$1" gd cd
+  gd="$(git -C "$repo" rev-parse --git-dir 2>/dev/null)" || return 2
+  cd="$(wt_common_dir "$repo")" || return 2
+  case "$gd" in /*) ;; *) gd="$(cd "$repo" && cd "$gd" 2>/dev/null && pwd -P)" ;; esac
+  [ "$gd" = "$cd" ]
+}
+wt_default_branch() {
+  local repo="$1" b=""
+  b="$(git -C "$repo" symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null | sed 's#^origin/##')"
+  # origin/HEAD 可能是**过期**的（远端分支已删，如 grayscale-open 指向 feat/init）→ 必须验证 ref 还在
+  if [ -n "$b" ] && ! git -C "$repo" show-ref --verify --quiet "refs/remotes/origin/$b"; then b=""; fi
+  [ -n "$b" ] || { git -C "$repo" show-ref --verify --quiet refs/heads/main && b="main"; }
+  [ -n "$b" ] || { git -C "$repo" show-ref --verify --quiet refs/heads/master && b="master"; }
+  [ -n "$b" ] || b="$(git -C "$repo" config --get dia.defaultBranch 2>/dev/null || true)"
+  # 注意：**不回落到当前 HEAD**（在 feature 分支上 adopt 会把 feature 当默认分支）
+  printf '%s' "$b"
+}
+
+wt_write_hook() {
+  local hooksdir="$1" name="$2" extra="${3:-}" chain="${4:-}"
+  cat > "$hooksdir/$name" <<'HOOK'
+#!/usr/bin/env bash
+# dia-wt guard（managed by `dia wt adopt`；勿手改）
+set -uo pipefail
+name="$(basename "$0")"
+top="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
+common="$(git rev-parse --git-common-dir 2>/dev/null || true)"
+case "$common" in /*) ;; *) common="$(cd "$top" && cd "$common" 2>/dev/null && pwd -P)" ;; esac
+gd="$(git rev-parse --git-dir 2>/dev/null || true)"
+case "$gd" in /*) ;; *) gd="$(cd "$top" && cd "$gd" 2>/dev/null && pwd -P)" ;; esac
+is_main=0; [ "$gd" = "$common" ] && is_main=1
+branch="$(git symbolic-ref --short HEAD 2>/dev/null || true)"
+prot=" main master develop dev "
+probe="${DIA_WT_GUARD_PROBE:-0}"
+wt_guard_scan() {
+local ls="$1" rs="$2" range="" base="" hits=""
+[ "${DIA_WT_GUARD_SCAN:-1}" = "1" ] || return 0
+if [ -n "$rs" ] && [ "$rs" != "0000000000000000000000000000000000000000" ] && git cat-file -e "$rs" 2>/dev/null; then
+  range="$rs..$ls"
+else
+  base="$(git merge-base "$ls" "origin/HEAD" 2>/dev/null || git merge-base "$ls" main 2>/dev/null || true)"
+  if [ -n "$base" ]; then range="$base..$ls"; else range="$ls^..$ls"; fi
+fi
+hits="$(git diff -U0 "$range" -- . 2>/dev/null | grep -E '^\+' | grep -vE '^\+\+\+' \
+  | grep -vE '/(Users|home)/(you|user|example|runner|shared|me)(/|$)' \
+  | grep -nE '(/Users/[A-Za-z0-9._-]+|/home/[A-Za-z0-9._-]+|-----BEGIN [A-Z ]*PRIVATE KEY-----|AKIA[0-9A-Z]{16}|ghp_[A-Za-z0-9]{20,}|github_pat_[A-Za-z0-9_]{20,})' | head -5)"
+if [ -n "$hits" ]; then
+  echo "[dia-wt] 推送包含敏感内容（已阻断）：" >&2
+  printf '%s\n' "$hits" >&2
+  echo "[dia-wt] 确认误报可临时关闭：DIA_WT_GUARD_SCAN=0 git push ..." >&2
+  return 1
+fi
+}
+
+case "$name" in
+  pre-commit)
+    if [ "$probe" = 1 ]; then
+      { [ "$is_main" = 1 ] && [[ "$prot" == *" $branch "* ]]; } && exit 1 || exit 0
+    fi
+    if [ "$is_main" = 1 ] && [[ "$prot" == *" $branch "* ]]; then
+      echo "[dia-wt] 主 checkout 禁止在 $branch 直接提交；请先：dia wt create <repo> <feature>" >&2
+      exit 1
+    fi ;;
+  pre-push)
+    if [ "$probe" = 1 ]; then
+      [ "$is_main" = 1 ] && exit 1 || exit 0
+    fi
+    if [ "$is_main" = 1 ]; then
+      echo "[dia-wt] 主 checkout 禁止直接 push；请走 worktree 分支 + MR" >&2
+      exit 1
+    fi
+    while read -r _lr ls rr rs; do
+      case "${rr:-}" in
+        refs/heads/main|refs/heads/master|refs/heads/develop|refs/heads/dev)
+          echo "[dia-wt] 禁止直接 push ${rr#refs/heads/}；请走 MR" >&2; exit 1 ;;
+      esac
+      wt_guard_scan "$ls" "$rs" || exit 1
+    done ;;
+  post-checkout)
+    [ "$probe" = 1 ] && exit 0
+    if [ "$is_main" = 1 ] && [[ "$prot" != *" $branch "* ]]; then
+      echo "[dia-wt] 提示：主 checkout 当前在 $branch（建议回到默认分支）" >&2
+    fi ;;
+esac
+# 钩子链：原 hooksPath（husky / .githooks / simple-git-hooks）优先，其次仓库默认 hooks 目录
+chain="${DIA_WT_CHAIN_DIR:-}"
+case "$chain" in
+  "") ;;
+  /*) ;;
+  *) chain="$top/$chain" ;;
+esac
+if [ -n "$chain" ] && [ -x "$chain/$name" ] && [ "$chain/$name" != "$0" ]; then exec "$chain/$name" "$@"; fi
+orig="$common/hooks/$name"
+if [ -x "$orig" ] && [ "$orig" != "$0" ]; then exec "$orig" "$@"; fi
+exit 0
+HOOK
+  if [ -n "$chain" ]; then
+    python3 - "$hooksdir/$name" "$chain" <<'PYCHAIN'
+import sys
+p, chain = sys.argv[1], sys.argv[2]
+s = open(p).read()
+s = s.replace('chain="${DIA_WT_CHAIN_DIR:-}"', 'chain="${DIA_WT_CHAIN_DIR:-%s}"' % chain.replace('\\', '\\\\').replace('"', '\\"'))
+open(p, "w").write(s)
+PYCHAIN
+  fi
+  if [ -n "$extra" ]; then
+    python3 - "$hooksdir/$name" "$extra" <<'PYGT'
+import sys, re
+p, extra = sys.argv[1], sys.argv[2]
+s = open(p).read()
+s = re.sub(r'^prot=" main master develop dev "$', f'prot=" main master develop dev {extra} "', s, flags=re.M)
+open(p, "w").write(s)
+PYGT
+  fi
+  chmod +x "$hooksdir/$name"
+}
+
+cmd_adopt() {
+  local repo="" mode="dry" template="" def="" json=0
+  while [ $# -gt 0 ]; do case "$1" in
+    --apply) mode="apply"; shift ;;
+    --check) mode="check"; shift ;;
+    --revert) mode="revert"; shift ;;
+    --dry-run) mode="dry"; shift ;;
+    --template) template="$2"; shift 2 ;;
+    --default-branch) def="$2"; shift 2 ;;
+    --json) json=1; shift ;;
+    --force) echo "[dia-wt] --force 已忽略：adopt 幂等、无破坏性默认行为" >&2; shift ;;
+    -h|--help) sed -n '2,6p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;;
+    -*) die "未知参数：$1" ;;
+    *) repo="$1"; shift ;;
+  esac; done
+  [ -n "$repo" ] || die "用法: dia wt adopt <repo> [--apply|--check|--revert] [--template T] [--default-branch B] [--json]"
+  [ -d "$repo" ] || die "目录不存在：$repo"
+  git -C "$repo" rev-parse --git-dir >/dev/null 2>&1 || die "不是 git 仓库：$repo"
+
+  local common cfgdir cfg hooksdir prev
+  common="$(wt_common_dir "$repo")" || die "无法解析 git-common-dir"
+  cfgdir="$common/dia"; cfg="$cfgdir/config.json"; hooksdir="$cfgdir/hooks"
+  prev="$(git -C "$repo" config --get core.hooksPath 2>/dev/null || true)"
+  [ -n "$template" ] || template='{{parent}}/{{repo}}-worktree--{{feature}}'
+  [ -n "$def" ] || def="$(wt_default_branch "$repo")"
+
+  if [ "$mode" = "revert" ]; then
+    [ -f "$cfg" ] || die "未 adopt（缺 $cfg）"
+    local saved
+    saved="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksPrevious") or "")' "$cfg")"
+    if [ "$prev" != "$hooksdir" ]; then
+      echo "[dia-wt] hooksPath 已被改动（$prev），跳过还原并保留 $cfgdir 备份" >&2
+      return 1
+    fi
+    if [ -n "$saved" ]; then git -C "$repo" config --local core.hooksPath "$saved"; else git -C "$repo" config --local --unset core.hooksPath 2>/dev/null || true; fi
+    rm -rf "$cfgdir"
+    echo "reverted：$cfgdir"
+    return 0
+  fi
+
+  if [ "$mode" = "check" ]; then
+    local bad=0
+    [ -f "$cfg" ] || { echo "FAIL D01 未 adopt（缺 $cfg）"; bad=1; }
+    # 策略 SSOT 是 config.json：默认分支以它为准（不从 remote 重猜，避免与已写入的钩子策略漂移）
+    if [ -f "$cfg" ]; then
+      local cfgDef; cfgDef="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("defaultBranch") or "")' "$cfg" 2>/dev/null || true)"
+      [ -n "$cfgDef" ] && def="$cfgDef"
+    fi
+    case "$prev" in /*) ;; *) echo "FAIL D02 core.hooksPath 不是绝对路径（$prev）"; bad=1 ;; esac
+    for h in pre-commit pre-push post-checkout; do
+      [ -x "$hooksdir/$h" ] || { echo "FAIL D02 缺 $h 钩子"; bad=1; }
+    done
+    if [ -n "$def" ] && [ -x "$hooksdir/pre-commit" ]; then
+      grep -q "prot=\" main master develop dev $def \"" "$hooksdir/pre-commit" \
+        || { echo "FAIL D03 钩子未保护默认分支 $def"; bad=1; }
+      if wt_is_main_checkout "$repo" && [ "$(git -C "$repo" symbolic-ref --short HEAD 2>/dev/null)" = "$def" ]; then
+        ( cd "$repo" && DIA_WT_GUARD_PROBE=1 "$hooksdir/pre-commit" >/dev/null 2>&1 ) \
+          && { echo "FAIL D03 守卫探针未拦截主 checkout 的 $def 提交"; bad=1; }
+      fi
+    fi
+    if [ "$json" = 1 ]; then
+      python3 -c 'import json,sys;print(json.dumps({"repo":sys.argv[1],"ok":sys.argv[2]=="0","defaultBranch":sys.argv[3]},ensure_ascii=False,separators=(",",":")))' "$repo" "$bad" "$def"
+    fi
+    return $bad
+  fi
+
+  local nwt
+  nwt="$(git -C "$repo" worktree list --porcelain 2>/dev/null | grep -c '^worktree ' || true)"
+  if [ "$mode" = "dry" ]; then
+    echo "adopt plan：$repo"
+    echo "  common=${common}"
+    echo "  defaultBranch=${def:-（无法解析，需 --default-branch）}"
+    echo "  template=${template}"
+    echo "  worktrees=${nwt}"
+    echo "  hooksPath=${prev:-（未设置）} → ${hooksdir}"
+    if [ "$json" = 1 ]; then
+      python3 -c 'import json,sys;print(json.dumps({"repo":sys.argv[1],"common":sys.argv[2],"defaultBranch":sys.argv[3],"template":sys.argv[4],"worktrees":int(sys.argv[5]),"hooksPath":sys.argv[6]},ensure_ascii=False,separators=(",",":")))' "$repo" "$common" "$def" "$template" "$nwt" "$prev"
+    fi
+    return 0
+  fi
+
+  [ -n "$def" ] || die "默认分支不可解析；请 --default-branch main"
+  mkdir -p "$hooksdir"
+  # 保留首次 adopt 记下的 hooksPrevious（重复 apply 时 prev 已是我们自己的 hooksdir）
+  local savedPrev=""
+  [ -f "$cfg" ] && savedPrev="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksPrevious") or "")' "$cfg" 2>/dev/null || true)"
+  [ "$prev" = "$hooksdir" ] && prev="$savedPrev"
+  # 钩子链目标：首次 adopt 前的 hooksPath（husky/.githooks/…）；没有则用仓库默认 hooks 目录
+  local chain="$prev"
+  [ -n "$chain" ] || chain="$common/hooks"
+  [ -f "$cfg" ] && cp "$cfg" "$cfgdir/config.json.bak.$(date +%s)"
+  python3 - "$cfg" "$repo" "$def" "$template" "$hooksdir" "$prev" "$chain" <<'PY'
+import json, sys, datetime
+cfg, repo, br, tmpl, hooks, prev, chain = sys.argv[1:8]
+data = {
+  "schema": 1, "repo": repo, "defaultBranch": br, "template": tmpl,
+  "hooksPath": hooks, "hooksPrevious": prev or None, "hooksChain": chain,
+  "adoptedAt": datetime.datetime.now(datetime.timezone.utc).isoformat(),
+}
+json.dump(data, open(cfg, "w"), ensure_ascii=False, indent=1)
+PY
+  wt_write_hook "$hooksdir" pre-commit "$def" "$chain"
+  wt_write_hook "$hooksdir" pre-push "$def" "$chain"
+  wt_write_hook "$hooksdir" post-checkout "$def" "$chain"
+  git -C "$repo" config --local core.hooksPath "$hooksdir"
+  echo "adopted：$repo（hooksPath=$hooksdir）"
+}
+
+cmd_doctor() {
+  local json=0 all=0 repos=()
+  while [ $# -gt 0 ]; do case "$1" in
+    --json) json=1; shift ;;
+    --all) all=1; shift ;;
+    --strict|--fix) shift ;;
+    -*) die "未知参数：$1" ;;
+    *) repos+=("$1"); shift ;;
+  esac; done
+  if [ "$all" = 1 ] && [ ${#repos[@]} -eq 0 ]; then
+    while IFS= read -r -d '' d; do repos+=("$(dirname "$d")"); done < <(find "${HOME}/repos" -maxdepth 3 -name .git -type d -print0 2>/dev/null)
+  fi
+  if [ ${#repos[@]} -eq 0 ]; then
+    echo "usage: dia wt doctor <repo>... | --all（--all 未匹配到任何仓库）" >&2
+    exit 2
+  fi
+  local fails=0
+  for repo in "${repos[@]:-}"; do
+    [ -n "$repo" ] || continue
+    git -C "$repo" rev-parse --git-dir >/dev/null 2>&1 || continue
+    local common cfgdir cfg hooksdir prev def
+    common="$(wt_common_dir "$repo")"; cfgdir="$common/dia"; cfg="$cfgdir/config.json"; hooksdir="$cfgdir/hooks"
+    prev="$(git -C "$repo" config --get core.hooksPath 2>/dev/null || true)"
+    def=""
+    if [ -f "$cfg" ]; then
+      def="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("defaultBranch") or "")' "$cfg" 2>/dev/null || true)"
+    fi
+    [ -n "$def" ] || def="$(wt_default_branch "$repo")"
+    local bad=0
+    [ -f "$cfg" ] || { echo "FAIL D01 $repo 未 adopt"; bad=1; }
+    case "$prev" in /*) ;; *) echo "FAIL D02 $repo hooksPath 非绝对（$prev）"; bad=1 ;; esac
+    for h in pre-commit pre-push post-checkout; do
+      [ -x "$hooksdir/$h" ] || { echo "FAIL D02 $repo 缺 $h"; bad=1; }
+    done
+    if [ -n "$def" ] && [ -x "$hooksdir/pre-commit" ]; then
+      # 静态：钩子里的 protected 列表必须包含 defaultBranch
+      grep -q "prot=\" main master develop dev $def \"" "$hooksdir/pre-commit" \
+        || { echo "FAIL D03 $repo 钩子未保护默认分支 $def"; bad=1; }
+      # 动态：主 checkout 当前就在 def 上时必须被拦
+      if wt_is_main_checkout "$repo" && [ "$(git -C "$repo" symbolic-ref --short HEAD 2>/dev/null)" = "$def" ]; then
+        ( cd "$repo" && DIA_WT_GUARD_PROBE=1 "$hooksdir/pre-commit" >/dev/null 2>&1 ) \
+          && { echo "FAIL D03 $repo 守卫未拦截 $def 提交"; bad=1; }
+      fi
+    fi
+    if wt_is_main_checkout "$repo"; then
+      [ -z "$(git -C "$repo" status --porcelain 2>/dev/null)" ] || echo "WARN D04 $repo 主 checkout 有未提交改动"
+      [ "$(git -C "$repo" symbolic-ref --short HEAD 2>/dev/null)" = "$def" ] || echo "WARN D04 $repo 主 checkout 不在 $def"
+    fi
+    local missing=0
+    while IFS= read -r p; do [ -n "$p" ] && [ ! -d "$p" ] && { echo "FAIL D05 $repo worktree 路径缺失：$p"; missing=1; }; done \
+      < <(git -C "$repo" -c core.quotePath=false worktree list --porcelain 2>/dev/null | sed -n 's/^worktree //p')
+    [ "$missing" = 0 ] || bad=1
+    [ "$(git -C "$repo" -c core.quotePath=false worktree list --porcelain 2>/dev/null | grep -cE '^(prunable|locked)')" = 0 ] || { echo "FAIL D06 $repo 有 prunable/locked worktree"; bad=1; }
+    [ -z "$(git -C "$repo" -c core.quotePath=false worktree list --porcelain 2>/dev/null | sed -n 's/^branch refs\/heads\///p' | sort | uniq -d)" ] || { echo "FAIL D07 $repo 分支被多个 worktree 占用"; bad=1; }
+    [ -n "$def" ] || { echo "FAIL D11 $repo 默认分支不可解析"; bad=1; }
+    if [ "$json" = 1 ]; then
+      python3 -c 'import json,sys;print(json.dumps({"repo":sys.argv[1],"ok":sys.argv[2]=="0"},ensure_ascii=False))' "$repo" "$bad"
+    fi
+    [ "$bad" = 0 ] && [ "$json" = 0 ] && echo "ok $repo"
+    [ "$bad" = 1 ] && fails=$((fails+1))
+  done
+  [ "$fails" = 0 ]
+}
+
+cmd_gate() {
+  local repo="" feature=""
+  while [ $# -gt 0 ]; do case "$1" in
+    -*) shift ;;
+    *) if [ -z "$repo" ]; then repo="$1"; elif [ -z "$feature" ]; then feature="$1"; fi; shift ;;
+  esac; done
+  [ -n "$repo" ] && [ -n "$feature" ] || die "用法：dia wt gate <repo> <feature>"
+  echo "== check（R20）"; cmd_check "$repo" || { echo "gate FAIL: check"; return 1; }
+  echo "== doctor"; cmd_doctor "$repo" || { echo "gate FAIL: doctor"; return 1; }
+  local def; def="$(wt_default_branch "$repo")"
+  local wt=""
+  while IFS= read -r p; do
+    [ -n "$p" ] || continue
+    local br; br="$(git -C "$p" rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
+    if [ "$br" = "feat/$feature" ] || [ "$(basename "$p")" = "${repo##*/}-worktree--$feature" ]; then wt="$p"; break; fi
+  done < <(git -C "$repo" -c core.quotePath=false worktree list --porcelain 2>/dev/null | sed -n 's/^worktree //p')
+  [ -n "$wt" ] || { echo "gate FAIL: 找不到 feature=$feature 的 worktree"; return 1; }
+  [ -z "$(git -C "$wt" status --porcelain)" ] || { echo "gate FAIL: worktree 有未提交改动"; return 1; }
+  local ahead; ahead="$(git -C "$wt" rev-list --count "origin/${def}..HEAD" 2>/dev/null || echo 0)"
+  [ "$ahead" -gt 0 ] || { echo "gate FAIL: 相对 origin/${def} 没有提交"; return 1; }
+  echo "gate OK：$feature（ahead origin/${def} = $ahead）"
+}
+
+
 case "${1:-}" in
   create) shift; cmd_create "$@" ;;
   route)  shift; cmd_route "$@" ;;
@@ -1101,6 +1446,9 @@ case "${1:-}" in
   list)   shift; cmd_list "$@" ;;
   status) shift; cmd_status "$@" ;;
   check)  shift; cmd_check "$@" ;;
+  adopt)  shift; cmd_adopt "$@" ;;
+  doctor) shift; cmd_doctor "$@" ;;
+  gate)   shift; cmd_gate "$@" ;;
   clean)  shift; cmd_clean "$@" ;;
   prune-merged) shift; cmd_prune_merged "$@" ;;
   ""|help|-h|--help)
@@ -1114,6 +1462,11 @@ dia wt —— worktree 目录形式选型 + 创建（唯一实现）
   dia wt status [repo-path]              # ★ 清理前必查：唯一工作副本 + 改动重叠（只读）
   dia wt check  [<repo>...] [--all] [--deep] [--quiet]
                                                # ★ 依赖体检（R20）：软链/逃逸/悬空；--all 扫全部仓
+  dia wt adopt  <repo> [--apply|--check|--revert] [--template T] [--default-branch B] [--json]
+                                               # 配置路径模板 + 守卫钩子（默认 dry-run）
+                                               # 守卫含推送前敏感扫描（DIA_WT_GUARD_SCAN=0 可临时关闭）
+  dia wt doctor [<repo>...] [--all] [--json]    # 巡检：配置/钩子/探针/主 checkout/worktree 卫生
+  dia wt gate   <repo> <feature>               # 提交 MR 前：check + doctor + 干净 + ahead>0
   dia wt route  <repo-path>              # ★ 开工前必查：走 MR 还是直推（R1.7，配置驱动）
   dia wt scope  <repo|worktree> [--feature <slug>] [--session <id>]   # ★ 产出作用域声明（设计 §4.5）
   dia wt scope  --show                   # 看与当前目录匹配的作用域声明

package/packages/wt/tests/adopt.test.sh

@@ -0,0 +1,151 @@
+#!/usr/bin/env bash
+# adopt / doctor / gate 回归测试（2026-11-05）
+# 覆盖：dry-run 计划、apply 幂等、check 通过、主 checkout 守卫、doctor、revert。
+set -uo pipefail
+HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+WT="$HERE/../bin/dia-wt"
+TD="$(mktemp -d)"; trap 'rm -rf "$TD"' EXIT
+PASS=0; FAIL=0
+ok(){ echo "  ✓ $1"; PASS=$((PASS+1)); }; bad(){ echo "  ✗ $1"; FAIL=$((FAIL+1)); }
+
+R="$TD/repo"; mkdir -p "$R"; git -C "$R" init -q -b main
+git -C "$R" config user.email t@example.com; git -C "$R" config user.name t
+echo a > "$R/a.txt"; git -C "$R" add -A; git -C "$R" commit -qm init --no-verify
+
+out="$(bash "$WT" adopt "$R" --json)"
+printf '%s' "$out" | grep -q '"defaultBranch":"main"' && ok "dry-run 识别默认分支" || bad "dry-run: $out"
+[ ! -f "$R/.git/dia/config.json" ] && ok "dry-run 不落盘" || bad "dry-run 落盘了"
+
+bash "$WT" adopt "$R" --apply >/dev/null 2>&1 || bad "apply 失败"
+[ -f "$R/.git/dia/config.json" ] && ok "config 已写" || bad "缺 config"
+hp="$(git -C "$R" config --get core.hooksPath)"
+case "$hp" in /*) ok "hooksPath 是绝对路径" ;; *) bad "hooksPath=$hp" ;; esac
+[ -x "$R/.git/dia/hooks/pre-commit" ] && ok "pre-commit 可执行" || bad "缺 pre-commit"
+
+md5_before="$(md5 -q "$R/.git/dia/config.json" 2>/dev/null || md5sum "$R/.git/dia/config.json" | cut -d' ' -f1)"
+sleep 1
+bash "$WT" adopt "$R" --apply >/dev/null 2>&1
+md5_after="$(md5 -q "$R/.git/dia/config.json" 2>/dev/null || md5sum "$R/.git/dia/config.json" | cut -d' ' -f1)"
+[ "$md5_before" != "$md5_after" ] && ok "重复 apply 会刷新时间戳（幂等语义：不重复建目录/钩子）" || bad "重复 apply 无变化"
+
+bash "$WT" adopt "$R" --check >/dev/null 2>&1 && ok "check 通过" || bad "check 失败"
+bash "$WT" doctor "$R" >/dev/null 2>&1 && ok "doctor 通过" || bad "doctor 失败"
+
+echo b > "$R/b.txt"; git -C "$R" add b.txt
+if git -C "$R" commit -qm should-block 2>/dev/null; then bad "主 checkout main 提交未被拦截"; else ok "主 checkout main 提交被拦截"; fi
+git -C "$R" reset -q
+
+# ── 推送前敏感扫描（PII/凭据形态）──
+BR="$TD/remote.git"; git init -q --bare "$BR"
+git -C "$R" remote add origin "$BR" 2>/dev/null || true
+git -C "$R" push -q --no-verify -u origin main 2>/dev/null || true
+git -C "$R" worktree add -q "$TD/wt" -b feat/scan 2>/dev/null || true
+echo "/Users/alice/secret" > "$TD/wt/bad.txt"
+git -C "$TD/wt" add -A && git -C "$TD/wt" commit -qm bad --no-verify
+if git -C "$TD/wt" push -q origin feat/scan 2>/dev/null; then bad "敏感推送未被拦截"; else ok "敏感推送被拦截"; fi
+echo ok > "$TD/wt/bad.txt" && git -C "$TD/wt" add -A && git -C "$TD/wt" commit -qm fix --no-verify
+git -C "$TD/wt" push -q origin feat/scan 2>/dev/null && ok "干净推送放行" || bad "干净推送被拒"
+
+bash "$WT" adopt "$R" --revert >/dev/null 2>&1 || bad "revert 失败"
+[ -z "$(git -C "$R" config --get core.hooksPath || true)" ] && ok "revert 还原 hooksPath" || bad "revert 未还原"
+[ ! -d "$R/.git/dia" ] && ok "revert 删除 dia 目录" || bad "dia 目录残留"
+
+# ── 原 hooksPath 保留 + 二次 apply 不改写 hooksPrevious（review P2-7）──────────
+R2="$TD/repo2"; mkdir -p "$R2" "$TD/orighooks"; git -C "$R2" init -q -b main
+git -C "$R2" config user.email t@example.com; git -C "$R2" config user.name t
+echo a > "$R2/a.txt"; git -C "$R2" add -A; git -C "$R2" commit -qm init --no-verify
+printf '#!/bin/sh\nexit 0\n' > "$TD/orighooks/pre-commit"; chmod +x "$TD/orighooks/pre-commit"
+git -C "$R2" config --local core.hooksPath "$TD/orighooks"
+bash "$WT" adopt "$R2" --apply >/dev/null 2>&1 || bad "R2 apply 失败"
+hp1="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksPrevious") or "")' "$R2/.git/dia/config.json")"
+[ "$hp1" = "$TD/orighooks" ] && ok "首次 apply 记录 hooksPrevious" || bad "hooksPrevious=$hp1"
+bash "$WT" adopt "$R2" --apply >/dev/null 2>&1
+hp2="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksPrevious") or "")' "$R2/.git/dia/config.json")"
+[ "$hp2" = "$TD/orighooks" ] && ok "二次 apply 不覆盖 hooksPrevious" || bad "hooksPrevious 被改成 $hp2"
+bash "$WT" adopt "$R2" --revert >/dev/null 2>&1 || bad "R2 revert 失败"
+[ "$(git -C "$R2" config --get core.hooksPath)" = "$TD/orighooks" ] && ok "revert 还原原 hooksPath" || bad "revert 未还原原 hooksPath"
+# hooksPath 被第三方改动 → revert 拒绝（不抢配置）
+bash "$WT" adopt "$R2" --apply >/dev/null 2>&1
+git -C "$R2" config --local core.hooksPath "$TD/orighooks"
+if bash "$WT" adopt "$R2" --revert >/dev/null 2>&1; then bad "hooksPath 被改动后 revert 仍执行"; else ok "hooksPath 被改动后 revert 拒绝"; fi
+[ -f "$R2/.git/dia/config.json" ] && ok "拒绝 revert 时保留 config 备份" || bad "拒绝 revert 却删了 config"
+git -C "$R2" config --local core.hooksPath "$R2/.git/dia/hooks"; bash "$WT" adopt "$R2" --revert >/dev/null 2>&1
+
+# ── 自定义默认分支受保护（review P1-1 + P1-2）────────────────────────────────
+R3="$TD/repo3"; mkdir -p "$R3"; git -C "$R3" init -q -b trunk
+git -C "$R3" config user.email t@example.com; git -C "$R3" config user.name t
+echo a > "$R3/a.txt"; git -C "$R3" add -A; git -C "$R3" commit -qm init --no-verify
+bash "$WT" adopt "$R3" --apply --default-branch trunk >/dev/null 2>&1 || bad "自定义分支 apply 失败"
+bash "$WT" adopt "$R3" --check >/dev/null 2>&1 && ok "自定义默认分支 check 通过" || bad "自定义默认分支 check 失败"
+bash "$WT" doctor "$R3" >/dev/null 2>&1 && ok "自定义默认分支 doctor 通过" || bad "自定义默认分支 doctor 失败"
+echo b > "$R3/b.txt"; git -C "$R3" add b.txt
+if git -C "$R3" commit -qm should-block 2>/dev/null; then bad "trunk 提交未被拦截"; else ok "自定义默认分支 trunk 提交被拦截"; fi
+git -C "$R3" reset -q
+
+# ── doctor：未 adopt / 无参数（review P1-4）──────────────────────────────────
+bash "$WT" doctor "$R3" >/dev/null 2>&1 || true
+R4="$TD/repo4"; mkdir -p "$R4"; git -C "$R4" init -q -b main
+git -C "$R4" config user.email t@example.com; git -C "$R4" config user.name t
+echo a > "$R4/a.txt"; git -C "$R4" add -A; git -C "$R4" commit -qm init --no-verify
+if bash "$WT" doctor "$R4" >/dev/null 2>&1; then bad "未 adopt 的仓 doctor 误报通过"; else ok "未 adopt 的仓 doctor 失败"; fi
+bash "$WT" doctor >/dev/null 2>&1; [ $? = 2 ] && ok "doctor 无参数 exit 2" || bad "doctor 无参数未 exit 2"
+
+# ── pre-push 守卫（主 checkout 拒绝 / worktree 放行）──────────────────────────
+R5="$TD/repo5"; ORIGIN5="$TD/origin5.git"; git init -q --bare "$ORIGIN5"
+mkdir -p "$R5"; git -C "$R5" init -q -b main
+git -C "$R5" config user.email t@example.com; git -C "$R5" config user.name t
+echo a > "$R5/a.txt"; git -C "$R5" add -A; git -C "$R5" commit -qm init --no-verify
+git -C "$R5" remote add origin "$ORIGIN5"; git -C "$R5" push -q --no-verify origin main
+git -C "$R5" fetch -q origin
+git -C "$R5" symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+bash "$WT" adopt "$R5" --apply >/dev/null 2>&1 || bad "R5 apply 失败"
+echo x >> "$R5/a.txt"; git -C "$R5" commit -qam dirty-main --no-verify 2>/dev/null
+if git -C "$R5" push origin main >/dev/null 2>&1; then bad "主 checkout push 未被拦截"; else ok "主 checkout push 被拦截"; fi
+git -C "$R5" reset -q --hard origin/main
+git -C "$R5" worktree add -q -b feat/x "$TD/repo5-worktree--x" main
+echo b > "$TD/repo5-worktree--x/b.txt"; git -C "$TD/repo5-worktree--x" add b.txt
+git -C "$TD/repo5-worktree--x" commit -qm feat-x --no-verify 2>/dev/null
+if git -C "$TD/repo5-worktree--x" push -q origin feat/x >/dev/null 2>&1; then ok "worktree push 放行"; else bad "worktree push 被误拦"; fi
+
+# ── template 生效（P2-6）：adopt 后 create 按 config.template 推导路径 ─────────
+out="$(bash "$WT" create "$R5" t1 --dry-run 2>&1 || true)"
+printf '%s' "$out" | grep -q "repo5-worktree--t1" && ok "默认模板 create 路径" || bad "默认模板 create: $out"
+bash "$WT" adopt "$R5" --apply --template '{{parent}}/{{repo}}.wt.{{feature}}' >/dev/null 2>&1 || bad "template apply 失败"
+out="$(bash "$WT" create "$R5" t1 --dry-run 2>&1 || true)"
+printf '%s' "$out" | grep -q "repo5.wt.t1" && ok "自定义模板 create 路径生效" || bad "自定义模板: $out"
+bash "$WT" adopt "$R5" --apply >/dev/null 2>&1
+
+# ── 过期 origin/HEAD（远端分支已删）不误判默认分支 ──────────────────────────
+R6="$TD/repo6"; mkdir -p "$R6"; git -C "$R6" init -q -b main
+git -C "$R6" config user.email t@example.com; git -C "$R6" config user.name t
+echo a > "$R6/a.txt"; git -C "$R6" add -A; git -C "$R6" commit -qm init --no-verify
+git -C "$R6" symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/gone
+out="$(bash "$WT" adopt "$R6" --json)"
+printf '%s' "$out" | grep -q '"defaultBranch":"main"' && ok "过期 origin/HEAD 回落到 main" || bad "过期 origin/HEAD: $out"
+
+# ── 钩子链：原 hooksPath（.githooks / husky）不被吞掉 ─────────────────────────
+R7="$TD/repo7"; mkdir -p "$R7/.githooks"; git -C "$R7" init -q -b main
+git -C "$R7" config user.email t@example.com; git -C "$R7" config user.name t
+printf '#!/bin/sh\necho chained >> "$(git rev-parse --show-toplevel)/chain.log"\n' > "$R7/.githooks/pre-commit"
+chmod +x "$R7/.githooks/pre-commit"
+echo a > "$R7/a.txt"; git -C "$R7" add -A; git -C "$R7" commit -qm init --no-verify
+git -C "$R7" config --local core.hooksPath .githooks
+bash "$WT" adopt "$R7" --apply >/dev/null 2>&1 || bad "R7 apply 失败"
+python3 -c 'import json,sys;d=json.load(open(sys.argv[1]));sys.exit(0 if d.get("hooksChain")==".githooks" else 1)' "$R7/.git/dia/config.json" \
+  && ok "config 记录 hooksChain" || bad "hooksChain 未记录"
+git -C "$R7" worktree add -q -b feat/y "$TD/repo7-worktree--y" main
+echo b > "$TD/repo7-worktree--y/b.txt"; git -C "$TD/repo7-worktree--y" add b.txt
+git -C "$TD/repo7-worktree--y" commit -qm feat-y >/dev/null 2>&1
+[ -f "$TD/repo7-worktree--y/chain.log" ] && ok "原 pre-commit 被链式执行" || bad "原 pre-commit 未执行（钩子被吞）"
+bash "$WT" adopt "$R7" --revert >/dev/null 2>&1
+[ "$(git -C "$R7" config --get core.hooksPath)" = ".githooks" ] && ok "revert 还原原 hooksPath（相对）" || bad "revert 未还原 .githooks"
+
+# ── gate：成功 / 失败（P1-3 精确匹配）────────────────────────────────────────
+bash "$WT" gate "$R5" x >/dev/null 2>&1 && ok "gate 成功" || bad "gate 失败"
+if bash "$WT" gate "$R5" xb >/dev/null 2>&1; then bad "gate 子串误匹配（x 命中 xb）"; else ok "gate 精确匹配 feature"; fi
+echo dirty >> "$TD/repo5-worktree--x/b.txt"
+if bash "$WT" gate "$R5" x >/dev/null 2>&1; then bad "worktree 脏时 gate 通过"; else ok "worktree 脏时 gate 失败"; fi
+git -C "$TD/repo5-worktree--x" checkout -q -- b.txt
+
+echo; echo "── PASS $PASS · FAIL $FAIL ──"
+[ "$FAIL" = 0 ]