Main added one commit (#1030, b3eaffce): "context rot defense for /ship —
subagent isolation + clean step numbering (v0.18.2.0)". This restructured
the ship template to:
- Renumber fractional steps (3.47, 8.5, 8.75) to clean integers (1-20)
- Move document-release from post-PR (Step 8.5) to pre-PR subagent
dispatch (Step 18) so doc sync actually happens
- Wrap 4 heavy sub-workflows (coverage audit, plan completion audit,
Greptile triage, doc sync) in subagent dispatches for context isolation
Conflicts and resolutions:
- VERSION: kept this branch's 0.19.0.0 (higher than main's 0.18.2.0).
- CHANGELOG.md: kept both entries — 0.19.0.0 on top, 0.18.2.0 below,
contiguous version sequence preserved.
- ship/SKILL.md.tmpl: integrated this branch's WIP-squash sub-step with
main's renumbered step structure. My old "Step 5.75: WIP Commit Squash"
is now "Step 15.0: WIP Commit Squash" — a genuinely-nested sub-step
inside main's "Step 15: Commit (bisectable chunks)". Per main's note:
"Resolver sub-steps that are genuinely nested are preserved." Internal
refs updated (Step 6 → Step 15.1, Step 7 → push step).
- package.json: version mismatch with VERSION caught by gen-skill-docs
test. Bumped to 0.19.0.0 to match.
- ship/SKILL.md and golden ship fixtures: regenerated via
`bun run gen:skill-docs --host all` and re-snapshotted for
claude/codex/factory hosts.
Verification:
- bun test test/gen-skill-docs.test.ts: 348 pass / 0 fail
- bun test test/host-config.test.ts: passes
- bun run gen:skill-docs --host all: completes cleanly
Token-ceiling warnings on plan-ceo-review (29K), office-hours (26K),
ship (35K — grew slightly from main's 34K with the WIP squash addition).
Pre-existing concern, flagged as follow-up, not blocking.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1d0a6a0a59