docs: finalize main branch cutover metadata

.github/github.json

@@ -1,9 +1,8 @@
 {
-  "defaultBranch": "local/cbusillo-overlay",
+  "defaultBranch": "main",
   "projectType": "every-code-product",
   "upstreamForkBaseBranch": "fork-main",
-  "currentProductBranch": "local/cbusillo-overlay",
-  "plannedProductBranch": "main",
+  "productBranch": "main",
   "docs": {
     "overview": "README.md",
     "agentGuide": "AGENTS.md",
@@ -28,7 +27,7 @@
       "mcpTypesFocused": "cd code-rs && cargo test -p mcp-types --tests"
     },
     "scripts": {
-      "waitForGitHubRun": "scripts/wait-for-gh-run.sh --workflow Release --branch local/cbusillo-overlay",
+      "waitForGitHubRun": "scripts/wait-for-gh-run.sh --workflow Release --branch main",
       "cleanupSpace": "just local-cleanup-space --apply",
       "upstreamImport": "just local-upstream-import"
     },

AGENTS.md

@@ -66,20 +66,16 @@ Examples:
 
 ## Upstream Import Workflow
 
-- `main` is the planned Every Code product branch. Until #87 completes the
-  GitHub default-branch cutover, `local/cbusillo-overlay` remains the factual
-  protected/default branch and source of truth for the `code` binary installed
-  on this machine.
+- `main` is the Every Code product branch and the GitHub default branch.
 - Use `just local-code-rebuild` to rebuild the current branch into the PATH-resolved binary.
 - After `./build-fast.sh`, run `just local-code-rebuild` again before release smoke checks; the fast build can leave the PATH-resolved `code` pointing at a dev-fast binary that reports `0.0.0`.
 - Before leaving a local work session, run `just local-cleanup-space --apply`
   to remove rebuildable target/cache artifacts while preserving
   `code-rs/target/release/code`.
-- Use `just local-upstream-import` only from a clean product branch. Today that
-  means `local/cbusillo-overlay`; after #87 it means `main`. The helper fetches
-  `upstream/main`, merges it into the current Every Code branch, replays any
-  commits listed in `scripts/local/overlay-picks.txt`, then rebuilds the release
-  binary.
+- Use `just local-upstream-import` only from a clean `main` branch. The helper
+  fetches `upstream/main`, merges it into the current Every Code branch, replays
+  any commits listed in `scripts/local/overlay-picks.txt`, then rebuilds the
+  release binary.
 - Commits already on the product branch persist automatically across future
   upstream imports. They do not need to be duplicated in
   `scripts/local/overlay-picks.txt`.

docs/local-overlay.md

@@ -1,15 +1,13 @@
 # Upstream Import And Local Runtime Policy
 
-Every Code owns its product direction, defaults, releases, and UX. The product
-branch is moving from `local/cbusillo-overlay` to `main` in #87. Until GitHub's
-default branch and protection rules are changed together, `local/cbusillo-overlay`
-remains the canonical branch for the local `code` binary on this machine.
+Every Code owns its product direction, defaults, releases, and UX. `main` is the
+canonical product branch and GitHub default branch for the local `code` binary on
+this machine.
 
-Important cutover blocker: `origin/main` already exists and diverges heavily
-from `origin/local/cbusillo-overlay`. Do not overwrite, delete, or repoint it as
-an experiment. The branch cutover must explicitly choose `local/cbusillo-overlay`
-as the source-of-truth commit, move branch protection to `main`, update the
-GitHub default branch, and verify Actions before retiring the old branch name.
+The pre-cutover `origin/main` history was archived at
+`archive/pre-every-code-main-2026-05-24` before `main` was repointed to the Every
+Code product branch. Treat `local/cbusillo-overlay` as a retired branch name;
+do not revive it for new work.
 
 Treat `codex-rs/` as a read-only mirror of `openai/codex`; put editable Rust
 changes under `code-rs/`.
@@ -40,8 +38,7 @@ Remote map:
 
 ## Upstream Sync
 
-Use the import helper from a clean product branch. Today that is
-`local/cbusillo-overlay`; after #87 completes it should be `main`:
+Use the import helper from a clean `main` branch:
 
 ```sh
 just local-upstream-import

scripts/local/fork-health.sh

@@ -7,7 +7,7 @@ cd "$repo_root"
 current_branch="$(git symbolic-ref --quiet --short HEAD || echo HEAD)"
 upstream_ref="${UPSTREAM_REF:-upstream/main}"
 product_branch="${PRODUCT_BRANCH:-$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null | sed 's#^origin/##')}"
-product_branch="${product_branch:-local/cbusillo-overlay}"
+product_branch="${product_branch:-main}"
 latest_product_tag="$(git tag --list 'every-code-v*' 'overlay-v*' --sort=-v:refname | head -n 1 || true)"
 latest_upstream_tag="$(git tag --list 'v*' --sort=-v:refname | head -n 1 || true)"
 package_version="$(node -p "require('$repo_root/codex-cli/package.json').version" 2>/dev/null || true)"