Skip to content

refactor common settings logic for skills,agents#17490

Merged
scidomino merged 6 commits intogoogle-gemini:mainfrom
ishaanxgupta:ishaan/refactor
Mar 3, 2026
Merged

refactor common settings logic for skills,agents#17490
scidomino merged 6 commits intogoogle-gemini:mainfrom
ishaanxgupta:ishaan/refactor

Conversation

@ishaanxgupta
Copy link
Contributor

@ishaanxgupta ishaanxgupta commented Jan 25, 2026

Related Issues

closes #17348

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

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @ishaanxgupta, 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 significantly refactors the internal logic for managing the enabled/disabled states of agents and skills. By introducing a new featureToggleUtils.ts module and a FeatureToggleStrategy pattern, it abstracts the common operations for feature toggling. This change centralizes the core functionality, making the code more modular, reducing duplication in agentSettings.ts and skillSettings.ts, and improving overall maintainability for future feature management.

Highlights

  • Code Refactoring for Feature Toggling: Introduced a new utility file, featureToggleUtils.ts, to centralize and abstract the common logic for enabling and disabling various features, such as agents and skills.
  • Strategy Pattern Implementation: Implemented a FeatureToggleStrategy interface, allowing for feature-specific logic (e.g., how agents are enabled/disabled versus how skills are) to be defined and passed to generic toggle functions.
  • Reduced Code Duplication: Refactored agentSettings.ts and skillSettings.ts to leverage the new generic enableFeature and disableFeature functions, significantly reducing redundant code for managing feature states across different settings scopes.
  • Improved Maintainability: The changes enhance the modularity and maintainability of the settings management system by separating generic toggling mechanisms from feature-specific implementation details.
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.

@gemini-cli gemini-cli bot added the area/core Issues related to User Interface, OS Support, Core Functionality label Jan 25, 2026
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 centralizes the logic for enabling and disabling skills and agents into a new featureToggleUtils.ts utility, significantly reducing code duplication and improving maintainability. However, functions in agentSettings.ts and skillSettings.ts that wrap the new utility produce objects with an incorrect shape, violating their declared types.

@ishaanxgupta ishaanxgupta marked this pull request as ready for review January 26, 2026 15:33
@ishaanxgupta ishaanxgupta requested a review from a team as a code owner January 26, 2026 15:33
@ishaanxgupta
Copy link
Contributor Author

@sehoon38 please have a look, there are no test files for these 2 files, should I implement them in another PR or should I do them in this itself?

@gemini-cli
Copy link
Contributor

gemini-cli bot commented Jan 27, 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 27, 2026
@ishaanxgupta
Copy link
Contributor Author

ishaanxgupta commented Feb 19, 2026

@sehoon38 @scidomino could you please reopen this one, it previously got closed due to lack of help wanted label

@scidomino scidomino reopened this Mar 3, 2026
@gemini-cli gemini-cli bot added the help wanted We will accept PRs from all issues marked as "help wanted". Thanks for your support! label Mar 3, 2026
@scidomino scidomino self-requested a review March 3, 2026 01:32
@scidomino
Copy link
Collaborator

This PR is a solid refactoring that improves code structure by creating a reusable utility for toggling features. This is a definite improvement for maintainability.

The most critical issue is the lack of tests for the new, shared logic. The existing tests for the agents and skills commands mock the functions that were refactored, so the new logic in featureToggleUtils.ts and the strategies in agentSettings.ts and skillSettings.ts are not covered by any tests. This is a significant risk for a change that touches settings.

Before this PR is merged, I recommend adding unit tests for the new and refactored files.

Here are my specific recommendations:

packages/cli/src/utils/featureToggleUtils.test.ts

  • Test enableFeature when the feature is already enabled in all scopes.
  • Test enableFeature when the feature is disabled in one scope.
  • Test enableFeature when the feature is disabled in both scopes.
  • Test disableFeature when the feature is already disabled.
  • Test disableFeature when the feature is enabled.
  • Test disableFeature with an invalid scope.

packages/cli/src/utils/agentSettings.test.ts

  • Test the agentStrategy with various settings configurations (e.g., enabled, disabled, not present).

packages/cli/src/utils/skillSettings.test.ts

  • Test the skillStrategy with various settings configurations (e.g., in the disabled list, not in the list).

Adding these tests will ensure that this refactoring is safe and that the logic is correct.

@ved015
Copy link
Contributor

ved015 commented Mar 3, 2026

@scidomino added test and ran them on local all tests are passing and preflight also checked

@ved015
Copy link
Contributor

ved015 commented Mar 3, 2026

Screenshot 2026-03-03 at 11 37 23 PM

@scidomino Uhh is there any mistake on my side for this one

@ved015
Copy link
Contributor

ved015 commented Mar 3, 2026

Three test are failing in e2e one timedout one is flaky ig and one failed legit but i dont think that has anything to do with the refactor which this PR does🤔

@ishaanxgupta
Copy link
Contributor Author

tests look good!

@scidomino scidomino added this pull request to the merge queue Mar 3, 2026
Merged via the queue into google-gemini:main with commit 4be08a2 Mar 3, 2026
27 checks passed
jwhelangoog pushed a commit that referenced this pull request Mar 3, 2026
Co-authored-by: ved015 <vedant.04.mahajan@gmail.com>
Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>
BryanBradfo pushed a commit to BryanBradfo/gemini-cli that referenced this pull request Mar 5, 2026
Co-authored-by: ved015 <vedant.04.mahajan@gmail.com>
Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>
struckoff pushed a commit to struckoff/gemini-cli that referenced this pull request Mar 6, 2026
Co-authored-by: ved015 <vedant.04.mahajan@gmail.com>
Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>
liamhelmer pushed a commit to badal-io/gemini-cli that referenced this pull request Mar 12, 2026
Co-authored-by: ved015 <vedant.04.mahajan@gmail.com>
Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>
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 help wanted We will accept PRs from all issues marked as "help wanted". Thanks for your support!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Refactor common settings logic for hooks, skills, and agents

3 participants