@lmzhen/dsh-evolution-curator 0.3.65 → 0.3.67

package/README.md

@@ -33,7 +33,7 @@ Independent of request-prefix construction. This package does not alter the asse
 - `archive` never deletes: skills move to `.archive/` with a `.archive-reason` marker.
 - `restore(name)` (service) / `/evolution skill restore <name>` brings one archived skill back to the active root and resets its usage state.
 - `consolidate(target, sources)` (service) / `/evolution consolidate` merges source bodies into the target, archives the sources with an absorbed-into marker, and folds their usage records into `archived` state. Both operations snapshot the full state first (`pre-consolidate` / `pre-restore`).
-- `restoreSnapshot` (service) / `/evolution restore` rolls the FULL state back to the latest snapshot: active tree, usage/suppression sidecars, `.archive/` and the curator state carried in the snapshot (`curator-state.json`), so the interval gate does not immediately re-fire after a rollback. The restore itself is undoable — the pre-rollback safety snapshot preserves the current tree plus its state.
+- `restoreSnapshot` (service) / `/evolution restore` rolls the state back to the latest snapshot: active tree, usage/suppression sidecars, `.archive/` and the curator state carried in the snapshot (`curator-state.json`), so the interval gate does not immediately re-fire after a rollback. Skills that were skipped at snapshot time (a live writer held their lock; recorded in the manifest's `skipped` list) are NOT restored — the restore result names them, and `.backups` may hold a copy. The restore itself is undoable — the pre-rollback safety snapshot preserves the current tree plus its state.
 
 ## Automatic scheduling
 

package/lib/index.js

@@ -401,6 +401,17 @@ var EvolutionCurator = class extends Service {
 	* increments `mutexDepth` synchronously (so run()'s skip check sees queued
 	* work), awaits the previous tail, and the returned release resolves the
 	* tail for the next entrant. Double-release is a no-op.
+	*
+	* v20 (C-3) cross-layer note: this chain serializes CURATOR operations
+	* only. The review subagent channel writes through its own SkillLibrary
+	* and shares NO mutex with this service; the cross-layer exclusion is
+	* skill-store's per-file write lock + the F-17 marker probe (a destructive
+	* 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
+	* the one realistic interleave window — documented, accepted (plan v20
+	* C-3①). The same statement lives on evolution-review's `reviewInFlight`.
 	*/
 	mutexDepth = 0;
 	mutexTail = Promise.resolve();
@@ -449,13 +460,17 @@ var EvolutionCurator = class extends Service {
 			skipped: "active-session"
 		};
 		if (!ignoreGates && persisted === null && (stateService !== void 0 || !this.statelessFirstRunDeferred)) {
-			if (stateService) await stateService.saveCuratorState({
-				schemaVersion: 1,
-				lastRunAt: Date.now(),
-				runCount: 0,
-				lastSummary: "first-run-deferred",
-				paused: false
-			});
+			if (stateService) try {
+				await stateService.saveCuratorState({
+					schemaVersion: 1,
+					lastRunAt: Date.now(),
+					runCount: 0,
+					lastSummary: "first-run-deferred",
+					paused: false
+				});
+			} catch (error) {
+				this.ctx.logger.warn(`evolution-curator: failed to persist the first-run baseline: ${error instanceof Error ? error.message : String(error)}`);
+			}
 			else {
 				this.lastRun = Date.now();
 				this.statelessFirstRunDeferred = true;
@@ -472,6 +487,16 @@ var EvolutionCurator = class extends Service {
 		const rawUsage = await loadUsage(root, this.io);
 		const usage = dryRun ? new Map([...rawUsage].map(([name, record]) => [name, { ...record }])) : rawUsage;
 		const runStartStates = new Map([...usage].map(([name, record]) => [name, record.state]));
+		if (this.isDisposed()) {
+			this.ctx.logger.warn("evolution-curator: run aborted before the archive phase (plugin disposed mid-run)");
+			return {
+				stale: [],
+				archived: [],
+				errors: ["run aborted: evolution-curator was disposed mid-run"],
+				report: this.skippedReport(runId, startedAt),
+				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({
@@ -658,6 +683,15 @@ var EvolutionCurator = class extends Service {
 		let suppressedChanged = false;
 		const suppressedAdded = /* @__PURE__ */ new Set();
 		const stateOwned = new Set(input.stateOwned ?? []);
+		if (this.isDisposed()) {
+			this.ctx.logger.warn("evolution-curator: run aborted at the archive gate (plugin disposed mid-run)");
+			return {
+				archivedSkills: [],
+				errors: ["run aborted: evolution-curator was disposed mid-run"],
+				suppressedChanged: false,
+				consolidated: []
+			};
+		}
 		for (const name of archiveCandidates) {
 			if (!treeNames.has(name)) {
 				const record = usage.get(name);
@@ -725,7 +759,13 @@ var EvolutionCurator = class extends Service {
 			}
 		}
 		const alreadyArchived = new Set(archiveCandidates);
-		for (const nomination of nominations.consolidations) {
+		let consolidationDisposed = false;
+		if (this.isDisposed()) {
+			consolidationDisposed = true;
+			errors.push("run aborted: evolution-curator was disposed mid-run — consolidation skipped; archives that landed above are still accounted");
+			this.ctx.logger.warn("evolution-curator: consolidation phase skipped (plugin disposed mid-run); archive accounts above are preserved");
+		}
+		for (const nomination of consolidationDisposed ? [] : nominations.consolidations) {
 			if (alreadyArchived.has(nomination.from)) continue;
 			if (!treeNames.has(nomination.from) || !treeNames.has(nomination.into)) {
 				errors.push(`${nomination.from}: consolidation target or source missing from the skill tree`);
@@ -775,12 +815,6 @@ var EvolutionCurator = class extends Service {
 		} catch {
 			this.ctx.logger.warn("evolution-curator: failed to persist usage sidecar");
 		}
-		const usageRegistry = this.ctx.get("skillUsage");
-		try {
-			await usageRegistry?.invalidate?.();
-		} catch (error) {
-			this.ctx.logger.warn(`evolution-curator: skillUsage cache invalidate failed after curation: ${error instanceof Error ? error.message : String(error)}`);
-		}
 		return {
 			archivedSkills,
 			errors,

package/lib/types/index.d.ts

@@ -214,6 +214,17 @@ export declare class EvolutionCurator extends Service {
      * increments `mutexDepth` synchronously (so run()'s skip check sees queued
      * work), awaits the previous tail, and the returned release resolves the
      * tail for the next entrant. Double-release is a no-op.
+     *
+     * v20 (C-3) cross-layer note: this chain serializes CURATOR operations
+     * only. The review subagent channel writes through its own SkillLibrary
+     * and shares NO mutex with this service; the cross-layer exclusion is
+     * skill-store's per-file write lock + the F-17 marker probe (a destructive
+     * 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
+     * the one realistic interleave window — documented, accepted (plan v20
+     * C-3①). The same statement lives on evolution-review's `reviewInFlight`.
      */
     private mutexDepth;
     private mutexTail;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-curator",
   "description": "Deterministic skill lifecycle and recovery (community build)",
-  "version": "0.3.65",
+  "version": "0.3.67",
   "publishConfig": {
     "access": "public"
   },
@@ -31,20 +31,20 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-core": "^0.3.65"
+    "@lmzhen/dsh-evolution-core": "^0.3.67"
   },
   "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.65",
-    "@lmzhen/dsh-evolution-state": "^0.3.65"
+    "@lmzhen/dsh-evolution-io": "^0.3.67",
+    "@lmzhen/dsh-evolution-state": "^0.3.67"
   },
   "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.65",
-    "@lmzhen/dsh-evolution-io": "^0.3.65",
-    "@lmzhen/dsh-evolution-state": "^0.3.65"
+    "@lmzhen/dsh-evolution-core": "^0.3.67",
+    "@lmzhen/dsh-evolution-io": "^0.3.67",
+    "@lmzhen/dsh-evolution-state": "^0.3.67"
   }
 }