Skip to content

fix(patch): cherry-pick ce56b4e to release/v0.15.1-pr-13073 [CONFLICTS]#13098

Closed
gemini-cli-robot wants to merge 1 commit into
release/v0.15.1-pr-13073from
hotfix/v0.15.1/0.15.2/stable/cherry-pick-ce56b4e/pr-13073
Closed

fix(patch): cherry-pick ce56b4e to release/v0.15.1-pr-13073 [CONFLICTS]#13098
gemini-cli-robot wants to merge 1 commit into
release/v0.15.1-pr-13073from
hotfix/v0.15.1/0.15.2/stable/cherry-pick-ce56b4e/pr-13073

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit ce56b4e to patch version v0.15.1 in the stable release to create version 0.15.2.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

  1. Review the conflicts: Check out this branch and review the conflict markers
  2. Resolve conflicts: Edit the affected files to resolve the conflicts
  3. Test the changes: Ensure the patch works correctly after resolution
  4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

  • Do not merge this PR until conflicts are resolved
  • The automated patch release will trigger once this PR is merged

# Conflicts:
#	packages/core/src/code_assist/experiments/experiments.test.ts
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @gemini-cli-robot, 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 updates the experiment flag identification mechanism from string-based names to numeric IDs. This change impacts how experiment flags are defined, parsed, and consumed throughout the application, ensuring a more robust and consistent approach to feature flagging. The PR also introduces new unit tests to validate the updated experiment handling logic. However, this is an automated cherry-pick that has encountered merge conflicts, which need to be resolved manually before it can be merged.

Highlights

  • Experiment Flag Identification: The system now uses numeric flagId instead of string name for identifying experiment flags across the codebase, enhancing consistency and robustness.
  • API Contract Update: The Flag interface in types.ts has been updated to reflect the new flagId field, ensuring type safety and alignment with the new identification scheme.
  • Experiment Parsing Logic: The parseExperiments function has been modified to correctly process and store flags using their flagId as the primary key.
  • Configuration Integration: The Config class has been updated to correctly summarize experiment flags using their flagId when displaying experiment information.
  • New Test Coverage: Comprehensive unit tests have been added for the experiments module, covering fetching, parsing, caching, and handling of various API responses, including cases with missing flag identifiers.
  • Merge Conflicts Detected: This pull request is an automated cherry-pick that resulted in merge conflicts, requiring manual resolution before it can be merged.
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.

@skeshive skeshive closed this Nov 14, 2025

@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 updates the experiment flag handling to use numeric flagIds instead of string names. The changes are applied consistently across type definitions, constants, implementation, and tests. I've found one issue in the debug logging logic for experiments where the sorting of flags is incorrect and the logged flagId type is inconsistent. I've provided a suggestion to fix this.

Comment on lines 1457 to +1459
.sort(([a], [b]) => a.localeCompare(b))
.map(([name, flag]) => {
const summary: Record<string, unknown> = { name };
.map(([flagId, flag]) => {
const summary: Record<string, unknown> = { flagId };

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 experiment flags are now identified by numeric flagIds. For the debug summary, it would be better to sort them numerically and also to represent the flagId as a number in the summary object to be consistent with its type. Currently, they are sorted lexicographically as strings, which can lead to an unexpected order (e.g., '100' before '20'), and the flagId in the summary is a string.

Suggested change
.sort(([a], [b]) => a.localeCompare(b))
.map(([name, flag]) => {
const summary: Record<string, unknown> = { name };
.map(([flagId, flag]) => {
const summary: Record<string, unknown> = { flagId };
.sort(([a], [b]) => Number(a) - Number(b))
.map(([, flag]) => {
const summary: Record<string, unknown> = { flagId: flag.flagId };

@github-actions

Copy link
Copy Markdown

Size Change: -66 B (0%)

Total Size: 20.5 MB

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

compressed-size-action

@sripasg sripasg added the size/m A medium sized PR label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/m A medium sized PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants