Skip to content

Avoid persisting empty resume sessions#27770

Merged
SandyTao520 merged 4 commits into
mainfrom
st/fix/resume
Jun 9, 2026
Merged

Avoid persisting empty resume sessions#27770
SandyTao520 merged 4 commits into
mainfrom
st/fix/resume

Conversation

@SandyTao520

Copy link
Copy Markdown
Contributor

Summary

Avoid surfacing empty or command-only sessions in resume flows, and clean up startup-only interactive sessions on exit so immediately-started-and-quit sessions are not persisted.

Details

  • Adds a shared resumable-content check for recorded session messages.
  • Filters /resume and --list-sessions entries using resumable content instead of any user/model message.
  • Deletes the current session during interactive cleanup only when it never gained resumable content.
  • Keeps real user prompts, model responses, tool calls, and thought-bearing model messages resumable.

Related Issues

Related to #18007

How to Validate

  • npm test --workspace @google/gemini-cli-core -- src/services/chatRecordingService.test.ts
    • Expected: all tests pass.
  • npm test --workspace @google/gemini-cli -- src/utils/sessionUtils.test.ts
    • Expected: all tests pass.
  • npm test --workspace @google/gemini-cli -- src/gemini.test.tsx -t "should perform all startup tasks in correct order"
    • Expected: targeted startup cleanup test passes.

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

@SandyTao520 SandyTao520 requested a review from a team as a code owner June 9, 2026 21:06
@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 improves session management by ensuring that only meaningful conversations are persisted and surfaced in the UI. By defining what constitutes 'resumable content'—specifically excluding command-only or system-generated messages—the system now avoids cluttering the session history with empty or trivial startup artifacts. This change includes robust cleanup logic to discard abandoned sessions upon exit and updates existing listing utilities to respect these new filtering criteria.

Highlights

  • Resumable Content Logic: Introduced a shared 'resumable-content' check to identify meaningful session interactions, excluding command-only, system-only, or internal context messages.
  • Session Filtering: Updated /resume and --list-sessions functionality to filter out sessions that lack actual user or model interaction content.
  • Automatic Cleanup: Implemented automatic cleanup of non-resumable sessions upon exit, preventing the persistence of sessions that were immediately started and closed.
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 the 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 counterproductive. 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 github-actions Bot added the size/l A large sized PR label Jun 9, 2026
@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown

📊 PR Size: size/L

  • Lines changed: 517
  • Additions: +318
  • Deletions: -199
  • Files changed: 9

@gemini-code-assist gemini-code-assist Bot left a comment

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.

Code Review

This pull request introduces logic to identify and clean up non-resumable sessions (such as startup-only, command-only, or internal-context-only sessions) to prevent them from cluttering the session history. It adds filtering helpers, registers a cleanup task in the interactive CLI, and includes comprehensive unit tests. The review feedback highlights two critical issues: first, the cleanup function is removed from the registry during normal exit without being executed, which prevents session cleanup on clean exits; second, message.content lacks a safety guard, which could lead to a runtime TypeError and crash the CLI when processing malformed or legacy records.

Comment thread packages/cli/src/interactiveCli.tsx
Comment thread packages/core/src/services/chatRecordingService.ts
@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown

