diff --git a/.doc/ops/short-term/2026-09-23-closeout-worktrees.md b/.doc/ops/short-term/2026-09-23-closeout-worktrees.md new file mode 100644 index 00000000..2e8d0ab5 --- /dev/null +++ b/.doc/ops/short-term/2026-09-23-closeout-worktrees.md @@ -0,0 +1,82 @@ +--- +title: "Worktree 收口:docs 增量合入与清理" +task_id: "closeout-worktrees-2026-09-23" +status: in_progress +created: 2026-09-23 +updated: 2026-09-23 +owner: Cursor +task_type: ops +task_tier: medium +policy_revision: "agent-governance-2026-09-21-r1 @ cc91c217e7c0e4732de3923d0fa229fd4bd65798" +branch: feature/closeout-worktrees-2026-09-23 +worktree: .worktrees/closeout-worktrees-2026-09-23 +base_dev_sha: "cc91c217e7c0e4732de3923d0fa229fd4bd65798" +head_sha: "" +write_scope: [".doc"] +allowed_environments: [] +mutex: "git:dev+worktree-cleanup" +review_state: pending +integration_state: pending +deployment: n/a +cleanup: pending +cleanup_owner: "本任务完成后独立维护者复查" +cleanup_trigger: "合入 local_dev 且批次 A–D remove 成功或 cleanup_pending 已登记" +remote_sync: not_requested +--- + +# Worktree 收口:docs 增量合入与清理 + +## 用户目标 + +检查所有 worktree 分支;推进并完成可合入的 docs 增量;验证通过后合入 `dev` 并清理 worktree。避开并行会话中的 `task-bubble-bind` 系列;不 push。 + +## 授权边界 + +- 允许:`.doc` 写入;`git:dev` 集成(候选 worktree);关闭已完成 agentctl 任务;脚本入口清理 worktree。 +- 禁止:push;晋升 test/main;碰 task-bubble 系列;强制 `--force`/`-D`;修改非 `.doc` 业务代码(合入时冲突取 dev)。 + +## 待合入分支(docs 增量) + +| tip | branch | 预期增量 | 代码风险 | +|---|---|---|---| +| 20290d03 | feature/2026-09-23-user-profile-display | CURRENT done 行 | 无 | +| 457bea85 | feature/docrev-ui-rerun-2026-09-22 | short-term 备忘 +5 行 | 无 | +| 10f9a8b9 | feature/integrate-modular-decouple-closeout-docs-2026-09-23 | W4 matrix / governance 校准(3ebabc19 已在 dev) | 无 | +| 5ab034eb | feature/integrate-modular-decouple-residual-2026-09-23 | cancelled 旧候选 docs | 无 | +| b6965eb0 | feature/freeform-project-id-bigint-2026-09-22 | 任务文档;代码等价物 3bdd53ae 已在 dev | **冲突取 dev** | +| ee66bd00 | feature/promote-fix-latest-upload-test-2026-09-23 | promote evidence docs | 无 | + +## 明确跳过 + +- task-bubble-bind / integrate-task-bubble-bind / promote-task-bubble-bind(并行会话 active) +- push / origin 同步 + +## 特殊残留(预登记) + +| 路径 | 处置 | +|---|---| +| docrev worktree 锁文件 `.exclusive-run.lockdir` / `.ui-run.lock` | 删除 | +| `canonical-ui00-13a-pass.json` sha256=`dd83d656…f287` | 测试报告未引用;登记后删除 | +| `sealed-ledger-main-20260922T195858Z.json` sha256=`31ed8a36…44be` | 正式密封账本 `sealed-ledger-ui00-16-post-20260923T0400Z` 已在 dev;登记后删除 | +| integrate-user-profile-display-current 脏 CURRENT.md | 与 20290d03 行等价 → checkout 丢弃 | + +## 验证计划 + +纯文档档:diff 核对;`.doc` 链接存在性;CURRENT/MATRIX 抽查;合入后 `git diff HEAD -- ':!.doc'` 必须为空;freeform 追加 `go vet`/`go test -short ./internal/freedoc/`。 + +## 步骤 + +1. [x] 创建 worktree + 登记任务 +2. [ ] 写本任务文档并提交 +3. [ ] integrate 候选:串行 merge 六分支(冲突取 dev) +4. [ ] validate + integrate 推进 local_dev +5. [ ] agentctl task close(跳过 task-bubble) +6. [ ] 分批清理 worktree A/B/C/D +7. [ ] 特殊残留处理 + 收口状态更新 + +## 结果(执行后填) + +- `integration_state`: +- `dev_tip_after`: +- `cleanup_summary`: +- `cleanup_pending`: