factory-factory 0.1.4 → 0.1.6

package/dist/src/backend/services/message-state-machine.test.js

@@ -0,0 +1,67 @@
+import { describe, expect, it } from 'vitest';
+import { MessageState } from '../../shared/claude/index.js';
+import { isValidTransition, MessageStateMachine } from './message-state-machine.js';
+function createTestQueuedMessage(id, text = 'Test message') {
+    return {
+        id,
+        text,
+        settings: {
+            selectedModel: null,
+            thinkingEnabled: false,
+            planModeEnabled: false,
+        },
+        timestamp: new Date().toISOString(),
+    };
+}
+function createHistoryMessage(type, content) {
+    return {
+        type,
+        content,
+        timestamp: new Date().toISOString(),
+    };
+}
+describe('MessageStateMachine', () => {
+    it('validates user state transitions', () => {
+        expect(isValidTransition('user', MessageState.PENDING, MessageState.SENT)).toBe(true);
+        expect(isValidTransition('user', MessageState.SENT, MessageState.DISPATCHED)).toBe(false);
+        expect(isValidTransition('user', MessageState.ACCEPTED, MessageState.CANCELLED)).toBe(true);
+    });
+    it('rejects claude state transitions', () => {
+        expect(isValidTransition('claude', MessageState.COMPLETE, MessageState.COMPLETE)).toBe(false);
+    });
+    it('allocates order per session independently', () => {
+        const machine = new MessageStateMachine();
+        expect(machine.allocateOrder('session-1')).toBe(0);
+        expect(machine.allocateOrder('session-1')).toBe(1);
+        expect(machine.allocateOrder('session-2')).toBe(0);
+    });
+    it('assigns queue positions based on accepted messages', () => {
+        const machine = new MessageStateMachine();
+        machine.createUserMessage('session-1', createTestQueuedMessage('msg-1'));
+        machine.updateState('session-1', 'msg-1', MessageState.DISPATCHED);
+        const msg2 = machine.createUserMessage('session-1', createTestQueuedMessage('msg-2'));
+        expect(msg2.queuePosition).toBe(0);
+    });
+    it('updates state with metadata', () => {
+        const machine = new MessageStateMachine();
+        machine.createUserMessage('session-1', createTestQueuedMessage('msg-1'));
+        const result = machine.updateState('session-1', 'msg-1', MessageState.DISPATCHED, {
+            queuePosition: 2,
+            errorMessage: 'oops',
+        });
+        expect(result.ok).toBe(true);
+        if (result.ok) {
+            expect(result.message.state).toBe(MessageState.DISPATCHED);
+            expect(result.message.queuePosition).toBe(2);
+            expect(result.message.errorMessage).toBe('oops');
+        }
+    });
+    it('does not overwrite existing messages on history load', () => {
+        const machine = new MessageStateMachine();
+        machine.createUserMessage('session-1', createTestQueuedMessage('msg-1'));
+        const history = [createHistoryMessage('assistant', 'from history')];
+        machine.loadFromHistory('session-1', history);
+        expect(machine.getMessageCount('session-1')).toBe(1);
+    });
+});
+//# sourceMappingURL=message-state-machine.test.js.map

package/dist/src/backend/services/message-state-machine.test.js.map

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

package/dist/src/backend/services/message-state.service.d.ts

