Skip to content

[Cherry-pick] Cherry-pick to release-v0.185.0 - #1368

Merged
truefoundry-saas merged 9 commits into
release-v0.185.0from
cherry-pick/36983f1a-d8ef-4cf2-9350-2f253ae85527/release-v0.185.0
Nov 12, 2026
Merged

truefoundry-saas merged 9 commits into
release-v0.185.0from
cherry-pick/36983f1a-d8ef-4cf2-9350-2f253ae85527/release-v0.185.0

Conversation

@truefoundry-saas

@truefoundry-saas truefoundry-saas commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

Automated cherry-pick for release request 36983f1a-d8ef-4cf2-9350-2f253ae85527.

Source PRs (merged to main):

Warning

This PR does not contain the fix yet. The cherry-pick conflicted, so
automation stopped at the first conflicting commit and left the rest out.
GitHub therefore shows this PR as mergeable, with no conflict to resolve —
it carries only the 7 commit(s) that applied before the conflict.
Paste the prompt below into any coding agent that has this repository open.
It checks out this branch, applies the missing commits, and pushes.
Do not merge the PR. The release request checks every commit within a few
minutes (or use "Sync status" on it). The PR is merged when the request is
approved — or, if it is already approved, when a QA member or engineering
admin uses "Retry merge".

Agent prompt — copy from here:

Apply the missing cherry-pick commits onto this pull request. Work only in this repository. Do not merge the pull request and do not open a new one.

Repository: truefoundry/trueforge
Branch to check out and push to: cherry-pick/36983f1a-d8ef-4cf2-9350-2f253ae85527/release-v0.185.0
Base branch (do not commit onto this directly): release-v0.185.0
The first commit conflicted in: packages/assistant-ui-runtime/src/collectPending.ts, packages/assistant-ui-runtime/test/collectPending.test.ts.

Commits still missing, in this order:
1. bf57ece2e8a6d442994f7df02d7a7c0f01ca45ae

Steps:
1. Fetch and check out the branch above.
2. For each missing commit, in the order listed, run `git cherry-pick -x <sha>`. Keep the `-x`: the release request confirms a commit from the "cherry picked from" line it writes.
3. If a cherry-pick conflicts, resolve it so that commit's changes land on this branch, then `git add` the resolved files and `git cherry-pick --continue`. Do not skip a commit and do not abort the sequence.
4. Push to the same branch. This pull request updates on its own.
5. Stop. Do not merge the pull request.

Conflicting file(s):

  • packages/assistant-ui-runtime/src/collectPending.ts
  • packages/assistant-ui-runtime/test/collectPending.test.ts

Commits still to apply (starting at the conflict):

  • bf57ece2e8a6d442994f7df02d7a7c0f01ca45ae

Do not merge manually — this PR is merged automatically when the release request is approved. If you do merge it yourself, use "Sync status" on the request so it stops showing as pending.


Note

Medium Risk
Changes span live chat streaming, pause/MCP auth orchestration, and agent API validation—user-visible behavior on concurrent subagent turns—with moderate blast radius but no core auth redesign.

Overview
Release-oriented bundle that tightens chat and assistant runtime behavior when parallel subagents pause for different reasons: tool approvals and ask-user prompts take precedence over MCP Connect, MCP auth is not cleared just because the turn reports running, subscribe cursors stay on mcp.auth_required until user.mcp_auth_continue, and Continue can optimistically clear Connect chrome after a successful continue request. Cancelled turns again show human-readable banners in live New Chat/Build (hidden only when superseded by a newer message), the stop button shows Cancelling…, and cancel calls are deduplicated.

Backend/product tweaks in the diff include aligning agent update validation with create (422 when capabilities need missing/disabled providers), schedule-run sessions tagged with tfg.source = 'schedule' (plus backfill), and the built-in management MCP using id/name trueforge:mcp with tools labeled truefoundry-system.

Adds extensive SDK v2 documentation (overview-v2, use-agent-v2), bumps OpenAPI to 0.185.0-rc.3, makes CI migration ordering use the PR base branch instead of hardcoded main, and bumps Jest 30 plus several dependency advisories.

Note: The PR description states this cherry-pick may still be missing commit bf57ece (conflict in collectPending.ts); verify that file matches the intended approval-pending logic before merge.

Reviewed by Cursor Bugbot for commit 46f3673. Bugbot is set up for automated code reviews on this repo. Configure here.

truefoundry-saas and others added 7 commits November 12, 2026 21:48
…oup across 1 directory (#1316)

Bumps the npm-security group with 1 update in the / directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite).


Updates `vite` from 6.4.4 to 6.4.5
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.4.5/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.4.5/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.4.5
  dependency-type: direct:development
  dependency-group: npm-security
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: TrueForge Agent <trueforge@example.org>
Agent save is a publish boundary, so create and update must both reject
disabled web search, memory, and sandbox environments. Sessions still
grandfather stored specs so existing chats keep running without forcing
an agent edit first.
…1344)

* Revert "bugfix: hide cancelled-turn reason banners in live chat (#1258)"

This reverts commit 117b013.

Co-authored-by: Cursor <cursoragent@cursor.com>

* [AGE-2739] Show why chat turns stopped after cancellation or errors

Map turn cancel reasons to readable banner text (stopped, timed out, interrupted) in chat and session detail. Hide only turns replaced by a newer message in live chat; session replay still shows them. Client-side supersede/cancel now use the wire cancel reasons so live and reloaded turns match.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
…1325)

* fix(deps): override node-forge, follow-redirects, body-parser to patched versions

* Upgrade jest and use pnpm up -r instead of overrides

* Add changeset for dependency vulnerability and Jest bumps.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: tfy-vuln-bot <vuln-bot@truefoundry.com>
Co-authored-by: Chirag Jain <jain.chirag925@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
* Docs for turn paused state

* WIP: Enhance code snippets

* Handle mcp auth required bug with concurrent approvals

* Fix mcp auth required with concurrent approval in subagents

* Dont' make mcp continue optimistic

* Show Cancelling feedback and single-flight stop on the composer.

Co-authored-by: Cursor <cursoragent@cursor.com>

* Align assistant-ui-runtime tests with concurrent pause status rules.

Co-authored-by: Cursor <cursoragent@cursor.com>

* Keep sibling prompts interactive without inventing paused turnState.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
@changeset-bot

changeset-bot Bot commented Nov 12, 2026 •

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 46f3673

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 4 packages
Name Type
@truefoundry/trueforge Patch
@truefoundry/trueforge-assistant-ui-runtime Patch
@truefoundry/trueforge-ui Patch
@truefoundry/trueforge-core Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@veria-ai

veria-ai Bot commented Nov 12, 2026 •

Copy link
Copy Markdown

PR overview

No security issues were found in this pull request.

Reviews

@truefoundry-saas
truefoundry-saas merged commit c5dea02 into release-v0.185.0 Nov 12, 2026
10 of 11 checks passed
@truefoundry-saas
truefoundry-saas deleted the cherry-pick/36983f1a-d8ef-4cf2-9350-2f253ae85527/release-v0.185.0 branch November 12, 2026 16:26
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.

2 participants