@minonl/dia 0.0.2 → 0.0.3

package/dist/cli.js

@@ -4313,6 +4313,7 @@ function registryCandidates() {
     out.push(process.env.DIA_PLATFORMS_FILE);
   const install = installDir();
   out.push(join18(install, "registry", "platforms.json"));
+  out.push(join18(install, "docs", "platforms", "registry.json"));
   out.push(join18(process.cwd(), "docs", "platforms", "registry.json"));
   return out;
 }
@@ -4402,6 +4403,7 @@ function candidates() {
     out.push(process.env.DIA_DEPS_FILE);
   const install = installDir();
   out.push(join19(install, "registry", "deps.jsonl"));
+  out.push(join19(install, "docs", "deps.jsonl"));
   out.push(join19(process.cwd(), "docs", "deps.jsonl"));
   return out;
 }

package/package.json

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

package/packages/wt/bin/dia-wt

@@ -461,7 +461,7 @@ cmd_prune_merged() {
     local -a roots=()
     [ -n "$dr" ] && [ -d "$dr/repos" ] && roots+=("$dr/repos")
     [ -d "$rr" ] && roots+=("$rr")
-    [ ${#roots[@]} -gt 0 ] || die "--all：未找到仓根（数据根 repos/ 与 ${rr}）"
+    [ ${#roots[@]} -gt 0 ] || { echo "usage: dia wt adopt --all（未找到仓根：${rr}）" >&2; exit 2; }
     local root sub
     for root in "${roots[@]}"; do
       for sub in "$root"/*; do
@@ -779,7 +779,7 @@ cmd_check() {
     rr="${DIA_WT_REPOS_ROOT:-$HOME/repos/leyan}"
     [ -n "$dr" ] && [ -d "$dr/repos" ] && roots+=("$dr/repos")
     [ -d "$rr" ] && roots+=("$rr")
-    [ ${#roots[@]} -gt 0 ] || die "--all：未找到仓根（数据根 repos/ 与 ${rr}）"
+    [ ${#roots[@]} -gt 0 ] || { echo "usage: dia wt adopt --all（未找到仓根：${rr}）" >&2; exit 2; }
     local root sub
     for root in "${roots[@]}"; do
       for sub in "$root"/*; do
@@ -1243,8 +1243,10 @@ PYGT
 }
 
 cmd_adopt() {
-  local repo="" mode="dry" template="" def="" json=0
+  local repo="" mode="dry" template="" def="" json=0 all=0
+  local -a orig=("$@")
   while [ $# -gt 0 ]; do case "$1" in
+    --all) all=1; shift ;;
     --apply) mode="apply"; shift ;;
     --check) mode="check"; shift ;;
     --revert) mode="revert"; shift ;;
@@ -1257,7 +1259,41 @@ cmd_adopt() {
     -*) die "未知参数：$1" ;;
     *) repo="$1"; shift ;;
   esac; done
-  [ -n "$repo" ] || die "用法: dia wt adopt <repo> [--apply|--check|--revert] [--template T] [--default-branch B] [--json]"
+  if [ "$all" = 1 ]; then
+    [ -z "$repo" ] || die "--all 不能与 <repo> 同时给（要么单个仓，要么全量）"
+    local -a roots=() repos=()
+    local dr rr
+    dr="$(dia_wt_data_root 2>/dev/null || true)"
+    rr="${DIA_WT_REPOS_ROOT:-$HOME/repos}"
+    [ -n "$dr" ] && [ -d "$dr/repos" ] && roots+=("$dr/repos")
+    [ -d "$rr" ] && roots+=("$rr")
+    [ ${#roots[@]} -gt 0 ] || { echo "usage: dia wt adopt --all（未找到仓根：${rr}）" >&2; exit 2; }
+    local root sub gd cd_
+    for root in "${roots[@]}"; do
+      while IFS= read -r -d '' gd; do
+        sub="$(dirname "$gd")"
+        case "$(basename "$sub")" in *-worktree--*) continue ;; esac
+        cd_="$(git -C "$sub" rev-parse --git-common-dir 2>/dev/null || true)"
+        # 统一物理路径（macOS /tmp → /private/tmp），否则等式比较会假失败
+        gd="$(cd "$sub" 2>/dev/null && cd "$gd" 2>/dev/null && pwd -P)"
+        cd_="$(cd "$sub" 2>/dev/null && cd "$cd_" 2>/dev/null && pwd -P)"
+        [ -n "$gd" ] && [ "$gd" = "$cd_" ] || continue   # 只处理主 checkout
+        repos+=("$sub")
+      done < <(find "$root" -maxdepth 3 -name .git -type d -print0 2>/dev/null)
+    done
+    [ ${#repos[@]} -gt 0 ] || { echo "usage: dia wt adopt --all（未匹配到任何主 checkout）" >&2; exit 2; }
+    local -a pass=()
+    local a
+    for a in "${orig[@]}"; do [ "$a" = "--all" ] && continue; pass+=("$a"); done
+    local okc=0 badc=0 r
+    for r in "${repos[@]}"; do
+      if cmd_adopt "$r" "${pass[@]}"; then okc=$((okc+1)); else badc=$((badc+1)); echo "FAIL $r" >&2; fi
+    done
+    [ "$json" = 1 ] && python3 -c 'import json,sys;print(json.dumps({"repos":int(sys.argv[1]),"ok":int(sys.argv[2]),"fail":int(sys.argv[3])},separators=(",",":")))' "${#repos[@]}" "$okc" "$badc"
+    [ "$badc" = 0 ] || return 1
+    return 0
+  fi
+  [ -n "$repo" ] || die "用法: dia wt adopt <repo>|--all [--apply|--check|--revert] [--template T] [--default-branch B] [--json]"
   [ -d "$repo" ] || die "目录不存在：$repo"
   git -C "$repo" rev-parse --git-dir >/dev/null 2>&1 || die "不是 git 仓库：$repo"
 
@@ -1343,6 +1379,11 @@ 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"
@@ -1351,11 +1392,12 @@ PY
 }
 
 cmd_doctor() {
-  local json=0 all=0 repos=()
+  local json=0 all=0 fix=0 repos=()
   while [ $# -gt 0 ]; do case "$1" in
     --json) json=1; shift ;;
     --all) all=1; shift ;;
-    --strict|--fix) shift ;;
+    --fix) fix=1; shift ;;
+    --strict) shift ;;
     -*) die "未知参数：$1" ;;
     *) repos+=("$1"); shift ;;
   esac; done
@@ -1378,6 +1420,19 @@ cmd_doctor() {
       def="$(python3 -c 'import json,sys;print(json.load(open(sys.argv[1])).get("defaultBranch") or "")' "$cfg" 2>/dev/null || true)"
     fi
     [ -n "$def" ] || def="$(wt_default_branch "$repo")"
+    # --fix：无损修复（重写三个守卫钩子 + hooksPath 绝对路径）。只对已 adopt 的仓生效。
+    if [ "$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"
+      mkdir -p "$hooksdir"
+      wt_write_hook "$hooksdir" pre-commit "$def" "$fixChain"
+      wt_write_hook "$hooksdir" pre-push "$def" "$fixChain"
+      wt_write_hook "$hooksdir" post-checkout "$def" "$fixChain"
+      [ "$prev" = "$hooksdir" ] || git -C "$repo" config --local core.hooksPath "$hooksdir"
+      prev="$hooksdir"
+      [ "$json" = 0 ] && echo "FIX $repo 钩子已重装（chain=$fixChain）"
+    fi
     local bad=0
     [ -f "$cfg" ] || { echo "FAIL D01 $repo 未 adopt"; bad=1; }
     case "$prev" in /*) ;; *) echo "FAIL D02 $repo hooksPath 非绝对（$prev）"; bad=1 ;; esac
@@ -1462,10 +1517,11 @@ dia wt —— worktree 目录形式选型 + 创建（唯一实现）
   dia wt status [repo-path]              # ★ 清理前必查：唯一工作副本 + 改动重叠（只读）
   dia wt check  [<repo>...] [--all] [--deep] [--quiet]
                                                # ★ 依赖体检（R20）：软链/逃逸/悬空；--all 扫全部仓
-  dia wt adopt  <repo> [--apply|--check|--revert] [--template T] [--default-branch B] [--json]
-                                               # 配置路径模板 + 守卫钩子（默认 dry-run）
+  dia wt adopt  <repo>|--all [--apply|--check|--revert] [--template T] [--default-branch B] [--json]
+                                               # 配置路径模板 + 守卫钩子（默认 dry-run；--all 扫仓根）
                                                # 守卫含推送前敏感扫描（DIA_WT_GUARD_SCAN=0 可临时关闭）
-  dia wt doctor [<repo>...] [--all] [--json]    # 巡检：配置/钩子/探针/主 checkout/worktree 卫生
+  dia wt doctor [<repo>...] [--all] [--json] [--fix]
+                                               # 巡检：配置/钩子/探针/主 checkout/worktree 卫生；--fix 重装守卫钩子
   dia wt gate   <repo> <feature>               # 提交 MR 前：check + doctor + 干净 + ahead>0
   dia wt route  <repo-path>              # ★ 开工前必查：走 MR 还是直推（R1.7，配置驱动）
   dia wt scope  <repo|worktree> [--feature <slug>] [--session <id>]   # ★ 产出作用域声明（设计 §4.5）

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

@@ -140,6 +140,35 @@ git -C "$TD/repo7-worktree--y" commit -qm feat-y >/dev/null 2>&1
 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 目录 ─────────────────────────
+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 --no-verify
+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)"
+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"
+DIA_WT_REPOS_ROOT="$TD/empty-root" DIA_WT_DATA_ROOT="$TD/dr3" 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 --no-verify
+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：成功 / 失败（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