Skip to content

#208 Switch to shipping-work's pr merge mode - #209

Merged
gregoryfoster merged 7 commits into
mainfrom
208-pr-merge-mode
Nov 17, 2026
Merged

gregoryfoster merged 7 commits into
mainfrom
208-pr-merge-mode

Conversation

@gregoryfoster

Copy link
Copy Markdown
Member

Refs #208

Switches this repo to shipping-work's pr merge mode. After this merges, shipping-work, the daily skills refresh hook and the weekly context-cadence workflow open or update a PR instead of pushing to main.

Draft until the operator decides how this PR itself lands. Its own ship runs direct, because the knob isn't on main yet. The two choices are on #208.

Commits

  1. 9426f06: the workflow brought up to the template. context-cadence.yml is re-rendered direct, byte for byte, to install-cadence.sh at skills 063ba5d. The installed file was 114 lines behind, and --check on main already exited 3 (drift report and delta check STALE). Also in this render:
    • the checkout moves from @v5 to @v7;
    • each script is resolved on its own path;
    • a counts sweep;
    • a drift report for every doc;
    • a recorded-deltas check.
  2. 4c3f6a1: the knob. .skills/merge_mode reads pr, plus the pr render, a 171-line delta. The installer reads the knob from the primary checkout, which has no knob until this merges, so the render was made in a scratch clone of this branch with the knob committed. A clone of the branch tip re-renders it unchanged: --check there reads re-render: none and merge mode: pr.
  3. 87ed982: the docs.
    • DEPLOYMENT.md gets a new section, "main takes pull requests". It covers the merge method, rollback to merge commits, and the two bot PRs.
    • DEPLOYMENT.md's "measurement commit" paragraph and its Dependabot line change to match.
    • SKILLS.md's refresh-hook section is rewritten for pr mode.

Verification

  • Default suite: 2062 passed, 1 skipped, the same as the baseline. ruff check . is clean.
  • doctor.sh exits 0. The doc check flags the knob-rendered artifact, as it is designed to; see commit 2.
  • Only possible after the merge: install-cadence.sh --check and merge-mode.sh from the main checkout, and the first pr-mode runs of the hook and the cadence. These are tracked on Switch to shipping-work's pr merge mode (.skills/merge_mode) #208.

🤖 Generated with Claude Code

gregoryfoster and others added 3 commits November 17, 2026 15:53
The installed workflow was 114 lines behind install-cadence.sh at 063ba5d:
its --check reported the drift report and the delta check STALE and exited 3
on main before this change. This is the direct render, byte for byte, so the
pr render that follows is reviewable as its own delta.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
.skills/merge_mode says pr, so shipping-work, the skills refresh hook and the
weekly cadence workflow open or update a PR instead of pushing to main.

The workflow is install-cadence.sh's pr render. The installer reads the knob
from the primary checkout, which has none until this merges, so it was
rendered in a scratch clone of this branch with the knob committed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… open PRs

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
gregoryfoster and others added 4 commits November 17, 2026 16:41
…un it

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… be the bot's

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@gregoryfoster
gregoryfoster marked this pull request as ready for review November 17, 2026 17:11
@gregoryfoster
gregoryfoster merged commit a072ba5 into main Nov 17, 2026
4 checks passed
@gregoryfoster
gregoryfoster deleted the 208-pr-merge-mode branch November 17, 2026 17:11
gregoryfoster pushed a commit to gregoryfoster/skills that referenced this pull request Nov 20, 2026
…ies its render

On a branch that changed .skills/merge_mode, the #647 hit offered only
"re-render after this branch merges", and its --check excerpt compared with
the primary's mode, so on a branch already carrying the pr render it said
`behind` and advised undoing a correct render (CannObserv/replicator#209).

It now reads the knob as the branch commits it (HEAD's tree, merge-mode.sh's
grammar; absent is direct), the file the job reads, and runs
install-cadence.sh --check --merge-mode <mode>:
- `re-render: none`: the branch already carries its render; after the merge
  --check from the primary should read none.
- otherwise: the in-branch `install-cadence.sh --merge-mode <mode>` first,
  then re-rendering after the merge.
- an unusable committed knob is said, and no command is offered.

Still a hit, exit 1, both ways: the branch changes how work lands, and the
merge leaves a check to read.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant