Multiplayer agent harness for work.
Reuse the composer model picker in context settings (#1476)
Regan Bell81aa332f3aeb
diff --git a/docs/screenshots/context-model-picker/after.png b/docs/screenshots/context-model-picker/after.pngnew file mode 100644index 000000000..09dc62c67Binary files /dev/null and b/docs/screenshots/context-model-picker/after.png differdiff --git a/docs/screenshots/context-model-picker/before.png b/docs/screenshots/context-model-picker/before.pngnew file mode 100644index 000000000..6ba1acdc9Binary files /dev/null and b/docs/screenshots/context-model-picker/before.png differdiff --git a/docs/screenshots/context-model-picker/menu.png b/docs/screenshots/context-model-picker/menu.pngnew file mode 100644index 000000000..7803b7933Binary files /dev/null and b/docs/screenshots/context-model-picker/menu.png differdiff --git a/plugins/web-ui/src/composer-loadout.ts b/plugins/web-ui/src/composer-loadout.tsindex df2ebb401..29d373188 100644--- a/plugins/web-ui/src/composer-loadout.ts+++ b/plugins/web-ui/src/composer-loadout.ts@@ -114,3 +114,21 @@ export function modelLoadoutOptions(return preferred ? [preferred] : [];});}++const LOADOUT_STORAGE_KEY = "web-ui:loadout";++export function loadLoadout(): LoadoutEntry[] {+ try {+ return parseLoadout(localStorage.getItem(LOADOUT_STORAGE_KEY));+ } catch {+ return [];+ }+}++export function saveLoadout(entries: LoadoutEntry[]): void {+ try {+ localStorage.setItem(LOADOUT_STORAGE_KEY, JSON.stringify(entries.slice(0, LOADOUT_CAP)));+ } catch {+ return;+ }+}diff --git a/plugins/web-ui/src/composer.ts b/plugins/web-ui/src/composer.tsindex 3bd991127..4bd3f217b 100644--- a/plugins/web-ui/src/composer.ts+++ b/plugins/web-ui/src/composer.ts@@ -6,23 +6,7 @@ import type { Attachment } from "@earendil-works/pi-web-ui";import { FolderDropError, folderToZipFile, isFolderReadError, splitDropItems, type DropEntryLike } from "./folder-drop";import { html, nothing, type TemplateResult } from "lit";import { live } from "lit/directives/live.js";-import {- ArrowUp,- Box,- Check,- ChevronDown,- ChevronRight,- GripVertical,- Plus,- Sparkles,- CornerDownRight,- FileText,- Paperclip,- Square,- Star,- X,- Zap,-} from "lucide";+import { ArrowUp, Box, CornerDownRight, FileText, Paperclip, Square, X } from "lucide";import {api,ApiError,@@ -44,15 +28,11 @@ import {type QueuedRun,} from "./core-bridge";import { errMessage } from "../../chassis/src/errors";-import { fieldSelect, icon, modelMark } from "./ui";+import { fieldSelect, icon } from "./ui";import {- EFFORT_LEVELS,defaultEffortForModel,defaultModelValue,- effortLabel,getModelOptions,- getHarnessOptions,- harnessSupportsEffort,harnessSupportsFastMode,harnessSupportsSteer,type EffortLevel,@@ -69,38 +49,23 @@ import { tip } from "./tooltip";import { isPhone } from "./viewport";import {LOADOUT_CAP,- parseLoadout,+ loadLoadout,+ saveLoadout,reconcileLoadout,upsertLoadout,- reorderLoadout,effortLevelsForHarness,compatibleHarnessOptions,- loadoutModelId,modelLoadoutOptions,type LoadoutEntry,} from "./composer-loadout";-import { burstEffortConfetti } from "./effort-confetti";+import { createModelPicker } from "./model-picker";export type ComposerMenu = "effort" | "model" | "settings" | "loadout";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 loadLoadout(): LoadoutEntry[] {- try {- return parseLoadout(localStorage.getItem(LOADOUT_STORAGE_KEY));- } catch {- return [];- }-}--function saveLoadout(entries: LoadoutEntry[]): void {- persistPreference(LOADOUT_STORAGE_KEY, JSON.stringify(entries.slice(0, LOADOUT_CAP)));-}-function loadThreadPicks(): Map<string, ModelOptionValue> {try {const raw: unknown = JSON.parse(localStorage.getItem(THREAD_PICKS_STORAGE_KEY) ?? "[]");@@ -194,14 +159,6 @@ 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;@@ -218,7 +175,6 @@ export function resyncModelSelection(): void {export function createComposerSurface(ctx: ConvCtx): ComposerSurface {const refreshAccount = () => ctx.chat.drawActiveChat();window.addEventListener("model-account-changed", refreshAccount);- const loadoutMenuId = `composer-loadout-${crypto.randomUUID()}`;let runtimeRequest = 0;let runtimeIdentity = "";let unsubscribeRuntime: (() => void) | undefined;@@ -529,7 +485,7 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {const compact = Boolean(ctx.pane) || isPhone();const showRuntimeControls = !appState.me?.individualModelAuth;- const runtimeControls = loadoutControl(agent, selectedModel, inputBlocked);+ const runtimeControls = modelPicker.render(agent, selectedModel, inputBlocked);return html`<formclass="composer-wrap ${compact ? "compact" : ""}"@@ -935,10 +891,26 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {}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;+ const modelPicker = createModelPicker<Agent>({+ host: () => ctx.chat.state.host,+ redraw: () => ctx.chat.drawActiveChat(),+ scopeKey,+ state: composerState,+ entries: seededLoadout,+ activeEntry: activeLoadoutEntry,+ saveEntries: (entries) => {+ loadout = entries;+ saveLoadout(entries);+ },+ apply: applyLoadout,+ add: addLoadoutEntry,+ selectEffort,+ selectHarness,+ toggleFastMode,+ effectiveFastMode,+ changeDefault: changeScopeRuntime,+ });+ const placeLoadout = modelPicker.place;function activeLoadoutEntry(selected: ModelOption): LoadoutEntry {return {@@ -996,7 +968,7 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {composerState.fastMode = normalized.fast;loadout = upsertLoadout(loadout, activeLoadoutEntry(option));saveLoadout(loadout);- loadoutSection = null;+ modelPicker.resetSection();composerState.openMenu = wasOpen ? "loadout" : null;ctx.chat.drawActiveChat(agent);placeLoadout();@@ -1017,641 +989,6 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {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 = option.displayProvider ?? String(option.model.provider);- const mark =- option.harnessId === "codex"- ? modelMark("codex", 16)- : (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"- ? getHarnessOptions(scopeKey()).map((harness) => {- const compatible = compatibleHarnessOptions(getModelOptions(scopeKey()), selected.model.id).some(- (option) => option.harnessId === harness.value,- );- const reason = compatible ? "" : `${harness.label} cannot run ${selected.label}.`;- return html`<button- class="loadout-effort"- type="button"- role="menuitemradio"- aria-checked=${harness.value === selected.harnessId ? "true" : "false"}- aria-disabled=${compatible ? "false" : "true"}- aria-description=${reason || nothing}- ${tip(reason)}- @click=${() => {- if (!compatible) return;- closeLoadoutSection();- selectHarness(harness.value, agent);- }}- >- <span class="loadout-harness-option"- >${modelMark(harness.value, 15) ?? nothing}<span>${harness.label}</span></span- >- ${harness.value === 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 = getHarnessOptions(scopeKey());- 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();- 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="loadout-submenu-anchor"- ${tip(entries.length >= LOADOUT_CAP ? "Remove a preset to add another." : "")}- >- <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="loadout-setting ${loadoutSection === "effort" ? "open" : ""}"- type="button"- 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);- }}- >- <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>`- : 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 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 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 }));@@ -2423,9 +1760,7 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {function closeMenus(): boolean {let changed = false;if (composerState.openMenu) {- cancelLoadoutClose();- loadoutSection = null;- loadoutSectionHovered = false;+ modelPicker.resetSection();composerState.openMenu = null;changed = true;}@@ -2438,15 +1773,13 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {function dispose(): void {window.removeEventListener("model-account-changed", refreshAccount);- cancelLoadoutClose();+ modelPicker.dispose();unsubscribeRuntime?.();++runtimeRequest;fileDrag.dispose();autosizeObserver?.disconnect();autosizeObserver = null;autosizedTa = null;- window.removeEventListener("resize", placeLoadout);- window.visualViewport?.removeEventListener("resize", placeLoadout);}return {diff --git a/plugins/web-ui/src/context-model.ts b/plugins/web-ui/src/context-model.tsindex 9a0314555..f53aa8558 100644--- a/plugins/web-ui/src/context-model.ts+++ b/plugins/web-ui/src/context-model.ts@@ -2,14 +2,24 @@ import { html, nothing, type TemplateResult } from "lit";import type { RuntimeConfig } from "./core-bridge";import { getRuntimeConfig, loadRuntimeConfig, saveRuntimeConfig, subscribeRuntimeConfig } from "./runtime-config-store";import {- EFFORT_LEVELS,- effortLabel,+ defaultEffortForModel,+ harnessSupportsFastMode,harnessSupportsEffort,runtimeModelOptions,type EffortLevel,type ModelOption,} from "./model-options";-import { fieldSelect } from "./ui";+import { createModelPicker } from "./model-picker";+import {+ loadLoadout,+ saveLoadout,+ reconcileLoadout,+ upsertLoadout,+ effortLevelsForHarness,+ compatibleHarnessOptions,+ type LoadoutEntry,+} from "./composer-loadout";+import { modelSupportsFastMode } from "./pi-models";import { errMessage } from "../../chassis/src/errors";const INHERIT = "";@@ -20,18 +30,24 @@ export const contextModelState = {saving: false,pending: null as string | null,pendingEffort: null as string | null,+ pendingFast: null as boolean | null,get config(): RuntimeConfig | null {return getRuntimeConfig(contextModelState.scope);},notice: "",- noticeKind: "" as "" | "saved" | "error",+ noticeKind: "" as "" | "error",};+let picker: ReturnType<typeof createModelPicker<void>> | undefined;+let pickerState = { openMenu: null as string | null, menuQuery: "", effortLevel: "auto" as EffortLevel };let loadSeq = 0;let unsubscribeRuntime: (() => void) | undefined;let redraw: () => void = () => {};export function resetContextModel(): void {+ picker?.dispose();+ picker = undefined;+ pickerState = { openMenu: null, menuQuery: "", effortLevel: "auto" };loadSeq += 1;unsubscribeRuntime?.();unsubscribeRuntime = undefined;@@ -40,6 +56,7 @@ export function resetContextModel(): void {contextModelState.saving = false;contextModelState.pending = null;contextModelState.pendingEffort = null;+ contextModelState.pendingFast = null;contextModelState.notice = "";contextModelState.noticeKind = "";}@@ -86,45 +103,46 @@ function selectedValue(config: RuntimeConfig): string {function effortLevelsFor(harnessId: string): Array<{ value: EffortLevel; label: string }> {if (!harnessSupportsEffort(harnessId)) return [];- return EFFORT_LEVELS.filter(({ value }) => {- if (value === "ultracode") return harnessId === "pi";- if (value === "max") return harnessId !== "codex";- return true;- });+ return effortLevelsForHarness(harnessId);}function selectedEffort(config: RuntimeConfig): string {- return config.scopeOverride?.effortLevel ?? "auto";+ return (+ config.effective.effortLevel ??+ defaultEffortForModel(+ optionsFor(config).find((option) => option.value === `${config.effective.harnessId}:${config.effective.modelId}`)+ ?.model,+ )+ );}-async function choose(scope: string, value: string, effort?: string): Promise<void> {+async function choose(scope: string, value: string, effort?: string, fast = false): Promise<void> {if (contextModelState.saving) return;const seq = loadSeq;+ const restoreFocus = document.activeElement?.closest(".context-model .loadout-control") !== null;contextModelState.saving = true;contextModelState.pending = value;contextModelState.pendingEffort = effort ?? null;+ contextModelState.pendingFast = fast;+ picker?.resetSection();contextModelState.notice = "";contextModelState.noticeKind = "";redraw();try {const sep = value.indexOf(":");const harnessId = value.slice(0, sep);- const config = await saveRuntimeConfig(+ await saveRuntimeConfig(scope,value === INHERIT? { inherit: true }: {harnessId,modelId: value.slice(sep + 1),+ fastMode: fast && harnessSupportsFastMode(harnessId) && modelSupportsFastMode(scope, value.slice(sep + 1)),...(effort && effortLevelsFor(harnessId).some((o) => o.value === effort) ? { effortLevel: effort } : {}),},);if (seq !== loadSeq) return;- const effortNote = config.scopeOverride?.effortLevel- ? ` · ${effortLabel(config.scopeOverride.effortLevel as EffortLevel)} effort`- : "";- contextModelState.notice = `Saved. New conversations here run on ${labelForRuntime(config, config.effective)}${effortNote}.`;- contextModelState.noticeKind = "saved";} catch (e) {if (seq !== loadSeq) return;contextModelState.notice = errMessage(e, "Couldn't change the model. Try again.");@@ -134,11 +152,71 @@ async function choose(scope: string, value: string, effort?: string): Promise<vocontextModelState.saving = false;contextModelState.pending = null;contextModelState.pendingEffort = null;+ contextModelState.pendingFast = null;redraw();+ if (restoreFocus)+ requestAnimationFrame(() => {+ if (seq === loadSeq && document.activeElement === document.body)+ document.querySelector<HTMLButtonElement>(".context-model .loadout-button")?.focus();+ });}}}+function activeEntry(config: RuntimeConfig): LoadoutEntry {+ return {+ value: contextModelState.pending || `${config.effective.harnessId}:${config.effective.modelId}`,+ effort: (contextModelState.pendingEffort ?? selectedEffort(config)) as EffortLevel,+ fast: contextModelState.pendingFast ?? config.effective.fastMode === true,+ };+}++function contextPicker(scopeId: string) {+ const current = () => activeEntry(contextModelState.config!);+ const options = () => optionsFor(contextModelState.config!);+ const apply = (entry: LoadoutEntry) => {+ if (contextModelState.saving) return;+ const option = options().find((option) => option.value === entry.value);+ if (!option) return;+ const normalized = {+ ...entry,+ effort: effortLevelsForHarness(option.harnessId).some((level) => level.value === entry.effort)+ ? entry.effort+ : ("auto" as EffortLevel),+ fast: entry.fast && harnessSupportsFastMode(option.harnessId) && modelSupportsFastMode(scopeId, option.model.id),+ };+ void choose(scopeId, normalized.value, normalized.effort, normalized.fast);+ };+ return createModelPicker<void>({+ host: () => document.querySelector<HTMLElement>(".context-model"),+ redraw,+ scopeKey: () => scopeId,+ state: pickerState,+ entries: () => reconcileLoadout(loadLoadout(), options(), current()),+ activeEntry: current,+ saveEntries: saveLoadout,+ apply,+ add: (option) => {+ const entry = { value: option.value, effort: defaultEffortForModel(option.model), fast: false };+ saveLoadout(upsertLoadout(reconcileLoadout(loadLoadout(), options(), current()), entry));+ pickerState.menuQuery = "";+ apply(entry);+ },+ selectEffort: (effort) => apply({ ...current(), effort }),+ selectHarness: (harnessId) => {+ const selected = options().find((option) => option.value === current().value);+ const target =+ selected &&+ compatibleHarnessOptions(options(), selected.model.id).find((option) => option.harnessId === harnessId);+ if (target) apply({ ...current(), value: target.value });+ },+ toggleFastMode: () => apply({ ...current(), fast: !current().fast }),+ effectiveFastMode: () => current().fast,+ changeDefault: () => choose(scopeId, INHERIT),+ showDefaultAction: false,+ });+}+export function contextModelSection(scopeId: string): TemplateResult | typeof nothing {if (contextModelState.scope !== scopeId) return nothing;if (contextModelState.loading)@@ -153,80 +231,18 @@ export function contextModelSection(scopeId: string): TemplateResult | typeof no<span class="context-model-status error" aria-live="polite">${contextModelState.notice}</span></section>`;const options = optionsFor(config);- const multiHarness = new Set(options.map((o) => o.harnessId)).size > 1;- const selected = contextModelState.pending ?? selectedValue(config);- const stalePin = selected !== INHERIT && !options.some((o) => o.value === selected);- const isSlack = scopeId.startsWith("channel:");- const pinnedHarness = selected === INHERIT ? null : selected.slice(0, selected.indexOf(":"));- const effort = contextModelState.pendingEffort ?? selectedEffort(config);- const effortOptions = pinnedHarness ? effortLevelsFor(pinnedHarness) : [];- const showEffort = pinnedHarness !== null && harnessSupportsEffort(pinnedHarness);+ const active = activeEntry(config);+ const option = options.find((option) => option.value === active.value);+ const stalePin = config.scopeOverride && !options.some((option) => option.value === selectedValue(config));+ pickerState.effortLevel = active.effort;+ picker ??= contextPicker(scopeId);+ picker.place();return html`<section class="context-panel context-model" aria-labelledby="context-model-title">- <div class="context-panel-heading">- <div>- <h2 class="context-panel-title" id="context-model-title">Model</h2>- <p class="context-panel-copy">The model every conversation here starts on.</p>- </div>- </div>- ${fieldSelect({- id: "context-model-select",- className: "context-model-select",- focusKey: "context-model",- ariaLabel: "Default model for this project",- disabled: contextModelState.saving,- value: selected,- onChange: (value) => {- const nextHarness = value.slice(0, value.indexOf(":"));- const carry =- value !== INHERIT && effortLevelsFor(nextHarness).some((o) => o.value === effort) ? effort : undefined;- void choose(scopeId, value, carry);- },- options: [- html`<option value=${INHERIT} ?selected=${selected === INHERIT}>- Org default (${labelForRuntime(config, config.orgDefault)})- </option>`,- ...options.map(- (o) =>- html`<option value=${o.value} ?selected=${o.value === selected}>${optionLabel(o, multiHarness)}</option>`,- ),- ...(stalePin- ? [- html`<option value=${selected} selected>- ${labelForRuntime(config, config.scopeOverride!)} (no longer offered)- </option>`,- ]- : []),- ],- })}- ${- showEffort- ? html`<label class="context-model-effort">- <span class="context-model-effort-label">Default effort</span>- ${fieldSelect({- id: "context-effort-select",- className: "context-effort-select",- focusKey: "context-effort",- ariaLabel: "Default effort level for this project",- disabled: contextModelState.saving,- value: effort,- compact: true,- onChange: (value) => void choose(scopeId, selected, value),- options: effortOptions.map(- (o) => html`<option value=${o.value} ?selected=${o.value === effort}>${o.label}</option>`,- ),- })}- </label>`- : nothing- }- <p class="context-model-hint">- ${- selected === INHERIT- ? "Following the org default. It changes when the org's does."- : "Pinned for this project. Anyone in a chat can still pick a different model for that conversation."- }- ${isSlack ? " The pinned Slack header (when enabled below) names this model." : ""}- </p>+ <h2 class="context-panel-title" id="context-model-title">Model</h2>+ ${stalePin ? html`<span class="context-model-status">${labelForRuntime(config, config.scopeOverride!)} (no longer offered)</span>` : nothing}+ ${!option && !stalePin ? html`<span class="context-model-status">${labelForRuntime(config, config.effective)} (no longer offered)</span>` : nothing}+ ${picker.render(undefined, option, contextModelState.saving)}${contextModelState.notice? html`<spandiff --git a/plugins/web-ui/src/model-picker.ts b/plugins/web-ui/src/model-picker.tsnew file mode 100644index 000000000..c1302a373--- /dev/null+++ b/plugins/web-ui/src/model-picker.ts@@ -0,0 +1,788 @@+import { html, nothing, type TemplateResult } from "lit";+import { live } from "lit/directives/live.js";+import { Check, ChevronDown, ChevronRight, GripVertical, Plus, Sparkles, Star, X, Zap } from "lucide";+import { icon, modelMark } from "./ui";+import { getRuntimeConfig, saveRuntimeConfig } from "./runtime-config-store";+import {+ EFFORT_LEVELS,+ effortLabel,+ defaultEffortForModel,+ defaultModelValue,+ getModelOptions,+ getHarnessOptions,+ harnessSupportsEffort,+ harnessSupportsFastMode,+ type EffortLevel,+ type ModelOption,+} from "./model-options";+import { modelSupportsFastMode } from "./pi-models";+import {+ LOADOUT_CAP,+ reorderLoadout,+ effortLevelsForHarness,+ compatibleHarnessOptions,+ loadoutModelId,+ modelLoadoutOptions,+ type LoadoutEntry,+} from "./composer-loadout";+import { tip } from "./tooltip";+import { isPhone } from "./viewport";+import { burstEffortConfetti } from "./effort-confetti";++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;+}++interface ModelPickerBindings<T> {+ host(): HTMLElement | null;+ redraw(): void;+ scopeKey(): string | null;+ state: { openMenu: string | null; menuQuery: string; effortLevel: EffortLevel };+ entries(selected: ModelOption): LoadoutEntry[];+ activeEntry(selected: ModelOption): LoadoutEntry;+ saveEntries(entries: LoadoutEntry[]): void;+ apply(entry: LoadoutEntry, target: T): void;+ add(option: ModelOption, target: T): void;+ selectEffort(effort: EffortLevel, target: T): void;+ selectHarness(harness: string, target: T): void;+ toggleFastMode(target: T): void;+ effectiveFastMode(): boolean;+ changeDefault(change: Parameters<typeof saveRuntimeConfig>[1], target: T, keepOpen?: boolean): Promise<unknown>;+ showDefaultAction?: boolean;+}++export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {+ const {+ scopeKey,+ state: composerState,+ entries: seededLoadout,+ activeEntry: activeLoadoutEntry,+ apply: applyLoadout,+ add: addLoadoutEntry,+ selectEffort,+ selectHarness,+ toggleFastMode,+ effectiveFastMode,+ changeDefault: changeScopeRuntime,+ } = bindings;+ const loadoutMenuId = `model-picker-${crypto.randomUUID()}`;+ let loadoutSection: "effort" | "add" | "harness" | null = null;+ let loadoutSectionHovered = false;+ let loadoutCloseTimer: ReturnType<typeof setTimeout> | null = null;+ let draggedModel: string | null = null;+ let disposed = false;++ function removeLoadoutEntry(value: string, selected: ModelOption): void {+ if (value === activeLoadoutEntry(selected).value) return;+ const entries = seededLoadout(selected);+ const index = entries.findIndex((entry) => entry.value === value);+ const next = entries.filter((entry) => entry.value !== value);+ bindings.saveEntries(next);+ bindings.redraw();+ placeLoadout();+ requestAnimationFrame(() => {+ const rows = bindings.host()?.querySelectorAll<HTMLButtonElement>(".loadout-pick");+ rows?.[Math.max(0, Math.min(index, next.length - 1))]?.focus();+ });+ }++ function clearLoadoutDropTargets(): void {+ bindings+ .host()+ ?.querySelectorAll(".loadout-row.drop-target")+ .forEach((row) => {+ row.classList.remove("drop-target", "drop-after");+ });+ }++ function moveLoadout(value: string, targetValue: string, selected: ModelOption): void {+ bindings.saveEntries(reorderLoadout(seededLoadout(selected), value, targetValue));+ bindings.redraw();+ placeLoadout();+ }++ function modelGlyph(option: ModelOption): TemplateResult {+ const provider = option.displayProvider ?? String(option.model.provider);+ const mark =+ option.harnessId === "codex"+ ? modelMark("codex", 16)+ : (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: T,+ ): TemplateResult | typeof nothing {+ const option = getModelOptions(scopeKey()).find((option) => option.value === entry.value);+ if (!option) return nothing;+ const active = entry.value === activeLoadoutEntry(selected).value;+ const settings = active ? activeLoadoutEntry(selected) : entry;+ const isDefault = entry.value === defaultModelValue(scopeKey());+ const activeRuntimeConfig = getRuntimeConfig(scopeKey());+ const canMakeDefault =+ bindings.showDefaultAction !== false &&+ 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 = bindings.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);+ dismissSelection();+ 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 bindings.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;+ bindings.redraw();+ placeLoadout();+ if (keyboard)+ requestAnimationFrame(() => {+ const menu = bindings.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;+ bindings.redraw();+ placeLoadout();+ if (previous && refocus)+ requestAnimationFrame(() =>+ bindings.host()?.querySelector<HTMLElement>(`[data-loadout-section="${previous}"]`)?.focus(),+ );+ }++ function loadoutSubmenu(agent: T, 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"+ ? getHarnessOptions(scopeKey()).map((harness) => {+ const compatible = compatibleHarnessOptions(getModelOptions(scopeKey()), selected.model.id).some(+ (option) => option.harnessId === harness.value,+ );+ const reason = compatible ? "" : `${harness.label} cannot run ${selected.label}.`;+ return html`<button+ class="loadout-effort"+ type="button"+ role="menuitemradio"+ aria-checked=${harness.value === selected.harnessId ? "true" : "false"}+ aria-disabled=${compatible ? "false" : "true"}+ aria-description=${reason || nothing}+ ${tip(reason)}+ @click=${() => {+ if (!compatible) return;+ bindings.host()?.querySelector<HTMLElement>(".loadout-button")?.focus();+ closeLoadoutSection();+ selectHarness(harness.value, agent);+ }}+ >+ <span class="loadout-harness-option"+ >${modelMark(harness.value, 15) ?? nothing}<span>${harness.label}</span></span+ >+ ${harness.value === 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"+ data-focus-key=${`${loadoutMenuId}-search`}+ placeholder="Search models…"+ .value=${live(composerState.menuQuery)}+ @input=${(e: InputEvent) => {+ const input = e.currentTarget as HTMLInputElement;+ const selection = [input.selectionStart, input.selectionEnd] as const;+ composerState.menuQuery = input.value;+ bindings.redraw();+ positionLoadout();+ const next = bindings.host()?.querySelector<HTMLInputElement>(".loadout-search input");+ next?.focus();+ if (selection[0] !== null && selection[1] !== null)+ next?.setSelectionRange(selection[0], selection[1]);+ }}+ />+ </label>+ ${catalog.map(+ (option) =>+ html`<button+ class="menu-option"+ type="button"+ role="menuitem"+ aria-label=${`Add ${option.label} to presets`}+ @click=${() => {+ dismissSelection();+ 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 = getHarnessOptions(scopeKey());+ 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 render(agent: T, choice: ModelOption | undefined, disabled: boolean): TemplateResult {+ const selected = choice ?? getModelOptions(scopeKey())[0];+ if (!selected) return html`<span class="context-model-status">No models available</span>`;+ const open = composerState.openMenu === "loadout";+ const entries = seededLoadout(selected);+ const modelSupportsFast = modelSupportsFastMode(scopeKey(), selected.model.id);+ const fastAvailable = !!choice && harnessSupportsFastMode(selected.harnessId) && modelSupportsFast;+ const fastUnsupportedReason = modelSupportsFast ? "Not supported by this harness" : "Not supported by this model";+ const fastOn = fastAvailable && effectiveFastMode();+ return html`<div+ class="menu-control loadout-control"+ data-align="left"+ @keydown=${(event: KeyboardEvent) => {+ if (+ disabled ||+ !fastAvailable ||+ event.defaultPrevented ||+ !event.metaKey ||+ !event.shiftKey ||+ event.code !== "KeyE"+ )+ return;+ event.preventDefault();+ toggleFastMode(agent);+ }}+ >+ <button+ class="menu-button loadout-button"+ data-focus-key=${`${loadoutMenuId}-trigger`}+ type="button"+ aria-label=${choice ? `Model: ${choice.label}, ${effortLabel(composerState.effortLevel)} effort${fastOn ? ", Fast" : ""}` : "Choose model"}+ 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";+ bindings.redraw();+ placeLoadout();+ requestAnimationFrame(() => bindings.host()?.querySelector<HTMLElement>(".loadout-pick")?.focus());+ }+ }}+ @click=${(e: Event) => {+ e.stopPropagation();+ cancelLoadoutClose();+ loadoutSection = null;+ loadoutSectionHovered = false;+ composerState.menuQuery = "";+ composerState.openMenu = open ? null : "loadout";+ bindings.redraw();+ placeLoadout();+ }}+ >+ <span class="menu-label">${choice?.label ?? "Choose model"}</span>+ ${choice ? html`<span class="menu-suffix">${effortText(composerState.effortLevel)}</span>` : nothing}+ ${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();+ bindings.redraw();+ requestAnimationFrame(() => bindings.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="loadout-submenu-anchor"+ ${tip(entries.length >= LOADOUT_CAP ? "Remove a preset to add another." : "")}+ >+ <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>+ ${+ choice+ ? html`<div class="loadout-divider"></div>+ ${loadoutHarnessControl(selected)}+ ${+ harnessSupportsEffort(selected.harnessId)+ ? html`<div class="loadout-submenu-anchor">+ <button+ class="loadout-setting ${loadoutSection === "effort" ? "open" : ""}"+ type="button"+ 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);+ }}+ >+ <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>`+ : 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>`+ : nothing+ }+ </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 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 positionLoadout(): void {+ if (disposed) return;+ const host = bindings.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`;+ }+ }++ function placeLoadout(): void {+ requestAnimationFrame(positionLoadout);+ }++ window.addEventListener("resize", placeLoadout);+ window.visualViewport?.addEventListener("resize", placeLoadout);++ function resetSection(): void {+ cancelLoadoutClose();+ loadoutSection = null;+ loadoutSectionHovered = false;+ }++ function dismissSelection(): void {+ closeMenus();+ requestAnimationFrame(() => bindings.host()?.querySelector<HTMLElement>(".loadout-button")?.focus());+ }++ function closeMenus(): void {+ resetSection();+ composerState.openMenu = null;+ }++ function outsideClick(event: Event): void {+ if (composerState.openMenu !== "loadout") return;+ const target = event.target;+ if (target instanceof Element && bindings.host()?.contains(target) && target.closest(".loadout-control")) return;+ closeMenus();+ bindings.redraw();+ }++ document.addEventListener("click", outsideClick);++ function dispose(): void {+ disposed = true;+ resetSection();+ document.removeEventListener("click", outsideClick);+ window.removeEventListener("resize", placeLoadout);+ window.visualViewport?.removeEventListener("resize", placeLoadout);+ }++ return { render, place: placeLoadout, resetSection, dispose };+}diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.cssindex a58516b6d..de5a9f8d7 100644--- a/plugins/web-ui/src/shell.css+++ b/plugins/web-ui/src/shell.css@@ -7670,7 +7670,9 @@ a.connector-widget:focus-visible {}.context-model {display: flex;- flex-direction: column;+ align-items: center;+ justify-content: space-between;+ flex-wrap: wrap;gap: 10px;}.project-slack-form {@@ -7691,27 +7693,15 @@ a.connector-widget:focus-visible {font-size: 12px;line-height: 1.45;}-.context-model-select {- align-self: flex-start;- min-width: min(260px, 100%);-}-.context-model-effort {- display: flex;- align-items: center;- gap: 8px;+.context-model .loadout-control {align-self: flex-start;+ max-width: 100%;}-.context-model-effort-label {- color: var(--muted-foreground);- font-size: 12px;-}-.context-model-hint {- margin: 0;- color: var(--muted-foreground);- font-size: 12px;- line-height: 1.45;+.context-model .loadout-button {+ max-width: 100%;}.context-model-status {+ flex-basis: 100%;color: var(--muted-foreground);font-size: 12px;}diff --git a/plugins/web-ui/test/composer-fast-mode.test.ts b/plugins/web-ui/test/composer-fast-mode.test.tsindex aa9560292..b7a2c66a1 100644--- a/plugins/web-ui/test/composer-fast-mode.test.ts+++ b/plugins/web-ui/test/composer-fast-mode.test.ts@@ -2,7 +2,7 @@ import assert from "node:assert/strict";import { readFileSync } from "node:fs";import test from "node:test";-const composer = readFileSync(new URL("../src/composer.ts", import.meta.url), "utf8");+const composer = readFileSync(new URL("../src/model-picker.ts", import.meta.url), "utf8");const css = readFileSync(new URL("../src/shell.css", import.meta.url), "utf8");const fast = composer.slice(composer.indexOf('class="loadout-setting"'),diff --git a/plugins/web-ui/test/composer-picker.test.ts b/plugins/web-ui/test/composer-picker.test.tsindex de74a44be..b403efebd 100644--- a/plugins/web-ui/test/composer-picker.test.ts+++ b/plugins/web-ui/test/composer-picker.test.ts@@ -25,7 +25,7 @@ function model(id: string, label: string, provider = "anthropic"): ModelMetadata};}-test("the model picker remembers compatible harnesses without duplicating or changing models", async () => {+test("the shared picker preserves composer choices and saves context defaults", async () => {const dom = new JSDOM('<!doctype html><div id="app"></div><div id="composer"></div>', {url: "http://localhost/web-ui/",pretendToBeVisual: true,@@ -96,15 +96,24 @@ test("the model picker remembers compatible harnesses without duplicating or chadeferNextPut = false;await pendingPut;}+ if (change.inherit) return Response.json({ ...config, effective: config.orgDefault, scopeOverride: null });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" },- });+ return new Response(+ JSON.stringify({+ ...config,+ scopeId: change.scopeId,+ effective,+ scopeOverride: { ...effective, orgRevision: 1 },+ }),+ {+ headers: { "content-type": "application/json" },+ },+ );},};const descriptors = new Map<string, PropertyDescriptor | undefined>();@@ -146,6 +155,7 @@ test("the model picker remembers compatible harnesses without duplicating or chaconst vite = await createServer({ server: { middlewareMode: true, hmr: false }, appType: "custom" });let composer: ComposerSurface | undefined;let siblingComposer: ComposerSurface | undefined;+ let resetContext: (() => void) | undefined;try {const { appState } = await vite.ssrLoadModule("/src/shell-state.ts");const { createComposerSurface } = await vite.ssrLoadModule("/src/composer.ts");@@ -181,11 +191,14 @@ test("the model picker remembers compatible harnesses without duplicating or chaawait new Promise<void>((resolve) => dom.window.requestAnimationFrame(() => resolve()));};const button = (selector: string): HTMLButtonElement => {+ if (selector !== ".loadout-button" && !host.querySelector(".loadout-popover"))+ host.querySelector<HTMLButtonElement>(".loadout-button")!.click();const target = host.querySelector<HTMLButtonElement>(selector);assert.ok(target, `button exists: ${selector}`);return target;};const pick = (label: string): HTMLButtonElement => {+ if (!host.querySelector(".loadout-popover")) button(".loadout-button").click();const target = [...host.querySelectorAll<HTMLButtonElement>(".loadout-pick")].find((row) => row.querySelector(".loadout-name")?.textContent === label,);@@ -361,6 +374,7 @@ test("the model picker remembers compatible harnesses without duplicating or chaassert.deepEqual(names(), ["Beta", "Alpha", "Gamma"]);assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').disabled, false);pick("Gamma").click();+ button(".loadout-button").click();assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').querySelector(".loadout-shortcut")?.textContent,"Not supported by this model",@@ -368,6 +382,7 @@ test("the model picker remembers compatible harnesses without duplicating or chaassert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').disabled, true);assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').getAttribute("aria-checked"), "false");pick("Alpha").click();+ button(".loadout-button").click();assert.equal(button('[aria-label="Fast"][role="menuitemcheckbox"]').disabled, false);await tick();@@ -489,7 +504,137 @@ test("the model picker remembers compatible harnesses without duplicating or chaassert.equal(pendingComposer.state.fastMode, field === "fastMode" ? !fastBefore : fastBefore);pendingComposer.dispose();}++ const context = await vite.ssrLoadModule("/src/context-model.ts");+ resetContext = context.resetContextModel;+ const contextHost = document.createElement("section");+ document.body.append(contextHost);+ const { replaceChildrenPreservingFocus } = await vite.ssrLoadModule("/src/pane-focus.ts");+ const drawContext = () => {+ const next = document.createElement("div");+ render(context.contextModelSection(config.scopeId), next);+ replaceChildrenPreservingFocus(contextHost, next);+ };+ await context.loadContextModel(config.scopeId, drawContext);+ const contextButton = (selector: string): HTMLButtonElement => {+ const result = contextHost.querySelector<HTMLButtonElement>(selector);+ assert.ok(result, `context button exists: ${selector}`);+ return result;+ };+ contextButton(".loadout-button").click();+ assert.ok(contextHost.querySelector('[role="menu"][aria-label="Model settings"]'));+ assert.equal(contextHost.querySelector("select"), null);+ assert.equal(contextHost.querySelector(".loadout-make-default"), null);+ const betaPreset = [...contextHost.querySelectorAll<HTMLButtonElement>(".loadout-pick")].find((item) =>+ item.textContent?.includes("Beta"),+ );+ assert.ok(betaPreset);+ betaPreset.click();+ await tick();+ assert.equal(context.contextModelState.config.effective.modelId, "beta");+ assert.equal(contextHost.querySelector(".loadout-popover"), null);+ contextButton(".loadout-button").click();+ contextButton('[data-loadout-section="effort"]').click();+ const high = [...contextHost.querySelectorAll<HTMLButtonElement>(".loadout-effort")].find(+ (item) => item.textContent?.trim() === "High",+ );+ assert.ok(high);+ const gate = Promise.withResolvers<void>();+ pendingPut = gate.promise;+ deferNextPut = true;+ high.click();+ assert.equal(contextButton(".loadout-button").disabled, true);+ assert.match(contextButton(".loadout-button").getAttribute("aria-label") ?? "", /High effort/);+ await tick();+ gate.resolve();+ await tick();+ assert.equal(context.contextModelState.config.effective.effortLevel, "high");+ assert.equal(contextButton(".loadout-button").disabled, false);+ contextButton('[aria-label="Fast"][role="menuitemcheckbox"]').click();+ await tick();+ assert.equal(context.contextModelState.config.effective.fastMode, true);+ assert.equal(updates.at(-1)?.effortLevel, "high");+ failNextPut = true;+ contextButton('[aria-label="Fast"][role="menuitemcheckbox"]').click();+ await tick();+ assert.match(contextHost.textContent ?? "", /default save failed/);+ assert.equal(context.contextModelState.config.effective.fastMode, true);+ assert.equal(contextButton('[aria-label="Fast"][role="menuitemcheckbox"]').getAttribute("aria-checked"), "true");+ contextButton(".loadout-button").dispatchEvent(+ new KeyboardEvent("keydown", { code: "KeyE", metaKey: true, shiftKey: true, bubbles: true, cancelable: true }),+ );+ await tick();+ assert.equal(context.contextModelState.config.effective.fastMode, false);+ contextButton(".loadout-foot-btn").click();+ await tick();+ assert.equal(context.contextModelState.config.scopeOverride, null);+ assert.doesNotMatch(contextHost.textContent ?? "", /Following the org default/);+ assert.equal(contextHost.querySelector(".loadout-foot-btn"), null);+ contextButton(".loadout-popover").dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));+ await tick();+ assert.equal(contextHost.querySelector(".loadout-popover"), null);+ assert.equal(document.activeElement, contextButton(".loadout-button"));+ contextButton(".loadout-button").click();+ document.body.click();+ assert.equal(contextHost.querySelector(".loadout-popover"), null);+ contextButton(".loadout-button").click();+ contextButton('[data-loadout-section="add"]').click();+ for (const query of ["D", "De", "Del"]) {+ const input = contextHost.querySelector<HTMLInputElement>(".loadout-search input")!;+ input.focus();+ input.value = query;+ input.dispatchEvent(new dom.window.Event("input", { bubbles: true }));+ assert.equal(document.activeElement, contextHost.querySelector(".loadout-search input"));+ assert.equal((document.activeElement as HTMLInputElement).value, query);+ }+ contextButton('[aria-label="Add Delta to presets"]').click();+ await tick();+ assert.equal(contextHost.querySelector(".loadout-popover"), null);+ assert.equal(context.contextModelState.config.effective.modelId, "delta");+ contextButton(".loadout-button").click();+ contextButton('[data-loadout-section="harness"]').click();+ const harness = [...contextHost.querySelectorAll<HTMLButtonElement>(".loadout-effort")].find(+ (item) => item.textContent?.trim() === "Claude Code",+ )!;+ harness.focus();+ harness.click();+ await tick();+ assert.equal(context.contextModelState.config.effective.harnessId, "claude");+ assert.equal(document.activeElement, contextButton('[data-loadout-section="harness"]'));+ context.resetContextModel();+ drawContext();+ assert.equal(contextHost.querySelector(".context-model"), null);+ const { seedRuntimeConfig } = await vite.ssrLoadModule("/src/runtime-config-store.ts");+ const staleScope = "personal:stale-default";+ seedRuntimeConfig(staleScope, {+ ...config,+ scopeId: staleScope,+ effective: { harnessId: "removed", modelId: "retired" },+ orgDefault: { harnessId: "removed", modelId: "retired", revision: 1 },+ scopeOverride: null,+ });+ localStorage.removeItem("web-ui:loadout");+ const drawStale = () => {+ const next = document.createElement("div");+ render(context.contextModelSection(staleScope), next);+ replaceChildrenPreservingFocus(contextHost, next);+ };+ await context.loadContextModel(staleScope, drawStale);+ assert.match(contextHost.textContent ?? "", /retired.*no longer offered/);+ contextButton(".loadout-button").click();+ contextButton('[data-loadout-section="add"]').click();+ contextButton('[aria-label="Add Beta to presets"]').click();+ await tick();+ assert.deepEqual(updates.at(-1), {+ scopeId: staleScope,+ harnessId: "codex",+ modelId: "beta",+ effortLevel: "auto",+ fastMode: false,+ });+ assert.equal(context.contextModelState.config.effective.modelId, "beta");} finally {+ resetContext?.();composer?.dispose();siblingComposer?.dispose();for (const extra of extraComposers) extra.dispose();diff --git a/plugins/web-ui/test/composer-source.test.ts b/plugins/web-ui/test/composer-source.test.tsindex 9432a3625..58b1247b8 100644--- a/plugins/web-ui/test/composer-source.test.ts+++ b/plugins/web-ui/test/composer-source.test.ts@@ -2,14 +2,13 @@ import assert from "node:assert/strict";import { readFileSync } from "node:fs";import test from "node:test";+const picker = readFileSync(new URL("../src/model-picker.ts", import.meta.url), "utf8");+const composer = readFileSync(new URL("../src/composer.ts", import.meta.url), "utf8");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"),- );+ const row = picker.slice(picker.indexOf("function loadoutRow"), picker.indexOf("function cancelLoadoutClose"));+ const loadout = picker.slice(picker.indexOf("function render"), picker.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"));@@ -19,7 +18,7 @@ test("preset default actions live on the row while inheritance remains in the fotest("compact and full composers share one left-side picker with Fast inside its menu", () => {assert.ok(- /const runtimeControls = loadoutControl\(agent, selectedModel, inputBlocked\)/.test(composer),+ /const runtimeControls = modelPicker.render\(agent, selectedModel, inputBlocked\)/.test(composer),"compact surfaces must retain the full model and effort picker",);const leftStart = composer.indexOf('class="composer-left"');@@ -27,12 +26,9 @@ test("compact and full composers share one left-side picker with Fast inside itsassert.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"),- );+ const loadout = picker.slice(picker.indexOf("function render"), picker.indexOf("function menuArrowKeys"));assert.ok(/role="menuitemcheckbox"\s+aria-label="Fast"/.test(loadout));- assert.equal((composer.match(/@click=\$\{\(\) => toggleFastMode\(agent\)\}/g) ?? []).length, 1);+ assert.equal((picker.match(/@click=\$\{\(\) => toggleFastMode\(agent\)\}/g) ?? []).length, 1);});test("switching setups preserves prior tweaks and validates effort and Fast for the selected model", () => {@@ -82,8 +78,8 @@ test("a mid-turn submit queues — attachments cannot ride a queued message and});test("scope runtime defaults include effort and fast mode", () => {- assert.match(composer, /effortLevel: settings\.effort/);- assert.match(composer, /fastMode: settings\.fast/);+ assert.match(picker, /effortLevel: settings\.effort/);+ assert.match(picker, /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/context-model-source.test.ts b/plugins/web-ui/test/context-model-source.test.tsindex 908321930..334b793de 100644--- a/plugins/web-ui/test/context-model-source.test.ts+++ b/plugins/web-ui/test/context-model-source.test.ts@@ -14,17 +14,14 @@ test("the scope's model panel writes through the same endpoint the composer's de});test("the panel offers inheriting the org default and names what is serving now", () => {- assert.match(panel, /Org default \(\$\{labelForRuntime\(config, config\.orgDefault\)\}\)/);- assert.match(panel, /!options\.some\(\(o\) => o\.value === selected\)/);+ assert.match(panel, /changeDefault: \(\) => choose\(scopeId, INHERIT\)/);assert.match(panel, /no longer offered/);- assert.match(panel, /Saved\. New conversations here run on/);- assert.match(panel, /The pinned Slack header \(when enabled below\) names this model\./);});-test("the panel is labelled, focus-keyed, and disabled while saving", () => {- assert.match(panel, /ariaLabel: "Default model for this project"/);- assert.match(panel, /focusKey: "context-model"/);- assert.match(panel, /disabled: contextModelState\.saving/);+test("context settings reuse the composer picker and disable it while saving", () => {+ assert.match(panel, /createModelPicker<void>/);+ assert.match(panel, /picker.render\(undefined, option, contextModelState.saving\)/);+ assert.doesNotMatch(panel, /fieldSelect/);assert.match(panel, /aria-live="polite"/);});@@ -41,33 +38,25 @@ test("model panel styles use the shell theme contract", () => {assert.doesNotMatch(block, /#[0-9a-f]{6}(?![^)]*\))/i);});-test("the model dropdown marks the pinned option selected so the first paint is honest", () => {- assert.match(panel, /\?selected=\$\{selected === INHERIT\}/);- assert.match(panel, /\?selected=\$\{o\.value === selected\}/);- assert.match(panel, /option value=\$\{selected\} selected/);-});-test("an in-flight pick wins the saving re-render — no snap-back while the save runs", () => {assert.match(panel, /pending: null as string \| null/);assert.match(panel, /contextModelState\.pending = value/);- assert.match(panel, /const selected = contextModelState\.pending \?\? selectedValue\(config\)/);- // pending is cleared with saving, in the same guarded finallyassert.match(panel, /contextModelState\.saving = false;\n\s+contextModelState\.pending = null;/);});-test("a pinned model offers a default effort level on the panel", () => {- assert.match(panel, /harnessSupportsEffort\(pinnedHarness\)/);- assert.match(panel, /ariaLabel: "Default effort level for this project"/);- assert.match(panel, /focusKey: "context-effort"/);- // effort choices are filtered to what the pinned harness accepts- assert.match(panel, /if \(value === "ultracode"\) return harnessId === "pi"/);- assert.match(panel, /if \(value === "max"\) return harnessId !== "codex"/);- // switching models carries a still-valid effort, drops an invalid one- assert.match(panel, /effortLevelsFor\(nextHarness\)\.some\(\(o\) => o\.value === effort\) \? effort : undefined/);- // the effort styles exist- assert.ok(css.includes(".context-model-effort {"));+test("context effort and Fast use the shared harness and model capabilities", () => {+ assert.match(panel, /return effortLevelsForHarness\(harnessId\)/);+ assert.match(panel, /harnessSupportsFastMode\(harnessId\)/);+ assert.match(panel, /modelSupportsFastMode\(scope, value.slice\(sep \+ 1\)\)/);});test("no effort is ever sent for a harness that doesn't support it", () => {assert.match(panel, /if \(!harnessSupportsEffort\(harnessId\)\) return \[\];/);});++test("the model card omits explanatory and success prose", () => {+ assert.doesNotMatch(+ panel,+ /The model every conversation|Following the org default|Pinned for this project|Saved\. New conversations/,+ );+});diff --git a/plugins/web-ui/test/pane-composer-source.test.ts b/plugins/web-ui/test/pane-composer-source.test.tsindex 206318bcd..e86ec67f3 100644--- a/plugins/web-ui/test/pane-composer-source.test.ts+++ b/plugins/web-ui/test/pane-composer-source.test.ts@@ -58,7 +58,10 @@ test("narrow short panes hide runtime labels, not the accessible picker", () =>assert.match(narrow, /\.loadout-button \.menu-suffix \{\s*display: none;/);assert.match(narrow, /\.loadout-button \{[^}]*width: 34px;/);assert.doesNotMatch(narrow, /\.loadout-(?:button|control) \{[^}]*display: none;/);- assert.match(composer, /aria-label=\$\{`Model:/);+ assert.match(+ readFileSync(new URL("../src/model-picker.ts", import.meta.url), "utf8"),+ /aria-label=\$\{choice \? `Model:/,+ );});test("the smallest short panes leave text space even with stop controls", () => {