fix(cli): reset plan session state on /clear

[jasonmatthewsuhari]

Fixes #25500

Summary

/clear was only rotating the session ID on Config, while several pieces of session-scoped planning state continued to point at the previous session.

This change makes /clear start a true new planning session by resetting the approved plan pointer and rebinding session-scoped services and paths.

What changed

• Added Storage.setSessionId(...) so session-scoped temp paths can move with the active session.
• Updated Config.setSessionId(...) to:
  • update Storage
  • reset the cached TrackerService
  • refresh session-scoped plans directory registration when storage is initialized
• Added Config.resetNewSessionState(...) for brand-new session resets.
• Updated /clear to call resetNewSessionState(...) instead of only rotating the session ID.
• Added regression coverage for:
  • storage session path updates
  • config session-scoped service/path updates
  • clearing approved plan state on new session reset
  • /clear calling the new session reset path

Why

Before this change, /clear created a new session ID but could still retain old plan-mode state:

• /plan could still show the previously approved plan
• tracker state could remain bound to the old session directory
• session-scoped plan/tracker/task paths could stay stale

Validation

Passed:

• npm run build --workspace @google/gemini-cli-core
• npm run build --workspace @google/gemini-cli
• npm run typecheck --workspace @google/gemini-cli-core
• npm run typecheck --workspace @google/gemini-cli
• npm run lint --workspace @google/gemini-cli-core
• npm run lint --workspace @google/gemini-cli
• npm run test --workspace @google/gemini-cli-core -- src/config/storage.test.ts src/config/config.test.ts
• npm run test --workspace @google/gemini-cli-core -- src/tools/trackerTools.test.ts src/routing/strategies/approvalModeStrategy.test.ts src/prompts/promptProvider.test.ts
• npm run test --workspace @google/gemini-cli -- src/ui/commands/clearCommand.test.ts src/ui/commands/planCommand.test.ts
• npm run test --workspace @google/gemini-cli -- src/ui/hooks/useSessionBrowser.test.ts

Manual repro also passed:

1. Create and approve a plan
2. Confirm /plan shows it
3. Run /clear
4. Confirm /plan no longer shows the old approved plan
5. Confirm /plan copy reports that no approved plan exists

(screenshot of the /plan and /plan copy commands after doing /clear on an already-approved plan)

[gemini-code-assist]

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 addresses an issue where the /clear command failed to fully reset the planning session state, leading to stale data being retained. By implementing a more robust session reset mechanism, the changes ensure that all session-scoped paths, services, and approved plan states are correctly cleared or reinitialized when a new session begins.

Highlights

• Session Reset Logic: Introduced resetNewSessionState to ensure a complete reset of session-scoped planning state, including clearing approved plans and rebinding services.
• Storage Updates: Enabled dynamic updates to session-scoped directories by allowing Storage.sessionId to be mutable and adding Storage.setSessionId.
• Config Refactoring: Updated Config to properly refresh workspace directories and reset the TrackerService when the session ID changes.
• Regression Testing: Added comprehensive test coverage for storage path updates, config service rebinding, and the /clear command workflow.

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. ↩

[gemini-code-assist]

Code Review

This pull request introduces a mechanism to reset session state, ensuring that session-scoped directories and the approved plan path are correctly updated when a new session begins. Key changes include modifications to the Config and Storage classes to handle session ID updates and refresh the WorkspaceContext. A critical issue was identified where the CLI could crash if resolveToRealPath is called on a non-existent directory during a session reset, along with a recommendation for more consistent path resolution.

[jasonmatthewsuhari]

/gemini review

[gemini-code-assist]

Code Review

This pull request enhances session management by introducing resetNewSessionState and improving setSessionId within the Config and Storage classes. These changes ensure that session-scoped directories for plans, trackers, and tasks are correctly updated and that session-specific state, such as the approved plan path, is cleared when a new session begins. The clear command has been updated to use this new logic, and comprehensive tests have been added to verify the behavior. I have no feedback to provide as there were no review comments to evaluate.

[ruomengz]

Thank you for the contribution, changes look good!

[jasonmatthewsuhari]

Thank you for the contribution, changes look good!

Thank you for reviewing! :-)