Size Change: +2.01 kB (+0.01%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-2CPNJVZM.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-7OZMI2E2.js 0 B -3.77 kB (removed) 🏆
./bundle/chunk-BH7KCYCI.js 0 B -19.5 kB (removed) 🏆
./bundle/chunk-EOORHYNV.js 0 B -16.4 MB (removed) 🏆
./bundle/chunk-HBSIWNKZ.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-NCBGBGDI.js 0 B -661 kB (removed) 🏆
./bundle/chunk-OHXCGIHM.js 0 B -2.79 MB (removed) 🏆
./bundle/chunk-WIPLGZ64.js 0 B -13 kB (removed) 🏆
./bundle/core-HJNAYSPR.js 0 B -49.7 kB (removed) 🏆
./bundle/devtoolsService-QD2OGEN4.js 0 B -28 kB (removed) 🏆
./bundle/gemini-UTBWPD6X.js 0 B -589 kB (removed) 🏆
./bundle/interactiveCli-GN7OOP7J.js 0 B -1.3 MB (removed) 🏆
./bundle/liteRtServerManager-ZTMNABJM.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-3GLZS2UT.js 0 B -9.12 kB (removed) 🏆
./bundle/chunk-45NJFWA2.js 16.4 MB +16.4 MB (new file) 🆕
./bundle/chunk-5DL4CI3Y.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/chunk-D5QT2AF4.js 13 kB +13 kB (new file) 🆕
./bundle/chunk-GYKYWPKC.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-HSX5V343.js 661 kB +661 kB (new file) 🆕
./bundle/chunk-VTXYJ2B6.js 3.77 kB +3.77 kB (new file) 🆕
./bundle/chunk-XSMA7ENX.js 2.79 MB +2.79 MB (new file) 🆕
./bundle/chunk-ZZQHQIGY.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/core-IJTTDWXN.js 49.9 kB +49.9 kB (new file) 🆕
./bundle/devtoolsService-QFNFQ5P3.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-WISFNMEB.js 589 kB +589 kB (new file) 🆕
./bundle/interactiveCli-OMTKCWQU.js 1.3 MB +1.3 MB (new file) 🆕
./bundle/liteRtServerManager-IRM3VROK.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-NJT5YPPD.js 9.12 kB +9.12 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-6HI7VNOG.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-TUDYL3X4.js 40.3 kB 0 B
./bundle/cleanup-SIDPPV6K.js 0 B -902 B (removed) 🏆
./bundle/devtools-V7NE4CQA.js 696 kB 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.38 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/https-proxy-agent-AVGR4LHR.js 490 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 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-LG4OHBW7.js 233 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-NLNTP44X.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/worker/worker-entry.js 361 kB 0 B
./bundle/cleanup-TRQ273Z4.js 902 B +902 B (new file) 🆕
./bundle/start-6JTTQC3G.js 622 B +622 B (new file) 🆕

compressed-size-action

@gemini-cli gemini-cli Bot added the area/unknown Triage automation assigns this label to issues that it is unable to classify label Jun 9, 2026

@galz10 galz10 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

Intent Summary: Avoid persisting and listing interactive sessions that contain only commands (e.g., /resume) or system contexts without any real conversational content (user text or model responses).

🧹 Refactoring & Nits (P2/P3)

Recommended improvements.

  • packages/cli/src/utils/sessionUtils.ts & packages/cli/src/utils/sessionUtils.test.ts: The newly added hasResumableContent wrapper function is exported but never actually used in the codebase (getAllSessionFiles now correctly consumes the hasResumableContent boolean property directly from the parsed backend object). Remove this wrapper function entirely and move its extensive test cases directly into packages/core/src/services/chatRecordingService.test.ts to test the actual backend implementation.
  • packages/core/src/services/chatRecordingService.ts:102: The isIgnoredUserContent function duplicates the exact skip-prefix rules (startsWith('/'), startsWith('<session_context>'), etc.) already hardcoded in packages/core/src/utils/sessionUtils.ts. Extract this into a shared utility function in packages/core/src/utils/sessionUtils.ts to ensure skip-rules remain in sync.
  • packages/cli/src/utils/sessionUtils.ts and packages/core/src/services/chatRecordingService.ts: The hasUserOrAssistantMessage utility function, its tests, and its corresponding property on the loadConversationRecord return type are now dead code since getAllSessionFiles has fully migrated to hasResumableContent. Remove them.

📝 Metadata Review

Feedback on PR description or commit message clarity.

  • The PR description is extremely clear, links to the relevant issue, and provides concrete, platform-specific validation steps. Excellent work detailing the intent and testing strategy.

@SandyTao520 SandyTao520 enabled auto-merge June 9, 2026 22:24
@SandyTao520 SandyTao520 added this pull request to the merge queue Jun 9, 2026
Merged via the queue into main with commit 3a13b8e Jun 9, 2026
32 checks passed
@SandyTao520 SandyTao520 deleted the st/fix/resume branch June 9, 2026 22:57
teknium1 added a commit to NousResearch/hermes-agent that referenced this pull request Jun 11, 2026
Port from google-gemini/gemini-cli#27770: starting the CLI and
immediately quitting (or rotating with /new, /clear) left an empty
untitled session row behind. These ghost rows pile up in /resume,
`hermes sessions list`, and the in-chat recent-sessions browser.

- SessionDB.delete_session_if_empty(): transactional check-and-delete
  that only removes rows with no messages, no title, and no child
  sessions (delegate subagent parents are preserved). Also removes
  on-disk transcript files via the existing _remove_session_files.
- HermesCLI._discard_session_if_empty(): thin wrapper, wired into the
  cli_close shutdown path and the new_session() rotation path.
  Skipped when /exit --delete already handles removal.

Unlike the one-shot prune_empty_ghost_sessions migration (TUI-only,
24h-old rows), this prevents new ghost rows from accumulating at the
moment they would be created.
goingforstudying-ctrl pushed a commit to goingforstudying-ctrl/hermes-agent that referenced this pull request Jun 11, 2026
Port from google-gemini/gemini-cli#27770: starting the CLI and
immediately quitting (or rotating with /new, /clear) left an empty
untitled session row behind. These ghost rows pile up in /resume,
`hermes sessions list`, and the in-chat recent-sessions browser.

- SessionDB.delete_session_if_empty(): transactional check-and-delete
  that only removes rows with no messages, no title, and no child
  sessions (delegate subagent parents are preserved). Also removes
  on-disk transcript files via the existing _remove_session_files.
- HermesCLI._discard_session_if_empty(): thin wrapper, wired into the
  cli_close shutdown path and the new_session() rotation path.
  Skipped when /exit --delete already handles removal.

Unlike the one-shot prune_empty_ghost_sessions migration (TUI-only,
24h-old rows), this prevents new ghost rows from accumulating at the
moment they would be created.
alt-glitch pushed a commit to NousResearch/hermes-agent that referenced this pull request Jun 14, 2026
Port from google-gemini/gemini-cli#27770: starting the CLI and
immediately quitting (or rotating with /new, /clear) left an empty
untitled session row behind. These ghost rows pile up in /resume,
`hermes sessions list`, and the in-chat recent-sessions browser.

- SessionDB.delete_session_if_empty(): transactional check-and-delete
  that only removes rows with no messages, no title, and no child
  sessions (delegate subagent parents are preserved). Also removes
  on-disk transcript files via the existing _remove_session_files.
- HermesCLI._discard_session_if_empty(): thin wrapper, wired into the
  cli_close shutdown path and the new_session() rotation path.
  Skipped when /exit --delete already handles removal.

Unlike the one-shot prune_empty_ghost_sessions migration (TUI-only,
24h-old rows), this prevents new ghost rows from accumulating at the
moment they would be created.
AIalliAI pushed a commit to AIalliAI/Hermes that referenced this pull request Jun 14, 2026
Port from google-gemini/gemini-cli#27770: starting the CLI and
immediately quitting (or rotating with /new, /clear) left an empty
untitled session row behind. These ghost rows pile up in /resume,
`hermes sessions list`, and the in-chat recent-sessions browser.

- SessionDB.delete_session_if_empty(): transactional check-and-delete
  that only removes rows with no messages, no title, and no child
  sessions (delegate subagent parents are preserved). Also removes
  on-disk transcript files via the existing _remove_session_files.
- HermesCLI._discard_session_if_empty(): thin wrapper, wired into the
  cli_close shutdown path and the new_session() rotation path.
  Skipped when /exit --delete already handles removal.

Unlike the one-shot prune_empty_ghost_sessions migration (TUI-only,
24h-old rows), this prevents new ghost rows from accumulating at the
moment they would be created.
davidgut1982 pushed a commit to davidgut1982/hermes-agent that referenced this pull request Jun 17, 2026
Port from google-gemini/gemini-cli#27770: starting the CLI and
immediately quitting (or rotating with /new, /clear) left an empty
untitled session row behind. These ghost rows pile up in /resume,
`hermes sessions list`, and the in-chat recent-sessions browser.

- SessionDB.delete_session_if_empty(): transactional check-and-delete
  that only removes rows with no messages, no title, and no child
  sessions (delegate subagent parents are preserved). Also removes
  on-disk transcript files via the existing _remove_session_files.
- HermesCLI._discard_session_if_empty(): thin wrapper, wired into the
  cli_close shutdown path and the new_session() rotation path.
  Skipped when /exit --delete already handles removal.

Unlike the one-shot prune_empty_ghost_sessions migration (TUI-only,
24h-old rows), this prevents new ghost rows from accumulating at the
moment they would be created.
T02200059 pushed a commit to T02200059/hermes-agent that referenced this pull request Jun 18, 2026
Port from google-gemini/gemini-cli#27770: starting the CLI and
immediately quitting (or rotating with /new, /clear) left an empty
untitled session row behind. These ghost rows pile up in /resume,
`hermes sessions list`, and the in-chat recent-sessions browser.

- SessionDB.delete_session_if_empty(): transactional check-and-delete
  that only removes rows with no messages, no title, and no child
  sessions (delegate subagent parents are preserved). Also removes
  on-disk transcript files via the existing _remove_session_files.
- HermesCLI._discard_session_if_empty(): thin wrapper, wired into the
  cli_close shutdown path and the new_session() rotation path.
  Skipped when /exit --delete already handles removal.

Unlike the one-shot prune_empty_ghost_sessions migration (TUI-only,
24h-old rows), this prevents new ghost rows from accumulating at the
moment they would be created.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/unknown Triage automation assigns this label to issues that it is unable to classify size/l A large sized PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants