Skip to content

fix(vscode): track activation disposables#28386

Open
vivekjm wants to merge 1 commit into
google-gemini:mainfrom
vivekjm:fix/vscode-disposable-subscriptions
Open

fix(vscode): track activation disposables#28386
vivekjm wants to merge 1 commit into
google-gemini:mainfrom
vivekjm:fix/vscode-disposable-subscriptions

Conversation

@vivekjm

@vivekjm vivekjm commented Jul 13, 2026

Copy link
Copy Markdown

Summary

Fixes #27790.

The VS Code companion activation path was wrapping two pairs of registration calls in parentheses inside context.subscriptions.push(...). In JavaScript, those become comma expressions, so both registrations run but only the last Disposable from each pair is tracked.

This PR removes the comma expressions so these activation Disposables are all retained for cleanup:

  • gemini.diff.accept
  • gemini.diff.cancel
  • onDidChangeWorkspaceFolders
  • onDidGrantWorkspaceTrust

It also updates the extension activation test mock to return tagged Disposables and adds a regression assertion for the affected registrations.

Validation

  • npm run build -w @google/gemini-cli-core
  • npm test -w gemini-cli-vscode-ide-companion
  • npm run check-types -w gemini-cli-vscode-ide-companion
  • npm run lint -w gemini-cli-vscode-ide-companion

Note: npm install completed locally with engine warnings because this machine is on Node 20.15.0; the repo recommends Node ~20.19.0 for development.

@vivekjm vivekjm requested a review from a team as a code owner July 13, 2026 06:38
@github-actions github-actions Bot added the size/m A medium sized PR label Jul 13, 2026
@github-actions

Copy link
Copy Markdown

📊 PR Size: size/M

  • Lines changed: 54
  • Additions: +45
  • Deletions: -9
  • Files changed: 2

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a bug in the VS Code extension activation logic where multiple disposables were being incorrectly grouped using comma expressions. This prevented some resources from being properly tracked and disposed of upon extension deactivation. The changes ensure that all command registrations and workspace event listeners are correctly pushed to the extension context subscriptions.

Highlights

  • Disposable Registration Fix: Removed erroneous comma expressions in context.subscriptions.push calls to ensure all activation disposables are correctly tracked and cleaned up.
  • Testing Improvements: Updated the extension activation test mock to return tagged disposables and added a regression test to verify that all critical commands and workspace listeners are properly registered.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot 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.

Code Review

This pull request cleans up redundant parentheses in subscription registrations within extension.ts and adds a unit test in extension.test.ts to verify that activation disposables are correctly tracked for cleanup. However, the test suite calls activate(context) across multiple tests without invoking deactivate() afterwards, which leaves Express servers running in the background. It is recommended to import and call deactivate() in an afterEach block to prevent resource leaks and potential test flakiness.

Comment on lines +149 to +151
it('tracks all activation disposables for cleanup', async () => {
await activate(context);

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.

high

The test suite calls activate(context) in multiple tests, which starts an Express server on a random port each time. However, deactivate() is never called in afterEach or anywhere in the tests, causing these servers to remain running in the background. This leads to resource leaks (ports, memory, file descriptors) and potential test flakiness. Please import deactivate from ./extension.js and call it in afterEach to ensure proper cleanup of the IDE server.

@gemini-cli gemini-cli Bot added priority/p2 Important but can be addressed in a future release. area/core Issues related to User Interface, OS Support, Core Functionality labels Jul 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/core Issues related to User Interface, OS Support, Core Functionality priority/p2 Important but can be addressed in a future release. size/m A medium sized PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

fix(vscode-ide-companion): comma operator in activate() leaks two Disposables (gemini.diff.accept, onDidChangeWorkspaceFolders)

1 participant