@jacexh/claude-web-console 0.12.1 → 0.12.2

package/package.json

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

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-manager.ts

@@ -158,7 +158,7 @@ export class SessionManager {
   private streamingSessionIds = new Set<string>()
   private sessionListeners = new Map<string, Set<SessionListener>>()
   private idleTimers = new Map<string, ReturnType<typeof setTimeout>>()
-  private pendingRemaps = new Map<string, { sessionIdRef: { current: string } }>()
+  private pendingRemaps = new Map<string, { sessionIdRef: { current: string }; resolve?: (sessionId: string) => void }>()
   // Track cwd for each session so we can resume in the correct project
   private sessionCwds = new Map<string, string>()
   /** User-supplied creation options that must survive resume cycles */
@@ -384,12 +384,21 @@ export class SessionManager {
     })
 
     // Store tempId in pendingRemaps for remap inside consumeStream
-    this.pendingRemaps.set(tempId, { sessionIdRef })
+    const sessionIdReady = new Promise<string>((resolve) => {
+      this.pendingRemaps.set(tempId, { sessionIdRef, resolve })
+    })
 
     // For new sessions, start stream immediately — SDK may emit init messages
     this.startStreamConsumer(tempId, session)
 
-    return tempId
+    // Wait for real sessionId (resolved when consumeStream processes first SDK message)
+    const timeoutMs = 10_000
+    const sessionId = await Promise.race([
+      sessionIdReady,
+      new Promise<string>((_, reject) => setTimeout(() => reject(new Error('Session init timed out')), timeoutMs)),
+    ])
+
+    return sessionId
   }
 
   private fetchAndBroadcastModels(sessionId: string, session: SDKSession, currentModel?: string): void {
@@ -528,6 +537,8 @@ export class SessionManager {
             if (prevStatus) this.sessionStatus.set(sessionId, prevStatus)
             const q = this.activeQueries.get(tempId)
             if (q) { this.activeQueries.delete(tempId); this.activeQueries.set(sessionId, q) }
+            // Resolve the sessionId promise before cleaning up the remap entry
+            if (remap.resolve) remap.resolve(sessionId)
             this.pendingRemaps.delete(tempId)
             // Update our tracking variable
             currentSessionId = sessionId