Skip to content

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

fix(selection): preserve follow-up whitespace

Emre Sokulluf0ecfff7237a
diff --git a/src/chrome/src/background.js b/src/chrome/src/background.js
index 938d5ff72..f279b025a 100644
--- a/src/chrome/src/background.js
+++ b/src/chrome/src/background.js
@@ -1892,13 +1892,14 @@ async function queueSelectionShortcutPromptAfterProviders(msg, tab, sendResponse
{ contextWindow },
)
: includePageContext
- ? buildFullContextSelectionPrompt(selectionText, msg.question)
+ ? buildFullContextSelectionPrompt(selectionText, msg.question, { trim: !msg.priorAnswer })
: buildSelectionPrompt(
selectionText,
msg.action,
msg.question,
msg.language,
sourceGrounding,
+ { trim: !msg.priorAnswer },
);
if (!tab?.id || !text) {
sendResponse({ ok: false, queued: false, requiresManualOpen: false, error: 'Invalid selection shortcut request.' });
diff --git a/src/chrome/src/context-menu-storage.js b/src/chrome/src/context-menu-storage.js
index e4e8e3236..8f01b1ce4 100644
--- a/src/chrome/src/context-menu-storage.js
+++ b/src/chrome/src/context-menu-storage.js
@@ -218,6 +218,7 @@ export function buildSelectionPrompt(
question = '',
language = '',
sourceGrounding = SELECTION_ONLY_SOURCE_GROUNDING,
+ options = {},
) {
const actionId = String(action || '').trim();
const normalizedSourceGrounding = normalizeSelectionSourceGrounding(sourceGrounding);
@@ -225,16 +226,17 @@ export function buildSelectionPrompt(
if (normalizedSourceGrounding === SELECTION_CONTEXT_SOURCE_GROUNDING && actionId !== 'custom') return '';
const instruction = selectionActionInstruction(actionId, question, language);
if (!instruction) return '';
- return wrapSelectedPageText(selectionText, instruction, normalizedSourceGrounding);
+ return wrapSelectedPageText(selectionText, instruction, normalizedSourceGrounding, options);
}
-export function buildFullContextSelectionPrompt(selectionText, question) {
+export function buildFullContextSelectionPrompt(selectionText, question, options = {}) {
const userQuestion = String(question || '').trim();
if (!userQuestion) return '';
return wrapSelectedPageText(
selectionText,
`${CUSTOM_QUESTION_PREFIX}${userQuestion}`,
FULL_CONTEXT_PROMPT_GROUNDING,
+ options,
);
}
diff --git a/src/firefox/src/background.js b/src/firefox/src/background.js
index 89e42202b..c237a6f8a 100644
--- a/src/firefox/src/background.js
+++ b/src/firefox/src/background.js
@@ -1644,13 +1644,14 @@ async function queueFirefoxSelectionShortcutPromptAfterProviders(msg, tab, sendR
{ contextWindow },
)
: includePageContext
- ? buildFullContextSelectionPrompt(selectionText, msg.question)
+ ? buildFullContextSelectionPrompt(selectionText, msg.question, { trim: !msg.priorAnswer })
: buildSelectionPrompt(
selectionText,
msg.action,
msg.question,
msg.language,
sourceGrounding,
+ { trim: !msg.priorAnswer },
);
if (!tab?.id || !text) {
sendResponse({ ok: false, queued: false, requiresManualOpen: true, error: 'Invalid selection shortcut request.' });
diff --git a/src/firefox/src/context-menu-storage.js b/src/firefox/src/context-menu-storage.js
index b32b9eae2..3148f788c 100644
--- a/src/firefox/src/context-menu-storage.js
+++ b/src/firefox/src/context-menu-storage.js
@@ -218,6 +218,7 @@ export function buildSelectionPrompt(
question = '',
language = '',
sourceGrounding = SELECTION_ONLY_SOURCE_GROUNDING,
+ options = {},
) {
const actionId = String(action || '').trim();
const normalizedSourceGrounding = normalizeSelectionSourceGrounding(sourceGrounding);
@@ -225,16 +226,17 @@ export function buildSelectionPrompt(
if (normalizedSourceGrounding === SELECTION_CONTEXT_SOURCE_GROUNDING && actionId !== 'custom') return '';
const instruction = selectionActionInstruction(actionId, question, language);
if (!instruction) return '';
- return wrapSelectedPageText(selectionText, instruction, normalizedSourceGrounding);
+ return wrapSelectedPageText(selectionText, instruction, normalizedSourceGrounding, options);
}
-export function buildFullContextSelectionPrompt(selectionText, question) {
+export function buildFullContextSelectionPrompt(selectionText, question, options = {}) {
const userQuestion = String(question || '').trim();
if (!userQuestion) return '';
return wrapSelectedPageText(
selectionText,
`${CUSTOM_QUESTION_PREFIX}${userQuestion}`,
FULL_CONTEXT_PROMPT_GROUNDING,
+ options,
);
}
diff --git a/test/run.js b/test/run.js
index 9356342ff..817c6711a 100644
--- a/test/run.js
+++ b/test/run.js
@@ -55338,10 +55338,12 @@ test('selection shortcut is shipped, enabled by default, and keeps browser-speci
const chromePromptStart = chromeBg.indexOf('function queueSelectionShortcutPrompt(');
const chromeHandler = chromeBg.slice(chromePromptStart, chromeEnd);
const chromeOpen = chromeHandler.indexOf('openSidePanelForContextMenu(tab, { open: !panelOpened });');
- const chromeSave = chromeHandler.indexOf('await contextMenuStorage.save(tab.id, payload);');
+ const chromeDeferredStart = chromeBg.indexOf('async function queueSelectionShortcutPromptAfterProviders(');
+ const chromeDeferred = chromeBg.slice(chromeDeferredStart, chromePromptStart);
+ const chromeSave = chromeDeferred.indexOf('await contextMenuStorage.save(tab.id, payload);');
assert.notEqual(chromeStart, -1, 'chrome: selection shortcut listener missing');
assert.notEqual(chromePromptStart, -1, 'chrome: shared selection prompt handler missing');
- assert.equal(chromeOpen !== -1 && chromeSave !== -1 && chromeOpen < chromeSave, true, 'chrome: side panel must open before prompt storage awaits');
+ assert.equal(chromeOpen !== -1 && chromeSave !== -1, true, 'chrome: side panel must open before deferred prompt storage');
assert.match(chromeHandler, /requiresManualOpen: false/, 'chrome: successful shortcut response should not require manual opening');
const firefoxBg = fs.readFileSync(path.join(ROOT, 'src/firefox/src/background.js'), 'utf8');