Skip to content

[pull] main from microsoft:main#1130

Merged
pull[bot] merged 15 commits intocode:mainfrom
microsoft:main
Apr 10, 2026
Merged

[pull] main from microsoft:main#1130
pull[bot] merged 15 commits intocode:mainfrom
microsoft:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Apr 10, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

yogeshwaran-c and others added 15 commits April 10, 2026 04:33
feat: show breakpoint widget on Alt+click in gutter

Add Alt+click handling in the editor gutter to quickly add or edit
conditional breakpoints. When Alt+clicking on a line without
breakpoints, the breakpoint widget opens in conditional breakpoint
mode. When Alt+clicking on a line with existing breakpoints, the
breakpoint widget opens for editing the first breakpoint.

Fixes #203259

Co-authored-by: Rob Lourens <roblourens@gmail.com>
… test coverage (#308743)

* refactor: streamline session option group selection logic and improve test coverage

* refactor: enhance chat session initialization with new options structure and improve input state handling

* Update extensions/copilot/src/extension/chatSessions/vscode-node/test/sessionOptionGroupBuilder.spec.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Updates

* Fixes

* Fixes

* Updates

* Updates

* More updates

* Fix tests

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* agentHost: subagents

* agentHost: remove _meta.parentToolCallId dependency, subscribe to child sessions instead

Inner tool calls from subagent sessions are no longer stored in the parent
turn with _meta.parentToolCallId. Instead:

- Server: _buildTurnsFromMessages skips inner events (parentToolCallId),
  _restoreSubagentSession builds child session turns from raw messages
- Client: _enrichHistoryWithSubagentCalls subscribes to child sessions
  during history restore, injects serialized inner tool calls with
  subAgentInvocationId set

Also fixes hygiene: replace 'in' operator with hasKey in
agentSideEffects.test.ts, exclude .jsonl from copyright filter.

* fix: set terminalCommandUri from terminal content blocks in stateToProgressAdapter

completedToolCallToSerialized and toolCallStateToInvocation were not
detecting terminal tools via ToolResultContentType.Terminal content
blocks or setting terminalCommandUri/terminalToolSessionId, causing
6 test failures in CI.

* comments

Co-authored-by: Copilot <copilot@github.com>

* revert diff

---------

Co-authored-by: Copilot <copilot@github.com>
…308948)

feat: enhance welcome view to pre-select and deduplicate selected folder in chat session options
* Fix double compaction on first-turn budget exceeded

When the first render of a turn throws BudgetExceededError and the
background summarizer is Idle, we fall back to a synchronous foreground
'full' summarization via renderWithSummarization. That path did not set
the 'summary applied this iteration' flag, so the post-render gate
(>= 80% + Idle) would also kick off a background 'inline' compaction
in the same buildPrompt call — producing both
summarizeConversationHistory-full and summarizeConversationHistory-inline.

- Set the flag on both foreground fallback call sites so the post-render
  gate correctly short-circuits.
- Rename 'summaryAppliedThisIteration' to 'didSummarizeThisIteration' to
  better reflect that it covers any summarization work (pre-render bg
  apply, budget-exceeded bg apply, or foreground fallback).

* Update extensions/copilot/src/extension/intents/node/agentIntent.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* feat(CopilotCLI): support reasoning effort

* Enable reasoning effort for Copilot CLI
…308953)

* Background - validate upstream branch before creating the worktree

* Pull request feedback
…to session request lifecycle (#308960)

refactor: move worktree properties and metadata tracking to session request lifecycle
* chore: update electron@39.8.7

* chore: update command

* chore: remove showNodeSystemCertificates command

* chore: bump distro
guard instlaling built in extensions in cli
@pull pull Bot locked and limited conversation to collaborators Apr 10, 2026
@pull pull Bot added the ⤵️ pull label Apr 10, 2026
@pull pull Bot merged commit 8b5518b into code:main Apr 10, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants