fix(desktop-browser): expire stale recovery history

Author: waleedlatif1

apps/desktop/src/main/browser-agent/session.test.ts

@@ -134,6 +134,17 @@ function hostResizeHandler(win: BrowserWindow): () => void {
   return handler as () => void
 }
 
+function mainFrameNavigationStarted(
+  contents: MockView['webContents'],
+  isSameDocument = false
+): void {
+  const handler = contents.on.mock.calls
+    .filter(([eventName]) => eventName === 'did-start-navigation')
+    .at(-1)?.[1]
+  if (typeof handler !== 'function') throw new Error('no navigation-start listener bound')
+  handler({ isMainFrame: true, isSameDocument })
+}
+
 describe('browser-agent session', () => {
   let win: BrowserWindow
   let session: SessionModule
@@ -893,7 +904,7 @@ describe('browser-agent session', () => {
     mockContents.navigationHistory.canGoForward.mockReturnValue(true)
     expect(session.goForward(contents)).toBe(true)
     expect(mockContents.navigationHistory.goForward).toHaveBeenCalledTimes(1)
-    session.notePageLoadStarted(contents)
+    mainFrameNavigationStarted(mockContents)
 
     mockContents.navigationHistory.getActiveIndex.mockReturnValue(3)
     expect(session.goForward(contents)).toBe(true)
@@ -911,7 +922,31 @@ describe('browser-agent session', () => {
     })
     session.goBack(contents)
 
-    session.notePageLoadStarted(contents)
+    mainFrameNavigationStarted(mockContents)
+
+    expect(session.canGoForward(contents)).toBe(false)
+  })
+
+  it('discards synthetic Forward after same-document traversal and a fresh navigation', () => {
+    const mockContents = (session.ensureTab().view as unknown as MockView).webContents
+    const contents = mockContents as unknown as WebContents
+    mockContents.navigationHistory.getActiveIndex.mockReturnValue(3)
+    session.recordPageLoadFailure(contents, {
+      kind: 'load-error',
+      code: -102,
+      description: 'ERR_CONNECTION_REFUSED',
+      url: 'https://example.com/failed',
+    })
+
+    session.goBack(contents)
+    mockContents.navigationHistory.canGoBack.mockReturnValue(true)
+    expect(session.goBack(contents)).toBe(true)
+
+    mainFrameNavigationStarted(mockContents, true)
+
+    expect(session.canGoForward(contents)).toBe(true)
+
+    mainFrameNavigationStarted(mockContents)
 
     expect(session.canGoForward(contents)).toBe(false)
   })

apps/desktop/src/main/browser-agent/session.ts

@@ -89,7 +89,7 @@ export interface AgentTab {
   pendingRestoreUrl?: string
   pageIssue?: BrowserPageIssue
   syntheticForward?: { url: string; baseHistoryIndex: number }
-  preserveSyntheticForwardOnNextLoad?: boolean
+  preserveSyntheticForwardOnNextNavigation?: boolean
   recoveringUnresponsive?: boolean
 }
 
@@ -1043,18 +1043,23 @@ export function recordPageLoadFailure(
   publishPageIssue(tab, true)
 }
 
-/** Clears transient recovery state when Chromium begins a new top-level load. */
+/** Clears transient recovery state when Chromium begins loading a new document. */
 export function notePageLoadStarted(contents: WebContents): void {
   const tab = tabForContents(contents)
   if (!tab) return
   const changed = Boolean(tab.pageIssue)
   tab.pageIssue = undefined
-  if (tab.preserveSyntheticForwardOnNextLoad) {
-    tab.preserveSyntheticForwardOnNextLoad = false
+  if (changed) publishPageIssue(tab)
+}
+
+function notePageNavigationStarted(contents: WebContents): void {
+  const tab = tabForContents(contents)
+  if (!tab) return
+  if (tab.preserveSyntheticForwardOnNextNavigation) {
+    tab.preserveSyntheticForwardOnNextNavigation = false
   } else {
     tab.syntheticForward = undefined
   }
-  if (changed) publishPageIssue(tab)
 }
 
 /** Includes Sim's failed-navigation entry in the browser's Back availability. */
@@ -1085,7 +1090,7 @@ export function goBack(contents: WebContents): boolean {
     return true
   }
   if (!contents.navigationHistory.canGoBack()) return false
-  tab.preserveSyntheticForwardOnNextLoad = Boolean(tab.syntheticForward)
+  tab.preserveSyntheticForwardOnNextNavigation = Boolean(tab.syntheticForward)
   contents.navigationHistory.goBack()
   return true
 }
@@ -1100,7 +1105,7 @@ export function goForward(contents: WebContents): boolean {
       contents.navigationHistory.getActiveIndex() < syntheticForward.baseHistoryIndex &&
       contents.navigationHistory.canGoForward()
     ) {
-      tab.preserveSyntheticForwardOnNextLoad = true
+      tab.preserveSyntheticForwardOnNextNavigation = true
       contents.navigationHistory.goForward()
       return true
     }
@@ -1498,6 +1503,7 @@ function createTabView(): WebContentsView {
     'did-start-navigation',
     bindToBrowserScope(scopeId, (details) => {
       if (!details.isMainFrame) return
+      notePageNavigationStarted(contents)
       events?.onTabNavigated(contents, false)
     })
   )