@camstack/addon-provider-homeassistant 1.2.660 → 1.2.661

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.661] - 2026-11-05
+
+### Changed
+
+- Copying an integration into its record reads the leftover rows through the migration-only door and resolves their secrets in this addon
+
 ## [1.2.660] - 2026-11-05
 
 ### Changed

package/dist/addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_legacy_integration_rows = require("./legacy-integration-rows-BWVmjfDO.js");
+const require_legacy_integration_rows = require("./legacy-integration-rows-B_X4VL29.js");
 let node_crypto = require("node:crypto");
 let node_zlib = require("node:zlib");
 //#region src/ha-admin-link.ts
@@ -9107,7 +9107,12 @@ var HaProviderAddon = class HaProviderAddon extends require_legacy_integration_r
 		if (this.ctx.secrets === void 0) throw new Error("provider-homeassistant: ctx.secrets is required");
 		return {
 			readStored: (key) => this.readStoredGlobalKey(key),
-			...require_legacy_integration_rows.haInstanceSettingsPortsOver(this.ctx.api.integrations),
+			...require_legacy_integration_rows.haInstanceSettingsPortsOver({
+				list: this.ctx.api.integrations.list,
+				readLegacyIntegrationRows: this.ctx.api.migrations.readLegacyIntegrationRows,
+				patchLegacyIntegrationRows: this.ctx.api.migrations.patchLegacyIntegrationRows,
+				deleteLegacyIntegrationRowKeys: this.ctx.api.migrations.deleteLegacyIntegrationRowKeys
+			}, this.ctx.secrets ?? null),
 			...haInstanceRecordPortsOver(records.kind(haBrokersEntryKind)),
 			...require_legacy_integration_rows.flattenPortsOver(records.kind(haBrokersEntryKind))
 		};

package/dist/addon.mjs

