@dsh-workbench/core 0.2.2 → 0.2.4

package/dist/host/index.js

@@ -201,23 +201,37 @@ function quoteShellArg(value) {
 function tailLines(text, lines = 6) {
 	return String(text ?? "").trim().split("\n").slice(-lines).join("\n");
 }
+function candidateStarts(raw) {
+	const starts = [];
+	for (let index = 0; index < raw.length; index += 1) {
+		const char = raw[index];
+		if (char !== "[" && char !== "{") continue;
+		if (index === 0 || raw[index - 1] === "\n") starts.push(index);
+	}
+	const earliest = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
+	if (earliest.length > 0) {
+		const head = Math.min(...earliest);
+		if (!starts.includes(head)) starts.push(head);
+	}
+	return starts;
+}
 function parseJsonLoose(text) {
 	const raw = String(text ?? "").trim();
 	if (!raw) return void 0;
 	try {
 		return JSON.parse(raw);
 	} catch {
-		const starts = [raw.indexOf("["), raw.indexOf("{")].filter((index) => index >= 0);
-		if (starts.length === 0) return void 0;
-		const from = Math.min(...starts);
-		const close = raw[from] === "[" ? "]" : "}";
-		const to = raw.lastIndexOf(close);
-		if (to <= from) return void 0;
-		try {
-			return JSON.parse(raw.slice(from, to + 1));
-		} catch {
-			return;
+		for (const from of candidateStarts(raw)) {
+			const close = raw[from] === "[" ? "]" : "}";
+			const to = raw.lastIndexOf(close);
+			if (to <= from) continue;
+			try {
+				return JSON.parse(raw.slice(from, to + 1));
+			} catch {
+				continue;
+			}
 		}
+		return;
 	}
 }
 var PANEL_STATE_MAX_TEXT = 2e3;
@@ -2126,6 +2140,18 @@ function textOutput(text) {
 		text
 	}];
 }
+function textRender(_args, value) {
+	const text = value?.text;
+	return textOutput(typeof text === "string" ? text : JSON.stringify(value));
+}
+var TEXT_OUTPUT = {
+	schema: {
+		type: "object",
+		properties: {},
+		additionalProperties: true
+	},
+	render: textRender
+};
 function jsonText(value) {
 	return JSON.stringify(value);
 }
@@ -2724,8 +2750,11 @@ function createRegistryNotebook(dir) {
 	};
 }
 //#endregion
-//#region src/shared/api/host/diy.ts
+//#region src/shared/api/diy.ts
 var WORKSHOP_RELATIVE = "workbench/diy";
