spiracha 2.1.0 → 2.2.0

package/apps/ui/src/routes/__root.tsx

@@ -3,6 +3,8 @@ import { createRootRouteWithContext, HeadContent, Outlet, Scripts } from '@tanst
 import type { ReactNode } from 'react';
 import { AppShell } from '#/components/app-shell';
 import { TooltipProvider } from '#/components/ui/tooltip';
+import { getErrorPresentation } from '#/lib/error-presentation';
+import { getInitialSettingsFn } from '#/lib/settings-server';
 import { SettingsProvider } from '#/lib/settings-store';
 import appCss from '#/styles.css?url';
 
@@ -23,26 +25,18 @@ const themeInitScript = `
 `;
 
 function RootErrorComponent({ error }: { error: Error }) {
-    const isSqliteError =
-        error.message.includes('unable to open database') ||
-        error.message.includes('database is locked') ||
-        error.message.includes('SQLITE_');
+    const presentation = getErrorPresentation(error, { fallbackTitle: 'Something went wrong' });
 
     return (
         <div className="flex min-h-screen items-center justify-center bg-[#101418] px-4 text-[#eef3f7]">
             <div className="max-w-[30rem] text-center">
-                <h1 className="mb-3 font-semibold text-base">
-                    {isSqliteError ? 'Database unavailable' : 'Something went wrong'}
-                </h1>
-                {isSqliteError ? (
-                    <p className="my-2 text-[#99a3af] text-[0.875rem] leading-6">
-                        Spiracha could not open the Codex SQLite database. Codex may have an exclusive lock on the file,
-                        or the database does not exist yet. Close Codex or wait a moment, then reload.
-                    </p>
+                <h1 className="mb-3 font-semibold text-base">{presentation.title}</h1>
+                {presentation.isDatabaseError ? (
+                    <p className="my-2 text-[#99a3af] text-[0.875rem] leading-6">{presentation.description}</p>
                 ) : (
                     <p className="my-2 text-[#99a3af] text-[0.875rem] leading-6">
                         <code className="rounded border border-white/10 bg-[#12181e] px-1.5 py-1 text-[0.8em]">
-                            {error.message}
+                            {presentation.description}
                         </code>
                     </p>
                 )}
@@ -87,7 +81,7 @@ export const Route = createRootRouteWithContext<RouterContext>()({
             },
             {
                 content:
-                    'Browse local Codex, Claude Code, Kiro, Qoder, Cursor, Antigravity, and OpenCode history through a compact workspace UI.',
+                    'Browse local Codex, Claude Code, Grok, Kiro, Qoder, Cursor, Antigravity, and OpenCode history through a compact workspace UI.',
                 name: 'description',
             },
             {
@@ -95,12 +89,15 @@ export const Route = createRootRouteWithContext<RouterContext>()({
             },
         ],
     }),
+    loader: () => getInitialSettingsFn(),
 });
 
 function RootComponent() {
+    const initialSettings = Route.useLoaderData();
+
     return (
         <RootDocument>
-            <SettingsProvider>
+            <SettingsProvider initialSettings={initialSettings}>
                 <TooltipProvider>
                     <AppShell>
                         <Outlet />

package/apps/ui/src/routes/analytics.tsx

@@ -1,9 +1,7 @@
-import type { ModelTokenSummary, ToolUsageSummary } from '@spiracha/lib/codex-browser-types';
 import { useSuspenseQuery } from '@tanstack/react-query';
 import { createFileRoute, useNavigate } from '@tanstack/react-router';
-import { createColumnHelper } from '@tanstack/react-table';
 import { startTransition } from 'react';
-import { DataTable } from '#/components/data-table';
+import { AnalyticsBreakdowns } from '#/components/analytics-breakdowns';
 import { MetricCard } from '#/components/metric-card';
 import { PageHeader } from '#/components/page-header';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '#/components/ui/select';
@@ -16,34 +14,6 @@ import {
     withAnalyticsProjectSearch,
 } from '#/lib/route-search';
 
-const toolUsageColumnHelper = createColumnHelper<ToolUsageSummary>();
-const toolUsageColumns = [
-    toolUsageColumnHelper.accessor('name', {
-        cell: (info) => <span className="font-mono text-sm">{info.getValue()}</span>,
-        header: 'Tool',
-    }),
-    toolUsageColumnHelper.accessor('count', {
-        cell: (info) => <span className="font-mono text-sm">{formatNumber(info.getValue())}</span>,
-        header: 'Calls',
-    }),
-] as const;
-
-const modelColumnHelper = createColumnHelper<ModelTokenSummary>();
-const modelColumns = [
-    modelColumnHelper.accessor('model', {
-        cell: (info) => <span className="font-mono text-sm">{info.getValue()}</span>,
-        header: 'Model',
-    }),
-    modelColumnHelper.accessor('threadCount', {
-        cell: (info) => <span className="font-mono text-sm">{formatNumber(info.getValue())}</span>,
-        header: 'Threads',
-    }),
-    modelColumnHelper.accessor('totalTokens', {
-        cell: (info) => <span className="font-mono text-sm">{formatTokens(info.getValue())}</span>,
-        header: 'Tokens',
-    }),
-] as const;
-
 export const Route = createFileRoute('/analytics')({
     component: AnalyticsPage,
     loader: ({ context, deps }) => {
@@ -98,7 +68,7 @@ function AnalyticsPage() {
                 title="Analytics"
             />
 
-            <div className="grid gap-4 md:grid-cols-2 xl:grid-cols-5">
+            <div className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
                 <MetricCard label="Threads" value={formatNumber(analytics.summary.totalThreads)} />
                 <MetricCard label="Projects" value={formatNumber(analytics.summary.totalProjects)} />
                 <MetricCard label="Tokens" value={formatTokens(analytics.summary.totalTokens)} />
@@ -106,38 +76,17 @@ function AnalyticsPage() {
                     label="Average per thread"
                     value={formatTokens(Math.round(analytics.summary.averageTokensPerThread))}
                 />
+                <MetricCard label="Median per thread" value={formatTokens(analytics.summary.medianTokensPerThread)} />
                 <MetricCard label="Web search threads" value={formatNumber(analytics.summary.threadsWithWebSearch)} />
+                <MetricCard label="Archived threads" value={formatNumber(analytics.summary.archivedThreads)} />
             </div>
 
-            <div className="grid gap-4 xl:grid-cols-2">
-                <section className="space-y-4">
-                    <div>
-                        <h3 className="font-semibold text-sm">Most frequent tool calls</h3>
-                        <p className="mt-1 text-[var(--muted-foreground)] text-sm">
-                            Useful for future prompt and tool optimization work.
-                        </p>
-                    </div>
-                    <DataTable
-                        columns={toolUsageColumns}
-                        data={analytics.toolUsage}
-                        emptyMessage="No tool calls recorded."
-                    />
-                </section>
-
-                <section className="space-y-4">
-                    <div>
-                        <h3 className="font-semibold text-sm">Model token breakdown</h3>
-                        <p className="mt-1 text-[var(--muted-foreground)] text-sm">
-                            Compare model usage and token concentration within the current project scope.
-                        </p>
-                    </div>
-                    <DataTable
-                        columns={modelColumns}
-                        data={analytics.modelsByTokens}
-                        emptyMessage="No model usage recorded."
-                    />
-                </section>
-            </div>
+            <AnalyticsBreakdowns
+                modelsByTokens={analytics.modelsByTokens}
+                reasoningEfforts={analytics.reasoningEfforts}
+                sources={analytics.sources}
+                toolUsage={analytics.toolUsage}
+            />
         </div>
     );
 }

package/apps/ui/src/routes/antigravity-conversations.$conversationId.tsx

@@ -5,12 +5,13 @@ import { useMemo, useState } from 'react';
 import { AntigravityKeychainPanel } from '#/components/antigravity-keychain-panel';
 import { Breadcrumbs } from '#/components/breadcrumbs';
 import { DeleteConfirmDialog } from '#/components/delete-confirm-dialog';
+import { ExportDialog } from '#/components/export-dialog';
 import { JsonPanel } from '#/components/json-panel';
 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 { TextDocumentPanel } from '#/components/text-document-panel';
 import { DEFAULT_SHOW_USER_MESSAGES, TranscriptView } from '#/components/transcript-view';
 import { Button } from '#/components/ui/button';
@@ -20,6 +21,7 @@ import { canExportAntigravityConversation } from '#/lib/antigravity-conversation
 import {
     antigravityConversationDetailQueryOptions,
     antigravityDecryptionQueryOptions,
+    antigravityWorkspacesQueryOptions,
 } from '#/lib/antigravity-queries';
 import {
     deleteAntigravityConversationFn,
@@ -31,8 +33,11 @@ import {
     antigravityMarkdownToThreadEvents,
     getAntigravityThreadTranscriptStats,
 } from '#/lib/antigravity-transcript-events';
-import { downloadTextFile } from '#/lib/download';
-import { formatBytes, formatDateTime, formatNumber } from '#/lib/formatters';
+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 AntigravityConversationDetail = Awaited<ReturnType<typeof getAntigravityConversationDetailFn>>;
 
@@ -97,7 +102,7 @@ const buildTranscriptStatsItems = (
 
     const stats = getAntigravityThreadTranscriptStats(events);
     return [
-        { label: 'Event kinds', value: [...new Set(events.map((event) => event.kind))].join(', ') || 'n/a' },
+        { label: 'Event kinds', value: formatList([...new Set(events.map((event) => event.kind))]) },
         { label: 'Messages', value: formatNumber(stats.messageCount) },
         { label: 'User messages', value: formatNumber(stats.userMessageCount) },
         { label: 'Assistant messages', value: formatNumber(stats.assistantMessageCount) },
@@ -117,7 +122,14 @@ const getConversationSizeLabel = (detail: AntigravityConversationDetail): string
 };
 
 export const Route = createFileRoute('/antigravity-conversations/$conversationId')({
-    component: AntigravityConversationDetailPage,
+    component: () => {
+        const { conversationId } = Route.useParams();
+        return (
+            <RouteStateResetBoundary routeKey={conversationId}>
+                <AntigravityConversationDetailPage />
+            </RouteStateResetBoundary>
+        );
+    },
     errorComponent: AntigravityConversationDetailErrorComponent,
     loader: async ({ context, params }) => {
         await Promise.all([
@@ -134,7 +146,7 @@ export const Route = createFileRoute('/antigravity-conversations/$conversationId
 });
 
 function AntigravityConversationDetailErrorComponent({ error }: { error: Error }) {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Antigravity conversation" />;
+    return <RouteErrorPanel error={error} title="Failed to load Antigravity conversation" />;
 }
 
 function AntigravityConversationHeaderActions({
@@ -307,6 +319,7 @@ function AntigravityConversationDetailPage() {
     const decryptionState = useSuspenseQuery(antigravityDecryptionQueryOptions()).data;
     const detail = useSuspenseQuery(antigravityConversationDetailQueryOptions(Route.useParams().conversationId)).data;
     const [deleteOpen, setDeleteOpen] = useState(false);
+    const [exportOpen, setExportOpen] = useState(false);
     const [showToolCalls, setShowToolCalls] = useState(false);
     const [showCommentary, setShowCommentary] = useState(false);
     const [showExtraEvents, setShowExtraEvents] = useState(false);
@@ -324,10 +337,26 @@ function AntigravityConversationDetailPage() {
     const showConversationExport = canExportConversation || detail.transcriptLocked;
 
     const exportConversationMutation = useMutation({
-        mutationFn: () =>
-            exportAntigravityConversationFn({ data: { conversationId: detail.conversation.conversationId } }),
-        onSuccess: (result) => {
-            downloadTextFile(result.filename, result.content, 'text/markdown; charset=utf-8');
+        mutationFn: async (options: ExportDialogOptions) => {
+            const download = await exportAntigravityConversationFn({
+                data: {
+                    conversationId: detail.conversation.conversationId,
+                    includeCommentary: options.includeCommentary,
+                    includeMetadata: options.includeMetadata,
+                    includeTools: options.includeTools,
+                    outputFormat: options.outputFormat,
+                    zipArchive: options.zipArchive,
+                },
+            });
+            if (download.mode === 'download') {
+                downloadTextFile(download.fileName, download.content, download.mimeType);
+                return;
+            }
+
+            await downloadUrlFile(download.fileName, download.downloadUrl);
+        },
+        onSuccess: () => {
+            setExportOpen(false);
         },
     });
 
@@ -352,6 +381,17 @@ function AntigravityConversationDetailPage() {
                     queryKey: ['antigravity-conversation', detail.conversation.conversationId],
                 }),
             ]);
+            const workspaces = await queryClient.fetchQuery(antigravityWorkspacesQueryOptions());
+            if (
+                shouldNavigateToSourceIndexAfterDelete(
+                    workspaces,
+                    detail.conversationGroup.key,
+                    (workspace) => workspace.key,
+                )
+            ) {
+                navigate({ to: '/antigravity' });
+                return;
+            }
             navigate({
                 params: { workspaceKey: detail.conversationGroup.key },
                 to: '/antigravity/$workspaceKey',
@@ -371,7 +411,7 @@ function AntigravityConversationDetailPage() {
                         showConversationExport={showConversationExport}
                         onDeleteConversation={() => setDeleteOpen(true)}
                         onExportArtifacts={() => exportArtifactsMutation.mutate()}
-                        onExportConversation={() => exportConversationMutation.mutate()}
+                        onExportConversation={() => setExportOpen(true)}
                     />
                 }
                 breadcrumb={
@@ -463,14 +503,6 @@ function AntigravityConversationDetailPage() {
                 </TabsContent>
             </Tabs>
 
-            {exportConversationMutation.isError ? (
-                <p className="text-[var(--destructive)] text-sm">
-                    {exportConversationMutation.error instanceof Error
-                        ? exportConversationMutation.error.message
-                        : 'Conversation export failed'}
-                </p>
-            ) : null}
-
             {exportArtifactsMutation.isError ? (
                 <p className="text-[var(--destructive)] text-sm">
                     {exportArtifactsMutation.error instanceof Error
@@ -479,6 +511,28 @@ function AntigravityConversationDetailPage() {
                 </p>
             ) : null}
 
+            <ExportDialog
+                errorMessage={
+                    exportConversationMutation.isError
+                        ? exportConversationMutation.error instanceof Error
+                            ? exportConversationMutation.error.message
+                            : 'Conversation export failed'
+                        : null
+                }
+                open={exportOpen}
+                pending={exportConversationMutation.isPending}
+                showCommentaryOption={detail.conversation.transcriptSource !== 'safe-storage'}
+                showToolsOption={detail.conversation.transcriptSource !== 'safe-storage'}
+                title={`Export ${detail.conversation.title}`}
+                onExport={(options) => exportConversationMutation.mutate(options)}
+                onOpenChange={(open) => {
+                    setExportOpen(open);
+                    if (!open) {
+                        exportConversationMutation.reset();
+                    }
+                }}
+            />
+
             <DeleteConfirmDialog
                 confirmLabel={deleteConversationMutation.isPending ? 'Deleting...' : 'Delete conversation'}
                 description="Permanently delete this Antigravity conversation from disk. This removes its summary entry, conversation file, transcript logs, and generated artifacts."

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

@@ -10,7 +10,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 {
     antigravityConversationsQueryOptions,
@@ -21,21 +21,13 @@ import {
     deleteAntigravityConversationFn,
     deleteAntigravityConversationsFn,
     exportAntigravityArtifactsFn,
-    exportAntigravityConversationFn,
     exportAntigravityConversationsFn,
 } from '#/lib/antigravity-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 PendingConversationDelete = {
     conversations: AntigravityConversation[];
     scope: 'all' | 'selected';
@@ -44,6 +36,7 @@ type PendingConversationDelete = {
 type PendingConversationExport = {
     conversationIds: string[];
     label: string;
+    supportsTranscriptFilters: boolean;
 };
 
 const findWorkspaceOrThrow = (workspaces: AntigravityWorkspaceGroup[], workspaceKey: string) => {
@@ -61,6 +54,9 @@ const buildConversationExport = (selectedConversations: AntigravityConversation[
         selectedConversations.length === 1
             ? selectedConversations[0]!.title
             : `${selectedConversations.length} selected conversations`,
+    supportsTranscriptFilters: selectedConversations.every(
+        (conversation) => conversation.transcriptSource !== 'safe-storage',
+    ),
 });
 
 const getDeleteConfirmLabel = (pendingDelete: PendingConversationDelete | null, isPending: boolean) => {
@@ -101,32 +97,12 @@ const getDeleteTitle = (pendingDelete: PendingConversationDelete | null) => {
         : 'Delete this Antigravity conversation?';
 };
 
-const AntigravityWorkspaceErrors = ({
-    artifactError,
-    batchExportError,
-    conversationError,
-}: {
-    artifactError: Error | null;
-    batchExportError: Error | null;
-    conversationError: Error | null;
-}) => {
-    const messages = [conversationError?.message, artifactError?.message, batchExportError?.message].filter(
-        (message): message is string => Boolean(message),
-    );
-
-    if (messages.length === 0) {
+const AntigravityWorkspaceErrors = ({ artifactError }: { artifactError: Error | null }) => {
+    if (!artifactError) {
         return null;
     }
 
-    return (
-        <div className="space-y-1">
-            {messages.map((message) => (
-                <p className="text-[var(--destructive)] text-sm" key={message}>
-                    {message}
-                </p>
-            ))}
-        </div>
-    );
+    return <p className="text-[var(--destructive)] text-sm">{artifactError.message}</p>;
 };
 
 export const Route = createFileRoute('/antigravity/$workspaceKey')({
@@ -149,7 +125,7 @@ export const Route = createFileRoute('/antigravity/$workspaceKey')({
 });
 
 function AntigravityWorkspaceErrorComponent({ error }: { error: Error }) {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Antigravity workspace" />;
+    return <RouteErrorPanel error={error} title="Failed to load Antigravity workspace" />;
 }
 
 function AntigravityWorkspacePage() {
@@ -165,14 +141,6 @@ function AntigravityWorkspacePage() {
     const [pendingExport, setPendingExport] = useState<PendingConversationExport | null>(null);
     const deferredSearch = useDeferredValue(searchInput);
 
-    const exportConversationMutation = useMutation({
-        mutationFn: (conversation: AntigravityConversation) =>
-            exportAntigravityConversationFn({ data: { conversationId: conversation.conversationId } }),
-        onSuccess: (result) => {
-            downloadTextFile(result.filename, result.content, 'text/markdown; charset=utf-8');
-        },
-    });
-
     const exportArtifactsMutation = useMutation({
         mutationFn: (conversation: AntigravityConversation) =>
             exportAntigravityArtifactsFn({ data: { conversationId: conversation.conversationId } }),
@@ -182,14 +150,13 @@ function AntigravityWorkspacePage() {
     });
 
     const exportConversationsMutation = useMutation({
-        mutationFn: async (options: ExportDialogOptions) => {
-            if (!pendingExport) {
-                throw new Error('No Antigravity conversation selected for export');
-            }
-
+        mutationFn: async ({ ids, options }: ExportSelectionMutationInput) => {
             const download = await exportAntigravityConversationsFn({
                 data: {
-                    conversationIds: pendingExport.conversationIds,
+                    conversationIds: [...ids],
+                    includeCommentary: options.includeCommentary,
+                    includeMetadata: options.includeMetadata,
+                    includeTools: options.includeTools,
                     outputFormat: options.outputFormat,
                     zipArchive: options.zipArchive,
                 },
@@ -212,14 +179,7 @@ function AntigravityWorkspacePage() {
             conversationIds.length === 1
                 ? deleteAntigravityConversationFn({ data: { conversationId: conversationIds[0]! } })
                 : deleteAntigravityConversationsFn({ data: { conversationIds } }),
-        onSuccess: async (result) => {
-            const conversationIds = result.deletedConversationIds;
-            const workspaceEmptied = isWorkspaceEmptiedByDelete(
-                conversations,
-                conversationIds,
-                (conversation) => conversation.conversationId,
-            );
-            setPendingDelete(null);
+        onSettled: async (_result, _error, conversationIds) => {
             await Promise.all([
                 queryClient.invalidateQueries({ queryKey: ['antigravity-workspaces'] }),
                 queryClient.invalidateQueries({ queryKey: ['antigravity-conversations', workspace.key] }),
@@ -229,6 +189,15 @@ function AntigravityWorkspacePage() {
                     }),
                 ),
             ]);
+        },
+        onSuccess: async (result) => {
+            const conversationIds = result.deletedConversationIds;
+            const workspaceEmptied = isWorkspaceEmptiedByDelete(
+                conversations,
+                conversationIds,
+                (conversation) => conversation.conversationId,
+            );
+            setPendingDelete(null);
             if (workspaceEmptied) {
                 await navigate({ to: '/antigravity' });
             }
@@ -308,7 +277,7 @@ function AntigravityWorkspacePage() {
                     openDeleteForConversations(lookupSelectedConversations(conversationIds), 'selected')
                 }
                 onExportArtifacts={(conversation) => exportArtifactsMutation.mutate(conversation)}
-                onExportConversation={(conversation) => exportConversationMutation.mutate(conversation)}
+                onExportConversation={(conversation) => openExportForConversations([conversation])}
                 onExportConversations={(conversationIds) =>
                     openExportForConversations(lookupSelectedConversations(conversationIds))
                 }
@@ -316,16 +285,29 @@ function AntigravityWorkspacePage() {
 
             <AntigravityWorkspaceErrors
                 artifactError={exportArtifactsMutation.isError ? exportArtifactsMutation.error : null}
-                batchExportError={exportConversationsMutation.isError ? exportConversationsMutation.error : null}
-                conversationError={exportConversationMutation.isError ? exportConversationMutation.error : null}
             />
 
             <ExportDialog
+                errorMessage={
+                    exportConversationsMutation.isError
+                        ? exportConversationsMutation.error instanceof Error
+                            ? exportConversationsMutation.error.message
+                            : 'Conversation export failed'
+                        : null
+                }
                 forceZipArchive={pendingExport ? pendingExport.conversationIds.length > 1 : false}
                 open={pendingExport !== null}
                 pending={exportConversationsMutation.isPending}
+                showCommentaryOption={pendingExport?.supportsTranscriptFilters ?? true}
+                showToolsOption={pendingExport?.supportsTranscriptFilters ?? true}
                 title={pendingExport ? `Export ${pendingExport.label}` : 'Export conversation'}
-                onExport={(options) => exportConversationsMutation.mutate(options)}
+                onExport={(options) => {
+                    if (pendingExport) {
+                        exportConversationsMutation.mutate(
+                            createExportSelectionMutationInput(pendingExport.conversationIds, options),
+                        );
+                    }
+                }}
                 onOpenChange={(open) => {
                     if (!open) {
                         setPendingExport(null);

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

@@ -5,7 +5,7 @@ import { AntigravityKeychainPanel } from '#/components/antigravity-keychain-pane
 import { AntigravityWorkspacesTable } from '#/components/antigravity-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 { antigravityWorkspacesQueryOptions } from '#/lib/antigravity-queries';
 import { matchesTextQuery } from '#/lib/text-filter';
 
@@ -16,7 +16,7 @@ export const Route = createFileRoute('/antigravity/')({
 });
 
 function AntigravityErrorComponent({ error }: { error: Error }) {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Antigravity workspaces" />;
+    return <RouteErrorPanel error={error} title="Failed to load Antigravity workspaces" />;
 }
 
 function AntigravityPage() {

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

@@ -12,7 +12,7 @@ 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';
@@ -20,6 +20,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from '#/components/ui/tabs';
 import {
     claudeCodeSessionDetailQueryOptions,
     claudeCodeSessionTranscriptQueryOptions,
+    claudeCodeWorkspacesQueryOptions,
 } from '#/lib/claude-code-queries';
 import { deleteClaudeCodeSessionFn, exportClaudeCodeSessionFn } from '#/lib/claude-code-server';
 import {
@@ -27,15 +28,10 @@ import {
     getClaudeCodeThreadTranscriptStats,
 } from '#/lib/claude-code-transcript-events';
 import { downloadTextFile, downloadUrlFile } from '#/lib/download';
+import type { ExportDialogOptions } from '#/lib/export-options';
 import { formatDateTime, formatList, formatNumber, formatTokens } from '#/lib/formatters';
-
-type ExportDialogOptions = {
-    includeCommentary: boolean;
-    includeMetadata: boolean;
-    includeTools: boolean;
-    outputFormat: 'md' | 'txt';
-    zipArchive: boolean;
-};
+import { RouteStateResetBoundary } from '#/lib/route-state-reset';
+import { shouldNavigateToSourceIndexAfterDelete } from '#/lib/workspace-delete-navigation';
 
 type TranscriptControlsProps = {
     rawJsonDisabled?: boolean;
@@ -52,7 +48,14 @@ type TranscriptControlsProps = {
 };
 
 export const Route = createFileRoute('/claude-code-sessions/$sessionId')({
-    component: ClaudeCodeSessionDetailPage,
+    component: () => {
+        const { sessionId } = Route.useParams();
+        return (
+            <RouteStateResetBoundary routeKey={sessionId}>
+                <ClaudeCodeSessionDetailPage />
+            </RouteStateResetBoundary>
+        );
+    },
     errorComponent: ClaudeCodeSessionDetailErrorComponent,
     loader: ({ context, params }) =>
         context.queryClient.ensureQueryData(claudeCodeSessionDetailQueryOptions(params.sessionId)),
@@ -65,7 +68,7 @@ export const Route = createFileRoute('/claude-code-sessions/$sessionId')({
 });
 
 function ClaudeCodeSessionDetailErrorComponent({ error }: { error: Error }) {
-    return <ReloadErrorPanel description={error.message} title="Failed to load Claude Code session" />;
+    return <RouteErrorPanel error={error} title="Failed to load Claude Code session" />;
 }
 
 const buildSessionMetadata = (detail: ClaudeCodeSessionTranscript) => [
@@ -285,6 +288,17 @@ function ClaudeCodeSessionDetailPage() {
                 queryClient.invalidateQueries({ queryKey: ['claude-code-session', params.sessionId] }),
                 queryClient.invalidateQueries({ queryKey: ['claude-code-session-transcript', params.sessionId] }),
             ]);
+            const workspaces = await queryClient.fetchQuery(claudeCodeWorkspacesQueryOptions());
+            if (
+                shouldNavigateToSourceIndexAfterDelete(
+                    workspaces,
+                    detail.session.workspaceKey,
+                    (workspace) => workspace.key,
+                )
+            ) {
+                navigate({ to: '/claude-code' });
+                return;
+            }
             navigate({
                 params: { workspaceKey: detail.session.workspaceKey },
                 to: '/claude-code/$workspaceKey',