docs(skill): topology-base PRs and guideline PR count for CyClaw-Optimize - #811
Conversation
…mize Reword post-3.5 steps so branches/PRs use the Step 3.5 topology base (not a blanket origin/main default), document session merge order as lowest PR number to highest with parent-before-child when stacked, and treat focused PR count as a guideline rather than a quota.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: cc2c05add9
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| lands on `main` (often via squash), refresh each open child onto current | ||
| `origin/main` (or retarget base to `main` after rebase) before merging the next. |
There was a problem hiding this comment.
When a stacked parent contains multiple commits and is squash-merged, an ordinary git rebase origin/main on the child replays the parent's original commits from the old merge base; this can conflict or reintroduce parent changes. The new squash-aware instruction says only to “refresh” or rebase, so direct the agent to replay only child commits with git rebase --onto origin/main <parent-tip> <child> (or an equivalent child-only operation) before retargeting the PR.
Useful? React with 👍 / 👎.
| groups findings into a **small set of reviewable PR-sized chunks** (about 1–4 | ||
| when several independent fixes earn their keep — **a guideline, not a quota**; | ||
| do not invent low-value PRs to hit a number), and opens one focused pull request |
There was a problem hiding this comment.
Changing the canonical Claude workflow to a 1–4 guideline leaves CLAUDE.md:424-428 describing the Kimi port as producing ~5 PRs and .codex/skills/cyclaw-optimize/SKILL.md:19-22 retaining the same quota language. Invocations through those documented agent paths can therefore continue the behavior this commit intends to stop; update the derived docs/ports or explicitly document why they diverge.
AGENTS.md reference: AGENTS.md:L78-L82
Useful? React with 👍 / 👎.
1 participant
What
Wording-only update to CyClaw-Optimize (skill + slash command mirrors):
origin/main/base=main.” Step 4, branch permissions, and gotchas now use the topology base from 3.5 (independent → main; stacked → parent branch; consolidated → owner branch). MCP examples cover both independent and stackedbase.No runtime code, bootstrap, or invariant changes.
Why / benefit
Reduces the “five peers from main + half-stack” steering that produced dirty stacked children (e.g. #803 after #802) while keeping Step 3.5’s consolidate/stack mechanics.
Risk to monitor
Merge topology
Test plan
.claude/skills/CyClaw-Optimize/SKILL.mdand.claude/commands/CyClaw-Optimize.md