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
Schedule form: keep prompt-to-target tracking on restored composers and show the URL field it fills
Claude0405c2e3e4b0
diff --git a/src/chrome/src/ui/sidepanel.js b/src/chrome/src/ui/sidepanel.jsindex 67899b2f9..542357726 100644--- a/src/chrome/src/ui/sidepanel.js+++ b/src/chrome/src/ui/sidepanel.js@@ -4555,13 +4555,36 @@ async function submitScheduleComposer(e, form) {}}+// The target follows the URL the prompt names until the person picks a target+// themselves; both live on the form so a restored composer keeps them.+function applyScheduleTarget(form, prompt) {+ const { targetType, urlInput } = getScheduleComposerControls(form);+ if (!targetType || !urlInput) return;+ const targetUrl = scheduleUrlFromPrompt(prompt) || form.dataset.initialUrl || '';+ if (isHttpScheduleUrl(targetUrl)) {+ urlInput.value = targetUrl;+ targetType.value = 'url';+ } else {+ urlInput.value = '';+ targetType.value = 'current_tab';+ }+ updateScheduleComposerVisibility(form);+}+function bindScheduleComposer(form) {if (!form || form.dataset.bound) return;- const { scheduleType, timeMode, targetType, cancel } = getScheduleComposerControls(form);+ const { scheduleType, timeMode, targetType, urlInput, promptInput, cancel } = getScheduleComposerControls(form);form.dataset.bound = 'true';scheduleType?.addEventListener('change', () => updateScheduleComposerVisibility(form));timeMode?.addEventListener('change', () => updateScheduleComposerVisibility(form));- targetType?.addEventListener('change', () => updateScheduleComposerVisibility(form));+ targetType?.addEventListener('change', () => {+ form.dataset.targetChosen = 'true';+ updateScheduleComposerVisibility(form);+ });+ urlInput?.addEventListener('input', () => { form.dataset.targetChosen = 'true'; });+ promptInput?.addEventListener('input', () => {+ if (form.dataset.targetChosen !== 'true') applyScheduleTarget(form, promptInput.value);+ });updateScheduleComposerVisibility(form);cancel?.addEventListener('click', () => form.closest('.message')?.remove());form.addEventListener('submit', (e) => submitScheduleComposer(e, form));@@ -4670,25 +4693,8 @@ async function renderScheduleComposer(prefillPrompt = '', tabId = currentTabId)urlInput.className = 'schedule-url';urlInput.placeholder = 'https://example.com/';addScheduleField(form, t('sp.schedule_form.target_url'), urlInput);- const applyScheduleTarget = (prompt) => {- const targetUrl = scheduleUrlFromPrompt(prompt) || initialScheduleUrl;- if (isHttpScheduleUrl(targetUrl)) {- urlInput.value = targetUrl;- targetType.value = 'url';- } else {- urlInput.value = '';- targetType.value = 'current_tab';- }- };- applyScheduleTarget(prefillPrompt);- // The target follows the URL the prompt names until the person picks one- // themselves, so a prompt typed or edited after /schedule opened is read too.- let scheduleTargetChosen = false;- urlInput.addEventListener('input', () => { scheduleTargetChosen = true; });- targetType.addEventListener('change', () => { scheduleTargetChosen = true; });- promptInput.addEventListener('input', () => {- if (!scheduleTargetChosen) applyScheduleTarget(promptInput.value);- });+ form.dataset.initialUrl = isHttpScheduleUrl(initialScheduleUrl) ? initialScheduleUrl : '';+ applyScheduleTarget(form, prefillPrompt);const modeInput = document.createElement('select');modeInput.className = 'schedule-mode';diff --git a/src/firefox/src/ui/sidepanel.js b/src/firefox/src/ui/sidepanel.jsindex 07a4d0f81..73927d824 100644--- a/src/firefox/src/ui/sidepanel.js+++ b/src/firefox/src/ui/sidepanel.js@@ -4419,13 +4419,36 @@ async function submitScheduleComposer(e, form) {}}+// The target follows the URL the prompt names until the person picks a target+// themselves; both live on the form so a restored composer keeps them.+function applyScheduleTarget(form, prompt) {+ const { targetType, urlInput } = getScheduleComposerControls(form);+ if (!targetType || !urlInput) return;+ const targetUrl = scheduleUrlFromPrompt(prompt) || form.dataset.initialUrl || '';+ if (isHttpScheduleUrl(targetUrl)) {+ urlInput.value = targetUrl;+ targetType.value = 'url';+ } else {+ urlInput.value = '';+ targetType.value = 'current_tab';+ }+ updateScheduleComposerVisibility(form);+}+function bindScheduleComposer(form) {if (!form || form.dataset.bound) return;- const { scheduleType, timeMode, targetType, cancel } = getScheduleComposerControls(form);+ const { scheduleType, timeMode, targetType, urlInput, promptInput, cancel } = getScheduleComposerControls(form);form.dataset.bound = 'true';scheduleType?.addEventListener('change', () => updateScheduleComposerVisibility(form));timeMode?.addEventListener('change', () => updateScheduleComposerVisibility(form));- targetType?.addEventListener('change', () => updateScheduleComposerVisibility(form));+ targetType?.addEventListener('change', () => {+ form.dataset.targetChosen = 'true';+ updateScheduleComposerVisibility(form);+ });+ urlInput?.addEventListener('input', () => { form.dataset.targetChosen = 'true'; });+ promptInput?.addEventListener('input', () => {+ if (form.dataset.targetChosen !== 'true') applyScheduleTarget(form, promptInput.value);+ });updateScheduleComposerVisibility(form);cancel?.addEventListener('click', () => form.closest('.message')?.remove());form.addEventListener('submit', (e) => submitScheduleComposer(e, form));@@ -4534,25 +4557,8 @@ async function renderScheduleComposer(prefillPrompt = '', tabId = currentTabId)urlInput.className = 'schedule-url';urlInput.placeholder = 'https://example.com/';addScheduleField(form, t('sp.schedule_form.target_url'), urlInput);- const applyScheduleTarget = (prompt) => {- const targetUrl = scheduleUrlFromPrompt(prompt) || initialScheduleUrl;- if (isHttpScheduleUrl(targetUrl)) {- urlInput.value = targetUrl;- targetType.value = 'url';- } else {- urlInput.value = '';- targetType.value = 'current_tab';- }- };- applyScheduleTarget(prefillPrompt);- // The target follows the URL the prompt names until the person picks one- // themselves, so a prompt typed or edited after /schedule opened is read too.- let scheduleTargetChosen = false;- urlInput.addEventListener('input', () => { scheduleTargetChosen = true; });- targetType.addEventListener('change', () => { scheduleTargetChosen = true; });- promptInput.addEventListener('input', () => {- if (!scheduleTargetChosen) applyScheduleTarget(promptInput.value);- });+ form.dataset.initialUrl = isHttpScheduleUrl(initialScheduleUrl) ? initialScheduleUrl : '';+ applyScheduleTarget(form, prefillPrompt);const modeInput = document.createElement('select');modeInput.className = 'schedule-mode';diff --git a/test/run.js b/test/run.jsindex 8d2cba09d..68f6fb6c2 100644--- a/test/run.js+++ b/test/run.js@@ -42624,9 +42624,37 @@ test('sidepanel exposes schedule slash commands in both builds', () => {assert.match(panel, /if \(currentTabId !== tabId\) \{[\s\S]*?replaceCachedScheduleComposer\(tabId, form\.dataset\.composerId, \{[\s\S]*?id: res\.jobId,[\s\S]*?scheduledAt: res\.scheduledAt,[\s\S]*?\}\);[\s\S]*?return;[\s\S]*?\}[\s\S]*?form\.remove\(\);[\s\S]*?renderScheduledJobCreatedMessage/, `${label}: schedule form should reconcile hidden and visible composer confirmations by job id`);assert.match(panel, /catch \(err\) \{[\s\S]*?if \(currentTabId !== tabId\) \{[\s\S]*?updateCachedScheduleComposerError\(tabId, form\.dataset\.composerId, err\.message\);[\s\S]*?return;[\s\S]*?\}[\s\S]*?submit\.disabled = false;[\s\S]*?errorEl\.textContent = err\.message;/, `${label}: schedule form failures should update hidden cached composers instead of leaving disabled forms`);assert.match(panel, /renderScheduleComposer\(payload, tabId\)/, `${label}: /schedule should pass the initiating tab into the async composer`);- assert.match(panel, /const targetUrl = scheduleUrlFromPrompt\(prompt\) \|\| initialScheduleUrl;\s*if \(isHttpScheduleUrl\(targetUrl\)\) \{\s*urlInput\.value = targetUrl;[\s\S]*?applyScheduleTarget\(prefillPrompt\);/, `${label}: schedule form should prefill URL targets from the prompt, else the active tab`);- assert.match(panel, /promptInput\.addEventListener\('input', \(\) => \{\s*if \(!scheduleTargetChosen\) applyScheduleTarget\(promptInput\.value\);/, `${label}: an unchosen target follows the prompt as it is typed or edited`);- assert.match(panel, /urlInput\.addEventListener\('input', \(\) => \{ scheduleTargetChosen = true; \}\);[\s\S]*?targetType\.addEventListener\('change', \(\) => \{ scheduleTargetChosen = true; \}\);/, `${label}: a target the person picked is not overwritten by the prompt`);+ assert.match(panel, /function applyScheduleTarget\(form, prompt\) \{[\s\S]*?const targetUrl = scheduleUrlFromPrompt\(prompt\) \|\| form\.dataset\.initialUrl \|\| '';[\s\S]*?updateScheduleComposerVisibility\(form\);\s*\}/, `${label}: schedule form should pick URL targets from the prompt, else the active tab, and refresh the URL field's visibility`);+ assert.match(panel, /applyScheduleTarget\(form, prefillPrompt\);/, `${label}: the prefilled prompt sets the first target`);+ assert.match(panel, /function bindScheduleComposer\(form\) \{[\s\S]*?promptInput\?\.addEventListener\('input', \(\) => \{\s*if \(form\.dataset\.targetChosen !== 'true'\) applyScheduleTarget\(form, promptInput\.value\);/, `${label}: an unchosen target follows the prompt as it is typed or edited, from the rebindable path`);+ assert.match(panel, /urlInput\?\.addEventListener\('input', \(\) => \{ form\.dataset\.targetChosen = 'true'; \}\);/, `${label}: a URL the person typed is not overwritten by the prompt`);+ assert.match(panel, /targetType\?\.addEventListener\('change', \(\) => \{\s*form\.dataset\.targetChosen = 'true';\s*updateScheduleComposerVisibility\(form\);/, `${label}: a target type the person picked is not overwritten by the prompt`);+ {+ // The tracking runs against a form rebuilt from saved markup, too.+ const fields = {};+ const field = (name, value = '') => ({+ value, hidden: false,+ closest: () => ({ classList: { toggle: (_c, on) => { fields[name].hidden = on; } } }),+ });+ for (const name of ['title', 'prompt', 'type', 'timeMode', 'after', 'runAt', 'interval', 'target', 'url', 'mode']) fields[name] = field(name);+ fields.target.value = 'current_tab';+ fields.type.value = 'once'; fields.timeMode.value = 'after';+ const selectors = { '.schedule-target-type': 'target', '.schedule-url': 'url', '.schedule-type': 'type', '.schedule-time-mode': 'timeMode', '.schedule-after': 'after', '.schedule-run-at': 'runAt', '.schedule-interval': 'interval', '.schedule-prompt': 'prompt' };+ const form = { dataset: { initialUrl: '' }, querySelector: sel => fields[selectors[sel]] || null };+ const env = vm.createContext({ URL });+ vm.runInContext(['isHttpScheduleUrl', 'trimScheduleUrlProse', 'scheduleUrlFromPrompt', 'getScheduleComposerControls', 'updateScheduleComposerVisibility', 'applyScheduleTarget'].map(name => {+ const start = panel.indexOf(`function ${name}(`);+ return panel.slice(start, panel.indexOf('\n}\n', start) + 2);+ }).join('\n'), env);+ env.form = form;+ vm.runInContext(`applyScheduleTarget(form, 'Check https://example.com/a daily.')`, env);+ assert.equal(fields.url.value, 'https://example.com/a');+ assert.equal(fields.target.value, 'url');+ assert.equal(fields.url.hidden, false, `${label}: an automatically chosen URL target shows its URL field`);+ vm.runInContext(`applyScheduleTarget(form, 'Check the open page.')`, env);+ assert.equal(fields.target.value, 'current_tab');+ assert.equal(fields.url.hidden, true);+ }{const helpers = vm.createContext({ URL });vm.runInContext(['isHttpScheduleUrl', 'trimScheduleUrlProse', 'scheduleUrlFromPrompt'].map(name => {