ccmanager 4.0.1 → 4.0.2

package/dist/components/ConfigureStatusHooks.js

@@ -105,7 +105,7 @@ const ConfigureStatusHooks = ({ onComplete, }) => {
         return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { color: "green", children: "\u2713 Configuration saved successfully!" }) }));
     }
     if (view === 'edit') {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "green", children: ["Configure ", STATUS_LABELS[selectedStatus], " Hook"] }) }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { children: ["Command to execute when status changes to", ' ', STATUS_LABELS[selectedStatus], ":"] }) }), _jsx(Box, { marginBottom: 1, children: _jsx(TextInputWrapper, { value: currentCommand, onChange: setCurrentCommand, onSubmit: handleCommandSubmit, placeholder: "Enter command (e.g., notify-send 'Claude is idle')" }) }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { children: ["Enabled: ", currentEnabled ? '✓' : '✗', " (Press Tab to toggle)"] }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Environment variables available: CCMANAGER_OLD_STATE, CCMANAGER_NEW_STATE," }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: `CCMANAGER_WORKTREE_PATH, CCMANAGER_WORKTREE_DIR, CCMANAGER_WORKTREE_BRANCH, CCMANAGER_SESSION_ID` }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter to save, Tab to toggle enabled, Esc to cancel" }) })] }));
+        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "green", children: ["Configure ", STATUS_LABELS[selectedStatus], " Hook"] }) }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { children: ["Command to execute when status changes to", ' ', STATUS_LABELS[selectedStatus], ":"] }) }), _jsx(Box, { marginBottom: 1, children: _jsx(TextInputWrapper, { value: currentCommand, onChange: setCurrentCommand, onSubmit: handleCommandSubmit, placeholder: "Enter command (e.g., notify-send 'Claude is idle')" }) }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { children: ["Enabled: ", currentEnabled ? '✓' : '✗', " (Press Tab to toggle)"] }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Environment variables available: CCMANAGER_OLD_STATE, CCMANAGER_NEW_STATE," }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: `CCMANAGER_WORKTREE_PATH, CCMANAGER_WORKTREE_DIR, CCMANAGER_WORKTREE_BRANCH, CCMANAGER_SESSION_ID, CCMANAGER_PRESET_NAME` }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter to save, Tab to toggle enabled, Esc to cancel" }) })] }));
     }
     const scopeLabel = scope === 'project' ? 'Project' : 'Global';
     return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "green", children: ["Configure Status Hooks (", scopeLabel, ")"] }) }), isInheriting && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { backgroundColor: "cyan", color: "black", children: [' ', "\uD83D\uDCCB Inheriting from global configuration", ' '] }) })), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Set commands to run when session status changes:" }) }), _jsx(SelectInput, { items: getMenuItems(), onSelect: handleMenuSelect, isFocused: true, limit: 10 }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Esc to go back" }) })] }));

package/dist/components/Session.js

@@ -4,11 +4,6 @@ import { shortcutManager } from '../services/shortcutManager.js';
 const Session = ({ session, sessionManager, onReturnToMenu, }) => {
     const { stdout } = useStdout();
     const isExitingRef = useRef(false);
-    const stripOscColorSequences = (input) => {
-        // Remove default foreground/background color OSC sequences that Codex emits
-        // These sequences leak as literal text when replaying buffered output
-        return input.replace(/\x1B\](?:10|11);[^\x07\x1B]*(?:\x07|\x1B\\)/g, '');
-    };
     const normalizeLineEndings = (input) => {
         // Ensure LF moves to column 0 to prevent cursor drift when ONLCR is disabled.
         let normalized = '';
@@ -32,22 +27,40 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             // protocol / modifyOtherKeys / focus tracking) so they don't leak into other
             // sessions after we detach.
             stdout.write('\x1b[>0u'); // Disable kitty keyboard protocol (CSI u sequences)
-            stdout.write('\x1b[>4m'); // Disable xterm modifyOtherKeys extensions
+            stdout.write('\x1b[>4;0m'); // Disable xterm modifyOtherKeys extensions
             stdout.write('\x1b[?1004l'); // Disable focus reporting
             stdout.write('\x1b[?2004l'); // Disable bracketed paste (can interfere with shortcuts)
             stdout.write('\x1b[?7h'); // Re-enable auto-wrap
         };
