code-foundry 0.32.2 → 0.32.3

package/.github/code-foundry.yml

@@ -17,7 +17,7 @@ npm_publish: true
 license: agpl-3.0-or-later
 git_workflow: staging-release
 merge_strategy: rebase
-release_merge_strategy: rebase
+release_merge_strategy: squash
 runner: ubuntu-latest
 unit_runner: ubuntu-slim
 cache_packages: auto

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.32.3](https://github.com/0xPlayerOne/code-foundry/compare/v0.32.2...v0.32.3) (2026-07-31)
+
+
+### Bug Fixes
+
+* **release:** no-op when staging already points at main's commit ([a47180a](https://github.com/0xPlayerOne/code-foundry/commit/a47180a16ae8b9fd66548aba284939b3cdfaeba8))
+* **release:** squash Release Please PRs for release-please compatibility ([41c808b](https://github.com/0xPlayerOne/code-foundry/commit/41c808b8c2502ca78e271cb6702334daf90169da))
+
 ## [0.32.2](https://github.com/0xPlayerOne/code-foundry/compare/v0.32.1...v0.32.2) (2026-07-31)
 
 

package/docs/RELEASES.md

@@ -36,15 +36,17 @@ release_merge_strategy: rebase # merge, squash, or rebase; used for Release Plea
 
 `merge_strategy` applies to promotion PRs (`staging` into `main`) and
 `release_merge_strategy` to Release Please version PRs; both default to
-`merge` when unset. Use **rebase** for both. Rebase merges keep `main` fully
-linear, which is what makes the post-release reconciliation possible:
-`staging` requires linear history, and any merge commit on `main` becomes an
-uncrossable barrier for `staging` (the linear-history rule rejects pushes
-whose new commits contain merge commits). With a linear `main`, the release
-workflow mirrors `staging` onto `main`'s tip after every release — a verified
-fast-forward when possible, otherwise a forced linear update, otherwise a
-single-parent synchronization commit — so `staging` is never left behind and
-never needs a manual rebase.
+`merge` when unset. Use **rebase** for promotion PRs and **squash** for
+Release Please PRs. Both keep `main` fully linear, which is what makes the
+post-release reconciliation possible: `staging` requires linear history, and
+any merge commit on `main` becomes an uncrossable barrier for `staging` (the
+linear-history rule rejects pushes whose new commits contain merge commits).
+Release Please itself also requires squash merges for its version PRs (rebase
+merges rewrite commit SHAs and break its merged-PR detection). With a linear
+`main`, the release workflow mirrors `staging` onto `main`'s tip after every
+release — a verified fast-forward when possible, otherwise a forced linear
+update, otherwise a single-parent synchronization commit — so `staging` is
+never left behind and never needs a manual rebase.
 
 `auto` selects a supported manifest. Use `simple` with `version.txt` for a
 repository without a package manifest and `none` for a repository that should
@@ -76,6 +78,6 @@ the generated version pull request before using the token to merge it.
 
 1. Merge tested changes from `staging` into `main`.
 2. Review the generated Release Please PR and changelog.
-3. Merge the release PR with the repository's configured `release_merge_strategy` (default `merge`, recommended `rebase`).
+3. Merge the release PR with the repository.s configured `release_merge_strategy` (default `merge`, recommended `squash`).
 4. Confirm the GitHub Release and any package publication.
 5. Synchronize `staging` with the new `main` release commit.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-foundry",
-  "version": "0.32.2",
+  "version": "0.32.3",
   "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/release.mjs

@@ -40,6 +40,7 @@ export function reconcileRelease(root, options) {
   console.log(JSON.stringify({ base, head, ...plan }, null, 2))
   if (plan.action === 'fail') throw new Error(plan.reason + (plan.unexpected?.length ? ` Unexpected paths: ${plan.unexpected.join(', ')}` : ''))
   if (!['fast-forward', 'pull-request', 'aligned'].includes(plan.action) || !options.github || options.dryRun) return plan
+  if (!plan.targetSha) return plan
   if (!process.env.GITHUB_REPOSITORY) throw new Error('GITHUB_REPOSITORY is required for --github reconciliation.')
   const token = process.env.GH_TOKEN || process.env.GITHUB_TOKEN
   if (!token) throw new Error('GH_TOKEN or GITHUB_TOKEN is required for --github reconciliation.')

package/src/commands/sync.mjs

@@ -364,7 +364,7 @@ function createDefaultConfig(root, source) {
     post_release: 'false', post_release_workflow: '', post_release_mode: 'auto',
     opencode_security: 'false',
     sync_mode: 'overlay', custom_workflows: 'preserve',
-    license: existsSync(join(root, 'LICENSE')) ? 'preserve' : 'gpl-3.0-or-later', git_workflow: 'staging-release', merge_strategy: 'rebase', release_merge_strategy: 'rebase',
+    license: existsSync(join(root, 'LICENSE')) ? 'preserve' : 'gpl-3.0-or-later', git_workflow: 'staging-release', merge_strategy: 'rebase', release_merge_strategy: 'squash',
   }
 }