Skip to content

feat(core): formalize 5-phase sequential planning workflow#18759

Merged
jerop merged 1 commit intomainfrom
optimize-planning-workflow-prompt
Feb 11, 2026
Merged

feat(core): formalize 5-phase sequential planning workflow#18759
jerop merged 1 commit intomainfrom
optimize-planning-workflow-prompt

Conversation

@jerop
Copy link
Copy Markdown
Contributor

@jerop jerop commented Feb 10, 2026

Refactor the planning workflow into a 5-phase sequential process (Requirements, Exploration, Design, Planning, and Approval) to ensure higher-quality implementation strategies and explicit user alignment.

  • Introduced "Workflow Rules" for sequential execution, user confirmation, and a "Step Back Protocol".
  • Phase 1: Enhance requirements gathering with proactive ambiguity checks and a preference for multiple-choice options.
image image
  • Phase 2: Refine exploration to focus on architectural mapping and reusable abstractions.
  • Phase 3 (Design): Add a mandatory phase for analyzing alternative approaches and securing user selection before planning.
image
  • Phase 4 (Planning): Require a structured plan document.
image
  • Phase 5: Streamline approval and iteration using exit_plan_mode.
  • Update documentation to reflect the formalized 5-phase structure.

Closes #18483
Closes #16857

@jerop jerop requested review from a team as code owners February 10, 2026 20:54
@jerop jerop requested a review from abhipatel12 February 10, 2026 20:54
@gemini-cli
Copy link
Copy Markdown
Contributor

gemini-cli Bot commented Feb 10, 2026

Hi @jerop, 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-cli
Copy link
Copy Markdown
Contributor

gemini-cli Bot commented Feb 10, 2026

Hi there! Thank you for your contribution to Gemini CLI.

To improve our contribution process and better track changes, we now require all pull requests to be associated with an existing issue, as announced in our recent discussion and as detailed in our CONTRIBUTING.md.

