feat: dual-mode terminal with Claude/Bash toggle #22
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds ability to switch between Claude Code and Bash modes within sessions: Core Features: - Ctrl+T keyboard shortcut toggles between Claude and Bash modes - Mode indicators show current state (blue=Claude, green=Bash) - Separate PTY processes for each mode with independent history buffers - Working directory context preserved for bash sessions - Memory-managed history (5MB limit per mode) with circular buffer cleanup Technical Implementation: - Extended Session interface with dual-mode properties (bashProcess, currentMode, bashHistory) - On-demand bash PTY creation preserving worktree working directory - Mode-aware input routing and display management - Enhanced sessionManager with dual PTY cleanup on session destruction - Added toggleMode shortcut to default configuration Session State Management: - Claude mode: Full sophisticated state detection preserved - Bash mode: Simple prompt-based state tracking (idle/running) - Independent history restoration when switching modes - Clean screen transitions with proper mode indicators This enables users to seamlessly switch between Claude Code assistance and direct shell access within the same worktree context, maintaining separate interaction histories for each mode. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Fix bash mode initialization sequence to wait for PTY prompt - Set mode state before clearing screen for better visual feedback - Display mode indicator immediately after screen clear - Handle first-time bash switch vs history restoration correctly - Resolves issue where bash mode showed Claude content initially
- Fix mode-aware session restore in SessionManager (only restore Claude history in Claude mode) - Remove manual sessionRestore emit from toggleMode (handled automatically by setSessionActive) - Fix bash PTY data handler to use session.currentMode instead of closure variable - Optimize useCallback dependencies to prevent stale closures - Optimize useEffect dependencies to prevent unnecessary re-runs - Resolves issues where Claude content was leaking into bash mode - Fixes race conditions between mode switching and history restoration - Dual-mode terminal now works seamlessly with Ctrl+T toggle Tested with ccmanager-tui MCP: - ✅ Ctrl+T toggle between Claude/Bash modes - ✅ Bash commands execute correctly (pwd, ls, etc.) - ✅ Mode indicators persistent and correct colors - ✅ History preservation for both modes - ✅ Working directory context maintained - ✅ No content leaking between modes
- Add dedicated bash session restore event handler in Session component - Implement robust bash history replay with clear screen sequence handling - Ensure both Claude and bash modes trigger appropriate restoration events - Maintain consistency between mode switching and session activation logic 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Add test coverage for bashSessionRestore event emission when bash sessions with history become active - Verify sessionRestore event continues working correctly for Claude sessions - Test edge case where sessions with empty histories don't emit unnecessary restore events - Ensure proper event listener setup and teardown in test scenarios - All 13 tests in sessionManager.test.ts passing (58 total tests across suite) 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Add toggleMode shortcut (Ctrl+T) to ConfigureShortcuts menu - Add cancel shortcut (Esc) to ConfigureShortcuts menu - Ensure all defined shortcuts are configurable through the UI - Maintains consistency with shortcut system implementation 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Replace hardcoded 'Ctrl+T' in mode indicators with dynamic shortcut reading
- Use shortcutManager.getShortcutDisplay('toggleMode') for current configuration
- Mode indicators now respect user's custom shortcut configuration
- Remove hardcoded reference in comment
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>
This was referenced Jun 23, 2025
kbwo
requested changes
Jun 25, 2025
There was a problem hiding this comment.
Please review #29 instead
#29 is closed.
Which PR should I review?
This branch seems to be buggy.
When I pressing ctrl+T in the session, this error occurs.
file:///home/kbwo/go/projects/github.com/kbwo/ccmanager-202506042324/dist/services/shortcutManager.js:107
if (!shortcut.ctrl || shortcut.alt || shortcut.shift) {
^
TypeError: Cannot read properties of undefined (reading 'ctrl')
at ShortcutManager.getShortcutCode (file:///home/kbwo/go/projects/github.com/kbwo/ccmanager-202506042324/dist/services/shortcutManager.js:107:23)
at ReadStream.handleStdinData (file:///home/kbwo/go/projects/github.com/kbwo/ccmanager-202506042324/dist/components/Session.js:238:52)
at ReadStream.emit (node:events:518:28)
at addChunk (node:internal/streams/readable:561:12)
at readableAddChunkPushByteMode (node:internal/streams/readable:512:3)
at Readable.push (node:internal/streams/readable:392:5)
at TTY.onStreamRead (node:internal/stream_base_commons:191:23)
Node.js v20.18.3
Screencast.From.2025-06-25.22-56-48.mp4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR has been superseded by a simpler approach in #29
Add hotkeys across all 6 CCManager menu components to improve navigation efficiency and reduce keystrokes for common actions.
Changes
Main Menu: N-New, M-Merge, D-Delete, C-Config, Q-Quit + number selection (0-9) for worktrees
Configuration: S-Shortcuts, H-Hooks, W-Worktree, C-Command, B-Back
Forms: Ctrl+N/B navigation, specialized hotkeys (F-Force, T-Target, etc.)
Confirmation: Y-Yes, N-No direct responses
Technical Details
Enhanced existing useInput hooks following Ink.js patterns
Maintained backward compatibility with arrow key navigation
Added comprehensive test coverage for both Menu and Configuration components
Fixed duplicate input handling in DeleteWorktree component
Status
This PR contains too many changes and has been replaced by #29 which focuses only on the essential menu hotkeys.
Please review #29 instead - it provides the core navigation improvements without the complexity.
Reference: See #29 for the simplified version that addresses the main use case.
🤖 Generated with Claude Code
Co-Authored-By: Claude [email protected]