ccmanager 3.12.4 → 3.12.6

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_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` }) }), _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/constants/statePersistence.d.ts

@@ -1,3 +1,3 @@
-export declare const STATE_PERSISTENCE_DURATION_MS = 200;
+export declare const STATE_PERSISTENCE_DURATION_MS = 1000;
 export declare const STATE_CHECK_INTERVAL_MS = 100;
-export declare const STATE_MINIMUM_DURATION_MS = 500;
+export declare const STATE_MINIMUM_DURATION_MS = 1000;

package/dist/constants/statePersistence.js

@@ -1,6 +1,9 @@
-// Duration in milliseconds that a detected state must persist before being confirmed
-export const STATE_PERSISTENCE_DURATION_MS = 200;
+// Duration in milliseconds that a detected state must persist before being confirmed.
+// A higher value prevents transient flicker (e.g., brief "idle" during terminal re-renders)
+// at the cost of slightly slower state transitions.
+export const STATE_PERSISTENCE_DURATION_MS = 1000;
 // Check interval for state detection in milliseconds
 export const STATE_CHECK_INTERVAL_MS = 100;
-// Minimum duration in current state before allowing transition to a new state
-export const STATE_MINIMUM_DURATION_MS = 500;
+// Minimum duration in current state before allowing transition to a new state.
+// Prevents rapid back-and-forth flicker (e.g., busy → idle → busy).
+export const STATE_MINIMUM_DURATION_MS = 1000;

package/dist/services/sessionManager.js

@@ -194,18 +194,12 @@ export class SessionManager extends EventEmitter {
         return `session-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
     }
     createTerminal() {
-        const terminal = new Terminal({
+        return new Terminal({
             cols: process.stdout.columns || 80,
             rows: process.stdout.rows || 24,
             allowProposedApi: true,
             logLevel: 'off',
         });
-        // Disable auto-wrap to match the real terminal setting (Session.tsx sends
-        // \x1b[?7l to stdout).  Without this, long lines wrap in xterm-headless but
-        // are clipped on the real terminal, causing Ink's cursor-up re-render to
-        // leave ghost content (old spinners, "esc to interrupt", etc.) in the buffer.
-        terminal.write('\x1b[?7l');
-        return terminal;
     }
     async createSessionInternal(worktreePath, ptyProcess, options = {}) {
         const id = this.createSessionId();

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

@@ -210,9 +210,8 @@ describe('SessionManager - State Persistence', () => {
         expect(session.stateMutex.getSnapshot().state).toBe('busy');
         // Simulate output that would trigger idle state
         eventEmitter.emit('data', 'Some output without busy indicators');
-        // Advance time enough for persistence duration but less than minimum duration
-        // STATE_PERSISTENCE_DURATION_MS (200ms) < STATE_MINIMUM_DURATION_MS (500ms)
-        await vi.advanceTimersByTimeAsync(STATE_PERSISTENCE_DURATION_MS + STATE_CHECK_INTERVAL_MS * 2);
+        // Advance time less than persistence duration so transition is not yet confirmed
+        await vi.advanceTimersByTimeAsync(STATE_PERSISTENCE_DURATION_MS - STATE_CHECK_INTERVAL_MS);
         // State should still be busy because minimum duration hasn't elapsed
         expect(session.stateMutex.getSnapshot().state).toBe('busy');
         expect(stateChangeHandler).not.toHaveBeenCalled();
@@ -251,10 +250,10 @@ describe('SessionManager - State Persistence', () => {
         await vi.advanceTimersByTimeAsync(STATE_CHECK_INTERVAL_MS); // 100ms
         // Pending state should be set to idle
         expect(session.stateMutex.getSnapshot().pendingState).toBe('idle');
-        // Advance past persistence duration (200ms) but NOT past minimum duration (500ms)
-        // Since stateConfirmedAt was updated at ~2000ms, and now is ~2200ms,
-        // timeInCurrentState = ~200ms which is < 500ms
-        await vi.advanceTimersByTimeAsync(STATE_PERSISTENCE_DURATION_MS);
+        // Advance past half the persistence duration but not fully
+        // Since stateConfirmedAt was updated at ~2000ms, this is not enough
+        // for the pending state to be confirmed
+        await vi.advanceTimersByTimeAsync(STATE_PERSISTENCE_DURATION_MS / 2);
         // State should still be busy because minimum duration since last busy detection hasn't elapsed
         expect(session.stateMutex.getSnapshot().state).toBe('busy');
         expect(stateChangeHandler).not.toHaveBeenCalled();

package/dist/services/stateDetector/claude.d.ts

@@ -12,6 +12,13 @@ export declare class ClaudeStateDetector extends BaseStateDetector {
      * If no prompt box is found, returns all content as fallback.
      */
     private getContentAbovePromptBox;
+    /**
+     * Claude Code frequently redraws the lower pane using cursor-addressed updates.
+     * xterm's buffer can retain transient fragments from those redraws outside the
+     * latest visible content block, so busy detection should only inspect the most
+     * recent contiguous block directly above the prompt box.
+     */
+    private getRecentContentAbovePromptBox;
     detectState(terminal: Terminal, currentState: SessionState): SessionState;
     detectBackgroundTask(terminal: Terminal): number;
     detectTeamMembers(terminal: Terminal): number;

package/dist/services/stateDetector/claude.js

@@ -3,6 +3,7 @@ import { BaseStateDetector } from './base.js';
 const SPINNER_CHARS = '✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃❇❈❉❊❋✢✣✤✥✦✧✨⊛⊕⊙◉◎◍⁂⁕※⍟☼★☆';
 // Matches spinner activity labels like "✽ Tempering…" or "✳ Simplifying recompute_tangents…"
 const SPINNER_ACTIVITY_PATTERN = new RegExp(`^[${SPINNER_CHARS}] \\S+ing.*\u2026`, 'm');
+const BUSY_LOOKBACK_LINES = 5;
 export class ClaudeStateDetector extends BaseStateDetector {
     /**
      * Extract content above the prompt box.
@@ -29,6 +30,37 @@ export class ClaudeStateDetector extends BaseStateDetector {
         // No prompt box found, return all content
         return lines.join('\n');
     }
+    /**
+     * Claude Code frequently redraws the lower pane using cursor-addressed updates.
+     * xterm's buffer can retain transient fragments from those redraws outside the
+     * latest visible content block, so busy detection should only inspect the most
+     * recent contiguous block directly above the prompt box.
+     */
+    getRecentContentAbovePromptBox(terminal, maxLines) {
+        const lines = this.getContentAbovePromptBox(terminal, maxLines).split('\n');
+        while (lines.length > 0) {
+            const trimmed = lines[lines.length - 1].trim();
+            if (trimmed === '' || trimmed === '❯' || /^[-─\s]+$/.test(trimmed)) {
+                lines.pop();
+                continue;
+            }
+            break;
+        }
+        if (lines.length === 0) {
+            return '';
+        }
+        let start = lines.length - 1;
+        while (start >= 0) {
+            const trimmed = lines[start].trim();
+            if (trimmed === '' || /^[-─\s]+$/.test(trimmed)) {
+                start++;
+                break;
+            }
+            start--;
+        }
+        const recentBlock = lines.slice(Math.max(start, 0));
+        return recentBlock.slice(-BUSY_LOOKBACK_LINES).join('\n');
+    }
     detectState(terminal, currentState) {
         // Check for search prompt (⌕ Search…) within 200 lines - always idle
         const extendedContent = this.getTerminalContent(terminal, 200);
@@ -56,7 +88,7 @@ export class ClaudeStateDetector extends BaseStateDetector {
             return 'waiting_input';
         }
         // Content above the prompt box only for busy detection
-        const abovePromptBox = this.getContentAbovePromptBox(terminal, 30);
+        const abovePromptBox = this.getRecentContentAbovePromptBox(terminal, 30);
         const aboveLowerContent = abovePromptBox.toLowerCase();
         // Check for busy state
         if (aboveLowerContent.includes('esc to interrupt') ||

package/dist/services/stateDetector/claude.test.js

@@ -423,6 +423,37 @@ describe('ClaudeStateDetector', () => {
             // Assert - Should be idle because search prompt takes precedence
             expect(state).toBe('idle');
         });
+        it('should ignore stale spinner output outside the latest block above the prompt box', () => {
+            terminal = createMockTerminal([
+                '✻ Seasoning… (44s · ↓ 247 tokens)',
+                '  ⎿ Tip: Use /btw to ask a quick side question',
+                '',
+                '⏺ 全て通過。',
+                '',
+                '  - lint: pass (0 errors)',
+                '  - typecheck: pass',
+                '  - tests: 56 files, 775 passed, 5 skipped',
+                '──────────────────────────────',
+                '❯',
+                '──────────────────────────────',
+            ]);
+            const state = detector.detectState(terminal, 'busy');
+            expect(state).toBe('idle');
+        });
+        it('should ignore stale interrupt text outside the latest block above the prompt box', () => {
+            terminal = createMockTerminal([
+                'Press esc to interrupt',
+                'Working...',
+                '',
+                'Command completed successfully',
+                'Ready for next command',
+                '──────────────────────────────',
+                '❯',
+                '──────────────────────────────',
+            ]);
+            const state = detector.detectState(terminal, 'busy');
+            expect(state).toBe('idle');
+        });
         it('should ignore "esc to interrupt" inside prompt box', () => {
             // Arrange - "esc to interrupt" is inside the prompt box, not above it
             terminal = createMockTerminal([

package/dist/utils/hookExecutor.js

@@ -1,4 +1,5 @@
 import { spawn } from 'child_process';
+import { dirname } from 'path';
 import { Effect } from 'effect';
 import { ProcessError } from '../types/errors.js';
 import { WorktreeService } from '../services/worktreeService.js';
@@ -148,6 +149,7 @@ 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_BRANCH: branch,
             CCMANAGER_GIT_ROOT: session.worktreePath, // For status hooks, we use worktree path as cwd
             CCMANAGER_OLD_STATE: oldState,

package/package.json

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