spiracha 2.1.0 → 2.2.0

package/apps/ui/src/routes/claude-code.$workspaceKey.tsx

@@ -8,7 +8,7 @@ import { ExportDialog } from '#/components/export-dialog';
 import { ListSearchInput } from '#/components/list-search-input';
 import { LoadingPanel } from '#/components/loading-panel';
 import { PageHeader } from '#/components/page-header';
-import { ReloadErrorPanel } from '#/components/reload-error-panel';
+import { RouteErrorPanel } from '#/components/route-error-panel';
 import { claudeCodeSessionsQueryOptions, claudeCodeWorkspacesQueryOptions } from '#/lib/claude-code-queries';
 import {
     deleteClaudeCodeSessionFn,
@@ -17,17 +17,10 @@ import {
     exportClaudeCodeSessionsFn,
 } from '#/lib/claude-code-server';
 import { downloadTextFile, downloadUrlFile } from '#/lib/download';
+import { createExportSelectionMutationInput, type ExportSelectionMutationInput } from '#/lib/export-mutation';
 import { matchesTextQuery } from '#/lib/text-filter';
 import { isWorkspaceEmptiedByDelete } from '#/lib/workspace-delete-navigation';
 
-type ExportDialogOptions = {
-    includeCommentary: boolean;
-    includeMetadata: boolean;
-    includeTools: boolean;
-    outputFormat: 'md' | 'txt';
-    zipArchive: boolean;
-};
-
 type PendingSessionDelete = {
     sessions: ClaudeCodeSessionSummary[];
 };
@@ -90,7 +83,7 @@ export const Route = createFileRoute('/claude-code/$workspaceKey')({
 });
 
 function ClaudeCodeWorkspaceErrorComponent({ error }: { error: Error }) {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Claude Code workspace" />;
+    return <RouteErrorPanel error={error} title="Failed to load Claude Code workspace" />;
 }
 
 function ClaudeCodeWorkspacePage() {
@@ -106,20 +99,16 @@ function ClaudeCodeWorkspacePage() {
     const deferredSearch = useDeferredValue(searchInput);
 
     const exportMutation = useMutation({
-        mutationFn: async (options: ExportDialogOptions) => {
-            if (!pendingExport) {
-                throw new Error('No Claude Code session selected for export');
-            }
-
+        mutationFn: async ({ ids, options }: ExportSelectionMutationInput) => {
             const download =
-                pendingExport.sessionIds.length === 1
+                ids.length === 1
                     ? await exportClaudeCodeSessionFn({
                           data: {
                               includeCommentary: options.includeCommentary,
                               includeMetadata: options.includeMetadata,
                               includeTools: options.includeTools,
                               outputFormat: options.outputFormat,
-                              sessionId: pendingExport.sessionIds[0]!,
+                              sessionId: ids[0]!,
                               zipArchive: options.zipArchive,
                           },
                       })
@@ -129,7 +118,7 @@ function ClaudeCodeWorkspacePage() {
                               includeMetadata: options.includeMetadata,
                               includeTools: options.includeTools,
                               outputFormat: options.outputFormat,
-                              sessionIds: pendingExport.sessionIds,
+                              sessionIds: [...ids],
                               zipArchive: options.zipArchive,
                           },
                       });
@@ -150,13 +139,7 @@ function ClaudeCodeWorkspacePage() {
             sessionIds.length === 1
                 ? deleteClaudeCodeSessionFn({ data: { sessionId: sessionIds[0]! } })
                 : deleteClaudeCodeSessionsFn({ data: { sessionIds } }),
-        onSuccess: async (_result, sessionIds) => {
-            const workspaceEmptied = isWorkspaceEmptiedByDelete(sessions, sessionIds, (session) => session.sessionId);
-            setPendingDelete(null);
-            if (workspaceEmptied) {
-                await navigate({ to: '/claude-code' });
-            }
-
+        onSettled: async (_result, _error, sessionIds) => {
             await Promise.all([
                 queryClient.invalidateQueries({ queryKey: ['claude-code-workspaces'] }),
                 queryClient.invalidateQueries({ queryKey: ['claude-code-sessions', workspace.key] }),
@@ -165,6 +148,13 @@ function ClaudeCodeWorkspacePage() {
                 ),
             ]);
         },
+        onSuccess: async (_result, sessionIds) => {
+            const workspaceEmptied = isWorkspaceEmptiedByDelete(sessions, sessionIds, (session) => session.sessionId);
+            setPendingDelete(null);
+            if (workspaceEmptied) {
+                await navigate({ to: '/claude-code' });
+            }
+        },
     });
 
     const visibleSessions = useMemo(
@@ -226,11 +216,22 @@ function ClaudeCodeWorkspacePage() {
             />
 
             <ExportDialog
+                errorMessage={
+                    exportMutation.isError
+                        ? exportMutation.error instanceof Error
+                            ? exportMutation.error.message
+                            : 'Session export failed'
+                        : null
+                }
                 forceZipArchive={pendingExport ? pendingExport.sessionIds.length > 1 : false}
                 open={pendingExport !== null}
                 pending={exportMutation.isPending}
                 title={pendingExport ? `Export ${pendingExport.label}` : 'Export session'}
-                onExport={(options) => exportMutation.mutate(options)}
+                onExport={(options) => {
+                    if (pendingExport) {
+                        exportMutation.mutate(createExportSelectionMutationInput(pendingExport.sessionIds, options));
+                    }
+                }}
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingExport(null);
@@ -239,12 +240,6 @@ function ClaudeCodeWorkspacePage() {
                 }}
             />
 
-            {exportMutation.isError ? (
-                <p className="text-[var(--destructive)] text-sm">
-                    {exportMutation.error instanceof Error ? exportMutation.error.message : 'Session export failed'}
-                </p>
-            ) : null}
-
             <DeleteConfirmDialog
                 confirmLabel={getDeleteConfirmLabel(pendingDelete, deleteMutation.isPending)}
                 description={getDeleteDescription(pendingDelete)}

package/apps/ui/src/routes/claude-code.index.tsx

@@ -4,7 +4,7 @@ import { useDeferredValue, useState } from 'react';
 import { ClaudeCodeWorkspacesTable } from '#/components/claude-code-workspaces-table';
 import { ListSearchInput } from '#/components/list-search-input';
 import { PageHeader } from '#/components/page-header';
-import { ReloadErrorPanel } from '#/components/reload-error-panel';
+import { RouteErrorPanel } from '#/components/route-error-panel';
 import { claudeCodeWorkspacesQueryOptions } from '#/lib/claude-code-queries';
 import { matchesTextQuery } from '#/lib/text-filter';
 
@@ -15,7 +15,7 @@ export const Route = createFileRoute('/claude-code/')({
 });
 
 function ClaudeCodeErrorComponent({ error }: { error: Error }) {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Claude Code workspaces" />;
+    return <RouteErrorPanel error={error} title="Failed to load Claude Code workspaces" />;
 }
 
 function ClaudeCodePage() {

package/apps/ui/src/routes/codex.$project.tsx

@@ -8,7 +8,7 @@ import { ExportDialog } from '#/components/export-dialog';
 import { ListSearchInput } from '#/components/list-search-input';
 import { LoadingPanel } from '#/components/loading-panel';
 import { PageHeader } from '#/components/page-header';
-import { ReloadErrorPanel } from '#/components/reload-error-panel';
+import { RouteErrorPanel } from '#/components/route-error-panel';
 import { ThreadsTable } from '#/components/threads-table';
 import { Button } from '#/components/ui/button';
 import { projectThreadsQueryOptions } from '#/lib/codex-queries';
@@ -20,6 +20,8 @@ import {
     recoverProjectThreadsFn,
 } from '#/lib/codex-server';
 import { downloadTextFile, downloadUrlFile } from '#/lib/download';
+import { createExportSelectionMutationInput, type ExportSelectionMutationInput } from '#/lib/export-mutation';
+import { getMutationErrorMessage } from '#/lib/mutation-error';
 import { parseTextQuerySearch, withTextQuerySearch } from '#/lib/route-search';
 import { useSettings } from '#/lib/settings-store';
 import { matchesTextQuery } from '#/lib/text-filter';
@@ -84,15 +86,7 @@ export const Route = createFileRoute('/codex/$project')({
 });
 
 function ProjectDetailErrorComponent({ error }: { error: Error }) {
-    const isSqlite = error.message.includes('unable to open database') || error.message.includes('database is locked');
-    return (
-        <ReloadErrorPanel
-            description={
-                isSqlite ? 'Codex may have an exclusive lock on the database. Reload to retry.' : error.message
-            }
-            title={isSqlite ? 'Database unavailable' : 'Failed to load Codex project'}
-        />
-    );
+    return <RouteErrorPanel error={error} title="Failed to load Codex project" />;
 }
 
 function ProjectThreadsLoadingState({ project }: { project: string }) {
@@ -112,6 +106,14 @@ function ProjectThreadsLoadingState({ project }: { project: string }) {
 
 const toError = (error: unknown) => (error instanceof Error ? error : new Error(String(error)));
 
+const getThreadExportErrorMessage = (error: unknown): string | null => {
+    if (!error) {
+        return null;
+    }
+
+    return error instanceof Error ? error.message : 'Thread export failed';
+};
+
 function ProjectDetailPage() {
     const navigate = useNavigate({ from: Route.fullPath });
     const params = Route.useParams();
@@ -168,39 +170,29 @@ function ProjectDetailPage() {
     });
 
     const exportThreadMutation = useMutation({
-        mutationFn: async (options: {
-            includeCommentary: boolean;
-            includeTools: boolean;
-            includeMetadata: boolean;
-            outputFormat: 'md' | 'txt';
-            zipArchive: boolean;
-        }) => {
-            if (!pendingExport) {
-                throw new Error('No thread selected for export');
-            }
-
+        mutationFn: async ({ ids, options }: ExportSelectionMutationInput) => {
             console.info('[spiracha:export-ui] request', {
                 outputFormat: options.outputFormat,
                 project,
-                selectedThreadCount: pendingExport.threadIds.length,
-                selectedThreadIds: pendingExport.threadIds,
+                selectedThreadCount: ids.length,
+                selectedThreadIds: ids,
                 zipArchive: options.zipArchive,
             });
 
             const download =
-                pendingExport.threadIds.length === 1
+                ids.length === 1
                     ? await exportThreadFn({
                           data: {
                               ...options,
                               ...settings,
-                              threadId: pendingExport.threadIds[0]!,
+                              threadId: ids[0]!,
                           },
                       })
                     : await exportThreadsFn({
                           data: {
                               ...options,
                               ...settings,
-                              threadIds: pendingExport.threadIds,
+                              threadIds: [...ids],
                           },
                       });
 
@@ -209,7 +201,7 @@ function ProjectDetailPage() {
                 fileName: download.fileName,
                 mode: download.mode,
                 project,
-                selectedThreadCount: pendingExport.threadIds.length,
+                selectedThreadCount: ids.length,
             });
 
             if (download.mode === 'download') {
@@ -219,12 +211,12 @@ function ProjectDetailPage() {
 
             await downloadUrlFile(download.fileName, download.downloadUrl);
         },
-        onError: (error) => {
+        onError: (error, variables) => {
             console.error('[spiracha:export-ui] failed', {
                 error: error instanceof Error ? error.message : String(error),
                 project,
-                selectedThreadCount: pendingExport?.threadIds.length ?? 0,
-                selectedThreadIds: pendingExport?.threadIds ?? [],
+                selectedThreadCount: variables.ids.length,
+                selectedThreadIds: variables.ids,
             });
         },
         onSuccess: () => {
@@ -354,6 +346,7 @@ function ProjectDetailPage() {
                 confirmLabel={getDeleteConfirmLabel(pendingDelete, deleteThreadMutation.isPending)}
                 defaultDeleteSessionFiles
                 description={getDeleteDescription(pendingDelete)}
+                errorMessage={getMutationErrorMessage(deleteThreadMutation.error, 'Thread delete failed')}
                 open={pendingDelete !== null}
                 showDeleteSessionFilesOption
                 title={getDeleteTitle(pendingDelete)}
@@ -369,19 +362,28 @@ function ProjectDetailPage() {
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingDelete(null);
+                        deleteThreadMutation.reset();
                     }
                 }}
             />
 
             <ExportDialog
+                errorMessage={getThreadExportErrorMessage(exportThreadMutation.error)}
                 forceZipArchive={shouldForceZipArchive(pendingExport)}
                 open={pendingExport !== null}
                 pending={exportThreadMutation.isPending}
                 title={pendingExport ? `Export ${pendingExport.threadLabel}` : 'Export thread'}
-                onExport={(options) => exportThreadMutation.mutate(options)}
+                onExport={(options) => {
+                    if (pendingExport) {
+                        exportThreadMutation.mutate(
+                            createExportSelectionMutationInput(pendingExport.threadIds, options),
+                        );
+                    }
+                }}
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingExport(null);
+                        exportThreadMutation.reset();
                     }
                 }}
             />

package/apps/ui/src/routes/codex.index.tsx

@@ -7,9 +7,10 @@ import { ListSearchInput } from '#/components/list-search-input';
 import { PageHeader } from '#/components/page-header';
 import { ProjectsLoadingState } from '#/components/projects-loading-state';
 import { ProjectsTable } from '#/components/projects-table';
-import { ReloadErrorPanel } from '#/components/reload-error-panel';
+import { RouteErrorPanel } from '#/components/route-error-panel';
 import { projectsQueryOptions } from '#/lib/codex-queries';
 import { deleteProjectFn } from '#/lib/codex-server';
+import { getMutationErrorMessage } from '#/lib/mutation-error';
 import { parseTextQuerySearch, withTextQuerySearch } from '#/lib/route-search';
 import { matchesTextQuery } from '#/lib/text-filter';
 
@@ -22,15 +23,7 @@ export const Route = createFileRoute('/codex/')({
 });
 
 function ProjectsErrorComponent({ error }: { error: Error }) {
-    const isSqlite = error.message.includes('unable to open database') || error.message.includes('database is locked');
-    return (
-        <ReloadErrorPanel
-            description={
-                isSqlite ? 'Codex may have an exclusive lock on the database. Reload to retry.' : error.message
-            }
-            title={isSqlite ? 'Database unavailable' : 'Failed to load Codex inventory'}
-        />
-    );
+    return <RouteErrorPanel error={error} title="Failed to load Codex inventory" />;
 }
 
 function ProjectsPage() {
@@ -93,6 +86,7 @@ function ProjectsPage() {
                         ? `Delete ${pendingDelete.threadCount} thread records for the derived project "${pendingDelete.name}" from the Codex database. Enable Delete Session files to remove the rollout JSONL files too.`
                         : ''
                 }
+                errorMessage={getMutationErrorMessage(deleteProjectMutation.error, 'Project delete failed')}
                 open={pendingDelete !== null}
                 showDeleteSessionFilesOption
                 title="Delete Codex project?"
@@ -108,6 +102,7 @@ function ProjectsPage() {
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingDelete(null);
+                        deleteProjectMutation.reset();
                     }
                 }}
             />

package/apps/ui/src/routes/cursor-threads.$composerId.tsx

@@ -11,27 +11,22 @@ import { LoadingPanel } from '#/components/loading-panel';
 import { MetadataSection } from '#/components/metadata-section';
 import { MetricCard } from '#/components/metric-card';
 import { PageHeader } from '#/components/page-header';
-import { ReloadErrorPanel } from '#/components/reload-error-panel';
+import { RouteErrorPanel } from '#/components/route-error-panel';
 import { DEFAULT_SHOW_USER_MESSAGES, TranscriptView } from '#/components/transcript-view';
 import { Button } from '#/components/ui/button';
 import { Checkbox } from '#/components/ui/checkbox';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '#/components/ui/tabs';
-import { cursorThreadDetailQueryOptions } from '#/lib/cursor-queries';
+import { cursorThreadDetailQueryOptions, cursorWorkspacesQueryOptions } from '#/lib/cursor-queries';
 import { deleteCursorThreadsFn, exportCursorThreadFn, type getCursorThreadDetailFn } from '#/lib/cursor-server';
 import { cursorTranscriptToThreadEvents, getCursorThreadTranscriptStats } from '#/lib/cursor-transcript-events';
 import { downloadTextFile, downloadUrlFile } from '#/lib/download';
+import type { ExportDialogOptions } from '#/lib/export-options';
 import { formatBytes, formatDateTime, formatList, formatNumber } from '#/lib/formatters';
+import { RouteStateResetBoundary } from '#/lib/route-state-reset';
+import { shouldNavigateToSourceIndexAfterDelete } from '#/lib/workspace-delete-navigation';
 
 type CursorThreadDetail = Awaited<ReturnType<typeof getCursorThreadDetailFn>>;
 
-type ExportDialogOptions = {
-    includeCommentary: boolean;
-    includeMetadata: boolean;
-    includeTools: boolean;
-    outputFormat: 'md' | 'txt';
-    zipArchive: boolean;
-};
-
 type TranscriptControlsProps = {
     rawJsonDisabled?: boolean;
     showCommentary: boolean;
@@ -208,7 +203,7 @@ const CursorThreadRawPanels = ({ detail, events }: { detail: CursorThreadDetail;
 };
 
 const CursorThreadDetailErrorComponent = ({ error }: { error: Error }) => {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Cursor thread" />;
+    return <RouteErrorPanel error={error} title="Failed to load Cursor thread" />;
 };
 
 const CursorThreadDetailPage = () => {
@@ -231,15 +226,26 @@ const CursorThreadDetailPage = () => {
     const deleteThreadMutation = useMutation({
         mutationFn: () => deleteCursorThreadsFn({ data: { composerIds: [detail.thread.composerId] } }),
         onSuccess: async () => {
-            await navigate({
-                params: { workspaceKey: detail.thread.workspaceKey },
-                to: '/cursor/$workspaceKey',
-            });
             await Promise.all([
                 queryClient.invalidateQueries({ queryKey: ['cursor-thread', detail.thread.composerId] }),
                 queryClient.invalidateQueries({ queryKey: ['cursor-threads', detail.thread.workspaceKey] }),
                 queryClient.invalidateQueries({ queryKey: ['cursor-workspaces'] }),
             ]);
+            const workspaces = await queryClient.fetchQuery(cursorWorkspacesQueryOptions());
+            if (
+                shouldNavigateToSourceIndexAfterDelete(
+                    workspaces,
+                    detail.thread.workspaceKey,
+                    (workspace) => workspace.key,
+                )
+            ) {
+                await navigate({ to: '/cursor' });
+                return;
+            }
+            await navigate({
+                params: { workspaceKey: detail.thread.workspaceKey },
+                to: '/cursor/$workspaceKey',
+            });
         },
     });
 
@@ -422,7 +428,14 @@ const CursorThreadDetailPage = () => {
 };
 
 export const Route = createFileRoute('/cursor-threads/$composerId')({
-    component: CursorThreadDetailPage,
+    component: () => {
+        const { composerId } = Route.useParams();
+        return (
+            <RouteStateResetBoundary routeKey={composerId}>
+                <CursorThreadDetailPage />
+            </RouteStateResetBoundary>
+        );
+    },
     errorComponent: CursorThreadDetailErrorComponent,
     loader: ({ context, params }) =>
         context.queryClient.ensureQueryData(cursorThreadDetailQueryOptions(params.composerId)),

package/apps/ui/src/routes/cursor.$workspaceKey.tsx

@@ -9,7 +9,7 @@ import { ExportDialog } from '#/components/export-dialog';
 import { ListSearchInput } from '#/components/list-search-input';
 import { LoadingPanel } from '#/components/loading-panel';
 import { PageHeader } from '#/components/page-header';
-import { ReloadErrorPanel } from '#/components/reload-error-panel';
+import { RouteErrorPanel } from '#/components/route-error-panel';
 import { Button } from '#/components/ui/button';
 import { cursorThreadsQueryOptions, cursorWorkspacesQueryOptions } from '#/lib/cursor-queries';
 import {
@@ -20,6 +20,8 @@ import {
     recoverCursorWorkspaceFn,
 } from '#/lib/cursor-server';
 import { downloadTextFile, downloadUrlFile } from '#/lib/download';
+import { createExportSelectionMutationInput, type ExportSelectionMutationInput } from '#/lib/export-mutation';
+import { getMutationErrorMessage } from '#/lib/mutation-error';
 import { matchesTextQuery } from '#/lib/text-filter';
 import { isWorkspaceEmptiedByDelete } from '#/lib/workspace-delete-navigation';
 
@@ -32,14 +34,6 @@ type PendingCursorExport = {
     label: string;
 };
 
-type ExportDialogOptions = {
-    includeCommentary: boolean;
-    includeMetadata: boolean;
-    includeTools: boolean;
-    outputFormat: 'md' | 'txt';
-    zipArchive: boolean;
-};
-
 const findWorkspaceOrThrow = (workspaces: CursorWorkspaceGroup[], workspaceKey: string) => {
     const workspace = workspaces.find((candidate) => candidate.key === workspaceKey);
     if (!workspace) {
@@ -114,7 +108,7 @@ const getCursorDeleteTitle = (pendingDelete: PendingCursorDelete | null) => {
 };
 
 const CursorWorkspaceErrorComponent = ({ error }: { error: Error }) => {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Cursor workspace" />;
+    return <RouteErrorPanel error={error} title="Failed to load Cursor workspace" />;
 };
 
 const CursorWorkspacePage = () => {
@@ -149,6 +143,7 @@ const CursorWorkspacePage = () => {
         onSuccess: async (_result, target) => {
             if (target.kind === 'workspace') {
                 await navigate({ to: '/cursor' });
+                queryClient.removeQueries({ queryKey: ['cursor-thread'] });
                 await queryClient.invalidateQueries({ queryKey: ['cursor-workspaces'] });
                 setPendingDelete(null);
                 return;
@@ -159,6 +154,9 @@ const CursorWorkspacePage = () => {
                 target.threads.map((thread) => thread.composerId),
                 (thread) => thread.composerId,
             );
+            for (const thread of target.threads) {
+                queryClient.removeQueries({ queryKey: ['cursor-thread', thread.composerId] });
+            }
             setPendingDelete(null);
             if (workspaceEmptied) {
                 await navigate({ to: '/cursor' });
@@ -169,23 +167,19 @@ const CursorWorkspacePage = () => {
     });
 
     const exportMutation = useMutation({
-        mutationFn: async (options: ExportDialogOptions) => {
-            if (!pendingExport) {
-                throw new Error('No thread selected for export');
-            }
-
+        mutationFn: async ({ ids, options }: ExportSelectionMutationInput) => {
             const download =
-                pendingExport.composerIds.length === 1
+                ids.length === 1
                     ? await exportCursorThreadFn({
                           data: {
                               ...options,
-                              composerId: pendingExport.composerIds[0]!,
+                              composerId: ids[0]!,
                           },
                       })
                     : await exportCursorThreadsFn({
                           data: {
                               ...options,
-                              composerIds: pendingExport.composerIds,
+                              composerIds: [...ids],
                           },
                       });
 
@@ -253,11 +247,11 @@ const CursorWorkspacePage = () => {
 
             <CursorWorkspaceErrors
                 deleteError={deleteMutation.isError ? deleteMutation.error : null}
-                exportError={exportMutation.isError ? exportMutation.error : null}
                 recoverError={recoverWorkspaceMutation.isError ? recoverWorkspaceMutation.error : null}
             />
 
             <CursorWorkspaceDeleteDialog
+                errorMessage={getMutationErrorMessage(deleteMutation.error, 'Delete failed')}
                 pending={deleteMutation.isPending}
                 pendingDelete={pendingDelete}
                 onConfirm={() => {
@@ -270,19 +264,32 @@ const CursorWorkspacePage = () => {
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingDelete(null);
+                        deleteMutation.reset();
                     }
                 }}
             />
 
             <ExportDialog
+                errorMessage={
+                    exportMutation.isError
+                        ? exportMutation.error instanceof Error
+                            ? exportMutation.error.message
+                            : 'Thread export failed'
+                        : null
+                }
                 forceZipArchive={pendingExport ? pendingExport.composerIds.length > 1 : false}
                 open={pendingExport !== null}
                 pending={exportMutation.isPending}
                 title={pendingExport ? `Export ${pendingExport.label}` : 'Export thread'}
-                onExport={(options) => exportMutation.mutate(options)}
+                onExport={(options) => {
+                    if (pendingExport) {
+                        exportMutation.mutate(createExportSelectionMutationInput(pendingExport.composerIds, options));
+                    }
+                }}
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingExport(null);
+                        exportMutation.reset();
                     }
                 }}
             />
@@ -358,18 +365,14 @@ const CursorWorkspaceRecoveryNotice = ({ workspace }: { workspace: CursorWorkspa
 
 const CursorWorkspaceErrors = ({
     deleteError,
-    exportError,
     recoverError,
 }: {
     deleteError: Error | null;
-    exportError: Error | null;
     recoverError: Error | null;
 }) => {
-    const entries = [
-        recoverError ? recoverError.message : null,
-        deleteError ? deleteError.message : null,
-        exportError ? exportError.message : null,
-    ].filter(Boolean);
+    const entries = [recoverError ? recoverError.message : null, deleteError ? deleteError.message : null].filter(
+        Boolean,
+    );
 
     if (entries.length === 0) {
         return null;
@@ -387,11 +390,13 @@ const CursorWorkspaceErrors = ({
 };
 
 const CursorWorkspaceDeleteDialog = ({
+    errorMessage,
     pending,
     pendingDelete,
     onConfirm,
     onOpenChange,
 }: {
+    errorMessage: string | null;
     pending: boolean;
     pendingDelete: PendingCursorDelete | null;
     onConfirm: () => void;
@@ -401,6 +406,7 @@ const CursorWorkspaceDeleteDialog = ({
         <DeleteConfirmDialog
             confirmLabel={getCursorDeleteConfirmLabel(pendingDelete, pending)}
             description={getCursorDeleteDescription(pendingDelete)}
+            errorMessage={errorMessage}
             open={pendingDelete !== null}
             title={getCursorDeleteTitle(pendingDelete)}
             onConfirm={onConfirm}

package/apps/ui/src/routes/cursor.index.tsx

@@ -6,13 +6,14 @@ import { CursorWorkspacesTable } from '#/components/cursor-workspaces-table';
 import { DeleteConfirmDialog } from '#/components/delete-confirm-dialog';
 import { ListSearchInput } from '#/components/list-search-input';
 import { PageHeader } from '#/components/page-header';
-import { ReloadErrorPanel } from '#/components/reload-error-panel';
+import { RouteErrorPanel } from '#/components/route-error-panel';
 import { cursorWorkspacesQueryOptions } from '#/lib/cursor-queries';
 import { deleteCursorWorkspaceFn, recoverCursorWorkspaceFn } from '#/lib/cursor-server';
+import { getMutationErrorMessage } from '#/lib/mutation-error';
 import { matchesTextQuery } from '#/lib/text-filter';
 
 const CursorErrorComponent = ({ error }: { error: Error }) => {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Cursor workspaces" />;
+    return <RouteErrorPanel error={error} title="Failed to load Cursor workspaces" />;
 };
 
 const CursorPage = () => {
@@ -94,6 +95,7 @@ const CursorPage = () => {
                         ? `Permanently delete every thread for "${pendingDelete.label}" from Cursor's database and remove any on-disk transcript directories. Quit Cursor first. This cannot be undone.`
                         : ''
                 }
+                errorMessage={getMutationErrorMessage(deleteWorkspaceMutation.error, 'Workspace deletion failed')}
                 open={pendingDelete !== null}
                 title="Delete Cursor workspace?"
                 onConfirm={() => {
@@ -106,6 +108,7 @@ const CursorPage = () => {
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingDelete(null);
+                        deleteWorkspaceMutation.reset();
                     }
                 }}
             />