Open-source AI browser agent for Chrome and Firefox (monorepo) ðŸ§
JavaScript ai-agentai-agentsai-toolsbrowser-aibrowser-automationbrowser-extensionchrome-aichrome-devtoolschrome-extensionchrome-extensionsfirefox-addonfirefox-addonsfirefox-extensionfirefox-extensionsgemmagemma4minimaxoffline-aioffline-llmqwen
Mode picker: a send waits for mode checks still going
Claudea6b4e089c5e1
diff --git a/src/chrome/src/ui/sidepanel.js b/src/chrome/src/ui/sidepanel.jsindex 4b32e9c81..e88a31c38 100644--- a/src/chrome/src/ui/sidepanel.js+++ b/src/chrome/src/ui/sidepanel.js@@ -1848,6 +1848,18 @@ const composerModeOptions = [...document.querySelectorAll('.composer-mode-optionconst composerModeBadge = document.getElementById('composer-mode-badge');const composerModeDesc = document.getElementById('composer-mode-desc');+// Mode checks still going (a pick waiting on its Act/Dev check, a restored+// or changed provider's check). A send waits for them before choosing its mode.+const composerModeTasks = new Set();+function trackComposerModeTask(task) {+ const tracked = Promise.resolve(task).catch(() => {}).finally(() => composerModeTasks.delete(tracked));+ composerModeTasks.add(tracked);+ return task;+}+async function settleComposerModeTasks() {+ for (let round = 0; round < 4 && composerModeTasks.size; round += 1) await Promise.allSettled([...composerModeTasks]);+}+function composerModePinForCurrentTab() {return isStandaloneWindow ? null : composerModePins.get(currentTabId);}@@ -1901,11 +1913,11 @@ function restoreComposerModeForCurrentTab() {syncComposerModeForCurrentTab();const tabId = currentTabId;if (isStandaloneWindow || tabId == null) return;- void composerModePins.load(tabId).then(() => {- if (!sameTabId(currentTabId, tabId)) return;+ trackComposerModeTask(composerModePins.load(tabId).then(() => {+ if (!sameTabId(currentTabId, tabId)) return null;syncComposerModeForCurrentTab();- void revalidateComposerModePin();- });+ return revalidateComposerModePin();+ }));}async function restoreComposerModeBeforeSend(tabId) {@@ -1913,6 +1925,8 @@ async function restoreComposerModeBeforeSend(tabId) {const before = composerModePins.get(tabId);await composerModePins.load(tabId);if (sameTabId(currentTabId, tabId) && composerModePins.get(tabId) !== before) syncComposerModeForCurrentTab();+ // A pick or a provider check still going decides the mode first.+ await settleComposerModeTasks();}function setComposerModePinForTab(tabId, mode) {@@ -1929,7 +1943,11 @@ function setComposerModePinForTab(tabId, mode) {if (sameTabId(currentTabId, tabId)) syncComposerModeForCurrentTab();}-async function pickComposerMode(choice) {+function pickComposerMode(choice) {+ return trackComposerModeTask(pickComposerModeNow(choice));+}++async function pickComposerModeNow(choice) {if (isStandaloneWindow || isProcessing) return;const tabId = currentTabId;if (tabId == null) return;@@ -1953,7 +1971,11 @@ async function pickComposerMode(choice) {// A kept Act or Dev that the active provider cannot run (an in-browser model,// or a Compact provider for Dev) goes back to Auto, with the shortcut's notice.// During a run the check waits for the run to end.-async function revalidateComposerModePin() {+function revalidateComposerModePin() {+ return trackComposerModeTask(checkComposerModePin());+}++async function checkComposerModePin() {const tabId = currentTabId;const pin = composerModePinForCurrentTab();if (pin !== 'act' && pin !== 'dev') {diff --git a/src/firefox/src/ui/sidepanel.js b/src/firefox/src/ui/sidepanel.jsindex 7ea6e00a7..940d41e38 100644--- a/src/firefox/src/ui/sidepanel.js+++ b/src/firefox/src/ui/sidepanel.js@@ -2023,6 +2023,18 @@ const composerModeOptions = [...document.querySelectorAll('.composer-mode-optionconst composerModeBadge = document.getElementById('composer-mode-badge');const composerModeDesc = document.getElementById('composer-mode-desc');+// Mode checks still going (a pick waiting on its Act/Dev check, a restored+// or changed provider's check). A send waits for them before choosing its mode.+const composerModeTasks = new Set();+function trackComposerModeTask(task) {+ const tracked = Promise.resolve(task).catch(() => {}).finally(() => composerModeTasks.delete(tracked));+ composerModeTasks.add(tracked);+ return task;+}+async function settleComposerModeTasks() {+ for (let round = 0; round < 4 && composerModeTasks.size; round += 1) await Promise.allSettled([...composerModeTasks]);+}+function composerModePinForCurrentTab() {return isStandaloneWindow ? null : composerModePins.get(currentTabId);}@@ -2076,11 +2088,11 @@ function restoreComposerModeForCurrentTab() {syncComposerModeForCurrentTab();const tabId = currentTabId;if (isStandaloneWindow || tabId == null) return;- void composerModePins.load(tabId).then(() => {- if (!sameTabId(currentTabId, tabId)) return;+ trackComposerModeTask(composerModePins.load(tabId).then(() => {+ if (!sameTabId(currentTabId, tabId)) return null;syncComposerModeForCurrentTab();- void revalidateComposerModePin();- });+ return revalidateComposerModePin();+ }));}async function restoreComposerModeBeforeSend(tabId) {@@ -2088,6 +2100,8 @@ async function restoreComposerModeBeforeSend(tabId) {const before = composerModePins.get(tabId);await composerModePins.load(tabId);if (sameTabId(currentTabId, tabId) && composerModePins.get(tabId) !== before) syncComposerModeForCurrentTab();+ // A pick or a provider check still going decides the mode first.+ await settleComposerModeTasks();}function setComposerModePinForTab(tabId, mode) {@@ -2099,7 +2113,11 @@ function setComposerModePinForTab(tabId, mode) {if (sameTabId(currentTabId, tabId)) syncComposerModeForCurrentTab();}-async function pickComposerMode(choice) {+function pickComposerMode(choice) {+ return trackComposerModeTask(pickComposerModeNow(choice));+}++async function pickComposerModeNow(choice) {if (isStandaloneWindow || isProcessing) return;const tabId = currentTabId;if (tabId == null) return;@@ -2123,7 +2141,11 @@ async function pickComposerMode(choice) {// A kept Act or Dev that the active provider cannot run (an in-browser model,// or a Compact provider for Dev) goes back to Auto, with the shortcut's notice.// During a run the check waits for the run to end.-async function revalidateComposerModePin() {+function revalidateComposerModePin() {+ return trackComposerModeTask(checkComposerModePin());+}++async function checkComposerModePin() {const tabId = currentTabId;const pin = composerModePinForCurrentTab();if (pin !== 'act' && pin !== 'dev') {diff --git a/test/sidepanel-permission-gate-ui.mjs b/test/sidepanel-permission-gate-ui.mjsindex 6150b5ed2..5d0714b95 100644--- a/test/sidepanel-permission-gate-ui.mjs+++ b/test/sidepanel-permission-gate-ui.mjs@@ -106,7 +106,7 @@ for (const [build, engine, api] of [['chrome', chromium, 'chrome'], ['firefox',${block}renderComposerModePicker();Object.assign(window, {- restoreComposerModeForCurrentTab, setComposerModePinForTab, revalidateComposerModePin,+ restoreComposerModeForCurrentTab, setComposerModePinForTab, revalidateComposerModePin, restoreComposerModeBeforeSend,// What setTabProcessing does for the visible tab.setProcessing(value) {isProcessing = value;@@ -400,6 +400,39 @@ for (const [build, engine, api] of [['chrome', chromium, 'chrome'], ['firefox',});});+ test('a send waits for a mode pick still being checked', async () => {+ await fixture(async ({ page }) => {+ await page.click('#btn-permission-gate');+ await page.evaluate(() => { window.__release = null; window.__gates.act = new Promise(resolve => { window.__release = resolve; }); });+ await page.click('.composer-mode-option[data-composer-mode="act"]');+ await page.evaluate(() => { window.__sent = null; window.restoreComposerModeBeforeSend(7).then(() => { window.__sent = window.modeState(); }); });+ await page.waitForTimeout(80);+ assert.equal(await page.evaluate(() => window.__sent), null, 'the send is held while Act is checked');+ await page.evaluate(() => window.__release());+ await page.waitForFunction(() => window.__sent !== null);+ assert.deepEqual(await page.evaluate(() => window.__sent), { auto: false, agentMode: 'act', pin: 'act' }, 'it then goes out in Act');+ });+ });++ test('a send waits for a restored mode to be checked against the provider', async () => {+ await fixture(async ({ page }) => {+ // Dev was kept, then the provider became Compact while the panel was closed.+ await page.evaluate(() => {+ window.__blocked.dev = true;+ window.__release = null;+ window.__gates.dev = new Promise(resolve => { window.__release = resolve; });+ window.restoreComposerModeForCurrentTab();+ window.__sent = null;+ window.restoreComposerModeBeforeSend(7).then(() => { window.__sent = window.modeState(); });+ });+ await page.waitForTimeout(80);+ assert.equal(await page.evaluate(() => window.__sent), null, 'the send is held while the restored Dev is checked');+ await page.evaluate(() => window.__release());+ await page.waitForFunction(() => window.__sent !== null);+ assert.deepEqual(await page.evaluate(() => window.__sent), { auto: true, agentMode: 'ask', pin: null }, 'it goes out in Auto, never in a Dev the provider cannot run');+ }, { storedPin: 'dev' });+ });+test('a kept mode the new provider cannot run goes back to Auto, after the run', async () => {await fixture(async ({ page }) => {await page.click('#btn-permission-gate');