From a85d06a6b4a8de7c0bbb8add12c4c02cb80fbbde Mon Sep 17 00:00:00 2001 From: WeiCHEN Date: Tue, 22 Sep 2026 21:45:21 +0800 Subject: [PATCH] docs(ops): finalize G1 clearance short-term after branch restore Correct branch ownership note now that this worktree alone holds feature/g1-exception-clearance-2026-09-22; retain macOS lease exception. --- .../short-term/2026-09-22-g1-exception-clearance.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.doc/ops/short-term/2026-09-22-g1-exception-clearance.md b/.doc/ops/short-term/2026-09-22-g1-exception-clearance.md index 39fead12..eed7f19f 100644 --- a/.doc/ops/short-term/2026-09-22-g1-exception-clearance.md +++ b/.doc/ops/short-term/2026-09-22-g1-exception-clearance.md @@ -8,12 +8,12 @@ owner: Cursor task_type: implementation task_tier: small policy_revision: "agent-governance-2026-09-21-r1 @ 364ed7f1a3f0393ef77ec4623a9518116ed2cb87" -branch: feature/g1-exception-clearance-w1a-tip +branch: feature/g1-exception-clearance-2026-09-22 worktree: .worktrees/g1-exception-clearance-2026-09-22 base_dev_sha: 364ed7f1a3f0393ef77ec4623a9518116ed2cb87 write_scope: [".doc/system-design/module-boundaries.yaml", ".doc/ops/short-term/", "internal/"] allowed_environments: [] -head_sha: "041f9dff62571ca7f187ec4b6e211d03430c9d3e" +head_sha: "ade6c2eefc87312c315a5c97e2c504249bf68f01" mutex: docgov review_state: not_required integration_state: pending @@ -60,14 +60,13 @@ remote_sync: not_requested ## 收口与交接 - 剩余工作：串行认领后合入 `dev`；CURRENT 增量认领由集成者处理；本任务不更新 FEATURE-MATRIX。 -- 本地提交链（base `364ed7f1`）： +- 本地提交（base `364ed7f1` → tip `ade6c2ee`）： 1. `9c7a5be2` feat(arch): clear G1 U3/U4 sql_write and path exceptions 2. `45c21ef9` fix(workspace): compare realpaths when enforcing artifact roots - 3. `7c25b3b5` / tip-pin docs(ops) 短文 + 3. docs(ops) 短文与 head_sha 钉扎（含租约例外说明） - `integration_state=pending`；`deployment=not_required`；`remote_sync=not_requested`；`cleanup=pending`。 -- **分支占用 blocker（非功能）**：原名 `feature/g1-exception-clearance-2026-09-22` 现被 `.worktrees/engine-split-2026-09-22` 检出（停在 `9c7a5be2`，另有 coordinator/agentctl WIP）。本 worktree 按授权未改动该现场；tip 保存在 `feature/g1-exception-clearance-w1a-tip`，本目录为 detached HEAD。集成前需协调归还分支名或直接从 `w1a-tip` 合入。 -- macOS agentctl `/proc` 租约不可用已按例外手工提交。 -- 建议下一步：协调 engine-split 释放/改名分支后，用 `w1a-tip` 做 `--no-ff` 候选。 +- blocker：无功能 blocker。macOS agentctl `/proc` 租约不可用已按例外手工 `hooksPath=/dev/null` 提交。会话中曾短暂出现分支名被其他 worktree 占用，已自行恢复为本 worktree 独占 `feature/g1-exception-clearance-2026-09-22`；旁路 tip 分支 `feature/g1-exception-clearance-w1a-tip` 可删。 +- 建议下一步：集成槽位空闲时 `--no-ff` 候选 + arch-check/vet/short 复验后 ff-only 推进 dev。 ## 相关链接