@camstack/system 1.2.475 → 1.2.477

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

@@ -1,6 +1,6 @@
-import { $i as hydrateSchema, $n as planComposition, Bt as coreBlockComposition, Hi as collectSecretMarkerRefs, Hr as composedDeviceRef, Ht as coreBlockSourceKind, Kn as normalizeCoreBlockWrite, N as DeclaredDevices, Nr as validateComposition, Ot as buildCapabilityLookup, Rt as compositionSourceRefs, Ta as transformSecretWrite, Ut as coreBlocksCapability, Vt as coreBlockIdFromAddonId, Zt as describeComposableCaps, ei as errMsg, f as COMPOSER_RUNNER_ID, ia as isSecretMarker, lr as resolveCoreBlockEntry, m as CORE_BLOCK_ADDON_PREFIX, oa as isSecretRefOwnedBy, or as replacedFieldKeys, p as CORE_BLOCKS_ADDON_ID, qi as defineRecordKinds, qr as compositionSourceKey, r as ALL_CAPABILITY_DEFINITIONS, ti as BaseAddon, ur as resolveCoreBlockFiles, v as CoreBlockSchema, va as resolveSecretMarkers, xa as secretTreeFromSchema, zt as coreBlockAddonId } from "../../dist-DygMs3Qc.mjs";
+import { $i as hydrateSchema, $n as planComposition, Bt as coreBlockComposition, Hi as collectSecretMarkerRefs, Hr as composedDeviceRef, Ht as coreBlockSourceKind, Kn as normalizeCoreBlockWrite, N as DeclaredDevices, Nr as validateComposition, Ot as buildCapabilityLookup, Rt as compositionSourceRefs, Ta as transformSecretWrite, Ut as coreBlocksCapability, Vt as coreBlockIdFromAddonId, Zt as describeComposableCaps, ei as errMsg, f as COMPOSER_RUNNER_ID, ia as isSecretMarker, lr as resolveCoreBlockEntry, m as CORE_BLOCK_ADDON_PREFIX, oa as isSecretRefOwnedBy, or as replacedFieldKeys, p as CORE_BLOCKS_ADDON_ID, qi as defineRecordKinds, qr as compositionSourceKey, r as ALL_CAPABILITY_DEFINITIONS, ti as BaseAddon, ur as resolveCoreBlockFiles, v as CoreBlockSchema, va as resolveSecretMarkers, xa as secretTreeFromSchema, zt as coreBlockAddonId } from "../../dist-B_V9r61Z.mjs";
 import { t as require_read_all_rows } from "../../read-all-rows-TaPqdWNF.mjs";
