@minonl/dia 0.0.9 → 0.0.10

package/README.md

@@ -90,6 +90,18 @@ bash tests/smoke.sh     # 用 Node 跑一遍构建产物
 bun src/cli.ts version  # 直接跑源码
 ```
 
+### CI 矩阵（`.github/workflows/test.yml`）
+
+| job | 触发 | 是否 required | 说明 |
+|---|---|---|---|
+| `test (ubuntu-latest)` | PR | ✅ | 全量：单测 / kb / job / build / install / smoke / e2e |
+| `test (macos-latest)` | PR | ✅ | 同上（**macOS 特有差异只有这里能抓到**，例如没有 `timeout(1)`） |
+| `windows-smoke` | PR（代码改动） | ❌ 非阻塞 | 装依赖 + `dia --version` + 纯逻辑测试；`dia job` 的 Windows 后端尚未实现（`install` 返回 rc=3），落地后再升 required |
+| `changes` | PR | ❌ | 判定改动是否只碰 `docs/**` / `llms*.txt`：是则跳过测试矩阵（docs-only 快通道） |
+
+> 只在 `pull_request` 上跑（不再对特性分支的 push 重复跑）。
+> 改这里时**保持 `test (…)` 的 job 名不变**——分支保护按名字要求这两个 check。
+
 ## 命令
 
 ```bash

package/dist/cli.js

@@ -6100,7 +6100,7 @@ function askBroker(req, timeoutMs = 5000) {
 }
 
 // packages/cli/src/index.ts
-import { execFileSync as execFileSync12, spawn as spawn2, spawnSync as spawnSync5 } from "node:child_process";
+import { execFileSync as execFileSync12, spawn as spawn3, spawnSync as spawnSync5 } from "node:child_process";
 import { mkdirSync as mkdirSync20, openSync as openSync3 } from "node:fs";
 import { basename as basename10, join as join32 } from "node:path";
 import { existsSync as existsSync29, readFileSync as readFileSync26 } from "node:fs";
@@ -7096,7 +7096,7 @@ function propose(opts = {}) {
 }
 
 // src/service.ts
-import { spawnSync as spawnSync4 } from "node:child_process";
+import { spawn as spawn2, spawnSync as spawnSync4 } from "node:child_process";
 import { createHash as createHash11, randomBytes as randomBytes4 } from "node:crypto";
 import {
   appendFileSync as appendFileSync9,
@@ -7121,6 +7121,52 @@ var ID_RE2 = /^[a-z0-9][a-z0-9-]*$/;
 var VERSION_RE = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/;
 var LIFECYCLE_TYPES = new Set(["periodic", "bounded", "service"]);
 var STDIN_TYPES = new Set(["json", "text", "none"]);
+var ACP_HOSTS = ["dsh", "opencode"];
+var HEALTHCHECK_KINDS = new Set(["script", "acp"]);
+var isPlainObject = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
+var isNonEmptyString = (v) => typeof v === "string" && v.trim() !== "";
+function acpAgentCommand(agent) {
+  if (!ACP_HOSTS.includes(agent?.host))
+    throw new Error(`E_MANIFEST: entry.agent.host must be ${ACP_HOSTS.join("|")}`);
+  const profile = agent.profile?.trim();
+  if (agent.host === "dsh")
+    return ["dsh", ...profile ? ["--profile", profile] : [], "acp"];
+  return ["opencode", "acp"];
+}
+var isAgentEntry = (e) => !!e && e.agent !== undefined && e.agent !== null;
+var healthcheckKind = (hc) => hc?.kind ?? "script";
+var entryCmdOf = (svc) => svc.entry.cmd ?? "";
+function checkAgentEntry(a) {
+  if (!isPlainObject(a))
+    throw new Error("E_MANIFEST: entry.agent must be an object");
+  if (!ACP_HOSTS.includes(a.host))
+    throw new Error(`E_MANIFEST: entry.agent.host must be ${ACP_HOSTS.join("|")}`);
+  for (const k of ["profile", "persona"]) {
+    if (a[k] !== undefined && !isNonEmptyString(a[k]))
+      throw new Error(`E_MANIFEST: entry.agent.${k} must be a non-empty string`);
+  }
+  if (a.host !== "dsh" && a.profile !== undefined) {
+    throw new Error(`E_MANIFEST: entry.agent.profile 只适用于 host=dsh（${a.host} 没有 profile）`);
+  }
+  return a;
+}
+function checkEntry(entry) {
+  if (!isPlainObject(entry))
+    throw new Error("E_MANIFEST: entry required");
+  const hasCmd = entry.cmd !== undefined && entry.cmd !== null;
+  const hasAgent = entry.agent !== undefined && entry.agent !== null;
+  if (hasCmd && hasAgent)
+    throw new Error("E_MANIFEST: entry.cmd 与 entry.agent 互斥，只能声明其一");
+  if (!hasCmd && !hasAgent)
+    throw new Error("E_MANIFEST: entry.cmd required（脚本型）或 entry.agent（agent 型）");
+  if (hasCmd) {
+    if (typeof entry.cmd !== "string" || !entry.cmd.trim())
+      throw new Error("E_MANIFEST: entry.cmd required");
+  } else {
+    checkAgentEntry(entry.agent);
+  }
+  return entry;
+}
 function entryDir() {
   return process.env.DIA_JOB_ENTRY_DIR || join31(jobRoot2(), "bin");
 }
@@ -7163,8 +7209,14 @@ var LEVELS = ["ok", "degraded", "fail"];
 function checkHealthcheck(hc) {
   if (hc === null || typeof hc !== "object" || Array.isArray(hc))
     throw new Error("E_MANIFEST: healthcheck must be an object");
-  if (typeof hc.cmd !== "string" || !hc.cmd.trim())
-    throw new Error("E_MANIFEST: healthcheck.cmd required");
+  if (hc.kind !== undefined && !HEALTHCHECK_KINDS.has(hc.kind))
+    throw new Error("E_MANIFEST: healthcheck.kind must be script|acp");
+  if (healthcheckKind(hc) === "script") {
+    if (typeof hc.cmd !== "string" || !hc.cmd.trim())
+      throw new Error("E_MANIFEST: healthcheck.cmd required");
+  } else if (hc.cmd !== undefined) {
+    throw new Error("E_MANIFEST: healthcheck.kind=acp 不得再声明 cmd（判据是 initialize + session/new，不是外部脚本）");
+  }
   if (hc.interval !== undefined) {
     const why = checkCronInterval(hc.interval);
     if (why)
@@ -7199,10 +7251,14 @@ function validateServiceManifest(m) {
     throw new Error("E_MANIFEST: bad id");
   if (!m.version || !VERSION_RE.test(m.version))
     throw new Error("E_MANIFEST: bad version");
-  if (m.entry === null || typeof m.entry !== "object" || Array.isArray(m.entry))
-    throw new Error("E_MANIFEST: entry required");
-  if (typeof m.entry.cmd !== "string" || !m.entry.cmd.trim())
-    throw new Error("E_MANIFEST: entry.cmd required");
+  checkEntry(m.entry);
+  const agentEntry = isAgentEntry(m.entry);
+  if (agentEntry && healthcheckKind(m.healthcheck) !== "acp") {
+    throw new Error('E_MANIFEST: entry.agent 必须配 healthcheck.kind="acp"（脚本型 healthcheck 无 cmd 可执行）');
+  }
+  if (!agentEntry && m.healthcheck && healthcheckKind(m.healthcheck) === "acp") {
+    throw new Error('E_MANIFEST: healthcheck.kind="acp" 只适用于 entry.agent 型服务');
+  }
   if (m.lifecycle === null || typeof m.lifecycle !== "object" || Array.isArray(m.lifecycle))
     throw new Error("E_MANIFEST: lifecycle required");
   if (!LIFECYCLE_TYPES.has(m.lifecycle.type))
@@ -7804,6 +7860,134 @@ function runHealth(svc, opts) {
   }
   return { judgement, report, stdout, stderr, ms };
 }
+async function runAcpHealth(svc, opts) {
+  const hc = svc.healthcheck;
+  if (!hc || healthcheckKind(hc) !== "acp")
+    throw new Error("E_MANIFEST: runAcpHealth 只处理 healthcheck.kind=acp");
+  const agent = svc.entry.agent;
+  if (!agent)
+    throw new Error("E_MANIFEST: healthcheck.kind=acp 需要 entry.agent");
+  const timeoutMs = (hc.timeout ?? DEFAULT_HEALTH_TIMEOUT) * 1000;
+  const now = opts.now ?? Date.now;
+  const t0 = now();
+  const argv = acpAgentCommand(agent);
+  const env = { ...process.env, ...opts.env ?? {} };
+  const steps = [];
+  const finish = (status, exit) => {
+    const judgement = {
+      ...judgeHealth(exit, {}),
+      state: status,
+      exit,
+      timeout: false,
+      detail: steps.filter((x) => x.state !== "ok").map((x) => `${x.step}: ${x.detail}`).join("; ") || `initialize + session/new ok（${agent.host}${agent.profile ? " --profile " + agent.profile : ""}）`
+    };
+    return { judgement, report: { status, checks: steps.map((x) => ({ name: x.step, status: x.state, detail: x.detail })) }, ms: now() - t0, steps };
+  };
+  const child = spawn2(argv[0], argv.slice(1), { cwd: opts.dir, env, stdio: ["pipe", "pipe", "pipe"] });
+  const pending = new Map;
+  let buf = "";
+  child.stdout.setEncoding("utf8");
+  child.stdout.on("data", (chunk) => {
+    buf += chunk;
+    for (let i = buf.indexOf(`
+`);i >= 0; i = buf.indexOf(`
+`)) {
+      const line = buf.slice(0, i).trim();
+      buf = buf.slice(i + 1);
+      if (!line)
+        continue;
+      let msg;
+      try {
+        msg = JSON.parse(line);
+      } catch {
+        continue;
+      }
+      const waiter = msg && msg.id !== undefined ? pending.get(msg.id) : undefined;
+      if (waiter) {
+        pending.delete(msg.id);
+        waiter(msg);
+      }
+    }
+  });
+  const spawnError = await new Promise((resolve) => {
+    let settled = false;
+    const done = (v) => {
+      if (!settled) {
+        settled = true;
+        resolve(v);
+      }
+    };
+    child.once("error", (e) => done(String(e?.message || e)));
+    child.once("spawn", () => done(null));
+    setTimeout(() => done(null), 50);
+  });
+  if (spawnError)
+    return steps.push({ step: "initialize", state: "degraded", detail: `端点起不来：${spawnError}` }), finish("degraded", 20);
+  const call = (id, method, params) => new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      pending.delete(id);
+      resolve({ timeout: true });
+    }, timeoutMs);
+    pending.set(id, (m) => {
+      clearTimeout(timer);
+      resolve(m);
+    });
+    try {
+      child.stdin.write(JSON.stringify({ jsonrpc: "2.0", id, method, params }) + `
+`);
+    } catch (e) {
+      clearTimeout(timer);
+      pending.delete(id);
+      resolve({ died: String(e?.message || e) });
+    }
+  });
+  try {
+    const init = await call(1, "initialize", { protocolVersion: 1, clientCapabilities: {} });
+    if (init.timeout)
+      steps.push({ step: "initialize", state: "degraded", detail: "initialize 超时" });
+    else if (init.died)
+      steps.push({ step: "initialize", state: "degraded", detail: `端点已退出：${init.died}` });
+    else if (init.error)
+      steps.push({ step: "initialize", state: "degraded", detail: `initialize 报错：${init.error?.message ?? JSON.stringify(init.error)}` });
+    else if (!init.result)
+      steps.push({ step: "initialize", state: "degraded", detail: "initialize 无 result" });
+    else
+      steps.push({ step: "initialize", state: "ok", detail: "initialize ok" });
+    if (steps[0].state !== "ok")
+      return finish("degraded", 20);
+    const ns = await call(2, "session/new", { cwd: opts.dir, mcpServers: [] });
+    if (ns.timeout)
+      steps.push({ step: "session/new", state: "fail", detail: "session/new 超时" });
+    else if (ns.error)
+      steps.push({ step: "session/new", state: "fail", detail: `session/new 报错：${ns.error?.message ?? JSON.stringify(ns.error)}` });
+    else if (!ns.result?.sessionId)
+      steps.push({ step: "session/new", state: "fail", detail: "session/new 未返回 sessionId" });
+    else
+      steps.push({ step: "session/new", state: "ok", detail: `session ${ns.result.sessionId}` });
+    return steps[1].state === "ok" ? finish("ok", 0) : finish("fail", 21);
+  } finally {
+    try {
+      child.kill("SIGKILL");
+    } catch {}
+  }
+}
+function recordHealth(svc, judgement, opts = {}) {
+  const id = svc.id;
+  const gen = opts.gen || generationOf(id);
+  const now = opts.now ?? Math.floor(Date.now() / 1000);
+  const file = opts.stateFile || process.env.DIA_SERVICE_HEALTH_FILE || healthStatePath(id);
+  const record = transition(findLastHealth(readHealthLines(file), id, gen), {
+    service: id,
+    gen,
+    source: opts.source ?? "manual",
+    ts: now,
+    judgement,
+    debounce: svc.healthcheck?.debounce,
+    checks: opts.checks
+  });
+  appendHealthRecord(file, record);
+  return { record, statePath: file };
+}
 function whichTimeout1() {
   const probe = spawnSync4("bash", ["-c", "command -v timeout || command -v gtimeout"], { encoding: "utf8" });
   const p = String(probe.stdout ?? "").trim().split(`
@@ -7862,7 +8046,7 @@ function collectManagedFiles(base, hc) {
 }
 function verify4(dir, opts = {}) {
   const svc = readServiceManifest(dir);
-  const entry = resolveEntry(svc.entry.cmd, dir);
+  const entry = resolveEntry(entryCmdOf(svc), dir);
   const drift = [];
   if (!existsSync28(entry.path))
     drift.push({ code: "entry_missing", detail: `entry 不存在：${entry.path}` });
@@ -7965,7 +8149,7 @@ function add2(opts) {
   }
   if (svc.healthcheck)
     healthJobInterval(svc);
-  const entry = resolveEntry(svc.entry.cmd, dir);
+  const entry = resolveEntry(entryCmdOf(svc), dir);
   if (!existsSync28(entry.path))
     throw new Error(`E_UNSTABLE_ENTRY: entry 不存在：${entry.path}`);
   if (!isExecutableFile(entry.path))
@@ -7979,7 +8163,7 @@ function add2(opts) {
     gen,
     dryRun: !!opts.dryRun,
     backend,
-    entry: { declared: svc.entry.cmd, kind: entry.kind, path: entry.path, link: null },
+    entry: { declared: entryCmdOf(svc), kind: entry.kind, path: entry.path, link: null },
     jobs: { service: serviceJobName(svc.id), health: svc.healthcheck ? healthJobName(svc.id) : null },
     target_mismatch: mismatch
   };
@@ -7988,7 +8172,7 @@ function add2(opts) {
       rmSync9(dir, { recursive: true, force: true });
     return result;
   }
-  const backfill = ["--allow-unstable", "--desc", `dia service ${svc.id}: healthcheck 只读判定，稳定入口 ${entryPathOf(svc.entry.cmd, dir)}`];
+  const backfill = ["--allow-unstable", "--desc", `dia service ${svc.id}: healthcheck 只读判定，稳定入口 ${entryPathOf(entryCmdOf(svc), dir)}`];
   const runner = opts.runner ?? defaultRunner({ backfill });
   const installed = [];
   const fail = (code, msg, rc) => {
@@ -8005,7 +8189,7 @@ function add2(opts) {
     entryPath = linkEntry(entry.path);
     result.entry.link = entryPath;
     result.entry.path = entryPath;
-  } else if (svc.entry.cmd.startsWith(entryDir())) {
+  } else if (entryCmdOf(svc).startsWith(entryDir())) {
     result.entry.link = entry.path;
   }
   const jobArgs = (name, cmd) => {
@@ -8322,7 +8506,7 @@ usage:
   dia collab status|enable|disable [--persona ID]   # dia-msg 默认能力开关（默认开）
   dia whoami [--json] [--name NAME]   # 当前会话身份（session id）
   dia in [--unread] [--all] [--legacy] [--json]   # 会话收件箱（正文内联）
-  dia out --to <session_id> --subject S (--body B|--body-file F) [--kind K] [--reply-to ID]
+  dia out --to <session_id> --subject S (--body B|--body-file F) [--kind K] [--touch p1,p2] [--reply-to ID]
   dia ack <id> | dia reply <id> --body B | dia close <id> --reason R | dia show <id>
   dia msg send|show|inbox|ack|delivered|deliver [--wait]|reply|needs-info|status|stuck|thread|escalate|agents|migrate
   dia agents list|register|unregister|discover
@@ -8820,7 +9004,7 @@ function spawnDetachedDelivery(args) {
   const log = join32(dir, `deliver-${id}.log`);
   const fd = openSync3(log, "a");
   const bin = process.argv[1];
-  const child = spawn2(process.execPath, [bin, "msg", "deliver", ...args, "--wait"], {
+  const child = spawn3(process.execPath, [bin, "msg", "deliver", ...args, "--wait"], {
     detached: true,
     stdio: ["ignore", fd, fd],
     env: process.env
@@ -9110,6 +9294,13 @@ async function collabCli(argv) {
       i++;
     }
   }
+  const touchPaths = [...flags(args, "--touch"), ...(flag(args, "--touches") || "").split(",")].map((x) => x.trim()).filter(Boolean);
+  if (touchPaths.length)
+    refs.touches = touchPaths.join(",");
+  const refPaths = (m) => [
+    ...(m.refs?.touches || "").split(","),
+    ...m.refs?.path ? [m.refs.path] : []
+  ].map((x) => x.trim()).filter(Boolean);
   const view = (m) => ({ ...m, body: bodyOf(m) });
   const print = (m) => {
     out(`${m.id}	[${m.state}]	${m.subject}`);
@@ -9118,6 +9309,12 @@ async function collabCli(argv) {
     out(`  kind: ${m.kind}${m.requires_reply ? "  需回复" : ""}${m.deadline ? `  deadline=${m.deadline}` : ""}  thread=${m.thread_id}#${m.seq}`);
     if (m.refs && Object.keys(m.refs).length)
       out(`  refs: ${Object.entries(m.refs).map(([k, v]) => `${k}=${v}`).join(" ")}`);
+    const touches = refPaths(m);
+    if (touches.length) {
+      const held = list3({}).filter((c) => touches.includes(c.path) && c.holder !== m.to.session_id);
+      for (const c of held)
+        out(`  ⚠ claim: ${c.path} 由 ${c.holder} 持有（${c.reason || "no reason"}）`);
+    }
     const body = bodyOf(m);
     if (body) {
       const max = 4000;
@@ -9220,7 +9417,14 @@ async function collabCli(argv) {
         idempotencyKey: flag(args, "--idempotency-key"),
         hops: flag(args, "--hops") ? Number(flag(args, "--hops")) : undefined
       });
-      out(asJson ? JSON.stringify(m, null, 1) : `${m.id}	${m.thread_id}#${m.seq}	${m.from.session_id} → ${m.to.session_id}	${m.kind}	${m.subject}`);
+      const overlaps = list3({}).filter((c) => touchPaths.includes(c.path) && c.holder !== m.from.session_id);
+      if (asJson)
+        out(JSON.stringify(overlaps.length ? { ...m, claim_overlaps: overlaps } : m, null, 1));
+      else {
+        out(`${m.id}	${m.thread_id}#${m.seq}	${m.from.session_id} → ${m.to.session_id}	${m.kind}	${m.subject}`);
+        for (const c of overlaps)
+          out(`  ⚠ claim overlap: ${c.path} 由 ${c.holder} 持有（${c.reason || "no reason"}）`);
+      }
       return 0;
     }
     if (sub === "ack") {
@@ -9814,6 +10018,18 @@ async function serviceCli(argv) {
       }
       const fromWrapper = has(args, "--from-wrapper");
       const ex = flag(args, "--exit");
+      const dir = serviceDir(id);
+      const svc = readServiceManifest(dir);
+      if (healthcheckKind(svc.healthcheck) === "acp" && !fromWrapper) {
+        const run = await runAcpHealth(svc, { dir });
+        const rec = recordHealth(svc, run.judgement, { gen: flag(args, "--gen"), stateFile: flag(args, "--state-file") });
+        const code = run.judgement.state === "ok" ? 0 : run.judgement.state === "degraded" ? 30 : 1;
+        if (asJson)
+          out(JSON.stringify({ id, verdict: run.judgement.state, shown: rec.record.state, exit: run.judgement.exit, detail: run.judgement.detail, steps: run.steps }, null, 1));
+        else
+          out(`${id}: ${run.judgement.state}（shown=${rec.record.state}${run.judgement.detail ? ", " + run.judgement.detail : ""}）`);
+        return code;
+      }
       const r = runServiceHealth(id, {
         wrapperExit: fromWrapper ? Number(ex ?? "1") : undefined,
         gen: flag(args, "--gen"),

package/docs/index.md

@@ -31,7 +31,7 @@ Agent 入口：[`llms.txt`](https://github.com/minonl/dia/blob/main/llms.txt)（
 | [价目表（tokens → 金额）](pricing.md) | 原则：没有价格就不编造；unpriced 明确记录，预算按 tokens 兜底。 |
 | [目标提案（team next）](proposals.md) | 定位：团队可以提候选，不能定目标。 |
 | [Sandbox 细化设计（dia）](security-sandbox.md) | 依据：dsh 本机源码实测、Hermes/Pi 取证、[/tmp/dia-sbx 实验]。 |
-| [服务（service）：可托管的执行体](service-noun.md) | 状态：提案（设计，未实现）。只做脚本型服务；healthcheck 按专用退出码域判定，旧结果超新鲜度窗口即报 stale。 |
+| [服务（service）：可托管的执行体](service-noun.md) | 状态：已实现（v0.0.10，脚本型 + agent 型）。脚本型走 entry.cmd，agent 型走 entry.agent + healthcheck.kind="acp"； |
 | [dia 状态页（单一事实源）](status.md) | 任何"现在做到哪了"的问题，以本页为准；其他文档是细节。 |
 | [全自动团队：人只在验收介入](team-automation.md) | 目标：计划→实现→验证→对抗→修复全自动循环；人只在验收阶段拍板。 |
 | [团队章程：谁来做 dia（开发团队）](team.md) | 2026-10-28 升级：开发团队执行模式改为全自动循环（计划→实现→验证→对抗→修复），人只在验收阶段介入； |

package/docs/msg-collab-m1.md

@@ -78,3 +78,18 @@ dia graph --tui --no-color      # 关 ANSI 颜色
 - 按状态分组显示 task → deps / touches / blocked_by；claims 单列；
 - 不启 HTTP/daemon，遵守框架“无网络模块”约束；
 - `--task t-...` 只显示该任务的直接邻居。
+
+---
+
+# handoff + claim 联动（M2）
+
+```bash
+dia claim src/collab.ts --reason "正在重构"
+dia out --to ses_xxx --kind handoff --subject "交接" --body-file handoff.md \
+        --touches src/collab.ts,docs/msg-collab-m1.md
+```
+
+- `--touches a,b`（也接受重复 `--touch`）写入消息 `refs.touches`；
+- 发送时如果有他人活跃 claim，输出 `⚠ claim overlap`（advisory，仍发送）；
+- 收件方 `dia in` 会在消息下显示 `⚠ claim: <path> 由 <holder> 持有`；
+- 不自动排队/阻断；claim 仍是可见性工具。

package/docs/overview.md

@@ -85,6 +85,12 @@ $ dia --persona yan kb scene S1  → 正常出场景卡
 
 ---
 
+## 3.1 CI 口径（见 README「CI 矩阵」）
+
+- required = `test (ubuntu-latest)` + `test (macos-latest)`（分支保护，`enforce_admins`）
+- `windows-smoke` 非阻塞：Windows 后端未实现（`dia job install` rc=3），落地后再升 required
+- **docs-only 快通道**：只改 `docs/**` / 根 `*.md` / `llms*.txt` 时跳过测试矩阵
+
 ## 4. 已知缺口（按优先级）
 
 1. **yan 安装落后来源仓 1 个提交**（`83fbaa9` vs `8d10cc5`，内容是 dsh profile 根 `cordis.yml` 修复）。

package/docs/service-noun.md

@@ -1,8 +1,11 @@
 # 服务（service）：可托管的执行体
 
-> 状态：提案（设计，未实现）。只做脚本型服务；healthcheck 按专用退出码域判定，旧结果超新鲜度窗口即报 stale。
+> 状态：**已实现（v0.0.10，脚本型 + agent 型）**。脚本型走 `entry.cmd`，agent 型走 `entry.agent` + `healthcheck.kind="acp"`；
+> healthcheck 按专用码域 `0/20/21` 判定（外加 `124`=timeout、信号=crash），旧结果超新鲜度窗口即报 `unknown (stale …)`。
+> **实现状态逐节对照见 §15。**
 > 日期 2026-11-05（rev.2：按 [设计评审 B1–B5 / C1–C7 / D1–D4](review/service-noun-review-2026-11-05.md) 改稿；
-> **rev.3**：按复核意见改「去抖单一写入方 / health 码域 `0/20/21` / timeout 映射 / 手动检查落台账 / adopted 口径」，见 §13）。
+> **rev.3**：按复核意见改「去抖单一写入方 / health 码域 `0/20/21` / timeout 映射 / 手动检查落台账 / adopted 口径」，见 §13；
+> **rev.4**：回填实现状态（PR #49 / #54 / #60）与 §15 对照表）。
 > 关联：[`cli.md`](cli.md)（名词与动词矩阵 / 退出码）· [`persona-install.md`](persona-install.md)（`dia.json` schema）·
 > [`kit-install.md`](kit-install.md) · [`acp-integration.md`](acp-integration.md)（agent 会话型服务）· `packages/job`（生命周期、状态台账）
 
@@ -243,9 +246,11 @@ unknown（stale）**不单独返回**——`health` 是实时执行，不存在
 
 - `job` 仍是**唯一调度实现**（不新增第二套）；健康检查任务本身就是一个 `job`（`periodic`）。
 - `service` 只多一层「声明 + 校验 + 健康检查」。
-- `dia job status` 的每行增加 `health=<ok|degraded|fail|unknown|n/a> (Ns ago)`（读 §4.5 缓存，不执行）。
+- `dia job status` 的每行增加 `health=<ok|degraded|fail|unknown|n/a> (Ns ago)`（读 §4.5 缓存，不执行）。**✅ 已实现（PR #54）**：
+  仅对 `local.dia-job-svc-<id>` 行追加，其它行原样（向后兼容）。
 - 对 `service` 型（常驻）任务：Linux 走 systemd `--user`，**常驻需 `loginctl enable-linger`**（`job doctor` 已提示，`dia service add` 一并转述）；
   对 `periodic` 任务，cron 后端**没有进程状态**，health 是唯一判据 → 新鲜度条款（§4.6）尤其关键。
+- **性能**：只读台账、零执行；实测 N=50 时 `3.1ms`（阈值 200ms），基准见 `tests/service-health-status.perf.test.ts`。
 
 ## 7. 边界与异常
 
@@ -355,7 +360,8 @@ unknown（stale）**不单独返回**——`health` 是实时执行，不存在
 
 ## 14. P2：agent 型服务（entry = persona 会话）
 
-> 状态：**草案（待实现）**。§0 已定「本版只做脚本型」；本节把 P2 的形状先定下来，避免实现时二次发明语义。
+> 状态：**已实现（PR #60）**。本节定义脚本型之外的 agent 型入口（`entry.agent` + `healthcheck.kind="acp"`）；
+> 实现与本节一致，差异见 §15。
 
 ### 14.1 与脚本型的关系
 
@@ -428,3 +434,31 @@ flowchart LR
 - [ ] 单测：`runAcpHealth` 用 `tests/fixtures/fake-acp.mjs` 覆盖 `initialize` 失败 / `session/new` 失败 / 正常三态
 - [ ] 单测：`healthcheck.kind` 缺省时按脚本型（向后兼容）
 - [ ] e2e：装一个 agent 型 demo（fake ACP）→ `dia job status` 显示 `health=ok…`，杀掉端点后变 `degraded(stale)`
+
+## 15. 实现状态（2026-11-06 回填）
+
+> 规则：**设计先改、代码同批**（R35）。本节是「设计 ↔ 实现」的对照表；后续改动必须同批更新本表。
+
+| 设计小节 | 状态 | 实现落点 |
+|---|---|---|
+| §2 构成（entry/lifecycle/contract/healthcheck） | ✅ | `src/service.ts`：`ServiceManifest` / `validateServiceManifest`（PR #49） |
+| §3 清单与校验（entry 规则、`E_MANIFEST`） | ✅ | `checkEntry` / `checkAgentEntry` / `resolveEntry`（#49、#60） |
+| §4.1 码域 `0/20/21` + `124` + 信号 | ✅ | `judgeHealth` / `judgeSpawnResult`；`124` 与 `137/143` 分流（#49；无 `timeout(1)` 的兜底见 #49 后续修复 `29a4341`） |
+| §4.2 执行环境 / `E_BACKEND` | ✅ | `healthShell`、`checkCronInterval`（#49） |
+| §4.3 去抖 + 单一写入方 + `gen` | ✅ | `transition`（`gen` 不同的行不计数）（#49） |
+| §4.4 崩溃语义（保持上次状态 + `last_error`） | ✅ | `judgeSpawnResult` + `transition`（#49） |
+| §4.5 台账（`state.jsonl` + `kind:"health"`） | ✅ | `appendHealthRecord` / `findLastHealth` / `readHealthLines`（#49、#54） |
+| §4.6 新鲜度（`interval × 1.5` → stale） | ✅ | `healthView` / `staleAfter`（#54） |
+| §5 CLI（add/remove/list/show/verify/health） | ✅ | `packages/cli/src/index.ts`（#49）；`health` 的 agent 分支（#60） |
+| §6 `dia job status` 追列 health | ✅ | `decorateStatus` + `runJobCapture`（#54） |
+| §7 边界（`E_UNSTABLE_ENTRY` / adopted / three-state） | ✅ | `verify` / `healthView`（#49、#54） |
+| §14 agent 型（`entry.agent` + `kind:"acp"`） | ✅ | `acpAgentCommand` / `runAcpHealth` / `recordHealth`（#60） |
+| §6 性能基准（N=50 ≤200ms） | ✅ | 实测 **3.1ms**（单服务 0.1ms，macOS / bun 1.4.4）；`tests/service-health-status.perf.test.ts` 断言 ≤200ms 且不随 N 线性增长 |
+
+### 15.1 已知与设计的偏差
+
+| 项 | 设计 | 实现 | 处置 |
+|---|---|---|---|
+| `healthcheck.kind` 缺省 | 未写 | 缺省 `script`（向后兼容） | 与 §14.6 一致，已写回 §14 |
+| `dia service health` 的 agent 分支 | §5 未细化 | 先跑 ACP 探测再落 `source:"manual"` 行 | 与 §5/§14 语义一致，无需改设计 |
+| `entry.agent` 与 `healthcheck.kind` 的强绑定 | §14.6 验收项 | 已实现为 `E_MANIFEST`（agent 型必须 acp；acp 只能配 agent 型） | 已写回 §14.2 校验说明 |

package/package.json

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

package/packages/wt/bin/dia-wt

@@ -1263,15 +1263,32 @@ 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
+# simple-git-hooks RC 注入目录（跟随 dia 数据根）
+wt_hooks_rc_dir() { printf '%s/hooks' "${DIA_ROOT:-${DIA_DATA_DIR:-$HOME/.dia}}"; }
+# 在 ~/.zshenv 里确保 export KEY=VALUE（幂等；带 marker 便于移除）
+wt_ensure_env_export() {
+  local key="$1" val="$2" rc="${DIA_WT_SHELL_RC:-$HOME/.zshenv}"
+  local marker="# dia-wt: $key"
+  [ -f "$rc" ] || : > "$rc"
+  grep -q "^$marker" "$rc" 2>/dev/null && return 0
+  printf '\n%s\nexport %s="%s"\n' "$marker" "$key" "$val" >> "$rc"
+}
+wt_write_hook() {
+  local hooksdir="$1" name="$2" extra="${3:-}" chain="${4:-}"
+  {
+    printf '#!/usr/bin/env bash\n# dia-wt guard（managed by `dia wt adopt`；勿手改）\n'
+    wt_guard_body
+  } > "$hooksdir/$name"
+  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('orig="$common/hooks/$name"', 'orig="%s/$name"' % chain.replace('\\', '\\\\').replace('"', '\\"'))
+open(p, "w").write(s)
+PYCHAIN
+  fi
+  chmod +x "$hooksdir/$name"
 }
 
 cmd_guard() {
@@ -1329,11 +1346,13 @@ cmd_adopt() {
 
   if [ "$mode" = "revert" ]; then
     [ -f "$cfg" ] || die "未 adopt（缺 $cfg）"
-    local saved
+    local saved mgr
     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"
+    mgr="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksManager") or "")' "$cfg" 2>/dev/null || true)"
+    if [ "$mgr" = "local" ] || [ -z "$mgr" ]; then
+      if [ "$prev" = "$hooksdir" ]; then
+        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
+      fi
     fi
     rm -rf "$cfgdir"
     echo "reverted：$cfgdir"
@@ -1348,16 +1367,29 @@ 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
-    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 "$ghd/$h" ] || { echo "FAIL D02 缺全局钩子 $h"; bad=1; }
-    done
-    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; }
+    local mgr2; mgr2="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksManager") or "")' "$cfg" 2>/dev/null || true)"
+    if [ "$mgr2" = "simple-git-hooks" ]; then
+      local rcf; rcf="$(wt_hooks_rc_dir)/simple-git-hooks-rc.sh"
+      [ -f "$rcf" ] || { echo "FAIL D02 缺 simple-git-hooks RC：$rcf"; bad=1; }
+      grep -rqs "SIMPLE_GIT_HOOKS_RC" "$HOME/.zshenv" || { echo "FAIL D02 shell 未 export SIMPLE_GIT_HOOKS_RC"; bad=1; }
+      python3 - "$repo/package.json" <<'PYM' >/dev/null 2>&1 || { echo "FAIL D02 package.json 未启用 simple-git-hooks"; bad=1; }
+import json,sys
+d=json.load(open(sys.argv[1])); c=d.get("simple-git-hooks"); dev=d.get("devDependencies",{}) or {}
+raise SystemExit(0 if isinstance(c,dict) or "simple-git-hooks" in dev else 1)
+PYM
+      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 bash "$SELF" guard pre-commit >/dev/null 2>&1 ) \
+          && { echo "FAIL D03 守卫探针未拦截 $def 提交"; bad=1; }
+      fi
+    else
+      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" ] && 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 守卫探针未拦截 $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"
@@ -1383,34 +1415,78 @@ 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
+  # ── 方案：每个仓本地钩子；simple-git-hooks 仓改用它的 RC 注入 ──────────────
+  # 不再写任何全局 git 配置（避免外溢）。
+  if [ -f "$repo/package.json" ] && python3 - "$repo/package.json" <<'PYCHK'
+import json,sys
+d=json.load(open(sys.argv[1]))
+cfg=d.get("simple-git-hooks")
+dev=d.get("devDependencies",{}) or {}
+raise SystemExit(0 if isinstance(cfg,dict) or "simple-git-hooks" in dev else 1)
+PYCHK
+  then
+    # simple-git-hooks：钩子由管理器生成到 .git/hooks，我们不碰；通过 SIMPLE_GIT_HOOKS_RC 注入守卫
+    local rcdir rcf
+    rcdir="$(wt_hooks_rc_dir)"; rcf="$rcdir/simple-git-hooks-rc.sh"
+    mkdir -p "$rcdir"
+    cat > "$rcf" <<'RC'
+# 由 simple-git-hooks 生成的钩子 source 本文件（SIMPLE_GIT_HOOKS_RC）
+# 只对已 adopt 的仓生效；未 adopt → 直接返回
+if command -v dia >/dev/null 2>&1; then
+  dia wt guard "$(basename "$0")" || exit $?
+fi
+RC
+    wt_ensure_env_export SIMPLE_GIT_HOOKS_RC "$rcf"
+    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": "simple-git-hooks", "hooksPrevious": prev or None,
+  "adoptedAt": datetime.datetime.now(datetime.timezone.utc).isoformat(),
+}, open(cfg, "w"), ensure_ascii=False, indent=1)
+PYG
+    echo "adopted：$repo（hook manager = simple-git-hooks；守卫经 SIMPLE_GIT_HOOKS_RC 注入）"
+    return 0
   fi
-  rm -rf "$hooksdir" 2>/dev/null || true
-  python3 - "$cfg" "$repo" "$def" "$template" "$prev" <<'PYG'
+
+  # 其它仓：自己管 <common>/dia/hooks，并把本地 core.hooksPath 指过去。
+  # 若该仓已有**别人**的本地 hooksPath（husky/.githooks 等），不抢占：只报告，交由转为 simple-git-hooks 处理。
+  if [ -n "$prev" ] && [ "$prev" != "$hooksdir" ]; then
+    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,
+  "hooksManager": "external", "hooksPrevious": prev,
+  "adoptedAt": datetime.datetime.now(datetime.timezone.utc).isoformat(),
+}, open(cfg, "w"), ensure_ascii=False, indent=1)
+PYG
+    echo "[dia-wt] ⚠️ $repo 的 core.hooksPath=$prev 由其它管理器管理，未接管（守卫不生效）；建议改用 simple-git-hooks（见 docs/worktree.md）" >&2
+    return 0
+  fi
+  mkdir -p "$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"
+  local chain="$prev"
+  [ -n "$chain" ] || chain="$common/hooks"
+  [ -f "$cfg" ] && cp "$cfg" "$cfgdir/config.json.bak.$(date +%s)"
+  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"
+  python3 - "$cfg" "$repo" "$def" "$template" "$prev" "$chain" <<'PYG'
+import json, sys, datetime
+cfg, repo, br, tmpl, prev, chain = sys.argv[1:7]
+json.dump({
+  "schema": 2, "repo": repo, "defaultBranch": br, "template": tmpl,
+  "hooksManager": "local", "hooksPath": cfg.rsplit("/",1)[0] + "/hooks",
+  "hooksPrevious": prev or None, "hooksChain": chain,
   "adoptedAt": datetime.datetime.now(datetime.timezone.utc).isoformat(),
 }, open(cfg, "w"), ensure_ascii=False, indent=1)
 PYG
-  echo "adopted：$repo（守卫 = 本机全局钩子 $(wt_global_hooks_dir)）"
+  echo "adopted：$repo（守卫 = 仓库本地钩子 $hooksdir）"
   return 0
   # 保留首次 adopt 记下的 hooksPrevious（重复 apply 时 prev 已是我们自己的 hooksdir）
   local savedPrev=""
@@ -1467,13 +1543,17 @@ cmd_doctor() {
     fi
     [ -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
-      :
+    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)" = "simple-git-hooks" ]; then
+      local rcdir rcf; rcdir="$(wt_hooks_rc_dir)"; rcf="$rcdir/simple-git-hooks-rc.sh"
+      mkdir -p "$rcdir"
+      cat > "$rcf" <<'RC'
+# 由 simple-git-hooks 生成的钩子 source 本文件（SIMPLE_GIT_HOOKS_RC）
+if command -v dia >/dev/null 2>&1; then
+  dia wt guard "$(basename "$0")" || exit $?
+fi
+RC
+      wt_ensure_env_export SIMPLE_GIT_HOOKS_RC "$rcf"
+      [ "$json" = 0 ] && echo "FIX $repo simple-git-hooks RC 已重建"
     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)"
@@ -1489,25 +1569,31 @@ cmd_doctor() {
     local bad=0 mcfg=""
     [ -f "$cfg" ] || { echo "FAIL D01 $repo 未 adopt"; bad=1; }
     [ -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)"
+    local ghp mgr2
     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 "$ghd/$h" ] || { echo "FAIL D02 缺全局钩子 $h"; bad=1; }
-    done
-    # 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
+    # D20 全局配置残留：旧版把守卫装到全局 hooksPath；现在改为每仓本地，必须清掉
+    if [ -n "$ghp" ] && [ -f "$ghp/pre-commit" ] && grep -q "dia-wt guard" "$ghp/pre-commit" 2>/dev/null; then
+      echo "FAIL D20 全局 core.hooksPath 仍指向 dia 旧钩子目录（$ghp）；执行 git config --global --unset core.hooksPath"
+      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 $repo 守卫探针未拦截 $def 提交"; bad=1; }
+    mgr2="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("hooksManager") or "")' "$cfg" 2>/dev/null || true)"
+    if [ "$mgr2" = "simple-git-hooks" ]; then
+      local rcf; rcf="$(wt_hooks_rc_dir)/simple-git-hooks-rc.sh"
+      [ -f "$rcf" ] || { echo "FAIL D02 $repo 缺 simple-git-hooks RC：$rcf"; bad=1; }
+      grep -rqs "SIMPLE_GIT_HOOKS_RC" "$HOME/.zshenv" || echo "WARN D02 $repo shell 未 export SIMPLE_GIT_HOOKS_RC（守卫不会执行）"
+      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 bash "$SELF" guard pre-commit >/dev/null 2>&1 ) \
+          && { echo "FAIL D03 $repo 守卫探针未拦截 $def 提交"; bad=1; }
+      fi
+    else
+      case "$prev" in /*) ;; *) echo "FAIL D02 $repo 本地 core.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" ] && 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 有未提交改动"

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

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
-# adopt / doctor / gate 回归测试（2026-11-06：本机全局钩子模型）
-# 覆盖：dry-run、apply(全局钩子)、check/doctor、主 checkout 守卫、链式调用仓库钩子、
-#       非 adopt 仓透传、敏感扫描、adopt --all、gate、revert。
+# adopt / doctor / gate 回归测试（2026-11-06：每仓本地钩子 + simple-git-hooks RC）
 set -uo pipefail
 HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 WT="$HERE/../bin/dia-wt"
@@ -9,29 +7,29 @@ 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 配置 / 数据根，避免污染真实机器
+# 隔离 HOME / 全局 git 配置 / 数据根 / shell rc（避免污染真实机器）
 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"
+export DIA_ROOT="$TD/dia"
+export DIA_WT_SHELL_RC="$HOME/.zshenv"
 
-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
+mk_repo(){ local r="$1"; 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; }
 
+R="$TD/repo"; mk_repo "$R"
 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"
-[ "$(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 未记录"
+hp="$(git -C "$R" config --local --get core.hooksPath)"
+case "$hp" in */repo/.git/dia/hooks) ok "仓库本地 hooksPath 指向 dia 目录" ;; *) bad "hooksPath=$hp" ;; esac
+for h in pre-commit pre-push post-checkout; do [ -x "$R/.git/dia/hooks/$h" ] || bad "缺 $h"; done
+ok "三个钩子可执行"
+python3 -c 'import json,sys;d=json.load(open(sys.argv[1]));sys.exit(0 if d.get("hooksManager")=="local" else 1)' "$R/.git/dia/config.json" \
+  && ok "config 记录 hooksManager=local" || bad "hooksManager 未记录"
+[ -z "$(git config --global --get core.hooksPath 2>/dev/null || true)" ] && ok "未写全局 git 配置" || bad "仍写了全局 hooksPath"
 
 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 失败"
