Skip to content

Promote develop to main: configure.sh check mode + history-rewrite signing rule - #395

Merged
ptr727 merged 2 commits into
mainfrom
develop
Jul 22, 2026
Merged

Promote develop to main: configure.sh check mode + history-rewrite signing rule#395
ptr727 merged 2 commits into
mainfrom
develop

Conversation

@ptr727

@ptr727 ptr727 commented Jul 22, 2026

Copy link
Copy Markdown
Owner

Promotes the develop line to main. Merge-commit promotion (not squash); develop is the head and is never deleted.

Included (2 commits)

  • Adopt the fleet check mode into the configure.sh canonical #393adopt the fleet check mode into the configure.sh canonical. Keeps the hub's registry-driven apply logic and adds a payload-driven, repo-agnostic check mode (rulesets/settings/security, non-zero on drift). apply also enables Dependabot security. shellcheck-clean, verified live against a release and an operational repo. The fleet's forked/stale copies now re-vendor onto the new canonical (parked in the divergence ledger).
  • Add a git-hygiene rule for signing identity during a history rewrite #394git-hygiene rule for signing identity during a history rewrite. A rewrite that re-signs commits (e.g. filter-repo for PII) must re-identify any not-yours commit's committer to the signing identity — GitHub verifies the signature against the committer, so a your-key signature over a bot/web-flow committer is unknown_key/unverified. Two-gate rule in AGENTS.md + cross-reference in docs/repo-config-carry.md.

Verification

spec/validate.py green; configure.sh shellcheck-clean and check verified live; markdownlint clean; trial merge conflict-free.

🤖 Generated with Claude Code

ptr727 added 2 commits July 22, 2026 16:09
Keep the hub's registry-driven apply logic and add a payload-driven, repo-agnostic check mode (rulesets/settings/security, non-zero on drift). apply also enables Dependabot security. shellcheck-clean, verified live against a release and an operational repo. The fleet now re-vendors onto the new canonical (parked in the divergence ledger).
…394)

A history rewrite that re-signs commits (e.g. filter-repo for PII) must re-identify any not-yours commit's committer to the signing identity - GitHub verifies the signature against the committer, so a your-key signature over a bot/web-flow committer is unverified. Two-gate rule added to AGENTS.md + cross-ref in repo-config-carry.md.
Copilot AI review requested due to automatic review settings July 22, 2026 23:50

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Promotes the develop line to main while also landing two governance/tooling updates: adding a payload-driven check mode to repo-config/configure.sh (alongside the existing apply behavior), and documenting a stricter signing/identity rule for history rewrites so signatures remain verifiable under require-signed-commits rulesets.

Changes:

  • Extend repo-config/configure.sh with apply and check subcommands (defaulting to apply for backwards compatibility), and ensure apply also enables Dependabot security features while check exits non-zero on drift.
  • Update onboarding and repo-config documentation to reflect the new configure.sh apply + configure.sh check flow.
  • Add an explicit AGENTS.md rule for history rewrites: scope rewrites to the minimum necessary commits, and re-identify rewritten non-owner commits to the signing identity before re-signing.

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.

Show a summary per file
File Description
STANDUP.md Updates standup procedure to run configure.sh apply followed by configure.sh check.
spec/divergences.json Collapses prior configure.sh divergence dispositions into a single re-vendor disposition reflecting the new canonical.
reports/divergences.md Regenerates divergence report to match updated dispositions and current drift counts.
repo-config/README.md Documents new configure.sh apply/check modes and Dependabot security enablement.
repo-config/configure.sh Implements payload-driven check mode, keeps apply behavior as default, and enables Dependabot security features during apply.
docs/repo-config-carry.md Updates carry/apply instructions to use configure.sh apply + configure.sh check, and references the new history-rewrite rule.
AGENTS.md Adds a two-gate history-rewrite signing rule to prevent unverified signatures under require-signed-commits.

@ptr727
ptr727 merged commit 59c8f81 into main Jul 22, 2026
7 checks passed
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.

2 participants