@lmzhen/dsh-evolution-curator 0.18.0 → 0.19.0

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, 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";
+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, probeText, readNumberParam, relatedSkillNames, releaseInstance, renderCuratorReportMarkdown, reportTime, reportsSweepLockTarget, sessionLastEventTime, sweepReports, transactIo, updateSuppressedNames, usageObserved, userSetKeys, verifyPromptBundle } from "@lmzhen/dsh-evolution-core";
 //#region lib/types/index.js
 /**
 * Deterministic skill lifecycle curator with interval gate and archive.
@@ -404,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({
@@ -421,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 {
@@ -430,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). */
@@ -1091,51 +1096,27 @@ var EvolutionCurator = class extends Service {
 		});
 	}
 	/** The sweep `retainReports` holds the per-home lock for. A caller MUST hold
-	* that lock: the listing and the deletions are not atomic on their own. */
+	* that lock: the listing and the deletions are not atomic on their own.
+	* 0.19.0 (S2): the sweep itself now lives in core (`sweepReports`) — the
+	* maintenance run reports added in 0.19.0 need the same window, and a second
+	* copy of "list, order, delete beyond the window" is the near-duplicate class
+	* this family treats as a defect. The lock and the two windows stay here. */
 	async sweepReports(keep, errorKeep) {
-		const reportsRoot = join(evolutionHome(), "reports");
-		const listed = await probeList(this.io, reportsRoot);
-		if (isUnknown(listed)) {
-			this.ctx.logger.warn(`evolution-curator: report retention skipped — the reports directory could not be listed (${listed.reason})`);
-			return;
-		}
-		const entries = isPresent(listed) ? listed.value : [];
-		const real = [];
-		const errors = [];
-		let unorderableWarned = false;
-		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 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,
-				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 {}
-		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);
-	}
-	/** Remove the oldest reports beyond `keep` (each with its `.md` digest, best-effort). */
-	async pruneReportList(reportsRoot, dated, keep) {
-		for (const oldReport of dated.slice(keep)) {
-			const stem = oldReport.name.replace(/\.json$/, "");
-			try {
-				await this.io.remove(join(reportsRoot, oldReport.name));
-			} catch {}
-			try {
-				await this.io.remove(join(reportsRoot, `${stem}.md`));
-			} catch {}
-		}
+		await sweepReports({
+			io: this.io,
+			dir: join(evolutionHome(), "reports"),
+			buckets: [{
+				prefix: "curator-error-",
+				keep: errorKeep
+			}, {
+				prefix: "curator-",
+				keep
+			}],
+			warn: (message) => {
+				this.ctx.logger.warn(message);
+			},
+			owner: "evolution-curator"
+		});
 	}
 	async latestReport() {
 		const reportsRoot = join(evolutionHome(), "reports");
@@ -1433,17 +1414,5 @@ var EvolutionCurator = class extends Service {
 		}
 	}
 };
-/**
-* v43 FLOW2-1: the per-home lock target for the report retention sweep.
-* `transactIo` takes the IO write lock on THIS path (minting `<path>.lock` with
-* the io protocol's `pid:token` body) and holds it for the whole task; nothing
-* ever writes the target, because the sweep's exclusion is the point. It lives
-* inside `<home>/reports` next to the directory it protects: the sweep's own
-* name filter (`curator-*.json`) ignores it, and the lock file is removed on
-* release.
-*/
-function reportsSweepLockTarget() {
-	return join(evolutionHome(), "reports", ".retention");
-}
 //#endregion
 export { EvolutionCurator, EvolutionCurator as default, gateConsolidations, validateCuratorSettings };

package/lib/types/index.d.ts

@@ -450,10 +450,12 @@ export declare class EvolutionCurator extends Service {
      */
     private retainReports;
     /** The sweep `retainReports` holds the per-home lock for. A caller MUST hold
-     * that lock: the listing and the deletions are not atomic on their own. */
+     * that lock: the listing and the deletions are not atomic on their own.
+     * 0.19.0 (S2): the sweep itself now lives in core (`sweepReports`) — the
+     * maintenance run reports added in 0.19.0 need the same window, and a second
+     * copy of "list, order, delete beyond the window" is the near-duplicate class
+     * this family treats as a defect. The lock and the two windows stay here. */
     private sweepReports;
-    /** Remove the oldest reports beyond `keep` (each with its `.md` digest, best-effort). */
-    private pruneReportList;
     latestReport(): Promise<CuratorRunReport | null>;
     /**
      * Read-only lifecycle scope classification: which skills are in scope,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-curator",
   "description": "Deterministic skill lifecycle and recovery (community build)",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "publishConfig": {
     "access": "public"
   },
@@ -27,20 +27,20 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.4",
-    "@lmzhen/dsh-evolution-core": "^0.18.0"
+    "@lmzhen/dsh-evolution-core": "^0.19.0"
   },
   "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.18.0",
-    "@lmzhen/dsh-evolution-state": "^0.18.0"
+    "@lmzhen/dsh-evolution-io": "^0.19.0",
+    "@lmzhen/dsh-evolution-state": "^0.19.0"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-llm": "^0.2.0-rc.1",
     "@deepseek-ai/dsh-session": "^0.2.0-rc.1",
-    "@lmzhen/dsh-evolution-core": "^0.18.0",
-    "@lmzhen/dsh-evolution-io": "^0.18.0",
-    "@lmzhen/dsh-evolution-state": "^0.18.0"
+    "@lmzhen/dsh-evolution-core": "^0.19.0",
+    "@lmzhen/dsh-evolution-io": "^0.19.0",
+    "@lmzhen/dsh-evolution-state": "^0.19.0"
   }
 }