@dsh-workbench/core 0.1.10 → 0.1.11

package/dist/host/index.js

@@ -892,171 +892,39 @@ function resolvePluginSource(source, env, options = {}) {
 }
 //#endregion
 //#region ../shared/dist/host/tool-approval.js
-function compose(detail, texts) {
-	if (detail === void 0 || typeof detail.zh !== "string" || detail.zh.trim() === "") return texts.generic;
-	return {
-		en: `${detail.en} — ${texts.question.en}`,
-		zh: `${detail.zh} —— ${texts.question.zh}`
-	};
-}
-function actionOf$1(call) {
-	const raw = call.arguments;
-	if (typeof raw !== "object" || raw === null) return {};
-	const value = raw;
-	return {
-		...typeof value.action === "string" ? { action: value.action } : {},
-		...typeof value.id === "string" ? { id: value.id } : typeof value.unit === "string" ? { id: value.unit } : {}
-	};
+function messageOf(error) {
+	return error instanceof Error ? error.message : String(error);
 }
-var READ_ONLY_ACTIONS = /* @__PURE__ */ new Set(["list", ""]);
-var READ = { kind: "read" };
-var UNKNOWN = { kind: "unknown" };
-function ask(spec) {
+function compose(detail, verdict) {
+	if (detail === void 0 || typeof detail.zh !== "string" || detail.zh.trim() === "") return verdict.fallback;
 	return {
-		kind: "ask",
-		spec
-	};
-}
-function confirmed(call) {
-	const raw = call.arguments;
-	if (typeof raw !== "object" || raw === null) return void 0;
-	const value = raw.confirm;
-	return typeof value === "boolean" ? value : void 0;
-}
-function effectOf(call, context) {
-	const name = call.name ?? "";
-	const { action, id } = actionOf$1(call);
-	const readAction = action !== void 0 && action !== "" && READ_ONLY_ACTIONS.has(action);
-	const what = () => {
-		if (id === void 0 || id === "") return "一个模块";
-		return `「${context.titleOf?.(id) ?? id}」`;
+		en: `${detail.en} — ${verdict.question.en}`,
+		zh: `${detail.zh} —— ${verdict.question.zh}`
 	};
-	if (name === "workbench_cmdb_release") {
-		if (confirmed(call) !== true) return READ;
-		return ask({
-			reason: "confirm=true releases a version to a real environment",
-			generic: {
-				en: "The agent wants to deploy a version for real (confirm: true) — it deploys on the platform (non-production). Allow?",
-				zh: "agent 想在非生产环境上**真的部署一个版本**（confirm: true）—— 会在平台上部署。允许吗？"
-			},
-			question: {
-				en: "it deploys on the platform for real (non-production). Allow?",
-				zh: "会在平台上真的部署一次（非生产环境）。允许吗？"
-			}
-		});
-	}
-	if (name === "workbench_coding_issue_comment" || name === "workbench_coding_issue_transfer") {
-		if (confirmed(call) !== true) return READ;
-		const comment = name === "workbench_coding_issue_comment";
-		return ask({
-			reason: comment ? "confirm=true posts a comment on the platform" : "confirm=true moves an issue to another status on the platform",
-			generic: comment ? {
-				en: "The agent wants to post a comment on the platform for real (confirm: true) — it writes on the platform. Allow?",
-				zh: "agent 想**真的给一条缺陷加评论**（confirm: true）—— 会写平台数据。允许吗？"
-			} : {
-				en: "The agent wants to move an issue to another status for real (confirm: true) — it writes on the platform. Allow?",
-				zh: "agent 想**真的把一条缺陷流转到别的状态**（confirm: true）—— 会写平台数据。允许吗？"
-			},
-			question: comment ? {
-				en: "it posts that comment on the platform for real. Allow?",
-				zh: "会在平台上真的发表这条评论。允许吗？"
-			} : {
-				en: "it changes that issue status on the platform for real. Allow?",
-				zh: "会在平台上真的改这条缺陷的状态。允许吗？"
-			}
-		});
-	}
-	if (name === "workbench_modules") {
-		if (readAction) return READ;
-		if (action === "update-dependency") return ask({
-			reason: `workbench_modules update-dependency ${id ?? ""} upgrades a shared dependency on this machine`,
-			generic: {
-				en: `The agent wants to upgrade the shared dependency ${what()} (it changes what is installed on this machine). Allow?`,
-				zh: `agent 想升级共用依赖 ${what()}（会改这台机器上装的东西）。允许吗？`
-			},
-			question: {
-				en: "it upgrades that shared dependency on this machine. Allow?",
-				zh: `会升级共用依赖 ${what()}。允许吗？`
-			}
-		});
-		const verb = action === "install" ? "装" : action === "uninstall" ? "卸载" : action === "update" ? "更新" : "装 / 更新 / 卸载";
-		return ask({
-			reason: `workbench_modules ${action ?? "(unknown action)"} ${id ?? ""} changes plugins on this machine`.trim(),
-			generic: {
-				en: `The agent wants to ${verb === "装" ? "install" : verb === "卸载" ? "remove" : verb === "更新" ? "update" : "install/update/remove"} the module ${what()} (it changes plugins on this machine). Allow?`,
-				zh: `agent 想${verb}模块 ${what()}（会改这台机器上的插件）。允许吗？`
-			},
-			question: {
-				en: "it changes plugins on this machine. Allow?",
-				zh: "会改这台机器上的插件。允许吗？"
-			}
-		});
-	}
-	if (name !== "workbench_panels") return UNKNOWN;
-	if (readAction) return READ;
-	if (action === "hide") return ask({
-		reason: "workbench_panels hide removes a module from the panel",
-		generic: {
-			en: `The agent wants to remove ${what()} from this project's panel (its agent tools go offline here too). Allow?`,
-			zh: `agent 想把 ${what()} 从这个项目的面板上收起来（这个项目里它的 agent 工具也一起下线）。允许吗？`
-		},
-		question: {
-			en: "it takes that module off this panel (its agent tools go offline here too). Allow?",
-			zh: `${what()}会从这个项目的面板上收起来（这个项目里它的 agent 工具也一起下线）。允许吗？`
-		}
-	});
-	if (action === "move") return ask({
-		reason: "workbench_panels move reorders the panel",
-		generic: {
-			en: `The agent wants to reorder this project's panel (put ${what()} first). Allow?`,
-			zh: `agent 想调整这个项目面板的顺序（把 ${what()} 放前面）。允许吗？`
-		},
-		question: {
-			en: `it reorders this panel (${what()} goes first). Allow?`,
-			zh: `会调整这个项目面板的顺序（${what()}放前面）。允许吗？`
-		}
-	});
-	if (action === "reset") return ask({
-		reason: "workbench_panels reset clears the panel",
-		generic: {
-			en: "The agent wants to clear this project's panel (every module goes offline here). Allow?",
-			zh: "agent 想清空这个项目的面板（所有模块在这个项目里都下线）。允许吗？"
-		},
-		question: {
-			en: "it clears this panel (every module goes offline here). Allow?",
-			zh: "会清空这个项目的面板（所有模块在这个项目里都下线）。允许吗？"
-		}
-	});
-	return ask({
-		reason: `workbench_panels ${action ?? "(unknown action)"} changes the user's panel`,
-		generic: {
-			en: `The agent wants to add ${what()} to this project's panel. Allow?`,
-			zh: `agent 想把 ${what()} 加到**这个项目**的面板上。允许吗？`
-		},
-		question: {
-			en: `it adds ${what()} to this project's panel. Allow?`,
-			zh: `会把 ${what()} 加到**这个项目**的面板上。允许吗？`
-		}
-	});
 }
 async function approvalFor(call, context = {}) {
-	const effect = effectOf(call, context);
-	if (effect.kind === "read") return void 0;
-	if (effect.kind === "unknown") {
-		if (context.writes !== true) return void 0;
+	if (context.writes !== true) return void 0;
+	let verdict;
+	try {
+		verdict = context.policy?.(call);
+	} catch (error) {
 		return {
 			kind: "deny",
-			reason: `${call.name ?? "这把工具"} 在清单里声明会写东西，但审批表没认领这次调用 —— 停下：给它在 tool-approval.ts 里补一条审批（含"这次会发生什么"），别让写静默过去`
+			reason: `问"要不要审批"的时候套件的策略抛了错，已经停下：${messageOf(error)}`
 		};
 	}
-	const { spec } = effect;
+	if (verdict?.kind === "read") return void 0;
+	if (verdict?.kind !== "ask") return {
+		kind: "deny",
+		reason: `${call.name ?? "这把工具"} 在清单里声明会写东西，但它的套件没认领这次调用 —— 停下：在套件的 needsApproval 里补一条审批（含"这次会发生什么"），别让写静默过去`
+	};
 	let facts;
 	try {
 		facts = await context.detailOf?.(call);
 	} catch (error) {
 		return {
 			kind: "deny",
-			reason: `拿不到"这次会发生什么"，已经停下：${error instanceof Error ? error.message : String(error)}`
+			reason: `拿不到"这次会发生什么"，已经停下：${messageOf(error)}`
 		};
 	}
 	if (facts !== void 0 && "blocked" in facts) return {
@@ -1065,8 +933,8 @@ async function approvalFor(call, context = {}) {
 	};
 	return {
 		kind: "ask",
-		reason: spec.reason,
-		displayReason: compose(facts, spec)
+		reason: verdict.reason,
+		displayReason: compose(facts, verdict)
 	};
 }
 //#endregion
@@ -1588,6 +1456,101 @@ function createRegistryNotebook(dir) {
 		}
 	};
 }
+var panelsUnit = {
+	id: "panels",
+	kind: "ui",
+	card: null,
+	tools: [{
+		name: "workbench_panels",
+		writes: true
+	}, {
+		name: "workbench_modules",
+		writes: true
+	}],
+	host: {
+		inject: [],
+		optional: ["tools", "shell"]
+	}
+};
+//#endregion
+//#region src/modules/panels/model/approval.ts
+var READ$1 = { kind: "read" };
+var READ_ONLY_ACTIONS = /* @__PURE__ */ new Set(["list", ""]);
+function actionOf$1(call) {
+	const raw = call.arguments;
+	if (typeof raw !== "object" || raw === null) return {};
+	const value = raw;
+	return {
+		...typeof value.action === "string" ? { action: value.action } : {},
+		...typeof value.id === "string" ? { id: value.id } : typeof value.unit === "string" ? { id: value.unit } : {}
+	};
+}
+function whatOf(id) {
+	if (id === void 0 || id === "") return "一个模块";
+	return `「${id}」`;
+}
+function askOf(reason, question, fallback) {
+	return {
+		kind: "ask",
+		reason,
+		question,
+		fallback
+	};
+}
+var panelsApproval = (call) => {
+	const { action, id } = actionOf$1(call);
+	const readAction = action !== void 0 && action !== "" && READ_ONLY_ACTIONS.has(action);
+	const what = whatOf(id);
+	if (call.name === "workbench_modules") {
+		if (readAction) return READ$1;
+		if (action === "update-dependency") return askOf(`workbench_modules update-dependency ${id ?? ""} upgrades a shared dependency on this machine`, {
+			en: "it upgrades that shared dependency on this machine. Allow?",
+			zh: `会升级共用依赖 ${what}。允许吗？`
+		}, {
+			en: `The agent wants to upgrade the shared dependency ${what} (it changes what is installed on this machine). Allow?`,
+			zh: `agent 想升级共用依赖 ${what}（会改这台机器上装的东西）。允许吗？`
+		});
+		const verb = action === "install" ? "装" : action === "uninstall" ? "卸载" : action === "update" ? "更新" : "装 / 更新 / 卸载";
+		const verbEn = verb === "装" ? "install" : verb === "卸载" ? "remove" : verb === "更新" ? "update" : "install/update/remove";
+		return askOf(`workbench_modules ${action ?? "(unknown action)"} ${id ?? ""} changes plugins on this machine`.trim(), {
+			en: "it changes plugins on this machine. Allow?",
+			zh: "会改这台机器上的插件。允许吗？"
+		}, {
+			en: `The agent wants to ${verbEn} the module ${what} (it changes plugins on this machine). Allow?`,
+			zh: `agent 想${verb}模块 ${what}（会改这台机器上的插件）。允许吗？`
+		});
+	}
+	if (call.name !== "workbench_panels") return void 0;
+	if (readAction) return READ$1;
+	if (action === "hide") return askOf("workbench_panels hide removes a module from the panel", {
+		en: "it takes that module off this panel (its agent tools go offline here too). Allow?",
+		zh: `${what}会从这个项目的面板上收起来（这个项目里它的 agent 工具也一起下线）。允许吗？`
+	}, {
+		en: `The agent wants to remove ${what} from this project's panel (its agent tools go offline here too). Allow?`,
+		zh: `agent 想把 ${what} 从这个项目的面板上收起来（这个项目里它的 agent 工具也一起下线）。允许吗？`
+	});
+	if (action === "move") return askOf("workbench_panels move reorders the panel", {
+		en: `it reorders this panel (${what} goes first). Allow?`,
+		zh: `会调整这个项目面板的顺序（${what}放前面）。允许吗？`
+	}, {
+		en: `The agent wants to reorder this project's panel (put ${what} first). Allow?`,
+		zh: `agent 想调整这个项目面板的顺序（把 ${what} 放前面）。允许吗？`
+	});
+	if (action === "reset") return askOf("workbench_panels reset clears the panel", {
+		en: "it clears this panel (every module goes offline here). Allow?",
+		zh: "会清空这个项目的面板（所有模块在这个项目里都下线）。允许吗？"
+	}, {
+		en: "The agent wants to clear this project's panel (every module goes offline here). Allow?",
+		zh: "agent 想清空这个项目的面板（所有模块在这个项目里都下线）。允许吗？"
+	});
+	return askOf(`workbench_panels ${action ?? "(unknown action)"} changes the user's panel`, {
+		en: `it adds ${what} to this project's panel. Allow?`,
+		zh: `会把 ${what} 加到**这个项目**的面板上。允许吗？`
+	}, {
+		en: `The agent wants to add ${what} to this project's panel. Allow?`,
+		zh: `agent 想把 ${what} 加到**这个项目**的面板上。允许吗？`
+	});
+};
 //#endregion
 //#region src/shared/api/host/release.ts
 function parseLedgerVersion(stdout, name) {
@@ -2432,22 +2395,6 @@ function applyPanelsPref(panels, payload) {
 		units: panels.move(action.id, action.index ?? 0, path)
 	};
 }
-var panelsUnit = {
-	id: "panels",
-	kind: "ui",
-	card: null,
-	tools: [{
-		name: "workbench_panels",
-		writes: true
-	}, {
-		name: "workbench_modules",
-		writes: true
-	}],
-	host: {
-		inject: [],
-		optional: ["tools", "shell"]
-	}
-};
 //#endregion
 //#region src/modules/panels/model/handoff.ts
 var PANELS_FACT = "panels";
@@ -2843,6 +2790,7 @@ var HOST_UNITS = [{
 			routes: panelRoutes(panels, values),
 			registerTools: () => [...registerPanelTools(ctx, panels, values), ...registerMarketTools(ctx, market)],
 			factsOf: (call) => panelsFactsOf(call, manifests()),
+			needsApproval: panelsApproval,
 			gate: {
 				deniedTools: (workspace) => manifests().filter((manifest) => manifest.card !== null).filter((manifest) => !panels.isEnabled(manifest.id, workspace)).flatMap((manifest) => manifest.tools.map((tool) => tool.name)),
 				subscribe: (listener) => panels.subscribe(listener)
@@ -3094,6 +3042,21 @@ function bundleInspectHandler(ctx) {
 	};
 }
 //#endregion
+//#region src/shared/api/diy.ts
+var WORKSHOP_TITLE = "工作台DIY";
+//#endregion
+//#region src/shared/api/host/diy.ts
+var WORKSHOP_RELATIVE = "workbench/diy";
+function workshopPathOf(ctx) {
+	const homePath = ctx.get("dshHomePath");
+	if (typeof homePath !== "function") return null;
+	try {
+		return homePath(WORKSHOP_RELATIVE);
+	} catch {
+		return null;
+	}
+}
+//#endregion
 //#region src/shared/api/dsh-plugins.ts
 var DSH_PLUGINS_ROUTE = "dsh-plugins";
 //#endregion
@@ -4036,6 +3999,54 @@ function createUnitRegistry() {
 	};
 }
 //#endregion
+//#region src/shared/api/host/approval-legacy.ts
+var READ = { kind: "read" };
+function confirmed(call) {
+	const raw = call.arguments;
+	if (typeof raw !== "object" || raw === null) return void 0;
+	const value = raw.confirm;
+	return typeof value === "boolean" ? value : void 0;
+}
+var legacyApproval = (call) => {
+	const name = call.name ?? "";
+	if (name === "workbench_cmdb_release") {
+		if (confirmed(call) !== true) return READ;
+		return {
+			kind: "ask",
+			reason: "confirm=true releases a version to a real environment",
+			question: {
+				en: "it deploys on the platform for real (non-production). Allow?",
+				zh: "会在平台上真的部署一次（非生产环境）。允许吗？"
+			},
+			fallback: {
+				en: "The agent wants to deploy a version for real (confirm: true) — it deploys on the platform (non-production). Allow?",
+				zh: "agent 想在非生产环境上**真的部署一个版本**（confirm: true）—— 会在平台上部署。允许吗？"
+			}
+		};
+	}
+	if (name !== "workbench_coding_issue_comment" && name !== "workbench_coding_issue_transfer") return void 0;
+	if (confirmed(call) !== true) return READ;
+	const comment = name === "workbench_coding_issue_comment";
+	return {
+		kind: "ask",
+		reason: comment ? "confirm=true posts a comment on the platform" : "confirm=true moves an issue to another status on the platform",
+		question: comment ? {
+			en: "it posts that comment on the platform for real. Allow?",
+			zh: "会在平台上真的发表这条评论。允许吗？"
+		} : {
+			en: "it changes that issue status on the platform for real. Allow?",
+			zh: "会在平台上真的改这条缺陷的状态。允许吗？"
+		},
+		fallback: comment ? {
+			en: "The agent wants to post a comment on the platform for real (confirm: true) — it writes on the platform. Allow?",
+			zh: "agent 想**真的给一条缺陷加评论**（confirm: true）—— 会写平台数据。允许吗？"
+		} : {
+			en: "The agent wants to move an issue to another status for real (confirm: true) — it writes on the platform. Allow?",
+			zh: "agent 想**真的把一条缺陷流转到别的状态**（confirm: true）—— 会写平台数据。允许吗？"
+		}
+	};
+};
+//#endregion
 //#region src/shared/api/host/tool-scope.ts
 function agentOf(value) {
 	return typeof value === "object" && value !== null ? value : void 0;
@@ -4140,6 +4151,14 @@ function apply(ctx) {
 	const units = createUnitRegistry();
 	ctx.provide(UNITS_SERVICE, units);
 	assembleHostUnits(units);
+	ctx.inject(["workspaceRegistry"], (scoped) => {
+		const registry = scoped.get("workspaceRegistry");
+		const workshop = workshopPathOf(scoped);
+		if (registry === void 0 || workshop === null) return;
+		registry.create(workshop, WORKSHOP_TITLE).catch((error) => {
+			ctx.logger?.warn?.(`dsh-workbench: 工坊没能登记成工作区 —— ${String(error)}`);
+		});
+	});
 	const opencliEnv = process.env.DSH_WORKBENCH_OPENCLI;
 	const installEnv = process.env.DSH_WORKBENCH_OPENCLI_INSTALL;
 	const liveManifests = () => units.manifests();
@@ -4365,20 +4384,19 @@ function apply(ctx) {
 		const off = ctx.on?.("tools/pre-execute", async (exec, next) => {
 			const decision = await next();
 			if (decision.kind !== "allow") return decision;
-			const detailOf = async (call) => {
-				for (const { result } of mounted.values()) {
-					const facts = await result.approvalDetail?.(call);
-					if (facts !== void 0) return facts;
-				}
-			};
+			const name = exec.name === void 0 ? void 0 : String(exec.name);
+			const tool = name === void 0 ? void 0 : unitsOfTool().get(name);
+			const owner = tool === void 0 ? void 0 : mounted.get(tool.unit)?.result;
+			const detailOf = owner === void 0 ? void 0 : (call) => owner.approvalDetail?.(call);
 			const workspace = sessionWorkspace(exec) ?? void 0;
 			return await approvalFor({
-				...exec.name === void 0 ? {} : { name: exec.name },
+				...name === void 0 ? {} : { name },
 				arguments: exec.arguments,
 				...workspace === void 0 ? {} : { workspace }
 			}, {
 				detailOf,
-				writes: exec.name === void 0 ? false : unitsOfTool().get(String(exec.name))?.writes ?? false
+				policy: owner?.needsApproval ?? legacyApproval,
+				writes: tool?.writes ?? false
 			}) ?? decision;
 		});
 		return () => off?.();