Skip to content

fix(patch): cherry-pick 7ec7845 to release/v0.15.0-preview.1-pr-12905 [CONFLICTS]#12962

Merged
anj-s merged 3 commits into
release/v0.15.0-preview.1-pr-12905from
hotfix/v0.15.0-preview.1/0.15.0-preview.2/preview/cherry-pick-7ec7845/pr-12905
Nov 12, 2025
Merged

fix(patch): cherry-pick 7ec7845 to release/v0.15.0-preview.1-pr-12905 [CONFLICTS]#12962
anj-s merged 3 commits into
release/v0.15.0-preview.1-pr-12905from
hotfix/v0.15.0-preview.1/0.15.0-preview.2/preview/cherry-pick-7ec7845/pr-12905

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 7ec7845 to patch version v0.15.0-preview.1 in the preview release to create version 0.15.0-preview.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:
#	schemas/settings.schema.json
@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 is an automated cherry-pick of a commit aimed at improving the write_todos tool. The primary goal is to rename the tool, enable it by default for better user experience and agent alignment, and refine its internal schema for improved validation. However, the automated process encountered merge conflicts, requiring manual resolution before the changes can be fully integrated.

Highlights

  • Tool Renaming: The write_todos_list tool has been renamed to write_todos across the codebase, including documentation, UI, and test files.
  • Default Enablement: The write_todos tool is now enabled by default, changing its previous default state of being disabled.
  • Schema Refinement: The output function schema for the write_todos tool has been refined by adding additionalProperties: false for stricter validation and explicitly defining the tool's schema via an override get schema method.
  • Documentation Updates: Documentation for the write_todos tool has been updated to reflect its new default enablement and provide further context on its benefits.
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-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 PR cherry-picks a commit to rename write_todos_list to write_todos and enable it by default. The changes across the documentation, configuration, and tests are consistent. However, there is a critical unresolved merge conflict in schemas/settings.schema.json which makes the file invalid. This must be resolved before merging.

Comment on lines 979 to 992
"useWriteTodos": {
<<<<<<< HEAD
"title": "Use Write Todos",
"description": "Enable the write_todos_list tool.",
"markdownDescription": "Enable the write_todos_list tool.\n\n- Category: `Advanced`\n- Requires restart: `no`\n- Default: `false`",
"default": false,
=======
"title": "Use WriteTodos",
"description": "Enable the write_todos tool.",
"markdownDescription": "Enable the write_todos tool.\n\n- Category: `Advanced`\n- Requires restart: `no`\n- Default: `true`",
"default": true,
>>>>>>> 7ec78452 (Enable write_todo tool and fix output function schema (#12905))
"type": "boolean"
},

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.

critical

This file contains an unresolved merge conflict which makes it an invalid JSON file. Please resolve the conflict before merging. It seems the correct resolution is to combine changes from both sides of the conflict.

    "useWriteTodos": {
      "title": "Use Write Todos",
      "description": "Enable the write_todos tool.",
      "markdownDescription": "Enable the write_todos tool.\n\n- Category: `Advanced`\n- Requires restart: `no`\n- Default: `true`",
      "default": true,
      "type": "boolean"
    },

@github-actions

github-actions Bot commented Nov 12, 2025

Copy link
Copy Markdown

Size Change: +967 B (0%)

Total Size: 20.5 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 20.5 MB +967 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

@anj-s anj-s merged commit e271970 into release/v0.15.0-preview.1-pr-12905 Nov 12, 2025
21 checks passed
@anj-s anj-s deleted the hotfix/v0.15.0-preview.1/0.15.0-preview.2/preview/cherry-pick-7ec7845/pr-12905 branch November 12, 2025 20:31
@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.

3 participants