@@ -41,51 +39,55 @@ 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
 
-# 链式：仓库自己的 .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/hooks/pre-commit 仍要执行
+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
-git -C "$R2" config --local core.hooksPath .githooks
-bash "$WT" adopt "$R2" --apply >/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 未提示覆盖"
+# simple-git-hooks 仓：走 RC 注入，不碰仓内文件与 .git/hooks
+RN="$TD/npmrepo"; mk_repo "$RN"
+printf '{"name":"r","devDependencies":{"simple-git-hooks":"^2.11.1"},"simple-git-hooks":{"pre-commit":"npx lint-staged"}}\n' > "$RN/package.json"
+git -C "$RN" add -A; git -C "$RN" commit -qm pkg
+before="$(md5 -q "$RN/package.json" 2>/dev/null || md5sum "$RN/package.json" | cut -d' ' -f1)"
+bash "$WT" adopt "$RN" --apply >/dev/null 2>&1 || bad "npm 仓 adopt 失败"
+after="$(md5 -q "$RN/package.json" 2>/dev/null || md5sum "$RN/package.json" | cut -d' ' -f1)"
+[ "$before" = "$after" ] && ok "不修改仓库 package.json" || bad "package.json 被改动"
+[ -z "$(git -C "$RN" config --local --get core.hooksPath || true)" ] && ok "不占用仓库 hooksPath（交给管理器）" || bad "仍设置了 hooksPath"
+[ -f "$DIA_ROOT/hooks/simple-git-hooks-rc.sh" ] && ok "写入 simple-git-hooks RC" || bad "缺 RC 文件"
+grep -q "SIMPLE_GIT_HOOKS_RC" "$HOME/.zshenv" 2>/dev/null && ok "shell rc 注入 SIMPLE_GIT_HOOKS_RC" || bad "未注入环境变量"
+bash "$WT" doctor "$RN" >/dev/null 2>&1 && ok "npm 仓 doctor 通过" || bad "npm 仓 doctor 失败"
+(cd "$RN" && DIA_WT_GUARD_PROBE=1 bash "$WT" guard pre-commit >/dev/null 2>&1) && bad "guard 未拦截 main 提交" || ok "guard 拦截 main 提交"
 
