@linxin666/dsh-remote-web-ui 0.3.0 → 0.3.2

package/lib/index.js

@@ -2025,6 +2025,7 @@ function fieldsOf(model, includeId) {
 	return fields;
 }
 function groupFor(catalog, provider) {
+	if (catalog.failures.some((failure) => failure.id === provider)) return void 0;
 	return catalog.groups.find((group) => group.id === provider);
 }
 async function readCatalog(apiProxy) {
@@ -2077,11 +2078,45 @@ async function eligibleProvider(apiProxy, requested) {
 		profile
 	} };
 }
+function validIdentifier(value) {
+	const parsed = stringField(MAX_IDENTIFIER_LENGTH).safeParse(value);
+	return parsed.success && parsed.data === value;
+}
+function configuredModels(profile) {
+	if (!Object.hasOwn(profile, "models")) return { inherited: true };
+	if (!Array.isArray(profile.models)) return void 0;
+	if (profile.models.length === 0) return { inherited: true };
+	const values = [];
+	for (const entry of profile.models) {
+		if (!isRecord(entry) || !validIdentifier(entry.id)) return void 0;
+		values.push({ ...entry });
+	}
+	return {
+		inherited: false,
+		values
+	};
+}
+function configuredOverrides(profile) {
+	if (!Object.hasOwn(profile, "modelOverrides")) return {
+		present: false,
+		values: /* @__PURE__ */ new Map()
+	};
+	if (!isRecord(profile.modelOverrides)) return void 0;
+	const values = /* @__PURE__ */ new Map();
+	for (const [id, value] of Object.entries(profile.modelOverrides)) {
+		if (!validIdentifier(id) || !isRecord(value)) return void 0;
+		values.set(id, { ...value });
+	}
+	return {
+		present: true,
+		values
+	};
+}
 function updatedModels(existing, model) {
-	const next = existing.map((entry) => isRecord(entry) ? { ...entry } : entry);
-	const index = next.findIndex((entry) => isRecord(entry) && entry.id === model.id);
+	const next = existing.map((entry) => ({ ...entry }));
+	const index = next.findIndex((entry) => entry.id === model.id);
 	const patch = fieldsOf(model, true);
-	if (index >= 0 && isRecord(next[index])) next[index] = {
+	if (index >= 0) next[index] = {
 		...next[index],
 		...patch
 	};
@@ -2089,40 +2124,68 @@ function updatedModels(existing, model) {
 	return next;
 }
 function mutationPlan(profile, provider, model, catalog) {
-	if (Array.isArray(profile.models)) return {
-		path: [
-			"providers",
-			provider,
-			"models"
-		],
-		value: updatedModels(profile.models, model)
-	};
+	const configured = configuredModels(profile);
+	const overrides = configuredOverrides(profile);
+	if (configured === void 0 || overrides === void 0) return void 0;
+	const modelsPath = [
+		"providers",
+		provider,
+		"models"
+	];
+	const overridesPath = [
+		"providers",
+		provider,
+		"modelOverrides"
+	];
+	if (!configured.inherited) {
+		if (overrides.values.size > 0) return void 0;
+		const ops = [{
+			op: "set",
+			path: modelsPath,
+			value: updatedModels(configured.values, model)
+		}];
+		if (overrides.present) ops.push({
+			op: "unset",
+			path: overridesPath
+		});
+		return { ops };
+	}
 	const group = groupFor(catalog, provider);
 	if (group?.models.some((entry) => entry.id === model.id) === true) {
-		const current = (isRecord(profile.modelOverrides) ? profile.modelOverrides : void 0)?.[model.id];
-		const existing = isRecord(current) ? current : {};
-		return {
-			path: [
-				"providers",
-				provider,
-				"modelOverrides",
-				model.id
-			],
+		const existing = overrides.values.get(model.id) ?? {};
+		return { ops: [{
+			op: "set",
+			path: [...overridesPath, model.id],
 			value: {
 				...existing,
 				...fieldsOf(model, false)
 			}
-		};
+		}] };
+	}
+	if (group === void 0) return void 0;
+	const materialized = [];
+	const materializedIds = /* @__PURE__ */ new Set();
+	for (const installed of group.models) {
+		materialized.push({
+			...overrides.values.get(installed.id),
+			id: installed.id
+		});
+		materializedIds.add(installed.id);
 	}
-	if (group === void 0 || catalog.failures.some((failure) => failure.id === provider)) return void 0;
-	return {
-		path: [
-			"providers",
-			provider,
-			"models"
-		],
-		value: [...group.models.map((entry) => ({ id: entry.id })), fieldsOf(model, true)]
-	};
+	for (const [id, override] of overrides.values) if (!materializedIds.has(id)) materialized.push({
+		...override,
+		id
+	});
+	const ops = [{
+		op: "set",
+		path: modelsPath,
+		value: updatedModels(materialized, model)
+	}];
+	if (overrides.present) ops.push({
+		op: "unset",
+		path: overridesPath
+	});
+	return { ops };
 }
 function paired(req, service) {
 	const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
@@ -2214,11 +2277,7 @@ function makePairedModelCatalogRoutes(deps) {
 			mutation = await apiProxy.settings.mutate(request$1({
 				ns: "llm-pi-ai",
 				expectedRevision: eligible.provider.namespace.revision,
-				ops: [{
-					op: "set",
-					path: plan.path,
-					value: plan.value
-				}]
+				ops: plan.ops
 			}));
 		} catch {
 			return reject(res, 502, `model update failed for provider ${body.provider}`);

package/lib/mobile.js

@@ -15627,9 +15627,9 @@ function DirectoryBrowser({ onCancel, onPick }) {
 					type: "button",
 					className: `mobile-row dir-entry ${entry.hidden ? "dir-entry-hidden" : ""}`,
 					onClick: () => setPath(entry.path),
-					children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", {
 						className: "mobile-rowTitle",
-						children: ["📁 ", entry.name]
+						children: entry.name
 					})
 				}) }, entry.path))
 			}),