Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(desktop): r7-m17 retire retries without preview owners
Josuéefd4edd26275
diff --git a/desktop-app/ui/src/App.tsx b/desktop-app/ui/src/App.tsxindex f5b8f22d7..2ca343eba 100644--- a/desktop-app/ui/src/App.tsx+++ b/desktop-app/ui/src/App.tsx@@ -45,6 +45,7 @@ import {shouldRevalidateGfsQuery,} from '@lib/gfsEntityChangeState'import { resolveGfsPreview } from '@lib/gfsPreview'+import { retireClosedGfsPreviewOwners } from '@lib/gfsPreviewRetryOwnership'import { desktopQueryClient } from '@lib/queryClient'import {canProcessSandboxUiDeepLinks,@@ -857,6 +858,24 @@ export function App() {const previewRefreshGenerationRef = React.useRef(new Map<string, number>())const previewRetryTimersRef = React.useRef(new Map<string, number>())const previewRetryAttemptRef = React.useRef(new Map<string, number>())+ const previewOwnersRef = React.useRef(new Set<string>())++ React.useEffect(() => {+ const currentOwners = new Set(+ workspaceTabs.tabs+ .filter(tab => tab.kind === 'preview' && tab.preview)+ .map(tab => tab.preview!.gfsUri)+ )+ if (pluginGfsPreview) currentOwners.add(pluginGfsPreview.gfsUri)+ retireClosedGfsPreviewOwners(+ previewOwnersRef.current,+ currentOwners,+ previewRetryTimersRef.current,+ previewRetryAttemptRef.current,+ previewRefreshGenerationRef.current,+ timer => window.clearTimeout(timer)+ )+ }, [pluginGfsPreview?.gfsUri, workspaceTabs.tabs])React.useEffect(() => {const off = window.clerum.pluginSdk?.onOpenGfsResource?.(resource => {diff --git a/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsx b/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsxindex 55b0a0443..d8675cdb9 100644--- a/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsx+++ b/desktop-app/ui/src/__tests__/App.chatDrawer.test.tsx@@ -1424,6 +1424,38 @@ describe('App live GFS preview revalidation', () => {expect(previews.every(tab => tab.preview?.unavailable)).toBe(true)})})++ it('does not retry a preview after its last tab owner closes', async () => {+ vi.useFakeTimers()+ const resolve = vi.mocked(window.clerum.gfs.resolve)+ resolve.mockRejectedValue(new Error('upstream unavailable httpStatus=503'))+ render(<App />)+ await act(async () => {+ await Promise.resolve()+ await Promise.resolve()+ })+ expect(dispatchEntityChange).toBeTypeOf('function')++ await act(async () => {+ dispatchEntityChange?.({+ type: 'scope.invalidated',+ schemaVersion: 1,+ cursor: 'cursor-retry',+ scopes: ['gfs'],+ })+ await Promise.resolve()+ await Promise.resolve()+ })+ expect(resolve).toHaveBeenCalledTimes(1)++ act(() => currentController.setWorkspaceTabs({ tabs: [], activeTabId: null }))+ await act(async () => {+ await vi.advanceTimersByTimeAsync(5000)+ })++ expect(resolve).toHaveBeenCalledTimes(1)+ vi.useRealTimers()+ })})// Mini-spec 05: below the minimum panel width the drawer is SUPPRESSED (hidden,diff --git a/desktop-app/ui/src/lib/__tests__/gfsPreviewRetryOwnership.test.ts b/desktop-app/ui/src/lib/__tests__/gfsPreviewRetryOwnership.test.tsnew file mode 100644index 000000000..1ef52bdb5--- /dev/null+++ b/desktop-app/ui/src/lib/__tests__/gfsPreviewRetryOwnership.test.ts@@ -0,0 +1,44 @@+// @vitest-environment jsdom+import { afterEach, describe, expect, it, vi } from 'vitest'+import { retireClosedGfsPreviewOwners } from '../gfsPreviewRetryOwnership'++describe('retireClosedGfsPreviewOwners', () => {+ afterEach(() => vi.useRealTimers())++ it('cancels retry and invalidates pending refresh only for the closed final owner', () => {+ vi.useFakeTimers()+ const closedUri = 'gfs://main/closed'+ const openUri = 'gfs://main/open'+ const previousOwners = new Set([closedUri, openUri])+ const retryTimers = new Map<string, number>()+ const retryAttempts = new Map([+ [closedUri, 2],+ [openUri, 1],+ ])+ const refreshGenerations = new Map([+ [closedUri, 4],+ [openUri, 9],+ ])+ const closedRetry = vi.fn()+ const openRetry = vi.fn()+ retryTimers.set(closedUri, window.setTimeout(closedRetry, 5000))+ retryTimers.set(openUri, window.setTimeout(openRetry, 5000))++ retireClosedGfsPreviewOwners(+ previousOwners,+ new Set([openUri]),+ retryTimers,+ retryAttempts,+ refreshGenerations,+ timer => window.clearTimeout(timer)+ )+ vi.advanceTimersByTime(5000)++ expect(closedRetry).not.toHaveBeenCalled()+ expect(openRetry).toHaveBeenCalledOnce()+ expect(retryTimers.has(closedUri)).toBe(false)+ expect(retryAttempts.has(closedUri)).toBe(false)+ expect(refreshGenerations.get(closedUri)).toBe(5)+ expect(previousOwners).toEqual(new Set([openUri]))+ })+})diff --git a/desktop-app/ui/src/lib/gfsPreviewRetryOwnership.ts b/desktop-app/ui/src/lib/gfsPreviewRetryOwnership.tsnew file mode 100644index 000000000..36ed57236--- /dev/null+++ b/desktop-app/ui/src/lib/gfsPreviewRetryOwnership.ts@@ -0,0 +1,21 @@+/** Retire retry work only when its final workspace/plugin preview owner closes. */+export function retireClosedGfsPreviewOwners(+ previousOwners: Set<string>,+ currentOwners: ReadonlySet<string>,+ retryTimers: Map<string, number>,+ retryAttempts: Map<string, number>,+ refreshGenerations: Map<string, number>,+ clearTimeoutFn: (timer: number) => void+): void {+ for (const gfsUri of previousOwners) {+ if (currentOwners.has(gfsUri)) continue+ const timer = retryTimers.get(gfsUri)+ if (timer !== undefined) clearTimeoutFn(timer)+ retryTimers.delete(gfsUri)+ retryAttempts.delete(gfsUri)+ refreshGenerations.set(gfsUri, (refreshGenerations.get(gfsUri) ?? 0) + 1)+ }++ previousOwners.clear()+ for (const gfsUri of currentOwners) previousOwners.add(gfsUri)+}