Skip to content

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

Closed
truefoundry-saas wants to merge 3 commits into
release-v0.185.0from
cherry-pick/d91df53c-1f11-4bae-bbdc-ebf19125e5db/release-v0.185.0
Closed

truefoundry-saas wants to merge 3 commits into
release-v0.185.0from
cherry-pick/d91df53c-1f11-4bae-bbdc-ebf19125e5db/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 d91df53c-1f11-4bae-bbdc-ebf19125e5db.

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 2 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/d91df53c-1f11-4bae-bbdc-ebf19125e5db/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 live turn-stream → UI mapping and pause precedence in assistant-ui-runtime (high user impact), plus a one-way DB backfill for session metadata; both are heavily covered by new/updated tests.

Overview
Concurrent pauses (tool approval, ask-user, MCP auth) on parallel sub-agents now show tool-input chrome first, keep Connect / ask-user / custom actions usable while the turn is running, and stop treating sibling turn.update running as clearing MCP auth or forcing a bogus paused turnState. Resume cursors stay on mcp.auth_required until user.mcp_auth_continue. Continue clears Connect only after the API accepts it (withOptimisticMcpAuthContinue shows Working… without a blank gap); the MCP prompt dismisses on success to avoid double-clicks.

The composer stop button shows Cancelling… while cancel is in flight (deduped via cancelInFlightRef).

Schedule runs stamp new sessions with metadata['tfg.source'] = 'schedule'; Postgres and SQLite migrations backfill existing schedule-linked sessions for source counts.

Adds large SDK v2 docs (overview-v2.mdx, use-agent-v2.mdx), minor use-agent.mdx snippet tweaks, and bumps OpenAPI to 0.185.0-rc.3.

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

truefoundry-saas and others added 2 commits November 12, 2026 21:13
* 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: db5e24a

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

This PR includes changesets to release 3 packages
Name Type
@truefoundry/trueforge-assistant-ui-runtime Patch
@truefoundry/trueforge-ui Patch
@truefoundry/trueforge 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

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes using default effort and found 2 potential issues.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit db5e24a. Configure here.

},
parallelToolGroups,
);
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Terminal turns show stale approval chrome

Medium Severity

History projection now stamps approval or ask-user requires-action chrome whenever the fold still has a pending prompt, without checking that the turn is still paused or running. A cancelled or errored turn that died mid-approval can reload as if it still needs input, hiding the terminal state.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit db5e24a. Configure here.

},
},
});
}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Continue skips Working after last approval

Medium Severity

withOptimisticMcpAuthContinue treats leftover toolApprovalThreadId / toolResponseThreadId on the message as “not MCP-only,” so it never flips the tip to running. Those keys stay on the message when MCP metadata is stashed beside approval chrome, and the approval overlay does not clear them. Approving the last tool then hitting Continue (the intended handoff) dismisses Connect without showing Working.

Additional Locations (2)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit db5e24a. Configure here.

@truefoundry-saas
truefoundry-saas deleted the cherry-pick/d91df53c-1f11-4bae-bbdc-ebf19125e5db/release-v0.185.0 branch November 12, 2026 16:14
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