emdash 0.35.0 → 0.36.0

package/src/media/usage/work-processor.ts

@@ -1,26 +1,28 @@
 import type { Kysely } from "kysely";
 
+import { isPostgres } from "../../database/dialect-helpers.js";
 import {
 	MediaUsageWorkRepository,
 	type MediaUsageWorkRecord,
 } from "../../database/repositories/media-usage-work.js";
 import { MediaUsageRepository } from "../../database/repositories/media-usage.js";
+import { withTransaction } from "../../database/transaction.js";
 import type { Database } from "../../database/types.js";
+import { getRequestContext } from "../../request-context.js";
 import {
-	refreshContentMediaUsageForWork,
+	contentRefreshKey,
+	refreshContentMediaUsageForWorkBatch,
+	type ContentMediaUsageRefreshResult,
 	type ContentMediaUsageRefreshErrorCode,
 } from "./content-refresh.js";
 
 export const MEDIA_USAGE_WORK_PROCESSING_LIMITS = Object.freeze({
-	candidatesPerTick: 4,
-	jobsPerTick: 1,
-	maxTickDurationMs: 5_000,
-	leaseDurationSeconds: 60,
+	candidatesPerTick: 1_000,
+	leaseDurationSeconds: 20 * 60,
 	maxAttempts: 5,
 	retryBaseSeconds: 30,
 	retryMaxSeconds: 15 * 60,
 	retryJitterRatio: 0.25,
-	ordinaryStatementsPerJob: 20,
 });
 
 export type MediaUsageWorkProcessingOutcome =
