From cdfd7d9849e67babfe70211c6a9f254d192b6ba6 Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 23 Sep 2026 14:02:35 +0000 Subject: [PATCH] docs(ops): remaining worktrees closeout report and CURRENT/MATRIX rows Record go-agentx+FAV integrate evidence, stale DIFF archive, claim/FAV cleanup rows, and events-fav partial note. Constraint bullet deferred to short-term due to CURRENT protected_sections. --- .doc/ops/CURRENT.md | 5 +- ...2026-09-23-remaining-worktrees-closeout.md | 34 +++++++++++ .doc/status/FEATURE-MATRIX.md | 2 +- ...emaining-worktrees-closeout-test-report.md | 57 +++++++++++++++++++ .../stale-DIFF.md | 19 +++++++ 5 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 .doc/ops/short-term/2026-09-23-remaining-worktrees-closeout.md create mode 100644 .doc/test-reports/2026-09-23-remaining-worktrees-closeout-test-report.md create mode 100644 .doc/test-reports/assets/2026-09-23-remaining-worktrees-closeout/stale-DIFF.md diff --git a/.doc/ops/CURRENT.md b/.doc/ops/CURRENT.md index 245e69e2..48de88d5 100644 --- a/.doc/ops/CURRENT.md +++ b/.doc/ops/CURRENT.md @@ -1,6 +1,6 @@ # 当前焦点 -**更新**：2026-09-23（DOCREV UI PASS + FEATURE-MATRIX A–G done / 红线证据入账）。此文件是协调快照；实际分支、进程、执行租约以机器核验为准。能力和发布结论分别见 [FEATURE-MATRIX](../status/FEATURE-MATRIX.md) / [gap-matrix](../remediation/gap-matrix.md)。 +**更新**：2026-09-23（剩余 worktree 收口：go-agentx+FAV 合入 local_dev；注册 worktree 已清；FAV live 仍不放量）。此文件是协调快照；实际分支、进程、执行租约以机器核验为准。能力和发布结论分别见 [FEATURE-MATRIX](../status/FEATURE-MATRIX.md) / [gap-matrix](../remediation/gap-matrix.md)。 本机 macOS 已可用 `agentctl with`/`docs apply`/`validate`/`integrate`（W1-B 进程层）；共享文档写走 docs apply 收据。 @@ -18,6 +18,7 @@ | 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 | 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 | @@ -72,7 +73,7 @@ | `.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 | | Cline `2026-09-16-partial-deferred-completion` | 仍 in_progress；W5–W7 未关闭 | Cline owner / 维护者 | 单独授权实施或交接 | -| 保护分支 / FAV 相关 | 保护项；故意不合入、不删 | 原 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 new file mode 100644 index 00000000..bf24f5e0 --- /dev/null +++ b/.doc/ops/short-term/2026-09-23-remaining-worktrees-closeout.md @@ -0,0 +1,34 @@ +# remaining-worktrees-closeout-2026-09-23 + +| field | value | +|---|---| +| status | done | +| owner | Cursor | +| type | integrate/cleanup | +| base_dev_sha | 3e01f1875661c8303d255661d5d6239de54d07fb (pre-closeout tip after FAV) | +| go_agentx_merge | 6032dbaa | +| fav_merge | 3e01f187 | +| write_scope | .doc | +| mutex | git:dev+worktree-cleanup | +| review_state | accepted | +| integration_state | pending_closeout_docs | +| deployment | not_required | +| cleanup | pending_self | +| remote_sync | not_requested | + +## Exception (FAV) + +见 （已合入 local_dev）。 + +## CURRENT protected-section note + + 不能改 / （ protected_sections）。 +已完成：认领行 done、清理表 FAV 行、页眉、MATRIX events-fav（保持 partial）。 + +**建议仍写入受控约束第一条（待有权维护者/策略放行）**： + + +## Goose + +- go-agentx registry: +- FAV: 保留既有 ；丢弃分支重复 diff --git a/.doc/status/FEATURE-MATRIX.md b/.doc/status/FEATURE-MATRIX.md index 9640ddad..33b61860 100644 --- a/.doc/status/FEATURE-MATRIX.md +++ b/.doc/status/FEATURE-MATRIX.md @@ -73,7 +73,7 @@ | events-core | 可靠事件核心 | PG dispatcher、notify/advance/projection live、生产闭包 hook 退出、Phase2 选择性解耦已合入 | done | non_blocker | [E0A–E2](../test-reports/2026-09-15-event-e0a-production-scope-contract-test-report.md) 等；[复盘](../ops/research/2026-09-15-track-e-retrospective.md)；[shared live](../test-reports/2026-09-15-event-notify-shared-live-test-report.md)；[phase2 closeout](../test-reports/2026-09-15-phase2-closeout-test-report.md) | **before**：与 FAV off 混成 partial → **after**：FAV 独立行。选择性后续解耦按收益触发 | `architecture-docs` / `events` | | module-spec | 模块开发规范 | 窄端口、领域事件、wire DTO 三种契约；故障隔离红线；新增模块/表/事件流程。不含批次 A–G 的代码整改 | done | non_blocker | [规范](../system-design/2026-09-20-module-development-standards.md)；[审计](../audit/2026-09-20-module-coupling-audit.md)；[ADR](../adr/2026-09-14-modular-monolith-decoupling.md) | 文档入口已立。代码整改不在本行 | `module-decoupling-spec` | | module-batches-ag | 模块解耦批次 A–G | server 端口装配、chat 解环、docgov 词汇、工作流单向依赖、巨型文件、前端 api client、21 条例外清零 | planned | non_blocker | [分批计划](../remediation/2026-09-20-module-decoupling-batch-plan.md)；[审计](../audit/2026-09-20-module-coupling-audit.md)；[A](../ops/short-term/2026-09-22-server-assembly-cleanup.md)；[B](../ops/short-term/2026-09-22-chat-app-decouple.md)；[C](../ops/short-term/2026-09-22-docgov-vocabulary-convergence.md)；[D](../ops/short-term/2026-09-22-workflow-def-unidirect.md)；[E](../ops/short-term/2026-09-22-engine-split.md)；[F](../ops/short-term/2026-09-22-web-api-client.md)；[G1](../ops/short-term/2026-09-22-g1-exception-clearance.md)；[G2/G3](../ops/short-term/2026-09-22-g2-g3-exception-clearance.md) | **after 2026-09-22**：A–F 与 E 已合入；G1/G2/G3 例外清零后 `arch-check --mode block` PASS 且 baseline import/sql_write/path/event **全 0**。关闭本伞行 | `module-decoupling-spec` | -| events-fav | Final Artifact Vault（FAV） | 不可变终态制品库；`FAV_DEGRADED_READ=false` | partial | deferred_enhancement | [Track E 复盘](../ops/research/2026-09-15-track-e-retrospective.md)；[U7 报告](../test-reports/2026-09-16-fav-u7-incremental-test-report.md)；[W6 shadow](../test-reports/2026-09-17-w6-fav-subscriber-shadow-test-report.md)；[红线证据](../test-reports/2026-09-22-redline-evidence-fav-test-report.md) | subscriber shadow 只计算 intended outcome。**live 未放量**；观察窗起点已登记。`FAV_DEGRADED_READ` 默认 false；禁止整支 merge | `events` | +| events-fav | Final Artifact Vault（FAV） | 不可变终态制品库；`FAV_DEGRADED_READ=false` | partial | deferred_enhancement | [Track E 复盘](../ops/research/2026-09-15-track-e-retrospective.md)；[U7 报告](../test-reports/2026-09-16-fav-u7-incremental-test-report.md)；[W6 shadow](../test-reports/2026-09-17-w6-fav-subscriber-shadow-test-report.md)；[红线证据](../test-reports/2026-09-22-redline-evidence-fav-test-report.md) | gap-fill 单测+drill 证据已合入 local_dev（例外授权 2026-09-23）。**live 未放量**；观察窗起点已登记。`FAV_DEGRADED_READ` 默认 false；保持 partial 不升 done | `events` | | web-sysadmin | 系统管理台 | 全屏系统级管理视图（总览/KB/特性开关/系统设置/工作流/角色/用户/文档 8 分组）；`/api/v1/admin/system/*`；`system_settings` 白名单可写；吸收下线 AdminSettingsModal；细粒度 `system:*` + 设置审计日志（goose 00065） | done | non_blocker | [short-term](../ops/short-term/2026-09-17-system-admin-console.md)；[测试报告](../test-reports/2026-09-17-system-admin-console-test-report.md)；residual `modular-decouple-residual-2026-09-23` | 剩余 deferred：Playwright 实跑、KB 运维动作、白名单项接消费方 | `web` + `sysadmin` | | removed-control-center | 个人工程中控台（已移出） | 原本地只读看板与后来的 Control Center 都不再属于本仓库 | removed | 进度管理改由独立项目承担 | [历史设计](../archive/design/2026-09-17-personal-engineering-control-center-plan.md)；[历史报告](../test-reports/2026-09-17-engineering-dashboard-test-report.md) | 2026-09-19 删除 `cmd/control-center`、`internal/controlcenter`、`control-center/web`、`deploy/control-center`。不恢复 `engineering-dashboard` | — | 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 new file mode 100644 index 00000000..17e7c9d6 --- /dev/null +++ b/.doc/test-reports/2026-09-23-remaining-worktrees-closeout-test-report.md @@ -0,0 +1,57 @@ +# 剩余 Worktree 推进完成 测试报告 + +## 一、 测试背景 (Background) +将 下剩余注册 worktree（已合入占用项、go-agentx、FAV）与 stale 目录推进至终态；用户授权解除 FAV 整支 merge 保护。不 push 远端。 + +## 二、 测试目标 (Test Objectives) +- 终止孤儿进程并移除已合入 worktree +- 合入 go-agentx 与 FAV（flag 默认关；MATRIX events-fav 保持 partial） +- 删除 stale 目录并归档 DIFF +- CURRENT/MATRIX 收口；主目录仅保留 registered worktree + +## 三、 测试方案与环境 (Test Plan & Environment) +- OS: Linux；Go short/vet/arch-check；agentctl validate/integrate +- 工程/治理变更：产品 PI 全链路 **NOT REQUIRED**（依据 PROJECT §8 / worktree 规范：合入与清理收口） + +## 四、 预期结果 (Expected Results) +- local_dev 含 go-agentx + FAV；goose 无重号 +- /home/weichen/projects/Agent-System 3e01f187 [dev] +/home/weichen/projects/Agent-System/.worktrees/remaining-worktrees-closeout-2026-09-23 3e01f187 [feature/remaining-worktrees-closeout-2026-09-23] 仅主目录（或仅本收口 wt 待删） +- FAV_DEGRADED_READ 默认 false；events-fav=partial +- remote_sync=not_requested + +## 五、 实际测试结果与判定 (Actual Results & Evaluation) + +### 5.1 阶段 A：孤儿进程与已合入 wt +- **Input**: kill 2384895 / 2361626 / 493547；remove dual-push / integrate-go-agentx / intent-confirm +- **Actual**: 三 PID 已终止；三 worktree+分支已 remove +- **Verdict**: PASS + +### 5.2 阶段 B：go-agentx +- **Input**: merge feature/go-agentx-runtime-2026-09-21 → candidate；goose 00062→00066；vet+short agentx/agent/workspace；arch-check +- **Actual**: merged as `6032dbaa`；validate PASS；integrate merged；源 wt/分支已删 +- **Verdict**: PASS + +### 5.3 阶段 C：FAV（例外授权） +- **Input**: merge feature/final-artifact-vault；丢弃重复 00034；vet+short artifactvault/app/fav/storage/config + server 相关；arch-check +- **Actual**: merged as `3e01f187`；FAV flags 默认关；integrate merged；`fix-dev-runtime-data-root-guard` / `feature/final-artifact-vault` 已删 +- **Verdict**: PASS + +### 5.4 阶段 D：stale +- **Input**: 4 计划项 + closeout leftover；见 assets/stale-DIFF.md +- **Actual**: 全部 `rm -rf`；multiuser 短文以 local_dev W1-D 为准，无字段需回抬 +- **Verdict**: PASS + +### 5.5 阶段 E：文档收口 +- **Input**: docs apply 认领/清理 FAV 行/页眉/events-fav；测试报告 +- **Actual**: apply 成功；受控约束第一条因 protected_sections 未直接改写（记入 short-term） +- **Verdict**: PASS（约束条文延期记入 short-term，不挡合入） + +## 六、 自动化测试套件汇总 (Test Suite Execution) +- go-agentx: `go vet`/`go test -short ./internal/agentx/...`/`arch-check --mode block` → PASS（validate run 3f593af3 / 51c72dfc） +- FAV: `go vet`/`go test -short ./internal/artifactvault/ ./internal/app/fav/ ./internal/storage/ ./internal/config/` + server 子集 + arch-check → PASS（validate run ef2d1f2a） +- 全量 `go test ./...`：**NOT REQUIRED**（工程收口；排除预存 docquery/chatflow） + +## 七、 测试结论与后续优化建议 (Conclusion & Next Steps) +- **结论**: 授权范围内剩余 worktree 推进完成；local_dev@pending；**不 push** +- **后续**: 有权维护者将受控约束第一条改为 short-term 建议文案；FAV live 仍不放量 diff --git a/.doc/test-reports/assets/2026-09-23-remaining-worktrees-closeout/stale-DIFF.md b/.doc/test-reports/assets/2026-09-23-remaining-worktrees-closeout/stale-DIFF.md new file mode 100644 index 00000000..c47165e7 --- /dev/null +++ b/.doc/test-reports/assets/2026-09-23-remaining-worktrees-closeout/stale-DIFF.md @@ -0,0 +1,19 @@ +# Stale worktree DIFF archive 2026-09-23 + +## fix-dev-multiuser-four-issues +- short-term: stale had status=done/updated=2026-09-21; local_dev has in_progress + W1-D pseudo-done note (2026-09-22). Keep local_dev; no fields to lift. +- test-report: identical or superseded on local_dev +- ONLY extra stale file: web/src/hooks/useTaskRunAttempts.test.ts (check) + test file DIFF (local_dev wins) + +## force-material-chunk-index-2026-09-21 +- DIFF vs HEAD: CURRENT.md (stale older), materialindex/pipeline.go (local_dev superseded) + +## integrate-intent-confirm-pi-docs-2026-09-21 +- only CURRENT.md DIFF (stale older snapshot) + +## upload-parse-ux-2026-09-21 +- DIFF: CURRENT + materialindex/pipeline + projectAssets + useSendMessage (local_dev superseded) + +## worktree-closeout-cleanup-2026-09-23 +- leftover from prior closeout; report already on local_dev