claude-yes 1.31.2 → 1.32.1

package/ts/codex-resume.spec.ts

@@ -1,239 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from 'bun:test';
-import { spawn } from 'child_process';
-import { mkdir, rm } from 'fs/promises';
-import path from 'path';
-import { promisify } from 'util';
-
-const sleep = promisify(setTimeout);
-
-// Helper function to run codex-yes with proper error handling
-function runCodexYes(
-  args: string[],
-  cwd: string,
-  timeout: number = 30000,
-): Promise<{
-  stdout: string;
-  stderr: string;
-  exitCode: number | null;
-}> {
-  return new Promise((resolve) => {
-    const child = spawn('node', ['dist/cli.js', 'codex', ...args], {
-      cwd,
-      stdio: 'pipe',
-      env: { ...process.env, VERBOSE: '1' },
-    });
-
-    let stdout = '';
-    let stderr = '';
-
-    child.stdout?.on('data', (data) => {
-      stdout += data.toString();
-    });
-
-    child.stderr?.on('data', (data) => {
-      stderr += data.toString();
-    });
-
-    const timeoutId = setTimeout(() => {
-      child.kill('SIGTERM');
-      setTimeout(() => child.kill('SIGKILL'), 5000);
-    }, timeout);
-
-    child.on('exit', (code) => {
-      clearTimeout(timeoutId);
-      resolve({
-        stdout,
-        stderr,
-        exitCode: code,
-      });
-    });
-
-    child.on('error', (error) => {
-      clearTimeout(timeoutId);
-      resolve({
-        stdout,
-        stderr: stderr + error.message,
-        exitCode: null,
-      });
-    });
-  });
-}
-
-describe('Codex Session Restoration', () => {
-  const testDir = path.join(__dirname, '../logs');
-  const cwd1 = path.join(testDir, 'cwd1');
-  const cwd2 = path.join(testDir, 'cwd2');
-
-  beforeAll(async () => {
-    // Create test directories
-    await mkdir(cwd1, { recursive: true });
-    await mkdir(cwd2, { recursive: true });
-  });
-
-  afterAll(async () => {
-    // Clean up test directories
-    await rm(testDir, { recursive: true, force: true });
-  });
-
-  it('should maintain separate sessions for different directories', async () => {
-    console.log('\n=== Testing Codex Session Restoration ===\n');
-
-    // Step 1: Start codex-yes in cwd1 with 60s timeout (background)
-    console.log('Step 1: Starting codex-yes in cwd1 (60s timeout)...');
-    const cwd1Promise = runCodexYes(
-      ['-e', '60s', 'hello from cwd1'],
-      cwd1,
-      70000,
-    );
-
-    // Wait a bit for cwd1 to initialize
-    await sleep(2000);
-
-    // Step 2: Start codex-yes in cwd2 with 5s timeout (foreground)
-    console.log('Step 2: Starting codex-yes in cwd2 (5s timeout)...');
-    const cwd2Result = await runCodexYes(
-      ['-e', '5s', 'hello from cwd2'],
-      cwd2,
-      15000,
-    );
-
-    console.log('Step 2 completed - cwd2 result:');
-    console.log('- Exit code:', cwd2Result.exitCode);
-    console.log('- Stdout length:', cwd2Result.stdout.length);
-    console.log('- Stderr length:', cwd2Result.stderr.length);
-
-    // Step 3: Wait for cwd1 to complete
-    console.log('Step 3: Waiting for cwd1 to complete...');
-    const cwd1Result = await cwd1Promise;
-
-    console.log('Step 3 completed - cwd1 result:');
-    console.log('- Exit code:', cwd1Result.exitCode);
-    console.log('- Stdout length:', cwd1Result.stdout.length);
-    console.log('- Stderr length:', cwd1Result.stderr.length);
-
-    // Step 4: Test session restoration in cwd1 using --continue
-    console.log(
-      'Step 4: Testing session restoration in cwd1 with --continue...',
-    );
-    const continueResult = await runCodexYes(
-      ['--continue', '-e', '10s', 'hello3 continuing session'],
-      cwd1,
-      20000,
-    );
-
-    console.log('Step 4 completed - continue result:');
-    console.log('- Exit code:', continueResult.exitCode);
-    console.log('- Stdout length:', continueResult.stdout.length);
-    console.log('- Stderr length:', continueResult.stderr.length);
-
-    // Analyze results
-    console.log('\n=== Analysis ===');
-
-    // Check that sessions ran (allowing for various exit codes since codex might not be available)
-    const cwd1Ran =
-      cwd1Result.stdout.length > 0 || cwd1Result.stderr.length > 0;
-    const cwd2Ran =
-      cwd2Result.stdout.length > 0 || cwd2Result.stderr.length > 0;
-    const continueRan =
-      continueResult.stdout.length > 0 || continueResult.stderr.length > 0;
-
-    console.log('Sessions executed:');
-    console.log('- cwd1:', cwd1Ran ? 'YES' : 'NO');
-    console.log('- cwd2:', cwd2Ran ? 'YES' : 'NO');
-    console.log('- continue:', continueRan ? 'YES' : 'NO');
-
-    // Look for session-related logs in the outputs
-    const hasSessionLogs = (output: string) => {
-      return (
-        output.includes('session|') ||
-        output.includes('continue|') ||
-        output.includes('restore|') ||
-        output.includes('Session ID') ||
-        output.includes('resume')
-      );
-    };
-
-    const cwd1HasSessionLogs = hasSessionLogs(
-      cwd1Result.stdout + cwd1Result.stderr,
-    );
-    const cwd2HasSessionLogs = hasSessionLogs(
-      cwd2Result.stdout + cwd2Result.stderr,
-    );
-    const continueHasSessionLogs = hasSessionLogs(
-      continueResult.stdout + continueResult.stderr,
-    );
-
-    console.log('Session management logs found:');
-    console.log('- cwd1:', cwd1HasSessionLogs ? 'YES' : 'NO');
-    console.log('- cwd2:', cwd2HasSessionLogs ? 'YES' : 'NO');
-    console.log('- continue:', continueHasSessionLogs ? 'YES' : 'NO');
-
-    // Extract any visible session IDs or relevant logs
-    const extractRelevantLogs = (output: string, label: string) => {
-      const lines = output.split('\n');
-      const relevantLines = lines.filter(
-        (line) =>
-          line.includes('session|') ||
-          line.includes('continue|') ||
-          line.includes('restore|') ||
-          line.includes('Session') ||
-          line.includes('resume') ||
-          line.includes('UUID') ||
-          /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i.test(
-            line,
-          ),
-      );
-
-      if (relevantLines.length > 0) {
-        console.log(`\n${label} relevant logs:`);
-        relevantLines.forEach((line) => console.log(`  ${line.trim()}`));
-      }
-    };
-
-    extractRelevantLogs(cwd1Result.stdout + cwd1Result.stderr, 'CWD1');
-    extractRelevantLogs(cwd2Result.stdout + cwd2Result.stderr, 'CWD2');
-    extractRelevantLogs(
-      continueResult.stdout + continueResult.stderr,
-      'CONTINUE',
-    );
-
-    // Basic assertions - the test should at least attempt to run
-    expect(cwd1Ran || cwd2Ran || continueRan).toBe(true);
-
-    // If codex is available and working, we should see some session management
-    if (cwd1Result.exitCode === 0 && cwd2Result.exitCode === 0) {
-      console.log(
-        '\nCodex appears to be working - checking for session management...',
-      );
-      // At least one of the runs should show session management activity
-      expect(
-        cwd1HasSessionLogs || cwd2HasSessionLogs || continueHasSessionLogs,
-      ).toBe(true);
-    } else {
-      console.log(
-        '\nCodex may not be available or working - test completed with basic execution check',
-      );
-    }
-
-    console.log('\n=== Test Summary ===');
-    console.log('✅ Session restoration test completed');
-    console.log('✅ Multiple directories tested');
-    console.log('✅ Continue functionality tested');
-    console.log('✅ Session isolation verified');
-  }, 120000); // 2 minute timeout for the entire test
-
-  it('should handle missing codex gracefully', async () => {
-    console.log('\n=== Testing Error Handling ===\n');
-
-    // Test with a simple command to ensure our wrapper handles missing codex
-    const result = await runCodexYes(['--help'], cwd1, 5000);
-
-    // Should either work (if codex is installed) or fail gracefully
-    const hasOutput = result.stdout.length > 0 || result.stderr.length > 0;
-    expect(hasOutput).toBe(true);
-
-    console.log('Error handling test completed');
-    console.log('- Has output:', hasOutput);
-    console.log('- Exit code:', result.exitCode);
-  });
-});

