Skip to content

Rename default branch references from master to main#702

Merged
shanselman merged 2 commits into
mainfrom
user/kmahone/rename-master-to-main
Jun 8, 2026
Merged

Rename default branch references from master to main#702
shanselman merged 2 commits into
mainfrom
user/kmahone/rename-master-to-main

Conversation

@kmahone

@kmahone kmahone commented Jun 5, 2026

Copy link
Copy Markdown
Collaborator

Clawsweeper bot assumes a default branch of 'main' in some cases. See
openclaw/clawsweeper#252

We will rename the master branch to main. We need to update all references to master in the repo.

Do not merge until the default branch has actually been renamed.

GitHub default branch is renaming from master to main. Update repository content that hard-codes the old name so contributors, CI, release tooling, and dev scripts all work against main.

Graceful transition: CI workflow triggers list both [main, master].

Deliberately NOT changed:

  • Third-party URLs (github/gitignore, snakers4/silero-vad) that reference upstream master branches

  • UX terminology (Master switch, Master toggle, master control region) in tray pages and settings - unrelated to git

  • GitVersion.yml regex ^(master|main)$ already accepts both

Validation: ./build.ps1, Shared.Tests (2045/29 skipped), Tray.Tests (940), YAML lint on workflows, autoreview --help, run-app-local.ps1 Get-Help shows -AllowNonMain with -AllowNonMaster alias.

Keith Mahoney and others added 2 commits June 5, 2026 12:03
GitHub default branch is renaming from master to main. Update repository content that hard-codes the old name so contributors, CI, release tooling, and dev scripts all work against main.

Graceful transition: CI workflow triggers list both [main, master] and run-app-local.ps1 keeps -AllowNonMaster as a deprecated alias of -AllowNonMain for one cycle so anyone with a stale local master branch is not abruptly broken.

Deliberately NOT changed:

- Third-party URLs (github/gitignore, snakers4/silero-vad) that reference upstream master branches

- UX terminology (Master switch, Master toggle, master control region) in tray pages and settings - unrelated to git

- GitVersion.yml regex ^(master|main)$ already accepts both

Validation: ./build.ps1, Shared.Tests (2045/29 skipped), Tray.Tests (940), YAML lint on workflows, autoreview --help, run-app-local.ps1 Get-Help shows -AllowNonMain with -AllowNonMaster alias.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Per follow-up feedback, no graceful alias for the renamed parameter; -AllowNonMain is the only switch going forward.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@clawsweeper

clawsweeper Bot commented Jun 5, 2026

Copy link
Copy Markdown

Codex review: needs changes before merge. Reviewed June 5, 2026, 3:14 PM ET / 19:14 UTC.

Summary
The PR updates default-branch references from master to main across docs, CI workflow branch filters, the autoreview helper, and the local app launch script.

Reproducibility: yes. for the PR defect from source inspection: the PR head declares only $AllowNonMain, so existing -AllowNonMaster invocations no longer bind. I did not execute PowerShell validation because this review is read-only.

Review metrics: 2 noteworthy metrics.

  • Changed files: 8 files, 31 additions, 31 deletions. The PR is mostly name substitution, but it spans docs, workflows, and helper scripts that contributors and automation use.
  • Workflow files: 2 workflow files changed. Branch filters are part of the default-branch migration and need timing review even though the YAML change is small.

Merge readiness
Overall: 🦪 silver shellfish
Proof: 🌊 off-meta tidepool
Patch quality: 🦪 silver shellfish
Result: blocked by patch quality or review findings.

Overall follows the weaker of proof and patch quality, so missing proof can cap an otherwise strong patch.

Rank-up moves:

  • Restore -AllowNonMaster as an alias for -AllowNonMain.
  • Keep the PR paused until the default branch has actually moved to main or document the exact cutover sequencing in the PR body.

Risk before merge

  • [P1] Merging before the GitHub default branch is actually renamed would make release docs and run-app-local.ps1 expect main while the repository is still based on master.
  • [P1] Dropping -AllowNonMaster will break existing local scripts or contributor commands that use the current documented branch-preview flag.

