@sqdr2/dsh-fusion 0.3.3 → 0.3.4

package/lib/dsh-fusion.js

@@ -608,16 +608,17 @@ function profileRoutes(profile) {
 //#endregion
 //#region src/host/settings.ts
 /** Configuration chooses registered physical models; it cannot create adapters. */
-function validatePairChoice(value, catalog) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(bi("请选择 Lead 和 Worker", "Choose a Lead and a Sidekick"));
+function validatePairChoice(value, catalog, combo) {
+	const say = (zh, en) => combo ? bi(`组合「${combo}」：${zh}`, `Combo "${combo}": ${en}`) : bi(zh, en);
+	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(say("请选择 Lead 和 Worker", "Choose a Lead and a Sidekick"));
 	const raw = value;
 	const route = (role, candidate) => {
 		const item = candidate;
-		if (!item || typeof item.provider !== "string" || typeof item.model !== "string") throw new Error(bi(`请选择 ${role} 模型`, `Choose the ${role} model`));
-		if (isFusionProvider(item.provider)) throw new Error(bi("Fusion 必须选择真实模型", "Fusion needs real models, not Fusion itself"));
+		if (!item || typeof item.provider !== "string" || typeof item.model !== "string") throw new Error(say(`请选择 ${role} 模型`, `Choose the ${role} model`));
+		if (isFusionProvider(item.provider)) throw new Error(say("Fusion 必须选择真实模型", "Fusion needs real models, not Fusion itself"));
 		const model = catalog.groups.find((group) => group.id === item.provider)?.models.find((model) => model.id === item.model);
-		if (!model) throw new Error(bi(`${role} 模型已不可用，请刷新后重选`, `The ${role} model is no longer available; refresh and choose again`));
-		if (item.reasoningEffort !== void 0 && (typeof item.reasoningEffort !== "string" || !model.reasoning?.efforts.some((effort) => effort.id === item.reasoningEffort))) throw new Error(bi(`${role} 不支持所选推理强度`, `${role} does not support the selected reasoning level`));
+		if (!model) throw new Error(say(`${role} 模型已不可用：${item.provider}/${item.model}。请为该角色重新选择模型`, `The ${role} model is no longer available: ${item.provider}/${item.model}. Choose a model for that role again`));
+		if (item.reasoningEffort !== void 0 && (typeof item.reasoningEffort !== "string" || !model.reasoning?.efforts.some((effort) => effort.id === item.reasoningEffort))) throw new Error(say(`${role} 不支持所选推理强度`, `${role} does not support the selected reasoning level`));
 		return {
 			provider: item.provider,
 			model: item.model,
@@ -629,7 +630,7 @@ function validatePairChoice(value, catalog) {
 	let outputTokens;
 	if (raw.outputTokens !== void 0) {
 		const value = raw.outputTokens;
-		if (!value || typeof value !== "object" || Array.isArray(value) || Object.entries(value).some(([role, tokens]) => !["lead", "worker"].includes(role) || !Number.isSafeInteger(tokens) || Number(tokens) < 1 || Number(tokens) > 128e3)) throw new Error(bi("每次响应上限必须是 1–128000 的整数 Token 数", "The per-response limit must be an integer of 1–128000 tokens"));
+		if (!value || typeof value !== "object" || Array.isArray(value) || Object.entries(value).some(([role, tokens]) => !["lead", "worker"].includes(role) || !Number.isSafeInteger(tokens) || Number(tokens) < 1 || Number(tokens) > 128e3)) throw new Error(say("每次响应上限必须是 1–128000 的整数 Token 数", "The per-response limit must be an integer of 1–128000 tokens"));
 		outputTokens = { ...value };
 	}
 	return {
@@ -834,7 +835,7 @@ function validatePairs(value, catalog, existing) {
 		return {
 			id,
 			name,
-			pair: validatePairChoice(raw.pair, catalog)
+			pair: validatePairChoice(raw.pair, catalog, name)
 		};
 	});
 }

package/lib/types/host/settings.d.ts

@@ -28,8 +28,23 @@ export declare function savedLeadRoute(value: unknown): {
     provider: string;
     model: string;
 } | undefined;
+/** The roles a saved pair names, in the order the settings page shows them. */
+export type PairRole = 'lead' | 'worker' | 'compactor';
+/**
+ * The routes a saved choice still names that the current catalog no longer
+ * offers: a provider that was renamed or removed, or a model that was retired.
+ *
+ * Reading a saved combo tolerates a stale route so the row stays visible and
+ * editable, but saving one does not. Without this, the page can only say that
+ * *some* model is gone, which is unusable when the stale route is not the one
+ * being edited — the user then cannot tell which combo to fix.
+ */
+export declare function missingRoutes(value: Partial<PairChoice> | undefined, catalog: SettingsCatalog): {
+    role: PairRole;
+    route: PhysicalRoute;
+}[];
 /** Configuration chooses registered physical models; it cannot create adapters. */
-export declare function validatePairChoice(value: unknown, catalog: SettingsCatalog): PairChoice;
+export declare function validatePairChoice(value: unknown, catalog: SettingsCatalog, combo?: string): PairChoice;
 /** New sessions can opt into this Worker cap. Frozen sessions keep their saved profile. */
 export declare const WORKER_IMPLEMENTATION_OUTPUT_TOKENS = 128000;
 export declare function profileFromChoice(pair: PairChoice, id?: string): Record<string, unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqdr2/dsh-fusion",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/client/FusionSettings.tsx

@@ -3,6 +3,7 @@ import { FusionCache } from './FusionCache.js'
 import { useEffect, useState } from 'react'
 import type { PhysicalRoute } from '../contracts.js'
 import type { PairChoice, SettingsCatalog } from '../host/settings.js'
+import { missingRoutes } from '../host/settings.js'
 import { settingsChanged } from './settings-events.js'
 import { tr, useLang } from './i18n.js'
 import { FUSION_API_PATH } from '../identity.js'
@@ -57,6 +58,7 @@ const styles = `
 .fusion-settings .fusion-combo-text{display:flex;flex-direction:column;gap:2px;min-width:0}
 .fusion-settings .fusion-combo-name{font-weight:600;overflow-wrap:anywhere}
 .fusion-settings .fusion-combo-routes{color:var(--dsw-alias-label-secondary);font-size:12px;overflow-wrap:anywhere}
+.fusion-settings .fusion-combo-stale{color:var(--dsw-alias-state-error-primary);font-size:12px;overflow-wrap:anywhere}
 .fusion-settings .fusion-combo-actions{flex:none;align-self:stretch;display:flex;align-items:center;padding:0 14px;border:0;border-left:1px solid var(--dsw-alias-border-l1);border-radius:0;background:none;color:var(--dsw-alias-label-secondary);font:inherit;font-size:12px;cursor:pointer;transition:color .15s ease,background-color .15s ease}
 .fusion-settings .fusion-combo-actions:hover:not(:disabled){color:var(--dsw-alias-state-error-primary);background-color:var(--dsw-alias-interactive-bg-hover-danger)}
 .fusion-settings .fusion-combo-actions:disabled{opacity:.4;cursor:default}
@@ -127,6 +129,10 @@ export function ModelChoice({ role, route, catalog, onChange }: {
   const lang = useLang()
   const name = role === 'compactor' ? tr(lang, '压缩', 'Compaction') : role
   const model = catalog.groups.find(group => group.id === route?.provider)?.models.find(model => model.id === route?.model)
+  // A saved route the catalog no longer offers would otherwise fall back to the
+  // placeholder, silently reading as "nothing chosen" — and hiding which model
+  // went away. Keep it listed, disabled and labelled, until it is replaced.
+  const stale = route !== undefined && model === undefined
   return <fieldset>
     <legend>{name}</legend>
     <p>{role === 'Lead' ? tr(lang, '回答问题、制定方案并审查结果。', 'Answers, plans and reviews.') : role === 'Sidekick' ? tr(lang, '执行命令和修改，接收反馈后继续。', 'Runs commands and makes changes, then continues with feedback.') : tr(lang, '整理较早的上下文，供 Lead 或 Worker 继续工作。', 'Summarises older context so the Lead or Sidekick can continue.')}</p>
@@ -136,10 +142,13 @@ export function ModelChoice({ role, route, catalog, onChange }: {
       onChange({ provider, model })
     }}>
       <option value="" disabled={role !== 'compactor'}>{role === 'compactor' ? tr(lang, '使用当前角色模型', 'Use the role\'s own model') : tr(lang, '选择已连接的模型', 'Choose a connected model')}</option>
+      {stale && route && <option value={key(route)} disabled>{tr(lang, `已不可用：${route.provider}/${route.model}`, `No longer available: ${route.provider}/${route.model}`)}</option>}
       {catalog.groups.map(group => <optgroup key={group.id} label={group.name}>
         {group.models.map(model => <option key={model.id} value={key({ provider: group.id, model: model.id })}>{model.name}</option>)}
       </optgroup>)}
     </select></label>
+    {stale && route && <p role="alert">{tr(lang, `这个角色保存的模型 ${route.provider}/${route.model} 已不可用，请重新选择。`,
+      `This role's saved model ${route.provider}/${route.model} is no longer available; choose another.`)}</p>}
     {model?.reasoning && route && <label>{tr(lang, '推理强度', 'Reasoning')}<select aria-label={tr(lang, `${name} 推理强度`, `${name} reasoning`)} value={route.reasoningEffort ?? ''} onChange={event => {
       const { reasoningEffort: _old, ...physical } = route
       onChange({ ...physical, ...(event.target.value ? { reasoningEffort: event.target.value } : {}) })
@@ -165,6 +174,8 @@ export function FusionSettings() {
   const routeName = (route?: PhysicalRoute) => route
     ? state?.catalog.groups.find(group => group.id === route.provider)?.models.find(model => model.id === route.model)?.name
       ?? `${route.provider}/${route.model}` : '—'
+  const roleLabel = (role: 'lead' | 'worker' | 'compactor') => role === 'lead' ? tr(lang, 'Lead', 'Lead')
+    : role === 'worker' ? tr(lang, 'Sidekick', 'Sidekick') : tr(lang, '压缩模型', 'Compaction model')
   const update = (change: (combo: DraftCombo) => DraftCombo) => setDraft(value => value.map((combo, index) =>
     combo.key === current?.key ? change(combo) : combo))
   const chooseModel = (role: 'lead' | 'worker', route: PhysicalRoute) => update(combo => ({ ...combo, pair: { ...combo.pair, [role]: route,
@@ -190,6 +201,13 @@ export function FusionSettings() {
     if (!state) return
     const invalid = draft.findIndex(combo => !combo.pair.lead || !combo.pair.worker || !combo.name.trim())
     if (invalid >= 0) { setError(tr(lang, `第 ${invalid + 1} 个组合还不完整：需要名称、Lead 和 Sidekick。`, `Combo ${invalid + 1} is incomplete: it needs a name, a Lead and a Sidekick.`)); return }
+    // A route that no longer exists cannot be saved, and the Host's own refusal
+    // names only the role. Checked here so the message can name the combo too:
+    // with several rows, "the Lead model is gone" does not say which row to open.
+    const stale = draft.flatMap((combo, index) => missingRoutes(combo.pair, state.catalog).map(({ role, route }) =>
+      tr(lang, `第 ${index + 1} 个组合「${combo.name.trim() || tr(lang, '未命名组合', 'Untitled combo')}」的 ${roleLabel(role)} 模型已不可用：${route.provider}/${route.model}。请为该角色重新选择模型。`,
+        `Combo ${index + 1} "${combo.name.trim() || 'Untitled combo'}" still names a ${roleLabel(role)} model that is no longer available: ${route.provider}/${route.model}. Choose a model for that role again.`)))
+    if (stale.length) { setError(stale.join(tr(lang, ' ', ' '))); return }
     setSaving(true); setError(undefined); setNotice(undefined)
     try {
       const pairs = draft.map(({ id, name, pair }) => {
@@ -238,6 +256,8 @@ export function FusionSettings() {
                   <span className="fusion-combo-text">
                     <span className="fusion-combo-name">{label}</span>
                     <span className="fusion-combo-routes">{`${routeName(combo.pair.lead)} → ${routeName(combo.pair.worker)}`}</span>
+                    {missingRoutes(combo.pair, state.catalog).length > 0 && <span className="fusion-combo-stale">
+                      {tr(lang, '有模型已不可用，需要重新选择', 'A model is no longer available; choose it again')}</span>}
                   </span>
                 </button>
                 <button type="button" className="fusion-combo-actions" disabled={saving || draft.length <= 1}

package/src/host/pairs.ts

@@ -155,7 +155,9 @@ export function validatePairs(value: unknown, catalog: SettingsCatalog, existing
     const name = pairName(raw.name, index === 0 ? DEFAULT_PAIR_NAME : `组合 ${index + 1}`)
     if (names.has(name)) throw new Error(bi(`组合名称 "${name}" 重复`, `The combo name "${name}" is used twice`))
     names.add(name)
-    return { id, name, pair: validatePairChoice(raw.pair, catalog) }
+    // The name goes in so a stale route in the second row does not read like a
+    // complaint about the first one.
+    return { id, name, pair: validatePairChoice(raw.pair, catalog, name) }
   })
 }
 

package/src/host/settings.ts

@@ -27,20 +27,49 @@ export function savedLeadRoute(value: unknown): { provider: string; model: strin
   return { provider, model }
 }
 
+/** The roles a saved pair names, in the order the settings page shows them. */
+export type PairRole = 'lead' | 'worker' | 'compactor'
+
+/**
+ * The routes a saved choice still names that the current catalog no longer
+ * offers: a provider that was renamed or removed, or a model that was retired.
+ *
+ * Reading a saved combo tolerates a stale route so the row stays visible and
+ * editable, but saving one does not. Without this, the page can only say that
+ * *some* model is gone, which is unusable when the stale route is not the one
+ * being edited — the user then cannot tell which combo to fix.
+ */
+export function missingRoutes(value: Partial<PairChoice> | undefined, catalog: SettingsCatalog): { role: PairRole; route: PhysicalRoute }[] {
+  if (!value) return []
+  const stale = (role: PairRole, route: PhysicalRoute | undefined) => route !== undefined
+    && !catalog.groups.find(group => group.id === route.provider)?.models.find(model => model.id === route.model)
+    ? [{ role, route }] : []
+  return [...stale('lead', value.lead), ...stale('worker', value.worker), ...stale('compactor', value.compactor?.route)]
+}
+
 /** Configuration chooses registered physical models; it cannot create adapters. */
-export function validatePairChoice(value: unknown, catalog: SettingsCatalog): PairChoice {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error(bi('请选择 Lead 和 Worker', 'Choose a Lead and a Sidekick'))
+export function validatePairChoice(value: unknown, catalog: SettingsCatalog, combo?: string): PairChoice {
+  // A list is validated row by row, so the failure has to say which row it came
+  // from; `bi` carries both languages, so the label joins the message here
+  // instead of being glued onto an already-bilingual string.
+  const say = (zh: string, en: string) => combo
+    ? bi(`组合「${combo}」：${zh}`, `Combo "${combo}": ${en}`) : bi(zh, en)
+  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error(say('请选择 Lead 和 Worker', 'Choose a Lead and a Sidekick'))
   const raw = value as Record<string, unknown>
   const route = (role: string, candidate: unknown): PhysicalRoute => {
     const item = candidate as Record<string, unknown> | undefined
-    if (!item || typeof item.provider !== 'string' || typeof item.model !== 'string') throw new Error(bi(`请选择 ${role} 模型`, `Choose the ${role} model`))
-    if (isFusionProvider(item.provider)) throw new Error(bi('Fusion 必须选择真实模型', 'Fusion needs real models, not Fusion itself'))
+    if (!item || typeof item.provider !== 'string' || typeof item.model !== 'string') throw new Error(say(`请选择 ${role} 模型`, `Choose the ${role} model`))
+    if (isFusionProvider(item.provider)) throw new Error(say('Fusion 必须选择真实模型', 'Fusion needs real models, not Fusion itself'))
     const group = catalog.groups.find(group => group.id === item.provider)
     const model = group?.models.find(model => model.id === item.model)
-    if (!model) throw new Error(bi(`${role} 模型已不可用，请刷新后重选`, `The ${role} model is no longer available; refresh and choose again`))
+    // Name the exact route: after a provider rename the model usually still
+    // exists elsewhere, so "refresh and choose again" alone leaves the user
+    // guessing which of the two roles went stale.
+    if (!model) throw new Error(say(`${role} 模型已不可用：${item.provider}/${item.model}。请为该角色重新选择模型`,
+      `The ${role} model is no longer available: ${item.provider}/${item.model}. Choose a model for that role again`))
     if (item.reasoningEffort !== undefined && (typeof item.reasoningEffort !== 'string'
       || !model.reasoning?.efforts.some(effort => effort.id === item.reasoningEffort))) {
-      throw new Error(bi(`${role} 不支持所选推理强度`, `${role} does not support the selected reasoning level`))
+      throw new Error(say(`${role} 不支持所选推理强度`, `${role} does not support the selected reasoning level`))
     }
     return { provider: item.provider, model: item.model,
       ...(item.reasoningEffort === undefined ? {} : { reasoningEffort: item.reasoningEffort as string }) }
@@ -53,7 +82,7 @@ export function validatePairChoice(value: unknown, catalog: SettingsCatalog): Pa
     if (!value || typeof value !== 'object' || Array.isArray(value)
       || Object.entries(value).some(([role, tokens]) => !['lead', 'worker'].includes(role)
         || !Number.isSafeInteger(tokens) || Number(tokens) < 1 || Number(tokens) > 128_000)) {
-      throw new Error(bi('每次响应上限必须是 1–128000 的整数 Token 数', 'The per-response limit must be an integer of 1–128000 tokens'))
+      throw new Error(say('每次响应上限必须是 1–128000 的整数 Token 数', 'The per-response limit must be an integer of 1–128000 tokens'))
     }
     outputTokens = { ...value } as PairChoice['outputTokens']
   }