Skip to content

Add git-branch-checkout icon with metadata and mapping - #541

Merged
Lee Murray (mrleemurray) merged 1 commit into
mainfrom
mrleemurray/overseas-chocolate-unicorn
Oct 30, 2026
Merged

Lee Murray (mrleemurray) merged 1 commit into
mainfrom
mrleemurray/overseas-chocolate-unicorn

Conversation

@mrleemurray

Copy link
Copy Markdown
Contributor

Introduce a new icon for checking out Git branches, along with its associated metadata and mapping in the configuration files. This enhances the visual representation of Git operations.

@mrleemurray Lee Murray (mrleemurray) changed the title Add git-branch-checkout icon with metadata and mapping Add git-branch-checkout icon with metadata and mapping Oct 30, 2026
@mrleemurray
Lee Murray (mrleemurray) merged commit ceaa866 into main Oct 30, 2026
6 checks passed
@mrleemurray
Lee Murray (mrleemurray) deleted the mrleemurray/overseas-chocolate-unicorn branch October 30, 2026 16:07
Megan Rogge (meganrogge) added a commit to microsoft/vscode that referenced this pull request Oct 30, 2026
fixes #343929
<!-- Thank you for submitting a Pull Request. Please:
* Read our Pull Request guidelines:

https://github.com/microsoft/vscode/wiki/How-to-Contribute#pull-requests
* Associate an issue with the Pull Request.
* Ensure that the code is up-to-date with the `main` branch.
* Include a description of the proposed changes and how to test them.
-->

Uses the new `git-branch-checkout` icon from
microsoft/vscode-codicons#541 for the **Branch** option in the
new-session composer's Branch/New Worktree picker, including the
selected trigger, across both the main Agent Host composer (including
Copilot workspace targets) and the shared nested-session composer. New
Worktree keeps its existing icon. Labels, keyboard behavior, and
screen-reader descriptions are unchanged; the trigger icon remains
decorative.

Updates desktop and web to the now-published Codicons `0.0.46-49`. The
official prerelease pipeline completed successfully:
https://dev.azure.com/monacotools/Monaco/_build/results?buildId=491288.
Verified the package's generated TypeScript, CSS, and font-derived CSV
contain the glyph with codepoint U+ECFB.

### Validation
- `npm run build-fast -- --client-only` — passed.
- `npm run eslint -- src/vs/base/common/codicons.ts
src/vs/sessions/contrib/chat/browser/isolationPicker.ts
src/vs/sessions/contrib/chat/test/browser/nestedChatComposer.test.ts` —
passed.
- `./scripts/test.sh --run
src/vs/sessions/contrib/providers/agentHost/test/browser/agentHost/agentHostSessionConfigPicker.test.ts
--run
src/vs/sessions/contrib/chat/test/browser/nestedChatComposer.test.ts
--reporter dot` — 100 passed. Native dependencies were rebuilt for the
live launch; the final run has no missing-native-module warning.
- `npm run eslint --
src/vs/sessions/contrib/providers/agentHost/browser/agentHostSessionConfigPicker.ts
src/vs/sessions/contrib/providers/agentHost/test/browser/agentHost/agentHostSessionConfigPicker.test.ts`
— passed.
- `npm run hygiene` — passed (14,180 files).
- `git diff --check` — passed.
- Web lockfile refreshed with `npm install --prefix remote/web
--package-lock-only --ignore-scripts --no-audit --no-fund
--registry=https://registry.npmjs.org
--min-release-age-exclude=@vscode/codicons` — passed. The one-command
exception is limited to this verified first-party prerelease; no npm
configuration changes.
- Live Code OSS Agents window: visually verified the main new-session
Branch trigger and open menu show the checkout glyph, with New Worktree
unchanged.
- Full type check and screen-reader testing were not run.

### Manual testing
Open the Agents window, choose a Git repository in the new-session
composer, and open the Branch/New Worktree picker. Check that Branch
uses the checkout icon in the menu and selected trigger, while New
Worktree keeps its worktree icon. The shared nested-session composer is
covered by the regression test.
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.

3 participants