@minonl/dia 0.0.8 → 0.0.9

package/dist/cli.js

@@ -4720,6 +4720,67 @@ function build(opts = {}) {
   return { schema: 1, nodes: filteredNodes, edges: filteredEdges, cycles: findCycles(tasks) };
 }
 
+// src/graph-tui.ts
+var ORDER = ["doing", "blocked", "review", "todo", "awaiting_acceptance", "accepted", "done", "dropped", "rejected", "escalated"];
+var color = (s, code, on) => on ? `\x1B[${code}m${s}\x1B[0m` : s;
+function render2(g, opts = {}) {
+  const on = opts.color ?? false;
+  const tasks = g.nodes.filter((n) => n.kind === "task");
+  const taskById = new Map(tasks.map((t) => [t.id, t]));
+  const edgesFrom = (id, kind) => g.edges.filter((e) => e.from === id && e.kind === kind);
+  const lines = [];
+  const groups = new Map;
+  for (const t of tasks) {
+    const st = t.status || "todo";
+    groups.set(st, [...groups.get(st) || [], t]);
+  }
+  for (const st of [...ORDER.filter((s) => groups.has(s)), ...[...groups.keys()].filter((s) => !ORDER.includes(s))]) {
+    lines.push(color(`[${st}]`, "1;36", on));
+    for (const t of groups.get(st).sort((a, b) => a.label.localeCompare(b.label))) {
+      lines.push(`  ${color(t.label, "1", on)}  ${color(t.id.replace(/^task:/, ""), "2", on)}${t.owner ? `  owner=${t.owner}` : ""}`);
+      for (const e of edgesFrom(t.id, "depends_on")) {
+        const dep = taskById.get(e.to);
+        lines.push(`    ${color("↳ depends", "34", on)} ${dep?.label || e.to}${dep ? ` [${dep.status}]` : ""}`);
+      }
+      for (const e of edgesFrom(t.id, "touches"))
+        lines.push(`    ${color("↳ touches", "35", on)} ${e.to.replace(/^path:/, "")}`);
+      if (t.blocked_by?.length)
+        lines.push(`    ${color(`⚠ blocked_by ${t.blocked_by.join(", ")}`, "31", on)}`);
+    }
+    lines.push("");
+  }
+  if (!tasks.length)
+    lines.push("(no tasks)");
+  const claimEdges = g.edges.filter((e) => e.kind === "claims");
+  if (claimEdges.length) {
+    lines.push(color("claims", "1;36", on));
+    for (const e of claimEdges)
+      lines.push(`  ${e.from.replace(/^session:/, "")} → ${e.to.replace(/^path:/, "")}`);
+    lines.push("");
+  }
+  for (const c of g.cycles)
+    lines.push(color(`⚠ cycle: ${c.join(" -> ")}`, "31", on));
+  return lines.join(`
+`);
+}
+function watch(build, opts = {}) {
+  const paint = () => process.stdout.write("\x1B[2J\x1B[H" + render2(build(), { color: opts.color ?? process.stdout.isTTY }) + `
+`);
+  paint();
+  const timer = setInterval(() => {
+    try {
+      paint();
+    } catch {}
+  }, opts.intervalMs ?? 2000);
+  const stop = () => {
+    clearInterval(timer);
+    process.exit(0);
+  };
+  process.on("SIGINT", stop);
+  process.on("SIGTERM", stop);
+  return new Promise(() => {});
+}
+
 // packages/cli/src/index.ts
 init_paths();
 
@@ -5491,6 +5552,25 @@ function jobRootResolved() {
   const legacy = join24(homedir11(), ".local", "share", "dia-job");
   return !existsSync21(next) && existsSync21(legacy) ? legacy : next;
 }
