@lmzhen/dsh-evolution-commands 0.3.76 → 0.3.77

package/lib/index.js

@@ -145,6 +145,7 @@ 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 = [];
@@ -152,7 +153,7 @@ async function diagnose(ctx, options = {}) {
 	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.");
@@ -162,6 +163,7 @@ async function diagnose(ctx, options = {}) {
 	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,
@@ -174,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}`,
@@ -242,8 +244,8 @@ const COMMAND_ENTRIES = [
 		summary: "run a maintenance scan (--facts: 0-token preview)"
 	},
 	{
-		usage: "preset install [--base <name>]",
-		summary: "generate the Evolution agent preset into the user root (bases from the agent package's bases.json)"
+		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>]",
@@ -555,7 +557,7 @@ 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);
 				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>` (the names live in the agent package's bases.json). Got: " + 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 {
@@ -572,27 +574,38 @@ function apply(ctx, rawConfig = {}) {
 					try {
 						const source = resolveAgentPresetDir(import.meta.url);
 						const table = readAgentPresetBases(source);
-						const requested = presetInstall[1] ?? table.defaultBase;
-						const base = table.entries.find((entry) => entry.name === requested);
-						if (base === void 0) return err(`Unknown agent-preset base "${requested}" — ${join(source, "bases.json")} lists ${table.entries.map((entry) => entry.name).join(", ")}`);
-						const target = join(evolutionRoot(), ".agent-presets", base.id);
+						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, base.metadata);
-						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(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);
-						});
-						return ok(`Evolution agent preset installed to ${target} (runtime ${base.name} + 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)}`);
 					}

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

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.76",
+  "version": "0.3.77",
   "publishConfig": {
     "access": "public"
   },
@@ -27,12 +27,12 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.76",
-    "@lmzhen/dsh-evolution-core": "^0.3.76",
-    "@lmzhen/dsh-evolution-maintenance": "^0.3.76"
+    "@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.76"
+    "@lmzhen/dsh-evolution-agent-preset": "^0.3.77"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",