@lmzhen/dsh-evolution-commands 0.3.63 → 0.3.65

package/lib/index.js

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import z from "@deepseek-ai/schemastery";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { SkillLibrary, appendEvolutionEvent, buildLearnPrompt, clampedNumber, composePresetComposition, eventsFile, evolutionRoot, resolveSkillsRoot } from "@lmzhen/dsh-evolution-core";
+import { SkillLibrary, appendEvolutionEvent, buildLearnPrompt, clampedNumber, composePresetComposition, eventsFile, evolutionRoot, resolveRootConfig, resolveSkillsRoot } from "@lmzhen/dsh-evolution-core";
 import { buildEnrichment, buildMaintainFacts, runMaintain, snapshotFromLibrary } from "@lmzhen/dsh-evolution-maintenance";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
@@ -16,6 +16,14 @@ import { fileURLToPath } from "node:url";
 * services are actually mounted in this runtime. Always ends with suggested
 * actions so any finding carries its next step.
 */
+/** D-6 (v18): exact-segment tail match (the loose substring form matched a
+* hypothetical `dsh-evolution-allowlist`). */
+const tailOf = (name) => name.slice(name.lastIndexOf("/") + 1);
+const EVOLUTION_BUNDLE_TAILS = new Set([
+	"dsh-evolution-all",
+	"dsh-evolution-host",
+	"dsh-evolution-preset"
+]);
 /** Profile bundle rows for evolution-family packages across all profiles. */
 function collectEvolutionBundles(home) {
 	const profilesDir = join(home, "profiles");
@@ -25,7 +33,7 @@ function collectEvolutionBundles(home) {
 		if (!profile.isDirectory()) continue;
 		try {
 			const manifest = JSON.parse(readFileSync(join(profilesDir, profile.name, "package.json"), "utf8"));
-			for (const name of manifest.dsh?.profile?.bundles ?? []) if (/evolution-(all|host|preset)/.test(name)) bundles.push(name);
+			for (const name of manifest.dsh?.profile?.bundles ?? []) if (EVOLUTION_BUNDLE_TAILS.has(tailOf(name))) bundles.push(name);
 		} catch {}
 	}
 	return bundles;
@@ -50,9 +58,9 @@ async function diagnose(ctx, options = {}) {
 	const home = options.home ?? evolutionRoot();
 	const bundles = collectEvolutionBundles(home);
 	const has = (name) => ctx.get(name) !== void 0;
-	const full = bundles.some((name) => /evolution-all/.test(name));
-	const host = bundles.some((name) => /evolution-host/.test(name));
-	const preset = bundles.some((name) => /evolution-preset/.test(name));
+	const full = bundles.some((name) => tailOf(name) === "dsh-evolution-all");
+	const host = bundles.some((name) => tailOf(name) === "dsh-evolution-host");
+	const preset = bundles.some((name) => tailOf(name) === "dsh-evolution-preset");
 	const presetDir = join(home, ".agent-presets", "evolution");
 	const layered = host && existsSync(presetDir);
 	const conflicts = [];
@@ -191,6 +199,7 @@ function renderHelpText() {
 /** Enrichment maps shared by the full scan and the `--facts` preview (v12). */
 const name = "evolution-commands";
 const Config = z.object({
+	root: z.string().default(""),
 	skillsRoot: z.string().default(""),
 	maintainCooldownMs: z.number().min(0).default(3e4),
 	maintainTimeoutMs: z.number().min(1).default(6e5),
@@ -198,6 +207,9 @@ const Config = z.object({
 });
 function apply(ctx, rawConfig = {}) {
 	const config = rawConfig;
+	const rootConfig = resolveRootConfig(rawConfig);
+	if (rootConfig.usedDeprecatedAlias) ctx.logger.warn("evolution-commands: config \"skillsRoot\" is deprecated (E-7); use \"root\" — the alias is honoured until 0.3.65");
+	const skillsRootValue = rootConfig.root;
 	let lastMaintainAt = 0;
 	let lastMaintainRunId = "";
 	let maintainInFlightSince = 0;
@@ -251,6 +263,7 @@ function apply(ctx, rawConfig = {}) {
 					const curator = ctx.get("evolutionCurator");
 					if (!curator) return err("E-302: curator service not mounted. Next: mount the evolution-curator row (evolution-host/evolution-all) and run /evolution doctor.");
 					const result = await curator.run({ ignoreGates: true });
+					if (result.skipped !== void 0) return ok(`Curator run skipped (${result.skipped}): no curation pass was executed.\nrunId=${result.report.runId}`);
 					return ok(`Curator run complete: ${result.stale.length} stale, ${result.archived.length} archived, ${result.errors.length} failed.\nrunId=${result.report.runId}${result.report.snapshotPath ? `\nsnapshot=${result.report.snapshotPath}` : ""}`);
 				}
 				if (input === "curator pause" || input === "curator resume") {
@@ -314,6 +327,8 @@ function apply(ctx, rawConfig = {}) {
 					].join("\n"));
 				}
 				if (input === "restore" || input.startsWith("restore ")) {
+					const tail = input.slice(7).trim();
+					if (tail !== "") return err(`\`restore\` takes no arguments (got "${tail}"). Use \`restore\` for a whole-tree rollback, or \`skill restore <name>\` for one skill.`);
 					const curator = ctx.get("evolutionCurator");
 					const result = curator ? await curator.restoreSnapshot() : {
 						ok: false,
@@ -384,7 +399,7 @@ function apply(ctx, rawConfig = {}) {
 				if (input === "maintain --facts") {
 					const ioRegistry = ctx.get("evolutionIo");
 					if (!ioRegistry) return err("Evolution IO registry not mounted — maintenance facts unavailable.");
-					const library = new SkillLibrary(resolveSkillsRoot({ root: config.skillsRoot }), ioRegistry.provider());
+					const library = new SkillLibrary(resolveSkillsRoot({ root: skillsRootValue }), ioRegistry.provider());
 					const enrichment = await buildEnrichment(ctx, library);
 					const { facts } = buildMaintainFacts(await snapshotFromLibrary(library, {
 						descriptions: enrichment.descriptions,
@@ -398,7 +413,7 @@ function apply(ctx, rawConfig = {}) {
 				const maintainArgs = /^maintain(?:\s+--timeout[ =](\d+))?\s*$/.exec(input);
 				if (maintainArgs) {
 					const runTimeoutMs = maintainArgs[1] ? Number(maintainArgs[1]) : config.maintainTimeoutMs ?? 6e5;
-					if (!Number.isSafeInteger(runTimeoutMs) || runTimeoutMs <= 0 || runTimeoutMs > 4294967295) return err(maintainArgs[1] ? "Invalid --timeout value: expected a positive integer number of milliseconds up to 4294967295 (e.g. /evolution maintain --timeout 600000)." : "The maintainTimeoutMs config is invalid: expected a positive integer number of milliseconds up to 4294967295. Fix the evolution-commands row config (maintainTimeoutMs), then retry.");
+					if (!Number.isSafeInteger(runTimeoutMs) || runTimeoutMs <= 0 || runTimeoutMs > 2147483647) return err(maintainArgs[1] ? "Invalid --timeout value: expected a positive integer number of milliseconds up to 2147483647 (e.g. /evolution maintain --timeout 600000)." : "The maintainTimeoutMs config is invalid: expected a positive integer number of milliseconds up to 2147483647. Fix the evolution-commands row config (maintainTimeoutMs), then retry.");
 					if (maintainInFlightSince > 0) return err(`Maintenance scan is already running (since ~${Math.max(1, Math.round((Date.now() - maintainInFlightSince) / 1e3))}s ago) — re-submitting now would cancel it. Wait for it to settle; the result appears when it finishes.`);
 					const cooldownMs = clampedNumber(config.maintainCooldownMs, 3e4, { min: 0 });
 					const sinceLast = Date.now() - lastMaintainAt;
@@ -409,7 +424,7 @@ function apply(ctx, rawConfig = {}) {
 					if (!subagents) return err("Subagents service not mounted — maintenance scan unavailable.");
 					try {
 						maintainInFlightSince = Date.now();
-						const library = new SkillLibrary(resolveSkillsRoot({ root: config.skillsRoot }), ioRegistry.provider());
+						const library = new SkillLibrary(resolveSkillsRoot({ root: skillsRootValue }), ioRegistry.provider());
 						const enrichment = await buildEnrichment(ctx, library);
 						const outcome = await runMaintain({
 							library,
@@ -422,6 +437,7 @@ function apply(ctx, rawConfig = {}) {
 							} }
 						}, {
 							timeoutMs: runTimeoutMs,
+							signal: invocation.signal,
 							descriptions: () => enrichment.descriptions,
 							supportFiles: () => enrichment.supportFiles,
 							quality: () => enrichment.quality,
@@ -486,7 +502,7 @@ function apply(ctx, rawConfig = {}) {
 					if (!toFile.startsWith("references/")) return err("to_file must live under references/ (log/detail destination).");
 					const ioRegistry = ctx.get("evolutionIo");
 					if (!ioRegistry) return err("Evolution IO registry not mounted — restructure unavailable.");
-					const result = await new SkillLibrary(resolveSkillsRoot({ root: config.skillsRoot }), ioRegistry.provider(), void 0, (event) => {
+					const result = await new SkillLibrary(resolveSkillsRoot({ root: skillsRootValue }), ioRegistry.provider(), void 0, (event) => {
 						ctx.emit("evolution/skill-mutated", event);
 					}, void 0, config.threatExemptLabels ?? []).restructure(name, [{
 						heading,
@@ -520,14 +536,12 @@ function apply(ctx, rawConfig = {}) {
 * dir≠name trap), so BOTH sibling shapes are probed.
 */
 function resolveAgentPresetDir(importMetaUrl) {
-	const dir = dirname(fileURLToPath(importMetaUrl));
-	const siblingCandidate = join(dir, "..", "dsh-evolution-agent-preset");
-	const candidates = [siblingCandidate, join(dir, "..", "..", "evolution-agent")];
-	for (const candidate of candidates) if (existsSync(join(candidate, "agent.cordis.yml")) && existsSync(join(candidate, "preset.yml"))) return candidate;
+	const overlayCandidate = join(dirname(fileURLToPath(importMetaUrl)), "..", "..", "evolution-agent");
+	if (existsSync(join(overlayCandidate, "agent.cordis.yml")) && existsSync(join(overlayCandidate, "preset.yml"))) return overlayCandidate;
 	try {
 		return dirname(createRequire(importMetaUrl).resolve("@lmzhen/dsh-evolution-agent-preset/package.json"));
 	} catch {
-		return siblingCandidate;
+		return overlayCandidate;
 	}
 }
 const defaultFs = {

package/lib/types/index.d.ts

@@ -6,10 +6,13 @@ import type { Context } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
 export declare const name = "evolution-commands";
 export interface Config {
-    /** Skill-tree root for maintain/restructure; empty uses skillsRoot().
-     * Align with tool-skill-manage/skill-usage/evolution-skill-catalog rows (A7).
-     * 0.3.22 (G3.2, F-342): resolved through resolveSkillsRoot() so an empty/
-     * whitespace value falls back to the default instead of a CWD-relative root. */
+    /** Skill-tree root for maintain/restructure; empty uses the default tree.
+     * E-7 (v18): canonical key — the same `root` every other family row reads,
+     * resolved through resolveSkillsRoot() so an empty/whitespace value falls
+     * back to the default instead of a CWD-relative root. */
+    root?: string | undefined;
+    /** Deprecated alias of `root` (E-7, v18): honoured only while `root` is
+     * empty, with a warning; removed after 0.3.65. */
     skillsRoot?: string | undefined;
     /** Cooldown window for scan commands (ms) — misclick/rapid-trigger guard;
      * secondary calls inside the window return the previous runId instead of
@@ -34,11 +37,13 @@ export interface Config {
     threatExemptLabels?: string[] | undefined;
 }
 export declare const Config: z<Schemastery.ObjectS<{
+    root: z<string, string>;
     skillsRoot: z<string, string>;
     maintainCooldownMs: z<number, number>;
     maintainTimeoutMs: z<number, number>;
     threatExemptLabels: z<string[], string[]>;
 }>, Schemastery.ObjectT<{
+    root: z<string, string>;
     skillsRoot: z<string, string>;
     maintainCooldownMs: z<number, number>;
     maintainTimeoutMs: z<number, number>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-commands",
   "description": "Human commands for the evolution family (/evolution pending|curator|maintain|doctor) (community build)",
-  "version": "0.3.63",
+  "version": "0.3.65",
   "publishConfig": {
     "access": "public"
   },
@@ -31,12 +31,12 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.63",
-    "@lmzhen/dsh-evolution-core": "^0.3.63",
-    "@lmzhen/dsh-evolution-maintenance": "^0.3.63"
+    "@lmzhen/dsh-evolution-approval": "^0.3.65",
+    "@lmzhen/dsh-evolution-core": "^0.3.65",
+    "@lmzhen/dsh-evolution-maintenance": "^0.3.65"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.3.63"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.3.65"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",