Maintainer options:

  1. Keep the old launch flag as an alias (recommended)
    Add AllowNonMaster as an alias for the new AllowNonMain parameter so existing local launch commands continue to bind while new docs use the new name.
  2. Hold until the branch cutover is live
    Keep the PR paused or draft until the repository default branch has moved to main, because the docs and branch guard intentionally target the post-cutover state.
Copy recommended automerge instruction
@clawsweeper automerge

Special instructions:
Restore backward compatibility for `run-app-local.ps1` by adding `[Alias("AllowNonMaster")]` to the new `$AllowNonMain` parameter, keep `-AllowNonMain` as the documented canonical switch, add or preserve a help/parameter-binding smoke where practical, and leave the workflow branch trigger strategy unchanged.

Next step before merge

  • [P2] A narrow automated repair can restore the removed AllowNonMaster alias; the final merge timing still remains a maintainer/admin decision.

Security
Cleared: No concrete security or supply-chain concern was found; the workflow edits only reorder branch filters and the scripts do not add new code execution sources, secrets, or dependencies.

Review findings

  • [P1] Preserve the old branch-preview switch — run-app-local.ps1:75
Review details

Best possible solution:

Land the branch-name cleanup after the default branch is actually main, while preserving compatibility aliases for existing helper flags during the transition.

Do we have a high-confidence way to reproduce the issue?

Yes for the PR defect from source inspection: the PR head declares only $AllowNonMain, so existing -AllowNonMaster invocations no longer bind. I did not execute PowerShell validation because this review is read-only.

Is this the best way to solve the issue?

No. The broad master to main cleanup is the right direction, but the maintainable transition should keep -AllowNonMaster as a deprecated alias and wait for the actual default-branch rename before merge.

Full review comments:

  • [P1] Preserve the old branch-preview switch — run-app-local.ps1:75
    run-app-local.ps1 currently exposes -AllowNonMaster, and existing contributor scripts using that documented flag will fail parameter binding after this rename because only -AllowNonMain remains. Keep -AllowNonMain as the canonical name, but preserve AllowNonMaster as an alias for at least the branch-transition window.
    Confidence: 0.9

Overall correctness: patch is incorrect
Overall confidence: 0.86

AGENTS.md: found and applied where relevant.

Codex review notes: model gpt-5.5, reasoning high; reviewed against afa6218338d6.

Label changes

Label changes:

  • add P2: This is a normal-priority repository migration/tooling PR with a limited but real contributor compatibility blocker.
  • add merge-risk: 🚨 compatibility: The helper switch rename and branch-cutover timing can break existing local development commands or clean default-branch checkouts if merged without compatibility handling.
  • add rating: 🦪 silver shellfish: Overall readiness is 🦪 silver shellfish; proof is 🌊 off-meta tidepool and patch quality is 🦪 silver shellfish.
  • add status: ⏳ waiting on author: ClawSweeper has contributor-facing work open and is waiting for author action. Not applicable: The external-contributor proof gate does not apply to this collaborator draft PR; the body reports validation, but I did not rerun it in this read-only review.

Label justifications:

  • P2: This is a normal-priority repository migration/tooling PR with a limited but real contributor compatibility blocker.
  • merge-risk: 🚨 compatibility: The helper switch rename and branch-cutover timing can break existing local development commands or clean default-branch checkouts if merged without compatibility handling.
  • rating: 🦪 silver shellfish: Overall readiness is 🦪 silver shellfish; proof is 🌊 off-meta tidepool and patch quality is 🦪 silver shellfish.
  • status: ⏳ waiting on author: ClawSweeper has contributor-facing work open and is waiting for author action. Not applicable: The external-contributor proof gate does not apply to this collaborator draft PR; the body reports validation, but I did not rerun it in this read-only review.
Evidence reviewed

Acceptance criteria:

  • [P1] ./build.ps1.
  • [P1] dotnet test ./tests/OpenClaw.Shared.Tests/OpenClaw.Shared.Tests.csproj --no-restore.
  • [P1] dotnet test ./tests/OpenClaw.Tray.Tests/OpenClaw.Tray.Tests.csproj --no-restore.
  • [P1] pwsh -NoProfile -Command "Get-Help ./run-app-local.ps1 -Parameter AllowNonMain; ./run-app-local.ps1 -NoBuild -DryRun -AllowNonMaster".

