Skip to content

Reconstruct batch 022/124: 2026-08-25 → 2026-08-26 (chat, sessions, agenthost, agent host) - #22

Open
elielvipata wants to merge 1 commit into
reconstruct/batch-021from
reconstruct/batch-022
Open

elielvipata wants to merge 1 commit into
reconstruct/batch-021from
reconstruct/batch-022

Conversation

@elielvipata

@elielvipata elielvipata commented Oct 23, 2026 •

Copy link
Copy Markdown

Reconstruct batch 022/124: 2026-08-25 → 2026-08-26 (chat, sessions, agenthost, agent host)

Overview

  • Upstream range: 3e86045092b..dc51f4a3aed
  • Dates: 2026-08-25 → 2026-08-26
  • Commits: 50 (50 on the first-parent line of main, 0 merges)
  • Contributors: 25 — Connor Peet (8), Benjamin Christopher Simmonds (7), Dmitriy Vasyura (4), Giuseppe Cianci (3), Logan Ramos (3), roblourens (3), Lee Murray (2), joshspicer (2) …
  • Diff: 382 files changed, 11835 insertions(+), 5363 deletions(-)
  • Files: 353 modified, 22 added, 7 deleted
  • Base branch: reconstruct/batch-021

Upstream PRs

This PR folds in 50 microsoft/vscode PRs.

  • #332496 chat: summarize the Agent Merge prompt as a widget
  • #332528 Modern UI: keep floating surfaces aligned across startup and layout changes
  • #332517 Add injected text component fixtures
  • #332504 Enable Node.js system certificates by default
  • #332503 sessions: harden ChatGPT profile image handling
  • #332532 Update modernActivityBar styles across multiple themes
  • #332512 Move to nightly build
  • #332541 agentHost: retry Codex model discovery after transient failures
  • #332538 Remove external session files from the agent host adaptor
  • #331731 Use synchronous hooks for ESM ASAR resolution
  • #332446 terminal: hide View in Chat for Agent Host sessions
  • #332535 files: stop Windows watcher flood after folder deletion
  • #332547 sessions: Fix External Agent Session Visibility Settings
  • #332549 refactor(chat): remove CHAT_CONFIG_MENU_ID references from chat actions
  • #332548 Address review feedback on external session files removal
  • #332562 Add developer reset pet size command
  • #332485 agent host: fix task completion summary
  • #332553 agentHost: keep restarted Codex drafts provisional
  • #332554 Fix slight misalignment of compact model picker button
  • #332460 Fix terminal tool progress listener leak
  • #332539 ci: fix electron types in product builds
  • #332564 Fix lone json surrogate breaking requests
  • #332558 sessions: preserve session creation provenance
  • #332569 sessions: add chat background management actions
  • #332372 Keep terminal task icon when holding Alt
  • #175525 Note that InlayHints with the same position are shown in-order
  • #332594 Fix Electron types in PR checks
  • #262910 Fix out of bounds text selection with line wrapping
  • #332589 agent host: anchor side chat forks at the last completed turn
  • #332588 Back off GitHub requests instead of hammering a failing service
  • #332590 Add valid permissions presets to mock-policy-server
  • #332584 managed settings: fix claude enablement
  • #332598 chat: explain why Agent Merge turned itself off
  • #332581 Agent Host: Make debug log export best effort
  • #329157 Update error message in inlineChatIntent.ts
  • #332574 Rename from the session header uses the inline title input
  • #332638 mcp: normalize install URI configurations
  • #332634 agentHost: apply customization changes made before the first message
  • #332606 agent host: adopt durable error response parts
  • #332643 chat: verify exact plugin commit checkouts
  • #332609 Preserve user picker state for orchestration when Agent Merge is enabled
  • #332476 Avoid decoration shutdown listeners for detached terminals
  • #332346 Stop observing chat layout while the pet is disabled
  • #332612 Do not cache a session-state subscription that failed to subscribe
  • #332653 chat: resolve MCP App resources through agent host
  • #332654 cli: add frame-ancestors header to serve-web responses
  • #332637 stabilize prompt height during toolbar changes
  • #332607 chat: Honor preferred Copilot harness during session loading
  • #332519 Enforce stable link presentation provider kinds
  • #332639 chat: require confirmation for .mcp.json and .npmrc edits

