@lmzhen/dsh-evolution-curator 0.27.3 → 0.29.0

package/lib/index.js

@@ -1,5 +1,5 @@
 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 { 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, acquireTreeWriteLock, authorityFrom, blobPath, buildCuratorRunReport, claimInstance, clampOnce, clampedNumber, computeDedupGroups, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, emptyRecord, entryTarget, evolutionHome, evolutionIoAdapter, executeUnitUndo, foldCuratorFields, historyIndexFile, isPresent, isUnknown, lintSkill, liveBool, loadSuppressedNames, loadUsage, markerEntryName, mutateUsage, newSkillLibrary, paramRowId, parseCuratorNominations, parseFrontmatter, parseHistoryIndex, pickWithPolicy, planUnitUndoAcross, 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";
@@ -670,6 +670,19 @@ var EvolutionCurator = class extends Service {
 	runClaim = false;
 	mutexDepth = 0;
 	mutexTail = Promise.resolve();
+	/** Cross-process tree lock shared with merge runs; curator mutations take it only around apply. */
+	async withMergeTreeLock(body) {
+		const acquired = await acquireTreeWriteLock({
+			io: this.io,
+			home: evolutionHome()
+		});
+		if (!acquired.ok) throw new Error("evolution-curator: merge tree lock unavailable (" + acquired.reason + ")" + (acquired.holder === void 0 ? "" : "; holder pid " + String(acquired.holder.pid)));
+		try {
+			return await body();
+		} finally {
+			await acquired.lock.release();
+		}
+	}
 	acquireMutex() {
 		this.mutexDepth += 1;
 		const prev = this.mutexTail;
@@ -858,7 +871,7 @@ var EvolutionCurator = class extends Service {
 			note: (text) => {
 				this.ctx.logger.info("evolution-curator: " + text);
 			}
-		}, async () => apply({
+		}, async () => this.withMergeTreeLock(() => apply({
 			dryRun,
 			archiveCandidates,
 			nominations: gatedNominations,
@@ -875,7 +888,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();
@@ -1632,10 +1645,36 @@ var EvolutionCurator = class extends Service {
 					message: "单元 " + unit + " 的成员没解析齐：" + missing + (conflicts === "" ? "" : "；冲突：" + conflicts) + " —— 拒绝用剩余片段拼一个撤销。"
 				};
 			}
-			if (resolved.members.length > 1) return {
-				ok: false,
-				message: "单元 " + unit + " 跨 " + String(resolved.members.length) + " 个技能（" + resolved.members.map((m) => m.skill).join("、") + "）—— 跨技能整体撤销尚未接线，拒绝只撤销其中一片。"
-			};
+			if (resolved.members.length > 1) {
+				const crossMembers = [];
+				for (const slice of resolved.members) {
+					const live = await this.skills.read(slice.skill);
+					crossMembers.push({
+						skill: slice.skill,
+						entries: slice.entries,
+						status: live === null ? "archived" : "live",
+						...live === null ? { archivedPath: "archive" } : {},
+						...slice.skill === name && slice.entries.some((entry) => entry.action === "create") ? { createdInUnit: true } : {}
+					});
+				}
+				const result = await executeUnitUndo(planUnitUndoAcross(crossMembers), {
+					readSkill: (skill) => this.skills.read(skill),
+					readSupport: (skill, path) => this.skills.readSupportFile(skill, path),
+					readBlob: async (hash) => {
+						const probe = await probeText(this.io, blobPath(this.skills.root, hash));
+						return isPresent(probe) ? probe.value : null;
+					},
+					restoreFromArchive: (skill) => this.skills.restoreFromArchive(skill, "foreground"),
+					archive: (skill, reason) => this.skills.archive(skill, { reason }, "foreground"),
+					updateSkill: (skill, body, anchor) => this.skills.update(skill, body, "foreground", anchor),
+					writeSupportFile: (skill, path, body, anchor) => this.skills.writeSupportFile(skill, path, body, "foreground", anchor),
+					removeSupportFile: (skill, path, anchor) => this.skills.removeSupportFile(skill, path, "foreground", anchor)
+				});
+				return {
+					ok: result.ok,
+					message: result.message
+				};
+			}
 		}
 		const blobOf = async (hash) => {
 			if (hash === void 0) return null;

package/lib/types/index.d.ts

@@ -415,6 +415,8 @@ export declare class EvolutionCurator extends Service {
     private runClaim;
     private mutexDepth;
     private mutexTail;
+    /** Cross-process tree lock shared with merge runs; curator mutations take it only around apply. */
+    private withMergeTreeLock;
     private acquireMutex;
     /**
      * PLAN S4.5 (2026-09-16) (audit P2-16): the manual control-plane entries

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-curator",
   "description": "Deterministic skill lifecycle and recovery (community build)",
-  "version": "0.27.3",
+  "version": "0.29.0",
   "publishConfig": {
     "access": "public"
   },
@@ -27,21 +27,21 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-core": "^0.27.3"
+    "@lmzhen/dsh-evolution-core": "^0.29.0"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5",
     "@deepseek-ai/dsh-llm": "^0.2.1-rc.1",
     "@deepseek-ai/dsh-session": "^0.2.1-rc.1",
-    "@lmzhen/dsh-evolution-io": "^0.27.3",
-    "@lmzhen/dsh-evolution-state": "^0.27.3"
+    "@lmzhen/dsh-evolution-io": "^0.29.0",
+    "@lmzhen/dsh-evolution-state": "^0.29.0"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-llm": "^0.2.1-rc.1",
     "@deepseek-ai/dsh-session": "^0.2.1-rc.1",
-    "@lmzhen/dsh-evolution-core": "^0.27.3",
-    "@lmzhen/dsh-evolution-io": "^0.27.3",
-    "@lmzhen/dsh-evolution-state": "^0.27.3"
+    "@lmzhen/dsh-evolution-core": "^0.29.0",
+    "@lmzhen/dsh-evolution-io": "^0.29.0",
+    "@lmzhen/dsh-evolution-state": "^0.29.0"
   },
   "engines": {
     "dsh": ">=0.2.1-rc.1 <0.2.2-0"