From de453fb3fa660cf196943af3ef7597224231c013 Mon Sep 17 00:00:00 2001 From: Chisanan232 Date: Tue, 21 Jul 2026 16:05:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A7=20(ci):=20Flip=20workflow=20br?= =?UTF-8?q?anch=20filters=20master=E2=86=92main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Default branch migrated master→main per ADR 0016 (AAASM-4963). Repoint every on.{push,pull_request}.branches filter so CI fires on main. paths-filtered pull_request triggers were already branch-agnostic. Refs AAASM-4963 --- .github/workflows/codeql.yml | 2 +- .github/workflows/example-metadata-check.yml | 2 +- .github/workflows/proof-html.yml | 2 +- .github/workflows/verify-go.yml | 4 ++-- .github/workflows/verify-node.yml | 2 +- .github/workflows/verify-python.yml | 2 +- .github/workflows/verify-scenarios.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4d00b89..fe2e71b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -12,7 +12,7 @@ on: - "docs/**" - "LICENSE" branches: - - master + - main schedule: - cron: "0 3 * * 1" diff --git a/.github/workflows/example-metadata-check.yml b/.github/workflows/example-metadata-check.yml index 689094b..b7bbc68 100644 --- a/.github/workflows/example-metadata-check.yml +++ b/.github/workflows/example-metadata-check.yml @@ -26,7 +26,7 @@ on: - ".github/workflows/**" push: branches: - - master + - main concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/proof-html.yml b/.github/workflows/proof-html.yml index 7743230..b6aacf1 100644 --- a/.github/workflows/proof-html.yml +++ b/.github/workflows/proof-html.yml @@ -2,7 +2,7 @@ name: Proof HTML on: push: branches: - - master + - main workflow_dispatch: concurrency: diff --git a/.github/workflows/verify-go.yml b/.github/workflows/verify-go.yml index e1947ad..904bba1 100644 --- a/.github/workflows/verify-go.yml +++ b/.github/workflows/verify-go.yml @@ -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 diff --git a/.github/workflows/verify-node.yml b/.github/workflows/verify-node.yml index eadfcf8..5fb6023 100644 --- a/.github/workflows/verify-node.yml +++ b/.github/workflows/verify-node.yml @@ -7,7 +7,7 @@ on: - ".github/workflows/verify-node.yml" push: branches: - - master + - main paths: - "node/**" diff --git a/.github/workflows/verify-python.yml b/.github/workflows/verify-python.yml index 9ae5021..56803d4 100644 --- a/.github/workflows/verify-python.yml +++ b/.github/workflows/verify-python.yml @@ -6,7 +6,7 @@ on: - "python/**" push: branches: - - master + - main paths: - "python/**" diff --git a/.github/workflows/verify-scenarios.yml b/.github/workflows/verify-scenarios.yml index 0424a65..eb07cfd 100644 --- a/.github/workflows/verify-scenarios.yml +++ b/.github/workflows/verify-scenarios.yml @@ -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 From feabfbda6e5766f576c1d4c67aec6d3ec3e0f3d6 Mon Sep 17 00:00:00 2001 From: Chisanan232 Date: Tue, 21 Jul 2026 16:06:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9D=20(docs):=20Update=20branch=20?= =?UTF-8?q?prose=20master=E2=86=92main=20after=20rename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Repo default branch migrated master→main per ADR 0016 (AAASM-4963). Rewrite the .claude/CLAUDE.md gotcha (master was default, main was the stale branch — now inverted), point the sdk-version-bump skill's branch/PR base at main, refresh the workflow README trigger column, and switch the cross-repo .github baseline link to the rename-proof /blob/HEAD/ form. Refs AAASM-4963 --- .claude/CLAUDE.md | 10 +++++----- .claude/skills/sdk-version-bump/SKILL.md | 4 ++-- .github/workflows/README.md | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md index 2c259ff..5c693bf 100644 --- a/.claude/CLAUDE.md +++ b/.claude/CLAUDE.md @@ -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 `/master`. + `git remote -v`; scope changes against `/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. diff --git a/.claude/skills/sdk-version-bump/SKILL.md b/.claude/skills/sdk-version-bump/SKILL.md index f7e3a5c..886660c 100644 --- a/.claude/skills/sdk-version-bump/SKILL.md +++ b/.claude/skills/sdk-version-bump/SKILL.md @@ -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): `///` (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 `[] (): `, base `master`, body per +- **PR** title `[] (): `, 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. diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 132ddd2..2b67937 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -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 From 2d41e6a5bdc30a4ff1d314a3b0ddff4f1b03615d Mon Sep 17 00:00:00 2001 From: Chisanan232 Date: Tue, 21 Jul 2026 16:08:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=9D=20(verify):=20Repoint=20AAASM-?= =?UTF-8?q?2311=20report=20branch=20refs=20master=E2=86=92main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The report describes the verify-scenarios trigger and merge gate as 'push to master' / 'green on master'; both now resolve to main after the ADR 0016 rename. Kept the historical verdict, corrected the branch. Refs AAASM-4963 --- .../AAASM-2311-verify-policy-approval-scenarios.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/verification-reports/AAASM-2311-verify-policy-approval-scenarios.md b/verification-reports/AAASM-2311-verify-policy-approval-scenarios.md index 114135d..04d0857 100644 --- a/verification-reports/AAASM-2311-verify-policy-approval-scenarios.md +++ b/verification-reports/AAASM-2311-verify-policy-approval-scenarios.md @@ -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.