Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(desktop): simplify preset modes and add icon colors
  • Loading branch information
SivanCola committed Nov 2, 2026
commit c646a910035afcee30aa977bf2779bc4b10685e9
14 changes: 7 additions & 7 deletions desktop/electron/scripts/agent-presets-smoke.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ try {
assert.equal(await editor().getByLabel("ID", { exact: true }).inputValue(), "default-copy");
await editor().getByLabel("Name", { exact: true }).fill("Native reviewer");
await editor().getByLabel("ID", { exact: true }).fill("native-reviewer");
await editor().getByLabel("Description", { exact: true }).fill("Native preset acceptance");
await editor().getByLabel("Persona body", { exact: true }).fill("NATIVE_PERSONA_FIRST");
await editor().getByLabel("Complete system prompt", { exact: true }).check();
await editor().getByLabel("Include runtime context", { exact: true }).uncheck();
assert.equal(await editor().getByRole("button", { name: "Keep", exact: true }).isDisabled(), true);
await editor().getByLabel("Restrict available tools", { exact: true }).check();
await editor().getByLabel("Summary (optional)", { exact: true }).fill("Native preset acceptance");
await editor().getByRole("radio", { name: "Custom complete system prompt", exact: true }).check();
await editor().getByLabel("System prompt (required)", { exact: true }).fill("NATIVE_PERSONA_FIRST");
await editor().locator(".agent-preset-advanced summary").click();
await editor().getByRole("switch", { name: "Include runtime context", exact: true }).uncheck();
await editor().getByRole("switch", { name: "Restrict available tools", exact: true }).check();
await page.screenshot({ path: join(home, "preset-editor.png") });
await editor().getByRole("button", { name: "Save", exact: true }).click();
await row("Native reviewer").waitFor();
Expand Down Expand Up @@ -170,7 +170,7 @@ try {
check("first native turn sends only the complete body, required cwd and admitted schemas, then locks the picker");
await settings();
await row("Native reviewer").getByRole("button", { name: "Edit", exact: true }).click();
await editor().getByLabel("Persona body", { exact: true }).fill("NATIVE_PERSONA_LATEST");
await editor().getByLabel("System prompt (required)", { exact: true }).fill("NATIVE_PERSONA_LATEST");
await editor().getByRole("button", { name: "Save", exact: true }).click();
await row("Native reviewer").waitFor();
await composer();
Expand Down
38 changes: 38 additions & 0 deletions desktop/frontend/bench/agent-presets.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,31 @@ try {
await page.waitForFunction(() => document.activeElement?.id.endsWith("-name"));
console.log("PASS picker action opens the creation form and focuses its name");
await editor.getByLabel("Name", { exact: true }).fill("Custom avatar");

const modes = editor.getByRole("radiogroup", { name: "Prompt mode", exact: true });
assert.equal(await modes.getByRole("radio").count(), 3);
assert.equal(await editor.getByRole("switch", { name: "Include runtime context", exact: true }).isVisible(), false);
await modes.getByRole("radio", { name: "Custom complete system prompt", exact: true }).check();
assert.equal(await editor.getByRole("button", { name: "Save", exact: true }).isDisabled(), true, "empty complete prompt blocks save");
await editor.getByLabel("System prompt (required)", { exact: true }).fill("Retain this draft across modes.");
await modes.getByRole("radio", { name: "Replace coding instructions", exact: true }).check();
assert.equal(await editor.getByLabel("Coding instructions (required)").inputValue(), "Retain this draft across modes.");
await editor.locator(".agent-preset-advanced summary").press("Enter");
const context = editor.getByRole("switch", { name: "Include runtime context", exact: true });
await context.press("Space");
assert.equal(await context.isChecked(), false, "context switch is keyboard accessible");
await modes.getByRole("radio", { name: "Extend default instructions (recommended)", exact: true }).check();
assert.equal(await context.isChecked(), false, "mode changes retain runtime setting");
await editor.getByLabel("Role instructions (optional)").fill("");
assert.equal(await editor.getByRole("button", { name: "Save", exact: true }).isEnabled(), true);
await context.check();
await editor.locator(".agent-preset-advanced summary").press("Enter");
const restrict = editor.getByRole("switch", { name: "Restrict available tools", exact: true });
await restrict.press("Space");
await editor.getByRole("button", { name: "Choose tools (0 selected)", exact: true }).waitFor();
await restrict.uncheck();
assert.equal(await editor.getByRole("button", { name: "Choose tools (0 selected)", exact: true }).count(), 0);
console.log("PASS three prompt modes, dynamic required body, advanced disclosure and keyboard switches");
assert.equal(await editor.getByLabel("ID", { exact: true }).inputValue(), "custom-avatar");
await editor.getByLabel("ID", { exact: true }).fill("avatar-manual");
await editor.getByLabel("Name", { exact: true }).fill("Custom avatar renamed");
Expand Down Expand Up @@ -119,9 +144,22 @@ try {
await page.evaluate(() => window.releasePresetImage());
assert.equal(await page.locator(".agent-preset-icon-crop").count(), 0, "late decode cannot reopen crop");
assert.equal(await page.getByRole("radio", { name: "search", exact: true }).getAttribute("aria-checked"), "true");
await editor.getByRole("radiogroup", { name: "Icon color", exact: true }).getByRole("radio", { name: "Blue", exact: true }).click();
await page.getByRole("form").getByRole("button", { name: "Save", exact: true }).click();
await row.waitFor();
assert.equal(await row.locator("img").count(), 0, "reset and built-in choice persist");
assert.equal(await row.locator(".agent-preset-row__icon svg").evaluate(node => getComputedStyle(node).color), "rgb(96, 165, 250)", "chosen color persists in list");
await row.getByRole("button", { name: "Copy", exact: true }).click();
assert.equal(await editor.getByRole("radiogroup", { name: "Icon color", exact: true }).getByRole("radio", { name: "Blue", exact: true }).getAttribute("aria-checked"), "true", "copy retains color");
await editor.getByRole("button", { name: "Random", exact: true }).click();
assert.equal(await editor.locator('.agent-preset-editor__icons [aria-checked="true"]').count(), 1, "random chooses one built-in glyph");
assert.equal(await editor.locator('.agent-preset-icon-picker__colors [aria-checked="true"]').count(), 1, "random chooses one palette color");
if (evidence) {
await page.screenshot({ path: path.join(evidence, "icon-grid-prompt-modes.png"), fullPage: true });
await page.setViewportSize({ width: 800, height: 1000 });
await page.waitForFunction(() => document.documentElement.scrollWidth <= innerWidth);
await page.screenshot({ path: path.join(evidence, "preset-compact.png"), fullPage: true });
}
assert.deepEqual(errors, []);
console.log("PASS preset picker creation, keyboard navigation, image crop/save/copy/readback, upload validation, cancel/reset and stale decode");
} finally {
Expand Down
60 changes: 33 additions & 27 deletions desktop/frontend/src/__tests__/agent-presets-ui.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ const checkbox = (label: string) => {
const field = (node.htmlFor ? document.getElementById(node.htmlFor) : node.querySelector('input[type="checkbox"]')) as HTMLInputElement | null;
assert.equal(field?.type, "checkbox"); return field!;
};
const mode = (value: string) => rootEl.querySelector<HTMLInputElement>(`.agent-preset-modes input[value="${value}"]`)!;
async function openAdvanced() {
const details = rootEl.querySelector<HTMLDetailsElement>(".agent-preset-advanced")!;
if (!details.open) await click(details.querySelector("summary")!);
}
async function fill(label: string, value: string) {
const node = [...rootEl.querySelectorAll("label")].find(item => item.textContent === label);
assert.ok(node, `Missing label ${label}`);
Expand All @@ -72,8 +77,12 @@ assert.match(rootEl.textContent!, /1 preset files could not be loaded/u, "malfor
await click(button("Copy", builtInRow));
assert.equal(rootEl.querySelector<HTMLInputElement>('input[id$="-id"]')!.value, "default-copy");
assert.equal(document.activeElement, rootEl.querySelector('input[id$="-name"]'), "editor focuses its name");
assert.equal(checkbox("Complete system prompt").checked, false, "missing complete field defaults to false when copying an older DTO");
assert.equal(mode("append").checked, true, "older DTO uses the recommended mode");
assert.equal(rootEl.querySelector<HTMLDetailsElement>(".agent-preset-advanced")!.open, false, "advanced settings starts collapsed");
await openAdvanced();
assert.equal(checkbox("Include runtime context").checked, true, "missing runtime context field defaults to true when copying an older DTO");
assert.equal(checkbox("Include runtime context").getAttribute("role"), "switch");
assert.equal(checkbox("Restrict available tools").getAttribute("role"), "switch");
await click(checkbox("Restrict available tools"));
assert.match(rootEl.textContent!, /No tools are allowed/u);
await click(button("Save"));
Expand All @@ -84,7 +93,8 @@ assert.equal(saves[0].id, "default-copy");
assert.doesNotMatch(saves[0].content, /^(?:complete|include-runtime-context):/mu, "default prompt options remain omitted after copying an older DTO");

await click(button("New preset"));
assert.equal(checkbox("Complete system prompt").checked, false, "new presets use an assembled system prompt");
assert.equal(mode("append").checked, true, "new presets use the recommended mode");
await openAdvanced();
assert.equal(checkbox("Include runtime context").checked, true, "new presets include runtime context");
await fill("Name", "Persona");
assert.equal(rootEl.querySelector<HTMLInputElement>('input[id$="-id"]')!.value, "persona", "name generates a valid ID");
Expand All @@ -95,33 +105,29 @@ assert.equal(button("Save").disabled, true, "reserved ID is rejected");
await fill("ID", "persona");
await fill("Name", "Renamed Persona");
assert.equal(rootEl.querySelector<HTMLInputElement>('input[id$="-id"]')!.value, "persona", "manual ID survives later name edits");
await click(checkbox("Complete system prompt"));
assert.equal(button("Save").disabled, true, "complete mode needs a body even when Keep is selected");
await click(mode("complete"));
assert.equal(button("Save").disabled, true, "complete mode needs a body");
assert.equal(rootEl.querySelector<HTMLTextAreaElement>('textarea[id$="-body"]')!.required, true);
assert.equal(button("Keep").disabled, true);
assert.equal(button("Replace").disabled, true);
assert.equal(button("Keep").getAttribute("aria-pressed"), "true", "complete mode preserves the Keep choice");
assert.match(document.getElementById(checkbox("Complete system prompt").getAttribute("aria-describedby")!)!.textContent!, /core instructions, standing documents, skill instructions, and the model persona/u);
assert.match(document.getElementById(checkbox("Include runtime context").getAttribute("aria-describedby")!)!.textContent!, /Independent.*optional runtime background.*working directory.*permissions are unchanged/u);
await fill("Persona body", " ");
assert.equal(rootEl.querySelectorAll(".agent-preset-modes input:checked").length, 1, "modes are mutually exclusive");
assert.match(document.getElementById(mode("complete").getAttribute("aria-describedby")!)!.textContent!, /core instructions, standing documents, skill instructions and model persona/u);
assert.match(document.getElementById(checkbox("Include runtime context").getAttribute("aria-describedby")!)!.textContent!, /any prompt mode.*working directory and permissions/u);
await fill("System prompt (required)", " ");
assert.equal(button("Save").disabled, true, "whitespace does not satisfy complete mode");
await click(checkbox("Include runtime context"));
assert.equal(checkbox("Complete system prompt").checked, true, "runtime context is independent of complete mode");
await click(checkbox("Complete system prompt"));
assert.equal(mode("complete").checked, true, "runtime context is independent of complete mode");
await click(mode("append"));
assert.equal(checkbox("Include runtime context").checked, false, "changing complete mode preserves the runtime context choice");
assert.equal(button("Keep").disabled, false);
assert.equal(button("Keep").getAttribute("aria-pressed"), "true");
assert.equal(mode("append").checked, true);
assert.equal(button("Save").disabled, false, "leaving complete mode permits an empty body when Keep is selected");
await click(button("Replace"));
await click(mode("replace"));
assert.equal(button("Save").disabled, true, "replacement needs a body");
await fill("Persona body", "Explain concepts clearly.");
await click(checkbox("Complete system prompt"));
assert.equal(button("Replace").getAttribute("aria-pressed"), "true", "complete mode preserves Replace as well as Keep");
await fill("Coding instructions (required)", "Explain concepts clearly.");
await click(mode("complete"));
failSave = true;
await click(button("Save"));
assert.match(rootEl.querySelector('[role="alert"]')!.textContent!, /read-only/u);
assert.equal(rootEl.querySelector<HTMLTextAreaElement>('textarea[id$="-body"]')!.value, "Explain concepts clearly.", "failed save retains draft");
assert.equal(checkbox("Complete system prompt").checked, true);
assert.equal(mode("complete").checked, true);
assert.equal(checkbox("Include runtime context").checked, false);
failSave = false;
await click(button("Save"));
Expand All @@ -134,23 +140,23 @@ assert.match(completeRow.querySelector(".agent-preset-row__summary")!.textConten
assert.doesNotMatch(completeRow.querySelector(".agent-preset-row__summary")!.textContent!, /Coding instructions/u, "complete mode is not summarized as a coding-only replacement");
assert.match(completeRow.textContent!, /Optional runtime context omitted/u);
await click(button("Edit", completeRow));
assert.equal(checkbox("Complete system prompt").checked, true);
assert.equal(mode("complete").checked, true);
await openAdvanced();
assert.equal(checkbox("Include runtime context").checked, false);
assert.equal(checkbox("Restrict available tools").checked, true, "edit retains an explicit empty tools list");
assert.equal(button("Replace").getAttribute("aria-pressed"), "true");
await click(checkbox("Complete system prompt"));
assert.equal(button("Replace").disabled, false);
assert.equal(button("Replace").getAttribute("aria-pressed"), "true", "leaving complete mode restores the saved coding choice");
await click(checkbox("Complete system prompt"));
await click(mode("replace"));
assert.equal(mode("replace").checked, true);
await click(mode("complete"));
await click(button("Save"));
assert.match(saves[2].content, /^complete: true$/mu);
assert.match(saves[2].content, /^include-runtime-context: false$/mu);
assert.match(saves[2].content, /^tools: \[\]$/mu);
assert.equal(saves[2].id, "complete");
await click(button("Copy", rootEl.querySelector('article[aria-label="Complete"]')!));
assert.equal(checkbox("Complete system prompt").checked, true);
assert.equal(mode("complete").checked, true);
await openAdvanced();
assert.equal(checkbox("Include runtime context").checked, false);
assert.equal(button("Replace").getAttribute("aria-pressed"), "true");
assert.equal(mode("complete").checked, true);
await click(button("Save"));
assert.equal(saves[3].id, "complete-copy");
assert.match(saves[3].content, /^complete: true$/mu);
Expand Down
4 changes: 3 additions & 1 deletion desktop/frontend/src/__tests__/agent-presets.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ let tabs = [{ id: "a", active: true, workspaceRoot: "/project-a", topicId: "blan
const changed: string[] = [];
const mock = makeMockAgentPresetBindings({ tabs: () => tabs, update: tab => { tabs = tabs.map(item => item.id === tab.id ? tab : item); }, isBlank: id => id === "blank", changed: async id => { changed.push(id); } });
const image = "data:image/png;base64,iVBORw0KGgo=";
const withImage = await mock.SaveAgentPreset("a", "user", "avatar", renderAgentPreset({ ...special, icon: "search", iconImage: image }));
const withImage = await mock.SaveAgentPreset("a", "user", "avatar", renderAgentPreset({ ...special, icon: "search", iconImage: image, iconColor: "#60a5fa" }));
assert.equal(withImage.iconColor, "#60a5fa");
await assert.rejects(mock.SaveAgentPreset("a", "user", "bad-color", renderAgentPreset({ ...special, iconColor: "url(https://example.com/)" })), /Invalid icon color/u);
assert.equal(withImage.iconImage, image);
assert.equal(withImage.icon, "search", "mock and backend preserve glyph fallback alongside custom images");
const imageCopy = await mock.SaveAgentPreset("a", "user", "avatar-copy", renderAgentPreset(withImage));
Expand Down
4 changes: 2 additions & 2 deletions desktop/frontend/src/components/AgentPresetChoice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function AgentPresetChoice({ tabId, sessionKey, current, locked = false,
<span>
<ComposerChoice label={loading && !view ? t("agentPresets.loading") : name}
ariaLabel={`${t("agentPresets.picker")}: ${name}${isLocked ? ` · ${t("agentPresets.locked")}` : ""}`}
icon={isLocked ? <LockKeyhole size={16} aria-hidden="true" /> : <AgentPresetIcon icon={preset?.icon} image={preset?.iconImage} />}
icon={isLocked ? <LockKeyhole size={16} aria-hidden="true" /> : <AgentPresetIcon icon={preset?.icon} image={preset?.iconImage} color={preset?.iconColor} />}
showChevron={!isLocked} value={selected} disabled={disabled || pending || loading && !view || isLocked}
dismissSignal={dismissSignal} onPick={id => void choose(id)}
actions={[{ label: t("agentPresets.createFromPicker"), icon: <Plus size={16} aria-hidden="true" />, onSelect: () => {
Expand All @@ -67,7 +67,7 @@ export function AgentPresetChoice({ tabId, sessionKey, current, locked = false,
} }]}
options={(view?.presets ?? []).map(item => ({ value: item.id, label: item.id === "default" ? t("agentPresets.default") : item.name,
description: item.id === "default" ? t("agentPresets.defaultDescription") : item.description,
badge: t(`agentPresets.scope.${item.scope}`), icon: <AgentPresetIcon icon={item.icon} image={item.iconImage} /> }))} />
badge: t(`agentPresets.scope.${item.scope}`), icon: <AgentPresetIcon icon={item.icon} image={item.iconImage} color={item.iconColor} /> }))} />
</span>
</Tooltip>
{isLocked && <span className="sr-only">{t("agentPresets.lockedHint")}</span>}
Expand Down
Loading
Loading