@lmzhen/dsh-evolution-maintenance 0.3.23 → 0.3.25

package/lib/index.js

@@ -110,7 +110,11 @@ function validateAndNormalizeMaintainPlan(raw, report, validSignals) {
 	const errors = [];
 	const forcedHuman = [];
 	const protectedNames = /* @__PURE__ */ new Set();
-	for (const skill of report.skills) if (skill.protected) protectedNames.add(skill.name);
+	const factNames = /* @__PURE__ */ new Set();
+	for (const skill of report.skills) {
+		if (skill.protected) protectedNames.add(skill.name);
+		factNames.add(skill.name);
+	}
 	if (!isRecord(raw)) return {
 		ok: false,
 		errors: ["plan root: must be an object"],
@@ -137,7 +141,10 @@ function validateAndNormalizeMaintainPlan(raw, report, validSignals) {
 			}
 			if (typeof item.kind !== "string" || !KINDS.has(item.kind)) errors.push(`${path}.kind: invalid`);
 			if (!Array.isArray(item.names) || item.names.length === 0 || !item.names.every(isNonEmptyString)) errors.push(`${path}.names: non-empty string array required`);
-			else if (item.names.some((nm) => protectedNames.has(nm))) {
+			else if (item.names.some((nm) => !factNames.has(nm))) {
+				const missing = item.names.find((nm) => !factNames.has(nm));
+				errors.push(`${path}.names: references skill "${String(missing)}" not in the facts report — names must come from the scanned skill set`);
+			} else if (item.names.some((nm) => protectedNames.has(nm))) {
 				const hit = item.names.find((nm) => protectedNames.has(nm));
 				errors.push(`${path}.names: references protected skill "${String(hit)}" — §7 forbids recommendations for bundled/hub-installed/pinned skills`);
 			}
@@ -348,7 +355,7 @@ async function runMaintain(runtime, options = {}) {
 		abortSignal = signal;
 		const agentOptions = { model: options.model ?? runtime.evolutionPolicy?.get()?.curatorModel ?? "deepseek-v4-pro" };
 		if (options.provider) agentOptions.provider = options.provider;
-		const runResult = await (await runtime.subagents.start("spawn", {
+		const run = await runtime.subagents.start("spawn", {
 			label: "dsh-evolution-maintain",
 			prompt: [{
 				type: "text",
@@ -430,31 +437,40 @@ async function runMaintain(runtime, options = {}) {
 					}
 				}
 			}
-		})).result;
-		const raw = runResult?.structured;
-		if (raw === void 0) {
-			if (runResult?.stopReason === "aborted") return {
+		});
+		try {
+			const runResult = await run.result;
+			const raw = runResult?.structured;
+			if (raw === void 0) {
+				if (runResult?.stopReason === "aborted") return {
+					ok: false,
+					error: "Maintenance scan was aborted (the run was cancelled before the subagent produced a plan) — retry when the session is idle; concurrent re-submission cancels the previous scan."
+				};
+				return {
+					ok: false,
+					error: "Maintain subagent returned no structured plan (the model did not emit the structured plan, or the run ended without one) — retry; if it repeats, raise --timeout or check the model output shape."
+				};
+			}
+			const validated = validateAndNormalizeMaintainPlan(raw, report, existingSignalIds(report));
+			if (!validated.ok) return {
 				ok: false,
-				error: "Maintenance scan was aborted (the run was cancelled before the subagent produced a plan) — retry when the session is idle; concurrent re-submission cancels the previous scan."
+				error: `Maintain plan rejected by validator: ${validated.errors.slice(0, 5).join("; ")}`
 			};
+			const runId = randomUUID();
 			return {
-				ok: false,
-				error: "Maintain subagent returned no structured plan (the model did not emit the structured plan, or the run ended without one) — retry; if it repeats, raise --timeout or check the model output shape."
+				ok: true,
+				runId,
+				verdict: validated.plan.verdict,
+				forcedHuman: validated.forcedHuman,
+				text: formatPlan(validated, runId)
 			};
+		} finally {
+			try {
+				await run.dispose?.();
+			} catch (disposeError) {
+				runtime.logger?.warn(`dsh-evolution-maintenance: subagent dispose failed: ${disposeError instanceof Error ? disposeError.message : String(disposeError)}`);
+			}
 		}
-		const validated = validateAndNormalizeMaintainPlan(raw, report, existingSignalIds(report));
-		if (!validated.ok) return {
-			ok: false,
-			error: `Maintain plan rejected by validator: ${validated.errors.slice(0, 5).join("; ")}`
-		};
-		const runId = randomUUID();
-		return {
-			ok: true,
-			runId,
-			verdict: validated.plan.verdict,
-			forcedHuman: validated.forcedHuman,
-			text: formatPlan(validated, runId)
-		};
 	} catch (error) {
 		const name = typeof error === "object" && error !== null ? error.name : void 0;
 		const message = error instanceof Error ? error.message : String(error);

package/lib/tools.js

@@ -16,7 +16,8 @@ const name = "evolution-maintenance-tools";
 function apply(ctx, rawConfig = {}) {
 	const config = rawConfig;
 	ctx.inject(["tools"], (toolCtx) => {
-		toolCtx.get("tools").register(defineTool({
+		const tools = toolCtx.get("tools");
+		toolCtx.effect(() => tools.register(defineTool({
 			name: "maintenance_probe",
 			description: "Read-only deep-dive into maintenance scan signals: library-level group/cluster membership or per-skill detail (line numbers, pointer gaps, narrow shapes, stamp samples). Machine-derived from the same calculators as the facts block — never introduces new evidence ids. Output is JSON detail.",
 			parameters: {
@@ -74,7 +75,7 @@ function apply(ctx, rawConfig = {}) {
 					detail: redacted.split("\n")
 				};
 			}
-		}));
+		})), "evolution-maintenance.tools");
 	});
 }
 //#endregion

package/lib/types/orchestrate.d.ts

@@ -9,14 +9,22 @@ import { type SkillLibraryLike } from './drift-scan.ts';
 export interface MaintainRuntime {
     /** SkillLibrary-like reader for snapshot assembly. */
     library: SkillLibraryLike;
-    /** Subagent spawner (platform `subagents` service — minimal shape for injection). */
+    /** Subagent spawner (platform `subagents` service — minimal shape for injection).
+     * `dispose` is optional: not every provider exposes it, so the run is only
+     * disposed when the platform provides the handle (rc.42 P1-3 parity with review). */
     subagents: {
         start(kind: string, options: unknown): Promise<{
             result: Promise<unknown>;
+            dispose?: () => Promise<void>;
         }>;
     };
     /** Parent agent/session handle passed through to the subagent, when available. */
     parent?: unknown;
+    /** Optional logger for dispose-failure traces; when absent the failure is
+     * swallowed without surfacing (the orchestrator is a pure function). */
+    logger?: {
+        warn(message: string): void;
+    } | undefined;
     /** Evolution-policy reader for model routing (same source as the curator:
      * `policy.get().curatorModel`). Optional — a missing service falls back to
      * the default model (E-55). `get()` may RESOLVE to undefined (a soft probe

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-maintenance",
   "description": "Deterministic maintenance-scan surface: skill-library snapshot assembly, drift signals and mechanical-facts rendering (design 011) (community build)",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "publishConfig": {
     "access": "public"
   },
@@ -34,7 +34,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@lmzhen/dsh-evolution-core": "^0.3.23"
+    "@lmzhen/dsh-evolution-core": "^0.3.25"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",