From 5679c790112e926f78a5b5cea3757496bd53d33a Mon Sep 17 00:00:00 2001 From: weichen Date: Mon, 28 Sep 2026 06:05:32 +0000 Subject: [PATCH] docs(ops): record rc-v1.1.0-beta.6 promotion and cleanup --- .doc/ops/CURRENT.md | 1 + .../short-term/2026-09-28-promote-rc-beta6.md | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 .doc/ops/short-term/2026-09-28-promote-rc-beta6.md diff --git a/.doc/ops/CURRENT.md b/.doc/ops/CURRENT.md index d2921728..a511cdcb 100644 --- a/.doc/ops/CURRENT.md +++ b/.doc/ops/CURRENT.md @@ -18,6 +18,7 @@ | owner | task | branch | worktree | mutex | status | |---|---|---|---|---|---| +| Cursor | promote-rc-beta6-closeout-2026-09-28 | feature/promote-rc-beta6-closeout-2026-09-28 | .worktrees/promote-rc-beta6-closeout-2026-09-28 | git:test+env:test | done | | Cursor | quality-gate-heading-mismatch-2026-09-28-r3 | fix/quality-gate-heading-mismatch-2026-09-28 | .worktrees/quality-gate-heading-mismatch-2026-09-28 | quality-gate-heading | in_progress | | Cursor | agent-reply-llm-narrative-2026-09-28 | feature/agent-reply-llm-narrative-2026-09-28 | .worktrees/agent-reply-llm-narrative-2026-09-28 | chat+coordinator | in_progress | | Cursor | test-user-doc-issues-2026-09-28 | fix/test-user-doc-issues-2026-09-28 | .worktrees/test-user-doc-issues-2026-09-28 | intent-write-verb | done | diff --git a/.doc/ops/short-term/2026-09-28-promote-rc-beta6.md b/.doc/ops/short-term/2026-09-28-promote-rc-beta6.md new file mode 100644 index 00000000..590ee83c --- /dev/null +++ b/.doc/ops/short-term/2026-09-28-promote-rc-beta6.md @@ -0,0 +1,58 @@ +--- +title: "晋升 rc-v1.1.0-beta.6（dev→test）与已结束 worktree 清理" +task_id: promote-rc-beta6-closeout-2026-09-28 +status: done +created: 2026-09-28 +updated: 2026-09-28 +owner: Cursor +task_type: ops +task_tier: small +policy_revision: "AGENTS+worktree-ops @ 714732df" +branch: feature/promote-rc-beta6-closeout-2026-09-28 +worktree: .worktrees/promote-rc-beta6-closeout-2026-09-28 +base_dev_sha: "714732df5a378eae43df0f73ad6a059a4840c3e1" +head_candidate: "0664abe57d85f7776874728e92476c5360388b2a" +write_scope: [".doc"] +allowed_environments: ["test"] +capabilities: [docs:publish, docs:admin] +mutex: git:test+env:test +review_state: accepted +integration_state: merged_local_test +deployment: test_ok +cleanup: pending +remote_sync: not_requested +--- + +# 晋升 rc-v1.1.0-beta.6 + +## 用户目标与授权 + +用户指令：继续把 dev 合入 test，并清理已结束现场。不跑 nightly，不 push。 + +## 结果 + +- beta.5 记录先合入 dev：`714732df`（`merge: candidate land-promote-rc-beta5-record-2026-09-28 into dev`）。首次入队因主仓未跟踪的中止 nightly 证据被 `DIRTY_TREE` 拒绝；证据移到 `/tmp/agent-nightly-aborted-8f77053f/` 后，r2 候选合入。 +- test 从 `73836962`（rc-v1.1.0-beta.5）前进到 `0664abe5`，标签 `rc-v1.1.0-beta.6`。第一父是上一轮 test，第二父是 `714732df`，树与该 dev 相同。validate run `f3fed9d6`。 +- 制品：主仓 `bin/agent-server-test`，由 `714732df` 构建。启动前清掉调用方 `DATA_DIR` 与 `PI_AGENT_RUNNER_URL`。 +- 租约 run `c1eb671a` 因后台进程组未退出进入 `recovery_required`。服务改由独立会话拉起后已 `recover`。 + +## 连接核对 + +| 项 | 实际 | +|---|---| +| health `:8081` | `env=test`，schema 78，数据库与共享知识库就绪；首页 200 | +| 系统库 | `127.0.0.1:5434/agent_system_test`；projects=11，users=11，与重启前相同 | +| 工作区 | `DATA_DIR` 解析为 `data/test`；sidecar `:18866` 数据目录为 `data/test/workspaces` | +| dev 未串 | test 进程无到 `:5433` 的连接；dev `:8080` 仍在；`:18865` 仍是 `data/dev/workspaces` | + +构建把主仓已跟踪的 `web/dist/.gitkeep` 从工作区删掉，已 `git checkout` 恢复，未形成新提交。 + +## 清理 + +已删除：`fix/test-user-doc-issues-2026-09-28`（只剩 `.codegraph/`）；`feature/integrate-land-promote-rc-beta5-record-2026-09-28-r2`（已是 dev）。 + +留下：`feature/integrate-land-promote-rc-beta5-record-2026-09-28`（首个候选不是 dev 祖先，`cleanup_pending`）；进行中的 agent-reply、quality-gate、refresh-task-state、subagent-process-view、e2e-wipe 及其 integrate 场；intent-material-fallback 与 squad evidence 的未提交修改；pi-runner 本地 `configs/.env.test` 与主仓不一致；u9u12 仍被 PID 3386059 占用；root 拥有的 e2e `playwright-output-main/`。 + +## 收口 + +deployment=test_ok；remote_sync=not_requested。本记录随后合入 dev。test 这一刀不含本文件。