Skip to content

graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs

Python

Keep browser navigation errors aligned with page completion

Rach Pradhan471afcc7a0b9
diff --git a/apps/native/components/site/ElectronBrowserPane.tsx b/apps/native/components/site/ElectronBrowserPane.tsx
index b04fa867..5b557638 100644
--- a/apps/native/components/site/ElectronBrowserPane.tsx
+++ b/apps/native/components/site/ElectronBrowserPane.tsx
@@ -17,6 +17,9 @@ export default function ElectronBrowserPane({ chat, pins, onPinsChange, onAsk, o
const address = useRef<HTMLInputElement>(null);
const typing = useRef(false);
const infoRevision = useRef(0);
+ const currentUrl = useRef(initialUrl || "about:blank");
+ const navigationId = useRef(0);
+ const navigation = useRef<{ id: number; previousUrl: string; completedUrl?: string; aborted?: boolean } | null>(null);
const callbacks = useRef({ pins, onPinsChange }); callbacks.current = { pins, onPinsChange };
const storageKey = `graff.electron.browser.url:${memoryKey || chat}`;
const layout = () => {
@@ -27,17 +30,30 @@ export default function ElectronBrowserPane({ chat, pins, onPinsChange, onAsk, o
const layoutRef = useRef(layout); layoutRef.current = layout;
const command = async (method: string, params?: Record<string, unknown>) => {
const revision = ++infoRevision.current;
+ const pending = method === "open" || method === "navigate"
+ ? { id: ++navigationId.current, previousUrl: currentUrl.current } : null;
+ if (pending) navigation.current = pending;
try {
setError(""); const next = await desktop()!.browser(chat, method, params);
// Navigation events may be newer than the snapshot returned over IPC.
- if (revision === infoRevision.current && next?.url !== undefined) { setInfo(next); setUrl(next.url === "about:blank" ? "" : next.url); localStorage.setItem(storageKey, next.url); }
+ if (revision === infoRevision.current && next?.url !== undefined) { currentUrl.current = next.url; setInfo(next); setUrl(next.url === "about:blank" ? "" : next.url); localStorage.setItem(storageKey, next.url); }
layoutRef.current();
} catch (err) {
+ if (pending && navigation.current?.id !== pending.id) return;
const raw = err instanceof Error ? err.message : String(err);
+ // A redirected load can reject with ERR_ABORTED after its replacement
+ // page has loaded. Ignore it only when a newer page completed for this
+ // chat's pending navigation; a failed load must still reach the user.
+ if (pending && /ERR_ABORTED/.test(raw) && navigation.current?.id === pending.id) {
+ if (navigation.current.completedUrl && navigation.current.completedUrl !== pending.previousUrl) return;
+ navigation.current.aborted = true;
+ }
setError(/Invalid URL/i.test(raw) ? "Enter a web address or a search." : raw);
}
};
useEffect(() => {
+ navigation.current = null;
+ currentUrl.current = initialUrl || "about:blank";
const bridge = desktop()!;
const unsubscribe = bridge.subscribe(event => {
if (event.type === "layout") layoutRef.current();
@@ -46,6 +62,12 @@ export default function ElectronBrowserPane({ chat, pins, onPinsChange, onAsk, o
if (event.type === "info" && event.info) {
infoRevision.current++;
if (event.info.ready === "loading") setPicking(false);
+ const pending = navigation.current;
+ if (pending && event.info.ready === "complete" && event.info.url !== pending.previousUrl) {
+ pending.completedUrl = event.info.url;
+ if (pending.aborted) { pending.aborted = false; setError(""); }
+ }
+ currentUrl.current = event.info.url;
setInfo(event.info); setUrl(event.info.url === "about:blank" ? "" : event.info.url);
localStorage.setItem(storageKey, event.info.url);
}
@@ -60,6 +82,7 @@ export default function ElectronBrowserPane({ chat, pins, onPinsChange, onAsk, o
void bridge.browser(chat, "info").then(current => {
if (!alive || revision !== infoRevision.current) return;
if (current && current.url && current.url !== "about:blank") {
+ currentUrl.current = current.url;
setInfo(current); setUrl(current.url);
return;
}
@@ -71,7 +94,8 @@ export default function ElectronBrowserPane({ chat, pins, onPinsChange, onAsk, o
if (frame.current) observer.observe(frame.current);
const changed = () => layoutRef.current();
window.addEventListener("resize", changed);
- return () => { alive = false; infoRevision.current++; observer.disconnect(); unsubscribe(); window.removeEventListener("resize", changed);
+ return () => { alive = false; infoRevision.current++; navigationId.current++; navigation.current = null;
+ observer.disconnect(); unsubscribe(); window.removeEventListener("resize", changed);
void bridge.browser(chat, "hide"); };
// A browser view belongs to its chat, not a render of the composer.
// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/apps/native/electron/browser-address-visual.cjs b/apps/native/electron/browser-address-visual.cjs
index a52f288a..17903165 100644
--- a/apps/native/electron/browser-address-visual.cjs
+++ b/apps/native/electron/browser-address-visual.cjs
@@ -1,5 +1,5 @@
const assert = require('node:assert/strict');
-async function runBrowserAddress({ wc, browser, destination, guard, wait, delayOpenReply, openReplySent }) {
+async function runBrowserAddress({ wc, browser, destination, guard, wait, delayOpenReply, openReplySent, delayAbortedReply, abortedReplySent, delayUnreplacedAbort, unreplacedAbortSent }) {
const js = code => wc.executeJavaScript(code);
const searches = [];
const safe = guard(destination);
@@ -34,6 +34,24 @@ async function runBrowserAddress({ wc, browser, destination, guard, wait, delayO
await js('new Promise(resolve=>requestAnimationFrame(()=>requestAnimationFrame(resolve)))');
assert.deepEqual(searches, [expected]);
assert.equal(await js(`!!document.querySelector('aside [role="alert"]')`), false, 'Search terms do not show Invalid URL');
+ // A successful replacement page can precede an ERR_ABORTED IPC reply for
+ // the original navigation. The late error must not cover that page.
+ delayAbortedReply();
+ const redirected = destination + '/late-reply';
+ await submit(redirected);
+ await wait(() => {
+ const page = browser.tabs.get(browser.visible)?.view?.webContents;
+ return page && !page.isLoading() && page.getURL() === redirected;
+ }, 'replacement page finished before its rejected reply');
+ await wait(abortedReplySent, 'late aborted reply delivered');
+ await js('new Promise(resolve=>setTimeout(resolve,100))');
+ assert.equal(await js(`!!document.querySelector('aside [role="alert"]')`), false, 'superseded abort does not show a navigation error');
+ // Without a completed replacement, the same abort remains visible.
+ delayUnreplacedAbort();
+ await submit(destination + '/no-replacement');
+ await wait(unreplacedAbortSent, 'unreplaced abort delivered');
+ await wait(`document.querySelector('aside [role="alert"]')?.textContent.includes('ERR_ABORTED')`);
+ assert.equal(browser.tabs.get(browser.visible).view.webContents.getURL(), redirected);
// Check scheme rejection in the real IPC path without treating it as a search.
const oldURL = browser.tabs.get(browser.visible).view.webContents.getURL();
await submit('javascript:alert(1)');
diff --git a/apps/native/electron/link-destination-visual.cjs b/apps/native/electron/link-destination-visual.cjs
index fec758e4..d9b6bf72 100644
--- a/apps/native/electron/link-destination-visual.cjs
+++ b/apps/native/electron/link-destination-visual.cjs
@@ -31,7 +31,7 @@ async function runLinkDestinationVisuals({ origin, output }) {
wc.on('console-message', event => { if (event.level >= 2) console.error('Link renderer:', event.message); });
const browser = new BrowserTabs(win, event => wc.send('browser-event', event));
const system = [], routed = [], settings = [], blocked = [], errors = [];
- let delayNextOpen = false, delayedReplySent = false;
+ let delayNextOpen = null, delayedReplySent = false, abortedReplySent = false, unreplacedAbortSent = false;
// Neither session may reach the network or an engine endpoint. Only the app's
// static assets and our loopback HTML fixture are allowed through.
const guard = allowed => (details, callback) => {
@@ -48,19 +48,34 @@ async function runLinkDestinationVisuals({ origin, output }) {
settings.push({ action, value, result }); return result;
});
ipcMain.handle('browser', async (_event, { chat, method, params }) => {
+ const delayed = method === 'open' ? delayNextOpen : null;
+ if (delayed) delayNextOpen = null;
try {
- const delayed = delayNextOpen && method === 'open';
- if (delayed) delayNextOpen = false;
- const result = await browser.command(chat, method, params);
+ if (delayed === 'unreplaced-abort') {
+ unreplacedAbortSent = true;
+ throw Error('ERR_ABORTED (-3) without replacement');
+ }
+ let result, navigationError;
+ try { result = await browser.command(chat, method, params); }
+ catch (error) { navigationError = error; }
if (delayed) {
// An IPC reply captured during navigation can arrive after newer events.
await wait(`document.querySelector('input[aria-label="Address"]')?.closest('aside').querySelector('header')?.textContent.includes('Link destination fixture')`);
+ if (delayed === 'abort') {
+ abortedReplySent = true;
+ throw navigationError || Error('ERR_ABORTED (-3) after redirected page completed');
+ }
delayedReplySent = true;
+ if (navigationError) throw navigationError;
return { ...result, ready: 'loading', title: 'Earlier loading snapshot' };
}
+ if (navigationError) throw navigationError;
return result;
}
- catch (error) { errors.push(error.message); throw error; }
+ catch (error) {
+ if (!(delayed && /ERR_ABORTED/.test(error.message))) errors.push(error.message);
+ throw error;
+ }
});
const overlay = (event, value) => { if (event.sender === wc) browser.setOverlay(value); };
ipcMain.on('browser-overlay', overlay);
@@ -212,7 +227,10 @@ async function runLinkDestinationVisuals({ origin, output }) {
assert.equal(routed.length, before, 'same-origin links bypass external routing');
assert.ok(await js(`!!document.querySelector('textarea[aria-label="Prompt"]')`));
assert.deepEqual(errors, [], 'browser IPC completes without errors');
- await require('./browser-address-visual.cjs').runBrowserAddress({ wc, browser, destination, guard, wait, delayOpenReply: () => { delayNextOpen = true; }, openReplySent: () => delayedReplySent });
+ await require('./browser-address-visual.cjs').runBrowserAddress({ wc, browser, destination, guard, wait,
+ delayOpenReply: () => { delayNextOpen = 'success'; }, openReplySent: () => delayedReplySent,
+ delayAbortedReply: () => { delayNextOpen = 'abort'; }, abortedReplySent: () => abortedReplySent,
+ delayUnreplacedAbort: () => { delayNextOpen = 'unreplaced-abort'; }, unreplacedAbortSent: () => unreplacedAbortSent });
await require('./inline-reference-visual.cjs').inlineReferenceVisual({ wc, js, wait, browser, destination, closeBrowser, screenshot });
assert.deepEqual(blocked, [], 'no external network or engine/model requests attempted');
console.log('Link destination visuals passed: real UserBubble click, default/save/switch, reload and fresh-store persistence, normal/blank links, closed-browser reveal, overlays, unsafe/same-origin links, split focus and preserved app.');