fix(core): discourage unprompted git add . in prompt snippets by akh64bit · Pull Request #26220 · google-gemini/gemini-cli

akh64bit · 2026-04-29T19:55:45Z

This PR explicitly discourages the use of git add . or git add -A unprompted by updating the instructions in both snippets.ts and snippets.legacy.ts. Instead, the agent is instructed to selectively stage task-specific changed files.

Fixes #24628

gemini-code-assist · 2026-04-29T19:55:58Z

Summary of Changes

Hello, I'm Gemini Code Assist¹! 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 improves the reliability of Git operations performed by the agent by refining the instructions provided in the core prompt snippets. By discouraging indiscriminate staging commands, the agent is now guided to be more precise and intentional when preparing commits, which helps prevent common errors related to staging unintended files.

Highlights

Updated Git instructions: Modified prompt instructions to explicitly discourage the use of 'git add .' or 'git add -A' without explicit user prompting.
Promoted selective staging: Instructed the agent to prefer staging specific files related to the task to avoid accidentally including unwanted or untracked files.

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.

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 · 2026-04-29T19:56:05Z

🛑 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:

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

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

github-actions · 2026-04-29T20:01:49Z

Size Change: +430 B (0%)

Total Size: 33.9 MB

Filename	Size	Change
`./bundle/chunk-3VW3B6X2.js`	0 B	-19.5 kB (removed)	🏆
`./bundle/chunk-5BYP4PME.js`	0 B	-49.2 kB (removed)	🏆
`./bundle/chunk-EOT7CNWD.js`	0 B	-12.6 kB (removed)	🏆
`./bundle/chunk-MHONIPG3.js`	0 B	-2.72 MB (removed)	🏆
`./bundle/chunk-NQH7YEVX.js`	0 B	-14.7 MB (removed)	🏆
`./bundle/chunk-QQPRK56X.js`	0 B	-3.43 kB (removed)	🏆
`./bundle/chunk-TXOTIBO3.js`	0 B	-3.8 kB (removed)	🏆
`./bundle/chunk-VVCDHW4T.js`	0 B	-655 kB (removed)	🏆
`./bundle/core-C3GHJ3R7.js`	0 B	-48.2 kB (removed)	🏆
`./bundle/devtoolsService-L4XND4TI.js`	0 B	-28 kB (removed)	🏆
`./bundle/gemini-HIUDN73S.js`	0 B	-577 kB (removed)	🏆
`./bundle/interactiveCli-O2BFKOR2.js`	0 B	-1.31 MB (removed)	🏆
`./bundle/liteRtServerManager-QM3KCEQZ.js`	0 B	-2.11 kB (removed)	🏆
`./bundle/oauth2-provider-ONAEBTQB.js`	0 B	-9.16 kB (removed)	🏆
`./bundle/chunk-2QUPRMFB.js`	49.2 kB	+49.2 kB (new file)	🆕
`./bundle/chunk-72CTCALI.js`	14.7 MB	+14.7 MB (new file)	🆕
`./bundle/chunk-74EY42LR.js`	655 kB	+655 kB (new file)	🆕
`./bundle/chunk-7S3UISMR.js`	19.5 kB	+19.5 kB (new file)	🆕
`./bundle/chunk-BC52IL46.js`	3.8 kB	+3.8 kB (new file)	🆕
`./bundle/chunk-DXK4PUJT.js`	12.6 kB	+12.6 kB (new file)	🆕
`./bundle/chunk-OOO4EO7Z.js`	2.72 MB	+2.72 MB (new file)	🆕
`./bundle/chunk-VZ2A2D7N.js`	3.43 kB	+3.43 kB (new file)	🆕
`./bundle/core-4I2SUFJY.js`	48.2 kB	+48.2 kB (new file)	🆕
`./bundle/devtoolsService-5GAAVKLS.js`	28 kB	+28 kB (new file)	🆕
`./bundle/gemini-XLQN6CX3.js`	577 kB	+577 kB (new file)	🆕
`./bundle/interactiveCli-BI7F5DPZ.js`	1.31 MB	+1.31 MB (new file)	🆕
`./bundle/liteRtServerManager-NGJK6G5T.js`	2.11 kB	+2.11 kB (new file)	🆕
`./bundle/oauth2-provider-6SDMVUJE.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/chunk-XRLFHCHC.js`	1.97 MB	0 B
`./bundle/cleanup-LUJD2HZQ.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`	5.1 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-FN3IAPBT.js`	980 B	0 B
`./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-ING5INN7.js`	0 B	-652 B (removed)	🏆
`./bundle/tree-sitter-7U6MW5PS.js`	274 kB	0 B
`./bundle/tree-sitter-bash-34ZGLXVX.js`	1.84 MB	0 B
`./bundle/cleanup-F55DJI6Q.js`	932 B	+932 B (new file)	🆕
`./bundle/start-ENA77YYZ.js`	652 B	+652 B (new file)	🆕

_{compressed-size-action}

gemini-code-assist

Code Review

This pull request updates the git-related prompt instructions in the core package to prevent the AI agent from using bulk staging commands like git add . or git add -A unprompted. The instructions now explicitly require staging only the specific files that were changed or created as part of the task. I have no feedback to provide.

_{Note: Security Review did not run due to the size of the PR.}

Samee24

Can we add behavioral eval(s) for this?

Update instructions to prompt the agent to stage only task-specific changed files to prevent unprompted staging of untracked files. Fixes #24628

akh64bit · 2026-04-29T23:29:28Z

Good callout. I have added the behavioral test.

akh64bit · 2026-05-01T17:26:36Z

@gemini-code-assist can you review the behavioral test that I have added. Does it cover all the changes in this PR?

gemini-code-assist · 2026-05-01T17:26:50Z

Thank you for adding the behavioral test. I have reviewed the test case in evals/gitRepo.eval.ts and it correctly asserts that the agent does not use git add ., git add -a, or git add --all when prompted to commit changes. This test effectively validates the new instructions added to the prompt snippets. The implementation is sound and covers the requirement.

akh64bit · 2026-05-01T17:34:06Z

@gemini-code-assist can you give me a detailed summary of the test that was added for @Samee24

gemini-code-assist · 2026-05-01T17:34:18Z

Summary of Changes

This pull request refines the agent's Git workflow instructions to improve precision when staging files for commits. By discouraging the use of broad staging commands, the agent is encouraged to be more intentional, reducing the risk of accidentally including unintended or untracked files in commits. A new behavioral test ensures these instructions are followed correctly.

Highlights

Prompt Instruction Update: Updated core prompt snippets to explicitly discourage the use of 'git add .' or 'git add -A' and instead guide the agent to selectively stage specific files.
Behavioral Evaluation Added: Introduced a new test case in 'evals/gitRepo.eval.ts' that verifies the agent avoids indiscriminate staging commands when prompted to commit changes.

Activity

Initial pull request created by akh64bit.
Gemini Code Assist provided an initial summary of changes.
GitHub Actions requested evaluation approval for steering changes.
GitHub Actions posted a bundle size change report.
Author added a behavioral test to verify the new instructions.
Author requested a review of the added behavioral test from Gemini Code Assist.
Gemini Code Assist reviewed the test and confirmed it correctly validates the new prompt instructions.
Author requested a detailed summary of the added test for a reviewer.

akh64bit · 2026-05-01T17:35:08Z

@Samee24 the test has been added. Pls review. Thanks.

Samee24

LGTM!

…-gemini#26220)

akh64bit requested review from a team as code owners April 29, 2026 19:55

akh64bit had a problem deploying to eval-gate April 29, 2026 19:56 — with GitHub Actions Error

akh64bit had a problem deploying to eval-gate April 29, 2026 19:57 — with GitHub Actions Error

akh64bit force-pushed the fix-git-add-unprompted branch from ca16fc1 to 8c3aab8 Compare April 29, 2026 19:57

akh64bit had a problem deploying to eval-gate April 29, 2026 19:58 — with GitHub Actions Error

gemini-code-assist Bot reviewed Apr 29, 2026

View reviewed changes

gemini-cli Bot added the area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality label Apr 29, 2026

akh64bit had a problem deploying to eval-gate April 29, 2026 22:53 — with GitHub Actions Error

Samee24 requested changes Apr 29, 2026

View reviewed changes

fix(core): discourage unprompted git add . in prompt snippets

e0bfc35

Update instructions to prompt the agent to stage only task-specific changed files to prevent unprompted staging of untracked files. Fixes #24628

akh64bit force-pushed the fix-git-add-unprompted branch from ac21aab to e0bfc35 Compare April 29, 2026 23:27

akh64bit requested a deployment to eval-gate April 29, 2026 23:28 — with GitHub Actions Waiting

akh64bit enabled auto-merge April 29, 2026 23:29

This was referenced Apr 30, 2026

📊 AI CLI 工具社区动态日报 2026-04-30 gsscsd/big_model_radar#269

Open

📊 AI CLI 工具社区动态日报 2026-04-30 borq168/big_model_radar#79

Open

📊 AI CLI Tools Digest 2026-04-30 borq168/big_model_radar#82

Open

Samee24 self-requested a review May 1, 2026 17:54

Samee24 approved these changes May 1, 2026

View reviewed changes

akh64bit added this pull request to the merge queue May 1, 2026

Merged via the queue into main with commit f496354 May 1, 2026
28 of 29 checks passed

akh64bit deleted the fix-git-add-unprompted branch May 1, 2026 18:08

bkutasi mentioned this pull request May 1, 2026

📊 AI CLI Tools Digest 2026-05-02 bkutasi/big_model_radar#1

Open

TirthNaik-99 pushed a commit to TirthNaik-99/gemini-cli that referenced this pull request May 4, 2026

fix(core): discourage unprompted git add . in prompt snippets (google…

7c8c54c

…-gemini#26220)

scidomino pushed a commit to TirthNaik-99/gemini-cli that referenced this pull request May 4, 2026

fix(core): discourage unprompted git add . in prompt snippets (google…

ff232ab

…-gemini#26220)

kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 6, 2026

fix(core): discourage unprompted git add . in prompt snippets (google…

44d178e

…-gemini#26220)

kimjune01 pushed a commit to kimjune01/gemini-cli-claude that referenced this pull request May 8, 2026

fix(core): discourage unprompted git add . in prompt snippets (google…

fef8569

…-gemini#26220)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(core): discourage unprompted git add . in prompt snippets#26220

fix(core): discourage unprompted git add . in prompt snippets#26220
akh64bit merged 1 commit intomainfrom
fix-git-add-unprompted

akh64bit commented Apr 29, 2026

Uh oh!

gemini-code-assist Bot commented Apr 29, 2026

Uh oh!

github-actions Bot commented Apr 29, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Apr 29, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Samee24 left a comment

Uh oh!

akh64bit commented Apr 29, 2026

Uh oh!

akh64bit commented May 1, 2026

Uh oh!

gemini-code-assist Bot commented May 1, 2026

Uh oh!

akh64bit commented May 1, 2026

Uh oh!

gemini-code-assist Bot commented May 1, 2026

Uh oh!

akh64bit commented May 1, 2026

Uh oh!

Samee24 left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

akh64bit commented Apr 29, 2026

Uh oh!

gemini-code-assist Bot commented Apr 29, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

github-actions Bot commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🛑 Action Required: Evaluation Approval

Uh oh!

github-actions Bot commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Samee24 left a comment

Choose a reason for hiding this comment

Uh oh!

akh64bit commented Apr 29, 2026

Uh oh!

akh64bit commented May 1, 2026

Uh oh!

gemini-code-assist Bot commented May 1, 2026

Uh oh!

akh64bit commented May 1, 2026

Uh oh!

gemini-code-assist Bot commented May 1, 2026

Summary of Changes

Highlights

Uh oh!

akh64bit commented May 1, 2026

Uh oh!

Samee24 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions Bot commented Apr 29, 2026 •

edited

Loading

github-actions Bot commented Apr 29, 2026 •

edited

Loading