@@ -1,14 +1,44 @@
-import { type HistoryMessage, MessageState, type MessageWithState, type QueuedMessage, type SessionStatus, type UserMessageWithState } from '../../lib/claude-types.js';
+import { type ChatMessage, type HistoryMessage, MessageState, type MessageWithState, type QueuedMessage, type SessionStatus, type UserMessageWithState } from '../../shared/claude/index.js';
+export type MessageStateEvent = {
+    type: 'message_state_changed';
+    sessionId: string;
+    data: {
+        id: string;
+        newState: MessageState;
+        queuePosition?: number;
+        errorMessage?: string;
+        userMessage?: {
+            text: string;
+            timestamp: string;
+            attachments?: UserMessageWithState['attachments'];
+            settings: UserMessageWithState['settings'];
+            order: number;
+        };
+    };
+} | {
+    type: 'messages_snapshot';
+    sessionId: string;
+    data: {
+        messages: ChatMessage[];
+        sessionStatus: SessionStatus;
+        pendingInteractiveRequest?: {
+            requestId: string;
+            toolName: string;
+            input: Record<string, unknown>;
+            planContent?: string | null;
+            timestamp: string;
+        } | null;
+    };
+};
 declare class MessageStateService {
-    private sessionMessages;
-    private sessionEvents;
-    private sessionOrderCounters;
-    private getOrCreateSessionMap;
-    private getNextOrder;
+    private stateMachine;
+    private eventStore;
+    private emitter;
+    onEvent(listener: (event: MessageStateEvent) => void): () => void;
+    hasEventListener(listener: (event: MessageStateEvent) => void): boolean;
     allocateOrder(sessionId: string): number;
     createUserMessage(sessionId: string, msg: QueuedMessage): UserMessageWithState;
     createRejectedMessage(sessionId: string, messageId: string, errorMessage: string, text?: string): UserMessageWithState;
-    private getQueuedMessageCount;
     updateState(sessionId: string, messageId: string, newState: MessageState, metadata?: {
         queuePosition?: number;
         errorMessage?: string;
@@ -28,7 +58,7 @@ declare class MessageStateService {
     clearStoredEvents(sessionId: string): void;
     clearAllSessions(): void;
     loadFromHistory(sessionId: string, history: HistoryMessage[]): void;
-    private historyToClaudeMessage;
+    ensureHistoryLoaded(sessionId: string, history: HistoryMessage[]): boolean;
     hasMessage(sessionId: string, messageId: string): boolean;
     getMessageCount(sessionId: string): number;
     sendSnapshot(sessionId: string, sessionStatus: SessionStatus, pendingInteractiveRequest?: {

package/dist/src/backend/services/message-state.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-state.service.d.ts","sourceRoot":"","sources":["../../../../src/backend/services/message-state.service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAIL,KAAK,cAAc,EAEnB,YAAY,EACZ,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,aAAa,EAElB,KAAK,oBAAoB,EAC1B,MAAM,oBAAoB,CAAC;AAgE5B,cAAM,mBAAmB;IAKvB,OAAO,CAAC,eAAe,CAAoD;IAO3E,OAAO,CAAC,aAAa,CAA8D;IAMnF,OAAO,CAAC,oBAAoB,CAA6B;IAKzD,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,YAAY;IAWpB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAQxC,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,oBAAoB;IAwC9E,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,MAAM,GACZ,oBAAoB;IA+BvB,OAAO,CAAC,qBAAqB;IAmB7B,WAAW,CACT,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,YAAY,EACtB,QAAQ,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3D,OAAO;IA0DV,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAS9E,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAkBrD,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAgB5D,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAqBrC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAY5E,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAO3E,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAO1C,gBAAgB,IAAI,IAAI;IA0BxB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAI;IAyEnE,OAAO,CAAC,sBAAsB;IAoE9B,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAOzD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAsB1C,YAAY,CACV,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,EAC5B,yBAAyB,CAAC,EAAE;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,IAAI,GACP,IAAI;IAsDP,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,aAAa;IAmBhF,OAAO,CAAC,eAAe;CA0BxB;AAGD,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
+{"version":3,"file":"message-state.service.d.ts","sourceRoot":"","sources":["../../../../src/backend/services/message-state.service.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/message-state.service.js

@@ -1,91 +1,39 @@
-import { isUserMessage, MessageState, } from '../../lib/claude-types.js';
-import { chatConnectionService } from './chat-connection.service.js';
+import { EventEmitter } from 'node:events';
+import { isUserMessage, MessageState, } from '../../shared/claude/index.js';
 import { createLogger } from './logger.service.js';
+import { MessageEventStore } from './message-event-store.js';
+import { isValidTransition, MessageStateMachine } from './message-state-machine.js';
 const logger = createLogger('message-state-service');
-const USER_STATE_TRANSITIONS = {
-    PENDING: ['SENT'],
-    SENT: ['ACCEPTED', 'REJECTED'],
-    ACCEPTED: ['DISPATCHED', 'CANCELLED'],
-    DISPATCHED: ['COMMITTED', 'FAILED'],
-    COMMITTED: [],
-    REJECTED: [],
-    FAILED: [],
-    CANCELLED: [],
-};
-const USER_STATES = new Set(Object.keys(USER_STATE_TRANSITIONS));
-function isValidUserTransition(from, to) {
-    return USER_STATE_TRANSITIONS[from]?.includes(to) ?? false;
-}
-function isValidTransition(messageType, from, to) {
-    if (messageType === 'claude') {
-        logger.error('Claude messages do not support state transitions', { from, to });
-        return false;
-    }
-    if (!(USER_STATES.has(from) && USER_STATES.has(to))) {
-        logger.error('Invalid user message state', { from, to });
-        return false;
-    }
-    return isValidUserTransition(from, to);
-}
 class MessageStateService {
-    sessionMessages = new Map();
-    sessionEvents = new Map();
-    sessionOrderCounters = new Map();
-    getOrCreateSessionMap(sessionId) {
-        let messages = this.sessionMessages.get(sessionId);
-        if (!messages) {
-            messages = new Map();
-            this.sessionMessages.set(sessionId, messages);
-        }
-        return messages;
+    stateMachine = new MessageStateMachine();
+    eventStore = new MessageEventStore();
+    emitter = new EventEmitter();
+    onEvent(listener) {
+        this.emitter.on('event', listener);
+        return () => {
+            this.emitter.off('event', listener);
+        };
     }
-    getNextOrder(sessionId) {
-        const current = this.sessionOrderCounters.get(sessionId) ?? 0;
-        this.sessionOrderCounters.set(sessionId, current + 1);
-        return current;
+    hasEventListener(listener) {
+        return this.emitter.listeners('event').includes(listener);
     }
     allocateOrder(sessionId) {
-        return this.getNextOrder(sessionId);
+        return this.stateMachine.allocateOrder(sessionId);
     }
     createUserMessage(sessionId, msg) {
-        const messages = this.getOrCreateSessionMap(sessionId);
-        const queuePosition = this.getQueuedMessageCount(sessionId);
-        const order = this.getNextOrder(sessionId);
-        const messageWithState = {
-            id: msg.id,
-            type: 'user',
-            state: MessageState.ACCEPTED,
-            timestamp: msg.timestamp,
-            text: msg.text,
-            attachments: msg.attachments,
-            queuePosition,
-            settings: msg.settings,
-            order,
-        };
-        messages.set(msg.id, messageWithState);
+        const messageWithState = this.stateMachine.createUserMessage(sessionId, msg);
         logger.info('User message created', {
             sessionId,
             messageId: msg.id,
             state: messageWithState.state,
-            queuePosition,
-            order,
+            queuePosition: messageWithState.queuePosition,
+            order: messageWithState.order,
         });
         this.emitStateChange(sessionId, messageWithState);
         return messageWithState;
     }
     createRejectedMessage(sessionId, messageId, errorMessage, text) {
-        const messages = this.getOrCreateSessionMap(sessionId);
-        const order = this.getNextOrder(sessionId);
-        const messageWithState = {
-            id: messageId,
-            type: 'user',
-            state: MessageState.REJECTED,
-            timestamp: new Date().toISOString(),
-            text: text ?? '',
-            errorMessage,
-            order,
-        };
-        messages.set(messageId, messageWithState);
+        const messageWithState = this.stateMachine.createRejectedMessage(sessionId, messageId, errorMessage, text);
         logger.info('User message rejected', {
             sessionId,
             messageId,
@@ -94,22 +42,8 @@ class MessageStateService {
         this.emitStateChange(sessionId, messageWithState);
         return messageWithState;
     }
-    getQueuedMessageCount(sessionId) {
-        const messages = this.sessionMessages.get(sessionId);
-        if (!messages) {
-            return 0;
-        }
-        let count = 0;
-        for (const msg of messages.values()) {
-            if (msg.type === 'user' && msg.state === MessageState.ACCEPTED) {
-                count++;
-            }
-        }
-        return count;
-    }
     updateState(sessionId, messageId, newState, metadata) {
-        const messages = this.sessionMessages.get(sessionId);
-        const message = messages?.get(messageId);
+        const message = this.stateMachine.getMessage(sessionId, messageId);
         if (!message) {
             logger.warn('Message not found for state update', { sessionId, messageId, newState });
             return false;
@@ -124,211 +58,130 @@ class MessageStateService {
             });
             return false;
         }
-        const oldState = message.state;
-        if (!isUserMessage(message)) {
-            logger.error('Unexpected state update for non-user message', {
-                sessionId,
-                messageId,
-                messageType: message.type,
-            });
+        const updateResult = this.stateMachine.updateState(sessionId, messageId, newState, metadata);
+        if (!updateResult.ok) {
+            if (updateResult.reason === 'non_user') {
+                logger.error('Unexpected state update for non-user message', {
+                    sessionId,
+                    messageId,
+                    messageType: message.type,
+                });
+            }
             return false;
         }
-        message.state = newState;
-        if (metadata?.queuePosition !== undefined) {
-            message.queuePosition = metadata.queuePosition;
-        }
-        if (metadata?.errorMessage !== undefined) {
-            message.errorMessage = metadata.errorMessage;
-        }
         logger.info('Message state updated', {
             sessionId,
             messageId,
-            oldState,
+            oldState: updateResult.oldState,
             newState,
         });
-        this.emitStateChange(sessionId, message);
+        this.emitStateChange(sessionId, updateResult.message);
         return true;
     }
     getMessage(sessionId, messageId) {
-        return this.sessionMessages.get(sessionId)?.get(messageId);
+        return this.stateMachine.getMessage(sessionId, messageId);
     }
     getAllMessages(sessionId) {
-        const messages = this.sessionMessages.get(sessionId);
-        if (!messages) {
-            return [];
-        }
-        const terminalErrorStates = new Set(['REJECTED', 'FAILED', 'CANCELLED']);
-        return Array.from(messages.values())
-            .filter((msg) => !terminalErrorStates.has(msg.state))
-            .sort((a, b) => a.order - b.order);
+        return this.stateMachine.getAllMessages(sessionId);
     }
     removeMessage(sessionId, messageId) {
-        const messages = this.sessionMessages.get(sessionId);
-        if (!messages) {
-            return false;
-        }
-        const removed = messages.delete(messageId);
+        const removed = this.stateMachine.removeMessage(sessionId, messageId);
         if (removed) {
             logger.info('Message removed', { sessionId, messageId });
         }
         return removed;
     }
     clearSession(sessionId) {
-        const messages = this.sessionMessages.get(sessionId);
-        if (messages && messages.size > 0) {
+        const messageCount = this.stateMachine.getMessageCount(sessionId);
+        if (messageCount > 0) {
             logger.info('Session messages cleared', {
                 sessionId,
-                clearedCount: messages.size,
+                clearedCount: messageCount,
             });
         }
-        this.sessionMessages.delete(sessionId);
-        this.sessionEvents.delete(sessionId);
-        this.sessionOrderCounters.delete(sessionId);
+        this.stateMachine.clearSession(sessionId);
+        this.eventStore.clearSession(sessionId);
     }
     storeEvent(sessionId, event) {
-        let events = this.sessionEvents.get(sessionId);
-        if (!events) {
-            events = [];
-            this.sessionEvents.set(sessionId, events);
-        }
-        events.push(event);
+        this.eventStore.storeEvent(sessionId, event);
     }
     getStoredEvents(sessionId) {
-        return this.sessionEvents.get(sessionId) ?? [];
+        return this.eventStore.getStoredEvents(sessionId);
     }
     clearStoredEvents(sessionId) {
-        this.sessionEvents.delete(sessionId);
+        this.eventStore.clearSession(sessionId);
     }
     clearAllSessions() {
-        const sessionCount = this.sessionMessages.size;
-        this.sessionMessages.clear();
-        this.sessionEvents.clear();
-        this.sessionOrderCounters.clear();
-        if (sessionCount > 0) {
+        const sessionCount = this.stateMachine.getSessionCount();
+        this.stateMachine.clearAllSessions();
+        this.eventStore.clearAllSessions();
+        this.emitter.removeAllListeners('event');
+        if (sessionCount && sessionCount > 0) {
             logger.info('All sessions cleared', { clearedCount: sessionCount });
         }
     }
     loadFromHistory(sessionId, history) {
-        const existingMessages = this.sessionMessages.get(sessionId);
-        if (existingMessages && existingMessages.size > 0) {
+        const existingCount = this.stateMachine.getMessageCount(sessionId);
+        if (existingCount > 0) {
             logger.info('Skipping history load - session already has messages', {
                 sessionId,
-                existingCount: existingMessages.size,
+                existingCount,
             });
             return;
         }
-        this.sessionMessages.delete(sessionId);
-        this.sessionOrderCounters.delete(sessionId);
-        const messages = this.getOrCreateSessionMap(sessionId);
-        for (const historyMsg of history) {
-            const messageId = historyMsg.uuid ||
-                `history-${historyMsg.timestamp}-${Math.random().toString(36).slice(2, 9)}`;
-            const order = this.getNextOrder(sessionId);
-            if (historyMsg.type === 'user') {
-                const messageWithState = {
-                    id: messageId,
-                    type: 'user',
-                    state: MessageState.COMMITTED,
-                    timestamp: historyMsg.timestamp,
-                    text: historyMsg.content,
-                    order,
-                };
-                messages.set(messageId, messageWithState);
-            }
-            else if (historyMsg.type === 'assistant' ||
-                historyMsg.type === 'tool_use' ||
-                historyMsg.type === 'tool_result' ||
-                historyMsg.type === 'thinking') {
-                const claudeMessage = this.historyToClaudeMessage(historyMsg);
-                const messageWithState = {
-                    id: messageId,
-                    type: 'claude',
-                    state: MessageState.COMPLETE,
-                    timestamp: historyMsg.timestamp,
-                    chatMessages: [
-                        {
-                            id: `${messageId}-0`,
-                            source: 'claude',
-                            message: claudeMessage,
-                            timestamp: historyMsg.timestamp,
-                            order,
-                        },
-                    ],
-                    order,
-                };
-                messages.set(messageId, messageWithState);
-            }
-        }
+        this.stateMachine.loadFromHistory(sessionId, history);
         logger.info('Loaded messages from history', {
             sessionId,
-            messageCount: messages.size,
+            messageCount: this.stateMachine.getMessageCount(sessionId),
         });
     }
-    historyToClaudeMessage(msg) {
-        switch (msg.type) {
-            case 'tool_use':
-                if (msg.toolName && msg.toolId) {
-                    return {
-                        type: 'assistant',
-                        message: {
-                            role: 'assistant',
-                            content: [
-                                {
-                                    type: 'tool_use',
-                                    id: msg.toolId,
-                                    name: msg.toolName,
-                                    input: msg.toolInput ?? {},
-                                },
-                            ],
-                        },
-                    };
-                }
-                break;
-            case 'tool_result':
-                if (msg.toolId) {
-                    return {
-                        type: 'user',
-                        message: {
-                            role: 'user',
-                            content: [
-                                {
-                                    type: 'tool_result',
-                                    tool_use_id: msg.toolId,
-                                    content: msg.content,
-                                    is_error: msg.isError,
-                                },
-                            ],
-                        },
-                    };
-                }
-                break;
-            case 'thinking':
-                return {
-                    type: 'assistant',
-                    message: {
-                        role: 'assistant',
-                        content: [
-                            {
-                                type: 'thinking',
-                                thinking: msg.content,
-                            },
-                        ],
+    ensureHistoryLoaded(sessionId, history) {
+        const existingMessages = this.getAllMessages(sessionId);
+        const queuedMessages = [];
+        let hasNonQueuedMessages = false;
+        for (const message of existingMessages) {
+            if (isUserMessage(message) && message.state === MessageState.ACCEPTED) {
+                queuedMessages.push({
+                    id: message.id,
+                    text: message.text,
+                    timestamp: message.timestamp,
+                    attachments: message.attachments,
+                    settings: message.settings ?? {
+                        selectedModel: null,
+                        thinkingEnabled: false,
+                        planModeEnabled: false,
                     },
-                };
+                });
+                continue;
+            }
+            hasNonQueuedMessages = true;
+            break;
         }
-        return {
-            type: 'assistant',
-            message: {
-                role: 'assistant',
-                content: msg.content,
-            },
-        };
+        if (hasNonQueuedMessages) {
+            logger.info('Skipping history load - session already has non-queued messages', {
+                sessionId,
+                existingCount: existingMessages.length,
+            });
+            return false;
+        }
+        this.clearSession(sessionId);
+        this.stateMachine.loadFromHistory(sessionId, history);
+        for (const queuedMessage of queuedMessages) {
+            this.stateMachine.createUserMessage(sessionId, queuedMessage);
+        }
+        logger.info('Loaded messages from history with queued preservation', {
+            sessionId,
+            historyCount: history.length,
+            queuedCount: queuedMessages.length,
+            messageCount: this.stateMachine.getMessageCount(sessionId),
+        });
+        return true;
     }
     hasMessage(sessionId, messageId) {
-        return this.sessionMessages.get(sessionId)?.has(messageId) ?? false;
+        return this.stateMachine.hasMessage(sessionId, messageId);
     }
     getMessageCount(sessionId) {
-        return this.sessionMessages.get(sessionId)?.size ?? 0;
+        return this.stateMachine.getMessageCount(sessionId);
     }
     sendSnapshot(sessionId, sessionStatus, pendingInteractiveRequest) {
         const allMessages = this.getAllMessages(sessionId);
@@ -348,11 +201,14 @@ class MessageStateService {
                 chatMessages.push(...msg.chatMessages);
             }
         }
-        chatConnectionService.forwardToSession(sessionId, {
+        this.emitter.emit('event', {
             type: 'messages_snapshot',
-            messages: chatMessages,
-            sessionStatus,
-            pendingInteractiveRequest,
+            sessionId,
+            data: {
+                messages: chatMessages,
+                sessionStatus,
+                pendingInteractiveRequest,
+            },
         });
         for (const msg of allMessages) {
             if (isUserMessage(msg) && msg.state === MessageState.ACCEPTED) {
@@ -368,7 +224,7 @@ class MessageStateService {
         if (isClientRunning) {
             return { phase: 'running' };
         }
-        const queuedCount = this.getQueuedMessageCount(sessionId);
+        const queuedCount = this.stateMachine.getQueuedMessageCount(sessionId);
         if (queuedCount > 0) {
             return { phase: 'starting' };
         }
@@ -386,13 +242,16 @@ class MessageStateService {
                 order: message.order,
             }
             : undefined;
-        chatConnectionService.forwardToSession(sessionId, {
+        this.emitter.emit('event', {
             type: 'message_state_changed',
-            id: message.id,
-            newState: message.state,
-            queuePosition,
-            errorMessage,
-            userMessage,
+            sessionId,
+            data: {
+                id: message.id,
+                newState: message.state,
+                queuePosition,
+                errorMessage,
+                userMessage,
+            },
         });
     }
 }