refactor(desktop): move the Composer's reads, edits and delivery recovery below the shell (R2 M3)

apps/desktop/renderer-architecture.json

@@ -26,7 +26,6 @@
     "src/renderer/computer-use-overlay/engine/cursor-candidate-grid.ts",
     "src/renderer/computer-use-overlay/engine/cursor-engine.ts",
     "src/renderer/computer-use-overlay/engine/palette.ts",
-    "src/renderer/conversation-markdown.ts",
     "src/renderer/custom-pet-companion-model.ts",
     "src/renderer/custom-pet-companion.tsx",
     "src/renderer/daily-review-actions.ts",
@@ -162,16 +161,13 @@
     "src/renderer/titlebar-dim-color.ts",
     "src/renderer/titlebar-modal-sync.ts",
     "src/renderer/use-app-shell-session-list.ts",
-    "src/renderer/use-app-shell-session-ui-reads.ts",
     "src/renderer/use-app-shell-session-workspace.ts",
     "src/renderer/use-project-context.ts",
     "src/renderer/use-shell-appearance.ts",
     "src/renderer/use-shell-connections.ts",
-    "src/renderer/use-shell-live-turn.ts",
     "src/renderer/use-shell-memory-pill.ts",
     "src/renderer/use-stable-actions.ts",
     "src/renderer/use-system-ui-locale.ts",
-    "src/renderer/use-turn-action-registry.ts",
     "src/renderer/use-work-board.ts",
     "src/renderer/work-board-panel.tsx",
     "src/renderer/workspace-readiness-recovery.ts"
@@ -345,7 +341,9 @@
       "appShell": [
         "ComposerStagingProvider",
         "ComposerSubmissionProvider",
+        "ConversationActivityConsumer",
         "ConversationComposerRegion",
+        "ConversationHomeSurface",
         "ConversationLifecycle",
         "ConversationMessageConsumer",
         "ConversationProvider",
@@ -354,18 +352,13 @@
         "PlanExecutionSurface",
         "PlanProvider",
         "TaskReadinessProvider",
-        "chatTurnActivity",
         "createComposerStagingCommands",
         "createComposerSubmissionCommands",
         "createExecutorSessionActivator",
-        "desktopSlashCommandPresentation",
-        "executorComposerProps",
         "resolveTaskReadinessModelTarget",
         "useActiveExecutionBoundary",
-        "useAppShellSessionUiReads",
         "useAppShellSessionUiState",
-        "useShellChatModel",
-        "useShellResume"
+        "useShellChatModel"
       ],
       "composition": [
         "ComposerStagingServicesProvider",
@@ -530,7 +523,7 @@
         "nonTriviaTokens": 122
       },
       "src/renderer/app-shell-command-actions.ts": {
-        "importDeclarations": 5,
+        "importDeclarations": 4,
         "bridgePaths": {},
         "environmentCapabilities": {
           "navigator.clipboard.writeText": 1
@@ -544,15 +537,14 @@
         "dependencyPaths": {
           "./app-shell-copy.js": 1,
           "./command-palette-commands.js": 1,
-          "./conversation-markdown.js": 1,
           "./locales/settings-memory-copy.js": 1,
           "./locales/settings-test-result-copy.js": 1,
           "./locales/shell-copy.js": 1,
           "./platform/desktop/default-runtime-host-operation.js": 1,
           "react": 1
         },
-        "importSpecifiers": 8,
-        "nonTriviaTokens": 2172
+        "importSpecifiers": 7,
+        "nonTriviaTokens": 2158
       },
       "src/renderer/app-shell-copy.ts": {
         "importDeclarations": 1,
@@ -614,7 +606,7 @@
           "react": 1
         },
         "importSpecifiers": 7,
-        "nonTriviaTokens": 856
+        "nonTriviaTokens": 843
       },
       "src/renderer/app-shell-overlays.tsx": {
         "importDeclarations": 5,
@@ -647,7 +639,7 @@
         "nonTriviaTokens": 858
       },
       "src/renderer/app-shell.tsx": {
-        "importDeclarations": 40,
+        "importDeclarations": 35,
         "bridgePaths": {},
         "environmentCapabilities": {
           "window.requestAnimationFrame": 3
@@ -659,24 +651,19 @@
           "useAppShellNavRefSync": 1,
           "useAppShellPersistenceEffects": 1,
           "useAppShellProjectContext": 1,
-          "useAppShellSessionUiReads": 1,
           "useAppShellSessionWorkspace": 1,
-          "useAppShellTurnPresentation": 1,
           "useLayoutEffect": 1,
           "useRef": 4,
           "useSessionNavigationReads": 1,
           "useSessionSettingIntent": 1,
           "useShellAppearance": 1,
           "useShellChatModel": 1,
           "useShellConnections": 3,
-          "useShellLiveTurn": 1,
           "useShellMemoryPill": 1,
-          "useShellResume": 1,
           "useStableActions": 1,
           "useState": 5,
           "useSystemUiLocale": 1,
-          "useToast": 1,
-          "useTurnActionRegistry": 1
+          "useToast": 1
         },
         "lifecycleMethods": {},
         "unresolvedDependencies": 0,
@@ -688,17 +675,14 @@
           "./app-shell-effects": 1,
           "./app-shell-overlays": 1,
           "./application/contracts/conversation-copy": 1,
-          "./application/contracts/desktop-slash-command.js": 1,
           "./application/contracts/onboarding/onboarding-authority.js": 1,
           "./application/contracts/shell-lifecycle.js": 1,
-          "./application/contracts/turn-presentation": 1,
           "./application/contracts/workhub-workspace/workhub-enablement.js": 1,
           "./chat-composer-region": 1,
           "./chat-message-surface": 1,
           "./composer-defaults": 1,
           "./composer-mentions": 1,
           "./custom-pet-companion": 1,
-          "./custom-pet-companion-model": 1,
           "./desktop-execution-boundary-surface": 1,
           "./error-boundary": 1,
           "./features/app-update/index.js": 1,
@@ -726,28 +710,24 @@
           "./settings/runtime-host-ssh-terminal-dialog.js": 1,
           "./shell/detail-panel": 1,
           "./shell/frame-style": 1,
-          "./use-app-shell-session-ui-reads": 1,
           "./use-app-shell-session-workspace": 1,
           "./use-project-context": 1,
           "./use-shell-appearance": 1,
           "./use-shell-connections": 1,
-          "./use-shell-live-turn": 1,
           "./use-shell-memory-pill": 1,
           "./use-stable-actions": 1,
           "./use-system-ui-locale": 1,
-          "./use-turn-action-registry": 1,
           "./workspace-readiness-recovery": 1,
           "@astryxdesign/core/AppShell": 1,
           "@maka/core/onboarding-milestone": 1,
           "@maka/core/session": 1,
           "@maka/core/session-revisions": 1,
-          "@maka/core/slash-command-catalog": 1,
           "@maka/core/ui-locale": 1,
           "@maka/ui": 1,
           "react": 1
         },
