@lmzhen/dsh-evolution-commands 0.3.74 → 0.3.77

package/README.md

@@ -19,7 +19,7 @@ The injection goes through the agent's waking primitive (`followup`, falling bac
 to `inject` when the host lacks it), **called on the agent instance**: the
 platform's `Agent.followup` is a prototype method (`this.send(...)`), so a
 detached reference throws and queues nothing (0.3.73 fix; the same shape is
-pinned by `evolution-host/tests/wake-delivery-guard.spec.ts`).
+pinned by rule N13b in `packages/scripts/verify-arch-guards.mjs`, which masks comments and string literals before matching and self-tests its detector at startup).
 
 #### KV Cache effect
 
@@ -29,3 +29,5 @@ Independent of request-prefix construction. This package does not alter the asse
 
 
 - No known durable consumer gaps at this time. Runtime contracts are covered by package and boundary tests.
+
+**Runtime invariant:** No companion is published. The platform auto-assembles nothing and the family mounts no `<pkg>/invariant` cordis row, so a companion here would never execute (v37 S2.1 / I-3).

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 { MAX_TIMER_DELAY_MS, SkillLibrary, appendEvolutionEvent, assertSkillsRootAliasRetired, buildLearnPrompt, clampedNumber, composePresetComposition, eventsFile, evolutionRoot, resolveRootConfig, resolveSkillsRoot } from "@lmzhen/dsh-evolution-core";
+import { MAX_TIMER_DELAY_MS, appendEvolutionEvent, assertSkillsRootAliasRetired, buildLearnPrompt, clampedNumber, composePresetComposition, eventsFile, evolutionRoot, newSkillLibrary, resolveRootConfig } 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";
@@ -46,8 +46,17 @@ function collectEvolutionBundles(home, onReadError) {
 	}
 	for (const profile of profileEntries) {
 		if (!profile.isDirectory()) continue;
+		if (profile.name === "node_modules" || profile.name.startsWith(".")) continue;
+		let raw;
 		try {
-			const manifest = JSON.parse(readFileSync(join(profilesDir, profile.name, "package.json"), "utf8"));
+			raw = readFileSync(join(profilesDir, profile.name, "package.json"), "utf8");
+		} catch (error) {
+			if (error?.code === "ENOENT") continue;
+			onReadError?.(error, "profile-manifest");
+			continue;
+		}
+		try {
+			const manifest = JSON.parse(raw);
 			for (const name of manifest.dsh?.profile?.bundles ?? []) if (EVOLUTION_BUNDLE_TAILS.has(tailOf(name))) bundles.push(name);
 		} catch (error) {
 			onReadError?.(error, "profile-manifest");
@@ -66,6 +75,33 @@ function envIssues() {
 	if (query && !SESSION_QUERY_MODES.has(query)) issues.push(`DSH_EVOLUTION_SESSION_QUERY="${query}" is not one of startup|first-search|never — the patch normalizes it to 'startup' silently; set it to a listed mode.`);
 	return issues;
 }
+/** S0.2 (v37 P0-1): memory files that still carry the platform's `{{` prompt
+* variable syntax. The platform interpolates EVERY `systemPrompt.context` text
+* once per model step and throws on an unknown/malformed reference, so one such
+* entry used to fail every turn of every session under this home. Current
+* builds neutralize the injected text (`MemoryStore.renderContext`), which is
+* why this is a residual-risk report instead of a hard failure: an older
+* still-running process is still bricked, and an operator may prefer to clean
+* the file. Read-only; an unreadable file is skipped (the doctor never throws).
+* @param home - resolved DSH_HOME.
+* @returns one message per affected memory file.
+*/
+function memoryInterpolationIssues(home) {
+	const issues = [];
+	for (const file of ["MEMORY.md", "USER.md"]) {
+		const path = join(home, "memories", file);
+		if (!existsSync(path)) continue;
+		let raw;
+		try {
+			raw = readFileSync(path, "utf8");
+		} catch {
+			continue;
+		}
+		const hits = raw.split("{{").length - 1;
+		if (hits > 0) issues.push(`${file}: ${hits} "{{" occurrence(s) — the platform interpolates this syntax in prompt context and throws on an unknown reference, so a build without the render-time neutralization fails every later turn; rewrite the affected entries`);
+	}
+	return issues;
+}
 /**
 * Diagnose the deployment. `ctx` supplies service presence (a bare stub with
 * only `get` is enough); `home` defaults to the evolution root so tests can
@@ -109,22 +145,29 @@ async function diagnose(ctx, options = {}) {
 		executingCount = null;
 	}
 	const installForm = full ? "full" : preset ? "preset" : layered ? "layered" : host ? "host" : presetDirInstalled ? "preset-only" : "none";
+	const deploymentForm = installForm === "layered" ? "variant" : installForm === "full" || installForm === "preset" ? "attach" : installForm === "host" ? "host-only" : installForm === "preset-only" ? "preset-only" : "none";
 	const mountConflicts = conflicts.filter((row) => !row.includes("DEGRADED"));
+	const undecidable = mountConflicts.length !== conflicts.length;
 	const actions = [];
 	if (mountConflicts.length > 0) actions.push("Resolve the conflict first: keep exactly one of evolution-all / evolution-host / evolution-preset / layered.");
+	else if (undecidable) actions.push("The install form is UNDECIDABLE (see the DEGRADED row above): an unreadable profiles directory or profile manifest hides whatever is installed, so this report must not add or remove a bundle. Fix the reported read failure, then re-run /evolution doctor.");
 	else if (installForm === "none") actions.push("Install the default full bundle: dsh plugin --profile web add @lmzhen/dsh-evolution-all");
 	else if (installForm === "preset-only") actions.push("The Evolution preset is delivered but no profile mounts an evolution bundle — re-add @lmzhen/dsh-evolution-host for the layered layout (do NOT add all on top of the preset: that double-mounts the model rows), or remove .agent-presets/evolution if the layered layout is no longer wanted.");
-	else if (installForm === "layered") actions.push("Model tools follow the Evolution preset per session; add @lmzhen/dsh-evolution-all instead if every session should have them.");
+	else if (installForm === "layered") actions.push("Variant form (session opt-in): model tools follow the Evolution preset, and a session on a platform original preset carries no family rows; add @lmzhen/dsh-evolution-all instead if every session should have them.");
 	const env = envIssues();
 	if (env.length > 0) actions.push("Fix the DSH_EVOLUTION_* variable listed above.");
 	if (services.review && !services.curator) actions.push("Curator service is not mounted — automatic curation is off; verify the host/all bundle row set is complete.");
 	if (pendingCount === null && services.approval) actions.push("Approval service is mounted but pending listing failed — check the evolution state service.");
+	const memoryIssues = memoryInterpolationIssues(home);
+	if (memoryIssues.length > 0) actions.push("Rewrite the memory entries listed above (or run a build with the render-time neutralization) — they broke prompt assembly on older builds.");
 	if ((executingCount ?? 0) > 0) actions.push(`${executingCount} staged write(s) are EXECUTING (an approve crashed mid-run — or one is still in flight). Inspect with /evolution pending: if you started the approve, verify the landed write and do not reject it; only reject after verifying no write is intended.`);
 	return {
 		installForm,
+		deploymentForm,
 		bundles,
 		conflicts,
 		envIssues: env,
+		memoryIssues,
 		services,
 		pendingCount,
 		executingCount,
@@ -133,7 +176,7 @@ async function diagnose(ctx, options = {}) {
 }
 function renderDoctorText(report) {
 	const lines = [
-		`Evolution doctor — install form: ${report.installForm}`,
+		`Evolution doctor — install form: ${report.installForm} (deployment: ${report.deploymentForm})`,
 		`bundles (all profiles): ${report.bundles.length > 0 ? report.bundles.join(", ") : "(none)"}`,
 		`services: review=${report.services.review} (inferred from bundles, all profiles) curator=${report.services.curator} approval=${report.services.approval} skillUsage=${report.services.skillUsage} io=${report.services.io}`,
 		`pending: ${report.pendingCount === null ? "unknown" : report.pendingCount}`,
@@ -141,6 +184,7 @@ function renderDoctorText(report) {
 	];
 	if (report.conflicts.length > 0) lines.push("conflicts:", ...report.conflicts.map((line) => `  ! ${line}`));
 	if (report.envIssues.length > 0) lines.push("env:", ...report.envIssues.map((line) => `  ! ${line}`));
+	if (report.memoryIssues.length > 0) lines.push("memory:", ...report.memoryIssues.map((line) => `  ! ${line}`));
 	if (report.actions.length > 0) lines.push("next steps:", ...report.actions.map((line) => `  → ${line}`));
 	return lines.join("\n");
 }
@@ -200,8 +244,8 @@ const COMMAND_ENTRIES = [
 		summary: "run a maintenance scan (--facts: 0-token preview)"
 	},
 	{
-		usage: "preset install",
-		summary: "generate the Evolution agent preset into the user root"
+		usage: "preset install [--base <name>[,<name>...]]",
+		summary: "generate one Evolution agent preset per named base into the user root (bases from the agent package's bases.json)"
 	},
 	{
 		usage: "restructure <name> \"<heading>\" <to_file> [--plan <runId>]",
@@ -350,11 +394,15 @@ function apply(ctx, rawConfig = {}) {
 					const reportAny = report;
 					const nameOf = (item) => typeof item === "object" && item !== null && typeof item.name === "string" ? item.name : "?";
 					const reasonOf = (item) => typeof item === "object" && item !== null && typeof item.reason === "string" ? item.reason : "?";
+					const aborted = typeof reportAny.aborted === "string" ? reportAny.aborted : void 0;
+					const unattributed = Array.isArray(reportAny.unattributed) ? reportAny.unattributed.length : 0;
 					return ok([
 						`runId=${reportAny.runId}`,
 						`startedAt=${reportAny.startedAt}`,
 						`archived=${reportAny.archived.map(nameOf).join(", ") || "(none)"}`,
-						`failed=${reportAny.failed.map((item) => `${nameOf(item)}: ${reasonOf(item)}`).join(", ") || "(none)"}`
+						`failed=${reportAny.failed.map((item) => `${nameOf(item)}: ${reasonOf(item)}`).join(", ") || "(none)"}`,
+						...aborted === void 0 ? [] : [`aborted=${aborted}`],
+						...unattributed === 0 ? [] : [`unattributed=${unattributed}`]
 					].join("\n"));
 				}
 				if (input === "restore" || input.startsWith("restore ")) {
@@ -433,7 +481,10 @@ 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: skillsRootValue }), ioRegistry.provider());
+					const library = newSkillLibrary({
+						config: { root: skillsRootValue },
+						io: ioRegistry.provider()
+					});
 					const enrichment = await buildEnrichment(ctx, library);
 					const { facts } = buildMaintainFacts(await snapshotFromLibrary(library, {
 						descriptions: enrichment.descriptions,
@@ -458,7 +509,10 @@ 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: skillsRootValue }), ioRegistry.provider());
+						const library = newSkillLibrary({
+							config: { root: skillsRootValue },
+							io: ioRegistry.provider()
+						});
 						const enrichment = await buildEnrichment(ctx, library);
 						const outcome = await runMaintain({
 							library,
@@ -501,7 +555,9 @@ function apply(ctx, rawConfig = {}) {
 					}
 				}
 				if (/^maintain\b/.test(input)) return err("Unknown maintain arguments: expected bare `maintain`, `maintain --timeout <ms>` or `maintain --timeout=<ms>` (a positive integer). Got: " + input);
-				if (input === "preset install") {
+				const presetInstall = /^preset install(?: --base (\S+))?$/.exec(input);
+				if (presetInstall !== null || /^preset\b/.test(input)) {
+					if (presetInstall === null) return err("Unknown preset arguments: expected `preset install` or `preset install --base <name>[,<name>...]` (the names live in the agent package's bases.json). Got: " + input);
 					{
 						let installedBundles;
 						try {
@@ -515,26 +571,41 @@ function apply(ctx, rawConfig = {}) {
 						const presetBundle = installedBundles.find((name) => name === "dsh-evolution-preset" || name.endsWith("/dsh-evolution-preset"));
 						if (allBundle || presetBundle) return err(`Refusing to install the layered Evolution preset: "${allBundle ?? presetBundle}" is installed in this home — its model rows (tool-memory / tool-skill-manage / tool-session-query / skill-catalog) would double-mount with the preset's and the profile fails loud at startup. Keep ONE: remove the ${allBundle ? "evolution-all bundle" : "evolution-preset bundle"} before installing the layered preset (see /evolution doctor).`);
 					}
-					const target = join(evolutionRoot(), ".agent-presets", "evolution");
 					try {
 						const source = resolveAgentPresetDir(import.meta.url);
+						const table = readAgentPresetBases(source);
+						const requestedRaw = presetInstall[1] ?? table.defaultBase;
+						const requested = [...new Set(requestedRaw.split(",").map((part) => part.trim()).filter((part) => part !== ""))];
+						if (requested.length === 0) return err(`No agent-preset base named — ${join(source, "bases.json")} lists ${table.entries.map((entry) => entry.name).join(", ")}`);
+						const selected = [];
+						for (const name of requested) {
+							const entry = table.entries.find((candidate) => candidate.name === name);
+							if (entry === void 0) return err(`Unknown agent-preset base "${name}" — ${join(source, "bases.json")} lists ${table.entries.map((candidate) => candidate.name).join(", ")}`);
+							selected.push(entry);
+						}
 						const deltaPath = join(source, "agent.cordis.yml");
-						const presetPath = join(source, "preset.yml");
-						if (!existsSync(deltaPath) || !existsSync(presetPath)) return err(`Preset file missing from ${source} — is the dsh-evolution-agent-preset package installed?`);
+						if (!existsSync(deltaPath)) return err(`Preset file missing from ${source} — is the dsh-evolution-agent-preset package installed?`);
 						const registry = ctx.get("agentPresets");
 						if (!registry) return err("Agent preset registry not mounted — cannot compose the Evolution preset against the runtime standard.");
-						const composition = composePresetComposition(await registry.read("standard"), readFileSync(deltaPath, "utf8"));
-						mkdirSync(target, { recursive: true });
-						atomicWriteFiles(target, [{
-							name: "agent.cordis.yml",
-							content: composition
-						}, {
-							name: "preset.yml",
-							content: readFileSync(presetPath)
-						}], void 0, (message) => {
-							ctx.logger.warn(message);
-						});
-						return ok(`Evolution agent preset installed to ${target} (runtime standard + delta). Restart the session switcher to select it.`);
+						const written = [];
+						for (const base of selected) {
+							const target = join(evolutionRoot(), ".agent-presets", base.id);
+							const presetPath = join(source, base.metadata);
+							if (!existsSync(presetPath)) return err(`Preset file missing from ${source} — is the dsh-evolution-agent-preset package installed?`);
+							const composition = composePresetComposition(await registry.read(base.name), readFileSync(deltaPath, "utf8"));
+							mkdirSync(target, { recursive: true });
+							atomicWriteFiles(target, [{
+								name: "agent.cordis.yml",
+								content: composition
+							}, {
+								name: base.metadata,
+								content: readFileSync(presetPath)
+							}], void 0, (message) => {
+								ctx.logger.warn(message);
+							});
+							written.push(`${base.name} → ${target}`);
+						}
+						return ok(`Evolution agent preset installed (${written.join("; ")}). Restart the session switcher to select it.`);
 					} catch (error) {
 						return err(`Preset install failed: ${error instanceof Error ? error.message : String(error)}`);
 					}
@@ -577,9 +648,12 @@ function apply(ctx, rawConfig = {}) {
 						});
 						if (decision.action === "staged") return ok(`${decision.message}${planRunId ? `\n[audit] plan=${planRunId}` : ""}`);
 					}
-					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, [{
+					const result = await newSkillLibrary({
+						config: { root: skillsRootValue },
+						io: ioRegistry.provider(),
+						ctx,
+						threatExemptLabels: config.threatExemptLabels
+					}).restructure(name, [{
 						heading,
 						toFile
 					}], "foreground");
@@ -615,6 +689,31 @@ function apply(ctx, rawConfig = {}) {
 * name (`evolution-agent` vs `@lmzhen/dsh-evolution-agent-preset` — the rc.44
 * dir≠name trap), so BOTH sibling shapes are probed.
 */
+/** The agent-preset base table (evolution-agent/bases.json). The installer
+* (install-layered.mjs) reads the SAME file — the literal that used to live in
+* each of them is what kept this path on `standard` while the installer knew
+* `ptc` too. Fails loud: a missing table is an incomplete install, never a
+* silent fallback to the default base. */
+function readAgentPresetBases(source) {
+	const path = join(source, "bases.json");
+	const parsed = JSON.parse(readFileSync(path, "utf8"));
+	if (!Array.isArray(parsed.bases) || parsed.bases.length === 0) throw new Error(`${path} carries no bases[]`);
+	const entries = parsed.bases.map((raw) => {
+		const entry = raw;
+		if (typeof entry.name !== "string" || typeof entry.id !== "string" || typeof entry.metadata !== "string") throw new Error(`${path} entry ${JSON.stringify(raw)} needs name/id/metadata strings`);
+		return {
+			name: entry.name,
+			id: entry.id,
+			metadata: entry.metadata
+		};
+	});
+	const declared = parsed.default;
+	if (typeof declared !== "string" || !entries.some((entry) => entry.name === declared)) throw new Error(`${path} default ${JSON.stringify(declared)} is not one of ${entries.map((entry) => entry.name).join(", ")}`);
+	return {
+		defaultBase: declared,
+		entries
+	};
+}
 function resolveAgentPresetDir(importMetaUrl) {
 	const overlayCandidate = join(dirname(fileURLToPath(importMetaUrl)), "..", "..", "evolution-agent");
 	if (existsSync(join(overlayCandidate, "agent.cordis.yml")) && existsSync(join(overlayCandidate, "preset.yml"))) return overlayCandidate;

package/lib/types/doctor.d.ts

@@ -6,6 +6,13 @@ export interface DoctorReport {
      * installing `all` — which double-mounts the preset's model rows (the
      * exact conflict this report flags). */
     installForm: 'full' | 'host' | 'preset' | 'layered' | 'preset-only' | 'none';
+    /** The PRODUCT form the install form implies (0.3.77, C axis). `variant` =
+     * session-level opt-in: the model tools live in the Evolution preset, so a
+     * session on any platform original preset carries none of the family and the
+     * cross-session consumers skip it (config `sessionScoped`). `attach` =
+     * profile-level: the model rows sit at profile root and every session carries
+     * them. The two are mutually exclusive install targets (E-33). */
+    deploymentForm: 'variant' | 'attach' | 'host-only' | 'preset-only' | 'none';
     /** Aggregated across ALL profiles under `home` (N13, v12): doctor answers
      * "is any profile carrying an evolution bundle / which install forms exist"
      * — not "what this runtime mounted". `services.review` is the runtime-side
@@ -14,6 +21,12 @@ export interface DoctorReport {
     bundles: string[];
     conflicts: string[];
     envIssues: string[];
+    /** S0.2 (v37 P0-1): memory files carrying the platform's `{{` prompt-variable
+     * syntax. Residual-risk detector — current builds neutralize the INJECTED text
+     * (`MemoryStore.renderContext`), but a still-running older build fails every
+     * pre-step of every session under this home, and an operator may want to clean
+     * the file regardless. */
+    memoryIssues: string[];
     services: {
         review: boolean;
         curator: boolean;

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.74",
+  "version": "0.3.77",
   "publishConfig": {
     "access": "public"
   },
@@ -18,10 +18,6 @@
       "types": "./lib/types/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./invariant": {
-      "types": "./lib/types/invariant.d.ts",
-      "default": "./lib/invariant.js"
-    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -31,21 +27,19 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.74",
-    "@lmzhen/dsh-evolution-core": "^0.3.74",
-    "@lmzhen/dsh-evolution-maintenance": "^0.3.74"
+    "@lmzhen/dsh-evolution-approval": "^0.3.77",
+    "@lmzhen/dsh-evolution-core": "^0.3.77",
+    "@lmzhen/dsh-evolution-maintenance": "^0.3.77"
   },
   "optionalDependencies": {
-    "@lmzhen/dsh-evolution-agent-preset": "^0.3.74"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.3.77"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-commands": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-llm": "^0.1.5-rc.2"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-commands": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.2"
+    "@deepseek-ai/dsh-commands": "^0.1.5-rc.2"
   }
 }

package/lib/invariant.js

@@ -1,8 +0,0 @@
-//#region lib/types/invariant.js
-const PACKAGE_NAME = "@lmzhen/dsh-evolution-commands";
-const name = "evolution-commands-invariant";
-const inject = ["invariants"];
-const install = () => {};
-const apply = (ctx) => Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install));
-//#endregion
-export { apply, inject, name };

package/lib/types/invariant.d.ts

@@ -1,5 +0,0 @@
-import type { Context } from '@deepseek-ai/cordis';
-export declare const name = "evolution-commands-invariant";
-export declare const inject: string[];
-export declare const apply: (ctx: Context) => Promise<() => void>;
-//# sourceMappingURL=invariant.d.ts.map