Skip to content

[cherry-pick] Revert https://github.com/microsoft/vscode/pull/327408 - #328874

Open
vs-code-engineering[bot] wants to merge 1 commit into
mainfrom
cherry-pick/328871
Open

[cherry-pick] Revert https://github.com/microsoft/vscode/pull/327408#328874
vs-code-engineering[bot] wants to merge 1 commit into
mainfrom
cherry-pick/328871

Conversation

@vs-code-engineering

Copy link
Copy Markdown
Contributor

Cherry-pick of #328871 from release/1.132.

⚠️ 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/328871 && git checkout cherry-pick/328871
# resolve conflicts, then:
git add -A && git commit --amend --no-edit && git push --force-with-lease

Conflicting files:

  • src/vs/platform/agentHost/node/agentHostMain.ts
  • src/vs/platform/agentHost/node/agentHostServerMain.ts
  • src/vs/platform/agentHost/node/agentModelRefreshScheduler.ts
  • src/vs/platform/agentHost/node/agentService.ts
  • src/vs/platform/agentHost/test/node/agentModelRefreshScheduler.test.ts
  • src/vs/platform/agentHost/test/node/codex/codexModelRefresh.test.ts
  • src/vs/platform/agentHost/test/node/codex/codexPrewarmEviction.test.ts

Copilot AI review requested due to automatic review settings August 4, 2026 00:12
@vs-code-engineering vs-code-engineering Bot added the cherry-pick-artifact Auto-generated cherry-pick PR label Aug 4, 2026
@vs-code-engineering

Copy link
Copy Markdown
Contributor Author

📬 CODENOTIFY

The following users are being notified based on files changed in this PR:

@TylerLeonhardt

Matched files:

  • src/vs/platform/agentHost/node/claude/claudeAgent.ts

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.

1 participant