@lmzhen/dsh-evolution-curator 0.17.1 → 0.18.1

package/lib/index.js

@@ -3,7 +3,7 @@ import { randomUUID } from "node:crypto";
 import { join } from "node:path";
 import { BlockAssembler, createUserMessage } from "@deepseek-ai/dsh-llm";
 import z from "@deepseek-ai/schemastery";
-import { CURATOR_DRY_RUN_BANNER, CURATOR_PROMPT, DEFAULT_ARCHIVE_AFTER_DAYS, DEFAULT_CURATOR_BOOT_GRACE_SECONDS, DEFAULT_CURATOR_INTERVAL_HOURS, DEFAULT_CURATOR_MODEL, DEFAULT_CURATOR_REVIEW_MAX_TOKENS, DEFAULT_HEALTH_THRESHOLDS, DEFAULT_MIN_IDLE_HOURS, DEFAULT_SKILL_LIMITS, DEFAULT_STALE_AFTER_DAYS, EvolutionGateSet, INSTANCE_KEYS, MAX_TIMER_DELAY_MS, SKILL_NAME_RE, buildCuratorRunReport, claimInstance, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, emptyRecord, entryTarget, evolutionHome, evolutionIoAdapter, foldCuratorFields, isPresent, isUnknown, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, newSkillLibrary, paramRowId, parseCuratorNominations, parseFrontmatter, policyStageLimits, probeList, probeMtime, readNumberParam, relatedSkillNames, releaseInstance, renderCuratorReportMarkdown, sessionLastEventTime, transactIo, updateSuppressedNames, usageObserved } from "@lmzhen/dsh-evolution-core";
+import { CURATOR_DRY_RUN_BANNER, CURATOR_PROMPT, DEFAULT_ARCHIVE_AFTER_DAYS, DEFAULT_CURATOR_BOOT_GRACE_SECONDS, DEFAULT_CURATOR_INTERVAL_HOURS, DEFAULT_CURATOR_MODEL, DEFAULT_CURATOR_REVIEW_MAX_TOKENS, DEFAULT_HEALTH_THRESHOLDS, DEFAULT_MIN_IDLE_HOURS, DEFAULT_SKILL_LIMITS, DEFAULT_STALE_AFTER_DAYS, EvolutionGateSet, INSTANCE_KEYS, MAX_TIMER_DELAY_MS, PROMPT_BUNDLE, SKILL_NAME_RE, buildCuratorRunReport, claimInstance, clampOnce, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, emptyRecord, entryTarget, evolutionHome, evolutionIoAdapter, foldCuratorFields, isPresent, isUnknown, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, newSkillLibrary, paramRowId, parseCuratorNominations, parseFrontmatter, pickWithPolicy, policyStageLimits, probeList, probeMtime, probeText, readNumberParam, relatedSkillNames, releaseInstance, renderCuratorReportMarkdown, reportTime, sessionLastEventTime, transactIo, updateSuppressedNames, usageObserved, userSetKeys, verifyPromptBundle } from "@lmzhen/dsh-evolution-core";
 //#region lib/types/index.js
 /**
 * Deterministic skill lifecycle curator with interval gate and archive.
@@ -80,6 +80,10 @@ var EvolutionCurator = class extends Service {
 	bootGraceSeconds;
 	/** Keys whose supplied value had to be corrected; each warns once (G3.1). */
 	clampedKeys = /* @__PURE__ */ new Set();
