- thinking-default.ts: defaultOrderLevel (the ordering's first supported, the client twin of the server's defaultThinkingLevel) + populateLevel (an explicit level always rides; the WRITE clamps server-side, bd68486, and the cross-surface signal re-reads the clamped truth; only absence populates from the ordering) + THINKING_LABEL shared. - Setup dialog (item 5): per-slot thinking selectors pre-populated with the default-order level per picked model, editable; disabled until the model pick; prefillLevelFromPin keeps a stored level as-is and populates legacy pins from the ordering. - Composer + agent section (item 6): fresh model picks always write a level: the stored one rides, absence populates; the unset state can never re-enter. Item 4: records with a model but no stored level display the RESOLVED level (ordering's first supported) instead of a dash, in the composer pill and the settings slot triggers/menus. - Item 7 verified live end-to-end: an explicit level rides into the PUT, the server clamps, the signal re-reads, the pill shows the clamped truth.
316 lines
12 KiB
TypeScript
316 lines
12 KiB
TypeScript
"use client";
|
|
|
|
import { useCallback, useEffect, useRef, useState } from "react";
|
|
import type { ModelCatalogEntry, ModelCatalogResponse, ModelsSettings } from "@/src/core";
|
|
import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
|
|
import { prettyModel } from "@/components/usage-format";
|
|
import { ModelMenuList, ThinkingMenuList } from "@/components/settings/model-menu";
|
|
import { composeSlotModel } from "@/components/settings/agent-section";
|
|
import { MenuShell } from "@/components/menu-shell";
|
|
import { notifySettingsSaved, useSettingsSaved } from "@/components/settings-signal";
|
|
import { defaultOrderLevel, populateLevel, THINKING_LABEL } from "@/components/thinking-default";
|
|
|
|
/** GET /api/models is cached per page load for instant menu opens, but
|
|
* the federation is LIVE per call — keys saved mid-session widen the
|
|
* catalog immediately server-side. ModelControl therefore re-fetches on
|
|
* every model-menu open (stale-while-revalidate: the cached list shows
|
|
* instantly, the fresh one swaps in while the menu is open). */
|
|
let catalogCache: ModelCatalogResponse | undefined;
|
|
let catalogInflight: Promise<ModelCatalogResponse> | undefined;
|
|
|
|
function fetchCatalog(force = false): Promise<ModelCatalogResponse> {
|
|
if (force) {
|
|
catalogCache = undefined;
|
|
catalogInflight = undefined;
|
|
}
|
|
catalogInflight ??= fetch("/api/models")
|
|
.then((r) => {
|
|
if (!r.ok) throw new Error(`catalog request failed: ${r.status}`);
|
|
return r.json() as Promise<ModelCatalogResponse>;
|
|
})
|
|
.then((c) => {
|
|
catalogCache = c;
|
|
return c;
|
|
})
|
|
.catch((err) => {
|
|
catalogInflight = undefined; // retry on next mount/open
|
|
throw err;
|
|
});
|
|
return catalogInflight;
|
|
}
|
|
|
|
function useModelCatalog(): { catalog: ModelCatalogResponse | undefined; refresh: () => void } {
|
|
const [catalog, setCatalog] = useState(catalogCache);
|
|
useEffect(() => {
|
|
if (catalogCache) return;
|
|
let alive = true;
|
|
fetchCatalog()
|
|
.then((c) => alive && setCatalog(c))
|
|
.catch(() => {
|
|
/* the picker stays closed on failure; the buttons still
|
|
display the strong slot from the record fetch */
|
|
});
|
|
return () => {
|
|
alive = false;
|
|
};
|
|
}, []);
|
|
const refresh = useCallback(() => {
|
|
fetchCatalog(true)
|
|
.then(setCatalog)
|
|
.catch(() => {
|
|
/* refresh is best-effort: the cached list stays on failure */
|
|
});
|
|
}, []);
|
|
return { catalog, refresh };
|
|
}
|
|
|
|
/**
|
|
* THE STRONG-SLOT CONTROL (fix wave, owner ruling: "one and the same").
|
|
* The composer's model + thinking pills ARE the strong slot — the tier
|
|
* that runs prober + teacher. Reads: the raw models section (GET
|
|
* /api/settings) for the user's pick, plus the federated catalog for the
|
|
* menus. Writes: PUT /api/settings/models via composeSlotModel — the same
|
|
* seam the settings Agent section and the SetupDialog write, so there is
|
|
* exactly one strong slot in the world and every surface edits it.
|
|
*
|
|
* Unpicked reads "—" (the no-factory-fallback language: the UI never
|
|
* presents a default model; the engine-side pin still resolves, the UI
|
|
* never claims it). Legacy per-chat model overrides on old records keep
|
|
* resolving server-side — the UI simply no longer writes that field
|
|
* anywhere.
|
|
*/
|
|
export function ModelControl() {
|
|
const { catalog, refresh } = useModelCatalog();
|
|
const [models, setModels] = useState<ModelsSettings | undefined>();
|
|
const [open, setOpen] = useState<"model" | "thinking" | null>(null);
|
|
const [error, setError] = useState<string | null>(null);
|
|
const containerRef = useRef<HTMLDivElement>(null);
|
|
|
|
// The record read — BOTH mount and the cross-surface signal land
|
|
// here (fix wave: another surface's models write re-reads into the
|
|
// pill live; own writes also notify, and the refetch is idempotent).
|
|
const readRecord = useCallback(() => {
|
|
fetch("/api/settings")
|
|
.then((r) => r.json() as Promise<{ settings: { models?: ModelsSettings } | null }>)
|
|
.then((body) => setModels(body.settings?.models ?? undefined))
|
|
.catch(() => {
|
|
/* the record fetch failing leaves the control read-only
|
|
("—" triggers, closed menus) — same posture as a
|
|
catalog failure */
|
|
});
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
readRecord();
|
|
}, [readRecord]);
|
|
|
|
useSettingsSaved((section) => {
|
|
if (section === "models") readRecord();
|
|
});
|
|
|
|
const override = models?.strong;
|
|
const effectiveId = override?.model?.id;
|
|
const effectiveProvider = override?.model?.provider;
|
|
const storedLevel = override?.thinkingLevel;
|
|
const entry = catalog?.models.find(
|
|
(m) => m.id === effectiveId && m.provider === effectiveProvider,
|
|
);
|
|
const levels = entry?.supportedLevels ?? [];
|
|
// Legacy display (chunk 2 item 4, owner): a record with a model but no
|
|
// stored level shows the RESOLVED level — the ordering's first supported
|
|
// — because that is exactly what the engine build would run. Display-
|
|
// only: the record stays unset until a fresh pick populates it.
|
|
const effectiveLevel = storedLevel ?? (entry ? defaultOrderLevel(levels) : undefined);
|
|
|
|
// The intuitive dropdown contract (owner, stats-control round 1): any
|
|
// click outside the open menu — or an Esc keypress — closes it. The
|
|
// menu's own surface keeps it open: the toggle buttons live inside the
|
|
// container, and the menu BODY lives in a portal on document.body
|
|
// (MenuShell) — never a container descendant, so its rows are carved
|
|
// out via [data-lh-menu] (the settings sections' discipline; without
|
|
// it a row's pointerdown counts as outside and eats the pick —
|
|
// live-caught in the fix wave, broken since the MenuShell migration).
|
|
useEffect(() => {
|
|
if (open === null) return;
|
|
const onPointerDown = (e: PointerEvent) => {
|
|
const t = e.target as Element;
|
|
if (t instanceof Element && t.closest("[data-lh-menu]")) return;
|
|
if (containerRef.current && !containerRef.current.contains(t)) {
|
|
setOpen(null);
|
|
}
|
|
};
|
|
const onKeyDown = (e: KeyboardEvent) => {
|
|
if (e.key === "Escape") {
|
|
// Claim the Esc (keyboard wave A): the window-level chain must
|
|
// not ALSO stop dictation / abort the turn under this menu.
|
|
e.stopPropagation();
|
|
setOpen(null);
|
|
}
|
|
};
|
|
document.addEventListener("pointerdown", onPointerDown);
|
|
document.addEventListener("keydown", onKeyDown);
|
|
return () => {
|
|
document.removeEventListener("pointerdown", onPointerDown);
|
|
document.removeEventListener("keydown", onKeyDown);
|
|
};
|
|
}, [open]);
|
|
|
|
// One write seam: composeSlotModel preserves the cheap/vision siblings
|
|
// (replace-whole-section discipline) and the per-field independence of
|
|
// model + thinkingLevel within the strong slot.
|
|
const save = useCallback(
|
|
async (next: ModelsSettings) => {
|
|
setError(null);
|
|
try {
|
|
const res = await fetch("/api/settings/models", {
|
|
method: "PUT",
|
|
headers: { "Content-Type": "application/json" },
|
|
body: JSON.stringify(next),
|
|
});
|
|
if (!res.ok) {
|
|
const body = (await res.json().catch(() => ({}))) as { error?: string };
|
|
setError(body.error ?? `settings rejected (${res.status})`);
|
|
return;
|
|
}
|
|
setModels(next);
|
|
setOpen(null);
|
|
notifySettingsSaved("models");
|
|
} catch {
|
|
setError("Could not reach the server — try again.");
|
|
}
|
|
},
|
|
[],
|
|
);
|
|
|
|
// Shortcut seams (keyboard wave A): ⌘K opens the model menu (the
|
|
// universal command convention); Shift+Tab cycles the thinking level
|
|
// up the ladder (wrapping) — the owner's replacement for browser
|
|
// tab-focus. Both work from any focus, including mid-typing.
|
|
useEffect(() => {
|
|
const onOpenPicker = () => {
|
|
setOpen("model");
|
|
setError(null);
|
|
refresh(); // mid-session key changes widen the menu (cache fix)
|
|
};
|
|
window.addEventListener("lh:kbd-open-model-picker", onOpenPicker);
|
|
return () => window.removeEventListener("lh:kbd-open-model-picker", onOpenPicker);
|
|
}, [refresh]);
|
|
|
|
useEffect(() => {
|
|
const onCycleThinking = () => {
|
|
if (levels.length === 0) return;
|
|
const idx = effectiveLevel === undefined ? -1 : levels.indexOf(effectiveLevel);
|
|
const next = levels[(idx + 1) % levels.length];
|
|
if (next === undefined) return;
|
|
void save(composeSlotModel(models, "strong", effectiveProvider ?? "", effectiveId ?? "", next));
|
|
};
|
|
window.addEventListener("lh:kbd-cycle-thinking", onCycleThinking);
|
|
return () => window.removeEventListener("lh:kbd-cycle-thinking", onCycleThinking);
|
|
}, [levels, effectiveLevel, effectiveProvider, effectiveId, models, save]);
|
|
|
|
// Selecting a model (click and Enter share one path): keep the
|
|
// thinking level only when the new model supports it — otherwise
|
|
// drop it (a carry-over would 400 at the server's catalog gate).
|
|
const pickModel = (m: ModelCatalogEntry) => {
|
|
// Auto-populate (chunk 2, owner: "populate everywhere"): a fresh pick
|
|
// ALWAYS writes a level — the STORED one rides as-is (the write clamps
|
|
// server-side when the new model doesn't support it; the signal
|
|
// re-reads and the clamped truth displays), and a record with no
|
|
// stored level populates the ordering's level. The unset state can
|
|
// never re-enter through this door. (The DERIVED display level never
|
|
// rides — it belongs to the OLD model; the fresh pick's level comes
|
|
// from the fresh model's own ladder.)
|
|
const nextLevel = populateLevel(storedLevel, m.supportedLevels);
|
|
void save(composeSlotModel(models, "strong", m.provider, m.id, nextLevel));
|
|
};
|
|
|
|
// Stale-while-revalidate on manual open too (⌘K covers the keyboard
|
|
// path above): the cached list shows instantly, the fresh federation
|
|
// swaps in when it lands.
|
|
const openMenu = (kind: "model" | "thinking") => {
|
|
setOpen((o) => (o === kind ? null : kind));
|
|
setError(null);
|
|
if (kind === "model") refresh();
|
|
};
|
|
|
|
return (
|
|
<div ref={containerRef} className="relative flex items-center gap-1.5" data-testid="model-control">
|
|
<button
|
|
type="button"
|
|
data-testid="stats-model"
|
|
onClick={() => openMenu("model")}
|
|
aria-expanded={open === "model"}
|
|
title="Strong tier model (prober + teacher) — set app-wide"
|
|
className="flex items-center gap-1.5 rounded-full border border-border/60 bg-card/70 px-2.5 py-1 transition-colors hover:border-border hover:bg-muted"
|
|
>
|
|
<span className="text-card-foreground">{effectiveId ? prettyModel(effectiveId) : "—"}</span>
|
|
<span aria-hidden className="text-xs text-muted-foreground">▾</span>
|
|
</button>
|
|
<button
|
|
type="button"
|
|
data-testid="stats-thinking"
|
|
onClick={() => {
|
|
// No model picked → nothing to set a level FOR: the click
|
|
// is a no-op, never an empty menu.
|
|
if (entry === undefined) return;
|
|
openMenu("thinking");
|
|
}}
|
|
aria-expanded={open === "thinking"}
|
|
title="Strong tier thinking level — set app-wide"
|
|
className="flex items-center gap-1.5 rounded-full border border-border/60 bg-card/70 px-2.5 py-1 transition-colors hover:border-border hover:bg-muted"
|
|
>
|
|
{/* Just the level — the button reads like the model button reads
|
|
the model name (owner, stats-control round 1). */}
|
|
<span className="text-card-foreground">
|
|
{effectiveLevel === undefined ? "—" : (THINKING_LABEL[effectiveLevel] ?? effectiveLevel)}
|
|
</span>
|
|
<span aria-hidden className="text-xs text-muted-foreground">▾</span>
|
|
</button>
|
|
|
|
{/* The shared dropdown body (extracted 2026-09-20): the agent
|
|
settings' slot selects and the setup dialog use the exact same
|
|
one. */}
|
|
{open === "model" && (
|
|
<MenuShell
|
|
anchorRef={containerRef}
|
|
testid="model-menu"
|
|
preferredSide="up"
|
|
menuClass="flex w-[22rem] flex-col rounded-xl border bg-card p-2 text-xs shadow-xl"
|
|
>
|
|
{error && <div className="mb-1.5 text-destructive">{error}</div>}
|
|
<ModelMenuList
|
|
models={catalog?.models}
|
|
effectiveId={effectiveId}
|
|
effectiveProvider={effectiveProvider}
|
|
onPick={pickModel}
|
|
footer={
|
|
catalog && catalog.models.length === 0
|
|
? "No models — add a provider key in Keys"
|
|
: "Strong tier — runs prober + teacher, app-wide"
|
|
}
|
|
/>
|
|
</MenuShell>
|
|
)}
|
|
|
|
{open === "thinking" && (
|
|
<MenuShell
|
|
anchorRef={containerRef}
|
|
testid="thinking-menu"
|
|
preferredSide="up"
|
|
menuClass="flex w-44 flex-col gap-0.5 rounded-xl border bg-card p-2 text-xs shadow-xl"
|
|
>
|
|
<ThinkingMenuList
|
|
levels={catalog ? levels : []}
|
|
effectiveLevel={effectiveLevel}
|
|
onPick={(level) =>
|
|
void save(composeSlotModel(models, "strong", effectiveProvider ?? "", effectiveId ?? "", level as ThinkingLevel))
|
|
}
|
|
empty={catalog ? (effectiveId ? `${prettyModel(effectiveId)} has no thinking levels.` : "Pick a model first.") : "Loading…"}
|
|
footer="Levels this model actually supports"
|
|
/>
|
|
{error && <div className="mt-1 text-destructive">{error}</div>}
|
|
</MenuShell>
|
|
)}
|
|
</div>
|
|
);
|
|
} |