@camstack/addon-import-alexa 0.2.170 → 0.2.172

package/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.172] - 2026-10-31
+
+### Changed
+
+- Alexa shows an error instead of 'connected' when polling Amazon keeps failing, with the HTTP status in the log.
+- Alexa: quiet vs announce is now decided per notification (a silent notification is spoken quietly, any other announces); the per-target Mode setting is gone and a stored one is ignored.
+
+## [0.2.171] - 2026-10-30
+
+### Changed
+
+- Notification targets pick a broker and list their options inside the add/edit form; the page-wide Find devices dialog is gone
+
 ## [0.2.170] - 2026-10-30
 
 ### Changed

package/dist/addon.js

@@ -57379,6 +57379,12 @@ var TerminalInstanceInfoSchema = object({
 	instanceId: string(),
 	cameraStableId: string(),
 	nodeId: string(),
+	/**
+	* False while the node the instance is bound to is not in the cluster
+	* topology (forgotten, renamed, re-paired). The instance is kept; the
+	* operator re-points it with `updateInstance({ targetNodeId })`.
+	*/
+	nodeInCluster: boolean(),
 	profileId: string(),
 	profileLabel: string(),
 	name: string(),
@@ -57428,6 +57434,8 @@ method(_void(), array(TerminalProfileInfoSchema).readonly(), { auth: "admin" }),
 	auth: "admin"
 }), method(object({
 	instanceId: string().min(1),
+	/** Re-point the instance to another node; the profile must exist there. */
+	targetNodeId: string().min(1).max(256).optional(),
 	name: string().trim().min(1).max(160).optional(),
 	executable: string().max(1024).optional(),
 	args: array(string().max(2048)).max(64).optional(),
@@ -137140,7 +137148,21 @@ function isRateLimitError(message) {
 	const m = message.toLowerCase();
 	return m.includes("rate exceeded") || m.includes("throttl") || m.includes("too many requests") || m.includes("429");
 }
+/** HTTP statuses that mean Amazon rejected the session (a re-link is needed). */
+var SESSION_DEAD_STATUSES = new Set([401, 403]);
+/** The library logs `No body (code=NNN)` on a body-less non-2xx; it is the only place the status shows. */
+var NO_BODY_CODE = /No body \(code=(\d{3})\)/;
+/** A failed Amazon call whose HTTP status is known (null when the library did not say). */
+var AlexaHttpError = class extends Error {
+	statusCode;
+	constructor(message, statusCode) {
+		super(message);
+		this.name = "AlexaHttpError";
+		this.statusCode = statusCode;
+	}
+};
 var AlexaRemoteClient = class {
+	#lastHttpStatus = null;
 	#options;
 	#logger;
 	#dataDir;
@@ -137160,7 +137182,10 @@ var AlexaRemoteClient = class {
 	async connect() {
 		const remote = new import_alexa_remote.default();
 		this.#remote = remote;
-		const initOptions = await this.#buildInitOptions();
+		const initOptions = {
+			...await this.#buildInitOptions(),
+			logger: (...args) => this.#captureLibraryLine(args)
+		};
 		remote.on("cookie", () => {
 			this.#persistSession(remote);
 		});
@@ -137254,11 +137279,17 @@ var AlexaRemoteClient = class {
 	async #withBackoff(op, run) {
 		let lastError = null;
 		for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) try {
+			this.#lastHttpStatus = null;
 			return await run();
 		} catch (err) {
 			lastError = err;
 			const message = errMsg(err);
 			if (isAuthError(message)) throw new AlexaAuthError(message);
+			if (message.toLowerCase().includes("no body")) {
+				const status = this.#lastHttpStatus;
+				if (status !== null && SESSION_DEAD_STATUSES.has(status)) throw new AlexaAuthError(`${message} (HTTP ${status})`);
+				throw new AlexaHttpError(message, status);
+			}
 			if (!isRateLimitError(message) || attempt === MAX_ATTEMPTS - 1) throw err;
 			const delay = this.#backoffDelay(attempt);
 			this.#logger?.warn("AlexaRemoteClient: rate-limited — backing off", { meta: {
@@ -137271,6 +137302,10 @@ var AlexaRemoteClient = class {
 		}
 		throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error(`AlexaRemoteClient: ${op} failed`);
 	}
+	#captureLibraryLine(args) {
+		const match = NO_BODY_CODE.exec(args.map(String).join(" "));
+		if (match?.[1] !== void 0) this.#lastHttpStatus = Number(match[1]);
+	}
 	#backoffDelay(attempt) {
 		return Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_MAX_MS) + Math.floor(Math.random() * BACKOFF_BASE_MS);
 	}
@@ -137509,8 +137544,6 @@ var AlexaCommandSink = class {
 };
 /** The single in-process command sink shared across the addon. */
 var alexaCommands = new AlexaCommandSink();
-//#endregion
-//#region src/alexa-integration-manager.ts
 /**
 * Wraps exactly one {@link AlexaClient} (= one Amazon account). Authenticates on
 * `start()`, lists the appliance inventory, then runs a POLL loop (Alexa has no
@@ -137538,6 +137571,7 @@ var AlexaIntegrationManager = class {
 	#client = null;
 	#pollTimer = null;
 	#status = "disconnected";
+	#pollFailures = 0;
 	#applianceCount = 0;
 	#lastCheckedAt = null;
 	#error = null;
@@ -137642,14 +137676,37 @@ var AlexaIntegrationManager = class {
 			alexaAccounts.recordStates(this.#id, values);
 			this.#lastCheckedAt = Date.now();
 			this.#onStatesPolled(this.#id, values);
+			this.#pollFailures = 0;
+			this.#error = null;
+			if (this.#status === "error" || this.#status === "auth-failed") this.#transition("connected");
 		} catch (err) {
 			this.#error = errMsg(err);
+			this.#pollFailures += 1;
+			const httpStatus = err instanceof AlexaHttpError ? err.statusCode : null;
 			this.#logger.warn("AlexaIntegrationManager: poll failed", {
 				tags: { brokerId: this.#id },
-				meta: { error: errMsg(err) }
+				meta: {
+					error: errMsg(err),
+					consecutiveFailures: this.#pollFailures,
+					httpStatus
+				}
 			});
+			if (this.#pollFailures >= 3 && this.#status !== "disconnected") this.#transition(err instanceof AlexaAuthError ? "auth-failed" : "error");
 		}
 	}
+	#transition(next) {
+		if (this.#status === next) return;
+		const previous = this.#status;
+		this.#status = next;
+		this.#logger.info("AlexaIntegrationManager: status changed", {
+			tags: { brokerId: this.#id },
+			meta: {
+				from: previous,
+				to: next,
+				error: this.#error
+			}
+		});
+	}
 	/** Stop the poll loop, disconnect the client (FIRST), null it. */
 	async stop() {
 		if (this.#pollTimer !== null) {
@@ -137868,8 +137925,17 @@ var AlexaBrokerRegistry = class {
 	}
 };
 //#endregion
+//#region src/speak/constants.ts
+/** Echo speech limits and the worker restart bound (same window as CrashSupervisor). */
+var ALEXA_SPEAK_ADDON_ID = "import-alexa";
+var ALEXA_SPEAK_KIND = "alexa-echo";
+/** The kind of the Amazon-account broker the Echoes are read from. */
+var ALEXA_BROKER_KIND = "alexa";
+var DEVICE_REFRESH_MS = 5 * 6e4;
+/** Where the addon serves the Alexa mark; `listTargetKinds` stamps it as `iconUrl`. */
+var ALEXA_SPEAK_ICON_URL = `/addon/${ALEXA_SPEAK_ADDON_ID}/icons/${ALEXA_SPEAK_KIND}`;
+//#endregion
 //#region src/alexa-broker-provider.ts
-var ALEXA_KIND = "alexa";
 /**
 * Construct the `broker` cap provider for the Alexa import addon. Pure builder.
 * Mirrors `buildEcowittBrokerProvider`. The cookie + refresh token are secrets:
@@ -137887,7 +137953,7 @@ function buildAlexaBrokerProvider(deps) {
 	});
 	return {
 		list: async ({ kind }) => {
-			if (kind && kind !== ALEXA_KIND) return [];
+			if (kind && kind !== "alexa") return [];
 			return registry.list().map((info) => ({
 				...info,
 				addonId: ownerAddonId
@@ -137903,7 +137969,7 @@ function buildAlexaBrokerProvider(deps) {
 		listProviders: async () => [{
 			addonId: ownerAddonId,
 			kinds: [{
-				kind: ALEXA_KIND,
+				kind: ALEXA_BROKER_KIND,
 				label: "Alexa",
 				signIn: {
 					basePath: "/addon/import-alexa/login",
@@ -137912,7 +137978,7 @@ function buildAlexaBrokerProvider(deps) {
 			}]
 		}],
 		add: async ({ kind, name, settings }) => {
-			if (kind !== ALEXA_KIND) throw new Error(`import-alexa: only kind '${ALEXA_KIND}' is handled here (got '${kind}')`);
+			if (kind !== "alexa") throw new Error(`import-alexa: only kind '${ALEXA_BROKER_KIND}' is handled here (got '${kind}')`);
 			const entry = await registry.createEntry(name, settingsToAlexaConnection(settings));
 			await persistBrokers([...getBrokers(), entry]);
 			return { id: entry.id };
@@ -137970,11 +138036,11 @@ function buildAlexaBrokerProvider(deps) {
 			return entry ? redact(entry) : null;
 		},
 		getSettingsSchema: async ({ kind }) => {
-			if (kind !== ALEXA_KIND) return null;
+			if (kind !== "alexa") return null;
 			return buildConnectionFormSchema();
 		},
 		testSettings: async ({ kind, settings }) => {
-			if (kind !== ALEXA_KIND) return {
+			if (kind !== "alexa") return {
 				ok: false,
 				error: `unsupported kind: ${kind}`
 			};
@@ -139193,14 +139259,6 @@ var BrokerEcho = class {
 	}
 };
 //#endregion
-//#region src/speak/constants.ts
-/** Echo speech limits and the worker restart bound (same window as CrashSupervisor). */
-var ALEXA_SPEAK_ADDON_ID = "import-alexa";
-var ALEXA_SPEAK_KIND = "alexa-echo";
-var DEVICE_REFRESH_MS = 5 * 6e4;
-/** Where the addon serves the Alexa mark; `listTargetKinds` stamps it as `iconUrl`. */
-var ALEXA_SPEAK_ICON_URL = `/addon/${ALEXA_SPEAK_ADDON_ID}/icons/${ALEXA_SPEAK_KIND}`;
-//#endregion
 //#region src/speak/rate-limit.ts
 /**
 * Per-Echo admission. A burst is dropped here, not queued: a queue would be
@@ -139304,9 +139362,16 @@ function readString(config, key) {
 	const value = config[key];
 	return typeof value === "string" ? value : "";
 }
-/** The rule's value for this send wins; the target's saved config is the fallback. */
-function readMode(config, delivery) {
-	return (delivery?.["mode"] ?? config["mode"]) === "announce" ? "announce" : "speak";
+/** The level id an Echo notification uses for "quiet: no chime, no announcement". */
+var SILENT_LEVEL_ID = "silent";
+var SILENT_PRIORITY = 1;
+/**
+* Quiet or announce is decided PER NOTIFICATION, never per target: a silent
+* notification (the kind's silent level, or the lowest priority when no level
+* is named) is spoken quietly, hours-aware; every other one announces.
+*/
+function modeFor(notification) {
+	return (notification.level !== void 0 ? notification.level === SILENT_LEVEL_ID : notification.priority <= SILENT_PRIORITY) ? "speak" : "announce";
 }
 function readVolume(config, delivery) {
 	const ruled = delivery?.["volume"];
@@ -139317,21 +139382,9 @@ function readVolume(config, delivery) {
 /**
 * The delivery parameters a rule may set for an Echo target (D938). The
 * target's own config holds the default; these override it per notification.
+* Quiet vs announce is not one of them: it follows the notification's level.
 */
 var DELIVERY_PARAMS = [{
-	key: "mode",
-	label: "Mode",
-	labelKey: "import-alexa:echoTarget.s_echo.mode.label",
-	type: "enum",
-	options: [{
-		value: "speak",
-		label: "Speak (quiet hours apply)"
-	}, {
-		value: "announce",
-		label: "Announce (chime, then speech)"
-	}],
-	default: "speak"
-}, {
 	key: "volume",
 	label: "Volume",
 	labelKey: "import-alexa:echoTarget.s_echo.volume.label",
@@ -139351,64 +139404,37 @@ function echoOptionLabel(device) {
 	if (kind.length > 0) parts.push(kind);
 	return parts.join(" · ");
 }
-function echoField(devices, showWhen) {
-	return {
-		type: "select",
-		key: "echoId",
-		label: "Echo",
-		labelKey: "import-alexa:echoTarget.s_echo.echoId.label",
-		description: devices.length === 0 ? "No Echo found yet. Sign the Amazon account in on Integrations, Alexa." : void 0,
-		descriptionKey: devices.length === 0 ? "import-alexa:echoTarget.s_echo.echoId.empty" : void 0,
-		options: devices.map((device) => ({
-			value: device.id,
-			label: echoOptionLabel(device)
-		})),
-		...showWhen === void 0 ? {} : { showWhen }
-	};
-}
 /**
 * The two pickers are not `required`: a required select shows its first option
 * while the form still holds no value, so a save would drop the choice. Left
 * optional they open on "Select", and `upsertTarget` refuses an empty pick.
 *
-* The Echo picker is built from the accounts' own device lists on every call,
-* so a new Echo shows up without a deploy. With one account there is no account
-* field; with several, each account's Echoes appear when that account is chosen.
+* The account is a broker pick (existing, or created in place); the Echo list
+* is fetched from that account, so a new Echo shows up without a deploy.
 */
-function configSchema(brokers) {
-	const first = brokers[0];
+function configSchema() {
 	return { sections: [{
 		id: "echo",
 		title: "Echo",
 		titleKey: "import-alexa:echoTarget.s_echo.title",
 		fields: [
-			...brokers.length > 1 ? [{
-				type: "select",
+			...[{
+				type: "broker-select",
 				key: "brokerId",
 				label: "Amazon account",
 				labelKey: "import-alexa:echoTarget.s_echo.brokerId.label",
-				options: brokers.map((broker) => ({
-					value: broker.id,
-					label: broker.name
-				}))
-			}, ...brokers.map((broker) => echoField(broker.devices, {
-				field: "brokerId",
-				equals: broker.id
-			}))] : [echoField(first?.devices ?? [])],
-			{
+				brokerKind: ALEXA_BROKER_KIND
+			}, {
 				type: "select",
-				key: "mode",
-				label: "Mode",
-				labelKey: "import-alexa:echoTarget.s_echo.mode.label",
-				default: "speak",
-				options: [{
-					value: "speak",
-					label: "Speak (quiet hours apply)"
-				}, {
-					value: "announce",
-					label: "Announce (chime, then speech)"
-				}]
-			},
+				key: "echoId",
+				label: "Echo",
+				labelKey: "import-alexa:echoTarget.s_echo.echoId.label",
+				options: [],
+				discoverOptions: {
+					kind: ALEXA_SPEAK_KIND,
+					dependsOn: ["brokerId"]
+				}
+			}],
 			{
 				type: "number",
 				key: "volume",
@@ -139428,8 +139454,8 @@ function configSchema(brokers) {
 		]
 	}] };
 }
-/** The Alexa target kind as the Add target form sees it, for the accounts as they are now. */
-function alexaTargetKind(brokers) {
+/** The Alexa target kind as the Add target form sees it. */
+function alexaTargetKind() {
 	return {
 		kind: ALEXA_SPEAK_KIND,
 		label: "Alexa",
@@ -139439,7 +139465,7 @@ function alexaTargetKind(brokers) {
 		addonId: ALEXA_SPEAK_ADDON_ID,
 		supportsDiscovery: true,
 		destinationKeys: ["brokerId", "echoId"],
-		configSchema: configSchema(brokers),
+		configSchema: configSchema(),
 		deliveryParams: DELIVERY_PARAMS,
 		caps: {
 			attachments: {
@@ -139450,9 +139476,16 @@ function alexaTargetKind(brokers) {
 			actions: 0,
 			actionIcons: false,
 			levels: [{
+				id: SILENT_LEVEL_ID,
+				label: "Silent",
+				ordinal: SILENT_PRIORITY,
+				flags: { silent: true },
+				description: "Spoken quietly: no chime, quiet hours apply."
+			}, {
 				id: "default",
-				label: "Default",
-				ordinal: 3
+				label: "Announce",
+				ordinal: 3,
+				description: "Announced: chime, then speech."
 			}],
 			format: ["text"],
 			clickUrl: false,
@@ -139469,7 +139502,6 @@ function discoveredFrom(broker, device) {
 		config: {
 			brokerId: broker.id,
 			echoId: device.id,
-			mode: "speak",
 			volume: 40,
 			respectDnd: true,
 			family: device.family,
@@ -139482,6 +139514,7 @@ function createAlexaNotificationProvider(ports) {
 	let targets = ports.loadTargets();
 	let ledger = emptySpeechLedger();
 	let deliveries = [];
+	const warnedLegacyMode = /* @__PURE__ */ new Set();
 	function record(row) {
 		deliveries = [...deliveries, row];
 	}
@@ -139623,7 +139656,14 @@ function createAlexaNotificationProvider(ports) {
 				renderedAs: speech.renderedAs
 			};
 		}
-		const mode = readMode(target.config, notification.delivery);
+		const mode = modeFor(notification);
+		if (target.config["mode"] !== void 0 && !warnedLegacyMode.has(target.id)) {
+			warnedLegacyMode.add(target.id);
+			logger.warn("alexa target mode is ignored: quiet vs announce follows each notification", {
+				...tags,
+				meta: { targetId: target.id }
+			});
+		}
 		try {
 			const outcomes = await ports.speak({
 				brokerId: broker.id,
@@ -139701,7 +139741,7 @@ function createAlexaNotificationProvider(ports) {
 			return deliveries;
 		},
 		async listTargetKinds() {
-			return [alexaTargetKind(ports.brokers())];
+			return [alexaTargetKind()];
 		},
 		async listTargets() {
 			return [...targets];
@@ -139711,7 +139751,20 @@ function createAlexaNotificationProvider(ports) {
 			if (found === void 0) throw new Error(`target not found: ${input.targetId}`);
 			return found;
 		},
-		async discoverTargets() {
+		async discoverTargets(input) {
+			const named = readString(input.config ?? {}, "brokerId");
+			if (named.length > 0) {
+				const owner = ports.brokers().find((broker) => broker.id === named);
+				return (owner?.devices ?? []).map((device) => ({
+					...discoveredFrom(owner ?? {
+						id: named,
+						name: named,
+						ready: false,
+						devices: []
+					}, device),
+					suggestedName: echoOptionLabel(device)
+				}));
+			}
 			const taken = new Set(targets.flatMap((row) => {
 				const owner = brokerFor(row.config);
 				return owner === void 0 ? [] : [`${owner.id}/${readString(row.config, "echoId")}`];
@@ -140040,7 +140093,6 @@ function targetsFrom(rows) {
 		config: {
 			...row.brokerId.length > 0 ? { brokerId: row.brokerId } : {},
 			echoId: row.echoId,
-			mode: row.mode,
 			volume: row.volume,
 			respectDnd: row.respectDnd
 		}
@@ -140053,7 +140105,7 @@ function rowsFrom(targets) {
 		enabled: target.enabled,
 		brokerId: typeof target.config["brokerId"] === "string" ? target.config["brokerId"] : "",
 		echoId: typeof target.config["echoId"] === "string" ? target.config["echoId"] : "",
-		mode: target.config["mode"] === "announce" ? "announce" : "speak",
+		mode: "speak",
 		volume: typeof target.config["volume"] === "number" ? target.config["volume"] : 40,
 		respectDnd: target.config["respectDnd"] !== false
 	}));

package/dist/addon.mjs

@@ -57377,6 +57377,12 @@ var TerminalInstanceInfoSchema = object({
 	instanceId: string(),
 	cameraStableId: string(),
 	nodeId: string(),
+	/**
+	* False while the node the instance is bound to is not in the cluster
+	* topology (forgotten, renamed, re-paired). The instance is kept; the
+	* operator re-points it with `updateInstance({ targetNodeId })`.
+	*/
+	nodeInCluster: boolean(),
 	profileId: string(),
 	profileLabel: string(),
 	name: string(),
@@ -57426,6 +57432,8 @@ method(_void(), array(TerminalProfileInfoSchema).readonly(), { auth: "admin" }),
 	auth: "admin"
 }), method(object({
 	instanceId: string().min(1),
+	/** Re-point the instance to another node; the profile must exist there. */
+	targetNodeId: string().min(1).max(256).optional(),
 	name: string().trim().min(1).max(160).optional(),
 	executable: string().max(1024).optional(),
 	args: array(string().max(2048)).max(64).optional(),
@@ -137138,7 +137146,21 @@ function isRateLimitError(message) {
 	const m = message.toLowerCase();
 	return m.includes("rate exceeded") || m.includes("throttl") || m.includes("too many requests") || m.includes("429");
 }
+/** HTTP statuses that mean Amazon rejected the session (a re-link is needed). */
+var SESSION_DEAD_STATUSES = new Set([401, 403]);
+/** The library logs `No body (code=NNN)` on a body-less non-2xx; it is the only place the status shows. */
+var NO_BODY_CODE = /No body \(code=(\d{3})\)/;
+/** A failed Amazon call whose HTTP status is known (null when the library did not say). */
+var AlexaHttpError = class extends Error {
+	statusCode;
+	constructor(message, statusCode) {
+		super(message);
+		this.name = "AlexaHttpError";
+		this.statusCode = statusCode;
+	}
+};
 var AlexaRemoteClient = class {
+	#lastHttpStatus = null;
 	#options;
 	#logger;
 	#dataDir;
@@ -137158,7 +137180,10 @@ var AlexaRemoteClient = class {
 	async connect() {
 		const remote = new import_alexa_remote.default();
 		this.#remote = remote;
-		const initOptions = await this.#buildInitOptions();
+		const initOptions = {
+			...await this.#buildInitOptions(),
+			logger: (...args) => this.#captureLibraryLine(args)
+		};
 		remote.on("cookie", () => {
 			this.#persistSession(remote);
 		});
@@ -137252,11 +137277,17 @@ var AlexaRemoteClient = class {
 	async #withBackoff(op, run) {
 		let lastError = null;
 		for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) try {
+			this.#lastHttpStatus = null;
 			return await run();
 		} catch (err) {
 			lastError = err;
 			const message = errMsg(err);
 			if (isAuthError(message)) throw new AlexaAuthError(message);
+			if (message.toLowerCase().includes("no body")) {
+				const status = this.#lastHttpStatus;
+				if (status !== null && SESSION_DEAD_STATUSES.has(status)) throw new AlexaAuthError(`${message} (HTTP ${status})`);
+				throw new AlexaHttpError(message, status);
+			}
 			if (!isRateLimitError(message) || attempt === MAX_ATTEMPTS - 1) throw err;
 			const delay = this.#backoffDelay(attempt);
 			this.#logger?.warn("AlexaRemoteClient: rate-limited — backing off", { meta: {
@@ -137269,6 +137300,10 @@ var AlexaRemoteClient = class {
 		}
 		throw lastError instanceof Error ? lastError : /* @__PURE__ */ new Error(`AlexaRemoteClient: ${op} failed`);
 	}
+	#captureLibraryLine(args) {
+		const match = NO_BODY_CODE.exec(args.map(String).join(" "));
+		if (match?.[1] !== void 0) this.#lastHttpStatus = Number(match[1]);
+	}
 	#backoffDelay(attempt) {
 		return Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_MAX_MS) + Math.floor(Math.random() * BACKOFF_BASE_MS);
 	}
@@ -137507,8 +137542,6 @@ var AlexaCommandSink = class {
 };
 /** The single in-process command sink shared across the addon. */
 var alexaCommands = new AlexaCommandSink();
-//#endregion
-//#region src/alexa-integration-manager.ts
 /**
 * Wraps exactly one {@link AlexaClient} (= one Amazon account). Authenticates on
 * `start()`, lists the appliance inventory, then runs a POLL loop (Alexa has no
@@ -137536,6 +137569,7 @@ var AlexaIntegrationManager = class {
 	#client = null;
 	#pollTimer = null;
 	#status = "disconnected";
+	#pollFailures = 0;
 	#applianceCount = 0;
 	#lastCheckedAt = null;
 	#error = null;
@@ -137640,14 +137674,37 @@ var AlexaIntegrationManager = class {
 			alexaAccounts.recordStates(this.#id, values);
 			this.#lastCheckedAt = Date.now();
 			this.#onStatesPolled(this.#id, values);
+			this.#pollFailures = 0;
+			this.#error = null;
+			if (this.#status === "error" || this.#status === "auth-failed") this.#transition("connected");
 		} catch (err) {
 			this.#error = errMsg(err);
+			this.#pollFailures += 1;
+			const httpStatus = err instanceof AlexaHttpError ? err.statusCode : null;
 			this.#logger.warn("AlexaIntegrationManager: poll failed", {
 				tags: { brokerId: this.#id },
-				meta: { error: errMsg(err) }
+				meta: {
+					error: errMsg(err),
+					consecutiveFailures: this.#pollFailures,
+					httpStatus
+				}
 			});
+			if (this.#pollFailures >= 3 && this.#status !== "disconnected") this.#transition(err instanceof AlexaAuthError ? "auth-failed" : "error");
 		}
 	}
+	#transition(next) {
+		if (this.#status === next) return;
+		const previous = this.#status;
+		this.#status = next;
+		this.#logger.info("AlexaIntegrationManager: status changed", {
+			tags: { brokerId: this.#id },
+			meta: {
+				from: previous,
+				to: next,
+				error: this.#error
+			}
+		});
+	}
 	/** Stop the poll loop, disconnect the client (FIRST), null it. */
 	async stop() {
 		if (this.#pollTimer !== null) {
@@ -137866,8 +137923,17 @@ var AlexaBrokerRegistry = class {
 	}
 };
 //#endregion
+//#region src/speak/constants.ts
+/** Echo speech limits and the worker restart bound (same window as CrashSupervisor). */
+var ALEXA_SPEAK_ADDON_ID = "import-alexa";
+var ALEXA_SPEAK_KIND = "alexa-echo";
+/** The kind of the Amazon-account broker the Echoes are read from. */
+var ALEXA_BROKER_KIND = "alexa";
+var DEVICE_REFRESH_MS = 5 * 6e4;
+/** Where the addon serves the Alexa mark; `listTargetKinds` stamps it as `iconUrl`. */
+var ALEXA_SPEAK_ICON_URL = `/addon/${ALEXA_SPEAK_ADDON_ID}/icons/${ALEXA_SPEAK_KIND}`;
+//#endregion
 //#region src/alexa-broker-provider.ts
-var ALEXA_KIND = "alexa";
 /**
 * Construct the `broker` cap provider for the Alexa import addon. Pure builder.
 * Mirrors `buildEcowittBrokerProvider`. The cookie + refresh token are secrets:
@@ -137885,7 +137951,7 @@ function buildAlexaBrokerProvider(deps) {
 	});
 	return {
 		list: async ({ kind }) => {
-			if (kind && kind !== ALEXA_KIND) return [];
+			if (kind && kind !== "alexa") return [];
 			return registry.list().map((info) => ({
 				...info,
 				addonId: ownerAddonId
@@ -137901,7 +137967,7 @@ function buildAlexaBrokerProvider(deps) {
 		listProviders: async () => [{
 			addonId: ownerAddonId,
 			kinds: [{
-				kind: ALEXA_KIND,
+				kind: ALEXA_BROKER_KIND,
 				label: "Alexa",
 				signIn: {
 					basePath: "/addon/import-alexa/login",
@@ -137910,7 +137976,7 @@ function buildAlexaBrokerProvider(deps) {
 			}]
 		}],
 		add: async ({ kind, name, settings }) => {
-			if (kind !== ALEXA_KIND) throw new Error(`import-alexa: only kind '${ALEXA_KIND}' is handled here (got '${kind}')`);
+			if (kind !== "alexa") throw new Error(`import-alexa: only kind '${ALEXA_BROKER_KIND}' is handled here (got '${kind}')`);
 			const entry = await registry.createEntry(name, settingsToAlexaConnection(settings));
 			await persistBrokers([...getBrokers(), entry]);
 			return { id: entry.id };
@@ -137968,11 +138034,11 @@ function buildAlexaBrokerProvider(deps) {
 			return entry ? redact(entry) : null;
 		},
 		getSettingsSchema: async ({ kind }) => {
-			if (kind !== ALEXA_KIND) return null;
+			if (kind !== "alexa") return null;
 			return buildConnectionFormSchema();
 		},
 		testSettings: async ({ kind, settings }) => {
-			if (kind !== ALEXA_KIND) return {
+			if (kind !== "alexa") return {
 				ok: false,
 				error: `unsupported kind: ${kind}`
 			};
@@ -139191,14 +139257,6 @@ var BrokerEcho = class {
 	}
 };
 //#endregion
-//#region src/speak/constants.ts
-/** Echo speech limits and the worker restart bound (same window as CrashSupervisor). */
-var ALEXA_SPEAK_ADDON_ID = "import-alexa";
-var ALEXA_SPEAK_KIND = "alexa-echo";
-var DEVICE_REFRESH_MS = 5 * 6e4;
-/** Where the addon serves the Alexa mark; `listTargetKinds` stamps it as `iconUrl`. */
-var ALEXA_SPEAK_ICON_URL = `/addon/${ALEXA_SPEAK_ADDON_ID}/icons/${ALEXA_SPEAK_KIND}`;
-//#endregion
 //#region src/speak/rate-limit.ts
 /**
 * Per-Echo admission. A burst is dropped here, not queued: a queue would be
@@ -139302,9 +139360,16 @@ function readString(config, key) {
 	const value = config[key];
 	return typeof value === "string" ? value : "";
 }
-/** The rule's value for this send wins; the target's saved config is the fallback. */
-function readMode(config, delivery) {
-	return (delivery?.["mode"] ?? config["mode"]) === "announce" ? "announce" : "speak";
+/** The level id an Echo notification uses for "quiet: no chime, no announcement". */
+var SILENT_LEVEL_ID = "silent";
+var SILENT_PRIORITY = 1;
+/**
+* Quiet or announce is decided PER NOTIFICATION, never per target: a silent
+* notification (the kind's silent level, or the lowest priority when no level
+* is named) is spoken quietly, hours-aware; every other one announces.
+*/
+function modeFor(notification) {
+	return (notification.level !== void 0 ? notification.level === SILENT_LEVEL_ID : notification.priority <= SILENT_PRIORITY) ? "speak" : "announce";
 }
 function readVolume(config, delivery) {
 	const ruled = delivery?.["volume"];
@@ -139315,21 +139380,9 @@ function readVolume(config, delivery) {
 /**
 * The delivery parameters a rule may set for an Echo target (D938). The
 * target's own config holds the default; these override it per notification.
+* Quiet vs announce is not one of them: it follows the notification's level.
 */
 var DELIVERY_PARAMS = [{
-	key: "mode",
-	label: "Mode",
-	labelKey: "import-alexa:echoTarget.s_echo.mode.label",
-	type: "enum",
-	options: [{
-		value: "speak",
-		label: "Speak (quiet hours apply)"
-	}, {
-		value: "announce",
-		label: "Announce (chime, then speech)"
-	}],
-	default: "speak"
-}, {
 	key: "volume",
 	label: "Volume",
 	labelKey: "import-alexa:echoTarget.s_echo.volume.label",
@@ -139349,64 +139402,37 @@ function echoOptionLabel(device) {
 	if (kind.length > 0) parts.push(kind);
 	return parts.join(" · ");
 }
-function echoField(devices, showWhen) {
-	return {
-		type: "select",
-		key: "echoId",
-		label: "Echo",
-		labelKey: "import-alexa:echoTarget.s_echo.echoId.label",
-		description: devices.length === 0 ? "No Echo found yet. Sign the Amazon account in on Integrations, Alexa." : void 0,
-		descriptionKey: devices.length === 0 ? "import-alexa:echoTarget.s_echo.echoId.empty" : void 0,
-		options: devices.map((device) => ({
-			value: device.id,
-			label: echoOptionLabel(device)
-		})),
-		...showWhen === void 0 ? {} : { showWhen }
-	};
-}
 /**
 * The two pickers are not `required`: a required select shows its first option
 * while the form still holds no value, so a save would drop the choice. Left
 * optional they open on "Select", and `upsertTarget` refuses an empty pick.
 *
-* The Echo picker is built from the accounts' own device lists on every call,
-* so a new Echo shows up without a deploy. With one account there is no account
-* field; with several, each account's Echoes appear when that account is chosen.
+* The account is a broker pick (existing, or created in place); the Echo list
+* is fetched from that account, so a new Echo shows up without a deploy.
 */
-function configSchema(brokers) {
-	const first = brokers[0];
+function configSchema() {
 	return { sections: [{
 		id: "echo",
 		title: "Echo",
 		titleKey: "import-alexa:echoTarget.s_echo.title",
 		fields: [
-			...brokers.length > 1 ? [{
-				type: "select",
+			...[{
+				type: "broker-select",
 				key: "brokerId",
 				label: "Amazon account",
 				labelKey: "import-alexa:echoTarget.s_echo.brokerId.label",
-				options: brokers.map((broker) => ({
-					value: broker.id,
-					label: broker.name
-				}))
-			}, ...brokers.map((broker) => echoField(broker.devices, {
-				field: "brokerId",
-				equals: broker.id
-			}))] : [echoField(first?.devices ?? [])],
-			{
+				brokerKind: ALEXA_BROKER_KIND
+			}, {
 				type: "select",
-				key: "mode",
-				label: "Mode",
-				labelKey: "import-alexa:echoTarget.s_echo.mode.label",
-				default: "speak",
-				options: [{
-					value: "speak",
-					label: "Speak (quiet hours apply)"
-				}, {
-					value: "announce",
-					label: "Announce (chime, then speech)"
-				}]
-			},
+				key: "echoId",
+				label: "Echo",
+				labelKey: "import-alexa:echoTarget.s_echo.echoId.label",
+				options: [],
+				discoverOptions: {
+					kind: ALEXA_SPEAK_KIND,
+					dependsOn: ["brokerId"]
+				}
+			}],
 			{
 				type: "number",
 				key: "volume",
@@ -139426,8 +139452,8 @@ function configSchema(brokers) {
 		]
 	}] };
 }
-/** The Alexa target kind as the Add target form sees it, for the accounts as they are now. */
-function alexaTargetKind(brokers) {
+/** The Alexa target kind as the Add target form sees it. */
+function alexaTargetKind() {
 	return {
 		kind: ALEXA_SPEAK_KIND,
 		label: "Alexa",
@@ -139437,7 +139463,7 @@ function alexaTargetKind(brokers) {
 		addonId: ALEXA_SPEAK_ADDON_ID,
 		supportsDiscovery: true,
 		destinationKeys: ["brokerId", "echoId"],
-		configSchema: configSchema(brokers),
+		configSchema: configSchema(),
 		deliveryParams: DELIVERY_PARAMS,
 		caps: {
 			attachments: {
@@ -139448,9 +139474,16 @@ function alexaTargetKind(brokers) {
 			actions: 0,
 			actionIcons: false,
 			levels: [{
+				id: SILENT_LEVEL_ID,
+				label: "Silent",
+				ordinal: SILENT_PRIORITY,
+				flags: { silent: true },
+				description: "Spoken quietly: no chime, quiet hours apply."
+			}, {
 				id: "default",
-				label: "Default",
-				ordinal: 3
+				label: "Announce",
+				ordinal: 3,
+				description: "Announced: chime, then speech."
 			}],
 			format: ["text"],
 			clickUrl: false,
@@ -139467,7 +139500,6 @@ function discoveredFrom(broker, device) {
 		config: {
 			brokerId: broker.id,
 			echoId: device.id,
-			mode: "speak",
 			volume: 40,
 			respectDnd: true,
 			family: device.family,
@@ -139480,6 +139512,7 @@ function createAlexaNotificationProvider(ports) {
 	let targets = ports.loadTargets();
 	let ledger = emptySpeechLedger();
 	let deliveries = [];
+	const warnedLegacyMode = /* @__PURE__ */ new Set();
 	function record(row) {
 		deliveries = [...deliveries, row];
 	}
@@ -139621,7 +139654,14 @@ function createAlexaNotificationProvider(ports) {
 				renderedAs: speech.renderedAs
 			};
 		}
-		const mode = readMode(target.config, notification.delivery);
+		const mode = modeFor(notification);
+		if (target.config["mode"] !== void 0 && !warnedLegacyMode.has(target.id)) {
+			warnedLegacyMode.add(target.id);
+			logger.warn("alexa target mode is ignored: quiet vs announce follows each notification", {
+				...tags,
+				meta: { targetId: target.id }
+			});
+		}
 		try {
 			const outcomes = await ports.speak({
 				brokerId: broker.id,
@@ -139699,7 +139739,7 @@ function createAlexaNotificationProvider(ports) {
 			return deliveries;
 		},
 		async listTargetKinds() {
-			return [alexaTargetKind(ports.brokers())];
+			return [alexaTargetKind()];
 		},
 		async listTargets() {
 			return [...targets];
@@ -139709,7 +139749,20 @@ function createAlexaNotificationProvider(ports) {
 			if (found === void 0) throw new Error(`target not found: ${input.targetId}`);
 			return found;
 		},
-		async discoverTargets() {
+		async discoverTargets(input) {
+			const named = readString(input.config ?? {}, "brokerId");
+			if (named.length > 0) {
+				const owner = ports.brokers().find((broker) => broker.id === named);
+				return (owner?.devices ?? []).map((device) => ({
+					...discoveredFrom(owner ?? {
+						id: named,
+						name: named,
+						ready: false,
+						devices: []
+					}, device),
+					suggestedName: echoOptionLabel(device)
+				}));
+			}
 			const taken = new Set(targets.flatMap((row) => {
 				const owner = brokerFor(row.config);
 				return owner === void 0 ? [] : [`${owner.id}/${readString(row.config, "echoId")}`];
@@ -140038,7 +140091,6 @@ function targetsFrom(rows) {
 		config: {
 			...row.brokerId.length > 0 ? { brokerId: row.brokerId } : {},
 			echoId: row.echoId,
-			mode: row.mode,
 			volume: row.volume,
 			respectDnd: row.respectDnd
 		}
@@ -140051,7 +140103,7 @@ function rowsFrom(targets) {
 		enabled: target.enabled,
 		brokerId: typeof target.config["brokerId"] === "string" ? target.config["brokerId"] : "",
 		echoId: typeof target.config["echoId"] === "string" ? target.config["echoId"] : "",
-		mode: target.config["mode"] === "announce" ? "announce" : "speak",
+		mode: "speak",
 		volume: typeof target.config["volume"] === "number" ? target.config["volume"] : 40,
 		respectDnd: target.config["respectDnd"] !== false
 	}));

package/i18n/en.json

@@ -14,8 +14,6 @@
   "echoTarget.s_echo.title": "Echo",
   "echoTarget.s_echo.brokerId.label": "Amazon account",
   "echoTarget.s_echo.echoId.label": "Echo",
-  "echoTarget.s_echo.echoId.empty": "No Echo found yet. Sign the Amazon account in on Integrations, Alexa.",
-  "echoTarget.s_echo.mode.label": "Mode",
   "echoTarget.s_echo.volume.label": "Volume",
   "echoTarget.s_echo.respectDnd.label": "Respect Do Not Disturb",
   "globalSettings": {

package/i18n/it.json

@@ -14,8 +14,6 @@
   "echoTarget.s_echo.title": "Echo",
   "echoTarget.s_echo.brokerId.label": "Account Amazon",
   "echoTarget.s_echo.echoId.label": "Echo",
-  "echoTarget.s_echo.echoId.empty": "Nessun Echo trovato. Accedi con l'account Amazon da Integrazioni, Alexa.",
-  "echoTarget.s_echo.mode.label": "Modalità",
   "echoTarget.s_echo.volume.label": "Volume",
   "echoTarget.s_echo.respectDnd.label": "Rispetta Non disturbare",
   "globalSettings": {

package/package.json

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