camstack 1.2.85 → 1.2.87

package/dist/{chunk-Y3OL5WYZ.js → chunk-I6O2CHPR.js}

@@ -20364,7 +20364,26 @@ var DiscoveryCandidateSchema = external_exports.object({
   * identity ahead of adoption. Rendering metadata (unit, precision)
   * flows live through the cap STATUS SLICE after adoption.
   */
-  sourceInfo: SourceInfoSchema.optional()
+  sourceInfo: SourceInfoSchema.optional(),
+  /**
+  * Set when this candidate is a device the provider ALREADY owns.
+  *
+  * A scan cannot generally produce the identity a device was onboarded under
+  * (Reolink keys on `mac-<mac>`, learned at adopt time), so a stableId
+  * comparison never matches and an owned device looks addable. Re-adopting one
+  * overwrites its config with scan-derived values — that is how a Home Hub's
+  * Baichuan port was overwritten with its ONVIF port, taking the hub and its
+  * three child cameras offline for four hours.
+  *
+  * A provider that can recognise its own devices says so here. Absent means
+  * "not recognised", which is not the same as "known to be new" — a provider
+  * that cannot tell simply never sets it.
+  */
+  alreadyOnboarded: external_exports.boolean().optional(),
+  /** Numeric id of the device this candidate was matched to. Set with `alreadyOnboarded`. */
+  onboardedDeviceId: external_exports.number().optional(),
+  /** Operator-facing name of the matched device, so the UI can say WHICH one it is. */
+  onboardedName: external_exports.string().optional()
 });
 var DeviceSummarySchema = external_exports.object({
   id: external_exports.number(),

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runDiscover
-} from "./chunk-Y3OL5WYZ.js";
+} from "./chunk-I6O2CHPR.js";
 import "./chunk-LMMQX4CK.js";
 
 // src/cli.ts
@@ -38,7 +38,7 @@ async function runServe(args) {
     ...typeof values.data === "string" ? { data: values.data } : {}
   };
   Object.assign(process.env, buildServeEnv(opts));
-  await import("./launcher-6T2UFXIG.js");
+  await import("./launcher-3OHBVI43.js");
 }
 
 // src/commands/agent.ts
@@ -83,7 +83,7 @@ async function runAgent(args) {
     ...typeof values.port === "string" ? { port: values.port } : {}
   };
   Object.assign(process.env, buildAgentEnv(opts));
-  await import("./launcher-6T2UFXIG.js");
+  await import("./launcher-3OHBVI43.js");
 }
 
 // src/commands/setup.ts
