refactor(desktop): move Composer staging into a persistent owner

apps/desktop/renderer-architecture.json

@@ -226,6 +226,13 @@
       "ownerSymbol": "AppUpdateProvider",
       "count": 1
     },
+    {
+      "implementation": "src/renderer/features/conversation/controller/use-composer-attachments.ts",
+      "symbol": "useComposerAttachments",
+      "owner": "src/renderer/features/conversation/ui/composer-staging-provider.tsx",
+      "ownerSymbol": "ComposerStagingProvider",
+      "count": 1
+    },
     {
       "implementation": "src/renderer/features/conversation/controller/use-conversation-controller.ts",
       "symbol": "useConversationController",
@@ -306,13 +313,16 @@
   ],
   "featurePrivateModules": [
     "src/renderer/features/conversation/controller/transcript-reading-position-controller.tsx",
+    "src/renderer/features/conversation/controller/use-composer-quotes.ts",
     "src/renderer/features/conversation/controller/use-conversation-observation.ts",
+    "src/renderer/features/conversation/model/composer-staging-binding.ts",
     "src/renderer/features/conversation/model/conversation-workspace.ts",
     "src/renderer/features/conversation/model/session-events.ts",
     "src/renderer/features/conversation/model/session-ui-reads.ts",
     "src/renderer/features/conversation/model/session-ui-state.ts",
     "src/renderer/features/conversation/model/session-workspace-actions.ts",
     "src/renderer/features/conversation/model/transcript-commands.ts",
+    "src/renderer/features/conversation/ui/composer-staging-context.ts",
     "src/renderer/features/conversation/ui/conversation-context.ts"
   ],
   "legacyAppShell": {
@@ -620,7 +630,6 @@
       "src/renderer/app-shell.tsx": {
         "importDeclarations": 53,
         "bridgePaths": {
-          "window.maka.attachments": 1,
           "window.maka.attachments.readBytes": 1,
           "window.maka.diagnostics.copyPreviousMainProcessInterruption": 1,
           "window.maka.diagnostics.copyReport": 1,
@@ -644,7 +653,6 @@
           "useAppShellSessionUiReads": 1,
           "useAppShellSessionWorkspace": 1,
           "useAppShellTurnPresentation": 1,
-          "useComposerAttachments": 1,
           "useEffect": 3,
           "useLayoutEffect": 1,
           "useNewTaskChoice": 1,
@@ -743,7 +751,7 @@
           "react": 1
         },
         "importSpecifiers": 80,
-        "nonTriviaTokens": 9769
+        "nonTriviaTokens": 9614
       },
       "src/renderer/use-app-shell-session-list.ts": {
         "importDeclarations": 4,
@@ -945,6 +953,7 @@
           "./application/contracts/new-task-reload-intent.js": 1,
           "./application/contracts/session-inspector/latest-request-usage.js": 1,
           "./composer-mentions.js": 1,
+          "./features/conversation/index.js": 1,
           "@maka/ui": 1,
           "react": 1
         }

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

@@ -32,14 +32,14 @@
  * the production submit path must fail this test.
  */
 
+import { ComposerStagingFixture } from './composer-staging-fixture.js';
 import assert from 'node:assert/strict';
 import { afterEach, test } from 'node:test';
 import { act, createElement, createRef } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
 import { parseHTML } from 'linkedom';
 import type { StoredMessage } from '@maka/core/session';
 import {
-  AstryxLocaleProvider,
   LocaleProvider,
   type ComposerHandle,
   type ComposerSendMetadata,
@@ -247,13 +247,16 @@ async function mountRevisionWorld(): Promise<RevisionWorld> {
     revisionDraftRef,
     composerRef: composer,
     retractedWorkspaceReferencesRef: { current: {} },
-    hasPendingContext: false,
-    hasStagedQuotes: false,
-    submittableAttachments: undefined,
-    directoryOptions: {},
-    quotesForSend: () => undefined,
-    clearSubmittedContext: () => {},
-    clearQuotes: () => {},
+    captureStaging: () => ({
+      draftKey: 'draft',
+      hasPendingContext: false,
+      hasStagedQuotes: false,
+      submittableAttachments: undefined,
+      directoryOptions: {},
+      quotesForSend: () => undefined,
+      clearSubmittedContext: () => {},
+      clearQuotes: () => {},
+    }),
     prepareRevisionSend: (text: string) => revisionActions.prepareRevisionSend(text),
     completeRevisionCopyAttempt: completeTurnRevisionCopyAttempt,
     parseSlashCommand: parseDesktopSlashCommand,
@@ -308,7 +311,8 @@ async function mountRevisionWorld(): Promise<RevisionWorld> {
     root.render(
       createElement(LocaleProvider, {
         locale: 'en',
-        children: createElement(AstryxLocaleProvider, {
+        children: createElement(ComposerStagingFixture, {
+          draftKey: SESSION_1,
           children: createElement(ChatComposerRegion, {
             composerRef: composer,
             active: true,
@@ -325,7 +329,8 @@ async function mountRevisionWorld(): Promise<RevisionWorld> {
             respondToUserForm: () => undefined,
             stop: () => undefined,
             onOpenContextUsage: () => undefined,
-            directoryComposerProps: {},
+            canStageContext: true,
+            contextPickEnabled: true,
             directoryPickerEnabled: false,
             onSend: (text: string, metadata?: ComposerSendMetadata) => {
               submittedTexts.push(text);

apps/desktop/src/main/__tests__/chat-composer-region-draft-handoff.test.ts

@@ -17,12 +17,13 @@
  * under the License.
  */
 
+import { ComposerStagingFixture } from './composer-staging-fixture.js';
 import assert from 'node:assert/strict';
 import { afterEach, test } from 'node:test';
 import { act, createElement, createRef } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
 import { parseHTML } from 'linkedom';
-import { AstryxLocaleProvider, type ComposerHandle, LocaleProvider } from '@maka/ui';
+import { type ComposerHandle, LocaleProvider } from '@maka/ui';
 import { ChatComposerRegion } from '../../renderer/chat-composer-region.js';
 import {
   markNewTaskReloadIntent,
@@ -138,11 +139,13 @@ async function mountRegion(): Promise<{
           LocaleProvider,
           {
             locale: 'en',
-            children: createElement(AstryxLocaleProvider, {
+            children: createElement(ComposerStagingFixture, {
+              draftKey: activeId ?? 'new-task',
               children: createElement(ChatComposerRegion, {
               composerRef: composer,
               onOpenContextUsage: () => undefined,
-              directoryComposerProps: {},
+              canStageContext: true,
+              contextPickEnabled: true,
               directoryPickerEnabled: false,
 
               active: true,

apps/desktop/src/main/__tests__/composer-directories.test.ts

@@ -17,13 +17,13 @@
  * under the License.
  */
 
+import { useComposerAttachments } from '../../renderer/features/conversation/testing.js';
 import assert from 'node:assert/strict';
 import { afterEach, test } from 'node:test';
 import { act, createElement } from 'react';
 import { LocaleProvider } from '@maka/ui';
 import { normalizeSessionSendCommand } from '../permission-response-guard.js';
 import {
-  useComposerAttachments,
   type ComposerAttachmentService,
 } from '../../renderer/features/conversation/index.js';
 import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';

apps/desktop/src/main/__tests__/composer-mentions.test.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { ComposerStagingFixture } from './composer-staging-fixture.js';
 import { strict as assert } from 'node:assert';
 import { test, type TestContext } from 'node:test';
 import { parseHTML } from 'linkedom';
@@ -132,11 +133,14 @@ function installCatalogRenderer(t: TestContext) {
           services,
           children: createElement(SessionCatalogContext.Provider, {
             value: sessionCatalog,
-            children: createElement(ComposerMentionsProvider, {
+            children: createElement(ComposerStagingFixture, {
+              draftKey: sessionId,
+              children: createElement(ComposerMentionsProvider, {
               sessionId,
               projectPath,
               skillCatalogRevision,
               children: createElement(Consumer, { sessionId }),
+              }),
             }),
           }),
         }),

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

@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createElement, useMemo, type ReactNode } from 'react';
+import { AstryxLocaleProvider, ToastProvider } from '@maka/ui';
+import {
+  ComposerStagingProvider, ComposerStagingServicesProvider, createComposerStagingCommands,
+  type ComposerStagingCommands, type ComposerStagingServices,
+} from '../../renderer/features/conversation/index.js';
+
+const emptyServices: ComposerStagingServices = {
+  pickFiles: async () => ({ ok: false, reason: 'cancelled' }),
+  previewApproval: async () => ({ ok: false, reason: 'unavailable' }),
+};
+
+/** Real owner with inert I/O, shared by renderer integration tests. */
+export function ComposerStagingFixture(props: {
+  readonly draftKey: string;
+  readonly directoryHostId?: string;
+  readonly commands?: ComposerStagingCommands;
+  readonly services?: ComposerStagingServices;
+  readonly children?: ReactNode;
+}) {
+  const fallbackCommands = useMemo(createComposerStagingCommands, []);
+  return createElement(AstryxLocaleProvider, {
+    children: createElement(ToastProvider, {
+      children: createElement(ComposerStagingServicesProvider, {
+        services: props.services ?? emptyServices,
+        children: createElement(ComposerStagingProvider, {
+          commands: props.commands ?? fallbackCommands,
+          draftKey: props.draftKey,
+          directoryHostId: props.directoryHostId,
+          children: props.children,
+        }),
+      }),
+    }),
+  });
+}