@lmzhen/dsh-evolution-commands 0.3.66 → 0.3.68

package/lib/index.js

@@ -2,7 +2,7 @@ import { createRequire } from "node:module";
 import z from "@deepseek-ai/schemastery";
 import { effectiveSessionPolicy } from "@lmzhen/dsh-evolution-approval";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { SkillLibrary, appendEvolutionEvent, buildLearnPrompt, clampedNumber, composePresetComposition, eventsFile, evolutionRoot, resolveRootConfig, resolveSkillsRoot } from "@lmzhen/dsh-evolution-core";
+import { MAX_TIMER_DELAY_MS, SkillLibrary, appendEvolutionEvent, assertSkillsRootAliasRetired, 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";
@@ -12,7 +12,8 @@ import { fileURLToPath } from "node:url";
 * `/evolution doctor` — read-only self-check (0.3.55, WB2).
 *
 * Turns "what the README would explain" into "the tool tells you directly":
-* install form, three-way conflict detection (all/host/preset + layered), the
+* install form, three-way conflict detection (all/host/preset + layered,
+* including preset-bundle × layered via the preset's delivered agent.cordis.yml), the
 * environment surfaces that bit us before (v10 P2-12/13), and which evolution
 * services are actually mounted in this runtime. Always ends with suggested
 * actions so any finding carries its next step.
@@ -62,13 +63,14 @@ async function diagnose(ctx, options = {}) {
 	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 presetDirInstalled = existsSync(join(join(home, ".agent-presets", "evolution"), "agent.cordis.yml"));
+	const layered = host && presetDirInstalled;
 	const conflicts = [];
 	if (full && host) conflicts.push("evolution-all and evolution-host are installed together — the infra rows double-mount and startup fails loud. Keep ONE: remove the other bundle.");
 	if (full && preset) conflicts.push("evolution-all and evolution-preset are installed together — the infra rows double-mount. Keep ONE.");
 	if (host && preset) conflicts.push("evolution-host and evolution-preset are installed together — the infra rows double-mount. Keep ONE.");
-	if (full && layered) conflicts.push("evolution-all and the layered Evolution preset are both present — the model rows double-mount. Keep ONE (use layered without all, or drop the preset).");
+	if (full && presetDirInstalled) conflicts.push("evolution-all and the layered Evolution preset are both present — the model rows double-mount. Keep ONE (use layered without all, or drop the preset).");
+	if (preset && presetDirInstalled) conflicts.push("evolution-preset and the layered Evolution preset are both present — the model rows double-mount (the preset bundle carries the same model rows as all). Keep ONE (drop the preset bundle, or remove the layered preset).");
 	const services = {
 		review: full || host || preset,
 		curator: has("evolutionCurator"),
@@ -187,7 +189,7 @@ const COMMAND_ENTRIES = [
 	},
 	{
 		usage: "replay",
-		summary: "compare prompt-bundle replay for this session"
+		summary: "compare plan outcomes across sessions and restarts (backfilled from the activity store)"
 	}
 ];
 /** The input-declaration hint (single line, ` | `-separated). */
@@ -215,9 +217,8 @@ 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;
+	assertSkillsRootAliasRetired(rawConfig);
+	const skillsRootValue = resolveRootConfig(rawConfig).root;
 	let lastMaintainAt = 0;
 	let lastMaintainRunId = "";
 	let maintainInFlightSince = 0;
@@ -229,7 +230,8 @@ function apply(ctx, rawConfig = {}) {
 			recordInput: false,
 			input: { hint: renderHint() },
 			async handler(invocation) {
-				const input = invocation.rawInput?.trim() ?? "";
+				const rawInputTrimmed = invocation.rawInput.trim();
+				const input = rawInputTrimmed.replace(/\s+/g, " ");
 				const ok = (text) => ({
 					kind: "success",
 					text
@@ -381,8 +383,8 @@ function apply(ctx, rawConfig = {}) {
 					return ok("Skill catalog refresh requested: caches dropped, catalog re-read on next lookup.");
 				}
 				if (input === "learn" || input.startsWith("learn ")) {
-					const request = input === "learn" ? "" : input.slice(6).trim();
-					invocation.agent.inject(createUserMessage({
+					const request = rawInputTrimmed === "learn" ? "" : rawInputTrimmed.slice(6).trim();
+					const message = createUserMessage({
 						content: [{
 							type: "text",
 							text: buildLearnPrompt(request)
@@ -393,7 +395,11 @@ function apply(ctx, rawConfig = {}) {
 							form: "notice",
 							summary: "learn request"
 						}
-					}));
+					});
+					const followup = invocation.agent.followup;
+					const woke = typeof followup === "function";
+					if (woke) followup(message);
+					else invocation.agent.inject(message);
 					const eventIo = ctx.get("evolutionIo")?.provider();
 					if (eventIo) appendEvolutionEvent(eventIo, eventsFile(evolutionRoot()), {
 						type: "learn",
@@ -402,7 +408,7 @@ function apply(ctx, rawConfig = {}) {
 					}).catch((error) => {
 						ctx.logger.warn(`evolution-commands: failed to record learn event: ${String(error)}`);
 					});
-					return ok("Learning request sent to this session. Follow it now.");
+					return woke ? ok("Learning request sent to this session. Follow it now.") : ok("Learning request queued for this session — this host exposes no wake-up channel, so it is read on your next message.");
 				}
 				if (input === "maintain --facts") {
 					const ioRegistry = ctx.get("evolutionIo");
@@ -421,7 +427,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 > 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 (!Number.isSafeInteger(runTimeoutMs) || runTimeoutMs <= 0 || runTimeoutMs > MAX_TIMER_DELAY_MS) return err(maintainArgs[1] ? `Invalid --timeout value: expected a positive integer number of milliseconds up to ${MAX_TIMER_DELAY_MS} (e.g. /evolution maintain --timeout 600000).` : `The maintainTimeoutMs config is invalid: expected a positive integer number of milliseconds up to ${MAX_TIMER_DELAY_MS}. 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;
@@ -442,7 +448,9 @@ function apply(ctx, rawConfig = {}) {
 							tools: { get: (name) => ctx.get("tools")?.get(name) },
 							logger: { warn: (message) => {
 								ctx.logger.warn(message);
-							} }
+							} },
+							rootExists: () => ioRegistry.provider().exists(skillsRootValue),
+							skillRoot: skillsRootValue
 						}, {
 							timeoutMs: runTimeoutMs,
 							signal: invocation.signal,
@@ -499,9 +507,9 @@ function apply(ctx, rawConfig = {}) {
 					}
 				}
 				if (input.startsWith("restructure ")) {
-					const planTail = /\s--plan\s+(\S+)\s*$/.exec(input) ?? null;
+					const planTail = /\s--plan\s+(\S+)\s*$/.exec(rawInputTrimmed) ?? null;
 					const planRunId = planTail?.[1] ?? void 0;
-					const rest = planTail ? input.slice(0, planTail.index) : input;
+					const rest = planTail ? rawInputTrimmed.slice(0, planTail.index) : rawInputTrimmed;
 					const match = /^restructure\s+(\S+)\s+"([^"]+)"\s+(\S+)$/.exec(rest);
 					if (!match) return err("Usage: /evolution restructure <name> \"<## heading>\" <to_file>");
 					const name = match[1] ?? "";
@@ -511,7 +519,8 @@ function apply(ctx, rawConfig = {}) {
 					const ioRegistry = ctx.get("evolutionIo");
 					if (!ioRegistry) return err("Evolution IO registry not mounted — restructure unavailable.");
 					if (approval) {
-						const sessionPolicy = effectiveSessionPolicy(ctx, void 0);
+						const session = invocation.agent.session;
+						const sessionPolicy = effectiveSessionPolicy(ctx, session);
 						if (approval.isEnabled !== false && sessionPolicy !== "never" && approval.stageForeground !== false && !approval.hasRunner("skill")) return err("Restructure cannot be staged: no skill replay runner is registered — mount the tool-skill-manage row (evolution-agent preset, or evolution-all) or disable evolution-approval.");
 						const decision = await approval.request({
 							kind: "skill",
@@ -528,7 +537,10 @@ function apply(ctx, rawConfig = {}) {
 								origin: "foreground",
 								libraryOrigin: "foreground"
 							},
-							origin: "foreground"
+							origin: "foreground",
+							...session.id ? { sessionId: session.id } : {},
+							session,
+							...sessionPolicy !== void 0 ? { sessionPolicy } : {}
 						});
 						if (decision.action === "staged") return ok(`${decision.message}${planRunId ? `\n[audit] plan=${planRunId}` : ""}`);
 					}

package/lib/types/index.d.ts

@@ -11,8 +11,9 @@ export interface Config {
      * 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. */
+    /** V27 G2.4 (M-08): RETIRED alias of `root`. The field stays declared so the
+     * loader can hand it to the load-time gate (which rejects it loudly) instead
+     * of dropping it silently; the plugin never reads it as a root. */
     skillsRoot?: string | undefined;
     /** Cooldown window for scan commands (ms) — misclick/rapid-trigger guard;
      * secondary calls inside the window return the previous runId instead of

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.66",
+  "version": "0.3.68",
   "publishConfig": {
     "access": "public"
   },
@@ -31,19 +31,21 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.66",
-    "@lmzhen/dsh-evolution-core": "^0.3.66",
-    "@lmzhen/dsh-evolution-maintenance": "^0.3.66"
+    "@lmzhen/dsh-evolution-approval": "^0.3.68",
+    "@lmzhen/dsh-evolution-core": "^0.3.68",
+    "@lmzhen/dsh-evolution-maintenance": "^0.3.68"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.3.66"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.3.68"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-commands": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-llm": "^0.1.1-rc.2"
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-commands": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2"
   }
 }