-import { t as describeCompositionSources } from "../../composition-sources-CiFkyAcf.mjs";
+import { t as describeCompositionSources } from "../../composition-sources-B5nK7pHt.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";
@@ -241,6 +241,13 @@ var BlockSupervisor = class {
 	emptyAppliesOwed = 2;
 	/** Consecutive applies that could not reach the composer: warned once per run. */
 	failedApplies = 0;
+	/** Composition ids the operator deleted. Passed until their claims are released. */
+	retiredBlockIds = /* @__PURE__ */ new Set();
+	/** What the last composition apply said about claim releases. */
+	releaseReport = {
+		error: null,
+		unreleased: []
+	};
 	constructor(deps) {
 		this.deps = deps;
 	}
@@ -276,6 +283,26 @@ var BlockSupervisor = class {
 	* timer tick could stop a runner the tick had just decided was healthy and
 	* then never re-launch it.
 	*/
+	/**
+	* The block row is already gone. The next apply names it retired so its
+	* claims are released before this resolves. A release that does not land is
+	* returned; the id stays retired so the following pass tries again.
+	*/
+	retireComposition(blockId) {
+		this.retiredBlockIds = new Set([...this.retiredBlockIds, blockId]);
+		return this.converge().then(() => this.claimsOf(blockId));
+	}
+	/**
+	* One apply, awaited. Used when an edit replaced a block's caps: the
+	* composer releases what the new plan dropped before this resolves.
+	*/
+	convergeForClaims() {
+		if (this.deps.composer === null) return Promise.reject(/* @__PURE__ */ new Error("core-blocks: no composer is available — a replaced claim cannot be released"));
+		return this.converge().then(() => {
+			if (this.releaseReport.error !== null) throw new Error(`core-blocks: a replaced claim was not released — ${this.releaseReport.error}`);
+			return this.releaseReport.unreleased;
+		});
+	}
 	restart(blockId) {
 		const block = this.deps.store.get(blockId);
 		if (block !== null && coreBlockSourceKind(block) === "composition") {
@@ -364,9 +391,13 @@ var BlockSupervisor = class {
 		});
 		const unreadable = this.deps.store.unreadableCompositions();
 		const nothingToSay = compositions.length === 0 && unreadable.length === 0;
-		if (nothingToSay && this.emptyAppliesOwed === 0) return;
+		if (nothingToSay && this.emptyAppliesOwed === 0 && this.retiredBlockIds.size === 0) return;
 		const composer = this.deps.composer;
 		if (composer === null) {
+			if (this.retiredBlockIds.size > 0) this.releaseReport = {
+				error: "no composer is available on this node — claims cannot be released",
+				unreleased: []
+			};
 			for (const { block } of compositions) await this.report(block.id, "failed", "no composer is available on this node — a composition cannot run here");
 			return;
 		}
@@ -389,7 +420,8 @@ var BlockSupervisor = class {
 					composition
 				})),
 				restartBlockIds: [...restart],
-				unreadableBlocks: [...unreadable]
+				unreadableBlocks: [...unreadable],
+				retiredBlockIds: [...this.retiredBlockIds]
 			});
 			if (this.failedApplies > 0) {
 				this.deps.logger.info("the composer answered again", { meta: { failedApplies: this.failedApplies } });
@@ -397,6 +429,7 @@ var BlockSupervisor = class {
 			}
 			this.pendingCompositionRestarts = new Set([...this.pendingCompositionRestarts].filter((id) => !restart.has(id)));
 			this.emptyAppliesOwed = !nothingToSay || !result.acted ? 2 : Math.max(0, this.emptyAppliesOwed - 1);
+			this.noteRelease(result);
 			const verdicts = new Map(result.blocks.map((v) => [v.blockId, v]));
 			for (const { block } of compositions) {
 				const verdict = verdicts.get(block.id);
@@ -404,13 +437,39 @@ var BlockSupervisor = class {
 				else await this.report(block.id, verdict.status, verdict.reason);
 			}
 		} catch (err) {
+			const error = errMsg(err);
+			this.releaseReport = {
+				error,
+				unreleased: []
+			};
 			this.failedApplies += 1;
 			if (this.failedApplies === 1) this.deps.logger.warn("the composer could not be reached — compositions keep their last status", { meta: {
-				error: errMsg(err),
+				error,
 				compositions: compositions.length
 			} });
-			for (const { block } of compositions) if (block.status === "stopped" && block.enabled) await this.report(block.id, "starting", `the composer is not reachable yet: ${errMsg(err)}`);
+			for (const { block } of compositions) if (block.status === "stopped" && block.enabled) await this.report(block.id, "starting", `the composer is not reachable yet: ${error}`);
+		}
+	}
+	claimsOf(blockId) {
+		if (this.releaseReport.error !== null) throw new Error(`core-blocks: claims of "${blockId}" were not released — ${this.releaseReport.error}`);
+		return this.releaseReport.unreleased.filter((claim) => claim.owner === blockId);
+	}
+	/** Remember which retired ids still hold a claim. An apply that did not act keeps every id. */
+	noteRelease(result) {
+		const unreleased = result.unreleasedClaims ?? [];
+		if (!result.acted) {
+			this.releaseReport = {
+				error: "the composer did not apply — claims stay until it does",
+				unreleased
+			};
+			return;
 		}
+		this.releaseReport = {
+			error: null,
+			unreleased
+		};
+		const failed = new Set(unreleased.map((claim) => claim.owner));
+		this.retiredBlockIds = new Set([...this.retiredBlockIds].filter((id) => failed.has(id)));
 	}
 	/** Compile, write the package, spawn. Each failure is reported ON the block
 	*  — the author asked for this to run, so they are owed the reason it does
@@ -2077,7 +2136,21 @@ function buildCompositionApi(deps) {
 				blockId,
 				by: caller.userId
 			} });
-			deps.convergeSoon();
+			if (block.composition !== void 0) {
+				const unreleased = (await deps.convergeForClaims()).filter((claim) => claim.owner === blockId);
+				if (unreleased.length > 0) {
+					for (const claim of unreleased) deps.logger.error("composition saved but a replaced claim was not released", {
+						tags: { deviceId: claim.deviceId },
+						meta: {
+							blockId,
+							cap: claim.capName,
+							error: claim.error
+						}
+					});
+					const detail = unreleased.map((claim) => `${claim.capName} on device ${claim.deviceId}: ${claim.error}`).join("; ");
+					throw new Error(`core-blocks: "${blockId}" was saved but a replaced claim was not released — ${detail}`);
+				}
+			} else deps.convergeSoon();
 			return { block: updated };
 		}),
 		getComposition: async ({ blockId }) => {
@@ -2453,9 +2526,30 @@ var CoreBlocksAddon = class extends BaseAddon {
 				return { block: updated };
 			},
 			delete: async ({ blockId }) => {
+				const existing = this.requireStore().get(blockId);
+				const composition = existing !== null && coreBlockComposition(existing) !== null;
 				await this.requireStore().delete(blockId);
 				await this.requirePrefs().delete(blockId);
-				this.convergeSoon();
+				if (composition && this.supervisor === null) {
+					this.ctx.logger.error("composition deleted but no supervisor can release its claims", { meta: { blockId } });
+					throw new Error(`core-blocks: "${blockId}" was deleted but no supervisor runs here — its claims were not released`);
+				}
+				if (composition && this.supervisor !== null) {
+					const unreleased = await this.supervisor.retireComposition(blockId);
+					if (unreleased.length > 0) {
+						for (const claim of unreleased) this.ctx.logger.error("composition deleted but its claim was not released", {
+							tags: { deviceId: claim.deviceId },
+							meta: {
+								blockId,
+								cap: claim.capName,
+								owner: claim.owner,
+								error: claim.error
+							}
+						});
+						const detail = unreleased.map((claim) => `${claim.capName} on device ${claim.deviceId}: ${claim.error}`).join("; ");
+						throw new Error(`core-blocks: "${blockId}" was deleted but its claims were not released — ${detail}`);
+					}
+				} else this.convergeSoon();
 				return { success: true };
 			},
 			setEnabled: async ({ blockId, enabled }) => {
@@ -2464,9 +2558,9 @@ var CoreBlocksAddon = class extends BaseAddon {
 				return { block: updated };
 			},
 			/**
-			* Awaited, unlike every other write here.
+			* Awaited, like a composition delete.
 			*
-			* `create`/`update` deliberately do not wait — the write is already
+			* `create`/`update` of a code block deliberately do not wait — the write is already
 			* durable and converging forks a process. A restart has no durable half:
 			* the whole thing IS the converge, so returning before it ran would hand
 			* the operator the old status and read as "nothing happened".
@@ -2547,6 +2641,10 @@ var CoreBlocksAddon = class extends BaseAddon {
 			lookupCap: buildCapabilityLookup(ALL_CAPABILITY_DEFINITIONS),
 			composerStates: async (blockIds) => (await requireApi().composer.getStates.query({ blockIds: [...blockIds] })).states,
 			convergeSoon: () => this.convergeSoon(),
+			convergeForClaims: () => {
+				if (this.supervisor === null) return Promise.reject(/* @__PURE__ */ new Error("core-blocks: no block supervisor runs on this node — claims cannot be released"));
+				return this.supervisor.convergeForClaims();
+			},
 			logger: this.ctx.logger.child("compositions"),
 			capabilityDefinitions: ALL_CAPABILITY_DEFINITIONS
 		});