Merge pull request #46 from bradfeld/feature/FRE-22-no-timeout-promise-coding-cli

client: add 30s timeout to coding CLI creation Promise

Author: danshapiro

src/store/codingCliThunks.ts

@@ -6,6 +6,8 @@ import type { RootState } from './store'
 import type { CodingCliProviderName } from '@/lib/coding-cli-types'
 import { nanoid } from 'nanoid'
 
+const CODING_CLI_CREATE_TIMEOUT_MS = 30_000
+
 export const createCodingCliTab = createAsyncThunk(
   'codingCli/createTab',
   async (
@@ -42,12 +44,16 @@ export const createCodingCliTab = createAsyncThunk(
       throw err
     }
 
-    return new Promise<string>((resolve, reject) => {
-      const unsub = ws.onMessage((msg) => {
+    let unsub: (() => void) | undefined
+    let timeoutId: ReturnType<typeof setTimeout> | undefined
+
+    const mainPromise = new Promise<string>((resolve, reject) => {
+      unsub = ws.onMessage((msg) => {
         if (msg.type === 'codingcli.created' && msg.requestId === requestId) {
+          clearTimeout(timeoutId)
           const canceled = (getState() as RootState).codingCli.pendingRequests[requestId]?.canceled
           dispatch(resolveCodingCliRequest({ requestId }))
-          unsub()
+          unsub?.()
           if (canceled) {
             ws.send({ type: 'codingcli.kill', sessionId: msg.sessionId })
             reject(new Error('Canceled'))
@@ -76,9 +82,10 @@ export const createCodingCliTab = createAsyncThunk(
           resolve(msg.sessionId)
         }
         if (msg.type === 'error' && msg.requestId === requestId) {
+          clearTimeout(timeoutId)
           const canceled = (getState() as RootState).codingCli.pendingRequests[requestId]?.canceled
           dispatch(resolveCodingCliRequest({ requestId }))
-          unsub()
+          unsub?.()
           if (!canceled && createdTabId) {
             dispatch(
               updateTab({
@@ -99,5 +106,18 @@ export const createCodingCliTab = createAsyncThunk(
         cwd,
       })
     })
+
+    const timeoutPromise = new Promise<never>((_, reject) => {
+      timeoutId = setTimeout(() => {
+        dispatch(resolveCodingCliRequest({ requestId }))
+        unsub?.()
+        if (createdTabId) {
+          dispatch(updateTab({ id: createdTabId, updates: { status: 'error' } }))
+        }
+        reject(new Error('Coding CLI creation timed out after 30 seconds'))
+      }, CODING_CLI_CREATE_TIMEOUT_MS)
+    })
+
+    return Promise.race([mainPromise, timeoutPromise])
   }
 )

test/unit/client/store/codingCliThunks.test.ts

@@ -81,6 +81,37 @@ describe('codingCliThunks', () => {
     expect(store.getState().codingCli.sessions['session-123']).toBeDefined()
   })
 
+  it('times out after 30s and sets tab to error state', async () => {
+    vi.useFakeTimers()
+    try {
+      const store = createStore()
+
+      const promise = store.dispatch(
+        createCodingCliTab({ provider: 'codex', prompt: 'Slow creation' })
+      )
+
+      const tab = store.getState().tabs.tabs[0]
+      expect(tab.status).toBe('creating')
+
+      // Advance past the 30s timeout
+      await vi.advanceTimersByTimeAsync(30_000)
+
+      const result = await promise
+      expect(result.type).toBe('codingCli/createTab/rejected')
+      expect(result.error?.message).toBe('Coding CLI creation timed out after 30 seconds')
+
+      // Tab should be in error state
+      const updatedTab = store.getState().tabs.tabs[0]
+      expect(updatedTab.status).toBe('error')
+
+      // Pending request should be cleaned up
+      const requestId = tab.codingCliSessionId as string
+      expect(store.getState().codingCli.pendingRequests[requestId]).toBeUndefined()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('kills created session when request was canceled', async () => {
     const store = createStore()