@@ -1,4 +1,4 @@
-import { $ as fanControlCapability, $t as createEvent, A as bestLocationMatch, At as runningFromMediaPlayer, B as climateControlCapability, Bt as tryConvertDelta, C as accessoriesCapability, Ct as pressureSensorCapability, D as ambientLightSensorCapability, Dt as resolveAttachmentUrls, E as alarmPanelCapability, Et as quantityFromUnit, F as buildAddonRouteProvider, Ft as smokeCapability, G as contactCapability, Gt as vibrationCapability, H as connectivityCapability, Ht as updateCapability, I as buildDeviceAdminUrl, J as deviceAdminLinkCapability, K as controlCapability, Kt as waterHeaterCapability, L as buttonCapability, Lt as switchCapability, M as boardKeySourceCapability, Mt as runningStateCapability, N as brightnessCapability, Nt as scriptRunnerCapability, O as automationControlCapability, P as brokerCapability, Q as eventEmitterCapability, Qt as baseUnitOf, R as calendarSourceCapability, Rt as tamperCapability, S as TargetSchema, Sn as EventCategory, St as presenceCapability, T as airQualitySensorCapability, Tt as publicEndpointReaderFrom, Ut as vacuumControlCapability, V as colorCapability, Vt as tryConvertUnit, Wt as valveCapability, Xt as RecordSecretUnavailableError, Y as deviceAdoptionCapability, Z as enumSensorCapability, _n as url, at as humiditySensorCapability, b as RUNNING_STATE_COLD, bn as DeviceType, bt as preconditionOf, cn as boolean, ct as integrationInstancesCapability, dn as number, dt as mediaPlayerCapability, en as defineAddonMigrations, et as flattenNestedRecords, fn as object, ft as motionCapability, gn as unknown, gt as numericSensorCapability, hn as union, ht as notifierCapability, it as humidifierCapability, j as binaryCapability, jt as runningFromVacuumState, k as batteryCapability, kt as runningFromLawnMower, ln as discriminatedUnion, lt as lawnMowerControlCapability, m as EnumSensorDateTimeFormatSchema, mn as string, mt as notificationOutputCapability, n as HA_BROKER_KIND, nn as defineRecordKinds, nt as floodCapability, o as BaseDevice, on as _enum, ot as imageCapability, pn as record, pt as normalizeUnit, q as coverCapability, qt as weatherCapability, rn as entryBody, rt as gasCapability, s as BaseDeviceProvider, sn as array, st as ingestReading, t as haInstanceSettingsPortsOver, tn as defineEntryKind, tt as flattenPortsOver, un as literal, ut as lockControlCapability, vn as DeviceFeature, vt as parseAdminBase, w as addonRoutesCapability, x as RecordIntegrationInstances, xn as errMsg, xt as prepareNotification, yn as DeviceRole, yt as powerMeterCapability, z as carbonMonoxideCapability, zt as temperatureSensorCapability } from "./legacy-integration-rows-BIbFoT26.mjs";
+import { $ as fanControlCapability, $t as createEvent, A as bestLocationMatch, At as runningFromMediaPlayer, B as climateControlCapability, Bt as tryConvertDelta, C as accessoriesCapability, Ct as pressureSensorCapability, D as ambientLightSensorCapability, Dt as resolveAttachmentUrls, E as alarmPanelCapability, Et as quantityFromUnit, F as buildAddonRouteProvider, Ft as smokeCapability, G as contactCapability, Gt as vibrationCapability, H as connectivityCapability, Ht as updateCapability, I as buildDeviceAdminUrl, J as deviceAdminLinkCapability, K as controlCapability, Kt as waterHeaterCapability, L as buttonCapability, Lt as switchCapability, M as boardKeySourceCapability, Mt as runningStateCapability, N as brightnessCapability, Nt as scriptRunnerCapability, O as automationControlCapability, P as brokerCapability, Q as eventEmitterCapability, Qt as baseUnitOf, R as calendarSourceCapability, Rt as tamperCapability, S as TargetSchema, Sn as EventCategory, St as presenceCapability, T as airQualitySensorCapability, Tt as publicEndpointReaderFrom, Ut as vacuumControlCapability, V as colorCapability, Vt as tryConvertUnit, Wt as valveCapability, Xt as RecordSecretUnavailableError, Y as deviceAdoptionCapability, Z as enumSensorCapability, _n as url, at as humiditySensorCapability, b as RUNNING_STATE_COLD, bn as DeviceType, bt as preconditionOf, cn as boolean, ct as integrationInstancesCapability, dn as number, dt as mediaPlayerCapability, en as defineAddonMigrations, et as flattenNestedRecords, fn as object, ft as motionCapability, gn as unknown, gt as numericSensorCapability, hn as union, ht as notifierCapability, it as humidifierCapability, j as binaryCapability, jt as runningFromVacuumState, k as batteryCapability, kt as runningFromLawnMower, ln as discriminatedUnion, lt as lawnMowerControlCapability, m as EnumSensorDateTimeFormatSchema, mn as string, mt as notificationOutputCapability, n as HA_BROKER_KIND, nn as defineRecordKinds, nt as floodCapability, o as BaseDevice, on as _enum, ot as imageCapability, pn as record, pt as normalizeUnit, q as coverCapability, qt as weatherCapability, rn as entryBody, rt as gasCapability, s as BaseDeviceProvider, sn as array, st as ingestReading, t as haInstanceSettingsPortsOver, tn as defineEntryKind, tt as flattenPortsOver, un as literal, ut as lockControlCapability, vn as DeviceFeature, vt as parseAdminBase, w as addonRoutesCapability, x as RecordIntegrationInstances, xn as errMsg, xt as prepareNotification, yn as DeviceRole, yt as powerMeterCapability, z as carbonMonoxideCapability, zt as temperatureSensorCapability } from "./legacy-integration-rows-Bhvthv-s.mjs";
 import { randomUUID } from "node:crypto";
 import { brotliCompressSync, deflateSync, gzipSync } from "node:zlib";
 //#region src/ha-admin-link.ts
@@ -9086,7 +9086,12 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 		if (this.ctx.secrets === void 0) throw new Error("provider-homeassistant: ctx.secrets is required");
 		return {
 			readStored: (key) => this.readStoredGlobalKey(key),
-			...haInstanceSettingsPortsOver(this.ctx.api.integrations),
+			...haInstanceSettingsPortsOver({
+				list: this.ctx.api.integrations.list,
+				readLegacyIntegrationRows: this.ctx.api.migrations.readLegacyIntegrationRows,
+				patchLegacyIntegrationRows: this.ctx.api.migrations.patchLegacyIntegrationRows,
+				deleteLegacyIntegrationRowKeys: this.ctx.api.migrations.deleteLegacyIntegrationRowKeys
+			}, this.ctx.secrets ?? null),
 			...haInstanceRecordPortsOver(records.kind(haBrokersEntryKind)),
 			...flattenPortsOver(records.kind(haBrokersEntryKind))
 		};

