Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Admin Runtimes card: composer model picker rows and memory recall (#2239)

Regan Bell28211da2ad4e
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 7282c9f2b..424b9198b 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -338,12 +338,15 @@ jobs:
with:
node-version-file: .node-version
cache: npm
- cache-dependency-path: plugins/admin/package-lock.json
+ cache-dependency-path: |
+ plugins/admin/package-lock.json
+ plugins/web-ui/package-lock.json
- name: Install, typecheck, test
if: needs.reuse.outputs.reusable != 'true'
working-directory: plugins/admin
run: |
npm ci
+ npm ci --prefix ../web-ui
npm run typecheck
npm test
- name: Build and boot production image
diff --git a/deploy/admin/Dockerfile b/deploy/admin/Dockerfile
index 4df4235f4..3bdc63ee2 100644
--- a/deploy/admin/Dockerfile
+++ b/deploy/admin/Dockerfile
@@ -8,6 +8,7 @@ RUN npm ci --omit=dev && rm -rf /root/.npm /tmp/node-compile-cache
COPY plugins/admin/src ./src
COPY plugins/admin/ui ./ui
COPY plugins/chassis/src /chassis/src
+COPY plugins/web-ui/src /web-ui/src
COPY plugins/admin/public ./public
COPY plugins/admin/tsconfig.json ./
diff --git a/deploy/web-ui/Dockerfile b/deploy/web-ui/Dockerfile
index 54d23a0c4..42746300d 100644
--- a/deploy/web-ui/Dockerfile
+++ b/deploy/web-ui/Dockerfile
@@ -24,6 +24,7 @@ COPY plugins/admin/src /admin/src
COPY plugins/admin/ui /admin/ui
COPY plugins/admin/public /admin/public
COPY plugins/chassis/src /chassis/src
+COPY plugins/web-ui/src /web-ui/src
COPY --from=build /app/dist-web ./dist-web
ARG GIT_SHA=
diff --git a/plugins/admin/package-lock.json b/plugins/admin/package-lock.json
index 469a35c1e..8fd5f2675 100644
--- a/plugins/admin/package-lock.json
+++ b/plugins/admin/package-lock.json
@@ -10,7 +10,8 @@
"dependencies": {
"@sentry/node": "10.75.0",
"esbuild": "^0.28.1",
- "lit": "^3.3.3"
+ "lit": "^3.3.3",
+ "lucide": "^0.544.0"
},
"devDependencies": {
"@types/jsdom": "^28.0.3",
@@ -1192,6 +1193,12 @@
"node": "20 || >=22"
}
},
+ "node_modules/lucide": {
+ "version": "0.544.0",
+ "resolved": "https://registry.npmjs.org/lucide/-/lucide-0.544.0.tgz",
+ "integrity": "sha512-U5ORwr5z9Sx7bNTDFaW55RbjVdQEnAcT3vws9uz3vRT1G4XXJUDAhRZdxhFoIyHEvjmTkzzlEhjSLYM5n4mb5w==",
+ "license": "ISC"
+ },
"node_modules/mdn-data": {
"version": "2.27.1",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
diff --git a/plugins/admin/package.json b/plugins/admin/package.json
index b5387b996..26549fb85 100644
--- a/plugins/admin/package.json
+++ b/plugins/admin/package.json
@@ -21,6 +21,7 @@
"dependencies": {
"@sentry/node": "10.75.0",
"esbuild": "^0.28.1",
- "lit": "^3.3.3"
+ "lit": "^3.3.3",
+ "lucide": "^0.544.0"
}
}
diff --git a/plugins/admin/public/admin-components.css b/plugins/admin/public/admin-components.css
index 980677b4b..fe19b3dfb 100644
--- a/plugins/admin/public/admin-components.css
+++ b/plugins/admin/public/admin-components.css
@@ -42,7 +42,8 @@
.model-chip button,
.emoji-picker-grid button,
.ovmenu button,
- .dd-btn
+ .dd-btn,
+ .loadout-control button
)
) {
min-height: var(--control-height);
@@ -98,7 +99,7 @@
input:not([type="checkbox"]):not([type="radio"]):not([type="hidden"]):not([type="file"]):not([type="color"]):not(
:where(.admin-search input)
),
-:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) select,
+:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) select:not(.loadout-button),
:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) textarea,
:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) .dd > .dd-btn {
min-height: var(--control-height);
@@ -119,7 +120,7 @@
}
:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) input:disabled,
-:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) select:disabled,
+:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) select:not(.loadout-button):disabled,
:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) textarea:disabled,
:where(html body[data-admin-kit="true"]) :is(#app-view #main, dialog) .dd > .dd-btn:disabled {
background: var(--subtle);
diff --git a/plugins/admin/public/index.html b/plugins/admin/public/index.html
index 1792c4519..4950a35f6 100644
--- a/plugins/admin/public/index.html
+++ b/plugins/admin/public/index.html
@@ -5310,20 +5310,51 @@
height: 18px;
accent-color: var(--cta);
}
- #view-governance .model-runtime-fields {
+ #view-governance {
+ --foreground: var(--text);
+ --muted-foreground: var(--muted);
+ --secondary: var(--subtle);
+ --background: var(--surface);
+ --popover: var(--surface);
+ --font-12-5: 12.5px;
+ --font-13: 13px;
+ --font-14: 14px;
+ --radius-sm: 6px;
+ --chat-surface-shadow: 0 8px 24px rgba(16, 24, 40, 0.12);
+ }
+ #view-governance #card-runtimes > .runtime-rows,
+ #view-governance .runtime-row {
display: grid;
- gap: 12px;
+ grid-column: 1 / -1;
+ grid-template-columns: subgrid;
+ align-items: center;
}
- #view-governance .model-runtime-fields label {
- margin: 0 0 4px;
+ #view-governance .runtime-row {
+ min-height: 40px;
}
- #view-governance .model-runtime-fields .dd,
- #view-governance .model-runtime-fields select {
- width: 100%;
- max-width: none;
+ #view-governance .runtime-label {
+ font-size: var(--section-font, 14px);
+ font-weight: 500;
}
- #view-governance #base-fast-mode-control {
- margin-top: 16px;
+ #view-governance .runtime-row .loadout-control {
+ justify-self: start;
+ }
+ #view-governance .runtime-hint {
+ grid-column: 2;
+ margin: 0;
+ }
+ #view-governance .runtime-row select.loadout-button {
+ appearance: none;
+ padding-right: 26px;
+ border-radius: 8px;
+ font-weight: 500;
+ }
+ #view-governance .runtime-row select.loadout-button + svg {
+ position: absolute;
+ right: 8px;
+ top: 50%;
+ transform: translateY(-50%);
+ pointer-events: none;
}
#view-governance .setting-toggle input:checked + .setting-switch {
border-color: var(--cta);
@@ -5332,23 +5363,6 @@
#view-governance .setting-toggle input:focus-visible + .setting-switch {
outline-color: var(--cta);
}
- #view-governance #base-fast-mode-control strong,
- #view-governance #base-fast-mode-control small {
- font-size: 13px;
- font-weight: 400;
- line-height: 1.4;
- }
- #view-governance #base-fast-mode-control .setting-copy {
- display: flex;
- flex-wrap: wrap;
- align-items: baseline;
- column-gap: 8px;
- row-gap: 0;
- }
- #view-governance #base-fast-mode-control small {
- color: var(--muted);
- margin: 0;
- }
.model-list {
display: flex;
flex-wrap: wrap;
@@ -6537,7 +6551,7 @@
<h2>Models &amp; browsing</h2>
<p>The models, browser runtime, and organization context available on future turns.</p>
</div>
- <template data-settings-card="card-base-model"></template>
+ <template data-settings-card="card-runtimes"></template>
<template data-settings-card="card-webui-models"></template>
<template data-settings-card="card-branding"></template>
<template data-settings-card="card-feature-flags"></template>
@@ -6660,10 +6674,7 @@
$("card-feature-flags").classList.remove("hidden");
[
- $("card-base-model"),
- $("card-cron-runtime"),
- $("card-subagent-runtime"),
- $("card-fallback-runtime"),
+ $("card-runtimes"),
providers,
$("card-webui-models"),
$("card-soul"),
@@ -8054,6 +8065,7 @@
governanceUI.settings.load(r.data, scope, "subagent-runtime");
governanceUI.settings.load(r.data, scope, "fallback-runtime");
governanceUI.settings.load(r.data, scope, "webui-models");
+ governanceUI.settings.load(r.data, scope, "memory-embedding-model");
}
refreshModelChoices.push(() => governanceUI.settings.updateCatalog(r.data));
if (requestedView === "customize") {
@@ -8559,6 +8571,7 @@
"subagent-runtime": "st-subagent-runtime",
"fallback-runtime": "st-fallback-runtime",
"webui-models": "st-webui-models",
+ "memory-embedding-model": "st-memory-embedding-model",
"ack-emoji": "st-ack-emoji",
branding: "st-branding",
};
@@ -8815,97 +8828,99 @@
);
};
- document.querySelectorAll("[data-save]").forEach((btn) => {
- btn.onclick = async () => {
- const key = btn.dataset.save;
- const requestedScope = scope;
- const requestedGeneration = governanceReq;
- let body;
- try {
- body = SAVE[key]();
- } catch (err) {
- setStatus(SAVE_ST[key], err instanceof Error ? err.message : "Could not save.", "err");
- return;
- }
- if (
- !(await governanceSaveReview(key, body)) ||
- requestedScope !== scope ||
- requestedGeneration !== governanceReq
- )
- return;
- const saveRequest = String(++governanceSaveSeq);
+ async function saveSetting(key, btn) {
+ const requestedScope = scope;
+ const requestedGeneration = governanceReq;
+ let body;
+ try {
+ body = SAVE[key]();
+ } catch (err) {
+ setStatus(SAVE_ST[key], err instanceof Error ? err.message : "Could not save.", "err");
+ return;
+ }
+ if (
+ !(await governanceSaveReview(key, body)) ||
+ requestedScope !== scope ||
+ requestedGeneration !== governanceReq
+ )
+ return;
+ const saveRequest = String(++governanceSaveSeq);
+ if (btn) {
btn.dataset.saveRequest = saveRequest;
btn.disabled = true;
- setStatus(SAVE_ST[key], "Saving...", "saving", true);
- const isBranding = key === "branding";
- const brandingBody = isBranding ? { ...savedBranding, ...body } : body;
- const r = await api(
- "PUT",
- "/api/scopes/" + encodeURIComponent(requestedScope) + "/" + (isBranding ? "branding" : key),
- brandingBody,
- );
- if (requestedGeneration !== governanceReq) return;
- if (requestedScope !== scope) {
- if (btn.dataset.saveRequest === saveRequest) {
+ }
+ setStatus(SAVE_ST[key], "Saving...", "saving", true);
+ const isBranding = key === "branding";
+ const brandingBody = isBranding ? { ...savedBranding, ...body } : body;
+ const r = await api(
+ "PUT",
+ "/api/scopes/" + encodeURIComponent(requestedScope) + "/" + (isBranding ? "branding" : key),
+ brandingBody,
+ );
+ if (requestedGeneration !== governanceReq) return;
+ if (requestedScope !== scope) {
+ if (!btn || btn.dataset.saveRequest === saveRequest) {
+ if (btn) {
delete btn.dataset.saveRequest;
btn.disabled = !btn.classList.contains("dirty");
- setStatus(SAVE_ST[key], "", "");
}
- return;
+ setStatus(SAVE_ST[key], "", "");
}
- if (btn.dataset.saveRequest === saveRequest) delete btn.dataset.saveRequest;
- if (r.ok) {
- if (governanceUI.owns(key)) {
- governanceUI.commit(key, body);
- sectionSnapshots.set(key, JSON.stringify(body));
- if (isBranding) {
- savedBranding = brandingBody;
- if (!hasGovernanceDraft()) location.reload();
- return;
- }
- if (key === "soul") {
- const fresh = await api("GET", "/api/scopes/" + encodeURIComponent(requestedScope) + "?view=customize");
- if (requestedScope !== scope || requestedGeneration !== governanceReq) return;
- if (fresh.ok) {
- governanceUI.settings.refreshSoul(fresh.data);
- sectionSnapshots.set(key, governanceUI.states.get(key).baseline);
- if (!governanceUI.states.get(key).dirty) governanceUI.status(key, "Saved", "ok");
- } else governanceUI.status(key, "Saved, but the latest version could not be refreshed.", "warn");
- return;
- }
- if (key === "command-policy") loadedCommandPolicyPresent = true;
- if (["security-posture", "sharing-posture", "ambient-policy", "auto-flagger"].includes(key)) {
- const fresh = await api(
- "GET",
- "/api/scopes/" + encodeURIComponent(requestedScope) + "?view=governance",
- );
- if (requestedScope !== scope || requestedGeneration !== governanceReq) return;
- if (fresh.ok && !governanceUI.states.get(key).dirty) {
- governanceUI.load(fresh.data, requestedScope, key);
- sectionSnapshots.set(key, JSON.stringify(governanceUI.collect(key)));
- governanceUI.status(key, "Saved", "ok");
- }
- }
+ return;
+ }
+ if (btn?.dataset.saveRequest === saveRequest) delete btn.dataset.saveRequest;
+ if (r.ok) {
+ if (governanceUI.owns(key)) {
+ governanceUI.commit(key, body);
+ sectionSnapshots.set(key, JSON.stringify(body));
+ if (isBranding) {
+ savedBranding = brandingBody;
+ if (!hasGovernanceDraft()) location.reload();
return;
- } else if (SAVE_RELOADS.has(key)) await loadScope();
- else {
- if (key === "command-policy") loadedCommandPolicyPresent = true;
- captureSection(key);
}
- setStatus(SAVE_ST[key], "Saved", "ok");
- } else {
- if (key === "soul" && r.status === 409) await refreshSoulConflict();
- updateSectionDirty(key);
- let message = r.data?.message || "Save failed.";
- if (key === "soul" && r.status === 409) {
- message = "SOUL changed; latest revision loaded and your draft was preserved.";
- } else if (r.status === 403) {
- message = "Not authorized for this scope.";
+ if (key === "soul") {
+ const fresh = await api("GET", "/api/scopes/" + encodeURIComponent(requestedScope) + "?view=customize");
+ if (requestedScope !== scope || requestedGeneration !== governanceReq) return;
+ if (fresh.ok) {
+ governanceUI.settings.refreshSoul(fresh.data);
+ sectionSnapshots.set(key, governanceUI.states.get(key).baseline);
+ if (!governanceUI.states.get(key).dirty) governanceUI.status(key, "Saved", "ok");
+ } else governanceUI.status(key, "Saved, but the latest version could not be refreshed.", "warn");
+ return;
+ }
+ if (key === "command-policy") loadedCommandPolicyPresent = true;
+ if (["security-posture", "sharing-posture", "ambient-policy", "auto-flagger"].includes(key)) {
+ const fresh = await api("GET", "/api/scopes/" + encodeURIComponent(requestedScope) + "?view=governance");
+ if (requestedScope !== scope || requestedGeneration !== governanceReq) return;
+ if (fresh.ok && !governanceUI.states.get(key).dirty) {
+ governanceUI.load(fresh.data, requestedScope, key);
+ sectionSnapshots.set(key, JSON.stringify(governanceUI.collect(key)));
+ governanceUI.status(key, "Saved", "ok");
+ }
}
- setStatus(SAVE_ST[key], message, "err");
+ return;
+ } else if (SAVE_RELOADS.has(key)) await loadScope();
+ else {
+ if (key === "command-policy") loadedCommandPolicyPresent = true;
+ captureSection(key);
}
- };
+ setStatus(SAVE_ST[key], "Saved", "ok");
+ } else {
+ if (key === "soul" && r.status === 409) await refreshSoulConflict();
+ updateSectionDirty(key);
+ let message = r.data?.message || "Save failed.";
+ if (key === "soul" && r.status === 409) {
+ message = "SOUL changed; latest revision loaded and your draft was preserved.";
+ } else if (r.status === 403) {
+ message = "Not authorized for this scope.";
+ }
+ setStatus(SAVE_ST[key], message, "err");
+ }
+ }
+ document.querySelectorAll("[data-save]").forEach((btn) => {
+ btn.onclick = () => saveSetting(btn.dataset.save, btn);
});
+ governanceUI.settings.configureRuntimes({ save: (key) => saveSetting(key) });
$("view-governance").addEventListener("input", (e) => {
if (!(
e.target instanceof HTMLInputElement ||
@@ -8941,7 +8956,8 @@
sel.dataset.ddHost ||
sel.hasAttribute("hidden") ||
sel.multiple ||
- sel.size > 1
+ sel.size > 1 ||
+ sel.closest(".loadout-control")
)
return;
sel.dataset.ddHost = "1";
diff --git a/plugins/admin/src/governance-bundle.ts b/plugins/admin/src/governance-bundle.ts
index 512045ed3..f5f98d3b9 100644
--- a/plugins/admin/src/governance-bundle.ts
+++ b/plugins/admin/src/governance-bundle.ts
@@ -12,6 +12,9 @@ export function buildGovernanceUI(): string {
target: "es2022",
minify: true,
legalComments: "none",
+ alias: Object.fromEntries(
+ ["lit", "lucide"].map((name) => [name, fileURLToPath(new URL(`../node_modules/${name}`, import.meta.url))]),
+ ),
});
return result.outputFiles[0]!.text.replace(/<\/script/gi, "<\\/script");
}
diff --git a/plugins/admin/src/index.ts b/plugins/admin/src/index.ts
index 105f64184..450979e8f 100644
--- a/plugins/admin/src/index.ts
+++ b/plugins/admin/src/index.ts
@@ -39,7 +39,9 @@ const BASE_HTML = readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..
"<style data-admin-components></style>",
() =>
"<style data-admin-components>" +
- readFileSync(join(dirname(fileURLToPath(import.meta.url)), "../public/admin-components.css"), "utf8") +
+ ["../../web-ui/src/model-picker.css", "../../web-ui/src/tooltip.css", "../public/admin-components.css"]
+ .map((path) => readFileSync(join(dirname(fileURLToPath(import.meta.url)), path), "utf8"))
+ .join("\n") +
"</style>",
);
const BRAND_MARK = readFileSync(join(dirname(fileURLToPath(import.meta.url)), "../public/brand-mark.svg"));
diff --git a/plugins/admin/test/branding.test.ts b/plugins/admin/test/branding.test.ts
index 2165b783d..db6b11f3f 100644
--- a/plugins/admin/test/branding.test.ts
+++ b/plugins/admin/test/branding.test.ts
@@ -104,7 +104,7 @@ test("design system routes embed the shared component library and retain the scr
assert.equal(response.status, 200);
const html = await response.text();
const css = readFileSync(new URL("../public/admin-components.css", import.meta.url), "utf8");
- assert.ok(html.includes("<style data-admin-components>" + css + "</style>"));
+ assert.ok(html.includes(css + "</style>"));
const script = html.match(/<script>([\s\S]*?)<\/script>/i)?.[1];
assert.ok(script);
const hash = createHash("sha256").update(script).digest("base64");
diff --git a/plugins/admin/test/default-view.test.ts b/plugins/admin/test/default-view.test.ts
index c64d09f83..9d7da5217 100644
--- a/plugins/admin/test/default-view.test.ts
+++ b/plugins/admin/test/default-view.test.ts
@@ -240,15 +240,11 @@ test("governance renders simple settings as compact rows with contextual actions
});
test("default runtime controls save reasoning level and fast mode", () => {
- for (const id of ["base-effort", "base-fast-mode", "base-fast-mode-control"])
- assert.match(html, new RegExp(`id="${id}"`));
loadSettings(
{
baseModelOptions: [{ id: "a" }],
baseModelDefault: "a",
runtime: { harnessId: "pi", modelId: "a", effortLevel: "high", fastMode: true },
- thinkingLevelsByHarness: { pi: ["auto", "high"] },
- fastModeHarnessIds: ["pi"],
fastModeModelIds: ["a"],
},
"org:test",
@@ -428,7 +424,6 @@ test("admin parity views expose the requested card groups and real navigation ac
"Ambient reply policy",
"Egress policy",
"External Slack audience",
- "Conversation runtime",
"Custom providers",
"Enabled models",
"Organization SOUL",
diff --git a/plugins/admin/test/onboarding-view.test.ts b/plugins/admin/test/onboarding-view.test.ts
index ee7e9de34..f15bcebf9 100644
--- a/plugins/admin/test/onboarding-view.test.ts
+++ b/plugins/admin/test/onboarding-view.test.ts
@@ -257,3 +257,130 @@ test("pending onboarding reads preserve the provider associated with a newly ent
assert.equal(key.value, "test-only-key");
dom.window.close();
});
+
+test("embedding models register through the model registry without a chat lookup", async () => {
+ const { dom, controller } = fixture();
+ const calls: any[] = [];
+ controller.context.api = async (...args: any[]) => {
+ calls.push(args);
+ if (args[1] === "/api/model-registry")
+ return {
+ ok: true,
+ data: {
+ models: [
+ {
+ spec: { ...args[2], kind: "embedding", id: "text-embedding-3-small", name: "Small", provider: "openai" },
+ verifiedAt: 1,
+ },
+ ],
+ },
+ };
+ return { ok: true, data: {} };
+ };
+ const $ = (id: string) => dom.window.document.getElementById(id) as HTMLInputElement;
+ $("model-registry-kind").value = "embedding";
+ $("model-registry-kind").dispatchEvent(new dom.window.Event("change"));
+ assert.equal(($("model-registry-provider") as unknown as HTMLSelectElement).disabled, true);
+ assert.equal($("model-registry-lookup").closest(".foot")!.hasAttribute("hidden"), true);
+ $("model-registry-id").value = "text-embedding-3-small";
+ $("model-registry-id").dispatchEvent(new dom.window.Event("input"));
+ $("model-registry-name").value = "Small";
+ $("model-registry-name").dispatchEvent(new dom.window.Event("input"));
+ await controller.verify();
+ assert.deepEqual(JSON.parse(JSON.stringify(calls[0])), [
+ "PUT",
+ "/api/model-registry/text-embedding-3-small",
+ { kind: "embedding", name: "Small", provider: "openai", verify: true },
+ ]);
+ assert.match($("st-model-registry").textContent!, /Recall runtime/);
+ await controller.loadRegistry();
+ assert.match($("model-registry-rows").textContent!, /Small \(text-embedding-3-small\)[\s\S]*Embedding/);
+ dom.window.close();
+});
+
+test("saving another provider's key can keep the current base model", async () => {
+ const { dom, controller } = fixture();
+ const calls: string[] = [];
+ controller.context.api = async (method: string, path: string) => {
+ calls.push(method + " " + path);
+ if (path.startsWith("/api/model-providers"))
+ return {
+ ok: true,
+ data: {
+ providers: UNCONFIGURED_PROVIDERS,
+ models: [...ANTHROPIC_MODELS, { id: "gpt-test", name: "GPT test", provider: "openai" }],
+ },
+ };
+ if (path.includes("?view=onboarding")) return { ok: true, data: { baseModel: "first-option" } };
+ return { ok: true, data: {} };
+ };
+ await controller.load();
+ const provider = dom.window.document.querySelector<HTMLSelectElement>("#onboarding-model-provider")!;
+ provider.value = "openai";
+ provider.dispatchEvent(new dom.window.Event("change"));
+ const model = dom.window.document.querySelector<HTMLSelectElement>("#onboarding-model-id")!;
+ assert.equal(model.options[model.options.length - 1]!.textContent, "Keep current base model (first-option)");
+ assert.equal(model.value, "gpt-test");
+ model.value = "";
+ model.dispatchEvent(new dom.window.Event("change"));
+ controller.apiKey = "sk-test";
+ calls.length = 0;
+ await controller.connect();
+ assert.ok(calls.includes("PUT /api/model-providers/openai"));
+ assert.ok(!calls.some((call) => call.endsWith("/base-model")));
+ assert.match(controller.providerMessage, /base model is unchanged/);
+ dom.window.close();
+});
+
+test("a rejected base model change shows the server's reason", async () => {
+ const { dom, controller } = fixture();
+ controller.context.api = async (method: string, path: string) => {
+ if (method === "PUT" && path.endsWith("/base-model"))
+ return { ok: false, data: { message: "model_not_supported" } };
+ if (path.startsWith("/api/model-providers"))
+ return { ok: true, data: { providers: UNCONFIGURED_PROVIDERS, models: ANTHROPIC_MODELS } };
+ return { ok: true, data: {} };
+ };
+ await controller.load();
+ controller.apiKey = "sk-test";
+ controller.model = ANTHROPIC_MODELS[0]!.id;
+ await controller.connect();
+ assert.equal(controller.providerMessage, "Key saved, but the base model could not be changed: model_not_supported");
+ assert.equal(controller.providerTone, "err");
+ dom.window.close();
+});
+
+test("a pending onboarding load keeps an explicit keep-current-base-model choice", async () => {
+ const { dom, controller } = fixture();
+ let complete: (response: unknown) => void = () => {};
+ controller.baseModel = "first-option";
+ controller.models = {
+ anthropic: ANTHROPIC_MODELS,
+ openai: [{ id: "gpt-test", name: "GPT test", provider: "openai" }],
+ };
+ controller.context.api = async (_method: string, path: string) => {
+ if (path === "/api/model-providers?catalog=cached")
+ return new Promise((resolve) => {
+ complete = resolve;
+ });
+ if (path.includes("?view=onboarding")) return { ok: true, data: { baseModel: "first-option" } };
+ return { ok: true, data: {} };
+ };
+ const pending = controller.load();
+ const provider = dom.window.document.querySelector<HTMLSelectElement>("#onboarding-model-provider")!;
+ provider.value = "openai";
+ provider.dispatchEvent(new dom.window.Event("change"));
+ const model = dom.window.document.querySelector<HTMLSelectElement>("#onboarding-model-id")!;
+ model.value = "";
+ model.dispatchEvent(new dom.window.Event("change"));
+ complete({
+ ok: true,
+ data: {
+ providers: UNCONFIGURED_PROVIDERS,
+ models: [...ANTHROPIC_MODELS, { id: "gpt-test", name: "GPT test", provider: "openai" }],
+ },
+ });
+ await pending;
+ assert.equal(controller.model, "");
+ dom.window.close();
+});
diff --git a/plugins/admin/test/settings-lit.test.ts b/plugins/admin/test/settings-lit.test.ts
index 550318aee..ea2ec3e7b 100644
--- a/plugins/admin/test/settings-lit.test.ts
+++ b/plugins/admin/test/settings-lit.test.ts
@@ -25,30 +25,11 @@ const models = {
harnessDefault: "pi",
harnessOptions: ["pi", "codex"],
modelsByHarness: { pi: [{ id: "a", name: "Alpha" }], codex: [{ id: "b", name: "Beta" }] },
- thinkingLevelsByHarness: { pi: ["auto", "high"], codex: ["low"] },
runtime: { harnessId: "pi", modelId: "a", effortLevel: "high", fastMode: true },
- fastModeHarnessIds: ["pi"],
fastModeModelIds: ["a"],
webuiModels: [],
};
-test("runtime selection derives compatible model, reasoning, and fast mode from state", () => {
- const dom = setup();
- try {
- dom.window.eval("settingsUI.load(" + JSON.stringify(models) + ',"org:test","runtime")');
- const input = dom.window.document.getElementById("base-harness") as HTMLSelectElement;
- input.value = "codex";
- input.dispatchEvent(new dom.window.Event("change", { bubbles: true }));
- assert.deepEqual(JSON.parse(String(dom.window.eval('JSON.stringify(settingsUI.collect("runtime"))'))), {
- harnessId: "codex",
- modelId: "b",
- effortLevel: "low",
- fastMode: false,
- });
- assert.equal((dom.window.document.querySelector('[data-save="runtime"]') as HTMLButtonElement).disabled, false);
- } finally {
- dom.window.close();
- }
-});
+
test("model chips add and remove with stable keyed rendering", () => {
const dom = setup();
try {
@@ -161,86 +142,3 @@ test("credential save acknowledges its submitted snapshot and retains newer edit
dom.window.close();
}
});
-
-test("runtime reasoning choices follow the selected model and offer the current default", () => {
- const dom = setup();
- try {
- const data = {
- ...models,
- modelsByHarness: {
- pi: [
- { id: "a", effortLevels: ["auto", "adaptive", "default", "high"] },
- { id: "b", effortLevels: ["auto", "high"] },
- ],
- },
- thinkingLevelsByHarness: { pi: ["auto", "adaptive", "default", "high"] },
- runtime: { harnessId: "pi", modelId: "a", effortLevel: "auto" },
- };
- dom.window.eval("settingsUI.load(" + JSON.stringify(data) + ',"org:test","runtime")');
- const select = () => dom.window.document.getElementById("base-effort") as HTMLSelectElement;
- const choices = () => [...select().options].map((option) => [option.value, option.textContent]);
- assert.deepEqual(choices(), [
- ["auto", "Default"],
- ["adaptive", "Auto"],
- ["default", "Provider default"],
- ["high", "High"],
- ]);
- select().value = "adaptive";
- select().dispatchEvent(new dom.window.Event("change"));
- assert.equal(dom.window.eval('settingsUI.collect("runtime").effortLevel'), "adaptive");
- assert.equal(
- choices().some(([value]) => value === "auto"),
- false,
- );
- dom.window.eval('settingsUI.states.get("runtime").change("modelId", "b")');
- assert.deepEqual(choices(), [["high", "High"]]);
- assert.equal(dom.window.eval('settingsUI.collect("runtime").effortLevel'), "high");
- dom.window.eval(
- 'settingsUI.states.get("runtime").context.modelsByHarness.pi = [{id:"b"}]; settingsUI.states.get("runtime").changed()',
- );
- assert.deepEqual(choices(), [["high", "High"]]);
- } finally {
- dom.window.close();
- }
-});
-
-test("purpose runtime cards independently set and clear overrides using the runtime editor", () => {
- const dom = setup();
- try {
- dom.window.eval(
- "settingsUI.load(" +
- JSON.stringify({ ...models, cronRuntime: null, subagentRuntime: null, fallbackRuntime: null }) +
- ',"org:test")',
- );
- const doc = dom.window.document;
- for (const key of ["cron-runtime", "subagent-runtime", "fallback-runtime"]) {
- const collect = () => JSON.parse(String(dom.window.eval(`JSON.stringify(settingsUI.collect("${key}"))`)));
- assert.deepEqual(collect(), { inherit: true });
- assert.equal(doc.querySelectorAll(`#card-${key}`).length, 1);
- assert.equal((doc.getElementById(`${key}-harness`) as HTMLSelectElement).disabled, true);
- (doc.getElementById(`${key}-inherit`) as HTMLInputElement).click();
- const harness = doc.getElementById(`${key}-harness`) as HTMLSelectElement;
- harness.value = "codex";
- harness.dispatchEvent(new dom.window.Event("change"));
- assert.deepEqual(collect(), { harnessId: "codex", modelId: "b", effortLevel: "auto", fastMode: false });
- (doc.getElementById(`${key}-inherit`) as HTMLInputElement).click();
- assert.deepEqual(collect(), { inherit: true });
- assert.equal(dom.window.eval(`settingsUI.states.get("${key}").dirty`), false);
- }
- assert.equal(dom.window.eval('settingsUI.collect("runtime").fastMode'), true);
- dom.window.eval(
- "settingsUI.load(" +
- JSON.stringify({
- ...models,
- cronRuntime: { harnessId: "codex", modelId: "b", effortLevel: "low", fastMode: false },
- subagentRuntime: null,
- fallbackRuntime: null,
- }) +
- ',"org:test")',
- );
- assert.equal((doc.getElementById("cron-runtime-inherit") as HTMLInputElement).checked, false);
- assert.equal((doc.getElementById("cron-runtime-model") as HTMLSelectElement).value, "b");
- } finally {
- dom.window.close();
- }
-});
diff --git a/plugins/admin/test/settings-load.test.ts b/plugins/admin/test/settings-load.test.ts
index 558eb9073..72affc237 100644
--- a/plugins/admin/test/settings-load.test.ts
+++ b/plugins/admin/test/settings-load.test.ts
@@ -103,10 +103,7 @@ test("catalog completion appends options only to the requesting settings view",
});
test("branding saves commit the Lit draft and preserve unrelated settings", async () => {
- const source = extract(
- 'document.querySelectorAll("[data-save]").forEach',
- '$("view-governance").addEventListener("input"',
- );
+ const source = extract("async function saveSetting(key, btn) {", '$("view-governance").addEventListener("input"');
for (const otherDraft of [false, true]) {
const f = litFixture();
try {
@@ -299,20 +296,34 @@ test("admin shell calls resolve against the shipped Lit bundle", () => {
}
});
-test("models view loads and saves purpose cards through the real page handlers", async () => {
+const meta = (id: string) => ({
+ id,
+ name: id,
+ label: id,
+ buttonLabel: id,
+ provider: "openai",
+ api: "openai-responses",
+});
+
+test("models view saves runtime rows through the composer picker and real page handlers", async () => {
const f = litFixture();
try {
- f.root.innerHTML = '<template data-settings-card="card-base-model"></template>';
- f.ui.settings.mountCards();
+ f.window.requestAnimationFrame = () => 0;
+ f.root.innerHTML = '<template data-settings-card="card-runtimes"></template>';
+ f.ui.mountCards();
const data = {
baseModelDefault: "model",
baseModelOptions: [{ id: "model" }],
harnessOptions: ["pi"],
- thinkingLevelsByHarness: { pi: ["auto", "low"] },
- runtime: null,
+ modelsByHarness: { pi: [{ id: "model" }, { id: "fast" }] },
+ modelCatalog: { model: meta("model"), fast: meta("fast") },
+ fastModeModelIds: ["fast"],
+ runtime: { harnessId: "pi", modelId: "fast", effortLevel: "auto", fastMode: false },
cronRuntime: null,
subagentRuntime: null,
fallbackRuntime: null,
+ memoryEmbeddingModel: null,
+ memoryEmbeddingOptions: [{ id: "gateway/embed", name: "embed", provider: "qm:gateway" }],
};
const requests: any[] = [];
const context = vm.createContext({
@@ -323,6 +334,7 @@ test("models view loads and saves purpose cards through the real page handlers",
scope: "org:test",
governanceReq: 1,
governanceSaveSeq: 0,
+ refreshModelChoices: [],
sectionSnapshots: new Map(),
governanceSaveReview: async () => true,
setStatus: (id: string, message: string, tone: string) => f.ui.status(id.replace(/^st-/, ""), message, tone),
@@ -334,23 +346,85 @@ test("models view loads and saves purpose cards through the real page handlers",
vm.runInContext(extract('if (requestedView === "models") {', "refreshModelChoices.push"), context);
vm.runInContext(extract("const SAVE = Object.fromEntries(", "const sectionSnapshots ="), context);
vm.runInContext(
- extract('document.querySelectorAll("[data-save]").forEach', '$("view-governance").addEventListener("input"'),
+ extract("async function saveSetting(key, btn) {", '$("view-governance").addEventListener("input"'),
context,
);
- for (const key of ["cron-runtime", "subagent-runtime", "fallback-runtime"]) {
- assert.equal(f.document.getElementById(`card-${key}`)!.classList.contains("hidden"), false);
- const button = f.document.querySelector<HTMLButtonElement>(`[data-save="${key}"]`)!;
- (f.document.getElementById(`${key}-inherit`) as HTMLInputElement).click();
- await button.onclick!(new f.window.PointerEvent("click"));
- assert.equal(requests.at(-1)[1], `/api/scopes/org%3Atest/${key}`);
- assert.equal(requests.at(-1)[2].modelId, "model");
- assert.equal(f.ui.states.get(key).dirty, false);
- (f.document.getElementById(`${key}-inherit`) as HTMLInputElement).click();
- await button.onclick!(new f.window.PointerEvent("click"));
- assert.equal(JSON.stringify(requests.at(-1)[2]), '{"inherit":true}');
+ const plain = (value: unknown) => JSON.parse(JSON.stringify(value));
+ const row = (key: string) => f.document.querySelector(`[data-runtime-row="${key}"]`)!;
+ const open = (key: string) => row(key).querySelector<HTMLButtonElement>(".loadout-button")!.click();
+ const save = async () => {
+ f.document.getElementById("runtimes-save")!.click();
+ for (let i = 0; i < 5; i++) await setImmediate();
+ };
+
+ assert.equal(row("cron-runtime").querySelector(".menu-label")!.textContent, "Job's scope default");
+ open("cron-runtime");
+ assert.deepEqual(
+ [...row("cron-runtime").querySelectorAll(".loadout-pick .loadout-name")].map((name) => name.textContent),
+ ["model", "fast"],
+ );
+ for (const preset of ['[data-loadout-section="add"]', ".loadout-head", ".loadout-remove"])
+ assert.equal(row("cron-runtime").querySelector(preset), null);
+ row("cron-runtime").querySelector<HTMLButtonElement>(".loadout-pick")!.click();
+ assert.deepEqual(plain(f.ui.collect("cron-runtime")), {
+ harnessId: "pi",
+ modelId: "model",
+ effortLevel: "auto",
+ fastMode: false,
+ });
+
+ open("runtime");
+ row("runtime").querySelector<HTMLButtonElement>('button[aria-label="Fast"]')!.click();
+ row("runtime").querySelector<HTMLButtonElement>('[data-loadout-section="effort"]')!.click();
+ [...row("runtime").querySelectorAll<HTMLButtonElement>(".loadout-effort")]
+ .find((button) => button.textContent!.trim() === "High")!
+ .click();
+ assert.deepEqual(plain(f.ui.collect("runtime")), {
+ harnessId: "pi",
+ modelId: "fast",
+ effortLevel: "high",
+ fastMode: true,
+ });
+
+ const recall = row("memory-embedding-model").querySelector("select")!;
+ const pickRecall = (modelId: string) => {
+ recall.value = modelId;
+ recall.dispatchEvent(new f.window.Event("change"));
+ };
+ assert.deepEqual(
+ [...recall.options].map((option) => option.value),
+ ["", "gateway/embed"],
+ );
+ pickRecall("gateway/embed");
+ assert.deepEqual(plain(f.ui.collect("memory-embedding-model")), { modelId: "gateway/embed" });
+
+ await save();
+ assert.deepEqual(plain(requests.map(([method, path, body]) => [method, path, body])), [
+ [
+ "PUT",
+ "/api/scopes/org%3Atest/runtime",
+ { harnessId: "pi", modelId: "fast", effortLevel: "high", fastMode: true },
+ ],
+ [
+ "PUT",
+ "/api/scopes/org%3Atest/cron-runtime",
+ { harnessId: "pi", modelId: "model", effortLevel: "auto", fastMode: false },
+ ],
+ ["PUT", "/api/scopes/org%3Atest/memory-embedding-model", { modelId: "gateway/embed" }],
+ ]);
+ for (const key of ["runtime", "cron-runtime", "memory-embedding-model"])
assert.equal(f.ui.states.get(key).dirty, false);
- assert.ok(html.includes(`$("card-${key}"),`));
- }
+
+ assert.equal(f.window.localStorage.length, 0);
+ open("cron-runtime");
+ row("cron-runtime").querySelector<HTMLButtonElement>(".loadout-foot-btn")!.click();
+ pickRecall("");
+ await save();
+ assert.deepEqual(plain(requests.slice(3).map(([, path, body]) => [path, body])), [
+ ["/api/scopes/org%3Atest/cron-runtime", { inherit: true }],
+ ["/api/scopes/org%3Atest/memory-embedding-model", { modelId: null }],
+ ]);
+ assert.equal(row("cron-runtime").querySelector(".menu-label")!.textContent, "Job's scope default");
} finally {
f.dom.window.close();
}
diff --git a/plugins/admin/ui/onboarding.ts b/plugins/admin/ui/onboarding.ts
index cb0c9e39c..2702ffef4 100644
--- a/plugins/admin/ui/onboarding.ts
+++ b/plugins/admin/ui/onboarding.ts
@@ -22,6 +22,12 @@ const flagLabels: Record<string, string> = {
auxiliary: "Eligible for auxiliary tasks",
};
const errorText = (error: unknown) => (error instanceof Error ? error.message : "Request failed.");
+function providerSavedMessage(modelId: string, selected: { ok: boolean; data?: Data }) {
+ if (!modelId) return "Key saved. The base model is unchanged.";
+ if (selected.ok) return "Key and base model saved.";
+ return "Key saved, but the base model could not be changed: " + (selected.data?.message || "the server rejected it.");
+}
+
export class Onboarding {
context: Data;
models: Record<string, Data[]> = {};
@@ -35,6 +41,9 @@ export class Onboarding {
providerTone = "";
providerBusy = false;
registryProvider = "openai";
+ registryKind = "chat";
+ baseModel = "";
+ keepBaseModel = false;
registryId = "";
editing = false;
providerLocked = false;
@@ -97,7 +106,9 @@ export class Onboarding {
this.providerLocked = Boolean(spec?.provider);
this.registryId = spec?.id || "";
this.registryProvider = spec?.provider || "openai";
- if (spec)
+ if (spec) this.registryKind = spec.kind === "embedding" ? "embedding" : "chat";
+ this.draft = spec?.kind === "embedding" ? { name: spec.name } : {};
+ if (spec && spec.kind !== "embedding")
this.showLookup({
kind: "saved",
spec,
@@ -133,7 +144,7 @@ export class Onboarding {
return;
}
this.templates = response.data.templates || [];
- this.entries = (response.data.models || []).filter((row: Data) => !row.disabled && row.spec?.kind !== "embedding");
+ this.entries = (response.data.models || []).filter((row: Data) => !row.disabled);
this.draw();
}
async load() {
@@ -162,6 +173,7 @@ export class Onboarding {
...Object.values(config.data.modelsByHarness || {}).flat(),
]);
const baseModel = config.data.baseModel || config.data.baseModelDefault || "";
+ this.baseModel = baseModel;
const provider =
Object.entries(this.models).find(([, choices]) => choices.some((model) => model.id === baseModel))?.[0] ||
this.providers.find((row) => row.configured)?.provider ||
@@ -182,10 +194,8 @@ export class Onboarding {
this.steps.model = { text: ready ? "Ready" : "Needs a key", tone: ready ? "ok" : "warn", summary };
if (selection.provider === this.provider && selection.model === this.model && selection.apiKey === this.apiKey) {
this.provider = provider || this.providers[0]?.provider || "anthropic";
- this.model = (this.models[this.provider] || []).some((m) => m.id === baseModel)
- ? baseModel
- : this.models[this.provider]?.[0]?.id || "";
- } else if (!this.model) this.model = this.models[this.provider]?.[0]?.id || "";
+ this.model = this.firstModel();
+ } else if (!this.model && !this.keepBaseModel) this.model = this.firstModel();
this.steps.slack = {
text: slack.data.configured ? "Connected" : "Optional",
tone: slack.data.configured ? "ok" : "muted",
@@ -215,6 +225,21 @@ export class Onboarding {
})
.catch(() => {});
}
+ keepsBaseModel() {
+ return Boolean(this.baseModel) && !(this.models[this.provider] || []).some((m) => m.id === this.baseModel);
+ }
+ verifiedMessage(builtin: boolean, message: string) {
+ if (this.embedding) return "Embedding model verified. Select it under Models → Recall runtime.";
+ if (builtin) return message;
+ return "Model verified and enabled with organization credentials. Personal-key access may differ.";
+ }
+ get embedding() {
+ return this.registryKind === "embedding";
+ }
+ firstModel() {
+ if ((this.models[this.provider] || []).some((m) => m.id === this.baseModel)) return this.baseModel;
+ return this.models[this.provider]?.[0]?.id || "";
+ }
mergeModels(models: Data[]) {
for (const model of models) {
if (!model.provider) continue;
@@ -240,17 +265,15 @@ export class Onboarding {
try {
const saved = await this.context.api("PUT", "/api/model-providers/" + encodeURIComponent(provider), { apiKey });
if (!saved.ok) throw new Error(saved.data?.message || "The provider rejected this key.");
- const selected = await this.context.api(
- "PUT",
- "/api/scopes/" + encodeURIComponent(this.context.orgScope()) + "/base-model",
- { modelId },
- );
+ const selected = modelId
+ ? await this.context.api("PUT", "/api/scopes/" + encodeURIComponent(this.context.orgScope()) + "/base-model", {
+ modelId,
+ })
+ : { ok: true };
this.apiKey = "";
await this.load();
await this.context.loadCustomProviders();
- this.providerMessage = selected.ok
- ? "Key and base model saved."
- : "Key saved, but the base model could not be changed.";
+ this.providerMessage = providerSavedMessage(modelId, selected);
this.providerTone = selected.ok ? "ok" : "err";
} catch (error) {
this.providerMessage = errorText(error);
@@ -337,6 +360,11 @@ export class Onboarding {
}
}
collect() {
+ if (this.embedding) {
+ const name = String(this.draft.name ?? "").trim();
+ if (!this.registryId.trim() || !name) throw new Error("Model ID and display name are required.");
+ return { kind: "embedding", name, provider: this.registryProvider, verify: true };
+ }
if (!this.lookup) throw new Error("Look up the model first.");
const identity = { provider: this.registryProvider, id: this.registryId.trim() };
if (JSON.stringify(identity) !== JSON.stringify(this.lookup.identity))
@@ -365,10 +393,10 @@ export class Onboarding {
};
}
async verify() {
- if (this.registryBusy || !this.lookup) return;
+ if (this.registryBusy || (!this.lookup && !this.embedding)) return;
try {
const body = this.collect(),
- builtin = this.lookup.kind === "builtin",
+ builtin = this.lookup?.kind === "builtin",
id = this.registryId.trim();
this.registryBusy = true;
this.registryMessage = "Checking the model with organization credentials…";
@@ -381,9 +409,7 @@ export class Onboarding {
);
if (!response.ok) throw new Error(response.data?.message || "Could not verify model.");
await this.load();
- this.registryMessage = builtin
- ? response.data.message
- : "Model verified and enabled with organization credentials. Personal-key access may differ.";
+ this.registryMessage = this.verifiedMessage(builtin, response.data?.message);
this.registryTone = "ok";
} catch (error) {
this.registryMessage = errorText(error);
@@ -470,7 +496,8 @@ export class Onboarding {
?disabled=${this.providerBusy}
@change=${(e: Event) => {
this.provider = (e.target as HTMLSelectElement).value;
- this.model = this.models[this.provider]?.[0]?.id || "";
+ this.model = this.firstModel();
+ this.keepBaseModel = false;
this.draw();
}}
>
@@ -484,10 +511,12 @@ export class Onboarding {
?disabled=${this.providerBusy}
@change=${(e: Event) => {
this.model = (e.target as HTMLSelectElement).value;
+ this.keepBaseModel = !this.model;
this.draw();
}}
>
- ${(this.models[this.provider] || []).map((model) => html`<option value=${model.id} .selected=${model.id === this.model}>${model.name}</option>`)}
+ ${(this.models[this.provider] || []).map((model) => html`<option value=${model.id} ?selected=${model.id === this.model}>${model.name}</option>`)}
+ ${this.keepsBaseModel() ? html`<option value="" ?selected=${!this.model}>Keep current base model (${this.baseModel})</option>` : nothing}
</select></label
><label
>API key
@@ -567,7 +596,7 @@ export class Onboarding {
return html`<tr>
<td>${(spec.name || spec.id) + " (" + spec.id + ")" + verification}</td>
<td>${spec.provider || "Unknown"}</td>
- <td>${spec.template || "Missing"}</td>
+ <td>${spec.kind === "embedding" ? "Embedding" : spec.template || "Missing"}</td>
<td>
<button ?disabled=${this.registryBusy} @click=${() => this.reset(spec)}>Edit</button
><button class="danger" ?disabled=${this.registryBusy} @click=${() => this.deleteModel(spec)}>
@@ -582,11 +611,28 @@ export class Onboarding {
</div>
<div class="body setup-form">
<label
+ >Kind
+ <select
+ id="model-registry-kind"
+ .value=${this.registryKind}
+ ?disabled=${this.registryBusy || this.editing}
+ @change=${(e: Event) => {
+ this.registryKind = (e.target as HTMLSelectElement).value;
+ this.registryProvider = "openai";
+ this.draft = {};
+ this.resetLookup();
+ this.draw();
+ }}
+ >
+ <option value="chat" .selected=${!this.embedding}>Chat model</option>
+ <option value="embedding" .selected=${this.embedding}>Embedding model (memory recall)</option>
+ </select></label
+ ><label
>Provider
<select
id="model-registry-provider"
.value=${this.registryProvider}
- ?disabled=${this.registryBusy || this.providerLocked}
+ ?disabled=${this.registryBusy || this.providerLocked || this.embedding}
@change=${identityChange("registryProvider")}
>
<option value="openai" .selected=${this.registryProvider === "openai"}>OpenAI</option>
@@ -598,14 +644,15 @@ export class Onboarding {
type="text"
id="model-registry-id"
autocomplete="off"
- placeholder="e.g. claude-opus-4-6"
+ placeholder=${this.embedding ? "e.g. text-embedding-3-small" : "e.g. claude-opus-4-6"}
required
.value=${this.registryId}
?disabled=${this.registryBusy || this.editing}
@input=${identityChange("registryId")}
/></label>
</div>
- <div class="foot">
+ ${this.embedding ? html`<div class="body setup-form">${this.field("name")}</div>` : nothing}
+ <div class="foot" ?hidden=${this.embedding}>
<button
id="model-registry-lookup"
class="primary"
@@ -648,7 +695,7 @@ export class Onboarding {
</p>
<div class="setup-form" id="model-registry-advanced-fields">
${Object.keys(fieldLabels)
- .filter((key) => !missing.includes(key))
+ .filter((key) => !this.embedding && !missing.includes(key))
.map((key) => this.field(key))}
<p class="muted" id="model-registry-capabilities">
${template ? `Inherited: ${template.input.join(", ")} input; reasoning ${template.reasoning ? "yes" : "no"}.` : ""}
@@ -693,13 +740,14 @@ export class Onboarding {
a small provider charge (up to 128 output tokens per request; an additional check with fast mode; provider
retries may apply). A successful check confirms access now, not pricing, maximum context, every capability, or
personal-key access. Failed checks do not save or enable the new definition. Existing saved settings remain
- unchanged. A failed recheck of those settings removes their verification.
+ unchanged. A failed recheck of those settings removes their verification. Embedding models send one short
+ embedding request instead.
</p>
<div class="foot">
<button
class="primary"
id="model-registry-save"
- ?disabled=${!lookup || this.registryBusy}
+ ?disabled=${(!lookup && !this.embedding) || this.registryBusy}
@click=${() => this.verify()}
>
${(() => {
diff --git a/plugins/admin/ui/settings-runtimes.ts b/plugins/admin/ui/settings-runtimes.ts
new file mode 100644
index 000000000..dd2006246
--- /dev/null
+++ b/plugins/admin/ui/settings-runtimes.ts
@@ -0,0 +1,169 @@
+import { html, nothing } from "lit";
+import { classMap } from "lit/directives/class-map.js";
+import { ChevronDown } from "lucide";
+import { createModelPicker, type ModelCatalog } from "../../web-ui/src/model-picker.ts";
+import { runtimeModelOptions, type EffortLevel, type ModelOption } from "../../web-ui/src/model-options.ts";
+import { icon } from "../../web-ui/src/icons.ts";
+import { loadoutActions, type LoadoutEntry } from "../../web-ui/src/composer-loadout.ts";
+import { mountTemplate } from "./shared.ts";
+import { states, type SettingsState } from "./settings.ts";
+
+const rows: [key: string, label: string, inherit?: string][] = [
+ ["runtime", "Conversation runtime"],
+ ["cron-runtime", "Cron runtime", "Job's scope default"],
+ ["subagent-runtime", "Subagent runtime", "Child's scope default"],
+ ["fallback-runtime", "Fallback runtime", "Built-in fallback"],
+];
+const RECALL = "memory-embedding-model";
+const keys = [...rows.map(([key]) => key), RECALL];
+type Embedding = { id: string; name: string; provider: string };
+const pickers = new Map<string, ReturnType<typeof picker>>();
+const modelOptions = new WeakMap<object, ModelOption[]>();
+let saveSetting: (key: string) => Promise<void> = async () => {};
+
+export function configureRuntimes(actions: { save: (key: string) => Promise<void> }) {
+ saveSetting = actions.save;
+}
+
+function optionsFor(context: Record<string, any>): ModelOption[] {
+ let options = modelOptions.get(context);
+ if (!options) {
+ const ids = Object.fromEntries(
+ Object.entries(context.modelsByHarness ?? {}).map(([harness, models]) => [
+ harness,
+ (models as { id: string }[]).map((model) => model.id),
+ ]),
+ );
+ options = runtimeModelOptions(context.harnessOptions ?? [], ids, context.modelCatalog ?? {});
+ modelOptions.set(context, options);
+ }
+ return options;
+}
+
+const value = (s: SettingsState) => `${s.draft.harnessId}:${s.draft.modelId}`;
+const current = (s: SettingsState): LoadoutEntry => ({
+ value: value(s),
+ effort: s.draft.effortLevel as EffortLevel,
+ fast: s.draft.fastMode === true,
+});
+
+function picker(s: SettingsState, inheritLabel?: string) {
+ const state = { openMenu: null as string | null, menuQuery: "", effortLevel: "auto" as EffortLevel };
+ const catalog: ModelCatalog = {
+ options: () => optionsFor(s.context),
+ supportsFast: (modelId) => (s.context.fastModeModelIds ?? []).includes(modelId),
+ overridden: () => !s.draft.inherit,
+ };
+ const actions = loadoutActions(
+ catalog.options,
+ () => current(s),
+ (option, entry) => {
+ Object.assign(s.draft, {
+ ...(s.key === "runtime" ? {} : { inherit: false }),
+ harnessId: option.harnessId,
+ modelId: option.model.id,
+ effortLevel: entry.effort,
+ fastMode: entry.fast,
+ });
+ s.changed();
+ },
+ catalog.supportsFast,
+ );
+ const control = createModelPicker<void>({
+ host: () => document.querySelector<HTMLElement>(`[data-runtime-row="${s.key}"]`),
+ redraw: () => s.render(),
+ scopeKey: () => null,
+ state,
+ catalog,
+ activeEntry: () => current(s),
+ ...actions,
+ effectiveFastMode: () => s.draft.fastMode === true,
+ changeDefault: async () => {
+ state.openMenu = null;
+ s.change("inherit", true);
+ },
+ showDefaultAction: false,
+ showInheritAction: !!inheritLabel,
+ inheritLabel,
+ get emptyLabel() {
+ return s.draft.inherit ? inheritLabel : `${s.draft.modelId} (unavailable)`;
+ },
+ });
+ return { control, state };
+}
+
+function runtimeRow(key: string, label: string, inheritLabel?: string) {
+ const s = states.get(key)!;
+ if (!s.available) return nothing;
+ const { control, state } = pickers.get(key) ?? pickers.set(key, picker(s, inheritLabel)).get(key)!;
+ state.effortLevel = s.draft.effortLevel;
+ const choice = s.draft.inherit ? undefined : optionsFor(s.context).find((option) => option.value === value(s));
+ return html`<div class="runtime-row" data-runtime-row=${key}>
+ <span class="runtime-label">${label}</span>${control.render(undefined, choice, s.saving)}
+ </div>`;
+}
+
+const source = (model: Embedding) => (model.provider === "qm:gateway" ? "Model gateway" : "OpenAI");
+
+function recallRow() {
+ const s = states.get(RECALL)!;
+ if (!s.available) return nothing;
+ const models: Embedding[] = s.context.memoryEmbeddingOptions || [];
+ const selected: string = s.draft.modelId || "";
+ const missing = selected && !models.some((model) => model.id === selected);
+ return html`<div class="runtime-row" data-runtime-row=${RECALL}>
+ <span class="runtime-label" id="recall-runtime-label">Recall runtime</span>
+ <div class="menu-control loadout-control">
+ <select
+ aria-labelledby="recall-runtime-label"
+ class="menu-button loadout-button"
+ .value=${selected}
+ ?disabled=${s.saving}
+ @change=${(e: Event) => s.change("modelId", (e.target as HTMLSelectElement).value)}
+ >
+ <option value="" ?selected=${!selected}>Off — newest facts (recency)</option>
+ ${models.map((model) => html`<option value=${model.id} ?selected=${model.id === selected}>${model.name} · ${source(model)}</option>`)}
+ ${missing ? html`<option value=${selected} selected>${selected} (unavailable)</option>` : nothing}
+ </select>
+ ${icon(ChevronDown, 13)}
+ </div>
+ </div>
+ <p class="hint runtime-hint">
+ Recall uses the newest facts when no model is selected, the saved model is unavailable, or an embedding call
+ fails.
+ </p>`;
+}
+
+function card() {
+ const shown = keys.map((key) => states.get(key)!).filter((s) => s.available);
+ const dirty = shown.filter((s) => s.dirty);
+ const labels = Object.fromEntries([...rows, [RECALL, "Recall runtime"]]);
+ const failed = shown.filter((s) => s.tone === "err");
+ const status = failed.length
+ ? { tone: "err", message: failed.map((s) => `${labels[s.key]}: ${s.message}`).join(" · ") }
+ : (shown.find((s) => s.saving) ?? shown.find((s) => s.message));
+ return html`<section
+ class=${classMap({ card: true, "sv-models": true, hidden: !shown.length, dirty: !!dirty.length })}
+ id="card-runtimes"
+ >
+ <div class="body runtime-rows">
+ ${rows.map(([key, label, inherit]) => runtimeRow(key, label, inherit))}${recallRow()}
+ </div>
+ <div class="foot">
+ <button
+ type="button"
+ id="runtimes-save"
+ class=${classMap({ primary: true, dirty: !!dirty.length })}
+ ?disabled=${!dirty.length || shown.some((s) => s.saving)}
+ @click=${() => Promise.all(dirty.map((s) => saveSetting(s.key)))}
+ >
+ Save</button
+ ><span class=${classMap({ status: true, [status?.tone || "idle"]: true })}>${status?.message ?? ""}</span>
+ </div>
+ </section>`;
+}
+
+export function mountRuntimes() {
+ const draw = mountTemplate('template[data-settings-card="card-runtimes"]', card);
+ for (const key of keys) states.get(key)!.render = draw;
+}
diff --git a/plugins/admin/ui/settings.ts b/plugins/admin/ui/settings.ts
index 4dba725bd..f33650f4d 100644
--- a/plugins/admin/ui/settings.ts
+++ b/plugins/admin/ui/settings.ts
@@ -15,11 +15,13 @@ export { configureProviders, openProvider, loadProviders } from "./settings-prov
import { mountFlags } from "./settings-flags.ts";
export { configureFlags, loadFlags } from "./settings-flags.ts";
import { brandingCard } from "./settings-branding.ts";
+import { mountRuntimes } from "./settings-runtimes.ts";
+export { configureRuntimes } from "./settings-runtimes.ts";
import { html } from "lit";
import { classMap } from "lit/directives/class-map.js";
import { repeat } from "lit/directives/repeat.js";
-type Model = { id: string; name?: string; effortLevels?: string[] };
+type Model = { id: string; name?: string };
type Data = Record<string, any>;
const runtimeKeys = ["runtime", "cron-runtime", "subagent-runtime", "fallback-runtime"];
const runtimeReadKey = (key: string) => key.replace(/-runtime$/, "Runtime");
@@ -36,47 +38,19 @@ export class SettingsState extends SettingState {
const { inherit: _inherit, ...selection } = this.draft;
return structuredClone(selection);
}
+ if (this.key === "memory-embedding-model") return { modelId: this.draft.modelId || null };
if (this.key === "branding")
return Object.fromEntries(Object.entries(this.draft).map(([key, value]) => [key, String(value).trim()]));
return structuredClone(this.draft);
}
- get models(): Model[] {
- return this.context.modelsByHarness?.[this.draft.harnessId] || this.context.baseModelOptions || [];
- }
get catalog(): Model[] {
return [
...Object.values(this.context.modelsByHarness || {}).flat(),
...(this.context.baseModelOptions || []),
].filter((m: any, i, all) => m?.id && all.findIndex((x: any) => x?.id === m.id) === i) as Model[];
}
- get harnesses(): string[] {
- return this.context.harnessOptions?.length ? this.context.harnessOptions : [this.context.harnessDefault || "pi"];
- }
- get efforts(): string[] {
- const advertised = this.models.find((model) => model.id === this.draft.modelId)?.effortLevels;
- const levels: string[] = advertised ?? this.context.thinkingLevelsByHarness?.[this.draft.harnessId] ?? [];
- const choices = levels.filter(
- (level) => level !== "auto" && (advertised || (level !== "adaptive" && level !== "default")),
- );
- return this.draft.effortLevel === "auto" || !choices.length ? ["auto", ...choices] : choices;
- }
- get fastCapable() {
- return (
- (this.context.fastModeHarnessIds || []).includes(this.draft.harnessId) &&
- (this.context.fastModeModelIds || []).includes(this.draft.modelId)
- );
- }
- normalize() {
- if (!runtimeKeys.includes(this.key)) return;
- if (!this.harnesses.includes(this.draft.harnessId)) this.draft.harnessId = this.harnesses[0];
- if (!this.models.some((m) => m.id === this.draft.modelId)) this.draft.modelId = this.models[0]?.id || "";
- if (!this.efforts.includes(this.draft.effortLevel))
- this.draft.effortLevel = this.efforts.includes("auto") ? "auto" : this.efforts[0];
- if (!this.fastCapable) this.draft.fastMode = false;
- }
change(field: string, value: unknown) {
this.draft[field] = value;
- this.normalize();
this.changed();
}
changed() {
@@ -100,7 +74,10 @@ export class SettingsState extends SettingState {
}
}
export const states = new Map(
- [...runtimeKeys, "webui-models", "soul", "branding"].map((key) => [key, new SettingsState(key)]),
+ [...runtimeKeys, "webui-models", "memory-embedding-model", "soul", "branding"].map((key) => [
+ key,
+ new SettingsState(key),
+ ]),
);
export const { owns, collect, capture, commit, status, statusKey } = settingRegistry(states);
export function load(data: Data, scope: string, only?: string) {
@@ -120,6 +97,13 @@ export function load(data: Data, scope: string, only?: string) {
capture(key);
continue;
}
+ if (key === "memory-embedding-model") {
+ s.draft = { modelId: data.memoryEmbeddingModel || "" };
+ s.available = scope.startsWith("org:") && "memoryEmbeddingModel" in data;
+ s.saving = false;
+ capture(key);
+ continue;
+ }
if (key === "soul") {
s.draft = { content: data.soul || "", expectedVersion: data.soulVersion || 0 };
s.history = data.soulHistory || [];
@@ -143,7 +127,6 @@ export function load(data: Data, scope: string, only?: string) {
fastMode: runtime?.fastMode === true,
}
: { ids: (data.webuiModels || []).filter(Boolean) };
- s.normalize();
s.saving = false;
s.selected = "";
capture(key);
@@ -155,23 +138,6 @@ export function updateCatalog(data: Data) {
s.render();
}
}
-const harnessLabels: Record<string, string> = {
- pi: "pi (default)",
- opencode: "OpenCode",
- codex: "Codex",
- claude: "Claude Code",
-};
-const effortLabels: Record<string, string> = {
- auto: "Default",
- adaptive: "Auto",
- default: "Provider default",
- low: "Low",
- medium: "Medium",
- high: "High",
- xhigh: "Extra high",
- max: "Max",
- ultracode: "Ultracode",
-};
const value = (event: Event) => (event.target as HTMLInputElement).value;
const label = (s: SettingsState, id: string) => {
const m = s.catalog.find((x) => x.id === id);
@@ -180,112 +146,6 @@ const label = (s: SettingsState, id: string) => {
function card(s: SettingsState) {
if (s.key === "soul") return soulCard(s);
if (s.key === "branding") return brandingCard(s);
- if (runtimeKeys.includes(s.key)) {
- const prefix = s.key === "runtime" ? "base" : s.key;
- const purpose = s.key !== "runtime";
- const [title, description] = {
- runtime: ["Conversation runtime", "The default runtime for conversations unless overridden."],
- "cron-runtime": ["Cron runtime", "Used for scheduled jobs without a per-job runtime override."],
- "subagent-runtime": ["Sub-agent runtime", "Used for new sub-agents unless explicitly overridden."],
- "fallback-runtime": [
- "Fallback runtime",
- "Retries a turn or compaction when the model refuses it or is unavailable.",
- ],
- }[s.key]!;
- return html`<section
- class=${classMap({ card: true, "sv-models": true, hidden: !s.available, dirty: s.dirty })}
- id=${s.key === "runtime" ? "card-base-model" : `card-${s.key}`}
- >
- <div class="head">
- <h2>${title}</h2>
- <p>${description}</p>
- </div>
- <div class="body">
- ${
- purpose
- ? html`<label class="setting-toggle">
- <input
- type="checkbox"
- id=${`${prefix}-inherit`}
- .checked=${!!s.draft.inherit}
- @change=${(e: Event) => s.change("inherit", (e.target as HTMLInputElement).checked)}
- />
- <span class="setting-switch" aria-hidden="true"></span>
- <span class="setting-copy"
- ><strong>Use existing fallback</strong
- ><small
- >${
- {
- "cron-runtime": "Use the job's scope default.",
- "subagent-runtime": "Use the child’s scope default.",
- "fallback-runtime": "Use the built-in Claude fallback.",
- }[s.key]
- }</small
- ></span
- >
- </label>`
- : null
- }
- <div class="model-runtime-fields">
- <div>
- <label for=${`${prefix}-harness`}>Harness</label
- ><select
- id=${`${prefix}-harness`}
- ?disabled=${purpose && s.draft.inherit}
- .value=${s.draft.harnessId || ""}
- @change=${(e: Event) => s.change("harnessId", value(e))}
- >
- ${s.harnesses.map((id) => html`<option value=${id} ?selected=${id === s.draft.harnessId}>${harnessLabels[id] || id}</option>`)}
- </select>
- </div>
- <div>
- <label for=${`${prefix}-model`}>Model</label
- ><select
- id=${`${prefix}-model`}
- ?disabled=${purpose && s.draft.inherit}
- .value=${s.draft.modelId || ""}
- @change=${(e: Event) => s.change("modelId", value(e))}
- >
- ${repeat(
- s.models,
- (m) => m.id,
- (m) => html`<option value=${m.id} ?selected=${m.id === s.draft.modelId}>${m.name} (${m.id})</option>`,
- )}
- </select>
- </div>
- <div>
- <label for=${`${prefix}-effort`}>Reasoning level</label
- ><select
- id=${`${prefix}-effort`}
- ?disabled=${purpose && s.draft.inherit}
- .value=${s.draft.effortLevel || "auto"}
- @change=${(e: Event) => s.change("effortLevel", value(e))}
- >
- ${repeat(
- s.efforts,
- (id) => id,
- (id) =>
- html`<option value=${id} ?selected=${id === s.draft.effortLevel}>${effortLabels[id] || id}</option>`,
- )}
- </select>
- </div>
- </div>
- <label class="setting-toggle" id=${`${prefix}-fast-mode-control`} style=${s.fastCapable ? "" : "display: none"}
- ><input
- type="checkbox"
- id=${`${prefix}-fast-mode`}
- .checked=${!!s.draft.fastMode}
- ?disabled=${!s.fastCapable || (purpose && s.draft.inherit)}
- @change=${(e: Event) => s.change("fastMode", (e.target as HTMLInputElement).checked)}
- /><span class="setting-switch" aria-hidden="true"></span
- ><span class="setting-copy"
- ><strong>Fast mode</strong><small>Only available for supported models.</small></span
- ></label
- >
- </div>
- ${saveFooter(s)}
- </section>`;
- }
const ids: string[] = s.draft.ids || [];
const available = s.catalog.filter((m) => !ids.includes(m.id));
return html`<section
@@ -348,22 +208,12 @@ export function mountCards() {
mountFlags();
mountProviders();
mountCredentials();
- const renderRuntimes = mountTemplate('template[data-settings-card="card-base-model"]', () =>
- runtimeKeys.map((key) => card(states.get(key)!)),
- );
+ mountRuntimes();
for (const [key, s] of states) {
- if (runtimeKeys.includes(key)) {
- s.render = renderRuntimes;
- continue;
- }
const id = (
- {
- soul: "card-soul",
- branding: "card-branding",
- "webui-models": "card-webui-models",
- } as Record<string, string>
+ { soul: "card-soul", branding: "card-branding", "webui-models": "card-webui-models" } as Record<string, string>
)[key];
- s.render = mountTemplate(`template[data-settings-card="${id}"]`, () => card(s));
+ if (id) s.render = mountTemplate(`template[data-settings-card="${id}"]`, () => card(s));
}
}
diff --git a/plugins/web-ui/src/assistant-sidebar.ts b/plugins/web-ui/src/assistant-sidebar.ts
index 98ecdf903..493276b38 100644
--- a/plugins/web-ui/src/assistant-sidebar.ts
+++ b/plugins/web-ui/src/assistant-sidebar.ts
@@ -2,7 +2,7 @@ import { html, nothing, type TemplateResult } from "lit";
import type { DirectiveResult } from "lit/directive.js";
import { Send } from "lucide";
import { markdown } from "./message-markdown";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { tip } from "./tooltip";
type Content = TemplateResult | DirectiveResult | typeof nothing;
diff --git a/plugins/web-ui/src/browse.ts b/plugins/web-ui/src/browse.ts
index 173f1b23b..236377f71 100644
--- a/plugins/web-ui/src/browse.ts
+++ b/plugins/web-ui/src/browse.ts
@@ -4,7 +4,7 @@ import { deepLinkPath, isPlainLeftClick, UI_BASE } from "./deep-link";
import { nextGridIndex } from "./grid-nav";
import { setScopedSession } from "./session-scope";
import { ADMIN_HOME_URL, appState, can, switchView } from "./shell";
-import { icon } from "./ui";
+import { icon } from "./icons";
import type { View } from "./shell-state";
interface Destination {
diff --git a/plugins/web-ui/src/chat.ts b/plugins/web-ui/src/chat.ts
index 4c09d1de3..3128516cf 100644
--- a/plugins/web-ui/src/chat.ts
+++ b/plugins/web-ui/src/chat.ts
@@ -152,12 +152,12 @@ import {
chipBadge,
copyText,
formatBytes,
- icon,
relTime,
sheenLabel,
waveLoader,
workingWave,
} from "./ui";
+import { icon } from "./icons";
import { appState, renderSidebarTop, switchView, syncUrlFromState } from "./shell";
import { contextsState, scopeTitle } from "./contexts";
import { openProjectPage, scopeToolCount, sessionTopbarTpl, setScopedSession } from "./session-scope";
diff --git a/plugins/web-ui/src/composer-loadout.ts b/plugins/web-ui/src/composer-loadout.ts
index 5cca92b07..a775fbeed 100644
--- a/plugins/web-ui/src/composer-loadout.ts
+++ b/plugins/web-ui/src/composer-loadout.ts
@@ -1,6 +1,6 @@
import type { Api, Model } from "@earendil-works/pi-ai";
import type { ModelMetadata } from "./pi-models.ts";
-import { EFFORT_LEVELS, type EffortLevel, type ModelOption } from "./model-options.ts";
+import { EFFORT_LEVELS, harnessSupportsFastMode, type EffortLevel, type ModelOption } from "./model-options.ts";
export interface LoadoutEntry {
value: string;
@@ -152,3 +152,36 @@ export function saveLoadout(entries: LoadoutEntry[], key = LOADOUT_STORAGE_KEY):
return;
}
}
+
+export function loadoutActions(
+ options: () => readonly ModelOption[],
+ current: () => LoadoutEntry,
+ choose: (option: ModelOption, entry: LoadoutEntry) => void,
+ supportsFast: (modelId: string) => boolean,
+) {
+ const apply = (entry: LoadoutEntry) => {
+ const option = options().find((candidate) => candidate.value === entry.value);
+ if (!option) return;
+ const levels = effortLevelsForHarness(option.harnessId, option.model);
+ choose(option, {
+ value: option.value,
+ effort: levels.some((level) => level.value === entry.effort) ? entry.effort : levels[0]!.value,
+ fast: entry.fast && harnessSupportsFastMode(option.harnessId) && supportsFast(option.model.id),
+ });
+ };
+ const selected = () => options().find((option) => option.value === current().value);
+ return {
+ apply,
+ selectEffort: (effort: EffortLevel) => apply({ ...current(), effort }),
+ selectHarness: (harnessId: string) => {
+ const model = selected()?.model.id;
+ const target = model && compatibleHarnessOptions(options(), model).find((o) => o.harnessId === harnessId);
+ if (target) apply({ ...current(), value: target.value });
+ },
+ toggleFastMode: () => {
+ const option = selected();
+ const target = option?.model.id === ULTRAFAST_MODEL_ID ? ultrafastChoice(options(), option) : undefined;
+ apply({ ...current(), ...(target ? { value: target.value } : {}), fast: !current().fast });
+ },
+ };
+}
diff --git a/plugins/web-ui/src/composer.ts b/plugins/web-ui/src/composer.ts
index c142fb985..385e01fb3 100644
--- a/plugins/web-ui/src/composer.ts
+++ b/plugins/web-ui/src/composer.ts
@@ -1,12 +1,7 @@
import { emojiCompletion } from "./emoji-completion";
import { appEditSlug } from "./app-edit";
-import {
- runtimeConfigKey,
- getRuntimeConfig,
- loadRuntimeConfig,
- saveRuntimeConfig,
- subscribeRuntimeConfig,
-} from "./runtime-config-store";
+import { runtimeConfigKey, loadRuntimeConfig, saveRuntimeConfig, subscribeRuntimeConfig } from "./runtime-config-store";
+import { getRuntimeConfig } from "./runtime-config-cache.ts";
import type { Agent, AgentMessage } from "@earendil-works/pi-agent-core";
import { createFileDragState } from "./file-drag";
import type { Attachment } from "@earendil-works/pi-web-ui";
@@ -36,7 +31,8 @@ import {
type QueuedRun,
} from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { browserRenderableImage, fieldSelect, icon } from "./ui";
+import { browserRenderableImage, fieldSelect } from "./ui";
+import { icon } from "./icons";
import {
defaultEffortForModel,
defaultModelValue,
@@ -1007,14 +1003,16 @@ export function createComposerSurface(ctx: ConvCtx, options: ComposerOptions = {
redraw: () => ctx.chat.drawActiveChat(),
scopeKey,
state: composerState,
- entries: seededLoadout,
- activeEntry: activeLoadoutEntry,
- saveEntries: (entries) => {
- loadout = entries;
- saveLoadout(entries, loadoutKey);
+ presets: {
+ entries: seededLoadout,
+ save: (entries) => {
+ loadout = entries;
+ saveLoadout(entries, loadoutKey);
+ },
+ add: addLoadoutEntry,
},
+ activeEntry: activeLoadoutEntry,
apply: applyLoadout,
- add: addLoadoutEntry,
selectEffort,
selectHarness,
toggleFastMode,
diff --git a/plugins/web-ui/src/connection-picker.ts b/plugins/web-ui/src/connection-picker.ts
index b5a15351e..6b601a927 100644
--- a/plugins/web-ui/src/connection-picker.ts
+++ b/plugins/web-ui/src/connection-picker.ts
@@ -1,7 +1,7 @@
import { html, nothing, render } from "lit";
import { Search, ArrowUpRight, Check } from "lucide";
import { connectorLogo } from "./connector-logo";
-import { icon } from "./ui";
+import { icon } from "./icons";
export interface ConnectionService {
id: string;
diff --git a/plugins/web-ui/src/connector-logo.ts b/plugins/web-ui/src/connector-logo.ts
index 20740b343..cbac15829 100644
--- a/plugins/web-ui/src/connector-logo.ts
+++ b/plugins/web-ui/src/connector-logo.ts
@@ -1,6 +1,6 @@
import { html, type TemplateResult } from "lit";
import { Plug } from "lucide";
-import { icon } from "./ui";
+import { icon } from "./icons";
const CONNECTOR_LOGOS: Record<string, string> = {
googlesheets:
diff --git a/plugins/web-ui/src/connector-widget.ts b/plugins/web-ui/src/connector-widget.ts
index d00004c0b..e33a029d5 100644
--- a/plugins/web-ui/src/connector-widget.ts
+++ b/plugins/web-ui/src/connector-widget.ts
@@ -1,6 +1,6 @@
import { html, type TemplateResult } from "lit";
import { ArrowUpRight, Check } from "lucide";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { connectorLogo } from "./connector-logo";
import { CONNECTOR_NAMES, connectorService, type ConnectorLink } from "./connector-link";
diff --git a/plugins/web-ui/src/connectors.ts b/plugins/web-ui/src/connectors.ts
index 388caedee..4d9f92d07 100644
--- a/plugins/web-ui/src/connectors.ts
+++ b/plugins/web-ui/src/connectors.ts
@@ -2,7 +2,7 @@ import { html, render, type TemplateResult } from "lit";
import { KeyRound, Link } from "lucide";
import { api } from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { connectorLogo } from "./connector-logo";
import { appState, replacePanePreservingFocus } from "./shell";
import { scopedSession, scopedViewTopbar } from "./session-scope";
diff --git a/plugins/web-ui/src/context-model.ts b/plugins/web-ui/src/context-model.ts
index c085ca1b6..4fa76e581 100644
--- a/plugins/web-ui/src/context-model.ts
+++ b/plugins/web-ui/src/context-model.ts
@@ -1,6 +1,6 @@
import { html, nothing, type TemplateResult } from "lit";
-import type { RuntimeConfig } from "./core-bridge";
-import { getRuntimeConfig, loadRuntimeConfig, saveRuntimeConfig, subscribeRuntimeConfig } from "./runtime-config-store";
+import { getRuntimeConfig, type RuntimeConfig } from "./runtime-config-cache.ts";
+import { loadRuntimeConfig, saveRuntimeConfig, subscribeRuntimeConfig } from "./runtime-config-store";
import {
defaultEffortForModel,
harnessSupportsFastMode,
@@ -11,14 +11,12 @@ import {
} from "./model-options";
import { createModelPicker } from "./model-picker";
import {
- ULTRAFAST_MODEL_ID,
- ultrafastChoice,
+ loadoutActions,
loadLoadout,
saveLoadout,
reconcileLoadout,
upsertLoadout,
effortLevelsForHarness,
- compatibleHarnessOptions,
type LoadoutEntry,
} from "./composer-loadout";
import { modelSupportsFastMode } from "./pi-models";
@@ -184,46 +182,31 @@ function activeEntry(config: RuntimeConfig): LoadoutEntry {
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 levels = effortLevelsForHarness(option.harnessId, option.model);
- const normalized = {
- ...entry,
- effort: levels.some((level) => level.value === entry.effort) ? entry.effort : levels[0]!.value,
- fast: entry.fast && harnessSupportsFastMode(option.harnessId) && modelSupportsFastMode(scopeId, option.model.id),
- };
- void choose(scopeId, normalized.value, normalized.effort, normalized.fast);
- };
+ const actions = loadoutActions(
+ options,
+ current,
+ (_, entry) => {
+ if (!contextModelState.saving) void choose(scopeId, entry.value, entry.effort, entry.fast);
+ },
+ (modelId) => modelSupportsFastMode(scopeId, modelId),
+ );
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: () => {
- const selected = options().find((option) => option.value === current().value);
- const target = selected?.model.id === ULTRAFAST_MODEL_ID ? ultrafastChoice(options(), selected) : undefined;
- apply({ ...current(), ...(target ? { value: target.value } : {}), fast: !current().fast });
+ presets: {
+ entries: () => reconcileLoadout(loadLoadout(), options(), current()),
+ save: saveLoadout,
+ add: (option) => {
+ const entry = { value: option.value, effort: defaultEffortForModel(option.model), fast: false };
+ saveLoadout(upsertLoadout(reconcileLoadout(loadLoadout(), options(), current()), entry));
+ pickerState.menuQuery = "";
+ actions.apply(entry);
+ },
},
+ activeEntry: current,
+ ...actions,
effectiveFastMode: () => current().fast,
changeDefault: () => choose(scopeId, INHERIT),
showDefaultAction: false,
diff --git a/plugins/web-ui/src/contexts.ts b/plugins/web-ui/src/contexts.ts
index 88e37a89f..2cc173e36 100644
--- a/plugins/web-ui/src/contexts.ts
+++ b/plugins/web-ui/src/contexts.ts
@@ -26,7 +26,8 @@ import {
} from "./core-bridge";
import { UI_BASE } from "./deep-link";
import { errMessage } from "../../chassis/src/errors";
-import { actionSnippet, fieldSelect, formatBytes, icon, initials, menuSelect, relTime } from "./ui";
+import { actionSnippet, fieldSelect, formatBytes, initials, menuSelect, relTime } from "./ui";
+import { icon } from "./icons";
import { appState, replacePanePreservingFocus, switchView, syncUrlFromState } from "./shell";
import { startNewChat } from "./sessions";
import { groupDmTitle, openSession, refreshSessions, sessionsState, slackLogo, surfaceOf } from "./sessions";
diff --git a/plugins/web-ui/src/core-bridge.ts b/plugins/web-ui/src/core-bridge.ts
index 69c40c42f..ebd9bf52d 100644
--- a/plugins/web-ui/src/core-bridge.ts
+++ b/plugins/web-ui/src/core-bridge.ts
@@ -3,7 +3,7 @@ import { captureMessage, stopAnalytics } from "./product-analytics.ts";
import { streamedAnswer } from "./timeline.ts";
import { fetchServerSentEvents } from "@tanstack/ai-client";
import { postCallText, postResultOk } from "./surface-post.ts";
-import type { ModelMetadata } from "./pi-models.ts";
+import type { RuntimeChange, RuntimeConfig } from "./runtime-config-cache.ts";
import { createAssistantMessageEventStream } from "@earendil-works/pi-ai";
import type { Attachment } from "@earendil-works/pi-web-ui";
import type { Api, AssistantMessage, AssistantMessageEventStream, Context, Model, Usage } from "@earendil-works/pi-ai";
@@ -775,26 +775,6 @@ export async function api<T = unknown>(path: string, init?: RequestInit): Promis
return body as T;
}
-export interface RuntimeConfig {
- interactiveFastMode?: boolean;
- unavailableReason?: string;
- scopeId: string;
- approvedHarnesses: string[];
- modelsByHarness: Record<string, string[]>;
- modelCatalog: Record<string, ModelMetadata>;
- orgDefault: { harnessId: string; modelId: string; effortLevel?: string; fastMode?: boolean; revision: number };
- scopeOverride: {
- harnessId: string;
- modelId: string;
- effortLevel?: string;
- fastMode?: boolean;
- orgRevision: number;
- } | null;
- effective: { harnessId: string; modelId: string; effortLevel?: string; fastMode?: boolean };
- upgradeAvailable: boolean;
- fastModeModelIds?: string[];
-}
-
export async function fetchRuntimeConfig(scopeId?: string | null, account?: "company"): Promise<RuntimeConfig | null> {
try {
const params = new URLSearchParams();
@@ -808,17 +788,7 @@ export async function fetchRuntimeConfig(scopeId?: string | null, account?: "com
}
}
-export async function updateRuntimeConfig(
- scopeId: string | null,
- change: {
- harnessId?: string;
- modelId?: string;
- effortLevel?: string;
- fastMode?: boolean;
- inherit?: boolean;
- keep?: boolean;
- },
-): Promise<RuntimeConfig> {
+export async function updateRuntimeConfig(scopeId: string | null, change: RuntimeChange): Promise<RuntimeConfig> {
return api<RuntimeConfig>("/api/runtime-config", {
method: "PUT",
body: JSON.stringify({ ...change, ...(scopeId ? { scopeId } : {}) }),
diff --git a/plugins/web-ui/src/crons.ts b/plugins/web-ui/src/crons.ts
index cb73fc406..078ea6fa9 100644
--- a/plugins/web-ui/src/crons.ts
+++ b/plugins/web-ui/src/crons.ts
@@ -2,7 +2,7 @@ import { html, nothing, render, type TemplateResult } from "lit";
import { Archive, Pause, Pencil, Play, Plus, RotateCcw, Trash2 } from "lucide";
import { api, userSendMessage } from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { listBackLink, listPageTpl } from "./list-page";
import { contextsState, ensureContexts, scopeChip } from "./contexts";
import { scopedSession, scopedViewTopbar } from "./session-scope";
diff --git a/plugins/web-ui/src/deploy-permissions.ts b/plugins/web-ui/src/deploy-permissions.ts
index 8adac3c5e..3f482a97f 100644
--- a/plugins/web-ui/src/deploy-permissions.ts
+++ b/plugins/web-ui/src/deploy-permissions.ts
@@ -2,7 +2,8 @@ import { html, render, nothing } from "lit";
import { live } from "lit/directives/live.js";
import { Building2, Globe, Lock, Search, X } from "lucide";
import { api } from "./core-bridge";
-import { closeFormMenus, icon, initials, menuSelect } from "./ui";
+import { closeFormMenus, initials, menuSelect } from "./ui";
+import { icon } from "./icons";
import { scopeChip } from "./contexts";
import { friendlyPrincipal } from "./deploy-view";
import { errMessage } from "../../chassis/src/errors";
diff --git a/plugins/web-ui/src/deploys.ts b/plugins/web-ui/src/deploys.ts
index d0ee5c7a7..5f932e4f8 100644
--- a/plugins/web-ui/src/deploys.ts
+++ b/plugins/web-ui/src/deploys.ts
@@ -4,7 +4,8 @@ import { live } from "lit/directives/live.js";
import { Archive, Check, Copy, ExternalLink, Plus, RotateCcw, Trash2, X } from "lucide";
import { api, withBase } from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { copyText, icon, relTime } from "./ui";
+import { copyText, relTime } from "./ui";
+import { icon } from "./icons";
import { listBackLink, listPageTpl } from "./list-page";
import { contextsState, ensureContexts, scopeChip } from "./contexts";
import { scopedSession, scopedViewTopbar } from "./session-scope";
diff --git a/plugins/web-ui/src/effort-confetti.ts b/plugins/web-ui/src/effort-confetti.ts
index 5e7b71896..e65bbfac0 100644
--- a/plugins/web-ui/src/effort-confetti.ts
+++ b/plugins/web-ui/src/effort-confetti.ts
@@ -1,4 +1,4 @@
-import { effortLevelsForHarness } from "./composer-loadout";
+import { effortLevelsForHarness } from "./composer-loadout.ts";
const COLORS = ["#e8843a", "#e45d79", "#a78bfa", "#60a5fa", "#5cc074", "#f6cc46"];
let activeBurst: HTMLElement | null = null;
diff --git a/plugins/web-ui/src/file-viewer.ts b/plugins/web-ui/src/file-viewer.ts
index 2b7ec64f3..7412561a4 100644
--- a/plugins/web-ui/src/file-viewer.ts
+++ b/plugins/web-ui/src/file-viewer.ts
@@ -1,7 +1,7 @@
import { html, nothing, render } from "lit";
import { X } from "lucide";
import { webFetch } from "./core-bridge";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { markdown } from "./message-markdown";
import { installMarkdownSanitizer } from "./markdown-sanitize";
import { errMessage } from "../../chassis/src/errors";
diff --git a/plugins/web-ui/src/files.ts b/plugins/web-ui/src/files.ts
index 8bf117de8..c53753f5b 100644
--- a/plugins/web-ui/src/files.ts
+++ b/plugins/web-ui/src/files.ts
@@ -17,7 +17,8 @@ import {
} from "lucide";
import { api, fileContentUrl, webFetch, withBase } from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { browserRenderableImage, fieldSelect, formatBytes, icon, relTime } from "./ui";
+import { browserRenderableImage, fieldSelect, formatBytes, relTime } from "./ui";
+import { icon } from "./icons";
import { contextsState, ensureContexts, personalScopeId, scopeTitle } from "./contexts";
import { appState } from "./shell";
import { fileListNeedsAllPages } from "./file-list";
diff --git a/plugins/web-ui/src/icons.ts b/plugins/web-ui/src/icons.ts
new file mode 100644
index 000000000..a116bb104
--- /dev/null
+++ b/plugins/web-ui/src/icons.ts
@@ -0,0 +1,147 @@
+import { html, type TemplateResult } from "lit";
+import { unsafeSVG } from "lit/directives/unsafe-svg.js";
+import { createElement, type IconNode } from "lucide";
+
+const CLAUDE_MARK =
+ "M20.998 10.949H24v3.102h-3v3.028h-1.487V20H18v-2.921h-1.487V20H15v-2.921H9V20H7.488v-2.921H6V20H4.487v-2.921H3V14.05H0V10.95h3V5h17.998v5.949zM6 10.949h1.488V8.102H6v2.847zm10.51 0H18V8.102h-1.49v2.847z";
+
+const OPENAI_MARK =
+ "M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z";
+
+const CODEX_FRAME =
+ "M19.503 0H4.496A4.496 4.496 0 000 4.496v15.007A4.496 4.496 0 004.496 24h15.007A4.496 4.496 0 0024 19.503V4.496A4.496 4.496 0 0019.503 0z";
+
+const CODEX_MARK =
+ "M9.064 3.344a4.578 4.578 0 012.285-.312c1 .115 1.891.54 2.673 1.275.01.01.024.017.037.021a.09.09 0 00.043 0 4.55 4.55 0 013.046.275l.047.022.116.057a4.581 4.581 0 012.188 2.399c.209.51.313 1.041.315 1.595a4.24 4.24 0 01-.134 1.223.123.123 0 00.03.115c.594.607.988 1.33 1.183 2.17.289 1.425-.007 2.71-.887 3.854l-.136.166a4.548 4.548 0 01-2.201 1.388.123.123 0 00-.081.076c-.191.551-.383 1.023-.74 1.494-.9 1.187-2.222 1.846-3.711 1.838-1.187-.006-2.239-.44-3.157-1.302a.107.107 0 00-.105-.024c-.388.125-.78.143-1.204.138a4.441 4.441 0 01-1.945-.466 4.544 4.544 0 01-1.61-1.335c-.152-.202-.303-.392-.414-.617a5.81 5.81 0 01-.37-.961 4.582 4.582 0 01-.014-2.298.124.124 0 00.006-.056.085.085 0 00-.027-.048 4.467 4.467 0 01-1.034-1.651 3.896 3.896 0 01-.251-1.192 5.189 5.189 0 01.141-1.6c.337-1.112.982-1.985 1.933-2.618.212-.141.413-.251.601-.33.215-.089.43-.164.646-.227a.098.098 0 00.065-.066 4.51 4.51 0 01.829-1.615 4.535 4.535 0 011.837-1.388zm3.482 10.565a.637.637 0 000 1.272h3.636a.637.637 0 100-1.272h-3.636zM8.462 9.23a.637.637 0 00-1.106.631l1.272 2.224-1.266 2.136a.636.636 0 101.095.649l1.454-2.455a.636.636 0 00.005-.64L8.462 9.23z";
+
+const PI_GLYPH = "M165.29 165.29H517.36V400H400V517.36H282.65V634.72H165.29ZM282.65 282.65V400H400V282.65Z";
+
+const PI_DOT = "M517.36 400H634.72V634.72H517.36Z";
+
+const OPENCODE_FRAME = "M180 60H60V240H180V60ZM240 300H0V0H240V300Z";
+
+const OPENCODE_SCREEN = "M180 240H60V120H180V240Z";
+
+const MARK_KEYS: Record<string, "claude" | "codex" | "pi" | "opencode" | "gemini" | "openai"> = {
+ anthropic: "claude",
+ google: "gemini",
+ gemini: "gemini",
+ opencode: "opencode",
+ pi: "pi",
+ claude: "claude",
+ openai: "openai",
+ codex: "codex",
+};
+
+export function modelMark(key: string, size = 16): TemplateResult | null {
+ const mark = MARK_KEYS[key.toLocaleLowerCase()];
+ if (!mark) return null;
+ if (mark === "openai")
+ return html`<svg
+ class="model-mark"
+ width=${size}
+ height=${size}
+ viewBox="0 0 24 24"
+ role="img"
+ aria-label="OpenAI"
+ focusable="false"
+ >
+ <path fill="currentColor" d=${OPENAI_MARK} />
+ </svg>`;
+ if (mark === "gemini")
+ return html`<svg
+ class="model-mark"
+ width=${size}
+ height=${size}
+ viewBox="0 0 24 24"
+ role="img"
+ aria-label="Gemini"
+ focusable="false"
+ >
+ <path
+ fill="#4285f4"
+ d="M12 1C10.5 8.5 8.5 10.5 1 12c7.5 1.5 9.5 3.5 11 11 1.5-7.5 3.5-9.5 11-11C15.5 10.5 13.5 8.5 12 1Z"
+ />
+ </svg>`;
+ if (mark === "opencode")
+ return html`<svg
+ class="model-mark"
+ width=${size}
+ height=${size}
+ viewBox="-30 0 300 300"
+ role="img"
+ aria-label="OpenCode"
+ focusable="false"
+ >
+ <path fill="currentColor" opacity="0.45" d=${OPENCODE_SCREEN} />
+ <path fill="currentColor" d=${OPENCODE_FRAME} />
+ </svg>`;
+ if (mark === "pi")
+ return html`<svg
+ class="model-mark"
+ width=${size}
+ height=${size}
+ viewBox="0 0 800 800"
+ role="img"
+ aria-label="Pi"
+ focusable="false"
+ >
+ <rect width="800" height="800" rx="170" fill="#5b74e8" />
+ <path fill="#fff" fill-rule="evenodd" d=${PI_GLYPH} />
+ <path fill="#fff" d=${PI_DOT} />
+ </svg>`;
+ if (mark === "claude")
+ return html`<svg
+ class="model-mark"
+ width=${size}
+ height=${size}
+ viewBox="0 0 24 24"
+ role="img"
+ aria-label="Claude"
+ focusable="false"
+ >
+ <path clip-rule="evenodd" fill-rule="evenodd" fill="#d97757" d=${CLAUDE_MARK} />
+ </svg>`;
+ return html`<svg
+ class="model-mark"
+ width=${size}
+ height=${size}
+ viewBox="0 0 24 24"
+ role="img"
+ aria-label="Codex"
+ focusable="false"
+ >
+ <defs>
+ <linearGradient id="model-mark-codex" gradientUnits="userSpaceOnUse" x1="12" x2="12" y1="3" y2="21">
+ <stop stop-color="#b1a7ff" />
+ <stop offset=".5" stop-color="#7a9dff" />
+ <stop offset="1" stop-color="#3941ff" />
+ </linearGradient>
+ </defs>
+ <path fill="var(--background, #fff)" d=${CODEX_FRAME} />
+ <path fill="url(#model-mark-codex)" d=${CODEX_MARK} />
+ </svg>`;
+}
+
+const iconTemplates = new WeakMap<IconNode, Map<number, TemplateResult>>();
+
+export function icon(node: IconNode, size = 18): TemplateResult {
+ let sizes = iconTemplates.get(node);
+ if (!sizes) iconTemplates.set(node, (sizes = new Map()));
+ const cached = sizes.get(size);
+ if (cached) return cached;
+ const template = html`${unsafeSVG(iconElement(node, size).outerHTML)}`;
+ sizes.set(size, template);
+ return template;
+}
+
+export function iconElement(node: IconNode, size: number): SVGElement {
+ return createElement(node, {
+ class: "icon",
+ width: size,
+ height: size,
+ "aria-hidden": "true",
+ focusable: "false",
+ "stroke-width": 1.9,
+ });
+}
diff --git a/plugins/web-ui/src/inbox.ts b/plugins/web-ui/src/inbox.ts
index 35ce1a261..889770322 100644
--- a/plugins/web-ui/src/inbox.ts
+++ b/plugins/web-ui/src/inbox.ts
@@ -49,7 +49,8 @@ import { listBackLink } from "./list-page";
import { registerPaneKind } from "./pane-kinds";
import { exitSplitIfActive, notifyPanesChanged } from "./split";
import { tip } from "./tooltip";
-import { brandName, fieldSelect, menuSelect, icon, initials, relTime, sheenLabel, slackMark, workingWave } from "./ui";
+import { brandName, fieldSelect, menuSelect, initials, relTime, sheenLabel, slackMark, workingWave } from "./ui";
+import { icon } from "./icons";
import { assistantSidebar, assistantMessage } from "./assistant-sidebar";
import { inboxChat } from "./inbox-chat";
diff --git a/plugins/web-ui/src/list-page.ts b/plugins/web-ui/src/list-page.ts
index aed446f57..01b299e61 100644
--- a/plugins/web-ui/src/list-page.ts
+++ b/plugins/web-ui/src/list-page.ts
@@ -1,7 +1,7 @@
import { html, nothing, type TemplateResult } from "lit";
import { live } from "lit/directives/live.js";
import { ArrowLeft, Plus, Search } from "lucide";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { scopeFilterControl } from "./contexts";
export function listBackLink(label: string, onBack: () => void): TemplateResult {
diff --git a/plugins/web-ui/src/loop-icon.ts b/plugins/web-ui/src/loop-icon.ts
index eb3010262..03af6baa2 100644
--- a/plugins/web-ui/src/loop-icon.ts
+++ b/plugins/web-ui/src/loop-icon.ts
@@ -16,7 +16,8 @@ import {
Heart,
Wrench,
} from "lucide";
-import { icon, slackMark } from "./ui";
+import { slackMark } from "./ui";
+import { icon } from "./icons";
export const LOOP_ICONS = [
{ id: "repeat", label: "Loop", glyph: Repeat },
diff --git a/plugins/web-ui/src/loops.ts b/plugins/web-ui/src/loops.ts
index fb37671cc..a7129aa8a 100644
--- a/plugins/web-ui/src/loops.ts
+++ b/plugins/web-ui/src/loops.ts
@@ -3,7 +3,8 @@ import { html, nothing, render, type TemplateResult } from "lit";
import { CheckCircle2, ChevronDown, ChevronRight, CornerUpLeft, Pause, Play, Zap } from "lucide";
import { api } from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { fieldSelect, icon } from "./ui";
+import { fieldSelect } from "./ui";
+import { icon } from "./icons";
import { listBackLink, listPageTpl } from "./list-page";
import { appState, can } from "./shell";
import { tip } from "./tooltip";
diff --git a/plugins/web-ui/src/main.ts b/plugins/web-ui/src/main.ts
index eaf5f9ddc..9e989e494 100644
--- a/plugins/web-ui/src/main.ts
+++ b/plugins/web-ui/src/main.ts
@@ -1,4 +1,6 @@
import "dockview-core/dist/styles/dockview.css";
+import "./model-picker.css";
+import "./tooltip.css";
import "./shell.css";
import { bootSafely, closeUserMenu } from "./shell";
import { registerChatSearchHotkey } from "./search";
diff --git a/plugins/web-ui/src/memory.ts b/plugins/web-ui/src/memory.ts
index 26cf58ee6..a4e410f1a 100644
--- a/plugins/web-ui/src/memory.ts
+++ b/plugins/web-ui/src/memory.ts
@@ -2,7 +2,7 @@ import { html, nothing, render } from "lit";
import { Pencil, Search, Trash2 } from "lucide";
import { api } from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { appState, replacePanePreservingFocus } from "./shell";
import { scopedSession, scopedViewTopbar } from "./session-scope";
import { tip } from "./tooltip";
diff --git a/plugins/web-ui/src/model-options.ts b/plugins/web-ui/src/model-options.ts
index 8cd40ddb8..775edd511 100644
--- a/plugins/web-ui/src/model-options.ts
+++ b/plugins/web-ui/src/model-options.ts
@@ -1,5 +1,4 @@
-import { getRuntimeConfig } from "./runtime-config-store.ts";
-import type { RuntimeConfig } from "./core-bridge.ts";
+import { getRuntimeConfig, type RuntimeConfig } from "./runtime-config-cache.ts";
import type { Api, Model } from "@earendil-works/pi-ai";
import { getBaseModel, type ModelMetadata } from "./pi-models.ts";
@@ -149,8 +148,7 @@ export function getModelOptions(scopeKey?: string | null): ModelOption[] {
return runtimeFor(scopeKey).options;
}
-export function getHarnessOptions(scopeKey?: string | null): Array<{ value: string; label: string }> {
- const options = runtimeFor(scopeKey).options;
+export function harnessOptions(options: readonly ModelOption[]): Array<{ value: string; label: string }> {
return [...new Map(options.map((option) => [option.harnessId, option.harnessLabel])).entries()].map(
([value, label]) => ({ value, label }),
);
diff --git a/plugins/web-ui/src/model-picker.css b/plugins/web-ui/src/model-picker.css
new file mode 100644
index 000000000..19a0fbf5b
--- /dev/null
+++ b/plugins/web-ui/src/model-picker.css
@@ -0,0 +1,754 @@
+.menu-control {
+ position: relative;
+ min-width: 0;
+}
+.menu-button {
+ height: 34px;
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ max-width: min(240px, 44vw);
+ min-width: 0;
+ padding: 0 8px;
+ border: 0;
+ border-radius: 8px;
+ font: inherit;
+ font-size: var(--font-13);
+ color: var(--muted-foreground);
+ background: transparent;
+ cursor: pointer;
+}
+.menu-button:hover,
+.menu-button[aria-expanded="true"] {
+ background: var(--secondary);
+ color: var(--foreground);
+}
+.menu-button:disabled {
+ opacity: 0.55;
+ cursor: not-allowed;
+}
+.menu-label {
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.model-control .menu-button {
+ max-width: min(280px, 46vw);
+ color: var(--foreground);
+}
+.menu-popover {
+ position: absolute;
+ bottom: calc(100% + 8px);
+ left: 0;
+ z-index: 30;
+ width: 230px;
+ max-width: calc(100vw - 36px);
+ max-height: min(320px, 52vh);
+ overflow-y: auto;
+ padding: 6px;
+ border: 1px solid var(--border);
+ border-radius: 12px;
+ background: var(--background);
+}
+.menu-control[data-drop="down"] .menu-popover {
+ top: calc(100% + 6px);
+ bottom: auto;
+}
+.menu-control[data-drop="down"] .menu-popover.drop-up {
+ top: auto;
+ bottom: calc(100% + 6px);
+}
+.menu-control[data-align="right"] .menu-popover {
+ right: 0;
+ left: auto;
+ width: 230px;
+}
+.loadout-button {
+ gap: 7px;
+ height: 32px;
+ max-width: min(360px, 58vw);
+ padding: 0 8px;
+ color: var(--foreground);
+ font-size: var(--font-13);
+}
+.loadout-button .menu-suffix {
+ color: var(--muted-foreground);
+ white-space: nowrap;
+}
+[data-density] .composer-toolbar .menu-button.loadout-button {
+ width: auto;
+ max-width: min(280px, calc(100cqw - 130px));
+ padding-inline: 6px;
+ justify-content: flex-start;
+}
+@container chat (max-width: 470px) {
+ [data-density] .loadout-button .menu-suffix {
+ display: none;
+ }
+}
+.menu-control .menu-popover.loadout-popover,
+.menu-control[data-align="right"] .menu-popover.loadout-popover,
+.menu-control[data-drop="down"] .menu-popover.loadout-popover {
+ position: fixed;
+ right: auto;
+ bottom: auto;
+ z-index: 60;
+ display: flex;
+ flex-direction: column;
+ width: min(280px, calc(100vw - 24px));
+ max-width: calc(100vw - 24px);
+ box-sizing: border-box;
+ margin: 0;
+ padding: 6px;
+ overflow: visible;
+ border: 1px solid var(--border);
+ border-radius: 12px;
+ background: var(--background);
+ color: var(--foreground);
+}
+.loadout-popover[popover]:not(:popover-open) {
+ display: none;
+}
+.loadout-popover::backdrop {
+ pointer-events: none;
+}
+.loadout-panel {
+ display: flex;
+ flex: 1 1 auto;
+ flex-direction: column;
+ min-height: 0;
+}
+.loadout-head {
+ padding: 4px 8px;
+ font-size: var(--font-12-5);
+ color: var(--muted-foreground);
+}
+.loadout-list {
+ padding-block: 0;
+ flex: 1 1 auto;
+ min-height: 0;
+ max-height: 304px;
+ overflow-y: auto;
+ overscroll-behavior: contain;
+ scrollbar-width: thin;
+}
+.loadout-row {
+ margin-block: 2px;
+ position: relative;
+ display: flex;
+ align-items: center;
+ min-height: 34px;
+ border-radius: 8px;
+}
+.loadout-row:hover,
+.loadout-row:focus-within {
+ background: var(--secondary);
+}
+.loadout-row.active {
+ background: color-mix(in srgb, var(--secondary) 94%, var(--foreground));
+}
+.loadout-pick {
+ display: flex;
+ align-items: center;
+ flex: 1;
+ gap: 7px;
+ min-width: 0;
+ min-height: 34px;
+ padding: 3px 34px 3px 8px;
+ border: 0;
+ border-radius: 8px;
+ background: transparent;
+ color: inherit;
+ font: inherit;
+ font-size: var(--font-13);
+ line-height: 20px;
+ text-align: left;
+ cursor: pointer;
+}
+.loadout-icon {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ flex: 0 0 17px;
+ width: 17px;
+ height: 17px;
+ color: var(--muted-foreground);
+}
+.loadout-icon[data-provider="openai"] {
+ color: var(--foreground);
+}
+.loadout-icon[data-provider="anthropic"] {
+ color: #d77d59;
+}
+.loadout-model-copy {
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ min-width: 0;
+}
+.loadout-title {
+ display: flex;
+ align-items: center;
+ gap: 5px;
+ min-width: 0;
+}
+.loadout-default {
+ flex: none;
+ padding: 0 4px;
+ border-radius: 999px;
+ background: var(--secondary);
+ color: var(--muted-foreground);
+ font-size: 9px;
+ font-weight: 400;
+ line-height: 13px;
+}
+.loadout-name,
+.loadout-harness {
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.loadout-name {
+ color: var(--foreground);
+ font-weight: 400;
+}
+.loadout-details {
+ display: flex;
+ align-items: baseline;
+ gap: 6px;
+ color: var(--muted-foreground);
+ font-size: 11px;
+ line-height: 14px;
+ white-space: nowrap;
+}
+.loadout-details .loadout-bolt {
+ align-self: center;
+}
+.loadout-meta {
+ flex: none;
+ color: var(--muted-foreground);
+ font-size: var(--font-13);
+ white-space: nowrap;
+}
+.effort-peak {
+ background-image:
+ linear-gradient(105deg, transparent 43%, rgb(0 0 0 / 0.3) 50%, transparent 57%),
+ linear-gradient(90deg, #cf361f, #af5614, #8a6b07, #607825, #317e43, #347a78, #2b769f, #5465d4, #a72aec);
+ background-repeat: no-repeat;
+ background-size:
+ 180% 100%,
+ 100% 100%;
+ background-position:
+ 220% 0,
+ 0 0;
+ -webkit-background-clip: text;
+ background-clip: text;
+ color: transparent;
+}
+.loadout-row:hover .effort-peak,
+.loadout-setting:hover .effort-peak,
+.loadout-effort:hover .effort-peak,
+.loadout-button:hover .effort-peak {
+ animation: effort-shine 900ms ease-out;
+}
+@keyframes effort-shine {
+ from {
+ background-position:
+ 220% 0,
+ 0 0;
+ }
+ to {
+ background-position:
+ -120% 0,
+ 0 0;
+ }
+}
+@media (prefers-reduced-motion: reduce) {
+ .loadout-row:hover .effort-peak,
+ .loadout-setting:hover .effort-peak,
+ .loadout-effort:hover .effort-peak,
+ .loadout-button:hover .effort-peak {
+ animation: none;
+ }
+}
+:root.dark .effort-peak,
+.dark .effort-peak {
+ background-image:
+ linear-gradient(105deg, transparent 43%, rgb(255 255 255 / 0.95) 50%, transparent 57%),
+ linear-gradient(90deg, #e45d49, #e8843a, #f6cc46, #abcc59, #5cc074, #55b7b5, #5ba9d3, #7b88de, #c46bf5);
+}
+@supports not ((background-clip: text) or (-webkit-background-clip: text)) {
+ .effort-peak {
+ background-image: none;
+ color: inherit;
+ }
+}
+.effort-peak::selection {
+ color: var(--foreground);
+}
+@media print {
+ .effort-peak {
+ background-image: none;
+ color: inherit;
+ }
+}
+.loadout-bolt {
+ display: inline-flex;
+ flex: none;
+ color: var(--muted-foreground);
+}
+.loadout-end {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ flex: none;
+ gap: 6px;
+ width: 26px;
+ min-width: 26px;
+ margin-left: auto;
+ padding: 0;
+ color: var(--foreground);
+}
+.loadout-row.has-default-action .loadout-model-copy {
+ margin-right: 26px;
+}
+.loadout-make-default,
+.loadout-default-star {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 26px;
+ position: absolute;
+ top: 50%;
+ right: 38px;
+ height: 26px;
+ margin-top: -13px;
+ padding: 0 5px;
+ border: 0;
+ border-radius: 6px;
+ background: transparent;
+ color: var(--muted-foreground);
+ font: inherit;
+ font-size: 11px;
+ cursor: pointer;
+ opacity: 0;
+ pointer-events: none;
+}
+.loadout-row:hover .loadout-make-default,
+.loadout-row:has(:focus-visible) .loadout-make-default {
+ opacity: 1;
+ pointer-events: auto;
+}
+.loadout-make-default:hover,
+.loadout-make-default:focus-visible {
+ background: var(--secondary);
+ color: var(--foreground);
+}
+.loadout-make-default:hover svg,
+.loadout-make-default:focus-visible svg {
+ fill: currentColor;
+}
+.loadout-make-default[data-default="true"],
+.loadout-default-star {
+ opacity: 1;
+ pointer-events: auto;
+ color: #eab308;
+}
+.loadout-default-star {
+ cursor: default;
+}
+.loadout-make-default[data-default="true"] svg,
+.loadout-default-star svg {
+ fill: currentColor;
+}
+@media (hover: none) {
+ .loadout-make-default,
+ .loadout-default-star {
+ opacity: 1;
+ pointer-events: auto;
+ }
+}
+.loadout-remove {
+ position: absolute;
+ top: 50%;
+ right: 8px;
+ margin-top: -13px;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 26px;
+ height: 26px;
+ padding: 0;
+ border: 0;
+ border-radius: 6px;
+ background: transparent;
+ color: var(--muted-foreground);
+ cursor: pointer;
+ opacity: 0;
+ pointer-events: none;
+}
+.loadout-row:hover .loadout-remove,
+.loadout-row:has(:focus-visible) .loadout-remove {
+ opacity: 1;
+ pointer-events: auto;
+}
+@media (hover: none) {
+ .loadout-remove {
+ opacity: 1;
+ pointer-events: auto;
+ }
+}
+.loadout-remove:hover,
+.loadout-remove:focus-visible {
+ background: var(--secondary);
+ color: var(--foreground);
+}
+.loadout-shortcut {
+ flex: none;
+ padding: 0;
+ border: 0;
+ color: var(--muted-foreground);
+ font: inherit;
+ font-size: 12px;
+ line-height: 18px;
+ white-space: nowrap;
+}
+.loadout-add,
+.loadout-setting,
+.loadout-effort,
+.loadout-back {
+ display: flex;
+ align-items: center;
+ flex: none;
+ gap: 9px;
+ width: 100%;
+ min-height: 28px;
+ box-sizing: border-box;
+ padding: 3px 8px;
+ border: 0;
+ border-radius: 8px;
+ background: transparent;
+ color: var(--foreground);
+ font: inherit;
+ font-size: var(--font-13);
+ line-height: 20px;
+ text-align: left;
+ cursor: pointer;
+}
+.loadout-add {
+ gap: 7px;
+ color: var(--muted-foreground);
+}
+.loadout-add:hover,
+.loadout-add.open,
+.loadout-setting:not([role="menuitemcheckbox"]):not(.loadout-setting-static):hover,
+.loadout-setting.open,
+.loadout-effort:not([aria-disabled="true"]):hover,
+.loadout-back:hover {
+ background: var(--secondary);
+}
+.loadout-effort[aria-disabled="true"] {
+ opacity: 0.45;
+ cursor: not-allowed;
+}
+.loadout-setting[role="menuitemcheckbox"]:disabled {
+ opacity: 1;
+ cursor: not-allowed;
+}
+.loadout-setting[role="menuitemcheckbox"]:disabled .loadout-setting-label,
+.loadout-setting[role="menuitemcheckbox"]:disabled .loadout-toggle {
+ opacity: 0.45;
+}
+.loadout-setting[role="menuitemcheckbox"]:not(:disabled):hover .loadout-toggle {
+ background: color-mix(in srgb, var(--foreground) 42%, var(--background));
+}
+.loadout-setting[role="menuitemcheckbox"]:not(:disabled):hover .loadout-toggle.on {
+ background: var(--cta-hover);
+}
+.loadout-divider {
+ flex: none;
+ height: 1px;
+ margin: 3px 0;
+ background: var(--border);
+}
+.loadout-setting-label {
+ font-weight: 400;
+}
+.loadout-setting-static {
+ cursor: default;
+}
+.loadout-setting-value {
+ display: inline-flex;
+ align-items: center;
+ gap: 10px;
+ margin-left: auto;
+ color: var(--muted-foreground);
+}
+.loadout-submenu-anchor {
+ position: relative;
+ flex: none;
+}
+.loadout-submenu {
+ position: fixed;
+ z-index: 61;
+ width: 250px;
+ max-width: calc(100vw - 24px);
+ max-height: calc(100dvh - 24px);
+ box-sizing: border-box;
+ padding: 6px;
+ overflow-y: auto;
+ overscroll-behavior: contain;
+ border: 1px solid var(--border);
+ border-radius: 12px;
+ background: var(--background);
+ color: var(--foreground);
+ scrollbar-width: thin;
+}
+.loadout-submenu:has(.loadout-search) {
+ width: 320px;
+}
+.loadout-submenu.inline {
+ position: static;
+ flex: 1 1 auto;
+ width: 100%;
+ min-height: 0;
+ max-width: none;
+ margin: 0;
+ box-shadow: none;
+}
+.loadout-popover:has(> .loadout-submenu.inline) > .loadout-panel,
+.loadout-popover:has(> .loadout-submenu.inline) > .loadout-foot {
+ display: none;
+}
+.loadout-submenu .menu-option {
+ min-height: 30px;
+ align-items: center;
+ gap: 9px;
+ padding: 4px 8px;
+ border: 0;
+ font-size: var(--font-13);
+ line-height: 20px;
+}
+.loadout-submenu .menu-option-copy {
+ display: flex;
+ 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;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.loadout-add-label {
+ flex: none;
+ align-self: center;
+ margin-left: auto;
+ color: var(--muted-foreground);
+ font-size: 12px;
+ opacity: 0;
+}
+.menu-option:hover .loadout-add-label,
+.menu-option:focus-visible .loadout-add-label {
+ opacity: 1;
+}
+.loadout-effort {
+ padding-inline: 10px;
+}
+.loadout-effort > svg {
+ margin-left: auto;
+ color: var(--foreground);
+}
+.loadout-harness-option {
+ display: inline-flex;
+ align-items: center;
+ gap: 8px;
+ min-width: 0;
+}
+.loadout-harness-option .model-mark {
+ flex: none;
+}
+.loadout-harness-option > span {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.loadout-toggle {
+ position: relative;
+ flex: none;
+ width: 38px;
+ height: 22px;
+ border-radius: 999px;
+ background: color-mix(in srgb, var(--foreground) 28%, var(--background));
+}
+.loadout-knob {
+ position: absolute;
+ top: 3px;
+ left: 3px;
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+ background: var(--background);
+ transition: transform 120ms ease;
+}
+.loadout-toggle.on {
+ background: var(--cta);
+}
+.loadout-toggle.on .loadout-knob {
+ background: var(--cta-foreground);
+ transform: translateX(16px);
+}
+.loadout-foot {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ flex: none;
+ gap: 8px;
+ min-height: 28px;
+ margin-top: 3px;
+ padding: 3px 8px 0;
+ border-top: 1px solid var(--border);
+ color: var(--muted-foreground);
+ font-size: 12px;
+}
+.loadout-foot-btn {
+ display: inline-flex;
+ align-items: center;
+ gap: 5px;
+ min-height: 28px;
+ padding: 0 2px;
+ border: 0;
+ border-radius: 4px;
+ background: transparent;
+ color: var(--muted-foreground);
+ font: inherit;
+ cursor: pointer;
+}
+.loadout-foot-btn:hover {
+ color: var(--foreground);
+}
+.loadout-search {
+ display: flex;
+ margin: 2px 2px 5px;
+}
+.loadout-search input {
+ width: 100%;
+ min-width: 0;
+ height: 30px;
+ box-sizing: border-box;
+ padding: 4px 9px;
+ border: 1px solid var(--border);
+ border-radius: 6px;
+ background: var(--background);
+ color: var(--foreground);
+ font: inherit;
+ font-size: var(--font-13);
+}
+.loadout-search input::placeholder {
+ color: var(--muted-foreground);
+}
+.loadout-empty {
+ padding: 12px 10px;
+ color: var(--muted-foreground);
+ font-size: var(--font-13);
+}
+.loadout-back {
+ display: none;
+ color: var(--muted-foreground);
+ font-size: var(--font-13);
+}
+.loadout-submenu.inline .loadout-back {
+ display: flex;
+}
+.loadout-back svg {
+ transform: rotate(90deg);
+}
+.loadout-popover button:focus-visible,
+.loadout-submenu button:focus-visible,
+.loadout-search input:focus-visible {
+ outline: 2px solid var(--muted-foreground);
+ outline-offset: -2px;
+}
+.loadout-popover button:disabled,
+.loadout-submenu button:disabled {
+ opacity: 0.4;
+ cursor: not-allowed;
+}
+@media (max-width: 860px) {
+ .menu-control .menu-popover.loadout-popover {
+ padding: 18px 10px calc(10px + env(safe-area-inset-bottom));
+ border-radius: 20px 20px 0 0;
+ border-bottom: 0;
+ }
+ .loadout-control .loadout-button {
+ max-width: min(360px, calc(100vw - 150px));
+ }
+ .loadout-panel {
+ overflow-y: auto;
+ overscroll-behavior: contain;
+ }
+ .loadout-list {
+ flex: none;
+ max-height: none;
+ overflow: visible;
+ }
+ .loadout-row,
+ .loadout-pick,
+ .loadout-add,
+ .loadout-setting,
+ .loadout-effort,
+ .loadout-back,
+ .loadout-submenu .menu-option {
+ min-height: 44px;
+ }
+}
+@media (prefers-reduced-motion: reduce) {
+ .loadout-knob {
+ transition: none;
+ }
+}
+
+.menu-title {
+ padding: 7px 8px 6px;
+ font-size: var(--font-14);
+ color: var(--foreground);
+}
+.menu-option {
+ width: 100%;
+ min-height: 34px;
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ gap: 10px;
+ padding: 7px 8px;
+ border: 0;
+ border-radius: 8px;
+ background: transparent;
+ color: var(--foreground);
+ cursor: pointer;
+ font: inherit;
+ font-size: var(--font-13);
+ text-align: left;
+}
+.menu-option:hover,
+.menu-option.active {
+ background: var(--secondary);
+}
+.menu-option-copy {
+ min-width: 0;
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+}
+.menu-option-label {
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
diff --git a/plugins/web-ui/src/model-picker.ts b/plugins/web-ui/src/model-picker.ts
index afbe41d74..daa4910d6 100644
--- a/plugins/web-ui/src/model-picker.ts
+++ b/plugins/web-ui/src/model-picker.ts
@@ -1,21 +1,21 @@
import { html, nothing, type TemplateResult } from "lit";
import { live } from "lit/directives/live.js";
import { Check, ChevronDown, ChevronRight, Plus, Sparkles, Star, X, Zap } from "lucide";
-import { icon, modelMark } from "./ui";
-import { getRuntimeConfig, saveRuntimeConfig } from "./runtime-config-store";
+import { icon, modelMark } from "./icons.ts";
+import { getRuntimeConfig, type RuntimeChange } from "./runtime-config-cache.ts";
import {
EFFORT_LEVELS,
effortLabel,
defaultEffortForModel,
defaultModelValue,
getModelOptions,
- getHarnessOptions,
+ harnessOptions,
harnessSupportsEffort,
harnessSupportsFastMode,
type EffortLevel,
type ModelOption,
-} from "./model-options";
-import { modelSupportsFastMode } from "./pi-models";
+} from "./model-options.ts";
+import { modelSupportsFastMode } from "./pi-models.ts";
import {
LOADOUT_CAP,
ULTRAFAST_MODEL_ID,
@@ -26,10 +26,10 @@ import {
presetModelId,
modelLoadoutOptions,
type LoadoutEntry,
-} from "./composer-loadout";
-import { tip } from "./tooltip";
-import { isPhone } from "./viewport";
-import { burstEffortConfetti } from "./effort-confetti";
+} from "./composer-loadout.ts";
+import { tip } from "./tooltip.ts";
+import { isPhone } from "./viewport.ts";
+import { burstEffortConfetti } from "./effort-confetti.ts";
const EFFORT_PEAK_FLOOR = EFFORT_LEVELS.findIndex((option) => option.value === "xhigh");
@@ -39,33 +39,43 @@ function effortText(level: EffortLevel | string): TemplateResult | string {
return rank >= EFFORT_PEAK_FLOOR ? html`<span class="effort-peak">${label}</span>` : label;
}
+export interface ModelCatalog {
+ options(): ModelOption[];
+ supportsFast(modelId: string): boolean;
+ overridden(): boolean;
+}
+
interface ModelPickerBindings<T> {
host(): HTMLElement | null;
redraw(): void;
scopeKey(): string | null;
state: { openMenu: string | null; menuQuery: string; effortLevel: EffortLevel };
- entries(selected: ModelOption): LoadoutEntry[];
+ presets?: {
+ entries(selected: ModelOption): LoadoutEntry[];
+ save(entries: LoadoutEntry[]): void;
+ add(option: ModelOption, target: T): void;
+ };
+ catalog?: ModelCatalog;
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>;
+ changeDefault(change: RuntimeChange, target: T, keepOpen?: boolean): Promise<unknown>;
showDefaultAction?: boolean;
showInheritAction?: boolean;
+ inheritLabel?: string;
+ emptyLabel?: string;
}
export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
const {
scopeKey,
state: composerState,
- entries: seededLoadout,
activeEntry: activeLoadoutEntry,
apply: applyLoadout,
- add: addLoadoutEntry,
+ presets,
selectEffort,
selectHarness,
toggleFastMode: applyFastMode,
@@ -77,6 +87,20 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
let loadoutSectionHovered = false;
let loadoutCloseTimer: ReturnType<typeof setTimeout> | null = null;
let disposed = false;
+ const catalog: ModelCatalog = bindings.catalog ?? {
+ options: () => getModelOptions(scopeKey()),
+ supportsFast: (modelId) => modelSupportsFastMode(scopeKey(), modelId),
+ overridden: () => !!getRuntimeConfig(scopeKey())?.scopeOverride,
+ };
+
+ function seededLoadout(selected: ModelOption): LoadoutEntry[] {
+ if (presets) return presets.entries(selected);
+ return modelLoadoutOptions(catalog.options(), [], selected.harnessId).map((option) => ({
+ value: option.value,
+ effort: defaultEffortForModel(option.model),
+ fast: false,
+ }));
+ }
function focusSpeedControl(label: string): void {
requestAnimationFrame(() => bindings.host()?.querySelector<HTMLElement>(`button[aria-label="${label}"]`)?.focus());
@@ -92,7 +116,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
const entries = seededLoadout(selected);
const index = entries.findIndex((entry) => entry.value === value);
const next = entries.filter((entry) => entry.value !== value);
- bindings.saveEntries(next);
+ presets?.save(next);
bindings.redraw();
placeLoadout();
requestAnimationFrame(() => {
@@ -103,9 +127,11 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
function modelLabel(option: ModelOption): string {
return option.model.id === ULTRAFAST_MODEL_ID
- ? (getModelOptions(scopeKey()).find(
- (candidate) => candidate.harnessId === option.harnessId && candidate.model.id === ULTRAFAST_BASE_MODEL_ID,
- )?.label ?? "Astra")
+ ? (catalog
+ .options()
+ .find(
+ (candidate) => candidate.harnessId === option.harnessId && candidate.model.id === ULTRAFAST_BASE_MODEL_ID,
+ )?.label ?? "Astra")
: option.label;
}
@@ -121,7 +147,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
}
function loadoutRow(entry: LoadoutEntry, selected: ModelOption, agent: T): TemplateResult | typeof nothing {
- const option = getModelOptions(scopeKey()).find((option) => option.value === entry.value);
+ const option = catalog.options().find((option) => option.value === entry.value);
if (!option) return nothing;
const active = entry.value === activeLoadoutEntry(selected).value;
const settings = active ? activeLoadoutEntry(selected) : entry;
@@ -192,7 +218,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
}
${isDefault && !canMakeDefault ? html`<span class="loadout-default-star" role="img" aria-label="My default" ${tip("My default")}>${icon(Star, 14)}</span>` : nothing}
${
- !active
+ !active && presets
? html`<button
class="loadout-remove"
type="button"
@@ -271,7 +297,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
const effort = loadoutSection === "effort";
const entries = seededLoadout(selected);
const query = composerState.menuQuery.trim().toLocaleLowerCase();
- const catalog = modelLoadoutOptions(getModelOptions(scopeKey()), entries, selected.harnessId).filter(
+ const addable = modelLoadoutOptions(catalog.options(), entries, selected.harnessId).filter(
(option) =>
!entries.some((entry) => presetModelId(entry.value) === presetModelId(option.value)) &&
(!query || `${option.harnessLabel} ${modelLabel(option)}`.toLocaleLowerCase().includes(query)),
@@ -316,8 +342,8 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
}
${
loadoutSection === "harness"
- ? getHarnessOptions(scopeKey()).map((harness) => {
- const compatible = compatibleHarnessOptions(getModelOptions(scopeKey()), selected.model.id).some(
+ ? harnessOptions(catalog.options()).map((harness) => {
+ const compatible = compatibleHarnessOptions(catalog.options(), selected.model.id).some(
(option) => option.harnessId === harness.value,
);
const reason = compatible ? "" : `${harness.label} cannot run ${selected.label}.`;
@@ -366,7 +392,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
}}
/>
</label>
- ${catalog.map(
+ ${addable.map(
(option) =>
html`<button
class="menu-option"
@@ -375,7 +401,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
aria-label=${`Add ${modelLabel(option)} to presets`}
@click=${() => {
dismissSelection();
- addLoadoutEntry(option, agent);
+ presets?.add(option, agent);
}}
>
${modelGlyph(option)}<span class="menu-option-copy"
@@ -386,14 +412,14 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
><span class="loadout-add-label" aria-hidden="true">Add</span>
</button>`,
)}
- ${catalog.length ? nothing : html`<div class="loadout-empty">No models found</div>`}`
+ ${addable.length ? nothing : html`<div class="loadout-empty">No models found</div>`}`
: nothing
}
</div>`;
}
function loadoutHarnessControl(selected: ModelOption): TemplateResult {
- const options = getHarnessOptions(scopeKey());
+ const options = harnessOptions(catalog.options());
const value = html`<span class="loadout-harness-option"
>${modelMark(selected.harnessId, 15) ?? nothing}<span>${selected.harnessLabel}</span></span
>`;
@@ -433,16 +459,13 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
}
function render(agent: T, choice: ModelOption | undefined, disabled: boolean): TemplateResult {
- const selected = choice ?? getModelOptions(scopeKey())[0];
+ const selected = choice ?? catalog.options()[0];
if (!selected) return html`<span class="context-model-status">No models available</span>`;
const open = composerState.openMenu === "loadout";
const entries = seededLoadout(selected);
const ultrafastOn = selected.model.id === ULTRAFAST_MODEL_ID;
- const ultrafastTarget = ultrafastChoice(getModelOptions(scopeKey()), selected);
- const modelSupportsFast = modelSupportsFastMode(
- scopeKey(),
- ultrafastOn ? ULTRAFAST_BASE_MODEL_ID : selected.model.id,
- );
+ const ultrafastTarget = ultrafastChoice(catalog.options(), selected);
+ const modelSupportsFast = catalog.supportsFast(ultrafastOn ? ULTRAFAST_BASE_MODEL_ID : selected.model.id);
const fastAvailable =
!!choice &&
(!ultrafastOn || !!ultrafastTarget) &&
@@ -472,7 +495,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
class="menu-button loadout-button ${ultrafastOn ? "ultrafast-active" : ""}"
data-focus-key=${`${loadoutMenuId}-trigger`}
type="button"
- aria-label=${choice ? `Model: ${modelLabel(choice)}, ${effortLabel(composerState.effortLevel)} effort${speedLabel}` : "Choose model"}
+ aria-label=${choice ? `Model: ${modelLabel(choice)}, ${effortLabel(composerState.effortLevel)} effort${speedLabel}` : (bindings.emptyLabel ?? "Choose model")}
aria-haspopup="menu"
aria-expanded=${open ? "true" : "false"}
aria-controls=${loadoutMenuId}
@@ -500,7 +523,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
placeLoadout();
}}
>
- <span class="menu-label">${choice ? modelLabel(choice) : "Choose model"}</span>
+ <span class="menu-label">${choice ? modelLabel(choice) : (bindings.emptyLabel ?? "Choose model")}</span>
${choice ? html`<span class="menu-suffix">${effortText(composerState.effortLevel)}</span>` : nothing}
${ultrafastOn ? html`<span class="loadout-ultrafast-badge">${icon(Zap, 12)} Ultrafast</span>` : nothing}
${fastOn ? html`<span class="loadout-bolt">${icon(Zap, 13)}</span>` : nothing}${icon(ChevronDown, 13)}
@@ -527,41 +550,45 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
}}
>
<div class="loadout-panel">
- <div class="loadout-head">Presets</div>
+ ${presets ? html`<div class="loadout-head">Presets</div>` : nothing}
<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." : "")}
- >
- <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);
- }}
- >
- <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>
+ ${
+ presets
+ ? html`<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);
+ }}
+ >
+ <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>`
+ : nothing
+ }
${
choice
? html`<div class="loadout-divider"></div>
@@ -652,7 +679,7 @@ export function createModelPicker<T>(bindings: ModelPickerBindings<T>) {
: nothing
}
</div>
- ${bindings.showInheritAction !== false && 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}
+ ${bindings.showInheritAction !== false && catalog.overridden() ? html`<div class="loadout-foot"><button class="loadout-foot-btn" type="button" @click=${() => changeScopeRuntime({ inherit: true }, agent)}>${bindings.inheritLabel ?? "Use org default"}</button></div>` : nothing}
${loadoutSubmenu(agent, selected)}
</div>`
: nothing
diff --git a/plugins/web-ui/src/onboarding-slack.ts b/plugins/web-ui/src/onboarding-slack.ts
index 1350a7619..baaf70f21 100644
--- a/plugins/web-ui/src/onboarding-slack.ts
+++ b/plugins/web-ui/src/onboarding-slack.ts
@@ -2,7 +2,8 @@ import { openDesktopBrowser } from "../../chassis/src/desktop-browser";
import "./slack-account.css";
import { LitElement, html, nothing } from "lit";
import { ArrowUpRight, Check } from "lucide";
-import { icon, slackMark } from "./ui";
+import { slackMark } from "./ui";
+import { icon } from "./icons";
export class OnboardingSlack extends LitElement {
static properties = {
diff --git a/plugins/web-ui/src/onboarding-welcome.ts b/plugins/web-ui/src/onboarding-welcome.ts
index 1fe45d1e4..154923184 100644
--- a/plugins/web-ui/src/onboarding-welcome.ts
+++ b/plugins/web-ui/src/onboarding-welcome.ts
@@ -9,7 +9,7 @@ import {
} from "./connection-return";
import { LitElement, html, nothing } from "lit";
import { Check } from "lucide";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { mountConnectionPicker, type ConnectionService } from "./connection-picker";
import type { Me } from "./shell-state";
import "./onboarding-welcome.css";
diff --git a/plugins/web-ui/src/people-results.ts b/plugins/web-ui/src/people-results.ts
index 8c7d74105..b6bc351ce 100644
--- a/plugins/web-ui/src/people-results.ts
+++ b/plugins/web-ui/src/people-results.ts
@@ -1,6 +1,7 @@
import { html, type TemplateResult } from "lit";
import { Plus } from "lucide";
-import { icon, initials } from "./ui";
+import { initials } from "./ui";
+import { icon } from "./icons";
export interface DirectoryMatch {
principalId: string;
diff --git a/plugins/web-ui/src/pi-models.ts b/plugins/web-ui/src/pi-models.ts
index 01c7553b8..df751fd72 100644
--- a/plugins/web-ui/src/pi-models.ts
+++ b/plugins/web-ui/src/pi-models.ts
@@ -1,4 +1,4 @@
-import { getRuntimeConfig } from "./runtime-config-store.ts";
+import { getRuntimeConfig } from "./runtime-config-cache.ts";
import type { Api, Model } from "@earendil-works/pi-ai";
export type ModelMetadata = Pick<
diff --git a/plugins/web-ui/src/runtime-config-cache.ts b/plugins/web-ui/src/runtime-config-cache.ts
new file mode 100644
index 000000000..ba2e7ca3f
--- /dev/null
+++ b/plugins/web-ui/src/runtime-config-cache.ts
@@ -0,0 +1,46 @@
+import type { ModelMetadata } from "./pi-models.ts";
+
+export interface RuntimeConfig {
+ interactiveFastMode?: boolean;
+ unavailableReason?: string;
+ scopeId: string;
+ approvedHarnesses: string[];
+ modelsByHarness: Record<string, string[]>;
+ modelCatalog: Record<string, ModelMetadata>;
+ orgDefault: { harnessId: string; modelId: string; effortLevel?: string; fastMode?: boolean; revision: number };
+ scopeOverride: {
+ harnessId: string;
+ modelId: string;
+ effortLevel?: string;
+ fastMode?: boolean;
+ orgRevision: number;
+ } | null;
+ effective: { harnessId: string; modelId: string; effortLevel?: string; fastMode?: boolean };
+ upgradeAvailable: boolean;
+ fastModeModelIds?: string[];
+}
+
+export type RuntimeChange = {
+ harnessId?: string;
+ modelId?: string;
+ effortLevel?: string;
+ fastMode?: boolean;
+ inherit?: boolean;
+ keep?: boolean;
+};
+
+const configs = new Map<string, RuntimeConfig>();
+let bootScope: string | null = null;
+
+export function getRuntimeConfig(scopeId: string | null = bootScope): RuntimeConfig | null {
+ return scopeId === null ? null : (configs.get(scopeId) ?? null);
+}
+
+export function setRuntimeBootScope(scopeId: string): void {
+ bootScope = scopeId;
+}
+
+export function cacheRuntimeConfig(scopeId: string, config: RuntimeConfig | null): void {
+ if (config) configs.set(scopeId, config);
+ else configs.delete(scopeId);
+}
diff --git a/plugins/web-ui/src/runtime-config-store.ts b/plugins/web-ui/src/runtime-config-store.ts
index fda55a66c..a256beae7 100644
--- a/plugins/web-ui/src/runtime-config-store.ts
+++ b/plugins/web-ui/src/runtime-config-store.ts
@@ -1,9 +1,15 @@
-import { fetchRuntimeConfig, updateRuntimeConfig, type RuntimeConfig } from "./core-bridge.ts";
+import { fetchRuntimeConfig, updateRuntimeConfig } from "./core-bridge.ts";
+import {
+ cacheRuntimeConfig,
+ getRuntimeConfig,
+ setRuntimeBootScope,
+ type RuntimeConfig,
+} from "./runtime-config-cache.ts";
import { swallow } from "../../chassis/src/errors.ts";
type Change = Parameters<typeof updateRuntimeConfig>[1];
type Entry = {
- config: RuntimeConfig | null;
+ key: string;
generation: number;
fetchedAt: number;
load: Promise<RuntimeConfig | null> | null;
@@ -13,14 +19,13 @@ type Entry = {
// Reuse boot/multiview reads briefly; returning to a view still revalidates server policy.
const FRESH_MS = 30_000;
const entries = new Map<string, Entry>();
-let bootScope: string | null = null;
let accountRevision = 0;
export function invalidateRuntimeConfigs(): void {
accountRevision++;
- for (const entry of entries.values()) {
+ for (const [key, entry] of entries) {
entry.generation++;
- entry.config = null;
+ cacheRuntimeConfig(key, null);
entry.fetchedAt = 0;
entry.load = null;
}
@@ -31,19 +36,15 @@ if (typeof window !== "undefined") window.addEventListener("model-account-change
function entryFor(scopeId: string): Entry {
let entry = entries.get(scopeId);
if (!entry) {
- entry = { config: null, generation: 0, fetchedAt: 0, load: null, write: null, listeners: new Set() };
+ entry = { key: scopeId, generation: 0, fetchedAt: 0, load: null, write: null, listeners: new Set() };
entries.set(scopeId, entry);
}
return entry;
}
-export function getRuntimeConfig(scopeId: string | null = bootScope): RuntimeConfig | null {
- return scopeId === null ? null : (entries.get(scopeId)?.config ?? null);
-}
-
function publish(scopeId: string, entry: Entry, config: RuntimeConfig): void {
if (config.scopeId !== scopeId) throw new Error("Runtime configuration scope mismatch");
- entry.config = config;
+ cacheRuntimeConfig(entry.key, config);
entry.fetchedAt = Date.now();
for (const listener of entry.listeners) {
try {
@@ -57,8 +58,8 @@ function publish(scopeId: string, entry: Entry, config: RuntimeConfig): void {
/** Boot hydration is shared by every pane, not consumed by the first mount. */
export function seedRuntimeConfig(scopeId: string, config: RuntimeConfig): void {
const entry = entryFor(scopeId);
- bootScope = scopeId;
- if (entry.config || entry.write) return;
+ setRuntimeBootScope(scopeId);
+ if (getRuntimeConfig(scopeId) || entry.write) return;
++entry.generation;
publish(scopeId, entry, config);
}
@@ -83,13 +84,14 @@ export async function loadRuntimeConfig(
const entry = entryFor(runtimeConfigKey(scopeId, account)!);
// Reads started during a save must not race ahead of that save on the server.
while (entry.write) await entry.write;
- if (!refresh && entry.config && Date.now() - entry.fetchedAt < FRESH_MS) return entry.config;
+ const cached = getRuntimeConfig(entry.key);
+ if (!refresh && cached && Date.now() - entry.fetchedAt < FRESH_MS) return cached;
if (entry.load) return entry.load;
const generation = entry.generation;
const load = fetchRuntimeConfig(scopeId, account).then(async (config) => {
if (generation !== entry.generation) {
while (entry.write) await entry.write;
- return entry.config;
+ return getRuntimeConfig(entry.key);
}
if (config) publish(scopeId, entry, config);
return config;
diff --git a/plugins/web-ui/src/search.ts b/plugins/web-ui/src/search.ts
index 5e779126f..0b6ed2cce 100644
--- a/plugins/web-ui/src/search.ts
+++ b/plugins/web-ui/src/search.ts
@@ -9,7 +9,7 @@ import { openSession, refreshSessions, sessionsState, sessionTitle } from "./ses
import { destinations } from "./browse";
import { UI_BASE } from "./deep-link";
import { resourceResults, matchResources, type ResourceHit, type ResourceSearchResponse } from "./search-resources";
-import { icon } from "./ui";
+import { icon } from "./icons";
interface ChatSearchHit {
sessionId: string;
diff --git a/plugins/web-ui/src/sent-mail.ts b/plugins/web-ui/src/sent-mail.ts
index a70ea2782..1eb412623 100644
--- a/plugins/web-ui/src/sent-mail.ts
+++ b/plugins/web-ui/src/sent-mail.ts
@@ -3,7 +3,8 @@ import { ArrowUpRight, ChevronRight, Mail } from "lucide";
import type { LedgerItem } from "./inbox";
import { api } from "./core-bridge";
import { listBackLink } from "./list-page";
-import { icon, initials, relTime } from "./ui";
+import { initials, relTime } from "./ui";
+import { icon } from "./icons";
interface SentThreadMessage {
from: string;
diff --git a/plugins/web-ui/src/session-scope.ts b/plugins/web-ui/src/session-scope.ts
index 4d103928e..ee0fbdc59 100644
--- a/plugins/web-ui/src/session-scope.ts
+++ b/plugins/web-ui/src/session-scope.ts
@@ -1,7 +1,8 @@
import { html, nothing, type TemplateResult } from "lit";
import { ArrowUpLeft, Box, Brain, Clock3, Ellipsis, Files, GitFork, KeyRound, Rocket } from "lucide";
import { api } from "./core-bridge";
-import { closeFormMenus, icon, toggleFormMenu } from "./ui";
+import { closeFormMenus, toggleFormMenu } from "./ui";
+import { icon } from "./icons";
import { tip } from "./tooltip";
/** A session's context carried into the crons/files/memory views so the whole
diff --git a/plugins/web-ui/src/session-share.ts b/plugins/web-ui/src/session-share.ts
index ac0e49105..fed37afa6 100644
--- a/plugins/web-ui/src/session-share.ts
+++ b/plugins/web-ui/src/session-share.ts
@@ -1,6 +1,7 @@
import { html, render } from "lit";
import { X, Link, Copy, Check, Users, Globe, ChevronDown } from "lucide";
-import { icon, toggleFormMenu, closeFormMenus } from "./ui";
+import { toggleFormMenu, closeFormMenus } from "./ui";
+import { icon } from "./icons";
import { api, withBase } from "./core-bridge";
interface ShareState {
diff --git a/plugins/web-ui/src/sessions.ts b/plugins/web-ui/src/sessions.ts
index 3d5eec842..d98c8b7fa 100644
--- a/plugins/web-ui/src/sessions.ts
+++ b/plugins/web-ui/src/sessions.ts
@@ -71,7 +71,8 @@ import {
} from "./session-list";
import { tip } from "./tooltip";
import { errMessage } from "../../chassis/src/errors";
-import { copyText, icon, menuSelect, relTime, workingWave } from "./ui";
+import { copyText, menuSelect, relTime, workingWave } from "./ui";
+import { icon } from "./icons";
import { listPageTpl } from "./list-page";
import {
contextsState,
diff --git a/plugins/web-ui/src/settings.ts b/plugins/web-ui/src/settings.ts
index 5d75984e0..a27b9ef1a 100644
--- a/plugins/web-ui/src/settings.ts
+++ b/plugins/web-ui/src/settings.ts
@@ -4,7 +4,7 @@ import { openModelConnectManager, type StatusResponse } from "./model-connect";
import { api, fetchUiState, putUiState, withBase } from "./core-bridge";
import { html, nothing, render, type TemplateResult } from "lit";
import { Download, ExternalLink, LogOut, Monitor, Moon, ShieldUser, Sun, type IconNode } from "lucide";
-import { icon } from "./ui";
+import { icon } from "./icons";
import { ADMIN_HOME_URL, appState, can, signOut } from "./shell";
import { sessionsState, setWebOnly } from "./sessions";
import { errMessage } from "../../chassis/src/errors";
diff --git a/plugins/web-ui/src/shared-session.ts b/plugins/web-ui/src/shared-session.ts
index a9eed2967..f534ff301 100644
--- a/plugins/web-ui/src/shared-session.ts
+++ b/plugins/web-ui/src/shared-session.ts
@@ -1,3 +1,5 @@
+import "./model-picker.css";
+import "./tooltip.css";
import "./shell.css";
import "@mariozechner/mini-lit/dist/ThemeToggle.js";
import { html, render } from "lit";
@@ -7,7 +9,8 @@ import { decorateTextCodeBlocks } from "./text-code";
import { markdown } from "./message-markdown";
import { sharedImagePolicy } from "./shared-image-policy";
import { installMarkdownSanitizer } from "./markdown-sanitize";
-import { brandName, brandMark, attachmentGallery, chipBadge, icon, copyText } from "./ui";
+import { brandName, brandMark, attachmentGallery, chipBadge, copyText } from "./ui";
+import { icon } from "./icons";
interface SharedTranscript {
createdAt: number;
diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.css
index 654f27b08..16c929d34 100644
--- a/plugins/web-ui/src/shell.css
+++ b/plugins/web-ui/src/shell.css
@@ -3792,760 +3792,6 @@ qm-markdown .tok-in {
opacity: 0.55;
cursor: not-allowed;
}
-.menu-control {
- position: relative;
- min-width: 0;
-}
-.menu-button {
- height: 34px;
- display: inline-flex;
- align-items: center;
- gap: 6px;
- max-width: min(240px, 44vw);
- min-width: 0;
- padding: 0 8px;
- border: 0;
- border-radius: 8px;
- font: inherit;
- font-size: var(--font-13);
- color: var(--muted-foreground);
- background: transparent;
- cursor: pointer;
-}
-.menu-button:hover,
-.menu-button[aria-expanded="true"] {
- background: var(--secondary);
- color: var(--foreground);
-}
-.menu-button:disabled {
- opacity: 0.55;
- cursor: not-allowed;
-}
-.menu-label {
- min-width: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.model-control .menu-button {
- max-width: min(280px, 46vw);
- color: var(--foreground);
-}
-.menu-popover {
- position: absolute;
- bottom: calc(100% + 8px);
- left: 0;
- z-index: 30;
- width: 230px;
- max-width: calc(100vw - 36px);
- max-height: min(320px, 52vh);
- overflow-y: auto;
- padding: 6px;
- border: 1px solid var(--border);
- border-radius: 12px;
- background: var(--background);
-}
-.menu-control[data-drop="down"] .menu-popover {
- top: calc(100% + 6px);
- bottom: auto;
-}
-.menu-control[data-drop="down"] .menu-popover.drop-up {
- top: auto;
- bottom: calc(100% + 6px);
-}
-.menu-control[data-align="right"] .menu-popover {
- right: 0;
- left: auto;
- width: 230px;
-}
-.loadout-button {
- gap: 7px;
- height: 32px;
- max-width: min(360px, 58vw);
- padding: 0 8px;
- color: var(--foreground);
- font-size: var(--font-13);
-}
-.loadout-button .menu-suffix {
- color: var(--muted-foreground);
- white-space: nowrap;
-}
-[data-density] .composer-toolbar .menu-button.loadout-button {
- width: auto;
- max-width: min(280px, calc(100cqw - 130px));
- padding-inline: 6px;
- justify-content: flex-start;
-}
-@container chat (max-width: 470px) {
- [data-density] .loadout-button .menu-suffix {
- display: none;
- }
-}
-.menu-control .menu-popover.loadout-popover,
-.menu-control[data-align="right"] .menu-popover.loadout-popover,
-.menu-control[data-drop="down"] .menu-popover.loadout-popover {
- position: fixed;
- right: auto;
- bottom: auto;
- z-index: 60;
- display: flex;
- flex-direction: column;
- width: min(280px, calc(100vw - 24px));
- max-width: calc(100vw - 24px);
- box-sizing: border-box;
- margin: 0;
- padding: 6px;
- overflow: visible;
- border: 1px solid var(--border);
- border-radius: 12px;
- background: var(--background);
- color: var(--foreground);
-}
-.loadout-popover[popover]:not(:popover-open) {
- display: none;
-}
-.loadout-popover::backdrop {
- pointer-events: none;
-}
-.loadout-panel {
- display: flex;
- flex: 1 1 auto;
- flex-direction: column;
- min-height: 0;
-}
-.loadout-head {
- padding: 4px 8px;
- font-size: var(--font-12-5);
- color: var(--muted-foreground);
-}
-.loadout-list {
- padding-block: 0;
- flex: 1 1 auto;
- min-height: 0;
- max-height: 304px;
- overflow-y: auto;
- overscroll-behavior: contain;
- scrollbar-width: thin;
-}
-.loadout-row {
- margin-block: 2px;
- position: relative;
- display: flex;
- align-items: center;
- min-height: 34px;
- border-radius: 8px;
-}
-.loadout-row:hover,
-.loadout-row:focus-within {
- background: var(--secondary);
-}
-.loadout-row.active {
- background: color-mix(in srgb, var(--secondary) 94%, var(--foreground));
-}
-.loadout-pick {
- display: flex;
- align-items: center;
- flex: 1;
- gap: 7px;
- min-width: 0;
- min-height: 34px;
- padding: 3px 34px 3px 8px;
- border: 0;
- border-radius: 8px;
- background: transparent;
- color: inherit;
- font: inherit;
- font-size: var(--font-13);
- line-height: 20px;
- text-align: left;
- cursor: pointer;
-}
-.loadout-icon {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- flex: 0 0 17px;
- width: 17px;
- height: 17px;
- color: var(--muted-foreground);
-}
-.loadout-icon[data-provider="openai"] {
- color: var(--foreground);
-}
-.loadout-icon[data-provider="anthropic"] {
- color: #d77d59;
-}
-.loadout-model-copy {
- display: flex;
- flex: 1;
- flex-direction: column;
- min-width: 0;
-}
-.loadout-title {
- display: flex;
- align-items: center;
- gap: 5px;
- min-width: 0;
-}
-.loadout-default {
- flex: none;
- padding: 0 4px;
- border-radius: 999px;
- background: var(--secondary);
- color: var(--muted-foreground);
- font-size: 9px;
- font-weight: 400;
- line-height: 13px;
-}
-.loadout-name,
-.loadout-harness {
- min-width: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.loadout-name {
- color: var(--foreground);
- font-weight: 400;
-}
-.loadout-details {
- display: flex;
- align-items: baseline;
- gap: 6px;
- color: var(--muted-foreground);
- font-size: 11px;
- line-height: 14px;
- white-space: nowrap;
-}
-.loadout-details .loadout-bolt {
- align-self: center;
-}
-.loadout-meta {
- flex: none;
- color: var(--muted-foreground);
- font-size: var(--font-13);
- white-space: nowrap;
-}
-.effort-peak {
- background-image:
- linear-gradient(105deg, transparent 43%, rgb(0 0 0 / 0.3) 50%, transparent 57%),
- linear-gradient(90deg, #cf361f, #af5614, #8a6b07, #607825, #317e43, #347a78, #2b769f, #5465d4, #a72aec);
- background-repeat: no-repeat;
- background-size:
- 180% 100%,
- 100% 100%;
- background-position:
- 220% 0,
- 0 0;
- -webkit-background-clip: text;
- background-clip: text;
- color: transparent;
-}
-.loadout-row:hover .effort-peak,
-.loadout-setting:hover .effort-peak,
-.loadout-effort:hover .effort-peak,
-.loadout-button:hover .effort-peak {
- animation: effort-shine 900ms ease-out;
-}
-@keyframes effort-shine {
- from {
- background-position:
- 220% 0,
- 0 0;
- }
- to {
- background-position:
- -120% 0,
- 0 0;
- }
-}
-@media (prefers-reduced-motion: reduce) {
- .loadout-row:hover .effort-peak,
- .loadout-setting:hover .effort-peak,
- .loadout-effort:hover .effort-peak,
- .loadout-button:hover .effort-peak {
- animation: none;
- }
-}
-:root.dark .effort-peak,
-.dark .effort-peak {
- background-image:
- linear-gradient(105deg, transparent 43%, rgb(255 255 255 / 0.95) 50%, transparent 57%),
- linear-gradient(90deg, #e45d49, #e8843a, #f6cc46, #abcc59, #5cc074, #55b7b5, #5ba9d3, #7b88de, #c46bf5);
-}
-@supports not ((background-clip: text) or (-webkit-background-clip: text)) {
- .effort-peak {
- background-image: none;
- color: inherit;
- }
-}
-.effort-peak::selection {
- color: var(--foreground);
-}
-@media print {
- .effort-peak {
- background-image: none;
- color: inherit;
- }
-}
-.loadout-bolt {
- display: inline-flex;
- flex: none;
- color: var(--muted-foreground);
-}
-.loadout-end {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- flex: none;
- gap: 6px;
- width: 26px;
- min-width: 26px;
- margin-left: auto;
- padding: 0;
- color: var(--foreground);
-}
-.loadout-row.has-default-action .loadout-model-copy {
- margin-right: 26px;
-}
-.loadout-make-default,
-.loadout-default-star {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- width: 26px;
- position: absolute;
- top: 50%;
- right: 38px;
- height: 26px;
- margin-top: -13px;
- padding: 0 5px;
- border: 0;
- border-radius: 6px;
- background: transparent;
- color: var(--muted-foreground);
- font: inherit;
- font-size: 11px;
- cursor: pointer;
- opacity: 0;
- pointer-events: none;
-}
-.loadout-row:hover .loadout-make-default,
-.loadout-row:has(:focus-visible) .loadout-make-default {
- opacity: 1;
- pointer-events: auto;
-}
-.loadout-make-default:hover,
-.loadout-make-default:focus-visible {
- background: var(--secondary);
- color: var(--foreground);
-}
-.loadout-make-default:hover svg,
-.loadout-make-default:focus-visible svg {
- fill: currentColor;
-}
-.loadout-make-default[data-default="true"],
-.loadout-default-star {
- opacity: 1;
- pointer-events: auto;
- color: #eab308;
-}
-.loadout-default-star {
- cursor: default;
-}
-.loadout-make-default[data-default="true"] svg,
-.loadout-default-star svg {
- fill: currentColor;
-}
-@media (hover: none) {
- .loadout-make-default,
- .loadout-default-star {
- opacity: 1;
- pointer-events: auto;
- }
-}
-.loadout-remove {
- position: absolute;
- top: 50%;
- right: 8px;
- margin-top: -13px;
- display: inline-flex;
- align-items: center;
- justify-content: center;
- width: 26px;
- height: 26px;
- padding: 0;
- border: 0;
- border-radius: 6px;
- background: transparent;
- color: var(--muted-foreground);
- cursor: pointer;
- opacity: 0;
- pointer-events: none;
-}
-.loadout-row:hover .loadout-remove,
-.loadout-row:has(:focus-visible) .loadout-remove {
- opacity: 1;
- pointer-events: auto;
-}
-@media (hover: none) {
- .loadout-remove {
- opacity: 1;
- pointer-events: auto;
- }
-}
-.loadout-remove:hover,
-.loadout-remove:focus-visible {
- background: var(--secondary);
- color: var(--foreground);
-}
-.loadout-shortcut {
- flex: none;
- padding: 0;
- border: 0;
- color: var(--muted-foreground);
- font: inherit;
- font-size: 12px;
- line-height: 18px;
- white-space: nowrap;
-}
-.loadout-add,
-.loadout-setting,
-.loadout-effort,
-.loadout-back {
- display: flex;
- align-items: center;
- flex: none;
- gap: 9px;
- width: 100%;
- min-height: 28px;
- box-sizing: border-box;
- padding: 3px 8px;
- border: 0;
- border-radius: 8px;
- background: transparent;
- color: var(--foreground);
- font: inherit;
- font-size: var(--font-13);
- line-height: 20px;
- text-align: left;
- cursor: pointer;
-}
-.loadout-add {
- gap: 7px;
- color: var(--muted-foreground);
-}
-.loadout-add:hover,
-.loadout-add.open,
-.loadout-setting:not([role="menuitemcheckbox"]):not(.loadout-setting-static):hover,
-.loadout-setting.open,
-.loadout-effort:not([aria-disabled="true"]):hover,
-.loadout-back:hover {
- background: var(--secondary);
-}
-.loadout-effort[aria-disabled="true"] {
- opacity: 0.45;
- cursor: not-allowed;
-}
-.loadout-setting[role="menuitemcheckbox"]:disabled {
- opacity: 1;
- cursor: not-allowed;
-}
-.loadout-setting[role="menuitemcheckbox"]:disabled .loadout-setting-label,
-.loadout-setting[role="menuitemcheckbox"]:disabled .loadout-toggle {
- opacity: 0.45;
-}
-.loadout-setting[role="menuitemcheckbox"]:not(:disabled):hover .loadout-toggle {
- background: color-mix(in srgb, var(--foreground) 42%, var(--background));
-}
-.loadout-setting[role="menuitemcheckbox"]:not(:disabled):hover .loadout-toggle.on {
- background: var(--cta-hover);
-}
-.loadout-divider {
- flex: none;
- height: 1px;
- margin: 3px 0;
- background: var(--border);
-}
-.loadout-setting-label {
- font-weight: 400;
-}
-.loadout-setting-static {
- cursor: default;
-}
-.loadout-setting-value {
- display: inline-flex;
- align-items: center;
- gap: 10px;
- margin-left: auto;
- color: var(--muted-foreground);
-}
-.loadout-submenu-anchor {
- position: relative;
- flex: none;
-}
-.loadout-submenu {
- position: fixed;
- z-index: 61;
- width: 250px;
- max-width: calc(100vw - 24px);
- max-height: calc(100dvh - 24px);
- box-sizing: border-box;
- padding: 6px;
- overflow-y: auto;
- overscroll-behavior: contain;
- border: 1px solid var(--border);
- border-radius: 12px;
- background: var(--background);
- color: var(--foreground);
- scrollbar-width: thin;
-}
-.loadout-submenu:has(.loadout-search) {
- width: 320px;
-}
-.loadout-submenu.inline {
- position: static;
- flex: 1 1 auto;
- width: 100%;
- min-height: 0;
- max-width: none;
- margin: 0;
- box-shadow: none;
-}
-.loadout-popover:has(> .loadout-submenu.inline) > .loadout-panel,
-.loadout-popover:has(> .loadout-submenu.inline) > .loadout-foot {
- display: none;
-}
-.loadout-submenu .menu-option {
- min-height: 30px;
- align-items: center;
- gap: 9px;
- padding: 4px 8px;
- border: 0;
- font-size: var(--font-13);
- line-height: 20px;
-}
-.loadout-submenu .menu-option-copy {
- display: flex;
- 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;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.loadout-add-label {
- flex: none;
- align-self: center;
- margin-left: auto;
- color: var(--muted-foreground);
- font-size: 12px;
- opacity: 0;
-}
-.menu-option:hover .loadout-add-label,
-.menu-option:focus-visible .loadout-add-label {
- opacity: 1;
-}
-.loadout-effort {
- padding-inline: 10px;
-}
-.loadout-effort > svg {
- margin-left: auto;
- color: var(--foreground);
-}
-.loadout-harness-option {
- display: inline-flex;
- align-items: center;
- gap: 8px;
- min-width: 0;
-}
-.loadout-harness-option .model-mark {
- flex: none;
-}
-.loadout-harness-option > span {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.loadout-toggle {
- position: relative;
- flex: none;
- width: 38px;
- height: 22px;
- border-radius: 999px;
- background: color-mix(in srgb, var(--foreground) 28%, var(--background));
-}
-.loadout-knob {
- position: absolute;
- top: 3px;
- left: 3px;
- width: 16px;
- height: 16px;
- border-radius: 50%;
- background: var(--background);
- transition: transform 120ms ease;
-}
-.loadout-toggle.on {
- background: var(--cta);
-}
-.loadout-toggle.on .loadout-knob {
- background: var(--cta-foreground);
- transform: translateX(16px);
-}
-.loadout-foot {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- flex: none;
- gap: 8px;
- min-height: 28px;
- margin-top: 3px;
- padding: 3px 8px 0;
- border-top: 1px solid var(--border);
- color: var(--muted-foreground);
- font-size: 12px;
-}
-.loadout-foot-btn {
- display: inline-flex;
- align-items: center;
- gap: 5px;
- min-height: 28px;
- padding: 0 2px;
- border: 0;
- border-radius: 4px;
- background: transparent;
- color: var(--muted-foreground);
- font: inherit;
- cursor: pointer;
-}
-.loadout-foot-btn:hover {
- color: var(--foreground);
-}
-.loadout-search {
- display: flex;
- margin: 2px 2px 5px;
-}
-.loadout-search input {
- width: 100%;
- min-width: 0;
- height: 30px;
- box-sizing: border-box;
- padding: 4px 9px;
- border: 1px solid var(--border);
- border-radius: 6px;
- background: var(--background);
- color: var(--foreground);
- font: inherit;
- font-size: var(--font-13);
-}
-.loadout-search input::placeholder {
- color: var(--muted-foreground);
-}
-.loadout-empty {
- padding: 12px 10px;
- color: var(--muted-foreground);
- font-size: var(--font-13);
-}
-.loadout-back {
- display: none;
- color: var(--muted-foreground);
- font-size: var(--font-13);
-}
-.loadout-submenu.inline .loadout-back {
- display: flex;
-}
-.loadout-back svg {
- transform: rotate(90deg);
-}
-.loadout-popover button:focus-visible,
-.loadout-submenu button:focus-visible,
-.loadout-search input:focus-visible {
- outline: 2px solid var(--muted-foreground);
- outline-offset: -2px;
-}
-.loadout-popover button:disabled,
-.loadout-submenu button:disabled {
- opacity: 0.4;
- cursor: not-allowed;
-}
-@media (max-width: 860px) {
- .menu-control .menu-popover.loadout-popover {
- padding: 18px 10px calc(10px + env(safe-area-inset-bottom));
- border-radius: 20px 20px 0 0;
- border-bottom: 0;
- }
- .loadout-control .loadout-button {
- max-width: min(360px, calc(100vw - 150px));
- }
- .loadout-panel {
- overflow-y: auto;
- overscroll-behavior: contain;
- }
- .loadout-list {
- flex: none;
- max-height: none;
- overflow: visible;
- }
- .loadout-row,
- .loadout-pick,
- .loadout-add,
- .loadout-setting,
- .loadout-effort,
- .loadout-back,
- .loadout-submenu .menu-option {
- min-height: 44px;
- }
-}
-@media (prefers-reduced-motion: reduce) {
- .loadout-knob {
- transition: none;
- }
-}
-
-.menu-title {
- padding: 7px 8px 6px;
- font-size: var(--font-14);
- color: var(--foreground);
-}
-.menu-option {
- width: 100%;
- min-height: 34px;
- display: flex;
- align-items: flex-start;
- justify-content: space-between;
- gap: 10px;
- padding: 7px 8px;
- border: 0;
- border-radius: 8px;
- background: transparent;
- color: var(--foreground);
- cursor: pointer;
- font: inherit;
- font-size: var(--font-13);
- text-align: left;
-}
-.menu-option:hover,
-.menu-option.active {
- background: var(--secondary);
-}
-.menu-option-copy {
- min-width: 0;
- display: flex;
- flex-direction: column;
- gap: 2px;
-}
-.menu-option-label {
- min-width: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
.slash-popover {
position: absolute;
left: 0;
@@ -8918,56 +8164,6 @@ h3.ambient-field-label {
width: 270px;
}
-[data-qm-tooltip-anchor] {
- anchor-name: --qm-tooltip-anchor;
-}
-
-.qm-tooltip {
- border: 1px solid var(--border);
- position: fixed;
- position-anchor: --qm-tooltip-anchor;
- position-area: top span-all;
- justify-self: anchor-center;
- position-try-fallbacks: flip-block;
- position-visibility: anchors-visible;
- inset: auto;
- margin: 7px;
- width: max-content;
- z-index: 4000;
- max-width: min(320px, calc(100vw - 14px));
- padding: 4px 8px;
- border-radius: 6px;
- font-size: 11.5px;
- line-height: 1.35;
- color: var(--foreground);
- background: var(--popover);
- box-shadow: var(--chat-surface-shadow);
- pointer-events: none;
- display: none;
- overflow-wrap: anywhere;
-}
-.qm-tooltip.visible {
- display: block;
-}
-.qm-tooltip.beside {
- position-area: right span-all;
- justify-self: normal;
- align-self: anchor-center;
- position-try-fallbacks: --qm-tooltip-above, --qm-tooltip-below;
-}
-@position-try --qm-tooltip-above {
- left: auto;
- position-area: top span-all;
- justify-self: anchor-center;
- align-self: normal;
-}
-@position-try --qm-tooltip-below {
- left: auto;
- position-area: bottom span-all;
- justify-self: anchor-center;
- align-self: normal;
-}
-
/* ===== Chat search palette (⌘K) ===== */
.section-label.recents-label > span:first-child {
flex: 1;
diff --git a/plugins/web-ui/src/shell.ts b/plugins/web-ui/src/shell.ts
index b93a15270..22bfb782b 100644
--- a/plugins/web-ui/src/shell.ts
+++ b/plugins/web-ui/src/shell.ts
@@ -46,7 +46,8 @@ import {
} from "./core-bridge";
import { seedRuntimeConfig } from "./runtime-config-store";
import { errMessage, swallow } from "../../chassis/src/errors";
-import { brandMark, brandName, icon } from "./ui";
+import { brandMark, brandName } from "./ui";
+import { icon } from "./icons";
import { PHONE_MAX_WIDTH, trackVisualViewport } from "./viewport";
import { markConnectorConnected } from "./chat";
import { clearSkillsCache, resyncModelSelection } from "./composer";
diff --git a/plugins/web-ui/src/slack-account.ts b/plugins/web-ui/src/slack-account.ts
index f39fb3e90..7b28900af 100644
--- a/plugins/web-ui/src/slack-account.ts
+++ b/plugins/web-ui/src/slack-account.ts
@@ -1,7 +1,8 @@
import { openDesktopBrowser } from "../../chassis/src/desktop-browser";
import { LitElement, html, nothing } from "lit";
import { ArrowUpRight, Check, Link2, UserRound } from "lucide";
-import { icon, slackMark } from "./ui";
+import { slackMark } from "./ui";
+import { icon } from "./icons";
import "./slack-account.css";
import { withBase } from "./core-bridge";
diff --git a/plugins/web-ui/src/split.ts b/plugins/web-ui/src/split.ts
index 4f5bf8cfb..09f57cb69 100644
--- a/plugins/web-ui/src/split.ts
+++ b/plugins/web-ui/src/split.ts
@@ -55,7 +55,8 @@ import {
import { paneKindByKey, paneKindEntry } from "./pane-kinds";
import { focusComposerOnPaneClick, focusPaneComposer, preservingFocus } from "./pane-focus";
import { attachTooltip, tip } from "./tooltip";
-import { icon, workingWave } from "./ui";
+import { workingWave } from "./ui";
+import { icon } from "./icons";
import { contextsState, scopeTitle } from "./contexts";
import type { DensityTier } from "./density";
import { appState } from "./shell-state";
diff --git a/plugins/web-ui/src/swarm-strip.ts b/plugins/web-ui/src/swarm-strip.ts
index 337b1b3bb..31d7c8a68 100644
--- a/plugins/web-ui/src/swarm-strip.ts
+++ b/plugins/web-ui/src/swarm-strip.ts
@@ -1,7 +1,7 @@
import { html, nothing, type TemplateResult } from "lit";
import { Users, ChevronRight } from "lucide";
import { api } from "./core-bridge.ts";
-import { icon } from "./ui.ts";
+import { icon } from "./icons.ts";
interface SwarmPeer {
id: string;
diff --git a/plugins/web-ui/src/tooltip.css b/plugins/web-ui/src/tooltip.css
new file mode 100644
index 000000000..6e75e6074
--- /dev/null
+++ b/plugins/web-ui/src/tooltip.css
@@ -0,0 +1,49 @@
+[data-qm-tooltip-anchor] {
+ anchor-name: --qm-tooltip-anchor;
+}
+
+.qm-tooltip {
+ border: 1px solid var(--border);
+ position: fixed;
+ position-anchor: --qm-tooltip-anchor;
+ position-area: top span-all;
+ justify-self: anchor-center;
+ position-try-fallbacks: flip-block;
+ position-visibility: anchors-visible;
+ inset: auto;
+ margin: 7px;
+ width: max-content;
+ z-index: 4000;
+ max-width: min(320px, calc(100vw - 14px));
+ padding: 4px 8px;
+ border-radius: 6px;
+ font-size: 11.5px;
+ line-height: 1.35;
+ color: var(--foreground);
+ background: var(--popover);
+ box-shadow: var(--chat-surface-shadow);
+ pointer-events: none;
+ display: none;
+ overflow-wrap: anywhere;
+}
+.qm-tooltip.visible {
+ display: block;
+}
+.qm-tooltip.beside {
+ position-area: right span-all;
+ justify-self: normal;
+ align-self: anchor-center;
+ position-try-fallbacks: --qm-tooltip-above, --qm-tooltip-below;
+}
+@position-try --qm-tooltip-above {
+ left: auto;
+ position-area: top span-all;
+ justify-self: anchor-center;
+ align-self: normal;
+}
+@position-try --qm-tooltip-below {
+ left: auto;
+ position-area: bottom span-all;
+ justify-self: anchor-center;
+ align-self: normal;
+}
diff --git a/plugins/web-ui/src/ui.ts b/plugins/web-ui/src/ui.ts
index f9a381e98..3dd9488b5 100644
--- a/plugins/web-ui/src/ui.ts
+++ b/plugins/web-ui/src/ui.ts
@@ -1,9 +1,9 @@
import { previewFile } from "./file-open.ts";
-import { unsafeSVG } from "lit/directives/unsafe-svg.js";
import { html, nothing, type TemplateResult } from "lit";
import { live } from "lit/directives/live.js";
import { tip } from "./tooltip.ts";
-import { Check, ChevronDown, Download, createElement, type IconNode } from "lucide";
+import { Check, ChevronDown, Download, type IconNode } from "lucide";
+import { icon, iconElement } from "./icons.ts";
export function brandName(): string {
if (typeof document === "undefined") return "QM";
@@ -92,150 +92,6 @@ export function slackMark(size = 14): TemplateResult {
</svg>`;
}
-const CLAUDE_MARK =
- "M20.998 10.949H24v3.102h-3v3.028h-1.487V20H18v-2.921h-1.487V20H15v-2.921H9V20H7.488v-2.921H6V20H4.487v-2.921H3V14.05H0V10.95h3V5h17.998v5.949zM6 10.949h1.488V8.102H6v2.847zm10.51 0H18V8.102h-1.49v2.847z";
-
-const OPENAI_MARK =
- "M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z";
-
-const CODEX_FRAME =
- "M19.503 0H4.496A4.496 4.496 0 000 4.496v15.007A4.496 4.496 0 004.496 24h15.007A4.496 4.496 0 0024 19.503V4.496A4.496 4.496 0 0019.503 0z";
-
-const CODEX_MARK =
- "M9.064 3.344a4.578 4.578 0 012.285-.312c1 .115 1.891.54 2.673 1.275.01.01.024.017.037.021a.09.09 0 00.043 0 4.55 4.55 0 013.046.275l.047.022.116.057a4.581 4.581 0 012.188 2.399c.209.51.313 1.041.315 1.595a4.24 4.24 0 01-.134 1.223.123.123 0 00.03.115c.594.607.988 1.33 1.183 2.17.289 1.425-.007 2.71-.887 3.854l-.136.166a4.548 4.548 0 01-2.201 1.388.123.123 0 00-.081.076c-.191.551-.383 1.023-.74 1.494-.9 1.187-2.222 1.846-3.711 1.838-1.187-.006-2.239-.44-3.157-1.302a.107.107 0 00-.105-.024c-.388.125-.78.143-1.204.138a4.441 4.441 0 01-1.945-.466 4.544 4.544 0 01-1.61-1.335c-.152-.202-.303-.392-.414-.617a5.81 5.81 0 01-.37-.961 4.582 4.582 0 01-.014-2.298.124.124 0 00.006-.056.085.085 0 00-.027-.048 4.467 4.467 0 01-1.034-1.651 3.896 3.896 0 01-.251-1.192 5.189 5.189 0 01.141-1.6c.337-1.112.982-1.985 1.933-2.618.212-.141.413-.251.601-.33.215-.089.43-.164.646-.227a.098.098 0 00.065-.066 4.51 4.51 0 01.829-1.615 4.535 4.535 0 011.837-1.388zm3.482 10.565a.637.637 0 000 1.272h3.636a.637.637 0 100-1.272h-3.636zM8.462 9.23a.637.637 0 00-1.106.631l1.272 2.224-1.266 2.136a.636.636 0 101.095.649l1.454-2.455a.636.636 0 00.005-.64L8.462 9.23z";
-
-const PI_GLYPH = "M165.29 165.29H517.36V400H400V517.36H282.65V634.72H165.29ZM282.65 282.65V400H400V282.65Z";
-
-const PI_DOT = "M517.36 400H634.72V634.72H517.36Z";
-
-const OPENCODE_FRAME = "M180 60H60V240H180V60ZM240 300H0V0H240V300Z";
-
-const OPENCODE_SCREEN = "M180 240H60V120H180V240Z";
-
-const MARK_KEYS: Record<string, "claude" | "codex" | "pi" | "opencode" | "gemini" | "openai"> = {
- anthropic: "claude",
- google: "gemini",
- gemini: "gemini",
- opencode: "opencode",
- pi: "pi",
- claude: "claude",
- openai: "openai",
- codex: "codex",
-};
-
-export function modelMark(key: string, size = 16): TemplateResult | null {
- const mark = MARK_KEYS[key.toLocaleLowerCase()];
- if (!mark) return null;
- if (mark === "openai")
- return html`<svg
- class="model-mark"
- width=${size}
- height=${size}
- viewBox="0 0 24 24"
- role="img"
- aria-label="OpenAI"
- focusable="false"
- >
- <path fill="currentColor" d=${OPENAI_MARK} />
- </svg>`;
- if (mark === "gemini")
- return html`<svg
- class="model-mark"
- width=${size}
- height=${size}
- viewBox="0 0 24 24"
- role="img"
- aria-label="Gemini"
- focusable="false"
- >
- <path
- fill="#4285f4"
- d="M12 1C10.5 8.5 8.5 10.5 1 12c7.5 1.5 9.5 3.5 11 11 1.5-7.5 3.5-9.5 11-11C15.5 10.5 13.5 8.5 12 1Z"
- />
- </svg>`;
- if (mark === "opencode")
- return html`<svg
- class="model-mark"
- width=${size}
- height=${size}
- viewBox="-30 0 300 300"
- role="img"
- aria-label="OpenCode"
- focusable="false"
- >
- <path fill="currentColor" opacity="0.45" d=${OPENCODE_SCREEN} />
- <path fill="currentColor" d=${OPENCODE_FRAME} />
- </svg>`;
- if (mark === "pi")
- return html`<svg
- class="model-mark"
- width=${size}
- height=${size}
- viewBox="0 0 800 800"
- role="img"
- aria-label="Pi"
- focusable="false"
- >
- <rect width="800" height="800" rx="170" fill="#5b74e8" />
- <path fill="#fff" fill-rule="evenodd" d=${PI_GLYPH} />
- <path fill="#fff" d=${PI_DOT} />
- </svg>`;
- if (mark === "claude")
- return html`<svg
- class="model-mark"
- width=${size}
- height=${size}
- viewBox="0 0 24 24"
- role="img"
- aria-label="Claude"
- focusable="false"
- >
- <path clip-rule="evenodd" fill-rule="evenodd" fill="#d97757" d=${CLAUDE_MARK} />
- </svg>`;
- return html`<svg
- class="model-mark"
- width=${size}
- height=${size}
- viewBox="0 0 24 24"
- role="img"
- aria-label="Codex"
- focusable="false"
- >
- <defs>
- <linearGradient id="model-mark-codex" gradientUnits="userSpaceOnUse" x1="12" x2="12" y1="3" y2="21">
- <stop stop-color="#b1a7ff" />
- <stop offset=".5" stop-color="#7a9dff" />
- <stop offset="1" stop-color="#3941ff" />
- </linearGradient>
- </defs>
- <path fill="var(--background, #fff)" d=${CODEX_FRAME} />
- <path fill="url(#model-mark-codex)" d=${CODEX_MARK} />
- </svg>`;
-}
-
-const iconTemplates = new WeakMap<IconNode, Map<number, TemplateResult>>();
-
-export function icon(node: IconNode, size = 18): TemplateResult {
- let sizes = iconTemplates.get(node);
- if (!sizes) iconTemplates.set(node, (sizes = new Map()));
- const cached = sizes.get(size);
- if (cached) return cached;
- const template = html`${unsafeSVG(iconElement(node, size).outerHTML)}`;
- sizes.set(size, template);
- return template;
-}
-
-function iconElement(node: IconNode, size: number): SVGElement {
- return createElement(node, {
- class: "icon",
- width: size,
- height: size,
- "aria-hidden": "true",
- focusable: "false",
- "stroke-width": 1.9,
- });
-}
-
export function fieldSelect(props: {
options: TemplateResult | TemplateResult[];
onChange: (value: string, event: Event) => void;
diff --git a/plugins/web-ui/src/viewport.ts b/plugins/web-ui/src/viewport.ts
index 2c6c30481..544ca580a 100644
--- a/plugins/web-ui/src/viewport.ts
+++ b/plugins/web-ui/src/viewport.ts
@@ -1,23 +1,21 @@
export const PHONE_MAX_WIDTH = 860;
-const query = window.matchMedia(`(max-width: ${PHONE_MAX_WIDTH}px)`);
+let query: MediaQueryList | undefined;
+const phoneQuery = () => (query ??= window.matchMedia(`(max-width: ${PHONE_MAX_WIDTH}px)`));
export function isPhone(): boolean {
- return query.matches;
+ return phoneQuery().matches;
}
export function isTouch(): boolean {
return window.matchMedia("(hover: none)").matches;
}
-const listeners = new Set<(phone: boolean) => void>();
-query.addEventListener("change", (e) => {
- for (const fn of listeners) fn(e.matches);
-});
-
export function onPhoneChange(fn: (phone: boolean) => void): () => void {
- listeners.add(fn);
- return () => listeners.delete(fn);
+ const query = phoneQuery();
+ const listener = (e: MediaQueryListEvent) => fn(e.matches);
+ query.addEventListener("change", listener);
+ return () => query.removeEventListener("change", listener);
}
export function trackVisualViewport(): void {
diff --git a/plugins/web-ui/src/webhooks.ts b/plugins/web-ui/src/webhooks.ts
index a8da2d486..0fa33688f 100644
--- a/plugins/web-ui/src/webhooks.ts
+++ b/plugins/web-ui/src/webhooks.ts
@@ -2,7 +2,8 @@ import { html, nothing, render, type TemplateResult } from "lit";
import { Check, ChevronDown, Plus } from "lucide";
import { api } from "./core-bridge";
import { errMessage } from "../../chassis/src/errors";
-import { actionSnippet, closeFormMenus, copyText, icon, relTime, setFormMenuValue, toggleFormMenu } from "./ui";
+import { actionSnippet, closeFormMenus, copyText, relTime, setFormMenuValue, toggleFormMenu } from "./ui";
+import { icon } from "./icons";
import { listBackLink, listPageTpl } from "./list-page";
import { ensureContexts, scopeChip } from "./contexts";
import { appState } from "./shell";
diff --git a/plugins/web-ui/test/composer-picker.test.ts b/plugins/web-ui/test/composer-picker.test.ts
index 75d21d8f1..655eba7c2 100644
--- a/plugins/web-ui/test/composer-picker.test.ts
+++ b/plugins/web-ui/test/composer-picker.test.ts
@@ -4,7 +4,7 @@ import type { Agent } from "@earendil-works/pi-agent-core";
import { JSDOM } from "jsdom";
import { createServer } from "vite";
import type { ComposerSurface, ConvCtx } from "../src/conv-types.ts";
-import type { RuntimeConfig } from "../src/core-bridge.ts";
+import type { RuntimeConfig } from "../src/runtime-config-cache.ts";
import type { ModelMetadata } from "../src/pi-models.ts";
import type { LoadoutEntry } from "../src/composer-loadout.ts";
diff --git a/plugins/web-ui/test/copy-button-lit.test.ts b/plugins/web-ui/test/copy-button-lit.test.ts
index 6a4afcb20..32a9b42d4 100644
--- a/plugins/web-ui/test/copy-button-lit.test.ts
+++ b/plugins/web-ui/test/copy-button-lit.test.ts
@@ -18,7 +18,8 @@ for (const [key, value] of Object.entries(globals))
const { html, render } = await import("lit");
const { Check, Copy } = await import("lucide");
-const { copyText, icon } = await import("../src/ui.ts");
+const { copyText } = await import("../src/ui.ts");
+const { icon } = await import("../src/icons.ts");
const copy = (event: Event) => void copyText("hello", event.currentTarget as HTMLButtonElement);
const flush = () => new Promise((resolve) => setImmediate(resolve));
diff --git a/plugins/web-ui/test/icon-pointer-events.test.ts b/plugins/web-ui/test/icon-pointer-events.test.ts
index 262ff3135..d678d37cb 100644
--- a/plugins/web-ui/test/icon-pointer-events.test.ts
+++ b/plugins/web-ui/test/icon-pointer-events.test.ts
@@ -15,7 +15,7 @@ for (const [key, value] of Object.entries({
const { html, render } = await import("lit");
const { Archive, Link, X } = await import("lucide");
-const { icon } = await import("../src/ui.ts");
+const { icon } = await import("../src/icons.ts");
const style = document.createElement("style");
style.textContent = readFileSync(new URL("../src/shell.css", import.meta.url), "utf8");
document.head.append(style);
diff --git a/plugins/web-ui/test/model-options.test.ts b/plugins/web-ui/test/model-options.test.ts
index bad2bf93b..75fe182c5 100644
--- a/plugins/web-ui/test/model-options.test.ts
+++ b/plugins/web-ui/test/model-options.test.ts
@@ -4,7 +4,7 @@ import assert from "node:assert/strict";
import {
defaultModelValue,
getModelOptions,
- getHarnessOptions,
+ harnessOptions,
runtimeModelOptions,
transcriptModel,
harnessSupportsEffort,
@@ -46,7 +46,7 @@ test("empty, unknown, missing-metadata and unapproved lists stay empty", async (
assert.deepEqual(getModelOptions("scope:empty"), []);
assert.equal(defaultModelValue("scope:empty"), "pi:future");
assert.equal(transcriptModel("scope:empty"), undefined);
- assert.deepEqual(getHarnessOptions("scope:empty"), []);
+ assert.deepEqual(harnessOptions(getModelOptions("scope:empty")), []);
});
test("scopes retain independent choices and an unloaded scope does not borrow another policy", async () => {
diff --git a/plugins/web-ui/test/runtime-config-sync.test.ts b/plugins/web-ui/test/runtime-config-sync.test.ts
index f1ac7bd0e..479cd8aab 100644
--- a/plugins/web-ui/test/runtime-config-sync.test.ts
+++ b/plugins/web-ui/test/runtime-config-sync.test.ts
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import { afterEach, test } from "node:test";
+import { getRuntimeConfig } from "../src/runtime-config-cache.ts";
import {
- getRuntimeConfig,
invalidateRuntimeConfigs,
loadRuntimeConfig,
saveRuntimeConfig,
diff --git a/plugins/web-ui/test/runtime-fixture.ts b/plugins/web-ui/test/runtime-fixture.ts
index 074a2d920..ba8fd6f7b 100644
--- a/plugins/web-ui/test/runtime-fixture.ts
+++ b/plugins/web-ui/test/runtime-fixture.ts
@@ -1,5 +1,5 @@
import { loadRuntimeConfig, seedRuntimeConfig } from "../src/runtime-config-store.ts";
-import type { RuntimeConfig } from "../src/core-bridge.ts";
+import type { RuntimeConfig } from "../src/runtime-config-cache.ts";
import { metadata } from "./model-metadata.ts";
export function runtimeConfig(scopeId: string, changes: Partial<RuntimeConfig> = {}): RuntimeConfig {
diff --git a/plugins/web-ui/test/ui-render-stability.test.ts b/plugins/web-ui/test/ui-render-stability.test.ts
index 9dfccbb48..751958ce3 100644
--- a/plugins/web-ui/test/ui-render-stability.test.ts
+++ b/plugins/web-ui/test/ui-render-stability.test.ts
@@ -18,7 +18,8 @@ for (const key of [
Object.defineProperty(globalThis, key, { value: dom.window[key], configurable: true });
}
const { html, render } = await import("lit");
-const { icon, waveLoader, workingWave, setFormMenuValue } = await import("../src/ui.ts");
+const { waveLoader, workingWave, setFormMenuValue } = await import("../src/ui.ts");
+const { icon } = await import("../src/icons.ts");
test("unchanged icon templates keep their DOM while separate placements remain independent", () => {
const host = document.createElement("div");
diff --git a/src/api/routes/admin/scope-config.ts b/src/api/routes/admin/scope-config.ts
index 656fb265d..e38b3073e 100644
--- a/src/api/routes/admin/scope-config.ts
+++ b/src/api/routes/admin/scope-config.ts
@@ -3,15 +3,15 @@ import { encodeRef, serviceCredRef } from "../../../acl/resource-ref.ts";
import { computeRetention } from "../../../admin/retention.ts";
import {
FAST_MODE_MODEL_IDS,
- harnessSupportsFastMode,
+ modelCatalogFor,
HARNESS_IDS,
selectableBaseModels,
+ embeddingModelCatalog,
defaultModelForHarness,
modelProviderAvailabilityFor,
modelServiceable,
ALL_PROVIDERS_AVAILABLE,
resolveModel,
- thinkingLevelsForHarness,
} from "../../../model/pi-models.ts";
import {
builtInModelCatalog,
@@ -279,6 +279,7 @@ const SETTINGS_RESOURCES = {
"webuiModels",
"interactiveFastMode",
"individualModelAuth",
+ "memoryEmbeddingModel",
"browseModel",
"browseMaxSteps",
],
@@ -401,6 +402,7 @@ async function scopeModelOptions(deps: ApiCtx["deps"], values: Record<string, un
configured.some((runtime) => runtime.modelId === model.id),
);
};
+ const modelsByHarness = Object.fromEntries(HARNESS_IDS.map((id) => [id, modelsFor(id)]));
return {
...(cached?.refreshing ? { modelCatalogRefreshing: true } : {}),
baseModelDefault: defaultModelForHarness(deps.harnessId ?? "pi", deps.baseModelDefault),
@@ -413,18 +415,15 @@ async function scopeModelOptions(deps: ApiCtx["deps"], values: Record<string, un
runtime?.harnessId === id ||
purposeRuntimes.some((runtime) => runtime.harnessId === id)),
),
- modelsByHarness: Object.fromEntries(
- HARNESS_IDS.map((id) => [
- id,
- modelsFor(id).map((model) => ({ ...model, effortLevels: thinkingLevelsForHarness(id, model.id) })),
- ]),
- ),
- thinkingLevelsByHarness: Object.fromEntries(
- HARNESS_IDS.filter((id) => id !== "mock").map((id) => [id, thinkingLevelsForHarness(id)]),
+ modelsByHarness,
+ modelCatalog: modelCatalogFor(
+ Object.values(modelsByHarness)
+ .flat()
+ .map((model) => model.id),
),
fastModeModelIds: FAST_MODE_MODEL_IDS,
- fastModeHarnessIds: HARNESS_IDS.filter(harnessSupportsFastMode),
autoFlaggerDefault: defaultAutoFlaggerConfig(deps),
+ memoryEmbeddingOptions: embeddingModelCatalog(),
browseModelOptions: selectableBaseModels().filter((m) =>
modelServiceable(m.id, providersFor(deps.harnessId ?? "pi")),
),
diff --git a/src/api/runtime-config.ts b/src/api/runtime-config.ts
index d8d489b31..a9edf3d6c 100644
--- a/src/api/runtime-config.ts
+++ b/src/api/runtime-config.ts
@@ -13,7 +13,7 @@ import {
serviceableModelIds,
ALL_PROVIDERS_AVAILABLE,
fastModeModelIds,
- safeModelMetadata,
+ modelCatalogFor,
modelOfferedInWebui,
modelUnavailableReason,
thinkingLevelsForHarness,
@@ -194,12 +194,7 @@ export async function runtimeConfigBody(
}
}
const advertisedModelIds = new Set(Object.values(modelsByHarness).flat());
- const modelCatalog = Object.fromEntries(
- [...advertisedModelIds].flatMap((id) => {
- const metadata = safeModelMetadata(id);
- return metadata ? [[id, metadata]] : [];
- }),
- );
+ const modelCatalog = modelCatalogFor(advertisedModelIds);
return {
scopeId: scope,
...(purpose ? { executionPurpose: purpose } : {}),
diff --git a/src/model/pi-models.ts b/src/model/pi-models.ts
index 6ba6aa05b..8c8e20f27 100644
--- a/src/model/pi-models.ts
+++ b/src/model/pi-models.ts
@@ -795,6 +795,15 @@ export function safeModelMetadata(id: string) {
};
}
+export function modelCatalogFor(ids: Iterable<string>) {
+ return Object.fromEntries(
+ [...new Set(ids)].flatMap((id) => {
+ const metadata = safeModelMetadata(id);
+ return metadata ? [[id, metadata]] : [];
+ }),
+ );
+}
+
export function embeddingModelFromDefinition(model: EmbeddingModelDefinition): EmbeddingModel {
return { ...model, baseUrl: providerBaseUrl(model.provider) ?? "https://api.openai.com/v1" };
}
diff --git a/test/embedding-models.test.ts b/test/embedding-models.test.ts
index fcde88940..f7bda62e2 100644
--- a/test/embedding-models.test.ts
+++ b/test/embedding-models.test.ts
@@ -159,6 +159,12 @@ test("HTTP embedding selection accepts only known embedding models and survives
});
assert.equal((await put({ modelId: definition.id })).status, 200);
assert.equal(await built.config.getEmbeddingModelDurable(), definition.id);
+ const models = await fetch(url.replace(/\/memory-embedding-model$/, "?view=models"), {
+ headers: { "x-admin-actor": "admin-alice@default-org" },
+ });
+ const view = (await models.json()) as { memoryEmbeddingModel: string; memoryEmbeddingOptions: { id: string }[] };
+ assert.equal(view.memoryEmbeddingModel, definition.id);
+ assert.ok(view.memoryEmbeddingOptions.some((model) => model.id === definition.id));
await built.memory.capture("personal:test", ["first fact"], Date.now());
assert.match(recallText(await built.memory.recall("personal:test", { query: "first" })), /first fact/);
assert.equal((await put({ modelId: "gpt-5.5" })).status, 400);
diff --git a/test/model-credential-route.test.ts b/test/model-credential-route.test.ts
index 0139fddca..c8d3a7b57 100644
--- a/test/model-credential-route.test.ts
+++ b/test/model-credential-route.test.ts
@@ -422,7 +422,6 @@ test("admin scope keeps the selected runtime model visible when its provider is
id: "claude-opus-5",
name: "Claude Opus 5",
provider: "anthropic",
- effortLevels: ["auto", "default", "adaptive", "low", "medium", "high", "xhigh", "max", "ultracode"],
},
]);
} finally {