Summary of changes by area

chat (12)

sessions (8)

agenthost (4)

agent host (4)

extensions/copilot (3)

terminal (3)

misc (2)

engineering (2)

modern ui (1)

workbench (1)

request (1)

extensions/theme-defaults (1)

files (1)

ci (1)

editor (1)

github (1)

managed settings (1)

mcp (1)

cli (1)

extensions/markdown-language-features (1)

Code changes

Where the changes landed (share of changed files, cumulative)

2.3% build/azure-pipelines/
   2.6% build/
   3.4% extensions/copilot/src/extension/
   4.9% extensions/copilot/src/
   5.7% extensions/copilot/
   2.0% extensions/markdown-language-features/src/preview/
   2.8% extensions/markdown-language-features/src/
   3.6% extensions/markdown-language-features/
  12.0% extensions/
   5.4% src/vs/platform/agentHost/common/state/protocol/
   6.2% src/vs/platform/agentHost/common/state/
   8.9% src/vs/platform/agentHost/common/
   7.3% src/vs/platform/agentHost/node/
   4.9% src/vs/platform/agentHost/test/node/e2e/providers/__snapshots__/
   6.0% src/vs/platform/agentHost/test/node/e2e/providers/
   7.8% src/vs/platform/agentHost/test/node/e2e/
  14.1% src/vs/platform/agentHost/test/node/
  15.9% src/vs/platform/agentHost/test/
  32.7% src/vs/platform/agentHost/
   2.0% src/vs/platform/github/common/
   3.4% src/vs/platform/github/
  38.4% src/vs/platform/
   2.3% src/vs/sessions/contrib/changes/
   2.3% src/vs/sessions/contrib/chat/
   2.0% src/vs/sessions/contrib/providers/
   2.0% src/vs/sessions/contrib/sessions/
   9.9% src/vs/sessions/contrib/
   2.3% src/vs/sessions/services/
  13.8% src/vs/sessions/
   2.3% src/vs/workbench/contrib/chat/browser/agentSessions/
   3.9% src/vs/workbench/contrib/chat/browser/widget/
  11.2% src/vs/workbench/contrib/chat/browser/
   3.1% src/vs/workbench/contrib/chat/test/browser/
   3.9% src/vs/workbench/contrib/chat/test/
  16.7% src/vs/workbench/contrib/chat/
  22.2% src/vs/workbench/contrib/
   3.4% src/vs/workbench/test/browser/componentFixtures/
  28.5% src/vs/workbench/
  82.1% src/vs/
  82.9% src/

Largest file changes

