ccmanager 3.6.9 → 3.6.11

package/dist/components/ConfigureOther.js

@@ -18,6 +18,7 @@ const ConfigureOther = ({ onComplete }) => {
     const [customCommandDraft, setCustomCommandDraft] = useState(customCommand);
     const [timeout, setTimeout] = useState(autoApprovalConfig.timeout ?? 30);
     const [timeoutDraft, setTimeoutDraft] = useState(timeout);
+    const [clearHistoryOnClear, setClearHistoryOnClear] = useState(autoApprovalConfig.clearHistoryOnClear ?? false);
     // Show if inheriting from global (for project scope)
     const isInheriting = scope === 'project' && !configEditor.hasProjectOverride('autoApproval');
     useInput((input, key) => {
@@ -48,6 +49,10 @@ const ConfigureOther = ({ onComplete }) => {
             label: `⏱️  Set Timeout (${timeout}s)`,
             value: 'timeout',
         },
+        {
+            label: `Clear History on Screen Clear: ${clearHistoryOnClear ? '✅ Enabled' : '❌ Disabled'}`,
+            value: 'toggleClearHistory',
+        },
         {
             label: '💾 Save Changes',
             value: 'save',
@@ -70,11 +75,15 @@ const ConfigureOther = ({ onComplete }) => {
                 setTimeoutDraft(timeout);
                 setView('timeout');
                 break;
+            case 'toggleClearHistory':
+                setClearHistoryOnClear(!clearHistoryOnClear);
+                break;
             case 'save':
                 configEditor.setAutoApprovalConfig({
                     enabled: autoApprovalEnabled,
                     customCommand: customCommand.trim() || undefined,
                     timeout,
+                    clearHistoryOnClear,
                 });
                 onComplete();
                 break;
@@ -104,6 +113,6 @@ const ConfigureOther = ({ onComplete }) => {
             } }));
     }
     const scopeLabel = scope === 'project' ? 'Project' : 'Global';
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "green", children: ["Other & Experimental Settings (", 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: "Toggle experimental capabilities and other miscellaneous options." }) }), _jsx(CustomCommandSummary, { command: customCommand }), _jsx(SelectInput, { items: menuItems, onSelect: handleSelect, isFocused: true }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: ["Press ", shortcutManager.getShortcutDisplay('cancel'), " to return without saving"] }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, color: "green", children: ["Other & Experimental Settings (", 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: "Toggle experimental capabilities and other miscellaneous options." }) }), _jsx(CustomCommandSummary, { command: customCommand }), clearHistoryOnClear && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Clear History: When enabled, session output history is cleared when a screen clear escape sequence is detected (e.g., /clear command). This prevents excessive scrolling during session restoration." }) })), _jsx(SelectInput, { items: menuItems, onSelect: handleSelect, isFocused: true }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: ["Press ", shortcutManager.getShortcutDisplay('cancel'), " to return without saving"] }) })] }));
 };
 export default ConfigureOther;

package/dist/components/Menu.js