package/ts/codexSessionManager.spec.ts

@@ -1,51 +0,0 @@
-import { describe, expect, it } from 'bun:test';
-import {
-  extractSessionId,
-  extractSessionIdFromSessionMeta,
-} from './codexSessionManager';
-
-describe('codexSessionManager', () => {
-  describe('extractSessionId', () => {
-    it('should extract UUID session ID from output', () => {
-      const output =
-        'Some text with session ID: 0199e659-0e5f-7843-8876-5a65c64e77c0 in it';
-      const sessionId = extractSessionId(output);
-      expect(sessionId).toBe('0199e659-0e5f-7843-8876-5a65c64e77c0');
-    });
-
-    it('should return null if no session ID found', () => {
-      const output = 'Some text without session ID';
-      const sessionId = extractSessionId(output);
-      expect(sessionId).toBe(null);
-    });
-
-    it('should handle uppercase UUIDs', () => {
-      const output = 'Session: 0199E659-0E5F-7843-8876-5A65C64E77C0';
-      const sessionId = extractSessionId(output);
-      expect(sessionId).toBe('0199E659-0E5F-7843-8876-5A65C64E77C0');
-    });
-  });
-
-  describe('extractSessionIdFromSessionMeta', () => {
-    it('should extract session ID from session metadata JSON', () => {
-      const sessionContent = `{"timestamp":"2025-10-15T05:30:20.265Z","type":"session_meta","payload":{"id":"0199e659-0e5f-7843-8876-5a65c64e77c0","timestamp":"2025-10-15T05:30:20.127Z","cwd":"/some/path"}}
-{"timestamp":"2025-10-15T05:30:20.415Z","type":"response_item","payload":{"type":"message","role":"user"}}`;
-
-      const sessionId = extractSessionIdFromSessionMeta(sessionContent);
-      expect(sessionId).toBe('0199e659-0e5f-7843-8876-5a65c64e77c0');
-    });
-
-    it('should fall back to regex extraction if JSON parsing fails', () => {
-      const sessionContent =
-        'Invalid JSON but contains 0199e659-0e5f-7843-8876-5a65c64e77c0';
-      const sessionId = extractSessionIdFromSessionMeta(sessionContent);
-      expect(sessionId).toBe('0199e659-0e5f-7843-8876-5a65c64e77c0');
-    });
-
-    it('should return null if no session ID found', () => {
-      const sessionContent = 'No session ID here';
-      const sessionId = extractSessionIdFromSessionMeta(sessionContent);
-      expect(sessionId).toBe(null);
-    });
-  });
-});

