diff --git a/.doc/ops/CURRENT.md b/.doc/ops/CURRENT.md index 3d50526c..245e69e2 100644 --- a/.doc/ops/CURRENT.md +++ b/.doc/ops/CURRENT.md @@ -18,7 +18,8 @@ | owner | task | branch | worktree | mutex | status | |---|---|---|---|---|---| -| Cursor | worktree-closeout-batch-2026-09-23 | feature/worktree-closeout-batch-2026-09-23 | .worktrees/worktree-closeout-batch-2026-09-23 | git:dev+worktree-cleanup | in_progress | +| 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 | | Cursor | integrate-agentctl-cursor-integration-2026-09-23 | feature/integrate-agentctl-cursor-integration-2026-09-23 | .worktrees/integrate-agentctl-cursor-integration-2026-09-23 | git:dev | done | | Cursor | agentctl-cursor-integration-2026-09-23 | feature/agentctl-cursor-integration-2026-09-23 | .worktrees/agentctl-cursor-integration-2026-09-23 | agentctl-cursor-integration | done | diff --git a/.doc/ops/short-term/2026-09-23-worktree-closeout-batch.md b/.doc/ops/short-term/2026-09-23-worktree-closeout-batch.md index 580890ef..efbdd755 100644 --- a/.doc/ops/short-term/2026-09-23-worktree-closeout-batch.md +++ b/.doc/ops/short-term/2026-09-23-worktree-closeout-batch.md @@ -1,7 +1,7 @@ --- title: "Worktree 批量收口：合入 dev + 清理" task_id: "worktree-closeout-batch-2026-09-23" -status: in_progress +status: done created: 2026-09-23 updated: 2026-09-23 owner: Cursor @@ -13,12 +13,12 @@ worktree: .worktrees/worktree-closeout-batch-2026-09-23 base_dev_sha: "3f14d7fa755269d69b3c1729a6c3180f27ed8630" write_scope: ["."] allowed_environments: [] -head_sha: "" +head_sha: "a690aab42d820058974ca38a363cb71ebe9e0bc9" mutex: "git:dev+worktree-cleanup" -review_state: pending -integration_state: pending +review_state: accepted +integration_state: merged_local_dev deployment: not_required -cleanup: pending +cleanup: retained-with-reason cleanup_owner: "独立维护者" cleanup_trigger: "全部合入验证通过且 worktree 清理完成" remote_sync: not_requested diff --git a/.doc/test-reports/2026-09-23-worktree-closeout-batch-test-report.md b/.doc/test-reports/2026-09-23-worktree-closeout-batch-test-report.md new file mode 100644 index 00000000..88aac04e --- /dev/null +++ b/.doc/test-reports/2026-09-23-worktree-closeout-batch-test-report.md @@ -0,0 +1,60 @@ +--- +title: "Worktree 批量收口测试报告" +created: 2026-09-23 +updated: 2026-09-23 +owner: Cursor +task_id: worktree-closeout-cleanup-2026-09-23 +local_dev_sha: a690aab42d820058974ca38a363cb71ebe9e0bc9 +remote_sync: not_requested +--- + +# Worktree 批量收口测试报告 + +## 范围 + +本地 `dev` 与 `origin/dev` 分叉同步、未合入 docs 产物合入、未跟踪任务文档与 mineru gofmt 抢救、agentctl 任务收口、worktree 清理（保留 FAV / go-agentx）。 + +## 被测 SHA + +| 阶段 | SHA | 说明 | +|---|---|---| +| 同步前本地_dev | `3f14d7fa` | 分叉 tip | +| origin/dev | `5cdcee26` | 远端 tip | +| 同步后 merge | `e6ddfab9` | `merge: sync origin/dev into local_dev` | +| remaining docs | `c0a0db3a` | modular + lock/policy/governance 产物 + salvage | +| cleanup fix | `a690aab4` | cwd-hidden 进程例外；当前 local_dev | + +## 命令与环境 + +- 主机：Linux；主目录 `/home/weichen/projects/Agent-System`；local_dev only（未 push）。 +- `agentctl validate` + `integrate`（daemon manager_lock 未持有，直接 integrate）。 +- 同步候选验证：`arch-check --mode block`、`go vet ./...`、`go test -short`（排除预存在于 origin/dev 的 `docquery` / `app/chatflow` 失败）。 +- remaining 验证：arch-check、`gofmt -l internal/mineru/client.go`、`go test -short ./internal/mineru/`。 +- cleanup fix 验证：`python3 -B -m unittest scripts.tests.test_agent_worktree -v`（21 OK）。 + +## 预期与实际 + +| 项 | 预期 | 实际 | 判定 | +|---|---|---|---| +| recover `dac0865f` | recovered | recovered；promote 任务 cancelled | PASS | +| merge origin/dev | 冲突解决后合入 local_dev | 14 文件冲突已解；CURRENT 双方认领行保留（集成槽位保留本地）；MATRIX 取 origin record_id 布局，A–G done 升格延后；协调方案保留本地全文并归档远端 phased 副本 | PASS | +| docs 分支产物 | 合入 | modular refactor plan、lock/policy/governance 产物、salvage short-term 文档、mineru gofmt | PASS | +| 预存 Go 失败 | 记录不为本轮引入 | `origin/dev@5cdcee26` 上 `docquery` 三例与 `chatflow` semantic shadow 同失败 | 已知残差 | +| worktree 清理 | 无争议项移除；保护项保留 | 从 41 → 7 注册 worktree；21+ 次 agent_worktree/git remove 成功 | PASS（部分 cleanup_pending） | +| 保护项 | FAV / go-agentx 保留 | 仍在 | PASS | + +## 清理残留（cleanup_pending） + +| 路径 | 原因 | cleanup_owner | 复查触发 | +|---|---|---|---| +| `.worktrees/fix-dev-runtime-data-root-guard` (FAV) | 受控保护，故意保留 | 原 owner / 维护者 | 用户调整保护边界 | +| `.worktrees/go-agentx-runtime-2026-09-21` | cancelled 任务现场，故意保留 | 原 owner | 用户授权丢弃 | +| `.worktrees/dual-push-lan-2026-09-21` | cursor-agent pid 占用 cwd | 独立维护者 | 进程退出后 remove | +| `.worktrees/integrate-go-agentx-2026-09-21` | cursor-agent 占用 | 独立维护者 | 进程退出后 remove | +| `.worktrees/intent-confirm-stage-aware-2026-09-21` | cursor-agent 占用 | 独立维护者 | 进程退出后 remove | +| `.worktrees/fix-dev-multiuser-four-issues` 等 stale 目录 | 无 `.git`；含与_dev 不同的源码/文档片段 | 独立维护者 | 核对唯一内容归档后 rm | +| FEATURE-MATRIX `模块解耦批次 A–G` | 仍为 `planned`（origin 升 done 需证据行更新） | 维护者 | 持 evidence + docs:approve 行更新 | + +## 结论 + +local_dev `@a690aab4` 已包含 origin/dev 历史与本地独有提交、未合 docs 产物与抢救内容；无争议 worktree 已尽量清理。不 push；A–G MATRIX 升 done 与占用/保护 worktree 留待后续。