@camstack/system 1.2.458 → 1.2.459

package/dist/builtins/sqlite-storage/sqlite-settings.addon.mjs

@@ -1,6 +1,6 @@
-import { C as DATABASE_SNAPSHOT_TIMEOUT_MS, Jt as databaseSnapshotCapability, Ot as bareAddonId, Rr as vectorStoreCapability, S as DATABASE_SNAPSHOT_SUFFIX, Tr as storageAdminCapability, ar as recordsCapability, ci as DeclarationRefusedError, ji as UnknownRecordKindError, la as normalizeSecretOwner, ma as parseSettingsBrokersAdoptsFrom, ni as BaseAddon, ot as STORAGE_ADMIN_MOVED_COLLECTIONS, pa as parseSettingsArrayAdoptsFrom, pi as NoCallerError, qt as dataStoreProviderCapability, st as STORAGE_ADMIN_SCOPED_BASES, ti as errMsg, vi as RECORD_SWEEP_INTERVAL_MS, w as DATA_STORE_DATABASES, wi as RecordKindDeclarationSchema, x as DATABASE_SNAPSHOT_PARTIAL_SUFFIX, xi as RUNTIME_DEFAULTS } from "../../dist-B_GRPhnY.mjs";
+import { C as DATABASE_SNAPSHOT_TIMEOUT_MS, Jt as databaseSnapshotCapability, Ot as bareAddonId, Rr as vectorStoreCapability, S as DATABASE_SNAPSHOT_SUFFIX, Tr as storageAdminCapability, ar as recordsCapability, ca as normalizeSecretOwner, ci as DeclarationRefusedError, ji as UnknownRecordKindError, ni as BaseAddon, ot as STORAGE_ADMIN_MOVED_COLLECTIONS, pi as NoCallerError, qt as dataStoreProviderCapability, st as STORAGE_ADMIN_SCOPED_BASES, ti as errMsg, vi as RECORD_SWEEP_INTERVAL_MS, w as DATA_STORE_DATABASES, wi as RecordKindDeclarationSchema, x as DATABASE_SNAPSHOT_PARTIAL_SUFFIX, xi as RUNTIME_DEFAULTS } from "../../dist-Wy8cTxg6.mjs";
 import { i as retiredKeyStoreOf, n as purgeRetiredSettingsKeys } from "../../retired-settings-keys-Bhwe4ymb.mjs";
-import { C as RecordsEngine, D as callVector, E as callRecords, O as controlTargetOf, S as trustResult, T as callData, _ as collectTransferables, a as WalMaintenance, c as vectorProviderOfOwnedFile, d as CrossDatabaseTransactError, f as DatabaseBusyError, l as SqliteSettingsBackend, m as rehydrateError, o as createVectorIndex, p as DuplicatePlacementError, s as vectorProviderOf, u as CollectionPlacementError, v as isFileHostMessage, w as callControl } from "../../wal-maintenance-Duejh7Lx.mjs";
+import { C as RecordsEngine, D as callVector, E as callRecords, O as controlTargetOf, S as trustResult, T as callData, _ as collectTransferables, a as WalMaintenance, c as vectorProviderOfOwnedFile, d as CrossDatabaseTransactError, f as DatabaseBusyError, l as SqliteSettingsBackend, m as rehydrateError, o as createVectorIndex, p as DuplicatePlacementError, s as vectorProviderOf, u as CollectionPlacementError, v as isFileHostMessage, w as callControl } from "../../wal-maintenance-NKbwWovZ.mjs";
 import { r as isSnapshotWorkerMessage } from "../../sqlite-snapshot-protocol-2QaTouWV.mjs";
 import { a as isWorkerMessage, t as WAL_CHECKPOINT_LARGE_PASS_FRAMES } from "../../wal-checkpoint-policy-BahrTtyD.mjs";
 import { createRequire } from "node:module";