-        "importSpecifiers": 57,
-        "nonTriviaTokens": 7852
+        "importSpecifiers": 52,
+        "nonTriviaTokens": 7333
       },
       "src/renderer/use-app-shell-session-list.ts": {
         "importDeclarations": 4,
@@ -776,20 +756,6 @@
         "importSpecifiers": 5,
         "nonTriviaTokens": 479
       },
-      "src/renderer/use-app-shell-session-ui-reads.ts": {
-        "importDeclarations": 0,
-        "bridgePaths": {},
-        "environmentCapabilities": {},
-        "hookCalls": {},
-        "lifecycleMethods": {},
-        "unresolvedDependencies": 0,
-        "actionFactories": [],
-        "dependencyPaths": {
-          "./features/conversation/index.js": 1
-        },
-        "importSpecifiers": 0,
-        "nonTriviaTokens": 9
-      },
       "src/renderer/use-app-shell-session-workspace.ts": {
         "importDeclarations": 1,
         "bridgePaths": {},
@@ -1009,19 +975,6 @@
           "./features/conversation/index.js": 2
         }
       },
-      "src/renderer/conversation-markdown.ts": {
-        "bridgePaths": {},
-        "environmentCapabilities": {},
-        "hookCalls": {},
-        "lifecycleMethods": {},
-        "unresolvedDependencies": 0,
-        "actionFactories": [],
-        "dependencyPaths": {
-          "./locales/shell-remaining-copy.js": 1,
-          "@maka/core/session": 1,
-          "@maka/ui": 1
-        }
-      },
       "src/renderer/custom-pet-companion-model.ts": {
         "bridgePaths": {},
         "environmentCapabilities": {},
@@ -3381,17 +3334,6 @@
           "react": 1
         }
       },
