@camstack/system 1.2.444 → 1.2.446

package/dist/builtins/core-blocks/core-blocks.addon.js

@@ -1,9 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-D1vECb_6.js");
-const require_composition_sources = require("../../composition-sources-NAPZddic.js");
+const require_dist = require("../../dist-BkNfEJKa.js");
+const require_read_all_rows$1 = require("../../read-all-rows-CVoO1ONM.js");
+const require_composition_sources = require("../../composition-sources-BwIIltnZ.js");
 const require_prefix_range = require("../../prefix-range-D_KueXbQ.js");
 const require_prefix_walk = require("../../prefix-walk-Dv6MLZlM.js");
+let zod = require("zod");
 let node_crypto = require("node:crypto");
 let _camstack_types_node = require("@camstack/types/node");
 let node_fs_promises = require("node:fs/promises");
@@ -502,6 +504,50 @@ var BlockSupervisor = class {
 	}
 };
 //#endregion
+//#region src/builtins/core-blocks/record-kinds.ts
+var import_read_all_rows = require_read_all_rows$1.require_read_all_rows();
+/**
+* Record kinds owned by core-blocks (phase 4).
+*/
+var CORE_BLOCKS_COLLECTION = "core_blocks";
+var CORE_BLOCK_SETTINGS_COLLECTION = "core-blocks:settings";
+var CoreBlockRowBodySchema = zod.z.object({
+	name: zod.z.string(),
+	enabled: zod.z.boolean(),
+	placement: zod.z.string(),
+	updatedAt: zod.z.number(),
+	block: zod.z.record(zod.z.string(), zod.z.unknown())
+});
+var CoreBlockSettingsBodySchema = zod.z.object({ values: zod.z.record(zod.z.string(), zod.z.unknown()) });
+var _coreBlocksRecordKinds = require_dist.defineRecordKinds({
+	blocks: {
+		schema: CoreBlockRowBodySchema,
+		class: "config",
+		writeTrigger: "create / update / setStatus after compile",
+		device: "none",
+		at: "none",
+		indexes: [{
+			name: "enabled",
+			fields: ["enabled"]
+		}],
+		retention: { none: "operator delete only" },
+		maxDataBytes: 256 * 1024,
+		adoptsFrom: CORE_BLOCKS_COLLECTION
+	},
+	settings: {
+		schema: CoreBlockSettingsBodySchema,
+		class: "config",
+		writeTrigger: "legacy only — migrateRawSecrets reads then deletes rows (D880)",
+		device: "none",
+		at: "none",
+		retention: { none: "rows deleted by migrateRawSecrets" },
+		adoptsFrom: CORE_BLOCK_SETTINGS_COLLECTION
+	}
+});
+var coreBlocksRecordKinds = _coreBlocksRecordKinds;
+_coreBlocksRecordKinds.blocks;
+_coreBlocksRecordKinds.settings;
+//#endregion
 //#region src/kernel/addon-settings-store.ts
 /** The collection every addon's settings share. Named nowhere else (with sections' own module). */
 var ADDON_SETTINGS_COLLECTION = "addon-settings";
