@lmzhen/dsh-evolution-curator 0.1.0-rc.27 → 0.1.0-rc.29

package/lib/index.js

@@ -9,6 +9,16 @@ import { CURATOR_DRY_RUN_BANNER, CURATOR_PROMPT, DEFAULT_ARCHIVE_AFTER_DAYS, DEF
 * Deterministic skill lifecycle curator with interval gate and archive.
 * @module @lmzhen/dsh-evolution-curator
 */
+/**
+* Block LLM-nominated consolidations that would touch a gate-protected name:
+* exclude / referenced / suppressed skills must never merge (neither as the
+* source being archived nor as the umbrella being edited). Mirrors the control
+* plane's `consolidate()` guard; automatic nominations must pass the same gate.
+*/
+function gateConsolidations(consolidations, gates) {
+	const blocked = (name) => gates.exclude?.has(name) === true || gates.referenced?.has(name) === true || gates.suppressed?.has(name) === true;
+	return consolidations.filter((n) => !blocked(n.from) && !blocked(n.into));
+}
 var EvolutionCurator = class extends Service {
 	static inject = ["evolutionIo"];
 	static Config = z.object({
@@ -219,17 +229,26 @@ var EvolutionCurator = class extends Service {
 			prunings: [],
 			consolidations: []
 		};
-		const llmNominations = nominations.prunings;
+		const gatedNominations = {
+			...nominations,
+			consolidations: gateConsolidations(nominations.consolidations, {
+				exclude: this.excludeSkillNames,
+				referenced: this.referencedSkillNames,
+				suppressed: suppressedNames
+			})
+		};
+		const llmNominations = gatedNominations.prunings;
 		const archiveCandidates = [...new Set([...result.archive, ...llmNominations])];
 		const { archivedSkills, errors } = await this.applyMutations({
 			dryRun,
 			archiveCandidates,
-			nominations,
+			nominations: gatedNominations,
 			treeNames,
 			usage,
 			bundledNames,
 			suppressedNames,
-			root
+			root,
+			failedFrom: new Map(result.transitions.filter((t) => t.to === "archived").map((t) => [t.name, t.from]))
 		});
 		if (!dryRun) this.lastRun = Date.now();
 		const report = buildCuratorRunReport({
@@ -240,7 +259,7 @@ var EvolutionCurator = class extends Service {
 			llmNominations,
 			archiveCandidates,
 			archived: archivedSkills,
-			failed: [...new Set([...archiveCandidates, ...nominations.consolidations.map((item) => item.from)])].filter((name) => errors.some((error) => error.startsWith(`${name}:`))).map((name) => {
+			failed: [...new Set([...archiveCandidates, ...gatedNominations.consolidations.map((item) => item.from)])].filter((name) => errors.some((error) => error.startsWith(`${name}:`))).map((name) => {
 				return {
 					name,
 					reason: errors.find((item) => item.startsWith(`${name}:`))?.slice(name.length + 2) ?? "unknown"
@@ -257,7 +276,7 @@ var EvolutionCurator = class extends Service {
 			this.ctx.logger.warn(error);
 		}
 		const llmHint = !this.llmReview && result.markStale.length > 0 ? " (llmReview: off - deterministic archive only; set llmReview: true for the LLM merge channel)" : "";
-		const summary = `${dryRun ? "dry-run" : "auto"}: stale:${result.markStale.length} archived:${archivedSkills.length} consolidated:${nominations.consolidations.length}${llmHint}`;
+		const summary = `${dryRun ? "dry-run" : "auto"}: stale:${result.markStale.length} archived:${archivedSkills.length} consolidated:${gatedNominations.consolidations.length}${llmHint}`;
 		await stateService?.saveCuratorState({
 			schemaVersion: 1,
 			lastRunAt: dryRun ? persisted?.lastRunAt ?? this.lastRun : this.lastRun,
@@ -270,7 +289,7 @@ var EvolutionCurator = class extends Service {
 			archived: archivedSkills.map((item) => item.name),
 			errors,
 			report,
-			...this.llmReview ? { nominations } : {}
+			...this.llmReview ? { nominations: gatedNominations } : {}
 		};
 	}
 	/**
@@ -346,7 +365,7 @@ var EvolutionCurator = class extends Service {
 			errors: [],
 			suppressedChanged: false
 		};
-		const { archiveCandidates, nominations, treeNames, usage, bundledNames, suppressedNames, root } = input;
+		const { archiveCandidates, nominations, treeNames, usage, bundledNames, suppressedNames, root, failedFrom } = input;
 		const errors = [];
 		const archivedSkills = [];
 		let suppressedChanged = false;
@@ -357,7 +376,8 @@ var EvolutionCurator = class extends Service {
 			});
 			if (!archived.ok) {
 				const record = usage.get(name);
-				if (record) record.state = "active";
+				const from = failedFrom?.get(name);
+				if (record && (from === "stale" || from === "active")) record.state = from;
 				errors.push(`${name}: ${archived.message}`);
 			} else {
 				archivedSkills.push({
@@ -391,7 +411,7 @@ var EvolutionCurator = class extends Service {
 			alreadyArchived.add(nomination.from);
 			archivedSkills.push({
 				name: nomination.from,
-				path: consolidated.path ?? "",
+				path: join(this.skills.root, ".archive", nomination.from),
 				reason: `Consolidated into ${nomination.into}`
 			});
 		}
@@ -453,7 +473,13 @@ var EvolutionCurator = class extends Service {
 			manageUnmanaged: this.manageUnmanaged,
 			pruneBuiltins: this.pruneBuiltins,
 			bundledNames
-		});
+		}, await this.protectedNameMap());
+	}
+	/** marker info (pinned/bundled/hub-installed) per skill, from the library list. */
+	async protectedNameMap() {
+		const map = /* @__PURE__ */ new Map();
+		for (const summary of await this.skills.list()) if (summary.protectedBy !== null) map.set(summary.name, summary.protectedBy);
+		return map;
 	}
 	/**
 	* Control-plane consolidation: merge source skill bodies into `target`,
@@ -473,6 +499,7 @@ var EvolutionCurator = class extends Service {
 		for (const source of sources) {
 			const record = usage.get(source);
 			if (record) record.state = "archived";
+			if (record) record.archived_at = (/* @__PURE__ */ new Date()).toISOString();
 		}
 		await saveUsage(this.skills.root, usage, this.io);
 		return result;
@@ -488,6 +515,7 @@ var EvolutionCurator = class extends Service {
 		const usage = await loadUsage(this.skills.root, this.io);
 		const record = usage.get(name);
 		if (record) record.state = "active";
+		if (record) record.archived_at = null;
 		await saveUsage(this.skills.root, usage, this.io);
 		const suppressed = new Set(await loadSuppressedNames(this.skills.root, this.io));
 		if (suppressed.delete(name)) try {
@@ -499,4 +527,4 @@ var EvolutionCurator = class extends Service {
 	}
 };
 //#endregion
-export { EvolutionCurator, EvolutionCurator as default };
+export { EvolutionCurator, EvolutionCurator as default, gateConsolidations };

package/lib/types/index.d.ts

@@ -5,7 +5,7 @@
 import { Context, Service } from '@deepseek-ai/cordis';
 import type Schema from '@deepseek-ai/schemastery';
 import { SkillLibrary } from '@deepseek-ai/dsh-evolution-core';
-import { type CuratorNominations, type CuratorRunReport, type ScopeView, type SkillActionResult } from '@deepseek-ai/dsh-evolution-core';
+import { type CuratorConsolidation, type CuratorNominations, type CuratorRunReport, type ScopeView, type SkillActionResult } from '@deepseek-ai/dsh-evolution-core';
 declare module '@deepseek-ai/cordis' {
     interface Context {
         evolutionCurator: EvolutionCurator;
@@ -54,6 +54,17 @@ export interface CuratorStateRecordShape {
     lastSummary: string;
     paused: boolean;
 }
+/**
+ * Block LLM-nominated consolidations that would touch a gate-protected name:
+ * exclude / referenced / suppressed skills must never merge (neither as the
+ * source being archived nor as the umbrella being edited). Mirrors the control
+ * plane's `consolidate()` guard; automatic nominations must pass the same gate.
+ */
+export declare function gateConsolidations(consolidations: CuratorConsolidation[], gates: {
+    exclude?: ReadonlySet<string>;
+    referenced?: ReadonlySet<string>;
+    suppressed?: ReadonlySet<string>;
+}): CuratorConsolidation[];
 export declare class EvolutionCurator extends Service {
     static inject: string[];
     static Config: Schema<Config>;
@@ -131,6 +142,8 @@ export declare class EvolutionCurator extends Service {
      * so the view always predicts what a curator pass may touch.
      */
     scopeView(): Promise<ScopeView>;
+    /** marker info (pinned/bundled/hub-installed) per skill, from the library list. */
+    private protectedNameMap;
     /**
      * Control-plane consolidation: merge source skill bodies into `target`,
      * archive the sources with an absorbed-into marker, and fold their usage

package/package.json

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