@lmzhen/dsh-evolution-curator 0.26.15 → 0.26.26

package/lib/index.js

@@ -1,10 +1,9 @@
 import { Service } from "@deepseek-ai/cordis";
+import { BASELINE_ACTION, 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_REVIEW_TIMEOUT_MS, DEFAULT_SKILL_LIMITS, DEFAULT_STALE_AFTER_DAYS, EvolutionGateSet, INSTANCE_KEYS, MAX_TIMER_DELAY_MS, PROMPT_BUNDLE, SKILL_NAME_RE, authorityFrom, blobPath, buildCuratorRunReport, claimInstance, clampOnce, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, emptyRecord, entryTarget, evolutionHome, evolutionIoAdapter, foldCuratorFields, historyIndexFile, isPresent, isUnknown, lintSkill, liveBool, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, newSkillLibrary, paramRowId, parseCuratorNominations, parseFrontmatter, parseHistoryIndex, pickWithPolicy, policyStageLimits, probeList, probeText, readNumberParam, relatedSkillNames, releaseInstance, renderCuratorReportMarkdown, reportTime, reportsSweepLockTarget, resolveUnitMembers, sessionLastEventTime, staleRouteStubs, sweepReports, transactIo, unitMembersAreComplete, unwrapLive, updateSuppressedNames, usageObserved, userSetKeys, verifyPromptBundle, withTreeWrite } from "@lmzhen/dsh-evolution-core";
 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 { preferProvider } from "@lmzhen/dsh-evolution-io";
-import { BASELINE_ACTION, 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_REVIEW_TIMEOUT_MS, DEFAULT_SKILL_LIMITS, DEFAULT_STALE_AFTER_DAYS, EvolutionGateSet, INSTANCE_KEYS, MAX_TIMER_DELAY_MS, PROMPT_BUNDLE, SKILL_NAME_RE, blobPath, buildCuratorRunReport, claimInstance, clampOnce, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, emptyRecord, entryTarget, evolutionHome, evolutionIoAdapter, foldCuratorFields, historyIndexFile, isPresent, isUnknown, lintSkill, liveBool, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, newSkillLibrary, paramRowId, parseCuratorNominations, parseFrontmatter, parseHistoryIndex, pickWithPolicy, policyStageLimits, probeList, probeText, readNumberParam, relatedSkillNames, releaseInstance, renderCuratorReportMarkdown, reportTime, reportsSweepLockTarget, resolveUnitMembers, sessionLastEventTime, staleRouteStubs, sweepReports, transactIo, unitMembersAreComplete, unwrapLive, updateSuppressedNames, usageObserved, userSetKeys, verifyPromptBundle } from "@lmzhen/dsh-evolution-core";
 //#region lib/types/unit-undo-plan.js
 /**
 * G3a: the pure half of `undoUnit` — deciding WHAT to write back, with no io and no host.
@@ -206,8 +205,9 @@ var EvolutionCurator = class extends Service {
 			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(() => preferProvider(ctx.evolutionIo, ["fs"]));
+		this.io = evolutionIoAdapter(() => ctx.evolutionIo.provider());
 		this.skills = newSkillLibrary({
+			authority: authorityFrom({ origin: "background_review" }),
 			config,
 			io: this.io,
 			ctx: this.ctx,
@@ -619,18 +619,18 @@ var EvolutionCurator = class extends Service {
 			report: this.skippedReport("instance-held", (/* @__PURE__ */ new Date()).toISOString()),
 			skipped: "instance-held"
 		};
