@lmzhen/dsh-evolution-commands 0.3.64 → 0.3.66

package/lib/index.js

@@ -1,5 +1,6 @@
 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 { buildEnrichment, buildMaintainFacts, runMaintain, snapshotFromLibrary } from "@lmzhen/dsh-evolution-maintenance";
@@ -76,12 +77,16 @@ async function diagnose(ctx, options = {}) {
 		io: has("evolutionIo")
 	};
 	let pendingCount = null;
+	let executingCount = null;
 	const approvalService = ctx.get("evolutionApproval");
 	if (approvalService?.list) try {
 		const rows = await approvalService.list("pending");
 		pendingCount = Array.isArray(rows) ? rows.length : null;
+		const executing = await approvalService.list("executing");
+		executingCount = Array.isArray(executing) ? executing.length : null;
 	} catch {
 		pendingCount = null;
+		executingCount = null;
 	}
 	const installForm = full ? "full" : preset ? "preset" : layered ? "layered" : host ? "host" : "none";
 	const actions = [];
@@ -92,6 +97,7 @@ async function diagnose(ctx, options = {}) {
 	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.");
+	if ((executingCount ?? 0) > 0) actions.push(`${executingCount} staged write(s) are stuck EXECUTING (the approving run crashed) — inspect with /evolution pending and reject them after verifying the write effect.`);
 	return {
 		installForm,
 		bundles,
@@ -99,6 +105,7 @@ async function diagnose(ctx, options = {}) {
 		envIssues: env,
 		services,
 		pendingCount,
+		executingCount,
 		actions
 	};
 }
@@ -107,7 +114,8 @@ function renderDoctorText(report) {
 		`Evolution doctor — install form: ${report.installForm}`,
 		`bundles (all profiles): ${report.bundles.length > 0 ? report.bundles.join(", ") : "(none)"}`,
 		`services: review=${report.services.review} curator=${report.services.curator} approval=${report.services.approval} skillUsage=${report.services.skillUsage} io=${report.services.io}`,
-		`pending: ${report.pendingCount === null ? "unknown" : report.pendingCount}`
+		`pending: ${report.pendingCount === null ? "unknown" : report.pendingCount}`,
+		`executing: ${report.executingCount === null ? "unknown" : report.executingCount}`
 	];
 	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}`));
@@ -327,6 +335,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,
@@ -411,7 +421,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;
@@ -500,6 +510,28 @@ 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.");
+					if (approval) {
+						const sessionPolicy = effectiveSessionPolicy(ctx, void 0);
+						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",
+							summary: `/evolution restructure ${name}${planRunId ? ` (plan ${planRunId})` : ""}`,
+							args: {
+								operation: {
+									action: "restructure",
+									name,
+									restructure: [{
+										heading,
+										to_file: toFile
+									}]
+								},
+								origin: "foreground",
+								libraryOrigin: "foreground"
+							},
+							origin: "foreground"
+						});
+						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, [{

package/lib/types/doctor.d.ts

@@ -16,6 +16,9 @@ export interface DoctorReport {
         io: boolean;
     };
     pendingCount: number | null;
+    /** v23 (AP-2): claimed-but-crashed records — the only state that needs an
+     * operator action (reject) to clear; surfaced separately from pending. */
+    executingCount: number | null;
     actions: string[];
 }
 /** Profile bundle rows for evolution-family packages across all profiles. */

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