What I checked:

  • PR context: The provided PR body says not to merge until the default branch has actually been renamed, and the author association is COLLABORATOR, so this must stay open for maintainer timing and review. (44f75cf7333b)
  • Diff scope: The PR changes 8 files with 31 additions and 31 deletions, covering docs, two workflow files, the autoreview helper, and run-app-local.ps1. (44f75cf7333b)
  • Compatibility blocker: The final PR head leaves only [switch]$AllowNonMain in run-app-local.ps1; the prior commit had added [Alias("AllowNonMaster")] and the final commit removed it. (run-app-local.ps1:75, 44f75cf7333b)
  • Current base branch: The checked-out current main state is still on master tracking origin/master, matching the PR base and reinforcing the PR body's merge-timing warning. (afa6218338d6)
  • Current-main ownership signal: Available blame for the central helper and workflow lines points to commit 85445c7, which touched run-app-local.ps1, the autoreview helper, and CI workflow lines in current main. (run-app-local.ps1:75, 85445c78066b)
  • Security pass: The diff does not add dependencies, downloads, action refs, secrets, or broader permissions; workflow changes only reorder existing main/master branch filters. (.github/workflows/ci.yml:5, 44f75cf7333b)

Likely related people:

  • christineyan4: Current-main blame in this shallow checkout attributes the local launch helper, autoreview helper, and CI workflow lines to commit 85445c7; history before that graft is limited. (role: recent area contributor; confidence: medium; commits: 85445c78066b; files: run-app-local.ps1, .agents/skills/autoreview/scripts/autoreview, .github/workflows/ci.yml)
  • kmahone: The PR body describes the repository default-branch rename timing and the branch commits are authored by Keith Mahoney, making them relevant for the administrative cutover decision. (role: branch-rename coordinator; confidence: medium; commits: 654fdedddfbd, 44f75cf7333b; files: run-app-local.ps1, docs/RELEASING.md, .agents/skills/autoreview/SKILL.md)
What the crustacean ranks mean
  • 🦀 challenger crab: rare, exceptional readiness with strong proof, clean implementation, and convincing validation.
  • 🦞 diamond lobster: very strong readiness with only minor maintainer review expected.
  • 🐚 platinum hermit: good normal PR, likely mergeable with ordinary maintainer review.
  • 🦐 gold shrimp: useful signal, but proof or patch confidence is still limited.
  • 🦪 silver shellfish: thin signal; proof, validation, or implementation needs work.
  • 🧂 unranked krab: not merge-ready because proof is missing/unusable or there are serious correctness or safety concerns.
  • 🌊 off-meta tidepool: rating does not apply to this item.

Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

How this review workflow works
  • ClawSweeper keeps one durable marker-backed review comment per issue or PR.
  • Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
  • A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
  • PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
  • Maintainers can also comment @clawsweeper review to request a fresh review only.
  • Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
  • Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
  • Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

@clawsweeper clawsweeper Bot added rating: 🦪 silver shellfish Thin PR readiness signal; proof, validation, or implementation needs work. status: ⏳ waiting on author ClawSweeper has contributor-facing work open and is waiting for author action. P2 Normal priority bug or improvement with limited blast radius. merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. labels Jun 5, 2026
@shanselman shanselman marked this pull request as ready for review June 8, 2026 06:27
@shanselman shanselman merged commit 37b0ea6 into main Jun 8, 2026
26 checks passed
@shanselman shanselman deleted the user/kmahone/rename-master-to-main branch June 8, 2026 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge-risk: 🚨 compatibility 🚨 Merging this PR could break existing users, config, migrations, defaults, or upgrades. P2 Normal priority bug or improvement with limited blast radius. rating: 🦪 silver shellfish Thin PR readiness signal; proof, validation, or implementation needs work. status: ⏳ waiting on author ClawSweeper has contributor-facing work open and is waiting for author action.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants