Skip to content

[pull] main from microsoft:main#1198

Merged
pull[bot] merged 18 commits into
code:mainfrom
microsoft:main
Apr 29, 2026
Merged

[pull] main from microsoft:main#1198
pull[bot] merged 18 commits into
code:mainfrom
microsoft:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Apr 29, 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 : )

shaypet and others added 18 commits April 29, 2026 12:23
…ext (#312326)

* feat: add compareBranch to TitleAndDescriptionProvider for enhanced PR context

* feat: enhance PR description to include escaped compare branch name

* Update extensions/copilot/src/extension/prompts/node/github/pullRequestDescriptionPrompt.tsx

Co-authored-by: Alex Ross <38270282+alexr00@users.noreply.github.com>

* feat: update pull request user message to include escaped compare branch name

---------

Co-authored-by: Alex Ross <38270282+alexr00@users.noreply.github.com>
* remove old inline chat from extension

* refactor: remove deprecated inline chat V2 configuration and related checks

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

* refactor: update context keys for inline chat and clean up unused variables

* address copilot review: fix typo and rename forInlineAndInlineChatIntent

---------

Co-authored-by: Copilot <copilot@github.com>
When clicking X on a sub-session tab, deleteChat checks chatIds.length
before finding the specific chat by URI. If the grouping cache doesn't
include the forked chat (e.g. due to stale sessionParentId metadata),
_getChatIdsInGroup returns only the main chat. The chatIds.length <= 1
check then falls through to deleteSession, which shows 'delete this
session?' and deletes the entire session including the worktree.

Fix: find the specific chat by URI first. Only fall through to
deleteSession if the chat IS found in the group AND it's the last one.

Fixes #313148

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* nes: feat: ghost-text-like behavior

* adddresss review
Co-authored-by: Copilot <copilot@github.com>
The previous reverts only changed the spec to ^1.0.34, but the resolved entries in the lockfiles still pointed at 1.0.38 (with 1.0.38 tarballs and integrity hashes). Since ^1.0.34 satisfies 1.0.38, npm ci would still install the broken version. Pin to exact 1.0.34 in all three package.json files and regenerate the lockfiles.
When a child chat in a multi-chat group was removed, _refreshSessionCache
would first remove it from _sessionCache and invalidate grouping caches.
Then _refreshSessionCacheMultiChat would try to resolve the removed chat's
group ID, but since the caches were already rebuilt without the removed
chat, _getGroupIdForChat fell back to the chat's own ID instead of the
parent group's ID. This caused the child to be treated as a 'truly removed'
standalone session rather than a group membership change, so no 'changed'
event was fired for the parent group.

Fix: resolve group IDs for removed sessions BEFORE removing them from the
cache and invalidating grouping caches.

Fixes #311987

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
terminal: add shell integration trace logging
feat: add inline chat progress messages and prompts for user feedback
* sessions: add home button to customizations header to open welcome page

Add a home icon button to the 'Customizations' collapsible header in the
Agents sidebar. The button:
- Appears on hover of the header row (opacity transition)
- Opens the AI Customizations management editor and navigates to the
  welcome/overview page via showWelcomePage()
- Supports keyboard (Enter/Space), click, and touch tap (iOS)
- Shows a tooltip via IHoverService: 'Open Customizations Overview'
- Does not interfere with the existing collapse/expand toggle

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

* sessions: move customizations home button to leading position

Move the home button to the start of the header (before the toggle pill)
and make it always visible. This makes the entrypoint more discoverable
for new users since it's no longer hidden behind a hover state.

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

* sessions: align home icon with section icons below

Use matching padding (4px 8px) so the home icon's horizontal position
matches the agent/skill/instruction icons listed below the header.

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

* sessions: refine home icon alignment to match section rows

Remove font-size and explicit height overrides; instead mirror the
sidebar-action-button layout exactly (padding 4px 8px + gap 10px) so
the home icon naturally sizes and aligns with the section icons.

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

* sessions: align home icon and tighten color hierarchy in customizations header

- Drop the header button's left padding and set the home button's right
  padding to 10px so 'Customizations' sits exactly 10px after the home
  icon, matching the icon->label gap of the section rows below.
- Remove the home icon's opacity dim; use the strong agentsPanel
  foreground so the home icon and 'Customizations' label render at the
  same color weight.
- Apply --vscode-descriptionForeground to the section rows below the
  header so they read as secondary content under the prominent header.

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

* sessions: bump home icon size to match bold header weight

Codicons are a single-weight font, so font-weight has no effect on
icons. Increase the home icon's font-size to 18px so its visual stroke
weight matches the bold 'Customizations' label.

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

* sessions: revert home icon size bump

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

* sessions: replace home button with 'Manage customizations' footer link

Move the entrypoint to the customizations welcome page from a header
icon to a footer link below the section list. The footer:
- Sits inside the collapsible content (collapses with the section)
- Uses subtle descriptionForeground styling with a top border separator
- Includes a right-arrow that nudges on hover for affordance
- Supports click, touch tap (iOS), and keyboard (Enter/Space)
- Restores the original header layout (no padding/color hacks)

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

* sessions: add customizations overview header action

Replace the footer-style Customizations entrypoint with a dedicated header home action so the overview remains accessible in both expanded and collapsed states.

Add focused browser coverage for opening the welcome page without toggling collapse.

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

* sessions: align customizations overview action with counts

Nudge the Customizations header overview action left so it visually aligns with the per-section count column.

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

* sessions: simplify customizations overview editor check

Use the concrete AI Customizations management editor type instead of a structural showWelcomePage guard when opening the overview from the sidebar header action.

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…d qualification (#313217)

* add pluginUri and  extensionId to ICustomizationItem: fix slash command qualification

* Update src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostLocalCustomizations.ts

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

* update

* update

* update

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* handle steering the way the SDK wants it (via priority)
* pass along properties via the queued request (rather than setting them when we get the message) so that we can set them when the message is to be yielded to the SDK
* Tons of code simplification

There's still more simplification to do... but this is getting unwieldy so let's start here.

Co-authored-by: Copilot <copilot@github.com>
…ing (#313127)

* telemetry: add workspaceChunkSearch.tryInit event for cold-init tracking

Adds telemetry to track duration and outcome of workspace chunk search
cold initialization (getPreferredType + service creation). Records
success, noEmbeddingType, alreadyInitialized, or error outcomes.
Not fired for fast paths (no auth, already initialized).

Related: #313070

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

* fix: type outcome as string literal union per review

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

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…#313254)

Strip trailing newline on terminal paste in auto mode

Prevents clipboard-hijack scenarios from auto-executing pasted commands
when the shell does not support bracketed paste mode. Right-click /
Ctrl+V paste of a command followed by a newline previously executed
immediately; now the trailing newline is stripped so the user must press
Enter to run the command.
…313249)

The rich execute strategy subscribed to onExit/onDisposed AFTER awaiting
xtermReadyPromise. If the pty had already exited before execute() was
entered, those emitters had already fired and been disposed, so
Event.toPromise() subscribed to a dead emitter and never resolved -
hanging the run-in-terminal tool until the agent's 60-minute outer
timeout (16 X_AGENT_STILL_RESPONDING failures observed in eval run
25073061392).

- Add synchronous up-front check for instance.isDisposed / exitCode in
  both rich and basic strategies; resolve immediately with the captured
  exit code rather than subscribing to a fired-and-disposed emitter.
- In the rich strategy, move the Promise.race lifecycle subscription
  setup BEFORE 'await this._instance.xtermReadyPromise' so onExit /
  onDisposed are wired synchronously at function entry, closing the
  race window where the pty exits during xterm initialization.
- Add unit tests for both branches in rich and basic strategies.

Fixes #313248
@pull pull Bot locked and limited conversation to collaborators Apr 29, 2026
@pull pull Bot added the ⤵️ pull label Apr 29, 2026
@pull pull Bot merged commit cdbdcc3 into code:main Apr 29, 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.