@rexvane/piweb 0.3.20 → 0.3.22

package/src/components/ProjectPanel.tsx

@@ -84,6 +84,12 @@ function roundColor(round: GrowthEntry): string {
 	return "var(--dsw-warn)";
 }
 
+/** 这一轮有没有实际改动（轮次列表据此把没改动的轮降成次要色，改过的才显示 +/− 行数） */
+function hasChanges(round: GrowthEntry): boolean {
+	const st = round.stats;
+	return Boolean(st.added || st.modified || st.deleted || st.renamed || st.add || st.del);
+}
+
 function changedLines(round: GrowthEntry): number {
 	return round.stats.add + round.stats.del;
 }
@@ -175,7 +181,13 @@ export function ProjectPanel({
 		};
 	}, [cwd, gitRefreshKey, latestCommit]);
 
-	const totals = useMemo(() => sumChanges(growth.changes), [growth.changes]);
+	const totals = useMemo(() => {
+		if (selected && growth.scope === "round") {
+			const st = selected.stats;
+			return { files: st.added + st.modified + st.deleted + st.renamed, add: st.add, del: st.del };
+		}
+		return growth.changesReady === false ? null : sumChanges(growth.changes);
+	}, [selected, growth.scope, growth.changes, growth.changesReady]);
 	const piRounds = useMemo(() => rounds.filter((round) => round.kind === "round").length, [rounds]);
 	const maxLines = useMemo(() => Math.max(1, ...rounds.map(changedLines)), [rounds]);
 	const railRef = useRef<HTMLDivElement>(null);