This pull request is being closed because it is not currently linked to an issue. Once you have updated the description of this PR to link an issue (e.g., by adding Fixes #123 or Related to #123), it will be automatically reopened.

How to link an issue:
Add a keyword followed by the issue number (e.g., Fixes #123) in the description of your pull request. For more details on supported keywords and how linking works, please refer to the GitHub Documentation on linking pull requests to issues.

Thank you for your understanding and for being a part of our community!

@gemini-cli gemini-cli Bot closed this Feb 10, 2026
@jerop jerop reopened this Feb 10, 2026
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @jerop, 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 significantly enhances the planning capabilities by formalizing the workflow into a structured, sequential five-phase process. The changes aim to improve the clarity, quality, and user involvement throughout the planning stages, ensuring that implementation strategies are well-thought-out and explicitly approved by the user. This structured approach is designed to reduce ambiguities and improve the overall development outcome.

Highlights

  • Formalized 5-Phase Sequential Planning Workflow: The planning workflow has been refactored into a new, explicit 5-phase sequential process: Requirements, Exploration, Design, Planning, and Approval. This aims to ensure higher-quality implementation strategies and explicit user alignment.
  • Introduced Workflow Rules: New 'Workflow Rules' have been added, emphasizing sequential execution, mandatory user confirmation before proceeding to the next phase, and a 'Step Back Protocol' for re-evaluating previous assumptions if new information arises.
  • Enhanced Requirements Phase: The 'Requirements' phase now includes proactive ambiguity checks, categorization of questions, and a preference for providing multiple-choice options when using the ask_user tool.
  • Mandatory Design Phase Added: A new, mandatory 'Design' phase has been introduced. This phase requires identifying and analyzing alternative implementation approaches (or justifying a single canonical approach) and securing explicit user selection before planning proceeds.
  • Structured Planning Document: The 'Planning' phase now mandates a structured Markdown document format for the implementation plan, requiring specific H2 headings such as 'Problem Statement', 'Proposed Solution', 'Implementation Plan', 'Verification Plan', 'Risks & Mitigations', and 'Alternatives Considered'.
  • Updated Documentation: The plan-mode.md documentation has been updated to reflect the new 5-phase structure, including the addition of the 'Design' phase and renumbering of subsequent phases.
Changelog
  • docs/cli/plan-mode.md
    • Updated the documented planning workflow from four to five phases.
    • Inserted a 'Design' phase between 'Exploration' and 'Planning'.
    • Adjusted the numbering of subsequent phases to accommodate the new 'Design' phase.
  • packages/core/src/prompts/snippets.ts
    • Added a new 'Workflow Rules' section outlining sequential execution, user confirmation, and a 'Step Back Protocol'.
    • Renamed 'Requirements Understanding' to 'Requirements' and expanded its guidelines to include proactive ambiguity identification and structured questioning.
    • Renamed 'Project Exploration' to 'Exploration' and added guidelines for mapping code paths, identifying reusable patterns, and summarizing findings.
    • Split the original 'Design & Planning' into a distinct 'Design' phase and a 'Planning' phase.
    • The new 'Design' phase mandates identifying multiple approaches (or explaining a single one), documenting pros/cons, and requiring user selection via ask_user.
    • The new 'Planning' phase specifies a pre-requisite of a user-selected approach and defines a strict Markdown document structure with specific H2 headings.
    • Renamed 'Review & Approval' to 'Approval' and updated its description to use EXIT_PLAN_MODE_TOOL_NAME.
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.

@jerop jerop force-pushed the optimize-planning-workflow-prompt branch from b318c1b to cc0e854 Compare February 10, 2026 20:58
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Feb 10, 2026

Size Change: +1.88 kB (+0.01%)

Total Size: 24.3 MB

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

compressed-size-action

@gemini-cli gemini-cli Bot added area/core Issues related to User Interface, OS Support, Core Functionality area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. labels Feb 10, 2026
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 introduces a well-structured 5-phase sequential planning workflow, which is a significant improvement for generating high-quality implementation strategies with explicit user alignment. The documentation and prompt updates are clear and comprehensive. I have one high-severity suggestion to improve prompt clarity for the plan's document structure, ensuring the agent generates correctly formatted plans.

Comment thread packages/core/src/prompts/snippets.ts Outdated
@jerop jerop force-pushed the optimize-planning-workflow-prompt branch 3 times, most recently from 52d07f6 to 4756e97 Compare February 10, 2026 21:24
@jerop jerop enabled auto-merge February 10, 2026 21:33
Comment thread packages/core/src/prompts/snippets.legacy.ts
@jerop jerop force-pushed the optimize-planning-workflow-prompt branch 2 times, most recently from 436566a to 6695a73 Compare February 10, 2026 23:31
Refactor the Plan Mode workflow into a strict 5-phase sequential process
(Requirements, Exploration, Design, Planning, and Approval) to ensure
higher-quality implementation strategies and explicit user alignment.

- Introduce "Workflow Rules" for sequential execution, user confirmation,
  and a "Step Back Protocol".
- Phase 1: Enhance requirements gathering with proactive ambiguity checks
  and a preference for multiple-choice options.
- Phase 2: Refine exploration to focus on architectural mapping and
  reusable abstractions.
- Phase 3 (Design): Add a mandatory phase for analyzing alternative
  approaches and securing user selection before planning.
- Phase 4 (Planning): Require a structured plan document including
  Implementation Plan, Verification Plan, and Risks & Mitigations.
- Phase 5: Streamline approval and iteration using exit_plan_mode.
- Update documentation to reflect the formalized 5-phase structure.
@jerop jerop force-pushed the optimize-planning-workflow-prompt branch from 6695a73 to 1d5193b Compare February 11, 2026 02:50
@jerop jerop added this pull request to the merge queue Feb 11, 2026
Merged via the queue into main with commit 49d55d9 Feb 11, 2026
27 checks passed
@jerop jerop deleted the optimize-planning-workflow-prompt branch February 11, 2026 03:14
krsjenmt added a commit to krsjenmt/gemini-cli that referenced this pull request Feb 11, 2026
* Fix newline insertion bug in replace tool (google-gemini#18595)

* fix(evals): update save_memory evals and simplify tool description (google-gemini#18610)

* chore(evals): update validation_fidelity_pre_existing_errors to USUALLY_PASSES (google-gemini#18617)

* fix: shorten tool call IDs and fix duplicate tool name in truncated output filenames (google-gemini#18600)

* feat(cli): implement atomic writes and safety checks for trusted folders (google-gemini#18406)

* Remove relative docs links (google-gemini#18650)

* docs: add legacy snippets convention to GEMINI.md (google-gemini#18597)

* fix(chore): Support linting for cjs (google-gemini#18639)

Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>

* feat: move shell efficiency guidelines to tool description (google-gemini#18614)

* Added "" as default value, since getText() used to expect a string only and thus crashed when undefined...  Fixes google-gemini#18076   (google-gemini#18099)

* Allow @-includes outside of workspaces (with permission) (google-gemini#18470)

* chore: make `ask_user` header description more clear (google-gemini#18657)

* bug(core): Fix minor bug in migration logic. (google-gemini#18661)

* Harded code assist converter. (google-gemini#18656)

* refactor(core): model-dependent tool definitions (google-gemini#18563)

* feat: enable plan mode experiment in settings (google-gemini#18636)

* refactor: push isValidPath() into parsePastedPaths() (google-gemini#18664)

* fix(cli): correct 'esc to cancel' position and restore duration display (google-gemini#18534)

* feat(cli): add DevTools integration with gemini-cli-devtools (google-gemini#18648)

* chore: remove unused exports and redundant hook files (google-gemini#18681)

* Fix number of lines being reported in rewind confirmation dialog (google-gemini#18675)

* feat(cli): disable folder trust in headless mode (google-gemini#18407)

* Disallow unsafe type assertions (google-gemini#18688)

* Change event type for release (google-gemini#18693)

* feat: handle multiple dynamic context filenames in system prompt (google-gemini#18598)

* Properly parse at-commands with narrow non-breaking spaces (google-gemini#18677)

* refactor(core): centralize core tool definitions and support model-specific schemas (google-gemini#18662)

* feat(core): Render memory hierarchically in context. (google-gemini#18350)

* feat: Ctrl+O to expand paste placeholder (google-gemini#18103)

* fix(cli): Improve header spacing (google-gemini#18531)

* Feature/quota visibility 16795 (google-gemini#18203)

* docs: remove TOC marker from Plan Mode header (google-gemini#18678)

* Inline thinking bubbles with summary/full modes (google-gemini#18033)

Co-authored-by: Jacob Richman <jacob314@gmail.com>

* fix(ui): remove redundant newlines in Gemini messages (google-gemini#18538)

* test(cli): fix AppContainer act() warnings and improve waitFor resilience (google-gemini#18676)

* refactor(core): refine Security & System Integrity section in system prompt (google-gemini#18601)

* Fix layout rounding. (google-gemini#18667)

* docs(skills): enhance pr-creator safety and interactivity (google-gemini#18616)

* test(core): remove hardcoded model from TestRig (google-gemini#18710)

* feat(core): optimize sub-agents system prompt intro (google-gemini#18608)

* feat(cli): update approval mode labels and shortcuts per latest UX spec (google-gemini#18698)

* fix(plan): update persistent approval mode setting (google-gemini#18638)

Co-authored-by: Sandy Tao <sandytao520@icloud.com>

* fix: move toasts location to left side (google-gemini#18705)

* feat(routing): restrict numerical routing to Gemini 3 family (google-gemini#18478)

* fix(ide): fix ide nudge setting (google-gemini#18733)

* fix(core): standardize tool formatting in system prompts (google-gemini#18615)

* chore: consolidate to green in ask user dialog (google-gemini#18734)

* feat: add `extensionsExplore` setting to enable extensions explore UI. (google-gemini#18686)

* feat(cli): defer devtools startup and integrate with F12 (google-gemini#18695)

* ui: update & subdue footer colors and animate progress indicator (google-gemini#18570)

* test: add model-specific snapshots for coreTools (google-gemini#18707)

Co-authored-by: matt korwel <matt.korwel@gmail.com>

* ci: shard windows tests and fix event listener leaks (google-gemini#18670)

* fix: allow `ask_user` tool in yolo mode (google-gemini#18541)

* feat: redact disabled tools from system prompt (google-gemini#13597) (google-gemini#18613)

* Update Gemini.md to use the curent year on creating new files (google-gemini#18460)

* Code review cleanup for thinking display (google-gemini#18720)

* fix(cli): hide scrollbars when in alternate buffer copy mode (google-gemini#18354)

Co-authored-by: Jacob Richman <jacob314@gmail.com>

* Fix issues with rip grep (google-gemini#18756)

* fix(cli): fix history navigation regression after prompt autocomplete (google-gemini#18752)

* chore: cleanup unused and add unlisted dependencies in packages/cli (google-gemini#18749)

* Fix issue where Gemini CLI creates tests in a new file (google-gemini#18409)

* feat(telemetry): Ensure experiment IDs are included in OpenTelemetry logs (google-gemini#18747)

* feat(ux): added text wrapping capabilities to markdown tables (google-gemini#18240)

Co-authored-by: jacob314 <jacob314@gmail.com>

* Revert "fix(mcp): ensure MCP transport is closed to prevent memory leaks" (google-gemini#18771)

* chore(release): bump version to 0.30.0-nightly.20260210.a2174751d (google-gemini#18772)

* chore: cleanup unused and add unlisted dependencies in packages/core (google-gemini#18762)

* chore(core): update activate_skill prompt verbiage to be more direct (google-gemini#18605)

* Add autoconfigure memory usage setting to the dialog (google-gemini#18510)

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix(core): prevent race condition in policy persistence (google-gemini#18506)

Co-authored-by: Allen Hutchison <adh@google.com>

* fix(evals): prevent false positive in hierarchical memory test (google-gemini#18777)

* test(evals): mark all `save_memory` evals as `USUALLY_PASSES` due to unreliability (google-gemini#18786)

* feat(cli): add setting to hide shortcuts hint UI (google-gemini#18562)

* feat(core): formalize 5-phase sequential planning workflow (google-gemini#18759)

* Introduce limits for search results. (google-gemini#18767)

---------

Co-authored-by: Andrew Garrett <andrewgarrett@google.com>
Co-authored-by: N. Taylor Mullen <ntaylormullen@google.com>
Co-authored-by: Sandy Tao <sandytao520@icloud.com>
Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
Co-authored-by: christine betts <chrstn@uw.edu>
Co-authored-by: Aswin Ashok <aswwwin@google.com>
Co-authored-by: Abhijith V Ashok <abhi2349jith@gmail.com>
Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>
Co-authored-by: Jack Wotherspoon <jackwoth@google.com>
Co-authored-by: joshualitt <joshualitt@google.com>
Co-authored-by: Jacob Richman <jacob314@gmail.com>
Co-authored-by: Aishanee Shah <aishaneeshah@gmail.com>
Co-authored-by: Jerop Kipruto <jerop@google.com>
Co-authored-by: Adib234 <30782825+Adib234@users.noreply.github.com>
Co-authored-by: Christian Gunderman <gundermanc@gmail.com>
Co-authored-by: g-samroberts <158088236+g-samroberts@users.noreply.github.com>
Co-authored-by: Spencer <spencertang@google.com>
Co-authored-by: Dmitry Lyalin <dmitry.lyalin@lyalin.com>
Co-authored-by: matt korwel <matt.korwel@gmail.com>
Co-authored-by: Shreya Keshive <shreyakeshive@google.com>
Co-authored-by: Sri Pasumarthi <111310667+sripasg@users.noreply.github.com>
Co-authored-by: Keith Guerin <keithguerin@gmail.com>
Co-authored-by: Sehoon Shon <sshon@google.com>
Co-authored-by: Adam Weidman <65992621+adamfweidman@users.noreply.github.com>
Co-authored-by: Kevin Ramdass <ramdass.kevin@gmail.com>
Co-authored-by: Dev Randalpura <devrandalpura@google.com>
Co-authored-by: gemini-cli-robot <gemini-cli-robot@google.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Brad Dux <959674+braddux@users.noreply.github.com>
Co-authored-by: Allen Hutchison <adh@google.com>
Co-authored-by: Abhijit Balaji <abhijitbalaji@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/agent Issues related to Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality area/core Issues related to User Interface, OS Support, Core Functionality 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update design phase in plan mode to be more interactive Evaluate and iterate on simple planning workflow

2 participants