Skip to content

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

TypeScript

fix(desktop-app): r3-h1 guard stale authorized preview refresh

Josué710937cb13bd
diff --git a/desktop-app/ui/src/App.tsx b/desktop-app/ui/src/App.tsx
index 2bff75a56..963fbd8bd 100644
--- a/desktop-app/ui/src/App.tsx
+++ b/desktop-app/ui/src/App.tsx
@@ -937,6 +937,8 @@ export function App() {
}
const generation = (previewRefreshGenerationRef.current.get(gfsUri) ?? 0) + 1
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
@@ -945,10 +947,11 @@ export function App() {
refreshPreviewTab(state, gfsUri, {
status: 'unavailable',
shellTitle: 'File unavailable',
+ isCurrentGeneration,
})
)
setPluginGfsPreview(current =>
- current?.gfsUri === gfsUri
+ isCurrentGeneration() && current?.gfsUri === gfsUri
? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
: current
)
@@ -969,10 +972,11 @@ export function App() {
refreshPreviewTab(state, gfsUri, {
status: 'unavailable',
shellTitle: 'Preview unavailable',
+ isCurrentGeneration,
})
)
setPluginGfsPreview(current =>
- current?.gfsUri === gfsUri
+ isCurrentGeneration() && current?.gfsUri === gfsUri
? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
: current
)
@@ -984,10 +988,12 @@ export function App() {
fileKind: preview.kind,
byteLength: preview.bytes,
resourceVersion: resource.version,
+ isCurrentGeneration,
...('mimeType' in preview ? { mimeType: preview.mimeType } : {}),
}
setWorkspaceTabs(state => refreshPreviewTab(state, gfsUri, refreshed))
setPluginGfsPreview(current => {
+ if (!isCurrentGeneration()) return current
if (current?.gfsUri !== gfsUri) return current
if (
preview.version !== undefined &&
@@ -1025,10 +1031,11 @@ export function App() {
refreshPreviewTab(state, gfsUri, {
status: 'unavailable',
shellTitle: 'File unavailable',
+ isCurrentGeneration,
})
)
setPluginGfsPreview(current =>
- current?.gfsUri === gfsUri
+ isCurrentGeneration() && current?.gfsUri === gfsUri
? { ...current, unavailable: true, reloadVersion: current.reloadVersion + 1 }
: current
)
diff --git a/desktop-app/ui/src/lib/__tests__/workspaceTabs.test.ts b/desktop-app/ui/src/lib/__tests__/workspaceTabs.test.ts
index 473d0d89e..4dd21a40b 100644
--- a/desktop-app/ui/src/lib/__tests__/workspaceTabs.test.ts
+++ b/desktop-app/ui/src/lib/__tests__/workspaceTabs.test.ts
@@ -846,6 +846,47 @@ describe('workspaceTabs — preview multi-instance by gfsUri (spec 18 §3.B.1)',
'unavailable'
)
})
+
+ it('restores the same version only from the current authorized refresh', () => {
+ let state = createEmptyWorkspaceTabsState()
+ state = openPreviewTab(state, {
+ id: 'preview-stable',
+ gfsUri: 'gfs://main/revoked',
+ fileKind: 'image',
+ mimeType: 'image/png',
+ byteLength: 44,
+ resourceVersion: 8,
+ })
+ const unavailable = refreshPreviewTab(state, 'gfs://main/revoked', {
+ status: 'unavailable',
+ shellTitle: 'File unavailable',
+ })
+ const staleRefresh = {
+ status: 'available' as const,
+ title: 'restored.png',
+ fileKind: 'image' as const,
+ mimeType: 'image/png',
+ byteLength: 44,
+ resourceVersion: 8,
+ isCurrentGeneration: () => false,
+ }
+
+ expect(refreshPreviewTab(unavailable, 'gfs://main/revoked', staleRefresh)).toBe(unavailable)
+
+ const currentRefresh = {
+ ...staleRefresh,
+ isCurrentGeneration: () => true,
+ }
+ const restored = refreshPreviewTab(unavailable, 'gfs://main/revoked', currentRefresh)
+ expect(restored.tabs.find(tab => tab.id === 'preview-stable')).toMatchObject({
+ id: 'preview-stable',
+ title: 'restored.png',
+ preview: { resourceVersion: 8, reloadVersion: 2 },
+ })
+ expect(restored.tabs.find(tab => tab.id === 'preview-stable')?.preview).not.toHaveProperty(
+ 'unavailable'
+ )
+ })
})
describe('workspaceTabs — new chat (blank) with kind guard', () => {
diff --git a/desktop-app/ui/src/lib/workspaceTabs.ts b/desktop-app/ui/src/lib/workspaceTabs.ts
index 8ffdf69b3..77104e8d5 100644
--- a/desktop-app/ui/src/lib/workspaceTabs.ts
+++ b/desktop-app/ui/src/lib/workspaceTabs.ts
@@ -353,7 +353,7 @@ export function openPreviewTab(
return { tabs: [...state.tabs, tab], activeTabId: input.id }
}
-export type PreviewTabRemoteRefresh =
+export type PreviewTabRemoteRefresh = (
| {
status: 'available'
title: string
@@ -363,6 +363,7 @@ export type PreviewTabRemoteRefresh =
resourceVersion?: number
}
| { status: 'unavailable'; shellTitle: 'File unavailable' | 'Preview unavailable' }
+) & { isCurrentGeneration?: () => boolean }
/** Apply current authorized metadata to every tab for one stable GFS URI. */
export function refreshPreviewTab(
@@ -370,6 +371,7 @@ export function refreshPreviewTab(
gfsUri: string,
refresh: PreviewTabRemoteRefresh
): WorkspaceTabsState {
+ if (refresh.isCurrentGeneration && !refresh.isCurrentGeneration()) return state
const targets = state.tabs.filter(
(tab): tab is WorkspaceTab & { preview: PreviewTabPayload } =>
tab.kind === 'preview' && tab.preview?.gfsUri === gfsUri