ccmanager 4.0.3 → 4.0.4

package/dist/services/sessionManager.d.ts

@@ -59,9 +59,8 @@ export declare class SessionManager extends EventEmitter implements ISessionMana
     /**
      * Sets up exit handler for the session process.
      * When the process exits with code 1 and it's the primary command,
-     * it will attempt to spawn a fallback process.
-     * If fallbackArgs are configured, they will be used.
-     * If no fallbackArgs are configured, the command will be retried with no arguments.
+     * it will attempt a single retry using the configured command with fallback args.
+     * If fallbackArgs are not configured, it retries the configured command with no args.
      */
     private setupExitHandler;
     private setupBackgroundHandler;

package/dist/services/sessionManager.js

@@ -207,6 +207,8 @@ export class SessionManager extends EventEmitter {
             worktreePath,
             sessionNumber: maxNumber + 1,
             sessionName: undefined,
+            command: options.command ?? 'claude',
+            fallbackArgs: options.fallbackArgs,
             lastAccessedAt: Date.now(),
             process: ptyProcess,
             output: [],
@@ -257,6 +259,8 @@ export class SessionManager extends EventEmitter {
                 const ptyProcess = await this.spawn(command, args, worktreePath);
                 const session = await this.createSessionInternal(worktreePath, ptyProcess, {
                     isPrimaryCommand: true,
+                    command,
+                    fallbackArgs: preset.fallbackArgs,
                     presetName: preset.name,
                     detectionStrategy: preset.detectionStrategy,
                 });
@@ -315,9 +319,8 @@ export class SessionManager extends EventEmitter {
     /**
      * Sets up exit handler for the session process.
      * When the process exits with code 1 and it's the primary command,
-     * it will attempt to spawn a fallback process.
-     * If fallbackArgs are configured, they will be used.
-     * If no fallbackArgs are configured, the command will be retried with no arguments.
+     * it will attempt a single retry using the configured command with fallback args.
+     * If fallbackArgs are not configured, it retries the configured command with no args.
      */
     setupExitHandler(session) {
         session.process.onExit(async (e) => {
@@ -325,26 +328,23 @@ export class SessionManager extends EventEmitter {
             if (e.exitCode === 1 && !e.signal && session.isPrimaryCommand) {
                 try {
                     let fallbackProcess;
+                    const fallbackArgs = injectTeammateMode(session.command, session.fallbackArgs ?? [], session.detectionStrategy);
                     // Check if we're in a devcontainer session
                     if (session.devcontainerConfig) {
                         // Parse the exec command to extract arguments
                         const execParts = session.devcontainerConfig.execCommand.split(/\s+/);
                         const devcontainerCmd = execParts[0] || 'devcontainer';
                         const execArgs = execParts.slice(1);
-                        // Build fallback command for devcontainer
-                        const fallbackClaudeArgs = injectTeammateMode('claude', [], session.detectionStrategy);
                         const fallbackFullArgs = [
                             ...execArgs,
                             '--',
-                            'claude',
-                            ...fallbackClaudeArgs,
+                            session.command,
+                            ...fallbackArgs,
                         ];
                         fallbackProcess = await this.spawn(devcontainerCmd, fallbackFullArgs, session.worktreePath, { rawMode: false });
                     }
                     else {
-                        // Regular fallback without devcontainer
-                        const fallbackArgs = injectTeammateMode('claude', [], session.detectionStrategy);
-                        fallbackProcess = await this.spawn('claude', fallbackArgs, session.worktreePath);
+                        fallbackProcess = await this.spawn(session.command, fallbackArgs, session.worktreePath);
                     }
                     // Replace the process
                     session.process = fallbackProcess;
@@ -691,6 +691,8 @@ export class SessionManager extends EventEmitter {
                 const ptyProcess = await this.spawn(devcontainerCmd, fullArgs, worktreePath, { rawMode: false });
                 const session = await this.createSessionInternal(worktreePath, ptyProcess, {
                     isPrimaryCommand: true,
+                    command: preset.command,
+                    fallbackArgs: preset.fallbackArgs,
                     presetName: preset.name,
                     detectionStrategy: preset.detectionStrategy,
                     devcontainerConfig,

package/dist/services/sessionManager.test.js

@@ -238,13 +238,14 @@ describe('SessionManager', () => {
             // Expect createSessionWithPresetEffect to throw the original error
             await expect(Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'))).rejects.toThrow('Command not found');
         });
-        it('should fallback to default command when main command exits with code 1', async () => {
+        it('should retry the configured command with fallback args when main command exits with code 1', async () => {
             // Setup mock preset with args
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
                 args: ['--invalid-flag'],
+                fallbackArgs: ['--safe-flag'],
             });
             // First spawn attempt - will exit with code 1
             const firstMockPty = new MockPty();
@@ -262,11 +263,13 @@ describe('SessionManager', () => {
             firstMockPty.emit('exit', { exitCode: 1 });
             // Wait for fallback to occur
             await new Promise(resolve => setTimeout(resolve, 50));
-            // Verify fallback spawn was called (with no args since commandConfig was removed)
+            // Verify fallback spawn was called with the configured fallback args
             expect(spawn).toHaveBeenCalledTimes(2);
-            expect(spawn).toHaveBeenNthCalledWith(2, 'claude', ['--teammate-mode', 'in-process'], expect.objectContaining({ cwd: '/test/worktree' }));
+            expect(spawn).toHaveBeenNthCalledWith(2, 'claude', ['--safe-flag', '--teammate-mode', 'in-process'], expect.objectContaining({ cwd: '/test/worktree' }));
             // Verify session process was replaced
             expect(session.process).toBe(secondMockPty);
+            expect(session.command).toBe('claude');
+            expect(session.fallbackArgs).toEqual(['--safe-flag']);
             expect(session.isPrimaryCommand).toBe(false);
         });
         it('should not use fallback if main command succeeds', async () => {
@@ -318,8 +321,37 @@ describe('SessionManager', () => {
             expect(spawn).toHaveBeenNthCalledWith(2, 'claude', ['--teammate-mode', 'in-process'], expect.objectContaining({ cwd: '/test/worktree' }));
             // Verify session process was replaced
             expect(session.process).toBe(secondMockPty);
+            expect(session.command).toBe('claude');
+            expect(session.fallbackArgs).toBeUndefined();
             expect(session.isPrimaryCommand).toBe(false);
         });
+        it('should cleanup and emit exit when fallback command also exits with code 1', async () => {
+            vi.mocked(configReader.getDefaultPreset).mockReturnValue({
+                id: '1',
+                name: 'Main',
+                command: 'opencode',
+                args: ['run', '--bad-flag'],
+                fallbackArgs: ['run', '--safe-mode'],
+                detectionStrategy: 'opencode',
+            });
+            const firstMockPty = new MockPty();
+            const secondMockPty = new MockPty();
+            let exitedSession = null;
+            vi.mocked(spawn)
+                .mockReturnValueOnce(firstMockPty)
+                .mockReturnValueOnce(secondMockPty);
+            sessionManager.on('sessionExit', (session) => {
+                exitedSession = session;
+            });
+            const session = await Effect.runPromise(sessionManager.createSessionWithPresetEffect('/test/worktree'));
+            firstMockPty.emit('exit', { exitCode: 1 });
+            await new Promise(resolve => setTimeout(resolve, 50));
+            secondMockPty.emit('exit', { exitCode: 1 });
+            await new Promise(resolve => setTimeout(resolve, 50));
+            expect(spawn).toHaveBeenNthCalledWith(2, 'opencode', ['run', '--safe-mode'], expect.objectContaining({ cwd: '/test/worktree' }));
+            expect(exitedSession).toBe(session);
+            expect(sessionManager.getSessionsForWorktree('/test/worktree')).toHaveLength(0);
+        });
         it('should handle custom command configuration', async () => {
             // Setup mock preset with custom command
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
@@ -655,13 +687,14 @@ describe('SessionManager', () => {
             expect(session.process).toBe(secondMockPty);
             expect(session.isPrimaryCommand).toBe(false);
         });
-        it('should fallback to default command in devcontainer when primary command exits with code 1', async () => {
+        it('should retry the configured command with fallback args in devcontainer when primary command exits with code 1', async () => {
             // Setup preset with args
             vi.mocked(configReader.getDefaultPreset).mockReturnValue({
                 id: '1',
                 name: 'Main',
                 command: 'claude',
                 args: ['--bad-flag'],
+                fallbackArgs: ['--safe-flag'],
             });
             // First spawn attempt - will exit with code 1
             const firstMockPty = new MockPty();
@@ -690,7 +723,7 @@ describe('SessionManager', () => {
             firstMockPty.emit('exit', { exitCode: 1 });
             // Wait for fallback to occur
             await new Promise(resolve => setTimeout(resolve, 50));
-            // Verify fallback spawn was called with teammate-mode args
+            // Verify fallback spawn was called with the configured fallback args
             expect(spawn).toHaveBeenCalledTimes(2);
             expect(spawn).toHaveBeenNthCalledWith(2, 'devcontainer', [
                 'exec',
@@ -698,6 +731,7 @@ describe('SessionManager', () => {
                 '.',
                 '--',
                 'claude',
+                '--safe-flag',
                 '--teammate-mode',
                 'in-process',
             ], expect.objectContaining({ cwd: '/test/worktree', rawMode: false }));

package/dist/services/stateDetector/cursor.js

@@ -13,7 +13,11 @@ export class CursorStateDetector extends BaseStateDetector {
             /auto .* \(shift\+tab\)/.test(lowerContent) ||
             /allow .+ \(y\)/.test(lowerContent) ||
             /run .+ \(y\)/.test(lowerContent) ||
-            lowerContent.includes('skip (esc or n)')) {
+            lowerContent.includes('skip (esc or n)') ||
+            lowerContent.includes('write to this file?') ||
+            lowerContent.includes('reject & propose changes') ||
+            (lowerContent.includes('add write(') &&
+                lowerContent.includes('allowlist'))) {
             return 'waiting_input';
         }
         // Check for busy state - Priority 2

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

@@ -114,6 +114,21 @@ describe('CursorStateDetector', () => {
         // Assert
         expect(state).toBe('waiting_input');
     });
+    it('should detect waiting_input state for Write to this file? prompt', () => {
+        // Arrange
+        terminal = createMockTerminal([
+            ' │ Write to this file?                                                                                                                                                                                                                                                                                                                                                                  │',
+            ' │ in /Users/kbwo/go/projects/github.com/kbwo/ccmanager--feature-takt/src/services/stateDetector/takt.ts                                                                                                                                                                                                                                                                                │',
+            ' │  → Proceed (y)                                                                                                                                                                                                                                                                                                                                                                       │',
+            ' │    Reject & propose changes (esc or n or p)                                                                                                                                                                                                                                                                                                                                          │',
+            ' │    Add Write(/Users/.../takt.ts) to allowlist? (tab)                                                                                                                                                                                                                                                                                                                                 │',
+            ' │    Run Everything (shift+tab)                                                                                                                                                                                                                                                                                                                                                        │',
+        ]);
+        // Act
+        const state = detector.detectState(terminal, 'idle');
+        // Assert
+        expect(state).toBe('waiting_input');
+    });
     it('should detect busy state for ctrl+c to stop pattern', () => {
         // Arrange
         terminal = createMockTerminal([

package/dist/types/index.d.ts

@@ -20,6 +20,8 @@ export interface Session {
     worktreePath: string;
     sessionNumber: number;
     sessionName?: string;
+    command: string;
+    fallbackArgs?: string[];
     lastAccessedAt: number;
     process: IPty;
     output: string[];

package/dist/utils/hookExecutor.test.js

@@ -377,6 +377,8 @@ describe('hookExecutor Integration Tests', () => {
                 id: 'test-session-123',
                 worktreePath: tmpDir, // Use tmpDir as the worktree path
                 sessionNumber: 1,
+                command: 'claude',
+                fallbackArgs: undefined,
                 lastAccessedAt: Date.now(),
                 process: {},
                 terminal: {},
@@ -434,6 +436,8 @@ describe('hookExecutor Integration Tests', () => {
                 id: 'test-session-456',
                 worktreePath: tmpDir, // Use tmpDir as the worktree path
                 sessionNumber: 1,
+                command: 'claude',
+                fallbackArgs: undefined,
                 lastAccessedAt: Date.now(),
                 process: {},
                 terminal: {},
@@ -489,6 +493,8 @@ describe('hookExecutor Integration Tests', () => {
                 id: 'test-session-789',
                 worktreePath: tmpDir, // Use tmpDir as the worktree path
                 sessionNumber: 1,
+                command: 'claude',
+                fallbackArgs: undefined,
                 lastAccessedAt: Date.now(),
                 process: {},
                 terminal: {},
@@ -546,6 +552,8 @@ describe('hookExecutor Integration Tests', () => {
                 id: 'test-session-failure',
                 worktreePath: tmpDir,
                 sessionNumber: 1,
+                command: 'claude',
+                fallbackArgs: undefined,
                 lastAccessedAt: Date.now(),
                 process: {},
                 terminal: {},

package/dist/utils/worktreeUtils.test.js

@@ -124,6 +124,8 @@ describe('prepareSessionItems', () => {
         id: 'test-session',
         worktreePath: '/path/to/worktree',
         sessionNumber: 1,
+        command: 'claude',
+        fallbackArgs: undefined,
         lastAccessedAt: Date.now(),
         process: {},
         output: [],

package/package.json

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