@dsh-workbench/core 1.1.6 → 1.1.7

package/client.js

@@ -2809,6 +2809,15 @@ window.__ModuleLoader__.load({
       	}
       	return errors;
       }
+      function libRunsProblemsOf(raw, at) {
+      	if (raw === void 0) return [];
+      	if (!Array.isArray(raw)) return [`${at}.runs 要是数组`];
+      	if (raw.length === 0) return [`${at}.runs 是空数组 —— 不自己跑命令就整条删掉`];
+      	const names = raw.map((one) => text(one));
+      	if (names.some((one) => one === "")) return [`${at}.runs 里有空字符串`];
+      	if (new Set(names).size !== names.length) return [`${at}.runs 里有重复的运行时`];
+      	return [];
+      }
       function perKindProblemsOf(kind, raw, at) {
       	const errors = [];
       	if (kind === "bin" || kind === "lib" || kind === "env") {
@@ -2816,6 +2825,7 @@ window.__ModuleLoader__.load({
       	}
       	if (kind === "bin") errors.push(...binInstallProblemsOf(raw["install"], at));
       	if (raw["docs"] !== void 0 && text(raw["docs"]) === "") errors.push(`${at}.docs 是空串`);
+      	if (kind === "lib") errors.push(...libRunsProblemsOf(raw["runs"], at));
       	if (kind === "extension") {
       		if (text(raw["runtime"]) === "") errors.push(`${at}.runtime 没写 —— 扩展属于哪个运行时（如 opencli）`);
       		if (text(raw["name"]) === "") errors.push(`${at}.name 没写`);

package/dist/client/client.body.js

@@ -2802,6 +2802,15 @@ function binInstallProblemsOf(raw, at) {
 	}
 	return errors;
 }
+function libRunsProblemsOf(raw, at) {
+	if (raw === void 0) return [];
+	if (!Array.isArray(raw)) return [`${at}.runs 要是数组`];
+	if (raw.length === 0) return [`${at}.runs 是空数组 —— 不自己跑命令就整条删掉`];
+	const names = raw.map((one) => text(one));
+	if (names.some((one) => one === "")) return [`${at}.runs 里有空字符串`];
+	if (new Set(names).size !== names.length) return [`${at}.runs 里有重复的运行时`];
+	return [];
+}
 function perKindProblemsOf(kind, raw, at) {
 	const errors = [];
 	if (kind === "bin" || kind === "lib" || kind === "env") {
@@ -2809,6 +2818,7 @@ function perKindProblemsOf(kind, raw, at) {
 	}
 	if (kind === "bin") errors.push(...binInstallProblemsOf(raw["install"], at));
 	if (raw["docs"] !== void 0 && text(raw["docs"]) === "") errors.push(`${at}.docs 是空串`);
+	if (kind === "lib") errors.push(...libRunsProblemsOf(raw["runs"], at));
 	if (kind === "extension") {
 		if (text(raw["runtime"]) === "") errors.push(`${at}.runtime 没写 —— 扩展属于哪个运行时（如 opencli）`);
 		if (text(raw["name"]) === "") errors.push(`${at}.name 没写`);

package/dist/client/index.js

@@ -2805,6 +2805,15 @@ function binInstallProblemsOf(raw, at) {
 	}
 	return errors;
 }
+function libRunsProblemsOf(raw, at) {
+	if (raw === void 0) return [];
+	if (!Array.isArray(raw)) return [`${at}.runs 要是数组`];
+	if (raw.length === 0) return [`${at}.runs 是空数组 —— 不自己跑命令就整条删掉`];
+	const names = raw.map((one) => text(one));
+	if (names.some((one) => one === "")) return [`${at}.runs 里有空字符串`];
+	if (new Set(names).size !== names.length) return [`${at}.runs 里有重复的运行时`];
+	return [];
+}
 function perKindProblemsOf(kind, raw, at) {
 	const errors = [];
 	if (kind === "bin" || kind === "lib" || kind === "env") {
@@ -2812,6 +2821,7 @@ function perKindProblemsOf(kind, raw, at) {
 	}
 	if (kind === "bin") errors.push(...binInstallProblemsOf(raw["install"], at));
 	if (raw["docs"] !== void 0 && text(raw["docs"]) === "") errors.push(`${at}.docs 是空串`);
+	if (kind === "lib") errors.push(...libRunsProblemsOf(raw["runs"], at));
 	if (kind === "extension") {
 		if (text(raw["runtime"]) === "") errors.push(`${at}.runtime 没写 —— 扩展属于哪个运行时（如 opencli）`);
 		if (text(raw["name"]) === "") errors.push(`${at}.name 没写`);

package/dist/host/index.js

@@ -144,7 +144,8 @@ var NEED_KEYS = [
 	"sources",
 	"secret",
 	"install",
-	"docs"
+	"docs",
+	"runs"
 ];
 var SOURCE_KEYS = [
 	"kind",
@@ -251,6 +252,15 @@ function binInstallProblemsOf(raw, at) {
 	}
 	return errors;
 }
+function libRunsProblemsOf(raw, at) {
+	if (raw === void 0) return [];
+	if (!Array.isArray(raw)) return [`${at}.runs 要是数组`];
+	if (raw.length === 0) return [`${at}.runs 是空数组 —— 不自己跑命令就整条删掉`];
+	const names = raw.map((one) => text$3(one));
+	if (names.some((one) => one === "")) return [`${at}.runs 里有空字符串`];
+	if (new Set(names).size !== names.length) return [`${at}.runs 里有重复的运行时`];
+	return [];
+}
 function perKindProblemsOf(kind, raw, at) {
 	const errors = [];
 	if (kind === "bin" || kind === "lib" || kind === "env") {
@@ -258,6 +268,7 @@ function perKindProblemsOf(kind, raw, at) {
 	}
 	if (kind === "bin") errors.push(...binInstallProblemsOf(raw["install"], at));
 	if (raw["docs"] !== void 0 && text$3(raw["docs"]) === "") errors.push(`${at}.docs 是空串`);
+	if (kind === "lib") errors.push(...libRunsProblemsOf(raw["runs"], at));
 	if (kind === "extension") {
 		if (text$3(raw["runtime"]) === "") errors.push(`${at}.runtime 没写 —— 扩展属于哪个运行时（如 opencli）`);
 		if (text$3(raw["name"]) === "") errors.push(`${at}.name 没写`);
@@ -1134,7 +1145,7 @@ var PHASES = [
 function asRecord$7(value) {
 	return typeof value === "object" && value !== null ? value : void 0;
 }
-function textOf$5(value, max) {
+function textOf$6(value, max) {
 	if (typeof value !== "string") return "";
 	const trimmed = value.trim();
 	return trimmed.length > max ? trimmed.slice(0, max) : trimmed;
@@ -1147,8 +1158,8 @@ function atOf(value) {
 function errorOf(raw) {
 	const record = asRecord$7(raw);
 	if (record === void 0) return void 0;
-	const code = textOf$5(record["code"], 120);
-	const message = textOf$5(record["message"], PANEL_STATE_MAX_TEXT);
+	const code = textOf$6(record["code"], 120);
+	const message = textOf$6(record["message"], PANEL_STATE_MAX_TEXT);
 	if (code === "" && message === "") return void 0;
 	return {
 		code: code === "" ? "unknown" : code,
@@ -1167,7 +1178,7 @@ function parseCardsReport(payload) {
 		ok: false,
 		message: "请求体要是一个对象"
 	};
-	const workspace = textOf$5(record["workspace"], PANEL_STATE_MAX_TEXT);
+	const workspace = textOf$6(record["workspace"], PANEL_STATE_MAX_TEXT);
 	if (workspace === "") return {
 		ok: false,
 		message: "workspace 不能是空的 —— 面板按工作区存"
@@ -1181,9 +1192,9 @@ function parseCardsReport(payload) {
 	for (const item of raw.slice(0, 32)) {
 		const card = asRecord$7(item);
 		if (card === void 0) continue;
-		const unit = textOf$5(card["unit"], 200);
-		const route = textOf$5(card["route"], 400);
-		const phase = textOf$5(card["phase"], 20);
+		const unit = textOf$6(card["unit"], 200);
+		const route = textOf$6(card["route"], 400);
+		const phase = textOf$6(card["phase"], 20);
 		const at = atOf(card["at"]);
 		if (unit === "" || route === "" || at === null || !PHASES.includes(phase)) continue;
 		const error = errorOf(card["error"]);
@@ -1218,9 +1229,9 @@ function parseCrashReport(payload) {
 		ok: false,
 		message: "请求体要是一个对象"
 	};
-	const workspace = textOf$5(record["workspace"], PANEL_STATE_MAX_TEXT);
-	const unit = textOf$5(record["unit"], 200);
-	const reason = textOf$5(record["reason"], PANEL_STATE_MAX_TEXT);
+	const workspace = textOf$6(record["workspace"], PANEL_STATE_MAX_TEXT);
+	const unit = textOf$6(record["unit"], 200);
+	const reason = textOf$6(record["reason"], PANEL_STATE_MAX_TEXT);
 	if (workspace === "") return {
 		ok: false,
 		message: "workspace 不能是空的"
@@ -2033,7 +2044,7 @@ var PLUGIN_LEDGER_FILE = "plugins.json";
 function ledgerKeyOf(entry) {
 	return `${entry.opencliHome}\u0000${entry.package}`;
 }
-function textOf$4(value) {
+function textOf$5(value) {
 	if (typeof value !== "string") return void 0;
 	const trimmed = value.trim();
 	return trimmed === "" ? void 0 : trimmed;
@@ -2041,13 +2052,13 @@ function textOf$4(value) {
 function entryOf$3(value) {
 	if (typeof value !== "object" || value === null) return void 0;
 	const box = value;
-	const opencliHome = textOf$4(box["opencliHome"]);
-	const pkg = textOf$4(box["package"]);
-	const installedAt = textOf$4(box["installedAt"]);
+	const opencliHome = textOf$5(box["opencliHome"]);
+	const pkg = textOf$5(box["package"]);
+	const installedAt = textOf$5(box["installedAt"]);
 	if (opencliHome === void 0 || pkg === void 0 || installedAt === void 0) return void 0;
-	const name = textOf$4(box["name"]);
-	const registry = textOf$4(box["registry"]);
-	const releasedAt = textOf$4(box["releasedAt"]);
+	const name = textOf$5(box["name"]);
+	const registry = textOf$5(box["registry"]);
+	const releasedAt = textOf$5(box["releasedAt"]);
 	return {
 		opencliHome,
 		package: pkg,
@@ -2350,6 +2361,93 @@ function sessionIdOf(exec) {
 	return typeof id === "string" && id.trim() !== "" ? id.trim() : null;
 }
 //#endregion
+//#region ../shared/dist/host/opencli-runner.js
+var AUTH_REQUIRED_EXIT_CODE = 77;
+function textOf$4(value) {
+	return typeof value === "string" ? value : "";
+}
+function failedOf(args, error) {
+	const head = `Command failed: opencli ${args.join(" ")}`;
+	const auth = error?.pageCode === "auth-required";
+	const helpUrl = textOf$4(error?.helpUrl);
+	const detail = textOf$4(error?.detail);
+	const hint = textOf$4(error?.hint);
+	const failed = new Error([
+		head,
+		...auth ? ["code: AUTH_REQUIRED", `message: ${textOf$4(error?.message)}`] : [textOf$4(error?.message) || "opencli 这条命令没跑通"],
+		...detail === "" ? [] : [detail],
+		...hint === "" ? [] : [hint],
+		...auth && helpUrl !== "" ? [`help: Please open Chrome or Chromium and log in to ${helpUrl}`] : []
+	].join("\n"));
+	if (auth) failed.code = AUTH_REQUIRED_EXIT_CODE;
+	return failed;
+}
+/**
+* 把读缝包成一条 opencli 命令的执行器：给还按 `execFile('opencli', args)` 收结果的编排库用，
+* 让它们跑在面板用的那份 opencli 上（同一套插件、同一份登录态）。
+*
+* 失败按 opencli 自己的约定还原：未登录是 `code: AUTH_REQUIRED` + 退出码 77，编排库的
+* 「等登录再重试」才接得上；其它失败保留 `Command failed: opencli …` 那句外壳。
+* @param read 模块手里的读缝（`data.read`）。
+* @param options `timeoutMs` 透传给读缝；不传就用读缝自己的默认值。
+* @returns 执行器；直接交给编排库的 `setOpencliRunner`。
+*/
+function opencliRunnerOf(read, options = {}) {
+	return async (args) => {
+		const result = await read({
+			kind: "command",
+			adapter: "opencli",
+			argv: [...args],
+			...options.timeoutMs === void 0 ? {} : { timeoutMs: options.timeoutMs }
+		});
+		if (result.ok) return { stdout: JSON.stringify(result.data) };
+		throw failedOf(args, result.error);
+	};
+}
+//#endregion
+//#region ../shared/dist/host/lib-runners.js
+function runnerOf(runtimes, runtime) {
+	return runtime === "opencli" ? runtimes.opencli : void 0;
+}
+function setterNameOf(runtime) {
+	return `set${runtime.charAt(0).toUpperCase()}${runtime.slice(1)}Runner`;
+}
+/**
+* 给声明了 `runs` 的 lib 注入「跑这个运行时」的执行器：库侧按约定暴露 `setOpencliRunner`
+* （运行时名字首字母大写 + `Runner`），外壳在每次 `load` 之后把执行器交给它。
+*
+* 没暴露的（版本旧）就保持它自己的行为（按 PATH 找），只记一条 warn；不熟悉的运行时同样只 warn。
+* @param libs 原来的读库口。
+* @param runtimes 外壳手上有的执行器，按运行时名字给。
+* @param logger 记 warn 的地方（默认不记）。
+* @returns 包好的读库口；`load` 的签名与返回不变。
+*/
+function withLibRunners(libs, runtimes, logger) {
+	const warned = /* @__PURE__ */ new Set();
+	const warnOnce = (key, message) => {
+		if (warned.has(key)) return;
+		warned.add(key);
+		logger?.warn?.(message);
+	};
+	return { async load(need, entry) {
+		const module = await libs.load(need, entry);
+		for (const runtime of need.runs ?? []) {
+			const runner = runnerOf(runtimes, runtime);
+			if (runner === void 0) {
+				warnOnce(`${need.name}:${runtime}:unsupported`, `[dsh-workbench] ${need.name} 声明了自己会跑 ${runtime}，但工作台没有这个执行器 —— 它会按自己的方式找`);
+				continue;
+			}
+			const setter = typeof module === "object" && module !== null ? module[setterNameOf(runtime)] : void 0;
+			if (typeof setter !== "function") {
+				warnOnce(`${need.name}:${entry}:${runtime}:missing`, `[dsh-workbench] ${need.name} 声明了自己会跑 ${runtime}，但这一版没有 ${setterNameOf(runtime)} —— 它会按 PATH 找`);
+				continue;
+			}
+			setter.call(module, runner);
+		}
+		return module;
+	} };
+}
+//#endregion
 //#region ../shared/dist/host/value-handoff.js
 function handoffId(entry) {
 	return `${String(entry.fact.length)}:${entry.fact}${entry.key}`;
@@ -17486,6 +17584,7 @@ function notifyLongTaskStop(agents, unit, change) {
 //#endregion
 //#region src/app/host.ts
 var name = "dsh-workbench";
+var LIB_OPENCLI_TIMEOUT_MS = 18e5;
 var inject = ["webServer"];
 async function defaultAdapterSet(ctx) {
 	return (await import("@dsh-workbench/adapters-default")).createAdapterSet(ctx);
@@ -17506,6 +17605,7 @@ async function apply(ctx, config) {
 	else if (loaded.failure !== "not-configured") ctx.logger?.warn?.(`[dsh-workbench] 适配器集合没生效（${loaded.failure}）：${loaded.detail}；先用默认集合`);
 	ctx.provide(WORKBENCH_ADAPTERS, adapters);
 	const opencli = adapters.runtime.opencliCommand(ctx);
+	const libRunners = adapters.libs === void 0 ? void 0 : withLibRunners(adapters.libs, { opencli: opencliRunnerOf((request) => adapters.data.read(request), { timeoutMs: LIB_OPENCLI_TIMEOUT_MS }) }, ctx.logger);
 	const shell = ctx.get("shell");
 	const routes = createHostRoutes({
 		ctx,
@@ -17682,7 +17782,7 @@ async function apply(ctx, config) {
 				installable: () => installableUnitsOf(units),
 				store,
 				data: adapters.data,
-				libs: adapters.libs,
+				libs: libRunners,
 				git: adapters.git,
 				commands: adapters.commands,
 				probe: (unit, options) => probeOne(unit, options?.force ?? false),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/core",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "个人工作台：Agent 工作台（左栏 + 常驻对话 + 自研右侧数据面板）。",
   "type": "module",
   "icon": "./icon.svg",
@@ -100,8 +100,8 @@
     "proper-lockfile": "^4.1.2",
     "which": "^7.0.0",
     "write-file-atomic": "^8.0.0",
-    "@dsh-workbench/shared": "1.1.6",
-    "@dsh-workbench/adapters-default": "1.1.6"
+    "@dsh-workbench/shared": "1.1.7",
+    "@dsh-workbench/adapters-default": "1.1.7"
   },
   "license": "MIT",
   "repository": {

package/skills/workbench-module-diy/TOOLS.md

@@ -107,7 +107,13 @@
       { "kind": "local", "env": "ACME_PLUGIN_PATH" }
     ]
   },
-  { "kind": "lib", "name": "opencli-workflow", "purpose": "发布编排" },
+  {
+    "kind": "lib",
+    "name": "opencli-workflow",
+    "version": "^1.1.25",
+    "runs": ["opencli"],
+    "purpose": "发布编排"
+  },
   {
     "kind": "bin",
     "name": "acme",
@@ -122,6 +128,10 @@
 - `sources` 按顺序试（本地 → 私有 → 公共）。没写 `sources` 就是「我自己装，你只帮我判」——外壳只探不代装。
 - `bin` 想让人一键装，就写 `install.line`（一条能直接粘进终端的命令，`platforms` 可限定平台）；
   不写就只显示「缺这条命令」，按钮都不会有。`docs` 是给人和 agent 看的补充链接。
+- `lib` 自己起运行时的命令（比如发布编排库自己 `execFile('opencli')`）就写 `runs: ["opencli"]`：
+  外壳把它手上那份「跑 opencli」的执行器注入进去（库侧约定暴露 `setOpencliRunner`），
+  于是编排与面板用同一份 opencli（同一套插件、同一份登录态）。不写 `runs` 就按库自己的 PATH 找。
+  库版本太旧、没有 `setOpencliRunner` 时外壳只记一条 warn，照旧按 PATH 跑；用 `version` 卡住那一版即可。
 - `extension` 的 `sources[].kind` 只有 `npm` / `git` / `local`；`lib` 只认 `npm`。
   未知 `kind` 或 `source.kind` 判红；need 里未知字段只警告，`x-` 前缀忽略。
 - 未装好文案由模块写：`libInstallCommand({ need, source })`（`@dsh-workbench/shared/host`）拼好源与缓存目录，