-		if (this.mutexDepth > 0) return {
+		if (this.runClaim || this.mutexDepth > 0) return {
 			stale: [],
 			archived: [],
 			errors: [],
 			report: this.skippedReport("already-running", (/* @__PURE__ */ new Date()).toISOString()),
 			skipped: "already-running"
 		};
-		const release = await this.acquireMutex();
+		this.runClaim = true;
 		try {
 			return await this.runCore(options);
 		} finally {
-			release();
+			this.runClaim = false;
 			try {
 				await this.retainReports();
 			} catch (error) {
@@ -663,6 +663,11 @@ var EvolutionCurator = class extends Service {
 	* the one realistic interleave window — documented, accepted (plan v20
 	* C-3①). The same statement lives on evolution-review's `reviewInFlight`.
 	*/
+	/** G1/1.5 (S7-09): the synchronous run claim. The mutex is taken later now (around the mutation only),
+	* so this is what makes the `already-running` answer atomic with respect to other entrants. It is a
+	* CLAIM, not a wait: no polling, so it cannot reintroduce the v15 micro-task starvation the promise
+	* chain replaced. */
+	runClaim = false;
 	mutexDepth = 0;
 	mutexTail = Promise.resolve();
 	acquireMutex() {
@@ -776,14 +781,13 @@ var EvolutionCurator = class extends Service {
 			suppressed: suppressedNames
 		});
 		const { bundledNames, treeNames, resetToActive } = await this.seedBaseline(usage);
+		const listed = await this.skills.list({ withContent: true });
 		const contents = /* @__PURE__ */ new Map();
-		for (const name of treeNames) {
-			const text = await this.skills.read(name);
-			if (text) contents.set(name, text);
-		}
+		for (const summary of listed) if (summary.content) contents.set(summary.name, summary.content);
 		const referencedBy = referencedSkillNames(contents);
 		const protectedNames = await this.protectedNameMap();
-		const dedupMembers = [...new Set(computeDedupGroups({ contents }).groups.filter((group) => group.length >= 2).flat())].filter((name) => !protectedNames.has(name) && !referencedBy.has(name));
+		const dedupScan = computeDedupGroups({ contents });
+		const dedupMembers = [...new Set(dedupScan.groups.filter((group) => group.length >= 2).flat())].filter((name) => !protectedNames.has(name) && !referencedBy.has(name));
 		await this.scoreTree(usage, treeNames, contents);
 		const result = computeLifecycleTransitions(usage, {
 			staleAfterDays: lifecycle.staleAfterDays,
@@ -842,7 +846,19 @@ var EvolutionCurator = class extends Service {
 				skipped: "active-session"
 			};
 		}
-		const { archivedSkills, errors, consolidated } = await this.applyMutations({
+		const apply = this.applyMutations.bind(this);
+		const { archivedSkills, errors, consolidated } = await withTreeWrite(() => this.acquireMutex(), {
+			names: [...treeNames],
+			read: async (name) => {
+				return (await this.skills.list({ withContent: true })).find((entry) => entry.name === name)?.content;
+			},
+			writeSkill: async (name, content) => {
+				await this.skills.update(name, content, "background_review");
+			},
+			note: (text) => {
+				this.ctx.logger.info("evolution-curator: " + text);
+			}
+		}, async () => apply({
 			dryRun,
 			archiveCandidates,
 			nominations: gatedNominations,
@@ -859,7 +875,7 @@ var EvolutionCurator = class extends Service {
 			]),
 			runStartStates,
 			failedFrom: new Map(result.transitions.filter((t) => t.to === "archived").map((t) => [t.name, t.from]))
-		});
+		}));
 		const runAborted = errors.some((error) => error.startsWith("run aborted"));
 		if (!dryRun && !runAborted) this.lastRun = Date.now();
 		const finishedAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -891,7 +907,8 @@ var EvolutionCurator = class extends Service {
 			consolidated,
 			...snapshotPath === void 0 ? {} : { snapshotPath },
 			llmReviewEnabled: settings.llmReview,
-			...gatedNominations.warnings.length > 0 ? { nominationsWarnings: gatedNominations.warnings } : {}
+			...gatedNominations.warnings.length > 0 ? { nominationsWarnings: gatedNominations.warnings } : {},
+			...dedupScan.truncated ? { scanWarnings: ["dedup scan truncated at the pair-comparison budget - the candidate pool is a PARTIAL result: the budget is spent in name order, so the tail was never examined"] } : {}
 		});
 		report.routeStubs = await (async () => {
 			const history = join(this.skills.root, ".history", "skills");

package/lib/types/index.d.ts

@@ -408,6 +408,11 @@ export declare class EvolutionCurator extends Service {
      * the one realistic interleave window — documented, accepted (plan v20
      * C-3①). The same statement lives on evolution-review's `reviewInFlight`.
      */
+    /** G1/1.5 (S7-09): the synchronous run claim. The mutex is taken later now (around the mutation only),
+     * so this is what makes the `already-running` answer atomic with respect to other entrants. It is a
+     * CLAIM, not a wait: no polling, so it cannot reintroduce the v15 micro-task starvation the promise
+     * chain replaced. */
+    private runClaim;
     private mutexDepth;
     private mutexTail;
     private acquireMutex;

package/package.json

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