@lmzhen/dsh-evolution-maintenance 0.26.26 → 0.27.0

package/lib/index.js

@@ -528,7 +528,6 @@ function formatPlan(validated, runId) {
 }
 /** Run one maintenance scan and return display text plus validation metadata. */
 async function runMaintain(runtime, options = {}) {
-	let abortSignal;
 	try {
 		if (!verifyPromptBundle(PROMPT_BUNDLE)) return {
 			ok: false,
@@ -578,22 +577,18 @@ ${MAINTAIN_OUTPUT_INSTRUCTION}`;
 			recommendationCount: 0,
 			error: `maintain：--timeout 必须是以毫秒为单位的正整数，最大 ${MAX_TIMER_DELAY_MS}；收到 ${String(timeoutMs)}`
 		};
-		const signal = options.signal !== void 0 ? AbortSignal.any([AbortSignal.timeout(timeoutMs), options.signal]) : AbortSignal.timeout(timeoutMs);
-		abortSignal = signal;
 		const agentOptions = { model: options.model ?? runtime.evolutionPolicy?.get()?.curatorModel ?? DEFAULT_CURATOR_MODEL };
 		if (options.provider) agentOptions.provider = options.provider;
-		const run = await runtime.subagents.start("spawn", {
-			label: "dsh-evolution-maintain",
-			prompt: [{
-				type: "text",
-				text: prompt
-			}],
+		const outcome = await runtime.channel.run({
 			parent: runtime.parent,
-			signal,
+			label: "dsh-evolution-maintain",
+			promptText: template + "\n\n" + prompt,
+			kind: "maintainer",
+			allow: [...toolAllow],
 			maxDepth: typeof options.maxDepth === "number" && Number.isFinite(options.maxDepth) && options.maxDepth >= 1 ? options.maxDepth : 1,
 			agentOptions,
-			persona: template,
-			toolFilter: { allow: [...toolAllow] },
+			timeoutMs,
+			...options.signal === void 0 ? {} : { signal: options.signal },
 			outputSchema: {
 				type: "object",
 				additionalProperties: false,
@@ -664,53 +659,47 @@ ${MAINTAIN_OUTPUT_INSTRUCTION}`;
 				}
 			}
 		});
