Skip to content

chore: upgrade to the current RSR template (48671ce) - #10

Merged
hyperpolymath merged 1 commit into
mainfrom
chore/template-upgrade-48671ce
Nov 13, 2026
Merged

hyperpolymath merged 1 commit into
mainfrom
chore/template-upgrade-48671ce

Conversation

@hyperpolymath

Copy link
Copy Markdown
Owner

Summary

This upgrades bactrian to the current RSR template. It uses a three-way merge.

  • Base: 889f7f7, the template commit this repo was cut from (from the deed's :parent-pin).
  • Theirs: a fresh mint of rsr-template-repo main at 48671ce (tree 2c0d77c).
  • Ours: this repo's main at e0b9b65.

The two urgent fixes are in. The Dogfood Gate and Hypatia scan workflows pin OTP 27.3.4.19, and scripts/check-lock-sync.sh is the template's, with the self-SHA clause.

Changes

  • Project files kept: the repo's own src/interface/ffi/src/main.zig, docs/status/PROOF-STATUS.adoc, .machine_readable/ai/PLACEHOLDERS.adoc, .machine_readable/coaptation/witness-map.ncl and .machine_readable/mint-verbatim.txt keep this repo's version. No project source or test file changed.
  • Template layer: files the repo never changed take main. That is 97 files added, 128 changed and 1 removed (GEMINI.md, which the template dropped). The files both sides changed merged cleanly by three-way merge.
  • Workflows: no workflow conflicted. The repo's own changes there were Dependabot bumps already on main (smtp-notify-action 0.5.1, softprops/action-gh-release 3.0.4 and sonarqube-scan-action 8.4.1) and one comment line. The merge keeps them. No standards pin or lock entry was edited by hand.
  • Lock: .github/workflows/actions.lock was rebuilt from the merged workflows. Every record is copied from the template's lock or this repo's old lock. None was written by hand. scripts/check-lock-sync.sh passes.
  • Repo map: docs/architecture/REPOSITORY-MAP.adoc was regenerated with just repo-map, so the determinism test passes.
  • .a2ml: none exist in the tree. None were created or deleted.
  • Deed pin: :parent-pin, :template-commit and :template-tree moved to 48671ce and 2c0d77c. No other deed line changed. :repo-uuid and every (anchor ...) clause are unchanged.
  • Dependabot: this repo has no open Dependabot PRs. Bumps already merged into main are kept.

Explicitly left out

  • CLAUDE.md and .machine_readable/arrival-pack/ are unchanged. The A7 thread owns them for a later wave.
  • No licence or SPDX change. LICENSE, LICENSES/ and the repo's licence files are as they were.
  • archetypes/, build/docs-seed/, build/templates/ and rsr-template-repo_chora.deed are not added, because this repo removed them at mint.

RSR Quality Checklist

  • Commit is signed and verified.
  • Project files are unchanged.
  • No .a2ml file created, and no :repo-uuid or anchor change.
  • scripts/check-lock-sync.sh passes.
  • just validate-claude-md passes.
  • just test was not run to a pass. zig is not installed where I worked (idris2 and julia were not either). It fails the same way on main.
  • tests/workflows/kyaml_format_test.sh and rhodibot_canary_test.sh need Mike Farah yq. It could not be installed where I worked, so they were not run to a pass.
  • tests/ffi_strings_test.sh needs zig and tests/e2e/chain_mint_test.sh needs uuidgen. Neither was available.
  • tests/workflows/governance_policy_test.sh fails. See the known failure below.

Testing

I compared every test under tests/ here with a clean clone of main.

  • scripts/check-lock-sync.sh: passes.
  • just validate-claude-md: passes.
  • tests/shape/repo_map_determinism_test.sh, tests/workflows/edict_trial_test.sh, the lock, deed and mint-gate tests: pass.
  • main already fails check_adoc_renders_test, kyaml_ratchet_test and julia_fmt_test. They fail the same way here. use_template_mint_test failed on main and passes here.
  • New failures against main, all explained: governance_policy_test (known failure below), kyaml_format_test and rhodibot_canary_test (Mike Farah yq missing), ffi_strings_test (zig missing), chain_mint_test (uuidgen missing).

Known failure approved by the owner. governance_policy_test.sh asserts a "## Proofs" section in CLAUDE.md. This PR must not touch CLAUDE.md, so the test fails until A7's wave lands. A7's wave will clear it.

Owner decisions

  • The template has a LICENSE.adoc that this repo does not have. I did not add it.
  • The owner merges this PR. I will not.
  • The applier (pins and lock) runs after this PR, as the owner ruled for this batch.

Generated by Claude Code

This is a three-way upgrade. The base is 889f7f7, the template commit
this repo was cut from. Theirs is rsr-template-repo main at 48671ce.
Ours is main.

Project files are unchanged. Template files the repo never changed take
main. The workflows that carried the old pins now come from main, with
OTP 27.3.4.19 and the current lock gate. actions.lock was rebuilt from
the merged workflows. The deed template pin moved to 48671ce. The repo
map was regenerated.

CLAUDE.md, the arrival pack, licence files and :repo-uuid are untouched.

Co-Authored-By: Claude <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Nov 13, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

Too many files!

This PR contains 225 files, which is 125 over the limit of 100.

To get a review, reduce the PR to 100 files or fewer by splitting it into smaller PRs or changing its base branch.

Upgrade to a paid plan to raise the limit.

This review couldn't start because sufficient usage credits or metered capacity aren't available. Add credits or update usage-based reviews in the billing tab, then retry.

Run configuration

Commits

Reviewing files that changed from the base of the PR and between e0b9b65 and 2228913.

Files ignored due to path filters: 1

  • .github/workflows/actions.lock is excluded by !**/*.lock
Files selected for processing: 225

  • .claude/hooks/session-start.sh
  • .claude/settings.json
  • .coderabbit.yaml
  • .devcontainer/Containerfile
  • .gitbot-fleet/enrolment.json
  • .gitbot-fleet/report-backs/README.md
  • .github/SECURITY.md
  • .github/actions/squabble/README.adoc
  • .github/actions/squabble/action.yml
  • .github/actions/squabble/install.sh
  • .github/actions/squabble/run.sh
  • .github/hooks/scan-secrets.sh
  • .github/hooks/validate-deed.sh
  • .github/hooks/validate-k9.sh
  • .github/label-classifier.json
  • .github/labels.json
  • .github/rulesets/README.adoc
  • .github/rulesets/base.json
  • .github/rulesets/branch-floor.json
  • .github/rulesets/require-linear-history.json
  • .github/rulesets/require-signed-commits.json
  • .github/workflows/README.adoc
  • .github/workflows/codeql.yml
  • .github/workflows/dependabot-automerge.yml
  • .github/workflows/docker-build.yml
  • .github/workflows/dogfood-gate.yml
  • .github/workflows/dogfood-summary.yml
  • .github/workflows/eclexiaiser-validate.yml
  • .github/workflows/empty-linter.yml
  • .github/workflows/estate-rules.yml
  • .github/workflows/fork-governance.yml
  • .github/workflows/governance.yml
  • .github/workflows/groove-check.yml
  • .github/workflows/hypatia-scan.yml
  • .github/workflows/label-triage.yml
  • .github/workflows/labels.yml
  • .github/workflows/lock-sync-gate.yml
  • .github/workflows/main-estate-audit.yml
  • .github/workflows/mirror.yml
  • .github/workflows/ossf-best-practices.yml
  • .github/workflows/proven-tests.yml
  • .github/workflows/quality.yml
  • .github/workflows/release.yml
  • .github/workflows/rsr-compliance-canary.yml
  • .github/workflows/rust-ci.yml
  • .github/workflows/scorecard.yml
  • .github/workflows/secret-scanner.yml
  • .github/workflows/security-policy.yml
  • .github/workflows/sonarqube.yml
  • .github/workflows/squabble.yml
  • .github/workflows/static-analysis-gate.yml
  • .github/workflows/verdict-grid-publish.yml
  • .github/workflows/workflow-linter.yml
  • .gitignore
  • .hypatia-ignore
  • .machine_readable/coaptation/README.adoc
  • .machine_readable/coaptation/coapt.ncl
  • .machine_readable/coaptation/core/Coaptation.idr
  • .machine_readable/coaptation/extract-facts.sh
  • .machine_readable/coaptation/receipts/latest.toml
  • .machine_readable/contractiles/intend/intend.k9.ncl
  • .machine_readable/contractiles/must/must.k9.ncl
  • .machine_readable/contractiles/trust/trust.k9.ncl
  • .machine_readable/internal-links-allow.txt
  • .machine_readable/policies/README.adoc
  • .machine_readable/policies/hypatia-rule-order.json
  • .machine_readable/required-contexts-allow.txt
  • .machine_readable/root-allow.txt
  • .machine_readable/scripts/maintenance/maint-assault.sh
  • .machine_readable/testing/adversarial-content.k9.ncl
  • CHANGELOG.adoc
  • CODE_OF_CONDUCT.adoc
  • CONTRIBUTING.adoc
  • GEMINI.md
  • Justfile
  • README.adoc
  • bactrian_chora.deed
  • benches/baseline.json
  • benches/template_bench.sh
  • build/container/README.adoc
  • build/just/assess.just
  • build/just/container.just
  • build/just/provision-lib.sh
  • build/just/repo-init.just
  • build/just/validate.just
  • ci/.pre-commit-config.yaml
  • docs/AI_INSTALLATION_GUIDE.adoc
  • docs/HYPATIA-RULE-ORDER.adoc
  • docs/MAINTAINERS.adoc
  • docs/SETUP.adoc
  • docs/architecture/REPOSITORY-MAP.adoc
  • docs/governance/CRG-CRITERIA.adoc
  • docs/onboarding/QUICKSTART-DEV.adoc
  • docs/onboarding/QUICKSTART-USER.adoc
  • docs/onboarding/llm-warmup-maintainer.adoc
  • docs/onboarding/llm-warmup-user.adoc
  • docs/reports/compliance/RSR-TEMPLATE-DAMAGE-2026-10-30.adoc
  • docs/status/PROOF-NEEDS.adoc
  • mise.toml
  • scripts/adopt-canon-lockstep.sh
  • scripts/bench-stats.jq
  • scripts/campaigns/repo-map-trim.campaign
  • scripts/canon-pin-check.sh
  • scripts/chain-mint.sh
  • scripts/check-bench-regression.sh
  • scripts/check-container-pins.sh
  • scripts/check-escape-hatches.sh
  • scripts/check-hypatia-ignore.sh
  • scripts/check-hypatia-rule-order.sh
  • scripts/check-ijson-jcs.sh
  • scripts/check-internal-links.sh
  • scripts/check-invisible-characters.sh
  • scripts/check-lock-sync.sh
  • scripts/check-mint-drift.sh
  • scripts/check-mint-tokens.sh
  • scripts/check-mint-tools.sh
  • scripts/check-mise-language.sh
  • scripts/check-no-a2ml.sh
  • scripts/check-no-placeholders.sh
  • scripts/check-proofs.sh
  • scripts/check-required-contexts.sh
  • scripts/check-spdx-headers.sh
  • scripts/check-variant-drift.sh
  • scripts/check-workflow-edges.sh
  • scripts/compute-bench-baseline.sh
  • scripts/deed-field.sh
  • scripts/edict-run.rs
  • scripts/emit-aggregate-inputs.sh
  • scripts/format-container-kyaml.sh
  • scripts/gen-repo-map.sh
  • scripts/governance-badge.js
  • scripts/ijson-jcs-cli.js
  • scripts/is-template-tree.sh
  • scripts/kyaml-format.sh
  • scripts/lock-sync-fix.sh
  • scripts/merge-actions-lock.rs
  • scripts/migrate-wellknown-to-www.sh
  • scripts/pin-container-digests.sh
  • scripts/prune-archetype-modules.sh
  • scripts/prune-dependabot-ecosystems.rs
  • scripts/render-mise.sh
  • scripts/replay-mint.sh
  • scripts/resolve-template-pin.sh
  • scripts/rsr-campaign.sh
  • scripts/run-proven-suite.sh
  • scripts/rust-tool.sh
  • scripts/scan-dangerous.sh
  • scripts/strip-instruction-blocks.rs
  • scripts/survey-template-damage.sh
  • scripts/sweep-wellknown.sh
  • scripts/uuid-v8.sh
  • scripts/uuid5-url.sh
  • scripts/validate-template.sh
  • scripts/verdict-grid-lane.sh
  • src/interface/Abi/Foreign.idr
  • src/interface/Abi/Types.idr
  • tests/aspect_tests.sh
  • tests/e2e.sh
  • tests/e2e/chain_mint_test.sh
  • tests/e2e/julia_mint_test.sh
  • tests/e2e/language_profiles_mint_test.sh
  • tests/e2e/template_instantiation_test.sh
  • tests/e2e/use_template_mint_test.sh
  • tests/ffi_strings_test.sh
  • tests/proven_suite_test.sh
  • tests/run_proven_suite_test.sh
  • tests/shape/rust_cli_root_shape_test.sh
  • tests/workflows/adopt_canon_lockstep_test.sh
  • tests/workflows/archetype_lock_merge_test.sh
  • tests/workflows/canon_pin_check_test.sh
  • tests/workflows/chain_tree_of_test.sh
  • tests/workflows/check_ijson_jcs_test.sh
  • tests/workflows/check_lock_sync_test.sh
  • tests/workflows/check_no_a2ml_test.sh
  • tests/workflows/coaptation_families_test.sh
  • tests/workflows/container_kyaml_test.sh
  • tests/workflows/dependabot_automerge_test.sh
  • tests/workflows/edict_trial_test.sh
  • tests/workflows/governance_badge_test.js
  • tests/workflows/governance_badge_test.sh
  • tests/workflows/governance_policy_test.sh
  • tests/workflows/hypatia_ignore_test.sh
  • tests/workflows/hypatia_rule_order_test.sh
  • tests/workflows/internal_links_test.sh
  • tests/workflows/kyaml_format_test.sh
  • tests/workflows/kyaml_ratchet_test.sh
  • tests/workflows/lock_sync_fix_test.sh
  • tests/workflows/migrate_wellknown_date_test.sh
  • tests/workflows/mint_cleanup_test.sh
  • tests/workflows/mint_gates_test.sh
  • tests/workflows/mint_tools_preflight_test.sh
  • tests/workflows/non_interactive_mint_test.sh
  • tests/workflows/replay_mint_env_test.sh
  • tests/workflows/repo_map_newline_test.sh
  • tests/workflows/repo_map_quotes_test.sh
  • tests/workflows/resolve_template_pin_test.sh
  • tests/workflows/rhodibot_canary_test.sh
  • tests/workflows/rsr_campaign_tokenless_test.sh
  • tests/workflows/secret_scanner_contract_test.sh
  • tests/workflows/self_name_pass_test.sh
  • tests/workflows/squabble_gate_test.sh
  • tests/workflows/uuid5_url_test.sh
  • tests/workflows/uuid_v8_test.sh
  • tests/workflows/verdict_grid_test.sh
  • tests/workflows/workflow_edges_test.sh
  • tests/workflows/workflow_evidence_test.sh
  • tests/workflows/workflow_gap_fixes_test.sh
  • verification/proofs/README.adoc
  • verification/proofs/agda/MANIFEST
  • verification/proofs/agda/Properties.agda
  • verification/proofs/idris2/ABI/Compliance.idr
  • verification/proofs/idris2/ABI/Foreign.idr
  • verification/proofs/idris2/ABI/Layout.idr
  • verification/proofs/idris2/ABI/Platform.idr
  • verification/proofs/idris2/ABI/Pointers.idr
  • verification/proofs/idris2/MANIFEST
  • verification/proofs/idris2/Types.idr
  • verification/proofs/lean4/MANIFEST
  • verification/proofs/tlaplus/MC.cfg
  • verification/proofs/tlaplus/MC.tla
  • verification/proofs/tlaplus/StateMachine.tla
  • www/errors/430.html
  • www/runbooks/deploy.adoc
  • www/schemas/aibdp-schema-v0.2.json
  • www/tests/check-bind-safety.sh

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@sonarqubecloud

Copy link
Copy Markdown

@hyperpolymath
hyperpolymath marked this pull request as ready for review November 13, 2026 20:11
@chatgpt-codex-connector

Copy link
Copy Markdown
Codex Review Summary: ❌ Failed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ❌ Failed 2026-11-13T20:11:09.427973Z
We couldn’t complete this review. Comment @codex review to try again.
2228913 Draft marked ready
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

Copy link
Copy Markdown
Owner Author

CI status on 2228913. Five checks are red that were not red on main for these reasons: Fork governance verdict, openssf-compliance, DEED syntax, estate-rules and Proven 3-outcome test & bench suite. The first is derived: it requires the DEED syntax lane. I am not pushing the fix yet, because a push to this branch currently reports a bypassed code_coverage rule and the sweep session is taking that to the owner. This is a diagnosis only.

  • Caused by my merge, fix prepared but not pushed: I kept this repo's old .machine_readable/mint-verbatim.txt and did not fill {{TOKEN}} text in new template files the way the mint does, so the placeholder gates fail (openssf-compliance, part of estate-rules). I left .cursorrules and .windsurfrules in place although the template retired them, which fails the root-shape gate. .hypatia-ignore still exempts build/docs-seed/, which this repo does not have. The template's mint removes that exemption together with the matching structural_drift entry in .machine_readable/policies/hypatia-rule-order.json, so both need to go.
  • Needs an owner decision: the root-shape gate requires LICENSE.adoc. This repo has none, and I was told not to add licence files. Also bactrian_chora.deed line 228 is 1159 octets and the new DEED syntax check allows 998. The same line is in main.

Known owner-approved red: governance_policy_test (A7's CLAUDE.md wave will clear it). The same changes are already on Apodeixis.jl#12.


Generated by Claude Code

@hyperpolymath
hyperpolymath merged commit d5e5111 into main Nov 13, 2026
42 of 47 checks passed
@hyperpolymath
hyperpolymath deleted the chore/template-upgrade-48671ce branch November 13, 2026 20:27
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.

3 participants