agent-exec transport 0d48f8761e48861d4803b5559c74cff6/e65a082de776

agent-exec transport 00b39ef7c68383bc27c5a700f1f69f10/4f97c052dc11
Merge pull request 'Upgrade the lifecycle RDM pin to increment D' (#715 ) from fix/rdm-pin-increment-d into main
2026-10-23 05:21:17 +00:00 · 2026-10-23 04:58:50 +00:00 · 2026-10-23 04:05:09 +00:00 · 2026-10-23 03:50:56 +00:00 · 2026-10-23 03:08:41 +00:00 · 2026-10-23 02:55:06 +00:00
24 changed files with 905 additions and 76 deletions
@@ -178,6 +178,31 @@ jobs:
          tar -C /usr/local --strip-components=1 -xJf "$RUNNER_TEMP/node.tar.xz"
      - name: Install house-style Python packages
        run: python3 -m pip install --break-system-packages -i https://pypi.tuna.tsinghua.edu.cn/simple python-docx python-pptx openpyxl
+      - name: Provision the Gitea token file for facts verification
+        env:
+          T1: ${{ secrets.GITEA_TOKEN }}
+          T2: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -euo pipefail
+          echo "provision: GITEA_TOKEN length=${#T1}, GITHUB_TOKEN length=${#T2}"
+          if [ -n "$T1" ]; then
+            token="$T1"; source_name=GITEA_TOKEN
+          elif [ -n "$T2" ]; then
+            token="$T2"; source_name=GITHUB_TOKEN
+          else
+            echo "provision: GITEA_TOKEN/GITHUB_TOKEN both empty"
+            exit 1
+          fi
+          echo "provision: using ${source_name}"
+          mkdir -p "$HOME/.secrets"
+          printf 'HOME:\n- ACCESS_TOKEN=%s\n' "$token" > "$HOME/.secrets/gitea"
+          chmod 600 "$HOME/.secrets/gitea"
+          code="$(curl -fsS -m 10 -H "Authorization: token ${token}" https://gitea.naitangbaobao.cn/api/v1/user -o /dev/null -w '%{http_code}')" || true
+          if [ "$code" != "200" ]; then
+            echo "provision: /api/v1/user self-check failed with http code ${code:-none} (source ${source_name})"
+            exit 1
+          fi
+          echo "provision: /api/v1/user self-check ok (http 200)"
      - name: make test (boundaries, pins, libs, core, backend, frontend, ui, agent-command)
        run: make test
      - name: Build the single binary
@@ -0,0 +1,168 @@
+# feature/catalog-recall-eval-a3 任务卡
+
+任务主记录：PR #713 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/713；状态：已完成（合入前闭合）；owner：weichen
+
+## 基线与授权
+
+- 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= 6ced938a126981ee2a4fab671a2da94f49cb56c5
+- 工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-catalog-recall-eval-a3（worktree）；分支：feature/catalog-recall-eval-a3
+- 分支类型：standalone；root_target：main；immediate_target：main；accepting_requirements：false
+- 需求分流：verdict=NEW；selected_initiative=无；requirement_sha256=bf205afb1f04e503573784c93b52a991095554ed7314d9ac0f6c1996660a3211；triage_receipt=/tmp/triage-a3-1792716554.json；receipt_sha256=1a4ee8fe2133a52386520d35955d0fc600817f9a6bd94d40730eb8fce0904f44
+
+- 授权与交付终点：用户已批准启动 A3 能力目录召回评测（方案 Functional Follow-Ups 第三项：先建脱敏评测集并产出指标基线，"是否需要检索/调模型"的决策由基线数据支撑、另行决策）。范围内连续推进：设计、agent-per-unit 实施、验证、组合、Review、PR/CI/合入。未授权：检索实现、模型/提示词调整、A2 后续、A4、部署。
+- 设计决定（2026-10-22，host）：
+  1. 评测落在 agent-intent 既有机制上（cmd/intentctl eval + testdata/corpus.json 共用格式），不新建平行体系。
+  2. 数据集五类覆盖（否定/引用指令、多意图、错误槽位、过期确认、生成规则一致性），全部合成脱敏、由现有 fixture 规格派生；规模 ≥30 例。
+  3. 指标层只记录不设质量阈值：top-1 命中率、误执行数（命中≠预期动作）、澄清率、fallback 率、生成 vs 规则一致性（离线 fake generator）。
+  4. 基线报告（evaluation/BASELINE.md + metrics.json）随库提交，附复跑方式；质量结论由人/后续任务基于数据做出。
+- 交付模式：goal-first（目标、范围和交付终点一次确认；范围内连续推进）
+- 实施执行：agent-per-unit（配置：AGENT-EXECUTION.md）
+- 合入执行：agent（已授权交付范围内，Review 通过、冲突解决且当前 HEAD 的 CI 通过后合入）
+- 人工决策点：仅限目标/范围/验收变更、重大取舍、高后果操作或无法自动判定的业务验收
+- 当前阶段：需求拆解；当前增量：I1（待定义）
+- 流程依据：仓库根目录 policy/delivery.md（归档后仍按仓库根目录定位）
+
+## 目标与非目标
+
+**目标**：脱敏评测集（五类 ≥30 例）+ intentctl eval 指标输出（JSON 与表格）+ 基线报告；离线可复跑（fake generator，无真实模型调用）。
+
+**非目标**：检索/召回增强实现；提示词或模型调整；真实用户数据；控制台；A2 后续/A4。
+
+## Agent 实施收据
+
+路由与 fail-stop 规则见根目录 AGENT-EXECUTION.md 与 policy/delivery.md；每次尝试一行，原始日志留在源码外收据路径。
+
+| 单元 ID | 预期范围 | 配置摘要 | 角色 | 候选顺序 | attempt | CLI/模型 | 终态 | transport | fallback | 源码外收据路径 |
+|---|---|---|---|---|---|---|---|---|---|---|
+| 待定义 | — | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | — |
+
+## 关联方向与规划
+
+- 适用状态：待核对（无适用规划时说明原因）
+- 主记录路径/版本：待核对（路径按仓库根目录定位，归档后不变；只引用唯一正文）
+- 对应里程碑：待核对
+
+## 需求分析
+
+| ID | 描述 | 项目符合度及依据 | 优先级 | 验收条件 | 依赖 | 结论 |
+|---|---|---|---|---|---|---|
+| R1 | 待填写 | 待评估 | 待定 | 待定义 | 待确认 | 待评审 |
+
+## 方案与计划
+
+- 方案引用：待填写（含对象版本）
+- 实施计划引用：待填写（含增量与需求 ID）
+- 测试计划引用：待填写（含需求 ID 与验收条件）
+
+## 阶段记录
+
+| 阶段 | 对象版本 | 状态 | 决策/执行者 | 时间 | 依据 |
+|---|---|---|---|---|---|
+| 需求拆解 | 待定 | 待执行 | — | — | — |
+| 需求评估 | 待定 | 待执行 | — | — | — |
+| 需求表确认 | 待定 | 待执行 | — | — | — |
+| 方案设计 | 待定 | 待执行 | — | — | — |
+| 实施计划 | 待定 | 待执行 | — | — | — |
+| 实施与自检 | 待定 | 待执行 | — | — | — |
+| 正式测试与验收 | 待定 | 待执行 | — | — | — |
+| 代码 Review | 待定 | 待执行 | — | — | — |
+| 合入 | 待定 | 待执行 | — | — | — |
+| 合入核验与收口 | 待定 | 待执行 | — | — | — |
+
+## 探索试验与迭代
+
+| 增量/试验 | 假设 | 范围 | 判断和停止条件 | 授权/决策依据 | 结果 | 变更影响 | 需重审补测 |
+|---|---|---|---|---|---|---|---|
+| 待定义 | — | — | — | 待核对 | NOT_RUN | 待评估 | 待评估 |
+
+## 同步记录
+
+| 节点 | sync_base_sha | tested_head_sha | checked_at |
+|---|---|---|---|
+| 启动 | 6ced938a126981ee2a4fab671a2da94f49cb56c5 | 6ced938a126981ee2a4fab671a2da94f49cb56c5 | 2026-10-23T00:51:18Z |
+
+## 证据（Evidence）
+
+<!-- CMD="<命令>" make evidence 写入；手抄/转写输出视为无效证据（AGENTS.md 证据与验证门禁）。 -->
+| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
+|---|---|---|---|---|---|
+
+## 交付调度
+
+- 调度状态：未入队；调度记录：无
+- entry_id：无；attempt_id：无；窗口执行者：无
+- 固定候选：无（base/head、组件与相关配置引用实际尝试）
+- 调度依据：policy/delivery.md#合入调度
+- 固定后证据：源码外 RECEIPT；实际结果后按授权原样导入和闭合
+
+## 结果与验证
+
+- 结果：
+- 验证：<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项；逐条证据由 make evidence 写入上方证据表>
+- 影响与剩余项：
+
+## 规划进展与下一步
+
+- 本次推进/剩余：待核对（依据实际成果更新适用方案/规划）
+- 首选下一任务：待核对（无适用规划、已完成或受阻时如实说明，不虚构任务）
+- 推荐依据：待填写
+- 前置条件/待确认：待核对
+- 预期产物/验收条件：待定义
+- 重复任务核对：待核对（已有/在途任务、PR 与规划记录）
+- 启动授权：未授权（建议不自动启动新任务，仍须明确授权）
+
+## 合入与清理
+
+- 实施收据：a3-recall-eval-dataset（cursor attempt1，五类语料+指标+基线报告，intent 6aa4925，verify-a3 exit=0）；gitlink 集成（native d1f72aa/squad a5afe9c/backend 8dc91c1 含嵌套 intent/native 级联，a3git5/a3git10-run.json）。
+- 组合验证：全量 make test PASS（verify-a3-combo3.json exit=0）。
+- Review 记录：独立 CLI 评审单元 a3-independent-review（收据 /tmp/agent-stack-b2/reviewa3-run.json）；结论 APPROVE；报告 .task/reviews/2026-10-22-a3-recall-eval-independent-review.md；被审对象 35524f3d 组合 vs main
+- 冲突记录：NOT_RUN（最新目标同步、冲突处置、组合兼容核验及复审/补测）
+- CI 记录：NOT_RUN（当前 HEAD 完整 SHA、全部必需检查、运行链接、执行身份及 GATE 结果）
+- 合入记录：NOT_RUN（交付授权范围、PR、被核验 HEAD、合入 SHA、目标分支及内容核验）
+- 清理记录：NOT_RUN（授权依据、写者退出确认、worktree/分支/任务卡处置）
+
+<!-- Local receipt: SELF. Digests detect corruption; they do not authenticate a reviewer or CI. -->
+```json
+{
+  "summary_schema": 1,
+  "source": "SELF",
+  "timestamp": "2026-10-23T00:50:13.586423+00:00",
+  "command": "make precheck",
+  "exit_code": 0,
+  "cwd": "/home/weichen/projects/Agent-System-Dev",
+  "before_head": "6ced938a126981ee2a4fab671a2da94f49cb56c5",
+  "after_head": "6ced938a126981ee2a4fab671a2da94f49cb56c5",
+  "branch": "main",
+  "target_branch": "main",
+  "target_head": "6ced938a126981ee2a4fab671a2da94f49cb56c5",
+  "root_target": "main",
+  "immediate_target": "main",
+  "before_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "after_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "output_tail": [
+    "make[1]: Entering directory '/home/weichen/projects/Agent-System-Dev'",
+    "[repo]   branch=main head=6ced938a12",
+    "[remote] origin/main=6ced938a12 ahead=0 behind=0",
+    "[tree]   clean submodules_drift=0 uninit=0",
+    "[worktrees] linked=8",
+    "[recycle] merged un-recycled branches: feature/exec-recovery-diagnostics-a2 fix/rdm-pin-advance-latest-2",
+    "[initiatives] local cards (not authoritative): none",
+    "[hooks]   core.hooksPath=scripts/hooks（pre-commit/post-merge 实际接线）",
+    "[facts]   policy/facts.md 6 条事实均在有效期内",
+    "[required-reading] core/baseline.md, workflows/delivery.md §1, policy/delivery.md",
+    "[R0] 6ced938a12（完整：6ced938a126981ee2a4fab671a2da94f49cb56c5）",
+    "[worktree] before-sync: recursive component checks passed",
+    "[verdict] READY — 保留本次 precheck receipt 后建任务工作区：PRECHECK_RECEIPT=/tmp/task-precheck.json make task-start NAME=feature/your-branch",
+    "make[1]: Leaving directory '/home/weichen/projects/Agent-System-Dev'"
+  ],
+  "output_sha256": "9f6b7e8979503847e2ec5623a17ee9624cbafd5450149556482244a86abe9192",
+  "receipt_sha256": "1cf2c62aea8ef98b5d211cb94c053174407c70aeab274681c1b77db0a2878db9",
+  "receipt_path": "/home/weichen/.cache/agent-system-dev/evidence/1cf2c62aea8ef98b5d211cb94c053174407c70aeab274681c1b77db0a2878db9.json"
+}
+```
+
+## 闭合记录（合入前折叠）
+
+- 本卡在 PR #713（https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/713）合入前闭合并归档，随该 PR 一同合入。
+- 该 PR 的合并提交即本任务的落地记录。
+- 合入后无需回填，也无需单独的闭合 PR。
@@ -0,0 +1,167 @@
+# feature/exec-recovery-diagnostics-a2 任务卡
+
+任务主记录：PR #704 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/704；状态：已完成（合入前闭合）；owner：weichen
+
+## 基线与授权
+
+- 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= c92443280ef8e9ed29bf5bf5250df650c01b4478
+- 工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-exec-recovery-diagnostics-a2（worktree）；分支：feature/exec-recovery-diagnostics-a2
+- 分支类型：standalone；root_target：main；immediate_target：main；accepting_requirements：false
+- 需求分流：verdict=NEW；selected_initiative=无；requirement_sha256=34e72676959d0e970f1a3cb0e90ac2067dfb31f3c2e7a6650b5de9f3f77923c7；triage_receipt=/tmp/triage-a2-1792672248.json；receipt_sha256=7924fdbaeba41d98994c2e11bc96026d4db3cdbd0b28a9d1e381400eae9a6de4
+
+- 授权与交付终点：用户已批准启动 A2 执行与恢复诊断（方案 Functional Follow-Ups 第二项）。范围内连续推进：设计、agent-per-unit 实施、验证、组合、Review、PR/CI/合入。未授权：控制台/前端界面、A3/A4、部署。
+- 设计决定（2026-10-22，host）：
+  1. 只读诊断 API：GET /api/runs/{id}/diagnostics（owner/project 授权，复用既有 run 鉴权），响应聚合：状态、当前责任方与等待原因（running / waiting_hitl / confirmation_pending / recovery_hold(原因+created_at) / reconciling / failed+reason / completed）、最后稳定 checkpoint（如可得）、已知副作用与关联 operation 记录（复用 cmdbus 审计信封查询）、下一步动作建议（确认卡片 / 解除 hold / 可安全重试 / 需人工核对 / 无）。
+  2. 纯读聚合，不改任何执行/恢复行为；复用既有 store 方法（GetRun/RecoveryHold/ListInterruptedSubagentRuns/审计查询）与 U7b 的 operation 查询。
+  3. 不建控制台、不加写接口；批量列表走既有会话 run 列表。
+- 交付模式：goal-first（目标、范围和交付终点一次确认；范围内连续推进）
+- 实施执行：agent-per-unit（配置：AGENT-EXECUTION.md）
+- 合入执行：agent（已授权交付范围内，Review 通过、冲突解决且当前 HEAD 的 CI 通过后合入）
+- 人工决策点：仅限目标/范围/验收变更、重大取舍、高后果操作或无法自动判定的业务验收
+- 当前阶段：需求拆解；当前增量：I1（待定义）
+- 流程依据：仓库根目录 policy/delivery.md（归档后仍按仓库根目录定位）
+
+## 目标与非目标
+
+**目标**：单只读端点聚合"卡在哪里/谁在等/为何等/最后 checkpoint/已知副作用/下一步"，覆盖 HITL 等待、确认等待、恢复 hold（批二 needs-reconciliation）、失败原因等全部可诊断状态。
+
+**非目标**：控制台/UI；任何写操作或状态变更端点；A3/A4； squad sqlite 协作层的跨库聚合（只读后端 store 与审计）。
+
+## Agent 实施收据
+
+路由与 fail-stop 规则见根目录 AGENT-EXECUTION.md 与 policy/delivery.md；每次尝试一行，原始日志留在源码外收据路径。
+
+| 单元 ID | 预期范围 | 配置摘要 | 角色 | 候选顺序 | attempt | CLI/模型 | 终态 | transport | fallback | 源码外收据路径 |
+|---|---|---|---|---|---|---|---|---|---|---|
+| 待定义 | — | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | — |
+
+## 关联方向与规划
+
+- 适用状态：待核对（无适用规划时说明原因）
+- 主记录路径/版本：待核对（路径按仓库根目录定位，归档后不变；只引用唯一正文）
+- 对应里程碑：待核对
+
+## 需求分析
+
+| ID | 描述 | 项目符合度及依据 | 优先级 | 验收条件 | 依赖 | 结论 |
+|---|---|---|---|---|---|---|
+| R1 | 待填写 | 待评估 | 待定 | 待定义 | 待确认 | 待评审 |
+
+## 方案与计划
+
+- 方案引用：待填写（含对象版本）
+- 实施计划引用：待填写（含增量与需求 ID）
+- 测试计划引用：待填写（含需求 ID 与验收条件）
+
+## 阶段记录
+
+| 阶段 | 对象版本 | 状态 | 决策/执行者 | 时间 | 依据 |
+|---|---|---|---|---|---|
+| 需求拆解 | 待定 | 待执行 | — | — | — |
+| 需求评估 | 待定 | 待执行 | — | — | — |
+| 需求表确认 | 待定 | 待执行 | — | — | — |
+| 方案设计 | 待定 | 待执行 | — | — | — |
+| 实施计划 | 待定 | 待执行 | — | — | — |
+| 实施与自检 | 待定 | 待执行 | — | — | — |
+| 正式测试与验收 | 待定 | 待执行 | — | — | — |
+| 代码 Review | 待定 | 待执行 | — | — | — |
+| 合入 | 待定 | 待执行 | — | — | — |
+| 合入核验与收口 | 待定 | 待执行 | — | — | — |
+
+## 探索试验与迭代
+
+| 增量/试验 | 假设 | 范围 | 判断和停止条件 | 授权/决策依据 | 结果 | 变更影响 | 需重审补测 |
+|---|---|---|---|---|---|---|---|
+| 待定义 | — | — | — | 待核对 | NOT_RUN | 待评估 | 待评估 |
+
+## 同步记录
+
+| 节点 | sync_base_sha | tested_head_sha | checked_at |
+|---|---|---|---|
+| 启动 | c92443280ef8e9ed29bf5bf5250df650c01b4478 | c92443280ef8e9ed29bf5bf5250df650c01b4478 | 2026-10-22T12:37:28Z |
+
+## 证据（Evidence）
+
+<!-- CMD="<命令>" make evidence 写入；手抄/转写输出视为无效证据（AGENTS.md 证据与验证门禁）。 -->
+| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
+|---|---|---|---|---|---|
+
+## 交付调度
+
+- 调度状态：未入队；调度记录：无
+- entry_id：无；attempt_id：无；窗口执行者：无
+- 固定候选：无（base/head、组件与相关配置引用实际尝试）
+- 调度依据：policy/delivery.md#合入调度
+- 固定后证据：源码外 RECEIPT；实际结果后按授权原样导入和闭合
+
+## 结果与验证
+
+- 结果：
+- 验证：<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项；逐条证据由 make evidence 写入上方证据表>
+- 影响与剩余项：
+
+## 规划进展与下一步
+
+- 本次推进/剩余：待核对（依据实际成果更新适用方案/规划）
+- 首选下一任务：待核对（无适用规划、已完成或受阻时如实说明，不虚构任务）
+- 推荐依据：待填写
+- 前置条件/待确认：待核对
+- 预期产物/验收条件：待定义
+- 重复任务核对：待核对（已有/在途任务、PR 与规划记录）
+- 启动授权：未授权（建议不自动启动新任务，仍须明确授权）
+
+## 合入与清理
+
+- 实施收据：a2-diagnostics-api（pi attempt1，rundiag 聚合 + GET /api/runs/{id}/diagnostics，backend 06b0c9f，verify-a2b exit=0）；架构基线边登记（repair，a2arch-run.json）；backend pin 集成（a2git2-run.json，cursor 配额间歇故障重试一次后成功）。
+- 组合验证：全量 make test PASS（verify-a2-combo2.json exit=0，本轮 svc 既有 flake 未复现）。
+- Review 记录：独立 CLI 评审单元 a2-independent-review（第 2 次派发 success；首轮 pi-glm 终态记录不可解码，现场保留）；结论 APPROVE（0 blocker / 0 major）；报告 .task/reviews/2026-10-22-a2-diagnostics-independent-review.md；被审对象合并基线 vs main
+- 冲突记录：NOT_RUN（最新目标同步、冲突处置、组合兼容核验及复审/补测）
+- CI 记录：NOT_RUN（当前 HEAD 完整 SHA、全部必需检查、运行链接、执行身份及 GATE 结果）
+- 合入记录：NOT_RUN（交付授权范围、PR、被核验 HEAD、合入 SHA、目标分支及内容核验）
+- 清理记录：NOT_RUN（授权依据、写者退出确认、worktree/分支/任务卡处置）
+
+<!-- Local receipt: SELF. Digests detect corruption; they do not authenticate a reviewer or CI. -->
+```json
+{
+  "summary_schema": 1,
+  "source": "SELF",
+  "timestamp": "2026-10-22T12:30:58.698213+00:00",
+  "command": "make precheck",
+  "exit_code": 0,
+  "cwd": "/home/weichen/projects/Agent-System-Dev",
+  "before_head": "c92443280ef8e9ed29bf5bf5250df650c01b4478",
+  "after_head": "c92443280ef8e9ed29bf5bf5250df650c01b4478",
+  "branch": "fix/gitea-address-migration",
+  "target_branch": "main",
+  "target_head": "c92443280ef8e9ed29bf5bf5250df650c01b4478",
+  "root_target": "main",
+  "immediate_target": "main",
+  "before_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "after_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "output_tail": [
+    "make[1]: Entering directory '/home/weichen/projects/Agent-System-Dev'",
+    "[repo]   branch=fix/gitea-address-migration head=c92443280e",
+    "[remote] origin/main=c92443280e ahead=0 behind=0",
+    "[tree]   clean submodules_drift=0 uninit=0",
+    "[worktrees] linked=7",
+    "[recycle] merged un-recycled branches: fix/gitea-endpoint-facts",
+    "[initiatives] local cards (not authoritative): none",
+    "[hooks]   core.hooksPath=scripts/hooks（pre-commit/post-merge 实际接线）",
+    "[facts]   policy/facts.md 6 条事实均在有效期内",
+    "[required-reading] core/baseline.md, workflows/delivery.md §1, policy/delivery.md",
+    "[R0] c92443280e（完整：c92443280ef8e9ed29bf5bf5250df650c01b4478）",
+    "[worktree] before-sync: recursive component checks passed",
+    "[verdict] READY — 保留本次 precheck receipt 后建任务工作区：PRECHECK_RECEIPT=/tmp/task-precheck.json make task-start NAME=feature/your-branch",
+    "make[1]: Leaving directory '/home/weichen/projects/Agent-System-Dev'"
+  ],
+  "output_sha256": "d670ed210b367c72f877fb63bbbeb5b28411e95cb56fab782f27172fa481ed89",
+  "receipt_sha256": "2829e17065c329449fac8ef2690d50babf82015a1f546dcbfd3f27f67789dd0c",
+  "receipt_path": "/home/weichen/.cache/agent-system-dev/evidence/2829e17065c329449fac8ef2690d50babf82015a1f546dcbfd3f27f67789dd0c.json"
+}
+```
+
+## 闭合记录（合入前折叠）
+
+- 本卡在 PR #704（https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/704）合入前闭合并归档，随该 PR 一同合入。
+- 该 PR 的合并提交即本任务的落地记录。
+- 合入后无需回填，也无需单独的闭合 PR。
@@ -0,0 +1,100 @@
+# fix/rdm-pin-advance-latest-2 任务卡
+
+任务主记录：PR #711 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/711；状态：已完成（合入前闭合）；owner：weichen
+
+- 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= 6ced938a126981ee2a4fab671a2da94f49cb56c5
+- 工作区：/home/weichen/projects/Agent-System-Dev-wt-fix-rdm-pin-advance-latest-2（worktree）；分支：fix/rdm-pin-advance-latest-2
+- 分支类型：standalone；root_target：main；immediate_target：main；accepting_requirements：false
+- 需求分流：verdict=NEW；selected_initiative=无；requirement_sha256=93558e2670e0b23a79612fed5a161be7cb54de39485d98d72f67b6541ee38a8a；triage_receipt=/tmp/pin-f2-triage.json；receipt_sha256=00841f4dfa7626161dcab13a8a598b10fdd81dcf26679b8de6d8177beaf3d655
+
+- 授权与交付终点：<本次允许的动作与终点；未授权事项写明>
+- 交付模式：goal-first（目标、范围和交付终点一次确认；范围内连续推进）
+- 实施执行：agent-per-unit（配置：AGENT-EXECUTION.md）
+- 合入执行：agent（已授权交付范围内，Review 通过、冲突解决且当前 HEAD 的 CI 通过后合入）
+- 流程依据：仓库根目录 policy/delivery.md（归档后仍按仓库根目录定位）
+
+## 目标与非目标
+
+<预期结果、受影响入口/模块/契约；明确不做什么。>
+
+## Agent 实施收据
+
+路由与 fail-stop 规则见根目录 AGENT-EXECUTION.md 与 policy/delivery.md；每次尝试一行，原始日志留在源码外收据路径。
+
+| 单元 ID | 预期范围 | 配置摘要 | 角色 | 候选顺序 | attempt | CLI/模型 | 终态 | transport | fallback | 源码外收据路径 |
+|---|---|---|---|---|---|---|---|---|---|---|
+| 待定义 | — | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | — |
+
+## 同步记录
+
+| 节点 | sync_base_sha | tested_head_sha | checked_at |
+|---|---|---|---|
+| 启动 | 6ced938a126981ee2a4fab671a2da94f49cb56c5 | 6ced938a126981ee2a4fab671a2da94f49cb56c5 | 2026-10-23T00:50:42Z |
+
+## 证据（Evidence）
+
+<!-- CMD="<命令>" make evidence 写入；手抄/转写输出视为无效证据（AGENTS.md 证据与验证门禁）。 -->
+| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
+|---|---|---|---|---|---|
+
+## 结果与验证
+
+- 结果：
+- 验证：<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项；逐条证据由 make evidence 写入上方证据表>
+- 影响与剩余项：
+
+## 合入与清理
+
+- Review 记录：NOT_RUN（审阅智能体/平台身份、base/head、结论、问题闭合及重放依据）
+- 冲突记录：NOT_RUN（最新目标同步、冲突处置、组合兼容核验及复审/补测）
+- CI 记录：NOT_RUN（当前 HEAD 完整 SHA、全部必需检查、运行链接、执行身份及 GATE 结果）
+- 合入记录：NOT_RUN（交付授权范围、PR、被核验 HEAD、合入 SHA、目标分支及内容核验）
+- 清理记录：NOT_RUN（授权依据、写者退出确认、worktree/分支/任务卡处置）
+
+<!-- Local receipt: SELF. Digests detect corruption; they do not authenticate a reviewer or CI. -->
+```json
+{
+  "summary_schema": 1,
+  "source": "SELF",
+  "timestamp": "2026-10-23T00:49:47.450962+00:00",
+  "command": "make precheck",
+  "exit_code": 0,
+  "cwd": "/home/weichen/projects/Agent-System-Dev",
+  "before_head": "6ced938a126981ee2a4fab671a2da94f49cb56c5",
+  "after_head": "6ced938a126981ee2a4fab671a2da94f49cb56c5",
+  "branch": "main",
+  "target_branch": "main",
+  "target_head": "6ced938a126981ee2a4fab671a2da94f49cb56c5",
+  "root_target": "main",
+  "immediate_target": "main",
+  "before_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "after_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "output_tail": [
+    "make[1]: Entering directory '/home/weichen/projects/Agent-System-Dev'",
+    "[repo]   branch=main head=6ced938a12",
+    "[remote] origin/main=6ced938a12 ahead=0 behind=0",
+    "[tree]   clean submodules_drift=0 uninit=0",
+    "[worktrees] linked=7",
+    "[recycle] merged un-recycled branches: feature/exec-recovery-diagnostics-a2",
+    "[initiatives] local cards (not authoritative): none",
+    "[hooks]   core.hooksPath=scripts/hooks（pre-commit/post-merge 实际接线）",
+    "[facts]   policy/facts.md 6 条事实均在有效期内",
+    "[required-reading] core/baseline.md, workflows/delivery.md §1, policy/delivery.md",
+    "[R0] 6ced938a12（完整：6ced938a126981ee2a4fab671a2da94f49cb56c5）",
+    "[worktree] before-sync: recursive component checks passed",
+    "[verdict] READY — 保留本次 precheck receipt 后建任务工作区：PRECHECK_RECEIPT=/tmp/task-precheck.json make task-start NAME=feature/your-branch",
+    "make[1]: Leaving directory '/home/weichen/projects/Agent-System-Dev'"
+  ],
+  "output_sha256": "d78ae27fdc16acddac83815947924a7eb3d6031e421381f3d9313f29f3c0fc9e",
+  "receipt_sha256": "aa32f1bbde2a3b12b355fedc1e5ed3b91dea43758fb2a307e93f56fd2c5ae9af",
+  "receipt_path": "/home/weichen/.cache/agent-system-dev/evidence/aa32f1bbde2a3b12b355fedc1e5ed3b91dea43758fb2a307e93f56fd2c5ae9af.json"
+}
+```
+| 同步（记录前对象） | c3fbf85732788ba91d32c921783993a645580041 | c3fbf85732788ba91d32c921783993a645580041 | 2026-10-23T01:26:28Z |
+
+## 闭合记录（合入前折叠）
+
+- 本卡在 PR #711（https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/711）合入前闭合并归档，随该 PR 一同合入。
+- 该 PR 的合并提交即本任务的落地记录。
+- 合入后无需回填，也无需单独的闭合 PR。
+| 同步（记录前对象） | e62092a4479bbe101e74e91b39e03577ce0786ae | bbd80aa38874dbac8a3188b42bc6ed977a4fb379 | 2026-10-23T02:14:09Z |
@@ -0,0 +1,98 @@
+# fix/svc-test-port-governance-batch1 任务卡
+
+任务主记录：PR #702 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/702（merge cb36b59acc）；状态：已完成（回填）；owner：weichen
+
+- 权威仓：ssh://git@192.168.3.2:2222/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= 3d3474a731f9ef3ee1f41935e63bca3afb70db56
+- 工作区：/home/weichen/projects/Agent-System-Dev-wt-fix-svc-test-port-governance-batch1（worktree）；分支：fix/svc-test-port-governance-batch1
+- 分支类型：standalone；root_target：main；immediate_target：main；accepting_requirements：false
+- 需求分流：verdict=NEW；selected_initiative=无；requirement_sha256=1723e9e3e6bd50bedc041afba3533c35e8b663edb12472f29c067df860df799b；triage_receipt=/tmp/pa1-triage.json；receipt_sha256=71d236166f2a1de8cecd6eb93042ef5199a09e2c49318dbf8eb9d5b5582a99e5
+
+- 授权与交付终点：<本次允许的动作与终点；未授权事项写明>
+- 交付模式：goal-first（目标、范围和交付终点一次确认；范围内连续推进）
+- 实施执行：agent-per-unit（配置：AGENT-EXECUTION.md）
+- 合入执行：agent（已授权交付范围内，Review 通过、冲突解决且当前 HEAD 的 CI 通过后合入）
+- 流程依据：仓库根目录 policy/delivery.md（归档后仍按仓库根目录定位）
+
+## 目标与非目标
+
+<预期结果、受影响入口/模块/契约；明确不做什么。>
+
+## Agent 实施收据
+
+路由与 fail-stop 规则见根目录 AGENT-EXECUTION.md 与 policy/delivery.md；每次尝试一行，原始日志留在源码外收据路径。
+
+| 单元 ID | 预期范围 | 配置摘要 | 角色 | 候选顺序 | attempt | CLI/模型 | 终态 | transport | fallback | 源码外收据路径 |
+|---|---|---|---|---|---|---|---|---|---|---|
+| 待定义 | — | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | — |
+
+## 同步记录
+
+| 节点 | sync_base_sha | tested_head_sha | checked_at |
+|---|---|---|---|
+| 启动 | 3d3474a731f9ef3ee1f41935e63bca3afb70db56 | 3d3474a731f9ef3ee1f41935e63bca3afb70db56 | 2026-10-22T11:15:53Z |
+
+## 证据（Evidence）
+
+<!-- CMD="<命令>" make evidence 写入；手抄/转写输出视为无效证据（AGENTS.md 证据与验证门禁）。 -->
+| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
+|---|---|---|---|---|---|
+
+## 结果与验证
+
+- 结果：
+- 验证：<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项；逐条证据由 make evidence 写入上方证据表>
+- 影响与剩余项：
+
+## 合入与清理
+
+- Review 记录：NOT_RUN（审阅智能体/平台身份、base/head、结论、问题闭合及重放依据）
+- 冲突记录：NOT_RUN（最新目标同步、冲突处置、组合兼容核验及复审/补测）
+- CI 记录：NOT_RUN（当前 HEAD 完整 SHA、全部必需检查、运行链接、执行身份及 GATE 结果）
+- 合入记录：NOT_RUN（交付授权范围、PR、被核验 HEAD、合入 SHA、目标分支及内容核验）
+- 清理记录：NOT_RUN（授权依据、写者退出确认、worktree/分支/任务卡处置）
+
+<!-- Local receipt: SELF. Digests detect corruption; they do not authenticate a reviewer or CI. -->
+```json
+{
+  "summary_schema": 1,
+  "source": "SELF",
+  "timestamp": "2026-10-22T11:15:04.613824+00:00",
+  "command": "make precheck",
+  "exit_code": 0,
+  "cwd": "/home/weichen/projects/Agent-System-Dev",
+  "before_head": "3d3474a731f9ef3ee1f41935e63bca3afb70db56",
+  "after_head": "3d3474a731f9ef3ee1f41935e63bca3afb70db56",
+  "branch": "main",
+  "target_branch": "main",
+  "target_head": "3d3474a731f9ef3ee1f41935e63bca3afb70db56",
+  "root_target": "main",
+  "immediate_target": "main",
+  "before_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "after_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "output_tail": [
+    "make[1]: Entering directory '/home/weichen/projects/Agent-System-Dev'",
+    "[repo]   branch=main head=3d3474a731",
+    "[remote] origin/main=3d3474a731 ahead=0 behind=0",
+    "[tree]   clean submodules_drift=0 uninit=0",
+    "[worktrees] linked=6",
+    "[initiatives] local cards (not authoritative): none",
+    "[hooks]   core.hooksPath=scripts/hooks（pre-commit/post-merge 实际接线）",
+    "[facts]   policy/facts.md 6 条事实均在有效期内",
+    "[required-reading] core/baseline.md, workflows/delivery.md §1, policy/delivery.md",
+    "[R0] 3d3474a731（完整：3d3474a731f9ef3ee1f41935e63bca3afb70db56）",
+    "[worktree] before-sync: recursive component checks passed",
+    "[verdict] READY — 保留本次 precheck receipt 后建任务工作区：PRECHECK_RECEIPT=/tmp/task-precheck.json make task-start NAME=feature/your-branch",
+    "make[1]: Leaving directory '/home/weichen/projects/Agent-System-Dev'"
+  ],
+  "output_sha256": "87e58b98732700984715adb3f7a46aeacdc3749aacf51643f68a2ad9ede2451d",
+  "receipt_sha256": "72f14e2080b227c1fc4094a0a4f573b0dc12fb08ed30c86400265a610fb09b0d",
+  "receipt_path": "/home/weichen/.cache/agent-system-dev/evidence/72f14e2080b227c1fc4094a0a4f573b0dc12fb08ed30c86400265a610fb09b0d.json"
+}
+```
+| 同步（记录前对象） | c92443280ef8e9ed29bf5bf5250df650c01b4478 | c22b9fb34a3702191a9e5f6007f3538520db694b | 2026-10-22T13:10:38Z |
+
+## 闭合记录（card-autoclose 回填）
+
+- 依据：merge cb36b59accd0418c5ca952912d7c181b83038a4c（PR #702）已包含于 origin/main，分支成果已落盘；本段为合入后回填。
+- 合并主题：Merge pull request 'Use dynamic ports across the five test files that shared hardcoded bindings' (#702) from fix/svc-test-port-governance-batch1 into main
+- 归档：随闭合移入 .task/archive/；任务执行期的过程证据见原任务记录与 PR。
@@ -0,0 +1,99 @@
+# fix/svc-test-port-governance-deploy-txn 任务卡
+
+任务主记录：PR #705 https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/705（merge f673c2a15a）；状态：已完成（回填）；owner：weichen
+
+- 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= cb36b59accd0418c5ca952912d7c181b83038a4c
+- 工作区：/home/weichen/projects/Agent-System-Dev-wt-fix-svc-test-port-governance-deploy-txn（worktree）；分支：fix/svc-test-port-governance-deploy-txn
+- 分支类型：standalone；root_target：main；immediate_target：main；accepting_requirements：false
+- 需求分流：verdict=NEW；selected_initiative=无；requirement_sha256=37c57479990e37eb048ba81763fe402e1e679a822679f315a4be18e4b965c333；triage_receipt=/tmp/plast-triage.json；receipt_sha256=d403df8b2564bf4e1fe16fb12ecc48cf31c25be4f7472e6b27bce6da3ecd93e0
+
+- 授权与交付终点：<本次允许的动作与终点；未授权事项写明>
+- 交付模式：goal-first（目标、范围和交付终点一次确认；范围内连续推进）
+- 实施执行：agent-per-unit（配置：AGENT-EXECUTION.md）
+- 合入执行：agent（已授权交付范围内，Review 通过、冲突解决且当前 HEAD 的 CI 通过后合入）
+- 流程依据：仓库根目录 policy/delivery.md（归档后仍按仓库根目录定位）
+
+## 目标与非目标
+
+<预期结果、受影响入口/模块/契约；明确不做什么。>
+
+## Agent 实施收据
+
+路由与 fail-stop 规则见根目录 AGENT-EXECUTION.md 与 policy/delivery.md；每次尝试一行，原始日志留在源码外收据路径。
+
+| 单元 ID | 预期范围 | 配置摘要 | 角色 | 候选顺序 | attempt | CLI/模型 | 终态 | transport | fallback | 源码外收据路径 |
+|---|---|---|---|---|---|---|---|---|---|---|
+| 待定义 | — | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | NOT_RUN | — |
+
+## 同步记录
+
+| 节点 | sync_base_sha | tested_head_sha | checked_at |
+|---|---|---|---|
+| 启动 | cb36b59accd0418c5ca952912d7c181b83038a4c | cb36b59accd0418c5ca952912d7c181b83038a4c | 2026-10-22T13:39:45Z |
+
+## 证据（Evidence）
+
+<!-- CMD="<命令>" make evidence 写入；手抄/转写输出视为无效证据（AGENTS.md 证据与验证门禁）。 -->
+| 时间(UTC) | 命令 | 被测HEAD | exit | 来源 | sha256(16) |
+|---|---|---|---|---|---|
+
+## 结果与验证
+
+- 结果：
+- 验证：<结论摘要 PASS/FAIL/SKIP/NOT_RUN 逐项；逐条证据由 make evidence 写入上方证据表>
+- 影响与剩余项：
+
+## 合入与清理
+
+- Review 记录：NOT_RUN（审阅智能体/平台身份、base/head、结论、问题闭合及重放依据）
+- 冲突记录：NOT_RUN（最新目标同步、冲突处置、组合兼容核验及复审/补测）
+- CI 记录：NOT_RUN（当前 HEAD 完整 SHA、全部必需检查、运行链接、执行身份及 GATE 结果）
+- 合入记录：NOT_RUN（交付授权范围、PR、被核验 HEAD、合入 SHA、目标分支及内容核验）
+- 清理记录：NOT_RUN（授权依据、写者退出确认、worktree/分支/任务卡处置）
+
+<!-- Local receipt: SELF. Digests detect corruption; they do not authenticate a reviewer or CI. -->
+```json
+{
+  "summary_schema": 1,
+  "source": "SELF",
+  "timestamp": "2026-10-22T13:28:41.022157+00:00",
+  "command": "make precheck",
+  "exit_code": 0,
+  "cwd": "/home/weichen/projects/Agent-System-Dev",
+  "before_head": "cb36b59accd0418c5ca952912d7c181b83038a4c",
+  "after_head": "cb36b59accd0418c5ca952912d7c181b83038a4c",
+  "branch": "main",
+  "target_branch": "main",
+  "target_head": "cb36b59accd0418c5ca952912d7c181b83038a4c",
+  "root_target": "main",
+  "immediate_target": "main",
+  "before_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "after_tracked_diff_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  "output_tail": [
+    "make[1]: Entering directory '/home/weichen/projects/Agent-System-Dev'",
+    "[repo]   branch=main head=cb36b59acc",
+    "[remote] origin/main=cb36b59acc ahead=0 behind=0",
+    "[tree]   clean submodules_drift=0 uninit=0",
+    "[worktrees] linked=9",
+    "[recycle] merged un-recycled branches: fix/gitea-address-migration fix/svc-test-port-governance-batch1",
+    "[cards] 已合入未闭合任务卡:fix-svc-test-port-governance-batch1.md——make task-close 回填归档（主检出运行）",
+    "[initiatives] local cards (not authoritative): none",
+    "[hooks]   core.hooksPath=scripts/hooks（pre-commit/post-merge 实际接线）",
+    "[facts]   policy/facts.md 6 条事实均在有效期内",
+    "[required-reading] core/baseline.md, workflows/delivery.md §1, policy/delivery.md",
+    "[R0] cb36b59acc（完整：cb36b59accd0418c5ca952912d7c181b83038a4c）",
+    "[worktree] before-sync: recursive component checks passed",
+    "[verdict] READY — 保留本次 precheck receipt 后建任务工作区：PRECHECK_RECEIPT=/tmp/task-precheck.json make task-start NAME=feature/your-branch",
+    "make[1]: Leaving directory '/home/weichen/projects/Agent-System-Dev'"
+  ],
+  "output_sha256": "9f6260af81b0761dbb20afc5d145a9cb310303d426f655840a50f0879d81a49e",
+  "receipt_sha256": "eeb4f9ac9bdc0e30a0a7bbaa49176626bb8aca54a20f152b1771e1df8fd855d3",
+  "receipt_path": "/home/weichen/.cache/agent-system-dev/evidence/eeb4f9ac9bdc0e30a0a7bbaa49176626bb8aca54a20f152b1771e1df8fd855d3.json"
+}
+```
+
+## 闭合记录（card-autoclose 回填）
+
+- 依据：merge f673c2a15a50bef2c55f2c79a17d7601f82c8a07（PR #705）已包含于 origin/main，分支成果已落盘；本段为合入后回填。
+- 合并主题：Merge pull request 'Use a dynamic port in the last hardcoded test binding' (#705) from fix/svc-test-port-governance-deploy-txn into main
+- 归档：随闭合移入 .task/archive/；任务执行期的过程证据见原任务记录与 PR。
@@ -0,0 +1,44 @@
+# Independent Code Review — feature/exec-recovery-diagnostics-a2 (A2 run diagnostics)
+
+- Reviewer: independent CLI review session (`a2-independent-review` unit; fresh session, not the implementer)
+- Date: 2026-10-22
+- Review object: this checkout @ `d0b2bde9` (branch `feature/exec-recovery-diagnostics-a2`) versus authoritative main. No `origin/*` refs exist in this sandbox; task card R0 = `c9244328` (= `d0b2bde9~5`, the merged main tip `c92443280ef8e9ed29bf5bf5250df650c01b4478`), so `git diff c9244328...d0b2bde9` ≡ `git diff origin/main...HEAD`.
+- Dev-level scope: task card `.task/feature-exec-recovery-diagnostics-a2.md` (new), `modules/backend` gitlink `9ee752c3` → `06b0c9f1`, `policy/architecture-baseline.json` +3 edges. Verified: dev diff is exactly these 3 files; the three edges (`backend/rundiag backend/cmdbus`, `backend/rundiag backend/store`, `backend/server backend/rundiag`) sit in correct sorted positions and match the actual import graph (see N5).
+- Backend scope: `git -C modules/backend diff 9ee752c..06b0c9f` — 7 files, +1418/−0: `internal/rundiag/rundiag.go` (488), `internal/rundiag/rundiag_test.go` (440), `internal/server/run_diagnostics.go` (32), `internal/server/run_diagnostics_test.go` (226), `internal/server/server.go` (+2), `internal/store/run_diagnostics.go` (110), `internal/store/run_diagnostics_test.go` (120).
+- Method: read-only review of the full diff plus the neighboring run-read/cancel routes, the pre-existing store methods the aggregator reuses, and the cmdbus pending-confirm write path. No code changed; the only write is this report.
+
+## Findings
+
+### Blockers
+
+None.
+
+### Major
+
+None.
+
+### Minor
+
+- **MI1 — Evidence-driven wait states outrank terminal run statuses; a completed/failed run can be reported as `waiting_hitl`.** In the responsibility switch the HITL arm `case ev.Run.Status == core.RunWaitingHITL || card != nil || decision != nil` (`modules/backend/internal/rundiag/rundiag.go:252`) is evaluated before `failed` (:281) and `completed` (:296). A run that ended while a decision card scoped only by owner+conversation (human_decisions has no run column; attributed by the time-window inference at :432-448) remained `pending`, or with a leftover unresolved run-scoped HITL card, yields `state=waiting_hitl`, `role=human`, `next_step.action=confirm_card` for a terminal run. This is exactly the fixed precedence the task card approved and the documented bounded attribution (`rundiag.go:15-19`), and `run.status` stays visible in the report — but a follow-up that suppresses evidence-driven wait mapping (or adds a note) when the run is terminal would remove the confusing "confirm card" advice on finished runs. Not blocking: matches the approved design; purely advisory output.
+- **MI2 — Silent truncation of side-effect evidence contradicts the package's own honesty contract.** `sideEffects` stops appending at `maxSideEffects = 50` with no note (`rundiag.go:342-366`, cap at :57), and `Gather` fetches only the 200 newest audit envelopes (`maxAuditScan`, `rundiag.go:175` → `ListAudits` orders `time DESC`, `internal/store/audit.go:147-152`), so a busy conversation can under-report a run's operations without any indication. Every other evidence gap in the package adds a note (even "absence of records is not proof of no effect", :313-315); a "side effects truncated" note would complete that contract. Diagnostic-only impact; recorded evidence is still correct as far as it goes.
+- **MI3 — Precedence is tested only at the top of the chain.** Of the ordered arms at `rundiag.go:224-310`, only "unreleased recovery hold wins over everything" (`rundiag_test.go:81-89`) exercises interleaved evidence; combinations such as released-hold+interrupted+open-HITL-card (→ `reconciling`) or decision+pending-confirm (→ `waiting_hitl`) are untested and rest on the switch order alone. Low risk because the order is literal and table-covered per state; suggesting coverage only because precedence is the stated spec center of this unit.
+
+### Notes
+
+- **N1 — Per-state derivation and precedence are complete and match the task-card contract.** All eight states are derivable: `unknown` fail-closed on unreadable hold (:226-233), `recovery_hold` on an open hold row (:234-240), `reconciling` for released-hold+`RunInterrupted` residue (:241-251, predicate at :402-403), `waiting_hitl` from status/run-scoped card/time-windowed decision (:252-273), `confirmation_pending` from an owner-scoped pending confirm parsed out of the dispatch payload (:274-280, :453-471), `failed` with retry-safety gated on unknown receipts (:281-295), `completed` (:296-298), `running` for running+pending (:299-303), `unknown` default for unmapped statuses (cancelled; interrupted without hold; :304-310). Precedence order is exactly `recovery_hold > reconciling > waiting_hitl > confirmation_pending > failed > completed > running > unknown`, with the fail-closed `HoldUnknown` degradation deliberately first.
+- **N2 — Security: scoping is byte-for-byte the neighboring run-read pattern; no cross-owner leakage path exists.** The handler resolves the run via `s.st.GetRun(s.owner(r), r.PathValue("id"))` (`internal/server/run_diagnostics.go:25`) — identical to `getRun` (`server.go:1592`) — where `owner` comes only from the auth context (`auth.go:220-225`), `GetRun` filters `WHERE id=? AND owner=?` with cross-tenant = `ErrNotFound` (`messages.go:307-316`), and `writeStoreErr` maps it to 404 indistinguishable from a missing run (`server.go:2617-2620`). Every follow-on query is keyed on the already-authorized run's own fields, never on request parameters: `GetRecoveryHold(run.ID)` (`recovery_holds.go:36`), `ActiveHITLCardsByRun(run.ID)` (`recovery.go:156`), `PendingHumanDecisionsByConversation(run.Owner, run.ConversationID)` with empty-owner defense (`store/run_diagnostics.go:51-53`), `ListOwnerPendingConfirms(run.Owner)` (:88-90), `LastRunCheckpoint(run.ConversationID, run.ID)` (:28-30), `ListAudits(run.Owner, run.ConversationID)` (`audit.go:134-140`). The `pending_confirms` payload is parsed only to extract command/owner/conversation identity; the raw payload is never echoed (`rundiag.go:453-471`).
+- **N3 — Read-only holds end to end.** All six store entry points the aggregator uses are SELECT-only (verified by reading each); `Build` is a pure function; the handler path contains no store write and the mux registers only the GET pattern (`server.go:396`). The author's `TestRunDiagnosticsIsReadOnly` additionally asserts the run row and hold are unchanged after a GET and that POST/PUT/DELETE/PATCH are not served (`run_diagnostics_test.go:153-193`).
+- **N4 — No route-registration conflicts.** `GET /api/runs/{id}/diagnostics` differs from `GET /api/runs/{id}` (:394) and `POST /api/runs/{id}/cancel` (:393) by a literal extra segment / method; ServeMux precedence is specificity-based, single registration, no duplicate pattern anywhere in the diff.
+- **N5 — Architecture-baseline edges are correct and validated.** `internal/rundiag` imports exactly `cmdbus` and `store` within the backend module (`rundiag.go:21-24`); the `agent-command` import is intentionally untracked — the baseline records only intra-repo package edges and has no deps-module edges anywhere (same precedent as `backend/cmdbus`, which also imports agent-command without an edge). `backend/server backend/rundiag` matches the handler import. Sorted positions are correct (`route < rundiag`; `ratelimit < rundiag < runmgr`), and `scripts/lint-architecture.go` compares this file against the collected import graph, so the edges are machine-checked in CI.
+- **N6 — Go tests NOT_RUN in this review workspace (environment, not code).** The backend's nested dependency checkouts (`modules/backend/deps/agent-command`, `deps/agent-system-core`, …) are empty gitlinks here and no `.git/modules` gitdirs exist; `git submodule init/update` is forbidden for this unit and network is off, so `go build ./internal/rundiag/ …` fails at module setup (`agent-command@v0.0.0 (replaced by ./deps/agent-command): reading deps/agent-command/go.mod: no such file or directory`), before any code compiles. Fallbacks applied: every changed file was fully line-read; all `core.Run*`/phase/event symbols referenced are used by pre-existing compiling backend code; `cmdbus.Request` carries `ID/Owner/ConversationID` (`cmdbus.go:163-177`) and the pending-confirm payload is the marshaled dispatch request (`cmdbus.go:522-523`), so `waitingConfirm`'s parsing is sound; the `events` table has `run_id`/`seq`/`ts`/`type` in both dialects (`migrate.go:47,71`) and the checkpoint query is served by `idx_events_conv(conversation_id, seq)`. Author-recorded receipts were reviewed and are internally consistent with the task card: `/tmp/agent-stack-b2/verify-a2b.json` (`go build ./... && go test -count=1 ./internal/server/... ./internal/rundiag/... ./internal/store/... && go vet …`, exit=0, `ok agent-system-backend/internal/{server,rundiag,store}`) and `/tmp/agent-stack-b2/verify-a2-combo2.json` (`make test`, exit=0) — author-claimed (SELF), not independently re-executed in this session.
+- **N7 — Attribution boundaries are documented and bounded; one sibling-run overlap remains.** Audit envelopes carry no runId today (host bus doesn't write it), so `belongsToRun` (`rundiag.go:371-383`) attributes by conversation + "not issued before run start". Concurrent sibling runs (subagents) in the same conversation have overlapping windows, so until the bus persists `runId`, an envelope from a sibling can appear in both runs' `side_effects`. The limitation is stated in the package doc (:17-19) and the report surfaces `operation_id`/`command_id` so a human can disambiguate; when the bus starts writing `env.RunID` the strict branch (:372-373) takes over automatically. Acceptable for a diagnostic surface.
+- **N8 — "No records ≠ no effect" honesty contract is consistently enforced** (unrecorded checkpoints → null + note at :311-312, tested at `rundiag_test.go:280-302`; empty side effects → note :313-315; unreadable hold → fail-closed unknown that can never yield `safe_retry` :226-233, tested :304-339). Only the truncation gap of MI2 falls short of it.
+
+## Lens summaries
+
+1. **Spec** — pass. State derivation and precedence are complete and per-state correct (N1); the JSON contract (snake_case, `last_checkpoint` explicit null, `side_effects` always an array, `next_step` never reason-less) is pinned by `TestReportJSONContract` (`rundiag_test.go:341-389`). Dev-level artifacts (task card, 3 baseline edges, gitlink `06b0c9f`) are exactly as claimed.
+2. **Security** — pass. Auth-context-only owner, tenant-filtered run fetch, 404 on cross-owner/missing (tested `run_diagnostics_test.go:62-97`), all downstream reads anchored on the authorized run, strictly read-only (N2/N3), no payload echo, empty-owner fail-closed store helpers.
+3. **Regressions** — pass. The diff is additive: 7 new files plus a 2-line route registration; no execution/recovery/runmgr path touched, no existing signature changed, no route conflicts (N4), no migration/schema/index change.
+4. **Tests** — pass with minor gaps. Per-state table of 12 cases covering all eight states plus degradation (`rundiag_test.go:78-225`), scoping at both server and store layers including cross-owner/cross-conversation/empty-owner (`run_diagnostics_test.go:62-97`, `store/run_diagnostics_test.go:13-120`), unknown-degradation at three levels (unreadable source, unmapped status, fail-closed hold; `run_diagnostics_test.go:195-226`), read-only and write-method rejection (`:153-193`), pre-run evidence exclusion (`rundiag_test.go:391-406`). Gaps: MI3 (chain precedence below the top arm), MI2 (truncation without note). Focused tests could not be re-run here (N6); author receipts for `go test ./internal/rundiag/... ./internal/server/... ./internal/store/...` and full `make test` are on record and uncontradicted.
+
+REVIEW VERDICT: APPROVE
@@ -0,0 +1,48 @@
+# 独立代码 Review：feature/catalog-recall-eval-a3（A3 召回评测集与指标基线）
+
+- Reviewer：独立 CLI session（未参与本单元实施；本报告为唯一产出变更）
+- 日期：2026-10-22
+- Review 对象：`git diff 6ced938a...HEAD`（6ced938a = R0 / origin-main 合入点，与任务卡 R0 一致）
+- 组件重点：`deps/agent-intent` 765a7e7..6aa4925（单提交 "Add the sanitized recall evaluation set and metrics baseline"，9 文件 +1354/-18）；Dev 层 4 个 gitlink 前移 + 任务卡
+- 方法：全量 diff 阅读被测文件；对语料/指标做独立的脚本化交叉复核（只读）；静态追踪指标口径、生成回放路径与 JSON 兼容性；检查嵌套 pin 级联与越界改动。聚焦测试见下文 NOT_RUN 说明。
+
+## 复核结论摘要（独立重算，非转抄）
+
+- 语料 `intent/testdata/recall_corpus.json`：**37 例 / 46 轮**，五类齐全且恰好五类（expired_confirmation 7/14、generation_consistency 8/8、multi_intent 7/7、negation_reference 8/10、wrong_slot 7/7），`record_only: true`；`expect_top` 轮次 31、生成用例 8 —— 与 BASELINE.md 表头逐项一致。
+- 语料 digest `sha256:53d26cfc…bc2885` 与 `evaluation/metrics.json` 的 `corpus_digest`、BASELINE.md 摘要三方一致（本机 `sha256sum` 独立重算）。
+- `evaluation/metrics.json` 全部 10 组计数与比率逐项等于 BASELINE.md 表；比率均可用 `round(n/d*10000)/10000` 独立复算（如 30/31→0.9677、13/46→0.2826、6/46→0.1304、5/14→0.3571、5/8→0.625、5/7→0.7143、3/7→0.4286）。
+- 总体口径自洽：top1_expected 3+3+7+11+7=31、hits 30（唯一 miss 即 multi_greet_then_report 的 1 次误执行）、mis_exec 5+1=6、clarify 0+0+5+5+3=13、fallback 2+0+0+3+0=5+1(gen)=6、pass 3+6+7+7+8=27。
+- 嵌套 pin 级联一致：native@d1f72aa→intent@6aa4925；squad@a5afe9c→intent@6aa4925+native@d1f72aa；backend@8dc91c1→intent@6aa4925+native@d1f72aa+squad@a5afe9c（各自 `git ls-tree` 核对）；三个组件 bump 均为 pins-only（`git diff --stat` 仅 gitlink），superrepo 层 diff 仅 4 gitlink + 任务卡，无评测范围外源码改动。
+
+## Findings
+
+### Blocker
+
+无。
+
+### Major
+
+无。
+
+### Minor
+
+1. **基线数值漂移不设防（结构性盲区，刻意取舍但建议记录）** — `intent/recall_eval_test.go:119-162`（`checkSummaryJSON`/`checkMetricsBounds`）：结构测试对已提交基线只校验 schema、digest、类别计数与「内部一致」（rate==ratio(n,d)），不把基线里的 hits/rates 与本次新鲜运行比对。若识别器行为改变而语料不变（digest 不变、计数不变），过期的基线数值不会被任何测试发现；BASELINE.md「重跑」一节只靠流程约束。这与「只记录不设阈值」的定位一致（比对数值即变相质量断言），属可辩护的设计取舍，但建议在 BASELINE.md 明示「引擎变更不会触发基线失效告警，须人工重跑」。
+2. **missing-slots 断言用 `fmt.Sprint` 比较切片** — `intent/corpus.go:194-222`（`matchTurn` 中 `fmt.Sprint(got) != fmt.Sprint(turn.ExpectMissingSlots)`）：`[]string(nil)` 与 `[]string{}` 都打印 `[]`，且比较对元素顺序敏感。当前引擎输出顺序确定、语料只断言单元素缺失（`["run_id"]`/`["topic"]`），不构成现实缺陷；但后续一旦断言多缺失槽位，顺序耦合会变成脆弱测试。建议改为逐元素显式比较。
+3. **任务卡内部记录不一致（文档级）** — `.task/feature-catalog-recall-eval-a3.md`：「Agent 实施收据」表全部为 NOT_RUN/待定义 占位，而「合入与清理」节已记载 `a3-recall-eval-dataset（…intent 6aa4925，verify-a3 exit=0）`、嵌套级联与 `组合验证：全量 make test PASS`；且「证据（Evidence）」表为空，组合验证结论以带外文件名（verify-a3-combo3.json 等）引用。按仓库门禁「命令输出只经 make evidence 写入任务卡」，合入前应把收据表与证据表补齐一致。不阻塞本次代码评审结论。
+
+### Notes
+
+1. **指标口径正确** — `intent/evalmetrics.go:129-141`（`misExecuted`）：仅当实际 `matched`/`expectation_hit` 出 Top 且与期望动作不同时计数；期望 matched/expectation_hit 而未写 expect_top 的轮次不约束动作，不计；期望 fallback/ambiguous/guard_hit 却执行了即计。与 BASELINE.md「指标口径」一节逐条一致。分母：top1=写了 expect_top 的轮次（`evalmetrics.go:103-108`）、clarify/fallback=全部轮次（`evalmetrics.go:111-118,153-159`）、gen_agree=写了 generator_commands 的用例数（用例级，`evalmetrics.go:120-124`）。`ratio` 定点 4 位舍入保证 JSON 字节稳定（`evalmetrics.go:161-166`）。
+2. **汇总对账安全** — `intent/evalmetrics.go:61-92`（`SummarizeCorpus`）：cases/results 按下标一一对应（越界即 break，契约已在注释声明），空 category 归入 `uncategorized`（旧语料兼容），类别名升序、overall 独立。`intent/eval_test.go:78-89` 在既有 `corpus.json`（无 category）上跑了一遍汇总，兼容路径有覆盖。
+3. **生成回放路径离线、确定性、fail-closed** — `intent/corpus.go:156-186`：`replayGenerator.Generate` 忽略输入与目录、只回放脚本命令（无模型/无网络），并深拷贝 slots 防串染；`compareGeneratorPath` 复用识别器兜底同款 `generateCommands`（`intent/recognizer.go:352-385`：start 的 ActionRef 必须从同一快照唯一解析、命令种类受限、槽位键集校验，任一不过即无 Top）。三个「故意不一致」用例路径成立：`run_id=43` 槽位分歧（sameSlots 判否）、`taskrun.restart` 错动作（handler 反查到 restart spec）、`ghost.flow` 幻觉动作（resolveActionRef 失败→校验拒绝→无 Top）。两边都无 Top 也算一致，`gen_chitchat_agree` 覆盖该分支。Nil expectation 传入 `NewRecognizer` 在该路径安全（`generateCommands` 不触达链式预期）。
+4. **eval 向后兼容** — `cmd/intentctl/main.go:254,260-262,365-390`：`-metrics-out` 缺省为空不写文件（唯一新增写文件入口，显式 opt-in；`-` 走 stdout）；旧语料（无 `record_only`）失败语义不变，且 `TestEvalRecordOnlyWritesMetrics`（`cmd/intentctl/main_test.go:79-112`）同时断言 record_only 不失败+strict 语料仍失败。输出新增的指标表为追加行，不破坏既有两行指标输出。`evalCorpus` 结构仅增可选字段（`omitempty`），旧 JSON 解析不受影响。
+5. **结构测试无质量阈值伪装** — `intent/recall_eval_test.go:64-117`：只断言 ≥30 例、恰好五类、每例可执行（无「识别错误」）、generation_consistency 用例形态、JSON 合法且计数与语料一致、基线 digest 与语料一致；`checkMetricsBounds`（:164-186）只做数学界校验（n≤d、rate==ratio）。无任何质量数值断言，符合「基线只记录」边界。测试与 CLI 同源建快照（:36-62，语料自声明 builtin_specs/guard/protected + 同款 specs 目录），指标同源声明成立。
+6. **语料确为夹具派生、五类行为真实可辨** — 全部期望 top ∈ {demo.run.status_query/restart/cancel, demo.greet.hello, demo.misc.deploy, report.generate, guard.config_change}，动作 id ∈ base.json 的 handler 集 + 刻意的幻觉 id；生成动作 id 与 `intent/testdata/specs/base.json` 的 handler/action 一一对应。各类用例确实 exercising 所标行为：语义否定（「不要/别/不用/先不要」无 excludes 声明，理想为 fallback）对照 `excludes_any` 声明否定（「配置」）；multi_intent 覆盖 动作+动作→ambiguous、寒暄+动作→动作、动作+guard→guard_hit；wrong_slot 覆盖 缺失/中文数字/双候选/越字符集/仅符号/空主题；expired_confirmation 覆盖 链式命中、过期后裸回答回落、过期后完整重述走 matched、宿主声明 pending 再过期（`pending_expectation`+`expectation_expired` 组合，语义为「先声明后作废」，实现顺序 `intent/corpus.go:120-126` 与用例意图一致）；wrong_slot 用单轮 `turns` 包装以使用本轮新增的 `expect_slots`/`expect_missing_slots` 能力。
+7. **安全边界** — 语料全合成（无真实用户数据/PII）；`record_only: true` 无阈值断言；生成路径为确定性回放，无网络/模型调用；未发现任何对外部输入的写路径（除显式 `-metrics-out`）。
+8. **聚焦测试 NOT_RUN（环境受限，非变更缺陷）** — `cd deps/agent-intent && GOWORK=off go test ./intent/...` 无法编译：`agent-intent` 的嵌套 gitlink（deps/error-code-system@a3ee67b、logging-system@49b5d8b 等）在本工作区未物化，且目标提交不在任何本地对象库（`git cat-file` fatal）、无网络。按诚实出口如实标注 NOT_RUN；作为补偿，本文「复核结论摘要」的计数/digest/比率均为独立脚本重算，与基线三方对账一致。任务卡所记 `make test PASS（verify-a3-combo3.json exit=0）`本评审无法复现，标注 [未经证实]（属 host 组合门禁范畴，不阻塞代码评审）。
+
+## Verdict
+
+未发现 blocker/major 级代码缺陷；三项 minor（基线漂移不设防的取舍说明、fmt.Sprint 切片比较的脆弱写法、任务卡收据/证据表未同步）均不阻塞合入，可在本次或后续增量处理。语料、指标、基线、CLI 兼容、结构守卫与嵌套 pin 级联均通过独立静态复核与数值对账。
+
+REVIEW VERDICT: APPROVE
@@ -51,6 +51,8 @@
 "backend/rag backend/settings",
 "backend/rag backend/store",
 "backend/route backend/intentgate",
+"backend/rundiag backend/cmdbus",
+"backend/rundiag backend/store",
 "backend/runmgr backend/bus",
 "backend/runmgr backend/cardsvc",
 "backend/runmgr backend/docgen",
@@ -85,6 +87,7 @@
 "backend/server backend/prompts",
 "backend/server backend/ratelimit",
 "backend/server backend/route",
+"backend/server backend/rundiag",
 "backend/server backend/runmgr",
 "backend/server backend/settings",
 "backend/server backend/store",
@@ -15,9 +15,9 @@

 | ID | 事实 | 验证命令 | last_verified | TTL(天) |
 |---|---|---|---|---|
-| F1 | Gitea Web/API 可达：https://git-home.u1680832.nyat.app:30319（1.27.3） | `curl -fsS -m 10 https://git-home.u1680832.nyat.app:30319/api/v1/version` | 2026-10-14 | 30 |
-| F2 | API token 存在且可用（值在 ~/.secrets/gitea，HOME/IMC 两段各一组 `- ACCESS_TOKEN=…`，本条取 HOME 段；不入仓不回显，不进子进程 argv） | `bash scripts/facts-verify.sh api-token https://git-home.u1680832.nyat.app:30319/api/v1/user` | 2026-10-14 | 30 |
-| F3 | Git over SSH 可达：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/&lt;Repo&gt;.git（key ~/.ssh/home_gitea） | `GIT_SSH_COMMAND="ssh -i ~/.ssh/home_gitea -o BatchMode=yes" git ls-remote ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Development-Guidelines.git HEAD` | 2026-10-14 | 30 |
+| F1 | Gitea Web/API 可达（2026-10-22 迁移后新权威）：https://gitea.naitangbaobao.cn（443，1.27.3）；旧地址 git-home…:30319 过渡期仍可达，随时退役 | `curl -fsS -m 10 https://gitea.naitangbaobao.cn/api/v1/version` | 2026-10-22 | 30 |
+| F2 | API token 存在且可用（值在 ~/.secrets/gitea，HOME/IMC 两段各一组 `- ACCESS_TOKEN=…`，本条取 HOME 段；不入仓不回显，不进子进程 argv）；在新权威 URL 实测 200 | `bash scripts/facts-verify.sh api-token https://gitea.naitangbaobao.cn/api/v1/user` | 2026-10-22 | 30 |
+| F3 | Git over SSH 可达（新地址，端口 52222）：ssh://git@gitea.naitangbaobao.cn:52222/weichen/&lt;Repo&gt;.git（key ~/.ssh/home_gitea）；旧地址 git-ssh…:31411 迁移期 push 间歇失败，不再作为权威 | `GIT_SSH_COMMAND="ssh -i ~/.ssh/home_gitea -p 52222 -o BatchMode=yes" git ls-remote ssh://git@gitea.naitangbaobao.cn:52222/weichen/Development-Guidelines.git HEAD` | 2026-10-22 | 30 |
 | F4 | 旧端点 git-panel.u1680832.nyat.app:30319 TCP 可连通但 TLS 握手失败（仅 TLS 层握手错误判 PASS） | `bash scripts/facts-verify.sh tls-handshake-fails git-panel.u1680832.nyat.app 30319` | 2026-10-14 | 180 |
 | F5 | 基座 users 表存有姓名（name 列，CreateAccount/ListUsersAdmin 读写；EXT-19 目录自 P3 起向授权管理读面下发） | `cd modules/backend && go test ./internal/app/ -run TestInprocHostSearchAccounts -count=1` | 2026-10-14 | 180 |
 | F6 | 基座账号无停用位（users 表无 disabled；EXT-19 Valid 恒为存在性）——停用机制未实现，不得当已具备 | `cd modules/backend && ! grep -rn -e disabled -e Disabled internal/store/auth.go pkg/extension/extension.go` | 2026-10-14 | 180 |
@@ -60,8 +60,9 @@ done

 # ── 1. 构建 ─────────────────────────────────────────────
 # RDM 源码经 git archive 从本地对象导出（不建 worktree、不触远端——Gitea 抖动时
-# submodule 克隆会挂死）；pins/* 从 RDM 主检出的已物化 submodule 快照拷贝（cp 排除
-# .git，39MB 级），构建输入由此固定为 RDM origin/main + 其 gitlink 指向的本地内容。
+# submodule 克隆会挂死）；pins/* 从 RDM 主检出的已物化 submodule 快照拷贝（tar 排除
+# .git；含 go.mod replace 引用的全部 pin，不仅 backend），构建输入由此固定为
+# RDM origin/main + 其 gitlink 指向的本地内容。
 log "build RDM binary (archive origin/main + snapshot pins from local checkout)"
 RDM_WT="$OUT/rdm-src"
 RDM_SHA=$(git -C "$RDM_REPO" rev-parse origin/main) || die "no origin/main in RDM repo"
@@ -75,7 +76,9 @@ PIN_SHA_WANT=$(git -C "$RDM_REPO" ls-tree "$RDM_SHA" pins/agent-system-backend |
 [ "$PIN_SHA_MAIN" = "$PIN_SHA_WANT" ] \
  || die "RDM checkout pins/backend ($PIN_SHA_MAIN) != origin/main pin ($PIN_SHA_WANT); git -C $RDM_REPO submodule update first"
 mkdir -p "$RDM_WT/pins"
-tar -C "$RDM_REPO/pins" --exclude=.git -cf - agent-system-backend | tar -C "$RDM_WT/pins" -xf -
+# 快照全部 pins/*（go.mod replace 依赖 agent-document-renderer、agent-squad 等，
+# 仅拷贝 backend 会导致 RDM 构建缺 pin）；--exclude=.git 保持不变。
+tar -C "$RDM_REPO/pins" --exclude=.git -cf - . | tar -C "$RDM_WT/pins" -xf -
 cleanup() {
  [ -n "${API_PID:-}" ] && { kill "$API_PID" 2>/dev/null || true; wait "$API_PID" 2>/dev/null || true; }
  # Preview runs directly as one owned Vite process. Verify its command before
@@ -108,6 +111,10 @@ $RDM -bootstrap-admin "$OWNER" >/dev/null
 # ── 凭据契约（2026-10-13 起）：--password 建号被 RECOVERY_CONTRACT_REPLACED 拒绝，
 # 改走 login-key 激活：serve 首启创建基座存储 → identity ensure → 基座首位账号
 # bootstrap-admin（激活 Key 交付）→ API redeem → 设密（PASSWORD2 为登录密码）。
+# auth on 时 serve / identity ensure 要求启动期超管环境；合成测试凭据（非真实秘密）。
+: "${SUPER_ADMIN_OWNER:=e2e-superadmin}"
+: "${SUPER_ADMIN_PASSWORD:=E2eSuperAdmin#FixedTest9kQm2NpR}"
+export SUPER_ADMIN_OWNER SUPER_ADMIN_PASSWORD
 log "serve RDM at $API_BASE (auth on；首启创建基座存储)"
 start_serve() {
  "$OUT/agent-system-rdm" -data "$DATA" -addr "127.0.0.1:$API_PORT" -auth on \
@@ -4,7 +4,7 @@
 # 用法：make facts-verify [ARGS=--update]   （--update：把 PASS 项 last_verified 刷为当天并写回）
 # 表内验证命令约定不含竖线；含 "\|" 转义时按字面还原后执行。
 # 登记表引用的探针子命令（单独运行时在 stderr 说明判定，不输出凭据）：
-#   api-token URL                 URL 须逐字等于登记端点 https://git-home.u1680832.nyat.app:30319/api/v1/user，
+#   api-token URL                 URL 须逐字等于登记端点 https://gitea.naitangbaobao.cn/api/v1/user，
 #                                 校验通过后才进程内读 ~/.secrets/gitea HOME 段 ACCESS_TOKEN 并 GET（不跟随重定向）；
 #                                 0=接受 3=缺失 4=格式不符 5=请求失败/被拒/重定向 6=非登记端点
 #   tls-handshake-fails HOST PORT 仅当 TCP 已连通且 TLS 层握手报错时 0；
@@ -20,7 +20,7 @@ import sys, urllib.request
 sys.path.insert(0, sys.argv[1])
 import task_triage

-ENDPOINT = "https://git-home.u1680832.nyat.app:30319/api/v1/user"
+ENDPOINT = "https://gitea.naitangbaobao.cn/api/v1/user"
 if sys.argv[2] != ENDPOINT:
    print("api-token: URL 不是 policy/facts.md F2 登记端点，拒绝发送凭据", file=sys.stderr)
    sys.exit(6)
@@ -1,12 +1,13 @@
 # RDM 制品钉扎。三行都是 40 位 hex。升级走 PR，不在 CI 里执行候选文件。
-# sha：生命周期套件的目标版本（6-pin 布局）。
+# sha：生命周期套件的目标版本（6-pin 布局）；本次钉扎为增量 D（W11 DHF U2-U6）交付版本，
+#   即 RDM main 上增量 D 合并 a3c721ae4 之后的 tip。
 # prev_sha：来回部署身份稳定性测试的起点。选取受两条硬约束——与 sha 的 pins 布局一致，
 #   且两者之间无跨 schema 迁移（scripts/svc.sh 的 schema 兼容闸会在停旧服务前拒绝不兼容切换）。
-#   取上一个已钉住的 sha：同为 6-pin 布局，与 sha 之间无 schema/迁移变更，在 RDM 主线上与 sha
-#   相距 59 个提交，往返部署覆盖的版本跨度大于仅隔一次合并的相邻提交。
+#   取上一个已钉住的 sha：同为 6-pin 布局，与 sha 之间无 store schema 迁移（W11/W8 变更走事件
+#   重放而非 schema），往返部署覆盖的正是上一交付版本到增量 D 的真实升级路径。
 # legacy_sha：承载「无身份」语义（没有 version --json），必然早于 6-pin 布局。
 # 三者的 pins 布局可能不同；CI 按每个 pin 自身的 gitlink 清单物化并逐个断言，不要求布局统一。
 # 来回切换的 schema 兼容不由钉扎保证，由真实生命周期套件检验。
-sha=ee8c2cdf4a0ed88cdc4037f4b43501e1eebc4c5b
-prev_sha=bc8db886606e88201e7f7210a1357d22dc84124b
+sha=9176476bf35d23e7886bf6ccb7c3a688067d357f
+prev_sha=15fdd479a9fe60a59559139305b8d760931cec93
 legacy_sha=72bb1fec79d64c2af5e49416640712320816c3b4
@@ -256,7 +256,7 @@ class FactsVerifyTests(unittest.TestCase):
        self.assert_status(result.stdout, "F2", "PASS")
        requests = self.stub_events("http")
        self.assertEqual(len(requests), 1, requests)
-        self.assertEqual(requests[0]["url"], "https://git-home.u1680832.nyat.app:30319/api/v1/user")
+        self.assertEqual(requests[0]["url"], "https://gitea.naitangbaobao.cn/api/v1/user")
        self.assertEqual(requests[0]["authorization"], "token " + HOME_TOKEN)
        self.assertEqual(self.dates(), {"F2": self.today, "F8": self.today, "F9": OLD_DATE})
        self.assertTrue(receipt.exists(), result.stderr)
@@ -285,7 +285,7 @@ class FactsVerifyTests(unittest.TestCase):
                self.assert_status(result.stdout, "F2", "FAIL")
                self.assertEqual(self.stub_events("http"), [], "no request without a valid HOME token")
                self.assertEqual(self.dates()["F2"], OLD_DATE)
-                direct = self.run_script("api-token", "https://git-home.u1680832.nyat.app:30319/api/v1/user")
+                direct = self.run_script("api-token", "https://gitea.naitangbaobao.cn/api/v1/user")
                self.assertNotEqual(direct.returncode, 0)
                self.assertIn("ACCESS_TOKEN", direct.stderr)
                self.assert_no_secrets(result.stdout, result.stderr, direct.stdout, direct.stderr,
@@ -299,7 +299,7 @@ class FactsVerifyTests(unittest.TestCase):
                result = self.run_script("--update", http=http)
                self.assert_status(result.stdout, "F2", "FAIL")
                self.assertEqual(self.dates(), {"F2": OLD_DATE, "F8": self.today, "F9": OLD_DATE})
-                direct = self.run_script("api-token", "https://git-home.u1680832.nyat.app:30319/api/v1/user",
+                direct = self.run_script("api-token", "https://gitea.naitangbaobao.cn/api/v1/user",
                                         http=http)
                self.assertNotEqual(direct.returncode, 0)
                self.assertNotIn("Authorization", direct.stderr)
@@ -307,17 +307,18 @@ class FactsVerifyTests(unittest.TestCase):

    def test_f2_rejects_unregistered_destination_before_reading_credentials(self):
        bad_urls = [
-            "http://git-home.u1680832.nyat.app:30319/api/v1/user",
+            "http://gitea.naitangbaobao.cn/api/v1/user",
            "https://evil.invalid/api/v1/user",
-            "https://git-home.u1680832.nyat.app:30320/api/v1/user",
-            "https://git-home.u1680832.nyat.app/api/v1/user",
-            "https://user:pw@git-home.u1680832.nyat.app:30319/api/v1/user",
-            "https://git-home.u1680832.nyat.app:30319@evil.invalid/api/v1/user",
-            "https://git-home.u1680832.nyat.app:30319/api/v1/user#frag",
-            "https://git-home.u1680832.nyat.app:30319/api/v1/user?next=https://evil.invalid",
-            "https://git-home.u1680832.nyat.app:30319/api/v1/users",
-            "https://git-home.u1680832.nyat.app:30319/api/v1/user/../admin",
-            "https://git-home.u1680832.nyat.app:30319/api/v1/user ",
+            "https://git-home.u1680832.nyat.app:30319/api/v1/user",
+            "https://gitea.naitangbaobao.cn:30320/api/v1/user",
+            "https://gitea.naitangbaobao.cn:443/api/v1/user",
+            "https://user:pw@gitea.naitangbaobao.cn/api/v1/user",
+            "https://gitea.naitangbaobao.cn@evil.invalid/api/v1/user",
+            "https://gitea.naitangbaobao.cn/api/v1/user#frag",
+            "https://gitea.naitangbaobao.cn/api/v1/user?next=https://evil.invalid",
+            "https://gitea.naitangbaobao.cn/api/v1/users",
+            "https://gitea.naitangbaobao.cn/api/v1/user/../admin",
+            "https://gitea.naitangbaobao.cn/api/v1/user ",
        ]
        for secrets_present in (True, False):
            if not secrets_present:
@@ -337,12 +338,12 @@ class FactsVerifyTests(unittest.TestCase):
        for code in ("301", "302", "303", "307", "308"):
            with self.subTest(code):
                self.stub_log.unlink(missing_ok=True)
-                direct = self.run_script("api-token", "https://git-home.u1680832.nyat.app:30319/api/v1/user",
+                direct = self.run_script("api-token", "https://gitea.naitangbaobao.cn/api/v1/user",
                                         http=code)
                self.assertEqual(direct.returncode, 5, direct.stderr)
                requests = self.stub_events("http")
                self.assertEqual([r["url"] for r in requests],
-                                 ["https://git-home.u1680832.nyat.app:30319/api/v1/user"], "no follow-up request")
+                                 ["https://gitea.naitangbaobao.cn/api/v1/user"], "no follow-up request")
                self.assertNotIn("redirect-target", direct.stdout + direct.stderr)
                self.assert_no_secrets(direct.stdout, direct.stderr)

@@ -2,9 +2,13 @@
 import importlib.util
 import json
 import os
+import sys
 import unittest
 from pathlib import Path

+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from _port_alloc import free_test_port  # noqa: E402
+
 SOURCE = Path(__file__).resolve().parents[1]
 _spec = importlib.util.spec_from_file_location(
    "tsi", SOURCE / "tests" / "test_svc_identity.py")
@@ -46,7 +50,7 @@ class DeployTxnTests(unittest.TestCase):
        new.chmod(0o755)
        fx.stub.write_text(old.read_text())
        fx.stub.chmod(0o755)
-        fx.seed_agent("txn", 9471)
+        fx.seed_agent("txn", free_test_port())
        fx.start_ok("txn")
        pid = fx.pid_of("txn")
        script = fx.root / "scripts" / "svc.sh"
@@ -68,7 +72,7 @@ class DeployTxnTests(unittest.TestCase):

    def test_forward_only_requires_confirm_and_backup(self):
        fx = self.fx
-        fx.seed_agent("fwd", 9472)
+        fx.seed_agent("fwd", free_test_port())
        fx.start_ok("fwd")
        iid = json.loads((fx.runtime("fwd") / "manifest.json").read_text())["instance_id"]
        base = fx.stub.read_text()
@@ -12,10 +12,14 @@ import os
 import shutil
 import sqlite3
 import subprocess
+import sys
 import tempfile
 import unittest
 from pathlib import Path

+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from _port_alloc import free_test_port  # noqa: E402
+
 SOURCE = Path(__file__).resolve().parents[1]
 SVC_SCRIPT = SOURCE / "scripts" / "svc.sh"

@@ -56,7 +60,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    # ---- T1 连续裸启停：同一身份与数据根 ----

    def test_T1_bare_restart_stable_identity(self):
-        self.seed_agent("id1", 9431)
+        port = free_test_port()
+        self.seed_agent("id1", port)
        self.start_ok("id1")
        m1 = self.manifest("id1")
        self.assertIsNotNone(m1, "start 应完成 manifest 迁移")
@@ -79,7 +84,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    # ---- T2 只改端口：数据/DB 锚点不动 ----

    def test_T2_port_change_keeps_anchors(self):
-        self.seed_agent("id2", 9432)
+        port = free_test_port()
+        self.seed_agent("id2", port)
        self.start_ok("id2")
        anchor = self.manifest("id2")["identity"]
        self.svc("id2", "stop")
@@ -95,7 +101,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    # ---- T3 数据根漂移：拒绝启动，不新建空系统 ----

    def test_T3_data_drift_rejected(self):
-        self.seed_agent("id3", 9434)
+        port = free_test_port()
+        self.seed_agent("id3", port)
        self.start_ok("id3")
        self.svc("id3", "stop")
        other = self.root / "other-data"
@@ -111,7 +118,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    # ---- T4 迁移窗口与损坏：不猜测 ----

    def test_T4a_leftover_new_file_ignored(self):
-        self.seed_agent("id4", 9435)
+        port = free_test_port()
+        self.seed_agent("id4", port)
        # 模拟 rename 前崩溃残留：.new 半成品必须被忽略/覆盖，不影响迁移结果
        (self.runtime("id4") / "manifest.json.new").write_text("{ truncated")
        self.start_ok("id4")
@@ -121,7 +129,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        self.svc("id4", "stop")

    def test_T4b_corrupt_manifest_blocks(self):
-        self.seed_agent("id5", 9436)
+        port = free_test_port()
+        self.seed_agent("id5", port)
        self.start_ok("id5")
        self.svc("id5", "stop")
        (self.runtime("id5") / "manifest.json").write_text("{ not json")
@@ -133,7 +142,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    # ---- T5 marker/manifest 事件：缺一即阻塞，不自动新建 ----

    def test_T5a_missing_marker_blocks(self):
-        self.seed_agent("id6", 9437)
+        port = free_test_port()
+        self.seed_agent("id6", port)
        self.start_ok("id6")
        self.svc("id6", "stop")
        m = self.manifest("id6")
@@ -145,7 +155,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        self.assertFalse(self.running("id6"))

    def test_T5b_foreign_marker_blocks(self):
-        self.seed_agent("id7", 9438)
+        port = free_test_port()
+        self.seed_agent("id7", port)
        self.start_ok("id7")
        self.svc("id7", "stop")
        m = self.manifest("id7")
@@ -158,7 +169,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        self.assertFalse(self.running("id7"))

    def test_T5c_lost_manifest_blocks_not_rebuild(self):
-        self.seed_agent("id8", 9439)
+        port = free_test_port()
+        self.seed_agent("id8", port)
        self.start_ok("id8")
        m0 = self.manifest("id8")
        iid = m0["instance_id"]
@@ -178,7 +190,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    # ---- T6 cwd 无关：从别处调用身份不变 ----

    def test_T6_cwd_independent_identity(self):
-        self.seed_agent("id9", 9440)
+        port = free_test_port()
+        self.seed_agent("id9", port)
        self.start_ok("id9")
        iid = self.manifest("id9")["instance_id"]
        self.svc("id9", "stop")
@@ -320,7 +333,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        旧服务继续运行、旧制品与登记不变（2026-10-12 rdm1/rdmcand 反例：停服→
        覆盖→启动即拒，只剩混合状态）。"""
        remote, old_sha, new_sha = self.make_rdm_repo(self.noid_stub())
-        self.seed_agent("rdx", 9451)
+        port = free_test_port()
+        self.seed_agent("rdx", port)
        self.start_ok("rdx")               # 已建立身份，有能力制品在运行
        self.set_kv("rdx", "source", "rdm@%s" % old_sha)
        pid = self.pid_of("rdx")
@@ -344,7 +358,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        """已建立身份后删行：update 在停服前拒绝，不自动补行，旧进程保持。
        补行只走 adopt --confirm。"""
        old_sha, new_sha = self.make_src_repo()
-        self.seed_agent("rowx", 9452)
+        port = free_test_port()
+        self.seed_agent("rowx", port)
        self.start_ok("rowx")
        self.set_kv("rowx", "source", "dev@%s" % old_sha)
        db = Path(self.manifest("rowx")["identity"]["data_root"]) / "agent-system.db"
@@ -364,7 +379,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    def test_U1_bare_start_missing_row_is_event_init_recovers(self):
        """普通启动只验证不补行：DB 行缺失 → 拒绝且不建空行（缺行即事件）；
        显式 init 补齐后恢复。"""
-        self.seed_agent("rowm", 9453)
+        port = free_test_port()
+        self.seed_agent("rowm", port)
        self.start_ok("rowm")
        iid = self.manifest("rowm")["instance_id"]
        self.svc("rowm", "stop")
@@ -416,7 +432,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
    def test_U1_adopt_identityless_artifact_reports_pending(self):
        """已装制品无 identity 能力：adopt 的 ensure 静默跳过，marker 留在 pending——
        输出必须如实报 pending，不得宣称 db_marker=established。"""
-        self.seed_agent("adx", 9454)
+        port = free_test_port()
+        self.seed_agent("adx", port)
        self.start_ok("adx")
        iid = self.manifest("adx")["instance_id"]
        self.svc("adx", "stop")
@@ -437,7 +454,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        cand.chmod(0o755)
        remote, old_sha, _ = self._make_track_repo(cand, "agent-system")
        self.git_ok(self.root, "clone", str(remote), str(self.root / "srccache"))
-        self.seed_agent("scx", 9455)
+        port = free_test_port()
+        self.seed_agent("scx", port)
        self.start_ok("scx")
        self.set_kv("scx", "source", "dev@%s" % old_sha)
        mpath = self.runtime("scx") / "manifest.json"
@@ -459,7 +477,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        self.svc("scx", "stop")

    def test_I3_start_ensures_sqlite_identity(self):
-        self.seed_agent("idb1", 9441)
+        port = free_test_port()
+        self.seed_agent("idb1", port)
        self.start_ok("idb1")
        iid = self.manifest("idb1")["instance_id"]
        rows = self.db_identity_row("idb1")
@@ -470,7 +489,8 @@ class IdentityTests(tsr.SvcAutoRecoverTests):
        self.svc("idb1", "stop")

    def test_I3_wrong_db_identity_blocks_start(self):
-        self.seed_agent("idb2", 9442)
+        port = free_test_port()
+        self.seed_agent("idb2", port)
        self.start_ok("idb2")
        iid = self.manifest("idb2")["instance_id"]
        self.svc("idb2", "stop")
@@ -1,9 +1,14 @@
 """生命周期隔离：调用方的 AGENT_SYSTEM_* 不得进入 serve，serve.env 为 0600。"""
 import importlib.util
 import json
+import os
 import shutil
+import sys
 from pathlib import Path

+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from _port_alloc import free_test_port  # noqa: E402
+
 SOURCE = Path(__file__).resolve().parents[1]
 _spec = importlib.util.spec_from_file_location("tsr", SOURCE / "tests" / "test_svc_recover.py")
 tsr = importlib.util.module_from_spec(_spec)
@@ -17,7 +22,8 @@ class LifecycleIsolationTests(tsr.SvcAutoRecoverTests):
                     self.root / "scripts" / "svc_manifest.py")

    def test_caller_identity_env_does_not_reach_serve(self):
-        self.seed_agent("iso", 9461)
+        port = free_test_port()
+        self.seed_agent("iso", port)
        env = dict(self.env)
        env["AGENT_SYSTEM_DSN"] = "postgres://leak-user:leak-pass@127.0.0.1/leak"
        env["AGENT_SYSTEM_DATA"] = "/tmp/leak-data"
@@ -38,7 +44,8 @@ class LifecycleIsolationTests(tsr.SvcAutoRecoverTests):
        self.svc("iso", "stop")

    def test_two_bare_restarts_keep_identity(self):
-        self.seed_agent("iso2", 9462)
+        port = free_test_port()
+        self.seed_agent("iso2", port)
        self.svc("iso2", "start")
        manifest = json.loads((self.runtime("iso2") / "manifest.json").read_text())
        iid = manifest["instance_id"]
@@ -11,12 +11,17 @@
 夹具复用 tests/test_svc_recover.py（桩不需要运行——台账操作是 SQLite 直读直写）。
 """
 import importlib.util
+import os
 import shutil
 import sqlite3
 import subprocess
+import sys
 import unittest
 from pathlib import Path

+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from _port_alloc import free_test_port  # noqa: E402
+
 SOURCE = Path(__file__).resolve().parents[1]

 _spec = importlib.util.spec_from_file_location("tsr", SOURCE / "tests" / "test_svc_recover.py")
@@ -64,21 +69,24 @@ class RdmAdminTests(tsr.SvcAutoRecoverTests):
    # ---- show ----

    def test_show_prints_ledger_and_flags_unknown_owner(self):
-        self.seed_agent("ra1", 9461)
+        port = free_test_port()
+        self.seed_agent("ra1", port)
        self.seed_dbs("ra1", ledger_owner="u7-admin", base_owners=("weichen",))
        out = self.svc("ra1", "rdm-admin", "show").stdout
        self.assertIn("RDM 域管理员 u7-admin", out)
        self.assertIn("不在基座用户表", out)  # u7-admin 不在 users → 残留警示

    def test_show_known_owner_no_warning(self):
-        self.seed_agent("ra2", 9462)
+        port = free_test_port()
+        self.seed_agent("ra2", port)
        self.seed_dbs("ra2", ledger_owner="weichen")
        out = self.svc("ra2", "rdm-admin").stdout  # 缺省子命令 = show
        self.assertIn("RDM 域管理员 weichen", out)
        self.assertNotIn("不在基座用户表", out)

    def test_show_empty_ledger_hint(self):
-        self.seed_agent("ra3", 9463)
+        port = free_test_port()
+        self.seed_agent("ra3", port)
        self.seed_dbs("ra3", ledger_owner=None)
        out = self.svc("ra3", "rdm-admin").stdout
        self.assertIn("台账为空", out)
@@ -87,7 +95,8 @@ class RdmAdminTests(tsr.SvcAutoRecoverTests):
    # ---- transfer ----

    def test_transfer_rewrites_single_row_with_provenance(self):
-        self.seed_agent("ra4", 9464)
+        port = free_test_port()
+        self.seed_agent("ra4", port)
        self.seed_dbs("ra4", ledger_owner="u7-admin")
        out = self.svc("ra4", "rdm-admin", "transfer", "--to", "weichen").stdout
        self.assertIn("受信部署通道", out)
@@ -97,13 +106,15 @@ class RdmAdminTests(tsr.SvcAutoRecoverTests):
        self.assertEqual(added_by, "svc:rdm-admin:u7-admin")  # 前任可追溯

    def test_transfer_idempotent_when_already_owner(self):
-        self.seed_agent("ra5", 9465)
+        port = free_test_port()
+        self.seed_agent("ra5", port)
        self.seed_dbs("ra5", ledger_owner="weichen")
        out = self.svc("ra5", "rdm-admin", "transfer", "--to", "weichen").stdout
        self.assertIn("已是 weichen", out)

    def test_transfer_rejects_owner_missing_from_base_users(self):
-        self.seed_agent("ra6", 9466)
+        port = free_test_port()
+        self.seed_agent("ra6", port)
        self.seed_dbs("ra6", ledger_owner="weichen")
        proc = self.svc("ra6", "rdm-admin", "transfer", "--to", "nobody", check=False)
        self.assertEqual(proc.returncode, 1, proc.stdout)
@@ -111,7 +122,8 @@ class RdmAdminTests(tsr.SvcAutoRecoverTests):
        self.assertEqual(self.ledger_owner("ra6")[0], "weichen")  # 台账未被动

    def test_transfer_rejects_empty_ledger(self):
-        self.seed_agent("ra7", 9467)
+        port = free_test_port()
+        self.seed_agent("ra7", port)
        self.seed_dbs("ra7", ledger_owner=None)
        proc = self.svc("ra7", "rdm-admin", "transfer", "--to", "weichen", check=False)
        self.assertEqual(proc.returncode, 1, proc.stdout)
@@ -120,7 +132,8 @@ class RdmAdminTests(tsr.SvcAutoRecoverTests):
    # ---- 绑定合同与用法 ----

    def test_refuses_when_rdm_db_missing(self):
-        self.seed_agent("ra8", 9468)
+        port = free_test_port()
+        self.seed_agent("ra8", port)
        self.seed_dbs("ra8")  # 建基座库后删 rdm.db
        (self.runtime("ra8") / "data" / "rdm.db").unlink()
        proc = self.svc("ra8", "rdm-admin", check=False)
@@ -128,13 +141,15 @@ class RdmAdminTests(tsr.SvcAutoRecoverTests):
        self.assertIn("无 RDM 域库", proc.stdout)

    def test_refuses_when_base_db_missing(self):
-        self.seed_agent("ra9", 9469)
+        port = free_test_port()
+        self.seed_agent("ra9", port)
        proc = self.svc("ra9", "rdm-admin", check=False)
        self.assertEqual(proc.returncode, 1, proc.stdout)
        self.assertIn("既有库不存在", proc.stdout)

    def test_unknown_subcommand_usage_exit_2(self):
-        self.seed_agent("raa", 9470)
+        port = free_test_port()
+        self.seed_agent("raa", port)
        proc = self.svc("raa", "rdm-admin", "bogus", check=False)
        self.assertEqual(proc.returncode, 2, proc.stdout)
        self.assertIn("用法", proc.stdout)
@@ -142,14 +157,16 @@ class RdmAdminTests(tsr.SvcAutoRecoverTests):
    # ---- status 巡检行 ----

    def test_status_lists_rdm_admin_row_and_warning(self):
-        self.seed_agent("rab", 9471)
+        port = free_test_port()
+        self.seed_agent("rab", port)
        self.seed_dbs("rab", ledger_owner="u7-admin", base_owners=("weichen",))
        out = self.svc("rab", "status").stdout
        self.assertIn("RDM 域管理员 u7-admin", out)
        self.assertIn("不在基座用户表", out)

    def test_status_silent_without_rdm_db(self):
-        self.seed_agent("rac", 9472)
+        port = free_test_port()
+        self.seed_agent("rac", port)
        self.seed_dbs("rac")
        (self.runtime("rac") / "data" / "rdm.db").unlink()
        out = self.svc("rac", "status").stdout
@@ -12,9 +12,13 @@ import os
 import shlex
 import shutil
 import subprocess
+import sys
 import unittest
 from pathlib import Path

+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from _port_alloc import free_test_port  # noqa: E402
+
 SOURCE = Path(__file__).resolve().parents[1]

 _spec = importlib.util.spec_from_file_location("tsr", SOURCE / "tests" / "test_svc_recover.py")
@@ -106,7 +110,8 @@ class U2ReleaseTests(tsi.IdentityTests):
        clock.chmod(0o755)
        self.env["PATH"] = str(clock_bin) + os.pathsep + self.env["PATH"]
        self.make_src_repo()  # 预克隆 srccache（本用例走 --from local，仅保环境一致）
-        self.seed_agent("u2a", 9461)
+        port = free_test_port()
+        self.seed_agent("u2a", port)
        self.start_ok("u2a")               # legacy 运行中（期望态=running）
        self.assertTrue(self.running("u2a"))

@@ -147,7 +152,8 @@ class U2ReleaseTests(tsi.IdentityTests):
    # ---- T2：构建失败 → 旧服务保持运行、current 不动 ----

    def test_U2_build_failure_keeps_old_running(self):
-        self.seed_agent("u2b", 9462)
+        port = free_test_port()
+        self.seed_agent("u2b", port)
        self.set_makefile(self.stub)
        self.svc("u2b", "deploy", "--from", "local")
        cur1 = self.cur_release("u2b")
@@ -164,7 +170,8 @@ class U2ReleaseTests(tsi.IdentityTests):
    # ---- T3：中断切换（journal switched）→ start 入口回退并恢复 ----

    def test_U2_journal_interrupt_resolved_on_start(self):
-        self.seed_agent("u2c", 9463)
+        port = free_test_port()
+        self.seed_agent("u2c", port)
        self.set_makefile(self.stub)
        self.svc("u2c", "deploy", "--from", "local")
        v1 = self.cur_release("u2c")
@@ -190,7 +197,8 @@ class U2ReleaseTests(tsi.IdentityTests):
    # ---- T4：schema 前进 → 回退阻断，不触碰业务库 ----

    def test_U2_schema_advance_blocks_rollback(self):
-        self.seed_agent("u2d", 9464)
+        port = free_test_port()
+        self.seed_agent("u2d", port)
        self.set_makefile(self.stub)
        self.svc("u2d", "deploy", "--from", "local")
        v1 = self.cur_release("u2d")
@@ -230,7 +238,8 @@ class U2ReleaseTests(tsi.IdentityTests):
    # ---- T5：legacy 布局未迁移 → 裸 start/restart 仍走原路径（兼容） ----

    def test_U2_fault_after_switch_rolls_back_on_next_start(self):
-        self.seed_agent("u2f", 9466)
+        port = free_test_port()
+        self.seed_agent("u2f", port)
        self.set_makefile(self.stub)
        self.svc("u2f", "deploy", "--from", "local")
        v1 = self.cur_release("u2f")
@@ -248,7 +257,8 @@ class U2ReleaseTests(tsi.IdentityTests):
        self.svc("u2f", "stop")

    def test_U2_health_timeout_rolls_back(self):
-        self.seed_agent("u2g", 9467)
+        port = free_test_port()
+        self.seed_agent("u2g", port)
        self.set_makefile(self.stub)
        self.svc("u2g", "deploy", "--from", "local")
        v1 = self.cur_release("u2g")
@@ -277,7 +287,8 @@ class U2ReleaseTests(tsi.IdentityTests):
        return p

    def test_U2_legacy_layout_bare_lifecycle_still_works(self):
-        self.seed_agent("u2e", 9465)
+        port = free_test_port()
+        self.seed_agent("u2e", port)
        self.start_ok("u2e")
        self.assertFalse((self.runtime("u2e") / "current").exists())
        self.assertTrue((self.runtime("u2e") / "bin" / "agent-system").exists())
@@ -9,9 +9,13 @@ import importlib.util
 import json
 import os
 import shutil
+import sys
 import unittest
 from pathlib import Path

+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from _port_alloc import free_test_port  # noqa: E402
+
 SOURCE = Path(__file__).resolve().parents[1]

 _spec = importlib.util.spec_from_file_location("tsr", SOURCE / "tests" / "test_svc_recover.py")
@@ -57,7 +61,8 @@ class UserBindingTests(tsr.SvcAutoRecoverTests):
    # ---- T1 合法 manifest：user list 绑定 data_root + --open-existing ----

    def test_T1_user_list_binds_manifest_data(self):
-        self.seed_agent("ub1", 9441)
+        port = free_test_port()
+        self.seed_agent("ub1", port)
        self.start_ok("ub1")
        self.svc("ub1", "stop")
        root = self.manifest("ub1")["identity"]["data_root"]
@@ -74,7 +79,8 @@ class UserBindingTests(tsr.SvcAutoRecoverTests):
    # ---- T2 禁止覆盖 --data；未绑定默认目录拒绝 ----

    def test_T2_reject_override_data_flag(self):
-        self.seed_agent("ub2", 9442)
+        port = free_test_port()
+        self.seed_agent("ub2", port)
        self.start_ok("ub2")
        self.svc("ub2", "stop")
        self.touch_db("ub2")
@@ -106,7 +112,8 @@ class UserBindingTests(tsr.SvcAutoRecoverTests):
    # ---- T3 删除 data 根：OpenExisting 失败，不建空库 ----

    def test_T3_missing_data_root_rejected(self):
-        self.seed_agent("ub3", 9444)
+        port = free_test_port()
+        self.seed_agent("ub3", port)
        self.start_ok("ub3")
        self.svc("ub3", "stop")
        root = Path(self.manifest("ub3")["identity"]["data_root"])
@@ -124,7 +131,8 @@ class UserBindingTests(tsr.SvcAutoRecoverTests):
    # ---- T4 隐藏 flock：user/deploy 拒绝；已运行服务仍在 ----

    def test_T4_no_flock_rejects_user_and_deploy(self):
-        self.seed_agent("ub4", 9445)
+        port = free_test_port()
+        self.seed_agent("ub4", port)
        self.start_ok("ub4")
        self.assertTrue(self.running("ub4"))
        self.touch_db("ub4")
@@ -158,7 +166,8 @@ class UserBindingTests(tsr.SvcAutoRecoverTests):
    # ---- T5 recovery U1 身份冒烟（完整套件见 test_svc_identity）----

    def test_T5_identity_regression_smoke(self):
-        self.seed_agent("ub5", 9446)
+        port = free_test_port()
+        self.seed_agent("ub5", port)
        self.start_ok("ub5")
        iid = self.manifest("ub5")["instance_id"]
        self.svc("ub5", "stop")