Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Simplify and compact model picker menus (#1573)

Eve Bouffard894c3261ddd9
diff --git a/plugins/web-ui/src/composer-loadout.ts b/plugins/web-ui/src/composer-loadout.ts
index 29d373188..89bb3aa64 100644
--- a/plugins/web-ui/src/composer-loadout.ts
+++ b/plugins/web-ui/src/composer-loadout.ts
@@ -68,16 +68,6 @@ export function reconcileLoadout(
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;
diff --git a/plugins/web-ui/src/model-picker.ts b/plugins/web-ui/src/model-picker.ts
index c1302a373..0d892929d 100644
--- a/plugins/web-ui/src/model-picker.ts
+++ b/plugins/web-ui/src/model-picker.ts
@@ -1,6 +1,6 @@
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 { Check, ChevronDown, ChevronRight, Plus, Sparkles, Star, X, Zap } from "lucide";
import { icon, modelMark } from "./ui";
import { getRuntimeConfig, saveRuntimeConfig } from "./runtime-config-store";
import {
@@ -18,7 +18,6 @@ import {
import { modelSupportsFastMode } from "./pi-models";
import {
LOADOUT_CAP,
- reorderLoadout,
effortLevelsForHarness,
compatibleHarnessOptions,
loadoutModelId,
@@ -73,7 +72,6 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
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 {
@@ -90,21 +88,6 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
});
}
- 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 =
@@ -116,12 +99,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
>`;
}
- function loadoutRow(
- entry: LoadoutEntry,
- at: number,
- selected: ModelOption,
- agent: T,
- ): TemplateResult | typeof nothing {
+ function loadoutRow(entry: LoadoutEntry, 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;
@@ -136,67 +114,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
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"
@@ -220,7 +138,6 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
${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
@@ -575,7 +492,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
>
<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-list">${entries.map((entry) => loadoutRow(entry, selected, agent))}</div>
<div
class="loadout-submenu-anchor"
${tip(entries.length >= LOADOUT_CAP ? "Remove a preset to add another." : "")}
@@ -605,7 +522,8 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
openLoadoutSection("add", e.detail === 0);
}}
>
- ${icon(Plus, 16)}<span>Add models</span><span class="loadout-end">${icon(ChevronRight, 14)}</span>
+ <span class="loadout-icon" aria-hidden="true">${icon(Plus, 16)}</span><span>Add models</span
+ ><span class="loadout-end">${icon(ChevronRight, 14)}</span>
</button>
</div>
${
@@ -684,10 +602,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
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"),
+ (button) => button.closest('[role="menu"]') === menu && button.offsetParent !== null,
);
if (!buttons.length) return;
e.preventDefault();
diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.css
index 8910c2dde..daba3f6f5 100644
--- a/plugins/web-ui/src/shell.css
+++ b/plugins/web-ui/src/shell.css
@@ -3800,7 +3800,7 @@ qm-markdown .tok-in {
z-index: 60;
display: flex;
flex-direction: column;
- width: min(360px, calc(100vw - 24px));
+ width: min(280px, calc(100vw - 24px));
max-width: calc(100vw - 24px);
box-sizing: border-box;
margin: 0;
@@ -3824,12 +3824,12 @@ qm-markdown .tok-in {
min-height: 0;
}
.loadout-head {
- padding: 8px 12px 5px;
+ padding: 4px 8px;
font-size: 12.5px;
color: var(--muted-foreground);
}
.loadout-list {
- padding-block: 4px;
+ padding-block: 0;
flex: 1 1 auto;
min-height: 0;
max-height: 304px;
@@ -3838,7 +3838,7 @@ qm-markdown .tok-in {
scrollbar-width: thin;
}
.loadout-row {
- margin-block: 6px;
+ margin-block: 2px;
position: relative;
display: flex;
align-items: center;
@@ -3849,41 +3849,8 @@ qm-markdown .tok-in {
.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-row.active {
+ background: color-mix(in srgb, var(--secondary) 94%, var(--foreground));
}
.loadout-pick {
display: flex;
@@ -3892,7 +3859,7 @@ qm-markdown .tok-in {
gap: 7px;
min-width: 0;
min-height: 34px;
- padding: 7px 8px;
+ padding: 3px 34px 3px 8px;
border: 0;
border-radius: 8px;
background: transparent;
@@ -4161,9 +4128,9 @@ qm-markdown .tok-in {
flex: none;
gap: 9px;
width: 100%;
- min-height: 34px;
+ min-height: 28px;
box-sizing: border-box;
- padding: 7px 8px;
+ padding: 3px 8px;
border: 0;
border-radius: 8px;
background: transparent;
@@ -4175,11 +4142,9 @@ qm-markdown .tok-in {
cursor: pointer;
}
.loadout-add {
+ gap: 7px;
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,
@@ -4216,7 +4181,7 @@ qm-markdown .tok-in {
.loadout-divider {
flex: none;
height: 1px;
- margin: 4px 0;
+ margin: 3px 0;
background: var(--border);
}
.loadout-setting-label {
@@ -4269,15 +4234,23 @@ qm-markdown .tok-in {
display: none;
}
.loadout-submenu .menu-option {
- min-height: 42px;
+ min-height: 30px;
+ align-items: center;
gap: 9px;
+ padding: 4px 8px;
border: 0;
- font-size: 14px;
+ font-size: 13px;
+ line-height: 20px;
}
.loadout-submenu .menu-option-copy {
display: flex;
- flex-direction: column;
- gap: 0;
+ flex: 1;
+ flex-direction: row;
+ align-items: baseline;
+ gap: 8px;
+}
+.loadout-submenu .loadout-meta {
+ font-size: 11px;
}
.loadout-submenu .menu-option-copy > span {
overflow: hidden;
@@ -4348,9 +4321,9 @@ qm-markdown .tok-in {
align-items: center;
flex: none;
gap: 8px;
- min-height: 32px;
- margin-top: 4px;
- padding: 8px 8px 2px;
+ min-height: 28px;
+ margin-top: 3px;
+ padding: 3px 8px 0;
border-top: 1px solid var(--border);
color: var(--muted-foreground);
font-size: 12px;
@@ -4381,9 +4354,9 @@ qm-markdown .tok-in {
.loadout-search input {
width: 100%;
min-width: 0;
- height: 34px;
+ height: 30px;
box-sizing: border-box;
- padding: 6px 9px;
+ padding: 4px 9px;
border: 1px solid var(--border);
border-radius: 6px;
background: var(--background);
@@ -4444,7 +4417,8 @@ qm-markdown .tok-in {
.loadout-add,
.loadout-setting,
.loadout-effort,
- .loadout-back {
+ .loadout-back,
+ .loadout-submenu .menu-option {
min-height: 44px;
}
}
diff --git a/plugins/web-ui/test/composer-loadout.test.ts b/plugins/web-ui/test/composer-loadout.test.ts
index 1728e9683..446bfac91 100644
--- a/plugins/web-ui/test/composer-loadout.test.ts
+++ b/plugins/web-ui/test/composer-loadout.test.ts
@@ -7,7 +7,6 @@ import {
modelLoadoutOptions,
parseLoadout,
reconcileLoadout,
- reorderLoadout,
upsertLoadout,
type LoadoutEntry,
} from "../src/composer-loadout.ts";
@@ -196,17 +195,6 @@ test("the model catalog falls back from unavailable saved harnesses using only c
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),