Skip to content

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

Skills: Cancel stops a URL import in flight

Emre Sokullu82667fcd3823
diff --git a/src/chrome/src/ui/settings.js b/src/chrome/src/ui/settings.js
index 686abb3e5..841e77e3a 100644
--- a/src/chrome/src/ui/settings.js
+++ b/src/chrome/src/ui/settings.js
@@ -1231,6 +1231,7 @@ function closeSkillForm() {
}
function startSkillEdit(skill) {
+ skillFormGeneration += 1;
setSkillFormOpen(true);
editingSkillId = skill.id;
if (skillNameInput) skillNameInput.value = skill.name || '';
@@ -1294,6 +1295,19 @@ async function addSkillFromText() {
}
}
+// The URL import in flight: Cancel aborts it, so a cancelled import adds no
+// skill. Cancel, Clear form and Edit also start a new form generation; an
+// import that finishes after one of them adds its skill but leaves the form
+// as the user has it now.
+let skillUrlImport = null;
+let skillFormGeneration = 0;
+
+function resetSkillUrlButton() {
+ if (!btnAddSkillUrl) return;
+ btnAddSkillUrl.disabled = false;
+ btnAddSkillUrl.textContent = t('st.skills.add_url');
+}
+
async function addSkillFromUrl() {
let url;
try {
@@ -1303,7 +1317,12 @@ async function addSkillFromUrl() {
return;
}
- const previousText = btnAddSkillUrl?.textContent;
+ skillUrlImport?.abort();
+ const controller = new AbortController();
+ skillUrlImport = controller;
+ const generation = skillFormGeneration;
+ // The name as it was when the import started.
+ const name = skillNameInput?.value || '';
if (btnAddSkillUrl) {
btnAddSkillUrl.disabled = true;
btnAddSkillUrl.textContent = t('st.skills.loading_url');
@@ -1314,6 +1333,7 @@ async function addSkillFromUrl() {
const { response, url: finalUrl } = await fetchSkillImportResponse(url, {
validateUrl: normalizeSkillUrl,
redirectMessage: t('st.skills.error.url'),
+ init: { signal: controller.signal },
});
if (!response.ok) throw new Error(t('st.skills.error.fetch', { status: response.status }));
const content = extractSkillText(
@@ -1324,24 +1344,28 @@ async function addSkillFromUrl() {
response.headers.get('content-type') || '',
);
if (!content) throw new Error(t('st.skills.error.empty_content'));
+ if (controller.signal.aborted) return;
await addCustomSkill({
id: makeSkillId(),
- name: skillNameInput?.value || '',
+ name,
sourceType: 'url',
sourceUrl: finalUrl,
content,
createdAt: Date.now(),
});
- if (skillNameInput) skillNameInput.value = '';
- if (skillUrlInput) skillUrlInput.value = '';
- closeSkillForm();
+ if (generation === skillFormGeneration) {
+ if (skillNameInput) skillNameInput.value = '';
+ if (skillUrlInput) skillUrlInput.value = '';
+ closeSkillForm();
+ }
flashSkillsResult('ok', t('st.skills.added'));
} catch (e) {
+ if (controller.signal.aborted) return;
flashSkillsResult('fail', e.message || t('st.skills.error.add_failed'));
} finally {
- if (btnAddSkillUrl) {
- btnAddSkillUrl.disabled = false;
- btnAddSkillUrl.textContent = previousText || t('st.skills.add_url');
+ if (skillUrlImport === controller) {
+ skillUrlImport = null;
+ resetSkillUrlButton();
}
}
}
@@ -1350,6 +1374,13 @@ btnAddSkillText?.addEventListener('click', addSkillFromText);
btnAddSkillUrl?.addEventListener('click', addSkillFromUrl);
btnShowSkillForm?.addEventListener('click', openSkillForm);
btnCancelSkillForm?.addEventListener('click', () => {
+ skillFormGeneration += 1;
+ if (skillUrlImport) {
+ skillUrlImport.abort();
+ skillUrlImport = null;
+ resetSkillUrlButton();
+ skillsResult?.classList.remove('show');
+ }
cancelSkillEdit();
if (skillNameInput) skillNameInput.value = '';
if (skillUrlInput) skillUrlInput.value = '';
@@ -1357,6 +1388,7 @@ btnCancelSkillForm?.addEventListener('click', () => {
closeSkillForm();
});
btnClearSkillForm?.addEventListener('click', () => {
+ skillFormGeneration += 1;
cancelSkillEdit();
if (skillNameInput) skillNameInput.value = '';
if (skillUrlInput) skillUrlInput.value = '';
diff --git a/src/firefox/src/ui/settings.js b/src/firefox/src/ui/settings.js
index 8ec2ba516..6f72bb0f5 100644
--- a/src/firefox/src/ui/settings.js
+++ b/src/firefox/src/ui/settings.js
@@ -1155,6 +1155,7 @@ function closeSkillForm() {
}
function startSkillEdit(skill) {
+ skillFormGeneration += 1;
setSkillFormOpen(true);
editingSkillId = skill.id;
if (skillNameInput) skillNameInput.value = skill.name || '';
@@ -1218,6 +1219,19 @@ async function addSkillFromText() {
}
}
+// The URL import in flight: Cancel aborts it, so a cancelled import adds no
+// skill. Cancel, Clear form and Edit also start a new form generation; an
+// import that finishes after one of them adds its skill but leaves the form
+// as the user has it now.
+let skillUrlImport = null;
+let skillFormGeneration = 0;
+
+function resetSkillUrlButton() {
+ if (!btnAddSkillUrl) return;
+ btnAddSkillUrl.disabled = false;
+ btnAddSkillUrl.textContent = t('st.skills.add_url');
+}
+
async function addSkillFromUrl() {
let url;
try {
@@ -1227,7 +1241,12 @@ async function addSkillFromUrl() {
return;
}
- const previousText = btnAddSkillUrl?.textContent;
+ skillUrlImport?.abort();
+ const controller = new AbortController();
+ skillUrlImport = controller;
+ const generation = skillFormGeneration;
+ // The name as it was when the import started.
+ const name = skillNameInput?.value || '';
if (btnAddSkillUrl) {
btnAddSkillUrl.disabled = true;
btnAddSkillUrl.textContent = t('st.skills.loading_url');
@@ -1238,6 +1257,7 @@ async function addSkillFromUrl() {
const { response, url: finalUrl } = await fetchSkillImportResponse(url, {
validateUrl: normalizeSkillUrl,
redirectMessage: t('st.skills.error.url'),
+ init: { signal: controller.signal },
});
if (!response.ok) throw new Error(t('st.skills.error.fetch', { status: response.status }));
const content = extractSkillText(
@@ -1248,24 +1268,28 @@ async function addSkillFromUrl() {
response.headers.get('content-type') || '',
);
if (!content) throw new Error(t('st.skills.error.empty_content'));
+ if (controller.signal.aborted) return;
await addCustomSkill({
id: makeSkillId(),
- name: skillNameInput?.value || '',
+ name,
sourceType: 'url',
sourceUrl: finalUrl,
content,
createdAt: Date.now(),
});
- if (skillNameInput) skillNameInput.value = '';
- if (skillUrlInput) skillUrlInput.value = '';
- closeSkillForm();
+ if (generation === skillFormGeneration) {
+ if (skillNameInput) skillNameInput.value = '';
+ if (skillUrlInput) skillUrlInput.value = '';
+ closeSkillForm();
+ }
flashSkillsResult('ok', t('st.skills.added'));
} catch (e) {
+ if (controller.signal.aborted) return;
flashSkillsResult('fail', e.message || t('st.skills.error.add_failed'));
} finally {
- if (btnAddSkillUrl) {
- btnAddSkillUrl.disabled = false;
- btnAddSkillUrl.textContent = previousText || t('st.skills.add_url');
+ if (skillUrlImport === controller) {
+ skillUrlImport = null;
+ resetSkillUrlButton();
}
}
}
@@ -1274,6 +1298,13 @@ btnAddSkillText?.addEventListener('click', addSkillFromText);
btnAddSkillUrl?.addEventListener('click', addSkillFromUrl);
btnShowSkillForm?.addEventListener('click', openSkillForm);
btnCancelSkillForm?.addEventListener('click', () => {
+ skillFormGeneration += 1;
+ if (skillUrlImport) {
+ skillUrlImport.abort();
+ skillUrlImport = null;
+ resetSkillUrlButton();
+ skillsResult?.classList.remove('show');
+ }
cancelSkillEdit();
if (skillNameInput) skillNameInput.value = '';
if (skillUrlInput) skillUrlInput.value = '';
@@ -1281,6 +1312,7 @@ btnCancelSkillForm?.addEventListener('click', () => {
closeSkillForm();
});
btnClearSkillForm?.addEventListener('click', () => {
+ skillFormGeneration += 1;
cancelSkillEdit();
if (skillNameInput) skillNameInput.value = '';
if (skillUrlInput) skillUrlInput.value = '';
diff --git a/test/run.js b/test/run.js
index aa95a946d..ddf786816 100644
--- a/test/run.js
+++ b/test/run.js
@@ -117588,7 +117588,8 @@ test('settings exposes custom skills tab and packaged skills resource directory'
assert.match(html, /<div class="skill-add-form" id="skill-add-form" hidden>[\s\S]*?id="skill-url"[\s\S]*?id="skill-text"[\s\S]*?id="btn-cancel-skill-form"[\s\S]*?<\/div>\s*<\/div>\s*<div class="test-result" id="skills-result">/,
`${label}: the add form should start hidden, with the result line outside it`);
assert.ok(html.indexOf('id="skills-list-card"') < html.indexOf('id="packaged-skills-card"'), `${label}: enabled skills should list before available ones`);
- assert.match(settingsJs, /function startSkillEdit\(skill\) \{\s*setSkillFormOpen\(true\);/, `${label}: Edit should open the add form`);
+ assert.match(settingsJs, /function startSkillEdit\(skill\) \{[^}]*?setSkillFormOpen\(true\);/, `${label}: Edit should open the add form`);
+ assert.match(settingsJs, /btnCancelSkillForm\?\.addEventListener\('click', \(\) => \{[\s\S]*?skillUrlImport\.abort\(\);/, `${label}: Cancel should stop a URL import in flight`);
assert.doesNotMatch(html, /id="chrome-web-store-release-card"/, `${label}: removed release skill must not leave an orphaned setup card`);
assert.doesNotMatch(html, /id="chrome-web-store-package"/, `${label}: removed release skill must not leave an orphaned ZIP picker`);
assert.match(html, /id="skill-preview-dialog"/, `${label}: skill content preview dialog missing`);
diff --git a/test/settings-pages-ui.mjs b/test/settings-pages-ui.mjs
index f3d7f163d..91e9d49a6 100644
--- a/test/settings-pages-ui.mjs
+++ b/test/settings-pages-ui.mjs
@@ -231,6 +231,29 @@ try {
await skills.locator('#packaged-skills-list button[data-packaged-skill-id]').first().click();
await skills.waitForFunction(() => window.testStore.customSkills?.length === 2);
assert.ok(await visible(skills, '#skills-result'), `${build}: enabling a packaged skill is confirmed with the form closed`);
+ // Cancel stops a URL import still in flight: it adds no skill and
+ // leaves a draft started afterwards alone.
+ let releaseImport;
+ const importHeld = new Promise(resolve => { releaseImport = resolve; });
+ await skills.route('https://skills.example/slow.md', async route => {
+ await importHeld;
+ await route.fulfill({ status: 200, contentType: 'text/markdown', body: '# Slow skill\nDo the slow thing.' }).catch(() => {});
+ });
+ const skillCount = await skills.evaluate(() => window.testStore.customSkills.length);
+ await skills.locator('#btn-show-skill-form').click();
+ await skills.locator('#skill-name').fill('Slow import');
+ await skills.locator('#skill-url').fill('https://skills.example/slow.md');
+ await skills.locator('#btn-add-skill-url').click();
+ await skills.waitForFunction(() => document.getElementById('btn-add-skill-url').disabled);
+ await skills.locator('#btn-cancel-skill-form').click();
+ assert.equal(await skills.locator('#btn-add-skill-url').isDisabled(), false, `${build}: Cancel resets the import button`);
+ await skills.locator('#btn-show-skill-form').click();
+ await skills.locator('#skill-name').fill('New draft');
+ releaseImport();
+ await skills.waitForTimeout(300);
+ assert.equal(await skills.evaluate(() => window.testStore.customSkills.length), skillCount, `${build}: a cancelled import adds no skill`);
+ assert.equal(await skills.locator('#skill-name').inputValue(), 'New draft', `${build}: a cancelled import leaves the new draft alone`);
+ assert.ok(await visible(skills, '#skill-add-form'), `${build}: a cancelled import does not close the reopened form`);
assert.deepEqual(skillErrors, [], `${build}: skills tab errors`);
await skills.close();