package/dist/ha-export/ha-export.addon.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_legacy_integration_rows = require("../legacy-integration-rows-BWVmjfDO.js");
+const require_legacy_integration_rows = require("../legacy-integration-rows-B_X4VL29.js");
 let node_crypto = require("node:crypto");
 require("node:zlib");
 let node_fs = require("node:fs");
@@ -5781,7 +5781,12 @@ async function readAllLinks(handle) {
 function haExportMigrationPorts(deps) {
 	return {
 		readStored: deps.readStored,
-		...require_legacy_integration_rows.haInstanceSettingsPortsOver(deps.api.integrations),
+		...require_legacy_integration_rows.haInstanceSettingsPortsOver({
+			list: deps.api.integrations.list,
+			readLegacyIntegrationRows: deps.api.migrations.readLegacyIntegrationRows,
+			patchLegacyIntegrationRows: deps.api.migrations.patchLegacyIntegrationRows,
+			deleteLegacyIntegrationRowKeys: deps.api.migrations.deleteLegacyIntegrationRowKeys
+		}, deps.secrets ?? null),
 		warn: deps.warn,
 		putLinks: async (brokerId, body) => {
 			if (await deps.links.get(brokerId) !== null) return "exists";
@@ -8108,6 +8113,7 @@ var HaExportAddon = class extends require_legacy_integration_rows.BaseAddon {
 		await this.runMigrations(require_legacy_integration_rows.defineAddonMigrations(ADDON_MIGRATIONS, haExportMigrationPorts({
 			readStored: async () => this.resolveGlobalStore(),
 			api: this.ctx.api,
+			secrets: this.ctx.secrets ?? null,
 			links: legacyLinks,
 			targets: targetsHandle,
 			clearSettingKeys: async (keys) => {

package/dist/ha-export/ha-export.addon.mjs

@@ -1,4 +1,4 @@
-import { F as buildAddonRouteProvider, It as statusInstanceOf, Jt as BaseAddon, Ot as runExportedAction, Pt as sendToExportedTarget, Qt as baseUnitOf, Sn as EventCategory, U as consumableFormOf, W as consumableKindOf, X as deviceExportCapability, Zt as RevConflictError, _ as HvacModeSchema, _t as oauthIntegrationCapability, a as AlarmArmModeSchema, an as nodePin, bt as preconditionOf, c as CAMERA_SWITCH_ORDER, cn as boolean, ct as integrationInstancesCapability, d as ConsumableFormSchema, dn as number, en as defineAddonMigrations, f as ConsumableItemSchema, fn as object, g as FanDirectionSchema, gn as unknown, h as ExportInstanceUnknownError, i as listHomeAssistantBrokers, in as isReadingQuantity, l as COCO_TO_MACRO, mn as string, on as _enum, p as ConsumableStatusSchema, sn as array, t as haInstanceSettingsPortsOver, tn as defineEntryKind, u as CameraSwitchIdSchema, v as MediaPlayerRepeatSchema, w as addonRoutesCapability, wt as pruneDeletedEntities, x as RecordIntegrationInstances, y as PLUG_APPLIANCE_TYPES } from "../legacy-integration-rows-BIbFoT26.mjs";
+import { F as buildAddonRouteProvider, It as statusInstanceOf, Jt as BaseAddon, Ot as runExportedAction, Pt as sendToExportedTarget, Qt as baseUnitOf, Sn as EventCategory, U as consumableFormOf, W as consumableKindOf, X as deviceExportCapability, Zt as RevConflictError, _ as HvacModeSchema, _t as oauthIntegrationCapability, a as AlarmArmModeSchema, an as nodePin, bt as preconditionOf, c as CAMERA_SWITCH_ORDER, cn as boolean, ct as integrationInstancesCapability, d as ConsumableFormSchema, dn as number, en as defineAddonMigrations, f as ConsumableItemSchema, fn as object, g as FanDirectionSchema, gn as unknown, h as ExportInstanceUnknownError, i as listHomeAssistantBrokers, in as isReadingQuantity, l as COCO_TO_MACRO, mn as string, on as _enum, p as ConsumableStatusSchema, sn as array, t as haInstanceSettingsPortsOver, tn as defineEntryKind, u as CameraSwitchIdSchema, v as MediaPlayerRepeatSchema, w as addonRoutesCapability, wt as pruneDeletedEntities, x as RecordIntegrationInstances, y as PLUG_APPLIANCE_TYPES } from "../legacy-integration-rows-Bhvthv-s.mjs";
 import { createHmac, timingSafeEqual } from "node:crypto";
 import "node:zlib";
 import "node:fs";
@@ -5743,7 +5743,12 @@ async function readAllLinks(handle) {
 function haExportMigrationPorts(deps) {
 	return {
 		readStored: deps.readStored,
-		...haInstanceSettingsPortsOver(deps.api.integrations),
+		...haInstanceSettingsPortsOver({
+			list: deps.api.integrations.list,
+			readLegacyIntegrationRows: deps.api.migrations.readLegacyIntegrationRows,
+			patchLegacyIntegrationRows: deps.api.migrations.patchLegacyIntegrationRows,
+			deleteLegacyIntegrationRowKeys: deps.api.migrations.deleteLegacyIntegrationRowKeys
+		}, deps.secrets ?? null),
 		warn: deps.warn,
 		putLinks: async (brokerId, body) => {
 			if (await deps.links.get(brokerId) !== null) return "exists";
@@ -8070,6 +8075,7 @@ var HaExportAddon = class extends BaseAddon {
 		await this.runMigrations(defineAddonMigrations(ADDON_MIGRATIONS, haExportMigrationPorts({
 			readStored: async () => this.resolveGlobalStore(),
 			api: this.ctx.api,
+			secrets: this.ctx.secrets ?? null,
 			links: legacyLinks,
 			targets: targetsHandle,
 			clearSettingKeys: async (keys) => {

package/dist/{legacy-integration-rows-BWVmjfDO.js → legacy-integration-rows-B_X4VL29.js}

@@ -5981,7 +5981,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-D1jjWAr8.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).
@@ -7935,10 +7935,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;
 	}
 	/**
@@ -7984,7 +7983,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 });
 	}
@@ -56784,11 +56783,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(),
@@ -56809,22 +56804,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(object({ id: string() }), object({
-	rows: number().int().nonnegative(),
-	secrets: number().int().nonnegative()
-}), {
-	kind: "mutation",
-	auth: "admin"
 }), method(_void(), array(AvailableIntegrationTypeSchema), { auth: "admin" }), method(object({
 	addonId: string(),
 	settings: record(string(), unknown())
@@ -59801,6 +59780,27 @@ method(object({}), object({ entries: array(MigrationLedgerEntrySchema) }), { aut
 }), {
 	kind: "mutation",
 	auth: "admin"
+}), method(object({ integrationId: string().min(1) }), record(string(), unknown()), { auth: "admin" }), method(object({ integrationId: string().min(1) }), object({
+	rows: number().int().nonnegative(),
+	secrets: number().int().nonnegative()
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	integrationId: string().min(1),
+	patch: record(string(), unknown())
+}), object({ written: boolean() }), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	integrationId: string().min(1),
+	keys: array(string().min(1))
+}), object({
+	present: boolean(),
+	removed: record(string(), unknown())
+}), {
+	kind: "mutation",
+	auth: "admin"
 });
 method(object({
 	sourceUrl: string(),
@@ -86621,13 +86621,6 @@ Object.freeze({
 		access: "create",
 		role: "admin"
 	},
-	"integrations.clearSettings": {
-		capName: "integrations",
-		capScope: "system",
-		addonId: null,
-		access: "delete",
-		role: "admin"
-	},
 	"integrations.create": {
 		capName: "integrations",
 		capScope: "system",
@@ -86663,13 +86656,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",
@@ -86677,13 +86663,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",
@@ -87678,6 +87657,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",
@@ -87685,6 +87671,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",
@@ -87720,6 +87713,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",
@@ -98399,13 +98406,18 @@ var HA_BROKER_KIND = "home-assistant";
 async function listHomeAssistantBrokers(query) {
 	return (await query({})).filter((broker) => broker.kind === HA_BROKER_KIND);
 }
-function haInstanceSettingsPortsOver(api) {
+function refsOfKeys(stored, keys) {
+	const picked = {};
+	for (const key of keys) if (Object.prototype.hasOwnProperty.call(stored, key)) picked[key] = stored[key];
+	return collectSecretMarkerRefs(picked);
+}
+function haInstanceSettingsPortsOver(api, secrets = null) {
 	const listInstances = async () => {
 		const all = await api.list.query();
 		const rows = [];
 		for (const integration of all) {
 			if (integration.addonId !== "provider-homeassistant") continue;
-			const settings = await api.getSettings.query({ id: integration.id });
+			const settings = await api.readLegacyIntegrationRows.query({ integrationId: integration.id });
 			const brokerId = settings["brokerId"];
 			rows.push({
 				integrationId: integration.id,
@@ -98415,31 +98427,26 @@ function haInstanceSettingsPortsOver(api) {
 		}
 		return rows;
 	};
+	const owns = async (integrationId) => {
+		return (await api.list.query()).some((i) => i.id === integrationId && i.addonId === "provider-homeassistant");
+	};
 	return {
 		listInstances,
 		patchInstanceSettings: async (integrationId, patch) => {
-			if (!(await api.list.query()).some((i) => i.id === integrationId && i.addonId === "provider-homeassistant")) return false;
-			const stored = await api.getSettings.query({ id: integrationId });
-			await api.setSettings.mutate({
-				id: integrationId,
-				settings: {
-					...stored,
-					...patch
-				},
-				skipRestart: true
-			});
-			return true;
+			if (!await owns(integrationId)) return false;
+			return (await api.patchLegacyIntegrationRows.mutate({
+				integrationId,
+				patch: { ...patch }
+			})).written;
 		},
 		clearInstanceSettingsKeys: async (integrationId, keys) => {
-			if (!(await api.list.query()).some((i) => i.id === integrationId && i.addonId === "provider-homeassistant")) return false;
-			const stored = await api.getSettings.query({ id: integrationId });
-			const drop = new Set(keys);
-			await api.setSettings.mutate({
-				id: integrationId,
-				settings: Object.fromEntries(Object.entries(stored).filter(([key]) => !drop.has(key))),
-				skipRestart: true
-			});
-			return true;
+			if (!await owns(integrationId)) return false;
+			const refs = refsOfKeys(await api.readLegacyIntegrationRows.query({ integrationId }), keys);
+			if (refs.length > 0 && secrets !== null) await secrets.delete(refs);
+			return (await api.deleteLegacyIntegrationRowKeys.mutate({
+				integrationId,
+				keys
+			})).present;
 		}
 	};
 }

package/dist/{legacy-integration-rows-BIbFoT26.mjs → legacy-integration-rows-Bhvthv-s.mjs}

@@ -5980,7 +5980,7 @@ var ZodIssueCode = {
 var ZodFirstPartyTypeKind;
 ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {});
 //#endregion
-//#region ../types/dist/sleep-D1jjWAr8.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).
@@ -7934,10 +7934,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;
 	}
 	/**
@@ -7983,7 +7982,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 });
 	}
@@ -56783,11 +56782,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(),
@@ -56808,22 +56803,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(object({ id: string() }), object({
-	rows: number().int().nonnegative(),
-	secrets: number().int().nonnegative()
-}), {
-	kind: "mutation",
-	auth: "admin"
 }), method(_void(), array(AvailableIntegrationTypeSchema), { auth: "admin" }), method(object({
 	addonId: string(),
 	settings: record(string(), unknown())
@@ -59800,6 +59779,27 @@ method(object({}), object({ entries: array(MigrationLedgerEntrySchema) }), { aut
 }), {
 	kind: "mutation",
 	auth: "admin"
+}), method(object({ integrationId: string().min(1) }), record(string(), unknown()), { auth: "admin" }), method(object({ integrationId: string().min(1) }), object({
+	rows: number().int().nonnegative(),
+	secrets: number().int().nonnegative()
+}), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	integrationId: string().min(1),
+	patch: record(string(), unknown())
+}), object({ written: boolean() }), {
+	kind: "mutation",
+	auth: "admin"
+}), method(object({
+	integrationId: string().min(1),
+	keys: array(string().min(1))
+}), object({
+	present: boolean(),
+	removed: record(string(), unknown())
+}), {
+	kind: "mutation",
+	auth: "admin"
 });
 method(object({
 	sourceUrl: string(),
@@ -86620,13 +86620,6 @@ Object.freeze({
 		access: "create",
 		role: "admin"
 	},
-	"integrations.clearSettings": {
-		capName: "integrations",
-		capScope: "system",
-		addonId: null,
-		access: "delete",
-		role: "admin"
-	},
 	"integrations.create": {
 		capName: "integrations",
 		capScope: "system",
@@ -86662,13 +86655,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",
@@ -86676,13 +86662,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",
@@ -87677,6 +87656,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",
@@ -87684,6 +87670,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",
@@ -87719,6 +87712,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",
@@ -98398,13 +98405,18 @@ var HA_BROKER_KIND = "home-assistant";
 async function listHomeAssistantBrokers(query) {
 	return (await query({})).filter((broker) => broker.kind === HA_BROKER_KIND);
 }
-function haInstanceSettingsPortsOver(api) {
+function refsOfKeys(stored, keys) {
+	const picked = {};
+	for (const key of keys) if (Object.prototype.hasOwnProperty.call(stored, key)) picked[key] = stored[key];
+	return collectSecretMarkerRefs(picked);
+}
+function haInstanceSettingsPortsOver(api, secrets = null) {
 	const listInstances = async () => {
 		const all = await api.list.query();
 		const rows = [];
 		for (const integration of all) {
 			if (integration.addonId !== "provider-homeassistant") continue;
-			const settings = await api.getSettings.query({ id: integration.id });
+			const settings = await api.readLegacyIntegrationRows.query({ integrationId: integration.id });
 			const brokerId = settings["brokerId"];
 			rows.push({
 				integrationId: integration.id,
@@ -98414,31 +98426,26 @@ function haInstanceSettingsPortsOver(api) {
 		}
 		return rows;
 	};
+	const owns = async (integrationId) => {
+		return (await api.list.query()).some((i) => i.id === integrationId && i.addonId === "provider-homeassistant");
+	};
 	return {
 		listInstances,
 		patchInstanceSettings: async (integrationId, patch) => {
-			if (!(await api.list.query()).some((i) => i.id === integrationId && i.addonId === "provider-homeassistant")) return false;
-			const stored = await api.getSettings.query({ id: integrationId });
-			await api.setSettings.mutate({
-				id: integrationId,
-				settings: {
-					...stored,
-					...patch
-				},
-				skipRestart: true
-			});
-			return true;
+			if (!await owns(integrationId)) return false;
+			return (await api.patchLegacyIntegrationRows.mutate({
+				integrationId,
+				patch: { ...patch }
+			})).written;
 		},
 		clearInstanceSettingsKeys: async (integrationId, keys) => {
-			if (!(await api.list.query()).some((i) => i.id === integrationId && i.addonId === "provider-homeassistant")) return false;
-			const stored = await api.getSettings.query({ id: integrationId });
-			const drop = new Set(keys);
-			await api.setSettings.mutate({
-				id: integrationId,
-				settings: Object.fromEntries(Object.entries(stored).filter(([key]) => !drop.has(key))),
-				skipRestart: true
-			});
-			return true;
+			if (!await owns(integrationId)) return false;
+			const refs = refsOfKeys(await api.readLegacyIntegrationRows.query({ integrationId }), keys);
+			if (refs.length > 0 && secrets !== null) await secrets.delete(refs);
+			return (await api.deleteLegacyIntegrationRowKeys.mutate({
+				integrationId,
+				keys
+			})).present;
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-homeassistant",
-  "version": "1.2.660",
+  "version": "1.2.661",
   "description": "Home Assistant device provider addon for CamStack",
   "keywords": [
     "camstack",
@@ -137,7 +137,7 @@
       "description": "Device provider (import) + native entity export (push). Two addons, one bundle, separate processes."
     },
     "requires": {
-      "server": ">=1.2.769"
+      "server": ">=1.2.770"
     }
   },
   "files": [