Agent Zero AI framework
Fix Browser tab switching stuck in loading state
Alessandro3c084c2d8932
diff --git a/plugins/_browser/AGENTS.md b/plugins/_browser/AGENTS.mdindex a180b186d..e14c57383 100644--- a/plugins/_browser/AGENTS.md+++ b/plugins/_browser/AGENTS.md@@ -25,6 +25,7 @@- When no Browser tab manifest exists yet, use Chromium's last session once to migrate open tabs into the owned manifest.- Throttle interactive resize updates throughout a drag and let the native-sized Chromium viewport follow the private display; do not defer all layout updates until resizing stops.- Keep exactly one interactive viewer iframe connected during canvas/modal handoff so hidden surfaces cannot compete to resize the same display.+- Complete tab switching when the viewer subscription succeeds and reuses the interactive viewer URL; the shared iframe does not reload for each tab. New viewer URLs and fallback frames retain their load/render completion path.- Notify the active Xpra client of its new frame geometry before resizing the backing display; after an interactive canvas/modal handoff, reconcile once after Xpra's deferred resize so Chromium cannot retain the previous surface size.- Present the Xpra shadow window as the raw browser canvas: remove its HTML decoration and shadow pointer while preserving exact viewport geometry.- Keep one internal Chromium, Xvfb, and Xpra runtime per Agent Zero process with one unguessable gateway token.diff --git a/plugins/_browser/webui/browser-store.js b/plugins/_browser/webui/browser-store.jsindex 3cd80f413..6ca918ed4 100644--- a/plugins/_browser/webui/browser-store.js+++ b/plugins/_browser/webui/browser-store.js@@ -1223,7 +1223,12 @@ const model = {replaceAll: Boolean(data.all_browsers),replaceContext: !data.all_browsers,});+ const previousInteractiveViewUrl = this.interactiveViewUrl;this.applyViewer(data);+ if (this.usesInteractiveTransport() && this.interactiveViewUrl === previousInteractiveViewUrl) {+ this.switchingBrowserId = null;+ this._surfaceSwitching = false;+ }this._subscribedViewerTransport = this.viewerTransport;this.setActiveBrowserId(data.active_browser_id || requestedBrowserId || this.activeBrowserId || null,diff --git a/tests/test_browser_agent_regressions.py b/tests/test_browser_agent_regressions.pyindex 8f3232f54..ed69602a5 100644--- a/tests/test_browser_agent_regressions.py+++ b/tests/test_browser_agent_regressions.py@@ -1614,6 +1614,52 @@ def test_browser_extension_settings_stay_user_facing():assert "Browser caches Playwright Chromium" not in config_html+def test_browser_tab_switch_completes_without_reloading_shared_interactive_viewer():+ source = (PROJECT_ROOT / "plugins/_browser/webui/browser-store.js").read_text(encoding="utf-8")+ source = source[source.index("const EXTENSIONS_ROOT"):source.index("export const store")]+ script = """+import assert from 'node:assert/strict';+let responseData;+let superseded = false;+const websocket = { request: async () => {+ if (superseded) model._connectSequence++;+ return { results: [{ ok: true, data: responseData }] };+} };+""" + source + """+Object.assign(model, {+ loading: false, contextId: 'ctx', activeBrowserContextId: 'ctx', activeBrowserId: 2,+ _bindSocketEvents: async () => {},+ currentViewportSize: () => ({ width: 900, height: 600 }),+});+for (const [transport, oldUrl, nextUrl, stale, busy] of [+ ['interactive', '/viewer', '/viewer', false, false],+ ['interactive', '', '/viewer', false, true],+ ['interactive', '/viewer', '/new-viewer', false, true],+ ['screencast', '/viewer', '', false, true],+ ['snapshot', '', '', false, true],+ ['interactive', '/viewer', '/viewer', true, true],+]) {+ Object.assign(model, {+ viewerTransport: transport, interactiveViewUrl: oldUrl,+ switchingBrowserId: 2, _surfaceSwitching: true,+ });+ responseData = {+ browsers: [{ id: 2, context_id: 'ctx', loading: false }],+ active_browser_id: 2, viewer_transport: transport,+ interactive_view: { available: Boolean(nextUrl), url: nextUrl },+ };+ superseded = stale;+ await model.connectViewer({ browserId: 2, contextId: 'ctx' });+ assert.equal(model.isBusy(), busy, JSON.stringify([transport, oldUrl, nextUrl, stale]));+ assert.equal(model.isBrowserLoading(model.browsers[0]), busy);+ assert.equal(model._surfaceSwitching, busy);+ assert.equal(model.switchingBrowserId, busy ? 2 : null);+ assert.equal(model.interactiveViewUrl, stale ? oldUrl : nextUrl);+}+"""+ subprocess.run(["node", "--input-type=module", "-e", script], check=True, text=True)++def test_browser_viewer_uses_tabs_for_session_switching():main_html = (PROJECT_ROOT / "plugins" / "_browser" / "webui" / "browser-panel.html").read_text(encoding="utf-8"