dsh-plugin-effort-declare 0.1.3 → 0.1.5

package/lib/client.js

@@ -11,7 +11,7 @@ window.__ModuleLoader__.load({
 		* Canonical thinking levels and openai-completions thinkingFormat names.
 		*
 		* Levels match `@deepseek-ai/dsh-llm-pi-ai` catalog.ts `THINKING_LEVELS`.
-		* Formats match `SUPPORTED_THINKING_FORMATS` in the same file (rc.8).
+		* Formats match `SUPPORTED_THINKING_FORMATS` in the same file (0.1.2-alpha.2).
 		* Tests pin these lists against a checked-in schema fixture
 		* (`tests/fixtures/pi-ai-thinking-format-union.ts`) and the local level
 		* whitelist. The settings page never offers the handwritten thinkingFormat
@@ -36,6 +36,13 @@ window.__ModuleLoader__.load({
 		const LLM_PI_AI_NS = "llm-pi-ai";
 		/** Any route key walks a dict schema to the same profile node. */
 		const SCHEMA_PROBE_ROUTE = "\0probe";
+		/** Request modalities llm-pi-ai accepts on `models[].input` / `defaultInput`. */
+		const INPUT_MODALITIES = ["text", "image"];
+		/**
+		* Canonical write for a hand-declared vision model.
+		* Must include `text`; image-only is not a serviceable OpenAI-completions route.
+		*/
+		const IMAGE_CAPABLE_INPUT = ["text", "image"];
 		//#endregion
 		//#region src/core/paths.ts
 		/**
@@ -231,25 +238,29 @@ window.__ModuleLoader__.load({
 			}
 			return map;
 		}
-		function effortsPresence(row) {
-			if (row === void 0 || !Object.hasOwn(row, "reasoningEfforts")) return {
+		/** Model-row fields this page edits; other keys follow the Models page. */
+		const MODEL_OVERLAY_KEYS = ["reasoningEfforts", "input"];
+		function fieldPresence(row, key) {
+			if (row === void 0 || !Object.hasOwn(row, key)) return {
 				present: false,
 				value: void 0
 			};
 			return {
 				present: true,
-				value: row.reasoningEfforts
+				value: row[key]
 			};
 		}
-		function effortsEqual(left, right) {
-			if (left.present !== right.present) return false;
-			if (!left.present) return true;
-			return sliceEqual(left.value, right.value);
+		function fieldEqual(left, right, key) {
+			const a = fieldPresence(left, key);
+			const b = fieldPresence(right, key);
+			if (a.present !== b.present) return false;
+			if (!a.present) return true;
+			return sliceEqual(a.value, b.value);
 		}
-		function overlayLocalEfforts(incomingRow, prevRow) {
+		function overlayLocalFields(incomingRow, prevRow, keys) {
 			const next = structuredClone(incomingRow);
-			if (Object.hasOwn(prevRow, "reasoningEfforts")) next.reasoningEfforts = structuredClone(prevRow.reasoningEfforts);
-			else delete next.reasoningEfforts;
+			for (const key of keys) if (Object.hasOwn(prevRow, key)) next[key] = structuredClone(prevRow[key]);
+			else delete next[key];
 			return next;
 		}
 		function objectKeyChanged(left, right, key) {
@@ -260,7 +271,8 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* Membership follows the latest user-layer models list (Models page add/delete).
-		* Local unsaved `reasoningEfforts` (including a cleared key) overlay by id.
+		* Local unsaved overlay keys (including a cleared key) overlay by id; other
+		* fields on the row follow incoming.
 		*/
 		function mergeModelsById(args) {
 			const prevById = indexById(args.prevModels);
@@ -273,16 +285,19 @@ window.__ModuleLoader__.load({
 				const prevRow = prevById.get(id);
 				if (prevRow === void 0) return structuredClone(incomingRow);
 				const prevOrig = prevOrigById.get(id);
-				if (!!effortsEqual(effortsPresence(prevRow), effortsPresence(prevOrig))) return structuredClone(incomingRow);
+				const dirtyKeys = MODEL_OVERLAY_KEYS.filter((key) => !fieldEqual(prevRow, prevOrig, key));
+				if (dirtyKeys.length === 0) return structuredClone(incomingRow);
 				const incomingOrig = incomingOrigById.get(id);
-				if (!effortsEqual(effortsPresence(prevOrig), effortsPresence(incomingOrig))) conflicted = true;
-				return overlayLocalEfforts(incomingRow, prevRow);
+				for (const key of dirtyKeys) if (!fieldEqual(prevOrig, incomingOrig, key)) conflicted = true;
+				return overlayLocalFields(incomingRow, prevRow, dirtyKeys);
 			});
 			for (const [id, prevRow] of prevById) {
 				if (incomingIds.has(id)) continue;
 				const prevOrig = prevOrigById.get(id);
-				if (effortsEqual(effortsPresence(prevRow), effortsPresence(prevOrig))) continue;
-				if (!effortsEqual(effortsPresence(prevOrig), effortsPresence(incomingOrigById.get(id)))) conflicted = true;
+				const dirtyKeys = MODEL_OVERLAY_KEYS.filter((key) => !fieldEqual(prevRow, prevOrig, key));
+				if (dirtyKeys.length === 0) continue;
+				const incomingOrig = incomingOrigById.get(id);
+				for (const key of dirtyKeys) if (!fieldEqual(prevOrig, incomingOrig, key)) conflicted = true;
 			}
 			return {
 				models,
@@ -314,9 +329,9 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* Apply a freshly loaded table. Membership and metadata follow incoming;
-		* unsaved reasoningEfforts / dirty compat keys overlay by id. Conflict only
-		* when a locally dirty field also changed in originals (revision-only bumps
-		* and sibling-card saves do not warn).
+		* unsaved overlay keys (`reasoningEfforts`, `input`) / dirty compat keys
+		* overlay by id. Conflict only when a locally dirty field also changed in
+		* originals (revision-only bumps and sibling-card saves do not warn).
 		*/
 		function mergeLoadedDrafts(current, incoming, options) {
 			const currentByProvider = new Map(current.map((draft) => [draft.provider, draft]));
@@ -524,12 +539,58 @@ window.__ModuleLoader__.load({
 			return next;
 		}
 		//#endregion
+		//#region src/core/input.ts
+		/**
+		* Per-model `input` modalities as stored in llm-pi-ai settings.
+		* Absence falls through to route `defaultInput` (`[text]`). Empty list is
+		* treated as absent by the official resolver — do not write `[]`.
+		*/
+		/** Whether the stored `input` list includes image. Absence is false. */
+		function readImageCapable(row) {
+			const value = row.input;
+			return Array.isArray(value) && value.includes("image");
+		}
+		/**
+		* Declare or drop image input on a spread row.
+		* Enabled writes `[text, image]`; disabled unsets the key (not `[]`, not `[text]`).
+		*/
+		function writeImageCapable(row, enabled) {
+			const next = { ...row };
+			if (enabled) next.input = [...IMAGE_CAPABLE_INPUT];
+			else delete next.input;
+			return next;
+		}
+		/**
+		* Validate a stored `input` field. Returns an error code; never throws.
+		* Absence is valid. Empty list is rejected so a bad stamp cannot be re-saved.
+		*/
+		function validateInput(input) {
+			if (input === void 0) return void 0;
+			if (!Array.isArray(input) || input.length === 0) return "bad-input";
+			const known = new Set(INPUT_MODALITIES);
+			const seen = /* @__PURE__ */ new Set();
+			for (const item of input) {
+				if (typeof item !== "string" || !known.has(item) || seen.has(item)) return "bad-input";
+				seen.add(item);
+			}
+			if (!seen.has("text")) return "bad-input";
+		}
+		/** Per-model client-side check used to show errors without throwing. */
+		function modelInputError(row) {
+			if (!("input" in row) || row.input === void 0) return void 0;
+			return validateInput(row.input);
+		}
+		//#endregion
 		//#region src/core/validate.ts
 		/** Per-model client-side check used to show errors without throwing. */
 		function modelEffortError(row) {
 			if (!("reasoningEfforts" in row) || row.reasoningEfforts === void 0) return void 0;
 			return validateReasoningEfforts(row.reasoningEfforts);
 		}
+		/** First blocking error on a model row (efforts, then input). */
+		function modelRowError(row) {
+			return modelEffortError(row) ?? modelInputError(row);
+		}
 		//#endregion
 		//#region src/core/attribution.ts
 		/**
@@ -555,7 +616,7 @@ window.__ModuleLoader__.load({
 		* package.json at DSH startup — host apply is empty and the settings page
 		* runs in the browser.
 		*/
-		const PLUGIN_FOOTER_TEXT = formatAttribution("0.1.3", COPYRIGHT_FROM, 2026);
+		const PLUGIN_FOOTER_TEXT = formatAttribution("0.1.5", COPYRIGHT_FROM, 2026);
 		//#endregion
 		//#region src/client/load-drafts.ts
 		function schemaDefaultString(node) {
@@ -628,7 +689,7 @@ window.__ModuleLoader__.load({
 				return current !== void 0 && current !== previous;
 			}, signal) ? "changed" : "aborted";
 		}
-		async function assembleDrafts(api, describe, schema) {
+		async function assembleDrafts(llm, describe, schema) {
 			const mirrored = describe.getSnapshot();
 			if (mirrored.view === void 0) return {
 				writable: false,
@@ -636,12 +697,12 @@ window.__ModuleLoader__.load({
 				drafts: [],
 				error: mirrored.error ?? void 0
 			};
-			const providersResponse = await api.llm.providers({});
-			if (!providersResponse.result.ok) return {
+			const providersResponse = await llm.listConfigurableProviders();
+			if (!providersResponse.ok) return {
 				writable: mirrored.view.writable,
 				formats: [],
 				drafts: [],
-				error: providersResponse.result.error.message
+				error: providersResponse.error.message
 			};
 			const pi = new Map(mirrored.view.namespaces.map((view) => [view.ns, view])).get(LLM_PI_AI_NS);
 			let formats = [];
@@ -662,7 +723,7 @@ window.__ModuleLoader__.load({
 				]));
 			} catch {}
 			const drafts = [];
-			for (const entry of providersResponse.result.value.providers) {
+			for (const entry of providersResponse.value) {
 				const settingsPath = entry.settingsPath !== void 0 && entry.settingsPath.length > 0 ? [...entry.settingsPath] : ["providers", entry.provider];
 				if (!classifyRoute(entry, profileAt(pi?.value, settingsPath, entry.provider), schemaDefaultApi).editable) continue;
 				drafts.push(routeDraftFromUserProfile({
@@ -683,9 +744,9 @@ window.__ModuleLoader__.load({
 		* `ensure`: first paint / idle recovery (official ensure only reads from idle).
 		* `snapshot`: refresh after the mirror revision already moved — do not ensure.
 		*/
-		async function loadDrafts(api, describe, schema, mode = "ensure") {
+		async function loadDrafts(llm, describe, schema, mode = "ensure") {
 			if (mode === "ensure") await describe.ensure();
-			return assembleDrafts(api, describe, schema);
+			return assembleDrafts(llm, describe, schema);
 		}
 		//#endregion
 		//#region src/client/schema-ops.ts
@@ -759,8 +820,8 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/EffortDeclareSection.tsx
 		/**
-		* Settings section: per-model reasoningEfforts + openai-completions compat
-		* for hand-declared llm-pi-ai routes.
+		* Settings section: per-model reasoningEfforts, image input, and
+		* openai-completions compat for hand-declared llm-pi-ai routes.
 		*/
 		function compatSummary(compat) {
 			const parts = [];
@@ -773,6 +834,7 @@ window.__ModuleLoader__.load({
 			if (code === "empty") return t("errorEmpty");
 			if (code === "off-only") return t("errorOffOnly");
 			if (code === "bad-wire") return t("errorBadWire");
+			if (code === "bad-input") return t("errorBadInput");
 		}
 		function ModelRowEditor(props) {
 			const { row, disabled, t, onChange } = props;
@@ -808,6 +870,21 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+						className: effort_declare_module_css_default.check,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+							type: "checkbox",
+							checked: readImageCapable(row),
+							disabled,
+							onChange: (event) => {
+								onChange(writeImageCapable(row, event.target.checked));
+							}
+						}), t("imageInput")]
+					}),
+					readImageCapable(row) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						className: effort_declare_module_css_default.notice,
+						children: t("imageInputHint")
+					}) : null,
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: effort_declare_module_css_default.fieldLabel,
 						children: t("levels")
@@ -891,7 +968,7 @@ window.__ModuleLoader__.load({
 			const formats = thinkingFormatChoices(props.formats, draft.compat.thinkingFormat);
 			const summary = compatSummary(draft.compat);
 			const sameWire = draft.compat.supportsReasoningEffort === false;
-			const clientError = draft.models.map((row) => errorText(modelEffortError(row), t)).find((text) => text !== void 0);
+			const clientError = draft.models.map((row) => errorText(modelRowError(row), t)).find((text) => text !== void 0);
 			const dirty = draftDirty(draft);
 			const applyPreset = (id) => {
 				const preset = PRESETS[id];
@@ -1083,7 +1160,8 @@ window.__ModuleLoader__.load({
 		}
 		function EffortDeclareSection(props) {
 			const t = props.t;
-			const api = props.api;
+			const llm = props.llm;
+			const settings = props.settings;
 			const describe = props.describe;
 			const schema = props.schema;
 			const [status, setStatus] = (0, react.useState)("loading");
@@ -1142,17 +1220,17 @@ window.__ModuleLoader__.load({
 				setStatus("ready");
 			};
 			const loadSnapshotThenSettle = async (generation, preserveDirty) => {
-				if (api === void 0 || describe === void 0 || schema === void 0) return;
+				if (llm === void 0 || typeof llm.listConfigurableProviders !== "function" || describe === void 0 || schema === void 0) return;
 				if (!generationIsCurrent(generationRef, generation)) return;
 				try {
-					const result = await loadDrafts(api, describe, schema, "snapshot");
+					const result = await loadDrafts(llm, describe, schema, "snapshot");
 					settleReload(generation, preserveDirty, result);
 				} catch (failure) {
 					failGeneration(generation, failure);
 				}
 			};
 			const reload = (0, react.useCallback)((preserveDirty, mode = "ensure") => {
-				if (api === void 0 || describe === void 0 || schema === void 0) {
+				if (llm === void 0 || typeof llm.listConfigurableProviders !== "function" || describe === void 0 || schema === void 0) {
 					setStatus("error");
 					setError(t("loadError"));
 					return;
@@ -1160,19 +1238,19 @@ window.__ModuleLoader__.load({
 				const { generation } = beginGeneration();
 				if (draftsRef.current.length === 0) setStatus("loading");
 				setError("");
-				loadDrafts(api, describe, schema, mode).then((result) => {
+				loadDrafts(llm, describe, schema, mode).then((result) => {
 					settleReload(generation, preserveDirty, result);
 				}, (failure) => {
 					failGeneration(generation, failure);
 				});
 			}, [
-				api,
+				llm,
 				describe,
 				schema,
 				t
 			]);
 			const refreshAtRevision = (0, react.useCallback)((revision, preserveDirty) => {
-				if (api === void 0 || describe === void 0 || schema === void 0) return;
+				if (llm === void 0 || typeof llm.listConfigurableProviders !== "function" || describe === void 0 || schema === void 0) return;
 				const { generation, signal } = beginGeneration();
 				if (draftsRef.current.length === 0) setStatus("loading");
 				setError("");
@@ -1183,7 +1261,7 @@ window.__ModuleLoader__.load({
 					failGeneration(generation, failure);
 				});
 			}, [
-				api,
+				llm,
 				describe,
 				schema,
 				t
@@ -1237,7 +1315,7 @@ window.__ModuleLoader__.load({
 				});
 			};
 			const save = async (draft) => {
-				if (api === void 0 || describe === void 0 || schema === void 0) return;
+				if (settings === void 0 || typeof settings.mutate !== "function" || describe === void 0 || schema === void 0) return;
 				if (status === "loading" || busyRouteRef.current !== null) {
 					patchNotice(draft.provider, {
 						kind: "error",
@@ -1245,7 +1323,7 @@ window.__ModuleLoader__.load({
 					});
 					return;
 				}
-				const blocking = draft.models.map((row) => errorText(modelEffortError(row), t)).find((text) => text !== void 0);
+				const blocking = draft.models.map((row) => errorText(modelRowError(row), t)).find((text) => text !== void 0);
 				if (blocking !== void 0) {
 					patchNotice(draft.provider, {
 						kind: "error",
@@ -1288,16 +1366,12 @@ window.__ModuleLoader__.load({
 							}
 						}
 					}
-					const response = await api.settings.mutate({
-						ns: LLM_PI_AI_NS,
-						ops,
-						expectedRevision: draft.revision
-					});
-					if (!response.result.ok) {
-						const conflict = response.result.error.code === "settings-conflict";
+					const response = await settings.mutate(LLM_PI_AI_NS, ops, draft.revision);
+					if (!response.ok) {
+						const conflict = response.error.code === "settings/conflict";
 						patchNotice(draft.provider, {
 							kind: conflict ? "conflict" : "error",
-							text: conflict ? t("conflict") : response.result.error.message
+							text: conflict ? t("conflict") : response.error.message
 						});
 						if (conflict) {
 							const { generation, signal } = beginGeneration();
@@ -1310,7 +1384,7 @@ window.__ModuleLoader__.load({
 						}
 						return;
 					}
-					const view = response.result.value;
+					const view = response.value;
 					echoedRevisionRef.current = view.revision;
 					describe.acceptView(view);
 					applyDrafts(applySaveSuccess(draftsRef.current, draft.provider, {
@@ -1415,9 +1489,9 @@ window.__ModuleLoader__.load({
 		const zh = {
 			nav: "推理档位",
 			title: "推理档位声明",
-			intro: "本页声明「这模型能选哪些推理档」。对话里的档位选择仍在输入框模型菜单。没声明 = 和现在一样没有 Effort 行。不会改密钥、目录或当次选择。",
+			intro: "声明手工模型可提供的推理档位，以及是否接受图片输入。未声明则不显示 Effort 行，图片附件也会被拒绝。档位仍在输入框菜单中选择；密钥、目录与当前选中项不在本页修改。",
 			empty: "没有可编辑的手工 openai-completions 路由。",
-			emptyHint: "请先到「模型」页添加提供方（llm-pi-ai 手工路由）。官方 DeepSeek 与 catalog 路由不在本页编辑。需要 DSH ≥ 0.1.0-rc.8（providers.declared）。",
+			emptyHint: "请先到「模型」页添加提供方（llm-pi-ai 手工路由）。官方 DeepSeek 与 catalog 路由不在本页编辑。需要 DSH ≥ 0.1.2-alpha.2。",
 			loadError: "无法加载提供方或设置。",
 			loading: "正在加载…",
 			readOnly: "当前设置为只读，无法保存。",
@@ -1425,7 +1499,7 @@ window.__ModuleLoader__.load({
 			saving: "保存中…",
 			saveBusy: "另有路由正在保存，请稍候。",
 			cancel: "取消",
-			saved: "已保存。对话选择器会按新的能力声明显示 Effort 行。",
+			saved: "已保存。对话会按新的能力声明更新 Effort 行和是否允许贴图。",
 			conflict: "设置已被其他地方改过，请重新加载后再保存。",
 			dirtyConflict: "此路由有未保存修改，设置已在其他地方更新。保存会写到最新文档上，或先取消再改。",
 			presets: "预设",
@@ -1453,14 +1527,17 @@ window.__ModuleLoader__.load({
 			errorOffOnly: "不能只开 Off，必须再开一档思考档。",
 			errorBadWire: "思考档必须填写线上拼写；只有 Off 可以留空。不能使用未知档位键。",
 			noModels: "这条路由还没有 models 列表。请先到「模型」页添加模型。",
-			reload: "重新加载"
+			reload: "重新加载",
+			imageInput: "支持图片输入",
+			imageInputHint: "只在这个模型确实能看图时勾选。勾错了图会进聊天记录，然后被接口打回来。",
+			errorBadInput: "input 只能是 text / image，必须包含 text，不能重复或留空。不支持图片请清除该键，不要写成空列表。"
 		};
 		const en = {
 			nav: "Reasoning efforts",
 			title: "Reasoning effort declarations",
-			intro: "This page declares which reasoning levels a model can offer. The per-turn choice stays in the composer model menu. Undeclared models keep having no Effort row. Keys, catalogs, and the current selection are not edited here.",
+			intro: "Declare reasoning levels and image input for hand-added models. Undeclared models omit the Effort row and refuse image attachments. Effort is still chosen in the composer menu; keys, catalogs, and the current selection are not modified here.",
 			empty: "No editable hand-declared openai-completions routes.",
-			emptyHint: "Add a provider on the Models page first (an llm-pi-ai hand-declared route). Official DeepSeek and catalog routes are not edited here. Requires DSH ≥ 0.1.0-rc.8 (providers.declared).",
+			emptyHint: "Add a provider on the Models page first (an llm-pi-ai hand-declared route). Official DeepSeek and catalog routes are not edited here. Requires DSH ≥ 0.1.2-alpha.2.",
 			loadError: "Could not load providers or settings.",
 			loading: "Loading…",
 			readOnly: "Settings are read-only; saving is disabled.",
@@ -1468,7 +1545,7 @@ window.__ModuleLoader__.load({
 			saving: "Saving…",
 			saveBusy: "Another route is saving. Wait, then save this card.",
 			cancel: "Cancel",
-			saved: "Saved. The composer Effort row follows this capability declaration.",
+			saved: "Saved. The composer Effort row and image admission follow this capability declaration.",
 			conflict: "Settings changed elsewhere. Reload, then save again.",
 			dirtyConflict: "This route has unsaved edits and settings changed elsewhere. Save writes onto the latest document, or cancel first.",
 			presets: "Presets",
@@ -1496,15 +1573,19 @@ window.__ModuleLoader__.load({
 			errorOffOnly: "Off alone is not enough; declare at least one thinking level.",
 			errorBadWire: "Thinking levels need a wire spelling; only Off may be empty. Unknown effort keys are rejected.",
 			noModels: "This route has no models list yet. Add models on the Models page first.",
-			reload: "Reload"
+			reload: "Reload",
+			imageInput: "Accepts image input",
+			imageInputHint: "Check only if this model actually sees images. Over-claiming admits a picture into history, then the gateway rejects the turn.",
+			errorBadInput: "input may only list text and image, must include text, and must not be empty or duplicated. To drop vision, unset the key; do not write []."
 		};
 		//#endregion
 		//#region src/client/index.ts
 		const inject = [
 			"slots",
 			"locale",
-			"connection",
 			"remote",
+			"remote.llm",
+			"remote.settings",
 			"settingsScope",
 			"settingsSchema"
 		];
@@ -1530,7 +1611,6 @@ window.__ModuleLoader__.load({
 				en
 			}), `${PLUGIN_ID}: dictionaries`);
 			ctx.effect(() => mountPluginCss(), `${PLUGIN_ID}: css`);
-			const connection = ctx.get("connection");
 			const settingsSchema = ctx.settingsSchema;
 			const schema = bindSchema({
 				rehydrate: (serialized) => settingsSchema.rehydrate(serialized),
@@ -1581,7 +1661,8 @@ window.__ModuleLoader__.load({
 				label: () => t("nav"),
 				locale: NS,
 				inject: () => ({
-					api: connection.api,
+					llm: ctx.remote.llm,
+					settings: ctx.remote.settings,
 					describe,
 					schema,
 					subscribeInvalidate