@@ -37,22 +37,11 @@ const Menu = ({ sessionManager, worktreeService, onSelectWorktree, onSelectRecen
     const [recentProjects, setRecentProjects] = useState([]);
     const { stdout } = useStdout();
     const fixedRows = 6;
-    const [terminalRows, setTerminalRows] = useState(stdout.rows);
-    // Update terminal rows on resize
-    useEffect(() => {
-        const handleResize = () => {
-            setTerminalRows(stdout.rows);
-        };
-        stdout.on('resize', handleResize);
-        return () => {
-            stdout.off('resize', handleResize);
-        };
-    }, [stdout]);
     // Use the search mode hook
     const { isSearchMode, searchQuery, selectedIndex, setSearchQuery } = useSearchMode(items.length, {
         isDisabled: !!error || !!loadError,
     });
-    const limit = Math.max(5, terminalRows -
+    const limit = Math.max(5, stdout.rows -
         fixedRows -
         (isSearchMode ? 1 : 0) -
         (error || loadError ? 3 : 0));

package/dist/services/config/configReader.d.ts

@@ -17,6 +17,7 @@ export declare class ConfigReader implements IConfigReader {
     getConfiguration(): ConfigurationData;
     getAutoApprovalConfig(): NonNullable<ConfigurationData['autoApproval']>;
     isAutoApprovalEnabled(): boolean;
+    isClearHistoryOnClearEnabled(): boolean;
     getDefaultPreset(): CommandPreset;
     getSelectPresetOnStart(): boolean;
     getPresetByIdEffect(id: string): Either.Either<CommandPreset, ValidationError>;

package/dist/services/config/configReader.js

@@ -86,6 +86,10 @@ export class ConfigReader {
     isAutoApprovalEnabled() {
         return this.getAutoApprovalConfig().enabled;
     }
+    // Check if clear history on clear is enabled
+    isClearHistoryOnClearEnabled() {
+        return this.getAutoApprovalConfig().clearHistoryOnClear ?? false;
+    }
     // Command Preset methods - delegate to global config for modifications
     getDefaultPreset() {
         const presets = this.getCommandPresets();

package/dist/services/config/globalConfigManager.js

@@ -76,6 +76,7 @@ class GlobalConfigManager {
             this.config.autoApproval = {
                 enabled: false,
                 timeout: 30,
+                clearHistoryOnClear: false,
             };
         }
         else {
@@ -85,6 +86,9 @@ class GlobalConfigManager {
             if (!Object.prototype.hasOwnProperty.call(this.config.autoApproval, 'timeout')) {
                 this.config.autoApproval.timeout = 30;
             }
+            if (!Object.prototype.hasOwnProperty.call(this.config.autoApproval, 'clearHistoryOnClear')) {
+                this.config.autoApproval.clearHistoryOnClear = false;
+            }
         }
         // Migrate legacy command config to presets if needed
         this.ensureDefaultPresets();

package/dist/services/sessionManager.js

@@ -277,6 +277,13 @@ export class SessionManager extends EventEmitter {
         session.process.onData((data) => {
             // Write data to virtual terminal
             session.terminal.write(data);
+            // Check for screen clear escape sequence (e.g., from /clear command)
+            // When enabled and detected, clear the output history to prevent replaying old content on restore
+            // This helps avoid excessive scrolling when restoring sessions with large output history
+            if (configReader.isClearHistoryOnClearEnabled() &&
+                data.includes('\x1B[2J')) {
+                session.outputHistory = [];
+            }
             // Store in output history as Buffer
             const buffer = Buffer.from(data, 'utf8');
             session.outputHistory.push(buffer);

package/dist/services/sessionManager.statePersistence.test.js

@@ -41,6 +41,7 @@ vi.mock('./config/configReader.js', () => ({
         getWorktreeLastOpened: vi.fn(() => ({})),
         isAutoApprovalEnabled: vi.fn(() => false),
         setAutoApprovalEnabled: vi.fn(),
+        isClearHistoryOnClearEnabled: vi.fn(() => false),
     },
 }));
 describe('SessionManager - State Persistence', () => {

package/dist/services/sessionManager.test.js

@@ -30,6 +30,7 @@ vi.mock('./config/configReader.js', () => ({
         getWorktreeLastOpened: vi.fn(() => ({})),
         isAutoApprovalEnabled: vi.fn(() => false),
         setAutoApprovalEnabled: vi.fn(),
+        isClearHistoryOnClearEnabled: vi.fn(() => false),
     },
 }));
 // Mock Terminal
@@ -694,6 +695,89 @@ describe('SessionManager', () => {
             expect(session.isPrimaryCommand).toBe(false);
         });
     });
+    describe('clearHistoryOnClear', () => {
+        it('should clear output history when screen clear escape sequence is detected and setting is enabled', async () => {
+            // Setup
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                id: '1',
+                name: 'Main',
+                command: 'claude',
+            });
+            vi.mocked(configReader.isClearHistoryOnClearEnabled).mockReturnValue(true);
+            vi.mocked(spawn).mockReturnValue(mockPty);
+            // Create session
+            const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+            // Simulate some data output
+            mockPty.emit('data', 'Hello World');
+            mockPty.emit('data', 'More data');
+            // Verify output history has data
+            expect(session.outputHistory.length).toBe(2);
+            // Simulate screen clear escape sequence
+            mockPty.emit('data', '\x1B[2J');
+            // Verify output history was cleared and only contains the clear sequence
+            expect(session.outputHistory.length).toBe(1);
+            expect(session.outputHistory[0]?.toString()).toBe('\x1B[2J');
+        });
+        it('should not clear output history when screen clear escape sequence is detected but setting is disabled', async () => {
+            // Setup
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                id: '1',
+                name: 'Main',
+                command: 'claude',
+            });
+            vi.mocked(configReader.isClearHistoryOnClearEnabled).mockReturnValue(false);
+            vi.mocked(spawn).mockReturnValue(mockPty);
+            // Create session
+            const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+            // Simulate some data output
+            mockPty.emit('data', 'Hello World');
+            mockPty.emit('data', 'More data');
+            // Verify output history has data
+            expect(session.outputHistory.length).toBe(2);
+            // Simulate screen clear escape sequence
+            mockPty.emit('data', '\x1B[2J');
+            // Verify output history was NOT cleared
+            expect(session.outputHistory.length).toBe(3);
+        });
+        it('should not clear output history for normal data when setting is enabled', async () => {
+            // Setup
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                id: '1',
+                name: 'Main',
+                command: 'claude',
+            });
+            vi.mocked(configReader.isClearHistoryOnClearEnabled).mockReturnValue(true);
+            vi.mocked(spawn).mockReturnValue(mockPty);
+            // Create session
+            const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+            // Simulate normal data output without screen clear
+            mockPty.emit('data', 'Hello World');
+            mockPty.emit('data', 'More data');
+            mockPty.emit('data', 'Even more data');
+            // Verify output history contains all data
+            expect(session.outputHistory.length).toBe(3);
+        });
+        it('should clear history when screen clear is part of larger data chunk', async () => {
+            // Setup
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                id: '1',
+                name: 'Main',
+                command: 'claude',
+            });
+            vi.mocked(configReader.isClearHistoryOnClearEnabled).mockReturnValue(true);
+            vi.mocked(spawn).mockReturnValue(mockPty);
+            // Create session
+            const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+            // Simulate some data output
+            mockPty.emit('data', 'Hello World');
+            mockPty.emit('data', 'More data');
+            // Simulate screen clear as part of larger data chunk (e.g., from /clear command)
+            mockPty.emit('data', 'prefix\x1B[2Jsuffix');
+            // Verify output history was cleared and only contains the new chunk
+            expect(session.outputHistory.length).toBe(1);
+            expect(session.outputHistory[0]?.toString()).toBe('prefix\x1B[2Jsuffix');
+        });
+    });
     describe('static methods', () => {
         describe('getSessionCounts', () => {
             // Helper to create mock session with stateMutex

package/dist/types/index.d.ts

@@ -113,6 +113,7 @@ export interface ConfigurationData {
         enabled: boolean;
         customCommand?: string;
         timeout?: number;
+        clearHistoryOnClear?: boolean;
     };
 }
 export type ConfigScope = 'project' | 'global';
@@ -120,6 +121,7 @@ export interface AutoApprovalConfig {
     enabled: boolean;
     customCommand?: string;
     timeout?: number;
+    clearHistoryOnClear?: boolean;
 }
 export interface ProjectConfigurationData {
     shortcuts?: ShortcutConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ccmanager",
-	"version": "3.6.9",
+	"version": "3.6.11",
 	"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": "3.6.9",
-		"@kodaikabasawa/ccmanager-darwin-x64": "3.6.9",
-		"@kodaikabasawa/ccmanager-linux-arm64": "3.6.9",
-		"@kodaikabasawa/ccmanager-linux-x64": "3.6.9",
-		"@kodaikabasawa/ccmanager-win32-x64": "3.6.9"
+		"@kodaikabasawa/ccmanager-darwin-arm64": "3.6.11",
+		"@kodaikabasawa/ccmanager-darwin-x64": "3.6.11",
+		"@kodaikabasawa/ccmanager-linux-arm64": "3.6.11",
+		"@kodaikabasawa/ccmanager-linux-x64": "3.6.11",
+		"@kodaikabasawa/ccmanager-win32-x64": "3.6.11"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.28.0",