@lmzhen/dsh-evolution-curator 0.3.67 → 0.3.69

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_REVIEW_MAX_TOKENS, DEFAULT_HEALTH_THRESHOLDS, DEFAULT_MIN_IDLE_HOURS, DEFAULT_STALE_AFTER_DAYS, EvolutionGateSet, SKILL_NAME_RE, SkillLibrary, buildCuratorRunReport, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, emptyRecord, evolutionHome, evolutionIoAdapter, foldCuratorFields, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, parseCuratorNominations, parseFrontmatter, relatedSkillNames, renderCuratorReportMarkdown, resolveSkillsRoot, 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_STALE_AFTER_DAYS, EvolutionGateSet, MAX_TIMER_DELAY_MS, SKILL_NAME_RE, SkillLibrary, buildCuratorRunReport, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, emptyRecord, evolutionHome, evolutionIoAdapter, foldCuratorFields, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, parseCuratorNominations, parseFrontmatter, relatedSkillNames, renderCuratorReportMarkdown, resolveSkillsRoot, updateSuppressedNames, usageObserved } from "@lmzhen/dsh-evolution-core";
 //#region lib/types/index.js
 /**
 * Deterministic skill lifecycle curator with interval gate and archive.
@@ -17,7 +17,6 @@ const DEFAULT_QUALITY_WARN_STALE_AFTER_DAYS = 7;
 * 120s matches the review subagent default; the 32-bit ceiling is Node's
 * timer-delay limit (`AbortSignal.timeout` throws above it). */
 const DEFAULT_CURATOR_REVIEW_TIMEOUT_MS = 12e4;
-const MAX_TIMER_DELAY_MS = 2147483647;
 /**
 * Block LLM-nominated consolidations that would touch a gate-protected name:
 * exclude / referenced / suppressed skills must never merge (neither as the
@@ -255,7 +254,7 @@ var EvolutionCurator = class extends Service {
 		if (candidates.length === 0) return empty;
 		const llm = this.ctx.get("llm");
 		if (!llm) return empty;
-		const model = this.ctx.get("evolutionPolicy")?.get()?.curatorModel ?? "deepseek-v4-pro";
+		const model = this.ctx.get("evolutionPolicy")?.get()?.curatorModel ?? DEFAULT_CURATOR_MODEL;
 		const clusters = computePrefixClusters(candidates);
 		const clusterLines = clusters.length === 0 ? ["Prefix clusters observed in the candidate list: (none)"] : ["Prefix clusters observed in the candidate list (orientation only — verify against the names above; you may also flag additional clusters):", ...clusters.map((cluster) => `- '${cluster.key}': ${cluster.members.join(", ")}`)];
 		const prompt = [
@@ -409,7 +408,9 @@ var EvolutionCurator = class extends Service {
 	* mover refuses a directory whose writer lock is alive), so a collision
 	* degrades to a recorded failed op + snapshot rollback, never a torn
 	* write. Automatic passes are kept out of the session-active window by the
-	* min-idle gate; a manual run (`ignoreGates`) bypasses that gate and is
+	* min-idle gate — checked pre-run AND re-checked at the commit boundary
+	* (v28 G4.2: a session activating mid-run no longer slips past it); a
+	* manual run (`ignoreGates`) bypasses both checks and is
 	* the one realistic interleave window — documented, accepted (plan v20
 	* C-3①). The same statement lives on evolution-review's `reviewInFlight`.
 	*/
@@ -497,14 +498,13 @@ var EvolutionCurator = class extends Service {
 				skipped: "disposed"
 			};
 		}
-		const snapshotPath = dryRun ? void 0 : await this.snapshotFull("pre-curator-run");
 		const suppressedNames = new Set(await loadSuppressedNames(root, this.io));
 		const gates = new EvolutionGateSet({
 			exclude: this.excludeSkillNames,
 			referenced: this.referencedSkillNames,
 			suppressed: suppressedNames
 		});
