hammoc 1.7.0 → 1.7.2

package/packages/server/dist/handlers/websocket.js

@@ -456,6 +456,38 @@ export function isSessionStreaming(sessionId) {
     const stream = activeStreams.get(sessionId);
     return !!stream && stream.status === 'running';
 }
+/** Check if a session has any pending AskUserQuestion interactions */
+export function sessionHasPendingQuestion(sessionId) {
+    const stream = activeStreams.get(sessionId);
+    if (!stream)
+        return false;
+    for (const p of stream.pendingPermissions.values()) {
+        if (p.interactionType === 'question')
+            return true;
+    }
+    return false;
+}
+/** Get pending AskUserQuestion counts grouped by project slug (in-memory, no I/O) */
+export function getPendingQuestionCountsByProject() {
+    const counts = new Map();
+    for (const [sessionId, stream] of activeStreams.entries()) {
+        if (stream.status !== 'running')
+            continue;
+        let hasQuestion = false;
+        for (const p of stream.pendingPermissions.values()) {
+            if (p.interactionType === 'question') {
+                hasQuestion = true;
+                break;
+            }
+        }
+        if (hasQuestion) {
+            const slug = sessionProjectMap.get(sessionId);
+            if (slug)
+                counts.set(slug, (counts.get(slug) ?? 0) + 1);
+        }
+    }
+    return counts;
+}
 /** Get session IDs that have active socket connections for a given project */
 export function getJoinedSessionIdsByProject(projectSlug) {
     const sessionIds = new Set();
@@ -566,6 +598,15 @@ function cleanupStream(streamKey, expectedStream) {
     // Only delete from activeStreams and clean up socket mappings if the stream
     // hasn't been replaced. When replaced, the new stream owns those resources.
     if (!replaced) {
+        // Clear pending question state before removing the stream
+        if (current) {
+            for (const p of current.pendingPermissions.values()) {
+                if (p.interactionType === 'question') {
+                    emitQuestionChange(streamKey, false);
+                    break;
+                }
+            }
+        }
         activeStreams.delete(streamKey);
         for (const [sockId, sessId] of socketToSession.entries()) {
             if (sessId === streamKey)
@@ -719,6 +760,17 @@ function emitStreamChange(sessionId, active, projectSlug) {
         }
     }
 }
+/**
+ * Emit session:question-change when an AskUserQuestion becomes pending or is resolved.
+ * Scoped to the project room so only relevant session list viewers receive it.
+ */
+function emitQuestionChange(sessionId, hasPendingQuestion) {
+    const projectSlug = sessionProjectMap.get(sessionId);
+    if (projectSlug) {
+        io.to(`project:${projectSlug}`).emit('session:question-change', { sessionId, hasPendingQuestion, projectSlug });
+        triggerDashboardStatusChange(projectSlug);
+    }
+}
 /**
  * Broadcast session:stream-change to project room (or all clients as fallback).
  * Used by queue service to signal stream start/end.
@@ -1032,9 +1084,15 @@ export async function initializeWebSocket(httpServer) {
             if (!sessionId)
                 return;
             const stream = activeStreams.get(sessionId);
-            if (stream?.pendingPermissions.has(data.requestId)) {
-                stream.pendingPermissions.get(data.requestId).resolve({ approved: data.approved, response: data.response });
+            if (!stream)
+                return;
+            const pending = stream.pendingPermissions.get(data.requestId);
+            if (pending) {
+                const wasQuestion = pending.interactionType === 'question';
+                pending.resolve({ approved: data.approved, response: data.response });
                 stream.pendingPermissions.delete(data.requestId);
+                if (wasQuestion)
+                    emitQuestionChange(sessionId, sessionHasPendingQuestion(sessionId));
                 // Broadcast the actual resolution to all OTHER viewers so their
                 // tool/interactive cards can show the correct approve/deny state.
                 // Also buffer via createStreamEmit so reconnecting clients see the
@@ -1281,7 +1339,7 @@ export async function initializeWebSocket(httpServer) {
                             socket.emit('stream:history', { sessionId, messages: buf.messages });
                         }
                         socket.emit('stream:status', { active: true, sessionId, permissionMode: freshMode });
-                        socket.emit('stream:buffer-replay', { sessionId, events: [...freshStream.buffer] });
+                        socket.emit('stream:buffer-replay', { sessionId, events: [...freshStream.buffer], engineMode: freshStream.engineMode });
                         freshStream.sockets.add(socket);
                         return;
                     }
@@ -1297,7 +1355,7 @@ export async function initializeWebSocket(httpServer) {
                             socket.emit('stream:history', { sessionId, messages: buf.messages });
                         }
                         socket.emit('stream:status', { active: true, sessionId, permissionMode });
-                        socket.emit('stream:buffer-replay', { sessionId, events: [...completedStream.buffer] });
+                        socket.emit('stream:buffer-replay', { sessionId, events: [...completedStream.buffer], engineMode: completedStream.engineMode });
                         completedStream.sockets.add(socket);
                         return;
                     }
@@ -1368,7 +1426,7 @@ export async function initializeWebSocket(httpServer) {
             }
             socket.emit('stream:status', { active: true, sessionId, permissionMode });
             // Replay raw event buffer so the client can build streaming segments
-            socket.emit('stream:buffer-replay', { sessionId, events: [...stream.buffer] });
+            socket.emit('stream:buffer-replay', { sessionId, events: [...stream.buffer], engineMode: stream.engineMode });
             // NOW add to broadcast set — live events flow from here
             stream.sockets.add(socket);
         });
@@ -2522,6 +2580,7 @@ async function handleChatSend(stream, data, abortController, lang) {
         const autoCompactEnabled = effectivePrefs.autoCompactEnabled ?? true;
         const chatService = createChatEngine(engineMode, { workingDirectory, permissionMode, cliBinaryPath: effectivePrefs.cliBinaryPath, cliShowThinkingSummaries: effectivePrefs.cliShowThinkingSummaries, cliResumeChoice: effectivePrefs.cliResumeChoice, autoCompactEnabled, planModeBypassBehavior: effectivePrefs.planModeBypassBehavior });
         stream.chatService = chatService;
+        stream.engineMode = engineMode;
         const effectiveEffort = clampEffortForModel(effort ?? effectivePrefs.defaultEffort, model);
         // Opus 4.7+ flipped `thinking.display` default to 'omitted' — ThinkingBlock UI stays blank
         // unless we explicitly opt in. For adaptive-thinking models, forward an explicit `thinking`
@@ -2546,6 +2605,7 @@ async function handleChatSend(stream, data, abortController, lang) {
                 : { images }),
             // Advanced settings from preferences
             customSystemPrompt: effectivePrefs.customSystemPrompt,
+            displayName: effectivePrefs.displayName,
             // maxThinkingTokens: legacy path; SDK docs say it takes precedence for backward-compat,
             // which conflicts with adaptive mode on Opus 4.7+ (rejects enabled+budget). Skip on
             // adaptive-capable models so the explicit `thinking` field governs.
@@ -2622,6 +2682,8 @@ async function handleChatSend(stream, data, abortController, lang) {
                         resolve,
                         interactionType: isAskUserQuestion ? 'question' : 'permission',
                     });
+                    if (isAskUserQuestion)
+                        emitQuestionChange(sessionIdRef.current || '', true);
                 });
                 if (isAskUserQuestion) {
                     const questions = input.questions;
@@ -2773,6 +2835,7 @@ async function handleChatSend(stream, data, abortController, lang) {
             // slug resolution cannot disrupt the stream.
             mcpRecorder: createMcpCallRecorder(() => projectService.findProjectByPath(workingDirectory).then((p) => p?.projectSlug)),
             backgroundTracker,
+            engineMode,
         }, {
             onCallbackActivity: (source) => resetTimeout(source),
             onSessionIdResolved: (sid) => {