Make the stacked-branch exception explicit in AGENTS.md #82

2026-09-30T16:35:32Z

weichen commented

2026-09-30 16:35:32 +00:00

同一文档两用（任务卡=PR 描述）：

Why: worktree feature 分支历史上出现过手动切的子分支（如 backend cross-session-reading-1-gcb7f79d），collaboration.md 有条件允许堆叠但 Dev 入口只字未提，成为自动化盲区。
Evidence: collaboration.md 共同基线节原文允许堆叠例外；历史编号子分支均已合入 main（origin/main..branch 为空）；precheck READY R0=7d45719869。
Impact: 仅 AGENTS.md——默认仍是 origin/main 单层分支+兄弟分支批次；堆叠须记录父任务/父PR、命名不嵌SHA、父→子合入、父合入后 sync 改回 base（分支保护强制）。
Refs: 任务卡 feature-branch-hierarchy-clause

同一文档两用（任务卡=PR 描述）： - Why: worktree feature 分支历史上出现过手动切的子分支（如 backend cross-session-reading-1-gcb7f79d），collaboration.md 有条件允许堆叠但 Dev 入口只字未提，成为自动化盲区。 - Evidence: collaboration.md 共同基线节原文允许堆叠例外；历史编号子分支均已合入 main（origin/main..branch 为空）；precheck READY R0=7d45719869。 - Impact: 仅 AGENTS.md——默认仍是 origin/main 单层分支+兄弟分支批次；堆叠须记录父任务/父PR、命名不嵌SHA、父→子合入、父合入后 sync 改回 base（分支保护强制）。 - Refs: 任务卡 feature-branch-hierarchy-clause

weichen added 4 commits 2026-09-30 16:35:33 +00:00

Record the task card for feature-branch-hierarchy-clause ee25cc3a02

Make the stacked-branch exception explicit in AGENTS.md 5194da2119

Why: worktree feature branches occasionally spawned child branches
(e.g. backend feature/cross-session-reading-1-gcb7f79d) outside the
task-start gate; collaboration.md conditionally allows stacked branches
but the Dev entry never said so, leaving stacking as an automation
blind spot with ad-hoc sha-embedded names.

Evidence: collaboration.md common-baseline section states the stacking
exception verbatim; historical numbered branches are all already merged
into main (origin/main..branch empty); precheck READY at R0=7d45719869.

Impact: AGENTS.md only. Default stays single-level branches from
origin/main with sibling branches for batch subtasks; stacking requires
recording the parent task/PR in the card, child naming without embedded
SHAs, parent-before-child merge order, and a sync back onto latest main
with PR base retargeted before merge (branch protection enforces this).

Refs: task card feature-branch-hierarchy-clause

Merge remote-tracking branch 'origin/main' into feature/branch-hierarchy-clause 9e213a89c3

Record the sync checkpoint

ci / test (pull_request) Failing after 1m37s

Details

9bd9ea8f1c

weichen merged commit aa87dcff82 into main

2026-09-30 16:35:35 +00:00

weichen referenced this pull request

2026-09-30 16:37:17 +00:00

Close the branch-hierarchy-clause task card (PR #82 merged) #83

weichen referenced this issue from a commit

2026-09-30 16:37:21 +00:00