@@ -304,9 +316,12 @@ export function ProjectPanel({
 					<div className="mt-0.5 flex items-center gap-2" style={{ fontSize: 11.5, color: "var(--dsw-label-caption)" }}>
 						<span>{fmtTime(selected.ts)}</span>
 						<span>·</span>
-						<span>{t.growthRoundFiles.replace("{n}", String(totals.files))}</span>
-						<span style={{ color: "var(--dsw-success)" }}>+{totals.add}</span>
-						<span style={{ color: "var(--dsw-danger)" }}>−{totals.del}</span>
+						{growth.scope === "session" && <span>{t.growthScopeSession}</span>}
+						{totals ? <>
+							<span>{t.growthRoundFiles.replace("{n}", String(totals.files))}</span>
+							<span style={{ color: "var(--dsw-success)" }}>+{totals.add}</span>
+							<span style={{ color: "var(--dsw-danger)" }}>−{totals.del}</span>
+						</> : <span>—</span>}
 						{statusText && <span style={{ color: "var(--dsw-warn)" }}>{statusText}</span>}
 						<span className="flex-1" />
 						{onJumpToChat && selected.promptIds[0] && (
@@ -397,7 +412,7 @@ export function ProjectPanel({
 										data-kind={round.kind}
 										data-active={selected?.commit === round.commit || undefined}
 										style={{ height: h, background: roundColor(round) }}
-										title={`${roundTitle(round, tt)} · ${fmtTime(round.ts)} · ${t.growthRoundFiles.replace("{n}", String(round.changes.length))} +${round.stats.add} −${round.stats.del}`}
+										title={`${roundTitle(round, tt)} · ${fmtTime(round.ts)} · ${t.growthRoundFiles.replace("{n}", String(round.stats.added + round.stats.modified + round.stats.deleted + round.stats.renamed))} +${round.stats.add} −${round.stats.del}`}
 										onClick={() => growth.select(round.commit)}
 									/>
 								);
@@ -478,31 +493,41 @@ export function ProjectPanel({
 									)}
 									{/* 轮次列表:当前轮高亮,打开时自动滚到它 */}
 									<div ref={roundListRef} className="min-h-0 max-h-[260px] overflow-y-auto border-t pt-1" style={{ borderColor: "var(--dsw-border-l1)" }}>
-										{rounds.map((round) => (
-											<button
-												key={round.commit}
-												type="button"
-												role="option"
-												aria-selected={selected?.commit === round.commit}
-												data-selected={selected?.commit === round.commit || undefined}
-												className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-left transition-colors"
-												style={{ background: selected?.commit === round.commit ? "var(--dsw-active)" : "transparent" }}
-												onMouseEnter={(e) => {
-													if (selected?.commit !== round.commit) e.currentTarget.style.background = "var(--dsw-hover)";
-												}}
-												onMouseLeave={(e) => {
-													if (selected?.commit !== round.commit) e.currentTarget.style.background = "transparent";
-												}}
-												title={`${roundTitle(round, tt)} · ${fmtTime(round.ts)}`}
-												onClick={() => {
-													growth.select(round.commit);
-													setRoundPickerOpen(false);
-												}}
-											>
-												<span className="min-w-0 flex-1 truncate" style={{ fontSize: 12.5 }}>{roundTitle(round, tt)}</span>
-												<span className="flex-none" style={{ fontSize: 11, color: "var(--dsw-label-caption)" }}>{fmtTime(round.ts)}</span>
-											</button>
-										))}
+										{rounds.map((round) => {
+											const changed = hasChanges(round);
+											// 没改动的轮整行降对比度，扫视时自然被跳过；选中的那行不灰（否则像被禁用）
+											const dimmed = !changed && selected?.commit !== round.commit;
+											return (
+												<button
+													key={round.commit}
+													type="button"
+													role="option"
+													aria-selected={selected?.commit === round.commit}
+													data-selected={selected?.commit === round.commit || undefined}
+													className="flex w-full items-center gap-2 rounded-lg px-2.5 py-1.5 text-left transition-colors"
+													style={{ background: selected?.commit === round.commit ? "var(--dsw-active)" : "transparent", ...(dimmed ? { opacity: 0.45 } : {}) }}
+													onMouseEnter={(e) => {
+														if (selected?.commit !== round.commit) e.currentTarget.style.background = "var(--dsw-hover)";
+													}}
+													onMouseLeave={(e) => {
+														if (selected?.commit !== round.commit) e.currentTarget.style.background = "transparent";
+													}}
+													title={`${roundTitle(round, tt)} · ${fmtTime(round.ts)}`}
+													onClick={() => {
+														growth.select(round.commit);
+														setRoundPickerOpen(false);
+													}}
+												>
+													<span className="min-w-0 flex-1 truncate" style={{ fontSize: 12.5 }}>{roundTitle(round, tt)}</span>
+													{changed && (round.stats.add > 0 || round.stats.del > 0) ? (
+														<span className="flex-none" style={{ fontSize: 11, fontFamily: "var(--font-mono)" }}>
+															<span style={{ color: "var(--dsw-success)" }}>+{round.stats.add}</span> <span style={{ color: "var(--dsw-danger)" }}>−{round.stats.del}</span>
+														</span>
+													) : null}
+													<span className="flex-none" style={{ fontSize: 11, color: "var(--dsw-label-caption)" }}>{fmtTime(round.ts)}</span>
+												</button>
+											);
+										})}
 									</div>
 								</div>
 							)}

package/src/components/PromptPanel.tsx

@@ -8,6 +8,7 @@
  */
 import { useCallback, useEffect, useState } from "react";
 import { useI18n } from "@/i18n";
+import { fmtBytes } from "@/lib/format";
 import { IconRefreshOutline14, IconCloseOutline14 } from "@/components/icons";
 
 export type PromptSourceKind = "system" | "append" | "agents" | "skill" | "template" | "tool" | "assembled";
@@ -45,10 +46,7 @@ export interface PromptSourcesData {
 const GROUP_KINDS: PromptSourceKind[] = ["system", "append", "agents", "skill", "template", "tool", "assembled"];
 
 function formatBytes(bytes: number | undefined): string {
-	if (!bytes) return "";
-	if (bytes < 1024) return `${bytes} B`;
-	if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-	return `${(bytes / 1024 / 1024).toFixed(1)} MB`;
+	return bytes ? fmtBytes(bytes) : "";
 }
 
 export function PromptPanel({

package/src/components/ProviderSetupModal.module.css

@@ -489,6 +489,12 @@
 	color: var(--dsw-danger);
 	padding: 4px 0;
 }
+.catalogHint {
+	margin-top: 8px;
+	font-size: 11.5px;
+	line-height: 1.5;
+	color: var(--dsw-label-caption);
+}
 
 /* ---- 候选选择对话框 ---- */
 .candidateMask {
@@ -542,6 +548,20 @@
 .candidateRow:hover {
 	background: var(--dsw-hover);
 }
+/* 已在内置目录里的候选：不可勾选 */
+.candidateRow[data-disabled] {
+	cursor: default;
+	color: var(--dsw-label-tertiary);
+}
+.candidateRow[data-disabled]:hover {
+	background: transparent;
+}
+.candidateTag {
+	flex: none;
+	margin-left: auto;
+	font-size: 11px;
+	color: var(--dsw-label-caption);
+}
 .candidateId {
 	font-family: var(--font-mono);
 	font-size: 12.5px;

package/src/components/ProviderSetupModal.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import {
 	IconCheckOutline14,
 	IconChevronDown14,
@@ -11,8 +11,9 @@ import {
 } from "@/components/icons";
 import { ProviderBrand } from "@/components/ProviderBrand";
 import { useI18n } from "@/i18n";
+import { looksPrivateEndpoint } from "@/lib/model-endpoint";
 import { CUSTOM_PROVIDER_ID_PATTERN, customApiOptions } from "@/lib/provider-display";
-import { formatCapacity, parseCapacity, serializeModelDraft, validateModelDrafts, type ModelDraft } from "@/lib/model-draft";
+import { formatCapacity, modelDraftFromCatalog, parseCapacity, serializeModelDraft, serializeProviderDraft, validateModelDrafts, type ModelDraft } from "@/lib/model-draft";
 import type { ProviderView } from "@/lib/models-service";
 import styles from "./ProviderSetupModal.module.css";
 
@@ -34,6 +35,7 @@ type SubmitResult = { success: boolean; error?: string };
 export function ProviderSetupModal({
 	mode,
 	providers,
+	catalogModelIds,
 	existingIds,
 	onClose,
 	onSaveBuiltin,
@@ -42,6 +44,8 @@ export function ProviderSetupModal({
 }: {
 	mode: "builtin" | "custom";
 	providers: ProviderView[];
+	/** 内置 provider → 目录里的模型 ID：同 ID 的行写 modelOverrides，「获取可用模型」里不再可选 */
+	catalogModelIds?: Readonly<Record<string, readonly string[]>>;
 	existingIds: string[];
 	onClose: () => void;
 	onSaveBuiltin: (value: BuiltinProviderSetup) => Promise<SubmitResult>;
@@ -62,10 +66,18 @@ export function ProviderSetupModal({
 	const allApis = customApiOptions(providers.flatMap((provider) => provider.apis));
 	const [api, setApi] = useState(allApis.includes("openai-completions") ? "openai-completions" : (allApis[0] ?? "openai-completions"));
 	const [models, setModels] = useState<ModelDraft[]>([]);
+	// 自定义 provider 的自动识别只在地址 / 密钥输入完（失焦）或换协议时触发：
+	// 还没有任何模型行，且 URL（+ 密钥，本机网关可省）都填了，这次失焦才算数
+	const autoReady = models.length === 0 && Boolean(baseUrl.trim()) && Boolean(apiKey.trim() || looksPrivateEndpoint(baseUrl));
+	const [autoTrigger, setAutoTrigger] = useState(0);
+	const requestAutoDiscover = () => {
+		if (autoReady) setAutoTrigger((count) => count + 1);
+	};
 	const [saving, setSaving] = useState(false);
 	const [error, setError] = useState("");
 	const pickerRef = useRef<HTMLDivElement>(null);
 	const selected = providers.find((provider) => provider.id === selectedId);
+	const catalogIds = useMemo(() => new Set(catalogModelIds?.[selectedId] ?? []), [catalogModelIds, selectedId]);
 	const filtered = providers.filter((provider) => {
 		const needle = search.trim().toLocaleLowerCase();
 		return !needle || provider.name.toLocaleLowerCase().includes(needle) || provider.id.toLocaleLowerCase().includes(needle);
@@ -114,12 +126,8 @@ export function ProviderSetupModal({
 				if (authMethod === "oauth" && onOAuthLogin) {
 					result = await onOAuthLogin(selected.id);
 				} else {
-					const config: Record<string, unknown> = {};
-					if (baseUrl.trim()) config.baseUrl = baseUrl.trim();
-					if (models.length) {
-						config.api = selected.apis[0] ?? "openai-completions";
-						config.models = models.map(serializeModelDraft);
-					}
+					// 与目录同 ID 的行进 modelOverrides，新 ID 才进 models[]（并带上协议）
+					const config = serializeProviderDraft({}, { baseUrl, models }, selected.apis[0] ?? "openai-completions", catalogIds);
 					result = await onSaveBuiltin({ providerId: selected.id, apiKey: apiKey.trim(), config });
 				}
 			} else {
@@ -130,7 +138,7 @@ export function ProviderSetupModal({
 						baseUrl: baseUrl.trim(),
 						api,
 						...(apiKey.trim() ? { apiKey: apiKey.trim() } : {}),
-						models: models.map(serializeModelDraft),
+						models: models.map((model) => serializeModelDraft(model)),
 					},
 				});
 			}
@@ -155,7 +163,7 @@ export function ProviderSetupModal({
 		});
 		const result = await response.json();
 		if (!response.ok || !result.success) throw new Error(result.error || t.toastError);
-		return (result.data.models ?? []).map((model: { id: string; name?: string }) => ({ id: model.id, name: model.name ?? "" }));
+		return (result.data.models ?? []).map(modelDraftFromCatalog);
 	};
 
 	return (
@@ -255,7 +263,7 @@ export function ProviderSetupModal({
 											<label className={styles.label}>{t.apiAddress}</label>
 											<input className={styles.input} value={baseUrl} onChange={(event) => setBaseUrl(event.target.value)} placeholder={selected?.baseUrl || t.providerDefault} />
 										</div>
-											<ModelCatalog models={models} setModels={setModels} updateModel={updateModel} inheritedCount={selected?.modelCount ?? 0} discover={discoverAvailableModels} discoverDisabled={!baseUrl.trim()} />
+											<ModelCatalog models={models} setModels={setModels} updateModel={updateModel} inheritedCount={selected?.modelCount ?? 0} catalogIds={catalogIds} discover={discoverAvailableModels} discoverDisabled={!baseUrl.trim()} />
 									</div>
 								) : null}
 							</div>
@@ -275,17 +283,17 @@ export function ProviderSetupModal({
 							</div>
 							<div className={styles.field}>
 								<label className={styles.label}>{t.apiAddress}</label>
-								<input className={styles.input} value={baseUrl} onChange={(event) => setBaseUrl(event.target.value)} placeholder="https://gateway.example/v1" />
+								<input className={styles.input} value={baseUrl} onChange={(event) => setBaseUrl(event.target.value)} onBlur={requestAutoDiscover} placeholder="https://gateway.example/v1" />
 							</div>
 							<div className={styles.field}>
 								<label className={styles.label}>{t.apiProtocol}</label>
-								<select className={styles.select} value={api} onChange={(event) => setApi(event.target.value)}>
+								<select className={styles.select} value={api} onChange={(event) => { setApi(event.target.value); requestAutoDiscover(); }}>
 									{allApis.map((value) => <option key={value} value={value}>{value}</option>)}
 								</select>
 							</div>
 							<div className={styles.field}>
 								<label className={styles.label}>{t.apiKey}</label>
-								<input className={styles.input} type="password" value={apiKey} onChange={(event) => setApiKey(event.target.value)} placeholder={t.apiKeyOptional} />
+								<input className={styles.input} type="password" value={apiKey} onChange={(event) => setApiKey(event.target.value)} onBlur={requestAutoDiscover} placeholder={t.apiKeyOptional} />
 								<div className={styles.hint}>{t.customApiKeyHint}</div>
 							</div>
 							<ModelCatalog
@@ -294,6 +302,7 @@ export function ProviderSetupModal({
 								updateModel={updateModel}
 								discover={discoverAvailableModels}
 								discoverDisabled={!baseUrl.trim()}
+								autoDiscover={autoReady ? { signature: `${baseUrl.trim()}|${api}|${apiKey.trim()}`, privateHost: looksPrivateEndpoint(baseUrl), trigger: autoTrigger } : undefined}
 							/>
 						</>
 					)}
@@ -325,16 +334,25 @@ export function ModelCatalog({
 	setModels,
 	updateModel,
 	inheritedCount,
+	catalogIds,
 	discover,
 	discoverDisabled,
+	autoDiscover,
 }: {
 	models: ModelDraft[];
 	setModels: React.Dispatch<React.SetStateAction<ModelDraft[]>>;
 	updateModel: (index: number, patch: Partial<ModelDraft>) => void;
 	inheritedCount?: number;
+	/** 内置 provider 的目录模型 ID：候选里已在目录中的不能勾选（本来就能选），同 ID 的行只覆盖填写的字段 */
+	catalogIds?: ReadonlySet<string>;
 	/** 用表单当前值探测远端目录（allowPrivate：用户勾选了允许访问本机/私网地址）；抛错时错误显示在目录内 */
 	discover?: (allowPrivate: boolean) => Promise<ModelDraft[]>;
 	discoverDisabled?: boolean;
+	/**
+	 * 自动识别：trigger 变了（地址 / 密钥失焦、换协议）就按当前签名（URL + 协议 + 密钥）拉一次模型目录。
+	 * 只在「还没有任何模型行」时给出；同一签名只跑一次，清空模型行后不会自己又加回来。
+	 */
+	autoDiscover?: { signature: string; privateHost: boolean; trigger: number };
 }) {
 	const { t } = useI18n();
 	const [expanded, setExpanded] = useState<ReadonlySet<number>>(new Set());
@@ -381,8 +399,64 @@ export function ModelCatalog({
 		});
 	};
 
+	const inCatalog = (id: string) => catalogIds?.has(id.trim()) ?? false;
+
+	// 自动识别：地址 / 密钥输入框失焦时（父组件递增 trigger）自己去拉一次目录，不用再点按钮。
+	// 不按「停手」计时：那样会拿半截地址和半截密钥去发请求。同一签名只跑一次；
+	// 表单一改（签名变了）就作废还在路上的那次，迟到的结果不会把别的地址的模型塞进来。
+	const auto = autoDiscover;
+	const autoDone = useRef("");
+	const autoSeq = useRef(0);
+	const autoPending = useRef(false);
+	// 处理过的最后一次 trigger：条目从无到有（如清空模型行）时 trigger 没变，不算一次新的失焦
+	const autoTriggerSeen = useRef(0);
+	const [autoStatus, setAutoStatus] = useState<"" | "loading" | "done" | "empty" | "failed">("");
+	const [autoFound, setAutoFound] = useState(0);
+	useEffect(() => {
+		if (!autoPending.current) return;
+		autoPending.current = false;
+		autoSeq.current += 1;
+		// 作废的那次不算跑过：改回原值再失焦还能重试
+		autoDone.current = "";
+		setAutoStatus("");
+	}, [auto?.signature]);
+	useEffect(() => {
+		if (!auto || auto.trigger === autoTriggerSeen.current) return;
+		autoTriggerSeen.current = auto.trigger;
+		if (!discover || autoDone.current === auto.signature) return;
+		autoDone.current = auto.signature;
+		autoPending.current = true;
+		const seq = ++autoSeq.current;
+		setAutoStatus("loading");
+		const settle = (status: "done" | "empty" | "failed") => {
+			if (seq !== autoSeq.current) return false;
+			autoPending.current = false;
+			setAutoStatus(status);
+			return true;
+		};
+		// 本机/私网地址自动允许（服务端仍会自己再判一次）
+		discover(allowPrivate || auto.privateHost).then(
+			(found) => {
+				if (!settle(found.length ? "done" : "empty")) return;
+				setAutoFound(found.length);
+				setModels((current) => (current.length ? current : found));
+			},
+			// 自动跑失败不弹错：按钮还在，手动点能看到具体原因
+			() => void settle("failed"),
+		);
+		// 只由失焦触发；discover 每次渲染都是新函数，放进依赖会让任何重渲染都重跑
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [auto?.trigger]);
+
 	const startDiscover = async () => {
 		if (!discover || discovering) return;
+		// 手动点了就以候选对话框为准：点按钮时输入框失焦触发的那次自动识别作废
+		if (autoPending.current) {
+			autoPending.current = false;
+			autoSeq.current += 1;
+			autoDone.current = "";
+			setAutoStatus("");
+		}
 		setDiscovering(true);
 		setDiscoverError("");
 		try {
@@ -391,10 +465,12 @@ export function ModelCatalog({
 				setDiscoverError(t.discoverEmpty);
 				return;
 			}
-			// 已配置的行默认不勾选：采纳永远不覆盖用户改过的内容
+			// 已配置的行默认不勾选：采纳永远不覆盖用户改过的内容。
+			// 内置目录里已有的模型本来就能选，加成行只会变成一条空覆盖：排到后面、不可勾选
 			const known = new Set(models.map((model) => model.id.trim()).filter(Boolean));
-			setCandidates(found);
-			setPicked(new Set(found.filter((model) => !known.has(model.id.trim())).map((model) => model.id)));
+			const ordered = [...found.filter((model) => !inCatalog(model.id)), ...found.filter((model) => inCatalog(model.id))];
+			setCandidates(ordered);
+			setPicked(new Set(ordered.filter((model) => !known.has(model.id.trim()) && !inCatalog(model.id)).map((model) => model.id)));
 		} catch (reason) {
 			setDiscoverError(reason instanceof Error ? reason.message : t.toastError);
 		} finally {
@@ -413,8 +489,8 @@ export function ModelCatalog({
 			const byId = new Map(current.map((model) => [model.id.trim(), model]));
 			for (const candidate of candidates) {
 				const id = candidate.id.trim();
-				if (!id || !picked.has(id) || byId.has(id)) continue;
-				byId.set(id, { id, name: candidate.name ?? "" });
+				if (!id || !picked.has(id) || byId.has(id) || inCatalog(id)) continue;
+				byId.set(id, candidate);
 			}
 			return [...byId.values()];
 		});
@@ -422,7 +498,9 @@ export function ModelCatalog({
 	};
 
 	const visibleCandidates = candidates ?? [];
-	const allVisiblePicked = visibleCandidates.length > 0 && visibleCandidates.every((model) => picked.has(model.id));
+	// 「全选」只管能勾的那些
+	const selectableCandidates = visibleCandidates.filter((model) => !inCatalog(model.id));
+	const allVisiblePicked = selectableCandidates.length > 0 && selectableCandidates.every((model) => picked.has(model.id));
 
 	const togglePick = (id: string) =>
 		setPicked((current) => {
@@ -432,6 +510,7 @@ export function ModelCatalog({
 		});
 
 	const firstInvalid = validateModelDrafts(models);
+	const overridesBuiltin = models.some((model) => inCatalog(model.id));
 
 	return (
 		<div className={styles.catalog}>
@@ -440,6 +519,10 @@ export function ModelCatalog({
 					<div className={styles.label}>{t.modelCatalog}</div>
 					<div className={styles.catalogStatus}>
 						{inheritedCount ? t.usingDefaultModels.replace("{count}", String(inheritedCount)) : t.customModelsRequired}
+						{autoStatus === "loading" ? ` · ${t.autoDiscovering}` : null}
+						{autoStatus === "done" ? ` · ${t.autoDiscovered.replace("{n}", String(autoFound))}` : null}
+						{autoStatus === "empty" ? ` · ${t.discoverEmpty}` : null}
+						{autoStatus === "failed" ? ` · ${t.autoDiscoverFailed}` : null}
 					</div>
 				</div>
 				{discover ? (
@@ -509,6 +592,22 @@ export function ModelCatalog({
 												placeholder="16K"
 											/>
 										</label>
+										<label className={styles.capacityField} title={t.visionHint}>
+											<span>{t.visionLabel}</span>
+											<select
+												className={styles.input}
+												value={model.vision === undefined ? "unset" : model.vision ? "image" : "text"}
+												onChange={(event) => {
+													const choice = event.target.value;
+													// 未声明 = 不写 input：pi 按纯文本处理，体检卡片会列出来提醒
+													updateModel(index, { vision: choice === "unset" ? undefined : choice === "image" });
+												}}
+											>
+												<option value="unset">{t.visionUnset}</option>
+												<option value="image">{t.visionOn}</option>
+												<option value="text">{t.visionOff}</option>
+											</select>
+										</label>
 										<span className={styles.capacityHint}>{t.capacityHint}</span>
 									</div>
 								) : null}
@@ -520,6 +619,7 @@ export function ModelCatalog({
 			) : (
 				<div className={styles.modelEmpty}>{inheritedCount ? t.modelCatalogEmptyBuiltin : t.modelCatalogEmptyCustom}</div>
 			)}
+			{overridesBuiltin ? <div className={styles.catalogHint}>{t.catalogOverrideHint}</div> : null}
 			<button className={styles.addModel} onClick={() => setModels((current) => [...current, { id: "", name: "" }])}>
 				<IconPlusOutline16 size={14} />
 				{t.addModel}
@@ -532,13 +632,17 @@ export function ModelCatalog({
 							<span>{t.candidateTitle.replace("{count}", String(candidates.length))}</span>
 						</div>
 						<div className={styles.candidateList}>
-							{visibleCandidates.map((model) => (
-								<label className={styles.candidateRow} key={model.id}>
-									<input type="checkbox" checked={picked.has(model.id)} onChange={() => togglePick(model.id)} />
-									<span className={styles.candidateId}>{model.id}</span>
-									{model.name ? <span className={styles.candidateName}>{model.name}</span> : null}
-								</label>
-							))}
+							{visibleCandidates.map((model) => {
+								const listed = inCatalog(model.id);
+								return (
+									<label className={styles.candidateRow} data-disabled={listed || undefined} key={model.id}>
+										<input type="checkbox" checked={!listed && picked.has(model.id)} disabled={listed} onChange={() => togglePick(model.id)} />
+										<span className={styles.candidateId}>{model.id}</span>
+										{model.name ? <span className={styles.candidateName}>{model.name}</span> : null}
+										{listed ? <span className={styles.candidateTag}>{t.candidateInCatalog}</span> : null}
+									</label>
+								);
+							})}
 							{visibleCandidates.length === 0 ? <div className={styles.modelEmpty}>—</div> : null}
 						</div>
 						<div className={styles.candidateActions}>
@@ -546,11 +650,12 @@ export function ModelCatalog({
 								<input
 									type="checkbox"
 									checked={allVisiblePicked}
+									disabled={selectableCandidates.length === 0}
 									onChange={() =>
 										setPicked((current) => {
 											const next = new Set(current);
-											if (visibleCandidates.every((model) => next.has(model.id))) visibleCandidates.forEach((model) => next.delete(model.id));
-											else visibleCandidates.forEach((model) => next.add(model.id));
+											if (selectableCandidates.every((model) => next.has(model.id))) selectableCandidates.forEach((model) => next.delete(model.id));
+											else selectableCandidates.forEach((model) => next.add(model.id));
 											return next;
 										})
 									}