code-foundry 0.37.1 → 0.37.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.37.2](https://github.com/0xPlayerOne/code-foundry/compare/v0.37.1...v0.37.2) (2026-08-23)
+
+
+### Bug Fixes
+
+* **ci:** stabilize runners and release reconciliation ([#387](https://github.com/0xPlayerOne/code-foundry/issues/387)) ([ea2c503](https://github.com/0xPlayerOne/code-foundry/commit/ea2c503cb6ea9b944ffa5b70ff7fbfc3d56d3a10))
+
 ## [0.37.1](https://github.com/0xPlayerOne/code-foundry/compare/v0.37.0...v0.37.1) (2026-08-08)
 
 

package/docs/RELEASES.md

@@ -57,8 +57,9 @@ reject any non-`rebase` `merge_strategy` only when `staging-release` is
 configured, and always reject a non-`rebase` `release_merge_strategy`; the
 release workflow fails closed instead of falling back to `merge`. Both keep
 `main` fully linear, which is what makes the post-release reconciliation
-possible: release-only main commits cannot be discarded because they are
-allowed metadata-only, and all non-metadata drift is rejected before mutation.
+possible. The final branch trees are inspected before mutation; validated
+main-only changes are inherited by `staging`, while unpromoted staging work is
+replayed on top of `main`.
 
 The `staging` → `main` reconciliation exists only in the `staging-release`
 topology. Patch-equivalent divergence between `main` and `staging` is treated
@@ -67,8 +68,8 @@ as aligned. When `staging` has pending commits that are not yet represented on
 detached worktree rooted at `main`, and then updates `staging` with an exact
 `--force-with-lease` to prevent
 unintended branch rewrites. There is no unconditional mirror force-push and no
-fallback synchronization commit path. `direct` repositories skip this step
-entirely.
+fallback synchronization commit path. Indeterminate history, replay conflicts,
+and stale leases fail closed. `direct` repositories skip this step entirely.
 
 `auto` selects a supported manifest. Use `simple` with `version.txt` for a
 repository without a package manifest and `none` for a repository that should

package/docs/WORKFLOWS.md

@@ -97,9 +97,11 @@ it opens (or reuses) a generated `code-foundry/reconcile/main-to-staging`
 pull request whose head contains the exact target tip (the `main` tip for a
 fast-forward, the replay tip when staging-only commits are replayed) and whose
 body documents the reconciliation. Reruns reuse the open pull request instead
-of duplicating it; unexpected code divergence, replay conflicts, authentication
-errors, and ambiguous or stale pull request state still fail the job closed,
-and exact-lease protection stays in place for every direct push.
+of duplicating it. Validated changes that landed directly on `main` are synced
+back into `staging`; unpromoted staging commits are replayed on top. Indeterminate
+history, replay conflicts, authentication errors, and ambiguous or stale pull
+request state still fail the job closed, and exact-lease protection stays in
+place for every direct push.
 
 For this reconciliation path, maintainer PATs and administrator roles are not
 authorized bypasses; the job deliberately authenticates with `github.token`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-foundry",
-  "version": "0.37.1",
+  "version": "0.37.2",
   "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

@@ -361,6 +361,12 @@ function renderWorkflow(content, config, repository, ref, rustCodeql) {
     rendered = rendered.replace(/^(\s+unit-runner:)\s+.*$/m, `$1 ${config.unit_runner}`)
   }
   if (workflow === 'validation') {
+    // The mode classifier is a normal runner job in the caller rather than a
+    // reusable-workflow input. Keep it on the configured default runner so
+    // consumers that cannot use ubuntu-slim do not fail before validation.
+    if (config.runner) {
+      rendered = rendered.replace(/^  mode:\n    name: Mode\n    runs-on:\s+.*$/m, `  mode:\n    name: Mode\n    runs-on: ${config.runner}`)
+    }
     /** @type {Record<string, string|undefined>} */
     const runnerInputs = {
       'ci-runner': config.ci_runner ?? config.runner,

package/src/lib/release-policy.mjs

@@ -220,7 +220,7 @@ function compareVersions(a, b) {
  * Classify the relationship between main and staging using the final tree delta
  * when available. Historical commit paths can include equivalent workflow or
  * configuration changes that are no longer present in the branch delta, so the
- * final trees are the source of truth for release-only reconciliation. When
+ * final trees are the source of truth for reconciliation. When
  * directChangedPaths is supplied, unexpected paths in historical main-only
  * commits are ignored only when they are absent from the final tree delta
  * (their content is already identical in both branches); unexpected main-only
@@ -281,9 +281,9 @@ export function classifyReconciliation(input) {
     }
     if (!stagingOnlyCommits.length) {
       return {
-        action: 'fail',
-        reason: 'branch content differs outside release metadata.',
-        unexpected,
+        action: 'fast-forward',
+        targetSha: mainSha,
+        reason: 'main contains validated changes that staging must inherit.',
       }
     }
   }
@@ -300,7 +300,11 @@ export function classifyReconciliation(input) {
     [...new Set(mainOnlyCommits.flatMap((commit) => commit.changedPaths || []))],
     allowed,
   ).filter((path) => directTreePaths === null || directTreePaths.has(path))
-  if (unexpectedMain.length) {
+  // Without a final-tree comparison, retain the historical fail-closed
+  // behavior. When the final delta is known, main is the validated release
+  // source of truth: replay any staging-only work on top instead of deadlocking
+  // every later release because a hotfix landed directly on main.
+  if (unexpectedMain.length && directTreePaths === null) {
     return {
       action: 'fail',
       reason: 'main contains commits that are not release metadata.',
@@ -373,7 +377,7 @@ export function buildReconciliationPullRequestBody(input) {
     '',
     `Merging this pull request synchronizes \`${targetHead}\` with the exact target tip above; no other commits are introduced.`,
     '',
-    'Code Foundry reconciles only release metadata. Unexpected code divergence, replay conflicts, authentication failures, and ambiguous or stale state fail the release job closed and are never pushed around branch protection. Later releases retry the direct push first; when branch policy still rejects it, this pull request is updated instead of duplicated.',
+    `Code Foundry treats validated \`${sourceBase}\` as the shipped source of truth and preserves unpromoted \`${targetHead}\` work by replaying it on top. Indeterminate history, replay conflicts, authentication failures, and ambiguous or stale state fail the release job closed and are never pushed around branch protection. Later releases retry the direct push first; when branch policy still rejects it, this pull request is updated instead of duplicated.`,
   )
   return lines.join('\n')
 }