Skip to content

[Chore] Review pinned v1.4.0 reconciliation (do not merge) - #2355

Closed
roomote-roomote[bot] wants to merge 1 commit into
mainfrom
reconcile/v1.4.0
Closed

[Chore] Review pinned v1.4.0 reconciliation (do not merge)#2355
roomote-roomote[bot] wants to merge 1 commit into
mainfrom
reconcile/v1.4.0

Conversation

@roomote-roomote

Copy link
Copy Markdown
Contributor

​Opened on behalf of @mrubens. Follow up by mentioning @roomote-roomote, in the web UI, or in Slack.

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

  • A maintainer explicitly invited this PR in the linked issue or discussion
  • I am a maintainer / this is internal Roomote work

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

  • Resolution head: 3ada94108bf19afc8ede49ea05cf7394c28cb4fa.
  • First parent, frozen candidate: 16cc5395fe80bfa450b02fab27f44f5cfe79c09d.
  • Second parent, pinned main / published v1.3.2: 08dd507f504493981bc5718d6e9a5cb256b5300e.
  • Both candidate and resolution tree: 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) on develop with version 1.4.0, expected candidate 16cc5395fe80bfa450b02fab27f44f5cfe79c09d, expected main 08dd507f504493981bc5718d6e9a5cb256b5300e, and resolution 3ada94108bf19afc8ede49ea05cf7394c28cb4fa. 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

  • Exact ordered parents and complete candidate-tree equality verified after commit. Compared the reviewed tree to git merge-tree output: differences are confined to the four conflict paths.
  • Release integrity assertions passed: root 1.4.0, 8 minor / 37 patch notes, byte-identical published history, no pending changesets. git diff --check against pinned main passed.
  • Native tool schema suite: 9 tests passed, including production dangling-reference protection and Sentry scope preservation.
  • pnpm test:release-scripts on the frozen candidate: 18 tests passed. The newer workflow tests deliberately are not imported into this tree.
  • Focused SDK cancellation checks: 3 tests passed, 83 excluded by the name filter. The delivery path already checks cancelled rows before creating a turn and again before posting a reply. See fast-agent-parent-event.ts:2275-2288,2376-2384 and tests at fast-agent-parent-event.test.ts:3212-3310 on 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.
  • Ordinary pre-commit hook ran (no net staged file changes). Ordinary pre-push passed: oxlint, residual ESLint, all 27 fast type-check tasks, and Knip, with cached type/lint results and one existing non-failing Mintlify hint.
  • Browser proof is not applicable to an ancestry-only change. No full product suite or live external-service checks ran. No reconciliation dispatch, release-branch push, promotion, tag, publication, or deployment occurred.

Related PRs

Checklist

  • The PR title follows the repo convention: [Fix], [Feat], [Improve], [Refactor], [Docs], or [Chore] followed by a user-facing description
  • This PR is small and scoped to one change
  • pnpm lint and pnpm check-types pass locally
  • I added tests or included a clear manual validation note above
  • I removed secrets, tokens, private keys, and customer data from code, logs, and screenshots
  • If this change should appear in the changelog, I ran pnpm changeset

Full root lint/type-check variants were not run separately from ordinary push gates. No changeset is appropriate for this ancestry-only reconciliation.

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.
@roomote-community

roomote-community Bot commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

No code issues found. See task

Reviewed 3ada941

@roomote-roomote
roomote-roomote Bot marked this pull request as ready for review September 8, 2026 15:42
mrubens pushed a commit that referenced this pull request Sep 8, 2026
Reviewed resolution: 3ada941
Review PR: #2355
Base automatically changed from release/v1.4.0 to main September 8, 2026 16:30
@mrubens mrubens closed this Sep 8, 2026
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