factory-factory 0.2.4 → 0.2.6

package/dist/src/backend/services/chat-message-handlers/handlers/queue-message.handler.js

@@ -1,8 +1,8 @@
-import { messageQueueService } from '../../message-queue.service.js';
-import { messageStateService } from '../../message-state.service.js';
+import { MessageState, resolveSelectedModel } from '../../../../shared/claude/index.js';
+import { sessionStoreService } from '../../session-store.service.js';
 import { resolveAttachmentContentType } from '../attachment-utils.js';
 import { tryHandleAsInteractiveResponse } from '../interactive-response.js';
-import { buildQueuedMessage, notifyMessageAccepted } from '../utils.js';
+import { buildQueuedMessage } from '../utils.js';
 function extractTextFromAttachments(attachments) {
     if (!attachments || attachments.length === 0) {
         return undefined;
@@ -17,29 +17,47 @@ function extractTextFromAttachments(attachments) {
 }
 export function createQueueMessageHandler(deps) {
     return async ({ ws, sessionId, message }) => {
-        const typedMessage = message;
-        const text = typedMessage.text?.trim();
-        const hasContent = text || (typedMessage.attachments && typedMessage.attachments.length > 0);
+        const text = message.text?.trim();
+        const hasContent = text || (message.attachments && message.attachments.length > 0);
         if (!hasContent) {
             ws.send(JSON.stringify({ type: 'error', message: 'Empty message' }));
             return;
         }
-        if (!typedMessage.id) {
+        if (!message.id) {
             ws.send(JSON.stringify({ type: 'error', message: 'Missing message id' }));
             return;
         }
-        const messageId = typedMessage.id;
-        const responseText = text || extractTextFromAttachments(typedMessage.attachments);
-        if (responseText && tryHandleAsInteractiveResponse(ws, sessionId, messageId, responseText)) {
+        const messageId = message.id;
+        const responseText = text || extractTextFromAttachments(message.attachments);
+        if (responseText && tryHandleAsInteractiveResponse(sessionId, messageId, responseText)) {
             return;
         }
-        const queuedMsg = buildQueuedMessage(messageId, typedMessage, text ?? '');
-        const result = messageQueueService.enqueue(sessionId, queuedMsg);
+        const queuedMsg = buildQueuedMessage(messageId, message, text ?? '');
+        const result = sessionStoreService.enqueue(sessionId, queuedMsg);
         if ('error' in result) {
-            messageStateService.createRejectedMessage(sessionId, messageId, result.error, text);
+            sessionStoreService.emitDelta(sessionId, {
+                type: 'message_state_changed',
+                id: messageId,
+                newState: MessageState.REJECTED,
+                errorMessage: result.error,
+            });
             return;
         }
-        notifyMessageAccepted(sessionId, queuedMsg);
+        sessionStoreService.emitDelta(sessionId, {
+            type: 'message_state_changed',
+            id: messageId,
+            newState: MessageState.ACCEPTED,
+            queuePosition: result.position,
+            userMessage: {
+                text: queuedMsg.text,
+                timestamp: queuedMsg.timestamp,
+                attachments: queuedMsg.attachments,
+                settings: {
+                    ...queuedMsg.settings,
+                    selectedModel: resolveSelectedModel(queuedMsg.settings.selectedModel),
+                },
+            },
+        });
         await deps.tryDispatchNextMessage(sessionId);
     };
 }

package/dist/src/backend/services/chat-message-handlers/handlers/queue-message.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue-message.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/queue-message.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOrE,SAAS,0BAA0B,CACjC,WAA6C;IAE7C,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,OAAO,SAAS,CAAC;IACnB,CAAC;IAGD,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,4BAA4B,CAAC,UAAU,CAAC,KAAK,MAAM,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YAC3E,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAGD,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,IAAiC;IACzE,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,OAA4B,CAAC;QAClD,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,IAAI,YAAY,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE7F,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;YACrB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC;YAC1E,OAAO;QACT,CAAC;QAKD,MAAM,SAAS,GAAG,YAAY,CAAC,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,IAAI,IAAI,0BAA0B,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAClF,IAAI,YAAY,IAAI,8BAA8B,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,EAAE,CAAC;YAC3F,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAEjE,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;YAEtB,mBAAmB,CAAC,qBAAqB,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QAED,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"queue-message.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/queue-message.handler.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.d.ts

@@ -1,3 +1,4 @@
+import type { RemoveQueuedMessageInput } from '../../../../shared/websocket/index.js';
 import type { ChatMessageHandler } from '../types.js';
-export declare function createRemoveQueuedMessageHandler(): ChatMessageHandler;
+export declare function createRemoveQueuedMessageHandler(): ChatMessageHandler<RemoveQueuedMessageInput>;
 //# sourceMappingURL=remove-queued-message.handler.d.ts.map

package/dist/src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-queued-message.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,gCAAgC,IAAI,kBAAkB,CAgBrE"}
+{"version":3,"file":"remove-queued-message.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAInE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,gCAAgC,IAAI,kBAAkB,CAAC,wBAAwB,CAAC,CAkB/F"}

package/dist/src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.js

@@ -1,16 +1,18 @@
 import { MessageState } from '../../../../shared/claude/index.js';
 import { createLogger } from '../../logger.service.js';
-import { messageQueueService } from '../../message-queue.service.js';
-import { messageStateService } from '../../message-state.service.js';
+import { sessionStoreService } from '../../session-store.service.js';
 import { DEBUG_CHAT_WS } from '../constants.js';
 const logger = createLogger('chat-message-handlers');
 export function createRemoveQueuedMessageHandler() {
     return ({ ws, sessionId, message }) => {
-        const typedMessage = message;
-        const { messageId } = typedMessage;
-        const removed = messageQueueService.remove(sessionId, messageId);
+        const { messageId } = message;
+        const removed = sessionStoreService.removeQueuedMessage(sessionId, messageId);
         if (removed) {
-            messageStateService.updateState(sessionId, messageId, MessageState.CANCELLED);
+            sessionStoreService.emitDelta(sessionId, {
+                type: 'message_state_changed',
+                id: messageId,
+                newState: MessageState.CANCELLED,
+            });
             if (DEBUG_CHAT_WS) {
                 logger.info('[Chat WS] Queued message cancelled', { sessionId, messageId });
             }

package/dist/src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-queued-message.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,gCAAgC;IAC9C,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,OAAmC,CAAC;QACzD,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC;QACnC,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAEjE,IAAI,OAAO,EAAE,CAAC;YAEZ,mBAAmB,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;YAC9E,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"remove-queued-message.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/remove-queued-message.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,gCAAgC;IAC9C,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAC9B,MAAM,OAAO,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE9E,IAAI,OAAO,EAAE,CAAC;YACZ,mBAAmB,CAAC,SAAS,CAAC,SAAS,EAAE;gBACvC,IAAI,EAAE,uBAAuB;gBAC7B,EAAE,EAAE,SAAS;gBACb,QAAQ,EAAE,YAAY,CAAC,SAAS;aACjC,CAAC,CAAC;YACH,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC,CAAC;QACpF,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/services/chat-message-handlers/handlers/rewind-files.handler.d.ts

@@ -1,3 +1,4 @@
+import type { RewindFilesMessage } from '../../../../shared/websocket/index.js';
 import type { ChatMessageHandler } from '../types.js';
-export declare function createRewindFilesHandler(): ChatMessageHandler;
+export declare function createRewindFilesHandler(): ChatMessageHandler<RewindFilesMessage>;
 //# sourceMappingURL=rewind-files.handler.d.ts.map

package/dist/src/backend/services/chat-message-handlers/handlers/rewind-files.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rewind-files.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/rewind-files.handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,wBAAwB,IAAI,kBAAkB,CAkD7D"}
+{"version":3,"file":"rewind-files.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/rewind-files.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAI7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,wBAAwB,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,CAiDjF"}

package/dist/src/backend/services/chat-message-handlers/handlers/rewind-files.handler.js

@@ -4,30 +4,29 @@ import { DEBUG_CHAT_WS } from '../constants.js';
 const logger = createLogger('chat-message-handlers');
 export function createRewindFilesHandler() {
     return async ({ ws, sessionId, message }) => {
-        const typedMessage = message;
         const client = sessionService.getClient(sessionId);
         if (!client) {
             ws.send(JSON.stringify({
                 type: 'rewind_files_error',
-                userMessageId: typedMessage.userMessageId,
+                userMessageId: message.userMessageId,
                 rewindError: 'No active client for session',
             }));
             return;
         }
         try {
-            const response = await client.rewindFiles(typedMessage.userMessageId, typedMessage.dryRun);
+            const response = await client.rewindFiles(message.userMessageId, message.dryRun);
             if (DEBUG_CHAT_WS) {
                 logger.info('[Chat WS] Rewind files request completed', {
                     sessionId,
-                    userMessageId: typedMessage.userMessageId,
-                    dryRun: typedMessage.dryRun,
+                    userMessageId: message.userMessageId,
+                    dryRun: message.dryRun,
                     affectedFiles: response.affected_files?.length ?? 0,
                 });
             }
             ws.send(JSON.stringify({
                 type: 'rewind_files_preview',
-                userMessageId: typedMessage.userMessageId,
-                dryRun: typedMessage.dryRun ?? false,
+                userMessageId: message.userMessageId,
+                dryRun: message.dryRun ?? false,
                 affectedFiles: response.affected_files ?? [],
             }));
         }
@@ -35,12 +34,12 @@ export function createRewindFilesHandler() {
             const errorMessage = error instanceof Error ? error.message : String(error);
             logger.error('[Chat WS] Failed to rewind files', {
                 sessionId,
-                userMessageId: typedMessage.userMessageId,
+                userMessageId: message.userMessageId,
                 error: errorMessage,
             });
             ws.send(JSON.stringify({
                 type: 'rewind_files_error',
-                userMessageId: typedMessage.userMessageId,
+                userMessageId: message.userMessageId,
                 rewindError: `Failed to rewind files: ${errorMessage}`,
             }));
         }

package/dist/src/backend/services/chat-message-handlers/handlers/rewind-files.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"rewind-files.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/rewind-files.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,wBAAwB;IACtC,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,OAA6B,CAAC;QACnD,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,oBAAoB;gBAC1B,aAAa,EAAE,YAAY,CAAC,aAAa;gBACzC,WAAW,EAAE,8BAA8B;aAC5C,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;YAC3F,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE;oBACtD,SAAS;oBACT,aAAa,EAAE,YAAY,CAAC,aAAa;oBACzC,MAAM,EAAE,YAAY,CAAC,MAAM;oBAC3B,aAAa,EAAE,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;iBACpD,CAAC,CAAC;YACL,CAAC;YAED,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,sBAAsB;gBAC5B,aAAa,EAAE,YAAY,CAAC,aAAa;gBACzC,MAAM,EAAE,YAAY,CAAC,MAAM,IAAI,KAAK;gBACpC,aAAa,EAAE,QAAQ,CAAC,cAAc,IAAI,EAAE;aAC7C,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;gBAC/C,SAAS;gBACT,aAAa,EAAE,YAAY,CAAC,aAAa;gBACzC,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;YACH,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,oBAAoB;gBAC1B,aAAa,EAAE,YAAY,CAAC,aAAa;gBACzC,WAAW,EAAE,2BAA2B,YAAY,EAAE;aACvD,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"rewind-files.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/rewind-files.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,wBAAwB;IACtC,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,oBAAoB;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,WAAW,EAAE,8BAA8B;aAC5C,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACjF,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE;oBACtD,SAAS;oBACT,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,aAAa,EAAE,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;iBACpD,CAAC,CAAC;YACL,CAAC;YAED,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,sBAAsB;gBAC5B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;gBAC/B,aAAa,EAAE,QAAQ,CAAC,cAAc,IAAI,EAAE;aAC7C,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;gBAC/C,SAAS;gBACT,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;YACH,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,oBAAoB;gBAC1B,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,WAAW,EAAE,2BAA2B,YAAY,EAAE;aACvD,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/services/chat-message-handlers/handlers/set-model.handler.d.ts

@@ -1,3 +1,4 @@
+import type { SetModelMessage } from '../../../../shared/websocket/index.js';
 import type { ChatMessageHandler } from '../types.js';
-export declare function createSetModelHandler(): ChatMessageHandler;
+export declare function createSetModelHandler(): ChatMessageHandler<SetModelMessage>;
 //# sourceMappingURL=set-model.handler.d.ts.map

package/dist/src/backend/services/chat-message-handlers/handlers/set-model.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-model.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-model.handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,qBAAqB,IAAI,kBAAkB,CAyB1D"}
+{"version":3,"file":"set-model.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-model.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAI1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,qBAAqB,IAAI,kBAAkB,CAAC,eAAe,CAAC,CAuB3E"}

package/dist/src/backend/services/chat-message-handlers/handlers/set-model.handler.js

@@ -4,24 +4,22 @@ import { DEBUG_CHAT_WS } from '../constants.js';
 const logger = createLogger('chat-message-handlers');
 export function createSetModelHandler() {
     return async ({ ws, sessionId, message }) => {
-        const typedMessage = message;
         const client = sessionService.getClient(sessionId);
         if (!client) {
             ws.send(JSON.stringify({ type: 'error', message: 'No active client for session' }));
             return;
         }
         try {
-            await client.setModel(typedMessage.model);
+            await client.setModel(message.model);
             if (DEBUG_CHAT_WS) {
-                logger.info('[Chat WS] Set model', { sessionId, model: typedMessage.model });
+                logger.info('[Chat WS] Set model', { sessionId, model: message.model });
             }
-            ws.send(JSON.stringify({ type: 'model_set', model: typedMessage.model }));
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             logger.error('[Chat WS] Failed to set model', {
                 sessionId,
-                model: typedMessage.model,
+                model: message.model,
                 error: errorMessage,
             });
             ws.send(JSON.stringify({ type: 'error', message: `Failed to set model: ${errorMessage}` }));

package/dist/src/backend/services/chat-message-handlers/handlers/set-model.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-model.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-model.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,qBAAqB;IACnC,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,OAA0B,CAAC;QAChD,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;YAC/E,CAAC;YACD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE;gBAC5C,SAAS;gBACT,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;YACH,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,wBAAwB,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"set-model.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-model.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,qBAAqB;IACnC,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE;gBAC5C,SAAS;gBACT,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;YACH,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,wBAAwB,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.d.ts

@@ -1,3 +1,4 @@
+import type { SetThinkingBudgetMessage } from '../../../../shared/websocket/index.js';
 import type { ChatMessageHandler } from '../types.js';
-export declare function createSetThinkingBudgetHandler(): ChatMessageHandler;
+export declare function createSetThinkingBudgetHandler(): ChatMessageHandler<SetThinkingBudgetMessage>;
 //# sourceMappingURL=set-thinking-budget.handler.d.ts.map

package/dist/src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-thinking-budget.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,8BAA8B,IAAI,kBAAkB,CA8BnE"}
+{"version":3,"file":"set-thinking-budget.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAInE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,8BAA8B,IAAI,kBAAkB,CAAC,wBAAwB,CAAC,CA4B7F"}

package/dist/src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.js

@@ -4,27 +4,25 @@ import { DEBUG_CHAT_WS } from '../constants.js';
 const logger = createLogger('chat-message-handlers');
 export function createSetThinkingBudgetHandler() {
     return async ({ ws, sessionId, message }) => {
-        const typedMessage = message;
         const client = sessionService.getClient(sessionId);
         if (!client) {
             ws.send(JSON.stringify({ type: 'error', message: 'No active client for session' }));
             return;
         }
         try {
-            await client.setMaxThinkingTokens(typedMessage.max_tokens);
+            await client.setMaxThinkingTokens(message.max_tokens);
             if (DEBUG_CHAT_WS) {
                 logger.info('[Chat WS] Set thinking budget', {
                     sessionId,
-                    maxTokens: typedMessage.max_tokens,
+                    maxTokens: message.max_tokens,
                 });
             }
-            ws.send(JSON.stringify({ type: 'thinking_budget_set', max_tokens: typedMessage.max_tokens }));
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
             logger.error('[Chat WS] Failed to set thinking budget', {
                 sessionId,
-                maxTokens: typedMessage.max_tokens,
+                maxTokens: message.max_tokens,
                 error: errorMessage,
             });
             ws.send(JSON.stringify({ type: 'error', message: `Failed to set thinking budget: ${errorMessage}` }));

package/dist/src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-thinking-budget.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,8BAA8B;IAC5C,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,YAAY,GAAG,OAAmC,CAAC;QACzD,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,oBAAoB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE;oBAC3C,SAAS;oBACT,SAAS,EAAE,YAAY,CAAC,UAAU;iBACnC,CAAC,CAAC;YACL,CAAC;YACD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAChG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE;gBACtD,SAAS;gBACT,SAAS,EAAE,YAAY,CAAC,UAAU;gBAClC,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;YACH,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,kCAAkC,YAAY,EAAE,EAAE,CAAC,CAC7F,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"set-thinking-budget.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/set-thinking-budget.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,8BAA8B;IAC5C,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACtD,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE;oBAC3C,SAAS;oBACT,SAAS,EAAE,OAAO,CAAC,UAAU;iBAC9B,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE;gBACtD,SAAS;gBACT,SAAS,EAAE,OAAO,CAAC,UAAU;gBAC7B,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;YACH,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,kCAAkC,YAAY,EAAE,EAAE,CAAC,CAC7F,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/services/chat-message-handlers/handlers/start.handler.d.ts

@@ -1,3 +1,4 @@
+import type { StartMessageInput } from '../../../../shared/websocket/index.js';
 import type { ChatMessageHandler, HandlerRegistryDependencies } from '../types.js';
-export declare function createStartHandler(deps: HandlerRegistryDependencies): ChatMessageHandler;
+export declare function createStartHandler(deps: HandlerRegistryDependencies): ChatMessageHandler<StartMessageInput>;
 //# sourceMappingURL=start.handler.d.ts.map

package/dist/src/backend/services/chat-message-handlers/handlers/start.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/start.handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAKhF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,2BAA2B,GAAG,kBAAkB,CAwBxF"}
+{"version":3,"file":"start.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/start.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAI5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAKhF,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,2BAA2B,GAChC,kBAAkB,CAAC,iBAAiB,CAAC,CAwBvC"}

package/dist/src/backend/services/chat-message-handlers/handlers/start.handler.js

@@ -1,5 +1,6 @@
 import { createLogger } from '../../logger.service.js';
 import { sessionService } from '../../session.service.js';
+import { sessionStoreService } from '../../session-store.service.js';
 import { getValidModel } from '../utils.js';
 const logger = createLogger('chat-message-handlers');
 export function createStartHandler(deps) {
@@ -9,10 +10,11 @@ export function createStartHandler(deps) {
             ws.send(JSON.stringify({ type: 'error', message: 'Client creator not configured' }));
             return;
         }
-        ws.send(JSON.stringify({ type: 'starting', dbSessionId: sessionId }));
+        sessionStoreService.markStarting(sessionId);
         const sessionOpts = await sessionService.getSessionOptions(sessionId);
         if (!sessionOpts) {
             logger.error('[Chat WS] Failed to get session options', { sessionId });
+            sessionStoreService.markError(sessionId);
             ws.send(JSON.stringify({ type: 'error', message: 'Session not found' }));
             return;
         }
@@ -21,7 +23,7 @@ export function createStartHandler(deps) {
             planModeEnabled: message.planModeEnabled,
             model: getValidModel(message),
         });
-        ws.send(JSON.stringify({ type: 'started', dbSessionId: sessionId }));
+        sessionStoreService.markIdle(sessionId, 'alive');
     };
 }
 //# sourceMappingURL=start.handler.js.map

package/dist/src/backend/services/chat-message-handlers/handlers/start.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/start.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,kBAAkB,CAAC,IAAiC;IAClE,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC,CAAC,CAAC;YACrF,OAAO;QACT,CAAC;QAED,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QAEtE,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;YACvE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO;QACT,CAAC;QAED,MAAM,aAAa,CAAC,WAAW,CAAC,SAAS,EAAE;YACzC,eAAe,EAAG,OAA6B,CAAC,eAAe;YAC/D,eAAe,EAAG,OAA6B,CAAC,eAAe;YAC/D,KAAK,EAAE,aAAa,CAAC,OAA4B,CAAC;SACnD,CAAC,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"start.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/start.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,kBAAkB,CAChC,IAAiC;IAEjC,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,CAAC,CAAC,CAAC;YACrF,OAAO;QACT,CAAC;QACD,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;YACvE,mBAAmB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACzC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO;QACT,CAAC;QAED,MAAM,aAAa,CAAC,WAAW,CAAC,SAAS,EAAE;YACzC,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;SAC9B,CAAC,CAAC;QACH,mBAAmB,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/services/chat-message-handlers/handlers/stop.handler.d.ts

@@ -1,3 +1,4 @@
+import type { StopMessage } from '../../../../shared/websocket/index.js';
 import type { ChatMessageHandler } from '../types.js';
-export declare function createStopHandler(): ChatMessageHandler;
+export declare function createStopHandler(): ChatMessageHandler<StopMessage>;
 //# sourceMappingURL=stop.handler.d.ts.map

package/dist/src/backend/services/chat-message-handlers/handlers/stop.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stop.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/stop.handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD,wBAAgB,iBAAiB,IAAI,kBAAkB,CAQtD"}
+{"version":3,"file":"stop.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/stop.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAItD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAEnD,wBAAgB,iBAAiB,IAAI,kBAAkB,CAAC,WAAW,CAAC,CAYnE"}

package/dist/src/backend/services/chat-message-handlers/handlers/stop.handler.js

@@ -1,10 +1,15 @@
 import { chatEventForwarderService } from '../../chat-event-forwarder.service.js';
 import { sessionService } from '../../session.service.js';
+import { sessionStoreService } from '../../session-store.service.js';
 export function createStopHandler() {
-    return async ({ ws, sessionId }) => {
+    return async ({ sessionId }) => {
+        const existingClient = sessionService.getClient(sessionId);
+        sessionStoreService.markStopping(sessionId);
         await sessionService.stopClaudeSession(sessionId);
         chatEventForwarderService.clearPendingRequest(sessionId);
-        ws.send(JSON.stringify({ type: 'stopped', dbSessionId: sessionId }));
+        if (!existingClient) {
+            sessionStoreService.markIdle(sessionId, 'stopped');
+        }
     };
 }
 //# sourceMappingURL=stop.handler.js.map

package/dist/src/backend/services/chat-message-handlers/handlers/stop.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"stop.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/stop.handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,MAAM,UAAU,iBAAiB;IAC/B,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QACjC,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAGlD,yBAAyB,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACzD,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"stop.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/stop.handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGlE,MAAM,UAAU,iBAAiB;IAC/B,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE;QAC7B,MAAM,cAAc,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC3D,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,cAAc,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAGlD,yBAAyB,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,mBAAmB,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/services/chat-message-handlers/handlers/user-input.handler.d.ts

@@ -1,3 +1,4 @@
+import type { UserInputMessage } from '../../../../shared/websocket/index.js';
 import type { ChatMessageHandler } from '../types.js';
-export declare function createUserInputHandler(): ChatMessageHandler;
+export declare function createUserInputHandler(): ChatMessageHandler<UserInputMessage>;
 //# sourceMappingURL=user-input.handler.d.ts.map

package/dist/src/backend/services/chat-message-handlers/handlers/user-input.handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-input.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/user-input.handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,sBAAsB,IAAI,kBAAkB,CA+B3D"}
+{"version":3,"file":"user-input.handler.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/user-input.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAInD,wBAAgB,sBAAsB,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,CA8B7E"}

package/dist/src/backend/services/chat-message-handlers/handlers/user-input.handler.js

@@ -3,8 +3,7 @@ import { sessionService } from '../../session.service.js';
 const logger = createLogger('chat-message-handlers');
 export function createUserInputHandler() {
     return ({ ws, sessionId, message }) => {
-        const typedMessage = message;
-        const rawContent = typedMessage.content || typedMessage.text;
+        const rawContent = message.content || message.text;
         if (!rawContent) {
             return;
         }

package/dist/src/backend/services/chat-message-handlers/handlers/user-input.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-input.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/user-input.handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,sBAAsB;IACpC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,OAA2B,CAAC;QACjD,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC;QAC7D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YACzD,OAAO;QACT,CAAC;QAGD,MAAM,cAAc,GAClB,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAE,UAAkC,CAAC;QAEpF,MAAM,cAAc,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,cAAc,EAAE,SAAS,EAAE,EAAE,CAAC;YAChC,cAAc,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACzD,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YACzE,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,gEAAgE;SAC1E,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"user-input.handler.js","sourceRoot":"","sources":["../../../../../../src/backend/services/chat-message-handlers/handlers/user-input.handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,UAAU,sBAAsB;IACpC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;QACnD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC;YACzD,OAAO;QACT,CAAC;QAGD,MAAM,cAAc,GAClB,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAE,UAAkC,CAAC;QAEpF,MAAM,cAAc,GAAG,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,cAAc,EAAE,SAAS,EAAE,EAAE,CAAC;YAChC,cAAc,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACzD,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YACzE,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,gEAAgE;SAC1E,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/services/chat-message-handlers/interactive-response.d.ts

@@ -1,3 +1,2 @@
-import type { WebSocket } from 'ws';
-export declare function tryHandleAsInteractiveResponse(ws: WebSocket, sessionId: string, messageId: string, text: string): boolean;
+export declare function tryHandleAsInteractiveResponse(sessionId: string, messageId: string, text: string): boolean;
 //# sourceMappingURL=interactive-response.d.ts.map

package/dist/src/backend/services/chat-message-handlers/interactive-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactive-response.d.ts","sourceRoot":"","sources":["../../../../../src/backend/services/chat-message-handlers/interactive-response.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAYpC,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,SAAS,EACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAMT"}
+{"version":3,"file":"interactive-response.d.ts","sourceRoot":"","sources":["../../../../../src/backend/services/chat-message-handlers/interactive-response.ts"],"names":[],"mappings":"AASA,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAMT"}

package/dist/src/backend/services/chat-message-handlers/interactive-response.js

@@ -1,30 +1,25 @@
-import { INTERACTIVE_RESPONSE_TOOLS } from '../../../shared/pending-request-types.js';
+import { isInteractiveResponseTool } from '../../../shared/pending-request-types.js';
 import { AskUserQuestionInputSchema, safeParseToolInput } from '../../schemas/tool-inputs.schema.js';
-import { chatConnectionService } from '../chat-connection.service.js';
-import { chatEventForwarderService } from '../chat-event-forwarder.service.js';
 import { createLogger } from '../logger.service.js';
-import { messageStateService } from '../message-state.service.js';
 import { sessionService } from '../session.service.js';
+import { sessionStoreService } from '../session-store.service.js';
 import { DEBUG_CHAT_WS } from './constants.js';
 const logger = createLogger('chat-message-handlers');
-export function tryHandleAsInteractiveResponse(ws, sessionId, messageId, text) {
-    const pendingRequest = chatEventForwarderService.getPendingRequest(sessionId);
+export function tryHandleAsInteractiveResponse(sessionId, messageId, text) {
+    const pendingRequest = sessionStoreService.getPendingInteractiveRequest(sessionId);
     if (!pendingRequest) {
         return false;
     }
-    return handleMessageAsInteractiveResponse(ws, sessionId, messageId, text, pendingRequest);
+    return handleMessageAsInteractiveResponse(sessionId, messageId, text, pendingRequest);
 }
-function handleMessageAsInteractiveResponse(ws, sessionId, messageId, text, pendingRequest) {
+function handleMessageAsInteractiveResponse(sessionId, messageId, text, pendingRequest) {
     const client = sessionService.getClient(sessionId);
     if (!client) {
         return false;
     }
-    if (!INTERACTIVE_RESPONSE_TOOLS.includes(pendingRequest.toolName)) {
+    if (!isInteractiveResponseTool(pendingRequest.toolName)) {
         return false;
     }
-    chatEventForwarderService.clearPendingRequestIfMatches(sessionId, pendingRequest.requestId);
-    const order = messageStateService.allocateOrder(sessionId);
-    const responseEvent = { type: 'message_used_as_response', id: messageId, text, order };
     try {
         if (pendingRequest.toolName === 'AskUserQuestion') {
             handleAskUserQuestionResponse(client, sessionId, pendingRequest, text);
@@ -40,6 +35,26 @@ function handleMessageAsInteractiveResponse(ws, sessionId, messageId, text, pend
                 requestId: pendingRequest.requestId,
             });
         }
+        sessionStoreService.clearPendingInteractiveRequestIfMatches(sessionId, pendingRequest.requestId);
+        const order = sessionStoreService.allocateOrder(sessionId);
+        const timestamp = new Date().toISOString();
+        sessionStoreService.commitSentUserMessageAtOrder(sessionId, {
+            id: messageId,
+            text,
+            timestamp,
+            settings: {
+                selectedModel: null,
+                thinkingEnabled: false,
+                planModeEnabled: false,
+            },
+        }, order, { emitSnapshot: false });
+        sessionStoreService.emitDelta(sessionId, {
+            type: 'message_used_as_response',
+            id: messageId,
+            text,
+            order,
+        });
+        return true;
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -49,19 +64,12 @@ function handleMessageAsInteractiveResponse(ws, sessionId, messageId, text, pend
             toolName: pendingRequest.toolName,
             error: errorMessage,
         });
-    }
-    try {
-        ws.send(JSON.stringify(responseEvent));
-        chatConnectionService.forwardToSession(sessionId, responseEvent, ws);
-    }
-    catch (sendError) {
-        logger.warn('[Chat WS] Failed to send message_used_as_response event', {
-            sessionId,
-            messageId,
-            error: sendError instanceof Error ? sendError.message : String(sendError),
+        sessionStoreService.emitDelta(sessionId, {
+            type: 'error',
+            message: 'Failed to deliver interactive response. Please try again.',
         });
+        return true;
     }
-    return true;
 }
 function handleAskUserQuestionResponse(client, sessionId, pendingRequest, text) {
     const parsed = safeParseToolInput(AskUserQuestionInputSchema, pendingRequest.input, 'AskUserQuestion', logger);

package/dist/src/backend/services/chat-message-handlers/interactive-response.js.map

@@ -1 +1 @@
-{"version":3,"file":"interactive-response.js","sourceRoot":"","sources":["../../../../../src/backend/services/chat-message-handlers/interactive-response.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"interactive-response.js","sourceRoot":"","sources":["../../../../../src/backend/services/chat-message-handlers/interactive-response.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/chat-message-handlers/interactive-response.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=interactive-response.test.d.ts.map

package/dist/src/backend/services/chat-message-handlers/interactive-response.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interactive-response.test.d.ts","sourceRoot":"","sources":["../../../../../src/backend/services/chat-message-handlers/interactive-response.test.ts"],"names":[],"mappings":""}