@@ -1130,7 +1130,7 @@ function isUnknown(_value) {
   return true;
 }
 async function resolveServerInteractive(presetNamespace) {
-  const { discoverNodes, resolveHubFromDiscovered, filterHubNodes, DEFAULT_HUB_HTTPS_PORT } = await import("./discover-PPTEAP5N.js");
+  const { discoverNodes, resolveHubFromDiscovered, filterHubNodes, DEFAULT_HUB_HTTPS_PORT } = await import("./discover-LZJPQBVA.js");
   if (presetNamespace) {
     const spinner4 = clack.spinner();
     spinner4.start(`Discovering hub on LAN (namespace "${presetNamespace}")`);

package/dist/{discover-PPTEAP5N.js → discover-LZJPQBVA.js}

@@ -5,7 +5,7 @@ import {
   filterHubNodes,
   resolveHubFromDiscovered,
   runDiscover
-} from "./chunk-Y3OL5WYZ.js";
+} from "./chunk-I6O2CHPR.js";
 import "./chunk-LMMQX4CK.js";
 export {
   DEFAULT_HUB_HTTPS_PORT,

package/dist/{launcher-6T2UFXIG.js → launcher-3OHBVI43.js}

@@ -23633,9 +23633,9 @@ var require_zod = __commonJS({
   }
 });
 
-// ../system/dist/dist-whe0b4_3.js
-var require_dist_whe0b4_3 = __commonJS({
-  "../system/dist/dist-whe0b4_3.js"(exports) {
+// ../system/dist/dist-D8VIyu_0.js
+var require_dist_D8VIyu_0 = __commonJS({
+  "../system/dist/dist-D8VIyu_0.js"(exports) {
     "use strict";
     var zod = require_zod();
     var EventCategory = /* @__PURE__ */ (function(EventCategory2) {
@@ -31077,7 +31077,26 @@ var require_dist_whe0b4_3 = __commonJS({
       * identity ahead of adoption. Rendering metadata (unit, precision)
       * flows live through the cap STATUS SLICE after adoption.
       */
-      sourceInfo: SourceInfoSchema.optional()
+      sourceInfo: SourceInfoSchema.optional(),
+      /**
+      * Set when this candidate is a device the provider ALREADY owns.
+      *
+      * A scan cannot generally produce the identity a device was onboarded under
+      * (Reolink keys on `mac-<mac>`, learned at adopt time), so a stableId
+      * comparison never matches and an owned device looks addable. Re-adopting one
+      * overwrites its config with scan-derived values — that is how a Home Hub's
+      * Baichuan port was overwritten with its ONVIF port, taking the hub and its
+      * three child cameras offline for four hours.
+      *
+      * A provider that can recognise its own devices says so here. Absent means
+      * "not recognised", which is not the same as "known to be new" — a provider
+      * that cannot tell simply never sets it.
+      */
+      alreadyOnboarded: zod.z.boolean().optional(),
+      /** Numeric id of the device this candidate was matched to. Set with `alreadyOnboarded`. */
+      onboardedDeviceId: zod.z.number().optional(),
+      /** Operator-facing name of the matched device, so the UI can say WHICH one it is. */
+      onboardedName: zod.z.string().optional()
     });
     var DeviceSummarySchema = zod.z.object({
       id: zod.z.number(),
@@ -60042,7 +60061,7 @@ var require_alerts_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     function selectExpired(alerts, cutoffMs) {
       return alerts.filter((a) => a.createdAt < cutoffMs).sort((a, b) => a.createdAt - b.createdAt).map((a) => a.id);
     }
@@ -60861,7 +60880,7 @@ var require_console_logging = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var require_formatter = require_formatter_DqAKDlvN();
     var LEVEL_RANK = {
       debug: 0,
@@ -60955,7 +60974,7 @@ var require_core_blocks_addon = __commonJS({
     "use strict";
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var node_crypto = __require("crypto");
     var node_fs_promises = __require("fs/promises");
     node_fs_promises = require_chunk.__toESM(node_fs_promises);
@@ -61852,11 +61871,11 @@ var require_core_blocks = __commonJS({
   }
 });
 
-// ../system/dist/retired-settings-keys-BdvmiaK7.js
-var require_retired_settings_keys_BdvmiaK7 = __commonJS({
-  "../system/dist/retired-settings-keys-BdvmiaK7.js"(exports) {
+// ../system/dist/retired-settings-keys-wakiINPT.js
+var require_retired_settings_keys_wakiINPT = __commonJS({
+  "../system/dist/retired-settings-keys-wakiINPT.js"(exports) {
     "use strict";
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     function settingsStoreIsAuthoritativeHere(env) {
       const raw = (env["CAMSTACK_ROLE"] ?? "").trim().toLowerCase();
       return raw === "" || raw === "hub";
@@ -64070,8 +64089,8 @@ var require_device_manager_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
-    var require_retired_settings_keys = require_retired_settings_keys_BdvmiaK7();
+    var require_dist10 = require_dist_D8VIyu_0();
+    var require_retired_settings_keys = require_retired_settings_keys_wakiINPT();
     var node_crypto = __require("crypto");
     var _camstack_types_node = require_node();
     var JOB_HISTORY = 20;
@@ -65547,7 +65566,10 @@ var require_device_manager_addon = __commonJS({
         stableId: d.stableId,
         type: d.type,
         suggestedName: d.suggestedName,
-        prefilledConfig: d.prefilledConfig
+        prefilledConfig: d.prefilledConfig,
+        ...d.alreadyOnboarded === true ? { alreadyOnboarded: true } : {},
+        ...d.onboardedDeviceId !== void 0 ? { onboardedDeviceId: d.onboardedDeviceId } : {},
+        ...d.onboardedName !== void 0 ? { onboardedName: d.onboardedName } : {}
       }));
     }
     async function adoptDevice(pctx, input) {
@@ -69340,7 +69362,7 @@ var require_hub_forwarder = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var require_formatter = require_formatter_DqAKDlvN();
     var DEFAULT_OUTBOUND_BUFFER_SIZE = 500;
     var HubForwarderDestination = class {
@@ -69477,7 +69499,7 @@ var require_liveness_monitor_addon = __commonJS({
     "use strict";
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var NO_DEVICES = "liveness:no-devices";
     var ALL_OFFLINE = "liveness:all-devices-offline";
     var NO_FOOTAGE_PREFIX = "liveness:no-footage:";
@@ -69667,7 +69689,7 @@ var require_local_auth_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var node_crypto = __require("crypto");
     node_crypto = require_chunk.__toESM(node_crypto);
     var crypto$1 = __require("crypto");
@@ -77480,7 +77502,7 @@ var require_loki_logging = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     function sanitizeLabelName(raw) {
       const replaced = raw.replaceAll(/[^a-zA-Z0-9_]/g, "_");
       return /^[a-zA-Z_]/.test(replaced) ? replaced : `_${replaced}`;
@@ -78045,7 +78067,7 @@ var require_native_metrics_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var node_fs_promises = __require("fs/promises");
     var node_child_process = __require("child_process");
     var node_util = __require("util");
@@ -80629,7 +80651,7 @@ var require_filesystem_storage_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var node_crypto = __require("crypto");
     var node_fs_promises = __require("fs/promises");
     var node_path = __require("path");
@@ -81745,8 +81767,8 @@ var require_sqlite_settings_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
-    var require_retired_settings_keys = require_retired_settings_keys_BdvmiaK7();
+    var require_dist10 = require_dist_D8VIyu_0();
+    var require_retired_settings_keys = require_retired_settings_keys_wakiINPT();
     var node_crypto = __require("crypto");
     var node_fs = __require("fs");
     var node_module = __require("module");
@@ -84236,7 +84258,7 @@ var require_storage_orchestrator_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var require_hub_cap_forward = require_hub_cap_forward_DmHNjbB0();
     var zod = require_zod();
     var node_crypto = __require("crypto");
@@ -87187,7 +87209,7 @@ var require_system_config_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var SECTION_TITLES = {
       server: "Server",
       auth: "Authentication"
@@ -105248,7 +105270,7 @@ var require_winston_logging = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var require_formatter = require_formatter_DqAKDlvN();
     var node_path = __require("path");
     node_path = require_chunk.__toESM(node_path);
@@ -117750,12 +117772,12 @@ var require_dist2 = __commonJS({
   }
 });
 
-// ../system/dist/manifest-system-deps-y5vZBO6q.js
-var require_manifest_system_deps_y5vZBO6q = __commonJS({
-  "../system/dist/manifest-system-deps-y5vZBO6q.js"(exports) {
+// ../system/dist/manifest-system-deps-BbP419V1.js
+var require_manifest_system_deps_BbP419V1 = __commonJS({
+  "../system/dist/manifest-system-deps-BbP419V1.js"(exports) {
     "use strict";
     var require_chunk = require_chunk_Cek0wNdY();
-    require_dist_whe0b4_3();
+    require_dist_D8VIyu_0();
     require_hub_cap_forward_DmHNjbB0();
     var node_crypto = __require("crypto");
     node_crypto = require_chunk.__toESM(node_crypto);
@@ -129822,7 +129844,7 @@ var require_dist3 = __commonJS({
     "use strict";
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_whe0b4_3();
+    var require_dist10 = require_dist_D8VIyu_0();
     var require_builtins_alerts_alerts_addon = require_alerts_addon();
     require_alerts();
     var require_formatter = require_formatter_DqAKDlvN();
@@ -129849,7 +129871,7 @@ var require_dist3 = __commonJS({
     var require_builtins_winston_logging_index = require_winston_logging();
     var require_file_data_plane = require_file_data_plane_DO8KbxCe();
     var require_tls$1 = require_tls_BxQlomxd();
-    var require_manifest_system_deps = require_manifest_system_deps_y5vZBO6q();
+    var require_manifest_system_deps = require_manifest_system_deps_BbP419V1();
     var require_resource_monitor = require_resource_monitor_CdnzxBLP();
     var require_custom_action_registry = require_custom_action_registry_jY0NOZK8();
     var zod = require_zod();
@@ -218247,7 +218269,26 @@ ${recipe.triggers.map((t, i) => emitTrigger(t, i)).join("\n\n")}
       * identity ahead of adoption. Rendering metadata (unit, precision)
       * flows live through the cap STATUS SLICE after adoption.
       */
-      sourceInfo: SourceInfoSchema.optional()
+      sourceInfo: SourceInfoSchema.optional(),
+      /**
+      * Set when this candidate is a device the provider ALREADY owns.
+      *
+      * A scan cannot generally produce the identity a device was onboarded under
+      * (Reolink keys on `mac-<mac>`, learned at adopt time), so a stableId
+      * comparison never matches and an owned device looks addable. Re-adopting one
+      * overwrites its config with scan-derived values — that is how a Home Hub's
+      * Baichuan port was overwritten with its ONVIF port, taking the hub and its
+      * three child cameras offline for four hours.
+      *
+      * A provider that can recognise its own devices says so here. Absent means
+      * "not recognised", which is not the same as "known to be new" — a provider
+      * that cannot tell simply never sets it.
+      */
+      alreadyOnboarded: zod.z.boolean().optional(),
+      /** Numeric id of the device this candidate was matched to. Set with `alreadyOnboarded`. */
+      onboardedDeviceId: zod.z.number().optional(),
+      /** Operator-facing name of the matched device, so the UI can say WHICH one it is. */
+      onboardedName: zod.z.string().optional()
     });
     var DeviceSummarySchema = zod.z.object({
       id: zod.z.number(),
@@ -239772,6 +239813,23 @@ ${recipe.triggers.map((t, i) => emitTrigger(t, i)).join("\n\n")}
       * failed — logged at ERROR with `tags.deviceId` and surfaced via
       * `getStatus().error`.
       */
+      /**
+      * Repair a row's PERSISTED config blob immediately before it is restored.
+      * Default: no-op — most providers have nothing to heal.
+      *
+      * This exists because a restored device self-hydrates from the DB: `create()`
+      * passes `{}` and `BaseDevice` parses the stored blob against the device
+      * schema. A blob that lost a REQUIRED field therefore fails restore forever,
+      * and no later pass revisits it — a hub-adopted Reolink camera whose blob had
+      * been emptied failed all four bounded attempts against fields
+      * (`host`, `password`) it inherits from its parent and never dials itself.
+      *
+      * Implementations get every saved row, so a child can read its parent's blob.
+      * A heal that throws is treated like any other restore failure: retried under
+      * the bound, then reported — never swallowed.
+      */
+      async healSavedConfig(_saved, _allSaved) {
+      }
       async onRestoreDevices(savedDevices) {
         const restored = /* @__PURE__ */ new Set();
         const failures = [];
@@ -239780,6 +239838,7 @@ ${recipe.triggers.map((t, i) => emitTrigger(t, i)).join("\n\n")}
           const Class = this.deviceClasses[saved.type];
           if (!Class) throw new Error(`no device class registered for type "${saved.type}"`);
           if (saved.parentDeviceId !== null && !restored.has(saved.parentDeviceId)) throw new Error(`parent device ${saved.parentDeviceId} not restored`);
+          await this.healSavedConfig(saved, savedDevices);
           await this.ctx.kernel.devices.create(saved.stableId, Class, {}, saved.parentDeviceId);
           restored.add(saved.id);
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstack",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "description": "CLI tool for managing and running CamStack server",
   "keywords": [
     "camstack",