refactor(desktop): own Conversation publication and observation

apps/desktop/src/main/__tests__/active-execution-boundary-read-model.test.ts

@@ -28,7 +28,7 @@ import type { SessionEvent } from '@maka/core/events';
 import { parseHTML } from 'linkedom';
 import { act, createElement } from 'react';
 import { createRoot } from 'react-dom/client';
-import { createAppShellSessionEventHandlers } from '../../renderer/app-shell-session-events.js';
+import { createAppShellSessionEventHandlers } from '../../renderer/features/conversation/testing.js';
 import {
   ConversationServicesProvider,
   type ConversationHostChange,

apps/desktop/src/main/__tests__/app-shell-chat-actions-fixture.ts

@@ -93,13 +93,13 @@ export function createActionsDeps() {
       activeIdRef.current = session.id;
     },
     retireSession: (_sessionId: string) => undefined,
-    setMessageLoadErrorBySession: () => undefined,
+    clearMessageLoadError: () => undefined,
     addTransientMessage: () => undefined,
     updateTransientMessage: () => undefined,
     removeTransientMessage: () => undefined,
     transcriptRangeRef: { current: undefined },
     isMessagePublished: (_message: unknown) => false,
-    setInteractionBySession: () => undefined,
+    settleInteraction: () => undefined,
     respondToUserForm: async () => undefined,
     showModelSetupToast: () => undefined,
     toastApi: { error: () => undefined, info: () => undefined },

apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

@@ -40,14 +40,13 @@ import type { StoredMessage } from '@maka/core/session';
 import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
 import {
   ConversationServicesProvider,
-  useAppShellSessionUiState,
 } from '../../renderer/features/conversation/index.js';
 import { createSessionCatalogController } from '../../renderer/application/contracts/session-catalog/session-catalog-state.js';
 
 import { LocaleProvider, ToastProvider, type LiveTurnProjection } from '@maka/ui';
 import type { DesktopTranscriptRangeController } from '../../renderer/platform/desktop/desktop-transcript-range-store.js';
 import { createAppShellChatActions } from '../../renderer/app-shell-chat-actions.js';
-import { prepareTranscriptForSend, stubConversationServices } from '../../renderer/features/conversation/testing.js';
+import { prepareTranscriptForSend, stubConversationServices, createConversationWorkspace, createTranscriptCommands } from '../../renderer/features/conversation/testing.js';
 
 import {
   createActionsDeps,
@@ -675,83 +674,52 @@ describe('composer first-send cleanup', () => {
   });
 
   it('refresh waits for durable messages without bypassing range publication', async () => {
-    const deps = createActionsDeps();
-    deps.activeIdRef.current = 'session';
+    const catalog = createSessionCatalogController();
+    const workspace = createConversationWorkspace(catalog, stubConversationServices().observation);
+    workspace.commands.setActiveId('session');
     let durable = false;
-    const durableAnswer = { id: 'answer' };
-    let publishedAnswer = { id: 'answer' };
+    const answer = { type: 'assistant', id: 'answer', text: 'done', ts: 1 } as StoredMessage;
     const ready = deferred<void>();
     const controller = {
       ready: () => ready.promise,
       waitForDurableMessage: async () => { durable = true; return true; },
       store: {
-        snapshot: () => ({ sessionId: 'session', messages: [durableAnswer] }),
+        range: () => ({ sessionId: 'session', ready: true, hasOlder: false }),
+        snapshot: () => ({ sessionId: 'session', messages: [answer] }),
         hasDurableMessage: () => durable,
       },
     } as unknown as DesktopTranscriptRangeController;
-    const dependencies = {
-      ...deps,
-      transcriptRangeRef: { current: controller },
-      isMessagePublished: (message: unknown) => message === publishedAnswer,
-    };
-    const actions = createAppShellChatActions(dependencies);
+    workspace.transcriptRangeRef.current = controller;
+    const actions = createTranscriptCommands(workspace, { current: { locale: 'en', toast: { error: () => '' } } });
     const refresh = actions.refreshMessages('session', { requiredAssistantMessageId: 'answer' });
     assert.equal(durable, false);
     ready.resolve();
     assert.equal(await refresh, false, 'durability cannot retire the live answer before publication');
-    publishedAnswer = durableAnswer;
+    workspace.commitTranscript('session', [answer], controller);
     assert.equal(await actions.refreshMessages('session', { requiredAssistantMessageId: 'answer' }), true);
   });
 
   it('an in-flight refresh reads publication that commits after the call began', async () => {
-    const deps = createActionsDeps();
-    deps.activeIdRef.current = 'session';
+    const catalog = createSessionCatalogController();
+    const workspace = createConversationWorkspace(catalog, stubConversationServices().observation);
+    workspace.commands.setActiveId('session');
     const answer = { type: 'assistant', id: 'answer', text: 'done', ts: 1 } as StoredMessage;
     const ready = deferred<void>();
     const controller = {
       ready: () => ready.promise,
       store: {
+        range: () => ({ sessionId: 'session', ready: true, hasOlder: false }),
         snapshot: () => ({ sessionId: 'session', messages: [answer] }),
         hasDurableMessage: () => true,
       },
     } as unknown as DesktopTranscriptRangeController;
-    const { root } = installReactRenderer();
-    let publication!: ReturnType<typeof useAppShellSessionUiState>['publication'];
-    const catalog = createSessionCatalogController();
-    const services = stubConversationServices();
-    function Probe(): null {
-      publication = useAppShellSessionUiState(
-        catalog, undefined, deps.activeIdRef,
-        (_sessionId, _messages, _controller: DesktopTranscriptRangeController) => true,
-      ).publication;
-      return null;
-    }
-    try {
-      act(() => root.render(
-        createElement(LocaleProvider, {
-          locale: 'en',
-          children: createElement(ToastProvider, {
-            children: createElement(ConversationServicesProvider, {
-              services, children: createElement(Probe),
-            }),
-          }),
-        }),
-      ));
-      const actions = createAppShellChatActions({
-        ...deps, transcriptRangeRef: { current: controller },
-        isMessagePublished: publication.isMessagePublished,
-      });
-      const refresh = actions.refreshMessages('session', { requiredAssistantMessageId: 'answer' });
-      act(() => {
-        publication.messagesRef.current = [answer];
-        publication.setMessagesState([answer]);
-      });
-      ready.resolve();
-      assert.equal(await refresh, true, 'the original invocation must see the new publication');
-      assert.equal(publication.isMessagePublished({ ...answer }), false, 'same id is not the published version');
-    } finally {
-      cleanupFakeDom();
-    }
+    workspace.transcriptRangeRef.current = controller;
+    const actions = createTranscriptCommands(workspace, { current: { locale: 'en', toast: { error: () => '' } } });
+    const refresh = actions.refreshMessages('session', { requiredAssistantMessageId: 'answer' });
+    workspace.commitTranscript('session', [answer], controller);
+    ready.resolve();
+    assert.equal(await refresh, true, 'the original invocation must see the new publication');
+    assert.equal(workspace.isMessagePublished({ ...answer }), false, 'same id is not the published version');
   });
 
 });

