@jacexh/claude-web-console 0.10.6 → 0.11.1

package/server/src/session-manager.ts

@@ -17,6 +17,8 @@ import { join } from 'node:path'
 import { homedir } from 'node:os'
 import type { FastifyBaseLogger } from 'fastify'
 import type { SessionInfo, EffortLevel } from './types.js'
+import { shouldBroadcastTurnStarted, type TurnState } from './turn-lifecycle.js'
+import { SessionStatusTracker } from './session-status.js'
 
 type PermissionResolver = {
   resolve: (approved: boolean, reason?: string, updatedPermissions?: import('@anthropic-ai/claude-agent-sdk').PermissionUpdate[]) => void
@@ -147,7 +149,11 @@ export class SessionManager {
   private sessions = new Map<string, SDKSession>()
   private pendingPermissions = new Map<string, PermissionResolver>()
   private pendingElicitations = new Map<string, { resolve: (result: ElicitationResult) => void; sessionId: string }>()
-  private runningSessionIds = new Set<string>()
+  private sessionStatus = new SessionStatusTracker((sessionId, status) => {
+    this.broadcast(sessionId, (l) => l.onMessage(sessionId, {
+      type: 'session_status', sessionId, status,
+    } as unknown as SDKMessage))
+  })
   private closedSessionIds = new Set<string>()
   private streamingSessionIds = new Set<string>()
   private sessionListeners = new Map<string, Set<SessionListener>>()
@@ -368,6 +374,7 @@ export class SessionManager {
     // Use a temporary ID, then remap when real sessionId arrives.
     const tempId = `pending-${Date.now()}`
     this.sessions.set(tempId, session)
+    this.sessionStatus.set(tempId, 'idle')
     this.sessionCwds.set(tempId, cwd)
     this.sessionCreationOptions.set(tempId, {
       model: options?.model,
@@ -425,6 +432,7 @@ export class SessionManager {
       while (true) {
         this.log.info({ sessionId: currentSessionId }, 'consumeStream: entering stream()')
         const query = session.stream()
+        const turnState: TurnState = { turnStarted: false }
         // Store query reference so control requests (setModel etc.) can use it
         try {
           const sid = session.sessionId
@@ -489,6 +497,7 @@ export class SessionManager {
             } else {
               this.log.info({ cost: (msgAny as Record<string, unknown>).total_cost_usd }, 'Turn complete')
             }
+            this.sessionStatus.set(currentSessionId, 'idle')
           }
 
           let sessionId: string
@@ -514,6 +523,9 @@ export class SessionManager {
             if (listeners) { this.sessionListeners.delete(tempId); this.sessionListeners.set(sessionId, listeners) }
             this.streamingSessionIds.delete(tempId)
             this.streamingSessionIds.add(sessionId)
+            const prevStatus = this.sessionStatus.get(tempId)
+            this.sessionStatus.delete(tempId)
+            if (prevStatus) this.sessionStatus.set(sessionId, prevStatus)
             const q = this.activeQueries.get(tempId)
             if (q) { this.activeQueries.delete(tempId); this.activeQueries.set(sessionId, q) }
             this.pendingRemaps.delete(tempId)
@@ -525,7 +537,10 @@ export class SessionManager {
             } as unknown as SDKMessage))
           }
 
-          this.runningSessionIds.add(sessionId)
+          // Set session status to running on first message of each turn
+          if (shouldBroadcastTurnStarted(turnState)) {
+            this.sessionStatus.set(sessionId, 'running')
+          }
           this.broadcast(sessionId, (l) => l.onMessage(sessionId, msg))
         }
         this.log.info({ sessionId: currentSessionId }, 'consumeStream: stream() ended (turn complete)')
@@ -533,6 +548,10 @@ export class SessionManager {
         let sessionId: string
         try { sessionId = session.sessionId } catch { break }
         if (this.closedSessionIds.has(sessionId)) break
+        // Reset to idle if stream ended without a result (e.g. init-only stream)
+        if (this.sessionStatus.get(sessionId) === 'running') {
+          this.sessionStatus.set(sessionId, 'idle')
+        }
         // Wait briefly before re-entering stream() for next turn
         await new Promise((r) => setTimeout(r, 50))
       }
@@ -544,12 +563,12 @@ export class SessionManager {
     } finally {
       try {
         const sessionId = session.sessionId
-        this.runningSessionIds.delete(sessionId)
+        this.sessionStatus.set(sessionId, 'stopped')
         this.streamingSessionIds.delete(sessionId)
         this.activeQueries.delete(sessionId)
         // Clean up stale session object if stream ended unexpectedly (not via explicit closeSession).
         // Without this, the session stays in this.sessions (appears "already running")
-        // while runningSessionIds shows it as idle — making resume impossible.
+        // while sessionStatus shows it as idle — making resume impossible.
         if (this.sessions.has(sessionId) && !this.closedSessionIds.has(sessionId)) {
           const s = this.sessions.get(sessionId)
           this.sessions.delete(sessionId)
@@ -558,7 +577,7 @@ export class SessionManager {
         this.broadcast(sessionId, (l) => l.onEnd(sessionId))
       } catch {
         // Session never initialized — try with our tracked id
-        this.runningSessionIds.delete(currentSessionId)
+        this.sessionStatus.set(currentSessionId, 'stopped')
         this.streamingSessionIds.delete(currentSessionId)
         this.activeQueries.delete(currentSessionId)
         if (this.sessions.has(currentSessionId) && !this.closedSessionIds.has(currentSessionId)) {
@@ -642,10 +661,11 @@ export class SessionManager {
     } as unknown as SDKMessage))
   }
 
-  getSessionState(sessionId: string): { model?: string; effortLevel?: EffortLevel } {
+  getSessionState(sessionId: string): { model?: string; effortLevel?: EffortLevel; status: 'idle' | 'running' | 'stopped' } {
     return {
       model: this.sessionModels.get(sessionId),
       effortLevel: this.sessionEffortLevels.get(sessionId),
+      status: this.sessionStatus.get(sessionId),
     }
   }
 
@@ -743,7 +763,7 @@ export class SessionManager {
         sessionId: s.sessionId,
         summary: s.summary || 'Untitled',
         lastModified: s.lastModified,
-        status: this.runningSessionIds.has(s.sessionId) ? 'running' as const : 'idle' as const,
+        status: this.sessionStatus.get(s.sessionId),
         cwd: (s as Record<string, unknown>).cwd as string | undefined,
       }))
   }
@@ -814,7 +834,7 @@ export class SessionManager {
     const session = unstable_v2_resumeSession(sessionId, sessionOptions)
     try { process.chdir(originalCwd) } catch { /* ignore */ }
     this.sessions.set(sessionId, session)
-    this.runningSessionIds.add(sessionId)
+    this.sessionStatus.set(sessionId, 'idle')
 
     // Broadcast session_resumed to all listeners so other connections update their UI
     this.broadcast(sessionId, (l) => l.onMessage(sessionId, {
@@ -832,7 +852,7 @@ export class SessionManager {
       this.closedSessionIds.add(sessionId)
       session.close()
       this.sessions.delete(sessionId)
-      this.runningSessionIds.delete(sessionId)
+      this.sessionStatus.set(sessionId, 'stopped')
       this.streamingSessionIds.delete(sessionId)
 
       // Clean up idle timer

package/server/src/session-status.ts

@@ -0,0 +1,30 @@
+export type SessionStatus = 'idle' | 'running' | 'stopped'
+
+export class SessionStatusTracker {
+  private map = new Map<string, SessionStatus>()
+  private onChange?: (sessionId: string, status: SessionStatus) => void
+
+  constructor(onChange?: (sessionId: string, status: SessionStatus) => void) {
+    this.onChange = onChange
+  }
+
+  get(sessionId: string): SessionStatus {
+    return this.map.get(sessionId) ?? 'stopped'
+  }
+
+  set(sessionId: string, status: SessionStatus): void {
+    const prev = this.map.get(sessionId)
+    this.map.set(sessionId, status)
+    if (prev !== status && this.onChange) {
+      this.onChange(sessionId, status)
+    }
+  }
+
+  delete(sessionId: string): void {
+    this.map.delete(sessionId)
+  }
+
+  getAll(): Map<string, SessionStatus> {
+    return new Map(this.map)
+  }
+}

package/server/src/types.ts

@@ -158,7 +158,7 @@ export interface SessionInfo {
   sessionId: string
   summary: string
   lastModified: number
-  status: 'idle' | 'running'
+  status: 'idle' | 'running' | 'stopped'
   cwd?: string
 }
 
@@ -277,6 +277,7 @@ export interface SessionStateMessage {
   sessionId: string
   model?: string
   effortLevel?: EffortLevel
+  status?: 'idle' | 'running' | 'stopped'
 }
 
 export interface SubagentMessagesMessage {
@@ -302,6 +303,12 @@ export interface SessionSettingsMessage {
   settings: Record<string, unknown>
 }
 
+export interface SessionStatusMessage {
+  type: 'session_status'
+  sessionId: string
+  status: string
+}
+
 export type ServerMessage =
   | SessionCreatedMessage
   | SessionListMessage
@@ -325,3 +332,4 @@ export type ServerMessage =
   | SubagentMessagesMessage
   | ElicitationRequestMessage
   | SessionSettingsMessage
+  | SessionStatusMessage

package/server/src/ws-handler.ts

@@ -135,6 +135,12 @@ export function createWsHandler(sessionManager: SessionManager, log: FastifyBase
             return // don't forward synthetic message
           }
 
+          // Forward session_status as top-level message (not wrapped in sdk_message)
+          if (msg.type === 'session_status') {
+            send({ type: 'session_status', sessionId: msg.sessionId as string, status: msg.status as string })
+            return
+          }
+
           send({ type: 'sdk_message', sessionId: sid, message })
         },
         onPermissionRequest(sid, toolUseId, toolName, input, meta) {

package/client/dist/assets/channel-C81EZqNp.js

@@ -1 +0,0 @@
-import{aq as o,ar as n}from"./mermaid.core-B3-wKFnz.js";const t=(r,a)=>o.lang.round(n.parse(r)[a]);export{t as c};

package/client/dist/assets/classDiagram-6PBFFD2Q-Bwl-Yyn3.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-4TB4RGXK-Cpwuap5g.js";import{_ as i}from"./mermaid.core-B3-wKFnz.js";import"./chunk-FMBD7UC4-aLTS4ppS.js";import"./chunk-YZCP3GAM-BCHcb4hM.js";import"./chunk-55IACEB6-MDkMv1Vj.js";import"./chunk-EDXVE4YY-fWFZkL3K.js";import"./index-BlOeGePC.js";var n={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{n as diagram};

package/client/dist/assets/classDiagram-v2-HSJHXN6E-Bwl-Yyn3.js

@@ -1 +0,0 @@
-import{s as a,c as s,a as e,C as t}from"./chunk-4TB4RGXK-Cpwuap5g.js";import{_ as i}from"./mermaid.core-B3-wKFnz.js";import"./chunk-FMBD7UC4-aLTS4ppS.js";import"./chunk-YZCP3GAM-BCHcb4hM.js";import"./chunk-55IACEB6-MDkMv1Vj.js";import"./chunk-EDXVE4YY-fWFZkL3K.js";import"./index-BlOeGePC.js";var n={parser:e,get db(){return new t},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{n as diagram};

package/client/dist/assets/clone-DwEzo7pK.js

@@ -1 +0,0 @@
-import{b as r}from"./graph-CwsRpftd.js";var e=4;function a(o){return r(o,e)}export{a as c};

package/client/dist/assets/stateDiagram-v2-QKLJ7IA2-BHkgOSON.js

@@ -1 +0,0 @@
-import{s as e,b as r,a,S as s}from"./chunk-OYMX7WX6-CdiOjMj9.js";import{_ as i}from"./mermaid.core-B3-wKFnz.js";import"./chunk-55IACEB6-MDkMv1Vj.js";import"./chunk-EDXVE4YY-fWFZkL3K.js";import"./index-BlOeGePC.js";var p={parser:a,get db(){return new s(2)},renderer:r,styles:e,init:i(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute},"init")};export{p as diagram};