fix: YOLO mode still asking for plan approval in non-interactive mode

[theshloksschauhan]

When using --yolo or --approval-mode yolo with --output-format stream-json or --prompt (non-interactive/headless mode), the CLI was still asking for plan approval.

Two bugs fixed in promptProvider.ts:

1. The 'Autonomous Mode (YOLO)' system prompt section was only injected when interactiveMode was true. Changed condition from 'isYoloMode && interactiveMode' to just 'isYoloMode'.
2. enableEnterPlanModeTool was true in YOLO mode, causing the model to call enter_plan_mode and ask 'Does this plan sound good to you?'. Added '&& !isYoloMode' to suppress this.

Fixes #13561

Summary

Details

Related Issues

How to Validate

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]

Summary of Changes

Hello @theshloksschauhan, 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 addresses a critical bug where the YOLO (autonomous) mode in the CLI was still prompting for plan approval when used in non-interactive or headless environments. The changes ensure that the system behaves as expected in YOLO mode, eliminating unnecessary user intervention and streamlining automated workflows.

Highlights

• YOLO Mode Prompt Fix: The 'Autonomous Mode (YOLO)' system prompt section is now correctly injected based solely on isYoloMode, removing the previous dependency on interactiveMode.
• Plan Approval Suppression: The enableEnterPlanModeTool is now explicitly disabled when in YOLO mode, preventing the model from incorrectly asking for plan approval in non-interactive environments.

Changelog

• packages/core/src/prompts/promptProvider.ts
  • Modified the condition for enableEnterPlanModeTool to include !isYoloMode, ensuring it is disabled when YOLO mode is active.
  • Updated the interactiveYoloMode section condition to activate when isYoloMode is true, removing the interactiveMode dependency.

Activity

• No human activity has occurred on this pull request yet.

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]

Code Review

This pull request addresses a bug where YOLO mode would still prompt for plan approval in non-interactive sessions. The changes in packages/core/src/prompts/promptProvider.ts modify the conditions for enabling the enter_plan_mode tool and for injecting the 'Autonomous Mode (YOLO)' system prompt. These changes ensure that autonomous behavior is correctly triggered in all YOLO mode scenarios. The implementation appears to correctly resolve the issue.

[jerop]

which version are you using? this should already be fixed in #19570

cc @Adib234

[theshloksschauhan]

Thanks for the heads-up, @jerop! I'm based on commit 8e9ce3f (current main). I checked #19570 and it addresses the issue at the tool-registry level in Config.syncPlanModeTools. However, I found that in promptProvider.ts, the 'Autonomous Mode (YOLO)' system prompt section was still gated on interactiveMode, and enableEnterPlanModeTool was not guarded against YOLO mode specifically in the prompt context. I believe both fixes may be complementary — could you confirm if #19570 fully covers the non-interactive (--prompt / --output-format stream-json) headless scenario?

[jerop]

this was very much intentional because it's used to define interactiveYoloMode

cc @jackwotherspoon

[jerop]

it should be covered, unless you're seeing something wrong on main branch

[jerop]

enter_plan_mode tool is not available in YOLO mode so this is redundant - #19570

[theshloksschauhan]

Thanks for the thorough review, @jerop! You're absolutely right — since #19570 already removes ENTER_PLAN_MODE_TOOL_NAME from the tool registry in YOLO mode, the && !isYoloMode guard is redundant. I tested this before pulling the latest main that includes #19570. I'll go ahead and close this PR.