@lmzhen/dsh-evolution-core 0.3.13 → 0.3.15

package/lib/index.js

@@ -2,6 +2,7 @@ import { basename, dirname, join } from "node:path";
 import { cp, lstat, mkdir, 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";
 //#region lib/types/io.js
 /**
 * Structural IO seam for the evolution plugin family.
@@ -2116,6 +2117,38 @@ async function recordMutation(root, io, record, cap = 500) {
 	});
 }
 //#endregion
+//#region lib/types/preset-composition.js
+/**
+* Build the user-root Evolution preset composition from the RUNTIME platform's
+* `standard` preset rows plus the evolution delta rows (P1-1 follow-up,
+* 0.3.15): the agent-preset registry mounts ONE composition file verbatim, so
+* a delta-only `agent.cordis.yml` would produce an agent carrying only the
+* delta rows.
+*
+* Same contract as `install-layered.mjs` `generateAgentPreset` (the source
+* install path) — installer.spec pins byte parity between the two.
+*
+* Row ids are read from `- id:` lines; an id present in both fragments would
+* mount twice and could shadow the platform row, so it fails loud.
+* @param standardComposition - the runtime `standard` preset composition.
+* @param deltaComposition - the evolution delta fragment.
+* @returns the composed preset composition (standard rows first, then delta).
+*/
+function composePresetComposition(standardComposition, deltaComposition) {
+	const standardIds = compositionRowIds(standardComposition);
+	const collisions = [...compositionRowIds(deltaComposition)].filter((id) => standardIds.has(id)).sort();
+	if (collisions.length > 0) throw new Error(`evolution preset composition: delta rows collide with runtime standard rows: ${collisions.join(", ")}`);
+	return `${standardComposition.replace(/\s+$/, "")}\n\n${deltaComposition.trim()}\n`;
+}
+function compositionRowIds(composition) {
+	const ids = /* @__PURE__ */ new Set();
+	for (const line of composition.split("\n")) {
+		const match = /^- id:\s*(\S+)/.exec(line);
+		if (match) ids.add(match[1] ?? "");
+	}
+	return ids;
+}
+//#endregion
 //#region lib/types/quality.js
 /**
 * Quality scoring and near-duplicate detection for the curated skill library.
@@ -2501,15 +2534,42 @@ function markerEntryName(marker) {
 function markerPath(dir, marker) {
 	return join(dir, markerEntryName(marker));
 }
-function parseFrontmatter(content) {
+/**
+* Shared frontmatter block detection (P3-3 single owner): opening line `---`
+* and closing line exactly `---` (both trimmed). Used by `parseFrontmatter`,
+* `frontmatterYamlUnsafeValues` and `normalizeFrontmatter` so the three can
+* never disagree about where the block ends (the loose `indexOf('\n---')`
+* form matched `\n----` and was replaced by this strict line rule).
+*/
+function frontmatterBlock(content) {
 	if (!content.trimStart().startsWith("---")) return null;
-	const end = content.indexOf("\n---", 3);
+	const nl = content.includes("\r\n") ? "\r\n" : "\n";
+	const lines = content.split(nl);
+	if ((lines[0] ?? "").trim() !== "---") return null;
+	let end = -1;
+	for (let i = 1; i < lines.length; i++) {
+		const line = lines[i];
+		if (line === void 0) continue;
+		if (line.trim() === "---") {
+			end = i;
+			break;
+		}
+	}
 	if (end < 0) return null;
-	const block = content.slice(3, end);
-	const body = content.slice(end + 4).trim();
+	return {
+		block: lines.slice(1, end).join(nl),
+		lines,
+		end,
+		nl
+	};
+}
+function parseFrontmatter(content) {
+	const found = frontmatterBlock(content);
+	if (!found) return null;
+	const body = found.lines.slice(found.end + 1).join(found.nl).trim();
 	if (!body) return null;
 	const frontmatter = {};
-	for (const line of block.split("\n")) {
+	for (const line of found.block.split(found.nl)) {
 		const match = /^([A-Za-z0-9_-]+):\s*(.*)$/.exec(line);
 		if (match) {
 			const [, key, value] = match;
@@ -2528,7 +2588,10 @@ function parseFrontmatter(content) {
 * silently split family-visibility from platform-visibility (0.3.11
 * inkos-harness case: the description carried "…: " and the catalog dropped
 * the whole skill). Already-quoted values and well-formed flow collections
-* (`[a, b]` / `{a: b}`) are considered safe. */
+* (`[a, b]` / `{a: b}`) are considered safe. This rule is only the FAST
+* PATH — the write path re-verifies every rewrite with the real YAML parser
+* (see normalizeFrontmatter), so an incomplete approximation can never
+* corrupt a multiline flow value (P3-4). */
 function yamlPlainScalarNeedsQuotes(value) {
 	if (value.length === 0) return false;
 	if (value.length >= 2 && (value.startsWith("\"") && value.endsWith("\"") || value.startsWith("'") && value.endsWith("'"))) return false;
@@ -2545,23 +2608,9 @@ function yamlPlainScalarNeedsQuotes(value) {
 * path. Single-line entries only; lines with embedded line breaks skip. */
 function frontmatterYamlUnsafeValues(content) {
 	const found = [];
-	if (!content.trimStart().startsWith("---")) return found;
-	const nl = content.includes("\r\n") ? "\r\n" : "\n";
-	const lines = content.split(nl);
-	if ((lines[0] ?? "").trim() !== "---") return found;
-	let end = -1;
-	for (let i = 1; i < lines.length; i++) {
-		const line = lines[i];
-		if (line === void 0) continue;
-		if (line.trim() === "---") {
-			end = i;
-			break;
-		}
-	}
-	if (end < 0) return found;
-	for (let i = 1; i < end; i++) {
-		const line = lines[i];
-		if (line === void 0) continue;
+	const block = frontmatterBlock(content);
+	if (!block) return found;
+	for (const line of block.block.split(block.nl)) {
 		if (line.includes("\n") || line.includes("\r")) continue;
 		const match = /^([A-Za-z0-9_-]+):\s*(.*)$/.exec(line);
 		if (!match) continue;
@@ -2579,43 +2628,25 @@ function frontmatterYamlUnsafeValues(content) {
 * Normalize a SKILL.md frontmatter block into catalog-loadable YAML: values
 * that YAML forbids unquoted get quotes — double quotes normally, single
 * quotes (with `''` doubling) when the value contains `"` or `\` (both legal
-* unescaped inside single-quoted YAML). Idempotent (a normalized block
-* passes through unchanged); only single-line `key: value` entries are
-* touched; body text is never modified; a key line carrying an embedded
-* line break (mixed ending styles) is left untouched rather than risking
-* continuation-line data loss. Line-ending style of the block is preserved.
+* unescaped inside single-quoted YAML). Idempotent; only single-line
+* `key: value` entries are touched; body text is never modified; line-ending
+* style is preserved. **Every rewrite is re-verified with the real YAML
+* parser** (js-yaml — the same parser the platform catalog uses): if the
+* rewritten block no longer parses, or a rewritten value's parsed content
+* differs from the original, the rewrite is rolled back and reported in
+* `issues` (fail-loud, never a silent value corruption — P3-4).
 */
 function normalizeFrontmatter(content) {
-	if (!content.trimStart().startsWith("---")) return {
-		content,
-		changed: false,
-		fields: [],
-		issues: []
-	};
-	const nl = content.includes("\r\n") ? "\r\n" : "\n";
-	const lines = content.split(nl);
-	if ((lines[0] ?? "").trim() !== "---") return {
-		content,
-		changed: false,
-		fields: [],
-		issues: []
-	};
-	let end = -1;
-	for (let i = 1; i < lines.length; i++) {
-		const line = lines[i];
-		if (line === void 0) continue;
-		if (line.trim() === "---") {
-			end = i;
-			break;
-		}
-	}
-	if (end < 0) return {
+	const block = frontmatterBlock(content);
+	if (!block) return {
 		content,
 		changed: false,
 		fields: [],
 		issues: []
 	};
+	const { lines, end, nl } = block;
 	const unsafe = new Map(frontmatterYamlUnsafeValues(content).map((entry) => [entry.key, entry.value]));
+	const originalValues = new Map(unsafe);
 	const fields = [];
 	const issues = [];
 	let changed = false;
@@ -2635,12 +2666,30 @@ function normalizeFrontmatter(content) {
 		fields.push(key);
 		changed = true;
 	}
-	return {
-		content: changed ? lines.join(nl) : content,
-		changed,
-		fields,
+	if (!changed) return {
+		content,
+		changed: false,
+		fields: [],
 		issues
 	};
+	const rewrittenBlock = lines.slice(1, end).join(nl);
+	try {
+		const parsed = load(rewrittenBlock);
+		for (const key of fields) if (String(parsed[key]) !== originalValues.get(key)) throw new Error(`rewritten value for ${key} differs from the original`);
+		return {
+			content: lines.join(nl),
+			changed: true,
+			fields,
+			issues
+		};
+	} catch (error) {
+		return {
+			content,
+			changed: false,
+			fields: [],
+			issues: [`frontmatter rewrite verification failed (${error instanceof Error ? error.message : String(error)}) — quoting skipped; wrap this value manually`]
+		};
+	}
 }
 /**
 * Skill names referenced by a SKILL.md's `related_skills` frontmatter
@@ -4154,4 +4203,4 @@ function evolutionHome(env = process.env) {
 	return join(env.DSH_HOME ?? join(homedir(), ".dsh"), "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, EvolutionGateSet, 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, 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, computeDedupGroups, computeDriftSignals, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, createGateSet, duplicateHeadings, emptyRecord, evaluateThreat, eventsFile, evolutionHome, evolutionIoAdapter, findDriftSignal, foldCuratorFields, foldTurn, frontmatterYamlUnsafeValues, getRecord, latestActivityAt, lifecycleCandidate, listEventArchives, loadMutations, loadSuppressedNames, loadUsage, markAgentCreated, memoryRoot, missingSupportPointers, mutateUsage, mutationsFile, narrowNameMatches, nodeEvolutionIo, normalizeFrontmatter, normalizeUsageRecord, observeEvent, overlongLines, parseCuratorNominations, parseEvolutionEvents, parseFrontmatter, readEvolutionEvents, readEvolutionTimeline, recordMutation, redactSecrets, relatedSkillNames, renderCuratorReportMarkdown, resolveOrigins, 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, EvolutionGateSet, 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, 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, composePresetComposition, computeDedupGroups, computeDriftSignals, computeLifecycleTransitions, computePrefixClusters, computeQualityScores, computeScopeView, contentHash, createGateSet, duplicateHeadings, emptyRecord, evaluateThreat, eventsFile, evolutionHome, evolutionIoAdapter, findDriftSignal, foldCuratorFields, foldTurn, frontmatterBlock, frontmatterYamlUnsafeValues, getRecord, latestActivityAt, lifecycleCandidate, listEventArchives, loadMutations, loadSuppressedNames, loadUsage, markAgentCreated, memoryRoot, missingSupportPointers, mutateUsage, mutationsFile, narrowNameMatches, nodeEvolutionIo, normalizeFrontmatter, normalizeUsageRecord, observeEvent, overlongLines, parseCuratorNominations, parseEvolutionEvents, parseFrontmatter, readEvolutionEvents, readEvolutionTimeline, recordMutation, redactSecrets, relatedSkillNames, renderCuratorReportMarkdown, resolveOrigins, retainEventArchives, reviewPrompt, saveSuppressedNames, saveUsage, scanContentThreats, scanMemoryThreats, scanThreats, skillsRoot, suppressedFile, transactIo, updateSuppressedNames, usageFile, usageObserved, validateFrontmatter, verifyPromptBundle, yamlPlainScalarNeedsQuotes };

package/lib/types/index.d.ts

@@ -15,6 +15,7 @@ export * from './io.ts';
 export * from './learn-prompt.ts';
 export * from './memory-store.ts';
 export * from './mutations.ts';
+export * from './preset-composition.ts';
 export * from './prompts.ts';
 export * from './quality.ts';
 export * from './redact.ts';

package/lib/types/preset-composition.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Build the user-root Evolution preset composition from the RUNTIME platform's
+ * `standard` preset rows plus the evolution delta rows (P1-1 follow-up,
+ * 0.3.15): the agent-preset registry mounts ONE composition file verbatim, so
+ * a delta-only `agent.cordis.yml` would produce an agent carrying only the
+ * delta rows.
+ *
+ * Same contract as `install-layered.mjs` `generateAgentPreset` (the source
+ * install path) — installer.spec pins byte parity between the two.
+ *
+ * Row ids are read from `- id:` lines; an id present in both fragments would
+ * mount twice and could shadow the platform row, so it fails loud.
+ * @param standardComposition - the runtime `standard` preset composition.
+ * @param deltaComposition - the evolution delta fragment.
+ * @returns the composed preset composition (standard rows first, then delta).
+ */
+export declare function composePresetComposition(standardComposition: string, deltaComposition: string): string;
+//# sourceMappingURL=preset-composition.d.ts.map

package/lib/types/skill-store.d.ts

@@ -100,6 +100,19 @@ export interface Frontmatter {
     description?: string;
     [key: string]: unknown;
 }
+/**
+ * Shared frontmatter block detection (P3-3 single owner): opening line `---`
+ * and closing line exactly `---` (both trimmed). Used by `parseFrontmatter`,
+ * `frontmatterYamlUnsafeValues` and `normalizeFrontmatter` so the three can
+ * never disagree about where the block ends (the loose `indexOf('\n---')`
+ * form matched `\n----` and was replaced by this strict line rule).
+ */
+export declare function frontmatterBlock(content: string): {
+    block: string;
+    lines: string[];
+    end: number;
+    nl: string;
+} | null;
 export declare function parseFrontmatter(content: string): {
     frontmatter: Frontmatter;
     body: string;
@@ -111,7 +124,10 @@ export declare function parseFrontmatter(content: string): {
  * silently split family-visibility from platform-visibility (0.3.11
  * inkos-harness case: the description carried "…: " and the catalog dropped
  * the whole skill). Already-quoted values and well-formed flow collections
- * (`[a, b]` / `{a: b}`) are considered safe. */
+ * (`[a, b]` / `{a: b}`) are considered safe. This rule is only the FAST
+ * PATH — the write path re-verifies every rewrite with the real YAML parser
+ * (see normalizeFrontmatter), so an incomplete approximation can never
+ * corrupt a multiline flow value (P3-4). */
 export declare function yamlPlainScalarNeedsQuotes(value: string): boolean;
 /** Raw-line scan of the frontmatter block: entries whose UNQUOTED value is
  * YAML-unsafe for the strict platform catalog. Operates on the ORIGINAL line
@@ -127,20 +143,23 @@ export interface FrontmatterNormalizeResult {
     changed: boolean;
     /** Frontmatter keys whose values were auto-quoted. */
     fields: string[];
-    /** Values that cannot be auto-quoted safely (control characters only —
-     * double/single-quote fallback covers `"`/`\`/`'`, so a quote-containing
-     * value no longer traps the write path in an unfixable loop). */
+    /** Values that cannot be auto-quoted safely (control characters, or a
+     * rewrite that failed the real-parser verification — a multiline flow
+     * collection line etc. is left untouched and reported here, so the write
+     * path rejects instead of silently damaging a value; 0.3.14). */
     issues: string[];
 }
 /**
  * Normalize a SKILL.md frontmatter block into catalog-loadable YAML: values
  * that YAML forbids unquoted get quotes — double quotes normally, single
  * quotes (with `''` doubling) when the value contains `"` or `\` (both legal
- * unescaped inside single-quoted YAML). Idempotent (a normalized block
- * passes through unchanged); only single-line `key: value` entries are
- * touched; body text is never modified; a key line carrying an embedded
- * line break (mixed ending styles) is left untouched rather than risking
- * continuation-line data loss. Line-ending style of the block is preserved.
+ * unescaped inside single-quoted YAML). Idempotent; only single-line
+ * `key: value` entries are touched; body text is never modified; line-ending
+ * style is preserved. **Every rewrite is re-verified with the real YAML
+ * parser** (js-yaml — the same parser the platform catalog uses): if the
+ * rewritten block no longer parses, or a rewritten value's parsed content
+ * differs from the original, the rewrite is rolled back and reported in
+ * `issues` (fail-loud, never a silent value corruption — P3-4).
  */
 export declare function normalizeFrontmatter(content: string): FrontmatterNormalizeResult;
 /**

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.13",
+  "version": "0.3.15",
   "publishConfig": {
     "access": "public"
   },
@@ -31,12 +31,16 @@
     "lib/types/invariant.d.ts"
   ],
   "license": "MIT",
+  "dependencies": {
+    "js-yaml": "^4.2.0"
+  },
   "peerDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-session": "^0.1.1-rc.2"
   },
   "devDependencies": {
+    "@types/js-yaml": "^4.0.9",
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-session": "^0.1.1-rc.2"