diff --git a/.doc/ops/CURRENT.md b/.doc/ops/CURRENT.md index 48de88d5..a67f823b 100644 --- a/.doc/ops/CURRENT.md +++ b/.doc/ops/CURRENT.md @@ -18,7 +18,8 @@ | owner | task | branch | worktree | mutex | status | |---|---|---|---|---|---| -| Cursor | remaining-worktrees-closeout-2026-09-23 | feature/remaining-worktrees-closeout-2026-09-23 | .worktrees/remaining-worktrees-closeout-2026-09-23 | git:dev+worktree-cleanup | done | +| Cursor | closeout-worktree-cleanup-2026-09-23 | feature/closeout-worktree-cleanup-2026-09-23 | .worktrees/closeout-worktree-cleanup-2026-09-23 | git:dev+worktree-cleanup | done | +| Cursor | remaining-worktrees-closeout-2026-09-23 | feature/remaining-worktrees-closeout-2026-09-23 | (removed) | git:dev+worktree-cleanup | done | | Cursor | worktree-closeout-cleanup-2026-09-23 | feature/worktree-closeout-cleanup-2026-09-23 | .worktrees/worktree-closeout-cleanup-2026-09-23 | git:dev+worktree-cleanup | done | | Cursor | worktree-closeout-batch-2026-09-23 | feature/worktree-closeout-batch-2026-09-23 | (removed) | git:dev+worktree-cleanup | done | | Cursor | agentctl-cursor-integration-close-2026-09-23 | feature/agentctl-cursor-integration-close-2026-09-23 | .worktrees/agentctl-cursor-integration-close-2026-09-23 | agentctl-cursor-integration-close | done | @@ -70,8 +71,8 @@ | 路径/事项 | 分类与保留原因 | cleanup_owner | 复查触发 | |---|---|---|---| -| `.worktrees/docrev-ui-rerun-2026-09-22` / `freeform-project-id-bigint` | 任务 done;UI PASS 密封;cleanup=pending | 独立维护者 | tip 为 local_dev 祖先且无 Playwright 后 remove | -| `.worktrees/dev-prod-ready-test-promotion-2026-09-22` 等本轮三个 worktree | 任务 done;cleanup=pending;证据已入 test-reports / gap-matrix | 独立维护者 | 核对 tip 为 origin/dev 或 origin/test 祖先、无进程后 remove | +| `.worktrees/docrev-ui-rerun-2026-09-22` / `freeform-project-id-bigint` | 已清理 / 目录不存在(2026-09-23 核对) | Cursor | 无 | +| `.worktrees/dev-prod-ready-test-promotion-2026-09-22` 等本轮三个 worktree | 已清理 / 目录不存在(2026-09-23 核对) | Cursor | 无 | | Cline `2026-09-16-partial-deferred-completion` | 仍 in_progress;W5–W7 未关闭 | Cline owner / 维护者 | 单独授权实施或交接 | | 保护分支 / FAV 相关 | 已合入 local_dev(例外授权 2026-09-23);live 未放量;分支/worktree 已删 | Cursor | 无;见 integrate-fav-final 例外登记 | | embedding 401(dmxapi) | 非 blocker 运维债;不挡 PI | 运维 | 换钥后重跑 chunk index | diff --git a/.doc/ops/short-term/2026-09-23-remaining-worktrees-closeout.md b/.doc/ops/short-term/2026-09-23-remaining-worktrees-closeout.md index c44769f9..e123f81b 100644 --- a/.doc/ops/short-term/2026-09-23-remaining-worktrees-closeout.md +++ b/.doc/ops/short-term/2026-09-23-remaining-worktrees-closeout.md @@ -6,14 +6,15 @@ | owner | Cursor | | type | integrate/cleanup | | base_dev_sha | 3e01f1875661c8303d255661d5d6239de54d07fb (pre-closeout tip after FAV) | +| tip_sha | 4381b71094cf7f4ad580e877c661a6bdd0d2a0c5 | | go_agentx_merge | 6032dbaa | | fav_merge | 3e01f187 | | write_scope | .doc | | mutex | git:dev+worktree-cleanup | | review_state | accepted | -| integration_state | pending_closeout_docs | +| integration_state | merged_local_dev | | deployment | not_required | -| cleanup | pending_self | +| cleanup | done | | remote_sync | not_requested | ## Exception (FAV) @@ -23,7 +24,7 @@ ## CURRENT protected-section note `docs apply` 的 `@document` 不能改 `## 受控约束` / `## 焦点`(`configs/agent-governance.json` 的 protected_sections)。 -已完成:认领行 done、清理表 FAV 行、页眉、MATRIX events-fav(保持 partial)。 +已完成:认领行 done、清理表 FAV 行与已消失路径行、页眉、MATRIX events-fav(保持 partial)。 建议仍写入受控约束第一条(待有权维护者/策略放行): diff --git a/.doc/test-reports/2026-09-23-remaining-worktrees-closeout-test-report.md b/.doc/test-reports/2026-09-23-remaining-worktrees-closeout-test-report.md index 8fd44f74..3f35d732 100644 --- a/.doc/test-reports/2026-09-23-remaining-worktrees-closeout-test-report.md +++ b/.doc/test-reports/2026-09-23-remaining-worktrees-closeout-test-report.md @@ -63,5 +63,6 @@ ## 七、 测试结论与后续优化建议 (Conclusion & Next Steps) -- 结论: 授权范围内剩余 worktree 推进完成;合入后 tip 见收口 integrate;不 push +- 结论: 授权范围内剩余 worktree 推进完成;合入 tip `4381b710`;规范收尾后清理表已标「目录不存在」;不 push +- 五态终态: review_state=accepted · integration_state=merged_local_dev · deployment=not_required · cleanup=done · remote_sync=not_requested - 后续: 有权维护者将受控约束第一条改为 short-term 建议文案;FAV live 仍不放量