code-foundry 0.36.1 → 0.37.0

package/.github/dependabot.yml

@@ -12,7 +12,7 @@ updates:
       # code-foundry.yml). Dependabot must never bump them; a stale
       # github-actions group PR branched before a sync can resurrect
       # legacy caller files when merged.
-      - dependency-name: "0xPlayerOne/code-foundry*"
+      - dependency-name: '0xPlayerOne/code-foundry*'
     groups:
       github-actions:
         applies-to: version-updates

package/AGENTS.md

@@ -71,6 +71,12 @@ Ask for clarification when a missing decision would materially change the implem
 
 For normal feature work, branch from `staging` and target pull requests at `staging`. Treat `main` as the protected release branch. Follow `.github/CONTRIBUTING.md` for the complete internal and external contribution flow.
 
+## Git workflow and merging
+
+This repository uses the `staging-release` workflow: topic branches **squash** into `staging`, a promotion PR **rebases** validated changes into `main` (`merge_strategy: rebase`), and the Release Please version PR **rebases** into `main` (`release_merge_strategy: rebase`). Feature PRs land on `staging` with squash merges; promotion and release PRs land on `main` with rebase merges. Re-align `staging` with `main` after a release when needed.
+
+Merge only with the repository's canonical method. Never merge with `--admin`, never default or auto-select a merge method, and never use a method the branch ruleset does not allow. When in doubt, prefer the merge button's configured method and verify the ruleset after merging. Check `.github/CONTRIBUTING.md` for the complete flow and merge table.
+
 ## Toolchain and dependencies
 
 - Follow `toolchain: auto` in `.github/code-foundry.yml`; use native tools by

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.37.0](https://github.com/0xPlayerOne/code-foundry/compare/v0.36.2...v0.37.0) (2026-08-07)
+
+
+### Features
+
+* **agents:** add explicit merge-workflow guidance ([a74c0ce](https://github.com/0xPlayerOne/code-foundry/commit/a74c0ce61c8dc53795a645ab5f2062ded732e3a5))
+
+## [0.36.2](https://github.com/0xPlayerOne/code-foundry/compare/v0.36.1...v0.36.2) (2026-08-07)
+
+
+### Bug Fixes
+
+* **sync:** prettier-canonical dependabot ignore quotes ([491e06a](https://github.com/0xPlayerOne/code-foundry/commit/491e06ade14531eb02f1d7aa729cee3b1acdf78b))
+
 ## [0.36.1](https://github.com/0xPlayerOne/code-foundry/compare/v0.36.0...v0.36.1) (2026-08-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-foundry",
-  "version": "0.36.1",
+  "version": "0.37.0",
   "description": "A fast, language-aware repository factory for agent-ready workflows, testing, security, and release automation.",
   "type": "module",
   "license": "AGPL-3.0-or-later",

package/src/commands/sync.mjs

@@ -434,6 +434,10 @@ const DIRECT_DOC_REPLACEMENTS = {
       'Use `push` for `main, staging` and `pull_request` for `staging` unless a workflow has a documented event-specific reason.',
       'Use `push` for `main` and `pull_request` for `main` unless a workflow has a documented event-specific reason.',
     ],
+    [
+      'This repository uses the `staging-release` workflow: topic branches **squash** into `staging`, a promotion PR **rebases** validated changes into `main` (`merge_strategy: rebase`), and the Release Please version PR **rebases** into `main` (`release_merge_strategy: rebase`). Feature PRs land on `staging` with squash merges; promotion and release PRs land on `main` with rebase merges. Re-align `staging` with `main` after a release when needed.',
+      'This repository uses the `direct` workflow: topic branches **squash** directly into `main`, and the Release Please version PR **rebases** into `main` (`release_merge_strategy: rebase`). Feature PRs land on `main` with squash merges; release PRs land on `main` with rebase merges. No integration branch exists; all pull requests target `main`.',
+    ],
   ],
   '.github/CONTRIBUTING.md': [
     [