@lmzhen/dsh-evolution-core 0.3.34 → 0.3.36

package/lib/index.js

@@ -1,5 +1,5 @@
 import { basename, dirname, join } from "node:path";
-import { cp, lstat, mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
+import { cp, lstat, mkdir, open, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
 import { createHash, randomBytes } from "node:crypto";
 import { homedir } from "node:os";
 import { load } from "js-yaml";
@@ -149,11 +149,20 @@ function nodeEvolutionIo() {
 		const lock = `${path}.lock`;
 		let myClaim = "";
 		for (let attempt = 0; attempt < 40; attempt += 1) {
+			let lockHandle = null;
 			try {
 				myClaim = `${process.pid}:${randomBytes(4).toString("hex")}`;
-				await writeFile(lock, myClaim, { flag: "wx" });
+				lockHandle = await open(lock, "wx");
+				await lockHandle.writeFile(myClaim);
+				await lockHandle.close();
+				lockHandle = null;
 			} catch (error) {
 				const code = error?.code;
+				if (lockHandle) {
+					await lockHandle.close().catch(() => {});
+					await rm(lock, { force: true }).catch(() => {});
+					throw error;
+				}
 				if (code !== "EEXIST" && code !== "EPERM") throw error;
 				try {
 					const st = await stat(lock);
@@ -169,13 +178,16 @@ function nodeEvolutionIo() {
 						}
 						continue;
 					}
-					if (Number.isInteger(holder) && holder > 0 && Date.now() - st.mtimeMs > 1e3 && !holderAlive) {
+					const staleDead = Number.isInteger(holder) && holder > 0 && Date.now() - st.mtimeMs > 1e3 && !holderAlive;
+					const staleEmpty = holderContent === "" && Date.now() - st.mtimeMs > 1e3;
+					if (staleDead || staleEmpty) {
 						if (await readFile(lock, "utf8").catch(() => "") === holderContent) {
 							const ticket = `${lock}.next`;
 							try {
 								const ticketBody = await readFile(ticket, "utf8").catch(() => "");
+								const ticketMtime = await stat(ticket).then((s) => s.mtimeMs, () => 0);
 								const ticketHolder = Number(ticketBody.split(":")[0] ?? "");
-								if ((!Number.isInteger(ticketHolder) || ticketHolder <= 0 || !isAlive(ticketHolder) || Date.now() - await stat(ticket).then((s) => s.mtimeMs, () => 0) > 1e3) && ticketBody !== "") await rm(ticket, { force: true }).catch(() => {});
+								if ((!Number.isInteger(ticketHolder) || ticketHolder <= 0 || !isAlive(ticketHolder) || Date.now() - ticketMtime > 1e3) && (ticketBody !== "" || Date.now() - ticketMtime > 1e3)) await rm(ticket, { force: true }).catch(() => {});
 							} catch {}
 							try {
 								await writeFile(ticket, `${process.pid}:${randomBytes(4).toString("hex")}`, { flag: "wx" });
@@ -217,8 +229,24 @@ function nodeEvolutionIo() {
 			return;
 		}
 		const prefix = `${base}.`;
+		const lockName = `${base}.lock`;
+		const ticketName = `${lockName}.next`;
 		for (const name of entries) {
-			if (!name.startsWith(prefix) || !name.endsWith(".tmp")) continue;
+			if (!name.startsWith(prefix) || name === lockName) continue;
+			if (!name.endsWith(".tmp")) {
+				if (name === ticketName) {
+					const ticketPath = join(dir, name);
+					try {
+						const body = await readFile(ticketPath, "utf8").catch(() => "");
+						const holder = Number(body.split(":")[0] ?? "");
+						const st = await stat(ticketPath);
+						const dead = !Number.isInteger(holder) || holder <= 0 || !isAlive(holder);
+						const old = Date.now() - st.mtimeMs > 1e3;
+						if (dead || old) await rm(ticketPath, { force: true });
+					} catch {}
+				}
+				continue;
+			}
 			const tmpPath = join(dir, name);
 			const holder = Number(name.slice(prefix.length, name.length - 4).split(".")[0] ?? "");
 			try {
@@ -718,7 +746,8 @@ function buildCuratorRunReport(input) {
 		failed: [...input.failed],
 		...input.consolidated === void 0 ? {} : { consolidated: [...input.consolidated] },
 		...input.snapshotPath === void 0 ? {} : { snapshotPath: input.snapshotPath },
-		...input.llmReviewEnabled === void 0 ? {} : { llmReviewEnabled: input.llmReviewEnabled }
+		...input.llmReviewEnabled === void 0 ? {} : { llmReviewEnabled: input.llmReviewEnabled },
+		...input.nominationsWarnings === void 0 ? {} : { nominationsWarnings: [...input.nominationsWarnings] }
 	};
 }
 /**
@@ -737,7 +766,8 @@ function renderCuratorReportMarkdown(report) {
 		`- **Archived**: ${report.archived.length}`,
 		`- **Failed**: ${report.failed.length}`,
 		...report.snapshotPath === void 0 ? [] : [`- **Snapshot**: ${report.snapshotPath}`],
-		...report.llmReviewEnabled === void 0 ? [] : [`- **llmReview**: ${report.llmReviewEnabled}`]
+		...report.llmReviewEnabled === void 0 ? [] : [`- **llmReview**: ${report.llmReviewEnabled}`],
+		...report.nominationsWarnings === void 0 || report.nominationsWarnings.length === 0 ? [] : [`- **Nomination warnings**: ${report.nominationsWarnings.join("; ")}`]
 	];
 	const section = (title, items) => items.length === 0 ? [] : [
 		"",
@@ -763,10 +793,16 @@ const NOMINATION_NAME_RE = /^[a-z0-9][a-z0-9-]*$/;
 function parseCuratorNominations(text) {
 	const prunings = [];
 	const consolidations = [];
+	const warnings = [];
 	let section = null;
 	let currentFrom = "";
 	let currentMode;
 	for (const line of text.split("\n")) {
+		const header = /^\s*(consolidations|prunings)\s*:\s*$/.exec(line);
+		if (header) {
+			section = header[1] === "consolidations" ? "consolidations" : "prunings";
+			continue;
+		}
 		const consolidated = /^\s*-\s*from:\s*([a-z0-9][a-z0-9-]*)\s*$/.exec(line);
 		if (consolidated) {
 			section = "consolidations";
@@ -777,6 +813,7 @@ function parseCuratorNominations(text) {
 		const mode = /^\s*mode:\s*(append|reference)\s*$/.exec(line);
 		if (mode) {
 			if (currentFrom !== "") currentMode = mode[1] === "reference" ? "reference" : "append";
+			else warnings.push(`mode: ${mode[1]} ignored — no preceding "- from:" entry (the consolidation falls back to append)`);
 			continue;
 		}
 		const into = /^\s*into:\s*([a-z0-9][a-z0-9-]*)\s*$/.exec(line);
@@ -793,6 +830,7 @@ function parseCuratorNominations(text) {
 		}
 		const pruned = /^\s*-\s*name:\s*([a-z0-9][a-z0-9-]*)\s*$/.exec(line);
 		if (pruned) {
+			if (section === "consolidations") warnings.push("\"- name:\" inside the consolidations section flips the parse to prunings");
 			section = "prunings";
 			const name = pruned[1];
 			if (name) prunings.push(name);
@@ -801,7 +839,8 @@ function parseCuratorNominations(text) {
 	const valid = (name) => NOMINATION_NAME_RE.test(name);
 	return {
 		prunings: prunings.filter(valid),
-		consolidations: consolidations.filter((item) => valid(item.from) && valid(item.into))
+		consolidations: consolidations.filter((item) => valid(item.from) && valid(item.into)),
+		warnings
 	};
 }
 /**
@@ -836,7 +875,8 @@ function computeScopeView(usage, config, protectedNames, gates) {
 		}
 		const bundled = config.bundledNames?.has(name) === true;
 		const suppressed = gateSet.suppressed.has(name);
-		if (record.pinned || bundled || suppressed || protectedNames?.has(name) === true) protectedSet.add(name);
+		const isBuiltin = PROTECTED_BUILTIN_SKILLS.has(name);
+		if (record.pinned || bundled || suppressed || protectedNames?.has(name) === true || isBuiltin) protectedSet.add(name);
 		if (lifecycleCandidate(name, record, config, bundled, gateSet)) {
 			managed.push(name);
 			if (record.state === "stale" || record.quality_warn === true) watched.push(name);
@@ -1779,9 +1819,13 @@ const SCOPE_ORDER = {
 	strict: 3
 };
 const NO_SCAN_OPTIONS = {};
-/** Window overlap for the full-coverage scan: far larger than the longest
-* pattern span (~530 chars: `curl [^\n]{0,512} ...`), so a match straddling a
-* window boundary is fully inside at least one window (E-12, 0.3.16). */
+/** Minimum window size for the full-coverage scan (V6-05, 0.3.35). With the
+* proportional half-window step below, the overlap is `ceil(w/2)` — only a
+* window at or above this floor keeps the overlap above the longest pattern
+* span (~530 chars: `curl [^\n]{0,512} ...`), so a match straddling a window
+* boundary is fully inside at least one window (E-12, 0.3.16). The clamp
+* falls back to the default for a smaller caller value instead of risking a
+* blind zone. */
 const PATTERN_OVERLAP = 4096;
 /**
 * Scan text at `scope`. Patterns are cumulative: `strict` includes all scopes.
@@ -1791,7 +1835,7 @@ const PATTERN_OVERLAP = 4096;
 * characters (skill files may run to 100,000) is no longer a blind zone.
 */
 function scanThreats(text, scope = "strict", maxScanChars = 65536, options = NO_SCAN_OPTIONS) {
-	const windowSize = clampedNumber(maxScanChars, 65536, { min: 1 });
+	const windowSize = clampedNumber(maxScanChars, 65536, { min: 4097 });
 	const findings = [];
 	if (ZERO_WIDTH_CHARS.test(text)) findings.push({
 		label: "unicode_zero_width",
@@ -1807,7 +1851,7 @@ function scanThreats(text, scope = "strict", maxScanChars = 65536, options = NO_
 	const windows = [];
 	if (normalized.length <= windowSize) windows.push(normalized);
 	else {
-		const step = Math.max(1, windowSize - PATTERN_OVERLAP);
+		const step = Math.max(Math.floor(windowSize / 2), 1);
 		for (let start = 0; start < normalized.length; start += step) windows.push(normalized.slice(start, start + windowSize));
 	}
 	const excluded = new Set(options.excludeLabels ?? []);
@@ -4470,6 +4514,15 @@ var SkillLibrary = class {
 		};
 		const target = join(dir, ...filePath.replace(/\\/g, "/").split("/").filter(Boolean));
 		return await this.runSingleWrite(target, (current) => {
+			if (current !== null && content.trimEnd() === current.trimEnd()) return {
+				result: {
+					ok: true,
+					message: `Support file "${filePath}" unchanged: the supplied content already matches the current file; nothing written.`,
+					noop: true,
+					path: target
+				},
+				write: null
+			};
 			return {
 				result: {
 					ok: true,
@@ -4738,4 +4791,4 @@ function evolutionHome(env = process.env) {
 	return join(evolutionRoot(env), "evolution");
 }
 //#endregion
-export { AUTHORING_DESCRIPTION_BAR, COMBINED_REVIEW_PLAN_PROMPT, COMBINED_REVIEW_PROMPT, COMPLETION_SKILL_REVIEW_PROMPT, CURATOR_DRY_RUN_BANNER, CURATOR_PROMPT, DEFAULT_ARCHIVE_AFTER_DAYS, DEFAULT_CONSOLIDATION_FAILURES, DEFAULT_CURATOR_INTERVAL_HOURS, DEFAULT_HEALTH_THRESHOLDS, DEFAULT_MAX_OPS_PER_PLAN, DEFAULT_MEMORY_CHAR_LIMIT, DEFAULT_MIN_IDLE_HOURS, DEFAULT_MUTATION_CAP, DEFAULT_REVIEW_MEMORY_INTERVAL, DEFAULT_REVIEW_SKILL_INTERVAL, DEFAULT_SKILL_CONTENT_CHARS, DEFAULT_SKILL_LIMITS, DEFAULT_SKILL_REVIEW_COMPLETION_MIN_TOOL_CALLS, DEFAULT_SKILL_REVIEW_TRIGGER, DEFAULT_STALE_AFTER_DAYS, DEFAULT_SUBSTANTIVE_MIN_AGENT_CHARS, DEFAULT_SUBSTANTIVE_MIN_TOOL_CALLS, DEFAULT_SUBSTANTIVE_MIN_USER_CHARS, DEFAULT_USER_CHAR_LIMIT, DRIFT_MAX_LINE_CHARS, DRIFT_SIGNALS_VERSION, DRIFT_SIGNAL_NOUNS, DSH_AUTHORING_STANDARDS, ENTRY_DELIMITER, EVENT_ARCHIVE_PREFIX, EVENT_LOG_RETAIN_ARCHIVES, EVENT_LOG_ROTATE_AT, EVENT_LOG_VERSION, EVOLUTION_WRITE_TOOLS, EvolutionGateSet, FORBIDDEN_CONTROL_KEYS, HEALTH_STAMP_RE, LOW_QUALITY_THRESHOLD, MAINTAIN_PROMPT, MAX_DESCRIPTION_LENGTH, MAX_RESTRUCTURE_MOVES, MAX_SKILL_CONTENT_CHARS, MAX_SKILL_FILE_BYTES, MAX_SKILL_NAME_LENGTH, MEMORY_REVIEW_PROMPT, MIN_STAMP_BODY_CHARS, MUTATIONS_FILE_VERSION, MemoryStore, PROMPT_BUNDLE, PROMPT_BUNDLE_ID, PROMPT_BUNDLE_VERSION, PROTECTED_BUILTIN_SKILLS, QUALITY_WEIGHTS, RESTRUCTURE_TARGET_RE, SKILLS_GUIDANCE, SKILL_NAME_RE, SKILL_REVIEW_PLAN_PROMPT, SKILL_REVIEW_PROMPT, SNAPSHOT_EXTRA_NAME_RE, SUPPORT_DIRS, SUPPRESSED_FILE_VERSION, SkillLibrary, advanceReview, appendEvolutionEvent, applyCuratorFields, applyCuratorLifecycleFields, applyCuratorMetaFields, assessStructureHealth, authoringFeedback, buildCuratorRunReport, buildLearnPrompt, bumpPatch, bumpUse, bumpView, clampedNumber, composePresetComposition, computeDedupGroups, computeDriftSignals, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, createGateSet, duplicateHeadings, emptyRecord, evaluateThreat, eventsFile, evolutionHome, evolutionIoAdapter, evolutionRoot, findDriftSignal, foldCuratorFields, foldTurn, frontmatterBlock, frontmatterYamlUnsafeValues, getRecord, latestActivityAt, lifecycleCandidate, listEventArchives, loadMutations, loadSuppressedNames, loadUsage, makeSerialQueue, markAgentCreated, markerEntryName, memoryRoot, missingSupportPointers, mutateUsage, mutationsFile, narrowNameMatches, nodeEvolutionIo, normalizeFrontmatter, normalizeUsageRecord, observeEvent, overlongLines, parseCuratorNominations, parseEvolutionEvents, parseFrontmatter, pendingSelfCleanup, readEvolutionEvents, readEvolutionTimeline, recordMutation, redactSecrets, relatedSkillNames, renameWithRetry, renderCuratorReportMarkdown, resolveOrigins, resolveSkillsRoot, retainEventArchives, reviewPrompt, saveSuppressedNames, saveUsage, scanContentThreats, scanMemoryThreats, scanThreats, skillsRoot, suppressedFile, transactIo, updateSuppressedNames, usageFile, usageObserved, validateFrontmatter, verifyPromptBundle, yamlPlainScalarNeedsQuotes };
+export { AUTHORING_DESCRIPTION_BAR, COMBINED_REVIEW_PLAN_PROMPT, COMBINED_REVIEW_PROMPT, COMPLETION_SKILL_REVIEW_PROMPT, CURATOR_DRY_RUN_BANNER, CURATOR_PROMPT, DEFAULT_ARCHIVE_AFTER_DAYS, DEFAULT_CONSOLIDATION_FAILURES, DEFAULT_CURATOR_INTERVAL_HOURS, DEFAULT_HEALTH_THRESHOLDS, DEFAULT_MAX_OPS_PER_PLAN, DEFAULT_MEMORY_CHAR_LIMIT, DEFAULT_MIN_IDLE_HOURS, DEFAULT_MUTATION_CAP, DEFAULT_REVIEW_MEMORY_INTERVAL, DEFAULT_REVIEW_SKILL_INTERVAL, DEFAULT_SKILL_CONTENT_CHARS, DEFAULT_SKILL_LIMITS, DEFAULT_SKILL_REVIEW_COMPLETION_MIN_TOOL_CALLS, DEFAULT_SKILL_REVIEW_TRIGGER, DEFAULT_STALE_AFTER_DAYS, DEFAULT_SUBSTANTIVE_MIN_AGENT_CHARS, DEFAULT_SUBSTANTIVE_MIN_TOOL_CALLS, DEFAULT_SUBSTANTIVE_MIN_USER_CHARS, DEFAULT_USER_CHAR_LIMIT, DRIFT_MAX_LINE_CHARS, DRIFT_SIGNALS_VERSION, DRIFT_SIGNAL_NOUNS, DSH_AUTHORING_STANDARDS, ENTRY_DELIMITER, EVENT_ARCHIVE_PREFIX, EVENT_LOG_RETAIN_ARCHIVES, EVENT_LOG_ROTATE_AT, EVENT_LOG_VERSION, EVOLUTION_WRITE_TOOLS, EvolutionGateSet, FORBIDDEN_CONTROL_KEYS, HEALTH_STAMP_RE, LOW_QUALITY_THRESHOLD, MAINTAIN_PROMPT, MAX_DESCRIPTION_LENGTH, MAX_RESTRUCTURE_MOVES, MAX_SKILL_CONTENT_CHARS, MAX_SKILL_FILE_BYTES, MAX_SKILL_NAME_LENGTH, MEMORY_REVIEW_PROMPT, MIN_STAMP_BODY_CHARS, MUTATIONS_FILE_VERSION, MemoryStore, PATTERN_OVERLAP, PROMPT_BUNDLE, PROMPT_BUNDLE_ID, PROMPT_BUNDLE_VERSION, PROTECTED_BUILTIN_SKILLS, QUALITY_WEIGHTS, RESTRUCTURE_TARGET_RE, SKILLS_GUIDANCE, SKILL_NAME_RE, SKILL_REVIEW_PLAN_PROMPT, SKILL_REVIEW_PROMPT, SNAPSHOT_EXTRA_NAME_RE, SUPPORT_DIRS, SUPPRESSED_FILE_VERSION, SkillLibrary, advanceReview, appendEvolutionEvent, applyCuratorFields, applyCuratorLifecycleFields, applyCuratorMetaFields, assessStructureHealth, authoringFeedback, buildCuratorRunReport, buildLearnPrompt, bumpPatch, bumpUse, bumpView, clampedNumber, composePresetComposition, computeDedupGroups, computeDriftSignals, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, createGateSet, duplicateHeadings, emptyRecord, evaluateThreat, eventsFile, evolutionHome, evolutionIoAdapter, evolutionRoot, findDriftSignal, foldCuratorFields, foldTurn, frontmatterBlock, frontmatterYamlUnsafeValues, getRecord, latestActivityAt, lifecycleCandidate, listEventArchives, loadMutations, loadSuppressedNames, loadUsage, makeSerialQueue, markAgentCreated, markerEntryName, memoryRoot, missingSupportPointers, mutateUsage, mutationsFile, narrowNameMatches, nodeEvolutionIo, normalizeFrontmatter, normalizeUsageRecord, observeEvent, overlongLines, parseCuratorNominations, parseEvolutionEvents, parseFrontmatter, pendingSelfCleanup, readEvolutionEvents, readEvolutionTimeline, recordMutation, redactSecrets, relatedSkillNames, renameWithRetry, renderCuratorReportMarkdown, resolveOrigins, resolveSkillsRoot, retainEventArchives, reviewPrompt, saveSuppressedNames, saveUsage, scanContentThreats, scanMemoryThreats, scanThreats, skillsRoot, suppressedFile, transactIo, updateSuppressedNames, usageFile, usageObserved, validateFrontmatter, verifyPromptBundle, yamlPlainScalarNeedsQuotes };

package/lib/types/curator.d.ts

@@ -63,6 +63,8 @@ export interface CuratorRunReport {
     snapshotPath?: string;
     /** Whether the LLM nomination pass was enabled for this run (decision visibility). */
     llmReviewEnabled?: boolean;
+    /** V6-35 (0.3.36): lenient-parse shape notes from the LLM nomination block. */
+    nominationsWarnings?: string[];
 }
 export interface CuratorReportInput {
     runId: string;
@@ -76,6 +78,7 @@ export interface CuratorReportInput {
     consolidated?: readonly CuratorConsolidation[];
     snapshotPath?: string;
     llmReviewEnabled?: boolean;
+    nominationsWarnings?: readonly string[];
 }
 export declare function buildCuratorRunReport(input: CuratorReportInput): CuratorRunReport;
 /**
@@ -97,6 +100,11 @@ export interface CuratorConsolidation {
 export interface CuratorNominations {
     prunings: string[];
     consolidations: CuratorConsolidation[];
+    /** V6-35 (0.3.36): lenient-parse shape notes (an entry the lenient logic
+     * silently dropped or re-routed). Parsing stays lenient — these are advisory
+     * and flow into the run report so the operator sees why a mode or a pruning
+     * went somewhere unexpected. */
+    warnings: string[];
 }
 /**
  * Parse the curator LLM's YAML nomination block (consolidations + prunings).

package/lib/types/threats.d.ts

@@ -23,6 +23,14 @@ export interface ScanOptions {
     /** Pattern labels to skip during this scan. */
     excludeLabels?: readonly string[];
 }
+/** Minimum window size for the full-coverage scan (V6-05, 0.3.35). With the
+ * proportional half-window step below, the overlap is `ceil(w/2)` — only a
+ * window at or above this floor keeps the overlap above the longest pattern
+ * span (~530 chars: `curl [^\n]{0,512} ...`), so a match straddling a window
+ * boundary is fully inside at least one window (E-12, 0.3.16). The clamp
+ * falls back to the default for a smaller caller value instead of risking a
+ * blind zone. */
+export declare const PATTERN_OVERLAP = 4096;
 /**
  * Scan text at `scope`. Patterns are cumulative: `strict` includes all scopes.
  * `options.excludeLabels` removes matching patterns without changing `scope`.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-core",
   "description": "Shared stores, prompts, signals and lifecycle logic for the dsh-evolution plugin family (community build)",
-  "version": "0.3.34",
+  "version": "0.3.36",
   "publishConfig": {
     "access": "public"
   },