[Chore] Review pinned v1.4.0 reconciliation (do not merge) - #2355
Closed
roomote-roomote[bot] wants to merge 1 commit into
Closed
[Chore] Review pinned v1.4.0 reconciliation (do not merge)#2355roomote-roomote[bot] wants to merge 1 commit into
roomote-roomote[bot] wants to merge 1 commit into
Conversation
Review-only merge for CI reconciliation. Preserve the frozen candidate tree exactly; retain the 1.4.0 version and notes, current Astra guidance, and Sentry schema regression test. Production schema fixes and published changelog history are already present. Parents pin candidate 16cc539 and main 08dd507. Do not merge this branch into release manually.
Contributor
mrubens
approved these changes
Sep 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related issue
Review-only resolution for promotion #2352 using the CI workflow introduced in #2353.
Do not merge: CI applies this reviewed tree. Approval authorizes the pinned reconciliation input, not production promotion. This PR intentionally has an empty net file diff against the frozen candidate; its merge ancestry is the deliverable.
Why this PR exists
Production hotfixes are already present in the frozen 1.4.0 tree without shared main ancestry. This merge reconciles that history without importing newer develop or changing the audited release tree. The merged CI workflow requires an independently approved, exact-parent resolution PR before it can update the release branch.
What changed
3ada94108bf19afc8ede49ea05cf7394c28cb4fa.16cc5395fe80bfa450b02fab27f44f5cfe79c09d.08dd507f504493981bc5718d6e9a5cb256b5300e.a5e7adb461fbbf991f4df2844ed519ea16b43bb8.Four conflicts were inspected and resolved manually by intent:
package.json: keep the audited 1.4.0 version, not production's older 1.3.2.CHANGELOG.md: keep the full 1.4.0 section above byte-identical published 1.3.2 and earlier history. All 8 minor and 37 patch notes remain unchanged.apps/docs/models.mdx: retain the audited 1.4.0 additional Astra-provider guidance and unchanged-default/account-access caveats rather than restoring the older 1.3 announcement.packages/cloud-agents/src/server/fast-agent/__tests__/fast-agent-native-tool-schemas.test.ts: retain the additional Sentry organization-scope regression test alongside all production schema-hotfix tests.All automatic merge output outside those conflicted paths is unchanged. The production schema fix from #2295/#2296 already exists on the candidate, including its bridge/dependency/lockfile changes; the focused suite passes. The entire final file tree is identical to the frozen candidate, so no unrelated develop work, runtime fix, new changeset, or regenerated release artifact is included.
Approval gate: an independent human OWNER/MEMBER/COLLABORATOR must approve this exact resolution SHA; no outstanding CHANGES_REQUESTED vote or unresolved review thread may remain. The PR must stay open with these exact branch/base/pins. Do not click Merge.
After approval and a fresh unshipped-state/pin check, the next action is Reconcile Release Candidate (
release-reconcile.yml) ondevelopwith version1.4.0, expected candidate16cc5395fe80bfa450b02fab27f44f5cfe79c09d, expected main08dd507f504493981bc5718d6e9a5cb256b5300e, and resolution3ada94108bf19afc8ede49ea05cf7394c28cb4fa. CI alone mints and pushes the reconciliation merge. That workflow has not run; #2352 remains unchanged. Monitor the new promotion head's CI and reviews afterward, without merging or publishing.How it was tested
git merge-treeoutput: differences are confined to the four conflict paths.git diff --checkagainst pinned main passed.pnpm test:release-scriptson the frozen candidate: 18 tests passed. The newer workflow tests deliberately are not imported into this tree.fast-agent-parent-event.ts:2275-2288,2376-2384and tests atfast-agent-parent-event.test.ts:3212-3310on this pinned tree. The existing Promote v1.4.0 to production #2352 review finding should be re-evaluated against these guards; no runtime fix or thread resolution was made here.Related PRs
Checklist
[Fix],[Feat],[Improve],[Refactor],[Docs], or[Chore]followed by a user-facing descriptionpnpm lintandpnpm check-typespass locallypnpm changesetFull root lint/type-check variants were not run separately from ordinary push gates. No changeset is appropriate for this ancestry-only reconciliation.