@camstack/addon-import-alexa 0.2.185 → 0.2.187

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.187] - 2026-11-05
+
+### Fixed
+
+- The integration-settings drop no longer refuses on an Alexa account; its legacy broker link is carried onto the broker record first
+
+## [0.2.186] - 2026-11-05
+
+### Changed
+
+- An Alexa integration links to its account through the account record
+
 ## [0.2.185] - 2026-11-04
 
 ### Changed

package/dist/addon.js

@@ -6044,7 +6044,7 @@ function number(params) {
 	return /* @__PURE__ */ _coercedNumber(ZodNumber, params);
 }
 //#endregion
-//#region ../types/dist/sleep-Cv4Zmie9.mjs
+//#region ../types/dist/sleep-9TIHFj1w.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -7988,10 +7988,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;
 	}
 	/**
@@ -8037,7 +8036,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 });
 	}
@@ -8842,6 +8841,13 @@ var RecordsError = class extends Error {
 		this.detail = detail;
 	}
 };
+/** A write guarded by `ifRev` found another revision (or an existing row for `ifRev: 0`). */
+var RevConflictError = class extends RecordsError {
+	constructor(detail) {
+		super("rev-conflict", detail);
+		this.name = "RevConflictError";
+	}
+};
 /** The keychain could not store or serve a value: explicit, never an empty string. */
 var RecordSecretUnavailableError = class extends RecordsError {
 	constructor(detail) {
@@ -9311,6 +9317,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 },
@@ -11980,7 +11987,7 @@ object({
 	params: record(string(), union([string(), number$1()])).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.
 *
@@ -14770,6 +14777,72 @@ function flattenPortsOver(handle) {
 	};
 }
 /**
+* The addon-side ports of `moveIntegrationRowsToRecords` (planning#416). An addon runs the move
+* from its own process, so the leftover rows are reached through the migration-only door
+* (`migrations.readLegacyIntegrationRows` / `clearLegacyIntegrationRows`) on the hub's connection.
+* The door returns markers. This process is the owner, so it resolves and releases them with
+* `resolveSecretMarkers` — the same call the old settings door used — and only then asks the
+* door to delete the rows. The addon's own record kind is its records handle.
+*/
+async function resolvedRows(stored, secrets) {
+	if (secrets === null) return stored;
+	const { value, unresolved } = await resolveSecretMarkers(stored, secrets);
+	if (unresolved.length > 0) throw new Error(`${unresolved.length} secret(s) cannot be read from the keychain`);
+	return value;
+}
+function integrationRowsPortsOverApi(deps) {
+	const secrets = deps.secrets ?? null;
+	return {
+		warn: (message) => deps.log.warn(message),
+		listIntegrations: async (addonId) => (await deps.api.list()).filter((i) => i.addonId === addonId).map((i) => ({
+			id: i.id,
+			name: i.name
+		})),
+		readRows: async (integrationId) => resolvedRows(await deps.api.readLegacyIntegrationRows({ integrationId }), secrets),
+		putRecord: async (id, body) => {
+			if (await deps.records.get(id) !== null) return "exists";
+			try {
+				await deps.records.put({
+					id,
+					data: body
+				}, { ifRev: 0 });
+			} catch (err) {
+				if (err instanceof RevConflictError) return "exists";
+				throw err;
+			}
+			return "created";
+		},
+		readRecord: async (id) => (await deps.records.getResolved(id))?.data ?? null,
+		deleteRecord: async (id) => {
+			await deps.records.delete(id);
+		},
+		clearRows: async (integrationId) => {
+			const refs = collectSecretMarkerRefs(await deps.api.readLegacyIntegrationRows({ integrationId }));
+			if (refs.length > 0 && secrets !== null) await secrets.delete(refs);
+			await deps.api.clearLegacyIntegrationRows({ integrationId });
+		}
+	};
+}
+function defaultIntegrationApiOver(api) {
+	return {
+		list: () => api.integrations.list.query(),
+		readLegacyIntegrationRows: (input) => api.migrations.readLegacyIntegrationRows.query(input),
+		clearLegacyIntegrationRows: (input) => api.migrations.clearLegacyIntegrationRows.mutate(input),
+		listDevices: (addonId) => api.deviceManager.listAll.query({
+			addonId,
+			projection: "slim"
+		}),
+		setDeviceIntegrationId: async (deviceId, integrationId) => {
+			await api.deviceManager.setIntegrationId.mutate({
+				deviceId,
+				integrationId
+			});
+		},
+		readDeviceHasConfig: async (deviceId) => Object.keys((await api.deviceManager.getDevice.query({ deviceId }))?.config ?? {}).length > 0,
+		readDeviceIntegrationId: async (deviceId) => (await api.deviceManager.getDevice.query({ deviceId }))?.integrationId ?? null
+	};
+}
+/**
 * The trainer contract — what the hub hands the cloud trainer and what it
 * gets back (cloud training, D805+).
 *
@@ -50460,6 +50533,9 @@ var RunningProposalEvidenceSchema = object({
 	runsFound: number$1().int().nonnegative(),
 	pausesFound: number$1().int().nonnegative(),
 	longestPauseMs: number$1().nonnegative(),
+	/** Episodes shorter than ~90 s (an anti-crease pulse, a display waking): never a run, never a pause. */
+	pulsesFound: number$1().int().nonnegative(),
+	longestPulseMs: number$1().nonnegative(),
 	idleFloorW: number$1(),
 	noiseCeilingW: number$1(),
 	plateauW: number$1(),
@@ -56305,11 +56381,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(),
@@ -56330,16 +56402,6 @@ 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())
@@ -59316,6 +59378,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$1().int().nonnegative(),
+	secrets: number$1().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(),
@@ -80642,11 +80725,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.
 */
@@ -80657,6 +80744,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;
@@ -85976,13 +86067,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",
@@ -85990,13 +86074,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",
@@ -86991,6 +87068,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",
@@ -86998,6 +87082,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",
@@ -87033,6 +87124,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",
@@ -140564,7 +140669,7 @@ function isStringOrObject(value) {
 //#endregion
 //#region src/alexa-proxy-login-manager.ts
 /** The addon id the result page names to return to. */
-var ADDON_ID = "import-alexa";
+var ADDON_ID$1 = "import-alexa";
 /** An attempt lives as long as a sign-in attempt does elsewhere (10 min). */
 var ATTEMPT_TTL_MS = 600 * 1e3;
 /** How long the browser waits on the Amazon page for alexa-cookie2 to finish registering. */
@@ -140649,16 +140754,16 @@ var AlexaProxyLoginManager = class {
 					this.#logger.warn("alexa proxy-login: Amazon ended the login without an authorization code", { meta: { sessionId } });
 					return {
 						status: "error",
-						addonId: ADDON_ID,
+						addonId: ADDON_ID$1,
 						reason: "no_authorization_code"
 					};
 				}
 				return await this.#session?.whenCaptured(this.#captureWaitMs) === true ? {
 					status: "success",
-					addonId: ADDON_ID
+					addonId: ADDON_ID$1
 				} : {
 					status: "error",
-					addonId: ADDON_ID,
+					addonId: ADDON_ID$1,
 					reason: "exchange_failed"
 				};
 			}