-# 未 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 >/dev/null 2>&1 && ok "未 adopt 仓不受守卫影响" || bad "未 adopt 仓被误拦"
+# 全局配置残留检查：旧版全局钩子目录 → doctor FAIL
+LEGACY="$TD/legacy-hooks"; mkdir -p "$LEGACY"
+printf '#!/usr/bin/env bash\n# dia-wt guard（旧）\nexit 0\n' > "$LEGACY/pre-commit"; chmod +x "$LEGACY/pre-commit"
+git config --global core.hooksPath "$LEGACY"
+bash "$WT" doctor "$R" >/tmp/d20.log 2>&1; grep -q "D20" /tmp/d20.log && ok "doctor 报全局钩子残留" || bad "doctor 未报全局残留: $(head -3 /tmp/d20.log | tr "\n" " ")"
+git config --global --unset core.hooksPath
 
-# 敏感扫描：adopted 仓的 worktree 推送带绝对路径 → 阻断；相对片段不误报
+# 未 adopt 的仓不受影响
+R3="$TD/repo3"; mk_repo "$R3"; echo z > "$R3/z.txt"; git -C "$R3" add -A
+git -C "$R3" commit -qm ok >/dev/null 2>&1 && ok "未 adopt 仓不受守卫影响" || bad "未 adopt 仓被误拦"
+
+# 敏感扫描（worktree push）
 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
+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   # 丢掉含敏感内容的提交
+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--*
+# adopt --all
 AR="$TD/allroot"; mkdir -p "$AR/a" "$AR/b"
-for r in a b; do
-  git -C "$AR/$r" init -q -b main
-  git -C "$AR/$r" config user.email t@example.com; git -C "$AR/$r" config user.name t
-  echo x > "$AR/$r/x.txt"; git -C "$AR/$r" add -A; git -C "$AR/$r" commit -qm init
-done
+for r in a b; do mk_repo "$AR/$r"; done
 git -C "$AR/a" worktree add -q -b feat/w "$AR/a-worktree--w" main
 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"
@@ -97,16 +99,16 @@ DIA_WT_REPOS_ROOT="$TD/empty-root" bash "$WT" adopt --all >/dev/null 2>&1
 
 # 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" 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
 
-# revert：撤本仓配置，保留全局钩子
+# 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 误删全局钩子"
+[ -z "$(git -C "$R" config --local --get core.hooksPath || true)" ] && ok "revert 还原本地 hooksPath" || bad "hooksPath 未还原"
 git -C "$R" worktree remove --force "$TD/repo-worktree--y" >/dev/null 2>&1 || true
 
 echo; echo "── PASS $PASS · FAIL $FAIL ──"