Skip to content

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

Simplify steering controls and add default delivery setting

Barack Sokullu80b4c0b83a79
diff --git a/src/chrome/src/config-transfer.js b/src/chrome/src/config-transfer.js
index a07a825ce..7a95e3ba8 100644
--- a/src/chrome/src/config-transfer.js
+++ b/src/chrome/src/config-transfer.js
@@ -25,6 +25,7 @@ export const DEFAULT_CONFIG_SETTINGS = Object.freeze({
themeMode: 'system',
[UI_SCALE_STORAGE_KEY]: 100,
verboseMode: false,
+ composerDeliveryMode: 'queue',
selectionShortcutEnabled: true,
[AUTO_GROUP_TABS_KEY]: true,
helpImproveWebBrain: true,
@@ -174,6 +175,7 @@ const NUMBER_KEYS = new Set([
'systemOneCompletionThreshold',
]);
const STRING_KEYS = new Set([
+ 'composerDeliveryMode',
'wbLocale',
'themeMode',
'autoScreenshot',
diff --git a/src/chrome/src/ui/locales/en.js b/src/chrome/src/ui/locales/en.js
index 16a421128..0430e3588 100644
--- a/src/chrome/src/ui/locales/en.js
+++ b/src/chrome/src/ui/locales/en.js
@@ -123,6 +123,10 @@ export default {
'sp.attach.needs_prompt': 'Add a question to send with your attachment.',
'sp.attach.no_tab': 'No active tab to attach the selection to.',
'sp.steer.button': 'Steer',
+ 'st.display.composer_delivery.label': 'Messages during a running task',
+ 'st.display.composer_delivery.desc': 'Choose what Enter and Send do while a task is running. Queue saves the message for the next turn; Steer sends it to the current task. Alt+Enter always steers.',
+ 'st.display.composer_delivery.queue': 'Queue',
+ 'st.display.composer_delivery.steer': 'Steer',
'sp.steer.title': 'Steer the current task (Alt+Enter)',
'sp.steer.sent': 'Steering message sent; applies at the next agent step.',
'sp.steer.queued': 'The current task has ended; message queued for the next turn.',
diff --git a/src/chrome/src/ui/locales/tr.js b/src/chrome/src/ui/locales/tr.js
index 3aa04e2eb..f003701b6 100644
--- a/src/chrome/src/ui/locales/tr.js
+++ b/src/chrome/src/ui/locales/tr.js
@@ -864,6 +864,10 @@ export default {
"sp.attach.needs_prompt": "Ekinizle birlikte göndermek için bir soru yazın.",
"sp.attach.no_tab": "Seçimi ekleyebileceğiniz etkin bir sekme yok.",
"sp.steer.button": "Yönlendir",
+ "st.display.composer_delivery.label": "Görev çalışırken mesaj gönderme",
+ "st.display.composer_delivery.desc": "Görev çalışırken Enter ve Gönder düğmesinin davranışını seçin. Kuyruk, mesajı sonraki tur için saklar; Yönlendir, çalışan göreve iletir. Alt+Enter her zaman yönlendirir.",
+ "st.display.composer_delivery.queue": "Kuyruk",
+ "st.display.composer_delivery.steer": "Yönlendir",
"sp.steer.title": "Çalışan görevi yönlendir (Alt+Enter)",
"sp.steer.sent": "Yönlendirme gönderildi; agent bir sonraki adımda dikkate alacak.",
"sp.steer.queued": "Çalışan görev bitti; mesaj bir sonraki yanıt için kuyruğa alındı.",
diff --git a/src/chrome/src/ui/settings.html b/src/chrome/src/ui/settings.html
index c389f2fe7..55c77c9e3 100644
--- a/src/chrome/src/ui/settings.html
+++ b/src/chrome/src/ui/settings.html
@@ -1478,6 +1478,16 @@
<input class="setting-input" type="text" id="input-download-directory" autocomplete="off" spellcheck="false"
data-i18n-placeholder="st.display.download_directory.placeholder">
</div>
+ <div class="setting-row">
+ <div class="setting-info">
+ <div class="setting-label" data-i18n="st.display.composer_delivery.label"></div>
+ <div class="setting-desc" data-i18n="st.display.composer_delivery.desc"></div>
+ </div>
+ <select id="select-composer-delivery-mode" data-i18n-aria-label="st.display.composer_delivery.label">
+ <option value="queue" data-i18n="st.display.composer_delivery.queue"></option>
+ <option value="steer" data-i18n="st.display.composer_delivery.steer"></option>
+ </select>
+ </div>
<div class="setting-row">
<div class="setting-info">
<div class="setting-label" data-i18n="st.display.selection_shortcut.label"></div>
diff --git a/src/chrome/src/ui/settings.js b/src/chrome/src/ui/settings.js
index f26352198..834fb7765 100644
--- a/src/chrome/src/ui/settings.js
+++ b/src/chrome/src/ui/settings.js
@@ -98,6 +98,7 @@ const advancedSettings = document.querySelector('.advanced-settings');
const apocalypseModeLink = document.getElementById('apocalypse-mode-link');
const apocalypseModeStatus = document.getElementById('apocalypse-mode-status');
const verboseToggle = document.getElementById('toggle-verbose');
+const composerDeliveryModeSelect = document.getElementById('select-composer-delivery-mode');
const selectionShortcutToggle = document.getElementById('toggle-selection-shortcut');
const pdfViewerToggle = document.getElementById('toggle-pdf-viewer');
const autoGroupTabsToggle = document.getElementById('toggle-auto-group-tabs');
@@ -805,11 +806,14 @@ async function init() {
chrome.storage.local.remove(['authToken', 'authEmail', 'authDefaultModel']).catch(() => {});
// Load display settings
- const stored = await chrome.storage.local.get(['verboseMode', 'selectionShortcutEnabled', 'pdfViewerEnabled', AUTO_GROUP_TABS_KEY, 'helpImproveWebBrain', 'screenshotFallback', 'maxAgentSteps', 'autoScreenshot', 'useSiteAdapters', 'researchEscalationEnabled', 'researchEscalationEngine', 'voiceInputEnabled', 'alwaysAllowApiMutations', 'apiMutationObserverEnabled', 'webMcpEnabled', 'openaiAskStreamingEnabled', 'planBeforeActMode', 'planBeforeAct', 'planReviewMode', 'planReviewConfidenceThreshold', DOWNLOAD_DIRECTORY_STORAGE_KEY, 'notifySound', 'completionConfetti', 'completionFlashTab', 'tracingEnabled', 'losslessTrace', 'strictSecretMode', 'agentAllowLocalNetwork', CLOUD_BRIDGE_ENABLED_KEY, CLOUD_BRIDGE_URL_KEY, 'scheduledTasksEnabled', 'scheduledRequireConsequentialConfirmation', 'systemOneEnabled', 'systemOneWatchEnabled', 'systemOneCompletionEnabled', 'systemOneFastClassifications', 'systemOneFastBrowser', 'systemOneWatchThreshold', 'systemOneCompletionThreshold', 'typesafeApiKey', 'providerFilter', 'requestTimeoutMs', 'clarifyTimeoutSec', 'clarifyTimeoutSemanticsV2', 'costAllowanceSessionUsd', 'costAllowanceTotalUsd', 'meteredProviderCostSpentUsd', 'screenshotRedaction', 'imageDetail', 'maxScreenshotsPerTurn', 'maxImageDimension']);
+ const stored = await chrome.storage.local.get(['verboseMode', 'composerDeliveryMode', 'selectionShortcutEnabled', 'pdfViewerEnabled', AUTO_GROUP_TABS_KEY, 'helpImproveWebBrain', 'screenshotFallback', 'maxAgentSteps', 'autoScreenshot', 'useSiteAdapters', 'researchEscalationEnabled', 'researchEscalationEngine', 'voiceInputEnabled', 'alwaysAllowApiMutations', 'apiMutationObserverEnabled', 'webMcpEnabled', 'openaiAskStreamingEnabled', 'planBeforeActMode', 'planBeforeAct', 'planReviewMode', 'planReviewConfidenceThreshold', DOWNLOAD_DIRECTORY_STORAGE_KEY, 'notifySound', 'completionConfetti', 'completionFlashTab', 'tracingEnabled', 'losslessTrace', 'strictSecretMode', 'agentAllowLocalNetwork', CLOUD_BRIDGE_ENABLED_KEY, CLOUD_BRIDGE_URL_KEY, 'scheduledTasksEnabled', 'scheduledRequireConsequentialConfirmation', 'systemOneEnabled', 'systemOneWatchEnabled', 'systemOneCompletionEnabled', 'systemOneFastClassifications', 'systemOneFastBrowser', 'systemOneWatchThreshold', 'systemOneCompletionThreshold', 'typesafeApiKey', 'providerFilter', 'requestTimeoutMs', 'clarifyTimeoutSec', 'clarifyTimeoutSemanticsV2', 'costAllowanceSessionUsd', 'costAllowanceTotalUsd', 'meteredProviderCostSpentUsd', 'screenshotRedaction', 'imageDetail', 'maxScreenshotsPerTurn', 'maxImageDimension']);
if (typeof stored.providerFilter === 'string' && ['all','active','local','cloud','router'].includes(stored.providerFilter)) {
providerFilter = stored.providerFilter;
}
verboseToggle.checked = stored.verboseMode || false;
+ if (composerDeliveryModeSelect) {
+ composerDeliveryModeSelect.value = stored.composerDeliveryMode === 'steer' ? 'steer' : 'queue';
+ }
if (selectionShortcutToggle) selectionShortcutToggle.checked = stored.selectionShortcutEnabled !== false;
if (pdfViewerToggle) pdfViewerToggle.checked = stored.pdfViewerEnabled === undefined || stored.pdfViewerEnabled === true;
if (autoGroupTabsToggle) autoGroupTabsToggle.checked = stored[AUTO_GROUP_TABS_KEY] !== false;
@@ -1443,6 +1447,11 @@ if (globalThis.chrome?.storage?.onChanged) {
// --- Display Settings ---
+composerDeliveryModeSelect?.addEventListener('change', async () => {
+ const mode = composerDeliveryModeSelect.value === 'steer' ? 'steer' : 'queue';
+ await chrome.storage.local.set({ composerDeliveryMode: mode }).catch(() => {});
+});
+
downloadDirectoryInput?.addEventListener('input', () => {
downloadDirectoryInput.setCustomValidity('');
});
diff --git a/src/chrome/src/ui/sidepanel.html b/src/chrome/src/ui/sidepanel.html
index a7262c91a..c6b8927f3 100644
--- a/src/chrome/src/ui/sidepanel.html
+++ b/src/chrome/src/ui/sidepanel.html
@@ -413,7 +413,6 @@
<path d="M8 22h8"/>
</svg>
</button>
- <button id="btn-steer" type="button" class="hidden" data-i18n="sp.steer.button" data-i18n-title="sp.steer.title" data-i18n-aria-label="sp.steer.title" disabled>Steer</button>
<button id="btn-send" data-i18n-title="sp.btn.send">
<svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor">
<path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z"/>
diff --git a/src/chrome/src/ui/sidepanel.js b/src/chrome/src/ui/sidepanel.js
index 3634b928a..070c0f3f6 100644
--- a/src/chrome/src/ui/sidepanel.js
+++ b/src/chrome/src/ui/sidepanel.js
@@ -606,7 +606,6 @@ const chatNavigationLabelEl = document.getElementById('chat-navigation-label');
const inputEl = document.getElementById('user-input');
const inputHighlightEl = document.getElementById('input-highlight');
const sendBtn = document.getElementById('btn-send');
-const steerBtn = document.getElementById('btn-steer');
const micBtn = document.getElementById('btn-mic');
const clearBtn = document.getElementById('btn-clear');
const appEl = document.getElementById('app');
@@ -1975,6 +1974,17 @@ const queuedSteeringMessageIds = new Set();
const composerHistoryNavigationByTab = new Map();
let queuedComposerMessageSeq = 0;
+let composerDeliveryMode = 'queue';
+const composerDeliveryModeReady = chrome.storage.local.get('composerDeliveryMode').then((stored) => {
+ composerDeliveryMode = stored.composerDeliveryMode === 'steer' ? 'steer' : 'queue';
+ syncSendButtonState();
+}).catch(() => {});
+chrome.storage.onChanged.addListener((changes, area) => {
+ if (area !== 'local' || !changes.composerDeliveryMode) return;
+ composerDeliveryMode = changes.composerDeliveryMode.newValue === 'steer' ? 'steer' : 'queue';
+ syncSendButtonState();
+});
+
function enqueueTabChatOperation(tabId, fn) {
const numericTabId = Number(tabId);
if (!Number.isFinite(numericTabId)) return Promise.resolve({ ok: true });
@@ -2306,21 +2316,20 @@ async function steerComposerMessage(tabId, text, { queueId = null, fromComposer
}
}
-function syncSteerButtonState() {
- if (!steerBtn) return;
- const draft = inputEl?.value.trim() || '';
+function syncComposerDeliveryState() {
+ if (!sendBtn) return;
const sending = steeringRequestsByTab.has(Number(currentTabId));
const blocked = sending || !sameTabId(currentTabId, renderedTabId) || isTabAbortRequested(currentTabId)
|| isAwaitingPlanReviewForTab() || isConversationClearInProgress()
|| tabSwitchTransitionId != null || visibleStateRefreshPending || visibleStateRefreshInProgress;
- steerBtn.classList.toggle('hidden', !isProcessing);
- steerBtn.disabled = !isProcessing || !draft || draft.startsWith('/') || blocked;
queuedMessagesEl?.querySelectorAll('.queued-message-steer').forEach(button => {
button.classList.toggle('hidden', !isProcessing);
button.closest('.queued-message')?.classList.toggle('has-steer', isProcessing);
button.disabled = !isProcessing || blocked;
});
- const sendLabel = isProcessing ? 'sp.queue.send' : 'sp.btn.send';
+ const sendLabel = isProcessing
+ ? (composerDeliveryMode === 'steer' ? 'sp.steer.title' : 'sp.queue.send')
+ : 'sp.btn.send';
sendBtn.title = t(sendLabel);
sendBtn.setAttribute('aria-label', t(sendLabel));
sendBtn.dataset.i18nTitle = sendLabel;
@@ -2391,7 +2400,7 @@ function renderQueuedComposerMessages(tabId = currentTabId) {
row.append(edit, remove);
queuedMessagesEl.appendChild(row);
});
- syncSteerButtonState();
+ syncComposerDeliveryState();
}
function shiftQueuedComposerMessage(tabId) {
@@ -8098,7 +8107,7 @@ function isOutOfBandSlashDraft(value) {
function syncSendButtonState() {
if (!sendBtn) return;
- syncSteerButtonState();
+ syncComposerDeliveryState();
const draft = normalizeScreenshotCommandText(inputEl?.value || '').trim();
if (tabSwitchTransitionId != null || visibleStateRefreshPending || visibleStateRefreshInProgress) {
sendBtn.disabled = true;
@@ -9061,6 +9070,7 @@ async function sendMessage(extraChatParams = {}) {
const selectionAction = sourceGrounding ? normalizeSelectionAction(requestedSelectionAction) : '';
delete chatExtraParams.selectionAction;
if (selectionAction) chatExtraParams.selectionAction = selectionAction;
+ await composerDeliveryModeReady;
await waitForVisibleSidePanelStateRefresh();
if (agentPrompt && (
!agentDisplayText
@@ -9141,7 +9151,8 @@ async function sendMessage(extraChatParams = {}) {
showBusySlashCommandNotice();
return false;
}
- if (extraChatParams?.__deliveryMode === 'immediate') {
+ if (extraChatParams?.__deliveryMode === 'immediate'
+ || (extraChatParams?.__deliveryMode !== 'queue' && composerDeliveryMode === 'steer')) {
return steerComposerMessage(tabId, text, { fromComposer: true });
}
return enqueueQueuedComposerMessage(tabId, text);
@@ -14585,7 +14596,6 @@ if (selectionAskActionEl) {
}
sendBtn.addEventListener('click', sendMessage);
-steerBtn?.addEventListener('click', () => sendMessage({ __deliveryMode: 'immediate' }));
document.addEventListener('keydown', handleGlobalKeydown, true);
diff --git a/src/chrome/styles/sidepanel.css b/src/chrome/styles/sidepanel.css
index 79aa978e0..46f6b675f 100644
--- a/src/chrome/styles/sidepanel.css
+++ b/src/chrome/styles/sidepanel.css
@@ -3469,30 +3469,10 @@ html[data-ui-scale="175"] .conversation-action-label {
color: var(--text-muted);
}
-#btn-steer {
- flex-shrink: 0;
- height: 32px;
- padding: 0 8px;
- border: 1px solid var(--border);
- border-radius: 8px;
- background: var(--bg-input);
- color: var(--accent);
- font: inherit;
- font-size: 11px;
- font-weight: 600;
- cursor: pointer;
-}
-
-#btn-steer.hidden,
.queued-message-steer.hidden {
display: none;
}
-#btn-steer:hover:enabled {
- background: var(--accent-dim);
-}
-
-#btn-steer:disabled,
.queued-message-action:disabled {
opacity: 0.4;
cursor: not-allowed;
diff --git a/src/firefox/src/config-transfer.js b/src/firefox/src/config-transfer.js
index a07a825ce..7a95e3ba8 100644
--- a/src/firefox/src/config-transfer.js
+++ b/src/firefox/src/config-transfer.js
@@ -25,6 +25,7 @@ export const DEFAULT_CONFIG_SETTINGS = Object.freeze({
themeMode: 'system',
[UI_SCALE_STORAGE_KEY]: 100,
verboseMode: false,
+ composerDeliveryMode: 'queue',
selectionShortcutEnabled: true,
[AUTO_GROUP_TABS_KEY]: true,
helpImproveWebBrain: true,
@@ -174,6 +175,7 @@ const NUMBER_KEYS = new Set([
'systemOneCompletionThreshold',
]);
const STRING_KEYS = new Set([
+ 'composerDeliveryMode',
'wbLocale',
'themeMode',
'autoScreenshot',
diff --git a/src/firefox/src/ui/locales/en.js b/src/firefox/src/ui/locales/en.js
index bee0bbd5a..4c9ca9ba3 100644
--- a/src/firefox/src/ui/locales/en.js
+++ b/src/firefox/src/ui/locales/en.js
@@ -123,6 +123,10 @@ export default {
'sp.attach.needs_prompt': 'Add a question to send with your attachment.',
'sp.attach.no_tab': 'No active tab to attach the selection to.',
'sp.steer.button': 'Steer',
+ 'st.display.composer_delivery.label': 'Messages during a running task',
+ 'st.display.composer_delivery.desc': 'Choose what Enter and Send do while a task is running. Queue saves the message for the next turn; Steer sends it to the current task. Alt+Enter always steers.',
+ 'st.display.composer_delivery.queue': 'Queue',
+ 'st.display.composer_delivery.steer': 'Steer',
'sp.steer.title': 'Steer the current task (Alt+Enter)',
'sp.steer.sent': 'Steering message sent; applies at the next agent step.',
'sp.steer.queued': 'The current task has ended; message queued for the next turn.',
diff --git a/src/firefox/src/ui/locales/tr.js b/src/firefox/src/ui/locales/tr.js
index 8f928beb6..29a8a1722 100644
--- a/src/firefox/src/ui/locales/tr.js
+++ b/src/firefox/src/ui/locales/tr.js
@@ -837,6 +837,10 @@ export default {
"sp.attach.needs_prompt": "Ekinizle birlikte göndermek için bir soru yazın.",
"sp.attach.no_tab": "Seçimi ekleyebileceğiniz etkin bir sekme yok.",
"sp.steer.button": "Yönlendir",
+ "st.display.composer_delivery.label": "Görev çalışırken mesaj gönderme",
+ "st.display.composer_delivery.desc": "Görev çalışırken Enter ve Gönder düğmesinin davranışını seçin. Kuyruk, mesajı sonraki tur için saklar; Yönlendir, çalışan göreve iletir. Alt+Enter her zaman yönlendirir.",
+ "st.display.composer_delivery.queue": "Kuyruk",
+ "st.display.composer_delivery.steer": "Yönlendir",
"sp.steer.title": "Çalışan görevi yönlendir (Alt+Enter)",
"sp.steer.sent": "Yönlendirme gönderildi; agent bir sonraki adımda dikkate alacak.",
"sp.steer.queued": "Çalışan görev bitti; mesaj bir sonraki yanıt için kuyruğa alındı.",
diff --git a/src/firefox/src/ui/settings.html b/src/firefox/src/ui/settings.html
index 0db84f444..e629c620e 100644
--- a/src/firefox/src/ui/settings.html
+++ b/src/firefox/src/ui/settings.html
@@ -1369,6 +1369,16 @@
<input class="setting-input" type="text" id="input-download-directory" autocomplete="off" spellcheck="false"
data-i18n-placeholder="st.display.download_directory.placeholder">
</div>
+ <div class="setting-row">
+ <div class="setting-info">
+ <div class="setting-label" data-i18n="st.display.composer_delivery.label"></div>
+ <div class="setting-desc" data-i18n="st.display.composer_delivery.desc"></div>
+ </div>
+ <select id="select-composer-delivery-mode" data-i18n-aria-label="st.display.composer_delivery.label">
+ <option value="queue" data-i18n="st.display.composer_delivery.queue"></option>
+ <option value="steer" data-i18n="st.display.composer_delivery.steer"></option>
+ </select>
+ </div>
<div class="setting-row">
<div class="setting-info">
<div class="setting-label" data-i18n="st.display.selection_shortcut.label"></div>
diff --git a/src/firefox/src/ui/settings.js b/src/firefox/src/ui/settings.js
index 3397ddb93..cb45761be 100644
--- a/src/firefox/src/ui/settings.js
+++ b/src/firefox/src/ui/settings.js
@@ -90,6 +90,7 @@ const advancedSettings = document.querySelector('.advanced-settings');
const apocalypseModeLink = document.getElementById('apocalypse-mode-link');
const apocalypseModeStatus = document.getElementById('apocalypse-mode-status');
const verboseToggle = document.getElementById('toggle-verbose');
+const composerDeliveryModeSelect = document.getElementById('select-composer-delivery-mode');
const selectionShortcutToggle = document.getElementById('toggle-selection-shortcut');
const autoGroupTabsToggle = document.getElementById('toggle-auto-group-tabs');
const helpImproveToggle = document.getElementById('toggle-help-improve');
@@ -577,11 +578,14 @@ async function init() {
browser.storage.local.remove(['authToken', 'authEmail', 'authDefaultModel']).catch(() => {});
// Load display settings
- const stored = await browser.storage.local.get(['verboseMode', 'selectionShortcutEnabled', AUTO_GROUP_TABS_KEY, 'helpImproveWebBrain', 'screenshotFallback', 'maxAgentSteps', 'autoScreenshot', 'useSiteAdapters', 'researchEscalationEnabled', 'researchEscalationEngine', 'voiceInputEnabled', 'alwaysAllowApiMutations', 'apiMutationObserverEnabled', 'openaiAskStreamingEnabled', 'planBeforeActMode', 'planBeforeAct', 'planReviewMode', 'planReviewConfidenceThreshold', DOWNLOAD_DIRECTORY_STORAGE_KEY, 'notifySound', 'completionConfetti', 'completionFlashTab', 'tracingEnabled', 'losslessTrace', 'strictSecretMode', 'agentAllowLocalNetwork', 'scheduledTasksEnabled', 'scheduledRequireConsequentialConfirmation', 'systemOneEnabled', 'systemOneWatchEnabled', 'systemOneCompletionEnabled', 'systemOneFastClassifications', 'systemOneFastBrowser', 'systemOneWatchThreshold', 'systemOneCompletionThreshold', 'typesafeApiKey', 'providerFilter', 'requestTimeoutMs', 'clarifyTimeoutSec', 'clarifyTimeoutSemanticsV2', 'costAllowanceSessionUsd', 'costAllowanceTotalUsd', 'meteredProviderCostSpentUsd', 'screenshotRedaction', 'imageDetail', 'maxScreenshotsPerTurn', 'maxImageDimension']);
+ const stored = await browser.storage.local.get(['verboseMode', 'composerDeliveryMode', 'selectionShortcutEnabled', AUTO_GROUP_TABS_KEY, 'helpImproveWebBrain', 'screenshotFallback', 'maxAgentSteps', 'autoScreenshot', 'useSiteAdapters', 'researchEscalationEnabled', 'researchEscalationEngine', 'voiceInputEnabled', 'alwaysAllowApiMutations', 'apiMutationObserverEnabled', 'openaiAskStreamingEnabled', 'planBeforeActMode', 'planBeforeAct', 'planReviewMode', 'planReviewConfidenceThreshold', DOWNLOAD_DIRECTORY_STORAGE_KEY, 'notifySound', 'completionConfetti', 'completionFlashTab', 'tracingEnabled', 'losslessTrace', 'strictSecretMode', 'agentAllowLocalNetwork', 'scheduledTasksEnabled', 'scheduledRequireConsequentialConfirmation', 'systemOneEnabled', 'systemOneWatchEnabled', 'systemOneCompletionEnabled', 'systemOneFastClassifications', 'systemOneFastBrowser', 'systemOneWatchThreshold', 'systemOneCompletionThreshold', 'typesafeApiKey', 'providerFilter', 'requestTimeoutMs', 'clarifyTimeoutSec', 'clarifyTimeoutSemanticsV2', 'costAllowanceSessionUsd', 'costAllowanceTotalUsd', 'meteredProviderCostSpentUsd', 'screenshotRedaction', 'imageDetail', 'maxScreenshotsPerTurn', 'maxImageDimension']);
if (typeof stored.providerFilter === 'string' && ['all','active','local','cloud','router'].includes(stored.providerFilter)) {
providerFilter = stored.providerFilter;
}
verboseToggle.checked = stored.verboseMode || false;
+ if (composerDeliveryModeSelect) {
+ composerDeliveryModeSelect.value = stored.composerDeliveryMode === 'steer' ? 'steer' : 'queue';
+ }
if (selectionShortcutToggle) selectionShortcutToggle.checked = stored.selectionShortcutEnabled !== false;
if (autoGroupTabsToggle) autoGroupTabsToggle.checked = stored[AUTO_GROUP_TABS_KEY] !== false;
if (helpImproveToggle) helpImproveToggle.checked = stored.helpImproveWebBrain !== false; // on by default
@@ -1205,6 +1209,11 @@ if (globalThis.browser?.storage?.onChanged) {
// --- Display Settings ---
+composerDeliveryModeSelect?.addEventListener('change', async () => {
+ const mode = composerDeliveryModeSelect.value === 'steer' ? 'steer' : 'queue';
+ await browser.storage.local.set({ composerDeliveryMode: mode }).catch(() => {});
+});
+
downloadDirectoryInput?.addEventListener('input', () => {
downloadDirectoryInput.setCustomValidity('');
});
diff --git a/src/firefox/src/ui/sidepanel.html b/src/firefox/src/ui/sidepanel.html
index 75ac2f320..7bf1114a3 100644
--- a/src/firefox/src/ui/sidepanel.html
+++ b/src/firefox/src/ui/sidepanel.html
@@ -373,7 +373,6 @@
<path d="M8 22h8"/>
</svg>
</button>
- <button id="btn-steer" type="button" class="hidden" data-i18n="sp.steer.button" data-i18n-title="sp.steer.title" data-i18n-aria-label="sp.steer.title" disabled>Steer</button>
<button id="btn-send" data-i18n-title="sp.btn.send">
<svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor">
<path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z"/>
diff --git a/src/firefox/src/ui/sidepanel.js b/src/firefox/src/ui/sidepanel.js
index 960275e13..278980742 100644
--- a/src/firefox/src/ui/sidepanel.js
+++ b/src/firefox/src/ui/sidepanel.js
@@ -487,7 +487,6 @@ const chatNavigationLabelEl = document.getElementById('chat-navigation-label');
const inputEl = document.getElementById('user-input');
const inputHighlightEl = document.getElementById('input-highlight');
const sendBtn = document.getElementById('btn-send');
-const steerBtn = document.getElementById('btn-steer');
const micBtn = document.getElementById('btn-mic');
const clearBtn = document.getElementById('btn-clear');
const appEl = document.getElementById('app');
@@ -1838,6 +1837,17 @@ const queuedSteeringMessageIds = new Set();
const composerHistoryNavigationByTab = new Map();
let queuedComposerMessageSeq = 0;
+let composerDeliveryMode = 'queue';
+const composerDeliveryModeReady = browser.storage.local.get('composerDeliveryMode').then((stored) => {
+ composerDeliveryMode = stored.composerDeliveryMode === 'steer' ? 'steer' : 'queue';
+ syncSendButtonState();
+}).catch(() => {});
+browser.storage.onChanged.addListener((changes, area) => {
+ if (area !== 'local' || !changes.composerDeliveryMode) return;
+ composerDeliveryMode = changes.composerDeliveryMode.newValue === 'steer' ? 'steer' : 'queue';
+ syncSendButtonState();
+});
+
function enqueueTabChatOperation(tabId, fn) {
const numericTabId = Number(tabId);
if (!Number.isFinite(numericTabId)) return Promise.resolve({ ok: true });
@@ -2540,21 +2550,20 @@ async function steerComposerMessage(tabId, text, { queueId = null, fromComposer
}
}
-function syncSteerButtonState() {
- if (!steerBtn) return;
- const draft = inputEl?.value.trim() || '';
+function syncComposerDeliveryState() {
+ if (!sendBtn) return;
const sending = steeringRequestsByTab.has(Number(currentTabId));
const blocked = sending || !sameTabId(currentTabId, renderedTabId) || isTabAbortRequested(currentTabId)
|| isAwaitingPlanReviewForTab() || isConversationClearInProgress()
|| tabSwitchTransitionId != null || visibleStateRefreshPending || visibleStateRefreshInProgress;
- steerBtn.classList.toggle('hidden', !isProcessing);
- steerBtn.disabled = !isProcessing || !draft || draft.startsWith('/') || blocked;
queuedMessagesEl?.querySelectorAll('.queued-message-steer').forEach(button => {
button.classList.toggle('hidden', !isProcessing);
button.closest('.queued-message')?.classList.toggle('has-steer', isProcessing);
button.disabled = !isProcessing || blocked;
});
- const sendLabel = isProcessing ? 'sp.queue.send' : 'sp.btn.send';
+ const sendLabel = isProcessing
+ ? (composerDeliveryMode === 'steer' ? 'sp.steer.title' : 'sp.queue.send')
+ : 'sp.btn.send';
sendBtn.title = t(sendLabel);
sendBtn.setAttribute('aria-label', t(sendLabel));
sendBtn.dataset.i18nTitle = sendLabel;
@@ -2625,7 +2634,7 @@ function renderQueuedComposerMessages(tabId = currentTabId) {
row.append(edit, remove);
queuedMessagesEl.appendChild(row);
});
- syncSteerButtonState();
+ syncComposerDeliveryState();
}
function shiftQueuedComposerMessage(tabId) {
@@ -7893,7 +7902,7 @@ function isOutOfBandSlashDraft(value) {
function syncSendButtonState() {
if (!sendBtn) return;
- syncSteerButtonState();
+ syncComposerDeliveryState();
const draft = normalizeScreenshotCommandText(inputEl?.value || '').trim();
if (tabSwitchTransitionId != null || visibleStateRefreshPending || visibleStateRefreshInProgress) {
sendBtn.disabled = true;
@@ -8763,6 +8772,7 @@ async function sendMessage(extraChatParams = {}) {
const selectionAction = sourceGrounding ? normalizeSelectionAction(requestedSelectionAction) : '';
delete chatExtraParams.selectionAction;
if (selectionAction) chatExtraParams.selectionAction = selectionAction;
+ await composerDeliveryModeReady;
await waitForVisibleSidePanelStateRefresh();
if (agentPrompt && (
!agentDisplayText
@@ -8843,7 +8853,8 @@ async function sendMessage(extraChatParams = {}) {
showBusySlashCommandNotice();
return false;
}
- if (extraChatParams?.__deliveryMode === 'immediate') {
+ if (extraChatParams?.__deliveryMode === 'immediate'
+ || (extraChatParams?.__deliveryMode !== 'queue' && composerDeliveryMode === 'steer')) {
return steerComposerMessage(tabId, text, { fromComposer: true });
}
return enqueueQueuedComposerMessage(tabId, text);
@@ -14091,7 +14102,6 @@ if (selectionAskActionEl) {
}
sendBtn.addEventListener('click', sendMessage);
-steerBtn?.addEventListener('click', () => sendMessage({ __deliveryMode: 'immediate' }));
document.addEventListener('keydown', handleGlobalKeydown, true);
diff --git a/src/firefox/styles/sidepanel.css b/src/firefox/styles/sidepanel.css
index 02f726a3c..4d54e64b2 100644
--- a/src/firefox/styles/sidepanel.css
+++ b/src/firefox/styles/sidepanel.css
@@ -3295,30 +3295,10 @@ html[data-ui-scale="175"] .conversation-action-label {
color: var(--text-muted);
}
-#btn-steer {
- flex-shrink: 0;
- height: 32px;
- padding: 0 8px;
- border: 1px solid var(--border);
- border-radius: 8px;
- background: var(--bg-input);
- color: var(--accent);
- font: inherit;
- font-size: 11px;
- font-weight: 600;
- cursor: pointer;
-}
-
-#btn-steer.hidden,
.queued-message-steer.hidden {
display: none;
}
-#btn-steer:hover:enabled {
- background: var(--accent-dim);
-}
-
-#btn-steer:disabled,
.queued-message-action:disabled {
opacity: 0.4;
cursor: not-allowed;
diff --git a/test/chat-steering-ui.mjs b/test/chat-steering-ui.mjs
index 011fbc755..1c3f1281d 100644
--- a/test/chat-steering-ui.mjs
+++ b/test/chat-steering-ui.mjs
@@ -12,19 +12,31 @@ function extract(source, name) {
}
for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
- test(`${build}: native composer queues by default, explicitly steers, and preserves drafts across races`, async () => {
+ test(`${build}: native composer honors delivery settings, explicitly steers, and preserves drafts across races`, async () => {
const browser = await engine.launch({ headless: true });
try {
const page = await browser.newPage({ viewport: { width: 380, height: 700 } });
const html = read(build, 'src/ui/sidepanel.html');
const source = read(build, 'src/ui/sidepanel.js');
+ const settings = read(build, 'src/ui/settings.js');
+ const settingsHtml = read(build, 'src/ui/settings.html');
+ const preferenceStart = source.indexOf("let composerDeliveryMode = 'queue';");
+ const preferenceEnd = source.indexOf('\nfunction enqueueTabChatOperation(', preferenceStart);
+ const settingListenerStart = settings.indexOf("composerDeliveryModeSelect?.addEventListener('change'");
+ const settingListenerEnd = settings.indexOf('\n});', settingListenerStart) + 4;
+ const settingHydrationStart = settings.indexOf(' if (composerDeliveryModeSelect) {');
+ const settingHydrationEnd = settings.indexOf('\n }', settingHydrationStart) + 4;
+ const settingsRead = settings.match(/ const stored = await (?:chrome|browser)\.storage\.local\.get\(\[[^\n]+/)[0];
+ const settingSelectHtml = settingsHtml.match(/<select id="select-composer-delivery-mode"[\s\S]*?<\/select>/)[0];
+ assert.ok(preferenceStart >= 0 && preferenceEnd > preferenceStart);
+ assert.ok(settingListenerStart >= 0 && settingListenerEnd > settingListenerStart);
const start = html.indexOf('<div id="queued-messages"');
const end = html.indexOf(' </div>\n </div>', start);
assert.ok(start >= 0 && end > start);
- await page.setContent(`<style>${read(build, 'styles/sidepanel.css')}</style><div id="messages"></div>${html.slice(start, end + 12)}`);
+ await page.setContent(`<style>${read(build, 'styles/sidepanel.css')}</style><div id="messages"></div>${html.slice(start, end + 12)}${settingSelectHtml}`);
const functions = [
'sameTabId', 'getQueuedComposerMessages', 'setQueuedComposerMessages',
- 'queueUnconsumedSteeringMessages', 'steerComposerMessage', 'syncSteerButtonState',
+ 'queueUnconsumedSteeringMessages', 'steerComposerMessage', 'syncComposerDeliveryState',
'queuedComposerButton', 'renderQueuedComposerMessages', 'removeQueuedComposerMessage',
'enqueueQueuedComposerMessage', 'syncSendButtonState', 'sendMessage',
].map(name => extract(source, name)).join('\n');
@@ -33,7 +45,6 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
await page.addScriptTag({ content: `
var inputEl = document.getElementById('user-input');
var sendBtn = document.getElementById('btn-send');
- var steerBtn = document.getElementById('btn-steer');
var queuedMessagesEl = document.getElementById('queued-messages');
var messagesEl = document.getElementById('messages');
var currentTabId = 1, renderedTabId = 1, isProcessing = true;
@@ -45,6 +56,30 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
var clearedConversationRunRequestIds = new Set(), queuedComposerMessageSeq = 0;
var sent = [], notices = [], requestSeq = 0, heldResponse = null;
var responseMode = 'accept';
+ var storageData = { composerDeliveryMode: 'steer' }, storageListeners = [];
+ var chrome = { storage: {
+ local: {
+ async get(keys) {
+ return Object.fromEntries(Object.entries(storageData).filter(([key]) => [].concat(keys).includes(key)));
+ },
+ async set(values) {
+ Object.assign(storageData, values);
+ storageListeners.forEach(listener => listener(Object.fromEntries(
+ Object.entries(values).map(([key, newValue]) => [key, { newValue }])
+ ), 'local'));
+ },
+ },
+ onChanged: { addListener(listener) { storageListeners.push(listener); } },
+ } };
+ var browser = chrome;
+ var AUTO_GROUP_TABS_KEY = 'autoGroupTabs';
+ var DOWNLOAD_DIRECTORY_STORAGE_KEY = 'downloadDirectory';
+ var CLOUD_BRIDGE_ENABLED_KEY = 'cloudBridgeEnabled', CLOUD_BRIDGE_URL_KEY = 'cloudBridgeUrl';
+ var composerDeliveryModeSelect = document.getElementById('select-composer-delivery-mode');
+ async function hydrateDeliverySetting() {
+ ${settingsRead}
+ ${settings.slice(settingHydrationStart, settingHydrationEnd)}
+ }
function t(key) { return ({ 'sp.steer.button': 'Yönlendir', 'sp.queue.label': 'Kuyrukta' })[key] || key; }
function isTabProcessing(tabId) { return tabId === 1; }
function isTabAbortRequested() { return aborting; }
@@ -82,12 +117,24 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
}
${functions}
${source.slice(listenersStart, listenersEnd)}
- steerBtn.textContent = t('sp.steer.button');
+ ${source.slice(preferenceStart, preferenceEnd)}
+ ${settings.slice(settingListenerStart, settingListenerEnd)}
+ hydrateDeliverySetting();
inputEl.addEventListener('input', syncSendButtonState);
syncSendButtonState();
` });
const input = page.locator('#user-input');
+ const deliverySetting = page.locator('#select-composer-delivery-mode');
+ await page.waitForFunction(() => composerDeliveryMode === 'steer'
+ && composerDeliveryModeSelect.value === 'steer');
+ assert.equal(await page.locator('#btn-send').getAttribute('title'), 'sp.steer.title',
+ 'Saved preference hydrates both settings and composer');
+ assert.equal(await page.locator('#btn-steer').count(), 0, 'No separate composer Steer button');
+ await deliverySetting.selectOption('queue');
+ await page.waitForFunction(() => composerDeliveryMode === 'queue');
+ assert.equal(await page.evaluate(() => storageData.composerDeliveryMode), 'queue');
+ assert.equal(await page.locator('#btn-send').getAttribute('aria-label'), 'sp.queue.send');
await input.fill('After this, check the tests');
await input.press('Enter');
await page.waitForFunction(() => getQueuedComposerMessages(1).length === 1);
@@ -99,33 +146,36 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
'Steer, edit, and delete remain on one row in a narrow panel');
await input.fill('Use blue instead');
- await page.locator('#btn-steer').click();
+ await deliverySetting.selectOption('steer');
+ await page.locator('#btn-send').click();
await page.waitForFunction(() => sent.length === 1 && !steeringRequestsByTab.size);
assert.equal(await input.inputValue(), '');
assert.deepEqual(await page.evaluate(() => [sent[0].action, sent[0].text, sent[0].requestId, sent[0].tabId]),
['chat_steer', 'Use blue instead', 'run-1', 1]);
assert.equal(await page.evaluate(() => getQueuedComposerMessages(1).length), 1, 'Steering preserves queued follow-ups');
+ assert.equal(await page.evaluate(() => storageData.composerDeliveryMode), 'steer');
await page.locator('.queued-message-steer').click();
await page.waitForFunction(() => sent.length === 2 && !steeringRequestsByTab.size);
assert.equal(await page.evaluate(() => getQueuedComposerMessages(1).length), 0);
await input.fill('Keep the logo');
- await input.press('Alt+Enter');
+ await input.press('Enter');
await page.waitForFunction(() => sent.length === 3 && !steeringRequestsByTab.size);
assert.equal(await page.evaluate(() => sent.at(-1).text), 'Keep the logo');
+ await deliverySetting.selectOption('queue');
await page.evaluate(() => inputEl.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', altKey: true, isComposing: true })));
assert.equal(await page.evaluate(() => sent.length), 3, 'IME confirmation does not send');
await input.fill('/act');
- assert.equal(await page.locator('#btn-steer').isDisabled(), true);
+ assert.equal(await page.locator('#btn-send').isDisabled(), true);
await input.press('Alt+Enter');
assert.equal(await page.evaluate(() => sent.length), 3, 'Busy slash commands never become steering');
await page.evaluate(() => { responseMode = 'hold'; });
await input.fill('First correction');
- await page.locator('#btn-steer').click();
+ await input.press('Alt+Enter');
await page.waitForFunction(() => heldResponse !== null);
await input.fill('New draft while waiting');
await input.press('Enter');
@@ -136,7 +186,7 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
await page.evaluate(() => { responseMode = 'inactive'; });
await input.fill('Missed the current turn');
- await page.locator('#btn-steer').click();
+ await input.press('Alt+Enter');
await page.waitForFunction(() => !steeringRequestsByTab.size);
assert.equal(await input.inputValue(), '');
assert.equal(await page.evaluate(() => getQueuedComposerMessages(1)[0].text), 'Missed the current turn');
@@ -154,13 +204,13 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
await page.evaluate(() => { responseMode = 'fail'; });
await input.fill('Retain on failure');
- await page.locator('#btn-steer').click();
+ await input.press('Alt+Enter');
await page.waitForFunction(() => !steeringRequestsByTab.size);
assert.equal(await input.inputValue(), 'Retain on failure');
await page.evaluate(() => { responseMode = 'hold'; });
await input.fill('Correction for tab one');
- await page.locator('#btn-steer').click();
+ await input.press('Alt+Enter');
await page.waitForFunction(() => heldResponse !== null);
await page.evaluate(() => {
tabInputDrafts.set(1, inputEl.value);
@@ -175,7 +225,7 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
await page.evaluate(() => { responseMode = 'hold'; });
await input.fill('Clear while awaiting acknowledgement');
- await page.locator('#btn-steer').click();
+ await input.press('Alt+Enter');
await page.waitForFunction(() => heldResponse !== null);
await page.evaluate(() => {
queuedComposerMessagesByTab.clear();
@@ -192,8 +242,16 @@ for (const [build, engine] of [['chrome', chromium], ['firefox', firefox]]) {
});
assert.equal(await page.evaluate(() => getQueuedComposerMessages(1).length), 1, 'Journal replay is deduplicated');
assert.equal(await page.evaluate(() => getQueuedComposerMessages(2).length), 0);
+ await deliverySetting.selectOption('steer');
+ await page.evaluate(() => {
+ delete storageData.composerDeliveryMode;
+ storageListeners.forEach(listener => listener({ composerDeliveryMode: {} }, 'local'));
+ });
+ assert.equal(await page.evaluate(() => composerDeliveryMode), 'queue', 'Removing preference restores Queue');
+ await page.evaluate(() => hydrateDeliverySetting());
+ assert.equal(await deliverySetting.inputValue(), 'queue', 'Missing setting hydrates to Queue');
await page.evaluate(() => { isProcessing = false; syncSendButtonState(); });
- assert.equal(await page.locator('#btn-steer').isVisible(), false);
+ assert.equal(await page.locator('#btn-steer').count(), 0);
assert.equal(await page.locator('#btn-send').getAttribute('title'), 'sp.btn.send');
} finally {
await browser.close();