@@ -144934,6 +145039,79 @@ var AlexaSpeakController = class {
 	}
 };
 //#endregion
+//#region src/migrations/integration-rows-to-record.ts
+/**
+* The Alexa integration's last legacy row, `brokerId` (the integration to broker link), moves onto
+* the broker record (planning#416): the runtime reads `broker.integrationId`, so the row is only
+* stamped across when the broker has no link yet, then every legacy row of the integration is
+* cleared (the door `integration_settings` is dropped through accepts an addon only once this
+* ran). Nothing is overwritten: a broker that already names an integration, or a `brokerId` that
+* names no broker, is left as it is and said so in a warning (ids only, never a value).
+* An empty door is a no-op, so a rerun is too.
+*/
+var INTEGRATION_ROWS_TO_RECORD_ID = "import-alexa/2026-11-05-integration-rows-to-record";
+var ADDON_ID = "import-alexa";
+async function moveAlexaIntegrationRows(ports) {
+	const integrations = await ports.listIntegrations(ADDON_ID);
+	let stamped = 0;
+	let cleared = 0;
+	for (const integration of integrations) {
+		const rows = await ports.readIntegrationRows(integration.id);
+		if (Object.keys(rows).length === 0) continue;
+		const brokerId = rows["brokerId"];
+		if (typeof brokerId === "string" && brokerId !== "") {
+			const broker = await ports.readBrokerLink(brokerId);
+			if (broker === null) ports.warn(`integration '${integration.id}': brokerId '${brokerId}' names no broker record; nothing linked`);
+			else if (broker.integrationId !== void 0) ports.warn(`integration '${integration.id}': broker '${brokerId}' already names integration '${broker.integrationId}'; the link is not changed`);
+			else {
+				await ports.stampBrokerLink(brokerId, integration.id);
+				if ((await ports.readBrokerLink(brokerId))?.integrationId !== integration.id) throw new Error(`integration '${integration.id}': the link did not read back from broker '${brokerId}' - the legacy settings are kept`);
+				stamped += 1;
+			}
+		}
+		await ports.clearIntegrationRows(integration.id);
+		cleared += 1;
+	}
+	return cleared === 0 ? {
+		outcome: "already-done",
+		summary: { integrations: integrations.length }
+	} : {
+		outcome: "done",
+		summary: {
+			integrations: integrations.length,
+			stamped,
+			cleared
+		}
+	};
+}
+/** The hub side (the registry list, the migration-only door) and the broker records side. */
+function alexaIntegrationRowsPorts(deps) {
+	const brokers = deps.records.kind(alexaBrokersEntryKind);
+	const rows = integrationRowsPortsOverApi({
+		api: deps.api,
+		secrets: deps.secrets,
+		records: deps.records.kind({
+			name: alexaBrokersEntryKind.name,
+			declaration: alexaBrokersEntryKind.declaration,
+			schema: record(string(), unknown())
+		}),
+		log: { warn: deps.warn }
+	});
+	return {
+		warn: deps.warn,
+		listIntegrations: rows.listIntegrations,
+		readIntegrationRows: rows.readRows,
+		clearIntegrationRows: rows.clearRows,
+		readBrokerLink: async (id) => {
+			const row = await brokers.get(id);
+			return row === null ? null : { integrationId: row.data.integrationId };
+		},
+		stampBrokerLink: async (id, integrationId) => {
+			await brokers.patch(id, { integrationId });
+		}
+	};
+}
+//#endregion
 //#region src/migrations/flatten-broker-records.ts
 /**
 * The Alexa broker records keep their account flat (planning#408 P3): the nested `connection`
@@ -144996,37 +145174,56 @@ async function stripEchoTargetVolumeAndMode(ports) {
 //#endregion
 //#region src/migrations/index.ts
 /** The `import-alexa` catalogue (D987): offered to the engine when the addon initialises. */
