diff --git a/.doc/ops/CURRENT.md b/.doc/ops/CURRENT.md index 5581a668..01256641 100644 --- a/.doc/ops/CURRENT.md +++ b/.doc/ops/CURRENT.md @@ -18,6 +18,7 @@ | owner | task | branch | worktree | mutex | status | |---|---|---|---|---|---| +| Cursor | worktree-cleanup-closeout-2026-09-24 | feature/worktree-cleanup-closeout-2026-09-24 | .worktrees/worktree-cleanup-closeout-2026-09-24 | worktree-cleanup | in_progress | | Cursor | non-author-closeout-2026-09-24 | feature/non-author-closeout-2026-09-24 | .worktrees/non-author-closeout-2026-09-24 | docs+git:dev | done | | Cursor | integrate-non-author-docs-2026-09-24 | feature/integrate-non-author-docs-2026-09-24 | .worktrees/integrate-non-author-docs-2026-09-24 | git:dev | done | | Cursor | non-author-member-access-docs-2026-09-24 | feature/non-author-member-access-2026-09-24 | .worktrees/non-author-member-access-2026-09-24 | docs+matrix | done | @@ -36,10 +37,10 @@ | Cursor | dev-full-gate-test-promo-2026-09-24 | feature/dev-full-gate-test-promo-2026-09-24 | .worktrees/dev-full-gate-test-promo-2026-09-24 | git:dev+env:dev+env:test+docs | done | | Cursor | gate-promo-current-close-2026-09-24 | feature/gate-promo-current-close-2026-09-24 | .worktrees/gate-promo-current-close-2026-09-24 | docs:admin+docs | done | | Cursor | docs-gate-promo-report-2026-09-24 | feature/docs-gate-promo-report-2026-09-24 | .worktrees/docs-gate-promo-report-2026-09-24 | docs+git:dev | done | -| Cursor | admin-password-reset-2026-09-24 | feature/admin-password-reset-2026-09-24 | .worktrees/admin-password-reset-2026-09-24 | auth+env:test | in_progress | +| Cursor | admin-password-reset-2026-09-24 | feature/admin-password-reset-2026-09-24 | .worktrees/admin-password-reset-2026-09-24 | auth+env:test | done | | Cursor | fix-fav-staging-uuid-2026-09-24 | fix/fix-fav-staging-uuid-2026-09-24 | .worktrees/fix-fav-staging-uuid-2026-09-24 | artifactvault | done | -| Cursor | gate-e1a-unique-project-name-2026-09-24 | fix/gate-e1a-unique-project-name-2026-09-24 | .worktrees/gate-e1a-unique-project-name-2026-09-24 | docnotify | in_progress | -| Cursor | gate-unhook-docquery-2026-09-24 | fix/gate-unhook-docquery-2026-09-24 | .worktrees/gate-unhook-docquery-2026-09-24 | server+docquery | in_progress | +| Cursor | gate-e1a-unique-project-name-2026-09-24 | fix/gate-e1a-unique-project-name-2026-09-24 | .worktrees/gate-e1a-unique-project-name-2026-09-24 | docnotify | done | +| Cursor | gate-unhook-docquery-2026-09-24 | fix/gate-unhook-docquery-2026-09-24 | .worktrees/gate-unhook-docquery-2026-09-24 | server+docquery | done | | Cursor | integrate-jev-assist-land-2026-09-24 | feature/integrate-jev-assist-land-2026-09-24 | .worktrees/integrate-jev-assist-land-2026-09-24 | git:dev | done | | Cursor | integrate-codegraph-fixup2-2026-09-24 | feature/integrate-codegraph-fixup2-2026-09-24 | (removed) | git:dev | done | | Cursor | integrate-codegraph-governance-2026-09-24 | feature/integrate-codegraph-governance-2026-09-24 | (removed) | git:dev | done | diff --git a/.doc/ops/short-term/2026-09-24-admin-password-reset.md b/.doc/ops/short-term/2026-09-24-admin-password-reset.md index bd57ba6a..5979d95b 100644 --- a/.doc/ops/short-term/2026-09-24-admin-password-reset.md +++ b/.doc/ops/short-term/2026-09-24-admin-password-reset.md @@ -2,12 +2,12 @@ | 字段 | 值 | |---|---| -| status | in_progress | +| status | done | | write_scope | internal, web, deploy/postgres/goose, .doc | | mutex | auth+env:test | | base_dev_sha | 3de5bc5c396fc21887f0f19e6e3baa8784347f99 | -| review_state | pending | -| integration_state | pending | +| review_state | accepted | +| integration_state | queued_local_dev (waiting env:dev/git:dev lock from nightly) | | deployment | not_required（合入 local_dev；晋升 test 另授权） | | cleanup | pending | | remote_sync | not_requested | diff --git a/.doc/ops/short-term/2026-09-24-worktree-cleanup-inventory.md b/.doc/ops/short-term/2026-09-24-worktree-cleanup-inventory.md new file mode 100644 index 00000000..d995c048 --- /dev/null +++ b/.doc/ops/short-term/2026-09-24-worktree-cleanup-inventory.md @@ -0,0 +1,49 @@ +# Worktree cleanup inventory (2026-09-24) + +盘点基线 local_dev tip 在收口提交时以机器为准；本文件记录本轮已清除与 `cleanup_pending` 原因。 + +## 已清除（verdict=ready → `agent-worktree.sh remove --delete-branch`） + +- integrate-non-author-closeout-2026-09-24 +- chat-semantic-d3-closeout-2026-09-23 +- free-collab-claim-notify-2026-09-24 +- governance-catalog-2026-09-24 +- integrate-free-collab-2026-09-24 +- integrate-gate-nightly-fixes-2026-09-24 +- integrate-gate-unhook-docquery-2026-09-24 +- integrate-jev-dev-assist-on-2026-09-24 +- integrate-non-author-docs-2026-09-24 +- jev-dev-enable-2026-09-24 +- jev-product-shadow-2026-09-24 +- non-author-closeout-2026-09-24 +- non-author-member-access-2026-09-24 +- pi-narrative-final-closeout-b-2026-09-23 + +清除前对可再生 ignored（`.codegraph/`、`web/node_modules`、`web/dist`、测试 `data/`、`.env`）做了显式删除；对可丢弃未提交 tracked 脏文件执行 `git checkout -- .`（任务已 done，内容已在 local_dev）。 + +## cleanup_pending（`not_ancestor_of_dev`；普通 remove 拒绝，未使用 --force/-D） + +| worktree | head | blockers | 说明 | +|---|---|---|---| +| `admin-password-reset-2026-09-24` | `58bf83f7` | not_ancestor_of_dev,dirty_or_ignored_files | tip 含未成祖先的 docs 收口提交；任务 registry 多为 done. tasks: admin-password-reset-2026-09-24=done | +| `dev-full-gate-test-promo-2026-09-24` | `614ebb8d` | not_ancestor_of_dev,dirty_or_ignored_files | tip 含未成祖先的 docs 收口提交；任务 registry 多为 done. tasks: dev-full-gate-test-promo-2026-09-24=done | +| `fix-fullchain-unique-project-2026-09-24` | `8c4200c8` | not_ancestor_of_dev,dirty_or_ignored_files | patch-id/内容等价已在 local_dev；tip SHA 分叉. tasks: fix-fullchain-unique-project-2026-09-24=cancelled | +| `fix-nightly-abs-datadir-2026-09-24` | `6f0e43ca` | not_ancestor_of_dev,dirty_or_ignored_files | patch-id/内容等价已在 local_dev；tip SHA 分叉. tasks: fix-nightly-abs-datadir-2026-09-24=done | +| `gate-e1a-unique-project-name-2026-09-24` | `f04f14ff` | not_ancestor_of_dev,dirty_or_ignored_files | tip 含未成祖先的 docs 收口提交；任务 registry 多为 done. tasks: gate-e1a-unique-project-name-2026-09-24=done | +| `gate-unhook-docquery-2026-09-24` | `2844bbfe` | not_ancestor_of_dev,dirty_or_ignored_files | tip 含未成祖先的 docs 收口提交；任务 registry 多为 done. tasks: gate-unhook-docquery-2026-09-24=done | +| `integrate-codegraph-current-2026-09-24` | `734aa725` | not_ancestor_of_dev | task=cancelled；候选 tip 未成为 dev 祖先. tasks: integrate-codegraph-current-2026-09-24=cancelled | +| `integrate-codegraph-governance-2026-09-24` | `22ed51cf` | not_ancestor_of_dev | CURRENT 认领 commit 未成祖先；主目录 CURRENT 已记 done/(removed). tasks: integrate-codegraph-governance-2026-09-24=done | +| `integrate-fix-fav-staging-uuid-2026-09-24` | `80caa785` | not_ancestor_of_dev,dirty_or_ignored_files | patch-id/内容等价已在 local_dev；tip SHA 分叉. tasks: integrate-fix-fav-staging-uuid-2026-09-24=done | +| `integrate-intent-plan-u9u12-close-2026-09-24` | `e7262d4d` | not_ancestor_of_dev | 正文证据已由替代 SHA 合入 local_dev；本 tip SHA 分叉. tasks: integrate-intent-plan-u9u12-close-2026-09-24=done | +| `intent-plan-u9u12-accept-2026-09-24` | `e7262d4d` | not_ancestor_of_dev | 正文证据已由替代 SHA 合入 local_dev；本 tip SHA 分叉. tasks: intent-plan-u9u12-accept-2026-09-24=done | +| `promote-rc-beta3-c-2026-09-24` | `0e4b111d` | not_ancestor_of_dev | test 晋升线产物，本非 local_dev 合入目标. tasks: promote-rc-beta3-c-2026-09-24=done | +| `sync-local-test-origin-2026-09-24` | `9984c68d` | not_ancestor_of_dev | test 晋升线产物，本非 local_dev 合入目标. tasks: sync-local-test-origin-2026-09-24=done | +| `worktree-cleanup-closeout-2026-09-24` | `fabd85a6` | dirty_or_ignored_files,registry:TASK_ACTIVE,process_cwd:1269150 | tip 含未成祖先的 docs 收口提交；任务 registry 多为 done. tasks: worktree-cleanup-closeout-2026-09-24=active | + +## 孤儿目录（非 git worktree） + +- `.worktrees/codegraph-governance-2026-09-24`：仅残留 scripts 副本，可直接 `rm -rf`（非 `git worktree remove`）。 + +## 规范依据 + +- `.doc/ops/2026-09-21-agent-worktree-workflow.md` §8：仅 `verdict=ready` 可 remove；拒绝保留 cleanup_pending。