Skip to content

Open-source AI browser agent for Chrome and Firefox (monorepo) 🧠

Mode picker: a new chat cancels a pick still being checked

Claude7404ba13fa39
diff --git a/src/chrome/src/ui/sidepanel.js b/src/chrome/src/ui/sidepanel.js
index 3758eba3c..69bcc6077 100644
--- a/src/chrome/src/ui/sidepanel.js
+++ b/src/chrome/src/ui/sidepanel.js
@@ -1907,6 +1907,9 @@ function restoreComposerModeForCurrentTab() {
function setComposerModePinForTab(tabId, mode) {
if (isStandaloneWindow || tabId == null) return;
+ // Any change (a pick, a new chat, a recovered record, a selection scope, a
+ // provider check) supersedes a pick still waiting on its checks.
+ composerModePickGeneration += 1;
const previous = composerModePins.get(tabId);
void composerModePins.set(tabId, mode);
// Leaving a kept Dev drains that tab's diagnostics, never another tab's.
diff --git a/src/firefox/src/ui/sidepanel.js b/src/firefox/src/ui/sidepanel.js
index 7c2b5a46f..ca774f9fc 100644
--- a/src/firefox/src/ui/sidepanel.js
+++ b/src/firefox/src/ui/sidepanel.js
@@ -2082,6 +2082,9 @@ function restoreComposerModeForCurrentTab() {
function setComposerModePinForTab(tabId, mode) {
if (isStandaloneWindow || tabId == null) return;
+ // Any change (a pick, a new chat, a recovered record, a selection scope, a
+ // provider check) supersedes a pick still waiting on its checks.
+ composerModePickGeneration += 1;
void composerModePins.set(tabId, mode);
if (sameTabId(currentTabId, tabId)) syncComposerModeForCurrentTab();
}
diff --git a/test/sidepanel-permission-gate-ui.mjs b/test/sidepanel-permission-gate-ui.mjs
index 3012404d4..8c388d1ab 100644
--- a/test/sidepanel-permission-gate-ui.mjs
+++ b/test/sidepanel-permission-gate-ui.mjs
@@ -371,6 +371,21 @@ for (const [build, engine, api] of [['chrome', chromium, 'chrome'], ['firefox',
});
});
+ test('a new chat cancels a 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"]');
+ // New chat (renderClearedConversationForTab) while the Act check waits.
+ await page.evaluate(() => window.setComposerModePinForTab(7, null));
+ await page.evaluate(() => window.__release());
+ await page.waitForTimeout(50);
+ const p = await picker(page);
+ assert.deepEqual(p.state, { auto: true, agentMode: 'ask', pin: null }, 'the new chat starts in Auto');
+ assert.equal('composerModePin:7' in p.session, false);
+ });
+ });
+
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');