Multiplayer agent harness for work.
web-ui: simplify model selection with compact presets (#1132)
Eve Bouffard9b854415880a
diff --git a/plugins/web-ui/src/composer-loadout.ts b/plugins/web-ui/src/composer-loadout.tsnew file mode 100644index 000000000..df2ebb401--- /dev/null+++ b/plugins/web-ui/src/composer-loadout.ts@@ -0,0 +1,116 @@+import { EFFORT_LEVELS, type EffortLevel, type ModelOption } from "./model-options.ts";++export interface LoadoutEntry {+ value: string;+ effort: EffortLevel;+ fast: boolean;+}++export const LOADOUT_CAP = 4;++export function loadoutModelId(value: string): string {+ const separator = value.indexOf(":");+ return separator < 0 ? value : value.slice(separator + 1);+}++function uniqueLoadout(entries: readonly LoadoutEntry[]): LoadoutEntry[] {+ const seen = new Set<string>();+ return entries.filter(({ value }) => {+ const modelId = loadoutModelId(value);+ if (seen.has(modelId)) return false;+ seen.add(modelId);+ return true;+ });+}++export function parseLoadout(raw: string | null): LoadoutEntry[] {+ try {+ const parsed: unknown = JSON.parse(raw ?? "[]");+ if (!Array.isArray(parsed)) return [];+ const entries: LoadoutEntry[] = [];+ for (const entry of parsed) {+ if (+ !entry ||+ typeof entry !== "object" ||+ typeof entry.value !== "string" ||+ !entry.value.trim() ||+ !EFFORT_LEVELS.some(({ value }) => value === entry.effort)+ )+ continue;+ entries.push({ value: entry.value, effort: entry.effort, fast: entry.fast === true });+ }+ return uniqueLoadout(entries).slice(0, LOADOUT_CAP);+ } catch {+ return [];+ }+}++export function upsertLoadout(entries: readonly LoadoutEntry[], entry: LoadoutEntry): LoadoutEntry[] {+ const next = uniqueLoadout(entries).slice(0, LOADOUT_CAP);+ const index = next.findIndex(({ value }) => loadoutModelId(value) === loadoutModelId(entry.value));+ if (index >= 0) next[index] = { ...entry };+ else if (next.length === LOADOUT_CAP) next[LOADOUT_CAP - 1] = { ...entry };+ else next.push({ ...entry });+ return next;+}++export function reconcileLoadout(+ entries: readonly LoadoutEntry[],+ options: readonly ModelOption[],+ active: LoadoutEntry,+): LoadoutEntry[] {+ const available = new Set(options.map(({ value }) => value));+ const next = uniqueLoadout(entries).flatMap((entry) => {+ if (available.has(entry.value)) return [entry];+ const replacement = options.find(({ model }) => model.id === loadoutModelId(entry.value));+ return replacement ? [{ ...entry, value: replacement.value }] : [];+ });+ return available.has(active.value) ? upsertLoadout(next, active) : next.slice(0, LOADOUT_CAP);+}++export function reorderLoadout(entries: readonly LoadoutEntry[], value: string, targetValue: string): LoadoutEntry[] {+ const next = [...entries];+ const source = next.findIndex((entry) => entry.value === value);+ const target = next.findIndex((entry) => entry.value === targetValue);+ if (source < 0 || target < 0 || source === target) return next;+ const [entry] = next.splice(source, 1);+ next.splice(target, 0, entry!);+ return next;+}++export function effortLevelsForHarness(harnessId: string): Array<{ value: EffortLevel; label: string }> {+ return EFFORT_LEVELS.filter(({ value }) => {+ if (harnessId === "pi") return true;+ if (harnessId === "claude") return value !== "ultracode";+ if (harnessId === "codex") return value !== "max" && value !== "ultracode";+ return value === "auto";+ }).map((option) => ({ ...option, label: option.value === "xhigh" ? "Extra high" : option.label }));+}++export function compatibleHarnessOptions<T extends { harnessId: string; model: { id: string } }>(+ options: readonly T[],+ modelId: string,+): T[] {+ const seen = new Set<string>();+ return options.filter((option) => {+ if (option.model.id !== modelId || seen.has(option.harnessId)) return false;+ seen.add(option.harnessId);+ return true;+ });+}++export function modelLoadoutOptions(+ options: readonly ModelOption[],+ entries: readonly LoadoutEntry[],+ preferredHarnessId?: string,+): ModelOption[] {+ const saved = new Map(uniqueLoadout(entries).map((entry) => [loadoutModelId(entry.value), entry.value]));+ return [...new Set(options.map(({ model }) => model.id))].flatMap((modelId) => {+ const compatible = compatibleHarnessOptions(options, modelId);+ const preferred =+ compatible.find(({ value }) => value === saved.get(modelId)) ??+ compatible.find(({ harnessId }) => harnessId === preferredHarnessId) ??+ compatible[0];+ return preferred ? [preferred] : [];+ });+}diff --git a/plugins/web-ui/src/composer.ts b/plugins/web-ui/src/composer.tsindex 35350d31f..5044df4b1 100644--- a/plugins/web-ui/src/composer.ts+++ b/plugins/web-ui/src/composer.ts@@ -8,17 +8,19 @@ import { live } from "lit/directives/live.js";import {ArrowUp,Box,- Brain,Check,ChevronDown,+ ChevronRight,+ GripVertical,+ Plus,+ Sparkles,CornerDownRight,FileText,Paperclip,- SlidersHorizontal,Square,+ Star,X,Zap,- type IconNode,} from "lucide";import {api,@@ -42,15 +44,13 @@ import {type QueuedRun,} from "./core-bridge";import { errMessage, swallow } from "../../chassis/src/errors";-import { fieldSelect, icon } from "./ui";+import { fieldSelect, icon, modelMark } from "./ui";import {EFFORT_LEVELS,defaultEffortForModel,defaultModelValue,effortLabel,- getHarnessOptions,getModelOptions,- getModelOptionsForHarness,harnessSupportsEffort,harnessSupportsFastMode,harnessSupportsSteer,@@ -66,30 +66,39 @@ import { base64ToText, bytesToBase64, insertIntoDraft, pasteChipLabel } from "./import { clearDraft, newChatDraftKey, saveDraft } from "./drafts";import { tip } from "./tooltip";import { isPhone } from "./viewport";+import {+ LOADOUT_CAP,+ parseLoadout,+ reconcileLoadout,+ upsertLoadout,+ reorderLoadout,+ effortLevelsForHarness,+ compatibleHarnessOptions,+ loadoutModelId,+ modelLoadoutOptions,+ type LoadoutEntry,+} from "./composer-loadout";++import { burstEffortConfetti } from "./effort-confetti";++export type ComposerMenu = "effort" | "model" | "settings" | "loadout";-export type ComposerMenu = "effort" | "harness" | "model" | "settings";--interface ComposerMenuOption {- value: string;- label: string;- groupLabel?: string;-}+const LEGACY_MODEL_STORAGE_KEY = "web-ui:model";+const THREAD_PICKS_STORAGE_KEY = "web-ui:model-picks";+const THREAD_PICKS_CAP = 50;+const LOADOUT_STORAGE_KEY = "web-ui:loadout";-function groupMenuOptions(options: ComposerMenuOption[]): Array<{ label: string; options: ComposerMenuOption[] }> {- const groups = new Map<string, ComposerMenuOption[]>();- for (const option of options) {- const label = option.groupLabel ?? "";- const group = groups.get(label) ?? [];- group.push(option);- groups.set(label, group);+function loadLoadout(): LoadoutEntry[] {+ try {+ return parseLoadout(localStorage.getItem(LOADOUT_STORAGE_KEY));+ } catch {+ return [];}- return [...groups].map(([label, groupOptions]) => ({ label, options: groupOptions }));}-const LEGACY_MODEL_STORAGE_KEY = "web-ui:model";-const THREAD_PICKS_STORAGE_KEY = "web-ui:model-picks";-const THREAD_PICKS_CAP = 50;-const MENU_SEARCH_THRESHOLD = 8;+function saveLoadout(entries: LoadoutEntry[]): void {+ persistPreference(LOADOUT_STORAGE_KEY, JSON.stringify(entries.slice(0, LOADOUT_CAP)));+}function loadThreadPicks(): Map<string, ModelOptionValue> {try {@@ -129,6 +138,12 @@ function rememberThreadPick(threadRef: string, value: ModelOptionValue): void {persistPreference(THREAD_PICKS_STORAGE_KEY, JSON.stringify([...merged]));}+function forgetThreadPick(threadRef: string): void {+ threadModelPicks = loadThreadPicks();+ threadModelPicks.delete(threadRef);+ persistPreference(THREAD_PICKS_STORAGE_KEY, JSON.stringify([...threadModelPicks]));+}+export function carryModelPick(fromThreadRef: string | null, toThreadRef: string): void {const pick = fromThreadRef ? threadModelPicks.get(fromThreadRef) : undefined;if (pick) rememberThreadPick(toThreadRef, pick);@@ -178,6 +193,14 @@ export function clearSkillsCache(): void {const SLASH_TOKEN = /(^|\s)\/([a-zA-Z0-9_-]*)$/;+const EFFORT_PEAK_FLOOR = EFFORT_LEVELS.findIndex((option) => option.value === "xhigh");++function effortText(level: EffortLevel | string): TemplateResult | string {+ const label = effortLabel(level as EffortLevel);+ const rank = EFFORT_LEVELS.findIndex((option) => option.value === level);+ return rank >= EFFORT_PEAK_FLOOR ? html`<span class="effort-peak">${label}</span>` : label;+}+export function slashQuery(draft: string): string | null {const m = SLASH_TOKEN.exec(draft);return m ? (m[2] ?? "") : null;@@ -192,11 +215,17 @@ export function resyncModelSelection(): void {}export function createComposerSurface(ctx: ConvCtx): ComposerSurface {+ const loadoutMenuId = `composer-loadout-${crypto.randomUUID()}`;let runtimeRequest = 0;let runtimeIdentity = "";let unsubscribeRuntime: (() => void) | undefined;let effortOverride: EffortLevel | undefined;let fastModeOverride: boolean | undefined;+ let restoredLoadout: LoadoutEntry | undefined;+ let loadoutRestored = false;+ let modelSelectionRevision = 0;+ let effortSelectionRevision = 0;+ let fastSelectionRevision = 0;function isUnsentNewChat(): boolean {return (@@ -226,19 +255,33 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {menuQuery: "",slashDismissed: false,get effortLevel(): EffortLevel {- return (+ const selected = currentModelOption();+ const effort =effortOverride ??+ (restoredLoadout?.value === selected?.value ? restoredLoadout?.effort : undefined) ??(getRuntimeConfig(scopeKey())?.effective.effortLevel as EffortLevel | undefined) ??- defaultEffortForModel(currentModelOption()?.model)- );+ defaultEffortForModel(selected?.model);+ const levels = effortLevelsForHarness(selected?.harnessId ?? "");+ return levels.some((level) => level.value === effort) ? effort : "auto";},set effortLevel(value: EffortLevel) {+ ++effortSelectionRevision;effortOverride = value;},get fastMode(): boolean | undefined {- return fastModeOverride ?? getRuntimeConfig(scopeKey())?.effective.fastMode === true;+ const selected = currentModelOption();+ const fast =+ fastModeOverride ??+ (restoredLoadout?.value === selected?.value ? restoredLoadout?.fast : undefined) ??+ getRuntimeConfig(scopeKey())?.effective.fastMode === true;+ return (+ fast &&+ harnessSupportsFastMode(selected?.harnessId ?? "") &&+ modelSupportsFastMode(scopeKey(), selected?.model.id)+ );},set fastMode(value: boolean | undefined) {+ ++fastSelectionRevision;fastModeOverride = value;},pasteView: null as { id: string; text: string; initial: string; dirty: boolean } | null,@@ -270,11 +313,9 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {});let skillsLoading = false;let slashActiveIndex = 0;- let fastModeCharging = false;function effectiveFastMode(): boolean {return composerState.fastMode === true;}- let fastModeChargeTimer: ReturnType<typeof setTimeout> | null = null;function resetComposer(): void {composerState.draft = "";@@ -301,17 +342,30 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {const request = ++runtimeRequest;const key = runtimeScopeKey(scopeId);const identity = `${key}:${ctx.chat.state.threadRef}`;- if (identity !== runtimeIdentity) {+ const changedIdentity = identity !== runtimeIdentity;+ if (changedIdentity) {effortOverride = undefined;fastModeOverride = undefined;+ restoredLoadout = undefined;+ loadoutRestored = false;runtimeIdentity = identity;}unsubscribeRuntime?.();+ let defaults = getRuntimeConfig(key)?.effective;unsubscribeRuntime =key === null? undefined: subscribeRuntimeConfig(key, () => {if (key !== scopeKey()) return;+ const next = getRuntimeConfig(key)?.effective;+ if (+ (["harnessId", "modelId", "effortLevel", "fastMode"] as const).some(+ (field) => defaults?.[field] !== next?.[field],+ )+ ) {+ restoredLoadout = undefined;+ }+ defaults = next;syncRuntimeSelection(ctx.chat.state.agent ?? undefined);});composerState.error = "";@@ -319,12 +373,41 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {const config = key === null ? null : await loadRuntimeConfig(key, refresh);if (request !== runtimeRequest) return;if (!config) composerState.error = "Could not load runtime settings.";+ if (config && !loadoutRestored) {+ restoreLoadoutSelection();+ loadoutRestored = true;+ }syncRuntimeSelection(agent);}+ function restoreLoadoutSelection(): void {+ loadout = loadLoadout();+ let selected = currentModelOption();+ const threadRef = ctx.chat.state.threadRef;+ if (selected && threadRef && !threadModelPicks.has(threadRef)) {+ const preferred = modelLoadoutOptions(getModelOptions(scopeKey()), loadout, selected.harnessId).find(+ (option) => option.model.id === selected!.model.id,+ );+ if (preferred && preferred.value !== selected.value) {+ rememberThreadPick(threadRef, preferred.value);+ selected = preferred;+ }+ }+ if (!selected) return;+ const saved = loadout.find((entry) => entry.value === selected.value);+ if (!saved) return;+ const normalized = normalizeLoadoutEntry(saved, selected);+ if (threadRef && threadModelPicks.has(threadRef)) {+ effortOverride ??= normalized.effort;+ fastModeOverride ??= normalized.fast;+ } else {+ restoredLoadout = normalized;+ }+ }+function syncRuntimeSelection(agent?: Agent): void {- if (agent && (!ctx.chat.state.threadRef || !threadModelPicks.has(ctx.chat.state.threadRef)))- if (currentModelOption()) agent.state.model = currentModelOption()!.model;+ const selected = currentModelOption();+ if (agent && selected) agent.state.model = selected.model;ctx.chat.drawActiveChat(agent);if (pendingComposerFocus) focusComposerEnd();}@@ -339,13 +422,39 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {keep?: boolean;},agent: Agent,+ preserveSelection = false,): Promise<void> {const request = ++runtimeRequest;const scopeId = scopeKey();if (!scopeId) return;composerState.error = "";+ const current = preserveSelection ? currentModelOption() : undefined;+ const settings = current ? activeLoadoutEntry(current) : undefined;+ const modelRevision = modelSelectionRevision;+ const effortRevision = effortSelectionRevision;+ const fastRevision = fastSelectionRevision;try {await saveRuntimeConfig(scopeId, change);+ if (request !== runtimeRequest || scopeId !== scopeKey()) return;+ if (modelSelectionRevision === modelRevision) {+ if (current && settings) {+ if (effortSelectionRevision === effortRevision) effortOverride = settings.effort;+ if (fastSelectionRevision === fastRevision) fastModeOverride = settings.fast;+ if (ctx.chat.state.threadRef) rememberThreadPick(ctx.chat.state.threadRef, current.value);+ rememberActiveTweaks(current);+ } else if (+ !change.keep &&+ effortSelectionRevision === effortRevision &&+ fastSelectionRevision === fastRevision+ ) {+ if (ctx.chat.state.threadRef) forgetThreadPick(ctx.chat.state.threadRef);+ effortOverride = undefined;+ fastModeOverride = undefined;+ restoredLoadout = undefined;+ }+ }+ syncRuntimeSelection(agent);+ placeLoadout();} catch (e) {if (request !== runtimeRequest || scopeId !== scopeKey()) return;composerState.error = errMessage(e, "Could not update the scope default.");@@ -378,8 +487,8 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {if (!option) return;await changeScopeRuntime({ harnessId: option.harnessId, modelId: option.model.id }, agent);if (- activeRuntimeConfig?.effective.harnessId === option.harnessId &&- activeRuntimeConfig.effective.modelId === option.model.id+ getRuntimeConfig(scopeKey())?.effective.harnessId === option.harnessId &&+ getRuntimeConfig(scopeKey())?.effective.modelId === option.model.id)selectModel(value, agent);},@@ -390,25 +499,9 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {</button></div>`;}- const effortAvailable = harnessSupportsEffort(selectedModel.harnessId);- const fastSupported = harnessSupportsFastMode(selectedModel.harnessId);- const fastAvailable = fastSupported && modelSupportsFastMode(scopeKey(), selectedModel.model.id);- const fastOn = fastAvailable && effectiveFastMode();- const fastCharging = fastModeCharging && fastOn;- let fastTitle = "Fast mode is not enabled for this model";- if (fastAvailable) fastTitle = fastOn ? "Fast mode active" : "Fast mode";const approvalPauses = ctx.chat.activePendingApprovals();const blockingPauses = approvalPauses.filter(approvalBlocksComposer);const runtimePending = activeRuntimeConfig === null;- const effectiveEffort =- (activeRuntimeConfig?.effective.effortLevel as EffortLevel | undefined) ??- defaultEffortForModel(selectedModel.model);- const effectiveFast = activeRuntimeConfig?.effective.fastMode === true && fastAvailable;- const runtimeToggled =- !runtimePending &&- (selectedModel.value !== defaultModelValue(scopeKey()) ||- composerState.effortLevel !== effectiveEffort ||- fastOn !== effectiveFast);const inputBlocked = runtimePending || ctx.chat.state.resolvingApprovals.size > 0 || blockingPauses.length > 0;const attachingDisabled = inputBlocked;let placeholder = "Ask anything";@@ -432,65 +525,13 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {const compact = Boolean(ctx.pane) || isPhone();const showRuntimeControls = !appState.me?.individualModelAuth;- const runtimeControls = compact- ? settingsControl(agent, selectedModel, inputBlocked)- : html`- ${- runtimeToggled- ? html`<button- class="runtime-default-btn"- type="button"- aria-label="Make default"- data-mobile-label="Default"- ${tip("Use this harness, model, effort, and fast setting as the default for this scope")}- ?disabled=${inputBlocked}- @click=${() => changeScopeRuntime({ harnessId: selectedModel.harnessId, modelId: selectedModel.model.id, effortLevel: composerState.effortLevel, fastMode: fastOn }, agent)}- >- Make default- </button>`- : nothing- }- ${- runtimeToggled && activeRuntimeConfig?.scopeOverride- ? html`<button- class="runtime-default-btn"- type="button"- aria-label="Use org default"- data-mobile-label="Org default"- ?disabled=${inputBlocked}- @click=${() => changeScopeRuntime({ inherit: true }, agent)}- >- Use org default- </button>`- : nothing- }- ${menuControl({- kind: "model",- searchable: true,- label: selectedModel.buttonLabel,- title: "Model",- selected: selectedModel.value,- align: "right",- options: getModelOptionsForHarness(selectedModel.harnessId, scopeKey()).map((option) => ({- value: option.value,- label: option.label,- })),- disabled: inputBlocked,- onSelect: (value: string) => selectModel(value, agent),- })}- ${menuControl({- kind: "harness",- label: selectedModel.harnessLabel,- title: "Harness",- selected: selectedModel.harnessId,- align: "right",- options: getHarnessOptions(scopeKey()),- disabled: inputBlocked,- onSelect: (value: string) => selectHarness(value, agent),- })}- `;+ const runtimeControls = loadoutControl(agent, selectedModel, inputBlocked);return html`- <form class="composer-wrap ${compact ? "compact" : ""}" @submit=${(e: Event) => submitComposer(e, agent)}>+ <form+ class="composer-wrap ${compact ? "compact" : ""}"+ @submit=${(e: Event) => submitComposer(e, agent)}+ @keydown=${(e: KeyboardEvent) => composerShortcut(e, agent, inputBlocked)}+ >${header} ${slashMenu(agent)}${activeRuntimeConfig?.upgradeAvailable@@ -582,7 +623,7 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {@change=${(e: Event) => void onFilesSelected(e, agent)}/><button- class="icon-btn"+ class="icon-btn composer-attach"type="button"aria-label="Attach files"${tip("Attach files")}@@ -591,44 +632,9 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {>${icon(Paperclip, 18)}</button>- ${- compact- ? nothing- : html`- ${- effortAvailable- ? menuControl({- kind: "effort",- glyph: Brain,- label: effortLabel(composerState.effortLevel),- title: "Effort",- selected: composerState.effortLevel,- options: EFFORT_LEVELS,- disabled: inputBlocked,- onSelect: (value: string) => selectEffort(value as EffortLevel, agent),- })- : nothing- }- ${- fastSupported- ? html`<button- class="fast-toggle ${fastOn ? "active" : ""} ${fastCharging ? "charging" : ""} ${fastAvailable ? "" : "unavailable"}"- type="button"- aria-label=${fastTitle}- aria-pressed=${fastOn ? "true" : "false"}- aria-disabled=${fastAvailable ? "false" : "true"}- ?disabled=${inputBlocked}- @click=${() => toggleFastMode(agent)}- >- ${icon(Zap, 15)}- <span class="fast-label">Fast</span>- </button>`- : nothing- }- `- }+ ${showRuntimeControls ? runtimeControls : nothing}</div>- <div class="composer-right">${showRuntimeControls ? runtimeControls : nothing} ${sendControls(agent)}</div>+ <div class="composer-right">${sendControls(agent)}</div></div>${composerNotice}</form>@@ -854,236 +860,714 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {</div>`;}- function settingsControl(agent: Agent, selected: ModelOption, disabled: boolean): TemplateResult {- const open = composerState.openMenu === "settings";- const fastAvailable =- harnessSupportsFastMode(selected.harnessId) && modelSupportsFastMode(scopeKey(), selected.model.id);+ let loadout = loadLoadout();+ let loadoutSection: "effort" | "add" | "harness" | null = null;+ let loadoutSectionHovered = false;+ let loadoutCloseTimer: ReturnType<typeof setTimeout> | null = null;+ let draggedModel: string | null = null;++ function activeLoadoutEntry(selected: ModelOption): LoadoutEntry {+ return {+ value: selected.value,+ effort: composerState.effortLevel,+ fast:+ harnessSupportsFastMode(selected.harnessId) &&+ modelSupportsFastMode(scopeKey(), selected.model.id) &&+ effectiveFastMode(),+ };+ }++ function normalizeLoadoutEntry(entry: LoadoutEntry, option: ModelOption): LoadoutEntry {+ const levels = effortLevelsForHarness(option.harnessId);+ const defaultEffort = defaultEffortForModel(option.model);+ const fallbackEffort = levels.some((level) => level.value === defaultEffort) ? defaultEffort : "auto";+ return {+ value: option.value,+ effort: levels.some((level) => level.value === entry.effort) ? entry.effort : fallbackEffort,+ fast:+ entry.fast && harnessSupportsFastMode(option.harnessId) && modelSupportsFastMode(scopeKey(), option.model.id),+ };+ }++ function seededLoadout(selected: ModelOption): LoadoutEntry[] {+ const latest = loadLoadout();+ if (latest.length) loadout = latest;+ const active = activeLoadoutEntry(selected);+ if (!loadout.length) {+ loadout = [active];+ const other = getModelOptions(scopeKey()).find(+ (option) => option.model.id !== selected.model.id && option.model.provider !== selected.model.provider,+ );+ if (other) loadout.push({ value: other.value, effort: defaultEffortForModel(other.model), fast: false });+ }+ return reconcileLoadout(loadout, getModelOptions(scopeKey()), active).map((entry) =>+ normalizeLoadoutEntry(entry, modelOptionFor(entry.value, scopeKey())!),+ );+ }++ function rememberActiveTweaks(selected: ModelOption): void {+ loadout = upsertLoadout(seededLoadout(selected), activeLoadoutEntry(selected));+ saveLoadout(loadout);+ }++ function applyLoadout(entry: LoadoutEntry, agent: Agent): void {+ const option = modelOptionFor(entry.value, scopeKey());+ if (!option) return;+ const previous = currentModelOption();+ if (previous) rememberActiveTweaks(previous);+ const wasOpen = composerState.openMenu === "loadout";+ selectModel(entry.value, agent);+ const normalized = normalizeLoadoutEntry(entry, option);+ composerState.effortLevel = normalized.effort;+ composerState.fastMode = normalized.fast;+ loadout = upsertLoadout(loadout, activeLoadoutEntry(option));+ saveLoadout(loadout);+ loadoutSection = null;+ composerState.openMenu = wasOpen ? "loadout" : null;+ ctx.chat.drawActiveChat(agent);+ placeLoadout();+ }++ function composerShortcut(e: KeyboardEvent, agent: Agent, disabled: boolean): void {+ if (disabled || e.defaultPrevented || !e.metaKey) return;+ if (e.shiftKey && e.code === "KeyE") {+ e.preventDefault();+ toggleFastMode(agent);+ }+ }++ function addLoadoutEntry(option: ModelOption, agent: Agent): void {+ const current = currentModelOption();+ if (!current || seededLoadout(current).length >= LOADOUT_CAP) return;+ applyLoadout({ value: option.value, effort: defaultEffortForModel(option.model), fast: false }, agent);+ composerState.menuQuery = "";+ }++ function removeLoadoutEntry(value: string, selected: ModelOption): void {+ if (value === selected.value) return;+ const entries = seededLoadout(selected);+ const index = entries.findIndex((entry) => entry.value === value);+ loadout = entries.filter((entry) => entry.value !== value);+ saveLoadout(loadout);+ ctx.chat.drawActiveChat();+ placeLoadout();+ requestAnimationFrame(() => {+ const rows = ctx.chat.state.host?.querySelectorAll<HTMLButtonElement>(".loadout-pick");+ rows?.[Math.max(0, Math.min(index, loadout.length - 1))]?.focus();+ });+ }++ function clearLoadoutDropTargets(): void {+ ctx.chat.state.host?.querySelectorAll(".loadout-row.drop-target").forEach((row) => {+ row.classList.remove("drop-target", "drop-after");+ });+ }++ function moveLoadout(value: string, targetValue: string, selected: ModelOption): void {+ loadout = reorderLoadout(seededLoadout(selected), value, targetValue);+ saveLoadout(loadout);+ ctx.chat.drawActiveChat();+ placeLoadout();+ }++ function modelGlyph(option: ModelOption): TemplateResult {+ const provider = String(option.model.provider);+ const mark = modelMark(provider, 16) ?? modelMark(option.harnessId, 16);+ return html`<span class="loadout-icon" data-provider=${provider} aria-hidden="true"+ >${mark ?? icon(Sparkles, 16)}</span+ >`;+ }++ function loadoutRow(+ entry: LoadoutEntry,+ at: number,+ selected: ModelOption,+ agent: Agent,+ ): TemplateResult | typeof nothing {+ const option = modelOptionFor(entry.value, scopeKey());+ if (!option) return nothing;+ const active = entry.value === selected.value;+ const settings = active ? activeLoadoutEntry(selected) : entry;+ const isDefault = entry.value === defaultModelValue(scopeKey());+ const activeRuntimeConfig = getRuntimeConfig(scopeKey());+ const canMakeDefault =+ activeRuntimeConfig !== null &&+ (!isDefault ||+ settings.effort !== (activeRuntimeConfig.effective.effortLevel ?? defaultEffortForModel(option.model)) ||+ settings.fast !== (activeRuntimeConfig.effective.fastMode === true));+ return html` <div+ class="loadout-row ${active ? "active" : ""} ${canMakeDefault || isDefault ? "has-default-action" : ""}"+ @dragover=${(e: DragEvent) => {+ if (!draggedModel || draggedModel === entry.value) return;+ e.preventDefault();+ e.stopPropagation();+ if (e.dataTransfer) e.dataTransfer.dropEffect = "move";+ clearLoadoutDropTargets();+ const row = e.currentTarget as HTMLElement;+ row.classList.add("drop-target");+ row.classList.toggle(+ "drop-after",+ seededLoadout(selected).findIndex((item) => item.value === draggedModel) < at,+ );+ }}+ @dragleave=${(e: DragEvent) => {+ const row = e.currentTarget as HTMLElement;+ if (!(e.relatedTarget instanceof Node) || !row.contains(e.relatedTarget)) {+ row.classList.remove("drop-target", "drop-after");+ }+ }}+ @drop=${(e: DragEvent) => {+ if (!draggedModel) return;+ e.preventDefault();+ e.stopPropagation();+ clearLoadoutDropTargets();+ moveLoadout(draggedModel, entry.value, selected);+ draggedModel = null;+ }}+ >+ <button+ type="button"+ class="loadout-drag"+ draggable="true"+ aria-label=${`Reorder ${option.label}; use Up or Down`}+ @dragstart=${(e: DragEvent) => {+ e.stopPropagation();+ draggedModel = entry.value;+ e.dataTransfer?.setData("text/plain", entry.value);+ if (e.dataTransfer) e.dataTransfer.effectAllowed = "move";+ (e.currentTarget as HTMLElement).closest(".loadout-row")?.classList.add("dragging");+ }}+ @dragend=${(e: DragEvent) => {+ draggedModel = null;+ clearLoadoutDropTargets();+ (e.currentTarget as HTMLElement).closest(".loadout-row")?.classList.remove("dragging");+ }}+ @keydown=${(e: KeyboardEvent) => {+ if (e.key !== "ArrowUp" && e.key !== "ArrowDown") return;+ e.preventDefault();+ e.stopPropagation();+ const next = seededLoadout(selected)[at + (e.key === "ArrowUp" ? -1 : 1)];+ if (next) {+ moveLoadout(entry.value, next.value, selected);+ requestAnimationFrame(() => {+ const handles = ctx.chat.state.host?.querySelectorAll<HTMLButtonElement>(".loadout-drag");+ handles?.[at + (e.key === "ArrowUp" ? -1 : 1)]?.focus();+ });+ }+ }}+ >+ ${icon(GripVertical, 13)}+ </button>+ <button+ class="loadout-pick"+ type="button"+ role="menuitemradio"+ aria-checked=${active ? "true" : "false"}+ @click=${(event: MouseEvent) => {+ burstEffortConfetti(event, settings.effort, option.harnessId);+ applyLoadout(entry, agent);+ }}+ >+ ${modelGlyph(option)}+ <span class="loadout-model-copy">+ <span class="loadout-title">+ <span class="loadout-name">${option.label}</span>+ ${isDefault ? html`<span class="loadout-default">my default</span>` : nothing}+ </span>+ <span class="loadout-details">+ <span class="loadout-harness">${option.harnessLabel}</span>+ <span>${effortText(settings.effort)}</span>+ ${settings.fast ? html`<span class="loadout-bolt" aria-label="Fast">${icon(Zap, 10)}</span>` : nothing}+ </span>+ </span>+ <span class="loadout-end">${active ? icon(Check, 15) : nothing}</span>+ </button>+ ${+ canMakeDefault+ ? html`<button+ class="loadout-make-default"+ data-default=${isDefault ? "true" : "false"}+ type="button"+ role="menuitem"+ aria-label=${`Make ${option.label} default`}+ ${tip("Make default")}+ @click=${async (event: MouseEvent) => {+ const row = (event.currentTarget as HTMLElement).closest(".loadout-row");+ await changeScopeRuntime(+ {+ harnessId: option.harnessId,+ modelId: option.model.id,+ effortLevel: settings.effort,+ fastMode: settings.fast,+ },+ agent,+ true,+ );+ row?.querySelector<HTMLElement>(".loadout-pick")?.focus();+ placeLoadout();+ }}+ >+ ${icon(Star, 14)}+ </button>`+ : nothing+ }+ ${isDefault && !canMakeDefault ? html`<span class="loadout-default-star" role="img" aria-label="My default" ${tip("My default")}>${icon(Star, 14)}</span>` : nothing}+ ${+ !active+ ? html`<button+ class="loadout-remove"+ type="button"+ aria-label=${`Remove ${option.label} from presets`}+ ${tip("Remove from presets")}+ @click=${() => removeLoadoutEntry(entry.value, selected)}+ >+ ${icon(X, 14)}+ </button>`+ : nothing+ }+ </div>`;+ }++ function cancelLoadoutClose(): void {+ if (loadoutCloseTimer === null) return;+ clearTimeout(loadoutCloseTimer);+ loadoutCloseTimer = null;+ }++ function loadoutSubmenuHasFocus(): boolean {+ return ctx.chat.state.host?.querySelector<HTMLElement>(".loadout-submenu")?.matches(":focus-within") === true;+ }++ function queueLoadoutClose(): void {+ if (isPhone() || !loadoutSectionHovered || !loadoutSection || loadoutSubmenuHasFocus()) return;+ const section = loadoutSection;+ cancelLoadoutClose();+ loadoutCloseTimer = setTimeout(() => {+ loadoutCloseTimer = null;+ if (loadoutSection === section && !loadoutSubmenuHasFocus()) closeLoadoutSection(false);+ }, 140);+ }++ function trackLoadoutHover(e: MouseEvent): void {+ if (isPhone() || !loadoutSection) return;+ const target = e.target as HTMLElement;+ if (target.closest(".loadout-submenu") || target.closest(`[data-loadout-section="${loadoutSection}"]`))+ cancelLoadoutClose();+ else queueLoadoutClose();+ }++ function openLoadoutSection(section: "effort" | "add" | "harness", keyboard = false): void {+ cancelLoadoutClose();+ if (loadoutSection === section && !keyboard) return;+ loadoutSection = section;+ ctx.chat.drawActiveChat();+ placeLoadout();+ if (keyboard)+ requestAnimationFrame(() => {+ const menu = ctx.chat.state.host?.querySelector<HTMLElement>(".loadout-submenu");+ const target =+ menu?.querySelector<HTMLElement>('input, [aria-checked="true"]') ??+ [...(menu?.querySelectorAll<HTMLElement>("button:not(:disabled)") ?? [])].find(+ (button) => button.offsetParent !== null,+ );+ target?.focus();+ });+ }++ function closeLoadoutSection(refocus = true): void {+ cancelLoadoutClose();+ const previous = loadoutSection;+ loadoutSection = null;+ loadoutSectionHovered = false;+ ctx.chat.drawActiveChat();+ placeLoadout();+ if (previous && refocus)+ requestAnimationFrame(() =>+ ctx.chat.state.host?.querySelector<HTMLElement>(`[data-loadout-section="${previous}"]`)?.focus(),+ );+ }++ function loadoutSubmenu(agent: Agent, selected: ModelOption): TemplateResult | typeof nothing {+ if (!loadoutSection) return nothing;+ const effort = loadoutSection === "effort";+ const entries = seededLoadout(selected);+ const query = composerState.menuQuery.trim().toLocaleLowerCase();+ const catalog = modelLoadoutOptions(getModelOptions(scopeKey()), entries, selected.harnessId).filter(+ (option) =>+ !entries.some((entry) => loadoutModelId(entry.value) === option.model.id) &&+ (!query || `${option.harnessLabel} ${option.label}`.toLocaleLowerCase().includes(query)),+ );+ return html`<div+ class="loadout-submenu"+ role="menu"+ aria-label=${{ effort: "Effort levels", harness: "Run with", add: "Add models" }[loadoutSection]}+ @mouseenter=${() => cancelLoadoutClose()}+ @mouseleave=${() => queueLoadoutClose()}+ @keydown=${(e: KeyboardEvent) => {+ if (e.key === "ArrowLeft" || e.key === "Escape") {+ e.preventDefault();+ e.stopPropagation();+ closeLoadoutSection();+ } else menuArrowKeys(e);+ }}+ >+ <button class="loadout-back" type="button" @click=${() => closeLoadoutSection()}>+ ${icon(ChevronDown, 13)} Back+ </button>+ ${+ effort+ ? effortLevelsForHarness(selected.harnessId).map(+ (level) =>+ html` <button+ class="loadout-effort"+ type="button"+ role="menuitemradio"+ aria-checked=${composerState.effortLevel === level.value ? "true" : "false"}+ @click=${(event: MouseEvent) => {+ burstEffortConfetti(event, level.value, selected.harnessId);+ selectEffort(level.value, agent);+ closeLoadoutSection();+ }}+ >+ <span>${effortText(level.value)}</span+ >${composerState.effortLevel === level.value ? icon(Check, 15) : nothing}+ </button>`,+ )+ : nothing+ }+ ${+ loadoutSection === "harness"+ ? compatibleHarnessOptions(getModelOptions(scopeKey()), selected.model.id).map(+ (option) =>+ html`<button+ class="loadout-effort"+ type="button"+ role="menuitemradio"+ aria-checked=${option.harnessId === selected.harnessId ? "true" : "false"}+ @click=${() => {+ closeLoadoutSection();+ selectHarness(option.harnessId, agent);+ }}+ >+ <span class="loadout-harness-option"+ >${modelMark(option.harnessId, 15) ?? nothing}<span>${option.harnessLabel}</span></span+ >+ ${option.harnessId === selected.harnessId ? icon(Check, 15) : nothing}+ </button>`,+ )+ : nothing+ }+ ${+ loadoutSection === "add"+ ? html` <label class="loadout-search"+ ><span class="sr-only">Search models</span>+ <input+ type="search"+ placeholder="Search models…"+ .value=${live(composerState.menuQuery)}+ @input=${(e: InputEvent) => {+ composerState.menuQuery = (e.currentTarget as HTMLInputElement).value;+ ctx.chat.drawActiveChat();+ placeLoadout();+ }}+ />+ </label>+ ${catalog.map(+ (option) =>+ html`<button+ class="menu-option"+ type="button"+ role="menuitem"+ aria-label=${`Add ${option.label} to presets`}+ @click=${() => addLoadoutEntry(option, agent)}+ >+ ${modelGlyph(option)}<span class="menu-option-copy"+ ><span>${option.label}</span><span class="loadout-meta">${option.harnessLabel}</span></span+ ><span class="loadout-add-label" aria-hidden="true">Add</span>+ </button>`,+ )}+ ${catalog.length ? nothing : html`<div class="loadout-empty">No models found</div>`}`+ : nothing+ }+ </div>`;+ }++ function loadoutHarnessControl(selected: ModelOption): TemplateResult {+ const options = compatibleHarnessOptions(getModelOptions(scopeKey()), selected.model.id);+ const value = html`<span class="loadout-harness-option"+ >${modelMark(selected.harnessId, 15) ?? nothing}<span>${selected.harnessLabel}</span></span+ >`;+ if (options.length < 2)+ return html`<div class="loadout-setting loadout-setting-static">+ <span class="loadout-setting-label">Run with</span><span class="loadout-setting-value">${value}</span>+ </div>`;+ return html`<div class="loadout-submenu-anchor">+ <button+ class="loadout-setting ${loadoutSection === "harness" ? "open" : ""}"+ type="button"+ role="menuitem"+ data-loadout-section="harness"+ aria-haspopup="menu"+ aria-expanded=${loadoutSection === "harness" ? "true" : "false"}+ @mouseenter=${() => {+ if (isPhone()) return;+ loadoutSectionHovered = true;+ openLoadoutSection("harness");+ }}+ @keydown=${(e: KeyboardEvent) => {+ if (e.key === "ArrowRight") {+ e.preventDefault();+ loadoutSectionHovered = false;+ openLoadoutSection("harness", true);+ }+ }}+ @click=${(e: MouseEvent) => {+ loadoutSectionHovered = e.detail !== 0 && !isPhone();+ openLoadoutSection("harness", e.detail === 0);+ }}+ >+ <span class="loadout-setting-label">Run with</span>+ <span class="loadout-setting-value">${value}<span class="loadout-end">${icon(ChevronRight, 14)}</span></span>+ </button>+ </div>`;+ }++ function loadoutControl(agent: Agent, selected: ModelOption, disabled: boolean): TemplateResult {+ const open = composerState.openMenu === "loadout";+ const entries = seededLoadout(selected);+ const modelSupportsFast = modelSupportsFastMode(scopeKey(), selected.model.id);+ const fastAvailable = harnessSupportsFastMode(selected.harnessId) && modelSupportsFast;+ const fastUnsupportedReason = modelSupportsFast ? "Not supported by this harness" : "Not supported by this model";const fastOn = fastAvailable && effectiveFastMode();- const summary = `${selected.buttonLabel} · ${effortLabel(composerState.effortLevel)}${fastOn ? " · Fast" : ""}`;- return html`- <div class="menu-control settings-control ${open ? "open" : ""}" data-align="right">- <button- class="menu-button settings-button"- type="button"- ${tip(`Session settings: ${summary}`)}- aria-label="Session settings: ${summary}"- aria-haspopup="menu"- aria-expanded=${open ? "true" : "false"}- aria-controls="composer-settings-menu"- ?disabled=${disabled}- @click=${(e: Event) => toggleComposerMenu(e, "settings")}- >- ${icon(SlidersHorizontal, 16)}- </button>- ${- open && !disabled- ? html`+ return html`<div class="menu-control loadout-control" data-align="left">+ <button+ class="menu-button loadout-button"+ type="button"+ aria-label=${`Model: ${selected.label}, ${effortLabel(composerState.effortLevel)} effort${fastOn ? ", Fast" : ""}`}+ aria-haspopup="menu"+ aria-expanded=${open ? "true" : "false"}+ aria-controls=${loadoutMenuId}+ ?disabled=${disabled}+ @keydown=${(e: KeyboardEvent) => {+ if (e.key === "ArrowDown" || e.key === "ArrowUp") {+ e.preventDefault();+ cancelLoadoutClose();+ loadoutSection = null;+ loadoutSectionHovered = false;+ composerState.openMenu = "loadout";+ ctx.chat.drawActiveChat();+ placeLoadout();+ requestAnimationFrame(() => ctx.chat.state.host?.querySelector<HTMLElement>(".loadout-pick")?.focus());+ }+ }}+ @click=${(e: Event) => {+ e.stopPropagation();+ cancelLoadoutClose();+ loadoutSection = null;+ loadoutSectionHovered = false;+ composerState.menuQuery = "";+ composerState.openMenu = open ? null : "loadout";+ ctx.chat.drawActiveChat();+ placeLoadout();+ }}+ >+ <span class="menu-label">${selected.label}</span+ ><span class="menu-suffix">${effortText(composerState.effortLevel)}</span>+ ${fastOn ? html`<span class="loadout-bolt">${icon(Zap, 13)}</span>` : nothing}${icon(ChevronDown, 13)}+ </button>+ ${+ open && !disabled+ ? html`<div+ class="menu-popover loadout-popover"+ popover="manual"+ id=${loadoutMenuId}+ role="menu"+ aria-label="Model settings"+ @click=${(e: Event) => e.stopPropagation()}+ @mouseover=${(e: MouseEvent) => trackLoadoutHover(e)}+ @mouseleave=${() => queueLoadoutClose()}+ @keydown=${(e: KeyboardEvent) => {+ if (e.key === "Escape") {+ e.preventDefault();+ e.stopPropagation();+ closeMenus();+ ctx.chat.drawActiveChat();+ requestAnimationFrame(() =>+ ctx.chat.state.host?.querySelector<HTMLElement>(".loadout-button")?.focus(),+ );+ } else if (!(e.target as HTMLElement).closest(".loadout-submenu")) menuArrowKeys(e);+ }}+ >+ <div class="loadout-panel">+ <div class="loadout-head">Presets</div>+ <div class="loadout-list">${entries.map((entry, at) => loadoutRow(entry, at, selected, agent))}</div><div- class="menu-popover settings-popover"- id="composer-settings-menu"- role="menu"- @click=${(e: Event) => e.stopPropagation()}+ class="loadout-submenu-anchor"+ ${tip(entries.length >= LOADOUT_CAP ? "Remove a preset to add another." : "")}>- <div class="menu-title">Model</div>- ${getModelOptionsForHarness(selected.harnessId, scopeKey()).map(- (option) => html`- <button- class="menu-option ${option.value === selected.value ? "active" : ""}"- type="button"- role="menuitemradio"- aria-checked=${option.value === selected.value ? "true" : "false"}- @click=${() => selectModel(option.value, agent)}- >- <span class="menu-option-copy">- <span class="menu-option-label">${option.label}</span>- </span>- ${option.value === selected.value ? icon(Check, 15) : nothing}- </button>- `,- )}- <div class="menu-title">Harness</div>- <div class="settings-seg" role="group" aria-label="Harness">- ${getHarnessOptions(scopeKey()).map(- (option) => html`+ <button+ class="loadout-add ${loadoutSection === "add" ? "open" : ""}"+ type="button"+ role="menuitem"+ data-loadout-section="add"+ aria-haspopup="menu"+ aria-expanded=${loadoutSection === "add" ? "true" : "false"}+ ?disabled=${entries.length >= LOADOUT_CAP}+ @mouseenter=${() => {+ if (isPhone() || entries.length >= LOADOUT_CAP) return;+ loadoutSectionHovered = true;+ openLoadoutSection("add");+ }}+ @keydown=${(e: KeyboardEvent) => {+ if (e.key === "ArrowRight") {+ e.preventDefault();+ loadoutSectionHovered = false;+ openLoadoutSection("add", true);+ }+ }}+ @click=${(e: MouseEvent) => {+ loadoutSectionHovered = e.detail !== 0 && !isPhone();+ openLoadoutSection("add", e.detail === 0);+ }}+ >+ ${icon(Plus, 16)}<span>Add models</span><span class="loadout-end">${icon(ChevronRight, 14)}</span>+ </button>+ </div>+ <div class="loadout-divider"></div>+ ${loadoutHarnessControl(selected)}+ ${+ harnessSupportsEffort(selected.harnessId)+ ? html`<div class="loadout-submenu-anchor"><button- class="settings-chip ${option.value === selected.harnessId ? "active" : ""}"+ class="loadout-setting ${loadoutSection === "effort" ? "open" : ""}"type="button"- aria-pressed=${option.value === selected.harnessId ? "true" : "false"}- @click=${() => selectHarness(option.value, agent)}+ role="menuitem"+ data-loadout-section="effort"+ aria-haspopup="menu"+ aria-expanded=${loadoutSection === "effort" ? "true" : "false"}+ @mouseenter=${() => {+ if (isPhone()) return;+ loadoutSectionHovered = true;+ openLoadoutSection("effort");+ }}+ @keydown=${(e: KeyboardEvent) => {+ if (e.key === "ArrowRight") {+ e.preventDefault();+ loadoutSectionHovered = false;+ openLoadoutSection("effort", true);+ }+ }}+ @click=${(e: MouseEvent) => {+ loadoutSectionHovered = e.detail !== 0 && !isPhone();+ openLoadoutSection("effort", e.detail === 0);+ }}>- ${option.label}+ <span class="loadout-setting-label">Effort</span+ ><span class="loadout-setting-value"+ >${effortText(composerState.effortLevel)}<span class="loadout-end"+ >${icon(ChevronRight, 14)}</span+ ></span+ ></button>- `,- )}- </div>- ${- harnessSupportsEffort(selected.harnessId)- ? html`- <div class="menu-title">Effort</div>- <div class="settings-seg" role="group" aria-label="Effort">- ${EFFORT_LEVELS.map(- (option) => html`- <button- class="settings-chip ${option.value === composerState.effortLevel ? "active" : ""}"- type="button"- aria-pressed=${option.value === composerState.effortLevel ? "true" : "false"}- @click=${() => selectEffort(option.value, agent)}- >- ${option.label}- </button>- `,- )}- </div>- `- : nothing- }- ${- fastAvailable- ? html`- <div class="settings-seg">- <button- class="settings-chip settings-fast-toggle ${fastOn ? "active" : ""}"- type="button"- role="menuitemcheckbox"- aria-checked=${fastOn ? "true" : "false"}- @click=${() => toggleFastMode(agent)}- >- ${icon(Zap, 15)}- <span>Fast mode</span>- </button>- </div>- `- : nothing- }- </div>- `- : nothing- }- </div>- `;+ </div>`+ : nothing+ }+ <button+ class="loadout-setting"+ type="button"+ role="menuitemcheckbox"+ aria-label="Fast"+ aria-checked=${fastOn ? "true" : "false"}+ ?disabled=${!fastAvailable}+ @click=${() => toggleFastMode(agent)}+ >+ <span class="loadout-setting-label">Fast</span>+ <span class="loadout-setting-value">+ <span class="loadout-shortcut">${fastAvailable ? "⌘⇧E" : fastUnsupportedReason}</span>+ <span class="loadout-toggle ${fastOn ? "on" : ""}" aria-hidden="true">+ <span class="loadout-knob"></span>+ </span>+ </span>+ </button>+ </div>+ ${getRuntimeConfig(scopeKey())?.scopeOverride ? html`<div class="loadout-foot"><button class="loadout-foot-btn" type="button" @click=${() => changeScopeRuntime({ inherit: true }, agent)}>Use org default</button></div>` : nothing}+ ${loadoutSubmenu(agent, selected)}+ </div>`+ : nothing+ }+ </div>`;}- function menuControl(args: {- kind: ComposerMenu;- glyph?: IconNode;- label: string;- suffix?: string;- title: string;- selected: string;- options: ComposerMenuOption[];- searchable?: boolean;- disabled?: boolean;- align?: "left" | "right";- onSelect: (value: string) => void;- }): TemplateResult {- const open = composerState.openMenu === args.kind;- const menuId = `composer-${args.kind}-menu`;- let controlClass = "";- if (args.kind === "model") controlClass = "model-control";- else if (args.kind === "harness") controlClass = "harness-control";- const searchable = args.searchable === true && args.options.length >= MENU_SEARCH_THRESHOLD;- const query = searchable ? composerState.menuQuery.trim().toLocaleLowerCase() : "";- const matches = query- ? args.options.filter((option) =>- `${option.label} ${option.groupLabel ?? ""}`.toLocaleLowerCase().includes(query),- )- : args.options;- const grouped = groupMenuOptions(matches);- return html`- <div class="menu-control ${controlClass}" data-align=${args.align ?? "left"}>- <button- class="menu-button"- type="button"- ${tip(args.title)}- aria-haspopup="menu"- aria-expanded=${open ? "true" : "false"}- aria-controls=${menuId}- ?disabled=${args.disabled}- @click=${(e: Event) => toggleComposerMenu(e, args.kind)}- >- ${args.glyph ? icon(args.glyph, 16) : nothing}- <span class="menu-label">${args.label}</span>- ${args.suffix ? html`<span class="menu-suffix">${args.suffix}</span>` : nothing} ${icon(ChevronDown, 14)}- </button>- ${- open && !args.disabled- ? html`- <div class="menu-popover" id=${menuId} role="menu" @click=${(e: Event) => e.stopPropagation()}>- <div class="menu-title">${args.title}</div>- ${- searchable- ? html`<label class="menu-search">- <span class="sr-only">Search models</span>- <input- type="search"- placeholder="Search models…"- .value=${live(composerState.menuQuery)}- @input=${(e: InputEvent) => {- composerState.menuQuery = (e.currentTarget as HTMLInputElement).value;- ctx.chat.drawActiveChat();- requestAnimationFrame(() => placeComposerMenu(args.kind));- }}- />- </label>`- : nothing- }- ${- matches.length- ? grouped.map(- (group) => html`- ${group.label ? html`<div class="menu-group-label">${group.label}</div>` : nothing}- ${group.options.map(- (option) => html`- <button- class="menu-option ${option.value === args.selected ? "active" : ""}"- type="button"- role="menuitemradio"- aria-checked=${option.value === args.selected ? "true" : "false"}- @click=${() => args.onSelect(option.value)}- >- <span class="menu-option-copy">- <span class="menu-option-label">${option.label}</span>- </span>- ${option.value === args.selected ? icon(Check, 15) : nothing}- </button>- `,- )}- `,- )- : html`<div class="menu-empty">No models found</div>`- }- </div>- `- : nothing- }- </div>- `;+ function menuArrowKeys(e: KeyboardEvent): void {+ if (!["ArrowDown", "ArrowUp", "Home", "End"].includes(e.key)) return;+ const target = e.target as HTMLElement;+ if (target.matches("input") && !["ArrowDown", "ArrowUp"].includes(e.key)) return;+ const menu = target.closest<HTMLElement>('[role="menu"]');+ if (!menu) return;+ const buttons = [...menu.querySelectorAll<HTMLElement>("button:not(:disabled)")].filter(+ (button) =>+ button.closest('[role="menu"]') === menu &&+ button.offsetParent !== null &&+ !button.classList.contains("loadout-drag"),+ );+ if (!buttons.length) return;+ e.preventDefault();+ e.stopPropagation();+ const at = buttons.indexOf(target);+ let next = at + (e.key === "ArrowUp" ? -1 : 1);+ if (at < 0 && e.key === "ArrowUp") next = buttons.length - 1;+ if (e.key === "Home") next = 0;+ if (e.key === "End") next = buttons.length - 1;+ buttons[(next + buttons.length) % buttons.length]?.focus();}- function placeComposerMenu(kind: ComposerMenu): void {- const popover = ctx.chat.state.host?.querySelector<HTMLElement>(`#composer-${kind}-menu`);- const anchor = popover?.parentElement;- if (!popover || !anchor) return;- const viewport = window.visualViewport;- const viewportTop = viewport?.offsetTop ?? 0;- const viewportBottom = viewportTop + (viewport?.height ?? window.innerHeight);- const anchorRect = anchor.getBoundingClientRect();- const margin = 12;- const gap = 8;- const availableAbove = Math.max(0, anchorRect.top - viewportTop - margin - gap);- const availableBelow = Math.max(0, viewportBottom - anchorRect.bottom - margin - gap);- const placeBelow = availableBelow > availableAbove;- const availableHeight = placeBelow ? availableBelow : availableAbove;- popover.classList.toggle("drop-down", placeBelow);- popover.style.setProperty("--menu-available-height", `${Math.floor(availableHeight)}px`);- }-- function toggleComposerMenu(e: Event, kind: ComposerMenu): void {- e.stopPropagation();- composerState.openMenu = composerState.openMenu === kind ? null : kind;- ctx.chat.drawActiveChat();+ function placeLoadout(): void {+ requestAnimationFrame(() => {+ const host = ctx.chat.state.host;+ const menu = host?.querySelector<HTMLElement>(".loadout-popover");+ const trigger = host?.querySelector<HTMLElement>(".loadout-button");+ if (!menu || !trigger) return;+ if (typeof menu.showPopover === "function" && !menu.matches(":popover-open")) menu.showPopover();+ const viewport = window.visualViewport;+ const top = (viewport?.offsetTop ?? 0) + 12;+ const left = (viewport?.offsetLeft ?? 0) + 12;+ const right = left + (viewport?.width ?? window.innerWidth) - 24;+ const bottom = top + (viewport?.height ?? window.innerHeight) - 24;+ const rect = trigger.getBoundingClientRect();+ const above = rect.top - top - 8;+ const below = bottom - rect.bottom - 8;+ const up = above >= below;+ menu.style.maxHeight = `${Math.max(140, up ? above : below)}px`;+ menu.style.left = `${Math.max(left, Math.min(rect.left, right - menu.offsetWidth))}px`;+ menu.style.top = `${up ? Math.max(top, rect.top - menu.offsetHeight - 8) : rect.bottom + 8}px`;+ menu.style.bottom = "auto";+ const submenu = menu.querySelector<HTMLElement>(".loadout-submenu");+ const anchor = menu.querySelector<HTMLElement>(`[data-loadout-section="${loadoutSection}"]`);+ if (!submenu || !anchor) return;+ const menuRect = menu.getBoundingClientRect();+ const width = Math.min(260, right - left);+ const roomRight = right - menuRect.right - 4;+ const roomLeft = menuRect.left - left - 4;+ const inline = Math.max(roomLeft, roomRight) < width;+ submenu.classList.toggle("inline", inline);+ if (inline) {+ submenu.style.width = "";+ submenu.style.left = "";+ submenu.style.top = "";+ submenu.style.maxHeight = `${Math.max(120, (up ? above : below) - 80)}px`;+ menu.style.top = `${up ? Math.max(top, rect.top - menu.offsetHeight - 8) : rect.bottom + 8}px`;+ } else {+ submenu.style.width = `${width}px`;+ submenu.style.maxHeight = `${bottom - top}px`;+ submenu.style.left = `${roomRight >= width ? menuRect.right + 4 : menuRect.left - width - 4}px`;+ submenu.style.top = `${Math.max(top, Math.min(anchor.getBoundingClientRect().top - 6, bottom - submenu.offsetHeight))}px`;+ }+ });}+ window.addEventListener("resize", placeLoadout);+ window.visualViewport?.addEventListener("resize", placeLoadout);+function matchSkills(query: string, skills: SkillItem[]): SkillMatch[] {const q = query.toLowerCase();if (!q) return skills.map((skill) => ({ skill, start: -1, end: -1 }));@@ -1749,46 +2233,50 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {function selectModel(value: string, agent: Agent): void {const option = getModelOptions(scopeKey()).find((candidate) => candidate.value === value);if (!option) return;+ ++modelSelectionRevision;const previousDefaultEffort = defaultEffortForModel(currentModelOption()?.model);if (ctx.chat.state.threadRef) rememberThreadPick(ctx.chat.state.threadRef, option.value);agent.state.model = option.model;if (composerState.effortLevel === previousDefaultEffort) {composerState.effortLevel = defaultEffortForModel(option.model);}- if (composerState.openMenu !== "settings") composerState.openMenu = null;+ composerState.openMenu = null;ctx.chat.drawActiveChat(agent);}function selectHarness(harnessId: string, agent: Agent): void {- const current = currentModelOption();- const options = getModelOptionsForHarness(harnessId, scopeKey());- const option = options.find((candidate) => candidate.model.id === current?.model.id) ?? options[0];- if (option) selectModel(option.value, agent);+ const selected = currentModelOption();+ if (!selected || selected.harnessId === harnessId) return;+ const target = compatibleHarnessOptions(getModelOptions(scopeKey()), selected.model.id).find(+ (option) => option.harnessId === harnessId,+ );+ if (!target) return;+ const active = activeLoadoutEntry(selected);+ applyLoadout({ ...active, value: target.value }, agent);}function selectEffort(level: EffortLevel, agent: Agent): void {+ const selected = currentModelOption();+ if (!selected || !effortLevelsForHarness(selected.harnessId).some((option) => option.value === level)) return;composerState.effortLevel = level;- if (composerState.openMenu !== "settings") composerState.openMenu = null;+ rememberActiveTweaks(selected);ctx.chat.drawActiveChat(agent);+ placeLoadout();}function toggleFastMode(agent: Agent): void {+ const selected = currentModelOption();if (ctx.chat.hasUnresolvedApproval() || ctx.chat.state.resolvingApprovals.size > 0) return;- if (!modelSupportsFastMode(scopeKey(), currentModelOption()?.model.id)) return;+ if (+ !selected ||+ !harnessSupportsFastMode(selected.harnessId) ||+ !modelSupportsFastMode(scopeKey(), selected.model.id)+ )+ return;composerState.fastMode = !effectiveFastMode();- if (fastModeChargeTimer) {- clearTimeout(fastModeChargeTimer);- fastModeChargeTimer = null;- }- fastModeCharging = composerState.fastMode;+ rememberActiveTweaks(selected);ctx.chat.drawActiveChat(agent);- if (fastModeCharging) {- fastModeChargeTimer = setTimeout(() => {- fastModeCharging = false;- fastModeChargeTimer = null;- if (agent === ctx.chat.state.agent) ctx.chat.drawActiveChat(agent);- }, 760);- }+ placeLoadout();}let autosizedTa: HTMLTextAreaElement | null = null;@@ -1831,6 +2319,9 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {function closeMenus(): boolean {let changed = false;if (composerState.openMenu) {+ cancelLoadoutClose();+ loadoutSection = null;+ loadoutSectionHovered = false;composerState.openMenu = null;changed = true;}@@ -1842,13 +2333,15 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {}function dispose(): void {+ cancelLoadoutClose();unsubscribeRuntime?.();++runtimeRequest;fileDrag.dispose();autosizeObserver?.disconnect();autosizeObserver = null;autosizedTa = null;- if (fastModeChargeTimer !== null) clearTimeout(fastModeChargeTimer);+ window.removeEventListener("resize", placeLoadout);+ window.visualViewport?.removeEventListener("resize", placeLoadout);}return {diff --git a/plugins/web-ui/src/effort-confetti.ts b/plugins/web-ui/src/effort-confetti.tsnew file mode 100644index 000000000..5e7b71896--- /dev/null+++ b/plugins/web-ui/src/effort-confetti.ts@@ -0,0 +1,62 @@+import { effortLevelsForHarness } from "./composer-loadout";++const COLORS = ["#e8843a", "#e45d79", "#a78bfa", "#60a5fa", "#5cc074", "#f6cc46"];+let activeBurst: HTMLElement | null = null;+let activeAnchor: Element | null = null;++function isHighestEffort(level: string, harnessId: string): boolean {+ const levels = effortLevelsForHarness(harnessId);+ return levels.length > 1 && levels.at(-1)?.value === level;+}++export function burstEffortConfetti(event: Event, level: string, harnessId: string): void {+ if (!isHighestEffort(level, harnessId) || window.matchMedia("(prefers-reduced-motion: reduce)").matches) return;+ const target = event.currentTarget as HTMLElement | null;+ if (!target?.isConnected || typeof target.animate !== "function") return;+ const anchor = target.querySelector<HTMLElement>(".effort-peak") ?? target;+ if (activeBurst && activeAnchor === anchor) return;+ const rect = anchor.getBoundingClientRect();+ if (!rect.width || !rect.height) return;+ activeBurst?.getAnimations({ subtree: true }).forEach((animation) => animation.cancel());+ activeBurst?.remove();+ const burst = document.createElement("div");+ burst.className = "effort-confetti";+ burst.setAttribute("aria-hidden", "true");+ burst.setAttribute("popover", "manual");+ burst.style.left = `${rect.left + rect.width / 2}px`;+ burst.style.top = `${rect.top + rect.height / 2}px`;+ document.body.appendChild(burst);+ burst.showPopover?.();+ activeBurst = burst;+ activeAnchor = anchor;+ const animations: Promise<Animation>[] = [];+ for (let index = 0; index < 14; index++) {+ const piece = document.createElement("span");+ piece.style.backgroundColor = COLORS[index % COLORS.length];+ burst.appendChild(piece);+ const x = (index - 6.5) * 8 + Math.random() * 10 - 5;+ const rise = 24 + Math.random() * 26;+ const spin = (index % 2 ? 1 : -1) * (100 + Math.random() * 150);+ animations.push(+ piece.animate(+ [+ { transform: "translate(-50%, -50%) scale(0.4) rotate(0deg)", opacity: 0 },+ {+ transform: `translate(${x * 0.6}px, ${-rise}px) scale(1) rotate(${spin * 0.5}deg)`,+ opacity: 1,+ offset: 0.4,+ },+ { transform: `translate(${x}px, ${16 + Math.random() * 18}px) scale(0.6) rotate(${spin}deg)`, opacity: 0 },+ ],+ { duration: 620 + Math.random() * 140, easing: "cubic-bezier(0.2, 0.7, 0.3, 1)", fill: "forwards" },+ ).finished,+ );+ }+ void Promise.allSettled(animations).then(() => {+ burst.remove();+ if (activeBurst === burst) {+ activeBurst = null;+ activeAnchor = null;+ }+ });+}diff --git a/plugins/web-ui/src/model-options.ts b/plugins/web-ui/src/model-options.tsindex 9cc5af159..c41d68a7f 100644--- a/plugins/web-ui/src/model-options.ts+++ b/plugins/web-ui/src/model-options.ts@@ -122,10 +122,6 @@ export function getHarnessOptions(scopeKey?: string | null): Array<{ value: stri);}-export function getModelOptionsForHarness(harnessId: string, scopeKey?: string | null): ModelOption[] {- return runtimeFor(scopeKey).options.filter((option) => option.harnessId === harnessId);-}-export function runtimeModelOptions(approvedHarnesses: readonly string[],modelsByHarness: Readonly<Record<string, readonly string[]>>,diff --git a/plugins/web-ui/src/runtime-capabilities.ts b/plugins/web-ui/src/runtime-capabilities.tsindex d6fd026dd..18e327afb 100644--- a/plugins/web-ui/src/runtime-capabilities.ts+++ b/plugins/web-ui/src/runtime-capabilities.ts@@ -7,7 +7,7 @@ export const EFFORT_LEVELS: Array<{ value: EffortLevel; label: string }> = [{ value: "low", label: "Low" },{ value: "medium", label: "Medium" },{ value: "high", label: "High" },- { value: "xhigh", label: "XHigh" },+ { value: "xhigh", label: "Extra high" },{ value: "max", label: "Max" },{ value: "ultracode", label: "Ultracode" },];@@ -21,7 +21,7 @@ export function harnessSupportsEffort(harnessId: string): boolean {}export function harnessSupportsFastMode(harnessId: string): boolean {- return harnessId === "pi" || harnessId === "claude";+ return harnessId === "pi" || harnessId === "claude" || harnessId === "codex";}export function harnessSupportsSteer(harnessId: string): boolean {diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.cssindex 6fd5293a4..022d688d5 100644--- a/plugins/web-ui/src/shell.css+++ b/plugins/web-ui/src/shell.css@@ -2952,6 +2952,9 @@ a.chat-row-open {gap: 7px;min-width: 0;}+.composer-attach {+ transform: scale(0.81);+}.runtime-upgrade {display: flex;align-items: center;@@ -2966,164 +2969,842 @@ a.chat-row-open {.runtime-upgrade span {flex: 1;}-.runtime-upgrade button,-.runtime-default-btn {+.runtime-upgrade button,+.runtime-default-btn {+ border: 0;+ border-radius: 8px;+ padding: 6px 8px;+ background: transparent;+ color: var(--muted-foreground);+ font: inherit;+ font-size: 12px;+ white-space: nowrap;+ cursor: pointer;+}+.runtime-upgrade button:hover,+.runtime-default-btn:hover {+ background: var(--secondary);+ color: var(--foreground);+}+.runtime-default-btn:disabled {+ opacity: 0.55;+ cursor: not-allowed;+}+.menu-control {+ position: relative;+ min-width: 0;+}+.menu-button {+ height: 34px;+ display: inline-flex;+ align-items: center;+ gap: 6px;+ max-width: min(240px, 44vw);+ min-width: 0;+ padding: 0 8px;+ border: 0;+ border-radius: 8px;+ font: inherit;+ font-size: 13px;+ color: var(--muted-foreground);+ background: transparent;+ cursor: pointer;+}+.menu-button:hover,+.menu-button[aria-expanded="true"] {+ background: var(--secondary);+ color: var(--foreground);+}+.menu-button:disabled {+ opacity: 0.55;+ cursor: not-allowed;+}+.menu-label {+ min-width: 0;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+}+.model-control .menu-button {+ max-width: min(280px, 46vw);+ color: var(--foreground);+}+.fast-toggle {+ position: relative;+ height: 34px;+ display: inline-flex;+ align-items: center;+ justify-content: center;+ gap: 5px;+ padding: 0 6px;+ border: 1px solid transparent;+ background: transparent;+ color: var(--muted-foreground);+ cursor: pointer;+ font: inherit;+ font-size: 13px;+ white-space: nowrap;+ transition: color 160ms ease;+}+.fast-toggle:hover,+.fast-toggle:focus-visible {+ color: var(--foreground);+}+.fast-toggle.active {+ color: var(--cta);+}+.fast-toggle.unavailable,+.fast-toggle.unavailable:hover,+.fast-toggle.unavailable:focus-visible {+ opacity: 0.4;+ color: var(--muted-foreground);+ cursor: not-allowed;+}+.fast-toggle .icon,+.fast-toggle .fast-label {+ position: relative;+ z-index: 1;+}+.fast-toggle.active .icon {+ color: var(--cta);+}+.fast-toggle .fast-label {+ display: inline-flex;+ align-items: center;+}+.fast-toggle.charging .icon {+ animation: fast-charge 760ms cubic-bezier(0.2, 0.8, 0.2, 1) both;+}+@keyframes fast-charge {+ 0% {+ filter: none;+ transform: scale(1);+ }+ 38% {+ transform: scale(1.22) rotate(-8deg);+ }+ 64% {+ transform: scale(0.94) rotate(4deg);+ }+ 100% {+ filter: none;+ transform: scale(1) rotate(0);+ }+}+@media (prefers-reduced-motion: reduce) {+ .fast-toggle.charging .icon {+ animation: none;+ }+}+.menu-popover {+ position: absolute;+ bottom: calc(100% + 8px);+ left: 0;+ z-index: 30;+ width: 230px;+ max-width: calc(100vw - 36px);+ max-height: min(320px, 52vh);+ overflow-y: auto;+ padding: 6px;+ border: 1px solid var(--border);+ border-radius: 12px;+ background: var(--background);+}+.menu-control[data-drop="down"] .menu-popover {+ top: calc(100% + 6px);+ bottom: auto;+}+.menu-control[data-drop="down"] .menu-popover.drop-up {+ top: auto;+ bottom: calc(100% + 6px);+}+.menu-control[data-align="right"] .menu-popover {+ right: 0;+ left: auto;+ width: 230px;+}+.loadout-button {+ gap: 7px;+ height: 32px;+ max-width: min(360px, 58vw);+ padding: 0 8px;+ color: var(--foreground);+ font-size: 13px;+}+.loadout-button .menu-suffix {+ color: var(--muted-foreground);+ white-space: nowrap;+}+[data-density] .composer-toolbar .menu-button.loadout-button {+ width: auto;+ max-width: min(280px, calc(100cqw - 130px));+ padding-inline: 6px;+ justify-content: flex-start;+}+@container chat (max-width: 470px) {+ [data-density] .loadout-button .menu-suffix {+ display: none;+ }+}+.menu-control .menu-popover.loadout-popover,+.menu-control[data-align="right"] .menu-popover.loadout-popover,+.menu-control[data-drop="down"] .menu-popover.loadout-popover {+ position: fixed;+ right: auto;+ bottom: auto;+ z-index: 60;+ display: flex;+ flex-direction: column;+ width: min(360px, calc(100vw - 24px));+ max-width: calc(100vw - 24px);+ box-sizing: border-box;+ margin: 0;+ padding: 6px;+ overflow: visible;+ border: 1px solid var(--border);+ border-radius: 12px;+ background: var(--background);+ color: var(--foreground);+}+.loadout-popover[popover]:not(:popover-open) {+ display: none;+}+.loadout-popover::backdrop {+ pointer-events: none;+}+.loadout-panel {+ display: flex;+ flex: 1 1 auto;+ flex-direction: column;+ min-height: 0;+}+.loadout-head {+ padding: 8px 12px 5px;+ font-size: 12.5px;+ color: var(--muted-foreground);+}+.loadout-list {+ padding-block: 4px;+ flex: 1 1 auto;+ min-height: 0;+ max-height: 304px;+ overflow-y: auto;+ overscroll-behavior: contain;+ scrollbar-width: thin;+}+.loadout-row {+ margin-block: 6px;+ position: relative;+ display: flex;+ align-items: center;+ min-height: 34px;+ border-radius: 8px;+}+.loadout-row:hover,+.loadout-row:focus-within {+ background: var(--secondary);+}+.loadout-row.dragging {+ opacity: 0.45;+}+.loadout-list:has(.dragging) .loadout-row {+ background: transparent;+}+.loadout-row.drop-target::before {+ content: "";+ position: absolute;+ inset: -4px 8px auto;+ height: 2px;+ background: #93c5fd;+ pointer-events: none;+}+.loadout-row.drop-target.drop-after::before {+ top: auto;+ bottom: -4px;+}+.loadout-drag {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ flex: 0 0 20px;+ align-self: stretch;+ margin-left: 3px;+ padding: 0;+ border: 0;+ border-radius: 5px;+ background: transparent;+ color: var(--muted-foreground);+ cursor: grab;+ touch-action: none;+}+.loadout-drag:active {+ cursor: grabbing;+}+.loadout-pick {+ display: flex;+ align-items: center;+ flex: 1;+ gap: 7px;+ min-width: 0;+ min-height: 34px;+ padding: 7px 8px;+ border: 0;+ border-radius: 8px;+ background: transparent;+ color: inherit;+ font: inherit;+ font-size: 13px;+ line-height: 20px;+ text-align: left;+ cursor: pointer;+}+.loadout-icon {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ flex: 0 0 17px;+ width: 17px;+ height: 17px;+ color: var(--muted-foreground);+}+.loadout-icon[data-provider="openai"] {+ color: #7c83ee;+}+.loadout-icon[data-provider="anthropic"] {+ color: #d77d59;+}+.loadout-model-copy {+ display: flex;+ flex: 1;+ flex-direction: column;+ min-width: 0;+}+.loadout-title {+ display: flex;+ align-items: center;+ gap: 5px;+ min-width: 0;+}+.loadout-default {+ flex: none;+ padding: 0 4px;+ border-radius: 999px;+ background: var(--secondary);+ color: var(--muted-foreground);+ font-size: 9px;+ font-weight: 400;+ line-height: 13px;+}+.loadout-name,+.loadout-harness {+ min-width: 0;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+}+.loadout-name {+ color: var(--foreground);+ font-weight: 400;+}+.loadout-details {+ display: flex;+ align-items: baseline;+ gap: 6px;+ color: var(--muted-foreground);+ font-size: 11px;+ line-height: 14px;+ white-space: nowrap;+}+.loadout-details .loadout-bolt {+ align-self: center;+}+.loadout-meta {+ flex: none;+ color: var(--muted-foreground);+ font-size: 13px;+ white-space: nowrap;+}+.effort-peak {+ background-image:+ linear-gradient(105deg, transparent 43%, rgb(0 0 0 / 0.3) 50%, transparent 57%),+ linear-gradient(90deg, #cf361f, #af5614, #8a6b07, #607825, #317e43, #347a78, #2b769f, #5465d4, #a72aec);+ background-repeat: no-repeat;+ background-size:+ 180% 100%,+ 100% 100%;+ background-position:+ 220% 0,+ 0 0;+ -webkit-background-clip: text;+ background-clip: text;+ color: transparent;+}+.loadout-row:hover .effort-peak,+.loadout-setting:hover .effort-peak,+.loadout-effort:hover .effort-peak,+.loadout-button:hover .effort-peak {+ animation: effort-shine 900ms ease-out;+}+@keyframes effort-shine {+ from {+ background-position:+ 220% 0,+ 0 0;+ }+ to {+ background-position:+ -120% 0,+ 0 0;+ }+}+@media (prefers-reduced-motion: reduce) {+ .loadout-row:hover .effort-peak,+ .loadout-setting:hover .effort-peak,+ .loadout-effort:hover .effort-peak,+ .loadout-button:hover .effort-peak {+ animation: none;+ }+}+:root.dark .effort-peak,+.dark .effort-peak {+ background-image:+ linear-gradient(105deg, transparent 43%, rgb(255 255 255 / 0.95) 50%, transparent 57%),+ linear-gradient(90deg, #e45d49, #e8843a, #f6cc46, #abcc59, #5cc074, #55b7b5, #5ba9d3, #7b88de, #c46bf5);+}+@supports not ((background-clip: text) or (-webkit-background-clip: text)) {+ .effort-peak {+ background-image: none;+ color: inherit;+ }+}+.effort-peak::selection {+ color: var(--foreground);+}+@media print {+ .effort-peak {+ background-image: none;+ color: inherit;+ }+}+.loadout-bolt {+ display: inline-flex;+ flex: none;+ color: var(--muted-foreground);+}+.loadout-end {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ flex: none;+ gap: 6px;+ width: 26px;+ min-width: 26px;+ margin-left: auto;+ padding: 0;+ color: var(--foreground);+}+.loadout-row.has-default-action .loadout-model-copy {+ margin-right: 26px;+}+.loadout-make-default,+.loadout-default-star {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ width: 26px;+ position: absolute;+ top: 50%;+ right: 38px;+ height: 26px;+ margin-top: -13px;+ padding: 0 5px;+ border: 0;+ border-radius: 6px;+ background: transparent;+ color: var(--muted-foreground);+ font: inherit;+ font-size: 11px;+ cursor: pointer;+ opacity: 0;+ pointer-events: none;+}+.loadout-row:hover .loadout-make-default,+.loadout-row:has(:focus-visible) .loadout-make-default {+ opacity: 1;+ pointer-events: auto;+}+.loadout-make-default:hover,+.loadout-make-default:focus-visible {+ background: var(--secondary);+ color: var(--foreground);+}+.loadout-make-default:hover svg,+.loadout-make-default:focus-visible svg {+ fill: currentColor;+}+.loadout-make-default[data-default="true"],+.loadout-default-star {+ opacity: 1;+ pointer-events: auto;+ color: #eab308;+}+.loadout-default-star {+ cursor: default;+}+.loadout-make-default[data-default="true"] svg,+.loadout-default-star svg {+ fill: currentColor;+}+@media (hover: none) {+ .loadout-make-default,+ .loadout-default-star {+ opacity: 1;+ pointer-events: auto;+ }+}+.loadout-remove {+ position: absolute;+ top: 50%;+ right: 8px;+ margin-top: -13px;+ display: inline-flex;+ align-items: center;+ justify-content: center;+ width: 26px;+ height: 26px;+ padding: 0;+ border: 0;+ border-radius: 6px;+ background: transparent;+ color: var(--muted-foreground);+ cursor: pointer;+ opacity: 0;+ pointer-events: none;+}+.loadout-row:hover .loadout-remove,+.loadout-row:has(:focus-visible) .loadout-remove {+ opacity: 1;+ pointer-events: auto;+}+@media (hover: none) {+ .loadout-remove {+ opacity: 1;+ pointer-events: auto;+ }+}+.loadout-remove:hover,+.loadout-remove:focus-visible {+ background: var(--secondary);+ color: var(--foreground);+}+.loadout-shortcut {+ flex: none;+ padding: 0;+ border: 0;+ color: var(--muted-foreground);+ font: inherit;+ font-size: 12px;+ line-height: 18px;+ white-space: nowrap;+}+.loadout-add,+.loadout-setting,+.loadout-effort,+.loadout-back {+ display: flex;+ align-items: center;+ flex: none;+ gap: 9px;+ width: 100%;+ min-height: 34px;+ box-sizing: border-box;+ padding: 7px 8px;+ border: 0;+ border-radius: 8px;+ background: transparent;+ color: var(--foreground);+ font: inherit;+ font-size: 13px;+ line-height: 20px;+ text-align: left;+ cursor: pointer;+}+.loadout-add {+ color: var(--muted-foreground);+}+.loadout-add > svg:last-child {+ margin-left: auto;+}+.loadout-add:hover,+.loadout-add.open,+.loadout-setting:not([role="menuitemcheckbox"]):not(.loadout-setting-static):hover,+.loadout-setting.open,+.loadout-effort:hover,+.loadout-back:hover {+ background: var(--secondary);+}+.loadout-setting[role="menuitemcheckbox"]:disabled {+ opacity: 1;+ cursor: not-allowed;+}+.loadout-setting[role="menuitemcheckbox"]:disabled .loadout-setting-label,+.loadout-setting[role="menuitemcheckbox"]:disabled .loadout-toggle {+ opacity: 0.45;+}+.loadout-setting[role="menuitemcheckbox"]:not(:disabled):hover .loadout-toggle {+ background: color-mix(in srgb, var(--foreground) 42%, var(--background));+}+.loadout-setting[role="menuitemcheckbox"]:not(:disabled):hover .loadout-toggle.on {+ background: var(--cta-hover);+}+.loadout-plus {+ flex: 0 0 19px;+ width: 19px;+ font-size: 19px;+ line-height: 20px;+ text-align: center;+}+.loadout-divider {+ flex: none;+ height: 1px;+ margin: 4px 0;+ background: var(--border);+}+.loadout-setting-label {+ font-weight: 400;+}+.loadout-setting-static {+ cursor: default;+}+.loadout-setting-value {+ display: inline-flex;+ align-items: center;+ gap: 10px;+ margin-left: auto;+ color: var(--muted-foreground);+}+.loadout-submenu-anchor {+ position: relative;+ flex: none;+}+.loadout-submenu {+ position: fixed;+ z-index: 61;+ width: 250px;+ max-width: calc(100vw - 24px);+ max-height: calc(100dvh - 24px);+ box-sizing: border-box;+ padding: 6px;+ overflow-y: auto;+ overscroll-behavior: contain;+ border: 1px solid var(--border);+ border-radius: 12px;+ background: var(--background);+ color: var(--foreground);+ scrollbar-width: thin;+}+.loadout-submenu:has(.loadout-search) {+ width: 320px;+}+.loadout-submenu.inline {+ position: static;+ flex: 1 1 auto;+ width: 100%;+ min-height: 0;+ max-width: none;+ margin: 0;+ box-shadow: none;+}+.loadout-popover:has(> .loadout-submenu.inline) > .loadout-panel,+.loadout-popover:has(> .loadout-submenu.inline) > .loadout-foot {+ display: none;+}+.loadout-submenu .menu-option {+ min-height: 42px;+ gap: 9px;border: 0;- border-radius: 8px;- padding: 6px 8px;- background: transparent;+ font-size: 14px;+}+.loadout-submenu .menu-option-copy {+ display: flex;+ flex-direction: column;+ gap: 0;+}+.loadout-submenu .menu-option-copy > span {+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+}+.loadout-add-label {+ flex: none;+ align-self: center;+ margin-left: auto;color: var(--muted-foreground);- font: inherit;font-size: 12px;- white-space: nowrap;- cursor: pointer;+ opacity: 0;}-.runtime-upgrade button:hover,-.runtime-default-btn:hover {- background: var(--secondary);- color: var(--foreground);+.menu-option:hover .loadout-add-label,+.menu-option:focus-visible .loadout-add-label {+ opacity: 1;}-.runtime-default-btn:disabled {- opacity: 0.55;- cursor: not-allowed;+.loadout-effort {+ padding-inline: 10px;}-.menu-control {- position: relative;- min-width: 0;+.loadout-effort > svg {+ margin-left: auto;+ color: var(--foreground);}-.menu-button {- height: 34px;+.loadout-harness-option {display: inline-flex;align-items: center;- gap: 6px;- max-width: min(240px, 44vw);+ gap: 8px;min-width: 0;- padding: 0 8px;- border: 0;- border-radius: 8px;- font: inherit;- font-size: 13px;- color: var(--muted-foreground);- background: transparent;- cursor: pointer;-}-.menu-button:hover,-.menu-button[aria-expanded="true"] {- background: var(--secondary);- color: var(--foreground);}-.menu-button:disabled {- opacity: 0.55;- cursor: not-allowed;+.loadout-harness-option .model-mark {+ flex: none;}-.menu-label {- min-width: 0;+.loadout-harness-option > span {overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}-.model-control .menu-button {- max-width: min(280px, 46vw);- color: var(--foreground);+.loadout-toggle {+ position: relative;+ flex: none;+ width: 38px;+ height: 22px;+ border-radius: 999px;+ background: color-mix(in srgb, var(--foreground) 28%, var(--background));}-.harness-control .menu-button {- max-width: min(150px, 28vw);- color: var(--foreground);+.loadout-knob {+ position: absolute;+ top: 3px;+ left: 3px;+ width: 16px;+ height: 16px;+ border-radius: 50%;+ background: var(--background);+ transition: transform 120ms ease;}-.fast-toggle {- position: relative;- height: 34px;+.loadout-toggle.on {+ background: var(--cta);+}+.loadout-toggle.on .loadout-knob {+ background: var(--cta-foreground);+ transform: translateX(16px);+}+.loadout-foot {+ display: flex;+ flex-wrap: wrap;+ align-items: center;+ flex: none;+ gap: 8px;+ min-height: 32px;+ margin-top: 4px;+ padding: 8px 8px 2px;+ border-top: 1px solid var(--border);+ color: var(--muted-foreground);+ font-size: 12px;+}+.loadout-foot-btn {display: inline-flex;align-items: center;- justify-content: center;gap: 5px;- padding: 0 6px;- border: 1px solid transparent;+ min-height: 28px;+ padding: 0 2px;+ border: 0;+ border-radius: 4px;background: transparent;color: var(--muted-foreground);+ font: inherit;cursor: pointer;+}+.loadout-foot-btn:hover {+ color: var(--foreground);+}+.loadout-foot-note {+ color: var(--muted-foreground);+}+.loadout-search {+ display: flex;+ margin: 2px 2px 5px;+}+.loadout-search input {+ width: 100%;+ min-width: 0;+ height: 34px;+ box-sizing: border-box;+ padding: 6px 9px;+ border: 1px solid var(--border);+ border-radius: 6px;+ background: var(--background);+ color: var(--foreground);font: inherit;font-size: 13px;- white-space: nowrap;- transition: color 160ms ease;}-.fast-toggle:hover,-.fast-toggle:focus-visible {- color: var(--foreground);+.loadout-search input::placeholder {+ color: var(--muted-foreground);}-.fast-toggle.active {- color: var(--cta);+.loadout-empty {+ padding: 12px 10px;+ color: var(--muted-foreground);+ font-size: 13px;}-.fast-toggle.unavailable,-.fast-toggle.unavailable:hover,-.fast-toggle.unavailable:focus-visible {- opacity: 0.4;+.loadout-back {+ display: none;color: var(--muted-foreground);- cursor: not-allowed;+ font-size: 13px;}-.fast-toggle .icon,-.fast-toggle .fast-label {- position: relative;- z-index: 1;+.loadout-submenu.inline .loadout-back {+ display: flex;}-.fast-toggle.active .icon {- color: var(--cta);+.loadout-back svg {+ transform: rotate(90deg);}-.fast-toggle .fast-label {- display: inline-flex;- align-items: center;+.loadout-popover button:focus-visible,+.loadout-submenu button:focus-visible,+.loadout-search input:focus-visible {+ outline: 2px solid var(--muted-foreground);+ outline-offset: -2px;}-.fast-toggle.charging .icon {- animation: fast-charge 760ms cubic-bezier(0.2, 0.8, 0.2, 1) both;+.loadout-popover button:disabled,+.loadout-submenu button:disabled {+ opacity: 0.4;+ cursor: not-allowed;}-@keyframes fast-charge {- 0% {- filter: none;- transform: scale(1);+@media (max-width: 860px) {+ .menu-control .menu-popover.loadout-popover {+ padding: 18px 10px calc(10px + env(safe-area-inset-bottom));+ border-radius: 20px 20px 0 0;+ border-bottom: 0;}- 38% {- transform: scale(1.22) rotate(-8deg);+ .loadout-control .loadout-button {+ max-width: min(360px, calc(100vw - 150px));}- 64% {- transform: scale(0.94) rotate(4deg);+ .loadout-panel {+ overflow-y: auto;+ overscroll-behavior: contain;}- 100% {- filter: none;- transform: scale(1) rotate(0);+ .loadout-list {+ flex: none;+ max-height: none;+ overflow: visible;+ }+ .loadout-row,+ .loadout-pick,+ .loadout-add,+ .loadout-setting,+ .loadout-effort,+ .loadout-back {+ min-height: 44px;}}@media (prefers-reduced-motion: reduce) {- .fast-toggle.charging .icon {- animation: none;+ .loadout-knob {+ transition: none;}}-.menu-popover {- position: absolute;- bottom: calc(100% + 8px);- left: 0;- z-index: 30;- width: 230px;- max-width: calc(100vw - 36px);- max-height: min(320px, 52vh);- overflow-y: auto;- padding: 6px;- border: 1px solid var(--border);- border-radius: 12px;- background: var(--background);-}-.menu-control[data-drop="down"] .menu-popover {- top: calc(100% + 6px);- bottom: auto;-}-.menu-control[data-drop="down"] .menu-popover.drop-up {- top: auto;- bottom: calc(100% + 6px);-}-.menu-control[data-align="right"] .menu-popover {- right: 0;- left: auto;- width: 230px;-}+.menu-title {padding: 7px 8px 6px;font-size: 14px;@@ -7486,47 +8167,13 @@ h3.ambient-field-label {.menu-control.settings-control[data-align="right"] .menu-popover {width: 270px;}-.settings-seg {- display: flex;- flex-wrap: wrap;- gap: 4px;- padding: 2px 8px 8px;-}-.settings-chip {- appearance: none;- border: 1px solid var(--border);- border-radius: 7px;- background: var(--background);- color: var(--muted-foreground);- font-size: 12px;- font-weight: 600;- padding: 4px 9px;- cursor: pointer;-}-.settings-chip:hover {- color: var(--foreground);-}-.settings-chip.active {- border-color: var(--primary, #6366f1);- color: var(--primary, #6366f1);- background: color-mix(in srgb, var(--primary, #6366f1) 8%, var(--background));-}--.settings-fast-toggle {- display: inline-flex;- align-items: center;- gap: 5px;- white-space: nowrap;-}-.settings-fast-toggle.active .icon {- fill: currentColor;-}[data-qm-tooltip-anchor] {anchor-name: --qm-tooltip-anchor;}.qm-tooltip {+ border: 0;position: fixed;position-anchor: --qm-tooltip-anchor;position-area: top span-all;@@ -9698,10 +10345,6 @@ h3.ambient-field-label {letter-spacing: 0.04em;color: var(--muted-foreground);}- .settings-chip {- min-height: 40px;- font-size: 15px;- }.menu-control.settings-control[data-align="right"] .menu-popover {width: auto !important;}@@ -10601,3 +11244,33 @@ h3.ambient-field-label {white-space: nowrap;color: var(--muted-foreground);}++.effort-confetti {+ position: fixed;+ inset: auto;+ z-index: 1000;+ width: 0;+ height: 0;+ margin: 0;+ padding: 0;+ border: 0;+ overflow: visible;+ background: transparent;+ pointer-events: none;+}+.effort-confetti::backdrop {+ background: transparent;+ pointer-events: none;+}+.effort-confetti > span {+ position: absolute;+ width: 3px;+ height: 5px;+ border-radius: 1px;+ pointer-events: none;+}+@media (prefers-reduced-motion: reduce) {+ .effort-confetti {+ display: none;+ }+}diff --git a/plugins/web-ui/src/tooltip.ts b/plugins/web-ui/src/tooltip.tsindex bdbc57a8b..ea8681b8f 100644--- a/plugins/web-ui/src/tooltip.ts+++ b/plugins/web-ui/src/tooltip.ts@@ -9,6 +9,7 @@ function ensureEl(): HTMLDivElement {tipEl = document.createElement("div");tipEl.className = "qm-tooltip";tipEl.setAttribute("role", "tooltip");+ tipEl.setAttribute("popover", "manual");document.body.appendChild(tipEl);}return tipEl;@@ -27,10 +28,12 @@ function showTooltip(target: Element, text: string): void {el.textContent = text;el.classList.toggle("beside", !!target.closest('[data-tip-placement="right"]'));el.classList.add("visible");+ el.showPopover?.();}export function hideTooltip(target?: Element): void {if (target && anchor && target !== anchor) return;+ tipEl?.hidePopover?.();tipEl?.classList.remove("visible");anchor?.removeAttribute("data-qm-tooltip-anchor");anchor = null;diff --git a/plugins/web-ui/src/ui.ts b/plugins/web-ui/src/ui.tsindex 218378ff5..992560f37 100644--- a/plugins/web-ui/src/ui.ts+++ b/plugins/web-ui/src/ui.ts@@ -75,6 +75,95 @@ export function slackMark(size = 14): TemplateResult {</svg>`;}+const CLAUDE_MARK =+ "M20.998 10.949H24v3.102h-3v3.028h-1.487V20H18v-2.921h-1.487V20H15v-2.921H9V20H7.488v-2.921H6V20H4.487v-2.921H3V14.05H0V10.95h3V5h17.998v5.949zM6 10.949h1.488V8.102H6v2.847zm10.51 0H18V8.102h-1.49v2.847z";++const CODEX_FRAME =+ "M19.503 0H4.496A4.496 4.496 0 000 4.496v15.007A4.496 4.496 0 004.496 24h15.007A4.496 4.496 0 0024 19.503V4.496A4.496 4.496 0 0019.503 0z";++const CODEX_MARK =+ "M9.064 3.344a4.578 4.578 0 012.285-.312c1 .115 1.891.54 2.673 1.275.01.01.024.017.037.021a.09.09 0 00.043 0 4.55 4.55 0 013.046.275l.047.022.116.057a4.581 4.581 0 012.188 2.399c.209.51.313 1.041.315 1.595a4.24 4.24 0 01-.134 1.223.123.123 0 00.03.115c.594.607.988 1.33 1.183 2.17.289 1.425-.007 2.71-.887 3.854l-.136.166a4.548 4.548 0 01-2.201 1.388.123.123 0 00-.081.076c-.191.551-.383 1.023-.74 1.494-.9 1.187-2.222 1.846-3.711 1.838-1.187-.006-2.239-.44-3.157-1.302a.107.107 0 00-.105-.024c-.388.125-.78.143-1.204.138a4.441 4.441 0 01-1.945-.466 4.544 4.544 0 01-1.61-1.335c-.152-.202-.303-.392-.414-.617a5.81 5.81 0 01-.37-.961 4.582 4.582 0 01-.014-2.298.124.124 0 00.006-.056.085.085 0 00-.027-.048 4.467 4.467 0 01-1.034-1.651 3.896 3.896 0 01-.251-1.192 5.189 5.189 0 01.141-1.6c.337-1.112.982-1.985 1.933-2.618.212-.141.413-.251.601-.33.215-.089.43-.164.646-.227a.098.098 0 00.065-.066 4.51 4.51 0 01.829-1.615 4.535 4.535 0 011.837-1.388zm3.482 10.565a.637.637 0 000 1.272h3.636a.637.637 0 100-1.272h-3.636zM8.462 9.23a.637.637 0 00-1.106.631l1.272 2.224-1.266 2.136a.636.636 0 101.095.649l1.454-2.455a.636.636 0 00.005-.64L8.462 9.23z";++const PI_GLYPH = "M165.29 165.29H517.36V400H400V517.36H282.65V634.72H165.29ZM282.65 282.65V400H400V282.65Z";++const PI_DOT = "M517.36 400H634.72V634.72H517.36Z";++const OPENCODE_FRAME = "M180 60H60V240H180V60ZM240 300H0V0H240V300Z";++const OPENCODE_SCREEN = "M180 240H60V120H180V240Z";++const MARK_KEYS: Record<string, "claude" | "codex" | "pi" | "opencode"> = {+ anthropic: "claude",+ opencode: "opencode",+ pi: "pi",+ claude: "claude",+ openai: "codex",+ codex: "codex",+};++export function modelMark(key: string, size = 16): TemplateResult | null {+ const mark = MARK_KEYS[key.toLocaleLowerCase()];+ if (!mark) return null;+ if (mark === "opencode")+ return html`<svg+ class="model-mark"+ width=${size}+ height=${size}+ viewBox="-30 0 300 300"+ role="img"+ aria-label="OpenCode"+ focusable="false"+ >+ <path fill="currentColor" opacity="0.45" d=${OPENCODE_SCREEN} />+ <path fill="currentColor" d=${OPENCODE_FRAME} />+ </svg>`;+ if (mark === "pi")+ return html`<svg+ class="model-mark"+ width=${size}+ height=${size}+ viewBox="0 0 800 800"+ role="img"+ aria-label="Pi"+ focusable="false"+ >+ <rect width="800" height="800" rx="170" fill="#5b74e8" />+ <path fill="#fff" fill-rule="evenodd" d=${PI_GLYPH} />+ <path fill="#fff" d=${PI_DOT} />+ </svg>`;+ if (mark === "claude")+ return html`<svg+ class="model-mark"+ width=${size}+ height=${size}+ viewBox="0 0 24 24"+ role="img"+ aria-label="Claude"+ focusable="false"+ >+ <path clip-rule="evenodd" fill-rule="evenodd" fill="#d97757" d=${CLAUDE_MARK} />+ </svg>`;+ return html`<svg+ class="model-mark"+ width=${size}+ height=${size}+ viewBox="0 0 24 24"+ role="img"+ aria-label="Codex"+ focusable="false"+ >+ <defs>+ <linearGradient id="model-mark-codex" gradientUnits="userSpaceOnUse" x1="12" x2="12" y1="3" y2="21">+ <stop stop-color="#b1a7ff" />+ <stop offset=".5" stop-color="#7a9dff" />+ <stop offset="1" stop-color="#3941ff" />+ </linearGradient>+ </defs>+ <path fill="var(--background, #fff)" d=${CODEX_FRAME} />+ <path fill="url(#model-mark-codex)" d=${CODEX_MARK} />+ </svg>`;+}+export function icon(node: IconNode, size = 18): SVGElement {const el = createElement(node, {class: "icon",diff --git a/plugins/web-ui/test/composer-fast-mode.test.ts b/plugins/web-ui/test/composer-fast-mode.test.tsindex 7edd79d91..aa9560292 100644--- a/plugins/web-ui/test/composer-fast-mode.test.ts+++ b/plugins/web-ui/test/composer-fast-mode.test.ts@@ -4,27 +4,28 @@ import test from "node:test";const composer = readFileSync(new URL("../src/composer.ts", import.meta.url), "utf8");const css = readFileSync(new URL("../src/shell.css", import.meta.url), "utf8");-const settings = composer.slice(- composer.indexOf("function settingsControl("),- composer.indexOf("function menuControl("),+const fast = composer.slice(+ composer.indexOf('class="loadout-setting"'),+ composer.indexOf('<div class="loadout-foot">'),);-const fast = settings.slice(settings.indexOf("fastAvailable\n"));-test("compact Fast mode uses a stateful icon-and-label chip without a trailing checkmark", () => {- assert.match(fast, /class="settings-chip settings-fast-toggle \$\{fastOn \? "active" : ""\}"/);+test("Fast is a stateful toggle row without a trailing checkmark", () => {+ assert.match(fast, /class="loadout-setting"/);assert.match(fast, /role="menuitemcheckbox"/);assert.match(fast, /aria-checked=\$\{fastOn \? "true" : "false"\}/);assert.match(fast, /@click=\$\{\(\) => toggleFastMode\(agent\)\}/);- assert.match(fast, /icon\(Zap, 15\)/);- assert.match(fast, /<span>Fast mode<\/span>/);- assert.doesNotMatch(fast, /icon\(Check/);- assert.doesNotMatch(fast, /menu-option-copy|menu-option-label/);+ assert.match(fast, /class="loadout-toggle \$\{fastOn \? "on" : ""\}"/);+ assert.doesNotMatch(fast.slice(0, fast.indexOf("</button>")), /icon\(Check/);});-test("the Fast mode icon and label stay aligned and the active icon is filled", () => {- const toggle = css.match(/\.settings-fast-toggle \{[^}]*\}/)?.[0] ?? "";- assert.match(toggle, /display: inline-flex;/);- assert.match(toggle, /align-items: center;/);- assert.match(toggle, /white-space: nowrap;/);- assert.match(css, /\.settings-fast-toggle\.active \.icon \{\s*fill: currentColor;\s*\}/);+test("the Fast toggle names itself and hides its decorative track", () => {+ assert.match(fast, /aria-label="Fast"/);+ assert.match(fast, /aria-hidden="true"/);+ assert.match(fast, /fastAvailable \? "⌘⇧E" : fastUnsupportedReason/);+});++test("the toggle track and knob carry their own state styling", () => {+ assert.match(css, /\.loadout-toggle \{[^}]*\}/);+ assert.match(css, /\.loadout-toggle\.on \{[^}]*\}/);+ assert.match(css, /\.loadout-knob \{[^}]*\}/);});diff --git a/plugins/web-ui/test/composer-loadout.test.ts b/plugins/web-ui/test/composer-loadout.test.tsnew file mode 100644index 000000000..1728e9683--- /dev/null+++ b/plugins/web-ui/test/composer-loadout.test.ts@@ -0,0 +1,227 @@+import assert from "node:assert/strict";+import test from "node:test";+import {+ compatibleHarnessOptions,+ effortLevelsForHarness,+ loadoutModelId,+ modelLoadoutOptions,+ parseLoadout,+ reconcileLoadout,+ reorderLoadout,+ upsertLoadout,+ type LoadoutEntry,+} from "../src/composer-loadout.ts";+import type { ModelOption } from "../src/model-options.ts";++function entry(value: string, effort: LoadoutEntry["effort"] = "auto", fast = false): LoadoutEntry {+ return { value, effort, fast };+}++function option(value: string): ModelOption {+ const separator = value.indexOf(":");+ const harnessId = separator < 0 ? "pi" : value.slice(0, separator);+ const id = loadoutModelId(value);+ return {+ value,+ harnessId,+ harnessLabel: harnessId,+ label: id,+ buttonLabel: id,+ groupLabel: "Models",+ model: {+ id,+ name: id,+ provider: "anthropic",+ api: "anthropic-messages",+ baseUrl: "",+ reasoning: true,+ input: ["text"],+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },+ contextWindow: 100_000,+ maxTokens: 4096,+ },+ };+}++test("invalid persistence cannot create a loadout or invent an effort level", () => {+ for (const raw of [null, "", "{", "null", "true", '"model"', "{}"]) assert.deepEqual(parseLoadout(raw), []);+ assert.deepEqual(+ parseLoadout(+ JSON.stringify([+ null,+ 8,+ [],+ { value: 7, effort: "high" },+ { value: " ", effort: "auto" },+ { value: "pi:bad", effort: "extreme", fast: true },+ { value: "pi:missing" },+ { value: "pi:valid", effort: "low", fast: "true" },+ { value: "codex:other", effort: "xhigh", fast: true },+ ]),+ ),+ [entry("pi:valid", "low"), entry("codex:other", "xhigh", true)],+ );+});++test("persistence keeps the first valid model settings and four unique models in order", () => {+ const saved = [+ entry("pi:first", "high", true),+ entry("pi:second", "medium"),+ entry("pi:first", "low"),+ ...["third", "fourth", "fifth", "sixth"].map((id) => entry(`pi:${id}`)),+ ];+ assert.deepEqual(parseLoadout(JSON.stringify(saved)), [saved[0], saved[1], saved[3], saved[4]]);+});++test("legacy harness pairs merge into one model preference while preserving the first settings", () => {+ const first = entry("claude:one", "high", true);+ const legacy = entry("two", "low");+ assert.deepEqual(parseLoadout(JSON.stringify([first, entry("pi:one", "max"), legacy, entry("codex:two", "xhigh")])), [+ first,+ legacy,+ ]);+ assert.deepEqual(parseLoadout(JSON.stringify([legacy, entry("pi:two"), first])), [legacy, first]);+});++test("model identity preserves colon-containing model ids and unqualified legacy values", () => {+ assert.equal(loadoutModelId("pi:provider/model:free"), "provider/model:free");+ assert.equal(loadoutModelId("claude:one"), "one");+ assert.equal(loadoutModelId("legacy"), "legacy");+ const free = entry("pi:provider/model:free", "high");+ const paid = entry("pi:provider/model:paid", "low");+ assert.deepEqual(parseLoadout(JSON.stringify([free, entry("opencode:provider/model:free"), paid])), [free, paid]);+});++test("reconciliation removes unavailable models and keeps a valid active model's position and current tweaks", () => {+ const saved = [entry("pi:gone"), entry("codex:one", "high"), entry("pi:two", "low", true)];+ const snapshot = structuredClone(saved);+ const active = entry("codex:one", "xhigh", true);+ assert.deepEqual(reconcileLoadout(saved, [option("pi:two"), option("codex:one")], active), [active, saved[2]]);+ assert.deepEqual(saved, snapshot);+});++test("reconciliation never restores an unavailable active model", () => {+ const saved = [entry("pi:gone", "max", true), entry("codex:one", "medium")];+ assert.deepEqual(reconcileLoadout(saved, [option("codex:one")], saved[0]!), [saved[1]]);+ assert.deepEqual(reconcileLoadout(saved, [], saved[0]!), []);+});++test("an unavailable saved harness falls back to another harness for the same model in the same slot", () => {+ const saved = [entry("claude:one", "high", true), entry("pi:two", "low"), entry("codex:gone")];+ const snapshot = structuredClone(saved);+ const options = [option("opencode:two"), option("pi:one"), option("claude:two")];+ assert.deepEqual(reconcileLoadout(saved, options, entry("codex:gone")), [+ entry("pi:one", "high", true),+ entry("opencode:two", "low"),+ ]);+ assert.deepEqual(saved, snapshot);+});++test("reconciliation qualifies legacy values and replaces duplicate harness pairs with the active preference", () => {+ const saved = [entry("one", "high", true), entry("pi:two", "low"), entry("claude:one", "max")];+ const active = entry("claude:one", "medium");+ const options = [option("pi:one"), option("claude:one"), option("pi:two")];+ assert.deepEqual(reconcileLoadout(saved, options, entry("pi:missing")), [entry("pi:one", "high", true), saved[1]]);+ assert.deepEqual(reconcileLoadout(saved, options, active), [active, saved[1]]);+});++test("a new active model remains selectable even when four saved models fill the loadout", () => {+ const saved = ["one", "two", "three", "four"].map((id) => entry(`pi:${id}`));+ const active = entry("codex:five", "xhigh", true);+ const options = [...saved, active].map(({ value }) => option(value));+ assert.deepEqual(reconcileLoadout(saved, options, active), [...saved.slice(0, 3), active]);+ assert.deepEqual(reconcileLoadout([], options, active), [active]);+});++test("editing a setup preserves order and other models' independent effort and fast settings", () => {+ const first = entry("pi:first", "low", true);+ const second = entry("codex:second", "high");+ const saved = [first, second];+ const updated = entry(second.value, "xhigh", true);+ const next = upsertLoadout(saved, updated);+ assert.deepEqual(next, [first, updated]);+ assert.deepEqual(saved, [first, second]);+ assert.deepEqual(parseLoadout(JSON.stringify(next)), next);+});++test("adding at capacity preserves the newly selected model and never duplicates an existing setup", () => {+ const saved = ["one", "two", "three", "four"].map((id) => entry(`pi:${id}`));+ const active = entry("codex:five", "xhigh", true);+ assert.deepEqual(upsertLoadout(saved, active), [...saved.slice(0, 3), active]);+ assert.deepEqual(upsertLoadout([...saved, active], active), [...saved.slice(0, 3), active]);+ const updated = entry(saved[1]!.value, "max", true);+ assert.deepEqual(upsertLoadout(saved, updated), [saved[0], updated, ...saved.slice(2)]);+ assert.deepEqual(upsertLoadout([saved[0]!, saved[0]!], updated), [saved[0], updated]);+});++test("changing a model's harness updates its existing slot even at capacity", () => {+ const saved = ["one", "two", "three", "four"].map((id) => entry(`pi:${id}`));+ const snapshot = structuredClone(saved);+ const changed = entry("claude:two", "high", true);+ assert.deepEqual(upsertLoadout(saved, changed), [saved[0], changed, ...saved.slice(2)]);+ assert.deepEqual(upsertLoadout([entry("two"), entry("pi:one"), entry("pi:two")], changed), [+ changed,+ entry("pi:one"),+ ]);+ assert.deepEqual(saved, snapshot);+});++test("compatible harness choices never substitute another model and deduplicate a harness", () => {+ const options = [option("pi:one"), option("codex:two"), option("claude:one"), option("pi:one")];+ assert.deepEqual(compatibleHarnessOptions(options, "one"), [options[0], options[2]]);+ assert.deepEqual(compatibleHarnessOptions(options, "two"), [options[1]]);+ assert.deepEqual(compatibleHarnessOptions(options, "missing"), []);+});++test("the model catalog has one row per model and remembers each model's saved harness", () => {+ const options = [+ option("pi:one"),+ option("pi:two"),+ option("claude:one"),+ option("codex:two"),+ option("codex:three"),+ option("codex:two"),+ ];+ const saved = [entry("claude:one"), entry("pi:one"), entry("pi:two")];+ assert.deepEqual(modelLoadoutOptions(options, saved, "codex"), [options[2], options[1], options[4]]);+ assert.deepEqual(modelLoadoutOptions(options, [], "codex"), [options[0], options[3], options[4]]);+ assert.deepEqual(modelLoadoutOptions(options, []), [options[0], options[1], options[4]]);+});++test("the model catalog falls back from unavailable saved harnesses using only compatible options", () => {+ const options = [option("pi:one"), option("pi:two"), option("claude:one")];+ const saved = [entry("opencode:one"), entry("codex:two"), entry("pi:gone")];+ assert.deepEqual(modelLoadoutOptions(options, saved, "claude"), [options[2], options[1]]);+ assert.deepEqual(modelLoadoutOptions(options, saved, "unavailable"), [options[0], options[1]]);+ assert.deepEqual(modelLoadoutOptions([], saved, "claude"), []);+});++test("drag ordering moves a setup into the target position without separating its settings", () => {+ const saved = [entry("pi:first", "max", true), entry("codex:second", "xhigh"), entry("pi:third", "low")];+ const snapshot = structuredClone(saved);+ assert.deepEqual(reorderLoadout(saved, "pi:first", "pi:third"), [saved[1], saved[2], saved[0]]);+ assert.deepEqual(reorderLoadout(saved, "pi:third", "pi:first"), [saved[2], saved[0], saved[1]]);+ assert.deepEqual(reorderLoadout(saved, "pi:first", "pi:first"), saved);+ assert.deepEqual(reorderLoadout(saved, "missing", "pi:first"), saved);+ assert.deepEqual(reorderLoadout(saved, "pi:first", "missing"), saved);+ assert.deepEqual(saved, snapshot);+});++test("harness effort choices exclude unsupported settings and label extra high clearly", () => {+ assert.deepEqual(+ effortLevelsForHarness("pi").map(({ value }) => value),+ ["auto", "low", "medium", "high", "xhigh", "max", "ultracode"],+ );+ assert.deepEqual(+ effortLevelsForHarness("claude").map(({ value }) => value),+ ["auto", "low", "medium", "high", "xhigh", "max"],+ );+ assert.deepEqual(+ effortLevelsForHarness("codex").map(({ value }) => value),+ ["auto", "low", "medium", "high", "xhigh"],+ );+ for (const harnessId of ["pi", "claude", "codex"])+ assert.equal(effortLevelsForHarness(harnessId).find(({ value }) => value === "xhigh")?.label, "Extra high");+ for (const harnessId of ["opencode", "mock", "unknown"])+ assert.deepEqual(effortLevelsForHarness(harnessId), [{ value: "auto", label: "Auto" }]);+});diff --git a/plugins/web-ui/test/composer-picker.test.ts b/plugins/web-ui/test/composer-picker.test.tsnew file mode 100644index 000000000..c6f271ce6--- /dev/null+++ b/plugins/web-ui/test/composer-picker.test.ts@@ -0,0 +1,479 @@+import assert from "node:assert/strict";+import test from "node:test";+import type { Agent } from "@earendil-works/pi-agent-core";+import { JSDOM } from "jsdom";+import { createServer } from "vite";+import type { ComposerSurface, ConvCtx } from "../src/conv-types.ts";+import type { RuntimeConfig } from "../src/core-bridge.ts";+import type { ModelMetadata } from "../src/pi-models.ts";+import type { LoadoutEntry } from "../src/composer-loadout.ts";++function model(id: string, label: string, provider = "anthropic"): ModelMetadata {+ return {+ id,+ name: label,+ label,+ buttonLabel: label,+ provider,+ api: provider === "openai" ? "openai-responses" : "anthropic-messages",+ reasoning: true,+ input: ["text"],+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },+ contextWindow: 100_000,+ maxTokens: 4096,+ fastMode: true,+ };+}++test("the model picker remembers compatible harnesses without duplicating or changing models", async () => {+ const dom = new JSDOM('<!doctype html><div id="app"></div><div id="composer"></div>', {+ url: "http://localhost/web-ui/",+ pretendToBeVisual: true,+ });+ Object.defineProperty(dom.window, "matchMedia", {+ value: () => ({ matches: false, addEventListener() {}, removeEventListener() {} }),+ });+ Object.defineProperty(dom.window.HTMLElement.prototype, "offsetParent", {+ configurable: true,+ get() {+ return this.hidden ? null : dom.window.document.body;+ },+ });+ dom.window.HTMLDialogElement.prototype.showModal = function () {+ this.setAttribute("open", "");+ };+ dom.window.HTMLDialogElement.prototype.close = function () {+ this.removeAttribute("open");+ this.dispatchEvent(new dom.window.Event("close"));+ };+ const updates: Record<string, unknown>[] = [];+ let failNextGet = true;+ let failNextPut = false;+ let deferNextPut = false;+ let pendingPut: Promise<void> | undefined;+ const extraComposers: ComposerSurface[] = [];+ const globals = {+ window: dom.window,+ document: dom.window.document,+ location: dom.window.location,+ history: dom.window.history,+ localStorage: dom.window.localStorage,+ navigator: dom.window.navigator,+ HTMLElement: dom.window.HTMLElement,+ HTMLInputElement: dom.window.HTMLInputElement,+ HTMLTextAreaElement: dom.window.HTMLTextAreaElement,+ Element: dom.window.Element,+ Node: dom.window.Node,+ Event: dom.window.Event,+ MouseEvent: dom.window.MouseEvent,+ KeyboardEvent: dom.window.KeyboardEvent,+ customElements: dom.window.customElements,+ getComputedStyle: dom.window.getComputedStyle.bind(dom.window),+ requestAnimationFrame: dom.window.requestAnimationFrame.bind(dom.window),+ cancelAnimationFrame: dom.window.cancelAnimationFrame.bind(dom.window),+ ResizeObserver: class {+ observe() {}+ unobserve() {}+ disconnect() {}+ },+ fetch: async (input: RequestInfo | URL, init?: RequestInit) => {+ if (String(input).startsWith("/api/runtime-config") && init?.method !== "PUT") {+ if (failNextGet) {+ failNextGet = false;+ return Response.json({ error: "initial load failed" }, { status: 500 });+ }+ return Response.json(config);+ }+ if (String(input) !== "/api/runtime-config" || init?.method !== "PUT")+ throw new Error(`Unexpected request: ${String(input)}`);+ if (failNextPut) {+ failNextPut = false;+ return Response.json({ error: "default save failed" }, { status: 500 });+ }+ const change = JSON.parse(String(init.body));+ updates.push(change);+ if (deferNextPut) {+ deferNextPut = false;+ await pendingPut;+ }+ const effective = {+ harnessId: change.harnessId,+ modelId: change.modelId,+ effortLevel: change.effortLevel,+ fastMode: change.fastMode,+ };+ return new Response(JSON.stringify({ ...config, effective, scopeOverride: { ...effective, orgRevision: 1 } }), {+ headers: { "content-type": "application/json" },+ });+ },+ };+ const descriptors = new Map<string, PropertyDescriptor | undefined>();+ for (const [key, value] of Object.entries(globals)) {+ descriptors.set(key, Object.getOwnPropertyDescriptor(globalThis, key));+ Object.defineProperty(globalThis, key, { configurable: true, writable: true, value });+ }+ const config: RuntimeConfig = {+ scopeId: "personal:tester",+ approvedHarnesses: ["pi", "claude", "opencode", "codex"],+ modelsByHarness: {+ pi: ["alpha", "gamma", "delta", "epsilon"],+ claude: ["alpha", "delta"],+ opencode: ["alpha"],+ codex: ["beta"],+ },+ modelCatalog: {+ alpha: model("alpha", "Alpha"),+ beta: model("beta", "Beta", "openai"),+ gamma: model("gamma", "Gamma"),+ delta: model("delta", "Delta"),+ epsilon: model("epsilon", "Epsilon"),+ },+ orgDefault: { harnessId: "claude", modelId: "alpha", revision: 1 },+ effective: { harnessId: "claude", modelId: "alpha" },+ scopeOverride: null,+ upgradeAvailable: false,+ fastModeModelIds: ["alpha", "beta"],+ };+ localStorage.setItem(+ "web-ui:loadout",+ JSON.stringify([+ { value: "codex:beta", effort: "xhigh", fast: false },+ { value: "claude:alpha", effort: "high", fast: true },+ { value: "pi:alpha", effort: "low", fast: false },+ { value: "pi:gamma", effort: "medium", fast: false },+ ]),+ );+ const vite = await createServer({ server: { middlewareMode: true, hmr: false }, appType: "custom" });+ let composer: ComposerSurface | undefined;+ let siblingComposer: ComposerSurface | undefined;+ try {+ const { appState } = await vite.ssrLoadModule("/src/shell-state.ts");+ const { createComposerSurface } = await vite.ssrLoadModule("/src/composer.ts");+ const { render } = await vite.ssrLoadModule("lit");+ appState.me = { user: "tester", org: "test" };+ const host = document.querySelector<HTMLElement>("#composer")!;+ const agent = { state: { isStreaming: false, messages: [] } } as unknown as Agent;+ const draw = (): void => render(composer!.composerForm(agent), host);+ const ctx = {+ pane: false,+ chat: {+ state: {+ agent,+ host,+ threadRef: "web:tester:picker-test",+ sessionId: null,+ scopeId: null,+ resolvingApprovals: new Set<string>(),+ },+ activePendingApprovals: () => [],+ hasUnresolvedApproval: () => false,+ hasLiveRun: () => false,+ drawActiveChat: draw,+ },+ } as unknown as ConvCtx;+ const mount = async (): Promise<void> => {+ composer?.dispose();+ composer = createComposerSurface(ctx);+ ctx.composer = composer!;+ await composer!.refreshRuntimeSelection(null, agent);+ };+ const tick = async (): Promise<void> => {+ await new Promise<void>((resolve) => dom.window.requestAnimationFrame(() => resolve()));+ };+ const button = (selector: string): HTMLButtonElement => {+ const target = host.querySelector<HTMLButtonElement>(selector);+ assert.ok(target, `button exists: ${selector}`);+ return target;+ };+ const pick = (label: string): HTMLButtonElement => {+ const target = [...host.querySelectorAll<HTMLButtonElement>(".loadout-pick")].find(+ (row) => row.querySelector(".loadout-name")?.textContent === label,+ );+ assert.ok(target, `saved model exists: ${label}`);+ return target;+ };+ const saved = (): LoadoutEntry[] => JSON.parse(localStorage.getItem("web-ui:loadout") ?? "[]");+ const names = (): Array<string | null> =>+ [...host.querySelectorAll(".loadout-pick .loadout-name")].map((row) => row.textContent);++ await mount();+ assert.match(composer!.state.error, /Could not load runtime settings/);+ await composer!.refreshRuntimeSelection(null, agent);+ assert.equal(composer!.state.effortLevel, "high", "retry restores saved preset effort");+ assert.equal(composer!.state.fastMode, true, "retry restores saved preset Fast");+ await composer!.refreshRuntimeSelection(null, agent, true);+ assert.equal(composer!.state.effortLevel, "high", "identical refresh preserves restored effort");+ assert.equal(composer!.state.fastMode, true, "identical refresh preserves restored Fast");+ const siblingHost = document.createElement("section");+ document.body.append(siblingHost);+ const siblingAgent = { state: { isStreaming: false, messages: [] } } as unknown as Agent;+ const siblingCtx = {+ ...ctx,+ chat: {+ ...ctx.chat,+ state: { ...ctx.chat.state, host: siblingHost, agent: siblingAgent, threadRef: "web:tester:sibling" },+ drawActiveChat: () => render(siblingComposer!.composerForm(siblingAgent), siblingHost),+ },+ } as unknown as ConvCtx;+ siblingComposer = createComposerSurface(siblingCtx);+ await siblingComposer!.refreshRuntimeSelection(null, siblingAgent);+ siblingHost.querySelector<HTMLButtonElement>(".loadout-button")!.click();+ failNextPut = true;+ siblingHost.querySelector<HTMLButtonElement>('[aria-label="Make Beta default"]')!.click();+ await tick();+ assert.match(siblingComposer!.state.error, /default save failed/);+ assert.equal(siblingComposer!.currentModelOption()?.value, "claude:alpha");+ assert.equal(siblingComposer!.state.effortLevel, "high");+ assert.equal(siblingComposer!.state.fastMode, true);+ assert.equal(+ JSON.parse(localStorage.getItem("web-ui:model-picks") ?? "[]").some(+ ([ref]: [string, string]) => ref === "web:tester:sibling",+ ),+ false,+ );+ assert.equal(host.querySelector('.composer-toolbar [aria-label="Harness"]'), null);+ assert.equal(host.querySelector(".composer-toolbar .harness-control"), null);+ assert.equal(host.querySelectorAll('.composer-toolbar [aria-haspopup="menu"]').length, 1);+ button(".loadout-button").click();+ await tick();+ assert.deepEqual(names(), ["Beta", "Alpha", "Gamma"]);+ assert.equal(pick("Alpha").querySelector(".loadout-harness")?.textContent, "Claude Code");+ assert.equal(host.querySelectorAll(".loadout-default").length, 1);+ assert.equal(pick("Alpha").querySelector(".loadout-default")?.textContent, "my default");+ pick("Beta").click();+ assert.equal(pick("Beta").getAttribute("aria-checked"), "true");+ assert.equal(pick("Beta").querySelector(".loadout-default"), null);+ assert.equal(pick("Alpha").querySelector(".loadout-default")?.textContent, "my default");+ pick("Alpha").click();++ button('[data-loadout-section="harness"]').click();+ await tick();+ const choices = [...host.querySelectorAll<HTMLButtonElement>('.loadout-submenu [role="menuitemradio"]')];+ assert.deepEqual(+ choices.map((choice) => choice.textContent?.trim()),+ ["Pi", "Claude Code", "OpenCode"],+ );+ assert.equal(choices[1]!.getAttribute("aria-checked"), "true");+ assert.equal(document.activeElement, choices[1]);+ choices[0]!.click();+ await tick();+ assert.equal(composer!.currentModelOption()?.value, "pi:alpha");+ assert.equal(pick("Alpha").querySelector(".loadout-default"), null);+ assert.equal(agent.state.model.id, "alpha");+ assert.equal(host.querySelector(".loadout-submenu"), null);+ assert.equal(document.activeElement, button('[data-loadout-section="harness"]'));+ assert.deepEqual(names(), ["Beta", "Alpha", "Gamma"]);+ assert.deepEqual(saved(), [+ { value: "codex:beta", effort: "xhigh", fast: false },+ { value: "pi:alpha", effort: "high", fast: true },+ { value: "pi:gamma", effort: "medium", fast: false },+ ]);++ button('[data-loadout-section="add"]').click();+ await tick();+ const catalog = [...host.querySelectorAll(".loadout-submenu .menu-option")];+ assert.equal(catalog.length, 2);+ assert.match(catalog[0]!.textContent ?? "", /Delta/);+ button(".loadout-back").click();++ pick("Beta").click();+ assert.equal(composer!.currentModelOption()?.value, "codex:beta");+ assert.equal(host.querySelector('[data-loadout-section="harness"]'), null);+ assert.match(host.querySelector(".loadout-setting-static")?.textContent ?? "", /Run with\s*Codex/);+ assert.equal(host.querySelector(".loadout-setting-static button"), null);+ pick("Alpha").click();+ assert.equal(composer!.currentModelOption()?.value, "pi:alpha");+ assert.equal(composer!.state.effortLevel, "high");+ assert.equal(composer!.state.fastMode, true);+ assert.equal(pick("Alpha").querySelector(".loadout-harness")?.textContent, "Pi");++ await mount();+ assert.equal(composer!.currentModelOption()?.value, "pi:alpha");+ assert.equal(composer!.state.effortLevel, "high");+ assert.equal(composer!.state.fastMode, true);+ button(".loadout-button").click();+ assert.deepEqual(names(), ["Beta", "Alpha", "Gamma"]);+ assert.equal(pick("Alpha").querySelector(".loadout-harness")?.textContent, "Pi");+ await tick();++ ctx.chat.state.threadRef = "web:tester:picker-new-thread";+ await mount();+ assert.equal(composer!.currentModelOption()?.value, "pi:alpha");+ assert.equal(agent.state.model.id, "alpha");+ assert.equal(composer!.state.effortLevel, "high");+ assert.equal(composer!.state.fastMode, true);+ button(".loadout-button").click();+ assert.deepEqual(names(), ["Beta", "Alpha", "Gamma"]);+ assert.equal(pick("Alpha").querySelector(".loadout-harness")?.textContent, "Pi");++ button('[data-loadout-section="harness"]').click();+ const openCode = [...host.querySelectorAll<HTMLButtonElement>('.loadout-submenu [role="menuitemradio"]')].find(+ (choice) => choice.textContent?.trim() === "OpenCode",+ );+ assert.ok(openCode);+ openCode.click();+ assert.equal(composer!.currentModelOption()?.value, "opencode:alpha");+ assert.equal(agent.state.model.id, "alpha");+ assert.equal(composer!.state.effortLevel, "auto");+ assert.equal(composer!.state.fastMode, false);+ assert.deepEqual(saved()[1], { value: "opencode:alpha", effort: "auto", fast: false });+ assert.equal(host.querySelector('[data-loadout-section="effort"]'), null);+ const unavailableFast = button('[aria-label="Fast"][role="menuitemcheckbox"]');+ assert.equal(unavailableFast.disabled, true);+ assert.equal(unavailableFast.querySelector(".loadout-shortcut")?.textContent, "Not supported by this harness");+ assert.equal(unavailableFast.getAttribute("aria-checked"), "false");+ unavailableFast.click();+ assert.equal(composer!.state.fastMode, false);++ button('[data-loadout-section="harness"]').click();+ const pi = [...host.querySelectorAll<HTMLButtonElement>('.loadout-submenu [role="menuitemradio"]')].find(+ (choice) => choice.textContent?.trim() === "Pi",+ );+ assert.ok(pi);+ pi.click();+ assert.equal(composer!.currentModelOption()?.value, "pi:alpha");+ assert.equal(composer!.state.effortLevel, "auto");+ assert.equal(composer!.state.fastMode, false);+ assert.deepEqual(names(), ["Beta", "Alpha", "Gamma"]);+ assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').disabled, false);+ pick("Gamma").click();+ assert.equal(+ button('[aria-label="Fast"][role="menuitemcheckbox"]').querySelector(".loadout-shortcut")?.textContent,+ "Not supported by this model",+ );+ assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').disabled, true);+ assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').getAttribute("aria-checked"), "false");+ pick("Alpha").click();+ assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').disabled, false);+ await tick();++ button('[data-loadout-section="harness"]').click();+ await tick();+ assert.ok(host.querySelector(".loadout-submenu"));+ assert.equal(composer!.closeMenus(), true);+ draw();+ assert.equal(host.querySelector(".loadout-popover"), null);+ button(".loadout-button").dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }));+ await tick();+ assert.ok(host.querySelector(".loadout-popover"));+ assert.equal(host.querySelector(".loadout-submenu"), null);+ assert.equal(document.activeElement?.matches(".loadout-pick"), true);+ assert.equal(host.querySelector(".model-settings-trigger"), null);+ assert.equal(document.querySelector(".model-settings-modal"), null);+ pick("Alpha").click();+ const current = {+ value: composer!.currentModelOption()?.value,+ effort: composer!.state.effortLevel,+ fast: composer!.state.fastMode,+ };+ const betaDefault = pick("Beta")+ .closest(".loadout-row")!+ .querySelector<HTMLButtonElement>(".loadout-make-default")!;+ betaDefault.click();+ await tick();+ assert.equal(updates.length, 1);+ assert.deepEqual(updates[0], {+ harnessId: "codex",+ modelId: "beta",+ effortLevel: "xhigh",+ fastMode: false,+ scopeId: config.scopeId,+ });+ assert.deepEqual(+ {+ value: composer!.currentModelOption()?.value,+ effort: composer!.state.effortLevel,+ fast: composer!.state.fastMode,+ },+ current,+ );+ assert.equal(+ siblingComposer!.currentModelOption()?.value,+ "codex:beta",+ "failed save did not pin an untouched sibling",+ );+ assert.equal(siblingComposer!.state.effortLevel, "xhigh", "sibling follows the new default effort");+ assert.equal(siblingComposer!.state.fastMode, false, "sibling follows the new default Fast setting");+ assert.equal(siblingAgent.state.model.id, "beta");+ assert.equal(pick("Beta").querySelector(".loadout-default")?.textContent, "my default");+ assert.equal(pick("Beta").querySelector(".loadout-default svg"), null);+ assert.ok(pick("Beta").closest(".loadout-row")!.querySelector(".loadout-default-star svg"));+ assert.equal(pick("Beta").closest(".loadout-row")!.querySelector(".loadout-make-default"), null);+ assert.equal(pick("Alpha").getAttribute("aria-checked"), "true");+ button('[data-loadout-section="add"]').click();+ await tick();+ button(".loadout-back").hidden = true;+ const search = host.querySelector<HTMLInputElement>(".loadout-search input")!;+ const results = [...host.querySelectorAll<HTMLButtonElement>(".loadout-submenu .menu-option")];+ assert.equal(results.length, 2);+ search.focus();+ search.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowUp", bubbles: true }));+ assert.equal(document.activeElement, results.at(-1));+ search.focus();+ search.dispatchEvent(new KeyboardEvent("keydown", { key: "ArrowDown", bubbles: true }));+ assert.equal(document.activeElement, results[0]);+ search.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));+ await tick();+ assert.equal(document.activeElement, button('[data-loadout-section="add"]'));+ pick("Gamma").click();+ assert.equal(updates.length, 1);+ await tick();+ for (const field of ["effortLevel", "fastMode"] as const) {+ const pendingHost = document.createElement("section");+ document.body.append(pendingHost);+ const pendingAgent = { state: { isStreaming: false, messages: [] } } as unknown as Agent;+ const pendingCtx = {+ ...ctx,+ chat: {+ ...ctx.chat,+ state: {+ ...ctx.chat.state,+ host: pendingHost,+ agent: pendingAgent,+ threadRef: `web:tester:pending-${field}`,+ },+ drawActiveChat: () => render(pendingComposer.composerForm(pendingAgent), pendingHost),+ },+ } as unknown as ConvCtx;+ const pendingComposer = createComposerSurface(pendingCtx) as ComposerSurface;+ extraComposers.push(pendingComposer);+ await pendingComposer.refreshRuntimeSelection(null, pendingAgent);+ const selectedBefore = pendingComposer.currentModelOption()!;+ const effortBefore = pendingComposer.state.effortLevel;+ const fastBefore = pendingComposer.state.fastMode;+ pendingHost.querySelector<HTMLButtonElement>(".loadout-button")!.click();+ const target = [...pendingHost.querySelectorAll<HTMLButtonElement>(".loadout-make-default")].find(+ (button) => button.getAttribute("aria-label") !== `Make ${selectedBefore.label} default`,+ );+ assert.ok(target);+ deferNextPut = true;+ const gate = Promise.withResolvers<void>();+ pendingPut = gate.promise;+ target.click();+ await tick();+ assert.equal(deferNextPut, false, "default save is pending");+ if (field === "effortLevel") pendingComposer.state.effortLevel = "high";+ else pendingComposer.state.fastMode = !fastBefore;+ gate.resolve();+ await tick();+ assert.equal(+ pendingComposer.currentModelOption()?.value,+ selectedBefore.value,+ `${field} edit does not change the selected model during a default save`,+ );+ assert.equal(pendingComposer.state.effortLevel, field === "effortLevel" ? "high" : effortBefore);+ assert.equal(pendingComposer.state.fastMode, field === "fastMode" ? !fastBefore : fastBefore);+ pendingComposer.dispose();+ }+ } finally {+ composer?.dispose();+ siblingComposer?.dispose();+ for (const extra of extraComposers) extra.dispose();+ await vite.close();+ dom.window.close();+ for (const [key, descriptor] of descriptors) {+ if (descriptor) Object.defineProperty(globalThis, key, descriptor);+ else delete (globalThis as Record<string, unknown>)[key];+ }+ }+});diff --git a/plugins/web-ui/test/composer-source.test.ts b/plugins/web-ui/test/composer-source.test.tsindex f35fac603..9432a3625 100644--- a/plugins/web-ui/test/composer-source.test.ts+++ b/plugins/web-ui/test/composer-source.test.ts@@ -4,48 +4,64 @@ import test from "node:test";const composer = readFileSync(new URL("../src/composer.ts", import.meta.url), "utf8");-test("scope-default buttons render when any runtime setting differs from the scope default", () => {- assert.match(composer, /const runtimeToggled =\s*!runtimePending/);- assert.match(composer, /composerState\.effortLevel !== effectiveEffort/);- assert.match(composer, /fastOn !== effectiveFast/);- assert.match(composer, /\$\{\s*runtimeToggled\s*\? html`[\s\S]{0,800}?>\s*Make default\s*<\/button>/);- assert.match(composer, /\$\{\s*runtimeToggled && activeRuntimeConfig\?\.scopeOverride/);+test("preset default actions live on the row while inheritance remains in the footer", () => {+ const row = composer.slice(composer.indexOf("function loadoutRow"), composer.indexOf("function cancelLoadoutClose"));+ const loadout = composer.slice(+ composer.indexOf("function loadoutControl"),+ composer.indexOf("function menuArrowKeys"),+ );+ assert.ok(row.includes('class="loadout-make-default"'));+ assert.ok(row.includes("effortLevel: settings.effort"));+ assert.ok(row.includes("fastMode: settings.fast"));+ assert.ok(!loadout.includes("Make default"));+ assert.ok(loadout.includes("changeScopeRuntime({ inherit: true }, agent)"));});-test("composer-right keeps its control order: make default, use org default, model, harness, send", () => {- const runtime = composer.slice(- composer.indexOf("const runtimeControls ="),- composer.indexOf("return html`", composer.indexOf("const runtimeControls =")),+test("compact and full composers share one left-side picker with Fast inside its menu", () => {+ assert.ok(+ /const runtimeControls = loadoutControl\(agent, selectedModel, inputBlocked\)/.test(composer),+ "compact surfaces must retain the full model and effort picker",+ );+ const leftStart = composer.indexOf('class="composer-left"');+ const rightStart = composer.indexOf('class="composer-right"');+ assert.ok(leftStart >= 0 && rightStart > leftStart);+ assert.ok(composer.slice(leftStart, rightStart).includes("showRuntimeControls ? runtimeControls : nothing"));+ assert.ok(/class="composer-right">\$\{sendControls\(agent\)\}<\/div>/.test(composer));+ const loadout = composer.slice(+ composer.indexOf("function loadoutControl"),+ composer.indexOf("function menuArrowKeys"),+ );+ assert.ok(/role="menuitemcheckbox"\s+aria-label="Fast"/.test(loadout));+ assert.equal((composer.match(/@click=\$\{\(\) => toggleFastMode\(agent\)\}/g) ?? []).length, 1);+});++test("switching setups preserves prior tweaks and validates effort and Fast for the selected model", () => {+ const apply = composer.slice(+ composer.indexOf("function applyLoadout"),+ composer.indexOf("function composerShortcut"),+ );+ const remember = apply.indexOf("rememberActiveTweaks(previous)");+ const select = apply.indexOf("selectModel(entry.value, agent)");+ assert.ok(remember >= 0 && select > remember, "save the prior model's tweaks before switching");+ const normalize = composer.slice(+ composer.indexOf("function normalizeLoadoutEntry"),+ composer.indexOf("function seededLoadout"),+ );+ assert.ok(normalize.includes("effortLevelsForHarness(option.harnessId)"));+ assert.ok(/levels.some\([\s\S]*?\? entry.effort/.test(normalize));+ assert.ok(apply.includes("normalizeLoadoutEntry(entry, option)"));+ assert.ok(+ /entry.fast && harnessSupportsFastMode\(option.harnessId\) && modelSupportsFastMode\(scopeKey\(\), option.model.id\)/.test(+ normalize,+ ),+ "a stored Fast preference cannot enable an unsupported model",);- const rendered = composer.slice(composer.indexOf('class="composer-right"'));- assert.match(rendered, /showRuntimeControls \? runtimeControls : nothing/);- const right = runtime + rendered;- const makeDefault = right.indexOf("Make default");- const orgDefault = right.indexOf("Use org default");- const model = right.indexOf('kind: "model"');- const harness = right.indexOf('kind: "harness"');- const send = right.indexOf("sendControls(agent)");- for (const [name, at] of [- ["Make default", makeDefault],- ["Use org default", orgDefault],- ["model picker", model],- ["harness picker", harness],- ["send controls", send],- ] as const) {- assert.ok(at >= 0, `${name} missing from composer-right`);- }- assert.ok(makeDefault < orgDefault, "Make default should precede Use org default");- assert.ok(orgDefault < model, "Use org default should precede the model picker");- assert.ok(model < harness, "the model picker should precede the harness picker");- assert.ok(harness < send, "the harness picker should precede the send controls");+ assert.ok(apply.includes("saveLoadout(loadout)"));});test("attaching files is allowed while a turn is streaming", () => {- // The attach button and drop/paste paths must not gate on isStreaming —- // only on runtime readiness and pending approvals.assert.match(composer, /const attachingDisabled = inputBlocked;/);assert.doesNotMatch(composer, /attachingDisabled = inputBlocked \|\| agent\.state\.isStreaming/);- // pickFiles, addFiles, and the large-paste path no longer check isStreaming.const guards = composer.match(/isStreaming/g) ?? [];const pickFiles = composer.slice(composer.indexOf("function pickFiles"),@@ -61,15 +77,13 @@ test("attaching files is allowed while a turn is streaming", () => {});test("a mid-turn submit queues — attachments cannot ride a queued message and stay for the next", () => {- // Mid-turn Enter queues through core (queueDraft), so the steer-button attachment note is gone;- // the queue button gates only on draft text, never on the run slot.assert.match(composer, /\$\{tip\("Queue for after this turn"\)\}/);assert.doesNotMatch(composer, /attachments stay for your next message/);});test("scope runtime defaults include effort and fast mode", () => {- assert.match(composer, /effortLevel: composerState\.effortLevel/);- assert.match(composer, /fastMode: fastOn/);+ assert.match(composer, /effortLevel: settings\.effort/);+ assert.match(composer, /fastMode: settings\.fast/);assert.match(composer, /getRuntimeConfig\(scopeKey\(\)\)\?\.effective\.effortLevel/);assert.match(composer, /getRuntimeConfig\(scopeKey\(\)\)\?\.effective\.fastMode === true/);});diff --git a/plugins/web-ui/test/css-vars.test.ts b/plugins/web-ui/test/css-vars.test.tsindex c1774d1ce..ba83a2c4d 100644--- a/plugins/web-ui/test/css-vars.test.ts+++ b/plugins/web-ui/test/css-vars.test.ts@@ -57,7 +57,7 @@ test("every modal scrim dims through --scrim, which each theme points away fromassert.ok(scrims.length >= 5, "the scrim rules should still be findable by name");for (const rule of scrims) {const background = rule.match(/\n\s*background:\s*([^;]+);/)?.[1] ?? "";- if (!background.includes("transparent")) continue;+ if (!background.includes("transparent") || background === "transparent") continue;const name = rule.split("{")[0].trim();assert.doesNotMatch(background,diff --git a/plugins/web-ui/test/effort-confetti.test.ts b/plugins/web-ui/test/effort-confetti.test.tsnew file mode 100644index 000000000..24938349c--- /dev/null+++ b/plugins/web-ui/test/effort-confetti.test.ts@@ -0,0 +1,82 @@+import assert from "node:assert/strict";+import test from "node:test";+import { fileURLToPath } from "node:url";+import { JSDOM } from "jsdom";+import { createServer } from "vite";++test("confetti celebrates only the highest supported effort and respects reduced motion", async () => {+ const vite = await createServer({+ root: fileURLToPath(new URL("..", import.meta.url)),+ configFile: false,+ server: { middlewareMode: true, hmr: false },+ optimizeDeps: { noDiscovery: true },+ appType: "custom",+ });+ const dom = new JSDOM('<button><span class="effort-peak">Extra high</span></button>');+ const previousWindow = Object.getOwnPropertyDescriptor(globalThis, "window");+ const previousDocument = Object.getOwnPropertyDescriptor(globalThis, "document");+ let reducedMotion = false;+ Object.defineProperty(dom.window, "matchMedia", { value: () => ({ matches: reducedMotion }) });+ Object.defineProperty(globalThis, "window", { configurable: true, value: dom.window });+ Object.defineProperty(globalThis, "document", { configurable: true, value: dom.window.document });+ const completions: Array<() => void> = [];+ Object.defineProperty(dom.window.HTMLElement.prototype, "animate", {+ value: () => ({ finished: new Promise<void>((resolve) => completions.push(resolve)) }),+ });+ const button = dom.window.document.querySelector("button")!;+ const label = button.querySelector("span")!;+ label.getBoundingClientRect = () => ({ left: 100, top: 100, width: 60, height: 20 }) as DOMRect;+ try {+ const { burstEffortConfetti } = await vite.ssrLoadModule("/src/effort-confetti.ts");+ let selectedLevel = "xhigh";+ let selectedHarness = "codex";+ button.addEventListener("click", (event) => burstEffortConfetti(event, selectedLevel, selectedHarness));+ const finishBurst = async (): Promise<void> => {+ completions.splice(0).forEach((complete) => complete());+ await new Promise((resolve) => setTimeout(resolve, 0));+ assert.equal(dom.window.document.querySelector(".effort-confetti"), null);+ };+ for (const [harness, top] of [+ ["pi", "ultracode"],+ ["claude", "max"],+ ["codex", "xhigh"],+ ]) {+ selectedHarness = harness;+ for (const level of ["high", "auto", top]) {+ selectedLevel = level;+ button.click();+ assert.equal(dom.window.document.querySelectorAll(".effort-confetti > span").length, level === top ? 14 : 0);+ await finishBurst();+ }+ }+ for (const [harness, level] of [+ ["opencode", "auto"],+ ["codex", "ultracode"],+ ["pi", "max"],+ ]) {+ selectedHarness = harness;+ selectedLevel = level;+ button.click();+ assert.equal(dom.window.document.querySelector(".effort-confetti"), null);+ }+ selectedHarness = "codex";+ selectedLevel = "xhigh";+ reducedMotion = true;+ button.click();+ assert.equal(dom.window.document.querySelector(".effort-confetti"), null);+ reducedMotion = false;+ button.click();+ assert.equal(dom.window.document.querySelectorAll(".effort-confetti > span").length, 14);+ assert.equal(dom.window.document.querySelector(".effort-confetti")?.getAttribute("aria-hidden"), "true");+ button.click();+ assert.equal(completions.length, 14);+ await finishBurst();+ } finally {+ await vite.close();+ dom.window.close();+ if (previousWindow) Object.defineProperty(globalThis, "window", previousWindow);+ else Reflect.deleteProperty(globalThis, "window");+ if (previousDocument) Object.defineProperty(globalThis, "document", previousDocument);+ else Reflect.deleteProperty(globalThis, "document");+ }+});diff --git a/plugins/web-ui/test/effort-peak-contrast.test.ts b/plugins/web-ui/test/effort-peak-contrast.test.tsnew file mode 100644index 000000000..bebc10494--- /dev/null+++ b/plugins/web-ui/test/effort-peak-contrast.test.ts@@ -0,0 +1,67 @@+import assert from "node:assert/strict";+import { readFileSync } from "node:fs";+import test from "node:test";++const css = readFileSync(new URL("../src/shell.css", import.meta.url), "utf8");++const LIGHT_SURFACES = ["#ffffff", "#f5f5f5"];+const DARK_SURFACES = ["#070f18", "#18212c"];+const AA_NORMAL_TEXT = 4.5;++function channel(value: number): number {+ const c = value / 255;+ return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;+}++function luminance(hex: string): number {+ const [r, g, b] = [1, 3, 5].map((i) => channel(Number.parseInt(hex.slice(i, i + 2), 16)));+ return 0.2126 * r! + 0.7152 * g! + 0.0722 * b!;+}++function contrast(a: string, b: string): number {+ const [hi, lo] = [luminance(a), luminance(b)].sort((x, y) => y - x);+ return (hi! + 0.05) / (lo! + 0.05);+}++function rampAfter(marker: string): string[] {+ const rule = css.slice(css.indexOf(marker));+ const spectrum = /linear-gradient\(\s*90deg,([^)]*)\)/.exec(rule);+ assert.ok(spectrum, `no spectrum gradient found after ${marker}`);+ return [...spectrum![1]!.matchAll(/#[0-9a-f]{6}/g)].map((m) => m[0]);+}++test("the Extra high spectrum clears AA on the surfaces it is painted on", () => {+ const light = rampAfter(".effort-peak {");+ const dark = rampAfter(":root.dark .effort-peak,");+ assert.equal(light.length, 9);+ assert.equal(dark.length, 9);+ for (const [ramp, surfaces] of [+ [light, LIGHT_SURFACES],+ [dark, DARK_SURFACES],+ ] as const) {+ for (const stop of ramp) {+ for (const surface of surfaces) {+ assert.ok(+ contrast(stop, surface) >= AA_NORMAL_TEXT,+ `${stop} on ${surface} is ${contrast(stop, surface).toFixed(2)}:1, below ${AA_NORMAL_TEXT}:1`,+ );+ }+ }+ }+});++test("the hover glint darkens light surfaces and lightens dark ones", () => {+ const light = css.slice(css.indexOf(".effort-peak {"), css.indexOf(":root.dark .effort-peak,"));+ const dark = css.slice(css.indexOf(":root.dark .effort-peak,"));+ assert.match(light, /linear-gradient\(105deg,[^)]*rgb\(0 0 0 \/ 0?\.\d+\)/);+ assert.match(dark, /linear-gradient\(105deg,[^)]*rgb\(255 255 255 \/ 0?\.\d+\)/);+});++test("the spectrum never leaves the label invisible when the paint is dropped", () => {+ for (const guard of ["@supports not ((background-clip: text) or (-webkit-background-clip: text))", "@media print"]) {+ const block = css.slice(css.indexOf(guard), css.indexOf("}", css.indexOf("color: inherit;", css.indexOf(guard))));+ assert.match(block, /background-image: none;/, `${guard} must drop the gradient, not just restore the colour`);+ assert.match(block, /color: inherit;/, `${guard} must restore a visible colour`);+ }+ assert.match(css, /\.effort-peak::selection \{\s*color: var\(--foreground\);/);+});diff --git a/plugins/web-ui/test/model-options.test.ts b/plugins/web-ui/test/model-options.test.tsindex 58fbe06be..8f7cebe25 100644--- a/plugins/web-ui/test/model-options.test.ts+++ b/plugins/web-ui/test/model-options.test.ts@@ -84,7 +84,7 @@ test("harness controls retain their supported surfaces", async () => {assert.equal(harnessSupportsEffort("pi"), true);assert.equal(harnessSupportsEffort("opencode"), false);assert.equal(harnessSupportsFastMode("claude"), true);- assert.equal(harnessSupportsFastMode("codex"), false);+ assert.equal(harnessSupportsFastMode("codex"), true);});test("deleted selection retains identity and transcript rendering does not borrow a replacement", async () => {diff --git a/plugins/web-ui/test/pinned-composer-polish.test.ts b/plugins/web-ui/test/pinned-composer-polish.test.tsindex bea367b94..1268524e4 100644--- a/plugins/web-ui/test/pinned-composer-polish.test.ts+++ b/plugins/web-ui/test/pinned-composer-polish.test.ts@@ -19,7 +19,7 @@ test("editable background activity is rendered inside the composer surface", ()chat,/composerForm\(agent, html`\$\{glanceTier \? nothing : liveWorkStatus\(agent\)\} \$\{backgroundActivityStrip\(\)\}`\)/,);- assert.match(composer, /<form class="composer-wrap[^]*?\$\{header\}/);+ assert.match(composer, /<form[^]*?class="composer-wrap[^]*?\$\{header\}/);assert.match(css,/\.composer-wrap > \.bg-activity \{[^}]*background: color-mix\(in srgb, var\(--secondary\) 40%, var\(--background\)\);/,