@lmzhen/dsh-evolution-commands 0.3.66 → 0.3.67

package/lib/index.js

@@ -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 (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). */
@@ -229,7 +231,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,7 +384,7 @@ 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();
+					const request = rawInputTrimmed === "learn" ? "" : rawInputTrimmed.slice(6).trim();
 					invocation.agent.inject(createUserMessage({
 						content: [{
 							type: "text",
@@ -499,9 +502,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 +514,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 +532,10 @@ function apply(ctx, rawConfig = {}) {
 								origin: "foreground",
 								libraryOrigin: "foreground"
 							},
-							origin: "foreground"
+							origin: "foreground",
+							...session?.id ? { sessionId: session.id } : {},
+							...session ? { session } : {},
+							...sessionPolicy !== void 0 ? { sessionPolicy } : {}
 						});
 						if (decision.action === "staged") return ok(`${decision.message}${planRunId ? `\n[audit] plan=${planRunId}` : ""}`);
 					}

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.67",
   "publishConfig": {
     "access": "public"
   },
@@ -31,12 +31,12 @@
   "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.67",
+    "@lmzhen/dsh-evolution-core": "^0.3.67",
+    "@lmzhen/dsh-evolution-maintenance": "^0.3.67"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.3.66"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.3.67"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",