-var ADDON_MIGRATIONS = [{
-	meta: {
-		id: "import-alexa/2026-11-01-strip-echo-target-volume-and-mode",
-		owner: "import-alexa",
-		level: "addon-state",
-		seq: 1,
-		dependsOn: [],
-		store: "settings",
-		scope: "cluster",
-		onFailure: "tolerate",
-		bodyKind: "procedure",
-		description: "Remove the retired volume and mode from every stored Echo target",
-		fixtureMark: "the Echo id and the name the migration does not know"
-	},
-	procedure: stripEchoTargetVolumeAndMode
-}, {
-	meta: {
-		id: FLATTEN_BROKER_RECORDS_ID,
-		owner: "import-alexa",
-		level: "addon-state",
-		seq: 2,
-		dependsOn: [],
-		store: "settings",
-		scope: "cluster",
-		onFailure: "block-owner",
-		bodyKind: "procedure",
-		description: "Move each Alexa account from a nested connection object to flat top-level fields under the same id, reading every secret back first",
-		fixtureMark: "the integration link and the amazon domain of each account"
-	},
-	procedure: flattenBrokerRecords
-}];
+var ADDON_MIGRATIONS = [
+	{
+		meta: {
+			id: "import-alexa/2026-11-01-strip-echo-target-volume-and-mode",
+			owner: "import-alexa",
+			level: "addon-state",
+			seq: 1,
+			dependsOn: [],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "procedure",
+			description: "Remove the retired volume and mode from every stored Echo target",
+			fixtureMark: "the Echo id and the name the migration does not know"
+		},
+		procedure: stripEchoTargetVolumeAndMode
+	},
+	{
+		meta: {
+			id: FLATTEN_BROKER_RECORDS_ID,
+			owner: "import-alexa",
+			level: "addon-state",
+			seq: 2,
+			dependsOn: [],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "block-owner",
+			bodyKind: "procedure",
+			description: "Move each Alexa account from a nested connection object to flat top-level fields under the same id, reading every secret back first",
+			fixtureMark: "the integration link and the amazon domain of each account"
+		},
+		procedure: flattenBrokerRecords
+	},
+	{
+		meta: {
+			id: INTEGRATION_ROWS_TO_RECORD_ID,
+			owner: "import-alexa",
+			level: "addon-state",
+			seq: 3,
+			dependsOn: [FLATTEN_BROKER_RECORDS_ID],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "block-owner",
+			bodyKind: "procedure",
+			description: "Stamp the integration link from the legacy brokerId row onto its broker record when the broker has none, then clear the legacy integration settings rows",
+			fixtureMark: "the name of the broker and the integration it already names"
+		},
+		procedure: moveAlexaIntegrationRows
+	}
+];
 //#endregion
 //#region src/speak/icon-routes.ts
 var ALEXA_ICON_SVG = "<svg role=\"img\" viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"#00CAFF\"><title>Amazon Alexa</title><path d=\"M12 0C5.37 0 0 5.37 0 12C0 18.09 4.53 23.11 10.4 23.9V21.5A1.59 1.59 0 0 0 9.32 19.97A8.41 8.41 0 0 1 3.6 11.8A8.37 8.37 0 0 1 12.09 3.6A8.4 8.4 0 0 1 20.4 12.31L20.39 12.38A8.68 8.68 0 0 1 20.36 12.76C20.36 12.83 20.35 12.9 20.34 12.96C20.34 13.04 20.33 13.12 20.32 13.19L20.3 13.29C19.27 20.07 10.45 23.87 10.4 23.9C10.92 23.97 11.46 24 12 24C18.63 24 24 18.63 24 12S18.63 0 12 0Z\"/></svg>";
@@ -145238,13 +145435,20 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 		] };
 	}
 	migrationPorts(records) {
-		if (this.ctx.secrets === void 0) throw new Error("import-alexa: ctx.secrets is required");
+		const secrets = this.ctx.secrets;
+		if (secrets === void 0) throw new Error("import-alexa: ctx.secrets is required");
 		return {
 			readRows: () => Array.isArray(this.config.echoTargets) ? this.config.echoTargets : [],
 			writeRows: async (rows) => {
 				await this.updateGlobalSettings({ echoTargets: [...readEchoTargets({ echoTargets: rows })] });
 			},
-			...flattenPortsOver(records.kind(alexaBrokersEntryKind))
+			...flattenPortsOver(records.kind(alexaBrokersEntryKind)),
+			...alexaIntegrationRowsPorts({
+				api: defaultIntegrationApiOver(this.ctx.api),
+				records,
+				secrets,
+				warn: (message) => this.ctx.logger.warn(message)
+			})
 		};
 	}
 	/**
@@ -145507,18 +145711,10 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 		try {
 			const mine = (await this.ctx.api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id);
 			const surviving = new Set(mine.map((i) => i.id));
-			for (const integration of mine) {
-				const settings = await this.ctx.api.integrations.getSettings.query({ id: integration.id });
-				const brokerId = typeof settings["brokerId"] === "string" ? settings["brokerId"] : void 0;
-				if (brokerId === void 0) continue;
-				if (!this.activeBrokers.some((b) => b.id === brokerId)) {
-					this.ctx.logger.warn("Alexa integration→broker: linked broker not found", { meta: {
-						integrationId: integration.id,
-						brokerId
-					} });
-					continue;
-				}
-				this.requireRegistry().linkIntegration(integration.id, brokerId);
+			for (const broker of this.activeBrokers) {
+				const integrationId = broker.integrationId;
+				if (integrationId === void 0 || !surviving.has(integrationId)) continue;
+				this.requireRegistry().linkIntegration(integrationId, broker.id);
 			}
 			const toRemove = this.activeBrokers.filter((b) => b.integrationId !== void 0 && !surviving.has(b.integrationId)).map((b) => b.id);
 			if (toRemove.length === 0) return;
@@ -145560,9 +145756,9 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 			},
 			logger: this.ctx.logger,
 			getBrokerIdForIntegration: async (id) => {
-				const brokerId = (await this.ctx.api.integrations.getSettings.query({ id }))["brokerId"];
-				if (typeof brokerId !== "string") throw new Error(`integration ${id} has no linked brokerId`);
-				return brokerId;
+				const broker = this.activeBrokers.find((entry) => entry.integrationId === id);
+				if (broker === void 0) throw new Error(`integration ${id} has no linked brokerId`);
+				return broker.id;
 			},
 			listAdoptedAlexa: async () => {
 				const reg = this.ctx.kernel.deviceRegistry;

package/dist/addon.mjs

@@ -6042,7 +6042,7 @@ function number(params) {
 	return /* @__PURE__ */ _coercedNumber(ZodNumber, params);
 }
 //#endregion
-//#region ../types/dist/sleep-Cv4Zmie9.mjs
+//#region ../types/dist/sleep-9TIHFj1w.mjs
 /**
 * The audio chunk plane's byte format, and the ONE expansion from a coded
 * window to float samples (D455).
@@ -7986,10 +7986,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;
 	}
 	/**
@@ -8035,7 +8034,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 });
 	}
@@ -8840,6 +8839,13 @@ var RecordsError = class extends Error {
 		this.detail = detail;
 	}
 };
+/** A write guarded by `ifRev` found another revision (or an existing row for `ifRev: 0`). */
+var RevConflictError = class extends RecordsError {
+	constructor(detail) {
+		super("rev-conflict", detail);
+		this.name = "RevConflictError";
+	}
+};
 /** The keychain could not store or serve a value: explicit, never an empty string. */
 var RecordSecretUnavailableError = class extends RecordsError {
 	constructor(detail) {
@@ -9309,6 +9315,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 },
@@ -11978,7 +11985,7 @@ object({
 	params: record(string(), union([string(), number$1()])).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.
 *
@@ -14768,6 +14775,72 @@ function flattenPortsOver(handle) {
 	};
 }
 /**
+* The addon-side ports of `moveIntegrationRowsToRecords` (planning#416). An addon runs the move
+* from its own process, so the leftover rows are reached through the migration-only door
+* (`migrations.readLegacyIntegrationRows` / `clearLegacyIntegrationRows`) on the hub's connection.
+* The door returns markers. This process is the owner, so it resolves and releases them with
+* `resolveSecretMarkers` — the same call the old settings door used — and only then asks the
+* door to delete the rows. The addon's own record kind is its records handle.
+*/
+async function resolvedRows(stored, secrets) {
+	if (secrets === null) return stored;
+	const { value, unresolved } = await resolveSecretMarkers(stored, secrets);
+	if (unresolved.length > 0) throw new Error(`${unresolved.length} secret(s) cannot be read from the keychain`);
+	return value;
+}
+function integrationRowsPortsOverApi(deps) {
+	const secrets = deps.secrets ?? null;
+	return {
+		warn: (message) => deps.log.warn(message),
+		listIntegrations: async (addonId) => (await deps.api.list()).filter((i) => i.addonId === addonId).map((i) => ({
+			id: i.id,
+			name: i.name
+		})),
+		readRows: async (integrationId) => resolvedRows(await deps.api.readLegacyIntegrationRows({ integrationId }), secrets),
+		putRecord: async (id, body) => {
+			if (await deps.records.get(id) !== null) return "exists";
+			try {
+				await deps.records.put({
+					id,
+					data: body
+				}, { ifRev: 0 });
+			} catch (err) {
+				if (err instanceof RevConflictError) return "exists";
+				throw err;
+			}
+			return "created";
+		},
+		readRecord: async (id) => (await deps.records.getResolved(id))?.data ?? null,
+		deleteRecord: async (id) => {
+			await deps.records.delete(id);
+		},
+		clearRows: async (integrationId) => {
+			const refs = collectSecretMarkerRefs(await deps.api.readLegacyIntegrationRows({ integrationId }));
+			if (refs.length > 0 && secrets !== null) await secrets.delete(refs);
+			await deps.api.clearLegacyIntegrationRows({ integrationId });
+		}
+	};
+}
+function defaultIntegrationApiOver(api) {
+	return {
+		list: () => api.integrations.list.query(),
+		readLegacyIntegrationRows: (input) => api.migrations.readLegacyIntegrationRows.query(input),
+		clearLegacyIntegrationRows: (input) => api.migrations.clearLegacyIntegrationRows.mutate(input),
+		listDevices: (addonId) => api.deviceManager.listAll.query({
+			addonId,
+			projection: "slim"
+		}),
+		setDeviceIntegrationId: async (deviceId, integrationId) => {
+			await api.deviceManager.setIntegrationId.mutate({
+				deviceId,
+				integrationId
+			});
+		},
+		readDeviceHasConfig: async (deviceId) => Object.keys((await api.deviceManager.getDevice.query({ deviceId }))?.config ?? {}).length > 0,
+		readDeviceIntegrationId: async (deviceId) => (await api.deviceManager.getDevice.query({ deviceId }))?.integrationId ?? null
+	};
+}
+/**
 * The trainer contract — what the hub hands the cloud trainer and what it
 * gets back (cloud training, D805+).
 *
@@ -50458,6 +50531,9 @@ var RunningProposalEvidenceSchema = object({
 	runsFound: number$1().int().nonnegative(),
 	pausesFound: number$1().int().nonnegative(),
 	longestPauseMs: number$1().nonnegative(),
+	/** Episodes shorter than ~90 s (an anti-crease pulse, a display waking): never a run, never a pause. */
+	pulsesFound: number$1().int().nonnegative(),
+	longestPulseMs: number$1().nonnegative(),
 	idleFloorW: number$1(),
 	noiseCeilingW: number$1(),
 	plateauW: number$1(),
@@ -56303,11 +56379,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(),
@@ -56328,16 +56400,6 @@ 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())
@@ -59314,6 +59376,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$1().int().nonnegative(),
+	secrets: number$1().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(),
@@ -80640,11 +80723,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.
 */
@@ -80655,6 +80742,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;
@@ -85974,13 +86065,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",
@@ -85988,13 +86072,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",
@@ -86989,6 +87066,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",
@@ -86996,6 +87080,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",
@@ -87031,6 +87122,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",
@@ -140562,7 +140667,7 @@ function isStringOrObject(value) {
 //#endregion
 //#region src/alexa-proxy-login-manager.ts
 /** The addon id the result page names to return to. */
-var ADDON_ID = "import-alexa";
+var ADDON_ID$1 = "import-alexa";
 /** An attempt lives as long as a sign-in attempt does elsewhere (10 min). */
 var ATTEMPT_TTL_MS = 600 * 1e3;
 /** How long the browser waits on the Amazon page for alexa-cookie2 to finish registering. */
@@ -140647,16 +140752,16 @@ var AlexaProxyLoginManager = class {
 					this.#logger.warn("alexa proxy-login: Amazon ended the login without an authorization code", { meta: { sessionId } });
 					return {
 						status: "error",
-						addonId: ADDON_ID,
+						addonId: ADDON_ID$1,
 						reason: "no_authorization_code"
 					};
 				}
 				return await this.#session?.whenCaptured(this.#captureWaitMs) === true ? {
 					status: "success",
-					addonId: ADDON_ID
+					addonId: ADDON_ID$1
 				} : {
 					status: "error",
-					addonId: ADDON_ID,
+					addonId: ADDON_ID$1,
 					reason: "exchange_failed"
 				};
 			}
@@ -144932,6 +145037,79 @@ var AlexaSpeakController = class {
 	}
 };
 //#endregion
+//#region src/migrations/integration-rows-to-record.ts
+/**
+* The Alexa integration's last legacy row, `brokerId` (the integration to broker link), moves onto
+* the broker record (planning#416): the runtime reads `broker.integrationId`, so the row is only
+* stamped across when the broker has no link yet, then every legacy row of the integration is
+* cleared (the door `integration_settings` is dropped through accepts an addon only once this
+* ran). Nothing is overwritten: a broker that already names an integration, or a `brokerId` that
+* names no broker, is left as it is and said so in a warning (ids only, never a value).
+* An empty door is a no-op, so a rerun is too.
+*/
+var INTEGRATION_ROWS_TO_RECORD_ID = "import-alexa/2026-11-05-integration-rows-to-record";
+var ADDON_ID = "import-alexa";
+async function moveAlexaIntegrationRows(ports) {
+	const integrations = await ports.listIntegrations(ADDON_ID);
+	let stamped = 0;
+	let cleared = 0;
+	for (const integration of integrations) {
+		const rows = await ports.readIntegrationRows(integration.id);
+		if (Object.keys(rows).length === 0) continue;
+		const brokerId = rows["brokerId"];
+		if (typeof brokerId === "string" && brokerId !== "") {
+			const broker = await ports.readBrokerLink(brokerId);
+			if (broker === null) ports.warn(`integration '${integration.id}': brokerId '${brokerId}' names no broker record; nothing linked`);
+			else if (broker.integrationId !== void 0) ports.warn(`integration '${integration.id}': broker '${brokerId}' already names integration '${broker.integrationId}'; the link is not changed`);
+			else {
+				await ports.stampBrokerLink(brokerId, integration.id);
+				if ((await ports.readBrokerLink(brokerId))?.integrationId !== integration.id) throw new Error(`integration '${integration.id}': the link did not read back from broker '${brokerId}' - the legacy settings are kept`);
+				stamped += 1;
+			}
+		}
+		await ports.clearIntegrationRows(integration.id);
+		cleared += 1;
+	}
+	return cleared === 0 ? {
+		outcome: "already-done",
+		summary: { integrations: integrations.length }
+	} : {
+		outcome: "done",
+		summary: {
+			integrations: integrations.length,
+			stamped,
+			cleared
+		}
+	};
+}
+/** The hub side (the registry list, the migration-only door) and the broker records side. */
+function alexaIntegrationRowsPorts(deps) {
+	const brokers = deps.records.kind(alexaBrokersEntryKind);
+	const rows = integrationRowsPortsOverApi({
+		api: deps.api,
+		secrets: deps.secrets,
+		records: deps.records.kind({
+			name: alexaBrokersEntryKind.name,
+			declaration: alexaBrokersEntryKind.declaration,
+			schema: record(string(), unknown())
+		}),
+		log: { warn: deps.warn }
+	});
+	return {
+		warn: deps.warn,
+		listIntegrations: rows.listIntegrations,
+		readIntegrationRows: rows.readRows,
+		clearIntegrationRows: rows.clearRows,
+		readBrokerLink: async (id) => {
+			const row = await brokers.get(id);
+			return row === null ? null : { integrationId: row.data.integrationId };
+		},
+		stampBrokerLink: async (id, integrationId) => {
+			await brokers.patch(id, { integrationId });
+		}
+	};
+}
+//#endregion
 //#region src/migrations/flatten-broker-records.ts
 /**
 * The Alexa broker records keep their account flat (planning#408 P3): the nested `connection`
@@ -144994,37 +145172,56 @@ async function stripEchoTargetVolumeAndMode(ports) {
 //#endregion
 //#region src/migrations/index.ts
 /** The `import-alexa` catalogue (D987): offered to the engine when the addon initialises. */