+	/** The clamp warning sink — the LOGIC lives in core's `clampOnce` (S2.9/T3-10), the prefix here. */
+	clampWarn = (message) => {
+		this.ctx.logger.warn("evolution-curator: " + message);
+	};
 	lastRun = 0;
 	timer;
 	/** B-8 (v18): set by the fiber disposer; a triggered autoCheck must not
@@ -113,9 +117,10 @@ var EvolutionCurator = class extends Service {
 		ctx.inject(["settings"], (injected) => {
 			const settings = injected.settings;
 			if (typeof settings?.configure !== "function") return;
-			const disposer = settings.configure({ auto: false });
+			const disposer = settings.configure({ auto: false }, ctx.fiber);
 			if (typeof disposer === "function") ctx.effect(() => disposer, "evolution-curator: settings presentation");
 		});
+		if (!verifyPromptBundle(PROMPT_BUNDLE)) throw new Error("dsh-evolution prompt bundle integrity check failed; refusing to run the curator");
 		this.io = evolutionIoAdapter(() => ctx.evolutionIo.provider());
 		this.skills = newSkillLibrary({
 			config,
@@ -137,7 +142,7 @@ var EvolutionCurator = class extends Service {
 		this.manageUnmanaged = config.manageUnmanaged ?? false;
 		this.pruneBuiltins = config.pruneBuiltins ?? false;
 		this.referencedSkillNames = new Set(config.referencedSkillNames ?? []);
-		this.bootGraceSeconds = this.clampOnce("bootGraceSeconds", config.bootGraceSeconds, DEFAULT_CURATOR_BOOT_GRACE_SECONDS, 0, 3600);
+		this.bootGraceSeconds = clampOnce(this.clampedKeys, this.clampWarn, "bootGraceSeconds", config.bootGraceSeconds, DEFAULT_CURATOR_BOOT_GRACE_SECONDS, 0, 3600);
 		const archiveAtBoot = this.rowNumber("archiveAfterDays", DEFAULT_ARCHIVE_AFTER_DAYS, 1);
 		const staleAtBoot = this.rowNumber("staleAfterDays", DEFAULT_STALE_AFTER_DAYS, 1);
 		if (archiveAtBoot < staleAtBoot) this.ctx.logger.warn(`evolution-curator: archiveAfterDays (${archiveAtBoot}) < staleAfterDays (${staleAtBoot}); using staleAfterDays as the archive threshold`);
@@ -163,26 +168,6 @@ var EvolutionCurator = class extends Service {
 		if (config.autoStart ?? true) this.start();
 	}
 	/**
-	* Clamp one supplied numeric value, warning once per key (G3.1).
-	* @param key - the config key, for the warning.
-	* @param value - the value as supplied by the deployment or the user.
-	* @param fallback - the package default a corrected value falls back to.
-	* @param min - the smallest value the engine can act on.
-	* @param max - the largest value the carrier can hold, when bounded.
-	* @returns the value the engine may use.
-	*/
-	clampOnce(key, value, fallback, min, max) {
-		const result = clampedNumber(value, fallback, max === void 0 ? { min } : {
-			min,
-			max
-		});
-		if (value !== void 0 && result !== value && !this.clampedKeys.has(key)) {
-			this.clampedKeys.add(key);
-			this.ctx.logger.warn(`evolution-curator: ${key} provided an invalid value; falling back to the default`);
-		}
-		return result;
-	}
-	/**
 	* One live numeric row field at USE time (G1 §8.3): the row config carries the
 	* platform-resolved layers (schema default < bundle row < profile override) and the
 	* field stays a live reference, so a committed edit applies without a watcher.
@@ -202,7 +187,7 @@ var EvolutionCurator = class extends Service {
 	* @returns the value the engine may use.
 	*/
 	rowNumber(key, fallback, min, max) {
-		return this.clampOnce(key, this.liveNumber(key), fallback, min, max);
+		return clampOnce(this.clampedKeys, this.clampWarn, key, this.liveNumber(key), fallback, min, max);
 	}
 	/**
 	* One live boolean row field at USE time.
@@ -235,20 +220,6 @@ var EvolutionCurator = class extends Service {
 			healthChurnMinPatches: number("healthChurnMinPatches", DEFAULT_HEALTH_THRESHOLDS.churnMinPatches, 1)
 		};
 	}
-	/**
-	* The keys the user set in this row's namespace (G1 §8.4-A).
-	*
-	* This is the ONLY remaining read of the settings user layer, and it reads KEY
-	* NAMES, never values: the platform resolves the user layer into the row config,
-	* so a value is needed from `config` — but the precedence rule (user > policy)
-	* needs to know WHICH keys the user set, or a deployment policy would silently
-	* override the user.
-	* @returns the keys present in this row's user layer.
-	*/
-	userSetKeys() {
-		const entry = this.ctx.get("settings")?.describe?.({ redactSecrets: false }).find((item) => item.ns === paramRowId("evolution-curator"));
-		return new Set(Object.keys(entry?.user ?? {}));
-	}
 	/** The policy-snapshot carrier for this group (unmounted service = no policy). */
 	policyFields() {
 		return this.ctx.get("evolutionPolicy")?.get() ?? {};
@@ -265,11 +236,8 @@ var EvolutionCurator = class extends Service {
 	settings() {
 		const snapshot = this.policyFields();
 		const row = this.rowSettings();
-		const userSet = this.userSetKeys();
-		const pick = (key) => {
-			if (userSet.has(key)) return row[key];
-			return snapshot[key] ?? row[key];
-		};
+		const userSet = userSetKeys(this.ctx, paramRowId("evolution-curator"));
+		const pick = (key) => pickWithPolicy(userSet, row, snapshot, key);
 		const number = (key, min, max) => {
 			const lower = row[key];
 			return clampedNumber(pick(key), lower, max === void 0 ? { min } : {
@@ -436,6 +404,7 @@ var EvolutionCurator = class extends Service {
 			"Return a YAML summary with consolidations and prunings lists. Nominate only actions whose archival/merge is clearly safe."
 		].join("\n");
 		const settings = this.settings();
+		const llmSignal = AbortSignal.timeout(settings.curatorReviewTimeoutMs);
 		try {
 			const assembler = new BlockAssembler();
 			for await (const chunk of llm.stream({
@@ -453,7 +422,7 @@ var EvolutionCurator = class extends Service {
 					}
 				})],
 				maxTokens: settings.curatorReviewMaxTokens,
-				signal: AbortSignal.timeout(settings.curatorReviewTimeoutMs)
+				signal: llmSignal
 			})) assembler.push(chunk);
 			const parsed = parseCuratorNominations(assembler.blocks().filter((block) => block.type === "text").map((block) => block.text).join("\n"));
 			return {
@@ -462,8 +431,12 @@ var EvolutionCurator = class extends Service {
 				warnings: parsed.warnings
 			};
 		} catch (error) {
-			this.ctx.logger.warn(`evolution-curator: LLM nomination pass failed: ${error instanceof Error ? error.message : String(error)}`);
-			return empty;
+			const failure = llmSignal.aborted ? `LLM nomination pass timed out after ${settings.curatorReviewTimeoutMs} ms — no nominations this run (NOT "nothing to nominate": the pass did not complete)` : `LLM nomination pass failed: ${error instanceof Error ? error.message : String(error)} — no nominations this run (NOT "nothing to nominate": the pass did not complete)`;
+			this.ctx.logger.warn(`evolution-curator: ${failure}`);
+			return {
+				...empty,
+				warnings: [failure]
+			};
 		}
 	}
 	/** Optional curator-state service (evolution-state-json / storage-domain). */
@@ -966,8 +939,9 @@ var EvolutionCurator = class extends Service {
 							if (!new RegExp(`^${name}-\\d{14}(-[0-9a-z]{1,6})?$`).test(entry)) continue;
 							wasBundled = await this.io.exists(join(this.skills.root, ".archive", entry, markerEntryName("bundled")));
 							if (wasBundled) {
-								const archivedBody = await this.io.readText(join(this.skills.root, ".archive", entry, "SKILL.md")).catch(() => null);
-								if (archivedBody !== null && parseFrontmatter(archivedBody)?.frontmatter.name !== name) wasBundled = false;
+								const archivedProbe = await probeText(this.io, join(this.skills.root, ".archive", entry, "SKILL.md"));
+								if (isUnknown(archivedProbe)) this.ctx.logger.warn(`evolution-curator: the archived body of "${entry}" could not be read (${archivedProbe.reason}); keeping the bundled marker as the signal`);
+								else if (isPresent(archivedProbe) && parseFrontmatter(archivedProbe.value)?.frontmatter.name !== name) wasBundled = false;
 							}
 							if (wasBundled) break;
 						}
@@ -1137,24 +1111,22 @@ var EvolutionCurator = class extends Service {
 		for (const name of entries.filter((entry) => entry.startsWith("curator-") && entry.endsWith(".json"))) try {
 			const raw = await this.io.readText(join(reportsRoot, name));
 			if (raw === null) continue;
-			const parsed = JSON.parse(raw);
-			let startedAt = typeof parsed.startedAt === "string" ? Date.parse(parsed.startedAt) : NaN;
-			if (!Number.isFinite(startedAt)) {
-				const probe = await probeMtime(this.io, join(reportsRoot, name));
-				if (isPresent(probe)) startedAt = probe.value;
-			}
-			if (!Number.isFinite(startedAt) && typeof parsed.at === "string") startedAt = Date.parse(parsed.at);
-			if (Number.isFinite(startedAt)) (name.startsWith("curator-error-") ? errors : real).push({
+			const startedAt = await reportTime(this.io, join(reportsRoot, name), JSON.parse(raw));
+			const probed = await probeMtime(this.io, join(reportsRoot, name));
+			const mtime = isPresent(probed) ? probed.value : null;
+			if (startedAt !== null) (name.startsWith("curator-error-") ? errors : real).push({
 				name,
-				startedAt
+				startedAt,
+				mtime
 			});
 			else if (!unorderableWarned) {
 				unorderableWarned = true;
 				this.ctx.logger.warn(`evolution-curator: report "${name}" carries no usable timestamp and this backend has no mtime probe - it is kept outside the retention window`);
 			}
 		} catch {}
-		real.sort((a, b) => b.startedAt - a.startedAt);
-		errors.sort((a, b) => b.startedAt - a.startedAt);
+		const newestFirst = (a, b) => b.startedAt - a.startedAt || (b.mtime ?? 0) - (a.mtime ?? 0) || b.name.localeCompare(a.name);
+		real.sort(newestFirst);
+		errors.sort(newestFirst);
 		await this.pruneReportList(reportsRoot, real, keep);
 		await this.pruneReportList(reportsRoot, errors, errorKeep);
 	}
@@ -1181,19 +1153,26 @@ var EvolutionCurator = class extends Service {
 		let latest = null;
 		let probeWarned = false;
 		for (const name of names) {
-			const probe = await probeMtime(this.io, join(reportsRoot, name));
-			if (isUnknown(probe)) {
+			const path = join(reportsRoot, name);
+			const raw = await this.io.readText(path);
+			if (raw === null) continue;
+			let parsed;
+			try {
+				parsed = JSON.parse(raw);
+			} catch {
+				continue;
+			}
+			const at = await reportTime(this.io, path, parsed);
+			if (at === null) {
 				if (!probeWarned) {
 					probeWarned = true;
-					this.ctx.logger.warn(`evolution-curator: latestReport could not read a report mtime (${probe.reason}) - the affected report(s) are not eligible as the latest`);
+					this.ctx.logger.warn("evolution-curator: latestReport found no usable report time (neither a declared startedAt/at nor an mtime probe) - the affected report(s) are not eligible as the latest");
 				}
 				continue;
 			}
-			if (!isPresent(probe)) continue;
-			const mtime = probe.value;
-			if (latest === null || mtime > latest.mtime) latest = {
+			if (latest === null || at > latest.at) latest = {
 				name,
-				mtime
+				at
 			};
 		}
 		if (latest === null) return null;

package/lib/types/index.d.ts

@@ -29,7 +29,7 @@ export interface Config {
     /** The due-ness interval. The policy snapshot shadows it in every shipped
      * composition — configure `curatorIntervalHours` there; that name is the
      * canonical id. Deprecated alias (G0/S0.3): still readable, refused by
-     * writes; removed 0.7.0. */
+     * writes; removal was planned for 0.7.0 and is deferred (the alias still ships — see the package README). */
     intervalHours?: number;
     staleAfterDays?: Volatile<number>;
     archiveAfterDays?: Volatile<number>;
@@ -205,6 +205,8 @@ export declare class EvolutionCurator extends Service {
     private readonly bootGraceSeconds;
     /** Keys whose supplied value had to be corrected; each warns once (G3.1). */
     private readonly clampedKeys;
+    /** The clamp warning sink — the LOGIC lives in core's `clampOnce` (S2.9/T3-10), the prefix here. */
+    private readonly clampWarn;
     private lastRun;
     private timer;
     /** B-8 (v18): set by the fiber disposer; a triggered autoCheck must not
@@ -232,16 +234,6 @@ export declare class EvolutionCurator extends Service {
      * yielding instance's log line names a concrete holder. */
     private readonly instanceOwner;
     constructor(ctx: Context, config?: Config);
-    /**
-     * Clamp one supplied numeric value, warning once per key (G3.1).
-     * @param key - the config key, for the warning.
-     * @param value - the value as supplied by the deployment or the user.
-     * @param fallback - the package default a corrected value falls back to.
-     * @param min - the smallest value the engine can act on.
-     * @param max - the largest value the carrier can hold, when bounded.
-     * @returns the value the engine may use.
-     */
-    private clampOnce;
     /**
      * One live numeric row field at USE time (G1 §8.3): the row config carries the
      * platform-resolved layers (schema default < bundle row < profile override) and the
@@ -272,17 +264,6 @@ export declare class EvolutionCurator extends Service {
      * @returns the row layer of the curator's behaviour knobs.
      */
     private rowSettings;
-    /**
-     * The keys the user set in this row's namespace (G1 §8.4-A).
-     *
-     * This is the ONLY remaining read of the settings user layer, and it reads KEY
-     * NAMES, never values: the platform resolves the user layer into the row config,
-     * so a value is needed from `config` — but the precedence rule (user > policy)
-     * needs to know WHICH keys the user set, or a deployment policy would silently
-     * override the user.
-     * @returns the keys present in this row's user layer.
-     */
-    private userSetKeys;
     /** The policy-snapshot carrier for this group (unmounted service = no policy). */
     private policyFields;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-curator",
   "description": "Deterministic skill lifecycle and recovery (community build)",
-  "version": "0.17.1",
+  "version": "0.18.1",
   "publishConfig": {
     "access": "public"
   },
@@ -26,21 +26,21 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-core": "^0.17.1"
+    "@deepseek-ai/schemastery": "^3.18.4",
+    "@lmzhen/dsh-evolution-core": "^0.18.1"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
     "@deepseek-ai/dsh-session": "^0.2.0-rc.1",
-    "@lmzhen/dsh-evolution-io": "^0.17.1",
-    "@lmzhen/dsh-evolution-state": "^0.17.1"
+    "@lmzhen/dsh-evolution-io": "^0.18.1",
+    "@lmzhen/dsh-evolution-state": "^0.18.1"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
     "@deepseek-ai/dsh-session": "^0.2.0-rc.1",
-    "@lmzhen/dsh-evolution-core": "^0.17.1",
-    "@lmzhen/dsh-evolution-io": "^0.17.1",
-    "@lmzhen/dsh-evolution-state": "^0.17.1"
+    "@lmzhen/dsh-evolution-core": "^0.18.1",
+    "@lmzhen/dsh-evolution-io": "^0.18.1",
+    "@lmzhen/dsh-evolution-state": "^0.18.1"
   }
 }