@camstack/addon-import-alexa 0.2.186 → 0.2.187

package/CHANGELOG.md

@@ -7,6 +7,12 @@ 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

package/dist/addon.js

@@ -8841,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) {
@@ -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+).
 *
@@ -140596,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. */
@@ -140681,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"
 				};
 			}
@@ -144966,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`
@@ -145028,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>";
@@ -145270,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)
+			})
 		};
 	}
 	/**

package/dist/addon.mjs

@@ -8839,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) {
@@ -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+).
 *
@@ -140594,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. */
@@ -140679,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"
 				};
 			}
@@ -144964,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`
@@ -145026,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>";
@@ -145268,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)
+			})
 		};
 	}
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-import-alexa",
-  "version": "0.2.186",
+  "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",