Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(desktop-app): r6-b2 preserve state on scope invalidation

Josué998ea58290f2
diff --git a/desktop-app/ui/src/App.tsx b/desktop-app/ui/src/App.tsx
index fa123a784..8b76e24c2 100644
--- a/desktop-app/ui/src/App.tsx
+++ b/desktop-app/ui/src/App.tsx
@@ -169,6 +169,14 @@ function errorCode(error: unknown): string {
return String(record.code || record.cause?.code || '').toUpperCase()
}
+function resourceStatus(error: unknown): number | undefined {
+ if (!error || typeof error !== 'object') return undefined
+ const status = (error as { status?: unknown }).status
+ if (typeof status === 'number') return status
+ const match = errorMessage(error).match(/(?:^|\D)(403|404)(?:\D|$)/)
+ return match ? Number(match[1]) : undefined
+}
+
function isTransientSandboxUiTeamContextError(error: unknown): boolean {
const message = errorMessage(error).toLowerCase()
if (
@@ -940,22 +948,6 @@ export function App() {
previewRefreshGenerationRef.current.set(gfsUri, generation)
const isCurrentGeneration = () =>
previewRefreshGenerationRef.current.get(gfsUri) === generation
- // Invalidation is intentionally coarse, so purge/hide cached preview
- // content before resolving the current authorization and metadata. This
- // prevents revoked/deleted bytes from remaining visible during a slow
- // authoritative refetch; a successful resolve remounts the generic body.
- setWorkspaceTabs(state =>
- refreshPreviewTab(state, gfsUri, {
- status: 'unavailable',
- shellTitle: 'File unavailable',
- isCurrentGeneration,
- })
- )
- setPluginGfsPreview(current =>
- isCurrentGeneration() && current?.gfsUri === gfsUri
- ? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
- : current
- )
try {
const resource = await window.clerum.gfs.resolve(gfsUri)
if (previewRefreshGenerationRef.current.get(gfsUri) !== generation) return
@@ -1026,29 +1018,37 @@ export function App() {
if (retryTimer !== undefined) window.clearTimeout(retryTimer)
previewRetryTimersRef.current.delete(gfsUri)
previewRetryAttemptRef.current.delete(gfsUri)
- } catch {
+ } catch (error) {
if (previewRefreshGenerationRef.current.get(gfsUri) !== generation) return
- setWorkspaceTabs(state =>
- refreshPreviewTab(state, gfsUri, {
- status: 'unavailable',
- shellTitle: 'File unavailable',
- isCurrentGeneration,
+ const status = resourceStatus(error)
+ if (status === 403 || status === 404) {
+ setWorkspaceTabs(state =>
+ refreshPreviewTab(state, gfsUri, {
+ status: 'unavailable',
+ shellTitle: 'File unavailable',
+ isCurrentGeneration,
+ })
+ )
+ setPluginGfsPreview(current =>
+ isCurrentGeneration() && current?.gfsUri === gfsUri
+ ? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
+ : current
+ )
+ void queryClient.invalidateQueries({
+ queryKey: desktopQueryKeys.gfsRoot,
+ refetchType: 'active',
})
- )
- setPluginGfsPreview(current =>
- isCurrentGeneration() && current?.gfsUri === gfsUri
- ? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
- : current
- )
- queryClient.removeQueries({ queryKey: desktopQueryKeys.gfsRoot })
- const attempt = (previewRetryAttemptRef.current.get(gfsUri) ?? 0) + 1
- previewRetryAttemptRef.current.set(gfsUri, attempt)
- const delayMs = Math.min(5000 * 2 ** Math.min(attempt - 1, 4), 60_000)
- const retryTimer = window.setTimeout(() => {
- previewRetryTimersRef.current.delete(gfsUri)
- void refreshOpenPreview(gfsUri, true)
- }, delayMs)
- previewRetryTimersRef.current.set(gfsUri, retryTimer)
+ }
+ if (status === undefined || status === 429 || status >= 500) {
+ const attempt = (previewRetryAttemptRef.current.get(gfsUri) ?? 0) + 1
+ previewRetryAttemptRef.current.set(gfsUri, attempt)
+ const delayMs = Math.min(5000 * 2 ** Math.min(attempt - 1, 4), 60_000)
+ const retryTimer = window.setTimeout(() => {
+ previewRetryTimersRef.current.delete(gfsUri)
+ void refreshOpenPreview(gfsUri, true)
+ }, delayMs)
+ previewRetryTimersRef.current.set(gfsUri, retryTimer)
+ }
}
},
[queryClient, setWorkspaceTabs]
@@ -1060,16 +1060,15 @@ export function App() {
if (typeof entityChangeBridge?.subscribe !== 'function') return
let active = true
let stopSubscription: (() => Promise<void>) | null = null
- const unsubscribeGfs = entityChangeRegistry.subscribe(['gfs', 'authorization'], event => {
+ const unsubscribeGfs = entityChangeRegistry.subscribe(['gfs', 'authorization'], () => {
setRemoteGfsChangeEpoch(epoch => epoch + 1)
- if (event.scopes.includes('authorization')) {
- void queryClient.resetQueries({ queryKey: desktopQueryKeys.gfsRoot })
- } else {
- void queryClient.invalidateQueries({
- queryKey: desktopQueryKeys.gfsRoot,
- refetchType: 'active',
- })
- }
+ // Scope invalidations are soft convergence hints, not proof that cached
+ // data is no longer authorized. Keep visible/paginated rows while active
+ // queries refetch; only an authoritative 403/404 purges a preview.
+ void queryClient.invalidateQueries({
+ queryKey: desktopQueryKeys.gfsRoot,
+ refetchType: 'active',
+ })
const resources = new Set(
workspaceTabsRef.current.tabs
.filter(tab => tab.kind === 'preview' && tab.preview)
diff --git a/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsx b/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsx
index 23dc0468a..b1ecb4a55 100644
--- a/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsx
+++ b/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsx
@@ -2,7 +2,7 @@
import { useReducer } from 'react'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { useNotificationsContext } from '@contexts/NotificationsContext'
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
import { DESKTOP_ROUTES } from '@constants/navigation'
import { useAppController } from '@hooks/useAppController'
import type { GfsPreviewResource } from '@lib/gfsPreview'
@@ -1259,6 +1259,105 @@ describe('App plugin previewable handoff — routes through resolveGfsPreview (R
})
})
+describe('App live GFS preview revalidation', () => {
+ let currentController: AppController
+ let dispatchEntityChange: ((event: unknown) => void) | null
+
+ beforeEach(() => {
+ vi.clearAllMocks()
+ dispatchEntityChange = null
+ const workspaceTabs = openPreviewTab(createWorkspaceTabsState('chat-tab-1'), {
+ id: 'preview-md',
+ title: 'README.md',
+ gfsUri: 'gfs://main/readme',
+ fileKind: 'markdown',
+ byteLength: 14,
+ resourceVersion: 3,
+ })
+ currentController = makeController({ workspaceTabs } as Partial<AppController>)
+ vi.mocked(useAppController).mockImplementation(() => useReactiveController(currentController))
+ Object.defineProperty(window, 'clerum', {
+ configurable: true,
+ value: {
+ shortcuts: { onCommand: vi.fn(() => vi.fn()) },
+ app: { rendererReady: vi.fn().mockResolvedValue(undefined) },
+ entityChanges: {
+ subscribe: vi.fn((handler: (event: unknown) => void) => {
+ dispatchEntityChange = handler
+ return Promise.resolve(vi.fn())
+ }),
+ },
+ gfs: { resolve: vi.fn() },
+ sandboxUi: {
+ listApps: vi.fn().mockResolvedValue({ apps: [] }),
+ listPendingDeepLinks: vi.fn().mockResolvedValue({ links: [] }),
+ clearPendingDeepLinks: vi.fn().mockResolvedValue(undefined),
+ onDeepLink: vi.fn(() => vi.fn()),
+ setVisible: vi.fn().mockResolvedValue(undefined),
+ setBounds: vi.fn().mockResolvedValue(undefined),
+ focusActive: vi.fn().mockResolvedValue(true),
+ close: vi.fn().mockResolvedValue(undefined),
+ },
+ } as unknown as Window['clerum'],
+ })
+ })
+
+ afterEach(() => {
+ cleanup()
+ delete (window as { clerum?: unknown }).clerum
+ })
+
+ it('preserves an unchanged preview during soft scope revalidation and purges only on 403', async () => {
+ const resolve = vi.mocked(window.clerum.gfs.resolve)
+ let finishResolve!: (value: ReturnType<typeof resolvedFile>) => void
+ resolve.mockImplementationOnce(
+ () =>
+ new Promise(resolvePromise => {
+ finishResolve = resolvePromise
+ }) as never
+ )
+ render(<App />)
+ await waitFor(() => expect(dispatchEntityChange).toBeTypeOf('function'))
+
+ const initial = () => currentController.workspaceTabs.tabs.find(tab => tab.id === 'preview-md')
+ const before = initial()
+ expect(before?.kind).toBe('preview')
+ act(() =>
+ dispatchEntityChange?.({
+ type: 'scope.invalidated',
+ schemaVersion: 1,
+ cursor: 'cursor-1',
+ scopes: ['authorization'],
+ })
+ )
+ expect(initial()).toEqual(before)
+
+ await act(async () => {
+ finishResolve(
+ resolvedFile('readme', 'README.md', {
+ gfsUri: 'gfs://main/readme',
+ bytes: 14,
+ version: 3,
+ })
+ )
+ })
+ expect(initial()).toEqual(before)
+
+ resolve.mockRejectedValueOnce(Object.assign(new Error('403 Forbidden'), { status: 403 }))
+ act(() =>
+ dispatchEntityChange?.({
+ type: 'scope.invalidated',
+ schemaVersion: 1,
+ cursor: 'cursor-2',
+ scopes: ['authorization'],
+ })
+ )
+ await waitFor(() =>
+ expect(initial()?.kind === 'preview' && initial()?.preview?.unavailable).toBe(true)
+ )
+ })
+})
+
// Mini-spec 05: below the minimum panel width the drawer is SUPPRESSED (hidden,
// app takes full width) without clearing the user's open intent, so it reappears
// when the window re-widens; a MANUAL close clears the intent, so it stays gone.