+var WORKSHOP_TITLE = "工作台DIY";
+//#endregion
+//#region src/shared/api/host/diy.ts
 function workshopPathOf(ctx) {
 	const homePath = ctx.get("dshHomePath");
 	if (typeof homePath !== "function") return null;
@@ -4353,13 +4382,39 @@ function outcomeOf(deps, pkg, change, plugin) {
 	};
 }
 async function installDshBundle(deps, spec, options) {
-	const change = await deps.manager.install({
-		spec,
+	return settle(deps, spec, options, await installOnce(deps, spec, options));
+}
+async function replaceDshBundle(deps, spec, options) {
+	const first = await installOnce(deps, spec, options);
+	if (first.errorCode !== "already-installed") return settle(deps, spec, options, first);
+	const pkg = bundleNameOf(first, spec);
+	const removed = await deps.remove(pkg);
+	if (removed.application !== "applied") return {
+		change: removed,
+		module: deps.installed?.(pkg) ?? {
+			kind: "unknown",
+			pkg
+		},
+		supply: { state: "no-needs" }
+	};
+	return settle(deps, spec, options, await installOnce(deps, spec, options));
+}
+function installOptions(options) {
+	return {
 		...options?.registry === void 0 ? {} : { registry: options.registry },
 		...options?.requestId === void 0 ? {} : { requestId: options.requestId },
 		...options?.approvedBuilds === void 0 ? {} : { approvedBuilds: options.approvedBuilds }
+	};
+}
+async function installOnce(deps, spec, options) {
+	const change = await deps.manager.install({
+		spec,
+		...installOptions(options)
 	});
 	if (change === null) throw new Error("插件管理器回的安装结果看不懂。");
+	return change;
+}
+async function settle(deps, spec, options, change) {
 	const pkg = bundleNameOf(change, spec);
 	const module = deps.installed?.(pkg) ?? {
 		kind: "unknown",
@@ -4813,6 +4868,11 @@ function createMarketService(options) {
 		...registries === void 0 ? {} : { registries },
 		...logger === void 0 ? {} : { logger }
 	};
+	async function removeInstalledBundle(manager, pkg) {
+		const first = await manager.remove(pkg);
+		if (first === null) throw new Error("插件管理器回的卸载结果看不懂。");
+		return retryAfterRegistryFix(registryFix, manager, pkg, first);
+	}
 	function routeDeps(manager) {
 		return {
 			manager,
@@ -4820,6 +4880,7 @@ function createMarketService(options) {
 			runAll,
 			rememberSource: (manager, pkg, registry) => rememberInstalledSource(registryFix, manager, pkg, registry),
 			supplyAfter,
+			remove: (pkg) => removeInstalledBundle(manager, pkg),
 			...shell === void 0 ? {} : { shell },
 			...installed === void 0 ? {} : { installed },
 			...ledger === void 0 ? {} : { ledger },
@@ -4962,9 +5023,7 @@ function createMarketService(options) {
 			const unit = module.kind === "module" ? module.unit : void 0;
 			const manifest = unit === void 0 ? void 0 : catalog().find((item) => item.id === unit);
 			const before = unit === void 0 ? void 0 : await capabilityOf(unit, true);
-			const first = await manager.remove(pkg);
-			if (first === null) throw new Error("插件管理器回的卸载结果看不懂。");
-			const change = await retryAfterRegistryFix(registryFix, manager, pkg, first);
+			const change = await removeInstalledBundle(manager, pkg);
 			if (change.application !== "applied" || unit === void 0) return {
 				change,
 				keptFor: []
@@ -4981,8 +5040,10 @@ function createMarketService(options) {
 			return requireBundles().cancel(requestId);
 		},
 		async updateBundle(unit) {
-			const pkg = (modules?.() ?? []).find((item) => item.unit === unit)?.pkg;
-			if (pkg === void 0) return null;
+			const found = (modules?.() ?? []).find((item) => item.unit === unit);
+			if (found === void 0) return null;
+			if (found.local === true) throw new Error(`这份模块装的是本地那一份（${found.pkg}），不从源上更新 —— 要更新先把它换成源上的版本。`);
+			const pkg = found.pkg;
 			const read = installed?.(pkg) ?? {
 				kind: "unknown",
 				pkg
@@ -4995,7 +5056,7 @@ function createMarketService(options) {
 				force: true
 			});
 			const spec = latest === void 0 ? pkg : `${pkg}@${latest}`;
-			const outcome = await installDshBundle(routeDeps(requireBundles()), spec, { ...registry === void 0 ? {} : { registry } });
+			const outcome = await replaceDshBundle(routeDeps(requireBundles()), spec, { ...registry === void 0 ? {} : { registry } });
 			await plugins.sweep();
 			await service.update(unit).catch(() => void 0);
 			return outcome;
@@ -5023,7 +5084,7 @@ function createMarketService(options) {
 				if (missing.length > 0) throw new Error(`源上已经有 ${read.pkg}@${latest}，但这一份发布还没铺齐：${missing.join("、")} 在这一版上还拉不到。装上会缺依赖，稍等再试 —— 市场页那颗「重新检查」会重新探一次。`);
 			}
 			const spec = latest === void 0 ? `${read.pkg}@latest` : `${read.pkg}@${latest}`;
-			const outcome = await installDshBundle(routeDeps(requireBundles()), spec, { ...registry === void 0 ? {} : { registry } });
+			const outcome = await replaceDshBundle(routeDeps(requireBundles()), spec, { ...registry === void 0 ? {} : { registry } });
 			logger?.info?.(`[dsh-workbench] 已更新工作台 ${read.version} → ${latest ?? "最新版"}`);
 			return outcome;
 		},
@@ -5162,8 +5223,19 @@ function render$1(entries, shared) {
 	if (shared.length === 0) return modules;
 	return `${modules}\n\n共用依赖（只有升级）：\n${shared.map((dep) => `${dep.id} · ${stateOfDependency(dep)}${versionsOf(dep)}` + (dep.usedBy.length === 0 ? "" : ` · 供 ${dep.usedBy.join("、")} 使用`)).join("\n")}`;
 }
+var REMOVE_BLOCKED = /* @__PURE__ */ new Set([
+	"not-removable",
+	"management-required",
+	"stop-profile",
+	"bundle-in-use"
+]);
+function failureText(change) {
+	const code = change.errorCode ?? change.application;
+	if (code === "already-installed") return "它已经在这份 profile 里，而这次没能把它卸下来（这一版 dsh 不肯就地覆盖装，得先卸再装）";
+	return REMOVE_BLOCKED.has(code) ? "旧版卸不掉，而这一版 dsh 又不许就地覆盖装 —— 让用户重启一次 dsh，或者从终端更新" : code;
+}
 function describeInstall(spec, module, supply, change) {
-	return `${change.application === "applied" ? "装好了，已生效" : change.application === "restart-required" ? "装好了，要重启一次才生效" : `没成功：${change.errorCode ?? change.application}`}：${module.kind === "module" ? `${module.unit}（${module.pkg}）` : module.pkg}${supply.state === "installed" ? "；它要的 opencli 插件也装上了" : supply.state === "pending-restart" ? "；重启后再装它要的 opencli 插件" : supply.state === "not-a-module" ? "；但它不是工作台模块（没有 dsh.workbench 声明，不会出现在面板上）" : supply.state === "failed" ? `；但它要的插件没装上：${supply.reason}` : ""}（spec：${spec}）`;
+	return `${change.application === "applied" ? "装好了，已生效" : change.application === "restart-required" ? "装好了，要重启一次才生效" : `没成功：${failureText(change)}`}：${module.kind === "module" ? `${module.unit}（${module.pkg}）` : module.pkg}${supply.state === "installed" ? "；它要的 opencli 插件也装上了" : supply.state === "pending-restart" ? "；重启后再装它要的 opencli 插件" : supply.state === "not-a-module" ? "；但它不是工作台模块（没有 dsh.workbench 声明，不会出现在面板上）" : supply.state === "failed" ? `；但它要的插件没装上：${supply.reason}` : ""}（spec：${spec}）`;
 }
 var OUTPUT_SCHEMA$1 = {
 	type: "object",
@@ -5191,7 +5263,7 @@ function describePluginUninstall(pkg, outcome) {
 	return `已从「你装的插件」里去掉 ${pkg}。${outcome.kept === void 0 ? "" : pluginKeptText(outcome.kept)}`;
 }
 function describeWorkbenchUpdate(change) {
-	if (change.application === "failed" || change.application === "cancelled") return `没成功：${change.errorCode ?? change.application}`;
+	if (change.application === "failed" || change.application === "cancelled") return `没成功：${failureText(change)}`;
 	return change.application === "restart-required" ? "工作台更新到新版了 —— 这一版要重启一次 dsh 才生效（重启由用户来，别自己重启）。" : "工作台更新到新版了 —— 客户端与宿主自己换上，不用重启。";
 }
 function usersOf(shared, names) {
@@ -6499,9 +6571,6 @@ function bundleInspectHandler(ctx) {
 	};
 }
 //#endregion
-//#region src/shared/api/diy.ts
-var WORKSHOP_TITLE = "工作台DIY";
-//#endregion
 //#region src/shared/api/dsh-plugins.ts
 var DSH_PLUGINS_ROUTE = "dsh-plugins";
 //#endregion
@@ -7614,6 +7683,8 @@ function parseCommandRows(stdout) {
 			name,
 			description: textOf(record["description"]),
 			access: textOf(record["access"]),
+			browser: record["browser"] === true,
+			siteSession: textOf(record["siteSession"]),
 			...textOf(record["domain"]) === "" ? {} : { domain: textOf(record["domain"]) },
 			args: argsOf(record["args"])
 		});
@@ -7626,6 +7697,9 @@ function commandOf(plugin, row) {
 		name: row.name,
 		description: row.description,
 		access: row.access,
+		browser: row.browser,
+		siteSession: row.siteSession,
+		...row.domain === void 0 ? {} : { domain: row.domain },
 		args: row.args
 	};
 }
@@ -7799,6 +7873,8 @@ var SCHEMA_TYPE = {
 	string: "string"
 };
 var KEY_ARG_LIMIT = 3;
+var RUN_CODE_TOOL = "run_code";
+var PLUGIN_PROMPT_BUDGET = 4e3;
 function pluginToolName(plugin, command) {
 	return `${plugin}_${command}`.toLowerCase().replace(/[^a-z0-9_]+/g, "_").replace(/_{2,}/g, "_").replace(/^_+|_+$/g, "");
 }
@@ -7807,7 +7883,7 @@ function schemaTypeOf(arg) {
 }
 function propertyOf(arg) {
 	const type = schemaTypeOf(arg);
-	const enumValues = arg.choices.length > 0 ? arg.choices.map((choice) => choice) : void 0;
+	const enumValues = type === "string" && arg.choices.length > 0 ? [...arg.choices] : void 0;
 	return {
 		type,
 		...arg.help.trim() === "" ? {} : { description: arg.help.trim() },
@@ -7815,6 +7891,9 @@ function propertyOf(arg) {
 		...arg.defaultValue === void 0 ? {} : { default: arg.defaultValue }
 	};
 }
+function pluginPromptChars(command) {
+	return pluginToolDescription(command).length + command.args.reduce((sum, arg) => sum + arg.help.trim().length, 0);
+}
 function pluginToolParameters(command) {
 	const properties = {};
 	for (const arg of command.args) properties[arg.name] = propertyOf(arg);
@@ -7834,6 +7913,11 @@ function pluginToolDescription(command) {
 function pluginToolWrites(command) {
 	return command.access !== "read";
 }
+function pluginToolSession(command) {
+	if (!command.browser) return "none";
+	if (command.siteSession === "persistent" || command.siteSession === "ephemeral") return command.siteSession;
+	return command.access === "read" ? "persistent" : "ephemeral";
+}
 function valuesOf(raw) {
 	return typeof raw === "object" && raw !== null ? raw : {};
 }
@@ -7850,9 +7934,9 @@ function pluginToolArgv(command, raw) {
 		if (arg.positional) continue;
 		const value = values[arg.name];
 		if (value === void 0 || value === null) continue;
-		if (typeof value === "boolean") argv.push(`--${arg.name}`, value ? "true" : "false");
-		else if (Array.isArray(value)) argv.push(`--${arg.name}`, value.map((item) => String(item)).join(","));
-		else argv.push(`--${arg.name}`, String(value));
+		if (typeof value === "boolean") argv.push(`--${arg.name}=${value ? "true" : "false"}`);
+		else if (Array.isArray(value)) argv.push(`--${arg.name}=${value.map((item) => String(item)).join(",")}`);
+		else argv.push(`--${arg.name}=${String(value)}`);
 	}
 	return argv;
 }
@@ -7890,11 +7974,6 @@ function pluginApprovalFor(command) {
 }
 //#endregion
 //#region src/shared/api/host/plugin-units.ts
-var TOOL_OUTPUT_SCHEMA = {
-	type: "object",
-	properties: {},
-	additionalProperties: true
-};
 function signatureOf(version, commands) {
 	return [version, ...commands.map((command) => `${command.name}:${command.access}:${command.args.map((arg) => `${arg.name}${arg.required ? "!" : ""}`).join("+")}`)].join("|");
 }
@@ -7904,6 +7983,10 @@ function toolsOf(plugin, commands, taken) {
 	const claimed = /* @__PURE__ */ new Set();
 	for (const command of commands) {
 		const name = pluginToolName(plugin, command.name);
+		if (name === "run_code") {
+			problems.push(`工具名 ${RUN_CODE_TOOL}（${plugin} ${command.name}）是 dsh 的保留名（PTC 的传送工具）—— 这条命令这次不合成`);
+			continue;
+		}
 		if (taken.has(name) || claimed.has(name)) {
 			problems.push(`工具名 ${name}（${plugin} ${command.name}）已经被占着 —— 这条命令这次不合成（先来的那份说了算）`);
 			continue;
@@ -7946,12 +8029,15 @@ function planOf(options, registered) {
 		problems.push(...built.problems);
 		for (const tool of built.tools) taken.add(tool.name);
 		if (built.tools.length === 0 && commands.length === set.commands.length) problems.push(`「${plugin}」的命令一条都没能合成工具`);
+		const chars = built.tools.reduce((sum, tool) => sum + pluginPromptChars(tool.command), 0);
+		if (chars > 4e3) problems.push(`「${plugin}」合成出来的 ${String(built.tools.length)} 把工具，描述与参数说明合起来 ${String(chars)} 字，超过 ${String(PLUGIN_PROMPT_BUDGET)} 字的合成面预算 —— 这些字每一步请求都跟着走，插件该精简或按工作区少开一点`);
 		rows.push({
 			plugin,
 			pkg: row.pkg,
 			version: set.version,
 			commands: set.commands.length,
 			synthesized: built.tools.length,
+			chars,
 			tools: built.tools.map((tool) => tool.name)
 		});
 		if (built.tools.length === 0) continue;
@@ -7972,7 +8058,7 @@ function planOf(options, registered) {
 		problems
 	};
 }
-function faceOf(unit, opencliFor) {
+function faceOf(unit, opencliFor, note) {
 	const byTool = new Map(unit.tools.map((tool) => [tool.name, tool.command]));
 	const manifest = {
 		id: unit.id,
@@ -8000,14 +8086,14 @@ function faceOf(unit, opencliFor) {
 				name: tool.name,
 				description: pluginToolDescription(tool.command),
 				parameters: pluginToolParameters(tool.command),
-				output: {
-					schema: TOOL_OUTPUT_SCHEMA,
-					render: (_args, value) => textOutput(jsonText(value))
-				},
+				output: TEXT_OUTPUT,
 				async execute(raw, exec) {
 					const workspace = sessionWorkspace(exec);
 					try {
-						return (await opencli.json([tool.command.name, ...pluginToolArgv(tool.command, raw)], workspace === null ? {} : { workdir: workspace })).value;
+						return { text: jsonText((await opencli.json([tool.command.name, ...pluginToolArgv(tool.command, raw)], {
+							session: pluginToolSession(tool.command),
+							...workspace === null ? {} : { workdir: workspace }
+						})).value) };
 					} catch (error) {
 						throw new Error(pluginLoginHint(error, tool.command.domain), { cause: error });
 					}
@@ -8016,7 +8102,15 @@ function faceOf(unit, opencliFor) {
 			return {
 				routes: {},
 				factsOf: () => [],
-				registerTools: () => definitions.map((definition) => tools.register(definition)),
+				registerTools: () => {
+					const disposers = [];
+					for (const definition of definitions) try {
+						disposers.push(tools.register(definition));
+					} catch (error) {
+						note(`「${unit.plugin}」的 ${definition.name} 这把工具没注册上（${error instanceof Error ? error.message : String(error)}）—— 只废这一把，同插件其余命令照常`);
+					}
+					return disposers;
+				},
 				needsApproval: (call) => {
 					const command = call.name === void 0 ? void 0 : byTool.get(call.name);
 					return command === void 0 ? void 0 : pluginApprovalFor(command)(call);
@@ -8025,7 +8119,7 @@ function faceOf(unit, opencliFor) {
 		}
 	};
 }
-function reconcile(registered, units, options) {
+function reconcile(registered, units, options, note) {
 	const wanted = new Map(units.map((unit) => [unit.id, unit]));
 	for (const [id, item] of [...registered]) {
 		const next = wanted.get(id);
@@ -8038,12 +8132,13 @@ function reconcile(registered, units, options) {
 		registered.set(unit.id, {
 			signature: unit.signature,
 			tools: unit.tools.map((tool) => tool.name),
-			drop: options.registry.registerPlugin(faceOf(unit, options.opencliFor))
+			drop: options.registry.registerPlugin(faceOf(unit, options.opencliFor, note))
 		});
 	}
 }
 function createPluginUnits(options) {
 	const registered = /* @__PURE__ */ new Map();
+	const mountProblems = /* @__PURE__ */ new Set();
 	let report = {
 		ok: false,
 		at: 0,
@@ -8053,6 +8148,18 @@ function createPluginUnits(options) {
 	let inflight;
 	let lastTouch = 0;
 	let warned = "";
+	function note(problem) {
+		if (mountProblems.has(problem)) return;
+		mountProblems.add(problem);
+		options.logger?.warn?.(`[dsh-workbench] ${problem}`);
+	}
+	function snapshot() {
+		const extra = [...mountProblems];
+		return extra.length === 0 ? report : {
+			...report,
+			problems: [...report.problems, ...extra]
+		};
+	}
 	function warn(problems) {
 		const text = [...problems].sort().join("\n");
 		if (text === "" || text === warned) return;
@@ -8060,6 +8167,7 @@ function createPluginUnits(options) {
 		options.logger?.warn?.(`[dsh-workbench] opencli 插件命令面：\n${text}`);
 	}
 	async function run(force) {
+		mountProblems.clear();
 		const probed = await options.catalog.refresh(force ? { force: true } : {});
 		if (!probed.ok) {
 			const problems = [...probed.problems, "这次探测没成功：上面这些插件行的工具面维持在上一份（不是\"这些插件没有命令\"）"];
@@ -8070,10 +8178,10 @@ function createPluginUnits(options) {
 				problems
 			};
 			warn(problems);
-			return report;
+			return snapshot();
 		}
 		const plan = planOf(options, registered);
-		reconcile(registered, plan.units, options);
+		reconcile(registered, plan.units, options, note);
 		report = {
 			ok: true,
 			at: Date.now(),
@@ -8081,7 +8189,7 @@ function createPluginUnits(options) {
 			problems: plan.problems
 		};
 		warn(plan.problems);
-		return report;
+		return snapshot();
 	}
 	function refresh(callOptions = {}) {
 		if (inflight !== void 0) return inflight;
@@ -8102,7 +8210,7 @@ function createPluginUnits(options) {
 				options.logger?.warn?.(`[dsh-workbench] 探 opencli 插件命令面时抛了错：${String(error)}`);
 			});
 		},
-		report: () => report,
+		report: () => snapshot(),
 		dispose() {
 			for (const item of registered.values()) item.drop();
 			registered.clear();