@camstack/addon-model-studio 1.1.204 → 1.1.206

package/dist/model-studio.addon.js

@@ -5773,7 +5773,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-DXKLNFvA.mjs
+//#region ../types/dist/sleep-C16NCZR2.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -11150,6 +11150,19 @@ var ModelProviderIdSchema = _enum([
 	"custom"
 ]);
 /**
+* Resolve a catalog entry's picker provider. An explicit stamp always wins;
+* otherwise Frigate/Scrypted are recognised from id prefix or description.
+* Unstamped BYO registry rows fall through to `custom`. Family `yolov9` is
+* NOT a Scrypted signal — CamStack ships that family too.
+*/
+function inferModelProvider(entry) {
+	if (entry.provider !== void 0) return entry.provider;
+	const haystack = `${entry.id} ${entry.description ?? ""}`;
+	if (/scrypted/i.test(haystack)) return "scrypted";
+	if (/frigate/i.test(haystack)) return "frigate";
+	return "custom";
+}
+/**
 * The licence of a model, as a record rather than a bare SPDX string: a
 * permissive CODE licence routinely sits on top of restrictive WEIGHTS or
 * DATA, and the obligations (attribution, modification notices, source offers)
@@ -16549,6 +16562,12 @@ method(_void(), array(string()).readonly(), { auth: "admin" }), method(object({
 	kind: "mutation",
 	auth: "admin"
 });
+var HUB_ADDRESS_ROLES = [
+	"appConnections",
+	"notificationTaps",
+	"internal",
+	"publicEndpoint"
+];
 /**
 * Transport bounds for AI capability methods.
 *
@@ -20726,7 +20745,13 @@ var NcAlarmModeDelaysListSchema = array(object({
 	* Absent = false (logged, not sent). Even when true it is not sent when that same sensor
 	* is the one that starts the entry delay — the entry-delay notification already names it.
 	*/
