Skip to content

sessions: refine Agent Merge PR actions - #333835

Merged
Benjamin Christopher Simmonds (benibenj) merged 3 commits into
mainfrom
benibenj/agents/create-pr-agent-merge-options
Sep 1, 2026
Merged

sessions: refine Agent Merge PR actions#333835
Benjamin Christopher Simmonds (benibenj) merged 3 commits into
mainfrom
benibenj/agents/create-pr-agent-merge-options

Conversation

@benibenj

Copy link
Copy Markdown
Contributor

Summary

  • add Create PR & Enable Agent Merge as the final Create PR operation when Agent Merge is available
  • make the primary Agent Merge button toggle session enablement and move configuration into a submenu
  • optimistically show invoked changeset operations as the disabled, running primary button until completion

Validation

  • 41 focused Agent Merge and pull request operation tests
  • 34 focused changes UI tests
  • npm run typecheck-client
  • git diff --check

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.

Copilot review overview

Review tier: Balanced
Findings: 2 Medium severity

New issues introduced by this change (2)
Severity Finding
Medium severity src/​vs/​platform/​agentHost/​node/​agentHostPullRequestOperationHandler.ts — Enabling here preserves the user overrides but also leaves any existing…
Medium severity src/​vs/​sessions/​contrib/​changes/​browser/​changesView.ts — This delegation executes the enable/disable command through a wrapper that still has the submenu's…
What changed in this PR

Refines Agent Merge PR actions, menu behavior, and optimistic operation feedback.

Changes:

  • Adds “Create PR & Enable Agent Merge.”
  • Makes the primary Agent Merge action toggle enablement.
  • Shows invoked operations as running until completion.
File Description
agentMergeActions.test.ts Tests Agent Merge menu nesting and ordering.
agentHostSessionChangesets.test.ts Tests optimistic running status.
agentMergeActions.ts Reorganizes toggle and configuration actions.
agentHostSessionChangesets.ts Tracks locally running operations.
changesViewActions.test.ts Updates PR achievement coverage.
sessionsChangesAccessibilityHelp.ts Documents the revised interaction.
changesView.ts Delegates the primary submenu action.
menus.ts Adds the configuration submenu.
agentHostPullRequestOperationProvider.test.ts Tests operation advertisement.
agentHostPullRequestOperationHandler.test.ts Tests PR creation and enablement.
agentHostPullRequestOperationProvider.ts Advertises and registers the new operation.
agentHostPullRequestOperationHandler.ts Enables Agent Merge after PR creation.

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread src/vs/sessions/contrib/changes/browser/changesView.ts Outdated
@github-actions

github-actions Bot commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Base: b8b400c3 Current: 1f143f9b

No screenshot changes.

Add a combined create-PR-and-enable-Agent-Merge operation, reorganize Agent Merge configuration under a submenu, and restore immediate running feedback for changeset operations.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Keep the strict contribution activation harness aligned with the pull request operation contribution's dependencies.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Reset stale controller state when enabling Agent Merge for a newly created pull request and preserve the delegated toggle command identity in the primary button.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@benibenj
Benjamin Christopher Simmonds (benibenj) merged commit ba0c096 into main Sep 1, 2026
40 checks passed
@benibenj
Benjamin Christopher Simmonds (benibenj) deleted the benibenj/agents/create-pr-agent-merge-options branch September 1, 2026 21:34
@vs-code-engineering vs-code-engineering Bot added this to the 1.137.0 milestone Sep 1, 2026
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.

4 participants