+function runJobCapture(argv) {
+  const { bin, error } = jobBin();
+  if (!bin) {
+    process.stderr.write(`dia job: ${error || "未找到 dia-job；先跑 packages/job/install.sh 或设置 DIA_JOB_BIN"}
+`);
+    return { status: 2, stdout: "", stderr: "" };
+  }
+  const r = spawnSync2(bin, argv, {
+    encoding: "utf8",
+    stdio: ["inherit", "pipe", "pipe"],
+    env: { ...process.env, DIA_JOB_ROOT: jobRootResolved() }
+  });
+  if (r.error) {
+    process.stderr.write(`dia job: ${r.error.message}
+`);
+    return { status: 1, stdout: "", stderr: "" };
+  }
+  return { status: r.status ?? 1, stdout: r.stdout ?? "", stderr: r.stderr ?? "" };
+}
 function runJob(argv) {
   const { bin, error } = jobBin();
   if (!bin) {
@@ -7237,7 +7317,18 @@ var STALE_FACTOR = 1.5;
 var MIN_HEALTH_INTERVAL = 60;
 var healthInterval = (hc) => hc?.interval ?? DEFAULT_HEALTH_INTERVAL;
 var staleAfter = (hc) => Math.floor(healthInterval(hc) * STALE_FACTOR);
-var isRecord = (v) => !!v && typeof v === "object" && v.kind === "health" && typeof v.state === "string";
+var isRecord = (v) => !!v && typeof v === "object" && v.kind === "health" && (v.state === "ok" || v.state === "degraded" || v.state === "fail");
+var TS_RE = /"ts"\s*:\s*(-?\d+)/;
+var KIND_RE = /"kind"\s*:\s*"([A-Za-z0-9_-]+)"/;
+function parseStateLine(line) {
+  const head = line.slice(0, 256), tail = line.slice(-256);
+  const ts = TS_RE.exec(head)?.[1] ?? TS_RE.exec(tail)?.[1];
+  const kind = KIND_RE.exec(head)?.[1] ?? KIND_RE.exec(tail)?.[1];
+  if (!ts || !kind)
+    return null;
+  const n = Number(ts);
+  return Number.isFinite(n) ? { ts: n, kind } : null;
+}
 function findLastHealth(lines, service, gen) {
   for (let i = lines.length - 1;i >= 0; i--) {
     const r = lines[i];
@@ -7422,6 +7513,24 @@ function diaCmd() {
   const entry = entries.find((p) => existsSync28(p));
   return entry ? `${q(process.execPath)} ${q(entry)}` : "dia";
 }
+function decorateStatus(text, view) {
+  const lines = String(text ?? "").split(`
+`);
+  const outLines = [];
+  for (const line of lines) {
+    outLines.push(line);
+    const m = line.match(/local\.dia-job-svc-([A-Za-z0-9._-]+)/) || line.match(/(?:^|\s)svc-([A-Za-z0-9._-]+)\s/);
+    if (!m)
+      continue;
+    try {
+      const v = view(m[1]);
+      if (v?.label)
+        outLines.push(`      health=${v.label}`);
+    } catch {}
+  }
+  return outLines.join(`
+`);
+}
 function servicesRoot() {
   return process.env.DIA_SERVICE_HOME || join31(diaHome(), "services");
 }
@@ -7456,15 +7565,34 @@ function readHealthLines(file) {
   if (!existsSync28(file))
     return [];
   const rows = [];
-  for (const line of readFileSync25(file, "utf8").split(`
-`)) {
+  const lines = readFileSync25(file, "utf8").split(`
+`);
+  for (const line of lines) {
     if (!line.trim())
       continue;
     try {
       const d = JSON.parse(line);
       if (isRecord(d))
         rows.push(d);
+      continue;
     } catch {}
+    const head = parseStateLine(line);
+    const state = head ? /"state"\s*:\s*"(ok|degraded|fail)"/.exec(line)?.[1] : undefined;
+    if (head && state) {
+      rows.push({
+        ...head,
+        state,
+        service: "",
+        gen: "",
+        source: "schedule",
+        candidate: state,
+        streak: 0,
+        raw: state,
+        exit: null,
+        timeout: false,
+        detail: ""
+      });
+    }
   }
   return rows;
 }
@@ -7473,6 +7601,41 @@ function appendHealthRecord(file, rec) {
   appendFileSync9(file, JSON.stringify(rec) + `
 `);
 }
+function readServiceHealth(id, opts = {}) {
+  const { healthFile } = opts;
+  const now = opts.now ?? Math.floor(Date.now() / 1000);
+  const jr = opts.jobRoot ?? jobRoot2();
+  const dir = opts.servicesRoot ?? (process.env.DIA_SERVICE_HOME || join31(jr, "services"));
+  const installDir = join31(dir, id);
+  let lock = null;
+  try {
+    lock = readLockFile(id);
+  } catch {}
+  let svc = null;
+  try {
+    svc = readServiceManifest(lock?.dir ?? installDir);
+  } catch {}
+  if (!svc)
+    return healthView({ adopted: true, hasHealthcheck: false, now });
+  const hc = svc?.healthcheck;
+  if (!hc)
+    return healthView({ hasHealthcheck: false, now });
+  const ledger = healthFile ?? healthStatePath(id);
+  const recs = readHealthLines(ledger).filter(isRecord);
+  let rec = lock ? findLastHealth(recs, id, lock.gen) : null;
+  if (!rec) {
+    for (let i = recs.length - 1;i >= 0; i--) {
+      const r = recs[i];
+      if (r.state !== "ok" && r.state !== "degraded" && r.state !== "fail")
+        continue;
+      if (r.service && r.service !== id)
+        continue;
+      if (!rec || r.ts > rec.ts)
+        rec = r;
+    }
+  }
+  return healthView({ record: rec, hasHealthcheck: true, hc, now });
+}
 function listServices(opts = {}) {
   const root = opts.servicesRoot ?? servicesRoot();
   const jr = opts.jobRoot ?? jobRoot2();
@@ -8165,7 +8328,7 @@ usage:
   dia agents list|register|unregister|discover
   dia msg deliver <agent> <id> [--transport tmux|acp]
   dia task add|list|link|status|done [--owner S] [--depends a,b] [--touches p1,p2]
-  dia graph [--json] [--task t-...]
+  dia graph [--json] [--task t-...] [--tui [--watch] [--no-color]]
   dia claim <path> [--reason R] [--ttl 4h] [--session S] | dia claims [--all] [--mine] | dia unclaim <path|id> [--force]
   dia team run <id> --mock | --acp|--dsh --workspace DIR
   dia team gate|accept|reject|next
@@ -8558,6 +8721,19 @@ async function taskCli(argv) {
 }
 async function graphCli(argv) {
   const asJson = has(argv, "--json");
+  if (has(argv, "--tui") || has(argv, "--watch")) {
+    const paint = (g) => out(render2(g, { color: !!process.stdout.isTTY && !has(argv, "--no-color") }));
+    try {
+      if (has(argv, "--watch"))
+        return await watch(() => build({ task: flag(argv, "--task") }), { color: !!process.stdout.isTTY && !has(argv, "--no-color") });
+      const g = build({ task: flag(argv, "--task") });
+      paint(g);
+      return g.cycles.length ? 3 : 0;
+    } catch (e) {
+      err(e?.message || String(e));
+      return String(e?.message || e).startsWith("E_GRAPH") ? 2 : 31;
+    }
+  }
   try {
     const g = build({ task: flag(argv, "--task") });
     if (asJson)
@@ -10086,8 +10262,19 @@ async function main(rawArgv) {
     return agentsCli(argv.slice(1));
   if (cmd === "team")
     return teamCli(argv.slice(1));
-  if (cmd === "job")
-    return runJob(argv.slice(1));
+  if (cmd === "job") {
+    const rest = argv.slice(1);
+    if (rest[0] === "status" || rest[0] === "list") {
+      const r = runJobCapture(rest);
+      if (r.stderr)
+        process.stderr.write(r.stderr);
+      const text = decorateStatus(r.stdout, (id) => readServiceHealth(id));
+      if (text)
+        out(text.replace(/\n$/, ""));
+      return r.status;
+    }
+    return runJob(rest);
+  }
   if (cmd === "price") {
     const table = loadPrices();
     if (has(argv.slice(1), "--json"))

package/docs/msg-collab-m1.md

@@ -64,3 +64,17 @@ dia graph --json --task t-xxx
 - `blocked_by` 只在 task 节点里做派生提示，不是边；
 - 任务依赖成环：`cycles` 非空，退出码 **3**（参数错仍是 2）；
 - `--task` 只输出该任务的直接依赖/touches/claim 邻居，不做全图闭包。
+
+---
+
+# 只读 TUI 图（M2 第一步）
+
+```bash
+dia graph --tui                 # 打印一次（有环 exit 3）
+dia graph --watch               # 每 2s 刷新，Ctrl-C 退出
+dia graph --tui --no-color      # 关 ANSI 颜色
+```
+
+- 按状态分组显示 task → deps / touches / blocked_by；claims 单列；
+- 不启 HTTP/daemon，遵守框架“无网络模块”约束；
+- `--task t-...` 只显示该任务的直接邻居。

package/docs/service-noun.md

@@ -352,3 +352,79 @@ unknown（stale）**不单独返回**——`health` 是实时执行，不存在
 
 1. 判据写成**可判定的检查**：`node scripts/docs-index.mjs --check && node scripts/docs-link-check.mjs`（+ 可选 checklist 计数）；
 2. 或者把它当**评审工具**用：接受 `escalated` 是预期结果，只取 `verify.json` 的 findings 作为 grill 产出。
+
+## 14. P2：agent 型服务（entry = persona 会话）
+
+> 状态：**草案（待实现）**。§0 已定「本版只做脚本型」；本节把 P2 的形状先定下来，避免实现时二次发明语义。
+
+### 14.1 与脚本型的关系
+
+```mermaid
+flowchart LR
+  S["service"] --> A["脚本型（已实现）<br/>entry = bin/*"]
+  S --> B["agent 型（P2）<br/>entry = ACP 会话"]
+  B --> J["job：把 ACP 端点拉起并保持<br/>(dsh --profile dia-acp / opencode acp)"]
+  B --> H["healthcheck：端点可应答 + 最近一轮成功<br/>(不判断“想得对不对”)"]
+```
+
+**不变的**：`lifecycle`（job 托管）、`healthcheck` 契约（专用码域）、台账（`kind:"health"`）、`gen` 代际。
+**不同的**：没有 `stdin` 事件契约 —— 输入是 ACP 的 `prompt`，输出是会话事件；所以 `contract` 换成 ACP 语义。
+
+### 14.2 清单
+
+```jsonc
+{
+  "kind": "service",
+  "id": "example-agent",
+  "entry": {
+    "agent": {
+      "host": "dsh",                 // dsh | opencode
+      "profile": "dia-acp",          // 由 persona/宿主提供；缺省用宿主默认
+      "persona": "yan"               // 可选：仅做归属校验，不注入内容
+    }
+  },
+  "lifecycle": { "type": "service", "target": "local" },
+  "healthcheck": { "kind": "acp", "interval": 1800, "timeout": 60 },
+  "kits": []
+}
+```
+
+| 字段 | 语义 |
+|---|---|
+| `entry.agent.host` | 用哪套 ACP 实现（`dsh --profile <p>` 或 `opencode acp`） |
+| `entry.agent.profile` | 宿主的 profile 名（不复制 persona 内容，只引用） |
+| `entry.agent.persona` | 可选；`verify` 时校验「该 profile 是否属于此 persona」，防止挂错人 |
+| `healthcheck.kind: "acp"` | 走 ACP 健康检查（见 §14.3），**不再要求 `cmd`** |
+
+### 14.3 健康检查（ACP 版）
+
+| 检查 | 判据 | 失败归类 |
+|---|---|---|
+| 端点存活 | `initialize` 能返回 `protocolVersion`（JSON-RPC 1.0） | 连不上/超时 → `degraded` |
+| 会话可用 | `session/new` 成功返回 `sessionId` | 返回错误 → `fail` |
+| 最近一轮 | 台账里最近一次 `prompt` 的成功/失败（由调用方写事件） | 连续失败 `debounce` 次 → `degraded` |
+
+**明确不做**：不判断「回答质量」、不重放 prompt、不在 healthcheck 里跑真实业务（成本 + 副作用）。
+
+### 14.4 与脚本型的复用
+
+- `healthView` / `transition` / `gen` / 台账格式**完全复用**（`state.jsonl` + `kind:"health"`）
+- 差异只在「怎么产生一次 judgement」：`runHealth()` 换成 `runAcpHealth()`（`initialize` + `session/new`）
+- `dia service health <id>` 对 agent 型走 `runAcpHealth`，退出码沿用 §5
+
+### 14.5 边界
+
+| 场景 | 行为 |
+|---|---|
+| 宿主未安装 / profile 不存在 | `add` 期 `E_BACKEND`（不装半套） |
+| 端点活着但 `session/new` 失败 | `fail`（配置/鉴权问题，不是 infra 抖动） |
+| 长任务（一轮 prompt 很久） | **不算失败**；只有「端点不可应答」才算 |
+| 多实例 | `lifecycle.target` 声明归属；ACP 端点同机只允许一个 |
+| 权限/凭据 | 由宿主 profile 自己管；`dia` 不读取、不注入 |
+
+### 14.6 验收（P2）
+
+- [ ] 单测：清单校验（`entry.agent` 与 `entry.cmd` **互斥**，同时给 → `E_MANIFEST`）
+- [ ] 单测：`runAcpHealth` 用 `tests/fixtures/fake-acp.mjs` 覆盖 `initialize` 失败 / `session/new` 失败 / 正常三态
+- [ ] 单测：`healthcheck.kind` 缺省时按脚本型（向后兼容）
+- [ ] e2e：装一个 agent 型 demo（fake ACP）→ `dia job status` 显示 `health=ok…`，杀掉端点后变 `degraded(stale)`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minonl/dia",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "type": "module",
   "description": "dia (嗲) — lightweight agent framework: knowledge index, audit, session ingest",
   "bin": {

package/packages/wt/bin/dia-wt

@@ -1167,22 +1167,31 @@ wt_default_branch() {
   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`；勿手改）
+wt_guard_body() {
+  cat <<'HOOKBODY'
 set -uo pipefail
-name="$(basename "$0")"
+# 钩子名：生成的钩子用 basename $0；`dia wt guard` 用环境变量指定
+name="${DIA_WT_HOOK_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
+case "$common" in /*) ;; *) common="$(cd "$top" 2>/dev/null && cd "$common" 2>/dev/null && pwd -P)" ;; esac
+[ -n "$common" ] || exit 0
 gd="$(git rev-parse --git-dir 2>/dev/null || true)"
-case "$gd" in /*) ;; *) gd="$(cd "$top" && cd "$gd" 2>/dev/null && pwd -P)" ;; esac
+case "$gd" in /*) ;; *) gd="$(cd "$top" 2>/dev/null && 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}"
+
+# 只对已 adopt 的仓生效；未 adopt → 纯透传（保持本机其它仓行为不变）
+cfg="$common/dia/config.json"
+adopted=0; [ -f "$cfg" ] && adopted=1
+def=""
+if [ "$adopted" = 1 ]; then
+  def="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("defaultBranch") or "")' "$cfg" 2>/dev/null || true)"
+fi
+prot=" main master develop dev $def "
+prot="${prot//  / }"
+
 wt_guard_scan() {
 local ls="$1" rs="$2" range="" base="" hits=""
 if [ -n "$rs" ] && [ "$rs" != "0000000000000000000000000000000000000000" ] && git cat-file -e "$rs" 2>/dev/null; then
@@ -1197,72 +1206,81 @@ hits="$(git diff -U0 "$range" -- . 2>/dev/null | grep -E '^\+' | grep -vE '^\+\+
 if [ -n "$hits" ]; then
   echo "[dia-wt] 推送包含敏感内容（已阻断）：" >&2
   printf '%s\n' "$hits" >&2
-  echo "[dia-wt] 误报请修扫描规则（hooks 由 dia wt adopt 生成），不提供关闭开关" >&2
+  echo "[dia-wt] 误报请修扫描规则（hooks 由 dia wt adopt 安装），不提供关闭开关" >&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
+if [ "$probe" = 1 ]; then
+  case "$name" in
+    pre-commit) { [ "$adopted" = 1 ] && [ "$is_main" = 1 ] && [[ "$prot" == *" $branch "* ]]; } && exit 1 || exit 0 ;;
+    pre-push)   { [ "$adopted" = 1 ] && [ "$is_main" = 1 ]; } && exit 1 || exit 0 ;;
+    *) exit 0 ;;
+  esac
+fi
+
+if [ "$adopted" = 1 ]; then
+  case "$name" in
+    pre-commit)
+      if [ "$is_main" = 1 ] && [[ "$prot" == *" $branch "* ]]; then
+        echo "[dia-wt] 主 checkout 禁止在 $branch 直接提交；请先：dia wt create <repo> <feature>" >&2
+        exit 1
+      fi ;;
+    pre-push)
+      if [ "$is_main" = 1 ]; then
+        echo "[dia-wt] 主 checkout 禁止直接 push；请走 worktree 分支 + MR" >&2
+        exit 1
+      fi
+      # 先把 stdin 全读进来：既要逐条判 ref / 扫敏感内容，也要原样喂给仓库自己的钩子
+      push_lines=()
+      while IFS= read -r line; do push_lines+=("$line"); done
+      for line in "${push_lines[@]}"; do
+        read -r _lr ls rr rs <<<"$line"
+        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
+        [ -n "${ls:-}" ] || continue
+        wt_guard_scan "$ls" "${rs:-}" || exit 1
+      done ;;
+    post-checkout)
+      if [ "$is_main" = 1 ] && [[ "$prot" != *" $branch "* ]]; then
+        echo "[dia-wt] 提示：主 checkout 当前在 $branch（建议回到默认分支）" >&2
+      fi ;;
+  esac
+fi
+
+# 链式：仓库自己的钩子（simple-git-hooks 等管理器生成在 <common>/hooks）
 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
+if [ -x "$orig" ] && [ "$orig" != "$0" ]; then
+  if [ "$name" = "pre-push" ] && [ ${#push_lines[@]} -gt 0 ]; then
+    printf '%s\n' "${push_lines[@]}" | "$orig" "$@"
+    exit $?
   fi
-  chmod +x "$hooksdir/$name"
+  exec "$orig" "$@"
+fi
+exit 0
+HOOKBODY
+}
+
+wt_global_hooks_dir() { printf '%s/hooks' "$(dia_wt_data_root 2>/dev/null || echo "${DIA_ROOT:-$HOME/.dia}")"; }
+wt_write_global_hooks() {
+  local dir; dir="$(wt_global_hooks_dir)"
+  mkdir -p "$dir"
+  local h
+  for h in pre-commit pre-push post-checkout; do
+    { printf '#!/usr/bin/env bash\n# dia-wt guard（本机全局钩子；由 `dia wt adopt` 安装，勿手改）\n'; wt_guard_body; } > "$dir/$h"
+    chmod +x "$dir/$h"
+  done
+}
+
+cmd_guard() {
+  local name="${1:-}"
+  case "$name" in
+    pre-commit|pre-push|post-checkout) ;;
+    *) echo "usage: dia wt guard <pre-commit|pre-push|post-checkout>" >&2; return 2 ;;
+  esac
+  DIA_WT_HOOK_NAME="$name" eval "$(wt_guard_body)"
 }
 
 cmd_adopt() {
@@ -1305,19 +1323,18 @@ cmd_adopt() {
   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)"
+  prev="$(git -C "$repo" config --local --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
+    saved="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksPrevious") or "")' "$cfg" 2>/dev/null || true)"
+    # 只还原 adopt 之前就存在的仓库级 hooksPath；当前若被别人改过则不动
+    if [ -n "$saved" ] && [ "$prev" = "$hooksdir" ]; then
+      git -C "$repo" config --local core.hooksPath "$saved"
     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
@@ -1331,17 +1348,16 @@ cmd_adopt() {
       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
+    local ghd ghp
+    ghd="$(wt_global_hooks_dir)"
+    ghp="$(git config --global --get core.hooksPath 2>/dev/null || true)"
+    [ "$ghp" = "$ghd" ] || { echo "FAIL D02 全局 core.hooksPath 未指向 $ghd（当前：${ghp:-未设置}）"; bad=1; }
     for h in pre-commit pre-push post-checkout; do
-      [ -x "$hooksdir/$h" ] || { echo "FAIL D02 缺 $h 钩子"; bad=1; }
+      [ -x "$ghd/$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
+    if [ -n "$def" ] && wt_is_main_checkout "$repo" && [ "$(git -C "$repo" symbolic-ref --short HEAD 2>/dev/null)" = "$def" ]; then
+      ( cd "$repo" && DIA_WT_GUARD_PROBE=1 "$ghd/pre-commit" >/dev/null 2>&1 ) \
+        && { echo "FAIL D03 守卫探针未拦截 $def 提交"; bad=1; }
     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"
@@ -1366,6 +1382,36 @@ cmd_adopt() {
 
   [ -n "$def" ] || die "默认分支不可解析；请 --default-branch main"
   mkdir -p "$hooksdir"
+  # 安装/刷新本机全局钩子，并让本仓走全局钩子（不改 package.json、不占用仓库钩子目录）
+  local ghd ghp
+  ghd="$(wt_global_hooks_dir)"
+  ghp="$(git config --global --get core.hooksPath 2>/dev/null || true)"
+  # 配置外溢防线：全局 hooksPath 若已被别人设置，绝不覆盖
+  if [ -n "$ghp" ] && [ "$ghp" != "$ghd" ]; then
+    die "全局 core.hooksPath 已指向 $ghp（非 dia），拒绝覆盖；请先自行处理该配置"
+  fi
+  wt_write_global_hooks
+  git config --global core.hooksPath "$ghd"
+  # 仓库级 hooksPath：旧版 dia 目录 → 撤掉迁移；别人的管理器（husky/.githooks）→ 保留并提示
+  if [ -n "$prev" ] && [ "$prev" != "$ghd" ]; then
+    if [ "$prev" = "$hooksdir" ]; then
+      git -C "$repo" config --local --unset core.hooksPath 2>/dev/null || true; prev=""
+    else
+      echo "[dia-wt] ⚠️ 该仓本地 core.hooksPath=$prev（由 hook manager 接管），全局守卫对本仓不生效" >&2
+    fi
+  fi
+  rm -rf "$hooksdir" 2>/dev/null || true
+  python3 - "$cfg" "$repo" "$def" "$template" "$prev" <<'PYG'
+import json, sys, datetime
+cfg, repo, br, tmpl, prev = sys.argv[1:6]
+json.dump({
+  "schema": 2, "repo": repo, "defaultBranch": br, "template": tmpl,
+  "hooksManager": "global", "hooksPrevious": prev or None,
+  "adoptedAt": datetime.datetime.now(datetime.timezone.utc).isoformat(),
+}, open(cfg, "w"), ensure_ascii=False, indent=1)
+PYG
+  echo "adopted：$repo（守卫 = 本机全局钩子 $(wt_global_hooks_dir)）"
+  return 0
   # 保留首次 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)"
@@ -1384,11 +1430,6 @@ data = {
 }
 json.dump(data, open(cfg, "w"), ensure_ascii=False, indent=1)
 PY
-  # 提示：simple-git-hooks / husky 的 postinstall 会重写 core.hooksPath 下的钩子，
-  # 每次 `pnpm/npm install` 后可能把守卫冲掉 → 用 `dia wt doctor --fix` 或重跑 adopt --apply 修复。
-  if grep -qs '"simple-git-hooks"\|"husky"\|lefthook' "$repo/package.json" "$repo/.lefthook.yml" 2>/dev/null; then
-    echo "[dia-wt] 注意：该仓使用 hook manager（simple-git-hooks/husky/lefthook），install 后若守卫被重写，跑 dia wt doctor --fix" >&2
-  fi
   wt_write_hook "$hooksdir" pre-commit "$def" "$chain"
   wt_write_hook "$hooksdir" pre-push "$def" "$chain"
   wt_write_hook "$hooksdir" post-checkout "$def" "$chain"
@@ -1419,7 +1460,7 @@ cmd_doctor() {
     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)"
+    prev="$(git -C "$repo" config --local --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)"
@@ -1427,6 +1468,13 @@ cmd_doctor() {
     [ -n "$def" ] || def="$(wt_default_branch "$repo")"
     # --fix：无损修复（重写三个守卫钩子 + hooksPath 绝对路径）。只对已 adopt 的仓生效。
     if [ "$fix" = 1 ] && [ -f "$cfg" ]; then
+      wt_write_global_hooks
+      git config --global core.hooksPath "$(wt_global_hooks_dir)"
+      [ "$json" = 0 ] && echo "FIX $repo 全局钩子已重装"
+    fi
+    if [ "$fix" = 1 ] && [ -f "$cfg" ] && [ "$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksManager") or "")' "$cfg" 2>/dev/null || true)" = "global" ]; then
+      :
+    elif [ "$fix" = 1 ] && [ -f "$cfg" ]; then
       local fixChain=""
       fixChain="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksChain") or "")' "$cfg" 2>/dev/null || true)"
       [ -n "$fixChain" ] || fixChain="$common/hooks"
@@ -1438,22 +1486,29 @@ cmd_doctor() {
       prev="$hooksdir"
       [ "$json" = 0 ] && echo "FIX $repo 钩子已重装（chain=$fixChain）"
     fi
-    local bad=0
+    local bad=0 mcfg=""
     [ -f "$cfg" ] || { echo "FAIL D01 $repo 未 adopt"; bad=1; }
-    case "$prev" in /*) ;; *) echo "FAIL D02 $repo hooksPath 非绝对（$prev）"; bad=1 ;; esac
+    [ -f "$cfg" ] && mcfg="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksManager") or "")' "$cfg" 2>/dev/null || true)"
+    local ghd ghp
+    ghd="$(wt_global_hooks_dir)"
+    ghp="$(git config --global --get core.hooksPath 2>/dev/null || true)"
+    # D20 全局配置归属：只认 dia 自己的 hooksPath，被别人占用就报出来（绝不自动覆盖）
+    [ "$ghp" = "$ghd" ] || { echo "FAIL D20 全局 core.hooksPath 未指向 $ghd（当前：${ghp:-未设置}）"; bad=1; }
     for h in pre-commit pre-push post-checkout; do
-      [ -x "$hooksdir/$h" ] || { echo "FAIL D02 $repo 缺 $h"; bad=1; }
+      [ -x "$ghd/$h" ] || { echo "FAIL D02 缺全局钩子 $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; }
+    # D21 仓库级 hooksPath 外溢：本地设置会覆盖全局（husky/.githooks 等）
+    if [ -n "$prev" ]; then
+      if [ "$prev" = "$hooksdir" ]; then
+        echo "FAIL D21 $repo 旧版本地 hooksPath 残留（$prev）；跑 dia wt adopt --apply 迁移到全局钩子"; bad=1
+      else
+        echo "WARN D21 $repo 本地 hooksPath=$prev 覆盖全局钩子，本仓守卫不生效"
       fi
     fi
+    if [ -n "$def" ] && wt_is_main_checkout "$repo" && [ "$(git -C "$repo" symbolic-ref --short HEAD 2>/dev/null)" = "$def" ]; then
+      ( cd "$repo" && DIA_WT_GUARD_PROBE=1 "$ghd/pre-commit" >/dev/null 2>&1 ) \
+        && { echo "FAIL D03 $repo 守卫探针未拦截 $def 提交"; bad=1; }
+    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"
@@ -1507,6 +1562,7 @@ case "${1:-}" in
   status) shift; cmd_status "$@" ;;
   check)  shift; cmd_check "$@" ;;
   adopt)  shift; cmd_adopt "$@" ;;
+  guard)  shift; cmd_guard "$@" ;;
   doctor) shift; cmd_doctor "$@" ;;
   gate)   shift; cmd_gate "$@" ;;
   clean)  shift; cmd_clean "$@" ;;
@@ -1522,6 +1578,7 @@ dia wt —— worktree 目录形式选型 + 创建（唯一实现）
   dia wt status [repo-path]              # ★ 清理前必查：唯一工作副本 + 改动重叠（只读）
   dia wt check  [<repo>...] [--all] [--deep] [--quiet]
                                                # ★ 依赖体检（R20）：软链/逃逸/悬空；--all 扫全部仓
+  dia wt guard  <pre-commit|pre-push|post-checkout>   # 守卫本体（供 hook manager 调用）
   dia wt adopt  <repo>|--all [--apply|--check|--revert] [--template T] [--default-branch B] [--json]
                                                # 配置路径模板 + 守卫钩子（默认 dry-run；--all 扫仓根）
                                                # 守卫含推送前敏感扫描（不提供关闭开关；误报修规则）

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

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
-# adopt / doctor / gate 回归测试（2026-11-05）
-# 覆盖：dry-run 计划、apply 幂等、check 通过、主 checkout 守卫、doctor、revert。
+# adopt / doctor / gate 回归测试（2026-11-06：本机全局钩子模型）
+# 覆盖：dry-run、apply(全局钩子)、check/doctor、主 checkout 守卫、链式调用仓库钩子、
+#       非 adopt 仓透传、敏感扫描、adopt --all、gate、revert。
 set -uo pipefail
 HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 WT="$HERE/../bin/dia-wt"
@@ -8,6 +9,13 @@ TD="$(mktemp -d)"; trap 'rm -rf "$TD"' EXIT
 PASS=0; FAIL=0
 ok(){ echo "  ✓ $1"; PASS=$((PASS+1)); }; bad(){ echo "  ✗ $1"; FAIL=$((FAIL+1)); }
 
+# 隔离：HOME / 全局 git 配置 / 数据根，避免污染真实机器
+export HOME="$TD/home"; mkdir -p "$HOME"
+export GIT_CONFIG_GLOBAL="$TD/gitconfig"; : > "$GIT_CONFIG_GLOBAL"
+export GIT_CONFIG_NOSYSTEM=1
+export DIA_WT_DATA_ROOT="$TD/data"
+GH="$TD/data/hooks"
+
 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
@@ -18,16 +26,14 @@ printf '%s' "$out" | grep -q '"defaultBranch":"main"' && ok "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 无变化"
-
+[ "$(git config --global --get core.hooksPath)" = "$GH" ] && ok "全局 hooksPath 指向 $GH" || bad "全局 hooksPath 未设置"
+for h in pre-commit pre-push post-checkout; do [ -x "$GH/$h" ] || bad "缺全局钩子 $h"; done
+ok "全局三钩子可执行"
+[ -z "$(git -C "$R" config --local --get core.hooksPath || true)" ] && ok "不再设置仓库本地 hooksPath" || bad "仍设了本地 hooksPath"
+python3 -c 'import json,sys;d=json.load(open(sys.argv[1]));sys.exit(0 if d.get("hooksManager")=="global" else 1)' "$R/.git/dia/config.json" \
+  && ok "config 记录 hooksManager=global" || bad "hooksManager 未记录"
+
+bash "$WT" adopt "$R" --apply >/dev/null 2>&1 && 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 失败"
 
@@ -35,119 +41,45 @@ 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 --git-dir="$BR" fetch -q "$R" main:main 2>/dev/null || true
- git -C "$R" fetch -q origin 2>/dev/null || true
-git -C "$R" worktree add -q "$TD/wt" -b feat/scan 2>/dev/null || true
-BAD_HOME="/Users"; echo "$BAD_HOME/alice/secret" > "$TD/wt/bad.txt"
-git -C "$TD/wt" add -A && git -C "$TD/wt" commit -qm bad
-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
-git -C "$TD/wt" push -q origin feat/scan 2>/dev/null && ok "干净推送放行" || bad "干净推送被拒"
-
-# 误报回归：`$TD/home/kits/...` 这种相对片段不该被判成 /home/<user>
-printf 'path=$TD/home/kits/dia-msg/dia.json\n' > "$TD/wt/vars.txt"
-git -C "$TD/wt" add -A && git -C "$TD/wt" commit -qm vars
-git -C "$TD/wt" push -q origin feat/scan 2>/dev/null && ok "相对片段 home/ 不误报" || 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/hooks/pre-commit 仍要执行（simple-git-hooks 等管理器就写这里）
+printf '#!/bin/sh\necho chained >> "$(git rev-parse --show-toplevel)/chain.log"\n' > "$R/.git/hooks/pre-commit"
+chmod +x "$R/.git/hooks/pre-commit"
+git -C "$R" worktree add -q -b feat/y "$TD/repo-worktree--y" main
+echo c > "$TD/repo-worktree--y/c.txt"; git -C "$TD/repo-worktree--y" add c.txt
+git -C "$TD/repo-worktree--y" commit -qm feat-y >/dev/null 2>&1
+[ -f "$TD/repo-worktree--y/chain.log" ] && ok "仓库自己的钩子被链式执行" || bad "仓库钩子未执行"
+rm -f "$TD/repo-worktree--y/chain.log"
+
+# 本地 hooksPath（husky/.githooks）优先于全局 → 守卫不生效，但 adopt 不得破坏它
+R2="$TD/repo2"; mkdir -p "$R2/.githooks"; 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
-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 拒绝（不抢配置）
+git -C "$R2" config --local core.hooksPath .githooks
 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
+[ "$(git -C "$R2" config --get core.hooksPath)" = ".githooks" ] && ok "保留仓库本地 hooksPath（husky 等）" || bad "破坏了本地 hooksPath"
+bash "$WT" doctor "$R2" 2>&1 | grep -q "本地 hooksPath" && ok "doctor 提示本地 hooksPath 覆盖全局" || bad "doctor 未提示覆盖"
 
-# ── 自定义默认分支受保护（review P1-1 + P1-2）────────────────────────────────
-R3="$TD/repo3"; mkdir -p "$R3"; git -C "$R3" init -q -b trunk
+# 未 adopt 的仓：全局钩子纯透传（主 checkout 可正常提交）
+R3="$TD/repo3"; mkdir -p "$R3"; git -C "$R3" init -q -b main
 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
-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
+echo a > "$R3/a.txt"; git -C "$R3" add -A
+git -C "$R3" commit -qm init >/dev/null 2>&1 && ok "未 adopt 仓不受守卫影响" || bad "未 adopt 仓被误拦"
 
-# ── 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
-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
-git -C "$R5" remote add origin "$ORIGIN5"; git -C "$R5" push -q 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 失败"
-# 主 checkout 的 pre-push 拒绝的是「从这里发起的任何 push」（含 feature 分支），不需要脏提交
-git -C "$R5" branch feat/push-probe origin/main
-if git -C "$R5" push origin feat/push-probe >/dev/null 2>&1; then bad "主 checkout push 未被拦截"; else ok "主 checkout push 被拦截"; fi
-git -C "$R5" branch -D feat/push-probe >/dev/null 2>&1 || true
-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 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
-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
-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"
-
-# ── adopt --all：批量主 checkout，跳过 worktree 目录 ─────────────────────────
+# 敏感扫描：adopted 仓的 worktree 推送带绝对路径 → 阻断；相对片段不误报
+BR="$TD/remote.git"; git init -q --bare "$BR"
+git -C "$R" remote add origin "$BR" 2>/dev/null || true
+git --git-dir="$BR" fetch -q "$R" main:main 2>/dev/null || true
+git -C "$R" fetch -q origin 2>/dev/null || true
+BAD="$(printf '/%s/alice/secret' Users)"; echo "$BAD" > "$TD/repo-worktree--y/bad.txt"
+git -C "$TD/repo-worktree--y" add bad.txt
+git -C "$TD/repo-worktree--y" commit -qm bad >/dev/null 2>&1
+if git -C "$TD/repo-worktree--y" push -q origin feat/y 2>/dev/null; then bad "敏感推送未被拦截"; else ok "敏感推送被拦截"; fi
+git -C "$TD/repo-worktree--y" reset -q --hard HEAD~1   # 丢掉含敏感内容的提交
+printf 'path=$TD/home/kits/dia.json\n' > "$TD/repo-worktree--y/vars.txt"
+git -C "$TD/repo-worktree--y" add vars.txt && git -C "$TD/repo-worktree--y" commit -qm vars >/dev/null 2>&1
+git -C "$TD/repo-worktree--y" push -q origin feat/y 2>/dev/null && ok "相对片段 home/ 不误报" || bad "相对片段被误判"
+
+# adopt --all：只处理主 checkout，跳过 *-worktree--*
 AR="$TD/allroot"; mkdir -p "$AR/a" "$AR/b"
 for r in a b; do
   git -C "$AR/$r" init -q -b main
@@ -155,35 +87,27 @@ for r in a b; do
   echo x > "$AR/$r/x.txt"; git -C "$AR/$r" add -A; git -C "$AR/$r" commit -qm init
 done
 git -C "$AR/a" worktree add -q -b feat/w "$AR/a-worktree--w" main
-out="$(DIA_WT_REPOS_ROOT="$AR" DIA_WT_DATA_ROOT="$TD/dr2" bash "$WT" adopt --all --apply --json 2>&1)"
+out="$(DIA_WT_REPOS_ROOT="$AR" bash "$WT" adopt --all --apply --json 2>&1)"
 printf '%s' "$out" | grep -q '"repos":2,"ok":2,"fail":0' && ok "adopt --all 覆盖 2 个主 checkout" || bad "adopt --all: $out"
-for r in a b; do
-  [ -n "$(git -C "$AR/$r" config --get core.hooksPath || true)" ] && ok "adopt --all: $r 已配 hooksPath" || bad "adopt --all: $r 未配置"
-done
 [ ! -d "$AR/a-worktree--w/.git/dia" ] && ok "adopt --all 跳过 worktree 目录" || bad "adopt --all 误改 worktree"
-out="$(DIA_WT_REPOS_ROOT="$AR" DIA_WT_DATA_ROOT="$TD/dr4" bash "$WT" doctor --all --json 2>/dev/null)"
-printf '%s' "$out" | grep -q "$AR/a" && ok "doctor --all 覆盖 DIA_WT_REPOS_ROOT" || bad "doctor --all 未覆盖自定义仓根"
-DIA_WT_REPOS_ROOT="$TD/empty-root" DIA_WT_DATA_ROOT="$TD/dr3" bash "$WT" adopt --all >/dev/null 2>&1
+out="$(DIA_WT_REPOS_ROOT="$AR" bash "$WT" doctor --all --json 2>/dev/null)"
+printf '%s' "$out" | grep -q "$AR/a" && ok "doctor --all 覆盖自定义仓根" || bad "doctor --all 未覆盖"
+DIA_WT_REPOS_ROOT="$TD/empty-root" bash "$WT" adopt --all >/dev/null 2>&1
 [ $? = 2 ] && ok "adopt --all 空结果 exit 2" || bad "adopt --all 空结果未 exit 2"
 
-# ── doctor --fix：钩子被覆盖后能无损重建 ────────────────────────────────────
-R8="$TD/repo8"; mkdir -p "$R8"; git -C "$R8" init -q -b main
-git -C "$R8" config user.email t@example.com; git -C "$R8" config user.name t
-echo a > "$R8/a.txt"; git -C "$R8" add -A; git -C "$R8" commit -qm init
-bash "$WT" adopt "$R8" --apply >/dev/null 2>&1
-rm -f "$R8/.git/dia/hooks/post-checkout"
-printf '#!/bin/sh\nexit 0\n' > "$R8/.git/dia/hooks/pre-commit"; chmod +x "$R8/.git/dia/hooks/pre-commit"
-if bash "$WT" doctor "$R8" >/dev/null 2>&1; then bad "钩子被覆盖后 doctor 仍通过"; else ok "钩子被覆盖后 doctor 报失败"; fi
-bash "$WT" doctor "$R8" --fix >/dev/null 2>&1 || bad "doctor --fix 失败"
-bash "$WT" doctor "$R8" >/dev/null 2>&1 && ok "doctor --fix 后恢复 ok" || bad "doctor --fix 后仍失败"
-[ -x "$R8/.git/dia/hooks/post-checkout" ] && ok "doctor --fix 补回 post-checkout" || bad "post-checkout 未补回"
+# gate
+rm -f "$TD/repo-worktree--y/chain.log"
+if bash "$WT" gate "$R" y >/tmp/gate.log 2>&1; then ok "gate 成功"; else bad "gate 失败: $(tail -2 /tmp/gate.log | tr "\n" " ")"; fi
+if bash "$WT" gate "$R" yb >/dev/null 2>&1; then bad "gate 子串误匹配"; else ok "gate 精确匹配 feature"; fi
+echo dirty >> "$TD/repo-worktree--y/c.txt"
+if bash "$WT" gate "$R" y >/dev/null 2>&1; then bad "worktree 脏时 gate 通过"; else ok "worktree 脏时 gate 失败"; fi
+git -C "$TD/repo-worktree--y" checkout -q -- c.txt
 
-# ── 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
+# revert：撤本仓配置，保留全局钩子
+bash "$WT" adopt "$R" --revert >/dev/null 2>&1 || bad "revert 失败"
+[ ! -f "$R/.git/dia/config.json" ] && ok "revert 删除本仓配置" || bad "配置残留"
+[ -x "$GH/pre-commit" ] && ok "revert 不影响全局钩子" || bad "revert 误删全局钩子"
+git -C "$R" worktree remove --force "$TD/repo-worktree--y" >/dev/null 2>&1 || true
 
 echo; echo "── PASS $PASS · FAIL $FAIL ──"
 [ "$FAIL" = 0 ]