@lmzhen/dsh-evolution-core 0.3.24 → 0.3.26

package/lib/index.js

@@ -2332,7 +2332,10 @@ async function recordMutation(root, io, record, cap = 500) {
 * delta rows.
 *
 * Same contract as `install-layered.mjs` `generateAgentPreset` (the source
-* install path) — installer.spec pins byte parity between the two.
+* install path) — installer.spec pins byte parity between the two, and both
+* apply the identical row-collision contract: a delta id that overlaps a
+* standard row id fails loud by default, and `DSH_EVOLUTION_ALLOW_ROW_COLLISIONS=1`
+* downgrades it to a warning that keeps both (the row mounts twice).
 *
 * 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.
@@ -2343,7 +2346,8 @@ async function recordMutation(root, io, record, cap = 500) {
 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(", ")}`);
+	if (collisions.length > 0 && process.env.DSH_EVOLUTION_ALLOW_ROW_COLLISIONS !== "1") throw new Error(`evolution preset composition: delta rows collide with runtime standard rows: ${collisions.join(", ")}`);
+	if (collisions.length > 0) console.warn(`evolution preset composition: warning — delta rows collide with standard rows (${collisions.join(", ")}); keeping both (DSH_EVOLUTION_ALLOW_ROW_COLLISIONS=1)`);
 	return `${standardComposition.replace(/\s+$/, "")}\n\n${deltaComposition.trim()}\n`;
 }
 function compositionRowIds(composition) {
@@ -2582,8 +2586,15 @@ const DEFAULT_HEALTH_THRESHOLDS = {
 	stampDensityPerKb: 2,
 	churnMinPatches: 20
 };
-/** Stamp regex shared by health assessment and the maintenance probe (single source, 011). */
-const HEALTH_STAMP_RE = /\brc\.\d+\b|\b[0-9a-f]{7,40}\b|\b\d{4}-\d{2}-\d{2}(?:T[0-9:.]+Z)?\b/g;
+/**
+* Stamp regex shared by health assessment and the maintenance probe (single
+* source, 011). Two refinements over the naive form (F-320): the hex branch
+* requires at least one digit so coincidental all-letter English words
+* (`defaced`, `feedback`) are not counted as commit shas; the ISO branch
+* accepts a UTC `Z`, a numeric UTC offset (`+08:00`), or no timezone at all —
+* non-UTC timestamps used to escape detection (log-like content missed).
+*/
+const HEALTH_STAMP_RE = new RegExp(String.raw`\brc\.\d+\b|\b(?=[0-9a-f]{7,40}\b)[0-9a-f]*[0-9][0-9a-f]*\b|\b\d{4}-\d{2}-\d{2}(?:T[0-9:.]+(?:Z|[+-]\d{2}:?\d{2})?)?\b`, "g");
 /**
 * Bodies below this size skip stamp-density assessment: a few dates or shas
 * in a short body are ordinary documentation, not log-like content. With the
@@ -2926,7 +2937,9 @@ function skillDir(root, name) {
 /** Dot-prefixed on-disk marker name. SINGLE source: `list()` matches directory
 * entries against this name, and path builders must never hardcode a marker
 * literal (N-1: the rc.49 exists()-probe convergence dropped the dot,
-* poisoning every protectedBy/managed report). */
+* poisoning every protectedBy/managed report). Exported for cross-package
+* consumers that must probe markers without re-deriving the name (curator's
+* archive-copy bundled probe, 0.3.26 V4-02). */
 function markerEntryName(marker) {
 	return `.${marker}`;
 }
@@ -3109,7 +3122,7 @@ function relatedSkillNames(content, exclude) {
 	const raw = parsed.frontmatter["related_skills"];
 	if (typeof raw !== "string") return [];
 	const names = /* @__PURE__ */ new Set();
-	for (const match of Array.from(raw.matchAll(/[a-z0-9][a-z0-9-]*/g))) {
+	for (const match of Array.from(raw.matchAll(/(?<![A-Za-z0-9_-])[a-z0-9][a-z0-9-]*(?![A-Za-z0-9_-])/g))) {
 		const target = match[0];
 		if (target && SKILL_NAME_RE.test(target) && target !== exclude) names.add(target);
 	}
@@ -3853,7 +3866,7 @@ var SkillLibrary = class {
 		const protection = await this.deleteProtection(name, options.allowBundled === void 0 ? {} : { allowBundled: options.allowBundled });
 		if (protection) return {
 			ok: false,
-			message: `Skill "${name}" is protected (${protection}).`
+			message: protection === "pinned" ? `Skill "${name}" is pinned and cannot be archived. Remove the \`.pinned\` marker in its directory, then retry.` : `Skill "${name}" is protected (${protection}).`
 		};
 		if (options.absorbedInto) {
 			if (options.absorbedInto.trim() === name) return {
@@ -4603,7 +4616,7 @@ var SkillLibrary = class {
 			rootEntries = [];
 		}
 		for (const entry of rootEntries) {
-			if (entry.startsWith(".")) continue;
+			if (entry === ".archive" || entry === ".backups" || entry === ".mutations.json" || entry === ".curator-suppressed.json") continue;
 			await this.io.remove(join(this.root, entry));
 		}
 		const manifest = await this.readSnapshotManifest(snapshotPath);
@@ -4684,4 +4697,4 @@ function clampedNumber(value, fallback, opts) {
 	return value;
 }
 //#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, memoryRoot, missingSupportPointers, mutateUsage, mutationsFile, narrowNameMatches, nodeEvolutionIo, normalizeFrontmatter, normalizeUsageRecord, observeEvent, overlongLines, parseCuratorNominations, parseEvolutionEvents, parseFrontmatter, 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, 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, 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/preset-composition.d.ts

@@ -6,7 +6,10 @@
  * delta rows.
  *
  * Same contract as `install-layered.mjs` `generateAgentPreset` (the source
- * install path) — installer.spec pins byte parity between the two.
+ * install path) — installer.spec pins byte parity between the two, and both
+ * apply the identical row-collision contract: a delta id that overlaps a
+ * standard row id fails loud by default, and `DSH_EVOLUTION_ALLOW_ROW_COLLISIONS=1`
+ * downgrades it to a warning that keeps both (the row mounts twice).
  *
  * 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.

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

@@ -22,7 +22,14 @@ export interface SkillHealthThresholds {
     churnMinPatches: number;
 }
 export declare const DEFAULT_HEALTH_THRESHOLDS: SkillHealthThresholds;
-/** Stamp regex shared by health assessment and the maintenance probe (single source, 011). */
+/**
+ * Stamp regex shared by health assessment and the maintenance probe (single
+ * source, 011). Two refinements over the naive form (F-320): the hex branch
+ * requires at least one digit so coincidental all-letter English words
+ * (`defaced`, `feedback`) are not counted as commit shas; the ISO branch
+ * accepts a UTC `Z`, a numeric UTC offset (`+08:00`), or no timezone at all —
+ * non-UTC timestamps used to escape detection (log-like content missed).
+ */
 export declare const HEALTH_STAMP_RE: RegExp;
 /**
  * Bodies below this size skip stamp-density assessment: a few dates or shas

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

@@ -108,6 +108,13 @@ export declare function resolveOrigins(headerOrigin: string | undefined, isRevie
     approval: 'foreground' | 'background_review';
     library: WriteOrigin;
 };
+/** Dot-prefixed on-disk marker name. SINGLE source: `list()` matches directory
+ * entries against this name, and path builders must never hardcode a marker
+ * literal (N-1: the rc.49 exists()-probe convergence dropped the dot,
+ * poisoning every protectedBy/managed report). Exported for cross-package
+ * consumers that must probe markers without re-deriving the name (curator's
+ * archive-copy bundled probe, 0.3.26 V4-02). */
+export declare function markerEntryName(marker: 'bundled' | 'hub-installed' | 'pinned' | 'hermes-managed'): string;
 export interface Frontmatter {
     name?: string;
     description?: string;

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.24",
+  "version": "0.3.26",
   "publishConfig": {
     "access": "public"
   },