@camstack/addon-mqtt-broker 1.2.150 → 1.2.152

package/dist/mqtt-broker.addon.mjs

@@ -6021,7 +6021,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-BaWhXZFm.mjs
+//#region ../types/dist/sleep-BX_MqzUe.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -6621,7 +6621,7 @@ var NOT_RUN = {
 * throws: an unreachable or refusing engine is logged and reported `declared: false`,
 * because the hub (and this addon's boot) must not hang on a migration.
 */
-async function runAddonMigrations(host, migrations, logger) {
+async function runAddonMigrations(host, migrations, logger, options = {}) {
 	const first = migrations[0];
 	if (first === void 0) return NOT_RUN;
 	const owner = first.meta.owner;
@@ -6650,7 +6650,9 @@ async function runAddonMigrations(host, migrations, logger) {
 		else if (status === "blocked") blocked.push(id);
 		else skipped.push(id);
 	};
+	const selected = options.only === void 0 ? null : new Set(options.only);
 	for (const step of declaration.steps) {
+		if (selected !== null && !selected.has(step.id)) continue;
 		const bound = byId.get(step.id);
 		if (bound === void 0 || step.action === "skip") {
 			skipped.push(step.id);
@@ -6828,6 +6830,12 @@ function projectStore(store, perNodeKeys, nodeId) {
 	}
 	return out;
 }
+/** Every scope, in the order the guard and the docs list them. */
+var SCOPED_SETTINGS_SCOPES = [
+	"cluster",
+	"device-defaults",
+	"node"
+];
 /**
 * The address of one keychain value: `secret://<owner>/<scope>/<fieldPath>`.
 *
@@ -7642,6 +7650,28 @@ var SECRET_RETRY_MAX_MS = 5 * 6e4;
 /** Coalesces a burst of `keychain.changed` events into one re-resolve. */
 var SECRET_CHANGE_DEBOUNCE_MS = 250;
 /**
+* Pair a catalogue with the function that builds its ports FROM THE MIGRATION API. The one
+* place a catalogue is bound: a migration reaches nothing a ports binder cannot reach
+* through `api` (guard `check-migration-ports-surface`).
+*/
+function migrationSet(catalogue, bindPorts) {
+	return { bind: (api) => defineAddonMigrations(catalogue, bindPorts(api)) };
+}
+/** A mixed array is a mistake: the other kind would be dropped without a word. */
+function refuseMixed(form, kept, dropped) {
+	if (dropped > 0) throw new Error(`runMigrations(${form}): ${dropped} of ${kept + dropped} entries are of the other kind and would be dropped; pass one kind per call`);
+}
+function catalogueOf(list) {
+	const kept = list.filter((entry) => !("execute" in entry));
+	refuseMixed("catalogue, (api) => ports", kept.length, list.length - kept.length);
+	return kept;
+}
+function boundOf(list) {
+	const kept = list.filter((entry) => "execute" in entry);
+	refuseMixed("bound migrations", kept.length, list.length - kept.length);
+	return kept;
+}
+/**
 * Base class for CamStack addons. Eliminates settings boilerplate:
 *
 * - Typed `config` property with automatic resolution from store + defaults
@@ -7719,6 +7749,13 @@ var BaseAddon = class {
 	*/
 	secretStatePaths = [];
 	_addonSecretTree = null;
+	/**
+	* D986 M4: the scoped schemas this addon declared, resolved once per capability
+	* (`loadScopedSchemas`) so the sync readers (`perNodeKeys`, the secret tree, the restart check)
+	* see them. Empty until loaded: the readers then fall back to {@link globalSettingsSchema}.
+	*/
+	_scopedByCap = /* @__PURE__ */ new Map();
+	_nodeKeysByCap = /* @__PURE__ */ new Map();
 	_deviceSecretTree = null;
 	/** Refs the last resolved config pointed at — a change to one re-resolves. */
 	_configSecretRefs = /* @__PURE__ */ new Set();
@@ -7788,6 +7825,7 @@ var BaseAddon = class {
 			this._ctx = context;
 			this._secretSettings = null;
 		}
+		await this.loadScopedSchemas();
 		await this.resolveConfig();
 		if (secrets !== void 0) this._secretChangeUnsub = secrets.onChange((ref) => {
 			if (this._configSecretRefs.has(ref)) this.scheduleSecretReresolve(SECRET_CHANGE_DEBOUNCE_MS);
@@ -7797,27 +7835,30 @@ var BaseAddon = class {
 		const normalized = normalizeAddonInitResult(result);
 		const providers = normalized && "providers" in normalized && normalized.providers ? normalized.providers : [];
 		this._registeredCapNames = providers.map((p) => p.capability.name);
+		await this.loadScopedSchemas();
 		return normalized;
 	}
+	async runMigrations(first, second, third) {
+		if (typeof second === "function") return this.runMigrationSets([migrationSet(catalogueOf(first), second)], third);
+		return this.runBound(boundOf(first), second);
+	}
 	/**
-	* Run this addon's migration catalogue (D987 M3) through the hub's `migrations`
-	* engine. Call it at the point of the boot where the data must already have the new
-	* shape — `onInitialize`, or `onRestoreDevices` for a migration that needs the
-	* restored devices — with the catalogue bound to the addon's ports
-	* (`defineAddonMigrations(ADDON_MIGRATIONS, ports)`).
-	*
-	* An engine that cannot be reached or refuses the catalogue is logged and runs
-	* nothing; the boot continues. A migration that FAILED (or was blocked by one)
-	* and declares `onFailure: 'block-owner'` makes this throw, so the addon does not
-	* serve data whose shape it cannot trust; `tolerate` migrations never do.
+	* Several catalogues of ONE owner in one declaration (the engine replaces an owner's
+	* catalogue on every declare, so two calls would each judge the other's ids "newer").
+	* Build each entry with `migrationSet(catalogue, (api) => ports)`.
 	*/
-	async runMigrations(migrations) {
+	async runMigrationSets(sets, options) {
+		const api = this.ctx.migrationApi;
+		if (api === void 0) throw new Error(`${this.ctx.id}: the migration API is not available on this context`);
+		return this.runBound(sets.flatMap((set) => set.bind(api)), options);
+	}
+	async runBound(migrations, options) {
 		const api = this.ctx.api.migrations;
 		const report = await runAddonMigrations({
 			declareOwner: (input) => api.declareOwner.mutate(input),
 			startMigration: (input) => api.startMigration.mutate(input),
 			finishMigration: (input) => api.finishMigration.mutate(input)
-		}, migrations, this.ctx.logger);
+		}, migrations, this.ctx.logger, options);
 		if (report.blockOwner.length > 0) throw new AddonMigrationsBlockedError(report.blockOwner);
 		return report;
 	}
@@ -7881,6 +7922,16 @@ var BaseAddon = class {
 	schema(schema) {
 		return schema;
 	}
+	/**
+	* The capability names whose scoped settings schemas ({@link clusterSettingsSchema},
+	* {@link nodeSettingsSchema}, {@link deviceDefaultsSchema}) this addon declares. Read BEFORE
+	* `onInitialize`, when the providers it registers are not known yet: the first config resolve
+	* must already know which keys are per node. Names the providers register at init are added
+	* once known.
+	*/
+	scopedSettingsCapabilities() {
+		return [];
+	}
 	/** Override to provide global-level settings UI schema. */
 	globalSettingsSchema(_cap) {
 		return null;
@@ -7924,7 +7975,8 @@ var BaseAddon = class {
 		return [];
 	}
 	async getGlobalSettings(overlay, cap, nodeId) {
-		const schema = this.globalSettingsSchema(cap);
+		await this.loadScopedSchemas(cap);
+		const schema = this.globalSettingsSchema(cap) ?? this.scopedFormSchema(cap);
 		if (!schema) return { sections: [] };
 		const projected = await this.readRawProjectedStore(nodeId, cap);
 		return hydrateSchema(schema, overlay ? await this.overlayKeepingMarkers(projected, overlay) : projected, { inlineSecretsAsViews: true });
@@ -7959,10 +8011,9 @@ var BaseAddon = class {
 	*
 	* Override it only when an `instanceMode: multiple` addon's instances differ: an NVR integration
 	* needs its connection fields, the default integration the addon's own sections. It is the
-	* SHAPE of the form only — the values live in `integrations.getSettings`, and the write path is
-	* unchanged (`integrations.setSettings` for an account integration).
+	* SHAPE of the form only — the values live on the instance record.
 	*/
-	async integrationSettingsSchema(_instance) {
+	async integrationFormSchema(_instance) {
 		return null;
 	}
 	/**
@@ -8008,7 +8059,7 @@ var BaseAddon = class {
 	* per-instance schema when it declares one, else its global schema (what they always showed).
 	*/
 	async getIntegrationFormSchema(instance, nodeId) {
-		const scoped = await this.integrationSettingsSchema(instance);
+		const scoped = await this.integrationFormSchema(instance);
 		if (scoped === null) return this.getGlobalSettings(void 0, void 0, nodeId);
 		return hydrateSchema(scoped, {}, { inlineSecretsAsViews: true });
 	}
@@ -8056,6 +8107,7 @@ var BaseAddon = class {
 	* resolved blob back is a no-op for every unchanged secret.
 	*/
 	async resolveGlobalStore(nodeId, cap) {
+		await this.loadScopedSchemas(cap);
 		const raw = await this._ctx?.settings?.readAddonStore() ?? {};
 		return this.projectForNode(raw, nodeId, cap);
 	}
@@ -8066,6 +8118,7 @@ var BaseAddon = class {
 	}
 	/** The PROJECTED store with its markers — the form hydrate only (D798). */
 	async readRawProjectedStore(nodeId, cap) {
+		await this.loadScopedSchemas(cap);
 		const raw = await this.rawSettings()?.readAddonStore() ?? {};
 		return this.projectForNode(raw, nodeId, cap);
 	}
@@ -8168,6 +8221,7 @@ var BaseAddon = class {
 		await this.applyGlobalPatch(patch, nodeId);
 	}
 	async applyGlobalPatch(barePatch, nodeId) {
+		await this.loadScopedSchemas();
 		const keys = this.perNodeKeys();
 		const localNode = normalizeNodeId(this._ctx?.kernel?.localNodeId);
 		const target = normalizeNodeId(nodeId ?? this._ctx?.kernel?.localNodeId);
@@ -8181,7 +8235,8 @@ var BaseAddon = class {
 		await this.resolveConfig();
 		await this.onConfigChanged();
 		this.emitLifecycle(EventCategory.AddonUpdated, { level: "global" });
-		this.maybeAutoRestart(Object.keys(barePatch), this.globalSettingsSchema());
+		const legacy = this.globalSettingsSchema();
+		this.maybeAutoRestart(Object.keys(barePatch), [...legacy === null ? [] : [legacy], ...this.loadedScopedSchemas().map((entry) => entry.schema)]);
 	}
 	/**
 	* The set of field keys the global settings schema declares `perNode: true`
@@ -8189,14 +8244,67 @@ var BaseAddon = class {
 	* declarations). Empty set ⇒ every per-node code path is bypassed and the
 	* settings API behaves exactly like the legacy node-agnostic one.
 	*/
-	_perNodeKeysCache = /* @__PURE__ */ new Map();
+	/**
+	* Load the scoped schemas of every capability this addon declares (the override and the
+	* providers registered at init, plus `extraCap`) that is not loaded yet, then drop what was
+	* derived from the previous set. Idempotent.
+	*/
+	async loadScopedSchemas(extraCap) {
+		const caps = new Set([
+			...this.scopedSettingsCapabilities(),
+			...this._registeredCapNames,
+			...extraCap === void 0 ? [] : [extraCap]
+		]);
+		let added = false;
+		for (const cap of caps) {
+			if (this._scopedByCap.has(cap)) continue;
+			const loaded = [];
+			for (const scope of SCOPED_SETTINGS_SCOPES) {
+				const schema = await this.getScopedSettingsSchema(scope, cap);
+				if (schema !== null) loaded.push({
+					scope,
+					schema
+				});
+			}
+			this._scopedByCap.set(cap, loaded);
+			added = true;
+		}
+		if (!added) return;
+		this._nodeKeysByCap = /* @__PURE__ */ new Map();
+		this._addonSecretTree = null;
+	}
+	/**
+	* The form the settings API serves while an addon declares no {@link globalSettingsSchema}: the
+	* sections of its scoped schemas, so dropping the old hook does not blank the form.
+	*/
+	scopedFormSchema(cap) {
+		const byId = /* @__PURE__ */ new Map();
+		for (const entry of this.loadedScopedSchemas(cap)) for (const section of entry.schema.sections) if (!byId.has(section.id)) byId.set(section.id, section);
+		return byId.size === 0 ? null : { sections: [...byId.values()] };
+	}
+	/** Every loaded scoped schema of `cap`, or of every loaded capability. */
+	loadedScopedSchemas(cap) {
+		if (cap !== void 0) return this._scopedByCap.get(cap) ?? [];
+		return [...this._scopedByCap.values()].flat();
+	}
+	/**
+	* The field keys that are stored per node: every field of a {@link nodeSettingsSchema}, plus
+	* the fields the legacy {@link globalSettingsSchema} still marks `perNode: true`. Derived once
+	* per `cap` argument and memoized (schemas are static declarations). Empty set ⇒ every
+	* per-node code path is bypassed and the settings API behaves like the node-agnostic one.
+	* Call {@link loadScopedSchemas} first (the async seams do).
+	*/
 	perNodeKeys(cap) {
 		const cacheKey = cap ?? "";
-		const cached = this._perNodeKeysCache.get(cacheKey);
+		const cached = this._nodeKeysByCap.get(cacheKey);
 		if (cached) return cached;
-		const schema = this.globalSettingsSchema(cap);
-		const keys = new Set(schema ? schema.sections.flatMap((section) => collectPerNodeFieldKeys(section.fields)) : []);
-		this._perNodeKeysCache.set(cacheKey, keys);
+		const legacy = this.globalSettingsSchema(cap);
+		const keys = new Set(legacy ? legacy.sections.flatMap((section) => collectPerNodeFieldKeys(section.fields)) : []);
+		for (const { scope, schema } of this.loadedScopedSchemas(cap)) {
+			if (scope !== "node") continue;
+			for (const section of schema.sections) for (const key of collectValueFieldKeys(section.fields)) keys.add(key);
+		}
+		this._nodeKeysByCap.set(cacheKey, keys);
 		return keys;
 	}
 	/**
@@ -8206,10 +8314,9 @@ var BaseAddon = class {
 	* time to return its response before the addon is torn down and
 	* re-initialised by `AddonRegistryService.restartAddon`.
 	*/
-	maybeAutoRestart(patchKeys, schema) {
-		if (!schema) return;
+	maybeAutoRestart(patchKeys, schemas) {
 		const restartKeys = /* @__PURE__ */ new Set();
-		for (const section of schema.sections) for (const field of section.fields) {
+		for (const schema of schemas) for (const section of schema.sections) for (const field of section.fields) {
 			if (field.type === "separator" || field.type === "info") continue;
 			if (field.requiresRestart) restartKeys.add(field.key);
 		}
@@ -8405,12 +8512,14 @@ var BaseAddon = class {
 	* here, in the addon's own process, so the hub keeps no copy of it.
 	*/
 	async getDeclaredSettingsKeys() {
+		await this.loadScopedSchemas();
 		return { keys: [...this.declaredKeySet()].toSorted() };
 	}
 	declaredKeySet() {
 		const keys = new Set(Object.keys(this.defaults));
 		const schema = this.globalSettingsSchema();
 		if (schema) for (const section of schema.sections) for (const key of collectFieldKeys(section.fields)) keys.add(key);
+		for (const { schema: scoped } of this.loadedScopedSchemas()) for (const section of scoped.sections) for (const key of collectFieldKeys(section.fields)) keys.add(key);
 		for (const key of this._declaredStateKeys) keys.add(key);
 		for (const path of this.secretStatePaths) {
 			const root = path.split(/[.[]/, 1)[0];
@@ -8506,7 +8615,11 @@ var BaseAddon = class {
 	}
 	/** The addon store's secret tree: schema fields by TYPE, plus `secretStatePaths`. */
 	addonSecretTree() {
-		this._addonSecretTree ??= mergeSecretStatePaths(secretTreeFromSchema(this.globalSettingsSchema()), this.secretStatePaths);
+		if (this._addonSecretTree === null) {
+			const tree = new Map(secretTreeFromSchema(this.globalSettingsSchema()));
+			for (const { schema } of this.loadedScopedSchemas()) for (const [key, node] of secretTreeFromSchema(schema)) tree.set(key, node);
+			this._addonSecretTree = mergeSecretStatePaths(tree, this.secretStatePaths);
+		}
 		return this._addonSecretTree;
 	}
 	deviceSecretTree() {
@@ -8756,6 +8869,23 @@ function dropPerNodeFields(fields) {
 	}
 	return kept;
 }
+/** The keys of the value-holding fields, recursing into layout containers. */
+function collectValueFieldKeys(fields) {
+	const collected = [];
+	for (const field of fields) {
+		if (field.type === "group") {
+			collected.push(...collectValueFieldKeys(field.fields));
+			continue;
+		}
+		if (field.type === "sub-tabs") {
+			for (const tab of field.tabs) collected.push(...collectValueFieldKeys(tab.fields));
+			continue;
+		}
+		if (field.type === "separator" || field.type === "info") continue;
+		if ("key" in field && typeof field.key === "string") collected.push(field.key);
+	}
+	return collected;
+}
 function collectFieldKeys(fields) {
 	const collected = [];
 	for (const field of fields) {
@@ -9282,6 +9412,7 @@ function defineEntryKind(name, spec) {
 		class: "config",
 		writeTrigger: spec.writeTrigger ?? "an operator adds or edits an entry in the entries UI",
 		retention: { none: "an entry goes only when the operator deletes it" },
+		...spec.maxDataBytes === void 0 ? {} : { maxDataBytes: spec.maxDataBytes },
 		...spec.database === void 0 ? {} : { database: spec.database },
 		...spec.indexes === void 0 ? {} : { indexes: spec.indexes },
 		...spec.secretArrayKeys === void 0 ? {} : { secretArrayKeys: spec.secretArrayKeys },
@@ -11947,7 +12078,7 @@ object({
 	params: record(string(), union([string(), number()])).optional()
 });
 //#endregion
-//#region ../types/dist/composition-CRNwcFYY.mjs
+//#region ../types/dist/composition-pOHbTzRB.mjs
 /**
 * The ffmpeg build every CamStack node downloads, per platform and arch.
 *
@@ -13428,7 +13559,7 @@ var RecordIntegrationInstances = class {
 		return record === null ? null : this.viewOf(record);
 	};
 	/** Insert ONE row (`ifRev: 0`: an existing id is refused, never overwritten). */
-	createInstance = async ({ id, name, kind }) => {
+	createInstance = async ({ id, name, kind, values }) => {
 		const minted = id ?? this.hooks.mintId?.({
 			name,
 			...kind !== void 0 ? { kind } : {}
@@ -13438,10 +13569,20 @@ var RecordIntegrationInstances = class {
 			id: minted,
 			data: this.hooks.initialBody(name, kind)
 		}, { ifRev: 0 });
+		const patch = this.patchOf(values ?? {});
+		if (Object.keys(patch).length > 0) await this.handle.patch(minted, patch);
 		await this.hooks.onChanged?.(minted, "created");
 		return { id: minted };
 	};
 	updateInstance = async ({ id, name, values }) => {
+		const patch = this.patchOf(values);
+		if (name !== void 0) patch[this.nameField] = name;
+		await this.handle.patch(id, patch);
+		await this.hooks.onChanged?.(id, "updated");
+		return { ok: true };
+	};
+	/** The record patch a form `values` object means: secrets kept, cleared or replaced. */
+	patchOf(values) {
 		const patch = {};
 		for (const [key, value] of Object.entries(values)) {
 			if (value === void 0) continue;
@@ -13452,11 +13593,8 @@ var RecordIntegrationInstances = class {
 			else if (isSecretClear(value)) patch[key] = null;
 			else if (typeof value === "string" && value !== "" && value !== "__camstack_redacted__" && !isSecretFieldView(value)) patch[key] = value;
 		}
-		if (name !== void 0) patch[this.nameField] = name;
-		await this.handle.patch(id, patch);
-		await this.hooks.onChanged?.(id, "updated");
-		return { ok: true };
-	};
+		return patch;
+	}
 	/** The switch lives in the record body; the addon is told so it applies it (D996). */
 	setInstanceEnabled = async ({ id, enabled }) => {
 		if (this.registryOwnsEnabled) throw new Error(`instance "${id}": the integrations registry owns the on/off switch of this addon; set it with integrations.update`);
@@ -14538,7 +14676,13 @@ var MigrationLedgerEntrySchema = object({
 	* joined by the engine from the catalogues it knows this boot. Absent when no
 	* catalogue lists the id (a newer database).
 	*/
-	meta: MigrationMetaSchema.optional()
+	meta: MigrationMetaSchema.optional(),
+	/**
+	* Set when this is an applied row of an addon owner whose catalogue the answering
+	* process has not loaded (the owner has not declared yet): the row is applied, the
+	* process just cannot judge it. Never `skipped-newer` — that needs the owner loaded.
+	*/
+	ownerNotLoaded: boolean().optional()
 });
 /** A catalogued migration that is not applied, with where it stands. */
 var MigrationPendingEntrySchema = object({
@@ -15659,6 +15803,39 @@ var UnstampedEventMediaCountSchema = object({
 	/** Sum across both, or `null` when either lane could not be counted. */
 	total: number().int().nonnegative().nullable()
 }).nullable();
+/**
+* Where the stored event media sits, per storage location: how many media rows
+* and how many bytes carry each location id, how many carry none (legacy,
+* resolved to the default `eventMedia` location), and how many name a location
+* that was not asked about (a deleted or never-listed one).
+*
+* One covering-index aggregate per asked location plus the NULL one, and one
+* unfiltered total that scans the covering index: O(rows), not a walk of the
+* rows themselves. `unlisted` is total minus the ASKED locations minus NULL, so
+* it is a deleted location only when every location id was asked.
+* `null` is "could not be measured", never zero.
+*/
+var MediaLocationCensusInputSchema = object({ locationIds: array(string().min(1)).max(50).readonly() });
+var MediaLocationCensusSchema = object({
+	locations: array(object({
+		locationId: string(),
+		rows: number().int().nonnegative(),
+		bytes: number().nonnegative()
+	})).readonly(),
+	unstamped: object({
+		rows: number().int().nonnegative(),
+		bytes: number().nonnegative()
+	}),
+	/** Rows stamped with a location id that was not in the asked list. */
+	unlisted: object({
+		rows: number().int().nonnegative(),
+		bytes: number().nonnegative()
+	}),
+	total: object({
+		rows: number().int().nonnegative(),
+		bytes: number().nonnegative()
+	})
+});
 var StorageMigrationMediaMoveInputSchema = RelocateMediaInputSchema.extend({ leaseId: string().min(1) });
 /** The independently selectable logical storage classes — every class
 * `storage.listLocationDeclarations` reports, so an operator never meets a
@@ -46179,52 +46356,7 @@ DeviceType.Light, method(object({
 	level: number().min(0).max(100),
 	lastChangedAt: number()
 });
-/**
-* `broker` — unified pub/sub broker registry, system-scoped collection.
-*
-* The cap models any kind-tagged message broker the user wants to
-* register and that other addons might consume. The first two kinds
-* are MQTT (mosquitto / aedes embedded / cloud bridge) and
-* Home Assistant (HA WebSocket — subscribe_entities + call_service).
-* Future kinds (Zigbee2MQTT bridge, ZHA, KNX, Telegram, …) plug in
-* the same surface.
-*
-* Why one cap, not one cap per kind:
-*   - The integrations page wants a single table of "every broker"
-*     across kinds; a unified cap drives it without join logic.
-*   - Generic admin operations (add / remove / test / status) are
-*     identical across kinds — duplicating them per cap was busywork.
-*   - The `network-access` cap precedent: same interface, many
-*     `providerKind: 'ingress'` implementations (Tailscale, ngrok, …).
-*
-* What stays kind-specific:
-*   - `getBrokerConfig` payload (kind decides whether it returns
-*     mqtt URL+creds, HA baseUrl+token, …) — typed as
-*     `Record<string, unknown>` at the wire; consumers narrow.
-*   - `publish` / `subscribe` / `getState` arguments (target / filter /
-*     key) — also typed as `Record<string, unknown>` so each kind can
-*     evolve its surface (MQTT topic+qos vs HA entity_id+domain)
-*     without rebreaking the cap signature.
-*   - `add` `settings` payload (different fields per kind, validated by
-*     the kind-specific provider).
-*
-* Bidirectionality:
-*   - `publish` is RPC — synchronous result (provider-defined).
-*   - `subscribe` returns a subscription handle; the actual message
-*     stream flows over the typed event-bus as `broker.message` events
-*     keyed by `(brokerId, subscriptionId)`. Consumers filter in their
-*     event handler. Subscriptions persist across reconnects — the
-*     provider re-subscribes upstream after a transport drop.
-*
-* Why event-bus push (not a subscription RPC stream):
-*   - Matches the rest of CamStack's D8 contract — events for telemetry,
-*     RPC for loss-is-a-bug. Broker messages are telemetry (a single
-*     drop is recoverable via `getState({key})`).
-*   - Frees `broker.subscribe` from holding a long-lived RPC channel.
-*   - Cross-process: events already route through `$event-bus`; no
-*     per-broker wire-shaping needed.
-*/
-var BrokerStatusEnum = _enum([
+_enum([
 	"connected",
 	"disconnected",
 	"connecting",
@@ -46232,141 +46364,12 @@ var BrokerStatusEnum = _enum([
 	"unreachable",
 	"error"
 ]);
-var BrokerInfoSchema = object({
-	/** Stable broker id. Persisted; survives addon restarts. */
-	id: string(),
-	/** Addon id of the provider that OWNS this broker.
-	*
-	*  The `broker` cap is a system-scoped collection: several addons
-	*  register a `broker` provider, each owning a DISJOINT set of
-	*  brokers (mqtt-broker owns `mqtt_*`, provider-homeassistant owns
-	*  `ha_*`). A broker therefore belongs to exactly one addon — like a
-	*  device belongs to one integration. The admin UI threads this id
-	*  back as the `{ addonId }` system-collection selector on every
-	*  id-keyed call (`get` / `getSettings` / `setSettings` / `remove` /
-	*  `testConnection`), so the call routes to the OWNING provider
-	*  instead of defaulting to the first-registered one. */
-	addonId: string(),
-	/** Human-readable name (operator-chosen at add-time). */
-	name: string(),
-	/** Provider-defined kind tag — `mqtt` / `home-assistant` / future. */
-	kind: string(),
-	status: BrokerStatusEnum,
-	/** Free-form provider-specific info (HA version, MQTT broker
-	*  flavour, latency, mTLS active, …). */
-	info: record(string(), unknown()),
-	/** Ms epoch of the last connection probe / status update. */
-	lastCheckedAt: number().nullable(),
-	/** Last error message, when `status` indicates failure. */
-	error: string().nullable()
-});
 var RegistryStatusSchema = object({
 	brokerCount: number().int().nonnegative(),
 	connectedCount: number().int().nonnegative()
 });
-/**
-* One entry per `broker` provider — which addon provides which broker
-* kind(s). The unified create picker reads this to know, for each
-* (addonId, kind) pair the operator can pick, where to route the
-* follow-up `getSettingsSchema` / `testSettings` / `add` calls (via the
-* `{ addonId }` selector). A provider only advertises a kind here when
-* it implements `getSettingsSchema` for that kind (so the picker never
-* offers a kind whose creation form can't be rendered).
-*/
-var BrokerProviderInfoSchema = object({
-	/** Addon id of the `broker` provider this entry describes. */
-	addonId: string(),
-	/** Broker kinds this provider can create, with a display label. */
-	kinds: array(object({
-		kind: string(),
-		label: string(),
-		/**
-		* Relative hub path to start an interactive account link (OAuth popup).
-		* May include `{{brokerId}}`; admin-ui substitutes and appends `?popup=1`.
-		*/
-		interactiveConnectPath: string().min(1).optional(),
-		/** Relative hub path to disconnect the linked account (same popup pattern). */
-		interactiveDisconnectPath: string().min(1).optional(),
-		/**
-		* The kind signs in through a server-held interactive session instead of
-		* (or before) typed credentials. `basePath` is a hub-relative route set
-		* served by the owning addon (`/addon/<id>/...`) speaking the sign-in
-		* contract: `POST {basePath}/start` (body: the form's settings) answers
-		* `{ sessionId, loginUrl }`; `GET {basePath}/status?sessionId=` answers
-		* `{ phase: 'starting' | 'awaiting-login' | 'captured' | 'error' |
-		* 'cancelled', loginUrl, error }`; `POST {basePath}/commit`
-		* (`{ sessionId, name, brokerId? }`) stores the credentials on a new or
-		* existing broker and answers `{ brokerId }`; `POST {basePath}/cancel`
-		* (`{ sessionId }`) drops the session. The dialog that edits a broker
-		* offers it as the default path; the fields the session fills are
-		* marked `filledBySignIn` in the kind's settings schema.
-		*
-		* `methods` lists the ways the session can sign in, recommended first:
-		* `'device-code'` adds `POST {basePath}/code/start` (body: the form's
-		* settings) answering `{ sessionId, userCode, verificationUrl,
-		* expiresAt }` — the operator types `userCode` at `verificationUrl` on
-		* any device, and the same `status` / `commit` / `cancel` routes follow
-		* (status then carries `method`, `userCode`, `verificationUrl`,
-		* `expiresAt` and the phases `'awaiting-code'` / `'expired'`);
-		* `'proxy'` is the `{basePath}/start` flow above. Absent means
-		* `['proxy']`.
-		*/
-		signIn: object({
-			basePath: string().min(1),
-			methods: array(_enum(["device-code", "proxy"])).optional()
-		}).optional()
-	}))
-});
-var ListInputSchema = object({ 
-/** Optional kind filter — `list({kind:'home-assistant'})` returns
-*  only HA brokers. Omit to list every broker. */
-kind: string().optional() });
 var GetInputSchema = object({ id: string() });
-var AddInputSchema = object({
-	kind: string().min(1),
-	name: string().min(1),
-	/**
-	* ADOPT an existing id instead of minting a new one.
-	*
-	* Written the day this cost an outage. A broker's id is not a detail: HA
-	* devices carry it inside their `stableId` (`ha:ha_004:dev:…`), so a broker
-	* lost from config and re-added as `ha_001` leaves every one of its devices
-	* bound to a broker that no longer exists. Re-entering the password under the
-	* ORIGINAL id turns a multi-step device migration back into re-entering a
-	* password.
-	*
-	* A provider MUST refuse an id that is already in use — adopting a live
-	* broker's id would silently take it over.
-	*/
-	id: string().min(1).optional(),
-	/** Kind-specific settings (e.g. MQTT `{url,username,password}` or HA
-	*  `{baseUrl,accessToken}`). Validated by the kind-specific provider
-	*  branch on receipt — invalid shape rejects the add. */
-	settings: record(string(), unknown())
-});
-var AddResultSchema = object({ id: string() });
-var RemoveInputSchema = object({ id: string() });
-var TestConnectionResultSchema = discriminatedUnion("ok", [object({
-	ok: literal(true),
-	latencyMs: number().nonnegative()
-}), object({
-	ok: literal(false),
-	error: string()
-})]);
 var SettingsRecordSchema$1 = record(string(), unknown());
-var SettingsSchemaInputSchema = object({ kind: string() });
-var TestSettingsInputSchema = object({
-	kind: string(),
-	settings: SettingsRecordSchema$1
-});
-var TestSettingsResultSchema = discriminatedUnion("ok", [object({
-	ok: literal(true),
-	latencyMs: number().nonnegative().optional()
-}).strict(), object({
-	ok: literal(false),
-	error: string()
-})]);
-var SettingsSchemaResultSchema = unknown().nullable();
 var PublishInputSchema = object({
 	brokerId: string(),
 	/** Kind-specific routing target.
@@ -46410,51 +46413,12 @@ var brokerCapability = {
 		kind: "poll"
 	},
 	methods: {
-		list: method(ListInputSchema, array(BrokerInfoSchema)),
-		get: method(GetInputSchema, BrokerInfoSchema.nullable()),
-		/** Enumerate which addon provides which broker kind(s) for the
-		*  unified create picker. The auto-mount fans this array across
-		*  every registered `broker` provider (array-output method), so the
-		*  picker sees every kind from every provider in one call. */
-		listProviders: method(_void(), array(BrokerProviderInfoSchema), { auth: "admin" }),
-		add: method(AddInputSchema, AddResultSchema, {
-			kind: "mutation",
-			auth: "admin"
-		}),
-		remove: method(RemoveInputSchema, _void(), {
-			kind: "mutation",
-			auth: "admin"
-		}),
-		testConnection: method(GetInputSchema, TestConnectionResultSchema, {
-			kind: "mutation",
-			auth: "admin"
-		}),
-		/** Read the persisted settings record for a broker (kind-specific
-		*  shape). Admin-only — settings may contain secrets. Returns `null`
-		*  when the broker id is unknown to the provider (the collection
-		*  fallback may route a foreign id to the first provider). */
-		getSettings: method(GetInputSchema, SettingsRecordSchema$1.nullable(), { auth: "admin" }),
-		/** Overwrite the persisted settings record. The kind-specific
-		*  provider validates the shape and applies the change (reconnects
-		*  if credentials changed). */
-		setSettings: method(object({
-			id: string(),
-			settings: SettingsRecordSchema$1
-		}), _void(), {
-			kind: "mutation",
-			auth: "admin"
-		}),
 		/** Returns the kind-specific connection config the consumer needs
 		*  to open its own client (MQTT pattern: `{url, username, password,
 		*  clientIdPrefix}`). HA providers MAY return the auth envelope
 		*  but typical HA consumers use `publish` / `subscribe` instead.
 		*  Returns `null` when the broker id is unknown to the provider. */
 		getBrokerConfig: method(GetInputSchema, SettingsRecordSchema$1.nullable(), { auth: "admin" }),
-		getSettingsSchema: method(SettingsSchemaInputSchema, SettingsSchemaResultSchema, { auth: "admin" }),
-		testSettings: method(TestSettingsInputSchema, TestSettingsResultSchema, {
-			kind: "mutation",
-			auth: "admin"
-		}),
 		publish: method(PublishInputSchema, unknown(), {
 			kind: "mutation",
 			auth: "admin"
@@ -49078,6 +49042,9 @@ var RunningProposalEvidenceSchema = object({
 	runsFound: number().int().nonnegative(),
 	pausesFound: number().int().nonnegative(),
 	longestPauseMs: number().nonnegative(),
+	/** Episodes shorter than ~90 s (an anti-crease pulse, a display waking): never a run, never a pause. */
+	pulsesFound: number().int().nonnegative(),
+	longestPulseMs: number().nonnegative(),
 	idleFloorW: number(),
 	noiseCeilingW: number(),
 	plateauW: number(),
@@ -50524,7 +50491,14 @@ var DiscoveryCandidateSchema = object({
 	/** `stableId` of the gateway candidate this device was found BEHIND. */
 	parentStableId: string().optional(),
 	/** `false` = shown for context but not pickable. Default true. */
-	selectable: boolean().optional()
+	selectable: boolean().optional(),
+	/**
+	* Keys of the provider's creation form (`getChildCreationSchema`) this candidate
+	* cannot be adopted without — a key for an encrypted board, a pairing code. The
+	* admin asks for exactly these, on the creation form prefilled with
+	* `prefilledConfig`, before it adopts. Absent or empty = adopt as it is.
+	*/
+	needsParams: array(string()).optional()
 });
 /**
 * Flat device summary returned by `createDevice` / `adoptDiscoveredDevice`.
@@ -50583,12 +50557,24 @@ method(_void(), _void(), { kind: "mutation" }), method(_void(), _void(), { kind:
 }), array(DiscoveryCandidateSchema), {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({}), CreationSchemaOutputSchema), method(object({}), object({ deviceType: _enum(DeviceType).nullable() })), method(object({ candidate: DiscoveryCandidateSchema }), DeviceSummarySchema, {
+}), method(object({}), CreationSchemaOutputSchema), method(object({ 
+/** The integration asked about; a provider whose integrations differ answers per one. */
+integrationId: string().optional() }), object({ deviceType: _enum(DeviceType).nullable() })), method(object({
+	candidate: DiscoveryCandidateSchema,
+	/** The integration the operator adopts into; a provider with several instances needs it. */
+	integrationId: string().optional()
+}), DeviceSummarySchema, {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({}), boolean()), method(object({ type: _enum(DeviceType) }), CreationSchemaOutputSchema), method(object({
+}), method(object({}), boolean()), method(object({
 	type: _enum(DeviceType),
-	config: record(string(), unknown())
+	/** The integration asked about; a provider whose integrations differ answers per one. */
+	integrationId: string().optional()
+}), CreationSchemaOutputSchema), method(object({
+	type: _enum(DeviceType),
+	config: record(string(), unknown()),
+	/** The integration the operator adds the device to; a provider with several instances needs it. */
+	integrationId: string().optional()
 }), DeviceSummarySchema, {
 	kind: "mutation",
 	auth: "admin"
@@ -51298,7 +51284,10 @@ method(object({
 	auth: "admin"
 }), method(object({
 	addonId: string(),
-	type: _enum(DeviceType)
+	type: _enum(DeviceType),
+	/** The integration the form is for; a provider whose integrations differ (a hub
+	*  integration takes no manual add) answers per integration. Absent = the addon's own. */
+	integrationId: string().optional()
 }), unknown().nullable()), method(object({
 	addonId: string(),
 	type: _enum(DeviceType),
@@ -51382,7 +51371,11 @@ method(object({
 	kind: "mutation",
 	auth: "admin",
 	timeoutMs: 12e4
-}), method(object({ addonId: string() }), object({ deviceType: _enum(DeviceType).nullable() }), { auth: "admin" }), method(object({ addonId: string() }), unknown(), { auth: "admin" }), method(object({
+}), method(object({
+	addonId: string(),
+	/** The integration the Add-Device dialog is open on; absent = the addon's own. */
+	integrationId: string().optional()
+}), object({ deviceType: _enum(DeviceType).nullable() }), { auth: "admin" }), method(object({ addonId: string() }), unknown(), { auth: "admin" }), method(object({
 	deviceId: number(),
 	key: string(),
 	value: unknown()
@@ -53978,7 +53971,7 @@ var TestConnectionStatusEnum = _enum([
 	"inconclusive",
 	"unsupported"
 ]);
-var TestConnectionResultSchema$1 = object({
+var TestConnectionResultSchema = object({
 	/** True ONLY for `validated`. Never true for a test that did not run. */
 	success: boolean(),
 	error: string().optional(),
@@ -53999,11 +53992,7 @@ var CreateIntegrationInputSchema = object({
 	info: record(string(), unknown()).optional(),
 	/** `stableId` of the discovery candidate the form was seeded from (D984). */
 	originStableId: string().optional(),
-	settings: record(string(), unknown()).optional(),
-	/** Keys of `settings` the form's schema declares secret (by type) — kept in
-	*  the keychain, not the table (D787). */
-	secretKeys: array(string()).optional(),
-	skipRestart: boolean().optional()
+	settings: record(string(), unknown()).optional()
 });
 var UpdateIntegrationInputSchema = object({
 	id: string(),
@@ -54024,20 +54013,10 @@ method(_void(), array(IntegrationWithStateSchema)), method(object({ id: string()
 }), method(object({ id: string() }), DeleteIntegrationResultSchema, {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({ id: string() }), record(string(), unknown()), { auth: "admin" }), method(object({
-	id: string(),
-	settings: record(string(), unknown()),
-	/** Keys the form's schema declares secret (by type) — keychain-stored (D787). */
-	secretKeys: array(string()).optional(),
-	/** The integration's own addon applies the change in-process and asks the hub not to respawn it. */
-	skipRestart: boolean().optional()
-}), object({ success: boolean() }), {
-	kind: "mutation",
-	auth: "admin"
 }), method(_void(), array(AvailableIntegrationTypeSchema), { auth: "admin" }), method(object({
 	addonId: string(),
 	settings: record(string(), unknown())
-}), TestConnectionResultSchema$1, {
+}), TestConnectionResultSchema, {
 	kind: "mutation",
 	auth: "admin"
 });
@@ -54064,6 +54043,14 @@ var ConfigSchemaPassthrough$3 = custom();
 var IntegrationInstanceIdSchema = string().min(1);
 var IntegrationInstanceModeSchema = _enum(["single", "multiple"]);
 /**
+* What the addon's instances ARE for the Integrations page (planning#416). `devices`: each
+* instance is an integration that brings devices (the registry owns its on/off switch);
+* `services`: a connection configured from the addon's own function page, never listed on
+* Integrations.
+* It is the same vocabulary as the manifest's `integrationRole`, which stays as an override.
+*/
+var IntegrationInstanceRoleSchema = _enum(["devices", "services"]);
+/**
 * One kind of instance a provider can create (an adapter, an account type). The sign-in and
 * connect fields follow the `broker` contract (`broker.cap.ts`): `signIn.basePath` is a
 * hub-relative route set speaking the sign-in contract, `connectPath` / `disconnectPath` open an
@@ -54074,6 +54061,22 @@ var IntegrationInstanceKindSchema = object({
 	/** Stable id of the kind, sent back as `createInstance.kind`. */
 	id: string().min(1),
 	label: string().min(1),
+	/**
+	* The function capability this kind is configured for (`broker`, `smtp-provider`,
+	* `device-provider`, ...). A page section is the kinds whose `functionCap` it names (D1013); a
+	* provider with more than one section must name it on every kind.
+	*/
+	functionCap: string().min(1),
+	/**
+	* For `functionCap: 'broker'`: the registry kind of the broker an instance of this kind is
+	* (`matter`, `home-assistant`, ...). A caller that needs a broker of one kind (a link field)
+	* finds the instances whose kind names it; absent takes the kind `id`.
+	*/
+	brokerKind: string().min(1).optional(),
+	/** What instances of this kind are for the Integrations page; absent takes the provider's `role`. */
+	role: IntegrationInstanceRoleSchema.optional(),
+	/** `testInstance` really probes the remote for this kind; absent takes the provider's `canTest`. */
+	canTest: boolean().optional(),
 	/** The kind signs in through a server-held interactive session. */
 	signIn: object({
 		basePath: string().min(1),
@@ -54086,11 +54089,7 @@ var IntegrationInstanceKindSchema = object({
 });
 var IntegrationInstanceDescriptionSchema = object({
 	/** What the instances are for the Integrations page; see {@link IntegrationInstanceRoleSchema}. */
-	role: _enum([
-		"devices",
-		"services",
-		"both"
-	]),
+	role: IntegrationInstanceRoleSchema,
 	/** How the devices of an instance are found; absent means `{ mode: 'none' }`. */
 	discovery: object({
 		mode: _enum([
@@ -54165,7 +54164,11 @@ var integrationInstancesCapability = {
 	methods: {
 		describe: method(_void(), IntegrationInstanceDescriptionSchema, { auth: "admin" }),
 		/** The form; `id: null` is the create form. */
-		instanceFormSchema: method(object({ id: IntegrationInstanceIdSchema.nullable() }), ConfigSchemaPassthrough$3, { auth: "admin" }),
+		instanceFormSchema: method(object({
+			id: IntegrationInstanceIdSchema.nullable(),
+			/** The kind of the create form (`id: null`) of a provider with several. */
+			kind: string().min(1).optional()
+		}), ConfigSchemaPassthrough$3, { auth: "admin" }),
 		listInstances: method(_void(), array(IntegrationInstanceSchema).readonly(), { auth: "admin" }),
 		getInstance: method(object({ id: IntegrationInstanceIdSchema }), IntegrationInstanceSchema.nullable(), { auth: "admin" }),
 		/**
@@ -54175,7 +54178,9 @@ var integrationInstancesCapability = {
 		createInstance: method(object({
 			id: IntegrationInstanceIdSchema.optional(),
 			name: string().min(1),
-			kind: string().min(1).optional()
+			kind: string().min(1).optional(),
+			/** Form values written with the record (a link picked in the create dialog). */
+			values: record(string(), unknown()).optional()
 		}), object({ id: string() }), {
 			kind: "mutation",
 			auth: "admin"
@@ -54202,8 +54207,10 @@ var integrationInstancesCapability = {
 		}),
 		testInstance: optionalMethod(object({
 			id: IntegrationInstanceIdSchema.nullable(),
-			values: record(string(), unknown())
-		}), TestConnectionResultSchema$1, {
+			values: record(string(), unknown()),
+			/** The kind to test when `id` is null and the provider has several. */
+			kind: string().min(1).optional()
+		}), TestConnectionResultSchema, {
 			kind: "mutation",
 			auth: "admin"
 		})
@@ -56708,6 +56715,380 @@ var SystemMetricsSchema = object({
 	gpuMemoryPercent: number().optional()
 });
 method(_void(), SystemResourceSnapshotSchema), method(_void(), SystemResourceSnapshotSchema.nullable()), method(_void(), SystemMetricsSchema), method(object({ dirPath: string() }), DiskSpaceInfoSchema), method(_void(), MetricsGpuInfoSchema.nullable()), method(_void(), number().nullable()), method(object({ pids: array(number()) }), array(PidResourceStatsSchema)), method(_void(), array(AddonInstanceSchema).readonly()), method(object({ addonId: string() }), PidResourceStatsSchema.nullable()), method(_void(), array(NodeProcessSchema).readonly()), method(GetLoadSeriesInputSchema, NodeLoadSeriesSchema);
+/**
+* records - an addon's own facts and documents (D881): ledgers, audit rows,
+* config documents, mirrors. The third storage API next to `ctx.settings`
+* (operator intent, D870) and device-history (numbers over time, D850).
+*
+* Who the OWNER is: `callerAddonId`, stamped by the transport on a call that
+* crossed a process and stated by a hub in-process caller (`ctx.records` does
+* that with the addon id closed over). It is deliberately NOT in any input
+* schema, so a session can never supply it, and a call with no stamp is refused
+* `records/no-caller`. A kind is readable and writable only by its owner; other
+* addons go through the owner's capability.
+*
+* Every read is three-way: a row, `null`, or the call THROWS. A failed read is
+* never `[]`. Secret fields are never on the wire: a read shows the
+* redaction token, `secretRefs` hands the owner's `ctx.secrets` the refs it
+* resolves itself, and a write may carry only a keychain marker bound to the
+* row's own ref.
+*
+* Internal: addons reach it through `ctx.records`, never directly.
+*/
+var RecordIdSchema = string().min(1).max(256);
+/** A JSON object body. Size is the engine's check (`maxDataBytes`), not a schema's. */
+var RecordBodySchema = record(string(), unknown());
+var RecordInputSchema = object({
+	id: RecordIdSchema,
+	/** The device this row belongs to (D865 removal, per-device reads). */
+	deviceId: number().int().optional(),
+	/** The domain clock, ms: observed / created / opened. */
+	at: number().int().optional(),
+	/** Producer-set expiry, ms. Refused on a kind whose retention is an engine TTL. */
+	expiresAt: number().int().optional(),
+	data: RecordBodySchema
+});
+var RecordViewSchema = object({
+	id: string(),
+	deviceId: number().int().nullable(),
+	at: number().nullable(),
+	expiresAt: number().nullable(),
+	rev: number().int(),
+	updatedAt: number(),
+	data: RecordBodySchema
+});
+/** Declared index fields only. Anything else does not compile, by design. */
+var RecordWhereSchema = record(RecordFieldPathSchema, union([
+	string(),
+	number(),
+	boolean(),
+	object({ in: array(union([
+		string(),
+		number(),
+		boolean()
+	])).min(1).max(RECORD_BATCH_MAX) }),
+	object({
+		gt: union([string(), number()]).optional(),
+		gte: union([string(), number()]).optional(),
+		lt: union([string(), number()]).optional(),
+		lte: union([string(), number()]).optional()
+	}).refine((r) => Object.keys(r).length > 0, { message: "name at least one bound" })
+]));
+var KindShape = { kind: RecordKindNameSchema };
+var TimeWindowShape = {
+	deviceId: number().int().optional(),
+	atFrom: number().optional(),
+	atTo: number().optional()
+};
+var RecordQueryInputSchema = object({
+	...KindShape,
+	...TimeWindowShape,
+	where: RecordWhereSchema.optional(),
+	/** Without `where`: `at` (default for a kind with a clock) or `id`. With `where` the order is the index's. */
+	order: _enum(["at", "id"]).optional(),
+	desc: boolean().optional(),
+	limit: number().int().min(1).max(RECORD_QUERY_MAX).default(100),
+	/** Opaque keyset cursor from a previous answer. There is no offset. */
+	cursor: string().min(1).optional()
+});
+var RecordQueryResultSchema = object({
+	records: array(RecordViewSchema),
+	nextCursor: string().nullable()
+});
+var RecordKindStateSchema = _enum([
+	"created",
+	"unchanged",
+	"updated"
+]);
+var DeclareKindResultSchema = object({
+	kindId: number().int(),
+	state: RecordKindStateSchema,
+	createdIndexes: array(string())
+});
+/** Keychain refs a write released (the old marker is gone from the row): the owner deletes the values. */
+var SecretRefsList = array(string());
+/**
+* One op of a `transact`: the single-row writes, each on a kind of the caller.
+* All ops of one call share ONE database file and ONE `transactFamily`.
+*/
+var RecordTransactOpSchema = discriminatedUnion("op", [
+	object({
+		op: literal("put"),
+		kind: RecordKindNameSchema,
+		record: RecordInputSchema,
+		ifRev: number().int().min(0).optional()
+	}),
+	object({
+		op: literal("patch"),
+		kind: RecordKindNameSchema,
+		id: RecordIdSchema,
+		data: RecordBodySchema,
+		at: number().int().nullable().optional(),
+		expiresAt: number().int().nullable().optional(),
+		ifRev: number().int().min(1).optional()
+	}),
+	object({
+		op: literal("delete"),
+		kind: RecordKindNameSchema,
+		id: RecordIdSchema
+	})
+]);
+var RecordSecretRefsSchema = record(string(), record(string(), string()));
+method(object({ kinds: record(RecordKindNameSchema, RecordKindDeclarationSchema) }), object({ kinds: record(string(), DeclareKindResultSchema) }), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	...KindShape,
+	id: RecordIdSchema
+}), RecordViewSchema.nullable(), { auth: "admin" }), method(object({
+	...KindShape,
+	ids: array(RecordIdSchema).min(1).max(RECORD_BATCH_MAX)
+}), array(RecordViewSchema), { auth: "admin" }), method(object({
+	...KindShape,
+	ids: array(RecordIdSchema).min(1).max(RECORD_BATCH_MAX)
+}), RecordSecretRefsSchema, { auth: "admin" }), method(object({
+	...KindShape,
+	record: RecordInputSchema,
+	/** Compare-and-set. `0` means "the row must not exist". */
+	ifRev: number().int().min(0).optional()
+}), object({
+	rev: number().int(),
+	releasedRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	...KindShape,
+	records: array(RecordInputSchema).min(1).max(RECORD_BATCH_MAX)
+}), object({
+	count: number().int(),
+	releasedRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	...KindShape,
+	id: RecordIdSchema,
+	data: RecordBodySchema,
+	at: number().int().nullable().optional(),
+	expiresAt: number().int().nullable().optional(),
+	ifRev: number().int().min(1).optional()
+}), object({
+	rev: number().int(),
+	releasedRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	...KindShape,
+	id: RecordIdSchema
+}), object({
+	deleted: boolean(),
+	secretRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	...KindShape,
+	ids: array(RecordIdSchema).min(1).max(RECORD_BATCH_MAX)
+}), object({
+	deleted: number().int(),
+	secretRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(RecordQueryInputSchema, RecordQueryResultSchema, { auth: "admin" }), method(object({
+	...KindShape,
+	...TimeWindowShape,
+	where: RecordWhereSchema.optional()
+}), object({ count: number().int() }), { auth: "admin" }), method(object({
+	...KindShape,
+	deviceId: number().int().optional(),
+	from: number(),
+	to: number(),
+	bucketMs: number().int().positive()
+}), object({ buckets: array(object({
+	bucketStart: number(),
+	count: number().int()
+})) }), { auth: "admin" }), method(object({
+	...KindShape,
+	op: _enum([
+		"sum",
+		"min",
+		"max",
+		"count"
+	]),
+	field: RecordFieldPathSchema.optional(),
+	groupBy: RecordFieldPathSchema.optional(),
+	where: RecordWhereSchema.optional()
+}), object({ rows: array(object({
+	group: union([
+		string(),
+		number(),
+		_null()
+	]),
+	value: number().nullable()
+})) }), { auth: "admin" }), method(object({
+	...KindShape,
+	deviceId: number().int().optional(),
+	atBefore: number().optional(),
+	where: RecordWhereSchema.optional()
+}), object({
+	deleted: number().int(),
+	secretRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({ ops: array(RecordTransactOpSchema).min(1).max(RECORD_BATCH_MAX) }), object({
+	results: array(object({
+		rev: number().int().nullable(),
+		deleted: boolean()
+	})),
+	releasedRefs: SecretRefsList,
+	secretRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	deviceId: number().int(),
+	kinds: array(RecordKindNameSchema).optional()
+}), object({
+	deleted: record(string(), number().int()),
+	secretRefs: SecretRefsList
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object(KindShape), object({ id: number().int() }), {
+	kind: "mutation",
+	auth: "admin"
+});
+/**
+* The wire shapes of the migration API, version 1 (planning#447).
+*
+* A migration is code that outlives the server it was written against: an addon at
+* version 1.4 that is brought to 1.9 in one jump still runs its 1.4 catalogue, against
+* the 1.9 kernel. The only thing that code may call is {@link MigrationApiV1}; this file
+* is the contract of every method of it, one Zod pair per method.
+*
+* APPEND-ONLY. A released method is never removed and never changes meaning: an input
+* field is never removed or made required, an enum never narrows, an output field is
+* never removed. A change that cannot be expressed that way is `migration-api.v2`, next
+* to this file. `scripts/check-migration-api-append-only.ts` holds the line against
+* `scripts/migration-api-contract.json`, and every `behaviours` id below must have an
+* `it('<id>'` in `migration-api.contract.spec.ts`.
+*/
+var Rows = record(string(), unknown());
+var IntegrationId = object({ integrationId: string().min(1) });
+var RecordId = object({ id: string().min(1) });
+var RecordRowSchema = object({
+	id: string(),
+	deviceId: number().int().nullable(),
+	at: number().nullable(),
+	expiresAt: number().nullable(),
+	rev: number().int(),
+	updatedAt: number(),
+	data: Rows
+});
+var RecordPutShape = {
+	id: string().min(1),
+	deviceId: number().int().optional(),
+	at: number().int().optional(),
+	expiresAt: number().int().optional(),
+	data: Rows
+};
+var MigrationIntegrationSchema = object({
+	id: string(),
+	addonId: string(),
+	name: string(),
+	info: Rows,
+	originStableId: string().optional()
+});
+var MigrationDeviceSchema = object({
+	id: number().int(),
+	integrationId: string().nullable().optional(),
+	/** The owning device; null or absent for a root. */
+	parentDeviceId: number().int().nullable().optional(),
+	type: string().optional(),
+	name: string().optional(),
+	stableId: string().optional()
+});
+/** What the engine says about the migration API it serves: lets an addon notice an older server. */
+var MigrationApiInfoSchema = object({
+	version: number().int(),
+	methods: array(string())
+});
+object({
+	message: string(),
+	meta: Rows.optional(),
+	/** Grouping tags of the line; a line about a device carries `{ deviceId }`. */
+	tags: object({ deviceId: number().int().optional() }).optional()
+});
+object({
+	owner: string().min(1),
+	metas: array(MigrationMetaSchema)
+}), object({
+	bootId: string(),
+	snapshot: _enum([
+		"none",
+		"written",
+		"refused"
+	]),
+	steps: array(MigrationOwnerStepSchema),
+	/** The migration API the engine serves; absent from a server that predates it. */
+	migrationApi: MigrationApiInfoSchema.optional()
+}), object({ id: string().min(1) }), object({
+	proceed: boolean(),
+	state: union([literal("pending"), MigrationStatusSchema]),
+	reason: string().nullable()
+}), object({
+	id: string().min(1),
+	result: MigrationOwnerResultSchema
+}), object({
+	status: MigrationStatusSchema,
+	error: string().nullable(),
+	rowsChanged: number().int().nonnegative()
+}), object({
+	rows: number().int().nonnegative(),
+	secrets: number().int().nonnegative()
+}), IntegrationId.extend({ patch: Rows }), object({ written: boolean() }), IntegrationId.extend({ keys: array(string().min(1)) }), object({
+	present: boolean(),
+	removed: Rows
+}), RecordRowSchema.nullable(), RecordRowSchema.nullable(), object({
+	...RecordPutShape,
+	ifRev: number().int().optional()
+}), object({ rev: number().int() }), object({ records: array(object(RecordPutShape)) }), object({ count: number().int().nonnegative() }), RecordId.extend({
+	partial: Rows,
+	ifRev: number().int().optional()
+}), object({ rev: number().int() }), object({ deleted: boolean() }), object({
+	deviceId: number().int().optional(),
+	atFrom: number().optional(),
+	atTo: number().optional(),
+	where: RecordWhereSchema.optional(),
+	limit: number().int().min(1).optional(),
+	cursor: string().min(1).optional(),
+	resolveSecrets: boolean().optional()
+}), object({
+	records: array(RecordRowSchema),
+	nextCursor: string().nullable()
+}), object({
+	deviceId: number().int().optional(),
+	atBefore: number().optional(),
+	where: RecordWhereSchema.optional()
+}), object({ count: number().int().nonnegative() }), object({}), object({ store: Rows }), object({ patch: Rows }), object({}), object({ keys: array(string().min(1)) }), object({ removed: array(string()) }), object({ refs: array(string()) }), object({ values: record(string(), string().nullable()) }), object({
+	ref: string().min(1),
+	value: string()
+}), object({}), object({ refs: array(string()) }), object({ deleted: number().int().nonnegative() }), object({}), object({ integrations: array(MigrationIntegrationSchema) }), object({ id: string().min(1) }), MigrationIntegrationSchema.nullable(), object({
+	addonId: string().min(1),
+	integrationId: string().min(1).optional()
+}), object({ devices: array(MigrationDeviceSchema) }), object({ deviceId: number().int() }), object({
+	id: number().int(),
+	integrationId: string().nullable(),
+	/** Whether the device carries any stored config; its content is not offered. */
+	hasConfig: boolean()
+}).nullable(), object({
+	deviceId: number().int(),
+	integrationId: string().min(1)
+}), object({}), object({}), object({ nodeId: string() }), object({}), object({});
 method(object({}), object({ entries: array(MigrationLedgerEntrySchema) }), { auth: "admin" }), method(object({ owner: string().optional() }), object({ pending: array(MigrationPendingEntrySchema) }), { auth: "admin" }), method(object({ id: string().min(1) }), MigrationDryRunResultSchema, { auth: "admin" }), method(object({
 	id: string().min(1),
 	error: string().min(1)
@@ -56737,7 +57118,9 @@ method(object({}), object({ entries: array(MigrationLedgerEntrySchema) }), { aut
 		"written",
 		"refused"
 	]),
-	steps: array(MigrationOwnerStepSchema)
+	steps: array(MigrationOwnerStepSchema),
+	/** The migration API this engine serves (additive: a server that predates it omits it). */
+	migrationApi: MigrationApiInfoSchema.optional()
 }), {
 	kind: "mutation",
 	auth: "admin"
@@ -56758,6 +57141,27 @@ method(object({}), object({ entries: array(MigrationLedgerEntrySchema) }), { aut
 }), {
 	kind: "mutation",
 	auth: "admin"
+}), method(object({ integrationId: string().min(1) }), record(string(), unknown()), { auth: "admin" }), method(object({ integrationId: string().min(1) }), object({
+	rows: number().int().nonnegative(),
+	secrets: number().int().nonnegative()
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	integrationId: string().min(1),
+	patch: record(string(), unknown())
+}), object({ written: boolean() }), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	integrationId: string().min(1),
+	keys: array(string().min(1))
+}), object({
+	present: boolean(),
+	removed: record(string(), unknown())
+}), {
+	kind: "mutation",
+	auth: "admin"
 });
 method(object({
 	sourceUrl: string(),
@@ -59383,7 +59787,10 @@ DeviceType.Camera, method(object({ deviceId: number() }), array(TrackSchema).rea
 }), method(RelocateMediaInputSchema, object({ jobId: string() }), {
 	kind: "mutation",
 	auth: "admin"
-}), method(object({}), UnstampedEventMediaCountSchema, { auth: "admin" }), method(RelocatableMediaCountInputSchema, RelocatableMediaCountSchema, {
+}), method(object({}), UnstampedEventMediaCountSchema, { auth: "admin" }), method(MediaLocationCensusInputSchema, MediaLocationCensusSchema, {
+	kind: "query",
+	auth: "admin"
+}), method(RelocatableMediaCountInputSchema, RelocatableMediaCountSchema, {
 	kind: "query",
 	auth: "admin"
 }), method(object({}), array(RelocateJobSchema).readonly(), {
@@ -61790,7 +62197,7 @@ var BrokerStatusSchema$1 = _enum([
 	"unreachable",
 	"tls-error"
 ]);
-var BrokerInfoSchema$1 = object({
+var BrokerInfoSchema = object({
 	id: string(),
 	name: string(),
 	url: string(),
@@ -61863,7 +62270,7 @@ var mqttBrokerCapability = {
 		kind: "poll"
 	},
 	methods: {
-		listBrokers: method(_void(), array(BrokerInfoSchema$1)),
+		listBrokers: method(_void(), array(BrokerInfoSchema)),
 		getBrokerConfig: method(IdInputSchema, BrokerConnectionDetailsSchema, { auth: "admin" }),
 		addBroker: method(AddBrokerInputSchema, AddBrokerResultSchema, {
 			kind: "mutation",
@@ -68190,253 +68597,6 @@ DeviceType.Camera, DeviceType.Sensor, DeviceType.Switch, DeviceType.Gateway, met
 	auth: "admin"
 });
 /**
-* records - an addon's own facts and documents (D881): ledgers, audit rows,
-* config documents, mirrors. The third storage API next to `ctx.settings`
-* (operator intent, D870) and device-history (numbers over time, D850).
-*
-* Who the OWNER is: `callerAddonId`, stamped by the transport on a call that
-* crossed a process and stated by a hub in-process caller (`ctx.records` does
-* that with the addon id closed over). It is deliberately NOT in any input
-* schema, so a session can never supply it, and a call with no stamp is refused
-* `records/no-caller`. A kind is readable and writable only by its owner; other
-* addons go through the owner's capability.
-*
-* Every read is three-way: a row, `null`, or the call THROWS. A failed read is
-* never `[]`. Secret fields are never on the wire: a read shows the
-* redaction token, `secretRefs` hands the owner's `ctx.secrets` the refs it
-* resolves itself, and a write may carry only a keychain marker bound to the
-* row's own ref.
-*
-* Internal: addons reach it through `ctx.records`, never directly.
-*/
-var RecordIdSchema = string().min(1).max(256);
-/** A JSON object body. Size is the engine's check (`maxDataBytes`), not a schema's. */
-var RecordBodySchema = record(string(), unknown());
-var RecordInputSchema = object({
-	id: RecordIdSchema,
-	/** The device this row belongs to (D865 removal, per-device reads). */
-	deviceId: number().int().optional(),
-	/** The domain clock, ms: observed / created / opened. */
-	at: number().int().optional(),
-	/** Producer-set expiry, ms. Refused on a kind whose retention is an engine TTL. */
-	expiresAt: number().int().optional(),
-	data: RecordBodySchema
-});
-var RecordViewSchema = object({
-	id: string(),
-	deviceId: number().int().nullable(),
-	at: number().nullable(),
-	expiresAt: number().nullable(),
-	rev: number().int(),
-	updatedAt: number(),
-	data: RecordBodySchema
-});
-/** Declared index fields only. Anything else does not compile, by design. */
-var RecordWhereSchema = record(RecordFieldPathSchema, union([
-	string(),
-	number(),
-	boolean(),
-	object({ in: array(union([
-		string(),
-		number(),
-		boolean()
-	])).min(1).max(RECORD_BATCH_MAX) }),
-	object({
-		gt: union([string(), number()]).optional(),
-		gte: union([string(), number()]).optional(),
-		lt: union([string(), number()]).optional(),
-		lte: union([string(), number()]).optional()
-	}).refine((r) => Object.keys(r).length > 0, { message: "name at least one bound" })
-]));
-var KindShape = { kind: RecordKindNameSchema };
-var TimeWindowShape = {
-	deviceId: number().int().optional(),
-	atFrom: number().optional(),
-	atTo: number().optional()
-};
-var RecordQueryInputSchema = object({
-	...KindShape,
-	...TimeWindowShape,
-	where: RecordWhereSchema.optional(),
-	/** Without `where`: `at` (default for a kind with a clock) or `id`. With `where` the order is the index's. */
-	order: _enum(["at", "id"]).optional(),
-	desc: boolean().optional(),
-	limit: number().int().min(1).max(RECORD_QUERY_MAX).default(100),
-	/** Opaque keyset cursor from a previous answer. There is no offset. */
-	cursor: string().min(1).optional()
-});
-var RecordQueryResultSchema = object({
-	records: array(RecordViewSchema),
-	nextCursor: string().nullable()
-});
-var RecordKindStateSchema = _enum([
-	"created",
-	"unchanged",
-	"updated"
-]);
-var DeclareKindResultSchema = object({
-	kindId: number().int(),
-	state: RecordKindStateSchema,
-	createdIndexes: array(string())
-});
-/** Keychain refs a write released (the old marker is gone from the row): the owner deletes the values. */
-var SecretRefsList = array(string());
-/**
-* One op of a `transact`: the single-row writes, each on a kind of the caller.
-* All ops of one call share ONE database file and ONE `transactFamily`.
-*/
-var RecordTransactOpSchema = discriminatedUnion("op", [
-	object({
-		op: literal("put"),
-		kind: RecordKindNameSchema,
-		record: RecordInputSchema,
-		ifRev: number().int().min(0).optional()
-	}),
-	object({
-		op: literal("patch"),
-		kind: RecordKindNameSchema,
-		id: RecordIdSchema,
-		data: RecordBodySchema,
-		at: number().int().nullable().optional(),
-		expiresAt: number().int().nullable().optional(),
-		ifRev: number().int().min(1).optional()
-	}),
-	object({
-		op: literal("delete"),
-		kind: RecordKindNameSchema,
-		id: RecordIdSchema
-	})
-]);
-var RecordSecretRefsSchema = record(string(), record(string(), string()));
-method(object({ kinds: record(RecordKindNameSchema, RecordKindDeclarationSchema) }), object({ kinds: record(string(), DeclareKindResultSchema) }), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object({
-	...KindShape,
-	id: RecordIdSchema
-}), RecordViewSchema.nullable(), { auth: "admin" }), method(object({
-	...KindShape,
-	ids: array(RecordIdSchema).min(1).max(RECORD_BATCH_MAX)
-}), array(RecordViewSchema), { auth: "admin" }), method(object({
-	...KindShape,
-	ids: array(RecordIdSchema).min(1).max(RECORD_BATCH_MAX)
-}), RecordSecretRefsSchema, { auth: "admin" }), method(object({
-	...KindShape,
-	record: RecordInputSchema,
-	/** Compare-and-set. `0` means "the row must not exist". */
-	ifRev: number().int().min(0).optional()
-}), object({
-	rev: number().int(),
-	releasedRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object({
-	...KindShape,
-	records: array(RecordInputSchema).min(1).max(RECORD_BATCH_MAX)
-}), object({
-	count: number().int(),
-	releasedRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object({
-	...KindShape,
-	id: RecordIdSchema,
-	data: RecordBodySchema,
-	at: number().int().nullable().optional(),
-	expiresAt: number().int().nullable().optional(),
-	ifRev: number().int().min(1).optional()
-}), object({
-	rev: number().int(),
-	releasedRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object({
-	...KindShape,
-	id: RecordIdSchema
-}), object({
-	deleted: boolean(),
-	secretRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object({
-	...KindShape,
-	ids: array(RecordIdSchema).min(1).max(RECORD_BATCH_MAX)
-}), object({
-	deleted: number().int(),
-	secretRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(RecordQueryInputSchema, RecordQueryResultSchema, { auth: "admin" }), method(object({
-	...KindShape,
-	...TimeWindowShape,
-	where: RecordWhereSchema.optional()
-}), object({ count: number().int() }), { auth: "admin" }), method(object({
-	...KindShape,
-	deviceId: number().int().optional(),
-	from: number(),
-	to: number(),
-	bucketMs: number().int().positive()
-}), object({ buckets: array(object({
-	bucketStart: number(),
-	count: number().int()
-})) }), { auth: "admin" }), method(object({
-	...KindShape,
-	op: _enum([
-		"sum",
-		"min",
-		"max",
-		"count"
-	]),
-	field: RecordFieldPathSchema.optional(),
-	groupBy: RecordFieldPathSchema.optional(),
-	where: RecordWhereSchema.optional()
-}), object({ rows: array(object({
-	group: union([
-		string(),
-		number(),
-		_null()
-	]),
-	value: number().nullable()
-})) }), { auth: "admin" }), method(object({
-	...KindShape,
-	deviceId: number().int().optional(),
-	atBefore: number().optional(),
-	where: RecordWhereSchema.optional()
-}), object({
-	deleted: number().int(),
-	secretRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object({ ops: array(RecordTransactOpSchema).min(1).max(RECORD_BATCH_MAX) }), object({
-	results: array(object({
-		rev: number().int().nullable(),
-		deleted: boolean()
-	})),
-	releasedRefs: SecretRefsList,
-	secretRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object({
-	deviceId: number().int(),
-	kinds: array(RecordKindNameSchema).optional()
-}), object({
-	deleted: record(string(), number().int()),
-	secretRefs: SecretRefsList
-}), {
-	kind: "mutation",
-	auth: "admin"
-}), method(object(KindShape), object({ id: number().int() }), {
-	kind: "mutation",
-	auth: "admin"
-});
-/**
 * record-entries - the ONE admin surface for every list of user-created entries
 * (D881): notification targets, brokers, LLM profiles, anything an addon
 * declares as an ENTRY kind (`entry: { title }` in `defineRecordKinds`).
@@ -75938,11 +76098,15 @@ discriminatedUnion("kind", [object({
 *  1. idle floor F = time-weighted median; noise ceiling N = highest value seen
 *     near F. A device that is not near one level most of the time has no floor.
 *  2. coarse activity = above max(2N, N + 5 W); consecutive stretches are episodes.
-*  3. gaps between episodes split in two by the largest log-scale jump (>= 3x):
-*     the short ones are pauses INSIDE a run (a soak), the long ones separate runs.
+*  3. an episode shorter than `PULSE_MAX_MS` is a PULSE (an anti-crease tumble, a
+*     display waking): it is neither a run nor a pause. Among the remaining
+*     episodes, gaps over `PAUSE_MAX_MS` always separate runs; the rest split in
+*     two by the largest log-scale jump (>= 3x): the short ones are pauses INSIDE
+*     a run (a soak), the long ones separate runs. A stretch under `MIN_RUN_MS`
+*     is no run.
 *  4. T = geometric mean of N and the plateau's 10th percentile, snapped to a
-*     grid a person would type; stop dwell covers the longest pause; start dwell
-*     covers the longest standby blip above T.
+*     grid a person would type; stop dwell covers the longest pause and the
+*     kind's floor; start dwell covers the longest pulse and standby blip above T.
 *  5. the numbers are proved by REPLAY through the real `dwell` evaluation: each
 *     run must hold exactly one true interval and nothing may flap outside.
 */
@@ -75953,6 +76117,10 @@ var MINUTE_MS$1 = 60 * SECOND_MS;
 30 * SECOND_MS;
 60 * SECOND_MS;
 20 * MINUTE_MS$1;
+90 * SECOND_MS;
+30 * MINUTE_MS$1;
+10 * MINUTE_MS$1;
+DeviceType.Dryer, 3 * MINUTE_MS$1, DeviceType.Dishwasher, 3 * MINUTE_MS$1, DeviceType.Washer, 10 * MINUTE_MS$1;
 10 * SECOND_MS;
 10 * SECOND_MS;
 DeviceFeature.FanSpeed, DeviceFeature.FanPreset, DeviceFeature.FanDirection, DeviceFeature.FanOscillating, DeviceFeature.CoverStoppable, DeviceFeature.CoverPositionable, DeviceFeature.CoverTilt, DeviceFeature.ValvePositionable, DeviceFeature.MediaPlayerVolume, DeviceFeature.ClimateFanMode;
@@ -76971,20 +77139,6 @@ Object.freeze({
 		access: "create",
 		role: "viewer"
 	},
-	"broker.add": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "create",
-		role: "admin"
-	},
-	"broker.get": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "view",
-		role: "admin"
-	},
 	"broker.getBrokerConfig": {
 		capName: "broker",
 		capScope: "system",
@@ -76992,20 +77146,6 @@ Object.freeze({
 		access: "view",
 		role: "admin"
 	},
-	"broker.getSettings": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "view",
-		role: "admin"
-	},
-	"broker.getSettingsSchema": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "view",
-		role: "admin"
-	},
 	"broker.getState": {
 		capName: "broker",
 		capScope: "system",
@@ -77020,20 +77160,6 @@ Object.freeze({
 		access: "view",
 		role: "admin"
 	},
-	"broker.list": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "view",
-		role: "admin"
-	},
-	"broker.listProviders": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "view",
-		role: "admin"
-	},
 	"broker.publish": {
 		capName: "broker",
 		capScope: "system",
@@ -77041,20 +77167,6 @@ Object.freeze({
 		access: "create",
 		role: "admin"
 	},
-	"broker.remove": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "delete",
-		role: "admin"
-	},
-	"broker.setSettings": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "create",
-		role: "admin"
-	},
 	"broker.subscribe": {
 		capName: "broker",
 		capScope: "system",
@@ -77062,20 +77174,6 @@ Object.freeze({
 		access: "create",
 		role: "admin"
 	},
-	"broker.testConnection": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "create",
-		role: "admin"
-	},
-	"broker.testSettings": {
-		capName: "broker",
-		capScope: "system",
-		addonId: null,
-		access: "create",
-		role: "admin"
-	},
 	"broker.unsubscribe": {
 		capName: "broker",
 		capScope: "system",
@@ -79708,13 +79806,6 @@ Object.freeze({
 		access: "view",
 		role: "admin"
 	},
-	"integrations.getSettings": {
-		capName: "integrations",
-		capScope: "system",
-		addonId: null,
-		access: "view",
-		role: "admin"
-	},
 	"integrations.list": {
 		capName: "integrations",
 		capScope: "system",
@@ -79722,13 +79813,6 @@ Object.freeze({
 		access: "view",
 		role: "admin"
 	},
-	"integrations.setSettings": {
-		capName: "integrations",
-		capScope: "system",
-		addonId: null,
-		access: "create",
-		role: "admin"
-	},
 	"integrations.testConnection": {
 		capName: "integrations",
 		capScope: "system",
@@ -80723,6 +80807,13 @@ Object.freeze({
 		access: "view",
 		role: "admin"
 	},
+	"migrations.clearLegacyIntegrationRows": {
+		capName: "migrations",
+		capScope: "system",
+		addonId: null,
+		access: "delete",
+		role: "admin"
+	},
 	"migrations.declareOwner": {
 		capName: "migrations",
 		capScope: "system",
@@ -80730,6 +80821,13 @@ Object.freeze({
 		access: "create",
 		role: "admin"
 	},
+	"migrations.deleteLegacyIntegrationRowKeys": {
+		capName: "migrations",
+		capScope: "system",
+		addonId: null,
+		access: "delete",
+		role: "admin"
+	},
 	"migrations.dryRun": {
 		capName: "migrations",
 		capScope: "system",
@@ -80765,6 +80863,20 @@ Object.freeze({
 		access: "create",
 		role: "admin"
 	},
+	"migrations.patchLegacyIntegrationRows": {
+		capName: "migrations",
+		capScope: "system",
+		addonId: null,
+		access: "create",
+		role: "admin"
+	},
+	"migrations.readLegacyIntegrationRows": {
+		capName: "migrations",
+		capScope: "system",
+		addonId: null,
+		access: "view",
+		role: "admin"
+	},
 	"migrations.restorePreMigration": {
 		capName: "migrations",
 		capScope: "system",
@@ -82025,6 +82137,13 @@ Object.freeze({
 		access: "view",
 		role: "viewer"
 	},
+	"pipelineAnalytics.getMediaLocationCensus": {
+		capName: "pipeline-analytics",
+		capScope: "device",
+		addonId: null,
+		access: "view",
+		role: "admin"
+	},
 	"pipelineAnalytics.getMediaReclaimStatus": {
 		capName: "pipeline-analytics",
 		capScope: "device",
@@ -90966,6 +91085,48 @@ object({
 	delay: number().nonnegative().optional(),
 	commands: record(string(), unknown())
 });
+var BrokerInUseError = class extends Error {
+	brokerId;
+	users;
+	name = "BrokerInUseError";
+	constructor(brokerId, users) {
+		super(`broker '${brokerId}' is still in use by ${users.map((u) => `${u.kind} '${u.name ?? u.id}' (${u.id})`).join(", ")}; unlink them first`);
+		this.brokerId = brokerId;
+		this.users = users;
+	}
+};
+/** Throw {@link BrokerInUseError} when any finder names a user of `brokerId`. */
+async function assertBrokerUnused(brokerId, finders) {
+	const users = [];
+	for (const finder of finders) users.push(...await finder.find(brokerId));
+	if (users.length > 0) throw new BrokerInUseError(brokerId, users);
+}
+/**
+* Users reached through another addon's listed rows (an addon cannot read a record kind it does
+* not own): every row whose `field` holds the broker id. `list` is a cap call the owner serves.
+*/
+function fieldUserFinder(spec) {
+	return { find: async (brokerId) => (await spec.list()).filter((row) => row.formValues[spec.field] === brokerId).map((row) => ({
+		kind: spec.kind,
+		id: row.id,
+		...row.name !== void 0 ? { name: row.name } : {}
+	})) };
+}
+/**
+* An account provider whose `deleteInstance` is refused while anything still uses the account
+* (D1012). The account is an `integration-instances` kind (D1013), so the refusal lives on the
+* delete the instances page calls, not on a separate broker cap.
+*/
+function guardBrokerDelete(base, users) {
+	return {
+		...base,
+		deleteInstance: async (input) => {
+			await assertBrokerUnused(input.id, users());
+			return base.deleteInstance(input);
+		}
+	};
+}
+entryBody({ brokerId: string() });
 //#endregion
 //#region ../../node_modules/xtend/immutable.js
 var require_immutable = /* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -123010,7 +123171,7 @@ function readOnboardPort(settings) {
 	return raw;
 }
 /**
-* Build an onboard {@link BuiltOnboardEntry} from `broker.add` settings.
+* Build an onboard {@link BuiltOnboardEntry} from the create form's values.
 * Pure — the port is pre-resolved by the caller (auto-allocation is a
 * side-effecting concern kept out of this helper), so the helper performs no
 * I/O of its own.
@@ -123096,7 +123257,7 @@ function resolveStoredPassword(value, legacy) {
 function retiredCiphertextPaths(config) {
 	const out = [];
 	for (const b of config.brokers) if (b.password?.startsWith("enc:v1:") === true) out.push(`brokers[${b.id}].password`);
-	if (config.embeddedPassword.startsWith("enc:v1:")) out.push("embeddedPassword");
+	if (config.embeddedPassword?.startsWith("enc:v1:") === true) out.push("embeddedPassword");
 	return out;
 }
 //#endregion
@@ -123130,6 +123291,229 @@ var mqttBrokersEntryKind = defineEntryKind("brokers", {
 	writeTrigger: "an operator adds or removes an external MQTT broker entry"
 });
 //#endregion
+//#region src/mqtt-broker-users.ts
+/** The addon whose integrations name an MQTT broker, and the field they keep that id in. */
+var MQTT_HA_ADDON_ID = "provider-mqtt-ha";
+var MQTT_HA_BROKER_FIELD = "mqttBrokerId";
+/** The finders for everything that still points at an MQTT broker. */
+function mqttBrokerUsers(listMqttHaInstances) {
+	return [fieldUserFinder({
+		kind: "integration",
+		field: MQTT_HA_BROKER_FIELD,
+		list: listMqttHaInstances
+	})];
+}
+/** MQTT Discovery is installed but has not registered as a provider: not known, NOT absent (D315). */
+var MqttDiscoveryNotReadyError = class extends Error {
+	constructor() {
+		super("MQTT Discovery is installed but not answering yet (still starting, or switched off), so its integrations cannot be checked: try again once it is running");
+		this.name = "MqttDiscoveryNotReadyError";
+	}
+};
+/**
+* The integrations of the MQTT Discovery addon. Nothing can name a broker only when the registry
+* ANSWERED that the addon supplies no `integration-instances` AND the addon roster ANSWERED that
+* it is not installed: then the answer is none. An addon that is installed but has not registered
+* (booting, switched off) is not-yet-known, and a registry or roster that does not answer, or a
+* read that fails, is unknown too: all of those throw, so the delete is refused (D49, D315).
+*/
+async function listMqttHaInstancesOver(api) {
+	const info = await api.capabilities.getCapability.query({ name: "integration-instances" });
+	if (info === null) throw new Error("the capability registry did not answer");
+	if (!info.providers.includes("provider-mqtt-ha")) {
+		if ((await api.addons.list.query()).some((row) => row.manifest.id === "provider-mqtt-ha")) throw new MqttDiscoveryNotReadyError();
+		return [];
+	}
+	return api.integrationInstances.listInstances.query({ addonId: MQTT_HA_ADDON_ID });
+}
+//#endregion
+//#region src/mqtt-broker-instances.ts
+/**
+* The MQTT brokers as `integration-instances` (D1013): one instance per `brokers` record. An
+* external broker is a URL; an ONBOARD broker (`onboard: true` on the create form) is a CamStack
+* `aedes` server on this hub: the create allocates its port (or honours the operator's) and the
+* addon spawns it from the record, the delete tears it down. Removing a broker an MQTT Discovery
+* integration still names is refused (D1012).
+*/
+var MQTT_INSTANCE_KIND = "mqtt";
+/** The create-form keys that only mean "run an onboard broker"; the record keeps a descriptor. */
+var ONBOARD_FORM_KEYS = new Set([
+	"onboard",
+	"port",
+	"allowAnonymous"
+]);
+var PROBE_LABELS = {
+	connected: "Connected",
+	disconnected: "Disconnected",
+	"auth-failed": "Authentication failed",
+	unreachable: "Unreachable",
+	"tls-error": "TLS error"
+};
+/** The instance's health word: connected / auth-failed / unreachable / tls-error, latency, clients. */
+function mqttHealthOf(body, live, now) {
+	if (body.enabled === false) return { status: {
+		state: "off",
+		label: "Switched off"
+	} };
+	if (body.onboard !== void 0) return live.onboard === null ? {
+		status: {
+			state: "error",
+			label: "Not listening"
+		},
+		lastCheckedAt: now
+	} : {
+		status: {
+			state: "ok",
+			label: "Listening",
+			detail: `${live.onboard.connectedClients} connected clients`
+		},
+		lastCheckedAt: now
+	};
+	const probe = live.probe;
+	if (probe === void 0) return { status: {
+		state: "unknown",
+		label: "Not checked yet"
+	} };
+	const detail = probe.status === "connected" ? probe.latencyMs !== null ? `${probe.latencyMs} ms` : void 0 : probe.error;
+	return {
+		status: {
+			state: probe.status === "connected" ? "ok" : "error",
+			label: PROBE_LABELS[probe.status],
+			...detail !== void 0 ? { detail } : {}
+		},
+		lastCheckedAt: probe.lastCheckedAt
+	};
+}
+function withoutOnboardKeys(values) {
+	return Object.fromEntries(Object.entries(values).filter(([key]) => !ONBOARD_FORM_KEYS.has(key)));
+}
+function typedText(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
+/** A password the form really typed: not blank, not the redaction token, not the hidden view. */
+function typedSecret(value) {
+	const text = typedText(value);
+	return text === void 0 || text === "__camstack_redacted__" || isSecretFieldView(text) ? void 0 : text;
+}
+function resultOf(probe) {
+	return probe.ok ? {
+		success: true,
+		status: "validated",
+		...probe.latencyMs !== void 0 ? { latencyMs: probe.latencyMs } : {}
+	} : {
+		success: false,
+		status: "rejected",
+		error: probe.error ?? "The broker did not answer"
+	};
+}
+function buildMqttBrokerInstances(records, deps) {
+	const instances = new RecordIntegrationInstances(records, mqttBrokersEntryKind, {
+		description: {
+			role: "services",
+			instanceMode: "multiple",
+			kind: "brokers",
+			canTest: true,
+			kinds: [{
+				id: MQTT_INSTANCE_KIND,
+				label: "MQTT broker",
+				functionCap: "broker",
+				brokerKind: "mqtt",
+				canTest: true
+			}]
+		},
+		formSchema: (id) => deps.formSchema(id, false),
+		kindOf: () => MQTT_INSTANCE_KIND,
+		initialBody: (name) => ({
+			name,
+			url: "mqtt://"
+		}),
+		configured: (body) => body.url.trim().length > 0 && body.url.trim() !== "mqtt://",
+		health: (body, id) => mqttHealthOf(body, deps.liveState(id), Date.now()),
+		onChanged: deps.onChanged,
+		test: async ({ id, values }) => {
+			if (id === null && isOnboardRequested(values)) return {
+				success: true,
+				status: "validated",
+				detail: "A free port is picked when the broker is created"
+			};
+			const saved = id === null ? null : await instances.readResolved(id);
+			if (saved?.body.onboard !== void 0) return deps.onboardListening(saved.id) ? {
+				success: true,
+				status: "validated",
+				detail: `Listening on port ${saved.body.onboard.port}`
+			} : {
+				success: false,
+				status: "rejected",
+				error: "The onboard broker is not listening"
+			};
+			const url = typedText(values["url"]) ?? saved?.body.url;
+			if (url === void 0 || url === "mqtt://") return {
+				success: false,
+				status: "rejected",
+				error: "Enter the broker URL first"
+			};
+			const username = typedText(values["username"]) ?? saved?.body.username;
+			const password = typedSecret(values["password"]) ?? saved?.body.password;
+			return resultOf(await deps.probe({
+				url,
+				...username !== void 0 ? { username } : {},
+				...password !== void 0 ? { password } : {}
+			}));
+		}
+	});
+	const base = instances.toProvider();
+	/** Port, descriptor and URL of an onboard broker the form asked for. */
+	const onboardValues = async (id, name, values) => {
+		const built = buildOnboardEntry({
+			id,
+			name,
+			port: readOnboardPort(values) ?? await deps.freePort(),
+			settings: values
+		});
+		return {
+			...withoutOnboardKeys(values),
+			url: built.url,
+			onboard: built.onboard
+		};
+	};
+	return guardBrokerDelete({
+		...base,
+		instanceFormSchema: async ({ id }) => {
+			const saved = id === null ? null : await instances.getResolved(id);
+			return deps.formSchema(id, saved?.onboard !== void 0);
+		},
+		createInstance: async (input) => {
+			const values = input.values ?? {};
+			if (!isOnboardRequested(values)) return base.createInstance({
+				...input,
+				values: withoutOnboardKeys(values)
+			});
+			const id = input.id ?? randomUUID();
+			return base.createInstance({
+				...input,
+				id,
+				values: await onboardValues(id, input.name, values)
+			});
+		},
+		updateInstance: async (input) => {
+			if (!isOnboardRequested(input.values)) return base.updateInstance({
+				...input,
+				values: withoutOnboardKeys(input.values)
+			});
+			const current = await instances.getResolved(input.id);
+			if (current === null) throw new Error(`mqtt-broker: broker '${input.id}' not found`);
+			if (current.onboard !== void 0) return base.updateInstance({
+				...input,
+				values: withoutOnboardKeys(input.values)
+			});
+			return base.updateInstance({
+				...input,
+				values: await onboardValues(input.id, input.name ?? current.name, input.values)
+			});
+		}
+	}, () => mqttBrokerUsers(deps.listMqttHaInstances));
+}
+//#endregion
 //#region src/migrations/brokers-to-records.ts
 /**
 * The external MQTT brokers live in the `brokers` records (D985, D996); the old addon-settings
@@ -123219,46 +123603,163 @@ async function planDropBrokersKey(ports) {
 	}] };
 }
 //#endregion
+//#region src/migrations/embedded-to-onboard.ts
+/**
+* The legacy single embedded broker lived in FLAT addon-settings keys (`embeddedEnabled`,
+* `embeddedPort`, ...). It is an ONBOARD broker record now, so the instance list, the pickers,
+* the test and the delete all see it (D1013). Two migrations of the catalogue, in this order:
+*
+*  1. `embeddedToOnboardRecord` (procedure): a legacy broker (a stopped one as a switched-off
+*     record) becomes a `brokers` record
+*     under the SAME id (`embeddedId`, else the `'embedded'` id the old code derived), so a
+*     consumer that stored that id still resolves. It never overwrites a record of that id.
+*  2. `planDropEmbeddedKeys` (plan): the flat keys are deleted from the canonical
+*     `addon-settings` rows, and only while the record that replaces them exists and carries the
+*     password the legacy key held. `embeddedClients` / `embeddedAcl` are not flat broker keys
+*     and stay.
+*/
+/** The flat keys that described the legacy embedded broker. */
+var LEGACY_EMBEDDED_KEYS = [
+	"embeddedEnabled",
+	"embeddedId",
+	"embeddedPort",
+	"embeddedAllowAnonymous",
+	"embeddedUsername",
+	"embeddedPassword"
+];
+var LEGACY_EMBEDDED_NAME = "Embedded broker";
+function onboardBodyOf(legacy) {
+	return {
+		name: LEGACY_EMBEDDED_NAME,
+		url: `mqtt://127.0.0.1:${legacy.port}`,
+		...legacy.username !== void 0 ? { username: legacy.username } : {},
+		...legacy.password !== void 0 ? { password: legacy.password } : {},
+		onboard: {
+			port: legacy.port,
+			allowAnonymous: legacy.allowAnonymous
+		},
+		...legacy.enabled ? {} : { enabled: false }
+	};
+}
+async function embeddedToOnboardRecord(ports) {
+	const legacy = await ports.readLegacyEmbedded();
+	if (legacy === null) return {
+		outcome: "already-done",
+		summary: { migrated: 0 }
+	};
+	if ((await ports.readRecords()).has(legacy.id)) return {
+		outcome: "already-done",
+		summary: { migrated: 0 }
+	};
+	await ports.putOnboardRecord(legacy.id, onboardBodyOf(legacy));
+	return {
+		outcome: "done",
+		summary: { migrated: 1 }
+	};
+}
+async function planDropEmbeddedKeys(ports) {
+	const raw = await ports.readRawEmbeddedKeys();
+	const present = LEGACY_EMBEDDED_KEYS.filter((key) => key in raw);
+	if (present.length === 0) return { edits: [] };
+	const refuse = (reason) => {
+		ports.warn(`mqtt-broker migration: the legacy embedded keys are kept: ${reason}`);
+		throw new Error(`the legacy embedded broker keys are not deleted: ${reason}`);
+	};
+	const legacy = await ports.readLegacyEmbedded();
+	if (legacy !== null) {
+		const record = (await ports.readRecords()).get(legacy.id);
+		if (record === void 0) return refuse(`the record '${legacy.id}' does not exist`);
+		if ((legacy.password ?? "").length > 0 && !record.hasPassword) return refuse(`the record '${legacy.id}' holds no password`);
+	}
+	return { edits: [{
+		op: "deleteKeys",
+		scope: ADDON_SETTINGS_TABLE,
+		keys: present.map((key) => `${MQTT_BROKER_ADDON_ID}.${key}`),
+		precondition: preconditionOf(Object.fromEntries(present.map((key) => [`${MQTT_BROKER_ADDON_ID}.${key}`, {
+			addonId: MQTT_BROKER_ADDON_ID,
+			key,
+			value: raw[key]
+		}])))
+	}] };
+}
+//#endregion
 //#region src/migrations/index.ts
 var BROKERS_TO_RECORDS_ID = "mqtt-broker/2026-11-03-brokers-settings-to-records";
 var DROP_BROKERS_KEY_ID = "mqtt-broker/2026-11-03-drop-brokers-key";
+var EMBEDDED_TO_ONBOARD_ID = "mqtt-broker/2026-11-05-embedded-broker-to-onboard-record";
+var DROP_EMBEDDED_KEYS_ID = "mqtt-broker/2026-11-05-drop-embedded-keys";
 var FIXTURE_MARK = "a setting key the migration does not know";
 /**
 * The `mqtt-broker` catalogue (D987), offered to the engine when the addon initialises. Both
 * entries are `tolerate`: the embedded broker and every record keep working while a legacy key
 * stays where it is.
 */
-var ADDON_MIGRATIONS = [{
-	meta: {
-		id: BROKERS_TO_RECORDS_ID,
-		owner: "mqtt-broker",
-		level: "addon-state",
-		seq: 1,
-		dependsOn: [],
-		store: "settings",
-		scope: "cluster",
-		onFailure: "tolerate",
-		bodyKind: "procedure",
-		description: "Check that every external broker of the old settings list is a brokers record; never deletes",
-		fixtureMark: FIXTURE_MARK
-	},
-	procedure: verifyBrokersAreRecords
-}, {
-	meta: {
-		id: DROP_BROKERS_KEY_ID,
-		owner: "mqtt-broker",
-		level: "addon-state",
-		seq: 2,
-		dependsOn: [BROKERS_TO_RECORDS_ID],
-		store: "settings",
-		scope: "cluster",
-		onFailure: "tolerate",
-		bodyKind: "plan",
-		description: "Delete the legacy brokers settings key once every broker is a record",
-		fixtureMark: FIXTURE_MARK
-	},
-	plan: planDropBrokersKey
-}];
+var ADDON_MIGRATIONS = [
+	{
+		meta: {
+			id: BROKERS_TO_RECORDS_ID,
+			owner: "mqtt-broker",
+			level: "addon-state",
+			seq: 1,
+			dependsOn: [],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "procedure",
+			description: "Check that every external broker of the old settings list is a brokers record; never deletes",
+			fixtureMark: FIXTURE_MARK
+		},
+		procedure: verifyBrokersAreRecords
+	},
+	{
+		meta: {
+			id: DROP_BROKERS_KEY_ID,
+			owner: "mqtt-broker",
+			level: "addon-state",
+			seq: 2,
+			dependsOn: [BROKERS_TO_RECORDS_ID],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "plan",
+			description: "Delete the legacy brokers settings key once every broker is a record",
+			fixtureMark: FIXTURE_MARK
+		},
+		plan: planDropBrokersKey
+	},
+	{
+		meta: {
+			id: EMBEDDED_TO_ONBOARD_ID,
+			owner: "mqtt-broker",
+			level: "addon-state",
+			seq: 3,
+			dependsOn: [DROP_BROKERS_KEY_ID],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "procedure",
+			description: "The legacy embedded broker (flat embedded* keys) becomes an onboard brokers record under the same id; never overwrites a record",
+			fixtureMark: FIXTURE_MARK
+		},
+		procedure: embeddedToOnboardRecord
+	},
+	{
+		meta: {
+			id: DROP_EMBEDDED_KEYS_ID,
+			owner: "mqtt-broker",
+			level: "addon-state",
+			seq: 4,
+			dependsOn: [EMBEDDED_TO_ONBOARD_ID],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "plan",
+			description: "Delete the flat embedded broker keys once the onboard record holds them",
+			fixtureMark: FIXTURE_MARK
+		},
+		plan: planDropEmbeddedKeys
+	}
+];
 //#endregion
 //#region src/mqtt-entry-record-kinds.ts
 var aclAccessSchema = _enum([
@@ -123460,129 +123961,31 @@ var MqttAclStore = class MqttAclStore {
 *   The addon has NO standalone admin page. All configuration — external
 *   broker entries, the embedded `aedes` broker, embedded credentials,
 *   and the topic ACL — is exposed through the standard
-*   `globalSettingsSchema()` and rendered automatically inside the
+*   `clusterSettingsSchema()` and rendered automatically inside the
 *   Integrations → Brokers tab's docked Settings panel, like every other
 *   integration-type addon.
 *
 * Lifecycle:
 *   - External broker entries are persisted in `this.activeExternalBrokers`.
-*   - The embedded broker is persisted as flat `embedded*` config keys
-*     (`embeddedEnabled`, `embeddedPort`, …) so the standard settings
-*     form can drive it; {@link MqttBrokerAddon.deriveEmbeddedEntry}
-*     reassembles them into an `EmbeddedBrokerEntry`.
-*   - On boot we start the embedded broker when `embeddedEnabled`.
-*   - `addBroker` / `removeBroker` / `startEmbeddedBroker` /
-*     `stopEmbeddedBroker` mutate the config and the runtime state.
+*   - The legacy single embedded broker is an onboard `brokers` record (migrated from the flat
+*     `embedded*` keys, same id); `startEmbeddedBroker` / `stopEmbeddedBroker` act on that record.
+*   - `addBroker` / `removeBroker` mutate the records and the runtime state.
 *   - `testConnection` does a one-shot `mqtt.connect` race against a 3s
 *     timeout AND refreshes the probe cache for the broker.
 */
 /** bcrypt cost factor — exported for tests. */
 var MQTT_EMBEDDED_BCRYPT_ROUNDS = 10;
 var PROBE_INTERVAL_MS = 3e4;
-var DEFAULT_EMBEDDED_PORT = 1883;
-/**
-* Per-kind broker creation form for kind='mqtt', rendered by the unified
-* Broker manager / create picker (via `broker.getSettingsSchema`). PURE
-* DATA — emits the flat `{ url, username, password, clientIdPrefix }`
-* shape `broker.add`'s `settings` payload consumes. Mirrors the external
-* broker fields `addBroker` accepts.
-*/
-var mqttBrokerSettingsSchema = { sections: [{
-	id: "mqtt-broker-connection",
-	title: "MQTT connection",
-	titleKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.title",
-	columns: 1,
-	fields: [
-		{
-			type: "boolean",
-			key: "onboard",
-			label: "Run an onboard broker",
-			labelKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.onboard.label",
-			description: "Spin up a CamStack-hosted aedes broker on this hub instead of connecting to an external one. Each onboard broker gets its own dedicated server + port.",
-			descriptionKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.onboard.description",
-			default: false
-		},
-		{
-			type: "number",
-			key: "port",
-			label: "Port",
-			labelKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.port.label",
-			placeholder: "(auto)",
-			description: "TCP port for the onboard broker. Leave blank to auto-allocate a free port.",
-			descriptionKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.port.description",
-			showWhen: {
-				field: "onboard",
-				equals: true
-			}
-		},
-		{
-			type: "boolean",
-			key: "allowAnonymous",
-			label: "Allow anonymous",
-			labelKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.allowAnonymous.label",
-			description: "Permit clients to connect without a username/password.",
-			descriptionKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.allowAnonymous.description",
-			default: false,
-			showWhen: {
-				field: "onboard",
-				equals: true
-			}
-		},
-		{
-			type: "text",
-			key: "url",
-			label: "Broker URL",
-			labelKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.url.label",
-			placeholder: "mqtt://localhost:1883",
-			showWhen: {
-				field: "onboard",
-				equals: false
-			}
-		},
-		{
-			type: "text",
-			key: "username",
-			label: "Username",
-			labelKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.username.label",
-			placeholder: "(optional)"
-		},
-		{
-			type: "password",
-			key: "password",
-			label: "Password",
-			labelKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.password.label",
-			showToggle: true
-		},
-		{
-			type: "text",
-			key: "clientIdPrefix",
-			label: "Client ID prefix",
-			labelKey: "mqtt-broker:mqttBrokerSettings.s_mqtt-broker-connection.clientIdPrefix.label",
-			placeholder: "(optional)",
-			showWhen: {
-				field: "onboard",
-				equals: false
-			}
-		}
-	]
-}] };
 var DEFAULT_CONFIG = {
-	embeddedEnabled: false,
-	embeddedId: "",
-	embeddedPort: DEFAULT_EMBEDDED_PORT,
-	embeddedAllowAnonymous: false,
-	embeddedUsername: "",
-	embeddedPassword: "",
 	embeddedClients: [],
 	embeddedAcl: []
 };
 var MqttBrokerAddon = class extends BaseAddon {
-	embeddedRuntime = null;
-	/** Per-entry onboard `aedes` runtimes, keyed by `ExternalBrokerEntry.id`. */
+	/** Per-record onboard `aedes` runtimes, keyed by `ExternalBrokerEntry.id`. */
 	onboardRuntimes = /* @__PURE__ */ new Map();
 	probeCache = null;
 	brokerStore = null;
-	instances = null;
+	brokerInstances = null;
 	clientStore = null;
 	aclStore = null;
 	/** The external broker rows: the `brokers` records, secrets resolved. */
@@ -123596,6 +123999,20 @@ var MqttBrokerAddon = class extends BaseAddon {
 		if (this.brokerStore === null) throw new Error("mqtt-broker: the broker records are not open");
 		return this.brokerStore;
 	}
+	/** What the addon knows of a broker right now: its onboard server or its last probe. */
+	liveState(id) {
+		const running = this.onboardRuntimes.get(id);
+		const probe = this.probeCache?.get(id);
+		return {
+			onboard: running === void 0 ? null : { connectedClients: running.aedes.connectedClients },
+			...probe !== void 0 ? { probe: {
+				status: probe.status,
+				latencyMs: probe.latencyMs,
+				...probe.error !== void 0 ? { error: probe.error } : {},
+				lastCheckedAt: probe.lastCheckedAt
+			} } : {}
+		};
+	}
 	async persistExternalBrokers(entries) {
 		this.activeExternalBrokers = [...entries];
 		await this.requireBrokerStore().replaceAll(entries);
@@ -123645,19 +124062,13 @@ var MqttBrokerAddon = class extends BaseAddon {
 		this.brokerStore = MqttBrokerStore.of(records);
 		this.clientStore = MqttClientStore.of(records);
 		this.aclStore = MqttAclStore.of(records);
-		this.instances = new RecordIntegrationInstances(records, mqttBrokersEntryKind, {
-			description: {
-				role: "services",
-				instanceMode: "multiple",
-				kind: "brokers",
-				canTest: false
-			},
-			formSchema: () => this.brokerForm(),
-			initialBody: (name) => ({
-				name,
-				url: "mqtt://"
-			}),
-			configured: (body) => body.url.trim().length > 0 && body.url.trim() !== "mqtt://",
+		this.brokerInstances = buildMqttBrokerInstances(records, {
+			formSchema: (id, onboard) => this.brokerForm(id, onboard),
+			listMqttHaInstances: () => listMqttHaInstancesOver(this.ctx.api),
+			freePort: () => findFreePort(),
+			probe: (cfg) => this.probeMqtt(cfg),
+			onboardListening: (id) => this.onboardRuntimes.has(id),
+			liveState: (id) => this.liveState(id),
 			onChanged: async () => {
 				await this.refreshExternalBrokers();
 			}
@@ -123686,29 +124097,9 @@ var MqttBrokerAddon = class extends BaseAddon {
 		});
 		this.probeCache.setBrokersSource(() => this.collectExternalProbeInputs());
 		this.probeCache.start();
-		const persistedEmbedded = this.deriveEmbeddedEntry();
-		if (persistedEmbedded) try {
-			await this.spawnEmbedded(persistedEmbedded);
-			this.ctx.logger.info("embedded mqtt broker restarted", {
-				meta: { port: persistedEmbedded.port },
-				tags: {
-					topic: "mqtt-broker",
-					phase: "embedded-restarted"
-				}
-			});
-		} catch (err) {
-			this.ctx.logger.warn("embedded mqtt broker failed to restart", {
-				meta: { error: errMsg(err) },
-				tags: {
-					topic: "mqtt-broker",
-					phase: "embedded-restart-failed"
-				}
-			});
-		}
 		await this.reconcileOnboardRuntimes();
 		this.ctx.addDisposer(async () => {
 			await this.probeCache?.stop();
-			await this.shutdownEmbedded().catch(() => void 0);
 			await this.shutdownAllOnboard();
 		});
 		const provider = {
@@ -123720,11 +124111,13 @@ var MqttBrokerAddon = class extends BaseAddon {
 			startEmbeddedBroker: async (input) => this.startEmbeddedBroker(input),
 			stopEmbeddedBroker: async ({ id }) => this.stopEmbeddedBroker(id),
 			getStatus: async () => ({
-				brokerCount: this.activeExternalBrokers.length + (this.config.embeddedEnabled ? 1 : 0),
-				embeddedRunning: this.embeddedRuntime !== null
+				brokerCount: this.activeExternalBrokers.length,
+				embeddedRunning: this.onboardRuntimes.size > 0
 			})
 		};
 		const unifiedProvider = this.buildUnifiedBrokerProvider();
+		const brokerInstances = this.brokerInstances;
+		if (brokerInstances === null) throw new Error("mqtt-broker: the broker instances are not built");
 		return [
 			{
 				capability: mqttBrokerCapability,
@@ -123736,111 +124129,21 @@ var MqttBrokerAddon = class extends BaseAddon {
 			},
 			{
 				capability: integrationInstancesCapability,
-				provider: this.instances.toProvider()
+				provider: brokerInstances
 			}
 		];
 	}
+	/**
+	* The bus-only `broker` cap (D1013). The brokers themselves are the `integration-instances`
+	* provider; this one only answers the config read and the status.
+	*/
 	buildUnifiedBrokerProvider() {
-		const KIND = "mqtt";
-		const ownerAddonId = this.ctx.id;
-		const adapt = (info) => ({
-			id: info.id,
-			addonId: ownerAddonId,
-			name: info.name,
-			kind: KIND,
-			status: mapMqttStatus(info.status),
-			info: {
-				...info.latencyMs !== null ? { latencyMs: info.latencyMs } : {},
-				...info.kind === "embedded" ? {
-					embedded: true,
-					connectedClients: info.connectedClients ?? 0
-				} : {}
-			},
-			lastCheckedAt: info.lastCheckedAt ?? null,
-			error: info.error ?? null
-		});
-		const owns = (id) => {
-			if (this.activeExternalBrokers.some((b) => b.id === id)) return true;
-			const embedded = this.deriveEmbeddedEntry();
-			return embedded !== null && embedded.id === id;
-		};
+		const owns = (id) => this.activeExternalBrokers.some((b) => b.id === id);
 		return {
-			list: async ({ kind }) => {
-				if (kind && kind !== KIND) return [];
-				return (await this.listBrokers()).map(adapt);
-			},
-			get: async ({ id }) => {
-				const match = (await this.listBrokers()).find((b) => b.id === id);
-				return match ? adapt(match) : null;
-			},
-			listProviders: async () => [{
-				addonId: ownerAddonId,
-				kinds: [{
-					kind: KIND,
-					label: "MQTT"
-				}]
-			}],
-			add: async ({ kind, name, settings, id }) => {
-				if (kind !== KIND) throw new Error(`mqtt-broker: only kind '${KIND}' is handled here (got '${kind}')`);
-				if (id !== void 0) throw new Error("mqtt-broker: adopting an existing broker id is not supported by this provider");
-				if (isOnboardRequested(settings)) return this.addOnboardBroker(name, settings);
-				const url = typeof settings["url"] === "string" ? settings["url"] : "";
-				if (!url) throw new Error("mqtt-broker.add: settings.url is required");
-				const input = {
-					name,
-					url,
-					...typeof settings["username"] === "string" ? { username: settings["username"] } : {},
-					...typeof settings["password"] === "string" ? { password: settings["password"] } : {},
-					...typeof settings["clientIdPrefix"] === "string" ? { clientIdPrefix: settings["clientIdPrefix"] } : {}
-				};
-				return this.addBroker(input);
-			},
-			remove: async ({ id }) => {
-				if (!owns(id)) return;
-				await this.removeBroker(id);
-			},
-			testConnection: async ({ id }) => {
-				if (!owns(id)) return {
-					ok: false,
-					error: "unknown broker"
-				};
-				return this.testConnection(id);
-			},
-			getSettings: async ({ id }) => {
-				if (!owns(id)) return null;
-				return this.getBrokerConfig(id);
-			},
-			setSettings: async () => {
-				throw new Error("mqtt-broker.setSettings: not supported — use remove + add to replace a broker");
-			},
 			getBrokerConfig: async ({ id }) => {
 				if (!owns(id)) return null;
 				return this.getBrokerConfig(id);
 			},
-			getSettingsSchema: async ({ kind }) => {
-				if (kind !== KIND) return null;
-				return mqttBrokerSettingsSchema;
-			},
-			testSettings: async ({ kind, settings }) => {
-				if (kind !== KIND) return {
-					ok: false,
-					error: `unsupported kind: ${kind}`
-				};
-				if (isOnboardRequested(settings)) return {
-					ok: true,
-					latencyMs: 0
-				};
-				const url = typeof settings["url"] === "string" ? settings["url"] : "";
-				if (!url) return {
-					ok: false,
-					error: "settings.url is required"
-				};
-				return this.probeMqtt({
-					url,
-					...typeof settings["username"] === "string" ? { username: settings["username"] } : {},
-					...typeof settings["password"] === "string" ? { password: settings["password"] } : {}
-				});
-			},
 			publish: async () => {
 				throw new Error("mqtt-broker.publish: not supported — fetch getBrokerConfig + open your own mqtt.js client (see \"NOT a pub/sub proxy\" in mqtt-broker.cap.ts)");
 			},
@@ -123854,7 +124157,7 @@ var MqttBrokerAddon = class extends BaseAddon {
 			getStatus: async () => {
 				const all = await this.listBrokers();
 				return {
-					brokerCount: this.activeExternalBrokers.length + (this.config.embeddedEnabled ? 1 : 0),
+					brokerCount: this.activeExternalBrokers.length,
 					connectedCount: all.filter((b) => b.status === "connected").length
 				};
 			}
@@ -123862,35 +124165,13 @@ var MqttBrokerAddon = class extends BaseAddon {
 	}
 	async onShutdown() {
 		await this.probeCache?.stop();
-		await this.shutdownEmbedded().catch(() => void 0);
 		await this.shutdownAllOnboard();
 	}
 	async onConfigChanged() {
 		this.activeExternalBrokers = await this.requireBrokerStore().listResolved();
 		await this.syncEmbeddedEntriesFromConfig();
 		await this.reconcileOnboardRuntimes();
-		const desired = this.deriveEmbeddedEntry();
-		const running = this.embeddedRuntime?.entry ?? null;
-		if (!desired && running) {
-			await this.shutdownEmbedded();
-			return;
-		}
-		if (desired && !running) {
-			await this.spawnEmbedded(desired).catch((err) => {
-				this.ctx.logger.warn("embedded mqtt broker spawn (on config change) failed", { meta: { error: errMsg(err) } });
-			});
-			return;
-		}
-		if (desired && running) {
-			if (requiresEmbeddedRespawn(desired, running)) {
-				await this.shutdownEmbedded();
-				await this.spawnEmbedded(desired).catch((err) => {
-					this.ctx.logger.warn("embedded mqtt broker respawn failed", { meta: { error: errMsg(err) } });
-				});
-				return;
-			}
-			this.reconcileEmbeddedClients();
-		}
+		this.reconcileEmbeddedClients();
 	}
 	async listBrokers() {
 		const out = [];
@@ -123924,22 +124205,6 @@ var MqttBrokerAddon = class extends BaseAddon {
 			};
 			out.push(info);
 		}
-		const embedded = this.deriveEmbeddedEntry();
-		if (embedded) {
-			const running = this.embeddedRuntime;
-			const status = running !== null ? "connected" : "disconnected";
-			const info = {
-				id: embedded.id,
-				name: embedded.name,
-				url: `mqtt://127.0.0.1:${embedded.port}`,
-				kind: "embedded",
-				status,
-				latencyMs: null,
-				...running ? { connectedClients: running.aedes.connectedClients } : {},
-				lastCheckedAt: Date.now()
-			};
-			out.push(info);
-		}
 		return out;
 	}
 	getBrokerConfig(id) {
@@ -123954,15 +124219,6 @@ var MqttBrokerAddon = class extends BaseAddon {
 				...external.clientIdPrefix !== void 0 ? { clientIdPrefix: external.clientIdPrefix } : {}
 			};
 		}
-		const embedded = this.deriveEmbeddedEntry();
-		if (embedded && embedded.id === id) {
-			const password = this.storedPassword(embedded.password);
-			return {
-				url: `mqtt://127.0.0.1:${embedded.port}`,
-				...embedded.username !== void 0 ? { username: embedded.username } : {},
-				...password !== void 0 ? { password } : {}
-			};
-		}
 		throw new Error(`mqtt-broker: broker '${id}' not found`);
 	}
 	async addBroker(input) {
@@ -123983,44 +124239,6 @@ var MqttBrokerAddon = class extends BaseAddon {
 		} });
 		return { id };
 	}
-	/**
-	* Create a per-entry ONBOARD broker from `broker.add` settings: allocate
-	* (or honour) a port, persist an `ExternalBrokerEntry` carrying an
-	* `onboard` descriptor, then spawn its dedicated `aedes` server.
-	*/
-	async addOnboardBroker(name, settings) {
-		const id = randomUUID();
-		const port = readOnboardPort(settings) ?? await findFreePort();
-		const built = buildOnboardEntry({
-			id,
-			name,
-			port,
-			settings
-		});
-		const entry = {
-			id: built.id,
-			name: built.name,
-			url: built.url,
-			...built.username !== void 0 ? { username: built.username } : {},
-			...built.password !== void 0 ? { password: built.password } : {},
-			onboard: built.onboard
-		};
-		const next = [...this.activeExternalBrokers, entry];
-		await this.persistExternalBrokers(next);
-		const spawn = this.onboardSpawnEntry(entry);
-		if (spawn) await this.spawnOnboard(spawn);
-		this.ctx.logger.info("onboard mqtt broker added", {
-			meta: {
-				id,
-				port
-			},
-			tags: {
-				topic: "mqtt-broker",
-				phase: "onboard-started"
-			}
-		});
-		return { id };
-	}
 	async removeBroker(id) {
 		const removed = this.activeExternalBrokers.find((b) => b.id === id);
 		if (removed) {
@@ -124031,13 +124249,6 @@ var MqttBrokerAddon = class extends BaseAddon {
 			this.ctx.logger.info("mqtt broker removed", { meta: { id } });
 			return;
 		}
-		const embedded = this.deriveEmbeddedEntry();
-		if (embedded && embedded.id === id) {
-			await this.shutdownEmbedded();
-			await this.updateGlobalSettings({ embeddedEnabled: false });
-			this.ctx.logger.info("embedded mqtt broker removed", { meta: { id } });
-			return;
-		}
 	}
 	async testConnection(id) {
 		let cfg;
@@ -124056,7 +124267,7 @@ var MqttBrokerAddon = class extends BaseAddon {
 	* One-shot connectivity probe against an MQTT endpoint built from a
 	* flat config (`{url, username?, password?}`). Shared by the
 	* id-keyed `testConnection` (existing broker) and the pre-creation
-	* `testSettings` (throwaway settings the operator hasn't saved yet).
+	* the instance test (`testInstance`) of a broker not saved yet (the typed values).
 	* Never throws — every failure resolves to `{ ok: false, error }`.
 	*/
 	async probeMqtt(cfg) {
@@ -124101,30 +124312,46 @@ var MqttBrokerAddon = class extends BaseAddon {
 			});
 		});
 	}
+	/** The `brokers` records, for the two legacy cap methods that create or switch off one. */
+	brokerRecordHandle() {
+		const handle = this.ctx.records?.kind(mqttBrokersEntryKind);
+		if (handle === void 0) throw new Error("mqtt-broker: the broker records are not open");
+		return handle;
+	}
+	/** Create an ONBOARD broker record; the reconcile then spawns its `aedes` server. */
 	async startEmbeddedBroker(input) {
-		if (this.embeddedRuntime) throw new Error("embedded broker already running — call stopEmbeddedBroker first");
-		const id = this.config.embeddedId || randomUUID();
-		const entry = {
+		const id = randomUUID();
+		const built = buildOnboardEntry({
 			id,
-			name: "Embedded broker",
+			name: LEGACY_EMBEDDED_NAME,
 			port: input.port,
-			allowAnonymous: input.allowAnonymous,
-			...input.username !== void 0 ? { username: input.username } : {},
-			...input.password !== void 0 ? { password: input.password } : {}
-		};
-		await this.spawnEmbedded(entry);
-		await this.updateGlobalSettings({
-			embeddedEnabled: true,
-			embeddedId: id,
-			embeddedPort: input.port,
-			embeddedAllowAnonymous: input.allowAnonymous,
-			embeddedUsername: input.username ?? "",
-			embeddedPassword: input.password ?? ""
+			settings: {
+				allowAnonymous: input.allowAnonymous,
+				...input.username !== void 0 ? { username: input.username } : {},
+				...input.password !== void 0 ? { password: input.password } : {}
+			}
 		});
+		const handle = this.brokerRecordHandle();
+		await handle.put({
+			id,
+			data: mqttBrokersEntryKind.schema.parse({
+				name: built.name,
+				url: built.url,
+				...built.username !== void 0 ? { username: built.username } : {},
+				...built.password !== void 0 ? { password: built.password } : {},
+				onboard: built.onboard
+			})
+		}, { ifRev: 0 });
+		await this.refreshExternalBrokers();
+		if (!this.onboardRuntimes.has(id)) {
+			await handle.delete(id);
+			await this.refreshExternalBrokers();
+			throw new Error(`embedded broker could not listen on port ${input.port}`);
+		}
 		this.ctx.logger.info("embedded mqtt broker started", {
 			meta: {
 				id,
-				port: entry.port
+				port: input.port
 			},
 			tags: {
 				topic: "mqtt-broker",
@@ -124146,20 +124373,22 @@ var MqttBrokerAddon = class extends BaseAddon {
 		});
 		return {
 			id,
-			url: `mqtt://127.0.0.1:${entry.port}`
+			url: built.url
 		};
 	}
+	/** Switch an onboard broker off (its record stays, so it can be switched on again). */
 	async stopEmbeddedBroker(id) {
-		if (!this.embeddedRuntime || this.embeddedRuntime.entry.id !== id) return;
-		await this.shutdownEmbedded();
-		await this.updateGlobalSettings({ embeddedEnabled: false });
+		const handle = this.brokerRecordHandle();
+		const row = await handle.get(id);
+		if (row === null || row.data.onboard === void 0) return;
+		await handle.patch(id, { enabled: false });
+		await this.refreshExternalBrokers();
 		this.ctx.logger.info("embedded mqtt broker stopped", { meta: { id } });
 	}
 	/**
 	* Build + listen an `aedes` server for `entry` and RETURN the runtime
-	* without assigning it to any field. Shared by the legacy single
-	* embedded broker ({@link spawnEmbedded}) and the per-entry onboard
-	* brokers ({@link spawnOnboard}).
+	* without assigning it to any field (the onboard brokers keep theirs in
+	* {@link spawnOnboard}).
 	*/
 	async spawnAedes(entry) {
 		const aedes = new import_aedes.default();
@@ -124198,15 +124427,6 @@ var MqttBrokerAddon = class extends BaseAddon {
 			aedes.close(() => resolve());
 		});
 	}
-	async spawnEmbedded(entry) {
-		this.embeddedRuntime = await this.spawnAedes(entry);
-	}
-	async shutdownEmbedded() {
-		if (!this.embeddedRuntime) return;
-		const runtime = this.embeddedRuntime;
-		this.embeddedRuntime = null;
-		await this.closeRuntime(runtime);
-	}
 	/** Spawn a dedicated onboard `aedes` server for an onboard entry. */
 	async spawnOnboard(entry) {
 		const runtime = await this.spawnAedes(entry);
@@ -124343,8 +124563,9 @@ var MqttBrokerAddon = class extends BaseAddon {
 	* (or whose username was removed entirely) get force-closed.
 	*/
 	reconcileEmbeddedClients() {
-		const runtime = this.embeddedRuntime;
-		if (!runtime) return;
+		for (const runtime of this.onboardRuntimes.values()) this.reconcileRuntimeClients(runtime);
+	}
+	reconcileRuntimeClients(runtime) {
 		const prevSnapshot = runtime.credentialsSnapshot;
 		const nextSnapshot = this.buildCredentialsSnapshot();
 		const affectedUsers = [];
@@ -124383,26 +124604,6 @@ var MqttBrokerAddon = class extends BaseAddon {
 		for (const c of this.activeEmbeddedClients) m.set(c.username, c.passwordHash);
 		return m;
 	}
-	/**
-	* Reassemble the internal {@link EmbeddedBrokerEntry} from the flat
-	* `embedded*` config keys the settings form writes. Returns `null`
-	* when the embedded broker is disabled — that's the signal
-	* `onConfigChanged` / `onInitialize` use to decide whether to spawn
-	* or shut down the `aedes` instance.
-	*/
-	deriveEmbeddedEntry() {
-		if (!this.config.embeddedEnabled) return null;
-		const username = this.config.embeddedUsername;
-		const password = this.config.embeddedPassword;
-		return {
-			id: this.config.embeddedId || "embedded",
-			name: "Embedded broker",
-			port: this.config.embeddedPort,
-			allowAnonymous: this.config.embeddedAllowAnonymous,
-			...username.length > 0 ? { username } : {},
-			...password.length > 0 ? { password } : {}
-		};
-	}
 	collectExternalProbeInputs() {
 		const out = [];
 		for (const b of this.activeExternalBrokers) {
@@ -124439,19 +124640,13 @@ var MqttBrokerAddon = class extends BaseAddon {
 	* here (no migration code ships): the operator's one-off `mqtt` step does.
 	*/
 	reportRetiredCiphertext() {
-		const paths = retiredCiphertextPaths({
-			brokers: this.activeExternalBrokers,
-			embeddedPassword: this.config.embeddedPassword
-		});
+		const paths = retiredCiphertextPaths({ brokers: this.activeExternalBrokers });
 		if (paths.length === 0) return;
 		const unreadable = [];
 		const values = [...this.activeExternalBrokers.map((b) => ({
 			id: `brokers[${b.id}].password`,
 			v: b.password
-		})), {
-			id: "embeddedPassword",
-			v: this.config.embeddedPassword
-		}];
+		}))];
 		for (const { id, v } of values) try {
 			this.storedPassword(v);
 		} catch (err) {
@@ -124475,13 +124670,79 @@ var MqttBrokerAddon = class extends BaseAddon {
 			}
 		});
 	}
-	brokerForm() {
+	/**
+	* The broker form. The create form (`id` null) offers "run an onboard broker" (CamStack hosts an
+	* `aedes` server on this hub: a port, anonymous access) or an external URL; an existing onboard
+	* broker edits only its credentials, since its address is the one it was given.
+	*/
+	brokerForm(id, onboard) {
+		const credentials = [{
+			type: "text",
+			key: "username",
+			label: "Username",
+			labelKey: "mqtt-broker:fullSettings.brokers.username.label"
+		}, {
+			type: "password",
+			key: "password",
+			label: "Password",
+			labelKey: "mqtt-broker:fullSettings.brokers.password.label",
+			showToggle: true
+		}];
+		if (onboard) return this.schema({ sections: [{
+			id: "broker",
+			title: "Onboard broker",
+			description: "A CamStack-hosted broker on this hub. Its port was chosen when it was created.",
+			columns: 1,
+			fields: credentials
+		}] });
+		const creating = id === null;
+		const external = {
+			field: "onboard",
+			equals: false
+		};
 		return this.schema({ sections: [{
 			id: "broker",
-			title: "External broker",
-			description: "A broker running outside CamStack (mosquitto, EMQX, HiveMQ, cloud bridges, …). The password is kept in the keychain.",
+			title: creating ? "MQTT broker" : "External broker",
+			description: creating ? "Run a broker on this hub, or connect to one running outside CamStack (mosquitto, EMQX, HiveMQ, cloud bridges, …). The password is kept in the keychain." : "A broker running outside CamStack (mosquitto, EMQX, HiveMQ, cloud bridges, …). The password is kept in the keychain.",
 			columns: 1,
 			fields: [
+				...creating ? [
+					{
+						type: "boolean",
+						key: "onboard",
+						label: "Run an onboard broker",
+						labelKey: "mqtt-broker:fullSettings.brokers.onboard.label",
+						description: "Spin up a CamStack-hosted aedes broker on this hub instead of connecting to an external one. Each onboard broker gets its own dedicated server + port.",
+						descriptionKey: "mqtt-broker:fullSettings.brokers.onboard.description",
+						default: false
+					},
+					{
+						type: "number",
+						key: "port",
+						label: "Port",
+						labelKey: "mqtt-broker:fullSettings.brokers.port.label",
+						placeholder: "(auto)",
+						description: "TCP port for the onboard broker. Leave blank to auto-allocate a free port.",
+						descriptionKey: "mqtt-broker:fullSettings.brokers.port.description",
+						showWhen: {
+							field: "onboard",
+							equals: true
+						}
+					},
+					{
+						type: "boolean",
+						key: "allowAnonymous",
+						label: "Allow anonymous",
+						labelKey: "mqtt-broker:fullSettings.brokers.allowAnonymous.label",
+						description: "Permit clients to connect without a username/password.",
+						descriptionKey: "mqtt-broker:fullSettings.brokers.allowAnonymous.description",
+						default: false,
+						showWhen: {
+							field: "onboard",
+							equals: true
+						}
+					}
+				] : [],
 				{
 					type: "text",
 					key: "url",
@@ -124489,26 +124750,15 @@ var MqttBrokerAddon = class extends BaseAddon {
 					labelKey: "mqtt-broker:fullSettings.brokers.url.label",
 					description: "mqtt://, mqtts://, ws://, wss://",
 					descriptionKey: "mqtt-broker:fullSettings.brokers.url.description",
-					required: true
-				},
-				{
-					type: "text",
-					key: "username",
-					label: "Username",
-					labelKey: "mqtt-broker:fullSettings.brokers.username.label"
-				},
-				{
-					type: "password",
-					key: "password",
-					label: "Password",
-					labelKey: "mqtt-broker:fullSettings.brokers.password.label",
-					showToggle: true
+					...creating ? { showWhen: external } : { required: true }
 				},
+				...credentials,
 				{
 					type: "text",
 					key: "clientIdPrefix",
 					label: "Client id prefix",
-					labelKey: "mqtt-broker:fullSettings.brokers.clientIdPrefix.label"
+					labelKey: "mqtt-broker:fullSettings.brokers.clientIdPrefix.label",
+					...creating ? { showWhen: external } : {}
 				}
 			]
 		}] });
@@ -124519,6 +124769,41 @@ var MqttBrokerAddon = class extends BaseAddon {
 		if (handle === void 0) throw new Error("records are not available");
 		return {
 			readRawBrokers: async () => (await this.ctx.settings?.readAddonStore())?.["brokers"],
+			readLegacyEmbedded: async () => {
+				const raw = await this.ctx.settings?.readAddonStore() ?? {};
+				const secrets = this.ctx.secrets;
+				const { value } = secrets === void 0 ? { value: raw } : await resolveSecretMarkers(raw, secrets, {
+					unresolved: "keep-marker",
+					ownedBy: secrets.owner
+				});
+				const text = (key) => {
+					const v = value[key];
+					return typeof v === "string" && v.length > 0 ? v : void 0;
+				};
+				const port = value["embeddedPort"];
+				const username = text("embeddedUsername");
+				const password = this.storedPassword(text("embeddedPassword"));
+				const enabled = value["embeddedEnabled"] === true;
+				if (!(enabled || text("embeddedId") !== void 0 || username !== void 0 || password !== void 0)) return null;
+				return {
+					enabled,
+					id: text("embeddedId") ?? "embedded",
+					port: typeof port === "number" && Number.isInteger(port) ? port : 1883,
+					allowAnonymous: value["embeddedAllowAnonymous"] === true,
+					...username !== void 0 ? { username } : {},
+					...password !== void 0 ? { password } : {}
+				};
+			},
+			readRawEmbeddedKeys: async () => {
+				const raw = await this.ctx.settings?.readAddonStore() ?? {};
+				return Object.fromEntries(LEGACY_EMBEDDED_KEYS.filter((key) => key in raw).map((key) => [key, raw[key]]));
+			},
+			putOnboardRecord: async (id, body) => {
+				await handle.put({
+					id,
+					data: mqttBrokersEntryKind.schema.parse(body)
+				}, { ifRev: 0 });
+			},
 			readRecords: async () => {
 				const page = await handle.query({ limit: 1e3 });
 				return new Map(page.records.map((r) => [r.id, { hasPassword: (r.data.password ?? "").length > 0 }]));
@@ -124531,184 +124816,109 @@ var MqttBrokerAddon = class extends BaseAddon {
 			}
 		};
 	}
+	scopedSettingsCapabilities() {
+		return ["mqtt-broker", "broker"];
+	}
 	/**
-	* The embedded broker, its credentials and the ACL. The external brokers are records, listed
+	* The credentials and the ACL of the onboard brokers. The brokers are records, listed
 	* on the Brokers page and edited as integration instances (`brokerForm`).
 	*/
-	globalSettingsSchema() {
-		return this.schema({ sections: [
-			{
-				id: "mqtt-broker-embedded",
-				title: "Embedded broker",
-				titleKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.title",
-				description: "Optional CamStack-hosted aedes broker. Enable it to run a broker on this hub without standing up an external one — its connection details are exposed through the `mqtt-broker` cap like any external entry.",
-				descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.description",
-				columns: 2,
-				fields: [
-					this.field({
-						type: "boolean",
-						key: "embeddedEnabled",
-						label: "Run embedded broker",
-						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedEnabled.label",
-						description: "Starts an aedes broker on this hub. Disabling it shuts the broker down and disconnects clients.",
-						descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedEnabled.description",
-						style: "switch",
-						default: false
-					}),
-					this.field({
-						type: "number",
-						key: "embeddedPort",
-						label: "Port",
-						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedPort.label",
-						description: "TCP port the embedded broker listens on.",
-						descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedPort.description",
-						min: 1,
-						max: 65535,
-						default: DEFAULT_EMBEDDED_PORT,
-						showWhen: {
-							field: "embeddedEnabled",
-							equals: true
-						}
-					}),
-					this.field({
-						type: "boolean",
-						key: "embeddedAllowAnonymous",
-						label: "Allow anonymous",
-						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedAllowAnonymous.label",
-						description: "Permit clients to connect without a username/password.",
-						descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedAllowAnonymous.description",
-						style: "switch",
-						default: false,
-						showWhen: {
-							field: "embeddedEnabled",
-							equals: true
-						}
-					}),
-					this.field({
-						type: "text",
-						key: "embeddedUsername",
-						label: "Shared username",
-						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedUsername.label",
-						description: "Legacy single-user fallback — used only when no per-client credentials are configured below.",
-						descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedUsername.description",
-						default: "",
-						showWhen: {
-							field: "embeddedEnabled",
-							equals: true
-						}
-					}),
-					this.field({
-						type: "password",
-						key: "embeddedPassword",
-						label: "Shared password",
-						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedPassword.label",
-						description: "Kept in the keychain. Paired with the shared username above.",
-						descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded.embeddedPassword.description",
-						showToggle: true,
-						default: "",
-						showWhen: {
-							field: "embeddedEnabled",
-							equals: true
-						}
-					})
-				]
-			},
-			{
-				id: "mqtt-broker-embedded-clients",
-				title: "Embedded broker — credentials",
-				titleKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.title",
-				description: "Per-client username + bcrypt password hash for the embedded aedes broker. Generate the hash with `npx bcrypt-cli` (or any bcrypt tool, cost factor 10) and paste it here.",
-				descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.description",
-				columns: 1,
-				fields: [{
-					type: "editable-array",
-					key: "embeddedClients",
-					label: "Clients",
-					labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.label",
-					emptyMessage: "No clients configured — embedded broker is in shared-creds / anonymous mode.",
-					addLabel: "Add client",
-					rowTitleTemplate: "{username}",
-					defaultItem: {
-						username: "",
-						passwordHash: ""
-					},
-					itemFields: [{
+	async clusterSettingsSchema(cap) {
+		if (cap !== "mqtt-broker" && cap !== "broker") return null;
+		return this.schema({ sections: [{
+			id: "mqtt-broker-embedded-clients",
+			title: "Embedded broker — credentials",
+			titleKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.title",
+			description: "Per-client username + bcrypt password hash for the embedded aedes broker. Generate the hash with `npx bcrypt-cli` (or any bcrypt tool, cost factor 10) and paste it here.",
+			descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.description",
+			columns: 1,
+			fields: [{
+				type: "editable-array",
+				key: "embeddedClients",
+				label: "Clients",
+				labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.label",
+				emptyMessage: "No clients configured — embedded broker is in shared-creds / anonymous mode.",
+				addLabel: "Add client",
+				rowTitleTemplate: "{username}",
+				defaultItem: {
+					username: "",
+					passwordHash: ""
+				},
+				itemFields: [{
+					type: "text",
+					key: "username",
+					label: "Username",
+					labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.username.label"
+				}, {
+					type: "text",
+					key: "passwordHash",
+					label: "bcrypt hash",
+					labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.passwordHash.label",
+					description: "bcrypt hash of the password (cost factor 10).",
+					descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.passwordHash.description"
+				}]
+			}]
+		}, {
+			id: "mqtt-broker-embedded-acl",
+			title: "Embedded broker — topic ACL",
+			titleKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.title",
+			description: "Per-user pub/sub allow-list. With zero rules the broker is fully open to authenticated clients. With at least one rule, every user needs at least one rule that matches the topic.",
+			descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.description",
+			columns: 1,
+			fields: [{
+				type: "editable-array",
+				key: "embeddedAcl",
+				label: "Rules",
+				labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.label",
+				emptyMessage: "No ACL rules — embedded broker is wide open to authenticated users.",
+				addLabel: "Add rule",
+				rowTitleTemplate: "{username} → {topicPattern} ({access})",
+				defaultItem: {
+					username: "",
+					topicPattern: "#",
+					access: "both"
+				},
+				itemFields: [
+					{
 						type: "text",
 						key: "username",
 						label: "Username",
-						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.username.label"
-					}, {
+						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.username.label"
+					},
+					{
 						type: "text",
-						key: "passwordHash",
-						label: "bcrypt hash",
-						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.passwordHash.label",
-						description: "bcrypt hash of the password (cost factor 10).",
-						descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-clients.embeddedClients.passwordHash.description"
-					}]
-				}]
-			},
-			{
-				id: "mqtt-broker-embedded-acl",
-				title: "Embedded broker — topic ACL",
-				titleKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.title",
-				description: "Per-user pub/sub allow-list. With zero rules the broker is fully open to authenticated clients. With at least one rule, every user needs at least one rule that matches the topic.",
-				descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.description",
-				columns: 1,
-				fields: [{
-					type: "editable-array",
-					key: "embeddedAcl",
-					label: "Rules",
-					labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.label",
-					emptyMessage: "No ACL rules — embedded broker is wide open to authenticated users.",
-					addLabel: "Add rule",
-					rowTitleTemplate: "{username} → {topicPattern} ({access})",
-					defaultItem: {
-						username: "",
-						topicPattern: "#",
-						access: "both"
+						key: "topicPattern",
+						label: "Topic pattern",
+						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.topicPattern.label",
+						description: "MQTT wildcards: `+` = single level, `#` = multi-level.",
+						descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.topicPattern.description"
 					},
-					itemFields: [
-						{
-							type: "text",
-							key: "username",
-							label: "Username",
-							labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.username.label"
-						},
-						{
-							type: "text",
-							key: "topicPattern",
-							label: "Topic pattern",
-							labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.topicPattern.label",
-							description: "MQTT wildcards: `+` = single level, `#` = multi-level.",
-							descriptionKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.topicPattern.description"
-						},
-						{
-							type: "select",
-							key: "access",
-							label: "Access",
-							labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.label",
-							options: [
-								{
-									value: "sub",
-									label: "Subscribe only",
-									labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.o_sub.label"
-								},
-								{
-									value: "pub",
-									label: "Publish only",
-									labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.o_pub.label"
-								},
-								{
-									value: "both",
-									label: "Subscribe + publish",
-									labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.o_both.label"
-								}
-							]
-						}
-					]
-				}]
-			}
-		] });
+					{
+						type: "select",
+						key: "access",
+						label: "Access",
+						labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.label",
+						options: [
+							{
+								value: "sub",
+								label: "Subscribe only",
+								labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.o_sub.label"
+							},
+							{
+								value: "pub",
+								label: "Publish only",
+								labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.o_pub.label"
+							},
+							{
+								value: "both",
+								label: "Subscribe + publish",
+								labelKey: "mqtt-broker:fullSettings.s_mqtt-broker-embedded-acl.embeddedAcl.access.o_both.label"
+							}
+						]
+					}
+				]
+			}]
+		}] });
 	}
 };
 /**
@@ -124738,13 +124948,6 @@ function bcryptCompareSafe(plain, hash) {
 	}
 }
 /**
-* Decide whether a config update to the embedded broker requires a full
-* restart (port change) or can be hot-reloaded (credential / ACL change).
-*/
-function requiresEmbeddedRespawn(desired, running) {
-	return desired.id !== running.id || desired.port !== running.port || desired.allowAnonymous !== running.allowAnonymous || desired.username !== running.username || desired.password !== running.password;
-}
-/**
 * Read the `username` field off an aedes Client without leaking a cast.
 * aedes attaches the username at runtime but its `.d.ts` doesn't carry
 * it — we narrow with a small structural check.
@@ -124797,15 +125000,5 @@ async function findFreePort() {
 		});
 	});
 }
-function mapMqttStatus(s) {
-	switch (s) {
-		case "connected": return "connected";
-		case "disconnected": return "disconnected";
-		case "auth-failed": return "auth-failed";
-		case "unreachable": return "unreachable";
-		case "tls-error": return "error";
-		default: return "error";
-	}
-}
 //#endregion
 export { MQTT_EMBEDDED_BCRYPT_ROUNDS, MqttBrokerAddon, MqttBrokerAddon as default };