@camstack/addon-matter-broker 0.2.157 → 0.2.159

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.159] - 2026-11-05
+
+### Changed
+
+- The integration form is declared as the instance form (the connection form); fabrics and their stored values are unchanged.
+
+## [0.2.158] - 2026-11-05
+
+### Changed
+
+- The Matter manifest declares multiple instances, as the integration already allowed.
+
 ## [0.2.157] - 2026-11-05
 
 ### Changed

package/dist/addon.js

@@ -5995,7 +5995,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-9TIHFj1w.mjs
+//#region ../types/dist/sleep-DEZaLbiu.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -6804,6 +6804,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>`.
 *
@@ -7695,6 +7701,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();
@@ -7764,6 +7777,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);
@@ -7773,6 +7787,7 @@ 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;
 	}
 	/**
@@ -7861,6 +7876,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;
@@ -7904,7 +7929,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 });
@@ -8035,6 +8061,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);
 	}
@@ -8045,6 +8072,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);
 	}
@@ -8147,6 +8175,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);
@@ -8160,7 +8189,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`
@@ -8168,14 +8198,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;
 	}
 	/**
@@ -8185,10 +8268,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);
 		}
@@ -8384,12 +8466,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];
@@ -8485,7 +8569,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() {
@@ -8735,6 +8823,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) {
@@ -13403,12 +13508,22 @@ var RecordIntegrationInstances = class {
 		...this.hooks.description,
 		mintsId: true
 	};
-	instanceFormSchema = async ({ id }) => this.hooks.formSchema(id);
+	/**
+	* The record an id names. A caller holding the `integrations` registry id (the Integrations
+	* page) reaches a kind whose body links to it through `integrationId`; an id that is itself a
+	* record id answers as it is. An id that names nothing comes back unchanged.
+	*/
+	async resolveRecordId(id) {
+		if (await this.handle.get(id) !== null) return id;
+		const linked = (await this.handle.query({ limit: INSTANCES_LIST_MAX })).records.find((record) => record.data["integrationId"] === id);
+		return linked === void 0 ? id : linked.id;
+	}
+	instanceFormSchema = async ({ id }) => this.hooks.formSchema(id === null ? null : await this.resolveRecordId(id));
 	listInstances = async () => {
 		return (await this.handle.query({ limit: INSTANCES_LIST_MAX })).records.map((record) => this.viewOf(record));
 	};
 	getInstance = async ({ id }) => {
-		const record = await this.handle.get(id);
+		const record = await this.handle.get(await this.resolveRecordId(id));
 		return record === null ? null : this.viewOf(record);
 	};
 	/** Insert ONE row (`ifRev: 0`: an existing id is refused, never overwritten). */
@@ -13425,7 +13540,8 @@ var RecordIntegrationInstances = class {
 		await this.hooks.onChanged?.(minted, "created");
 		return { id: minted };
 	};