File + −
extensions/markdown-language-features/src/preview/linkPresentation/githubLinkPresentationResolver.ts 0 543
src/vs/workbench/contrib/github/browser/githubLinkPresentation.contribution.ts 424 0
src/vs/sessions/contrib/changes/browser/sessionFilesWidget.ts 0 408
src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionFiles.ts 103 303
src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatAgentMergeContentPart.ts 395 0
src/vs/sessions/services/sessions/test/browser/sessionsListModelService.test.ts 359 6
src/vs/platform/agentHost/test/node/agentService.test.ts 263 83
src/vs/platform/agentHost/common/agentMergePrompt.ts 338 0
src/vs/sessions/services/sessions/test/browser/sessionGroupsService.test.ts 301 2
src/vs/workbench/test/browser/componentFixtures/chat/chatAgentMerge.fixture.ts 301 0
extensions/copilot/package-lock.json 32 266
src/vs/workbench/test/browser/componentFixtures/chat/linkPresentationBuilders.ts 290 0
src/bootstrap-esm.ts 121 169
src/vs/platform/github/common/githubQueryServiceImpl.ts 266 2
src/vs/workbench/contrib/chat/browser/widget/chatContentParts/media/chatAgentMergeContent.css 267 0
src/vs/workbench/contrib/github/test/browser/githubLinkPresentation.test.ts 266 0
src/vs/sessions/contrib/providers/agentHost/test/browser/localAgentHostSessionsProvider.test.ts 238 5
src/vs/platform/agentHost/test/node/sessionServerTools.test.ts 74 142
src/vs/platform/github/test/node/githubQueryService.test.ts 216 0
src/vs/workbench/api/test/browser/mainThreadDataChannels.test.ts 198 10
src/vs/platform/agentHost/test/common/agentMergePrompt.test.ts 203 0
src/vs/sessions/contrib/providers/agentHost/test/browser/agentHostSessionFiles.test.ts 126 77
src/vs/workbench/contrib/chat/browser/actions/exportAgentHostDebugLogsAction.ts 111 92
src/vs/workbench/contrib/chat/test/browser/widget/chatContentParts/chatTerminalToolProgressPart.test.ts 196 2
src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostActiveClientService.ts 66 124
extensions/markdown-language-features/src/preview/linkPresentation/linkPresentationResolver.ts 0 186
src/vs/workbench/test/browser/componentFixtures/editor/injectedTextDecorations.fixture.ts 176 0
extensions/markdown-language-features/src/test/markdownEditorRichLinks.test.ts 6 167
src/vs/sessions/contrib/changes/browser/media/sessionFilesWidget.css 0 171
src/vs/platform/agentHost/node/agentService.ts 137 29
src/vs/sessions/contrib/providers/agentHost/browser/baseAgentHostSessionsProvider.ts 125 39
src/vs/sessions/contrib/chat/browser/chat.contribution.ts 131 28
src/vs/platform/agentHost/node/sessionCoordination.ts 0 159
src/vs/workbench/contrib/mcp/browser/mcpWorkbenchService.ts 148 10
extensions/markdown-language-features/src/preview/linkPresentation/linkPresentationBuilders.ts 152 0
src/vs/platform/github/test/node/githubCredentialService.test.ts 145 5
src/vs/platform/agentHost/node/shared/sessionServerTools.ts 40 107
src/vs/platform/github/common/githubBackoff.ts 145 0
src/vs/platform/agentHost/node/codex/codexProfileImage.ts 123 20
src/vs/sessions/services/sessions/browser/sessionsListModelService.ts 137 1
… 342 more files

All commits