-	notifySensorRewatched: boolean().optional()
+	notifySensorRewatched: boolean().optional(),
+	/**
+	* D735: notify "ignored" when a sensor this arm bypassed really MOVED while armed (its own
+	* change time is after the arm) and set nothing off. Absent = false (logged, not sent). A
+	* re-sync, a recovery from `unavailable` or a duplicate is never announced, switch or not.
+	*/
+	notifySensorIgnored: boolean().optional()
 })).max(8).refine(uniqueModes, { message: "modeDelays: at most one entry per arm mode" });
 var NcAlarmModeDelaysEditListSchema = array(object({
 	mode: AlarmArmModeSchema,
@@ -20739,7 +20764,9 @@ var NcAlarmModeDelaysEditListSchema = array(object({
 	/** D706: set the switch, or `null` to clear it (back to the default, false). */
 	notifyDuringEntryDelay: boolean().nullable().optional(),
 	/** D706: set the switch, or `null` to clear it (back to the default, false). */
-	notifySensorRewatched: boolean().nullable().optional()
+	notifySensorRewatched: boolean().nullable().optional(),
+	/** D735: set the switch, or `null` to clear it (back to the default, false). */
+	notifySensorIgnored: boolean().nullable().optional()
 })).max(8).refine(uniqueModes, { message: "modeDelays: at most one edit per arm mode" });
 /** One switch of the alarm table: put ONE device on, or take it off, ONE mode's list. */
 var NcAlarmNonBlockingEditSchema = object({
@@ -28491,6 +28518,14 @@ DeviceType.Camera, method(object({ deviceId: number().int().nonnegative() }), ar
 	*/
 	alive: boolean()
 })), method(object({
+	deviceId: number().int().nonnegative(),
+	sessionId: string(),
+	downlinkMbps: number().nonnegative()
+}), object({
+	outcome: _enum(["switching", "held"]),
+	tier: CamProfileSchema.nullable(),
+	reason: string()
+}), { kind: "mutation" }), method(object({
 	deviceId: number().int().nonnegative(),
 	sessionId: string()
 }), WebrtcSessionDebugSchema, { kind: "query" });
@@ -31166,7 +31201,8 @@ var ConnectionEndpointSchema = object({
 		"lan-ipv6",
 		"public",
 		"loopback",
-		"app-link"
+		"app-link",
+		"custom"
 	]),
 	/**
 	* Originating-interface kind — `lan`/`wifi`/`docker`/`vpn`/`other`/
@@ -31235,7 +31271,7 @@ var GetConnectionEndpointsResultSchema = object({
 	localPort: AdvertisedLocalPortSchema
 });
 /**
-* The address flagged for notification links. `baseUrl: null` = AUTO, which
+* The address flagged for notification taps (`notificationTaps`). `baseUrl: null` = AUTO, which
 * since D709 is the CamStack app link; `resolved` reports the effective value,
 * so the UI can show it either way.
 */
@@ -31269,13 +31305,12 @@ var ViewerEndpointsSchema = object({
 	resolved: array(string()).readonly()
 });
 /**
-* One audience's hub address (see `hub-address.ts`): the operator's stored
-* override, the address in use, and where it came from.
+* DEPRECATED compatibility shape of `getHubAddresses` (D729 amendment, kept
+* for addons built against it): `cluster` is the `internal` role, `browser`
+* the `publicEndpoint` role; `override` is the flagged address.
 */
 var HubAddressSnapshotSchema = object({
-	/** The operator's override, or null for automatic. */
 	override: string().nullable(),
-	/** The address in use, or null when nothing qualifies (never loopback). */
 	resolved: string().nullable(),
 	source: _enum([
 		"override",
@@ -31284,11 +31319,57 @@ var HubAddressSnapshotSchema = object({
 	])
 });
 var HubAddressesSchema = object({
-	/** "Hub address for agents" — agents' bundle/model pulls, LAN devices. */
 	cluster: HubAddressSnapshotSchema,
-	/** "Public address for sign-in links" — e-mail links, OIDC, WebAuthn, OAuth2. */
 	browser: HubAddressSnapshotSchema
 });
+/**
+* What an address is used for (`hub-address.ts`, D734). `appConnections` is
+* many-valued; `notificationTaps`, `publicEndpoint` and `internal` are carried
+* by at most one address.
+*/
+var HubAddressRoleSchema = _enum(HUB_ADDRESS_ROLES);
+var RoleSourceSchema = _enum([
+	"flagged",
+	"auto",
+	"none"
+]);
+/** One single-valued role: the flagged address, the one in use, and why. */
+var HubAddressRoleResolutionSchema = object({
+	/** The address carrying the flag, or null = automatic. */
+	flagged: string().nullable(),
+	/** The address in use, or null when nothing qualifies (never loopback). */
+	resolved: string().nullable(),
+	source: RoleSourceSchema
+});
+var HubAppConnectionsResolutionSchema = object({
+	/** The addresses flagged `appConnections`, or empty = automatic. */
+	flagged: array(string()).readonly(),
+	/** What the apps race right now. */
+	resolved: array(string()).readonly(),
+	source: RoleSourceSchema
+});
+var HubAddressBookSchema = object({
+	rows: array(ConnectionEndpointSchema.extend({
+		/** In the hub's detected palette right now. */
+		detected: boolean(),
+		/** Entered by the operator (removable). */
+		custom: boolean(),
+		/** The roles explicitly flagged on this address. */
+		flags: array(HubAddressRoleSchema).readonly(),
+		/** The roles this address serves right now — flagged or automatic. */
+		inUse: array(HubAddressRoleSchema).readonly(),
+		/** The roles this address may be flagged with. */
+		eligible: array(HubAddressRoleSchema).readonly()
+	})).readonly(),
+	roles: object({
+		appConnections: HubAppConnectionsResolutionSchema,
+		notificationTaps: HubAddressRoleResolutionSchema,
+		internal: HubAddressRoleResolutionSchema,
+		publicEndpoint: HubAddressRoleResolutionSchema
+	}),
+	/** The `hub=` an app link carries (D709), or null. */
+	appLinkHub: string().nullable()
+});
 var AllowedAddressesSchema = object({ 
 /**
 * Allowlist of interface addresses operators have explicitly opted
@@ -31332,16 +31413,27 @@ method(_void(), ListResultSchema), method(_void(), PreferredSchema), method(obje
 	*  tunnel always emits `https://` regardless. */
 	scheme: _enum(["http", "https"]).optional(),
 	/** Append the CamStack app link entry (`kind: 'app-link'`, D709) —
-	*  an address notification links can be flagged with, not a hub
+	*  an address notification taps can be flagged with, not a hub
 	*  route. Default `false`: racers and rankers never see it. */
 	includeAppLink: boolean().optional()
-}), GetConnectionEndpointsResultSchema), method(_void(), NotificationEndpointSchema), method(object({ baseUrl: string().nullable() }), NotificationEndpointSchema, { kind: "mutation" }), method(_void(), ViewerEndpointsSchema), method(object({ baseUrls: array(string()).readonly() }), ViewerEndpointsSchema, { kind: "mutation" }), method(_void(), HubAddressesSchema), method(object({
-	audience: _enum(["cluster", "browser"]),
-	baseUrl: string().nullable()
-}), HubAddressesSchema, {
+}), GetConnectionEndpointsResultSchema), method(_void(), NotificationEndpointSchema), method(object({ baseUrl: string().nullable() }), NotificationEndpointSchema, { kind: "mutation" }), method(_void(), ViewerEndpointsSchema), method(object({ baseUrls: array(string()).readonly() }), ViewerEndpointsSchema, { kind: "mutation" }), method(object({ scheme: _enum(["http", "https"]).optional() }).optional(), HubAddressBookSchema), method(object({
+	baseUrl: string(),
+	label: string().max(80)
+}), HubAddressBookSchema, {
 	kind: "mutation",
 	auth: "admin"
-}), method(_void(), AllowedAddressesSchema), method(AllowedAddressesSchema, object({ success: literal(true) }), { kind: "mutation" }), method(_void(), AllowedAddressesSchema, { kind: "mutation" }), method(_void(), TlsStatusSchema), method(object({ reason: string().optional() }), TlsStatusSchema, {
+}), method(object({ baseUrl: string() }), HubAddressBookSchema, {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	role: HubAddressRoleSchema,
+	baseUrl: string().nullable(),
+	enabled: boolean(),
+	acceptInsecureHttp: boolean().optional()
+}), HubAddressBookSchema, {
+	kind: "mutation",
+	auth: "admin"
+}), method(_void(), HubAddressesSchema), method(_void(), AllowedAddressesSchema), method(AllowedAddressesSchema, object({ success: literal(true) }), { kind: "mutation" }), method(_void(), AllowedAddressesSchema, { kind: "mutation" }), method(_void(), TlsStatusSchema), method(object({ reason: string().optional() }), TlsStatusSchema, {
 	kind: "mutation",
 	auth: "admin"
 }), method(object({
@@ -39868,12 +39960,24 @@ Object.freeze({
 		addonId: null,
 		access: "view"
 	},
+	"localNetwork.addCustomAddress": {
+		capName: "local-network",
+		capScope: "system",
+		addonId: null,
+		access: "create"
+	},
 	"localNetwork.downloadCa": {
 		capName: "local-network",
 		capScope: "system",
 		addonId: null,
 		access: "view"
 	},
+	"localNetwork.getAddresses": {
+		capName: "local-network",
+		capScope: "system",
+		addonId: null,
+		access: "view"
+	},
 	"localNetwork.getAllowedAddresses": {
 		capName: "local-network",
 		capScope: "system",
@@ -39928,6 +40032,12 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"localNetwork.removeCustomAddress": {
+		capName: "local-network",
+		capScope: "system",
+		addonId: null,
+		access: "delete"
+	},
 	"localNetwork.resetAllowlistToBestMatch": {
 		capName: "local-network",
 		capScope: "system",
@@ -39940,13 +40050,13 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
-	"localNetwork.setAllowedAddresses": {
+	"localNetwork.setAddressRole": {
 		capName: "local-network",
 		capScope: "system",
 		addonId: null,
 		access: "create"
 	},
-	"localNetwork.setHubAddress": {
+	"localNetwork.setAllowedAddresses": {
 		capName: "local-network",
 		capScope: "system",
 		addonId: null,
@@ -44200,6 +44310,12 @@ Object.freeze({
 		addonId: null,
 		access: "create"
 	},
+	"webrtcSession.applyDownlinkProbe": {
+		capName: "webrtc-session",
+		capScope: "device",
+		addonId: null,
+		access: "create"
+	},
 	"webrtcSession.closeSession": {
 		capName: "webrtc-session",
 		capScope: "device",
@@ -48122,6 +48238,11 @@ Object.freeze({
 		form: "single",
 		optional: false
 	}],
+	"webrtcSession.applyDownlinkProbe": [{
+		name: "deviceId",
+		form: "single",
+		optional: false
+	}],
 	"webrtcSession.closeSession": [{
 		name: "deviceId",
 		form: "single",
@@ -49390,6 +49511,35 @@ function buildModelConvertProvider(deps) {
 		};
 	} };
 }
+var CONTROL_CHARS = /[\u0000-\u001f\u007f]/;
+/** Whitespace runs collapse to one space; leading/trailing whitespace goes. */
+function parseDisplayName(raw) {
+	const name = raw.replace(/\s+/g, " ").trim();
+	if (name.length === 0) return { kind: "reset" };
+	if (CONTROL_CHARS.test(name)) return {
+		kind: "invalid",
+		reason: "The name contains control characters."
+	};
+	if (name.length > 80) return {
+		kind: "invalid",
+		reason: `The name is ${name.length} characters long; the limit is 80.`
+	};
+	return {
+		kind: "set",
+		name
+	};
+}
+/**
+* The optional display name typed on an import card: `undefined` when left
+* empty (the source's own default applies), the cleaned name otherwise.
+* Throws with the reason when the input is not acceptable.
+*/
+function optionalImportName(raw) {
+	if (raw === void 0) return void 0;
+	const parsed = parseDisplayName(raw);
+	if (parsed.kind === "invalid") throw new Error(`Display name rejected: ${parsed.reason}`);
+	return parsed.kind === "set" ? parsed.name : void 0;
+}
 //#endregion
 //#region src/model-registry.ts
 /**
@@ -49421,22 +49571,18 @@ function upsertAvailability(map, modelId, nodeId, entry) {
 	});
 }
 /**
-* Pure registry operations over the custom-model list. Kept side-effect-free
-* so they unit-test without a live `BaseAddon` context — the addon class is a
-* thin durable-state wrapper around these.
-*/
-/**
 * Insert or replace a descriptor keyed by `entry.id`. When the id already
 * exists, **formats are merged** (Scrypted multi-format accumulate) — sibling
 * formats on the prior entry are never dropped. Returns a new array.
 */
-function upsertCustomModel(list, descriptor) {
+function upsertCustomModel(list, descriptor, nameOrigin = "source") {
 	const prev = list.find((m) => m.entry.id === descriptor.entry.id);
 	const merged = prev === void 0 ? descriptor : {
 		stepId: descriptor.stepId,
 		entry: {
 			...prev.entry,
 			...descriptor.entry,
+			name: nameOrigin === "operator" ? descriptor.entry.name : prev.entry.name,
 			formats: {
 				...prev.entry.formats,
 				...descriptor.entry.formats
@@ -49445,6 +49591,43 @@ function upsertCustomModel(list, descriptor) {
 	};
 	return [...list.filter((m) => m.entry.id !== descriptor.entry.id), merged];
 }
+/**
+* Rename one IMPORTED registry row in place. Only `entry.name` changes — the
+* id, step, formats and every pin keyed by the id stay exactly as they were.
+* An empty name resets the row to the name it was imported with. Throws on an
+* unknown id, a CamStack catalog row, or a name `parseDisplayName` rejects.
+*/
+function renameCustomModel(list, importedNames, modelId, rawName) {
+	const row = list.find((m) => m.entry.id === modelId);
+	if (row === void 0) throw new Error(`renameCustomModel: model "${modelId}" is not registered`);
+	if (!isRenameableEntry(row.entry)) throw new Error(`renameCustomModel: "${modelId}" is a CamStack catalog model and keeps its name`);
+	const parsed = parseDisplayName(rawName);
+	if (parsed.kind === "invalid") throw new Error(`renameCustomModel: ${parsed.reason}`);
+	const original = importedNames[modelId] ?? row.entry.name;
+	const name = parsed.kind === "set" ? parsed.name : original;
+	const nextNames = { ...importedNames };
+	if (parsed.kind === "set" && name !== original) nextNames[modelId] = original;
+	else delete nextNames[modelId];
+	return {
+		list: list.map((m) => m.entry.id === modelId ? {
+			stepId: m.stepId,
+			entry: {
+				...m.entry,
+				name
+			}
+		} : m),
+		importedNames: nextNames,
+		name
+	};
+}
+/** An imported row can be renamed; a CamStack catalog model cannot. */
+function isRenameableEntry(entry) {
+	return inferModelProvider({
+		id: entry.id,
+		description: entry.description,
+		provider: entry.provider
+	}) !== "camstack";
+}
 /** Drop the descriptor with the given `entry.id`. Reports whether anything changed. */
 function removeCustomModel(list, modelId) {
 	const next = list.filter((m) => m.entry.id !== modelId);
@@ -50292,6 +50475,19 @@ var modelStudioActions = defineCustomActions({
 		clearedPins: number().int().nonnegative()
 	}), { kind: "mutation" }),
 	/**
+	* Rename an IMPORTED registry row (Frigate, Frigate+, Scrypted, uploads,
+	* conversions) in place. Only `entry.name` changes — never the id, so pins
+	* and availability are untouched. An empty name restores the name the model
+	* was imported with. CamStack catalog models are refused.
+	*/
+	renameCustomModel: customAction(object({
+		modelId: string().min(1),
+		name: string()
+	}), object({
+		modelId: string(),
+		name: string()
+	}), { kind: "mutation" }),
+	/**
 	* Delete one format of a Library model from one node. Keeps the registry row
 	* and sibling formats/nodes; clears only that availability chip.
 	*/
@@ -50380,6 +50576,8 @@ var modelStudioActions = defineCustomActions({
 	})),
 	importScryptedCatalogModel: customAction(object({
 		manifestId: string(),
+		/** Optional display name typed on the import card. */
+		name: string().optional(),
 		targetNodeId: string().optional()
 	}), CustomModelDescriptorSchema, { kind: "mutation" }),
 	/**
@@ -50409,7 +50607,8 @@ var modelStudioActions = defineCustomActions({
 		modelId: string().optional(),
 		name: string().optional(),
 		/**
-		* Native artifact class from the list row (`plusDownloadTraits`). The
+		* Native artifact class of the chosen build (`plusImportLane`: neural →
+		* onnx, coral → tflite). The
 		* model-detail API does not always carry `supportedDetectors`, so the
 		* browser passes what the catalog already knew (fixes ssd/yolo-generic
 		* EdgeTPU rows that `plusTypeTraits` alone would call onnx).
@@ -50461,6 +50660,8 @@ var modelStudioActions = defineCustomActions({
 //#region src/model-studio.addon.ts
 var KEY_CUSTOM_MODELS = "customModels";
 var KEY_AVAILABILITY = "availability";
+var KEY_IMPORTED_NAMES = "importedNames";
+var ImportedNamesSchema = record(string(), string());
 var CustomModelsSchema = array(CustomModelDescriptorSchema);
 var pythonDirCache;
 function resolveAddonPythonDir() {
@@ -50523,12 +50724,18 @@ function spawnRunConvert(jobPath, pythonPath, onProgress, _sessionId) {
 		});
 	});
 }
+/** A name the operator typed replaces an existing row's name; a derived one never does. */
+function nameOriginOf(operatorName) {
+	return operatorName !== void 0 ? { nameOrigin: "operator" } : {};
+}
 /** Global-fetch adapter for the injected Frigate+ client seam. */
 var plusFetch = async (url, init) => fetch(url, init);
 var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 	id = "model-studio";
 	modelsState = null;
 	availabilityState = null;
+	/** modelId → the name a renamed registry row had before its first rename. */
+	importedNamesState = null;
 	/** Lazily-built chunked-upload store (hub only) — see `upload/model-upload-store.ts`. */
 	uploadStore = null;
 	/**
@@ -50611,6 +50818,7 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 		const state = this.state(KEY_CUSTOM_MODELS, CustomModelsSchema, []);
 		this.modelsState = state;
 		this.availabilityState = this.state(KEY_AVAILABILITY, ModelAvailabilityMapSchema, {});
+		this.importedNamesState = this.state(KEY_IMPORTED_NAMES, ImportedNamesSchema, {});
 		const rawNode = this.ctx.kernel?.localNodeId ?? "hub";
 		const isHub = (rawNode.includes("/") ? rawNode.split("/")[0] : rawNode) === "hub";
 		const pagesProvider = {
@@ -50644,7 +50852,11 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 					return result;
 				},
 				abortModelUpload: async (input) => (await this.getUploadStore()).abort(input),
-				registerCustomModel: async (input) => this.registerCustomModel(input, { ensureEngines: true }),
+				registerCustomModel: async (input) => this.registerCustomModel(input, {
+					ensureEngines: true,
+					nameOrigin: "operator"
+				}),
+				renameCustomModel: async (input) => this.renameCustomModel_(input),
 				ensureFormatsThenDistribute: async (input) => this.ensureFormatsThenDistribute_(input.modelId),
 				ensureModelFormats: async (input) => this.ensureModelFormats_(input.modelId, input.formats),
 				removeCustomModel: async (input) => this.removeCustomModel(input),
@@ -50796,6 +51008,35 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 		if (!this.modelsState) throw new Error("ModelStudioAddon: durable state not initialized");
 		return this.modelsState;
 	}
+	get importedNames_() {
+		if (!this.importedNamesState) throw new Error("ModelStudioAddon: imported-names state not initialized");
+		return this.importedNamesState;
+	}
+	/**
+	* Rename an imported registry row in place (`renameCustomModel` decides).
+	* The id is untouched, so pins, availability and files are unaffected; the
+	* pipeline's catalog view picks the new name up on its next registry read.
+	*/
+	async renameCustomModel_(input) {
+		const names = await this.importedNames_.get();
+		const outcome = {};
+		await this.state_.update((prev) => {
+			const renamed = renameCustomModel(prev, names, input.modelId, input.name);
+			outcome.result = renamed;
+			return renamed.list;
+		});
+		const result = outcome.result;
+		if (result === void 0) throw new Error("renameCustomModel: registry update did not run");
+		await this.importedNames_.set(result.importedNames);
+		this.ctx.logger.info("Renamed custom model", { meta: {
+			modelId: input.modelId,
+			name: result.name
+		} });
+		return {
+			modelId: input.modelId,
+			name: result.name
+		};
+	}
 	get availability_() {
 		if (!this.availabilityState) throw new Error("ModelStudioAddon: availability state not initialized");
 		return this.availabilityState;
@@ -50917,6 +51158,7 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 	* `targetNodeId` lands the HF URL on that node via download-on-target.
 	*/
 	async importScryptedCatalogFromManifest(input) {
+		const name = optionalImportName(input.name);
 		const entry = getScryptedManifestEntry(input.manifestId);
 		if (!entry) throw new Error(`importScryptedCatalogModel: unknown manifest id "${input.manifestId}"`);
 		let drift;
@@ -50936,8 +51178,15 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 			};
 		}
 		if (drift.status !== "ok") throw new Error(`importScryptedCatalogModel: entry "${entry.id}" is blocked by drift (${drift.status}${drift.details ? `: ${drift.details}` : ""})`);
-		const descriptor = buildScryptedRegistryDescriptor(entry);
-		await this.registerCustomModel(descriptor);
+		const built = buildScryptedRegistryDescriptor(entry);
+		const descriptor = name !== void 0 ? {
+			stepId: built.stepId,
+			entry: {
+				...built.entry,
+				name
+			}
+		} : built;
+		await this.registerCustomModel(descriptor, nameOriginOf(name));
 		if (input.targetNodeId !== void 0 && input.targetNodeId.length > 0) await this.distributeModel({
 			modelId: descriptor.entry.id,
 			nodeId: input.targetNodeId,
@@ -50959,11 +51208,12 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 	async importFrigateCatalogModel(input) {
 		const cat = FRIGATE_PUBLIC_CATALOG.find((c) => c.id === input.catalogId);
 		if (!cat) throw new Error(`importFrigateCatalogModel: unknown catalog id "${input.catalogId}"`);
+		const name = optionalImportName(input.name);
 		const descriptor = buildFrigateCatalogDescriptor(input.catalogId, {
 			...input.modelId !== void 0 ? { modelId: input.modelId } : {},
-			...input.name !== void 0 ? { name: input.name } : {}
+			...name !== void 0 ? { name } : {}
 		});
-		await this.registerCustomModel(descriptor);
+		await this.registerCustomModel(descriptor, nameOriginOf(name));
 		let bytes = Math.round(cat.sizeMB * 1e6);
 		if (input.targetNodeId !== void 0 && input.targetNodeId.length > 0) {
 			const landed = await this.distributeModel({
@@ -50994,6 +51244,7 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 	*/
 	async importFrigatePlusModel(input) {
 		const modelId = frigatePlusRegistryId(input.plusModelId);
+		const operatorName = optionalImportName(input.name);
 		const key = this.config.frigatePlusApiKey ?? "";
 		const { info, downloadUrl } = await requestPlusModelDownload(plusFetch, key, input.plusModelId);
 		const typeTraits = plusTypeTraits(info.type);
@@ -51018,12 +51269,15 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 		const sha256 = await ModelStudioAddon.fileSha256(destPath);
 		const descriptor = plusInfoToDescriptor(info, {
 			modelId,
-			name: input.name?.trim() || `Frigate+ ${info.type} (${input.plusModelId.slice(0, 8)})`,
+			name: operatorName ?? `Frigate+ ${info.type} (${input.plusModelId.slice(0, 8)})`,
 			filename,
 			sizeMB: Number((bytes / 1e6).toFixed(1)),
 			...input.format !== void 0 ? { format: input.format } : {}
 		});
-		await this.registerCustomModel(descriptor, { ensureEngines: false });
+		await this.registerCustomModel(descriptor, {
+			ensureEngines: false,
+			...nameOriginOf(operatorName)
+		});
 		await this.availability_.update((prev) => upsertAvailability(prev, modelId, "hub", {
 			format: traits.format,
 			sha256,
@@ -51056,7 +51310,7 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 	async registerCustomModel(input, opts = {}) {
 		if (!input.stepId.trim()) throw new Error("registerCustomModel: stepId is required");
 		if (!input.entry.id.trim()) throw new Error("registerCustomModel: entry.id is required");
-		await this.state_.update((prev) => upsertCustomModel(prev, input));
+		await this.state_.update((prev) => upsertCustomModel(prev, input, opts.nameOrigin));
 		this.ctx.logger.info("Registered custom model", { meta: {
 			modelId: input.entry.id,
 			stepId: input.stepId
@@ -51313,6 +51567,7 @@ var ModelStudioAddon = class ModelStudioAddon extends BaseAddon {
 			removed = result.removed;
 			return result.next;
 		});
+		await this.importedNames_.update((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => id !== input.modelId)));
 		this.ctx.logger.info("Removed custom model", { meta: {
 			modelId: input.modelId,
 			removed,