Skip to content

[cherry-pick] [cherry-pick] agentHost: Preserve workspace transition boundaries - #334793

Open
vs-code-engineering[bot] wants to merge 2 commits into
mainfrom
cherry-pick/334694
Open

[cherry-pick] [cherry-pick] agentHost: Preserve workspace transition boundaries#334793
vs-code-engineering[bot] wants to merge 2 commits into
mainfrom
cherry-pick/334694

Conversation

@vs-code-engineering

Copy link
Copy Markdown
Contributor

Cherry-pick of #334694 from release/1.137.

⚠️ This cherry-pick has merge conflicts that need manual resolution. Conflict markers (<<<<<<</=======/>>>>>>>) are committed to the branch — check it out locally, resolve, and force-push.

git fetch origin cherry-pick/334694 && git checkout cherry-pick/334694
# resolve conflicts, then:
git add -A && git commit --amend --no-edit && git push --force-with-lease

Conflicting files:

  • src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts

Summary

Backport of #334534 to release/1.137.

  • skip workspace trust prompts when effective permissions are Allow All or global auto-approve is enabled
  • preserve the always-visible Now working in workspace transition boundary across collapsed progress and Agent Host restarts
  • hide the internal continuation request while preserving provider output and file-change attribution
  • persist transition state atomically and serialize transition restoration with turn-ID mapping writes
  • expose truncated transition labels through the standard hover service

This branch contains only the five commits from #334534. The prerequisite workspace-conversion implementation from #334250 is already present on release/1.137.

Validation

  • npm run typecheck-client
  • targeted ESLint across all 26 changed TypeScript files
  • targeted Stylelint for the transition CSS
  • npm run transpile-client
  • 848 focused unit tests passed, 38 pending
  • git diff --check

Copilot AI balanced review requested due to automatic review settings September 6, 2026 11:02
@vs-code-engineering vs-code-engineering Bot added the cherry-pick-artifact Auto-generated cherry-pick PR label Sep 6, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟡 Changes recommended

Unresolved merge-conflict markers are committed, which will break parsing/compilation and must be resolved before approval.

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Pull request overview

Backport/cherry-pick to release/1.137 for the agent host workspace-conversion UX, focused on preserving the always-visible “Now working in” workspace transition boundary across collapsed progress and restarts.

Changes:

  • Preserve workspace transition boundaries across collapsed completed steps and Agent Host restarts.
  • Skip workspace trust prompts when effective permissions are “Allow All” or global auto-approve is enabled.
  • Persist/restore transition state atomically while hiding the internal continuation request but keeping attribution.

Blocking issue observed: merge-conflict markers are committed in src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts (and also present in extensions/copilot/script/test/scoredEditsReconciler.spec.ts in this branch snapshot), so the branch will not compile/test until conflicts are resolved.

File summaries
File Description
src/vs/workbench/contrib/chat/test/browser/widget/chatListRenderer.test.ts Test setup for workspace transition rendering currently contains unresolved merge-conflict markers that must be resolved.
Review details
  • Files reviewed: 1/1 changed files
  • Comments generated: 1
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment on lines +1561 to +1564
<<<<<<< HEAD
=======
configurationService.setUserConfiguration(ChatConfiguration.TurnStatusPills, false);
>>>>>>> f9a273540ca ([cherry-pick] agentHost: Preserve workspace transition boundaries (#334694))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

merge markers!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-pick-artifact Auto-generated cherry-pick PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants