@jacexh/claude-web-console 0.12.1 → 0.12.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacexh/claude-web-console",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "description": "Web-based console for Claude Code — manage sessions, switch models, preview artifacts",
   "type": "module",
   "bin": {

package/server/src/__tests__/wait-for-session-id.test.ts

@@ -0,0 +1,48 @@
+import { describe, it, expect, vi } from 'vitest'
+import { waitForSessionId } from '../session-id-resolver'
+
+describe('waitForSessionId', () => {
+  it('resolves when session.sessionId becomes available', async () => {
+    let ready = false
+    const session = {
+      get sessionId() {
+        if (!ready) throw new Error('not ready')
+        return 'real-session-id'
+      },
+    }
+
+    // Simulate SDK resolving sessionId after 100ms
+    setTimeout(() => { ready = true }, 100)
+
+    const result = await waitForSessionId(session as any, 5000)
+    expect(result).toBe('real-session-id')
+  })
+
+  it('resolves immediately when sessionId is already available', async () => {
+    const session = { sessionId: 'already-ready' }
+    const result = await waitForSessionId(session as any, 5000)
+    expect(result).toBe('already-ready')
+  })
+
+  it('rejects on timeout if sessionId never becomes available', async () => {
+    const session = {
+      get sessionId(): string { throw new Error('not ready') },
+    }
+
+    await expect(waitForSessionId(session as any, 200)).rejects.toThrow('Session init timed out')
+  })
+
+  it('ignores pending- prefixed session IDs', async () => {
+    let callCount = 0
+    const session = {
+      get sessionId() {
+        callCount++
+        if (callCount < 3) return 'pending-123'
+        return 'real-id'
+      },
+    }
+
+    const result = await waitForSessionId(session as any, 5000)
+    expect(result).toBe('real-id')
+  })
+})

package/server/src/http-routes.ts

@@ -17,10 +17,10 @@ export function registerHttpRoutes(app: FastifyInstance, sessionManager: Session
       await mkdir(cwd, { recursive: true })
     }
 
-    const tempId = await sessionManager.createSession(body ?? undefined)
-    const status = sessionManager.getSessionStatus(tempId)
+    const sessionId = await sessionManager.createSession(body ?? undefined)
+    const status = sessionManager.getSessionStatus(sessionId)
 
-    reply.code(201).send({ sessionId: tempId, status })
+    reply.code(201).send({ sessionId, status })
   })
 
   app.post<{ Params: { id: string } }>('/api/sessions/:id/resume', async (request, reply) => {

package/server/src/session-id-resolver.ts

@@ -0,0 +1,39 @@
+import type { SDKSession } from '@anthropic-ai/claude-agent-sdk'
+
+/**
+ * Polls session.sessionId until the SDK resolves the real ID.
+ * The SDK sets sessionId asynchronously after process init.
+ */
+export function waitForSessionId(session: SDKSession, timeoutMs: number): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      clearInterval(poll)
+      reject(new Error('Session init timed out'))
+    }, timeoutMs)
+
+    const poll = setInterval(() => {
+      try {
+        const id = session.sessionId
+        if (id && !id.startsWith('pending-')) {
+          clearInterval(poll)
+          clearTimeout(timeout)
+          resolve(id)
+        }
+      } catch {
+        // sessionId not ready yet, keep polling
+      }
+    }, 50)
+
+    // Check immediately (no need to wait 50ms if already ready)
+    try {
+      const id = session.sessionId
+      if (id && !id.startsWith('pending-')) {
+        clearInterval(poll)
+        clearTimeout(timeout)
+        resolve(id)
+      }
+    } catch {
+      // not ready, poll will handle it
+    }
+  })
+}

package/server/src/session-manager.ts

@@ -19,6 +19,7 @@ import type { FastifyBaseLogger } from 'fastify'
 import type { SessionInfo, EffortLevel } from './types.js'
 import { shouldBroadcastTurnStarted, shouldResetToIdleOnStreamEnd, isTurnMessage, type TurnState } from './turn-lifecycle.js'
 import { SessionStatusTracker } from './session-status.js'
+import { waitForSessionId } from './session-id-resolver.js'
 
 type PermissionResolver = {
   resolve: (approved: boolean, reason?: string, updatedPermissions?: import('@anthropic-ai/claude-agent-sdk').PermissionUpdate[]) => void
@@ -389,7 +390,9 @@ export class SessionManager {
     // For new sessions, start stream immediately — SDK may emit init messages
     this.startStreamConsumer(tempId, session)
 
-    return tempId
+    // Poll session.sessionId directly — don't depend on consumeStream remap timing
+    const sessionId = await waitForSessionId(session, 30_000)
+    return sessionId
   }
 
   private fetchAndBroadcastModels(sessionId: string, session: SDKSession, currentModel?: string): void {