Skip to content

Show notification when there's a conflict with an extensions command#17890

Merged
chrstnb merged 5 commits intomainfrom
cb/conflictnotif
Feb 12, 2026
Merged

Show notification when there's a conflict with an extensions command#17890
chrstnb merged 5 commits intomainfrom
cb/conflictnotif

Conversation

@chrstnb
Copy link
Collaborator

@chrstnb chrstnb commented Jan 29, 2026

Summary

Add a notification if we rename a command exposed by an extension because of a conflict

Details

ℹ Command conflicts detected:
  - Command '/fs:grep-code' from extension 'my-api-extension' was renamed to '/my-api-extension.fs:grep-code' because it conflicts with extension 'bigquery-data-analytics'.

Related Issues

Fixes google-gemini/maintainers-gemini-cli#1207

How to Validate

  1. Create a user command ~/.gemini/commands/deploy.toml.
  2. Install an extension that provides a deploy command (or simulate one).
  3. Start the CLI.
  4. Expected: A message "Command conflicts detected" should appear once.
  5. It should say: "...conflicts with extension '[extension_name]'".
  6. If the CLI reloads (e.g., due to an MCP server connecting), the message should NOT appear again.

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run
      • npx
      • Docker
      • Podman
      • Seatbelt
    • Windows
      • npm run
      • npx
      • Docker
    • Linux
      • npm run
      • npx
      • Docker

@chrstnb chrstnb requested a review from a team as a code owner January 29, 2026 20:22
@gemini-cli
Copy link
Contributor

gemini-cli bot commented Jan 29, 2026

Hi @chrstnb, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @chrstnb, 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 introduces a significant improvement in user experience by providing clear and concise notifications when command name conflicts arise from installed extensions. It ensures that users are aware of automatic command renaming, enhancing transparency and debugging capabilities within the CLI environment.

Highlights

  • Command Conflict Detection: The CommandService now detects and records instances where extension commands conflict with existing commands (either built-in or from other extensions). When a conflict occurs, the extension command is renamed to avoid collision.
  • Conflict Notification System: A new user-facing notification system has been implemented to inform users about command conflicts. This notification details which command was renamed, its original name, and the extension it belongs to, as well as the command it conflicted with.
  • Deduplication of Notifications: The notification system ensures that conflict warnings are displayed only once, even if the command processor reloads, preventing repetitive messages for the same conflict.
  • Testing: Comprehensive unit and integration tests have been added to verify the correct detection, reporting, and notification of command conflicts, covering various scenarios including built-in vs. extension and extension vs. extension conflicts.
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 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 counter productive. 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.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

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.

@github-actions
Copy link

github-actions bot commented Jan 29, 2026

Size Change: +2.99 kB (+0.01%)

Total Size: 24.3 MB

Filename Size Change
./bundle/gemini.js 24.3 MB +2.99 kB (+0.01%)
ℹ️ View Unchanged
Filename Size
./bundle/sandbox-macos-permissive-closed.sb 1.03 kB
./bundle/sandbox-macos-permissive-open.sb 890 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB
./bundle/sandbox-macos-restrictive-closed.sb 3.29 kB
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB

compressed-size-action

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

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 introduces a notification system to inform users about command conflicts. A potential race condition in the useEffect hook could lead to state updates on an unmounted component, which should be addressed by utilizing the AbortSignal for cancellation, consistent with existing patterns for asynchronous operations.

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Jan 29, 2026
@gemini-cli
Copy link
Contributor

gemini-cli bot commented Jan 30, 2026

Hi there! Thank you for your contribution to Gemini CLI. We really appreciate the time and effort you've put into this pull request.

To keep our backlog manageable and ensure we're focusing on current priorities, we are closing pull requests that haven't seen maintainer activity for 30 days. Currently, the team is prioritizing work associated with 🔒 maintainer only or help wanted issues.

If you believe this change is still critical, please feel free to comment with updated details. Otherwise, we encourage contributors to focus on open issues labeled as help wanted. Thank you for your understanding!

@gemini-cli gemini-cli bot closed this Jan 30, 2026
@jacob314 jacob314 reopened this Jan 30, 2026
@jacob314
Copy link
Contributor

jacob314 commented Feb 2, 2026

Testing Standards Review (via /review-frontend, reviewed by jacobr)

In packages/cli/src/ui/hooks/slashCommandProcessor.test.tsx, the test case should deduplicate conflict warnings across re-renders uses a fixed wait:

await new Promise((resolve) => setTimeout(resolve, 100));

This violates the project's mandate to avoid fixed waits, as they can lead to flaky and slow tests. Please replace this with the waitFor utility from ../../test-utils/async.js to ensure the assertion is checked as soon as the condition is met.

Copy link
Contributor

@jacob314 jacob314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overall. Approved once these comments are addressed.

Copy link
Contributor

@jacob314 jacob314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm
much cleaner!

@chrstnb chrstnb enabled auto-merge February 12, 2026 16:18
@chrstnb chrstnb added this pull request to the merge queue Feb 12, 2026
Merged via the queue into main with commit 2ca183f Feb 12, 2026
27 checks passed
@chrstnb chrstnb deleted the cb/conflictnotif branch February 12, 2026 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants