Skip to content

chore: streamline prompts and tool descriptions#25748

Open
adamfweidman wants to merge 1 commit intomainfrom
prompt-optimizations
Open

chore: streamline prompts and tool descriptions#25748
adamfweidman wants to merge 1 commit intomainfrom
prompt-optimizations

Conversation

@adamfweidman
Copy link
Copy Markdown
Contributor

Summary

Simplified and shortened system prompts and tool descriptions to optimize token usage during model interactions.

Details

Applied the following changes:

  • Simplified run_shell_command description.
  • Condensed read_file parameter descriptions.
  • Streamlined System Prompt Identity in snippets.ts.
  • Removed redundant guidelines in grep_search (Gemini 3 set).
  • Consolidated Security Mandates.
  • Shortened replace tool instructions.

Related Issues

None.

How to Validate

Validation will be handled by the eval-agent running Terminal Bench.

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

@adamfweidman adamfweidman requested a review from a team as a code owner April 21, 2026 16:55
@gemini-cli
Copy link
Copy Markdown
Contributor

gemini-cli Bot commented Apr 21, 2026

Hi @adamfweidman, 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
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 focuses on optimizing token usage by streamlining system prompts and tool definitions throughout the codebase. By condensing verbose instructions and removing redundant guidelines, the changes aim to improve model performance and efficiency during interactions without sacrificing clarity or safety.

Highlights

  • Prompt and Tool Optimization: Significantly reduced the verbosity of system prompts and tool descriptions across multiple files to improve token efficiency.
  • System Prompt Refinement: Consolidated the Gemini CLI system preamble into a single, concise identity statement.
  • Tool Description Updates: Simplified instructions for shell commands, file reading, and text replacement tools to focus on essential usage requirements.
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.

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
Copy Markdown

🛑 Action Required: Evaluation Approval

Steering changes have been detected in this PR. To prevent regressions, a maintainer must approve the evaluation run before this PR can be merged.

Maintainers:

  1. Go to the Workflow Run Summary.
  2. Click the yellow 'Review deployments' button.
  3. Select the 'eval-gate' environment and click 'Approve'.

Once approved, the evaluation results will be posted here automatically.

Copy link
Copy Markdown
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 simplifies and condenses various prompt snippets and tool descriptions across the core package, including the system preamble, security mandates, and documentation for shell, grep, and file editing tools. A review comment suggests that the simplified preamble in snippets.ts should retain the 'agent' persona and the distinction between interactive and autonomous modes to ensure the model maintains its communication style and level of autonomy.

return options.interactive
? 'You are Gemini CLI, an interactive CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and effectively.'
: 'You are Gemini CLI, an autonomous CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and effectively.';
return 'You are Gemini CLI, a software engineering assistant focused on safety and efficiency.';
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 simplified preamble removes the "agent" persona and the distinction between interactive and autonomous modes. This distinction is crucial for the model to understand its level of autonomy and communication style. Additionally, "agent" is generally a stronger persona for tool-use tasks than "assistant". The suggestion has been modified to exclude general safety reminders in favor of a concise persona definition.

Suggested change
return 'You are Gemini CLI, a software engineering assistant focused on safety and efficiency.';
return "You are Gemini CLI, an " + (options.interactive ? "interactive" : "autonomous") + " software engineering agent.";
References
  1. When instructing an agent, prefer explicit instructions or specific personas over general reminders to adhere to safety guidelines.

@github-actions
Copy link
Copy Markdown

Size Change: -2.95 kB (-0.01%)

Total Size: 33.7 MB

Filename Size Change
./bundle/chunk-7HZ62EWV.js 0 B -14.5 MB (removed) 🏆
./bundle/chunk-7JYX7OYE.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-7LSIJV5T.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-QOIPE2QP.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-TFETZB54.js 0 B -674 kB (removed) 🏆
./bundle/chunk-USRW35AA.js 0 B -2.72 MB (removed) 🏆
./bundle/chunk-YIPDXML5.js 0 B -1.97 MB (removed) 🏆
./bundle/core-XRKWYEBZ.js 0 B -46.7 kB (removed) 🏆
./bundle/devtoolsService-JM7UV5K7.js 0 B -28.4 kB (removed) 🏆
./bundle/gemini-HBHBH6VI.js 0 B -576 kB (removed) 🏆
./bundle/interactiveCli-VGZMS7IN.js 0 B -1.3 MB (removed) 🏆
./bundle/liteRtServerManager-56MHLN2Q.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-UE6YCM4Y.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-4ZM3K6HD.js 2.72 MB +2.72 MB (new file) 🆕
./bundle/chunk-6LO3LFAC.js 14.5 MB +14.5 MB (new file) 🆕
./bundle/chunk-C2PNKUOO.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/chunk-E7HOO5YS.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-GTLRBQRW.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-MRQKD3UE.js 674 kB +674 kB (new file) 🆕
./bundle/chunk-QFRXNDMX.js 1.97 MB +1.97 MB (new file) 🆕
./bundle/core-SO32FZ2G.js 46.7 kB +46.7 kB (new file) 🆕
./bundle/devtoolsService-ZWWL5HSK.js 28.4 kB +28.4 kB (new file) 🆕
./bundle/gemini-F5ZEJCD3.js 576 kB +576 kB (new file) 🆕
./bundle/interactiveCli-3M6RFWR3.js 1.3 MB +1.3 MB (new file) 🆕
./bundle/liteRtServerManager-HQIEQHAK.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-WNCKYZM6.js 9.16 kB +9.16 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-664ZODQF.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/cleanup-GLDYQJA4.js 0 B -932 B (removed) 🏆
./bundle/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 4.97 kB 0 B
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/memoryDiscovery-NXEEFR74.js 0 B -980 B (removed) 🏆
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 222 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 229 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 13.4 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 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-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-UAYHAXS3.js 0 B -622 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/cleanup-IK3XAVDY.js 932 B +932 B (new file) 🆕
./bundle/memoryDiscovery-WJ4YBB7E.js 980 B +980 B (new file) 🆕
./bundle/start-Z2FS66LK.js 622 B +622 B (new file) 🆕

compressed-size-action

@gemini-cli gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label Apr 21, 2026
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.

1 participant