-var ADDON_MIGRATIONS = [{
-	meta: {
-		id: "import-alexa/2026-11-01-strip-echo-target-volume-and-mode",
-		owner: "import-alexa",
-		level: "addon-state",
-		seq: 1,
-		dependsOn: [],
-		store: "settings",
-		scope: "cluster",
-		onFailure: "tolerate",
-		bodyKind: "procedure",
-		description: "Remove the retired volume and mode from every stored Echo target",
-		fixtureMark: "the Echo id and the name the migration does not know"
-	},
-	procedure: stripEchoTargetVolumeAndMode
-}, {
-	meta: {
-		id: FLATTEN_BROKER_RECORDS_ID,
-		owner: "import-alexa",
-		level: "addon-state",
-		seq: 2,
-		dependsOn: [],
-		store: "settings",
-		scope: "cluster",
-		onFailure: "block-owner",
-		bodyKind: "procedure",
-		description: "Move each Alexa account from a nested connection object to flat top-level fields under the same id, reading every secret back first",
-		fixtureMark: "the integration link and the amazon domain of each account"
-	},
-	procedure: flattenBrokerRecords
-}];
+var ADDON_MIGRATIONS = [
+	{
+		meta: {
+			id: "import-alexa/2026-11-01-strip-echo-target-volume-and-mode",
+			owner: "import-alexa",
+			level: "addon-state",
+			seq: 1,
+			dependsOn: [],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "tolerate",
+			bodyKind: "procedure",
+			description: "Remove the retired volume and mode from every stored Echo target",
+			fixtureMark: "the Echo id and the name the migration does not know"
+		},
+		procedure: stripEchoTargetVolumeAndMode
+	},
+	{
+		meta: {
+			id: FLATTEN_BROKER_RECORDS_ID,
+			owner: "import-alexa",
+			level: "addon-state",
+			seq: 2,
+			dependsOn: [],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "block-owner",
+			bodyKind: "procedure",
+			description: "Move each Alexa account from a nested connection object to flat top-level fields under the same id, reading every secret back first",
+			fixtureMark: "the integration link and the amazon domain of each account"
+		},
+		procedure: flattenBrokerRecords
+	},
+	{
+		meta: {
+			id: INTEGRATION_ROWS_TO_RECORD_ID,
+			owner: "import-alexa",
+			level: "addon-state",
+			seq: 3,
+			dependsOn: [FLATTEN_BROKER_RECORDS_ID],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "block-owner",
+			bodyKind: "procedure",
+			description: "Stamp the integration link from the legacy brokerId row onto its broker record when the broker has none, then clear the legacy integration settings rows",
+			fixtureMark: "the name of the broker and the integration it already names"
+		},
+		procedure: moveAlexaIntegrationRows
+	}
+];
 //#endregion
 //#region src/speak/icon-routes.ts
 var ALEXA_ICON_SVG = "<svg role=\"img\" viewBox=\"0 0 24 24\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"#00CAFF\"><title>Amazon Alexa</title><path d=\"M12 0C5.37 0 0 5.37 0 12C0 18.09 4.53 23.11 10.4 23.9V21.5A1.59 1.59 0 0 0 9.32 19.97A8.41 8.41 0 0 1 3.6 11.8A8.37 8.37 0 0 1 12.09 3.6A8.4 8.4 0 0 1 20.4 12.31L20.39 12.38A8.68 8.68 0 0 1 20.36 12.76C20.36 12.83 20.35 12.9 20.34 12.96C20.34 13.04 20.33 13.12 20.32 13.19L20.3 13.29C19.27 20.07 10.45 23.87 10.4 23.9C10.92 23.97 11.46 24 12 24C18.63 24 24 18.63 24 12S18.63 0 12 0Z\"/></svg>";
