From 9f7658515cc45d6af444ab7353889928b98036bb Mon Sep 17 00:00:00 2001 From: WeiCHEN Date: Wed, 23 Sep 2026 10:18:13 +0800 Subject: [PATCH] docs(ops): calibrate W4 matrix and close governance-automation status Mark W4 projection/deploy/recover/Darwin as landed in FEATURE-MATRIX, close the superseded governance-automation short-term, and refresh residual closeout SHAs after local_dev merges. --- .../2026-09-17-system-admin-console.md | 3 +- .../2026-09-22-governance-automation.md | 34 ++++++++++--------- .../2026-09-23-modular-decouple-residual.md | 19 ++++++----- .doc/status/FEATURE-MATRIX.md | 2 +- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/.doc/ops/short-term/2026-09-17-system-admin-console.md b/.doc/ops/short-term/2026-09-17-system-admin-console.md index 9a561f62..48f1740d 100644 --- a/.doc/ops/short-term/2026-09-17-system-admin-console.md +++ b/.doc/ops/short-term/2026-09-17-system-admin-console.md @@ -2,11 +2,12 @@ title: "系统管理台（System Admin Console）一期" status: done created: 2026-09-17 -updated: 2026-09-17 +updated: 2026-09-23 owner: Kimi branch: feature/system-admin-console worktree: "-" mutex: web + sysadmin +phase2: "细粒度 system:* + 设置审计日志经 modular-decouple-residual-2026-09-23 合入（goose 00065）；KB 运维/白名单消费方仍 deferred" --- # 系统管理台（System Admin Console）一期 diff --git a/.doc/ops/short-term/2026-09-22-governance-automation.md b/.doc/ops/short-term/2026-09-22-governance-automation.md index f0bbcf9e..ba046966 100644 --- a/.doc/ops/short-term/2026-09-22-governance-automation.md +++ b/.doc/ops/short-term/2026-09-22-governance-automation.md @@ -1,7 +1,7 @@ --- title: "W4 治理自动化剩余：持久队列与闭环" task_id: governance-automation-2026-09-22 -status: in_progress +status: done created: 2026-09-22 updated: 2026-09-23 owner: Cursor @@ -13,44 +13,44 @@ worktree: .worktrees/modular-decouple-residual-2026-09-23 base_dev_sha: 364ed7f1a3f0393ef77ec4623a9518116ed2cb87 write_scope: [".doc", "scripts"] allowed_environments: [] -head_sha: "" +head_sha: "12322b69" mutex: agent-workflow-governance-automation -review_state: pending -integration_state: pending +review_state: accepted_gates +integration_state: landed_via_modular-decouple-residual_701c565f deployment: not_required cleanup: pending cleanup_owner: "Cursor 之外的集成/维护执行者" cleanup_trigger: "合入 dev、验收通过且 owner 退出后核对清理门禁" remote_sync: not_requested -superseded_by: modular-decouple-residual-2026-09-23 +superseded_by: modular-decouple-residual-b-2026-09-23 --- # W4 治理自动化剩余：持久队列与闭环 ## 用户目标与授权 -- 原任务基线停在 `364ed7f1`；剩余工作并入 `modular-decouple-residual-2026-09-23` 从当前 local_dev tip 重做。 -- 禁止：push；强删 worktree；操作未授权环境；宣称完整 W3/W4 已关闭。 +- 原任务基线停在 `364ed7f1`；剩余工作并入 `modular-decouple-residual-b-2026-09-23` 从当时 local_dev tip 重做并已合入。 +- 禁止：push；强删 worktree；操作未授权环境；宣称完整 W3/W4 伞行已关闭（PI compose 仍 deferred）。 -## 步骤与验收（2026-09-23 更新） +## 步骤与验收（2026-09-23 终态） 1. [x] Durable queue schema + enqueue/list/cancel/tick 2. [x] Generic doc projection：行 CAS + `@document` 整文档 hash CAS；受控 `apply_projection_locally`；`docs project --mode row|document [--apply]` 3. [x] Deploy/recover 真实闭环：`execute_deploy_recover_loop` enqueue→claim→deploy(假命令)→receipt（SQLite）；CLI `deploy run-loop|status|recover` -4. [ ] PI 源码镜像交付 compose profile（**deferred**：超本轮范围，见下） -5. [~] Darwin cwd 可见性：`cwd_visibility` / lsof 已在 `agentctl_w4.py`；专用 `DarwinVisibilityTests` 仍待补（本轮黑盒测覆盖投影+deploy） -6. [x] short-term landed vs deferred；`scripts/tests/test_agentctl_w4.py`（5 PASS） +4. [ ] PI 源码镜像交付 compose profile（**deferred**：超本轮范围） +5. [x] Darwin cwd 可见性：`cwd_visibility` / lsof + `DarwinCwdVisibilityTests` +6. [x] short-term landed vs deferred；`scripts/tests/test_agentctl_w4.py`（6 PASS） ## 验证与证据 | 范围 | 命令 | 实际 | |---|---|---| -| W4 单测 | `python3 -B -m unittest scripts.tests.test_agentctl_w4 -v` | 5 PASS（CAS 行/整文、deploy 成败、recover） | +| W4 单测 | `python3 -B -m unittest scripts.tests.test_agentctl_w4 -v` | 6 PASS（CAS 行/整文、deploy 成败、recover、Darwin cwd） | | ops_guards | `python3 -B -m unittest scripts.tests.test_ops_guards` | 14 PASS（Darwin） | ## Landed vs deferred -**Landed（并入 residual 任务分支）** +**Landed（经 residual 合入 local_dev）** - `scripts/agentctl_w4.py`：projection CAS helpers、deploy/recover 全链、Darwin lsof cwd - `scripts/agentctl.py`：`docs project --mode/--apply`、`deploy` 子命令、`cleanup_process_gate` 用 cwd_visibility @@ -58,10 +58,12 @@ superseded_by: modular-decouple-residual-2026-09-23 **Deferred** -- PI 镜像 compose overlay（`docker-compose.dev.pi-image.yml` 实装与共享环境验收）——超本轮「临时仓/假命令」范围，不触共享 docker +- PI 镜像 compose overlay（`docker-compose.dev.pi-image.yml` 实装与共享环境验收） - `agentctl_automation.py` 与 `agentctl_w4.py` 重复实现收敛 +- 跨机隔离与清理可见性（非本机 Darwin cwd） ## 收口 -- 状态保持 `in_progress`（PI compose 仍 deferred）；实现去向：`modular-decouple-residual-2026-09-23`。 -- `integration_state` 随 residual 任务串行合入；不 push。 +- 本任务 `status=done`（授权范围内投影 + deploy/recover + Darwin 测试已完成）；PI compose 记 deferred，不冒充伞行 done。 +- 实现与合入去向：`modular-decouple-residual-b-2026-09-23` → local_dev `701c565f`（及后续 goose/closeout 节点）。 +- `remote_sync=not_requested`；旧 worktree `.worktrees/governance-automation-2026-09-22` cleanup=pending。 diff --git a/.doc/ops/short-term/2026-09-23-modular-decouple-residual.md b/.doc/ops/short-term/2026-09-23-modular-decouple-residual.md index c563537c..0948aad1 100644 --- a/.doc/ops/short-term/2026-09-23-modular-decouple-residual.md +++ b/.doc/ops/short-term/2026-09-23-modular-decouple-residual.md @@ -15,14 +15,14 @@ worktree: .worktrees/modular-decouple-residual-2026-09-23 base_dev_sha: "2fae99096568a2941ea38c3fd1a38c762e455027" write_scope: ["internal", "scripts", "web", ".doc"] allowed_environments: [] -head_sha: "3337bf4a4298cc0e50b2cc867a7f39d66cdd3275" +head_sha: "f1f1846925f0253c2910245c9b5c2ca821127cee" mutex: "modular-decouple-residual" review_state: accepted_gates -integration_state: landed_8b3936ea +integration_state: landed_f1f18469 deployment: not_required cleanup: pending cleanup_owner: "独立维护者" -cleanup_trigger: "全部批次合入 local_dev 且无进程占用后 remove" +cleanup_trigger: "全部批次合入 local_dev 且无进程占用后 remove；含 feature/integrate-* residual 与旧 governance-automation worktree" remote_sync: not_requested --- @@ -70,12 +70,13 @@ go test -short ./internal//... | 项 | 值 | |---|---| -| review_state | accepted_gates（arch-check + go test -short + W4/ops unittest） | -| integration_state | landed local_dev tip 8b3936ea（主合入 701c565f + goose 8b3936ea） | +| review_state | accepted_gates（arch-check + go test -short + W4 unittest 6 PASS） | +| integration_state | landed local_dev tip f1f18469（主合入 701c565f + goose 8b3936ea + closeout ae9d44a3/f1f18469） | | deployment | not_required（本轮不重建环境；goose 00065 待共享环境迁移） | -| cleanup | pending（feature + integrate worktrees；cleanup_owner=独立维护者） | +| cleanup | pending（feature + integrate-* residual + 旧 governance-automation；cleanup_owner=独立维护者） | | remote_sync | not_requested | -| deferred | PI 镜像 compose；KB 运维动作；白名单消费方；Playwright 实跑 | +| deferred | PI 镜像 compose；KB 运维动作；白名单消费方；Playwright 实跑；automation/w4 实现收敛 | -原 W4 任务 governance-automation-2026-09-22：剩余实现并入本任务；PI compose 仍 deferred。 -原 sysadmin 一期：二期细粒度权限 + 设置审计已落地；KB/白名单仍 deferred。 +原 W4 任务 `governance-automation-2026-09-22`：授权范围已 done；PI compose 仍 deferred；见该 short-term。 +原 sysadmin 一期：二期细粒度 `system:*` + 设置审计（goose 00065）已落地；KB/白名单仍 deferred。 +FEATURE-MATRIX「Agent worktree 治理自动化」行：投影/deploy/recover/Darwin 从 deferred 挪到 landed；伞行保持 partial。 diff --git a/.doc/status/FEATURE-MATRIX.md b/.doc/status/FEATURE-MATRIX.md index 1515b0ca..5895600e 100644 --- a/.doc/status/FEATURE-MATRIX.md +++ b/.doc/status/FEATURE-MATRIX.md @@ -49,7 +49,7 @@ | 模块 | 声明范围 | 状态 | 发布关系 | 证据 | 剩余工作 / 关闭条件 | mutex | |------|----------|------|----------|------|---------------------|-------| -| Agent worktree 治理自动化 | 主目录保护、任务 worktree、机器认领、候选集成、dev 部署与安全清理 | partial | non_blocker | [方案](../remediation/2026-09-21-agent-workflow-governance-plan.md)；[L1 验收](../test-reports/2026-09-21-agent-governance-test-report.md)；[W1-B macOS](../ops/short-term/2026-09-22-agentctl-macos.md)；[W4 剩余](../ops/short-term/2026-09-22-governance-automation.md) | L1 与 macOS `with/docs apply/validate/integrate` 已合入。W4 landed：durable queue schema + enqueue/list/cancel/tick。仍 deferred：完整 docs projection apply、真实 deploy/recover 收据、PI 源码镜像 compose、跨机隔离与清理可见性。本行不升 done | `agent-workflow-governance` | +| Agent worktree 治理自动化 | 主目录保护、任务 worktree、机器认领、候选集成、dev 部署与安全清理 | partial | non_blocker | [方案](../remediation/2026-09-21-agent-workflow-governance-plan.md)；[L1 验收](../test-reports/2026-09-21-agent-governance-test-report.md)；[W1-B macOS](../ops/short-term/2026-09-22-agentctl-macos.md)；[W4](../ops/short-term/2026-09-22-governance-automation.md)；residual `modular-decouple-residual-2026-09-23` | L1 与 macOS `with/docs apply/validate/integrate` 已合入。W4 landed：durable queue + 完整 docs projection apply（行/整文 CAS）+ deploy/recover 真实收据闭环 + Darwin cwd 可见性测试。仍 deferred：PI 源码镜像 compose、跨机隔离、automation/w4 实现收敛。本行不升 done | `agent-workflow-governance` | | 意图识别 L1 | 18 类 Intent、三分支消解、写/只读分流、双标签 `DOC_BUSY`、intent 纯依赖边界 | done | non_blocker | [intent-recognition](../system-design/intent-recognition/)；[工作流作用域](../test-reports/2026-09-21-intent-workflow-scoping-test-report.md)；[审计](../audit/2026-09-13-conversation-intent-runtime-state.md)；[报告](../test-reports/2026-09-13-conversation-intent-runtime-state-test-report.md)；[双标签](../test-reports/assets/2026-09-15-conversation-intent-dual-tab/live.json)；[U1](../test-reports/2026-09-15-multi-intent-u1-contracts-test-report.md)–[U3](../test-reports/2026-09-15-multi-intent-u3-intentflow-pg-test-report.md) | **边界 before**：含 U9–U12 叙事混入 → **after**：U9–U12 迁至「多意图扩面」行。关闭：纯依赖边界回归即重开 | `intent` | | 多意图持久计划（U1–U8 基线） | app/intentflow 生命周期、HITL、默认 `legacy`、U1–U8 代码与安全基线 | partial | non_blocker（默认 legacy） | [设计](../system-design/2026-09-15-multi-intent-hitl-plan.md)；[U1](../test-reports/2026-09-15-multi-intent-u1-contracts-test-report.md)–[U8](../test-reports/2026-09-16-multi-intent-u8-task-generate-test-report.md)；[Wave2 真 PI](../test-reports/2026-09-16-wave2-real-pi-evidence-test-report.md)；[Track I1](../test-reports/2026-09-22-track-i1-query-owner-test-report.md) | **after Track I1**：生产组合根已去 Fake query owner，改真实 QueryOwner；receipt 含 auth scope digest；confirm 后走既有步骤内核 dispatcher。默认仍 `MULTI_INTENT_PLAN_TIER=legacy`。升 `auto_read/confirm` 需 Track I2（项目 allowlist + 频率门）。U9–U12 仍独立 dry-run | `intent-plan` | | 多意图扩面（U9–U12） | U9 LLM 分段实验；U10 mutate；U11 docgov；U12 workflow/run-control | partial | deferred_enhancement | [设计](../system-design/2026-09-15-multi-intent-hitl-plan.md)；[go/no-go GO](../ops/research/2026-09-16-wave3-pu6-pu8-go-no-go.md)；[脚手架](../test-reports/2026-09-16-pu8-u9-u12-flags-test-report.md)；[U9](../test-reports/2026-09-17-w4-u9-segment-test-report.md)；[U10](../test-reports/2026-09-17-w4-u10-mutate-test-report.md)；[U11](../test-reports/2026-09-17-w4-u11-docgov-test-report.md)；[U12](../test-reports/2026-09-17-w4-u12-run-control-test-report.md)；[2026-09-20 复核](../ops/research/2026-09-20-capability-enablement-impact-research.md) | U9 proposer 已实现和注入但未进入生产聊天分段调用；提议请求已带 reasoning profile。U10–U12 当前为 dry-run/validated-only adapter。历史直接调用/PI 测试继续有效，不代表 live 接线。逐域实现和验收，禁止以 `full` 一次放量 | `intent-plan` |