@@ -593,23 +639,6 @@ function createAddonSettingsStore(door, addonId) {
 * now LEGACY - read only by {@link BlockSettingsStore.migrateRawSecrets}, which
 * moves the secrets, copies any key the rows lack, and deletes the blob.
 */
-/**
-* @durable class=config owner=core-blocks
-*   write="NOTHING since D880 - the values live in the block addon's `addon-settings` rows. Only the one-shot `migrateRawSecrets` reads it, then deletes each row."
-*   retention="legacy: every row is deleted by the verified operator migration; the declaration goes with it once every hub ran it."
-*/
-var CORE_BLOCK_SETTINGS_COLLECTION = "core-blocks:settings";
-var CORE_BLOCK_SETTINGS_COLUMNS = [{
-	name: "id",
-	type: "TEXT",
-	primaryKey: true,
-	notNull: true
-}, {
-	name: "values",
-	type: "JSON",
-	notNull: true,
-	defaultValue: "{}"
-}];
 /** The block declares a secret, but this process has no keychain door to put it in. */
 var BlockSecretsUnavailableError = class extends Error {
 	blockId;
@@ -693,19 +722,17 @@ function legacyValuesOf(row) {
 }
 var BlockSettingsStore = class {
 	store;
+	legacySettings;
 	keychainFor;
 	onOrphaned;
 	constructor(deps) {
 		this.store = deps.store;
+		this.legacySettings = deps.legacySettings;
 		this.keychainFor = deps.keychainFor;
 		this.onOrphaned = deps.onOrphaned ?? (() => void 0);
 	}
-	/** Declares the LEGACY collection, so the migration can read it. */
-	static async declare(store) {
-		await store.declareCollection.mutate({
-			collection: CORE_BLOCK_SETTINGS_COLLECTION,
-			columns: [...CORE_BLOCK_SETTINGS_COLUMNS]
-		});
+	static legacyKindOf(records) {
+		return records.kind(coreBlocksRecordKinds.settings);
 	}
 	rows(blockId) {
 		const store = this.store;
@@ -757,10 +784,7 @@ var BlockSettingsStore = class {
 		const removal = {};
 		for (const key of Object.keys(stored)) removal[key] = void 0;
 		await this.rows(blockId).merge(removal);
-		await this.store.delete.mutate({
-			collection: CORE_BLOCK_SETTINGS_COLLECTION,
-			key: blockId
-		});
+		await this.legacySettings.delete(blockId);
 		if (refs.length === 0) return;
 		const secrets = this.keychainFor(owner);
 		try {
@@ -782,9 +806,8 @@ var BlockSettingsStore = class {
 	* only - never a value, a ref or a block id.
 	*/
 	async migrateRawSecrets(blocks, apply) {
-		const legacyRows = await this.store.query.query({ collection: CORE_BLOCK_SETTINGS_COLLECTION });
 		const legacyById = /* @__PURE__ */ new Map();
-		for (const row of legacyRows) legacyById.set(row.id, legacyValuesOf(row.data));
+		for (const row of await (0, import_read_all_rows.readAllRows)(this.legacySettings)) legacyById.set(row.id, legacyValuesOf({ values: row.data.values }));
 		const tally = {
 			rows: 0,
 			raw: 0,
@@ -856,10 +879,7 @@ var BlockSettingsStore = class {
 		};
 	}
 	async dropLegacy(blockId) {
-		await this.store.delete.mutate({
-			collection: CORE_BLOCK_SETTINGS_COLLECTION,
-			key: blockId
-		});
+		await this.legacySettings.delete(blockId);
 	}
 	/** put -> read back -> compare -> only then the marker rows. */
 	async moveBlock(block, tree, rest, effective, stored) {
@@ -905,7 +925,7 @@ var BlockSettingsStore = class {
 		let remainingRaw = 0;
 		let unresolvedMarkers = 0;
 		const legacyById = /* @__PURE__ */ new Map();
-		for (const row of await this.store.query.query({ collection: CORE_BLOCK_SETTINGS_COLLECTION })) legacyById.set(row.id, legacyValuesOf(row.data));
+		for (const row of await (0, import_read_all_rows.readAllRows)(this.legacySettings)) legacyById.set(row.id, legacyValuesOf({ values: row.data.values }));
 		for (const block of subjects) {
 			const tree = require_dist.secretTreeFromSchema(block.settingsSchema ?? null);
 			const after = await this.readStored(block.id);
@@ -1332,47 +1352,6 @@ async function compileFiles(transpiler, files, entryPath) {
 *     shape, or a new PK/UNIQUE/NOT-NULL-without-default column — which drops the
 *     table and takes the operator's source code with it."
 */
-var CORE_BLOCKS_COLLECTION = "core_blocks";
-var CORE_BLOCKS_COLUMNS = [
-	{
-		name: "id",
-		type: "TEXT",
-		primaryKey: true,
-		notNull: true
-	},
-	{
-		name: "name",
-		type: "TEXT",
-		notNull: true
-	},
-	{
-		name: "enabled",
-		type: "BOOLEAN",
-		notNull: true
-	},
-	{
-		name: "placement",
-		type: "TEXT",
-		notNull: true
-	},
-	{
-		name: "updatedAt",
-		type: "INTEGER",
-		notNull: true
-	},
-	(
-	/** The FULL block, Zod-validated on read; the scalars above are indexed
-	*  projections for the list view. */
-	{
-		name: "block",
-		type: "JSON",
-		notNull: true
-	})
-];
-var CORE_BLOCKS_INDEXES = [{
-	name: "idx_core_blocks_enabled",
-	columns: ["enabled"]
-}];
 /**
 * Rows one read asks for. A read that ANSWERS this many is not a loaded table:
 * rows past the limit would be absent, and an absent composition reads as a
@@ -1398,11 +1377,11 @@ function mayBeComposition(raw) {
 function parseErrorText(issues) {
 	return issues.map((i) => `${i.path.map(String).join(".")}: ${i.message}`).join("; ");
 }
-var CoreBlockStore = class {
+var CoreBlockStore = class CoreBlockStore {
 	byId = /* @__PURE__ */ new Map();
 	/** Rows that exist but do not parse and may be compositions — held for the composer, never dropped (D49). */
 	unreadable = [];
-	store;
+	blocks;
 	logger;
 	now;
 	newId;
@@ -1410,16 +1389,15 @@ var CoreBlockStore = class {
 	/** Consecutive failed reads — the warn is once per run of them, not once per retry. */
 	failedLoads = 0;
 	constructor(deps) {
-		this.store = deps.store;
+		this.blocks = deps.blocks;
 		this.logger = deps.logger;
 		this.now = deps.now ?? (() => Date.now());
 		this.newId = deps.newId ?? (() => (0, node_crypto.randomUUID)());
 	}
-	static async declare(store) {
-		await store.declareCollection.mutate({
-			collection: CORE_BLOCKS_COLLECTION,
-			columns: [...CORE_BLOCKS_COLUMNS],
-			indexes: [...CORE_BLOCKS_INDEXES]
+	static of(records, logger) {
+		return new CoreBlockStore({
+			blocks: records.kind(coreBlocksRecordKinds.blocks),
+			logger
 		});
 	}
 	/** True only after a `load()` that READ the table. The composer withdraws nothing otherwise (D49). */
@@ -1444,11 +1422,8 @@ var CoreBlockStore = class {
 	*/
 	async load() {
 		try {
-			const rows = await this.store.query.query({
-				collection: CORE_BLOCKS_COLLECTION,
-				filter: { limit: CORE_BLOCKS_LOAD_LIMIT }
-			});
-			if (rows.length >= 1e3) throw new Error(`core_blocks answered ${rows.length} rows, the read limit — rows past it would read as deleted`);
+			const rows = (await this.blocks.query({ limit: CORE_BLOCKS_LOAD_LIMIT })).records;
+			if (rows.length >= 1e3) throw new Error(`${CORE_BLOCKS_COLLECTION} answered ${rows.length} rows, the read limit — rows past it would read as deleted`);
 			this.byId.clear();
 			this.loaded = true;
 			if (this.failedLoads > 0) {
@@ -1458,12 +1433,12 @@ var CoreBlockStore = class {
 			let skipped = 0;
 			const unreadable = [];
 			for (const row of rows) {
-				const raw = row.data["block"];
+				const raw = row.data.block;
 				const parsed = require_dist.CoreBlockSchema.safeParse(raw);
 				if (!parsed.success) {
 					skipped += 1;
 					if (mayBeComposition(raw)) {
-						const name = row.data["name"];
+						const name = row.data.name;
 						unreadable.push({
 							id: row.id,
 							name: typeof name === "string" ? name : null,
@@ -1623,22 +1598,21 @@ var CoreBlockStore = class {
 	async delete(blockId) {
 		this.byId.delete(blockId);
 		this.unreadable = this.unreadable.filter((u) => u.id !== blockId);
-		await this.store.delete.mutate({
-			collection: CORE_BLOCKS_COLLECTION,
-			key: blockId
-		});
+		await this.blocks.delete(blockId);
 	}
 	async persist(block) {
-		await this.store.set.mutate({
-			collection: CORE_BLOCKS_COLLECTION,
-			key: block.id,
-			value: {
-				name: block.name,
-				enabled: block.enabled,
-				placement: block.placement,
-				updatedAt: block.updatedAt,
-				block
-			}
+		const body = {
+			name: block.name,
+			enabled: block.enabled,
+			placement: block.placement,
+			updatedAt: block.updatedAt,
+			block
+		};
+		const parsed = coreBlocksRecordKinds.blocks.schema.safeParse(body);
+		if (!parsed.success) return;
+		await this.blocks.put({
+			id: block.id,
+			data: parsed.data
 		});
 	}
 	/**
@@ -2262,14 +2236,13 @@ var CoreBlocksAddon = class extends require_dist.BaseAddon {
 	async onInitialize() {
 		const settingsStore = this.ctx.api?.settingsStore;
 		if (!settingsStore) throw new Error("core-blocks: settings-store API not available — refusing to register the cap");
-		await CoreBlockStore.declare(settingsStore);
-		await BlockSettingsStore.declare(settingsStore);
-		this.store = new CoreBlockStore({
-			store: settingsStore,
-			logger: this.ctx.logger.child("store")
-		});
+		const records = this.ctx.records;
+		if (records === void 0) throw new Error("core-blocks needs ctx.records on the hub");
+		await records.declare(coreBlocksRecordKinds);
+		this.store = CoreBlockStore.of(records, this.ctx.logger.child("store"));
 		this.prefs = new BlockSettingsStore({
 			store: settingsStore,
+			legacySettings: BlockSettingsStore.legacyKindOf(records),
 			keychainFor: (owner) => this.ctx.secrets?.forOwner?.(owner) ?? null,
 			onOrphaned: (blockId, refs) => this.ctx.logger.warn("core block settings: dropped keychain refs could not be deleted", { meta: {
 				blockId,

package/dist/builtins/core-blocks/core-blocks.addon.mjs

@@ -1,8 +1,10 @@
-import { Ct as compositionSourceRefs, Dr as compositionSourceKey, Dt as coreBlockSourceKind, Ei as hydrateSchema, En as normalizeCoreBlockWrite, Et as coreBlockIdFromAddonId, Fr as BaseAddon, Hn as resolveCoreBlockEntry, It as describeComposableCaps, Mn as planComposition, Ni as isSecretRefOwnedBy, Ot as coreBlocksCapability, Pr as errMsg, Sr as composedDeviceRef, Tt as coreBlockComposition, Un as resolveCoreBlockFiles, Wi as resolveSecretMarkers, Zi as transformSecretWrite, _i as collectSecretMarkerRefs, fr as validateComposition, g as CORE_BLOCK_ADDON_PREFIX, h as CORE_BLOCKS_ADDON_ID, j as DeclaredDevices, ji as isSecretMarker, m as COMPOSER_RUNNER_ID, pt as buildCapabilityLookup, qi as secretTreeFromSchema, r as ALL_CAPABILITY_DEFINITIONS, wt as coreBlockAddonId, y as CoreBlockSchema, zn as replacedFieldKeys } from "../../dist-DERK-gP5.mjs";
-import { t as describeCompositionSources } from "../../composition-sources-C3rKncIF.mjs";
+import { $i as resolveSecretMarkers, An as normalizeCoreBlockWrite, Ar as compositionSourceKey, At as coreBlockIdFromAddonId, Bt as describeComposableCaps, Di as defineRecordKinds, Dt as compositionSourceRefs, In as planComposition, Kn as resolveCoreBlockEntry, Li as isSecretMarker, Lr as errMsg, Mi as hydrateSchema, Mt as coreBlocksCapability, Ot as coreBlockAddonId, Rr as BaseAddon, Tr as composedDeviceRef, Un as replacedFieldKeys, _t as buildCapabilityLookup, gr as validateComposition, h as CORE_BLOCK_ADDON_PREFIX, j as DeclaredDevices, jt as coreBlockSourceKind, kt as coreBlockComposition, m as CORE_BLOCKS_ADDON_ID, na as secretTreeFromSchema, oa as transformSecretWrite, p as COMPOSER_RUNNER_ID, qn as resolveCoreBlockFiles, r as ALL_CAPABILITY_DEFINITIONS, v as CoreBlockSchema, xi as collectSecretMarkerRefs, zi as isSecretRefOwnedBy } from "../../dist-CkZIrsAP.mjs";
+import { t as require_read_all_rows } from "../../read-all-rows-TaPqdWNF.mjs";
+import { t as describeCompositionSources } from "../../composition-sources-BmC5jAUv.mjs";
 import { t as prefixRange } from "../../prefix-range-Dl0znowN.mjs";
 import { n as unwrapStoredValue, t as loadPrefixed } from "../../prefix-walk-DAOBSyH1.mjs";
 import { createRequire } from "node:module";
+import { z } from "zod";
 import { randomUUID } from "node:crypto";
 import { customizationBlockName } from "@camstack/types/node";
 import * as fs from "node:fs/promises";
@@ -497,6 +499,50 @@ var BlockSupervisor = class {
 	}
 };
 //#endregion
+//#region src/builtins/core-blocks/record-kinds.ts
+var import_read_all_rows = require_read_all_rows();
+/**
+* Record kinds owned by core-blocks (phase 4).
+*/
+var CORE_BLOCKS_COLLECTION = "core_blocks";
+var CORE_BLOCK_SETTINGS_COLLECTION = "core-blocks:settings";
+var CoreBlockRowBodySchema = z.object({
+	name: z.string(),
+	enabled: z.boolean(),
+	placement: z.string(),
+	updatedAt: z.number(),
+	block: z.record(z.string(), z.unknown())
+});
+var CoreBlockSettingsBodySchema = z.object({ values: z.record(z.string(), z.unknown()) });
+var _coreBlocksRecordKinds = defineRecordKinds({
+	blocks: {
+		schema: CoreBlockRowBodySchema,
+		class: "config",
+		writeTrigger: "create / update / setStatus after compile",
+		device: "none",
+		at: "none",
+		indexes: [{
+			name: "enabled",
+			fields: ["enabled"]
+		}],
+		retention: { none: "operator delete only" },
+		maxDataBytes: 256 * 1024,
+		adoptsFrom: CORE_BLOCKS_COLLECTION
+	},
+	settings: {
+		schema: CoreBlockSettingsBodySchema,
+		class: "config",
+		writeTrigger: "legacy only — migrateRawSecrets reads then deletes rows (D880)",
+		device: "none",
+		at: "none",
+		retention: { none: "rows deleted by migrateRawSecrets" },
+		adoptsFrom: CORE_BLOCK_SETTINGS_COLLECTION
+	}
+});
+var coreBlocksRecordKinds = _coreBlocksRecordKinds;
+_coreBlocksRecordKinds.blocks;
+_coreBlocksRecordKinds.settings;
+//#endregion
 //#region src/kernel/addon-settings-store.ts
 /** The collection every addon's settings share. Named nowhere else (with sections' own module). */
 var ADDON_SETTINGS_COLLECTION = "addon-settings";
@@ -588,23 +634,6 @@ function createAddonSettingsStore(door, addonId) {
 * now LEGACY - read only by {@link BlockSettingsStore.migrateRawSecrets}, which
 * moves the secrets, copies any key the rows lack, and deletes the blob.
 */
-/**
-* @durable class=config owner=core-blocks
-*   write="NOTHING since D880 - the values live in the block addon's `addon-settings` rows. Only the one-shot `migrateRawSecrets` reads it, then deletes each row."
-*   retention="legacy: every row is deleted by the verified operator migration; the declaration goes with it once every hub ran it."
-*/
-var CORE_BLOCK_SETTINGS_COLLECTION = "core-blocks:settings";
-var CORE_BLOCK_SETTINGS_COLUMNS = [{
-	name: "id",
-	type: "TEXT",
-	primaryKey: true,
-	notNull: true
-}, {
-	name: "values",
-	type: "JSON",
-	notNull: true,
-	defaultValue: "{}"
-}];
 /** The block declares a secret, but this process has no keychain door to put it in. */
 var BlockSecretsUnavailableError = class extends Error {
 	blockId;
@@ -688,19 +717,17 @@ function legacyValuesOf(row) {
 }
 var BlockSettingsStore = class {
 	store;
+	legacySettings;
 	keychainFor;
 	onOrphaned;
 	constructor(deps) {
 		this.store = deps.store;
+		this.legacySettings = deps.legacySettings;
 		this.keychainFor = deps.keychainFor;
 		this.onOrphaned = deps.onOrphaned ?? (() => void 0);
 	}
-	/** Declares the LEGACY collection, so the migration can read it. */
-	static async declare(store) {
-		await store.declareCollection.mutate({
-			collection: CORE_BLOCK_SETTINGS_COLLECTION,
-			columns: [...CORE_BLOCK_SETTINGS_COLUMNS]
-		});
+	static legacyKindOf(records) {
+		return records.kind(coreBlocksRecordKinds.settings);
 	}
 	rows(blockId) {
 		const store = this.store;
@@ -752,10 +779,7 @@ var BlockSettingsStore = class {
 		const removal = {};
 		for (const key of Object.keys(stored)) removal[key] = void 0;
 		await this.rows(blockId).merge(removal);
-		await this.store.delete.mutate({
-			collection: CORE_BLOCK_SETTINGS_COLLECTION,
-			key: blockId
-		});
+		await this.legacySettings.delete(blockId);
 		if (refs.length === 0) return;
 		const secrets = this.keychainFor(owner);
 		try {
@@ -777,9 +801,8 @@ var BlockSettingsStore = class {
 	* only - never a value, a ref or a block id.
 	*/
 	async migrateRawSecrets(blocks, apply) {
-		const legacyRows = await this.store.query.query({ collection: CORE_BLOCK_SETTINGS_COLLECTION });
 		const legacyById = /* @__PURE__ */ new Map();
-		for (const row of legacyRows) legacyById.set(row.id, legacyValuesOf(row.data));
+		for (const row of await (0, import_read_all_rows.readAllRows)(this.legacySettings)) legacyById.set(row.id, legacyValuesOf({ values: row.data.values }));
 		const tally = {
 			rows: 0,
 			raw: 0,
@@ -851,10 +874,7 @@ var BlockSettingsStore = class {
 		};
 	}
 	async dropLegacy(blockId) {
-		await this.store.delete.mutate({
-			collection: CORE_BLOCK_SETTINGS_COLLECTION,
-			key: blockId
-		});
+		await this.legacySettings.delete(blockId);
 	}
 	/** put -> read back -> compare -> only then the marker rows. */
 	async moveBlock(block, tree, rest, effective, stored) {
@@ -900,7 +920,7 @@ var BlockSettingsStore = class {
 		let remainingRaw = 0;
 		let unresolvedMarkers = 0;
 		const legacyById = /* @__PURE__ */ new Map();
-		for (const row of await this.store.query.query({ collection: CORE_BLOCK_SETTINGS_COLLECTION })) legacyById.set(row.id, legacyValuesOf(row.data));
+		for (const row of await (0, import_read_all_rows.readAllRows)(this.legacySettings)) legacyById.set(row.id, legacyValuesOf({ values: row.data.values }));
 		for (const block of subjects) {
 			const tree = secretTreeFromSchema(block.settingsSchema ?? null);
 			const after = await this.readStored(block.id);
@@ -1327,47 +1347,6 @@ async function compileFiles(transpiler, files, entryPath) {
 *     shape, or a new PK/UNIQUE/NOT-NULL-without-default column — which drops the
 *     table and takes the operator's source code with it."
 */
-var CORE_BLOCKS_COLLECTION = "core_blocks";
-var CORE_BLOCKS_COLUMNS = [
-	{
-		name: "id",
-		type: "TEXT",
-		primaryKey: true,
-		notNull: true
-	},
-	{
-		name: "name",
-		type: "TEXT",
-		notNull: true
-	},
-	{
-		name: "enabled",
-		type: "BOOLEAN",
-		notNull: true
-	},
-	{
-		name: "placement",
-		type: "TEXT",
-		notNull: true
-	},
-	{
-		name: "updatedAt",
-		type: "INTEGER",
-		notNull: true
-	},
-	(
-	/** The FULL block, Zod-validated on read; the scalars above are indexed
-	*  projections for the list view. */
-	{
-		name: "block",
-		type: "JSON",
-		notNull: true
-	})
-];
-var CORE_BLOCKS_INDEXES = [{
-	name: "idx_core_blocks_enabled",
-	columns: ["enabled"]
-}];
 /**
 * Rows one read asks for. A read that ANSWERS this many is not a loaded table:
 * rows past the limit would be absent, and an absent composition reads as a
@@ -1393,11 +1372,11 @@ function mayBeComposition(raw) {
 function parseErrorText(issues) {
 	return issues.map((i) => `${i.path.map(String).join(".")}: ${i.message}`).join("; ");
 }
-var CoreBlockStore = class {
+var CoreBlockStore = class CoreBlockStore {
 	byId = /* @__PURE__ */ new Map();
 	/** Rows that exist but do not parse and may be compositions — held for the composer, never dropped (D49). */
 	unreadable = [];
-	store;
+	blocks;
 	logger;
 	now;
 	newId;
@@ -1405,16 +1384,15 @@ var CoreBlockStore = class {
 	/** Consecutive failed reads — the warn is once per run of them, not once per retry. */
 	failedLoads = 0;
 	constructor(deps) {
-		this.store = deps.store;
+		this.blocks = deps.blocks;
 		this.logger = deps.logger;
 		this.now = deps.now ?? (() => Date.now());
 		this.newId = deps.newId ?? (() => randomUUID());
 	}
-	static async declare(store) {
-		await store.declareCollection.mutate({
-			collection: CORE_BLOCKS_COLLECTION,
-			columns: [...CORE_BLOCKS_COLUMNS],
-			indexes: [...CORE_BLOCKS_INDEXES]
+	static of(records, logger) {
+		return new CoreBlockStore({
+			blocks: records.kind(coreBlocksRecordKinds.blocks),
+			logger
 		});
 	}
 	/** True only after a `load()` that READ the table. The composer withdraws nothing otherwise (D49). */
@@ -1439,11 +1417,8 @@ var CoreBlockStore = class {
 	*/
 	async load() {
 		try {
-			const rows = await this.store.query.query({
-				collection: CORE_BLOCKS_COLLECTION,
-				filter: { limit: CORE_BLOCKS_LOAD_LIMIT }
-			});
-			if (rows.length >= 1e3) throw new Error(`core_blocks answered ${rows.length} rows, the read limit — rows past it would read as deleted`);
+			const rows = (await this.blocks.query({ limit: CORE_BLOCKS_LOAD_LIMIT })).records;
+			if (rows.length >= 1e3) throw new Error(`${CORE_BLOCKS_COLLECTION} answered ${rows.length} rows, the read limit — rows past it would read as deleted`);
 			this.byId.clear();
 			this.loaded = true;
 			if (this.failedLoads > 0) {
@@ -1453,12 +1428,12 @@ var CoreBlockStore = class {
 			let skipped = 0;
 			const unreadable = [];
 			for (const row of rows) {
-				const raw = row.data["block"];
+				const raw = row.data.block;
 				const parsed = CoreBlockSchema.safeParse(raw);
 				if (!parsed.success) {
 					skipped += 1;
 					if (mayBeComposition(raw)) {
-						const name = row.data["name"];
+						const name = row.data.name;
 						unreadable.push({
 							id: row.id,
 							name: typeof name === "string" ? name : null,
@@ -1618,22 +1593,21 @@ var CoreBlockStore = class {
 	async delete(blockId) {
 		this.byId.delete(blockId);
 		this.unreadable = this.unreadable.filter((u) => u.id !== blockId);
-		await this.store.delete.mutate({
-			collection: CORE_BLOCKS_COLLECTION,
-			key: blockId
-		});
+		await this.blocks.delete(blockId);
 	}
 	async persist(block) {
-		await this.store.set.mutate({
-			collection: CORE_BLOCKS_COLLECTION,
-			key: block.id,
-			value: {
-				name: block.name,
-				enabled: block.enabled,
-				placement: block.placement,
-				updatedAt: block.updatedAt,
-				block
-			}
+		const body = {
+			name: block.name,
+			enabled: block.enabled,
+			placement: block.placement,
+			updatedAt: block.updatedAt,
+			block
+		};
+		const parsed = coreBlocksRecordKinds.blocks.schema.safeParse(body);
+		if (!parsed.success) return;
+		await this.blocks.put({
+			id: block.id,
+			data: parsed.data
 		});
 	}
 	/**
@@ -2257,14 +2231,13 @@ var CoreBlocksAddon = class extends BaseAddon {
 	async onInitialize() {
 		const settingsStore = this.ctx.api?.settingsStore;
 		if (!settingsStore) throw new Error("core-blocks: settings-store API not available — refusing to register the cap");
-		await CoreBlockStore.declare(settingsStore);
-		await BlockSettingsStore.declare(settingsStore);
-		this.store = new CoreBlockStore({
-			store: settingsStore,
-			logger: this.ctx.logger.child("store")
-		});
+		const records = this.ctx.records;
+		if (records === void 0) throw new Error("core-blocks needs ctx.records on the hub");
+		await records.declare(coreBlocksRecordKinds);
+		this.store = CoreBlockStore.of(records, this.ctx.logger.child("store"));
 		this.prefs = new BlockSettingsStore({
 			store: settingsStore,
+			legacySettings: BlockSettingsStore.legacyKindOf(records),
 			keychainFor: (owner) => this.ctx.secrets?.forOwner?.(owner) ?? null,
 			onOrphaned: (blockId, refs) => this.ctx.logger.warn("core block settings: dropped keychain refs could not be deleted", { meta: {
 				blockId,
@@ -2650,4 +2623,4 @@ async function loadTranspiler(logger) {
 	}
 }
 //#endregion
-export { CoreBlocksAddon, loadBlockTypeDefs as a, createAddonSettingsStore as c, blockAddonId as d, blockIdFromAddonId as f, compileBlock as i, BlockSupervisor as l, removeBlockPackage as m, CORE_BLOCKS_COLLECTION as n, BlockSettingsStore as o, materializeBlock as p, CoreBlockStore as r, CORE_BLOCK_SETTINGS_COLLECTION as s, extractSettingsSchema as t, BLOCK_ADDON_PREFIX as u };
+export { CoreBlocksAddon, BlockSettingsStore as a, CORE_BLOCK_SETTINGS_COLLECTION as c, blockAddonId as d, blockIdFromAddonId as f, loadBlockTypeDefs as i, BlockSupervisor as l, removeBlockPackage as m, CoreBlockStore as n, createAddonSettingsStore as o, materializeBlock as p, compileBlock as r, CORE_BLOCKS_COLLECTION as s, extractSettingsSchema as t, BLOCK_ADDON_PREFIX as u };

package/dist/builtins/core-blocks/index.mjs

@@ -1,2 +1,2 @@
-import { CoreBlocksAddon, a as loadBlockTypeDefs, d as blockAddonId, f as blockIdFromAddonId, i as compileBlock, l as BlockSupervisor, m as removeBlockPackage, n as CORE_BLOCKS_COLLECTION, o as BlockSettingsStore, p as materializeBlock, r as CoreBlockStore, s as CORE_BLOCK_SETTINGS_COLLECTION, t as extractSettingsSchema, u as BLOCK_ADDON_PREFIX } from "./core-blocks.addon.mjs";
+import { CoreBlocksAddon, a as BlockSettingsStore, c as CORE_BLOCK_SETTINGS_COLLECTION, d as blockAddonId, f as blockIdFromAddonId, i as loadBlockTypeDefs, l as BlockSupervisor, m as removeBlockPackage, n as CoreBlockStore, p as materializeBlock, r as compileBlock, s as CORE_BLOCKS_COLLECTION, t as extractSettingsSchema, u as BLOCK_ADDON_PREFIX } from "./core-blocks.addon.mjs";
 export { BLOCK_ADDON_PREFIX, BlockSettingsStore, BlockSupervisor, CORE_BLOCKS_COLLECTION, CORE_BLOCK_SETTINGS_COLLECTION, CoreBlockStore, CoreBlocksAddon, CoreBlocksAddon as default, blockAddonId, blockIdFromAddonId, compileBlock, extractSettingsSchema, loadBlockTypeDefs, materializeBlock, removeBlockPackage };