@@ -145236,13 +145433,20 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 		] };
 	}
 	migrationPorts(records) {
-		if (this.ctx.secrets === void 0) throw new Error("import-alexa: ctx.secrets is required");
+		const secrets = this.ctx.secrets;
+		if (secrets === void 0) throw new Error("import-alexa: ctx.secrets is required");
 		return {
 			readRows: () => Array.isArray(this.config.echoTargets) ? this.config.echoTargets : [],
 			writeRows: async (rows) => {
 				await this.updateGlobalSettings({ echoTargets: [...readEchoTargets({ echoTargets: rows })] });
 			},
-			...flattenPortsOver(records.kind(alexaBrokersEntryKind))
+			...flattenPortsOver(records.kind(alexaBrokersEntryKind)),
+			...alexaIntegrationRowsPorts({
+				api: defaultIntegrationApiOver(this.ctx.api),
+				records,
+				secrets,
+				warn: (message) => this.ctx.logger.warn(message)
+			})
 		};
 	}
 	/**
@@ -145505,18 +145709,10 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 		try {
 			const mine = (await this.ctx.api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id);
 			const surviving = new Set(mine.map((i) => i.id));
-			for (const integration of mine) {
-				const settings = await this.ctx.api.integrations.getSettings.query({ id: integration.id });
-				const brokerId = typeof settings["brokerId"] === "string" ? settings["brokerId"] : void 0;
-				if (brokerId === void 0) continue;
-				if (!this.activeBrokers.some((b) => b.id === brokerId)) {
-					this.ctx.logger.warn("Alexa integration→broker: linked broker not found", { meta: {
-						integrationId: integration.id,
-						brokerId
-					} });
-					continue;
-				}
-				this.requireRegistry().linkIntegration(integration.id, brokerId);
+			for (const broker of this.activeBrokers) {
+				const integrationId = broker.integrationId;
+				if (integrationId === void 0 || !surviving.has(integrationId)) continue;
+				this.requireRegistry().linkIntegration(integrationId, broker.id);
 			}
 			const toRemove = this.activeBrokers.filter((b) => b.integrationId !== void 0 && !surviving.has(b.integrationId)).map((b) => b.id);
 			if (toRemove.length === 0) return;
@@ -145558,9 +145754,9 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 			},
 			logger: this.ctx.logger,
 			getBrokerIdForIntegration: async (id) => {
-				const brokerId = (await this.ctx.api.integrations.getSettings.query({ id }))["brokerId"];
-				if (typeof brokerId !== "string") throw new Error(`integration ${id} has no linked brokerId`);
-				return brokerId;
+				const broker = this.activeBrokers.find((entry) => entry.integrationId === id);
+				if (broker === void 0) throw new Error(`integration ${id} has no linked brokerId`);
+				return broker.id;
 			},
 			listAdoptedAlexa: async () => {
 				const reg = this.ctx.kernel.deviceRegistry;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-import-alexa",
-  "version": "0.2.185",
+  "version": "0.2.187",
   "description": "Alexa device-import provider for CamStack — imports the smart-home devices in a user's Alexa account via the unofficial alexa-remote2 cookie/token client (the inverse of the Alexa exporter)",
   "keywords": [
     "camstack",
@@ -72,7 +72,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.763"
+      "server": ">=1.2.770"
     }
   },
   "files": [