-	updateInstance = async ({ id, name, values }) => {
+	updateInstance = async ({ id: askedId, name, values }) => {
+		const id = await this.resolveRecordId(askedId);
 		const patch = {};
 		for (const [key, value] of Object.entries(values)) {
 			if (value === void 0) continue;
@@ -13460,7 +13576,10 @@ var RecordIntegrationInstances = class {
 			status: "unsupported",
 			error: "This integration declares no connection test"
 		};
-		return this.hooks.test(input);
+		return this.hooks.test(input.id === null ? input : {
+			...input,
+			id: await this.resolveRecordId(input.id)
+		});
 	};
 	/** The flat provider object to hand to `registerProvider`. */
 	toProvider() {
@@ -97060,6 +97179,111 @@ object({
 	commands: record(string$2(), unknown())
 });
 //#endregion
+//#region src/config.ts
+/**
+* Matter broker connection settings for ONE fabric/controller (one broker entry).
+* v1 is intentionally minimal: optional Thread / Wi-Fi credentials supplied up
+* front for wireless commissioning. The pairing code itself is NOT stored here —
+* it is passed transiently to the commissioning action.
+*
+* The fabric credentials (root cert / NOC / node registry) live in the addon
+* `dataDir` via the controller's storage, NEVER in this typed KV.
+*/
+var matterConnectionSchema = object({
+	/** Optional Thread operational dataset (hex) for Thread device onboarding. */
+	threadDataset: string$2().default("").describe("Thread operational dataset (hex) — required only for Thread devices").meta({ secret: true }),
+	/** Optional Wi-Fi SSID for Wi-Fi device onboarding over BLE. */
+	wifiSsid: string$2().default("").describe("Wi-Fi SSID — required only for BLE Wi-Fi onboarding"),
+	/** Optional Wi-Fi password for Wi-Fi device onboarding over BLE. */
+	wifiPassword: string$2().default("").describe("Wi-Fi password (optional)").meta({ secret: true }),
+	/** PULL-reconcile interval for the commissioned-node inventory. */
+	reconcileIntervalMs: preprocess((v) => v === "" || v === null ? void 0 : v, number().int().min(1e4).max(864e5).default(3e5)).describe("Node-inventory reconcile interval (ms)")
+});
+/** A single registered Matter fabric ("broker"). */
+var MatterBrokerEntrySchema = object({
+	id: string$2().min(1),
+	name: string$2().min(1),
+	connection: matterConnectionSchema,
+	integrationId: string$2().optional(),
+	/** Absent means on; the instances page switches a fabric off without deleting it. */
+	enabled: boolean().optional()
+});
+/** Top-level addon config — the fabrics are records, so nothing is left here. */
+var matterAddonConfigSchema = object({});
+/** Narrow an `unknown` to a shallow plain-object record (cast-free boundary). */
+function toRecord(value) {
+	if (typeof value === "object" && value !== null && !Array.isArray(value)) return Object.fromEntries(Object.entries(value));
+	return {};
+}
+/** Coerce a loose settings blob through the connection schema, applying defaults. */
+function settingsToMatterConnection(settings) {
+	return matterConnectionSchema.parse(toRecord(settings));
+}
+/**
+* Settings readers see an empty string for both secrets. The stored value
+* stays in the keychain (records `secret` meta). An empty round-trip must
+* not wipe it — see {@link mergeMatterSecrets}.
+*/
+function publicMatterConnection(connection) {
+	return {
+		...connection,
+		wifiPassword: "",
+		threadDataset: ""
+	};
+}
+/** Keep a stored secret when the form sent back the redacted empty string. */
+function mergeMatterSecrets(existing, incoming) {
+	return {
+		...incoming,
+		wifiPassword: incoming.wifiPassword.length > 0 ? incoming.wifiPassword : existing.wifiPassword,
+		threadDataset: incoming.threadDataset.length > 0 ? incoming.threadDataset : existing.threadDataset
+	};
+}
+/** Hand-written connection form for the broker/integration creation UI. */
+function buildConnectionFormSchema() {
+	return { sections: [{
+		id: "matter-fabric",
+		title: "Matter fabric",
+		titleKey: "matter-broker:connection.s_matter-fabric.title",
+		description: "CamStack owns a Matter fabric on this hub. Add wireless onboarding credentials only if you will commission Thread or BLE-Wi-Fi devices. On-network (Ethernet/Wi-Fi) Matter devices need none of these.",
+		descriptionKey: "matter-broker:connection.s_matter-fabric.description",
+		columns: 1,
+		fields: [
+			{
+				type: "password",
+				key: "threadDataset",
+				secret: true,
+				showToggle: true,
+				label: "Thread operational dataset (hex, optional)",
+				labelKey: "matter-broker:connection.s_matter-fabric.threadDataset.label",
+				placeholder: "0e08000000000001…"
+			},
+			{
+				type: "text",
+				key: "wifiSsid",
+				label: "Wi-Fi SSID (optional)",
+				labelKey: "matter-broker:connection.s_matter-fabric.wifiSsid.label"
+			},
+			{
+				type: "password",
+				key: "wifiPassword",
+				label: "Wi-Fi password (optional)",
+				labelKey: "matter-broker:connection.s_matter-fabric.wifiPassword.label",
+				showToggle: true
+			},
+			{
+				type: "number",
+				key: "reconcileIntervalMs",
+				label: "Node reconcile interval (ms)",
+				labelKey: "matter-broker:connection.s_matter-fabric.reconcileIntervalMs.label",
+				min: 1e4,
+				max: 864e5,
+				default: 3e5
+			}
+		]
+	}] };
+}
+//#endregion
 //#region ../../node_modules/@matter/general/dist/esm/net/tcp/TcpConnection.js
 /**
 * @license
@@ -207386,8 +207610,8 @@ function sameConnection(a, b) {
 * Manages N live Matter fabric connections ("brokers"), each backed by a
 * {@link MatterIntegrationManager}. Allocates stable ids (`matter_001`, …), CRUD,
 * an integration FK index, lifecycle helpers. Mirrors the Ecowitt / Dreame
-* registry. Because `instanceMode` is `unique`, the common case is exactly one
-* fabric, but the namespace tolerates multiple.
+* registry. The integration is `instanceMode: multiple`: the common case is one
+* fabric, and an operator may add more.
 */
 var MatterBrokerRegistry = class {
 	#logger;
@@ -207575,111 +207799,6 @@ var MatterBrokerRegistry = class {
 	}
 };
 //#endregion
-//#region src/config.ts
-/**
-* Matter broker connection settings for ONE fabric/controller (one broker entry).
-* v1 is intentionally minimal: optional Thread / Wi-Fi credentials supplied up
-* front for wireless commissioning. The pairing code itself is NOT stored here —
-* it is passed transiently to the commissioning action.
-*
-* The fabric credentials (root cert / NOC / node registry) live in the addon
-* `dataDir` via the controller's storage, NEVER in this typed KV.
-*/
-var matterConnectionSchema = object({
-	/** Optional Thread operational dataset (hex) for Thread device onboarding. */
-	threadDataset: string$2().default("").describe("Thread operational dataset (hex) — required only for Thread devices").meta({ secret: true }),
-	/** Optional Wi-Fi SSID for Wi-Fi device onboarding over BLE. */
-	wifiSsid: string$2().default("").describe("Wi-Fi SSID — required only for BLE Wi-Fi onboarding"),
-	/** Optional Wi-Fi password for Wi-Fi device onboarding over BLE. */
-	wifiPassword: string$2().default("").describe("Wi-Fi password (optional)").meta({ secret: true }),
-	/** PULL-reconcile interval for the commissioned-node inventory. */
-	reconcileIntervalMs: preprocess((v) => v === "" || v === null ? void 0 : v, number().int().min(1e4).max(864e5).default(3e5)).describe("Node-inventory reconcile interval (ms)")
-});
-/** A single registered Matter fabric ("broker"). */
-var MatterBrokerEntrySchema = object({
-	id: string$2().min(1),
-	name: string$2().min(1),
-	connection: matterConnectionSchema,
-	integrationId: string$2().optional(),
-	/** Absent means on; the instances page switches a fabric off without deleting it. */
-	enabled: boolean().optional()
-});
-/** Top-level addon config — the fabrics are records, so nothing is left here. */
-var matterAddonConfigSchema = object({});
-/** Narrow an `unknown` to a shallow plain-object record (cast-free boundary). */
-function toRecord(value) {
-	if (typeof value === "object" && value !== null && !Array.isArray(value)) return Object.fromEntries(Object.entries(value));
-	return {};
-}
-/** Coerce a loose settings blob through the connection schema, applying defaults. */
-function settingsToMatterConnection(settings) {
-	return matterConnectionSchema.parse(toRecord(settings));
-}
-/**
-* Settings readers see an empty string for both secrets. The stored value
-* stays in the keychain (records `secret` meta). An empty round-trip must
-* not wipe it — see {@link mergeMatterSecrets}.
-*/
-function publicMatterConnection(connection) {
-	return {
-		...connection,
-		wifiPassword: "",
-		threadDataset: ""
-	};
-}
-/** Keep a stored secret when the form sent back the redacted empty string. */
-function mergeMatterSecrets(existing, incoming) {
-	return {
-		...incoming,
-		wifiPassword: incoming.wifiPassword.length > 0 ? incoming.wifiPassword : existing.wifiPassword,
-		threadDataset: incoming.threadDataset.length > 0 ? incoming.threadDataset : existing.threadDataset
-	};
-}
-/** Hand-written connection form for the broker/integration creation UI. */
-function buildConnectionFormSchema() {
-	return { sections: [{
-		id: "matter-fabric",
-		title: "Matter fabric",
-		titleKey: "matter-broker:connection.s_matter-fabric.title",
-		description: "CamStack owns a Matter fabric on this hub. Add wireless onboarding credentials only if you will commission Thread or BLE-Wi-Fi devices. On-network (Ethernet/Wi-Fi) Matter devices need none of these.",
-		descriptionKey: "matter-broker:connection.s_matter-fabric.description",
-		columns: 1,
-		fields: [
-			{
-				type: "password",
-				key: "threadDataset",
-				secret: true,
-				showToggle: true,
-				label: "Thread operational dataset (hex, optional)",
-				labelKey: "matter-broker:connection.s_matter-fabric.threadDataset.label",
-				placeholder: "0e08000000000001…"
-			},
-			{
-				type: "text",
-				key: "wifiSsid",
-				label: "Wi-Fi SSID (optional)",
-				labelKey: "matter-broker:connection.s_matter-fabric.wifiSsid.label"
-			},
-			{
-				type: "password",
-				key: "wifiPassword",
-				label: "Wi-Fi password (optional)",
-				labelKey: "matter-broker:connection.s_matter-fabric.wifiPassword.label",
-				showToggle: true
-			},
-			{
-				type: "number",
-				key: "reconcileIntervalMs",
-				label: "Node reconcile interval (ms)",
-				labelKey: "matter-broker:connection.s_matter-fabric.reconcileIntervalMs.label",
-				min: 1e4,
-				max: 864e5,
-				default: 3e5
-			}
-		]
-	}] };
-}
-//#endregion
 //#region src/matter-commissioning.ts
 /** A clear validation error for a malformed pairing code. */
 var InvalidPairingCodeError = class extends Error {
@@ -209241,22 +209360,9 @@ var MatterBrokerAddon = class extends BaseDeviceProvider {
 			}
 		});
 	}
-	globalSettingsSchema() {
-		return this.schema({ sections: [{
-			id: "matter-fabric",
-			title: "Matter fabric",
-			titleKey: "matter-broker:globalSettings.s_matter-fabric.title",
-			description: "Matter fabrics are managed in the External systems → Brokers tab.",
-			descriptionKey: "matter-broker:globalSettings.s_matter-fabric.description",
-			columns: 1,
-			fields: [{
-				type: "info",
-				key: "fabricHelp",
-				label: "Fabrics are managed separately",
-				labelKey: "matter-broker:globalSettings.s_matter-fabric.fabricHelp.label",
-				content: "This integration links to a Matter fabric broker. Add, edit, or remove fabrics from External systems → Brokers, then commission devices into the fabric. The integration only stores a reference to its broker."
-			}]
-		}] });
+	/** The connection form a record carries; the values live on the record, never in `addon-settings`. */
+	async integrationFormSchema(_instance) {
+		return buildConnectionFormSchema();
 	}
 	async supportsManualCreation() {
 		return false;

package/dist/addon.mjs

@@ -5993,7 +5993,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-9TIHFj1w.mjs
+//#region ../types/dist/sleep-DEZaLbiu.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -6802,6 +6802,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>`.
 *
@@ -7693,6 +7699,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();
@@ -7762,6 +7775,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);
@@ -7771,6 +7785,7 @@ 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;
 	}
 	/**
@@ -7859,6 +7874,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;
@@ -7902,7 +7927,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 });
@@ -8033,6 +8059,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);
 	}
@@ -8043,6 +8070,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);
 	}
@@ -8145,6 +8173,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);
@@ -8158,7 +8187,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`
@@ -8166,14 +8196,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;
 	}
 	/**
@@ -8183,10 +8266,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);
 		}
@@ -8382,12 +8464,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];
@@ -8483,7 +8567,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() {
@@ -8733,6 +8821,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) {
@@ -13401,12 +13506,22 @@ var RecordIntegrationInstances = class {
 		...this.hooks.description,
 		mintsId: true
 	};
-	instanceFormSchema = async ({ id }) => this.hooks.formSchema(id);
+	/**
+	* The record an id names. A caller holding the `integrations` registry id (the Integrations
+	* page) reaches a kind whose body links to it through `integrationId`; an id that is itself a
+	* record id answers as it is. An id that names nothing comes back unchanged.
+	*/
+	async resolveRecordId(id) {
+		if (await this.handle.get(id) !== null) return id;
+		const linked = (await this.handle.query({ limit: INSTANCES_LIST_MAX })).records.find((record) => record.data["integrationId"] === id);
+		return linked === void 0 ? id : linked.id;
+	}
+	instanceFormSchema = async ({ id }) => this.hooks.formSchema(id === null ? null : await this.resolveRecordId(id));
 	listInstances = async () => {
 		return (await this.handle.query({ limit: INSTANCES_LIST_MAX })).records.map((record) => this.viewOf(record));
 	};
 	getInstance = async ({ id }) => {
-		const record = await this.handle.get(id);
+		const record = await this.handle.get(await this.resolveRecordId(id));
 		return record === null ? null : this.viewOf(record);
 	};
 	/** Insert ONE row (`ifRev: 0`: an existing id is refused, never overwritten). */
@@ -13423,7 +13538,8 @@ var RecordIntegrationInstances = class {
 		await this.hooks.onChanged?.(minted, "created");
 		return { id: minted };
 	};
-	updateInstance = async ({ id, name, values }) => {
+	updateInstance = async ({ id: askedId, name, values }) => {
+		const id = await this.resolveRecordId(askedId);
 		const patch = {};
 		for (const [key, value] of Object.entries(values)) {
 			if (value === void 0) continue;
@@ -13458,7 +13574,10 @@ var RecordIntegrationInstances = class {
 			status: "unsupported",
 			error: "This integration declares no connection test"
 		};
-		return this.hooks.test(input);
+		return this.hooks.test(input.id === null ? input : {
+			...input,
+			id: await this.resolveRecordId(input.id)
+		});
 	};
 	/** The flat provider object to hand to `registerProvider`. */
 	toProvider() {
@@ -97058,6 +97177,111 @@ object({
 	commands: record(string$2(), unknown())
 });
 //#endregion
+//#region src/config.ts
+/**
+* Matter broker connection settings for ONE fabric/controller (one broker entry).
+* v1 is intentionally minimal: optional Thread / Wi-Fi credentials supplied up
+* front for wireless commissioning. The pairing code itself is NOT stored here —
+* it is passed transiently to the commissioning action.
+*
+* The fabric credentials (root cert / NOC / node registry) live in the addon
+* `dataDir` via the controller's storage, NEVER in this typed KV.
+*/
+var matterConnectionSchema = object({
+	/** Optional Thread operational dataset (hex) for Thread device onboarding. */
+	threadDataset: string$2().default("").describe("Thread operational dataset (hex) — required only for Thread devices").meta({ secret: true }),
+	/** Optional Wi-Fi SSID for Wi-Fi device onboarding over BLE. */
+	wifiSsid: string$2().default("").describe("Wi-Fi SSID — required only for BLE Wi-Fi onboarding"),
+	/** Optional Wi-Fi password for Wi-Fi device onboarding over BLE. */
+	wifiPassword: string$2().default("").describe("Wi-Fi password (optional)").meta({ secret: true }),
+	/** PULL-reconcile interval for the commissioned-node inventory. */
+	reconcileIntervalMs: preprocess((v) => v === "" || v === null ? void 0 : v, number().int().min(1e4).max(864e5).default(3e5)).describe("Node-inventory reconcile interval (ms)")
+});
+/** A single registered Matter fabric ("broker"). */
+var MatterBrokerEntrySchema = object({
+	id: string$2().min(1),
+	name: string$2().min(1),
+	connection: matterConnectionSchema,
+	integrationId: string$2().optional(),
+	/** Absent means on; the instances page switches a fabric off without deleting it. */
+	enabled: boolean().optional()
+});
+/** Top-level addon config — the fabrics are records, so nothing is left here. */
+var matterAddonConfigSchema = object({});
+/** Narrow an `unknown` to a shallow plain-object record (cast-free boundary). */
+function toRecord(value) {
+	if (typeof value === "object" && value !== null && !Array.isArray(value)) return Object.fromEntries(Object.entries(value));
+	return {};
+}
+/** Coerce a loose settings blob through the connection schema, applying defaults. */
+function settingsToMatterConnection(settings) {
+	return matterConnectionSchema.parse(toRecord(settings));
+}
+/**
+* Settings readers see an empty string for both secrets. The stored value
+* stays in the keychain (records `secret` meta). An empty round-trip must
+* not wipe it — see {@link mergeMatterSecrets}.
+*/
+function publicMatterConnection(connection) {
+	return {
+		...connection,
+		wifiPassword: "",
+		threadDataset: ""
+	};
+}
+/** Keep a stored secret when the form sent back the redacted empty string. */
+function mergeMatterSecrets(existing, incoming) {
+	return {
+		...incoming,
+		wifiPassword: incoming.wifiPassword.length > 0 ? incoming.wifiPassword : existing.wifiPassword,
+		threadDataset: incoming.threadDataset.length > 0 ? incoming.threadDataset : existing.threadDataset
+	};
+}
+/** Hand-written connection form for the broker/integration creation UI. */
+function buildConnectionFormSchema() {
+	return { sections: [{
+		id: "matter-fabric",
+		title: "Matter fabric",
+		titleKey: "matter-broker:connection.s_matter-fabric.title",
+		description: "CamStack owns a Matter fabric on this hub. Add wireless onboarding credentials only if you will commission Thread or BLE-Wi-Fi devices. On-network (Ethernet/Wi-Fi) Matter devices need none of these.",
+		descriptionKey: "matter-broker:connection.s_matter-fabric.description",
+		columns: 1,
+		fields: [
+			{
+				type: "password",
+				key: "threadDataset",
+				secret: true,
+				showToggle: true,
+				label: "Thread operational dataset (hex, optional)",
+				labelKey: "matter-broker:connection.s_matter-fabric.threadDataset.label",
+				placeholder: "0e08000000000001…"
+			},
+			{
+				type: "text",
+				key: "wifiSsid",
+				label: "Wi-Fi SSID (optional)",
+				labelKey: "matter-broker:connection.s_matter-fabric.wifiSsid.label"
+			},
+			{
+				type: "password",
+				key: "wifiPassword",
+				label: "Wi-Fi password (optional)",
+				labelKey: "matter-broker:connection.s_matter-fabric.wifiPassword.label",
+				showToggle: true
+			},
+			{
+				type: "number",
+				key: "reconcileIntervalMs",
+				label: "Node reconcile interval (ms)",
+				labelKey: "matter-broker:connection.s_matter-fabric.reconcileIntervalMs.label",
+				min: 1e4,
+				max: 864e5,
+				default: 3e5
+			}
+		]
+	}] };
+}
+//#endregion
 //#region ../../node_modules/@matter/general/dist/esm/net/tcp/TcpConnection.js
 /**
 * @license
@@ -207384,8 +207608,8 @@ function sameConnection(a, b) {
 * Manages N live Matter fabric connections ("brokers"), each backed by a
 * {@link MatterIntegrationManager}. Allocates stable ids (`matter_001`, …), CRUD,
 * an integration FK index, lifecycle helpers. Mirrors the Ecowitt / Dreame
-* registry. Because `instanceMode` is `unique`, the common case is exactly one
-* fabric, but the namespace tolerates multiple.
+* registry. The integration is `instanceMode: multiple`: the common case is one
+* fabric, and an operator may add more.
 */
 var MatterBrokerRegistry = class {
 	#logger;
@@ -207573,111 +207797,6 @@ var MatterBrokerRegistry = class {
 	}
 };
 //#endregion
-//#region src/config.ts
-/**
-* Matter broker connection settings for ONE fabric/controller (one broker entry).
-* v1 is intentionally minimal: optional Thread / Wi-Fi credentials supplied up
-* front for wireless commissioning. The pairing code itself is NOT stored here —
-* it is passed transiently to the commissioning action.
-*
-* The fabric credentials (root cert / NOC / node registry) live in the addon
-* `dataDir` via the controller's storage, NEVER in this typed KV.
-*/
-var matterConnectionSchema = object({
-	/** Optional Thread operational dataset (hex) for Thread device onboarding. */
-	threadDataset: string$2().default("").describe("Thread operational dataset (hex) — required only for Thread devices").meta({ secret: true }),
-	/** Optional Wi-Fi SSID for Wi-Fi device onboarding over BLE. */
-	wifiSsid: string$2().default("").describe("Wi-Fi SSID — required only for BLE Wi-Fi onboarding"),
-	/** Optional Wi-Fi password for Wi-Fi device onboarding over BLE. */
-	wifiPassword: string$2().default("").describe("Wi-Fi password (optional)").meta({ secret: true }),
-	/** PULL-reconcile interval for the commissioned-node inventory. */
-	reconcileIntervalMs: preprocess((v) => v === "" || v === null ? void 0 : v, number().int().min(1e4).max(864e5).default(3e5)).describe("Node-inventory reconcile interval (ms)")
-});
-/** A single registered Matter fabric ("broker"). */
-var MatterBrokerEntrySchema = object({
-	id: string$2().min(1),
-	name: string$2().min(1),
-	connection: matterConnectionSchema,
-	integrationId: string$2().optional(),
-	/** Absent means on; the instances page switches a fabric off without deleting it. */
-	enabled: boolean().optional()
-});
-/** Top-level addon config — the fabrics are records, so nothing is left here. */
-var matterAddonConfigSchema = object({});
-/** Narrow an `unknown` to a shallow plain-object record (cast-free boundary). */
-function toRecord(value) {
-	if (typeof value === "object" && value !== null && !Array.isArray(value)) return Object.fromEntries(Object.entries(value));
-	return {};
-}
-/** Coerce a loose settings blob through the connection schema, applying defaults. */
-function settingsToMatterConnection(settings) {
-	return matterConnectionSchema.parse(toRecord(settings));
-}
-/**
-* Settings readers see an empty string for both secrets. The stored value
-* stays in the keychain (records `secret` meta). An empty round-trip must
-* not wipe it — see {@link mergeMatterSecrets}.
-*/
-function publicMatterConnection(connection) {
-	return {
-		...connection,
-		wifiPassword: "",
-		threadDataset: ""
-	};
-}
-/** Keep a stored secret when the form sent back the redacted empty string. */
-function mergeMatterSecrets(existing, incoming) {
-	return {
-		...incoming,
-		wifiPassword: incoming.wifiPassword.length > 0 ? incoming.wifiPassword : existing.wifiPassword,
-		threadDataset: incoming.threadDataset.length > 0 ? incoming.threadDataset : existing.threadDataset
-	};
-}
-/** Hand-written connection form for the broker/integration creation UI. */
-function buildConnectionFormSchema() {
-	return { sections: [{
-		id: "matter-fabric",
-		title: "Matter fabric",
-		titleKey: "matter-broker:connection.s_matter-fabric.title",
-		description: "CamStack owns a Matter fabric on this hub. Add wireless onboarding credentials only if you will commission Thread or BLE-Wi-Fi devices. On-network (Ethernet/Wi-Fi) Matter devices need none of these.",
-		descriptionKey: "matter-broker:connection.s_matter-fabric.description",
-		columns: 1,
-		fields: [
-			{
-				type: "password",
-				key: "threadDataset",
-				secret: true,
-				showToggle: true,
-				label: "Thread operational dataset (hex, optional)",
-				labelKey: "matter-broker:connection.s_matter-fabric.threadDataset.label",
-				placeholder: "0e08000000000001…"
-			},
-			{
-				type: "text",
-				key: "wifiSsid",
-				label: "Wi-Fi SSID (optional)",
-				labelKey: "matter-broker:connection.s_matter-fabric.wifiSsid.label"
-			},
-			{
-				type: "password",
-				key: "wifiPassword",
-				label: "Wi-Fi password (optional)",
-				labelKey: "matter-broker:connection.s_matter-fabric.wifiPassword.label",
-				showToggle: true
-			},
-			{
-				type: "number",
-				key: "reconcileIntervalMs",
-				label: "Node reconcile interval (ms)",
-				labelKey: "matter-broker:connection.s_matter-fabric.reconcileIntervalMs.label",
-				min: 1e4,
-				max: 864e5,
-				default: 3e5
-			}
-		]
-	}] };
-}
-//#endregion
 //#region src/matter-commissioning.ts
 /** A clear validation error for a malformed pairing code. */
 var InvalidPairingCodeError = class extends Error {
@@ -209239,22 +209358,9 @@ var MatterBrokerAddon = class extends BaseDeviceProvider {
 			}
 		});
 	}
-	globalSettingsSchema() {
-		return this.schema({ sections: [{
-			id: "matter-fabric",
-			title: "Matter fabric",
-			titleKey: "matter-broker:globalSettings.s_matter-fabric.title",
-			description: "Matter fabrics are managed in the External systems → Brokers tab.",
-			descriptionKey: "matter-broker:globalSettings.s_matter-fabric.description",
-			columns: 1,
-			fields: [{
-				type: "info",
-				key: "fabricHelp",
-				label: "Fabrics are managed separately",
-				labelKey: "matter-broker:globalSettings.s_matter-fabric.fabricHelp.label",
-				content: "This integration links to a Matter fabric broker. Add, edit, or remove fabrics from External systems → Brokers, then commission devices into the fabric. The integration only stores a reference to its broker."
-			}]
-		}] });
+	/** The connection form a record carries; the values live on the record, never in `addon-settings`. */
+	async integrationFormSchema(_instance) {
+		return buildConnectionFormSchema();
 	}
 	async supportsManualCreation() {
 		return false;
@@ -209303,4 +209409,4 @@ function endpointsEqual(a, b) {
 	return true;
 }
 //#endregion
-export { MatterBrokerAddon, parsePairingCode as a, matterConnectionSchema as c, endpointLabel as d, mapMatterEndpointToCamStack as f, createMatterController as h, isValidPairingCode as i, settingsToMatterConnection as l, StubMatterController as m, endpointNativeId as n, buildConnectionFormSchema as o, MatterControllerNotWiredError as p, InvalidPairingCodeError as r, matterAddonConfigSchema as s, buildMatterNodeCandidate as t, MatterClusterId as u };
+export { MatterBrokerAddon, parsePairingCode as a, mapMatterEndpointToCamStack as c, createMatterController as d, buildConnectionFormSchema as f, settingsToMatterConnection as h, isValidPairingCode as i, MatterControllerNotWiredError as l, matterConnectionSchema as m, endpointNativeId as n, MatterClusterId as o, matterAddonConfigSchema as p, InvalidPairingCodeError as r, endpointLabel as s, buildMatterNodeCandidate as t, StubMatterController as u };

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { MatterBrokerAddon, a as parsePairingCode, c as matterConnectionSchema, d as endpointLabel, f as mapMatterEndpointToCamStack, h as createMatterController, i as isValidPairingCode, l as settingsToMatterConnection, m as StubMatterController, n as endpointNativeId, o as buildConnectionFormSchema, p as MatterControllerNotWiredError, r as InvalidPairingCodeError, s as matterAddonConfigSchema, t as buildMatterNodeCandidate, u as MatterClusterId } from "./addon.mjs";
+import { MatterBrokerAddon, a as parsePairingCode, c as mapMatterEndpointToCamStack, d as createMatterController, f as buildConnectionFormSchema, h as settingsToMatterConnection, i as isValidPairingCode, l as MatterControllerNotWiredError, m as matterConnectionSchema, n as endpointNativeId, o as MatterClusterId, p as matterAddonConfigSchema, r as InvalidPairingCodeError, s as endpointLabel, t as buildMatterNodeCandidate, u as StubMatterController } from "./addon.mjs";
 export { InvalidPairingCodeError, MatterBrokerAddon, MatterClusterId, MatterControllerNotWiredError, StubMatterController, buildConnectionFormSchema, buildMatterNodeCandidate, createMatterController, endpointLabel, endpointNativeId, isValidPairingCode, mapMatterEndpointToCamStack, matterAddonConfigSchema, matterConnectionSchema, parsePairingCode, settingsToMatterConnection };

package/i18n/en.json

@@ -1,7 +1,4 @@
 {
-  "globalSettings.s_matter-fabric.title": "Matter fabric",
-  "globalSettings.s_matter-fabric.description": "Matter fabrics are managed in the External systems → Brokers tab.",
-  "globalSettings.s_matter-fabric.fabricHelp.label": "Fabrics are managed separately",
   "connection.s_matter-fabric.title": "Matter fabric",
   "connection.s_matter-fabric.description": "CamStack owns a Matter fabric on this hub. Add wireless onboarding credentials only if you will commission Thread or BLE-Wi-Fi devices. On-network (Ethernet/Wi-Fi) Matter devices need none of these.",
   "connection.s_matter-fabric.threadDataset.label": "Thread operational dataset (hex, optional)",

package/i18n/it.json

@@ -1,7 +1,4 @@
 {
-  "globalSettings.s_matter-fabric.title": "Fabric Matter",
-  "globalSettings.s_matter-fabric.description": "I fabric Matter si gestiscono nella scheda Sistemi esterni → Broker.",
-  "globalSettings.s_matter-fabric.fabricHelp.label": "I fabric si gestiscono separatamente",
   "connection.s_matter-fabric.title": "Fabric Matter",
   "connection.s_matter-fabric.description": "CamStack gestisce un fabric Matter su questo hub. Aggiungi le credenziali di onboarding wireless solo se metterai in servizio dispositivi Thread o BLE-Wi-Fi. I dispositivi Matter sulla rete (Ethernet/Wi-Fi) non ne hanno bisogno.",
   "connection.s_matter-fabric.threadDataset.label": "Dataset operativo Thread (esadecimale, facoltativo)",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-matter-broker",
-  "version": "0.2.157",
+  "version": "0.2.159",
   "description": "Matter broker addon for CamStack — owns a Matter fabric (commissioning + the long-lived controller) via the matter.js controller and brokers commissioned Matter nodes into CamStack",
   "keywords": [
     "camstack",
@@ -43,7 +43,7 @@
         "entry": "./dist/addon.js",
         "icon": "assets/icon.svg",
         "color": "#3b6ea5",
-        "instanceMode": "unique",
+        "instanceMode": "multiple",
         "brokerKind": "matter",
         "execution": {
           "placement": "hub-only"
@@ -65,7 +65,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.770"
+      "server": ">=1.2.777"
     }
   },
   "files": [