-      "src/renderer/use-shell-live-turn.ts": {
-        "bridgePaths": {},
-        "environmentCapabilities": {},
-        "hookCalls": {},
-        "lifecycleMethods": {},
-        "unresolvedDependencies": 0,
-        "actionFactories": [],
-        "dependencyPaths": {
-          "./application/contracts/session-execution.js": 1
-        }
-      },
       "src/renderer/use-shell-memory-pill.ts": {
         "bridgePaths": {
           "window.maka.memory.getState": 2
@@ -3443,23 +3385,6 @@
           "react": 1
         }
       },
-      "src/renderer/use-turn-action-registry.ts": {
-        "bridgePaths": {},
-        "environmentCapabilities": {
-          "clearTimeout": 2,
-          "setTimeout": 1
-        },
-        "hookCalls": {
-          "useRef": 3,
-          "useState": 1
-        },
-        "lifecycleMethods": {},
-        "unresolvedDependencies": 0,
-        "actionFactories": [],
-        "dependencyPaths": {
-          "react": 1
-        }
-      },
       "src/renderer/use-work-board.ts": {
         "bridgePaths": {
           "window.maka.workBoard.archive": 1,
@@ -3718,13 +3643,6 @@
         "src/renderer/app-shell.tsx"
       ]
     },
-    {
-      "capability": "conversation-runtime-and-presentation",
-      "targetZone": "features/conversation",
-      "legacyPaths": [
-        "src/renderer/use-app-shell-session-ui-reads.ts"
-      ]
-    },
     {
       "capability": "session-catalog-and-scope",
       "targetZone": "application/session",

apps/desktop/src/main/__tests__/app-shell-command-options.ts

@@ -42,7 +42,7 @@ export function appShellCommandOptions(
     clientPathsAccessible: false,
     connections: [],
     defaultConnection: null,
-    readMessages: () => [],
+    renderPublishedConversation: () => '',
     newTaskProfileId: 'new-task-profile',
     settingsOpen: false,
     settingsProfileId: undefined,

apps/desktop/src/main/__tests__/command-palette-desktop-actions.test.ts

@@ -132,7 +132,14 @@ describe('command palette Desktop actions', () => {
       saveConversationToFile: async () => outcomes.shift()!,
     });
     const toasts: string[] = [];
-    const options = appShellCommandOptions(toasts, { paletteActions: palette });
+    const exports: unknown[][] = [];
+    const options = appShellCommandOptions(toasts, {
+      paletteActions: palette,
+      renderPublishedConversation: (sessionName, locale) => {
+        exports.push([sessionName, locale]);
+        return '# Long task export';
+      },
+    });
 
     for (let index = 0; index < 3; index += 1) {
       await runPaletteCommand(options, 'diag:save-conversation-file');
@@ -142,6 +149,8 @@ describe('command palette Desktop actions', () => {
     const [name, input] = calls[0] ?? [];
     assert.equal(name, 'saveConversationToFile');
     assert.deepEqual(Object.keys(input as object), ['markdown', 'defaultName']);
+    assert.equal((input as { markdown: string }).markdown, '# Long task export', 'Save writes the Conversation-owned export');
+    assert.deepEqual(exports, Array(3).fill(['Long task', 'en']));
     assert.match((input as { defaultName: string }).defaultName, /^maka-Long-task-\d{4}-\d{2}-\d{2}\.md$/);
     assert.equal(toasts.length, 2);
     assert.equal(toasts[0], `success:${copy.conversationSavedTitle}`);

apps/desktop/src/main/__tests__/composer-submission-fixture.ts

@@ -65,7 +65,6 @@ export function stubSubmissionShell(
     showModelSetupToast: () => {},
     bindNewTaskSessionResolver: () => () => {},
     openSideChat: () => {},
-    turnActions: { addKey: () => true, clearKey: () => {}, keyOf: (...parts) => parts.join(':') },
     orchestrationMode: () => 'default',
     setOrchestrationModeActive: async () => true,
     ...overrides,
@@ -100,6 +99,7 @@ export function withComposerSubmission(children: ReactNode, options: {
       shell: stubSubmissionShell(),
       newTask: stubNewTaskSubmission(),
       sharedSessionActive: false,
+      ownerSessionId: undefined,
       ...options.props,
       children,
     }),