chore: 🔀 merge upstream nightly v0.1.3-nightly.20261026.3726

apps/mobile/package.json

@@ -137,7 +137,7 @@
     "react-native-pdf-jsi": "5.0.0",
     "react-native-reanimated": "4.7.1",
     "react-native-safe-area-context": "~5.10.1",
-    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.44.tgz",
+    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.45.tgz",
     "react-native-svg": "15.16.0",
     "react-native-webview": "14.0.1",
     "react-native-worklets": "0.13.0",

apps/mobile/src/Stack.tsx

@@ -82,7 +82,6 @@ import {
   NewTaskEnvironmentPickerRouteScreen,
 } from "./features/threads/NewTaskContextPickerScreens";
 import {
-  ExistingThreadSettingsRouteProvider,
   ExistingThreadSettingsRouteScreen,
   NewTaskThreadSettingsRouteScreen,
 } from "./features/threads/ThreadSettingsSheet";
@@ -558,20 +557,18 @@ function RootStackLayout(props: {
         <ShowcaseCaptureCoordinator pathname={pathname} />
         <LauncherMoodCoordinator navigationState={props.state} />
         <SettingsEnvironmentFilterProvider open={settingsOpen}>
-          <ExistingThreadSettingsRouteProvider>
-            <WorkspaceConnectionStatusProvider>
-              <AndroidWorkspaceTabsProvider state={props.state}>
-                <AdaptiveWorkspaceLayout
-                  pathname={workspaceLocation.pathname}
-                  workspaceRouteKey={workspaceLocation.routeKey}
-                  selectedPullRequestKey={selectedPullRequestKey(props.state)}
-                >
-                  {props.children}
-                  <HardwareKeyboardCommandOverlay />
-                </AdaptiveWorkspaceLayout>
-              </AndroidWorkspaceTabsProvider>
-            </WorkspaceConnectionStatusProvider>
-          </ExistingThreadSettingsRouteProvider>
+          <WorkspaceConnectionStatusProvider>
+            <AndroidWorkspaceTabsProvider state={props.state}>
+              <AdaptiveWorkspaceLayout
+                pathname={workspaceLocation.pathname}
+                workspaceRouteKey={workspaceLocation.routeKey}
+                selectedPullRequestKey={selectedPullRequestKey(props.state)}
+              >
+                {props.children}
+                <HardwareKeyboardCommandOverlay />
+              </AdaptiveWorkspaceLayout>
+            </AndroidWorkspaceTabsProvider>
+          </WorkspaceConnectionStatusProvider>
         </SettingsEnvironmentFilterProvider>
       </HardwareKeyboardCommandProvider>
     </NewTaskFlowProvider>

apps/mobile/src/components/ComposerAttachmentStrip.tsx

@@ -3,10 +3,13 @@ import { composerImageGallery } from "../lib/composerImageGallery";
 import { SymbolView } from "./ui/AppSymbol";
 import { imageMimeType } from "@t3tools/shared/image";
 import { videoMimeType } from "@t3tools/shared/video";
-import { useEffect, useMemo, useState } from "react";
+import { useAtomValue } from "@effect/atom-react";
+import { AsyncResult, Atom } from "effect/reactivity";
+import { Paths } from "expo-file-system";
 import { Image, Pressable, ScrollView, View } from "react-native";
 
 import { AppText as Text } from "./ui/AppText";
+import { MaterializedPreviewKey, materializedPreviewAtom } from "../lib/composerImagePreview";
 import { PierreEntryIcon } from "./PierreEntryIcon";
 import {
   isFileBackedComposerAttachment,
@@ -93,65 +96,31 @@ export function ComposerAttachmentThumbnail(props: ComposerAttachmentThumbnailPr
   );
 }
 
-const PREVIEW_CACHE_DIRECTORY = "t3-composer-previews";
-
 /** Fabric re-parses URLs each layout; large data URLs can stall and abort commits. */
 const INLINE_PREVIEW_FALLBACK_MAX_CHARS = 256_000;
 
-async function materializeDataUrlPreview(id: string, dataUrl: string): Promise<string | null> {
-  const comma = dataUrl.indexOf(",");
-  if (comma < 0) return null;
-  const { Directory, File, Paths } = await import("expo-file-system");
-  const mimeType = /^data:([^;,]+)/.exec(dataUrl)?.[1] ?? "image/jpeg";
-  const extension = (mimeType.split("/")[1] ?? "jpg").replace("jpeg", "jpg");
-  const directory = new Directory(Paths.cache, PREVIEW_CACHE_DIRECTORY);
-  directory.create({ idempotent: true, intermediates: true });
-  const file = new File(directory, `${id}.${extension}`);
-  if (!file.exists) {
-    file.create();
-    await file.write(dataUrl.slice(comma + 1), { encoding: "base64" });
-  }
-  return file.uri;
-}
+const noMaterializedPreview = Atom.make(AsyncResult.initial<string | null>()).pipe(
+  Atom.withLabel("composer-image-preview:none"),
+);
 
 function useComposerImagePreviewUri(attachment: DraftComposerImageAttachment): string | null {
-  const { id, fileUri, previewUri } = attachment;
-  const [rebased, setRebased] = useState<{ fileUri: string; uri: string } | null>(null);
-  const [materialized, setMaterialized] = useState<{ id: string; uri: string | null } | null>(null);
+  const { fileUri, previewUri } = attachment;
   const inlinePreview = fileUri === undefined && previewUri.startsWith("data:");
-  useEffect(() => {
-    if (fileUri === undefined) return;
-    let cancelled = false;
-    void (async () => {
-      const { Paths } = await import("expo-file-system");
-      const owned = resolveOwnedComposerAttachmentFileUri(fileUri, Paths.document.uri);
-      if (!cancelled && owned !== null && owned !== previewUri) setRebased({ fileUri, uri: owned });
-    })();
-    return () => {
-      cancelled = true;
-    };
-  }, [fileUri, previewUri]);
-  useEffect(() => {
-    if (!inlinePreview) return;
-    let cancelled = false;
-    void materializeDataUrlPreview(id, previewUri)
-      .then((uri) => {
-        if (!cancelled && uri !== null) setMaterialized({ id, uri });
-      })
-      .catch((error: unknown) => {
-        console.warn("[composer-attachments] could not cache an image preview", error);
-        if (!cancelled) setMaterialized({ id, uri: null });
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [id, inlinePreview, previewUri]);
-  if (fileUri !== undefined && rebased?.fileUri === fileUri) return rebased.uri;
-  if (fileUri !== undefined) return previewUri.startsWith("data:") ? fileUri : previewUri;
+  const materialized = useAtomValue(
+    inlinePreview
+      ? materializedPreviewAtom(new MaterializedPreviewKey(attachment))
+      : noMaterializedPreview,
+  );
+  if (fileUri !== undefined) {
+    // Reinstalls move the app container, so a stored file URI may point at the old one.
+    const owned = resolveOwnedComposerAttachmentFileUri(fileUri, Paths.document.uri);
+    if (owned !== null) return owned;
+    return previewUri.startsWith("data:") ? fileUri : previewUri;
+  }
   if (inlinePreview) {
-    if (materialized?.id !== id) return null;
+    if (!AsyncResult.isSuccess(materialized)) return null;
     return (
-      materialized.uri ??
+      materialized.value ??
       (previewUri.length <= INLINE_PREVIEW_FALLBACK_MAX_CHARS ? previewUri : null)
     );
   }
@@ -280,15 +249,12 @@ function ComposerVideoAttachment(props: {
   const { attachment } = props;
   const sourceIdentifier = `draft:${attachment.id}`;
   const style = { width: props.size, height: props.size, borderRadius: props.borderRadius };
-  const actionsSource = useMemo<MediaActionsSource>(
-    () => ({
-      name: attachment.name,
-      mimeType: videoMimeType(attachment) ?? attachment.mimeType,
-      sourceIdentifier,
-      attachment,
-    }),
-    [attachment, sourceIdentifier],
-  );
+  const actionsSource: MediaActionsSource = {
+    name: attachment.name,
+    mimeType: videoMimeType(attachment) ?? attachment.mimeType,
+    sourceIdentifier,
+    attachment,
+  };
 
   return (
     <VideoAttachmentTile
@@ -304,7 +270,7 @@ function ComposerVideoAttachment(props: {
 }
 
 export function ComposerAttachmentStrip(props: ComposerAttachmentStripProps) {
-  const gallery = useMemo(() => composerImageGallery(props.attachments), [props.attachments]);
+  const gallery = composerImageGallery(props.attachments);
   const size = props.imageSize ?? 72;
   const radius = props.imageBorderRadius ?? 16;
   const removeButtonPlacement = props.removeButtonPlacement ?? "overlay";

apps/mobile/src/components/ComposerEditor.tsx

@@ -3,14 +3,15 @@ import { ComposerContextId } from "@t3tools/contracts";
 import { useAtomValue } from "@effect/atom-react";
 import { AsyncResult } from "effect/reactivity";
 import { settlePromise, squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useState } from "react";
 import type { EnvironmentId } from "@t3tools/contracts";
 import { encodeComposerContextFragment } from "@t3tools/shared/composerContextClipboard";
 import { collectComposerContextReferences } from "@t3tools/shared/composerContextReferences";
 import { ComposerEditor as NativeComposerEditor } from "../native/T3ComposerEditor";
 import type { ComposerEditorProps as NativeComposerEditorProps } from "../native/T3ComposerEditor";
 import {
   appendComposerDraftAttachments,
+  composerContextImportsAtom,
   createComposerDraftContextHistory,
   getComposerDraftAfterSelection,
   getComposerDraftSnapshot,
@@ -22,6 +23,8 @@ import {
   useComposerDraft,
 } from "../state/use-composer-drafts";
 import { importComposerContextClipboard } from "../lib/composerContextClipboard";
+import { startComposerDraftOperation } from "../state/composerDraftOperations";
+import { appAtomRegistry } from "../state/atom-registry";
 import { mobilePreferencesAtom } from "../state/preferences";
 import { useOpenLinkedThread } from "../features/threads/useOpenLinkedThread";
 import { ComposerContextSheet } from "./ComposerContextSheet";
@@ -73,33 +76,32 @@ export function ComposerEditor({
   const [selected, setSelected] = useState<{ source: string; start: number; end: number } | null>(
     null,
   );
-  const importRef = useRef<AbortController | null>(null);
-  const [importing, setImporting] = useState(false);
-  useEffect(
-    () => () => {
-      importRef.current?.abort();
-    },
-    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- Switching drafts aborts an import owned by the previous draft.
-    [draftKey],
-  );
+  const contextImports = useAtomValue(composerContextImportsAtom);
+  const importing = draftKey ? contextImports[draftKey] === true : false;
   const pasteContext = async (
     clipboard: Parameters<NonNullable<NativeComposerEditorProps["onPasteContext"]>>[0],
   ) => {
-    if (!draftKey || importRef.current || props.readOnly || props.editable === false) return;
+    if (
+      !draftKey ||
+      appAtomRegistry.get(composerContextImportsAtom)[draftKey] ||
+      props.readOnly ||
+      props.editable === false
+    )
+      return;
     const insertion = { text: clipboard.value, ...clipboard.selection };
-    const controller = new AbortController();
-    importRef.current = controller;
-    setImporting(true);
+    const operation = startComposerDraftOperation(draftKey);
+    const { signal } = operation;
     setComposerContextImporting(draftKey, true);
     const settled = await settlePromise(async () => {
       const retained = getComposerDraftAfterSelection(draftKey, insertion);
       const result = await importComposerContextClipboard(
         clipboard,
         retained.attachments.length,
-        controller.signal,
+        signal,
         retained.context?.records.length ?? 0,
         environmentId,
       );
+      if (signal.aborted) return;
       if (!result) {
         insertComposerDraftText(draftKey, clipboard.text, insertion);
         return;
@@ -126,10 +128,9 @@ export function ComposerEditor({
           [...warnings, "Those references are marked unavailable."].join("\n\n"),
         );
     });
+    operation.finish();
     setComposerContextImporting(draftKey, false);
-    importRef.current = null;
-    setImporting(false);
-    if (AsyncResult.isFailure(settled) && !controller.signal.aborted) {
+    if (AsyncResult.isFailure(settled) && !signal.aborted) {
       const error = squashAtomCommandFailure(settled);
       Dialog.alert(
         "Could not paste context",