apps/desktop/src/main/__tests__/app-shell-form-interaction.test.ts

@@ -20,6 +20,7 @@
 import { strict as assert } from 'node:assert';
 import { describe, it } from 'node:test';
 import type { InteractionQueues } from '@maka/ui';
+import { dequeueInteractionByRequestId } from '@maka/ui';
 import { createAppShellChatActions } from '../../renderer/app-shell-chat-actions.js';
 import { createActionsDeps } from './app-shell-chat-actions-fixture.js';
 
@@ -50,8 +51,8 @@ describe('AppShell form interaction response', () => {
       respondToUserForm: async (sessionId, response) => {
         submitted = { sessionId, response };
       },
-      setInteractionBySession: (update) => {
-        interactions = update(interactions);
+      settleInteraction: (sessionId, requestId) => {
+        interactions = dequeueInteractionByRequestId(interactions, sessionId, requestId);
       },
     });
 
@@ -72,8 +73,8 @@ describe('AppShell form interaction response', () => {
       respondToUserForm: async () => {
         throw new Error('Host unavailable');
       },
-      setInteractionBySession: (update) => {
-        interactions = update(interactions);
+      settleInteraction: (sessionId, requestId) => {
+        interactions = dequeueInteractionByRequestId(interactions, sessionId, requestId);
       },
       toastApi: { error: () => { errors += 1; }, info: () => undefined },
     });

apps/desktop/src/main/__tests__/app-shell-revision-actions.test.ts

@@ -69,7 +69,7 @@ function createActions(input: { messages: StoredMessage[]; failRefresh?: boolean
         clearDraft: () => {},
       } as never,
     },
-    messages: input.messages,
+    readMessages: () => input.messages,
     hasPendingAttachments: () => false,
     openSessionInChat: (sessionId: string) => {
       selectionRevision += 1;
@@ -261,7 +261,7 @@ describe('revision draft lifecycle over a prepared send', () => {
           },
         },
       },
-      messages: [userMessage('turn-1', 'original message')],
+      readMessages: () => [userMessage('turn-1', 'original message')],
       hasPendingAttachments: () => false,
       openSessionInChat: (sessionId: string) => {
         selectionRevision += 1;

apps/desktop/src/main/__tests__/app-shell-revision-resend.test.ts

@@ -211,7 +211,7 @@ async function mountRevisionWorld(): Promise<RevisionWorld> {
       return () => selectionRevision === revision;
     },
     composerRef: composer,
-    messages: [userMessage('turn-1', ORIGINAL_TEXT)],
+    readMessages: () => [userMessage('turn-1', ORIGINAL_TEXT)],
     hasPendingAttachments: () => false,
     openSessionInChat: (sessionId: string) => {
       selectionRevision += 1;

apps/desktop/src/main/__tests__/app-shell-session-ui-state.test.ts

@@ -25,7 +25,7 @@ import type { SessionSummary } from '@maka/core/session';
 import { armLiveTurn, applyLiveTurnBufferEvent, reconcileLiveTurnBuffer } from '@maka/ui';
 import type { StoredMessage } from '@maka/core/session';
 import { act, createElement } from 'react';
-import { LiveTurnReconciler } from '../../renderer/features/conversation/index.js';
+import { LiveTurnReconciler } from '../../renderer/features/conversation/testing.js';
 import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
 import { normalizeSessionSummaryForDisplay } from '../../renderer/application/contracts/session-status-presentation.js';
 import {

apps/desktop/src/main/__tests__/bootstrap-selection-lease.test.ts

@@ -19,7 +19,7 @@
 
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import { createBootstrapSelectionLease } from '../../renderer/bootstrap-selection-lease.js';
+import { createBootstrapSelectionLease } from '../../renderer/application/contracts/bootstrap-selection-lease.js';
 import {
   clearNewTaskReloadIntent,
   hasNewTaskReloadIntent,