SHA Date Author Subject
576c267f99f 2026-08-25 Benjamin Christopher Simmonds chat: summarize the Agent Merge prompt as a widget (microsoft#332496)
bf5a37438e0 2026-08-25 Lee Murray Modern UI: keep floating surfaces aligned across startup and layout changes (microsoft#332528)
a588fbb4c87 2026-08-25 Aiday Marlen Kyzy Add injected text component fixtures (microsoft#332517)
866a9bfc10d 2026-08-25 Christof Marti Enable Node.js system certificates by default (microsoft#332504)
408151dabda 2026-08-25 Giuseppe Cianci sessions: harden ChatGPT profile image handling (microsoft#332503)
00c6beca441 2026-08-25 Lee Murray Update modernActivityBar styles across multiple themes (microsoft#332532)
0e78ef8f640 2026-08-25 Dirk Bäumer Move to nightly build (microsoft#332512)
0a4795df2c0 2026-08-25 Giuseppe Cianci agentHost: retry Codex model discovery after transient failures (microsoft#332541)
fbba041f2ae 2026-08-25 Benjamin Christopher Simmonds Remove external session files from the agent host adaptor (microsoft#332538)
08a1ad01b35 2026-08-25 Dmitriy Vasyura Use synchronous hooks for ESM ASAR resolution (microsoft#331731)
b0e09b7356b 2026-08-25 Connor Peet terminal: hide View in Chat for Agent Host sessions (microsoft#332446)
31a2160bbe8 2026-08-25 Benjamin Christopher Simmonds files: stop Windows watcher flood after folder deletion (microsoft#332535)
4f8fa0fa95f 2026-08-25 Benjamin Christopher Simmonds sessions: Fix External Agent Session Visibility Settings (microsoft#332547)
2a2f49760bb 2026-08-25 Martin Aeschlimann refactor(chat): remove CHAT_CONFIG_MENU_ID references from chat actions (microsoft#332549)
e2af52e96b1 2026-08-25 Benjamin Christopher Simmonds Address review feedback on external session files removal (microsoft#332548)
c9b54fda631 2026-08-25 Logan Ramos Add developer reset pet size command (microsoft#332562)
5470e95e157 2026-08-25 Justin Chen agent host: fix task completion summary (microsoft#332485)
2fcde0acde2 2026-08-25 Giuseppe Cianci agentHost: keep restarted Codex drafts provisional (microsoft#332553)
405da76c407 2026-08-25 Logan Ramos Fix slight misalignment of compact model picker button (microsoft#332554)
c659a2ccd33 2026-08-25 Dmitriy Vasyura Fix terminal tool progress listener leak (microsoft#332460)
e79a9aaed86 2026-08-26 Robo ci: fix electron types in product builds (microsoft#332539)
f173dada522 2026-08-25 Logan Ramos Fix lone json surrogate breaking requests (microsoft#332564)
a036a4c2490 2026-08-25 Sandeep Somavarapu sessions: preserve session creation provenance (microsoft#332558)
153573d6d42 2026-08-25 TylerLeonhardt sessions: add chat background management actions (microsoft#332569)
293593cce43 2026-08-25 Anthony Kim Keep terminal task icon when holding Alt (microsoft#332372)
7d3bd2a1591 2026-08-25 Danny Tuppeny Note that InlayHints with the same position are shown in-order (microsoft#175525)
90f9b51baae 2026-08-25 Dmitriy Vasyura Fix Electron types in PR checks (microsoft#332594)
63da5e8b18c 2026-08-25 Remco Haszing Fix out of bounds text selection with line wrapping (microsoft#262910)
2726d6ad0cc 2026-08-25 Connor Peet agent host: anchor side chat forks at the last completed turn (microsoft#332589)
6a60e32fab8 2026-08-25 Benjamin Christopher Simmonds Back off GitHub requests instead of hammering a failing service (microsoft#332588)
1faca48a3e7 2026-08-25 joshspicer Add valid permissions presets to mock-policy-server (microsoft#332590)
38ec3d57f91 2026-08-25 joshspicer managed settings: fix claude enablement (microsoft#332584)
3d079185299 2026-08-25 Benjamin Christopher Simmonds chat: explain why Agent Merge turned itself off (microsoft#332598)
cc04d10042a 2026-08-25 roblourens Agent Host: Make debug log export best effort (microsoft#332581)
dc7793b9072 2026-08-26 koubaki Merge pull request microsoft#329157 from koubaki/patch-1
4d05c01ff9a 2026-08-25 Copilot Rename from the session header uses the inline title input (microsoft#332574)
a386ecaceb0 2026-08-25 Connor Peet mcp: normalize install URI configurations (microsoft#332638)
2c67b972cd7 2026-08-25 Connor Peet agentHost: apply customization changes made before the first message (microsoft#332634)
28c109e20bf 2026-08-25 roblourens agent host: adopt durable error response parts (microsoft#332606)
da59bf02011 2026-08-25 Connor Peet chat: verify exact plugin commit checkouts (microsoft#332643)
499be98b61d 2026-08-25 Copilot Preserve user picker state for orchestration when Agent Merge is enabled (microsoft#332609)
873ac47bc6f 2026-08-25 Dmitriy Vasyura Avoid decoration shutdown listeners for detached terminals (microsoft#332476)
59bb1a833fe 2026-08-25 Bryan Chen Stop observing chat layout while the pet is disabled (microsoft#332346)
692f114bc72 2026-08-25 Osvaldo Ortega Do not cache a session-state subscription that failed to subscribe (microsoft#332612)
71f7505782a 2026-08-25 Connor Peet chat: resolve MCP App resources through agent host (microsoft#332653)
0a289c3721a 2026-08-25 Connor Peet cli: add frame-ancestors header to serve-web responses (microsoft#332654)
80e7b544f29 2026-08-25 Jessie Houghton stabilize prompt height during toolbar changes (microsoft#332637)
fa73fe69cc9 2026-08-25 roblourens chat: Honor preferred Copilot harness during session loading (microsoft#332607)
4470c4eb329 2026-08-26 Henning Dieterichs Enforce stable link presentation provider kinds (microsoft#332519)
dc51f4a3aed 2026-08-25 Connor Peet chat: require confirmation for .mcp.json and .npmrc edits (microsoft#332639)

🤖 Generated with Claude Code

…genthost, agent host)

Squashed reconstruction of 50 upstream commits (3e86045..dc51f4a).
382 files changed, 11835 insertions(+), 5363 deletions(-)

chat:
  - chat: summarize the Agent Merge prompt as a widget (microsoft#332496)
  - refactor(chat): remove CHAT_CONFIG_MENU_ID references from chat actions (microsoft#332549)
  - Add developer reset pet size command (microsoft#332562)
  - Fix slight misalignment of compact model picker button (microsoft#332554)
  - Fix terminal tool progress listener leak (microsoft#332460)
  - chat: explain why Agent Merge turned itself off (microsoft#332598)
  - chat: verify exact plugin commit checkouts (microsoft#332643)
  - Stop observing chat layout while the pet is disabled (microsoft#332346)
  - chat: resolve MCP App resources through agent host (microsoft#332653)
  - stabilize prompt height during toolbar changes (microsoft#332637)
  - chat: Honor preferred Copilot harness during session loading (microsoft#332607)
  - chat: require confirmation for .mcp.json and .npmrc edits (microsoft#332639)

sessions:
  - sessions: harden ChatGPT profile image handling (microsoft#332503)
  - Remove external session files from the agent host adaptor (microsoft#332538)
  - sessions: Fix External Agent Session Visibility Settings (microsoft#332547)
  - Address review feedback on external session files removal (microsoft#332548)
  - sessions: preserve session creation provenance (microsoft#332558)
  - sessions: add chat background management actions (microsoft#332569)
  - Rename from the session header uses the inline title input (microsoft#332574)
  - Do not cache a session-state subscription that failed to subscribe (microsoft#332612)

agenthost:
  - agentHost: retry Codex model discovery after transient failures (microsoft#332541)
  - agentHost: keep restarted Codex drafts provisional (microsoft#332553)
  - agentHost: apply customization changes made before the first message (microsoft#332634)
  - Preserve user picker state for orchestration when Agent Merge is enabled (microsoft#332609)

agent host:
  - agent host: fix task completion summary (microsoft#332485)
  - agent host: anchor side chat forks at the last completed turn (microsoft#332589)
  - Agent Host: Make debug log export best effort (microsoft#332581)
  - agent host: adopt durable error response parts (microsoft#332606)

extensions/copilot:
  - Move to nightly build (microsoft#332512)
  - Fix lone json surrogate breaking requests (microsoft#332564)
  - Merge pull request microsoft#329157 from koubaki/patch-1

terminal:
  - terminal: hide View in Chat for Agent Host sessions (microsoft#332446)
  - Keep terminal task icon when holding Alt (microsoft#332372)
  - Avoid decoration shutdown listeners for detached terminals (microsoft#332476)

misc:
  - Use synchronous hooks for ESM ASAR resolution (microsoft#331731)
  - Note that InlayHints with the same position are shown in-order (microsoft#175525)

engineering:
  - Fix Electron types in PR checks (microsoft#332594)
  - Add valid permissions presets to mock-policy-server (microsoft#332590)

modern ui:
  - Modern UI: keep floating surfaces aligned across startup and layout changes (microsoft#332528)

workbench:
  - Add injected text component fixtures (microsoft#332517)

request:
  - Enable Node.js system certificates by default (microsoft#332504)

extensions/theme-defaults:
  - Update modernActivityBar styles across multiple themes (microsoft#332532)

files:
  - files: stop Windows watcher flood after folder deletion (microsoft#332535)

ci:
  - ci: fix electron types in product builds (microsoft#332539)

editor:
  - Fix out of bounds text selection with line wrapping (microsoft#262910)

github:
  - Back off GitHub requests instead of hammering a failing service (microsoft#332588)

managed settings:
  - managed settings: fix claude enablement (microsoft#332584)

mcp:
  - mcp: normalize install URI configurations (microsoft#332638)

cli:
  - cli: add frame-ancestors header to serve-web responses (microsoft#332654)

extensions/markdown-language-features:
  - Enforce stable link presentation provider kinds (microsoft#332519)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.

1 participant