automations: fix: revert broad provider configuration changes - #335591
Merged
Ulugbek Abdullaev (ulugbekna) merged 1 commit intoSep 10, 2026
Merged
Conversation
Revert 1328607 (#335018) so the worktree availability fix and unrelated provider configuration changes can be reviewed separately. Preserve subsequent main changes and the independent ActionList PR. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4e70d7c-fbe2-487b-a6c5-177af2abae2f
Copilot started reviewing on behalf of
Ulugbek Abdullaev (ulugbekna)
September 10, 2026 23:13
View session
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: Sandeep Somavarapu (@sandy081)Matched files:
Ladislau Szomoru (@lszomoru)Matched files:
|
Contributor
There was a problem hiding this comment.
Copilot review overview
🟢 Approval recommended
The diff cleanly restores every original hunk, preserves the separately scoped IME work, and has broad targeted validation.
Review tier: Balanced
Findings: None
What changed in this PR
Reverts the broad automation/provider configuration change so its fixes can be reviewed and landed separately, while preserving the independent ActionList IME work.
Changes:
- Restores previous worktree discovery and validation behavior.
- Reverts provider configuration, custom-agent, policy, and sandbox changes.
- Removes associated APIs and regression tests.
| File | Description |
|---|---|
src/vs/sessions/SESSIONS.md |
Removes reverted provider worktree documentation. |
src/vs/sessions/services/sessions/common/sessionsProvider.ts |
Removes workspace worktree-options API. |
src/vs/sessions/contrib/providers/remoteAgentHost/test/browser/remoteAgentHostSessionsProvider.test.ts |
Reverts remote worktree tests. |
src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/sandboxPicker.test.ts |
Reverts Automation sandbox-menu coverage. |
src/vs/sessions/contrib/providers/copilotChatSessions/test/browser/copilotChatSessionsProvider.test.ts |
Reverts provider-configuration regression coverage. |
src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsProvider.ts |
Restores prior model, sandbox, and approval behavior. |
src/vs/sessions/contrib/providers/copilotChatSessions/browser/copilotChatSessionsActions.ts |
Removes Automation sandbox control contribution. |
src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts |
Reverts host worktree capability tests. |
src/vs/sessions/contrib/providers/agentHost/test/browser/agentHost/agentHostSessionConfigPicker.test.ts |
Reverts Automation configuration-picker tests. |
src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts |
Restores Copilot-only worktree advertisement. |
src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker.ts |
Removes Automation-specific picker exposure. |
src/vs/sessions/contrib/chat/browser/branchPicker.ts |
Reverts asynchronous provider branch filtering. |
src/vs/sessions/contrib/automations/test/browser/automationTools.test.ts |
Removes provider worktree validation tests. |
src/vs/sessions/contrib/automations/test/browser/automationDialog.test.ts |
Reverts provider-owned branch-picker tests. |
src/vs/sessions/contrib/automations/browser/automationTools.ts |
Restores static worktree capability validation. |
src/vs/sessions/contrib/automations/browser/automationDialog.ts |
Restores local Git branch discovery. |
src/vs/platform/agentHost/test/node/codex/codexPrewarmEviction.test.ts |
Reverts worktree-agent routing coverage. |
src/vs/platform/agentHost/test/node/agentService.test.ts |
Reverts generated-session pending-state coverage. |
src/vs/platform/agentHost/test/node/agentHostAutomationService.test.ts |
Reverts first-turn custom-agent coverage. |
src/vs/platform/agentHost/node/codex/codexAgent.ts |
Restores prior custom-agent URI resolution. |
src/vs/platform/agentHost/node/agentService.ts |
Restores prior worktree pending-state timing. |
src/vs/platform/agentHost/node/agentHostAutomationService.ts |
Restores model-only first-turn inheritance. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Ulugbek Abdullaev (ulugbekna)
enabled auto-merge (squash)
September 10, 2026 23:22
Michael Lively (Yoyokrazy)
approved these changes
Sep 10, 2026
Ulugbek Abdullaev (ulugbekna)
deleted the
ulugbekna/revert-automation-config-scope
branch
September 10, 2026 23:47
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Revert the broad automation configuration change
Contents
Purpose
Revert #335018, commit
1328607eb90d69b7a66fb2e8d4fdca49dcc0f9d3, so its worktree availability fix and unrelated provider-configuration fixes can be reviewed and landed in smaller units.The original PR combined the falsely disabled New Worktree checkbox with remote branch discovery, Cloud model and Sandbox configuration, approval-policy state, custom-agent execution, and native session controls. This revert is a scope/review decision, not a claim that CI found a regression.
Scope
This is the exact inverse of the original PR's change to 22 files. Each restored file was checked against the parent of the original merge commit. Later unrelated changes on main are preserved.
The independent shared ActionList IME fix in #335578 is not part of this revert.
Behavior and follow-ups
Until the scoped replacements land, this intentionally restores the pre-PR behavior, including the known Codex/Claude automation worktree capability limitation and the provider-configuration issues the original PR addressed.
Two follow-up PRs are prepared as a stack:
The smaller fix PR is based on this revert branch so its diff contains only the reintroduced worktree behavior. Review this revert before its two scoped follow-ups.
Validation
npm run typecheck-clientpassed.git diff --checkand the normal commit hygiene hook passed.