ai-agent-assembly · Chisanan232 · Jul 23, 2026 · Jul 21, 2026 · Jul 21, 2026 · Jul 21, 2026
@@ -6,7 +6,7 @@ config. When a fact here duplicates a sub-project's `README.md`, `pyproject.toml
 `package.json`, or a CI workflow, treat those as the source of truth and update
 them, not just this file.
 
-Org-wide baseline: https://github.com/ai-agent-assembly/.github/blob/master/CLAUDE.md (org-universal conventions this file doesn't repeat).
+Org-wide baseline: https://github.com/ai-agent-assembly/.github/blob/HEAD/CLAUDE.md (org-universal conventions this file doesn't repeat).
 
 ## What this repo is
 
@@ -151,12 +151,12 @@ neither is sufficient alone.
 
 ## Repo-specific gotchas
 
-- **Default branch is `master`.** A `main` branch also exists but is **stale**
-  (`origin/HEAD` may still point at it) — **never** target or merge into `main`.
-  All branches and PRs base on `master`.
+- **Default branch is `main`.** Migrated from `master` per ADR 0016
+  (AAASM-4963); the old `master` name 301-redirects for web/clone URLs but is
+  no longer a branch — **never recreate it**. All branches and PRs base on `main`.
 - **Canonical remote** points at `ai-agent-assembly/examples` — here
   that is **`origin`** (unlike the core monorepo, where it's `remote`). Confirm with
-  `git remote -v`; scope changes against `<canonical>/master`.
+  `git remote -v`; scope changes against `<canonical>/main`.
 - **npm dependency fixes:** pin with `^` or a precise version (e.g. `^25.9.3`,
   `0.0.1-beta.3`), **never a bare `>=`** — a bare floor lets Dependabot/resolvers
   drag in a major bump and silently break an example.

@@ -135,14 +135,14 @@ generator should own.
 
 ### 6. Commit, branch, PR
 
-- **Branch** off `master` (never `main` — it is stale here):
+- **Branch** off `main` (the default branch since the ADR 0016 migration):
   `<version-or-phase>/<ticket>/<type>/<short_summary>` (e.g.
   `v0.0.1/AAASM-4728/deps/bump_sdk`).
 - **Commits** are gitmoji, one logical unit each — e.g. the `sdk-versions.yaml`
   bump, the regenerated manifests/READMEs, and each ecosystem's lockfile regen as
   separate commits. Bisectable; the tree passes the audit at every commit.
 - **Canonical remote is `origin`** (this repo, unlike the core monorepo).
-- **PR** title `[<ticket>] <emoji> (<scope>): <summary>`, base `master`, body per
+- **PR** title `[<ticket>] <emoji> (<scope>): <summary>`, base `main`, body per
   `.github/PULL_REQUEST_TEMPLATE.md`; ≥1 Pioneer-team approval. CI
   (`example-metadata-check.yml`) re-runs the generator, the snippet extractor, the
   `--check` audit, and the generator unit tests, and fails on any drift.

@@ -13,8 +13,8 @@ This directory contains the GitHub Actions workflows that verify the examples in
 | `verify-all-samples.yml`      | Weekly schedule              | Discovers and runs every sample in the repo, catching drift the per-PR path filters miss |
 | `verify-live.yml`             | Daily schedule / manual dispatch | Runs a real (non-mock) SDK driver against a real local gateway, one job per language |
 | `example-metadata-check.yml`  | PR affecting SDK version metadata or manifests | SDK version pins and generated README blocks aren't out of sync with `metadata/sdk-versions.yaml` |
-| `codeql.yml`                  | PR / push to `master` / weekly schedule | Static security analysis |
-| `proof-html.yml`              | Push to `master` / manual dispatch | Rendered HTML/docs links are valid |
+| `codeql.yml`                  | PR / push to `main` / weekly schedule | Static security analysis |
+| `proof-html.yml`              | Push to `main` / manual dispatch | Rendered HTML/docs links are valid |
 | `auto-assign.yml`             | Issue / PR opened            | Auto-assigns an owner |
 
 ## Design principles for CI workflows

@@ -12,7 +12,7 @@ on:
       - "docs/**"
       - "LICENSE"
     branches:
-      - master
+      - main
   schedule:
     - cron: "0 3 * * 1"
 

@@ -26,7 +26,7 @@ on:
       - ".github/workflows/**"
   push:
     branches:
-      - master
+      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

@@ -2,7 +2,7 @@ name: Proof HTML
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 concurrency:

@@ -2,7 +2,7 @@ name: Verify Go examples
 
 on:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - "go/**"
       # The lint job scans all of scenarios/ (gofmt -l go scenarios; go vet over
@@ -13,7 +13,7 @@ on:
       - "scenarios/**/go.sum"
       - ".github/workflows/verify-go.yml"
   pull_request:
-    branches: [master]
+    branches: [main]
     paths:
       - "go/**"
       # Mirror the push filter: the lint job scans all of scenarios/, so any Go

@@ -7,7 +7,7 @@ on:
       - ".github/workflows/verify-node.yml"
   push:
     branches:
-      - master
+      - main
     paths:
       - "node/**"
 

@@ -6,7 +6,7 @@ on:
       - "python/**"
   push:
     branches:
-      - master
+      - main
     paths:
       - "python/**"
 

@@ -7,7 +7,7 @@ on:
       - ".github/workflows/verify-scenarios.yml"
   push:
     branches:
-      - master
+      - main
     paths:
       - "scenarios/**"
   # Opt-in trigger for the real end-to-end live-core-enforcement run, which needs

@@ -76,7 +76,7 @@ Uses `assembly.WrapTools()` + `policyClient` implementing `assembly.GovernanceCl
 | `approval-gates / python` | `scenarios/approval-gates/python` | `uv run pytest tests/ -v` |
 | `approval-gates / node` | `scenarios/approval-gates/node` | `pnpm test` |
 
-Triggers on `scenarios/**` path changes and on push to master.
+Triggers on `scenarios/**` path changes and on push to main.
 
 ### ✅ Root README links these scenarios as the best product-value examples
 
@@ -123,4 +123,4 @@ Total: **44 tests, all passing**.
 
 ## Verdict
 
-All 8 acceptance criteria from AAASM-2196 are met. All 6 implementation PRs are open and ready for review. Story AAASM-2196 can be transitioned to Done after all PRs are merged and CI is green on master.
+All 8 acceptance criteria from AAASM-2196 are met. All 6 implementation PRs are open and ready for review. Story AAASM-2196 can be transitioned to Done after all PRs are merged and CI is green on main.
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Proof HTML @@
     on:
       push:
         branches:
-          - master
+          - main
       workflow_dispatch:
     concurrency:
@@ Expand Down @@