@@ -931,9 +931,6 @@ var InlineOwnedFile = class extends OwnedFileBase {
 	listPhysicalTables(ownerPrefix) {
 		return Promise.resolve(callControl(controlTargetOf(this.backend, 0), "listPhysicalTables", { ownerPrefix }));
 	}
-	readLegacyCollection(input) {
-		return Promise.resolve(callControl(controlTargetOf(this.backend, 0), "readLegacyCollection", input));
-	}
 	async dropRetiredTable(name) {
 		return callControl(controlTargetOf(this.backend, 0), "dropRetiredTable", { name });
 	}
@@ -991,9 +988,6 @@ var WorkerOwnedFile = class extends OwnedFileBase {
 	listPhysicalTables(ownerPrefix) {
 		return this.client.control("listPhysicalTables", { ownerPrefix });
 	}
-	readLegacyCollection(input) {
-		return this.client.control("readLegacyCollection", input);
-	}
 	dropRetiredTable(name) {
 		return this.client.control("dropRetiredTable", { name });
 	}
@@ -1238,54 +1232,6 @@ var PlacementRouter = class {
 	}
 };
 //#endregion
-//#region src/builtins/sqlite-storage/records/count-settings-array-legacy.ts
-function isRecord$1(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function unwrapValue$1(raw) {
-	if (isRecord$1(raw) && "value" in raw) return raw["value"];
-	return raw;
-}
-function legacyRowId(item) {
-	const id = item["id"];
-	if (typeof id === "string" && id.length > 0) return id;
-	const username = item["username"];
-	if (typeof username === "string" && username.length > 0) return username;
-	return null;
-}
-async function countSettingsArrayLegacy(router, addonId, settingsKey) {
-	const list = unwrapValue$1(await router.get({
-		collection: "addon-settings",
-		key: `${addonId}.${settingsKey}`
-	}));
-	if (!Array.isArray(list)) return 0;
-	let n = 0;
-	for (const item of list) {
-		if (!isRecord$1(item)) continue;
-		if (legacyRowId(item) !== null) n += 1;
-	}
-	return n;
-}
-//#endregion
-//#region src/builtins/sqlite-storage/records/count-settings-brokers-legacy.ts
-function isRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function unwrapValue(raw) {
-	if (isRecord(raw) && "value" in raw) return raw["value"];
-	return raw;
-}
-async function countSettingsBrokersLegacy(router, addonId) {
-	const list = unwrapValue(await router.get({
-		collection: "addon-settings",
-		key: `${addonId}.brokers`
-	}));
-	if (!Array.isArray(list)) return 0;
-	let n = 0;
-	for (const item of list) if (isRecord(item) && typeof item["id"] === "string") n += 1;
-	return n;
-}
-//#endregion
 //#region src/builtins/sqlite-storage/records/records-provider.ts
 /**
 * The `records` capability of the engine (D881): resolves WHO is calling and
@@ -1298,9 +1244,9 @@ async function countSettingsBrokersLegacy(router, addonId) {
 *   rebuilt from each open file's own `_record_kinds` at boot and updated on
 *   declaration. A kind declared for another file than the one it lives in is
 *   refused (the engine never moves data, D853).
-* - **The boot guard**: after a declaration, a kind with `adoptsFrom` that is
-*   EMPTY while its legacy table still holds rows is reported `adoptionPending`;
-*   `ctx.records.declare` turns that into a refusal to start.
+* - **No adoption** (D900): the records migration is closed. A declaration
+*   reads no legacy table, and a retired `adoptsFrom` an older addon still
+*   sends is dropped before the catalog stores the declaration.
 */
 /** The caller the transport stamped, or a refusal. */
 function recordsCallerOf(input) {
@@ -1311,6 +1257,16 @@ function recordsCallerOf(input) {
 function keyOf(owner, kind) {
 	return `${owner}\u0000${kind}`;
 }
+/**
+* A declaration as the catalog stores it: the retired `adoptsFrom` (D900) left
+* out, so the row an older addon's redeclaration writes no longer carries it.
+*/
+function withoutRetiredKeys(declaration) {
+	return {
+		...declaration,
+		adoptsFrom: void 0
+	};
+}
 var RecordsProvider = class {
 	router;
 	logger;
@@ -1344,7 +1300,7 @@ var RecordsProvider = class {
 		const owner = recordsCallerOf(input);
 		const byDatabase = /* @__PURE__ */ new Map();
 		const parsed = /* @__PURE__ */ new Map();
-		for (const [kind, raw] of Object.entries(input.kinds)) parsed.set(kind, RecordKindDeclarationSchema.parse(raw));
+		for (const [kind, raw] of Object.entries(input.kinds)) parsed.set(kind, withoutRetiredKeys(RecordKindDeclarationSchema.parse(raw)));
 		await this.assertFamiliesInOneFile(owner, parsed);
 		for (const [kind, declaration] of parsed) {
 			const known = this.placement.get(keyOf(owner, kind));
@@ -1366,22 +1322,7 @@ var RecordsProvider = class {
 				merged[kind] = result;
 			}
 		}
-		return { kinds: await this.withAdoption(owner, input.kinds, merged) };
-	}
-	/**
-	* Rows of a legacy table in EVERY open records-capable file. A legacy table lives
-	* in one file, but which one is the layout's business: the phase-3 NC ledgers moved
-	* to `events.db` with the P5 split, and a guard that asked `camstack.db` alone
-	* answered "no legacy rows" for 522 outbox rows (2026-10-20 audit).
-	*/
-	async legacyRowsAnywhere(table) {
-		let total = 0;
-		for (const file of this.router.openFiles()) {
-			if (file.databaseId === "history") continue;
-			const rows = await file.records("legacyRowCount", { table });
-			if (rows !== null) total += rows;
-		}
-		return total;
+		return { kinds: merged };
 	}
 	/**
 	* `transactFamily` (plan risk 8): kinds that must agree through one `transact` sit
@@ -1412,52 +1353,6 @@ var RecordsProvider = class {
 			throw new DeclarationRefusedError(`transactFamily "${family}" of "${owner}" is split across files (${[...members.entries()].map(([k, db]) => `${k}@${db}`).join(", ")}); a family lives in ONE file`);
 		}
 	}
-	/** The boot guard: empty kind + a legacy table that still has rows = adoption pending. */
-	async withAdoption(owner, declared, results) {
-		const out = { ...results };
-		for (const [kind, raw] of Object.entries(declared)) {
-			const legacy = raw.adoptsFrom;
-			const result = results[kind];
-			if (legacy === void 0 || result === void 0) continue;
-			if ((await (await this.fileOf(owner, kind)).records("adoptionState", {
-				owner,
-				kind
-			})).adoptedAt !== null) continue;
-			const settingsBrokersAddon = parseSettingsBrokersAdoptsFrom(legacy);
-			if (settingsBrokersAddon !== null) {
-				const legacyRows = await countSettingsBrokersLegacy(this.router, settingsBrokersAddon);
-				if (legacyRows > 0) out[kind] = {
-					...result,
-					adoptionPending: {
-						legacyTable: legacy,
-						legacyRows
-					}
-				};
-				continue;
-			}
-			const settingsArray = parseSettingsArrayAdoptsFrom(legacy);
-			if (settingsArray !== null) {
-				const legacyRows = await countSettingsArrayLegacy(this.router, settingsArray.addonId, settingsArray.settingsKey);
-				if (legacyRows > 0) out[kind] = {
-					...result,
-					adoptionPending: {
-						legacyTable: legacy,
-						legacyRows
-					}
-				};
-				continue;
-			}
-			const legacyRows = await this.legacyRowsAnywhere(legacy);
-			if (legacyRows > 0) out[kind] = {
-				...result,
-				adoptionPending: {
-					legacyTable: legacy,
-					legacyRows
-				}
-			};
-		}
-		return out;
-	}
 	async get(input) {
 		const owner = recordsCallerOf(input);
 		return (await this.fileOf(owner, input.kind)).records("get", {
@@ -1591,50 +1486,6 @@ var RecordsProvider = class {
 		} });
 		return (await this.fileOf(input.owner, input.kind)).records("query", input);
 	}
-	/** True when a declared kind lists `collection` as `adoptsFrom` and adoption finished. */
-	async isAdoptedLegacyTable(collection) {
-		const { kinds } = await this.listKinds({ counts: false });
-		for (const k of kinds) {
-			if (k.state === "dropped") continue;
-			if (k.declaration.adoptsFrom !== collection) continue;
-			const { adoptedAt } = await (await this.fileOf(k.owner, k.kind)).records("adoptionState", {
-				owner: k.owner,
-				kind: k.kind
-			});
-			if (adoptedAt !== null) return true;
-		}
-		return false;
-	}
-	async adoptRecords(input) {
-		const file = await this.fileOf(input.owner, input.kind);
-		if (input.records.length > 0) {
-			const { adoptedAt } = await file.records("adoptionState", {
-				owner: input.owner,
-				kind: input.kind
-			});
-			if (adoptedAt !== null) {
-				if ((await file.records("count", {
-					owner: input.owner,
-					kind: input.kind
-				})).count === 0) await file.records("revokeAdopted", {
-					owner: input.owner,
-					kind: input.kind
-				});
-			}
-		}
-		const result = await file.records("putMany", input);
-		if (input.complete === true) await file.records("markAdopted", {
-			owner: input.owner,
-			kind: input.kind
-		});
-		this.logger.warn("records: ADOPTED rows as their declared owner", { meta: {
-			owner: input.owner,
-			kind: input.kind,
-			count: result.count,
-			complete: input.complete === true
-		} });
-		return { adopted: result.count };
-	}
 	/** Housekeeping: delete rows past `expires_at` in every file that hosts kinds. */
 	async sweepExpired() {
 		let deleted = 0;
@@ -1649,8 +1500,9 @@ var RecordsProvider = class {
 //#region src/builtins/sqlite-storage/storage-admin-provider.ts
 /**
 * The `storage-admin` provider of the SQLite engine (D870): the operator's
-* maintenance reach into the settings database - list its tables, drop one that
-* nothing owns any more. Every call is logged with its table and counts.
+* maintenance reach into the settings database - list its tables and record
+* kinds, read a kind for diagnosis, drop a table that nothing owns any more.
+* Every call is logged with its table and counts.
 *
 * `dropCollection` is a one-shot of the D870 migration: remove it, and the
 * capability's method, once the last hub ran `migrate-device-store.ts --drop`.
@@ -1674,32 +1526,6 @@ var StorageAdminProvider = class {
 	readRecords(input) {
 		return this.records.readRecords(input);
 	}
-	adoptRecords(input) {
-		return this.records.adoptRecords(input);
-	}
-	isAdoptedLegacyTable(input) {
-		return this.records.isAdoptedLegacyTable(input.collection).then((adopted) => ({ adopted }));
-	}
-	async readLegacyCollection(input) {
-		if (this.backend.hasTable(input.collection)) {
-			const page = this.backend.readLegacyCollection(input);
-			return {
-				rows: [...page.rows],
-				nextCursor: page.nextCursor
-			};
-		}
-		for (const file of await this.peerFiles()) if (await file.hasTable(input.collection)) {
-			const page = await file.readLegacyCollection(input);
-			return {
-				rows: [...page.rows],
-				nextCursor: page.nextCursor
-			};
-		}
-		return {
-			rows: [],
-			nextCursor: null
-		};
-	}
 	/** May this table be dropped AT ALL? Throws with the reason when not. */
 	async assertDroppable(collection) {
 		const colon = collection.indexOf(":");
@@ -1711,7 +1537,7 @@ var StorageAdminProvider = class {
 			throw new Error(`drop refused: the installed addons could not be read (${err instanceof Error ? err.message : String(err)})`);
 		});
 		const owner = collection.slice(0, colon);
-		if (installed.has(owner) && !await this.records.isAdoptedLegacyTable(collection)) throw new Error(`drop refused: "${collection}" belongs to the installed addon "${owner}"`);
+		if (installed.has(owner)) throw new Error(`drop refused: "${collection}" belongs to the installed addon "${owner}"`);
 	}
 	async listTables(input) {
 		const tables = [...this.backend.listTables(input.ownerPrefix)];
@@ -1726,7 +1552,6 @@ var StorageAdminProvider = class {
 	async dropCollection(input) {
 		try {
 			await this.assertDroppable(input.collection);
-			if (await this.records.isAdoptedLegacyTable(input.collection)) this.backend.forgetDeclaredThisBoot(input.collection);
 			const rows = this.backend.dropTable(input.collection, input.expectRows);
 			this.logger.warn("storage-admin: DROPPED a table", { meta: {
 				collection: input.collection,

package/dist/builtins/sqlite-storage/storage-admin-provider.d.ts

@@ -1,7 +1,8 @@
 /**
 * The `storage-admin` provider of the SQLite engine (D870): the operator's
-* maintenance reach into the settings database - list its tables, drop one that
-* nothing owns any more. Every call is logged with its table and counts.
+* maintenance reach into the settings database - list its tables and record
+* kinds, read a kind for diagnosis, drop a table that nothing owns any more.
+* Every call is logged with its table and counts.
 *
 * `dropCollection` is a one-shot of the D870 migration: remove it, and the
 * capability's method, once the last hub ran `migrate-device-store.ts --drop`.
@@ -15,22 +16,13 @@ export declare class StorageAdminProvider implements IStorageAdminProvider {
 	private readonly logger;
 	/** The addon ids installed on this hub; a throw means "cannot tell" and refuses the drop. */
 	private readonly installedOwners;
-	/** The records provider the System -> Data and migration methods delegate to (D881). */
+	/** The records provider the System -> Data methods delegate to (D881). */
 	private readonly records;
-	/** Non-settings files (`events.db`, `history.db`) for legacy table listing and reads. */
+	/** Non-settings files (`events.db`, `history.db`) whose tables `listTables` lists too. */
 	private readonly peerFiles;
-	constructor(backend: SqliteSettingsBackend, logger: IScopedLogger, installedOwners: () => Promise<ReadonlySet<string>>, records: Pick<RecordsProvider, "listKinds" | "readRecords" | "adoptRecords" | "isAdoptedLegacyTable">, peerFiles?: () => Promise<readonly OwnedSqliteFile[]>);
+	constructor(backend: SqliteSettingsBackend, logger: IScopedLogger, installedOwners: () => Promise<ReadonlySet<string>>, records: Pick<RecordsProvider, "listKinds" | "readRecords">, peerFiles?: () => Promise<readonly OwnedSqliteFile[]>);
 	listKinds(input: Parameters<IStorageAdminProvider["listKinds"]>[0]): ReturnType<IStorageAdminProvider["listKinds"]>;
 	readRecords(input: Parameters<IStorageAdminProvider["readRecords"]>[0]): ReturnType<IStorageAdminProvider["readRecords"]>;
-	adoptRecords(input: Parameters<IStorageAdminProvider["adoptRecords"]>[0]): ReturnType<IStorageAdminProvider["adoptRecords"]>;
-	isAdoptedLegacyTable(input: {
-		collection: string;
-	}): ReturnType<IStorageAdminProvider["isAdoptedLegacyTable"]>;
-	readLegacyCollection(input: {
-		collection: string;
-		cursor?: string | undefined;
-		limit?: number | undefined;
-	}): ReturnType<IStorageAdminProvider["readLegacyCollection"]>;
 	/** May this table be dropped AT ALL? Throws with the reason when not. */
 	private assertDroppable;
 	listTables(input: {

package/dist/builtins/storage-orchestrator/storage-orchestrator.addon.d.ts

@@ -104,8 +104,8 @@ export declare class StorageOrchestratorAddon extends BaseAddon<StorageOrchestra
 	* restart — the service never hydrates from / persists to SQLite.
 	*/
 	private storeWireInFlight;
-	/** True while the locations kind is empty and its legacy table still holds rows. */
-	private adoptionIsPending;
+	/** True while the locations kind cannot be declared: its empty answer is not authoritative. */
+	private locationsKindNotReady;
 	private ensureStoreWired;
 	private storageProviders;
 	/** Single-flighted pressure sweep — never overlaps a slow eviction round. */

package/dist/builtins/storage-orchestrator/storage-orchestrator.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-BZQjLPiz.js");
+const require_dist = require("../../dist-Bn-RNanh.js");
 const require_read_all_rows$1 = require("../../read-all-rows-CVoO1ONM.js");
 let zod = require("zod");
 let node_crypto = require("node:crypto");
@@ -53,8 +53,7 @@ var _storageOrchestratorRecordKinds = require_dist.defineRecordKinds({
 			name: "type",
 			fields: ["type"]
 		}],
-		retention: { none: "operator delete or declaration prune only" },
-		adoptsFrom: STORAGE_LOCATIONS
+		retention: { none: "operator delete or declaration prune only" }
 	},
 	"seed-markers": {
 		schema: StorageSeedMarkerBodySchema,
@@ -74,8 +73,7 @@ var _storageOrchestratorRecordKinds = require_dist.defineRecordKinds({
 			name: "location_id",
 			fields: ["locationId"]
 		}],
-		retention: { none: "row deleted when location leaves drain" },
-		adoptsFrom: STORAGE_DRAIN_STATE_LEGACY
+		retention: { none: "row deleted when location leaves drain" }
 	}
 });
 var storageOrchestratorRecordKinds = _storageOrchestratorRecordKinds;
@@ -4653,8 +4651,8 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 	* restart — the service never hydrates from / persists to SQLite.
 	*/
 	storeWireInFlight = null;
-	/** True while the locations kind is empty and its legacy table still holds rows. */
-	async adoptionIsPending() {
+	/** True while the locations kind cannot be declared: its empty answer is not authoritative. */
+	async locationsKindNotReady() {
 		const records = this.ctx.records;
 		if (records === void 0 || this.locationsKind === null) return false;
 		try {
@@ -4662,7 +4660,7 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 			return false;
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			this.ctx.logger.warn("storage-orchestrator: persistence NOT wired — the storage-locations kind is not authoritative yet (adoption pending or the check failed); seeding is deferred", { meta: { error: message } });
+			this.ctx.logger.warn("storage-orchestrator: persistence NOT wired — the storage-locations kind is not authoritative yet (its declaration failed); seeding is deferred", { meta: { error: message } });
 			return true;
 		}
 	}
@@ -4672,7 +4670,7 @@ var StorageOrchestratorAddon = class extends require_dist.BaseAddon {
 		if (this.storeWireInFlight) return this.storeWireInFlight;
 		const store = this.resolveLocationStore(true);
 		if (!store) return;
-		if (await this.adoptionIsPending()) return;
+		if (await this.locationsKindNotReady()) return;
 		this.ctx.logger.info("storage-orchestrator: data-store engine now available — wiring persistence");
 		this.storeWireInFlight = service.attachStore(store).then(() => this.seedFromDeclarations()).catch((err) => {
 			this.ctx.logger.error("storage-orchestrator: attachStore failed", { meta: { error: err instanceof Error ? err.message : String(err) } });

package/dist/builtins/storage-orchestrator/storage-orchestrator.addon.mjs

@@ -1,4 +1,4 @@
-import { Dr as storageMigrationCapability, Er as storageCapability, Fn as legacyModeOf, Hn as mayReadLocation, Ki as defineRecordKinds, Kn as modeMayWrite, Oa as EventCategory, On as isLocationEnabled, Ri as collectSecretConfigKeys, Ta as transformSecretWrite, Un as mayWriteToLocation, ba as secretTreeFromPaths, br as settingsStoreCapability, ca as normalizeNodeId, dn as evictionPolicyOfLocation, ft as StorageCleanupJobSchema, ht as StorageMigrationJobSchema, mt as StorageLocationTypeSchema, na as isSecretMarker, ni as BaseAddon, pr as resolveLocationMode, pt as StorageLocationModeSchema, q as LegacyStorageLocationDefaultSchema, ua as parseJsonObject, va as resolveSecretMarkers, yi as REDACTED_SECRET, yn as gbToBytes, zr as withLocationMode } from "../../dist-B_GRPhnY.mjs";
+import { Dr as storageMigrationCapability, Er as storageCapability, Fn as legacyModeOf, Gi as defineRecordKinds, Hn as mayReadLocation, Kn as modeMayWrite, On as isLocationEnabled, Ri as collectSecretConfigKeys, Sa as transformSecretWrite, Ta as EventCategory, Un as mayWriteToLocation, _a as secretTreeFromPaths, br as settingsStoreCapability, dn as evictionPolicyOfLocation, ft as StorageCleanupJobSchema, ha as resolveSecretMarkers, ht as StorageMigrationJobSchema, la as parseJsonObject, mt as StorageLocationTypeSchema, ni as BaseAddon, pr as resolveLocationMode, pt as StorageLocationModeSchema, q as LegacyStorageLocationDefaultSchema, sa as normalizeNodeId, ta as isSecretMarker, yi as REDACTED_SECRET, yn as gbToBytes, zr as withLocationMode } from "../../dist-Wy8cTxg6.mjs";
 import { t as require_read_all_rows } from "../../read-all-rows-TaPqdWNF.mjs";
 import { z } from "zod";
 import { randomUUID } from "node:crypto";
@@ -48,8 +48,7 @@ var _storageOrchestratorRecordKinds = defineRecordKinds({
 			name: "type",
 			fields: ["type"]
 		}],
-		retention: { none: "operator delete or declaration prune only" },
-		adoptsFrom: STORAGE_LOCATIONS
+		retention: { none: "operator delete or declaration prune only" }
 	},
 	"seed-markers": {
 		schema: StorageSeedMarkerBodySchema,
@@ -69,8 +68,7 @@ var _storageOrchestratorRecordKinds = defineRecordKinds({
 			name: "location_id",
 			fields: ["locationId"]
 		}],
-		retention: { none: "row deleted when location leaves drain" },
-		adoptsFrom: STORAGE_DRAIN_STATE_LEGACY
+		retention: { none: "row deleted when location leaves drain" }
 	}
 });
 var storageOrchestratorRecordKinds = _storageOrchestratorRecordKinds;
@@ -4648,8 +4646,8 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 	* restart — the service never hydrates from / persists to SQLite.
 	*/
 	storeWireInFlight = null;
-	/** True while the locations kind is empty and its legacy table still holds rows. */
-	async adoptionIsPending() {
+	/** True while the locations kind cannot be declared: its empty answer is not authoritative. */
+	async locationsKindNotReady() {
 		const records = this.ctx.records;
 		if (records === void 0 || this.locationsKind === null) return false;
 		try {
@@ -4657,7 +4655,7 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 			return false;
 		} catch (err) {
 			const message = err instanceof Error ? err.message : String(err);
-			this.ctx.logger.warn("storage-orchestrator: persistence NOT wired — the storage-locations kind is not authoritative yet (adoption pending or the check failed); seeding is deferred", { meta: { error: message } });
+			this.ctx.logger.warn("storage-orchestrator: persistence NOT wired — the storage-locations kind is not authoritative yet (its declaration failed); seeding is deferred", { meta: { error: message } });
 			return true;
 		}
 	}
@@ -4667,7 +4665,7 @@ var StorageOrchestratorAddon = class extends BaseAddon {
 		if (this.storeWireInFlight) return this.storeWireInFlight;
 		const store = this.resolveLocationStore(true);
 		if (!store) return;
-		if (await this.adoptionIsPending()) return;
+		if (await this.locationsKindNotReady()) return;
 		this.ctx.logger.info("storage-orchestrator: data-store engine now available — wiring persistence");
 		this.storeWireInFlight = service.attachStore(store).then(() => this.seedFromDeclarations()).catch((err) => {
 			this.ctx.logger.error("storage-orchestrator: attachStore failed", { meta: { error: err instanceof Error ? err.message : String(err) } });