alternative way to handle multi session conflict flow

[gtrrz-victor]

Summary

Improves the session conflict warning experience when a second Claude Code session starts while another session has uncommitted checkpoints.

Key changes:

• Moved session conflict detection from user-prompt-submit hook to session-start hook
• Redesigned the warning message to be more user-friendly and actionable

New Warning Format

When a user starts a new session while an existing session has uncommitted checkpoints, they now see:

You have an existing session running (existing-session-id).                                                                     
Do you want to continue with this new session (new-session-id)?                                                                 
                                                                                                                                
Yes: Ignore this warning                                                                                                        
No: Type /exit, then either:                                                                                                    
  • Resume the other session: claude -r existing-session-id                                                                     
  • Reset and start fresh: entire reset --force && claude                                                                       
                                                                                                                                
To hide this notice in the future: entire enable --disable-multisession-warning                                 

Why This Matters

Previously, the conflict warning appeared at every prompt submission, which was disruptive. Moving it to session start means:

1. Better timing - Users see the warning once at the start, not repeatedly
2. Clear options - Users understand they can continue, resume the other session, or reset
3. Actionable guidance - Includes exact commands to run for each option
4. Dismissible - Users can permanently disable the warning if they prefer concurrent sessions

---

Note

Medium Risk
Behavioral change to when/how multi-session conflicts are detected and how hooks respond (new systemMessage JSON, Gemini no longer blocks), which could affect session workflows and any tooling/tests relying on the previous prompt-blocking semantics.

Overview
Moves multi-session conflict detection from per-prompt hooks to the session-start hook via a new shared handleSessionStartCommon/checkConcurrentSessions, and updates the warning to a more actionable message (including resume/reset commands) with agent-specific JSON output (Claude: systemMessage; Gemini: injects systemMessage without blocking).

Simplifies session ID handling by removing the persisted/legacy fallback logic and standardizing metadata paths on paths.SessionMetadataDirFromSessionID; removes ConcurrentWarningShown from session state and deletes the prior prompt-blocking/Gemini blocking-response flow plus related integration/unit tests, replacing them with a session-start warning-format test helper.

^{Written by Cursor Bugbot for commit 4593180. This will update automatically on new commits. Configure here.}

[Copilot]

Pull request overview

This pull request refactors the session conflict warning system by moving the detection from the user-prompt-submit hook to the session-start hook, resulting in a better user experience.

Changes:

• Moved session conflict detection to session-start hook, showing the warning once at session start instead of repeatedly on every prompt
• Removed the ConcurrentWarningShown field from session state, as the warning is now shown once and doesn't need to be tracked
• Redesigned the warning message to be more user-friendly with clear actionable guidance
• Renamed SessionMetadataDirFromEntireID to SessionMetadataDirFromSessionID to reflect the direct use of session IDs

Reviewed changes

Copilot reviewed 21 out of 21 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
cmd/entire/cli/strategy/manual_commit_types.go	Removed ConcurrentWarningShown field from SessionState struct
cmd/entire/cli/strategy/manual_commit_test.go	Updated test to remove references to removed field
cmd/entire/cli/strategy/manual_commit_session.go	Simplified session initialization by removing concurrent warning flag preservation
cmd/entire/cli/strategy/manual_commit_logs.go	Updated function call to use renamed SessionMetadataDirFromSessionID
cmd/entire/cli/strategy/manual_commit_hooks.go	Removed shadow branch conflict check from InitializeSession
cmd/entire/cli/strategy/manual_commit_git.go	Updated function call to use renamed SessionMetadataDirFromSessionID
cmd/entire/cli/strategy/manual_commit_condensation.go	Updated function call to use renamed SessionMetadataDirFromSessionID
cmd/entire/cli/strategy/manual_commit.go	Removed ConcurrentWarningShown field from state conversion functions
cmd/entire/cli/state.go	Updated function call to use renamed SessionMetadataDirFromSessionID
cmd/entire/cli/session/state.go	Removed ConcurrentWarningShown field from State struct
cmd/entire/cli/paths/paths.go	Renamed function from SessionMetadataDirFromEntireID to SessionMetadataDirFromSessionID
cmd/entire/cli/integration_test/setup_gemini_hooks_test.go	Removed test for old session-start behavior
cmd/entire/cli/integration_test/session_conflict_test.go	Added new test for session conflict warning message format at session-start
cmd/entire/cli/integration_test/rewind_test.go	Removed test for old concurrent session behavior
cmd/entire/cli/integration_test/hooks.go	Added SimulateSessionStartWithOutput helper for testing session-start hooks
cmd/entire/cli/integration_test/gemini_concurrent_session_test.go	Deleted entire file - old Gemini concurrent session tests
cmd/entire/cli/integration_test/concurrent_session_warning_test.go	Deleted entire file - old Claude concurrent session tests
cmd/entire/cli/hooks_handlers_test.go	Deleted entire file - old currentSessionIDWithFallback tests
cmd/entire/cli/hooks_geminicli_handlers.go	Removed checkConcurrentSessionsGemini function and simplified handlers
cmd/entire/cli/hooks_claudecode_handlers.go	Removed checkConcurrentSessions, currentSessionIDWithFallback, and handleSessionInitErrors functions
cmd/entire/cli/hooks.go	Added handleSessionStartCommon and checkConcurrentSessions functions

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.}

[khaong]

👍