-		const { bundledNames, treeNames } = await this.seedBaseline(usage);
+		const { bundledNames, treeNames, resetToActive } = await this.seedBaseline(usage);
 		const contents = /* @__PURE__ */ new Map();
 		for (const name of treeNames) {
 			const text = await this.skills.read(name);
@@ -537,6 +537,23 @@ var EvolutionCurator = class extends Service {
 		};
 		const llmNominations = gatedNominations.prunings;
 		const archiveCandidates = [...new Set([...result.archive, ...llmNominations])];
+		if (!ignoreGates && this.minIdleHours > 0 && this.recentSessionActive()) {
+			if (!dryRun) try {
+				await mutateUsage(root, this.io, (map) => {
+					for (const [name, record] of usage) if (!map.has(name)) map.set(name, { ...record });
+				});
+			} catch (error) {
+				this.ctx.logger.warn(`evolution-curator: failed to persist the seeded usage baseline on a session-blocked run (${error instanceof Error ? error.message : String(error)})`);
+			}
+			return {
+				stale: [],
+				archived: [],
+				errors: [],
+				report: this.skippedReport(runId, startedAt),
+				skipped: "active-session"
+			};
+		}
+		const snapshotPath = dryRun ? void 0 : await this.snapshotFull("pre-curator-run");
 		const { archivedSkills, errors, consolidated } = await this.applyMutations({
 			dryRun,
 			archiveCandidates,
@@ -547,11 +564,16 @@ var EvolutionCurator = class extends Service {
 			suppressedNames,
 			root,
 			recommendPool: new Set(recommendPool),
-			stateOwned: new Set([...result.transitions.map((t) => t.name), ...archiveCandidates]),
+			stateOwned: new Set([
+				...result.transitions.map((t) => t.name),
+				...archiveCandidates,
+				...resetToActive
+			]),
 			runStartStates,
 			failedFrom: new Map(result.transitions.filter((t) => t.to === "archived").map((t) => [t.name, t.from]))
 		});
-		if (!dryRun) this.lastRun = Date.now();
+		const runAborted = errors.some((error) => error.startsWith("run aborted"));
+		if (!dryRun && !runAborted) this.lastRun = Date.now();
 		const report = buildCuratorRunReport({
 			runId,
 			startedAt,
@@ -566,6 +588,15 @@ var EvolutionCurator = class extends Service {
 					reason: errors.find((item) => item.startsWith(`${name}:`))?.slice(name.length + 2) ?? "unknown"
 				};
 			}),
+			...(() => {
+				const attributed = new Set([...archiveCandidates, ...gatedNominations.consolidations.map((item) => item.from)]);
+				const loose = errors.filter((error) => ![...attributed].some((name) => error.startsWith(`${name}:`)));
+				const abort = loose.find((error) => error.startsWith("run aborted"));
+				return {
+					...abort === void 0 ? {} : { aborted: abort.slice(13) },
+					...loose.length === 0 ? {} : { unattributed: loose }
+				};
+			})(),
 			consolidated,
 			...snapshotPath === void 0 ? {} : { snapshotPath },
 			llmReviewEnabled: this.llmReview,
@@ -586,8 +617,8 @@ var EvolutionCurator = class extends Service {
 				const pausedNow = current?.paused ?? false;
 				return {
 					schemaVersion: 1,
-					lastRunAt: dryRun ? persisted?.lastRunAt ?? this.lastRun : Date.now(),
-					runCount: dryRun ? persisted?.runCount ?? 0 : (current?.runCount ?? 0) + 1,
+					lastRunAt: dryRun || runAborted ? persisted?.lastRunAt ?? this.lastRun : Date.now(),
+					runCount: dryRun || runAborted ? persisted?.runCount ?? 0 : (current?.runCount ?? 0) + 1,
 					lastSummary: summary,
 					paused: pausedNow
 				};
@@ -612,16 +643,23 @@ var EvolutionCurator = class extends Service {
 	async seedBaseline(usage) {
 		const bundledNames = /* @__PURE__ */ new Set();
 		const treeNames = /* @__PURE__ */ new Set();
+		const resetToActive = /* @__PURE__ */ new Set();
 		for (const summary of await this.skills.list()) {
 			treeNames.add(summary.name);
 			if (!usage.has(summary.name)) usage.set(summary.name, emptyRecord());
 			if (await this.skills.isBundled(summary.name)) bundledNames.add(summary.name);
 			const record = usage.get(summary.name);
+			if (record?.state === "archived") {
+				record.state = "active";
+				record.archived_at = null;
+				resetToActive.add(summary.name);
+			}
 			if (record) record.pinned = await this.skills.isPinned(summary.name);
 		}
 		return {
 			bundledNames,
-			treeNames
+			treeNames,
+			resetToActive
 		};
 	}
 	/**
@@ -699,6 +737,7 @@ var EvolutionCurator = class extends Service {
 					record.state = "archived";
 					record.archived_at = record.archived_at ?? (/* @__PURE__ */ new Date()).toISOString();
 					stateOwned.add(name);
+					this.ctx.logger.warn(`evolution-curator: skill "${name}" left the tree without an archive move - its usage record was folded to archived; if the directory is still on disk, repair or remove it manually (it will not re-enter the lifecycle while the record is archived)`);
 				}
 				let wasBundled = false;
 				try {
@@ -793,8 +832,7 @@ var EvolutionCurator = class extends Service {
 			});
 			archivedSkills.push({
 				name: nomination.from,
-				path: join(this.skills.root, ".archive", nomination.from),
-				reason: `Consolidated into ${nomination.into}`
+				reason: `Consolidated into ${nomination.into} (exact archive path: the evolution/skill-mutated event, archivedPath)`
 			});
 		}
 		if (suppressedChanged) try {

package/lib/types/index.d.ts

@@ -222,7 +222,9 @@ export declare class EvolutionCurator extends Service {
      * mover refuses a directory whose writer lock is alive), so a collision
      * degrades to a recorded failed op + snapshot rollback, never a torn
      * write. Automatic passes are kept out of the session-active window by the
-     * min-idle gate; a manual run (`ignoreGates`) bypasses that gate and is
+     * min-idle gate — checked pre-run AND re-checked at the commit boundary
+     * (v28 G4.2: a session activating mid-run no longer slips past it); a
+     * manual run (`ignoreGates`) bypasses both checks and is
      * the one realistic interleave window — documented, accepted (plan v20
      * C-3①). The same statement lives on evolution-review's `reviewInFlight`.
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-curator",
   "description": "Deterministic skill lifecycle and recovery (community build)",
-  "version": "0.3.67",
+  "version": "0.3.69",
   "publishConfig": {
     "access": "public"
   },
@@ -31,20 +31,20 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-core": "^0.3.67"
+    "@lmzhen/dsh-evolution-core": "^0.3.69"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-io": "^0.3.67",
-    "@lmzhen/dsh-evolution-state": "^0.3.67"
+    "@lmzhen/dsh-evolution-io": "^0.3.69",
+    "@lmzhen/dsh-evolution-state": "^0.3.69"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-core": "^0.3.67",
-    "@lmzhen/dsh-evolution-io": "^0.3.67",
-    "@lmzhen/dsh-evolution-state": "^0.3.67"
+    "@lmzhen/dsh-evolution-core": "^0.3.69",
+    "@lmzhen/dsh-evolution-io": "^0.3.69",
+    "@lmzhen/dsh-evolution-state": "^0.3.69"
   }
 }