@dsh-workbench/core 0.1.9 → 0.1.10

package/dist/host/index.js

@@ -3788,16 +3788,43 @@ function withRunsRoute(result, unit) {
 		}
 	};
 }
-function collectRoutes(mounted) {
+function failureReasonOf(error) {
+	if (error instanceof Error) return error.message;
+	return typeof error === "string" ? error : String(error);
+}
+function fail(ledger, item, reason) {
+	ledger.failed.add(item);
+	ledger.failures.push({
+		id: item.face.manifest.id,
+		reason
+	});
+}
+function collectRoutes(mounted, ledger) {
 	const routes = {};
 	const owner = /* @__PURE__ */ new Map();
 	const routesOfUnit = /* @__PURE__ */ new Map();
 	for (const item of mounted) {
+		if (ledger.failed.has(item)) continue;
 		const unit = item.face.manifest.id;
+		const accepted = [];
+		let problem;
 		for (const [key, handler] of Object.entries(item.result.routes)) {
-			if (key !== unit && !key.startsWith(`${unit}/`)) throw new Error(`路由名要住在自己那一格的命名空间里（${unit} 或 ${unit}/…）：${key} 不属于 ${unit} —— 装 / 升 / 卸时点名不到它，那个模块的数据会停在旧值`);
+			if (key !== unit && !key.startsWith(`${unit}/`)) {
+				problem = `路由名要住在自己那一格的命名空间里（${unit} 或 ${unit}/…）：${key} 不属于 ${unit} —— 装 / 升 / 卸时点名不到它，那个模块的数据会停在旧值`;
+				break;
+			}
 			const previous = owner.get(key);
-			if (previous !== void 0) throw new Error(`路由名冲突：${key} 由套件 ${previous} 与 ${unit} 同时声明`);
+			if (previous !== void 0) {
+				problem = `路由名冲突：${key} 由套件 ${previous} 与 ${unit} 同时声明`;
+				break;
+			}
+			accepted.push([key, handler]);
+		}
+		if (problem !== void 0) {
+			fail(ledger, item, problem);
+			continue;
+		}
+		for (const [key, handler] of accepted) {
 			owner.set(key, unit);
 			routes[key] = handler;
 			const own = routesOfUnit.get(unit);
@@ -3811,45 +3838,64 @@ function collectRoutes(mounted) {
 		routesOfUnit
 	};
 }
-function pickGate(mounted) {
-	const providers = mounted.filter((item) => item.result.gate !== void 0);
-	if (providers.length > 1) throw new Error(`启停闸门只能有一个提供者，现在是：${providers.map((item) => item.face.manifest.id).join("、")}`);
-	return providers[0]?.result.gate;
-}
-function pickProvision(mounted) {
-	const providers = mounted.filter((item) => item.result.provision !== void 0);
-	if (providers.length > 1) throw new Error(`机器供给只能有一个提供者，现在是：${providers.map((item) => item.face.manifest.id).join("、")}`);
-	return providers[0]?.result.provision;
-}
-function collectPrefs(mounted) {
+function collectNamed(mounted, ledger, pickMany, label) {
 	const owner = /* @__PURE__ */ new Map();
-	const prefs = [];
+	const out = [];
 	for (const item of mounted) {
-		const entry = item.result.prefs;
-		if (entry === void 0) continue;
-		const previous = owner.get(entry.resource);
-		if (previous !== void 0) throw new Error(`偏好资源名冲突：${entry.resource} 由套件 ${previous} 与 ${item.face.manifest.id} 同时声明`);
-		owner.set(entry.resource, item.face.manifest.id);
-		prefs.push({
-			...entry,
-			unit: item.face.manifest.id
-		});
+		if (ledger.failed.has(item)) continue;
+		const unit = item.face.manifest.id;
+		const entries = pickMany(item);
+		if (entries.length === 0) continue;
+		const clash = entries.find((entry) => owner.has(entry.resource));
+		if (clash !== void 0) {
+			fail(ledger, item, `${label}名冲突：${clash.resource} 由套件 ${owner.get(clash.resource)} 与 ${unit} 同时声明`);
+			continue;
+		}
+		for (const entry of entries) {
+			owner.set(entry.resource, unit);
+			out.push({
+				...entry,
+				unit
+			});
+		}
 	}
-	return prefs;
+	return out;
 }
-function collectActions(mounted) {
+function collectContextRenderers(mounted, ledger) {
+	const table = /* @__PURE__ */ new Map();
 	const owner = /* @__PURE__ */ new Map();
-	const actions = [];
-	for (const item of mounted) for (const entry of item.result.actions ?? []) {
-		const previous = owner.get(entry.resource);
-		if (previous !== void 0) throw new Error(`动作资源名冲突：${entry.resource} 由套件 ${previous} 与 ${item.face.manifest.id} 同时声明`);
-		owner.set(entry.resource, item.face.manifest.id);
-		actions.push({
-			...entry,
-			unit: item.face.manifest.id
-		});
+	for (const item of mounted) {
+		if (ledger.failed.has(item)) continue;
+		const unit = item.face.manifest.id;
+		const context = item.result.context;
+		if (context === void 0) continue;
+		const clash = context.kinds.find((kind) => owner.has(kind));
+		if (clash !== void 0) {
+			fail(ledger, item, `对话引用的 kind 冲突：${clash} 由套件 ${owner.get(clash)} 与 ${unit} 同时认领`);
+			continue;
+		}
+		for (const kind of context.kinds) {
+			owner.set(kind, unit);
+			table.set(kind, (ref) => context.render(ref));
+		}
+	}
+	return table;
+}
+function pickProvider(mounted, ledger, pick, label) {
+	let chosen;
+	let chosenBy;
+	for (const item of mounted) {
+		if (ledger.failed.has(item)) continue;
+		const value = pick(item);
+		if (value === void 0) continue;
+		if (chosen === void 0) {
+			chosen = value;
+			chosenBy = item.face.manifest.id;
+			continue;
+		}
+		fail(ledger, item, `${label}只能有一个提供者，现在是：${chosenBy}、${item.face.manifest.id}`);
 	}
-	return actions;
+	return chosen;
 }
 function collectWarmReads(mounted) {
 	const declarations = mounted.map((item) => item.result.warmReads).filter((declare) => declare !== void 0);
@@ -3865,26 +3911,15 @@ function collectWarmReads(mounted) {
 		return reads;
 	};
 }
-function collectContextRenderers(mounted) {
-	const table = /* @__PURE__ */ new Map();
-	const owner = /* @__PURE__ */ new Map();
-	for (const item of mounted) {
-		const context = item.result.context;
-		if (context === void 0) continue;
-		for (const kind of context.kinds) {
-			const previous = owner.get(kind);
-			if (previous !== void 0) throw new Error(`对话引用的 kind 冲突：${kind} 由套件 ${previous} 与 ${item.face.manifest.id} 同时认领`);
-			owner.set(kind, item.face.manifest.id);
-			table.set(kind, (ref) => context.render(ref));
-		}
-	}
-	return table;
-}
 function mountUnits(faces, deps) {
 	const store = deps.store ?? createWorkspaceStore({ root: null });
 	const mounted = [];
 	const skipped = [];
-	const longTaskDisposers = [];
+	const longTaskDisposers = /* @__PURE__ */ new Map();
+	const ledger = {
+		failed: /* @__PURE__ */ new Set(),
+		failures: []
+	};
 	for (const face of faces) {
 		const readiness = unitReadiness(face.manifest, (dep) => deps.ctx.get(dep));
 		if (!readiness.canMount) {
@@ -3900,48 +3935,71 @@ function mountUnits(faces, deps) {
 			unit,
 			bump: deps.longTasks.bump
 		});
-		if (longTasks !== void 0) longTaskDisposers.push(longTasks.dispose);
-		const result = face.mount({
-			ctx: deps.ctx,
-			logger: deps.logger,
-			manifests: deps.manifests,
-			...deps.opencliCommand === void 0 ? {} : { opencliCommand: deps.opencliCommand },
-			...deps.probe === void 0 ? {} : { probe: deps.probe },
-			...deps.values === void 0 ? {} : { values: deps.values },
-			...longTasks === void 0 ? {} : { longTasks: longTasks.host },
-			store
-		});
-		mounted.push({
+		let result;
+		try {
+			result = face.mount({
+				ctx: deps.ctx,
+				logger: deps.logger,
+				manifests: deps.manifests,
+				...deps.opencliCommand === void 0 ? {} : { opencliCommand: deps.opencliCommand },
+				...deps.probe === void 0 ? {} : { probe: deps.probe },
+				...deps.values === void 0 ? {} : { values: deps.values },
+				...longTasks === void 0 ? {} : { longTasks: longTasks.host },
+				store
+			});
+		} catch (error) {
+			longTasks?.dispose();
+			ledger.failures.push({
+				id: unit,
+				reason: failureReasonOf(error)
+			});
+			continue;
+		}
+		const item = {
 			face,
 			readiness,
 			result: withRunsRoute(result, unit)
-		});
+		};
+		mounted.push(item);
+		if (longTasks !== void 0) longTaskDisposers.set(item, longTasks.dispose);
 	}
-	const collected = collectRoutes(mounted);
-	const prefs = collectPrefs(mounted);
-	const actions = collectActions(mounted);
+	const collected = collectRoutes(mounted, ledger);
+	const prefs = collectNamed(mounted, ledger, (item) => item.result.prefs === void 0 ? [] : [item.result.prefs], "偏好资源");
+	const actions = collectNamed(mounted, ledger, (item) => item.result.actions ?? [], "动作资源");
 	const owners = new Map(collected.owners);
 	for (const entry of [...prefs, ...actions]) owners.set(entry.resource, entry.unit);
 	const factsOf = /* @__PURE__ */ new Map();
 	for (const item of mounted) {
+		if (ledger.failed.has(item)) continue;
 		const declare = item.result.factsOf;
 		if (declare !== void 0) factsOf.set(item.face.manifest.id, declare);
 	}
+	const gate = pickProvider(mounted, ledger, (item) => item.result.gate, "启停闸门");
+	const provision = pickProvider(mounted, ledger, (item) => item.result.provision, "机器供给");
+	const contextRenderers = collectContextRenderers(mounted, ledger);
+	const alive = mounted.filter((item) => !ledger.failed.has(item));
+	for (const item of mounted) {
+		if (!ledger.failed.has(item)) continue;
+		longTaskDisposers.get(item)?.();
+		longTaskDisposers.delete(item);
+	}
 	return {
-		mounted,
+		mounted: alive,
 		routes: collected.routes,
 		owners,
 		routesOfUnit: collected.routesOfUnit,
 		factsOf,
-		gate: pickGate(mounted),
+		gate,
 		prefs,
 		actions,
-		provision: pickProvision(mounted),
-		contextRenderers: collectContextRenderers(mounted),
+		provision,
+		contextRenderers,
 		skipped,
-		warmReads: collectWarmReads(mounted),
+		failed: ledger.failures,
+		warmReads: collectWarmReads(alive),
 		disposeLongTasks: () => {
-			for (const dispose of longTaskDisposers.splice(0)) dispose();
+			for (const dispose of [...longTaskDisposers.values()]) dispose();
+			longTaskDisposers.clear();
 		}
 	};
 }
@@ -4116,6 +4174,7 @@ function apply(ctx) {
 		logger: ctx.logger
 	});
 	const mounted = /* @__PURE__ */ new Map();
+	const mountFailures = /* @__PURE__ */ new Map();
 	const factsOfMap = /* @__PURE__ */ new Map();
 	const routesOfUnitMap = /* @__PURE__ */ new Map();
 	const ownersMap = /* @__PURE__ */ new Map();
@@ -4127,6 +4186,7 @@ function apply(ctx) {
 		const item = mounted.get(id);
 		if (item === void 0) return;
 		mounted.delete(id);
+		mountFailures.delete(id);
 		for (const dispose of item.toolDisposers) dispose?.();
 		item.gateOff?.();
 		item.plan.disposeLongTasks();
@@ -4137,34 +4197,72 @@ function apply(ctx) {
 		for (const resource of item.plan.owners.keys()) ownersMap.delete(resource);
 	}
 	function mountUnit(face) {
-		const one = mountUnits([face], {
-			ctx,
-			logger: ctx.logger,
-			manifests: liveManifests,
-			store,
-			...opencliEnv === void 0 ? {} : { opencliCommand: opencliEnv },
-			probe: (unit, options) => probeOne(unit, options?.force ?? false),
-			values,
-			longTasks: {
-				scope: process.env["DSH_HOME"] ?? "",
-				bump: (names) => facts.bump(names)
-			}
-		});
+		const id = face.manifest.id;
+		let one;
+		try {
+			one = mountUnits([face], {
+				ctx,
+				logger: ctx.logger,
+				manifests: liveManifests,
+				store,
+				...opencliEnv === void 0 ? {} : { opencliCommand: opencliEnv },
+				probe: (unit, options) => probeOne(unit, options?.force ?? false),
+				values,
+				longTasks: {
+					scope: process.env["DSH_HOME"] ?? "",
+					bump: (names) => facts.bump(names)
+				}
+			});
+		} catch (error) {
+			mountFailures.set(id, {
+				reason: failureReasonOf(error),
+				face
+			});
+			ctx.logger?.warn?.(`[dsh-workbench] ${id} 套件起不来（装配期）：${failureReasonOf(error)}`);
+			return;
+		}
 		for (const item of one.skipped) ctx.logger?.warn?.(`[dsh-workbench] ${item.id} 套件缺硬依赖，跳过：${item.missing.join(", ")}`);
+		for (const failure of one.failed) {
+			mountFailures.set(failure.id, {
+				reason: failure.reason,
+				face
+			});
+			ctx.logger?.warn?.(`[dsh-workbench] ${failure.id} 套件起不来，已摘掉它这一份：${failure.reason}`);
+		}
 		const slot = one.mounted[0];
-		if (slot === void 0) return;
+		if (slot === void 0) {
+			one.disposeLongTasks();
+			return;
+		}
 		if (slot.readiness.missingSoft.length > 0) ctx.logger?.warn?.(`[dsh-workbench] ${face.manifest.id} 套件降级：缺 ${slot.readiness.missingSoft.join(", ")}`);
-		Object.assign(routes, one.routes);
-		for (const [kind, render] of one.contextRenderers) renderers.set(kind, render);
-		for (const [unit, fn] of one.factsOf) factsOfMap.set(unit, fn);
-		for (const [unit, list] of one.routesOfUnit) routesOfUnitMap.set(unit, list);
-		for (const [resource, unit] of one.owners) ownersMap.set(resource, unit);
-		mounted.set(face.manifest.id, {
-			result: slot.result,
-			plan: one,
-			toolDisposers: slot.result.registerTools(),
-			gateOff: one.gate?.subscribe(() => toolScope.reapply())
-		});
+		const added = [];
+		try {
+			Object.assign(routes, one.routes);
+			added.push(...Object.keys(one.routes));
+			for (const [kind, render] of one.contextRenderers) renderers.set(kind, render);
+			for (const [unit, fn] of one.factsOf) factsOfMap.set(unit, fn);
+			for (const [unit, list] of one.routesOfUnit) routesOfUnitMap.set(unit, list);
+			for (const [resource, unit] of one.owners) ownersMap.set(resource, unit);
+			mounted.set(face.manifest.id, {
+				result: slot.result,
+				plan: one,
+				toolDisposers: slot.result.registerTools(),
+				gateOff: one.gate?.subscribe(() => toolScope.reapply())
+			});
+			mountFailures.delete(id);
+		} catch (error) {
+			for (const route of added) delete routes[route];
+			for (const kind of one.contextRenderers.keys()) renderers.delete(kind);
+			for (const unit of one.factsOf.keys()) factsOfMap.delete(unit);
+			for (const unit of one.routesOfUnit.keys()) routesOfUnitMap.delete(unit);
+			for (const [resource, unit] of one.owners) if (ownersMap.get(resource) === unit) ownersMap.delete(resource);
+			one.disposeLongTasks();
+			mountFailures.set(id, {
+				reason: failureReasonOf(error),
+				face
+			});
+			ctx.logger?.warn?.(`[dsh-workbench] ${id} 套件起不来（注册期）：${failureReasonOf(error)}`);
+		}
 	}
 	function rebindPost() {
 		for (const dispose of undoPost.reverse()) dispose?.();
@@ -4187,7 +4285,13 @@ function apply(ctx) {
 	function sync() {
 		const present = new Set(units.all().map((face) => face.manifest.id));
 		for (const id of [...mounted.keys()]) if (!present.has(id)) unmountUnit(id);
-		for (const face of units.all()) if (!mounted.has(face.manifest.id)) mountUnit(face);
+		for (const id of [...mountFailures.keys()]) if (!present.has(id)) mountFailures.delete(id);
+		for (const face of units.all()) {
+			if (mounted.has(face.manifest.id)) continue;
+			const already = mountFailures.get(face.manifest.id);
+			if (already !== void 0 && already.face === face) continue;
+			mountUnit(face);
+		}
 		rebindPost();
 	}
 	if (shell === void 0) ctx.logger?.warn?.("[dsh-workbench] 没有 shell 服务：需要执行缝的套件会降级");
@@ -4209,6 +4313,14 @@ function apply(ctx) {
 				...item,
 				released: releasedOf(item.unit)
 			})) };
+			const failure = mountFailures.get(unit);
+			if (failure !== void 0) return {
+				unit,
+				status: "failed",
+				required: [],
+				missing: [],
+				detail: failure.reason
+			};
 			return probeOne(unit, force);
 		});
 	}