@lmzhen/dsh-evolution-curator 0.3.80 → 0.3.82

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_STALE_AFTER_DAYS, EvolutionGateSet, INSTANCE_KEYS, MAX_TIMER_DELAY_MS, SKILL_NAME_RE, buildCuratorRunReport, claimInstance, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, emptyRecord, evolutionHome, evolutionIoAdapter, foldCuratorFields, isPresent, isUnknown, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, newSkillLibrary, parseCuratorNominations, parseFrontmatter, probeList, probeMtime, relatedSkillNames, releaseInstance, renderCuratorReportMarkdown, 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, INSTANCE_KEYS, MAX_TIMER_DELAY_MS, SKILL_NAME_RE, buildCuratorRunReport, claimInstance, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, emptyRecord, evolutionHome, evolutionIoAdapter, foldCuratorFields, isPresent, isUnknown, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, newSkillLibrary, parseCuratorNominations, parseFrontmatter, probeList, probeMtime, relatedSkillNames, releaseInstance, renderCuratorReportMarkdown, transactIo, updateSuppressedNames, usageObserved } from "@lmzhen/dsh-evolution-core";
 //#region lib/types/index.js
 /**
 * Deterministic skill lifecycle curator with interval gate and archive.
@@ -96,7 +96,9 @@ var EvolutionCurator = class extends Service {
 	/** P2-5 (v14): one-shot warning that the interval baseline is process-only. */
 	statelessStateWarned = false;
 	/** B3 / G4: the home this instance claimed, plus whether the claim was
-	* granted. A non-owning instance schedules nothing and runs nothing. */
+	* granted. A non-owning instance schedules nothing and runs nothing. The
+	* claim is PER PROCESS (v43 FLOW2-1): another process's holder is invisible
+	* here, so `holdsInstance` never proves this instance is alone on the home. */
 	instanceHome = "";
 	holdsInstance = false;
 	/** B3 / G4: this instance's identity in the claim — pid + short token, so the
@@ -114,7 +116,7 @@ var EvolutionCurator = class extends Service {
 		this.instanceHome = evolutionHome();
 		const claim = claimInstance(this.instanceHome, INSTANCE_KEYS.curator, this.instanceOwner);
 		this.holdsInstance = claim.granted;
-		if (!claim.granted) this.ctx.logger.warn(`evolution-curator: this instance YIELDS — ${claim.key} is already held by ${claim.holder}; a second curator over one home would race the report retention sweep. It schedules nothing and every run() returns skipped "instance-held".`);
+		if (!claim.granted) this.ctx.logger.warn(`evolution-curator: this instance YIELDS — ${claim.key} is already held by ${claim.holder} IN THIS PROCESS (the claim is a module-scope Map, so it does not exclude another process); a second curator ROW over one home would run a second gate set and a second lifecycle pass over the same tree. It schedules nothing and every run() returns skipped "instance-held"; the report sweep itself is cross-process locked (v43 FLOW2-1).`);
 		const clamped = [];
 		const field = (name, value, fallback, min, max) => {
 			const result = clampedNumber(value, fallback, max === void 0 ? { min } : {
@@ -934,8 +936,26 @@ var EvolutionCurator = class extends Service {
 	* (`curator-error-*.json`) are BUDGETED INDEPENDENTLY. Before this they shared
 	* one keep-20 window, so after 25 consecutive failures the next successful
 	* run's window held only a few real reports alongside the errors.
+	*
+	* v43 FLOW2-1 (P1): the sweep runs inside the IO backend's cross-process write
+	* lock. The inventory used to declare this site as serialized by the per-home
+	* instance claim, which is a module-scope Map (core/instance-scope.ts): a
+	* second ROW of this process yields, but a second PROCESS over the same home
+	* was never excluded — and "list the directory, then delete beyond the window"
+	* is exactly the multi-step shape that needs a real lock. A backend without
+	* `transact` has no lock at all: the sweep then degrades to the previous
+	* best-effort pass, which is safe because every deletion is idempotent and
+	* each report name is unique per runId.
 	*/
 	async retainReports(keep = 20, errorKeep = 10) {
+		await transactIo(this.io, reportsSweepLockTarget(), async () => {
+			await this.sweepReports(keep, errorKeep);
+			return null;
+		});
+	}
+	/** 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. */
+	async sweepReports(keep, errorKeep) {
 		const reportsRoot = join(evolutionHome(), "reports");
 		const listed = await probeList(this.io, reportsRoot);
 		if (isUnknown(listed)) {
@@ -1167,5 +1187,17 @@ var EvolutionCurator = class extends Service {
 		return result;
 	}
 };
+/**
+* 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 };

package/lib/types/index.d.ts

@@ -131,7 +131,9 @@ export declare class EvolutionCurator extends Service {
     /** P2-5 (v14): one-shot warning that the interval baseline is process-only. */
     private statelessStateWarned;
     /** B3 / G4: the home this instance claimed, plus whether the claim was
-     * granted. A non-owning instance schedules nothing and runs nothing. */
+     * granted. A non-owning instance schedules nothing and runs nothing. The
+     * claim is PER PROCESS (v43 FLOW2-1): another process's holder is invisible
+     * here, so `holdsInstance` never proves this instance is alone on the home. */
     private instanceHome;
     private holdsInstance;
     /** B3 / G4: this instance's identity in the claim — pid + short token, so the
@@ -283,8 +285,21 @@ export declare class EvolutionCurator extends Service {
      * (`curator-error-*.json`) are BUDGETED INDEPENDENTLY. Before this they shared
      * one keep-20 window, so after 25 consecutive failures the next successful
      * run's window held only a few real reports alongside the errors.
+     *
+     * v43 FLOW2-1 (P1): the sweep runs inside the IO backend's cross-process write
+     * lock. The inventory used to declare this site as serialized by the per-home
+     * instance claim, which is a module-scope Map (core/instance-scope.ts): a
+     * second ROW of this process yields, but a second PROCESS over the same home
+     * was never excluded — and "list the directory, then delete beyond the window"
+     * is exactly the multi-step shape that needs a real lock. A backend without
+     * `transact` has no lock at all: the sweep then degrades to the previous
+     * best-effort pass, which is safe because every deletion is idempotent and
+     * each report name is unique per runId.
      */
     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. */
+    private sweepReports;
     /** Remove the oldest reports beyond `keep` (each with its `.md` digest, best-effort). */
     private pruneReportList;
     latestReport(): Promise<CuratorRunReport | null>;

package/package.json

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