-		try {
-			const runResult = await run.result;
-			const raw = runResult.structured;
-			if (raw === void 0) {
-				if (runResult.stopReason === "aborted") return {
-					ok: false,
-					recommendationCount: 0,
-					error: "维护扫描已中止（在子智能体产出计划之前运行被取消）：请在会话空闲时重试；并发重交会取消上一次扫描。"
-				};
-				return {
-					ok: false,
-					recommendationCount: 0,
-					error: "维护子智能体没有返回结构化计划（模型没有产出结构化计划，或运行在产出前结束）：请重试；若反复出现，请提高 --timeout 或检查模型的输出结构。"
-				};
-			}
-			const validated = validateAndNormalizeMaintainPlan(raw, report, existingSignalIds(report));
-			if (!validated.ok) return {
-				ok: false,
-				recommendationCount: 0,
-				error: `维护计划被校验器拒绝：${validated.errors.slice(0, 5).join("; ")}`
-			};
-			const runId = options.runId ?? randomUUID();
-			return {
-				ok: true,
-				runId,
-				verdict: validated.plan.verdict,
-				forcedHuman: validated.forcedHuman,
-				items: validated.plan.plan,
-				notes: validated.plan.notes,
-				needsHumanCount: validated.plan.plan.filter((item) => item.needs_human).length,
-				recommendationCount: validated.plan.plan.length,
-				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)}`);
-			}
-		}
+		if (outcome.kind === "unavailable") return {
+			ok: false,
+			recommendationCount: 0,
+			error: `维护扫描不可用（${outcome.code}）：${outcome.reason}。请在已挂载 agentPresets/subagents 的宿主会话中重试。`
+		};
+		if (outcome.kind === "aborted") return {
+			ok: false,
+			recommendationCount: 0,
+			error: "维护扫描已中止（取消或超时），计划尚未产出 —— 在技能多、库大的场景下，请重试或提高超时（evolution-commands maintainTimeoutMs）。"
+		};
+		if (outcome.kind === "no-structured") return {
+			ok: false,
+			recommendationCount: 0,
+			error: "维护子智能体没有返回结构化计划（模型没有产出结构化计划，或运行在产出前结束）：请重试；若反复出现，请提高 --timeout 或检查模型的输出结构。"
+		};
+		const raw = outcome.structured;
+		const validated = validateAndNormalizeMaintainPlan(raw, report, existingSignalIds(report));
+		if (!validated.ok) return {
+			ok: false,
+			recommendationCount: 0,
+			error: `维护计划被校验器拒绝：${validated.errors.slice(0, 5).join("; ")}`
+		};
+		const runId = options.runId ?? randomUUID();
+		return {
+			ok: true,
+			runId,
+			verdict: validated.plan.verdict,
+			forcedHuman: validated.forcedHuman,
+			items: validated.plan.plan,
+			notes: validated.plan.notes,
+			needsHumanCount: validated.plan.plan.filter((item) => item.needs_human).length,
+			recommendationCount: validated.plan.plan.length,
+			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);
 		return {
 			ok: false,
 			recommendationCount: 0,
-			error: abortSignal?.aborted === true || name === "AbortError" || message === "This operation was aborted" ? "维护扫描已中止（取消或超时），计划尚未产出 —— 在技能多、库大的场景下，请重试或提高超时（evolution-commands maintainTimeoutMs）。" : `Maintenance scan failed: ${message}`
+			error: options.signal?.aborted === true || name === "AbortError" || message === "This operation was aborted" ? "维护扫描已中止（取消或超时），计划尚未产出 —— 在技能多、库大的场景下，请重试或提高超时（evolution-commands maintainTimeoutMs）。" : `Maintenance scan failed: ${message}`
 		};
 	}
 }

package/lib/types/orchestrate.d.ts

@@ -6,49 +6,24 @@
  */
 import { type DriftReport, type DriftSkillSnapshot } from '@lmzhen/dsh-evolution-core';
 import type { Agent } from '@deepseek-ai/dsh-agent';
-import type { SubagentResult, SubagentRun, SubagentStartRequest } from '@deepseek-ai/dsh-subagent';
+import type { SubagentChannel } from '@lmzhen/dsh-evolution-core';
 import { type SkillLibraryLike } from './drift-scan.ts';
 import { type Enrichment } from './enrichment.ts';
 import { type StoreFootprint } from './render-facts.ts';
 import { type FootprintIo } from './footprint.ts';
 import { type MaintainPlanItem } from './validate-plan.ts';
 /**
- * I-5 (v37), D-09 (G1/1.8): the platform types are IMPORTED, not copied. Each view below is DERIVED from
- * the platform contract, so a field the platform renames fails the build here instead of drifting.
- *
- * The one thing this layer must add: `persona` and `toolFilter` are honoured at runtime (child-agent.ts
- * installs a `deployment:persona` system-prompt section; the README documents toolFilter as applying the
- * requested child tool restriction) but the CALLER-facing `SubagentStartRequest` does not declare them.
- * They are therefore declared here, once, as an explicit extension instead of a hand-copied whole.
+ * W5 G3-S4: execution goes through evolution-core's Channel (the 0.2.1 startActivation contract +
+ * restricted preset). The former local views of the platform subagent request/result are gone — a
+ * structural copy would be the second definition the contract freeze forbids.
  */
-export type MaintainSubagentStart = SubagentStartRequest & {
-    readonly persona?: string | undefined;
-    readonly toolFilter?: {
-        readonly allow: readonly string[];
-    } | undefined;
-};
-/** The `SubagentResult` fields the outcome mapping reads (the platform result is wider). */
-/** The `SubagentResult` fields the outcome mapping reads. `diagnostic` is OPTIONAL here on purpose: the
- * platform type declares it required, but this layer reads it defensively (the mapped outcome must work
- * for a result that carries none), so the view states that narrower truth instead of inheriting the
- * platform requirement. */
-export type MaintainSubagentResult = Pick<SubagentResult, 'structured' | 'stopReason'> & {
-    readonly diagnostic?: string | undefined;
-};
-/** The platform run handle the orchestrator owns (`dispose` is required and every exit path awaits it). */
-export type MaintainSubagentRun = SubagentRun;
 export interface MaintainRuntime {
     /** SkillLibrary-like reader for snapshot assembly. */
     library: SkillLibraryLike;
-    /** Subagent spawner (platform `subagents` service — the request fields this
-     * orchestrator sends, typed as the platform requires them: I-5 (v37) tightened the
-     * request from `unknown` and `dispose` from optional to the platform's
-     * always-present handle, so a future miss fails `tsc` instead of a runtime TypeError. */
-    subagents: {
-        start(kind: 'spawn', options: MaintainSubagentStart): Promise<MaintainSubagentRun>;
-    };
-    /** The spawning agent (platform `SubagentStartRequest.parent`, required: in-process
-     * providers derive workspace, lineage and delegation depth from its durable session). */
+    /** W5 G3-S4: the ONE execution path (capability probe, restricted preset, timeout/abort and
+     * exactly-one dispose live in the channel; this orchestrator only maps the outcome). */
+    channel: SubagentChannel;
+    /** The spawning agent (0.2.1 `SubagentStartRequest.parent`). */
     parent: Agent;
     /** Optional logger for dispose-failure traces; when absent the failure is
      * swallowed without surfacing (the orchestrator is a pure function). */

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.26.26",
+  "version": "0.27.0",
   "publishConfig": {
     "access": "public"
   },
@@ -30,18 +30,19 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.4",
-    "@lmzhen/dsh-evolution-core": "^0.26.26"
+    "@deepseek-ai/schemastery": "^3.18.5",
+    "@lmzhen/dsh-evolution-core": "^0.27.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-subagent": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-tools": "^0.2.0-rc.1"
+    "@deepseek-ai/cordis": "^4.0.5",
+    "@deepseek-ai/dsh-agent": "^0.2.1-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.2.1-rc.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-agent": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-subagent": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-tools": "^0.2.0-rc.1"
+    "@deepseek-ai/dsh-agent": "^0.2.1-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.2.1-rc.1"
+  },
+  "engines": {
+    "dsh": ">=0.2.1-rc.1 <0.2.2-0"
   }
 }