test(claude): align sessionScanner path mapping

Author: leeroybrun

src/claude/utils/sessionScanner.test.ts

@@ -3,21 +3,37 @@ import { createSessionScanner } from './sessionScanner'
 import { RawJSONLines } from '../types'
 import { mkdir, writeFile, appendFile, rm, readFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import { tmpdir, homedir } from 'node:os'
+import { tmpdir } from 'node:os'
 import { existsSync } from 'node:fs'
+import { getProjectPath } from './path'
+
+async function waitFor(predicate: () => boolean, timeoutMs: number = 2000, intervalMs: number = 25): Promise<void> {
+  const start = Date.now()
+  while (Date.now() - start < timeoutMs) {
+    if (predicate()) return
+    await new Promise(resolve => setTimeout(resolve, intervalMs))
+  }
+  throw new Error('Timed out waiting for condition')
+}
 
 describe('sessionScanner', () => {
   let testDir: string
   let projectDir: string
   let collectedMessages: RawJSONLines[]
   let scanner: Awaited<ReturnType<typeof createSessionScanner>> | null = null
+  let originalClaudeConfigDir: string | undefined
+  let claudeConfigDir: string
 
   beforeEach(async () => {
     testDir = join(tmpdir(), `scanner-test-${Date.now()}`)
     await mkdir(testDir, { recursive: true })
 
-    const projectName = testDir.replace(/\//g, '-')
-    projectDir = join(homedir(), '.claude', 'projects', projectName)
+    // Ensure the scanner and this test agree on where session files live.
+    // (getProjectPath uses CLAUDE_CONFIG_DIR + a sanitized project id derived from workingDirectory.)
+    originalClaudeConfigDir = process.env.CLAUDE_CONFIG_DIR;
+    claudeConfigDir = join(testDir, 'claude-config');
+    process.env.CLAUDE_CONFIG_DIR = claudeConfigDir;
+    projectDir = getProjectPath(testDir);
     await mkdir(projectDir, { recursive: true })
 
     collectedMessages = []
@@ -30,6 +46,12 @@ describe('sessionScanner', () => {
       scanner = null
     }
 
+    if (originalClaudeConfigDir === undefined) {
+      delete process.env.CLAUDE_CONFIG_DIR;
+    } else {
+      process.env.CLAUDE_CONFIG_DIR = originalClaudeConfigDir;
+    }
+
     if (existsSync(testDir)) {
       await rm(testDir, { recursive: true, force: true })
     }
@@ -60,7 +82,7 @@ describe('sessionScanner', () => {
     // Write first line
     await writeFile(sessionFile1, lines1[0] + '\n')
     scanner.onNewSession(sessionId1)
-    await new Promise(resolve => setTimeout(resolve, 100))
+    await waitFor(() => collectedMessages.length >= 1)
 
     expect(collectedMessages).toHaveLength(1)
     expect(collectedMessages[0].type).toBe('user')
@@ -73,7 +95,7 @@ describe('sessionScanner', () => {
     // Write second line with delay
     await new Promise(resolve => setTimeout(resolve, 50))
     await appendFile(sessionFile1, lines1[1] + '\n')
-    await new Promise(resolve => setTimeout(resolve, 200))
+    await waitFor(() => collectedMessages.length >= 2)
 
     expect(collectedMessages).toHaveLength(2)
     expect(collectedMessages[1].type).toBe('assistant')
@@ -99,7 +121,7 @@ describe('sessionScanner', () => {
     await writeFile(sessionFile2, initialContent)
 
     scanner.onNewSession(sessionId2)
-    await new Promise(resolve => setTimeout(resolve, 100))
+    await waitFor(() => collectedMessages.length >= phase1Count + 1)
 
     // Should have added only 1 new message (summary) 
     // The historical user + assistant messages (lines 1-2) are deduplicated because they have same UUIDs
@@ -109,7 +131,7 @@ describe('sessionScanner', () => {
     // Write new messages (user asks for ls tool) - this is line 3
     await new Promise(resolve => setTimeout(resolve, 50))
     await appendFile(sessionFile2, lines2[3] + '\n')
-    await new Promise(resolve => setTimeout(resolve, 200))
+    await waitFor(() => collectedMessages.some(m => m.type === 'user' && m.message.content === 'run ls tool '))
 
     // Find the user message we just added
     const userMessages = collectedMessages.filter(m => m.type === 'user')
@@ -124,7 +146,12 @@ describe('sessionScanner', () => {
       await new Promise(resolve => setTimeout(resolve, 50))
       await appendFile(sessionFile2, lines2[i] + '\n')
     }
-    await new Promise(resolve => setTimeout(resolve, 300))
+    await waitFor(() => collectedMessages.some(m =>
+      m.type === 'assistant' &&
+      Array.isArray((m.message?.content as any)) &&
+      typeof (m.message?.content as any)[0]?.text === 'string' &&
+      (m.message?.content as any)[0].text.includes('0-say-lol-session.jsonl')
+    ), 5000)
 
     // Final count check
     const finalMessages = collectedMessages.slice(phase1Count)
@@ -204,4 +231,4 @@ describe('sessionScanner', () => {
     //   expect(lastAssistantMsg.message.id).toBe('msg_01KWeuP88pkzRtXmggJRnQmV')
     // }
   })
-})
+})