@oxy.so/services 12.9.0 → 12.10.1

package/src/ui/components/OxyAuthChooser.tsx

@@ -41,6 +41,7 @@ import { surfaces } from '@oxy.so/bloom/surfaces';
 import { useTheme } from '@oxy.so/bloom/theme';
 import { getNormalizedUserHandle, type User } from '@oxy.so/core';
 import { useQueryClient } from '@tanstack/react-query';
+import type { LogoutResult } from '../context/oxyContextTypes';
 import { useOxy } from '../context/oxyRuntimeContext';
 import { useDeviceSwitcher } from '../hooks/useDeviceSwitcher';
 import { useI18n } from '../hooks/useI18n';
@@ -257,7 +258,14 @@ const OxyAuthChooser: React.FC<OxyAuthChooserProps> = ({ onComplete }) => {
    */
   const handleSignOut = useCallback(async () => {
     if (!controller) return;
-    const outcome = await controller.runDeviceMutation(() => logout());
+    let outcome: { ran: true; value: LogoutResult } | { ran: false };
+    try {
+      outcome = await controller.runDeviceMutation(() => logout());
+    } catch {
+      // `runDeviceMutation` rethrows; the caller is `void handleSignOut()`.
+      toast.error(t('common.errors.signOutFailed'));
+      return;
+    }
     if (!outcome.ran) return;
     if (outcome.value.status === 'failed') {
       toast.error(t('common.errors.signOutFailed'));

package/src/ui/context/OxyContext.tsx

@@ -999,8 +999,8 @@ export const OxyRuntimeProvider: React.FC<OxyRuntimeProviderProps> = ({
     if (host) {
       accountDialogHostRef.current = null;
       setAccountDialogOpen(false);
-      host.goBack();
-      return;
+      // A host that is already gone cannot pop; fall through to the detached surface.
+      if (host.goBack()) return;
     }
     accountDialogSurfaceRef.current?.dismiss();
   }, []);
@@ -1161,7 +1161,16 @@ export const OxyRuntimeProvider: React.FC<OxyRuntimeProviderProps> = ({
       accountDialogControllerRef.current?.setView(nextView);
 
       // Its own detached surface is already open → just re-point the view above.
+      // A route surface (e.g. ManageAccount) may sit ON TOP of it, so re-pointing the
+      // view is not enough: bring the AccountDialog frame back to the front too.
       if (accountDialogSurfaceRef.current) {
+        const top = topRouteSurface();
+        if (top) {
+          accountDialogHostRef.current = top;
+          top.navigate('AccountDialog', { initialView: nextView });
+        } else {
+          accountDialogSurfaceRef.current.navigate('AccountDialog', { initialView: nextView });
+        }
         setAccountDialogOpen(true);
         return;
       }

package/src/ui/hooks/queries/useFileQueries.ts

@@ -60,7 +60,10 @@ export function mapRawFileToMetadata(raw: RawUserFile): FileMetadata {
     chunkSize: 0,
     uploadDate: raw.createdAt ?? '',
     ...(typeof raw.inUse === 'boolean' ? { inUse: raw.inUse } : {}),
-    ...(raw.status === 'active' || raw.status === 'trash' || raw.status === 'blocked'
+    ...(raw.status === 'active' ||
+    raw.status === 'trash' ||
+    raw.status === 'blocked' ||
+    raw.status === 'lost'
       ? { status: raw.status }
       : {}),
     ...(typeof raw.trashedAt === 'string' ? { trashedAt: raw.trashedAt } : {}),

package/src/ui/screens/FileManagementScreen.tsx

@@ -150,10 +150,13 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
   // Derived filtered and sorted files (avoid setState loops)
   const filteredFiles = useMemo(() => {
     let filteredByMode = files;
+    // A lost file (ADR 0043 D13) has no media to show: it is listed under
+    // "all" and "documents" only, as lost, never as a broken thumbnail.
+    const withMedia = files.filter((file) => file.status !== 'lost');
     if (viewMode === 'photos') {
-      filteredByMode = files.filter((file) => file.contentType.startsWith('image/'));
+      filteredByMode = withMedia.filter((file) => file.contentType.startsWith('image/'));
     } else if (viewMode === 'videos') {
-      filteredByMode = files.filter((file) => file.contentType.startsWith('video/'));
+      filteredByMode = withMedia.filter((file) => file.contentType.startsWith('video/'));
     } else if (viewMode === 'documents') {
       filteredByMode = files.filter(
         (file) =>
@@ -167,7 +170,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
           file.contentType.includes('powerpoint'),
       );
     } else if (viewMode === 'audio') {
-      filteredByMode = files.filter((file) => file.contentType.startsWith('audio/'));
+      filteredByMode = withMedia.filter((file) => file.contentType.startsWith('audio/'));
     }
 
     let filtered = filteredByMode;
@@ -721,6 +724,8 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         toggleSelect(file);
         return;
       }
+      // Nothing to open: its bytes are gone (ADR 0043 D13). The row says so.
+      if (file.status === 'lost') return;
       try {
         setLoadingFileContent(true);
         setOpenedFile(file);
@@ -865,7 +870,8 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
       const isImage = file.contentType.startsWith('image/');
       const isPDF = file.contentType.includes('pdf');
       const isVideo = file.contentType.startsWith('video/');
-      const hasPreview = isImage || isPDF || isVideo;
+      const isLost = file.status === 'lost';
+      const hasPreview = !isLost && (isImage || isPDF || isVideo);
       const isSelected = selectedIds.has(file.id);
 
       // Create icon for preview thumbnails (36x36)
@@ -948,7 +954,9 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         id: file.id,
         icon:
           fileIcon ??
-          (!hasPreview ? (
+          (isLost ? (
+            <Ionicons name="cloud-offline-outline" size={20} color={colors.error} />
+          ) : !hasPreview ? (
             <Ionicons name={getFileIcon(file.contentType)} size={20} color={colors.primary} />
           ) : undefined),
         title: file.filename,
@@ -958,9 +966,11 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         description: `${formatFileSize(file.length)} • ${new Date(file.uploadDate).toLocaleDateString()}${
           file.status === 'blocked'
             ? ` • ${t('fileManagement.removedAfterClaim')}`
-            : file.inUse === false
-              ? ` • ${t('fileManagement.notInUse')}`
-              : ''
+            : isLost
+              ? ` • ${t('fileManagement.contentLost')}`
+              : file.inUse === false
+                ? ` • ${t('fileManagement.notInUse')}`
+                : ''
         }`,
         onPress: () => {
           // Support selection in regular mode with long press or if already selecting
@@ -975,7 +985,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         rightElement:
           !selectMode && selectedIds.size === 0 ? (
             <View className="flex-row items-center gap-1.5 ml-3">
-              {isImage || isVideo || file.contentType.includes('pdf') ? (
+              {hasPreview ? (
                 <Button
                   appearance="subtle"
                   tone="neutral"
@@ -987,16 +997,18 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                   icon={<Ionicons name="eye" size={18} color={colors.text} />}
                 />
               ) : null}
-              <Button
-                appearance="subtle"
-                tone="neutral"
-                size="sm"
-                iconOnly
-                stopPropagation
-                accessibilityLabel={`Download ${file.filename}`}
-                onPress={() => handleFileDownload(file.id, file.filename)}
-                icon={<Ionicons name="download" size={18} color={colors.text} />}
-              />
+              {isLost ? null : (
+                <Button
+                  appearance="subtle"
+                  tone="neutral"
+                  size="sm"
+                  iconOnly
+                  stopPropagation
+                  accessibilityLabel={`Download ${file.filename}`}
+                  onPress={() => handleFileDownload(file.id, file.filename)}
+                  icon={<Ionicons name="download" size={18} color={colors.text} />}
+                />
+              )}
               <Button
                 appearance="subtle"
                 tone="danger"
@@ -1005,7 +1017,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                 stopPropagation
                 loading={deletingId === file.id}
                 accessibilityLabel={t(
-                  file.status === 'blocked'
+                  libraryRemovalFor(file) === 'delete'
                     ? 'fileManagement.a11y.deleteFile'
                     : 'fileManagement.a11y.moveToTrash',
                   { name: file.filename },
@@ -1308,7 +1320,7 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
         onDownload={handleFileDownload}
         onDelete={confirmFileDelete}
         deleteLabel={
-          openedFile.status === 'blocked'
+          libraryRemovalFor(openedFile) === 'delete'
             ? t('fileManagement.deleteFile')
             : t('fileManagement.moveToTrash')
         }

package/src/ui/screens/ManageAccountScreen.tsx

@@ -61,6 +61,7 @@ const ManageAccountScreen: React.FC<ManageAccountScreenProps> = ({
     openAvatarPicker,
     accounts,
     openAccountDialog,
+    accountDialogController,
     hasIdentity,
   } = useOxy();
 
@@ -105,7 +106,12 @@ const ManageAccountScreen: React.FC<ManageAccountScreenProps> = ({
     }
     setSigningOut(true);
     try {
-      await logout();
+      const result = await logout();
+      if (result?.status === 'failed') {
+        loggerUtil.warn('Sign out failed', { component: 'ManageAccountScreen' }, result.error);
+        toast.error(t('common.errors.signOutFailed') || 'Failed to sign out');
+        return;
+      }
       toast.success(t('common.actions.signedOut') || 'Signed out');
       onClose?.();
     } catch (error) {
@@ -360,22 +366,25 @@ const ManageAccountScreen: React.FC<ManageAccountScreenProps> = ({
             {/* Accounts (unified account graph) */}
             {accounts.length > 0 || isAuthenticated ? (
               <GroupedSection title={t('accountCenter.sections.accounts') || 'Accounts'}>
-                <GroupedSectionItem
-                  icon={<SettingsIcon name="account-switch" color={bloomTheme.colors.info} />}
-                  title={t('accounts.manage.switch.title') || 'Switch account'}
-                  description={
-                    accounts.length > 0
-                      ? // One account is "1 account", not "1 accounts".
-                        t(
-                          accounts.length === 1
-                            ? 'accounts.manage.switch.countOne'
-                            : 'accounts.manage.switch.count',
-                          { count: accounts.length },
-                        )
-                      : t('accounts.manage.switch.empty') || 'Accounts you own or share'
-                  }
-                  onPress={() => openAccountDialog('accounts')}
-                />
+                {/* No controller means the dialog can never open (identity-bound session). */}
+                {accountDialogController ? (
+                  <GroupedSectionItem
+                    icon={<SettingsIcon name="account-switch" color={bloomTheme.colors.info} />}
+                    title={t('accounts.manage.switch.title') || 'Switch account'}
+                    description={
+                      accounts.length > 0
+                        ? // One account is "1 account", not "1 accounts".
+                          t(
+                            accounts.length === 1
+                              ? 'accounts.manage.switch.countOne'
+                              : 'accounts.manage.switch.count',
+                            { count: accounts.length },
+                          )
+                        : t('accounts.manage.switch.empty') || 'Accounts you own or share'
+                    }
+                    onPress={() => openAccountDialog('accounts')}
+                  />
+                ) : null}
                 <GroupedSectionItem
                   icon={<SettingsIcon name="account-plus" color={bloomTheme.colors.primary} />}
                   title={t('accounts.create.title') || 'Create account'}

package/src/ui/screens/fileManagement/trashActions.ts

@@ -25,9 +25,12 @@ export interface TrashAssetsApi {
 /** What removing a file from the library does to it. */
 export type LibraryRemoval = 'trash' | 'delete';
 
-/** A `blocked` file is deleted (it cannot go to trash); every other is trashed. */
+/**
+ * A `blocked` file is deleted (it cannot go to trash), and so is a `lost` one
+ * (ADR 0043 D13: nothing is left to restore); every other is trashed.
+ */
 export function libraryRemovalFor(file: Pick<FileMetadata, 'status'>): LibraryRemoval {
-  return file.status === 'blocked' ? 'delete' : 'trash';
+  return file.status === 'blocked' || file.status === 'lost' ? 'delete' : 'trash';
 }
 
 /** The HTTP status of a failed asset call, when it carries one. */