package/ts/codexSessionManager.test.ts

@@ -1,259 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
-import { mkdir, rm, writeFile } from 'fs/promises';
-import { tmpdir } from 'os';
-import { join } from 'path';
-import {
-  type CodexSession,
-  extractSessionId,
-  extractSessionIdFromSessionMeta,
-  getAllWorkingDirectories,
-  getRecentSessionsForCwd,
-  getSessionForCwd,
-  storeSessionForCwd,
-} from './codexSessionManager';
-
-// Create a temporary test directory
-const testDir = join(tmpdir(), 'claude-yes-test-' + Date.now());
-const testCodexDir = join(testDir, '.codex', 'sessions');
-const testConfigDir = join(testDir, '.config', 'cli-yes');
-
-// Store original environment
-const originalTestHome = process.env.CLI_YES_TEST_HOME;
-
-beforeEach(async () => {
-  // Set up test directories
-  await mkdir(testCodexDir, { recursive: true });
-  await mkdir(testConfigDir, { recursive: true });
-
-  // Set test home directory
-  process.env.CLI_YES_TEST_HOME = testDir;
-});
-
-afterEach(async () => {
-  // Clean up
-  process.env.CLI_YES_TEST_HOME = originalTestHome;
-  await rm(testDir, { recursive: true, force: true });
-});
-
-// Helper function to create a mock codex session file
-async function createMockSessionFile(sessionData: {
-  id: string;
-  timestamp: string;
-  cwd: string;
-  git?: any;
-}) {
-  const year = new Date(sessionData.timestamp).getFullYear();
-  const month = String(new Date(sessionData.timestamp).getMonth() + 1).padStart(
-    2,
-    '0',
-  );
-  const day = String(new Date(sessionData.timestamp).getDate()).padStart(
-    2,
-    '0',
-  );
-
-  const sessionDir = join(testCodexDir, String(year), month, day);
-  await mkdir(sessionDir, { recursive: true });
-
-  const filename = `test-session-${sessionData.id}.jsonl`;
-  const filePath = join(sessionDir, filename);
-
-  const sessionMeta = {
-    timestamp: sessionData.timestamp,
-    type: 'session_meta',
-    payload: {
-      id: sessionData.id,
-      timestamp: sessionData.timestamp,
-      cwd: sessionData.cwd,
-      originator: 'codex_cli_rs',
-      cli_version: '0.42.0',
-      instructions: null,
-      git: sessionData.git,
-    },
-  };
-
-  const content = JSON.stringify(sessionMeta) + '\n';
-  await writeFile(filePath, content);
-
-  return filePath;
-}
-
-describe('codexSessionManager', () => {
-  describe('extractSessionId', () => {
-    it('should extract valid session IDs from output', () => {
-      const output1 = 'Session ID: 019a4877-5f3c-7763-b573-513cc2d5d291';
-      const output2 =
-        'Starting session 019a4877-5f3c-7763-b573-513cc2d5d291 for user';
-      const output3 = 'No session ID here';
-
-      expect(extractSessionId(output1)).toBe(
-        '019a4877-5f3c-7763-b573-513cc2d5d291',
-      );
-      expect(extractSessionId(output2)).toBe(
-        '019a4877-5f3c-7763-b573-513cc2d5d291',
-      );
-      expect(extractSessionId(output3)).toBeNull();
-    });
-  });
-
-  describe('extractSessionIdFromSessionMeta', () => {
-    it('should extract session ID from valid session metadata', () => {
-      const sessionContent = JSON.stringify({
-        timestamp: '2025-11-03T06:46:14.123Z',
-        type: 'session_meta',
-        payload: {
-          id: '019a4877-5f3c-7763-b573-513cc2d5d291',
-          cwd: '/test/path',
-        },
-      });
-
-      expect(extractSessionIdFromSessionMeta(sessionContent)).toBe(
-        '019a4877-5f3c-7763-b573-513cc2d5d291',
-      );
-    });
-
-    it('should fall back to regex extraction for invalid JSON', () => {
-      const invalidContent =
-        'Invalid JSON but contains 019a4877-5f3c-7763-b573-513cc2d5d291';
-
-      expect(extractSessionIdFromSessionMeta(invalidContent)).toBe(
-        '019a4877-5f3c-7763-b573-513cc2d5d291',
-      );
-    });
-  });
-
-  describe('session storage and retrieval', () => {
-    it('should store and retrieve session IDs for directories', async () => {
-      const cwd = '/test/project';
-      const sessionId = '019a4877-5f3c-7763-b573-513cc2d5d291';
-
-      await storeSessionForCwd(cwd, sessionId);
-      const retrieved = await getSessionForCwd(cwd);
-
-      expect(retrieved).toBe(sessionId);
-    });
-
-    it('should return null for non-existent directories', async () => {
-      const result = await getSessionForCwd('/non/existent');
-      expect(result).toBeNull();
-    });
-  });
-
-  describe('codex session file parsing', () => {
-    it('should read sessions from actual codex files', async () => {
-      const sessionData = {
-        id: '019a4877-5f3c-7763-b573-513cc2d5d291',
-        timestamp: '2025-11-03T06:46:14.123Z',
-        cwd: '/v1/code/snomiao/claude-yes/tree/main',
-        git: {
-          commit_hash: 'abc123',
-          branch: 'main',
-          repository_url: 'git@github.com:snomiao/claude-yes.git',
-        },
-      };
-
-      await createMockSessionFile(sessionData);
-
-      const retrieved = await getSessionForCwd(sessionData.cwd);
-      expect(retrieved).toBe(sessionData.id);
-    });
-
-    it('should get recent sessions for a directory', async () => {
-      const cwd = '/test/project';
-      const sessions = [
-        {
-          id: 'session-1',
-          timestamp: '2025-11-03T10:00:00.000Z',
-          cwd,
-        },
-        {
-          id: 'session-2',
-          timestamp: '2025-11-03T09:00:00.000Z',
-          cwd,
-        },
-        {
-          id: 'session-3',
-          timestamp: '2025-11-03T08:00:00.000Z',
-          cwd,
-        },
-      ];
-
-      for (const session of sessions) {
-        await createMockSessionFile(session);
-      }
-
-      const recent = await getRecentSessionsForCwd(cwd, 2);
-      expect(recent).toHaveLength(2);
-      expect(recent[0].id).toBe('session-1'); // Most recent first
-      expect(recent[1].id).toBe('session-2');
-    });
-
-    it('should get all working directories with counts', async () => {
-      const sessions = [
-        {
-          id: 'session-1',
-          timestamp: '2025-11-03T10:00:00.000Z',
-          cwd: '/project-a',
-        },
-        {
-          id: 'session-2',
-          timestamp: '2025-11-03T09:00:00.000Z',
-          cwd: '/project-a',
-        },
-        {
-          id: 'session-3',
-          timestamp: '2025-11-03T08:00:00.000Z',
-          cwd: '/project-b',
-        },
-      ];
-
-      for (const session of sessions) {
-        await createMockSessionFile(session);
-      }
-
-      const directories = await getAllWorkingDirectories();
-      expect(directories).toHaveLength(2);
-
-      const projectA = directories.find((d) => d.cwd === '/project-a');
-      const projectB = directories.find((d) => d.cwd === '/project-b');
-
-      expect(projectA?.count).toBe(2);
-      expect(projectB?.count).toBe(1);
-
-      // Should be sorted by last session time (most recent first)
-      expect(directories[0].cwd).toBe('/project-a');
-    });
-  });
-
-  describe('fallback behavior', () => {
-    it('should fall back to stored mapping when no codex files exist', async () => {
-      const cwd = '/fallback/test';
-      const sessionId = 'fallback-session-id';
-
-      // Store in mapping but don't create codex file
-      await storeSessionForCwd(cwd, sessionId);
-
-      const retrieved = await getSessionForCwd(cwd);
-      expect(retrieved).toBe(sessionId);
-    });
-
-    it('should prefer codex files over stored mapping', async () => {
-      const cwd = '/preference/test';
-      const storedSessionId = 'stored-session';
-      const codexSessionId = 'codex-session';
-
-      // Store in mapping first
-      await storeSessionForCwd(cwd, storedSessionId);
-
-      // Create codex file with different session ID
-      await createMockSessionFile({
-        id: codexSessionId,
-        timestamp: '2025-11-03T10:00:00.000Z',
-        cwd,
-      });
-
-      const retrieved = await getSessionForCwd(cwd);
-      expect(retrieved).toBe(codexSessionId); // Should prefer codex file
-    });
-  });
-});