@@ -47,7 +49,10 @@ export interface MediaUsageWorkTickResult {
 	supersededCount: number;
 	obsoleteCount: number;
 	durationMs: number;
-	admissionClosed: boolean;
+}
+
+export interface ProcessDueMediaUsageWorkOptions {
+	activationKnownActive?: boolean;
 }
 
 export async function processMediaUsageWorkAfterWrite(
@@ -59,14 +64,45 @@ export async function processMediaUsageWorkAfterWrite(
 		return { outcome: "inactive", claimed: false };
 	}
 
+	await new MediaUsageRepository(db).recoverIncrementalFinalizations();
 	const repo = new MediaUsageWorkRepository(db);
 	const work = await repo.findWorkForContent(collectionSlug, contentId);
 	if (!work) return { outcome: "not_due", claimed: false };
-	return processCandidate(db, repo, work);
+	const claimed = await repo.claimWork({
+		collectionId: work.collectionId,
+		contentId: work.contentId,
+		workVersion: work.workVersion,
+		leaseDurationSeconds: MEDIA_USAGE_WORK_PROCESSING_LIMITS.leaseDurationSeconds,
+	});
+	if (!claimed) return { outcome: "claim_lost", claimed: false };
+	try {
+		const processed = await runClaimedBatch(db, [claimed]);
+		return processed.get(workResultKey(claimed)) ?? { outcome: "claim_lost", claimed: false };
+	} catch (error) {
+		const transitioned = await repo.retryClaimedWorkBatch({
+			work: [workLease(claimed)],
+			errorCode: "MEDIA_USAGE_PROCESSING_FAILED",
+			retryDelaySeconds: MEDIA_USAGE_WORK_PROCESSING_LIMITS.retryBaseSeconds,
+			maxAttempts: MEDIA_USAGE_WORK_PROCESSING_LIMITS.maxAttempts,
+		});
+		const outcome = transitioned.get(workIdentityKey(claimed)) ?? "superseded";
+		if (outcome === "failed") {
+			await new MediaUsageRepository(db).recordIncrementalFailure({
+				collectionId: claimed.collectionId,
+				collectionSlug: claimed.collectionSlug,
+				contentId: claimed.contentId,
+				workVersion: claimed.workVersion,
+				errorCode: "MEDIA_USAGE_PROCESSING_FAILED",
+			});
+		}
+		console.error("[media-usage:work] Immediate processing failed:", error);
+		return { outcome, claimed: true };
+	}
 }
 
 export async function processDueMediaUsageWork(
 	db: Kysely<Database>,
+	options: ProcessDueMediaUsageWorkOptions = {},
 ): Promise<MediaUsageWorkTickResult> {
 	const startedAt = Date.now();
 	const result: MediaUsageWorkTickResult = {
@@ -78,28 +114,28 @@ export async function processDueMediaUsageWork(
 		supersededCount: 0,
 		obsoleteCount: 0,
 		durationMs: 0,
-		admissionClosed: false,
 	};
 
-	if (!(await isIncrementalCaptureActive(db))) {
+	if (!options.activationKnownActive && !(await isIncrementalCaptureActive(db))) {
 		result.durationMs = Date.now() - startedAt;
 		return result;
 	}
 
+	await new MediaUsageRepository(db).recoverIncrementalFinalizations();
 	const repo = new MediaUsageWorkRepository(db);
-	const candidates = await repo.findDueWork(MEDIA_USAGE_WORK_PROCESSING_LIMITS.candidatesPerTick);
-	result.candidateCount = candidates.length;
+	const candidates = await repo.claimDueWorkBatch({
+		limit: MEDIA_USAGE_WORK_PROCESSING_LIMITS.candidatesPerTick,
+		leaseDurationSeconds: MEDIA_USAGE_WORK_PROCESSING_LIMITS.leaseDurationSeconds,
+	});
+	result.candidateCount =
+		candidates.length > 0 || !(await repo.hasNonterminalWork()) ? candidates.length : 1;
 
+	const processedBatch = await processClaimedCollections(db, candidates);
 	for (const candidate of candidates) {
-		if (
-			result.claimedCount >= MEDIA_USAGE_WORK_PROCESSING_LIMITS.jobsPerTick ||
-			Date.now() - startedAt >= MEDIA_USAGE_WORK_PROCESSING_LIMITS.maxTickDurationMs
-		) {
-			result.admissionClosed = true;
-			break;
-		}
-
-		const processed = await processCandidate(db, repo, candidate);
+		const processed = processedBatch.get(workResultKey(candidate)) ?? {
+			outcome: "claim_lost" as const,
+			claimed: false,
+		};
 		if (processed.claimed) result.claimedCount++;
 		if (processed.outcome === "completed") result.completedCount++;
 		if (processed.outcome === "retry") result.retryCount++;
@@ -112,92 +148,311 @@ export async function processDueMediaUsageWork(
 	return result;
 }
 
-async function processCandidate(
+async function processClaimedCollections(
 	db: Kysely<Database>,
-	repo: MediaUsageWorkRepository,
-	candidate: MediaUsageWorkRecord,
-): Promise<MediaUsageWorkProcessingResult> {
-	const claimed = await repo.claimWork({
-		collectionId: candidate.collectionId,
-		contentId: candidate.contentId,
-		workVersion: candidate.workVersion,
-		leaseDurationSeconds: MEDIA_USAGE_WORK_PROCESSING_LIMITS.leaseDurationSeconds,
-	});
-	if (!claimed?.leaseToken) return { outcome: "claim_lost", claimed: false };
+	candidates: readonly MediaUsageWorkRecord[],
+): Promise<Map<string, MediaUsageWorkProcessingResult>> {
+	const processed = new Map<string, MediaUsageWorkProcessingResult>();
+	const byCollection = new Map<string, MediaUsageWorkRecord[]>();
+	for (const candidate of candidates) {
+		const key = collectionResultKey(candidate);
+		const collection = byCollection.get(key) ?? [];
+		collection.push(candidate);
+		byCollection.set(key, collection);
+	}
+	for (const collection of byCollection.values()) {
+		try {
+			for (const [key, result] of await runClaimedBatch(db, collection)) {
+				processed.set(key, result);
+			}
+		} catch (error) {
+			for (const [key, result] of await retryFailedClaimedCollection(db, collection)) {
+				processed.set(key, result);
+			}
+			console.error("[media-usage:work] Collection processing failed:", error);
+		}
+	}
+	return processed;
+}
 
-	const lease = {
-		collectionId: claimed.collectionId,
-		contentId: claimed.contentId,
-		workVersion: claimed.workVersion,
-		leaseToken: claimed.leaseToken,
-	};
-	if (!(await collectionIdentityIsCurrent(db, claimed.collectionId, claimed.collectionSlug))) {
-		return {
-			outcome: (await repo.completeWork(lease)) ? "obsolete" : "superseded",
+async function retryFailedClaimedCollection(
+	db: Kysely<Database>,
+	candidates: readonly MediaUsageWorkRecord[],
+): Promise<Map<string, MediaUsageWorkProcessingResult>> {
+	const transitioned = await new MediaUsageWorkRepository(db).retryClaimedWorkBatch({
+		work: candidates.map(workLease),
+		errorCode: "MEDIA_USAGE_PROCESSING_FAILED",
+		retryDelaySeconds: MEDIA_USAGE_WORK_PROCESSING_LIMITS.retryBaseSeconds,
+		maxAttempts: MEDIA_USAGE_WORK_PROCESSING_LIMITS.maxAttempts,
+	});
+	const processed = new Map<string, MediaUsageWorkProcessingResult>();
+	const failedCollectionIds = new Set<string>();
+	for (const candidate of candidates) {
+		const state = transitioned.get(workIdentityKey(candidate));
+		if (state === "failed") failedCollectionIds.add(candidate.collectionId);
+		processed.set(workResultKey(candidate), {
+			outcome: state ?? "superseded",
 			claimed: true,
-		};
+		});
 	}
+	await new MediaUsageRepository(db).recordIncrementalFailuresByCollection({
+		collectionIds: [...failedCollectionIds],
+		errorCode: "MEDIA_USAGE_PROCESSING_FAILED",
+	});
+	return processed;
+}
 
-	const refresh = await refreshContentMediaUsageForWork(
-		db,
-		claimed.collectionId,
-		claimed.collectionSlug,
-		claimed.contentId,
-	);
-	if (refresh.success) {
-		const completed = await repo.completeWork(lease);
-		if (completed) {
-			await new MediaUsageRepository(db).recordIncrementalSuccess({
-				collectionId: claimed.collectionId,
-				collectionSlug: claimed.collectionSlug,
-			});
+async function runClaimedBatch(
+	db: Kysely<Database>,
+	candidates: readonly MediaUsageWorkRecord[],
+): Promise<Map<string, MediaUsageWorkProcessingResult>> {
+	return isPostgres(db)
+		? withTransaction(db, (trx) =>
+				processClaimedBatch(trx, new MediaUsageWorkRepository(trx), candidates),
+			)
+		: processClaimedBatch(db, new MediaUsageWorkRepository(db), candidates);
+}
+
+async function processClaimedBatch(
+	db: Kysely<Database>,
+	repo: MediaUsageWorkRepository,
+	candidates: readonly MediaUsageWorkRecord[],
+): Promise<Map<string, MediaUsageWorkProcessingResult>> {
+	const results = new Map<string, MediaUsageWorkProcessingResult>();
+	const locked = await repo.lockClaimedWorkBatch(candidates.map(workLease));
+	const owned: MediaUsageWorkRecord[] = [];
+	for (const candidate of candidates) {
+		if (locked.has(workIdentityKey(candidate))) owned.push(candidate);
+		else {
+			results.set(workResultKey(candidate), { outcome: "superseded", claimed: true });
 		}
-		return {
-			outcome: completed ? "completed" : "superseded",
-			claimed: true,
-		};
+	}
+	const currentCollections = await findCurrentCollectionIdentities(db, owned);
+	const current: MediaUsageWorkRecord[] = [];
+	const obsolete: MediaUsageWorkRecord[] = [];
+	for (const candidate of owned) {
+		if (currentCollections.has(collectionResultKey(candidate))) current.push(candidate);
+		else obsolete.push(candidate);
 	}
 
-	if (!(await collectionIdentityIsCurrent(db, claimed.collectionId, claimed.collectionSlug))) {
-		return {
-			outcome: (await repo.completeWork(lease)) ? "obsolete" : "superseded",
+	const obsoleteCompleted = await repo.completeWorkBatch(obsolete.map(workLease));
+	for (const candidate of obsolete) {
+		results.set(workResultKey(candidate), {
+			outcome: obsoleteCompleted.has(workIdentityKey(candidate)) ? "obsolete" : "superseded",
 			claimed: true,
-		};
+		});
 	}
+	if (current.length === 0) return results;
 
-	const errorCode = processingErrorCode(refresh.errorCode);
-	const terminal =
-		errorCode === "MEDIA_USAGE_RESOURCE_LIMIT" ||
-		claimed.attemptCount + 1 >= MEDIA_USAGE_WORK_PROCESSING_LIMITS.maxAttempts;
-	if (terminal) {
-		const failed = await repo.failWork({ ...lease, errorCode });
-		if (failed) {
-			await new MediaUsageRepository(db).recordIncrementalFailure({
-				collectionId: claimed.collectionId,
-				collectionSlug: claimed.collectionSlug,
-				contentId: claimed.contentId,
-				workVersion: claimed.workVersion,
-				errorCode,
+	const refreshes = await refreshContentMediaUsageForWorkBatch(db, current, {
+		shouldContinue: canContinueBulkWork,
+	});
+	const successful: MediaUsageWorkRecord[] = [];
+	const unstarted: MediaUsageWorkRecord[] = [];
+	const failedRefreshes: Array<{
+		candidate: MediaUsageWorkRecord;
+		refresh: ContentMediaUsageRefreshResult;
+	}> = [];
+	for (const candidate of current) {
+		const refresh = refreshes.get(contentRefreshKey(candidate.collectionId, candidate.contentId));
+		if (refresh?.success) successful.push(candidate);
+		else if (!refresh) unstarted.push(candidate);
+		else failedRefreshes.push({ candidate, refresh });
+	}
+	const terminalFailureCollections = new Map<string, Set<string>>();
+	const failureGroups = new Map<
+		string,
+		{
+			errorCode: string;
+			retryDelaySeconds: number;
+			terminal: boolean;
+			candidates: MediaUsageWorkRecord[];
+		}
+	>();
+	for (const failure of failedRefreshes) {
+		const errorCode = processingErrorCode(failure.refresh.errorCode);
+		const terminal =
+			errorCode === "MEDIA_USAGE_RESOURCE_LIMIT" ||
+			failure.candidate.attemptCount + 1 >= MEDIA_USAGE_WORK_PROCESSING_LIMITS.maxAttempts;
+		const delay = retryDelaySeconds(failure.candidate.attemptCount);
+		const key = `${errorCode}\u0000${terminal ? "terminal" : String(delay)}`;
+		const group = failureGroups.get(key) ?? {
+			errorCode,
+			retryDelaySeconds: delay,
+			terminal,
+			candidates: [],
+		};
+		group.candidates.push(failure.candidate);
+		failureGroups.set(key, group);
+	}
+	for (const group of failureGroups.values()) {
+		const transitioned = await repo.retryClaimedWorkBatch({
+			work: group.candidates.map(workLease),
+			errorCode: group.errorCode,
+			retryDelaySeconds: group.retryDelaySeconds,
+			maxAttempts: group.terminal ? 1 : MEDIA_USAGE_WORK_PROCESSING_LIMITS.maxAttempts,
+		});
+		for (const candidate of group.candidates) {
+			const state = transitioned.get(workIdentityKey(candidate));
+			if (state === "failed") {
+				const collections = terminalFailureCollections.get(group.errorCode) ?? new Set<string>();
+				collections.add(candidate.collectionId);
+				terminalFailureCollections.set(group.errorCode, collections);
+			}
+			results.set(workResultKey(candidate), {
+				outcome: state ?? "superseded",
+				claimed: true,
 			});
 		}
-		return {
-			outcome: failed ? "failed" : "superseded",
+	}
+	for (const [errorCode, collectionIds] of terminalFailureCollections) {
+		await new MediaUsageRepository(db).recordIncrementalFailuresByCollection({
+			collectionIds: [...collectionIds],
+			errorCode,
+		});
+	}
+	const released = await repo.releaseClaimedWorkBatch(unstarted.map(workLease));
+	for (const candidate of unstarted) {
+		results.set(workResultKey(candidate), {
+			outcome: released.has(workIdentityKey(candidate)) ? "not_due" : "superseded",
 			claimed: true,
-		};
+		});
 	}
 
+	const usage = new MediaUsageRepository(db);
+	const successfulByCollection = new Map<string, MediaUsageWorkRecord[]>();
+	for (const candidate of successful) {
+		const key = collectionResultKey(candidate);
+		const collection = successfulByCollection.get(key) ?? [];
+		collection.push(candidate);
+		successfulByCollection.set(key, collection);
+	}
+	const readyToComplete: MediaUsageWorkRecord[] = [];
+	const deferredCompletion: MediaUsageWorkRecord[] = [];
+	const lostFinalization: MediaUsageWorkRecord[] = [];
+	let pendingFinalizationQueries = 2;
+	for (const collection of successfulByCollection.values()) {
+		const first = collection[0];
+		if (!first) continue;
+		const metrics = getRequestContext()?.metrics;
+		if (metrics && metrics.dbCount + pendingFinalizationQueries + 4 > 900) {
+			deferredCompletion.push(...collection);
+			continue;
+		}
+		const finalization = await usage.prepareIncrementalFinalization({
+			collectionId: first.collectionId,
+			collectionSlug: first.collectionSlug,
+		});
+		if (finalization.outcome !== "lost") {
+			readyToComplete.push(...collection);
+			pendingFinalizationQueries += 2;
+			continue;
+		}
+		lostFinalization.push(...collection);
+		pendingFinalizationQueries += 2;
+	}
+	const lostTransitions = await repo.retryClaimedWorkBatch({
+		work: lostFinalization.map(workLease),
+		errorCode: "MEDIA_USAGE_GENERATION_CONFLICT",
+		retryDelaySeconds: MEDIA_USAGE_WORK_PROCESSING_LIMITS.retryBaseSeconds,
+		maxAttempts: MEDIA_USAGE_WORK_PROCESSING_LIMITS.maxAttempts,
+	});
+	const lostFailedCollections = new Set<string>();
+	for (const candidate of lostFinalization) {
+		const state = lostTransitions.get(workIdentityKey(candidate));
+		if (state === "failed") lostFailedCollections.add(candidate.collectionId);
+		results.set(workResultKey(candidate), {
+			outcome: state ?? "superseded",
+			claimed: true,
+		});
+	}
+	await usage.recordIncrementalFailuresByCollection({
+		collectionIds: [...lostFailedCollections],
+		errorCode: "MEDIA_USAGE_GENERATION_CONFLICT",
+	});
+	const deferred = await repo.releaseClaimedWorkBatch(deferredCompletion.map(workLease));
+	for (const candidate of deferredCompletion) {
+		results.set(workResultKey(candidate), {
+			outcome: deferred.has(workIdentityKey(candidate)) ? "not_due" : "superseded",
+			claimed: true,
+		});
+	}
+	const completed = await repo.completeWorkBatch(readyToComplete.map(workLease));
+	const completedCollections = new Map<string, MediaUsageWorkRecord>();
+	for (const candidate of readyToComplete) {
+		const didComplete = completed.has(workIdentityKey(candidate));
+		results.set(workResultKey(candidate), {
+			outcome: didComplete ? "completed" : "superseded",
+			claimed: true,
+		});
+		if (didComplete) completedCollections.set(collectionResultKey(candidate), candidate);
+	}
+	for (const collection of completedCollections.values()) {
+		await usage.recordIncrementalSuccess({
+			collectionId: collection.collectionId,
+			collectionSlug: collection.collectionSlug,
+		});
+	}
+	return results;
+}
+
+async function findCurrentCollectionIdentities(
+	db: Kysely<Database>,
+	candidates: readonly MediaUsageWorkRecord[],
+): Promise<Set<string>> {
+	const identities = new Map(
+		candidates.map((candidate) => [collectionResultKey(candidate), candidate] as const),
+	);
+	const current = new Set<string>();
+	for (const batch of chunkCollectionIds(
+		Array.from(identities.values(), (item) => item.collectionId),
+	)) {
+		const rows = await db
+			.selectFrom("_emdash_collections")
+			.select(["id", "slug"])
+			.where("id", "in", batch)
+			.execute();
+		for (const row of rows) current.add(`${row.id}\u0000${row.slug}`);
+	}
+	return current;
+}
+
+function workLease(work: MediaUsageWorkRecord) {
+	if (!work.leaseToken) throw new Error("Claimed media usage work requires a lease token");
 	return {
-		outcome: (await repo.retryWork({
-			...lease,
-			errorCode,
-			retryDelaySeconds: retryDelaySeconds(claimed.attemptCount),
-		}))
-			? "retry"
-			: "superseded",
-		claimed: true,
+		collectionId: work.collectionId,
+		contentId: work.contentId,
+		workVersion: work.workVersion,
+		leaseToken: work.leaseToken,
 	};
 }
 
+function workIdentityKey(work: MediaUsageWorkRecord): string {
+	return `${work.collectionId}\u0000${work.contentId}\u0000${String(work.workVersion)}`;
+}
+
+function workResultKey(work: MediaUsageWorkRecord): string {
+	return workIdentityKey(work);
+}
+
+function collectionResultKey(work: Pick<MediaUsageWorkRecord, "collectionId" | "collectionSlug">) {
+	return `${work.collectionId}\u0000${work.collectionSlug}`;
+}
+
+function chunkCollectionIds(ids: readonly string[]): string[][] {
+	const unique = [...new Set(ids)];
+	const batches: string[][] = [];
+	for (let index = 0; index < unique.length; index += 50) {
+		batches.push(unique.slice(index, index + 50));
+	}
+	return batches;
+}
+
+function canContinueBulkWork(): boolean {
+	const metrics = getRequestContext()?.metrics;
+	return !metrics || metrics.dbCount + 150 <= 900;
+}
+
 async function isIncrementalCaptureActive(db: Kysely<Database>): Promise<boolean> {
 	const row = await db
 		.selectFrom("_emdash_media_usage_activation")
@@ -207,20 +462,6 @@ async function isIncrementalCaptureActive(db: Kysely<Database>): Promise<boolean
 	return row?.state === "active";
 }
 
-async function collectionIdentityIsCurrent(
-	db: Kysely<Database>,
-	collectionId: string,
-	collectionSlug: string,
-): Promise<boolean> {
-	const row = await db
-		.selectFrom("_emdash_collections")
-		.select("id")
-		.where("id", "=", collectionId)
-		.where("slug", "=", collectionSlug)
-		.executeTakeFirst();
-	return row !== undefined;
-}
-
 function retryDelaySeconds(attemptCount: number): number {
 	const exponential = Math.min(
 		MEDIA_USAGE_WORK_PROCESSING_LIMITS.retryMaxSeconds,

package/src/plugins/index.ts

@@ -44,6 +44,7 @@ export type { PluginContextFactoryOptions } from "./context.js";
 // Hooks
 export { HookPipeline, createHookPipeline } from "./hooks.js";
 export type { HookResult } from "./hooks.js";
+export { ContentSaveRejectedError, isContentSaveRejection } from "./save-rejection.js";
 
 // Email pipeline
 export { EmailPipeline, EmailNotConfiguredError, EmailRecursionError } from "./email.js";

package/src/plugins/save-rejection.ts

@@ -0,0 +1,20 @@
+/**
+ * Thrown by a `content:beforeSave` hook to reject a save with a message
+ * that is safe to show to the editor. The runtime converts it into a
+ * structured `SAVE_REJECTED` API error; any other exception thrown by the
+ * hook cancels the save with a generic error that hides the exception
+ * message.
+ */
+export class ContentSaveRejectedError extends Error {
+	override readonly name = "ContentSaveRejectedError";
+}
+
+/**
+ * Matches by name as well as by prototype: bundlers can duplicate this
+ * module across SSR chunks, and an `instanceof` against the wrong copy of
+ * the class would misreport a rejection as a plugin crash.
+ */
+export function isContentSaveRejection(error: unknown): error is ContentSaveRejectedError {
+	if (error instanceof ContentSaveRejectedError) return true;
+	return error instanceof Error && error.name === "ContentSaveRejectedError";
+}

package/src/plugins/scheduler/node.ts

@@ -29,7 +29,6 @@ export class NodeCronScheduler implements CronScheduler {
 	private timer: ReturnType<typeof setTimeout> | null = null;
 	private running = false;
 	private systemCleanup: SystemCleanupFn | null = null;
-	private mediaUsageMaintenance: SystemCleanupFn | null = null;
 
 	constructor(private executor: CronExecutor) {}
 
@@ -37,10 +36,6 @@ export class NodeCronScheduler implements CronScheduler {
 		this.systemCleanup = fn;
 	}
 
-	setMediaUsageMaintenance(fn: SystemCleanupFn): void {
-		this.mediaUsageMaintenance = fn;
-	}
-
 	start(): void {
 		this.running = true;
 		this.arm();
@@ -117,19 +112,12 @@ export class NodeCronScheduler implements CronScheduler {
 		}
 
 		void Promise.allSettled(tasks)
-			.then(async (results) => {
+			.then((results) => {
 				for (const r of results) {
 					if (r.status === "rejected") {
 						console.error("[cron:node] Tick task failed:", r.reason);
 					}
 				}
-				if (this.mediaUsageMaintenance) {
-					try {
-						await this.mediaUsageMaintenance();
-					} catch (error) {
-						console.error("[cron:node] Media Usage maintenance failed:", error);
-					}
-				}
 				return undefined;
 			})
 			.finally(() => {

package/src/plugins/scheduler/types.ts

@@ -18,8 +18,6 @@ export interface CronScheduler {
 	reschedule(): void;
 	/** Register a system cleanup function to run alongside each tick. */
 	setSystemCleanup(fn: SystemCleanupFn): void;
-	/** Register bounded Media Usage maintenance to run after the general tick settles. */
-	setMediaUsageMaintenance?(fn: SystemCleanupFn): void;
 }
 
 /**

package/src/plugins/state.ts

@@ -12,6 +12,16 @@ import type { Database } from "../database/types.js";
 export type PluginStatus = "active" | "inactive";
 export type PluginSource = "config" | "marketplace" | "registry";
 
+const TIMEZONE_SUFFIX = /(?:z|[+-]\d{2}(?::?\d{2})?)$/i;
+const HOUR_OFFSET_SUFFIX = /\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?[+-]\d{2}$/i;
+
+function parseDatabaseTimestamp(value: string): Date {
+	let normalized = value.trim().replace(" ", "T");
+	if (HOUR_OFFSET_SUFFIX.test(normalized)) normalized += ":00";
+	else if (!TIMEZONE_SUFFIX.test(normalized)) normalized += "Z";
+	return new Date(normalized);
+}
+
 function toPluginStatus(value: string): PluginStatus {
 	if (value === "active") return "active";
 	return "inactive";
@@ -255,9 +265,9 @@ function rowToPluginState(row: PluginStateRow): PluginState {
 		pluginId: row.plugin_id,
 		status: toPluginStatus(row.status),
 		version: row.version,
-		installedAt: new Date(row.installed_at),
-		activatedAt: row.activated_at ? new Date(row.activated_at) : null,
-		deactivatedAt: row.deactivated_at ? new Date(row.deactivated_at) : null,
+		installedAt: parseDatabaseTimestamp(row.installed_at),
+		activatedAt: row.activated_at ? parseDatabaseTimestamp(row.activated_at) : null,
+		deactivatedAt: row.deactivated_at ? parseDatabaseTimestamp(row.deactivated_at) : null,
 		source: toPluginSource(row.source),
 		marketplaceVersion: row.marketplace_version ?? null,
 		displayName: row.display_name ?? null,