@lmzhen/dsh-evolution-core 0.3.24 → 0.3.25

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
@@ -3109,7 +3120,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 +3864,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 +4614,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);

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/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.25",
   "publishConfig": {
     "access": "public"
   },