-        const sanitizeReplayBuffer = (input) => {
-            // Remove terminal mode toggles emitted by Codex so replay doesn't re-enable them
-            // on our own TTY when restoring the session view.
-            return stripOscColorSequences(input)
-                .replace(/\x1B\[>4;?\d*m/g, '') // modifyOtherKeys set/reset
-                .replace(/\x1B\[>[0-9;]*u/g, '') // kitty keyboard protocol enables
-                .replace(/\x1B\[\?1004[hl]/g, '') // focus tracking
-                .replace(/\x1B\[\?2004[hl]/g, ''); // bracketed paste
+        // Set up raw input handling
+        const stdin = process.stdin;
+        // Configure stdin for PTY passthrough
+        if (stdin.isTTY) {
+            stdin.setRawMode(true);
+            stdin.resume();
+        }
+        stdin.setEncoding('utf8');
+        const handleStdinData = (data) => {
+            if (isExitingRef.current)
+                return;
+            // Check for return to menu shortcut
+            if (shortcutManager.matchesRawInput('returnToMenu', data)) {
+                // Disable any extended input modes that might have been enabled by the PTY
+                if (stdout) {
+                    resetTerminalInputModes();
+                }
+                // Remove our listener — Ink will reconfigure stdin when Menu mounts
+                stdin.removeListener('data', handleStdinData);
+                onReturnToMenu();
+                return;
+            }
+            if (session.stateMutex.getSnapshot().state === 'pending_auto_approval') {
+                sessionManager.cancelAutoApproval(session.id, 'User input received during auto-approval');
+            }
+            // Pass all other input directly to the PTY
+            session.process.write(data);
         };
-        // Reset modes immediately on entry in case a previous session left them on
-        resetTerminalInputModes();
+        stdin.on('data', handleStdinData);
         // Prevent line wrapping from drifting redraws in TUIs that rely on cursor-up clears.
         stdout.write('\x1b[?7l');
         // Clear screen when entering session
@@ -61,9 +74,8 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
                 // Concatenate all history buffers and write at once for better performance
                 const allHistory = Buffer.concat(restoredSession.outputHistory);
                 const historyStr = allHistory.toString('utf8');
-                // Sanitize and normalize the output
-                const sanitized = sanitizeReplayBuffer(historyStr);
-                const normalized = normalizeLineEndings(sanitized);
+                // Normalize the output
+                const normalized = normalizeLineEndings(historyStr);
                 // Remove leading clear screen sequences to avoid double-clear
                 const cleaned = normalized
                     .replace(/^\x1B\[2J/g, '')
@@ -75,6 +87,21 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         };
         // Listen for restore event first
         sessionManager.on('sessionRestore', handleSessionRestore);
+        // Listen for session data events
+        const handleSessionData = (activeSession, data) => {
+            // Only handle data for our session
+            if (activeSession.id === session.id && !isExitingRef.current) {
+                stdout.write(normalizeLineEndings(data));
+            }
+        };
+        const handleSessionExit = (exitedSession) => {
+            if (exitedSession.id === session.id) {
+                isExitingRef.current = true;
+                // Don't call onReturnToMenu here - App component handles it
+            }
+        };
+        sessionManager.on('sessionData', handleSessionData);
+        sessionManager.on('sessionExit', handleSessionExit);
         // Mark session as active (this will trigger the restore event)
         sessionManager.setSessionActive(session.id, true);
         // Immediately resize the PTY and terminal to current dimensions
@@ -93,21 +120,6 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
         catch {
             /* empty */
         }
-        // Listen for session data events
-        const handleSessionData = (activeSession, data) => {
-            // Only handle data for our session
-            if (activeSession.id === session.id && !isExitingRef.current) {
-                stdout.write(normalizeLineEndings(data));
-            }
-        };
-        const handleSessionExit = (exitedSession) => {
-            if (exitedSession.id === session.id) {
-                isExitingRef.current = true;
-                // Don't call onReturnToMenu here - App component handles it
-            }
-        };
-        sessionManager.on('sessionData', handleSessionData);
-        sessionManager.on('sessionExit', handleSessionExit);
         // Handle terminal resize
         const handleResize = () => {
             const cols = process.stdout.columns || 80;
@@ -119,35 +131,6 @@ const Session = ({ session, sessionManager, onReturnToMenu, }) => {
             }
         };
         stdout.on('resize', handleResize);
-        // Set up raw input handling
-        const stdin = process.stdin;
-        // Configure stdin for PTY passthrough
-        if (stdin.isTTY) {
-            stdin.setRawMode(true);
-            stdin.resume();
-        }
-        stdin.setEncoding('utf8');
-        const handleStdinData = (data) => {
-            if (isExitingRef.current)
-                return;
-            // Check for return to menu shortcut
-            if (shortcutManager.matchesRawInput('returnToMenu', data)) {
-                // Disable any extended input modes that might have been enabled by the PTY
-                if (stdout) {
-                    resetTerminalInputModes();
-                }
-                // Remove our listener — Ink will reconfigure stdin when Menu mounts
-                stdin.removeListener('data', handleStdinData);
-                onReturnToMenu();
-                return;
-            }
-            if (session.stateMutex.getSnapshot().state === 'pending_auto_approval') {
-                sessionManager.cancelAutoApproval(session.id, 'User input received during auto-approval');
-            }
-            // Pass all other input directly to the PTY
-            session.process.write(data);
-        };
-        stdin.on('data', handleStdinData);
         return () => {
             // Remove our stdin listener
             stdin.removeListener('data', handleStdinData);

package/dist/services/sessionManager.js

@@ -217,6 +217,7 @@ export class SessionManager extends EventEmitter {
             terminal,
             stateCheckInterval: undefined, // Will be set in setupBackgroundHandler
             isPrimaryCommand: options.isPrimaryCommand ?? true,
+            presetName: options.presetName,
             detectionStrategy,
             devcontainerConfig: options.devcontainerConfig ?? undefined,
             stateMutex: new Mutex(createInitialSessionStateData()),
@@ -257,6 +258,7 @@ export class SessionManager extends EventEmitter {
                 const ptyProcess = await this.spawn(command, args, worktreePath);
                 const session = await this.createSessionInternal(worktreePath, ptyProcess, {
                     isPrimaryCommand: true,
+                    presetName: preset.name,
                     detectionStrategy: preset.detectionStrategy,
                 });
                 if (launch.stdinPayload) {
@@ -659,6 +661,7 @@ export class SessionManager extends EventEmitter {
                 const ptyProcess = await this.spawn(devcontainerCmd, fullArgs, worktreePath);
                 const session = await this.createSessionInternal(worktreePath, ptyProcess, {
                     isPrimaryCommand: true,
+                    presetName: preset.name,
                     detectionStrategy: preset.detectionStrategy,
                     devcontainerConfig,
                 });

package/dist/types/index.d.ts

@@ -29,6 +29,7 @@ export interface Session {
     terminal: Terminal;
     stateCheckInterval: NodeJS.Timeout | undefined;
     isPrimaryCommand: boolean;
+    presetName: string | undefined;
     detectionStrategy: StateDetectionStrategy | undefined;
     devcontainerConfig: DevcontainerConfig | undefined;
     /**

package/dist/utils/hookExecutor.js

@@ -1,5 +1,5 @@
 import { spawn } from 'child_process';
-import { dirname } from 'path';
+import { basename } from 'path';
 import { Effect } from 'effect';
 import { ProcessError } from '../types/errors.js';
 import { WorktreeService } from '../services/worktreeService.js';
@@ -149,12 +149,13 @@ export function executeStatusHook(oldState, newState, session) {
         // Build environment for status hook
         const environment = {
             CCMANAGER_WORKTREE_PATH: session.worktreePath,
-            CCMANAGER_WORKTREE_DIR: dirname(session.worktreePath),
+            CCMANAGER_WORKTREE_DIR: basename(session.worktreePath),
             CCMANAGER_WORKTREE_BRANCH: branch,
             CCMANAGER_GIT_ROOT: session.worktreePath, // For status hooks, we use worktree path as cwd
             CCMANAGER_OLD_STATE: oldState,
             CCMANAGER_NEW_STATE: newState,
             CCMANAGER_SESSION_ID: session.id,
+            CCMANAGER_PRESET_NAME: session.presetName || '',
         };
         yield* Effect.catchAll(executeHook(hook.command, session.worktreePath, environment), error => {
             // Log error but don't throw - hooks should not break the main flow

package/dist/utils/hookExecutor.test.js

@@ -384,6 +384,7 @@ describe('hookExecutor Integration Tests', () => {
                 outputHistory: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,
+                presetName: undefined,
                 detectionStrategy: 'claude',
                 devcontainerConfig: undefined,
                 lastActivity: new Date(),
@@ -440,6 +441,7 @@ describe('hookExecutor Integration Tests', () => {
                 outputHistory: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,
+                presetName: undefined,
                 detectionStrategy: 'claude',
                 devcontainerConfig: undefined,
                 lastActivity: new Date(),
@@ -494,6 +496,7 @@ describe('hookExecutor Integration Tests', () => {
                 outputHistory: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,
+                presetName: undefined,
                 detectionStrategy: 'claude',
                 devcontainerConfig: undefined,
                 lastActivity: new Date(),
@@ -550,6 +553,7 @@ describe('hookExecutor Integration Tests', () => {
                 outputHistory: [],
                 stateCheckInterval: undefined,
                 isPrimaryCommand: true,
+                presetName: undefined,
                 detectionStrategy: 'claude',
                 devcontainerConfig: undefined,
                 lastActivity: new Date(),

package/dist/utils/worktreeUtils.test.js

@@ -133,6 +133,7 @@ describe('prepareSessionItems', () => {
         terminal: {},
         stateCheckInterval: undefined,
         isPrimaryCommand: true,
+        presetName: undefined,
         detectionStrategy: 'claude',
         devcontainerConfig: undefined,
         stateMutex: new Mutex({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "4.0.1",
+	"version": "4.0.2",
 	"description": "TUI application for managing multiple Claude Code sessions across Git worktrees",
 	"license": "MIT",
 	"author": "Kodai Kabasawa",
@@ -41,11 +41,11 @@
 		"bin"
 	],
 	"optionalDependencies": {
-		"@kodaikabasawa/ccmanager-darwin-arm64": "4.0.1",
-		"@kodaikabasawa/ccmanager-darwin-x64": "4.0.1",
-		"@kodaikabasawa/ccmanager-linux-arm64": "4.0.1",
-		"@kodaikabasawa/ccmanager-linux-x64": "4.0.1",
-		"@kodaikabasawa/ccmanager-win32-x64": "4.0.1"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "4.0.2",
+		"@kodaikabasawa/ccmanager-darwin-x64": "4.0.2",
+		"@kodaikabasawa/ccmanager-linux-arm64": "4.0.2",
+		"@kodaikabasawa/ccmanager-linux-x64": "4.0.2",
+		"@kodaikabasawa/ccmanager-win32-x64": "4.0.2"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",