Skip to content

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

fix(newtab): round-77 review — a handoff queued behind an active run keeps its pinned mode

Claude247cc019a844
diff --git a/src/chrome/src/ui/sidepanel.js b/src/chrome/src/ui/sidepanel.js
index 89540a137..1a880afb1 100644
--- a/src/chrome/src/ui/sidepanel.js
+++ b/src/chrome/src/ui/sidepanel.js
@@ -2651,7 +2651,7 @@ function removeQueuedComposerMessage(tabId, queueId) {
return item;
}
-function enqueueQueuedComposerMessage(tabId, text) {
+function enqueueQueuedComposerMessage(tabId, text, mode = null) {
const numericTabId = Number(tabId);
const queuedText = String(text || '').trim();
if (!Number.isFinite(numericTabId) || !queuedText) return false;
@@ -2659,6 +2659,9 @@ function enqueueQueuedComposerMessage(tabId, text) {
queue.push({
id: `queued-${Date.now()}-${++queuedComposerMessageSeq}`,
text: queuedText,
+ // A mode the sender pinned (the new tab's Ask / Act) has to survive the wait: automatic
+ // mode selection would otherwise classify the message again when the queue drains.
+ ...(['ask', 'act', 'dev'].includes(mode) ? { mode } : {}),
});
setQueuedComposerMessages(numericTabId, queue);
if (sameTabId(currentTabId, numericTabId)) {
@@ -2900,6 +2903,7 @@ function drainQueuedComposerMessageForCurrentTab() {
inputEl.queuedComposerSubmission = submission;
Promise.resolve().then(() => sendMessage({
__queuedComposerMessage: submission,
+ ...(item.mode ? { __mode: item.mode } : {}),
})).catch((e) => {
addMessage('error', t('sp.error_prefix', { msg: e?.message || String(e) }));
});
@@ -9739,7 +9743,7 @@ async function sendMessage(extraChatParams = {}) {
|| (extraChatParams?.__deliveryMode !== 'queue' && composerDeliveryMode === 'steer')) {
return steerComposerMessage(tabId, text, { fromComposer: true });
}
- return enqueueQueuedComposerMessage(tabId, text);
+ return enqueueQueuedComposerMessage(tabId, text, modeOverride);
}
let runCaptureDirective = null;
if (!retryOptions) {
diff --git a/src/firefox/src/ui/sidepanel.js b/src/firefox/src/ui/sidepanel.js
index 7d405fd80..1c137ccd3 100644
--- a/src/firefox/src/ui/sidepanel.js
+++ b/src/firefox/src/ui/sidepanel.js
@@ -2911,7 +2911,7 @@ function removeQueuedComposerMessage(tabId, queueId) {
return item;
}
-function enqueueQueuedComposerMessage(tabId, text) {
+function enqueueQueuedComposerMessage(tabId, text, mode = null) {
const numericTabId = Number(tabId);
const queuedText = String(text || '').trim();
if (!Number.isFinite(numericTabId) || !queuedText) return false;
@@ -2919,6 +2919,9 @@ function enqueueQueuedComposerMessage(tabId, text) {
queue.push({
id: `queued-${Date.now()}-${++queuedComposerMessageSeq}`,
text: queuedText,
+ // A mode the sender pinned (the new tab's Ask / Act) has to survive the wait: automatic
+ // mode selection would otherwise classify the message again when the queue drains.
+ ...(['ask', 'act', 'dev'].includes(mode) ? { mode } : {}),
});
setQueuedComposerMessages(numericTabId, queue);
if (sameTabId(currentTabId, numericTabId)) {
@@ -3160,6 +3163,7 @@ function drainQueuedComposerMessageForCurrentTab() {
inputEl.queuedComposerSubmission = submission;
Promise.resolve().then(() => sendMessage({
__queuedComposerMessage: submission,
+ ...(item.mode ? { __mode: item.mode } : {}),
})).catch((e) => {
addMessage('error', t('sp.error_prefix', { msg: e?.message || String(e) }));
});
@@ -9451,7 +9455,7 @@ async function sendMessage(extraChatParams = {}) {
|| (extraChatParams?.__deliveryMode !== 'queue' && composerDeliveryMode === 'steer')) {
return steerComposerMessage(tabId, text, { fromComposer: true });
}
- return enqueueQueuedComposerMessage(tabId, text);
+ return enqueueQueuedComposerMessage(tabId, text, modeOverride);
}
let runCaptureDirective = null;
if (!retryOptions) {
diff --git a/test/newtab.mjs b/test/newtab.mjs
index 7897fa917..c396b679a 100644
--- a/test/newtab.mjs
+++ b/test/newtab.mjs
@@ -2548,3 +2548,13 @@ test('round-76: Act warns that it starts immediately, in every shipped language'
const h = readFileSync(path.join(root, 'src/chrome/src/ui/newtab-handoff.js'), 'utf8');
assert.doesNotMatch(h, /handoff\.mode === 'ask' && !getIsBlocked/);
});
+
+test('round-77: a queued handoff keeps the mode pinned by the new tab until it is sent', () => {
+ for (const browser of ['chrome', 'firefox']) {
+ const src = readFileSync(path.join(root, 'src', browser, 'src/ui/sidepanel.js'), 'utf8');
+ assert.match(src, /function enqueueQueuedComposerMessage\(tabId, text, mode = null\)/, browser);
+ assert.match(src, /text: queuedText,[\s\S]{0,260}\.\.\.\(\['ask', 'act', 'dev'\]\.includes\(mode\) \? \{ mode \} : \{\}\)/, browser);
+ assert.match(src, /return enqueueQueuedComposerMessage\(tabId, text, modeOverride\);/, browser);
+ assert.match(src, /__queuedComposerMessage: submission,\s*\.\.\.\(item\.mode \? \{ __mode: item\.mode \} : \{\}\)/, browser);
+ }
+});