Skip to content

fix(reconcile): preserve staging work after historical promotions - #362

Merged
0xPlayerOne merged 1 commit into
stagingfrom
fix/reconcile-staging-history
Aug 3, 2026
Merged

fix(reconcile): preserve staging work after historical promotions#362
0xPlayerOne merged 1 commit into
stagingfrom
fix/reconcile-staging-history

Conversation

@0xPlayerOne

@0xPlayerOne 0xPlayerOne commented Aug 3, 2026

Copy link
Copy Markdown
Owner

Summary

  • Treat final tree content as the authority when classifying post-release reconciliation.
  • Ignore unexpected paths from historical main-only aggregate commits only when those paths are absent from the final tree delta.
  • Keep genuine main-only content differences fail-closed, and preserve strict behavior when final-tree metadata is unavailable.

This unblocks Cortana's current staging promotion topology without expanding the approved release allowlist.

Validation

  • node --check src/lib/release-policy.mjs
  • node --check test/cli.test.mjs
  • Focused reconciliation tests: 7 passed
  • Full npm test: 100 passed
  • npm run build
  • npm run lint

npm run type-check was not run because this checkout has no installed TypeScript dependency. No Cortana data sync was run.

@0xPlayerOne 0xPlayerOne changed the title fix: reconcile-staging-history fix(reconcile): preserve staging work after historical promotions Aug 3, 2026
@0xPlayerOne
0xPlayerOne enabled auto-merge (squash) August 3, 2026 13:21
@0xPlayerOne
0xPlayerOne merged commit b0992bd into staging Aug 3, 2026
17 checks passed
@kilo-code-bot

kilo-code-bot Bot commented Aug 3, 2026

Copy link
Copy Markdown

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (2 files)
  • src/lib/release-policy.mjs
  • test/cli.test.mjs

Reviewed by step-3.7-flash · Input: 53.5K · Output: 9.7K · Cached: 677.9K

@0xPlayerOne
0xPlayerOne deleted the fix/reconcile-staging-history branch August 3, 2026 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant