@dsh-workbench/core 1.1.5 → 1.1.7

package/dist/host/index.js

@@ -1,4 +1,4 @@
-import path, { basename, delimiter, dirname, join, resolve } from "node:path";
+import path, { basename, delimiter, dirname, join, relative, resolve, sep } from "node:path";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc.js";
 import { createHash, randomUUID } from "node:crypto";
@@ -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}`;
@@ -4896,6 +4994,11 @@ function checkVersionRange(contract, version) {
 	if (parsed === null) return "malformed";
 	return import_semver.default.satisfies(parsed, range) ? "satisfied" : "unsatisfied";
 }
+//#endregion
+//#region ../shared/dist/contract/protocol/market-index.js
+var MARKET_INDEX_DIR = "market";
+var MARKET_ARTIFACTS_DIR = "artifacts";
+var MARKET_INDEX_PATH = "market.json";
 var MARKET_DISCOVER_ROUTE = "panels/market-discover";
 var MARKET_DOC_ROUTE = "panels/market-doc";
 var MARKET_GIT_PROBE_ROUTE = "panels/git-probe";
@@ -4917,34 +5020,39 @@ function marketText(value, locale) {
 	return locale.toLowerCase().startsWith("zh") ? zh || en : en || zh;
 }
 //#endregion
-//#region ../shared/dist/host/market-index.js
-var MARKET_INDEX_SEED = "{\n  \"format\": 1,\n  \"plugins\": []\n}\n";
-var MARKET_INDEX_README_LINES = [
-	"# 模块市场索引",
-	"",
-	"这个仓库给 DeepSeek Harness 工作台当模块市场索引：`market.json`（format 1）列出可安装的模块与版本。",
-	"",
-	"## 发布模块",
-	"",
-	"在模块包里运行：",
-	"",
-	"```bash",
-	"dsh-wb-module release --index <本仓库地址> --index-policy artifacts-in-repo",
-	"```",
-	"",
-	"产物会提交到 `packages/<包名>/`（带 scope 时是 `packages/@scope/名字/`），并更新 `market.json`。",
-	"",
-	"一个包名归第一次发布的人（`market.json` 里的 `owner`）。换一个署名发同名会被拒；要换人，先把这一条的 `owner` 改成新的人。",
-	"同一个市场里，一个模块 id（`metadata.unit`）只能被一个条目使用；另一个包名想用同一个 id / 产物目录也会被拒。",
-	"",
-	"## 使用这个索引",
-	"",
-	"在工作台的「模块市场 → 发现」里添加本仓库地址，即可浏览与安装。",
-	""
-];
+//#region ../shared/dist/host/market-index-parse.js
 var NPM_NAME = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
 var GIT_COMMIT = /^[0-9a-f]{40}$/;
 var MAX_ICON_CHARS = 32768;
+function compareSemver(left, right) {
+	return compareVersions(left, right);
+}
+function httpUrlProblem(url) {
+	let parsed;
+	try {
+		parsed = new URL(url);
+	} catch {
+		return "不是合法 URL";
+	}
+	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return "只收 http / https";
+	if (parsed.username !== "" || parsed.password !== "") return "URL 不能带凭据";
+	if (parsed.search !== "" || parsed.hash !== "") return "URL 不能带 query / fragment";
+}
+function gitUrlOk(url) {
+	if (url === "") return false;
+	if (/^[^@\s]+@[^@\s:]+:[^@\s]+$/.test(url)) return true;
+	let parsed;
+	try {
+		parsed = new URL(url);
+	} catch {
+		return false;
+	}
+	if (parsed.protocol !== "https:" && parsed.protocol !== "ssh:" && parsed.protocol !== "http:") return false;
+	if (parsed.password !== "") return false;
+	if (parsed.username !== "" && parsed.protocol !== "ssh:") return false;
+	if (parsed.search !== "" || parsed.hash !== "") return false;
+	return true;
+}
 function asRecord$4(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
@@ -4964,22 +5072,19 @@ function asLocalized(value) {
 		...en === "" ? {} : { en }
 	};
 }
-function problem(kind, detail, at) {
+function problem$1(kind, detail, at) {
 	return {
 		kind,
 		detail,
 		...at === void 0 ? {} : { at }
 	};
 }
-function compareSemver(left, right) {
-	return compareVersions(left, right);
-}
 function sourceOf(raw, at) {
 	const record = asRecord$4(raw);
-	if (record === void 0) return problem("source", "source 必须是一个对象", at);
+	if (record === void 0) return problem$1("source", "source 必须是一个对象", at);
 	if (record["type"] === "npm") {
 		const registry = record["registry"];
-		if (registry !== void 0 && asText$4(registry) === "") return problem("source", "npm source 的 registry 必须是非空字符串", at);
+		if (registry !== void 0 && asText$4(registry) === "") return problem$1("source", "npm source 的 registry 必须是非空字符串", at);
 		return {
 			type: "npm",
 			...registry === void 0 ? {} : { registry: asText$4(registry) }
@@ -4988,8 +5093,8 @@ function sourceOf(raw, at) {
 	if (record["type"] === "git") {
 		const url = asText$4(record["url"]);
 		const commit = asText$4(record["commit"]);
-		if (url === "") return problem("source", "git source 缺 url", at);
-		if (!GIT_COMMIT.test(commit)) return problem("git-commit", `git source 的 commit 必须是 40 位小写 SHA（现在是 ${JSON.stringify(commit)}）`, at);
+		if (url === "") return problem$1("source", "git source 缺 url", at);
+		if (!GIT_COMMIT.test(commit)) return problem$1("git-commit", `git source 的 commit 必须是 40 位小写 SHA（现在是 ${JSON.stringify(commit)}）`, at);
 		const path = record["path"];
 		return {
 			type: "git",
@@ -4998,17 +5103,17 @@ function sourceOf(raw, at) {
 			...path === void 0 || asText$4(path) === "" ? {} : { path: asText$4(path) }
 		};
 	}
-	return problem("source", "source.type 只能是 npm 或 git", at);
+	return problem$1("source", "source.type 只能是 npm 或 git", at);
 }
 function versionOf(raw, at) {
 	const record = asRecord$4(raw);
-	if (record === void 0) return problem("version", "版本必须是一个对象", at);
+	if (record === void 0) return problem$1("version", "版本必须是一个对象", at);
 	const version = asText$4(record["version"]);
-	if (!isValidVersion(version)) return problem("version", `版本号不是合法 SemVer：${JSON.stringify(version)}`, at);
+	if (!isValidVersion(version)) return problem$1("version", `版本号不是合法 SemVer：${JSON.stringify(version)}`, at);
 	const source = sourceOf(record["source"], `${at}.source`);
 	if ("kind" in source) return source;
 	const timestamp = record["publishTimestamp"];
-	if (timestamp !== void 0 && (!Number.isInteger(timestamp) || timestamp < 0)) return problem("timestamp", "publishTimestamp 必须是 Unix 秒整数", at);
+	if (timestamp !== void 0 && (!Number.isInteger(timestamp) || timestamp < 0)) return problem$1("timestamp", "publishTimestamp 必须是 Unix 秒整数", at);
 	const engines = asRecord$4(record["engines"]);
 	const dsh = engines === void 0 ? "" : asText$4(engines["dsh"]);
 	return {
@@ -5019,33 +5124,33 @@ function versionOf(raw, at) {
 	};
 }
 function versionsOf$1(raw, at) {
-	if (!Array.isArray(raw) || raw.length === 0) return problem("versions", "versions 必须是非空数组", at);
+	if (!Array.isArray(raw) || raw.length === 0) return problem$1("versions", "versions 必须是非空数组", at);
 	const versions = [];
 	const seen = /* @__PURE__ */ new Set();
 	for (const [index, item] of raw.entries()) {
 		const parsed = versionOf(item, `${at}[${String(index)}]`);
 		if ("kind" in parsed) return parsed;
-		if (seen.has(parsed.version)) return problem("versions", `版本重复：${parsed.version}`, at);
+		if (seen.has(parsed.version)) return problem$1("versions", `版本重复：${parsed.version}`, at);
 		seen.add(parsed.version);
 		versions.push(parsed);
 	}
 	for (let index = 1; index < versions.length; index += 1) {
 		const order = compareSemver(versions[index - 1]?.version ?? "", versions[index]?.version ?? "");
-		if (order === void 0 || order < 0) return problem("version-order", "versions 必须按 SemVer 降序", at);
+		if (order === void 0 || order < 0) return problem$1("version-order", "versions 必须按 SemVer 降序", at);
 	}
 	return versions;
 }
 function iconProblem(icon) {
-	if (icon.length > MAX_ICON_CHARS) return problem("icon", "icon 超过 32 KiB");
-	if (icon.startsWith("data:image/")) return icon.includes(";base64,") ? void 0 : problem("icon", "data URL 必须是 base64");
+	if (icon.length > MAX_ICON_CHARS) return problem$1("icon", "icon 超过 32 KiB");
+	if (icon.startsWith("data:image/")) return icon.includes(";base64,") ? void 0 : problem$1("icon", "data URL 必须是 base64");
 	if (/^https?:\/\//i.test(icon)) return void 0;
-	return problem("icon", "icon 只能是 base64 data URL 或 http(s) URL");
+	return problem$1("icon", "icon 只能是 base64 data URL 或 http(s) URL");
 }
 var MAX_OWNER_CHARS = 200;
 var UNIT_ID = /^[a-z][a-z0-9-]*$/;
 function ownerProblem(owner) {
-	if (/[\r\n]/u.test(owner)) return problem("owner", "owner 只能是一行署名");
-	if (owner.length > MAX_OWNER_CHARS) return problem("owner", "owner 超过 200 字");
+	if (/[\r\n]/u.test(owner)) return problem$1("owner", "owner 只能是一行署名");
+	if (owner.length > MAX_OWNER_CHARS) return problem$1("owner", "owner 超过 200 字");
 }
 function metadataOf(raw) {
 	const record = asRecord$4(raw);
@@ -5068,9 +5173,9 @@ function metadataOf(raw) {
 }
 function entryOf$1(raw, at) {
 	const record = asRecord$4(raw);
-	if (record === void 0) return problem("plugin", "插件条目必须是对象", at);
+	if (record === void 0) return problem$1("plugin", "插件条目必须是对象", at);
 	const name = asText$4(record["name"]);
-	if (name === "" || name.length > 214 || !NPM_NAME.test(name)) return problem("name", `不是合法 npm 包名：${JSON.stringify(name)}`, at);
+	if (name === "" || name.length > 214 || !NPM_NAME.test(name)) return problem$1("name", `不是合法 npm 包名：${JSON.stringify(name)}`, at);
 	const versions = versionsOf$1(record["versions"], `${at}.versions`);
 	if ("kind" in versions) return versions;
 	const icon = asText$4(record["icon"]);
@@ -5088,7 +5193,7 @@ function entryOf$1(raw, at) {
 	}
 	const homepage = asText$4(record["homepage"]);
 	const metadata = metadataOf(record["metadata"]);
-	if (metadata?.unit !== void 0 && !UNIT_ID.test(metadata.unit)) return problem("unit", `metadata.unit 只能是小写字母开头的 a-z0-9-（现在是 ${JSON.stringify(metadata.unit)}）`, at);
+	if (metadata?.unit !== void 0 && !UNIT_ID.test(metadata.unit)) return problem$1("unit", `metadata.unit 只能是小写字母开头的 a-z0-9-（现在是 ${JSON.stringify(metadata.unit)}）`, at);
 	return {
 		name,
 		versions,
@@ -5105,16 +5210,16 @@ function parseMarketIndex(raw) {
 	const record = asRecord$4(raw);
 	if (record === void 0) return {
 		ok: false,
-		problems: [problem("not-object", "索引必须是一个 JSON 对象")]
+		problems: [problem$1("not-object", "索引必须是一个 JSON 对象")]
 	};
 	if (record["format"] !== 1) return {
 		ok: false,
-		problems: [problem("format", `format 必须是 ${String(1)}（现在是 ${JSON.stringify(record["format"])}）`)]
+		problems: [problem$1("format", `format 必须是 ${String(1)}（现在是 ${JSON.stringify(record["format"])}）`)]
 	};
 	const plugins = record["plugins"];
 	if (!Array.isArray(plugins)) return {
 		ok: false,
-		problems: [problem("plugins", "plugins 必须是数组")]
+		problems: [problem$1("plugins", "plugins 必须是数组")]
 	};
 	const entries = [];
 	const problems = [];
@@ -5126,7 +5231,7 @@ function parseMarketIndex(raw) {
 			continue;
 		}
 		if (seen.has(parsed.name)) {
-			problems.push(problem("duplicate-name", `插件名重复：${parsed.name}`, `plugins[${String(index)}]`));
+			problems.push(problem$1("duplicate-name", `插件名重复：${parsed.name}`, `plugins[${String(index)}]`));
 			continue;
 		}
 		seen.add(parsed.name);
@@ -5156,10 +5261,13 @@ function parseMarketIndexJson(text) {
 	} catch (error) {
 		return {
 			ok: false,
-			problems: [problem("not-json", `JSON 解析失败：${error instanceof Error ? error.message : String(error)}`)]
+			problems: [problem$1("not-json", `JSON 解析失败：${error instanceof Error ? error.message : String(error)}`)]
 		};
 	}
 }
+function sortMarketVersions(versions) {
+	return [...versions].sort((left, right) => compareSemver(right.version, left.version) ?? 0);
+}
 function marketEntryLabels(entry) {
 	return entry.metadata?.labels ?? [];
 }
@@ -5195,7 +5303,7 @@ function parseSourceConfig(raw) {
 	const record = asRecord$4(raw);
 	if (record === void 0) return {
 		ok: false,
-		problem: problem("source", "索引源必须是对象")
+		problem: problem$1("source", "索引源必须是对象")
 	};
 	const id = asText$4(record["id"]);
 	const label = asText$4(record["label"]);
@@ -5203,21 +5311,21 @@ function parseSourceConfig(raw) {
 	const url = asText$4(record["url"]);
 	if (id === "") return {
 		ok: false,
-		problem: problem("source", "索引源缺 id")
+		problem: problem$1("source", "索引源缺 id")
 	};
 	if (label === "") return {
 		ok: false,
-		problem: problem("source", "索引源缺 label")
+		problem: problem$1("source", "索引源缺 label")
 	};
 	if (kind !== "http" && kind !== "git") return {
 		ok: false,
-		problem: problem("source", "kind 只能是 http 或 git")
+		problem: problem$1("source", "kind 只能是 http 或 git")
 	};
 	if (kind === "http") {
 		const bad = httpUrlProblem(url);
 		if (bad !== void 0) return {
 			ok: false,
-			problem: problem("source", bad)
+			problem: problem$1("source", bad)
 		};
 		return {
 			ok: true,
@@ -5231,7 +5339,7 @@ function parseSourceConfig(raw) {
 	}
 	if (!gitUrlOk(url)) return {
 		ok: false,
-		problem: problem("source", "git 地址不合格（只收 https / ssh / scp 形式，且不能带凭据）")
+		problem: problem$1("source", "git 地址不合格（只收 https / ssh / scp 形式，且不能带凭据）")
 	};
 	const ref = asText$4(record["ref"]);
 	const path = asText$4(record["path"]);
@@ -5239,7 +5347,7 @@ function parseSourceConfig(raw) {
 	const policy = record["policy"];
 	if (policy !== void 0 && policy !== "artifacts-in-repo" && policy !== "catalog-only") return {
 		ok: false,
-		problem: problem("source", "policy 只能是 artifacts-in-repo 或 catalog-only")
+		problem: problem$1("source", "policy 只能是 artifacts-in-repo 或 catalog-only")
 	};
 	return {
 		ok: true,
@@ -5255,31 +5363,270 @@ function parseSourceConfig(raw) {
 		}
 	};
 }
-function httpUrlProblem(url) {
-	let parsed;
-	try {
-		parsed = new URL(url);
-	} catch {
-		return "不是合法 URL";
+function docFieldsOf(record, at) {
+	const name = asText$4(record["name"]);
+	if (name === "" || name.length > 214 || !NPM_NAME.test(name)) return problem$1("name", `不是合法 npm 包名：${JSON.stringify(name)}`, at);
+	const icon = asText$4(record["icon"]);
+	if (icon !== "") {
+		const badIcon = iconProblem(icon);
+		if (badIcon !== void 0) return badIcon;
 	}
-	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return "只收 http / https";
-	if (parsed.username !== "" || parsed.password !== "") return "URL 不能带凭据";
-	if (parsed.search !== "" || parsed.hash !== "") return "URL 不能带 query / fragment";
+	const owner = asText$4(record["owner"]);
+	if (owner !== "") {
+		const badOwner = ownerProblem(owner);
+		if (badOwner !== void 0) return badOwner;
+	}
+	const metadata = metadataOf(record["metadata"]);
+	if (metadata?.unit !== void 0 && !UNIT_ID.test(metadata.unit)) return problem$1("unit", `metadata.unit 只能是小写字母开头的 a-z0-9-（现在是 ${JSON.stringify(metadata.unit)}）`, at);
+	const title = asLocalized(record["title"]);
+	const description = asLocalized(record["description"]);
+	const author = asText$4(record["author"]);
+	const homepage = asText$4(record["homepage"]);
+	return {
+		name,
+		...title === void 0 ? {} : { title },
+		...description === void 0 ? {} : { description },
+		...author === "" ? {} : { author },
+		...owner === "" ? {} : { owner },
+		...homepage === "" ? {} : { homepage },
+		...icon === "" ? {} : { icon },
+		...metadata === void 0 ? {} : { metadata }
+	};
 }
-function gitUrlOk(url) {
-	if (url === "") return false;
-	if (/^[^@\s]+@[^@\s:]+:[^@\s]+$/.test(url)) return true;
-	let parsed;
-	try {
-		parsed = new URL(url);
-	} catch {
-		return false;
+function parseMarketEntryDoc(raw) {
+	const record = asRecord$4(raw);
+	if (record === void 0) return {
+		ok: false,
+		problems: [problem$1("entry", "条目文件必须是一个 JSON 对象")]
+	};
+	const fields = docFieldsOf(record, "entry");
+	if ("kind" in fields) return {
+		ok: false,
+		problems: [fields]
+	};
+	const version = asText$4(record["version"]);
+	const timestamp = record["publishTimestamp"];
+	if (timestamp !== void 0 && (!Number.isInteger(timestamp) || timestamp < 0)) return {
+		ok: false,
+		problems: [problem$1("timestamp", "publishTimestamp 必须是 Unix 秒整数", "entry")]
+	};
+	if (version === "") {
+		if (timestamp === void 0) return {
+			ok: false,
+			problems: [problem$1("timestamp", "元数据文件要有 publishTimestamp", "entry")]
+		};
+		const epoch = record["epoch"];
+		if (epoch !== void 0 && (!Number.isInteger(epoch) || epoch < 0)) return {
+			ok: false,
+			problems: [problem$1("timestamp", "epoch 必须是非负整数", "entry")]
+		};
+		return {
+			ok: true,
+			doc: {
+				...fields,
+				publishTimestamp: timestamp,
+				...epoch === void 0 ? {} : { epoch }
+			}
+		};
 	}
-	if (parsed.protocol !== "https:" && parsed.protocol !== "ssh:" && parsed.protocol !== "http:") return false;
-	if (parsed.password !== "") return false;
-	if (parsed.username !== "" && parsed.protocol !== "ssh:") return false;
-	if (parsed.search !== "" || parsed.hash !== "") return false;
-	return true;
+	if (!isValidVersion(version)) return {
+		ok: false,
+		problems: [problem$1("version", `版本号不是合法 SemVer：${JSON.stringify(version)}`, "entry")]
+	};
+	const source = sourceOf(record["source"], "entry.source");
+	if ("kind" in source) return {
+		ok: false,
+		problems: [source]
+	};
+	const engines = asRecord$4(record["engines"]);
+	const dsh = engines === void 0 ? "" : asText$4(engines["dsh"]);
+	return {
+		ok: true,
+		doc: {
+			...fields,
+			version,
+			source,
+			...timestamp === void 0 ? {} : { publishTimestamp: timestamp },
+			...dsh === "" ? {} : { engines: { dsh } }
+		}
+	};
+}
+function indexPathBase(dir) {
+	return dir.replace(/^\/+|\/+$/g, "") || "market";
+}
+function marketEntryPath(dir, name, version) {
+	if (!NPM_NAME.test(name)) throw new Error(`不是合法包名：${JSON.stringify(name)}`);
+	if (!isValidVersion(version)) throw new Error(`不是合法版本号：${JSON.stringify(version)}`);
+	return `${indexPathBase(dir)}/${name}/${version}.json`;
+}
+//#endregion
+//#region ../shared/dist/host/market-index.js
+var MARKET_ENTRIES_README_LINES = [
+	"# 索引目录",
+	"",
+	"一个包一个目录，一个版本一个文件：`market/<包名>/<版本>.json`；产物在 `artifacts/<包名>/<版本>/`。",
+	"",
+	"`meta-<epoch>-<随机后缀>.json` 是只改标题 / 署名 / 说明时追加的元数据快照，读取时按 epoch 取最新的一份。"
+];
+var MARKET_INDEX_README_LINES = [
+	"# 模块市场索引",
+	"",
+	"这个仓库给 DeepSeek Harness 工作台当模块市场索引：条目在 `market/<包名>/<版本>.json`，产物在 `artifacts/<包名>/<版本>/`。",
+	"",
+	"## 发布模块",
+	"",
+	"在模块包里运行：",
+	"",
+	"```bash",
+	"dsh-wb-module release --index <本仓库地址> --index-policy artifacts-in-repo",
+	"```",
+	"",
+	"产物会提交到 `artifacts/<包名>/<版本>/`，条目提交到 `market/<包名>/<版本>.json`。",
+	"发布只新增文件、不改已有文件，两台机器同时发也不会冲突；老条目的 `packages/<包名>/` 路径继续可用。",
+	"",
+	"一个包名归第一次发布的人（条目文件里的 `owner`）。换一个署名发同名会被拒；要换人，先把这一条的 `owner` 改成新的人。",
+	"同一个市场里，一个模块 id（`metadata.unit`）只能被一个条目使用；另一个包名想用同一个 id / 产物目录也会被拒。",
+	"",
+	"## 使用这个索引",
+	"",
+	"在工作台的「模块市场 → 发现」里添加本仓库地址，即可浏览与安装。",
+	""
+];
+function problem(kind, detail, at) {
+	return {
+		kind,
+		detail,
+		...at === void 0 ? {} : { at }
+	};
+}
+function docFieldsFromEntry(entry) {
+	return {
+		name: entry.name,
+		...entry.title === void 0 ? {} : { title: entry.title },
+		...entry.description === void 0 ? {} : { description: entry.description },
+		...entry.author === void 0 ? {} : { author: entry.author },
+		...entry.owner === void 0 ? {} : { owner: entry.owner },
+		...entry.homepage === void 0 ? {} : { homepage: entry.homepage },
+		...entry.icon === void 0 ? {} : { icon: entry.icon },
+		...entry.metadata === void 0 ? {} : { metadata: entry.metadata }
+	};
+}
+function marketVersionDocOf(entry, version) {
+	return {
+		...docFieldsFromEntry(entry),
+		...version
+	};
+}
+function assembleMarketIndex(files) {
+	const problems = [];
+	const groups = /* @__PURE__ */ new Map();
+	const ordered = [...files].sort((left, right) => left.path < right.path ? -1 : left.path > right.path ? 1 : 0);
+	for (const file of ordered) {
+		let raw;
+		try {
+			raw = JSON.parse(file.text);
+		} catch (error) {
+			problems.push(problem("not-json", `JSON 解析失败：${error instanceof Error ? error.message : String(error)}`, file.path));
+			continue;
+		}
+		const parsed = parseMarketEntryDoc(raw);
+		if (!parsed.ok) {
+			for (const one of parsed.problems) problems.push({
+				...one,
+				at: file.path
+			});
+			continue;
+		}
+		const doc = parsed.doc;
+		const group = groups.get(doc.name) ?? {
+			versions: /* @__PURE__ */ new Map(),
+			meta: void 0,
+			fallback: void 0
+		};
+		const at = doc.publishTimestamp ?? 0;
+		if ("version" in doc) {
+			if (group.versions.has(doc.version)) problems.push(problem("duplicate-version", `版本重复：${doc.version}`, file.path));
+			group.versions.set(doc.version, {
+				version: doc.version,
+				source: doc.source,
+				...doc.publishTimestamp === void 0 ? {} : { publishTimestamp: doc.publishTimestamp },
+				...doc.engines === void 0 ? {} : { engines: doc.engines }
+			});
+			if (group.fallback === void 0 || at > group.fallback.at || at === group.fallback.at && file.path > group.fallback.path) group.fallback = {
+				at,
+				path: file.path,
+				doc
+			};
+		} else {
+			const epoch = doc.epoch ?? 0;
+			if (group.meta === void 0 || epoch > group.meta.epoch || epoch === group.meta.epoch && at > group.meta.at || epoch === group.meta.epoch && at === group.meta.at && file.path > group.meta.path) group.meta = {
+				epoch,
+				at,
+				path: file.path,
+				doc
+			};
+		}
+		groups.set(doc.name, group);
+	}
+	if (problems.length > 0) return {
+		ok: false,
+		problems
+	};
+	const plugins = [...groups.entries()].map(([name, group]) => {
+		const meta = group.meta?.doc ?? group.fallback?.doc;
+		return {
+			name,
+			versions: sortMarketVersions([...group.versions.values()]),
+			...meta?.title === void 0 ? {} : { title: meta.title },
+			...meta?.description === void 0 ? {} : { description: meta.description },
+			...meta?.author === void 0 ? {} : { author: meta.author },
+			...meta?.owner === void 0 ? {} : { owner: meta.owner },
+			...meta?.homepage === void 0 ? {} : { homepage: meta.homepage },
+			...meta?.icon === void 0 ? {} : { icon: meta.icon },
+			...meta?.metadata === void 0 ? {} : { metadata: meta.metadata }
+		};
+	});
+	plugins.sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0);
+	return {
+		ok: true,
+		index: {
+			format: 1,
+			plugins
+		}
+	};
+}
+function marketEntryFilesOf(index, dir = MARKET_INDEX_DIR) {
+	const files = [];
+	for (const entry of index.plugins) for (const version of entry.versions) files.push({
+		path: marketEntryPath(dir, entry.name, version.version),
+		text: `${JSON.stringify(marketVersionDocOf(entry, version), null, 2)}\n`
+	});
+	return files;
+}
+function collectMarketEntryFiles(dir) {
+	if (!existsSync(dir)) return [];
+	const files = [];
+	const walk = (current) => {
+		for (const item of readdirSync(current, { withFileTypes: true })) {
+			const full = join(current, item.name);
+			if (item.isDirectory()) {
+				walk(full);
+				continue;
+			}
+			if (!item.name.endsWith(".json")) continue;
+			files.push({
+				path: relative(dir, full).split(sep).join("/"),
+				text: readFileSync(full, "utf8")
+			});
+		}
+	};
+	walk(dir);
+	return files;
+}
+function marketEntryFilesOfLegacy(text, dir = MARKET_INDEX_DIR) {
+	const parsed = parseMarketIndexJson(text);
+	if (!parsed.ok) return void 0;
+	return marketEntryFilesOf(parsed.index, dir);
 }
 //#endregion
 //#region ../shared/dist/host/market-index-claim.js
@@ -5324,8 +5671,11 @@ function claimOfEntry(entry, publisher) {
 		owner
 	};
 }
-function marketArtifactPath(name) {
-	return `packages/${name}`;
+function marketArtifactRoot(name) {
+	return `${MARKET_ARTIFACTS_DIR}/${name}`;
+}
+function marketArtifactPathFor(name, version) {
+	return `${MARKET_ARTIFACTS_DIR}/${name}/${version}`;
 }
 function entryUnitOf(entry) {
 	const unit = entry.metadata?.unit?.trim();
@@ -6470,7 +6820,7 @@ function publishClaimDenyOf(claim, name) {
 	if (claim === void 0) return void 0;
 	if (claim.state === "unit-taken") return `市场里 ${claim.entry} 已经用了这个模块 id —— 两个模块不能共用一个，装在一起会撞。给这个模块换一个 unit（dsh.workbench.unit）再发。`;
 	if (claim.state === "path-taken") return `市场仓库里的产物目录已经被 ${claim.entry} 占了 —— 换一个包名再发。`;
-	if (claim.state === "conflict") return `市场里 ${name} 已经有主了（${claim.owner}）—— 同一个名字不能换人发。换一个带团队 scope 的包名；你就是原来的作者（只是换了机器或署名），用 author 参数带上原来的署名；确实是接手，让索引维护者改 market.json 里这一条的 owner。`;
+	if (claim.state === "conflict") return `市场里 ${name} 已经有主了（${claim.owner}）—— 同一个名字不能换人发。换一个带团队 scope 的包名；你就是原来的作者（只是换了机器或署名），用 author 参数带上原来的署名；确实是接手，让索引维护者改 market/<包名>/ 条目文件里的 owner。`;
 }
 //#endregion
 //#region src/modules/panels/model/approval.ts
@@ -10148,10 +10498,16 @@ var EMPTY_INDEX = {
 	plugins: []
 };
 function publishedIndexOf(source) {
-	const file = join(workbenchRoot(), "market-index", marketSourceKey(source), "worktree", source.path ?? "market.json");
-	if (!existsSync(file)) return void 0;
+	const root = join(workbenchRoot(), "market-index", marketSourceKey(source), "worktree");
 	try {
-		const parsed = parseMarketIndexJson(readFileSync(file, "utf8"));
+		const files = collectMarketEntryFiles(join(root, source.path ?? "market"));
+		if (files.length > 0) {
+			const assembled = assembleMarketIndex(files);
+			return assembled.ok ? assembled.index : void 0;
+		}
+		const legacy = join(root, "market.json");
+		if (!existsSync(legacy)) return void 0;
+		const parsed = parseMarketIndexJson(readFileSync(legacy, "utf8"));
 		return parsed.ok ? parsed.index : void 0;
 	} catch {
 		return;
@@ -10192,8 +10548,8 @@ function marketOf(dir, name, version) {
 		market: {
 			url: source.url,
 			...source.ref === void 0 ? {} : { ref: source.ref },
-			indexPath: source.path ?? "market.json",
-			artifactPath: marketArtifactPath(name),
+			indexPath: source.path ?? "market",
+			artifactPath: marketArtifactPathFor(name, nextVersion ?? version),
 			files: ARTIFACTS.filter((one) => existsSync(join(dir, one))),
 			...nextVersion === void 0 ? {} : { nextVersion }
 		},
@@ -10290,7 +10646,7 @@ function publishPreviewOf(root, unit, options = {}) {
 		name,
 		publisher: author,
 		unit,
-		artifactPath: marketArtifactPath(name)
+		artifactPath: marketArtifactRoot(name)
 	});
 	return {
 		name,
@@ -12391,7 +12747,82 @@ function dependencyStillBehind(target, capabilities) {
 	}
 }
 //#endregion
+//#region src/shared/api/host/self-update-marker.ts
+function readSelfUpdateMarker(file) {
+	try {
+		const raw = JSON.parse(readFileSync(file, "utf8"));
+		return {
+			...typeof raw.pkg === "string" ? { pkg: raw.pkg } : {},
+			...typeof raw.state === "string" ? { state: raw.state } : {}
+		};
+	} catch {
+		return {};
+	}
+}
+//#endregion
+//#region src/modules/panels/model/market-swap-stuck.ts
+var DEFAULT_POLL_MS = 400;
+var DEFAULT_WAIT_MS = 6e4;
+function sleep(ms) {
+	return new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
+}
+function landedIn(after, input) {
+	if (after.kind !== "module") return false;
+	return input.to === "" ? after.version !== input.from : after.version === input.to;
+}
+async function swapExternally(deps, input) {
+	let marker;
+	try {
+		marker = deps.supply.startSelfUpdate({
+			dshHome: deps.dshHome,
+			profile: deps.profile,
+			pkg: input.pkg,
+			from: input.from,
+			to: input.to,
+			pinned: input.pinned
+		}, (message) => deps.logger?.warn?.(`[dsh-workbench] ${message}`)).paths.marker;
+	} catch (error) {
+		deps.logger?.warn?.(`[dsh-workbench] 外部换版起不来（${input.pkg}）：${error instanceof Error ? error.message : String(error)}`);
+		return;
+	}
+	const pollMs = deps.pollMs ?? DEFAULT_POLL_MS;
+	const deadline = Date.now() + (deps.waitMs ?? DEFAULT_WAIT_MS);
+	let state = "timeout";
+	while (Date.now() < deadline) {
+		const read = readSelfUpdateMarker(marker);
+		if (read.pkg === input.pkg && read.state !== void 0 && read.state !== "running") {
+			state = read.state;
+			break;
+		}
+		await sleep(pollMs);
+	}
+	const after = deps.installed?.(input.pkg) ?? {
+		kind: "unknown",
+		pkg: input.pkg
+	};
+	const version = after.kind === "module" ? after.version : "读不到";
+	deps.logger?.info?.(`[dsh-workbench] 外部换版 ${input.pkg}：${state}，盘上 ${version}`);
+	return landedIn(after, input) ? after : void 0;
+}
+//#endregion
 //#region src/modules/panels/model/market-update-bundle.ts
+var SHIPPED_APPLICATIONS = /* @__PURE__ */ new Set([
+	"applied",
+	"restart-required",
+	"overridden"
+]);
+function stillStuck(change, after, before) {
+	if (!SHIPPED_APPLICATIONS.has(change.application)) return true;
+	return before !== void 0 && after.kind === "module" && after.version === before;
+}
+function remedyOf(deps, change, before, afterVersion, spec) {
+	const name = deps.profileName ?? deps.profile;
+	if (name === void 0) return void 0;
+	if (!!SHIPPED_APPLICATIONS.has(change.application) && !(before !== void 0 && afterVersion === before)) return void 0;
+	return { command: `dsh plugin --profile ${name} add ${quoteShellArg(spec)}` };
+}
 async function restoreRemovedBundle(pkg, before, registry, deps) {
 	if (before === void 0) return void 0;
 	try {
@@ -12446,7 +12877,7 @@ async function updateModuleBundle(unit, deps) {
 		kind: "unknown",
 		pkg
 	}).kind === "module" ? void 0 : await restoreRemovedBundle(pkg, before, registry, deps);
-	const after = deps.installed?.(pkg) ?? {
+	let after = deps.installed?.(pkg) ?? {
 		kind: "unknown",
 		pkg
 	};
@@ -12456,12 +12887,43 @@ async function updateModuleBundle(unit, deps) {
 		after,
 		...restored === void 0 ? {} : { restored }
 	});
+	let change = verified.change;
+	let restoredVersion = verified.restored;
+	const swap = stillStuck(change, after, before) && before !== void 0 && deps.dshHome !== void 0 && deps.profileName !== void 0 ? await swapExternally({
+		supply,
+		installed: deps.installed,
+		dshHome: deps.dshHome,
+		profile: deps.profileName,
+		...deps.logger === void 0 ? {} : { logger: deps.logger },
+		...deps.swapWaitMs === void 0 ? {} : { waitMs: deps.swapWaitMs },
+		...deps.swapPollMs === void 0 ? {} : { pollMs: deps.swapPollMs }
+	}, {
+		pkg,
+		from: before,
+		to: latest ?? "",
+		pinned: latest !== void 0
+	}) : void 0;
+	if (swap !== void 0) {
+		const swapVersion = swap.kind === "module" ? swap.version : "";
+		after = swap;
+		restoredVersion = void 0;
+		change = {
+			application: "restart-required",
+			stage: "install",
+			changed: true,
+			target: pkg,
+			bundle: pkg,
+			...swapVersion === "" ? {} : { version: swapVersion }
+		};
+	}
 	await deps.refreshSupply(unit).catch(() => void 0);
+	const remedy = stillStuck(change, after, before) ? remedyOf(deps, change, before, after.kind === "module" ? after.version : void 0, spec) : void 0;
 	return {
 		...outcome,
-		change: verified.change,
+		change,
 		module: after,
-		...verified.restored === void 0 ? {} : { restored: verified.restored }
+		...restoredVersion === void 0 ? {} : { restored: restoredVersion },
+		...remedy === void 0 ? {} : { remedy }
 	};
 }
 //#endregion
@@ -12778,14 +13240,14 @@ function createPluginActions(options) {
 			unreadable: []
 		};
 	}
-	function decide(entry, held) {
+	function decide(entry, held, claimedBy) {
 		const plugin = pluginNameOf(entry);
 		if (plugin === void 0) return {
 			act: "keep",
 			kept: { kind: "unnamed" }
 		};
 		const refs = referencesOf();
-		const by = options.claimedBy?.(plugin) ?? [];
+		const by = claimedBy?.(plugin) ?? options.claimedBy?.(plugin) ?? [];
 		const retention = pluginRetentionOf({
 			held,
 			claimedBy: by,
@@ -12852,12 +13314,12 @@ function createPluginActions(options) {
 				name: decision.plugin
 			};
 		},
-		async sweep() {
+		async sweep(claimedBy) {
 			if (ledger === void 0) return [];
 			const removed = [];
 			for (const entry of ledger.all()) {
 				if (entry.releasedAt === void 0) continue;
-				const decision = decide(entry, false);
+				const decision = decide(entry, false, claimedBy);
 				if (decision.act === "keep") continue;
 				try {
 					await removeFiles(decision.plugin);
@@ -12886,17 +13348,18 @@ function createEnvDropper(options) {
 			unreadable: []
 		};
 	}
-	function usersOf(plugin, except) {
-		return catalog().filter((item) => item.id !== except && !(isReleased?.(item.id) ?? false) && needsOf(item).some((need) => need.kind === "extension" && need.name === plugin)).map((item) => item.id);
+	function usersOf(plugin, except, roster) {
+		return (roster ?? catalog()).filter((item) => item.id !== except && !(isReleased?.(item.id) ?? false) && needsOf(item).some((need) => need.kind === "extension" && need.name === plugin)).map((item) => item.id);
 	}
-	function libUsersOf(name, unit) {
-		return catalog().filter((item) => item.id !== unit && !(isReleased?.(item.id) ?? false) && needsOf(item).some((need) => need.kind === "lib" && need.name === name)).map((item) => item.id);
+	function libUsersOf(name, unit, roster) {
+		return roster.filter((item) => item.id !== unit && !(isReleased?.(item.id) ?? false) && needsOf(item).some((need) => need.kind === "lib" && need.name === name)).map((item) => item.id);
 	}
 	return {
 		usersOf,
-		async drop(unit, needs, before) {
+		async drop(unit, needs, before, roster) {
 			const kept = /* @__PURE__ */ new Set();
-			const index = buildSupplyIndex(catalog().filter((item) => options.isReleased?.(item.id) !== true).map((item) => ({
+			const known = roster ?? catalog();
+			const index = buildSupplyIndex(known.filter((item) => options.isReleased?.(item.id) !== true).map((item) => ({
 				id: item.id,
 				needs: needsOf(item)
 			})), { env: process.env });
@@ -12905,7 +13368,7 @@ function createEnvDropper(options) {
 			const onMachine = new Set(before.needs.filter((state) => state.kind === "extension" && state.status !== "missing").map((state) => state.name));
 			const unknown = !before.needs.some((state) => state.kind === "extension");
 			for (const need of extensions) {
-				const users = usersOf(need.name, unit);
+				const users = usersOf(need.name, unit, known);
 				const retention = pluginRetentionOf({
 					held: ledger?.heldAsPlugin(need.name) !== void 0,
 					claimedBy: users,
@@ -12925,7 +13388,7 @@ function createEnvDropper(options) {
 				await run(`${quoteShellArg(command)} plugin uninstall ${quoteShellArg(need.name)}`);
 			}
 			for (const need of libs) {
-				const keepers = libUsersOf(need.name, unit);
+				const keepers = libUsersOf(need.name, unit, known);
 				if (keepers.length > 0) {
 					for (const id of keepers) kept.add(id);
 					continue;
@@ -13234,7 +13697,8 @@ function createMarketService(options) {
 				pkg
 			};
 			const unit = module.kind === "module" ? module.unit : void 0;
-			const manifest = unit === void 0 ? void 0 : catalog().find((item) => item.id === unit);
+			const roster = catalog();
+			const manifest = unit === void 0 ? void 0 : roster.find((item) => item.id === unit);
 			const before = unit === void 0 ? void 0 : await capabilityOf(unit, true);
 			const change = await removeDshBundle({
 				manager,
@@ -13247,8 +13711,8 @@ function createMarketService(options) {
 				change,
 				keptFor: []
 			};
-			const keptFor = manifest === void 0 || before === void 0 ? [] : await envDropper.drop(unit, needsOf(manifest), before);
-			await plugins.sweep();
+			const keptFor = manifest === void 0 || before === void 0 ? [] : await envDropper.drop(unit, needsOf(manifest), before, roster);
+			await plugins.sweep((plugin) => envDropper.usersOf(plugin, unit, roster));
 			onUninstalled?.(unit);
 			return {
 				change,
@@ -13260,15 +13724,22 @@ function createMarketService(options) {
 		},
 		async updateBundle(unit) {
 			const manager = requireBundles();
+			const home = dshHome?.();
+			const profile = profileName?.() ?? (profileDir === void 0 || profileDir === null ? void 0 : basename(profileDir));
 			return updateModuleBundle(unit, {
 				supply,
 				modules,
 				installed,
 				shell,
 				manager,
+				...profile === void 0 ? {} : {
+					profile,
+					profileName: profile
+				},
+				...home === void 0 ? {} : { dshHome: home },
 				routeDeps: routeDeps(manager),
 				sweep: async () => {
-					await plugins.sweep();
+					await plugins.sweep((plugin) => envDropper.usersOf(plugin, void 0, catalog()));
 				},
 				refreshSupply: async (id) => {
 					await service.update(id);
@@ -14000,7 +14471,7 @@ function createMarketIndexReader(options) {
 			}
 		};
 		const repo = repoOf(options.root, source);
-		const path = (source.path ?? "market.json").replace(/^\/+/, "");
+		const path = ((source.path ?? "market").replace(/^\/+/, "") || "market").replace(/\/+$/, "");
 		const ref = (source.ref ?? "").trim();
 		let revision = "FETCH_HEAD";
 		mkdirSync(directoryOf(options.root, source), { recursive: true });
@@ -14025,17 +14496,6 @@ function createMarketIndexReader(options) {
 				detail: "仓库还没有任何提交"
 			}
 		}, repo);
-		const shown = await run(`git -C ${quoteShellArg(repo)} show ${revision}:${quoteShellArg(path)}`);
-		if (!shown.ok) {
-			if (shown.problem.kind === "git-file") return withBranch({
-				ok: false,
-				problem: {
-					kind: "git-missing-index",
-					detail: `索引文件 ${path} 不在仓库里`
-				}
-			}, repo);
-			return shown;
-		}
 		const head = await run(`git -C ${quoteShellArg(repo)} rev-parse ${revision}`);
 		if (!head.ok) return head;
 		const commit = head.stdout.trim();
@@ -14046,26 +14506,105 @@ function createMarketIndexReader(options) {
 				detail: `读到的 commit 不是 40 位：${commit}`
 			}
 		};
-		const parsed = parseMarketIndexJson(shown.stdout);
-		if (!parsed.ok) return {
+		const listed = await run(`git -C ${quoteShellArg(repo)} ls-tree -r ${quoteShellArg(commit)} -- ${quoteShellArg(path)}`);
+		if (!listed.ok) {
+			if (listed.problem.kind === "git-file") return withBranch({
+				ok: false,
+				problem: {
+					kind: "git-missing-index",
+					detail: `索引 ${path} 不在仓库里`
+				}
+			}, repo);
+			return listed;
+		}
+		const rows = listed.stdout.split("\n").map((line) => line.trim()).filter((line) => line !== "").flatMap((line) => {
+			const [meta, file] = line.split("	");
+			const type = (meta ?? "").split(" ")[1] ?? "";
+			return file === void 0 ? [] : [{
+				type,
+				file
+			}];
+		});
+		const legacy = rows.find((one) => one.type === "blob" && one.file === path);
+		const entries = rows.filter((one) => one.type === "blob" && one.file !== path && one.file.startsWith(`${path}/`) && one.file.endsWith(".json"));
+		const finish = async (index, text) => {
+			const fetchedAt = now();
+			await writeFileAtomic(indexFileOf(options.root, source), text);
+			await writeMeta(metaFileOf(options.root, source), {
+				fetchedAt,
+				commit
+			});
+			return {
+				ok: true,
+				index,
+				fetchedAt,
+				commit
+			};
+		};
+		const readLegacy = async (file) => {
+			const shown = await run(`git -C ${quoteShellArg(repo)} show ${quoteShellArg(commit)}:${quoteShellArg(file)}`);
+			if (!shown.ok) return void 0;
+			const parsed = parseMarketIndexJson(shown.stdout);
+			if (!parsed.ok) return {
+				ok: false,
+				problem: {
+					kind: "format",
+					detail: parsed.problems.map((one) => one.detail).join("；")
+				}
+			};
+			return finish(parsed.index, shown.stdout);
+		};
+		if (legacy !== void 0) {
+			const outcome = await readLegacy(path);
+			if (outcome !== void 0) return outcome;
+		}
+		if (entries.length > 0) {
+			const parts = [];
+			let failed;
+			const queue = [...entries];
+			const worker = async () => {
+				for (;;) {
+					const next = queue.shift();
+					if (next === void 0 || failed !== void 0) return;
+					const shown = await run(`git -C ${quoteShellArg(repo)} show ${quoteShellArg(commit)}:${quoteShellArg(next.file)}`);
+					if (!shown.ok) {
+						failed = shown;
+						return;
+					}
+					parts.push({
+						path: next.file,
+						text: shown.stdout
+					});
+				}
+			};
+			await Promise.all(Array.from({ length: Math.min(6, entries.length) }, () => worker()));
+			if (failed !== void 0) return failed;
+			const assembled = assembleMarketIndex(parts);
+			if (!assembled.ok) return {
+				ok: false,
+				problem: {
+					kind: "format",
+					detail: assembled.problems.map((one) => one.detail).join("；")
+				}
+			};
+			return finish(assembled.index, `${JSON.stringify(assembled.index, null, 2)}\n`);
+		}
+		if (listed.stdout.trim() !== "") {
+			const empty = {
+				format: 1,
+				plugins: []
+			};
+			return finish(empty, `${JSON.stringify(empty, null, 2)}\n`);
+		}
+		const legacyText = await readLegacy(MARKET_INDEX_PATH);
+		if (legacyText !== void 0) return legacyText;
+		return withBranch({
 			ok: false,
 			problem: {
-				kind: "format",
-				detail: parsed.problems.map((one) => one.detail).join("；")
+				kind: "git-missing-index",
+				detail: `索引 ${path} 不在仓库里`
 			}
-		};
-		const fetchedAt = now();
-		await writeFileAtomic(indexFileOf(options.root, source), shown.stdout);
-		await writeMeta(metaFileOf(options.root, source), {
-			fetchedAt,
-			commit
-		});
-		return {
-			ok: true,
-			index: parsed.index,
-			fetchedAt,
-			commit
-		};
+		}, repo);
 	}
 	async function read(source, callOptions = {}) {
 		const key = marketSourceKey(source);
@@ -14413,16 +14952,31 @@ function createMarketSourceInitializer(options) {
 			], workdir);
 			if (created.exitCode !== 0) throw new Error(`建分支 ${branch} 没过：${tailLines(created.stderr, 4)}`);
 		}
-		const indexPath = (source.path ?? "market.json").replace(/^\/+/, "") || "market.json";
-		const indexFile = join(workdir, indexPath);
+		const indexPath = ((source.path ?? "market").replace(/^\/+/, "") || "market").replace(/\/+$/, "");
+		const indexDir = join(workdir, indexPath);
+		const indexMarker = join(indexDir, "README.md");
 		const stampOnly = request.stampOnly === true;
-		if (stampOnly && !existsSync(indexFile)) throw new Error(`仓库里还没有 ${indexPath} —— 先选中这个源，按发现页的提示把它初始化成索引`);
+		if (stampOnly && !existsSync(indexDir)) throw new Error(`仓库里还没有 ${indexPath}/ —— 先选中这个源，按发现页的提示把它初始化成索引`);
 		const written = [];
 		if (!stampOnly) {
-			if (!existsSync(indexFile)) {
-				mkdirSync(dirname(indexFile), { recursive: true });
-				writeFileSync(indexFile, MARKET_INDEX_SEED);
-				written.push(indexPath);
+			const legacyFile = join(workdir, "market.json");
+			if (indexPath !== "market.json" && existsSync(legacyFile)) {
+				const migrated = marketEntryFilesOfLegacy(readFileSync(legacyFile, "utf8"), indexPath);
+				if (migrated !== void 0) {
+					for (const file of migrated) {
+						const target = join(workdir, ...file.path.split("/"));
+						mkdirSync(dirname(target), { recursive: true });
+						writeFileSync(target, file.text);
+						written.push(file.path);
+					}
+					rmSync(legacyFile);
+					written.push("market.json");
+				}
+			}
+			if (!existsSync(indexMarker)) {
+				mkdirSync(indexDir, { recursive: true });
+				writeFileSync(indexMarker, MARKET_ENTRIES_README_LINES.join("\n"));
+				written.push(`${indexPath}/README.md`);
 			}
 			const readmeFile = join(workdir, "README.md");
 			if (!existsSync(readmeFile)) {
@@ -14691,7 +15245,7 @@ function failureText(change) {
 	const code = change.errorCode ?? change.application;
 	if (code === "already-installed") return "它已经在这份 profile 里，而这次没能把它卸下来（这一版 dsh 不肯就地覆盖装，得先卸再装）";
 	const surface = hostSurface();
-	return REMOVE_BLOCKED.has(code) ? `旧版卸不掉，而这一版 dsh 又不许就地覆盖装 —— 让用户${surface.restartHint}，或者${surface.deployment === "desktop" ? "从 Desktop 的插件页更新" : "从终端更新"}` : code;
+	return REMOVE_BLOCKED.has(code) ? `旧版卸不掉（dsh 不肯就地覆盖正在用的模块），自动从外部换也没成 —— 让用户从终端跑 dsh plugin --profile <名字> add <包>@<版本>，跑完${surface.restartHint}` : code;
 }
 function describeInstall(spec, module, supply, change) {
 	return `${change.application === "applied" ? "装好了，已生效" : change.application === "restart-required" ? `装好了，要${hostSurface().restartHint} 才生效` : `没成功：${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}）`;
@@ -14825,6 +15379,14 @@ function registerMarketTools(ctx, market, sources) {
 		async execute(raw) {
 			const id = await idOrList(raw, MODULES_UNINSTALL_TOOL);
 			const outcome = await market.uninstall(id);
+			const change = outcome.change;
+			if (change !== void 0 && change.application !== "applied") {
+				const code = change.errorCode ?? change.application;
+				return {
+					module: outcome.entry,
+					text: `没卸下来：${id} 还在这份 profile 里（${code}）—— 这一版 dsh 不肯卸正在加载的模块。让用户从终端跑 dsh plugin --profile <profile> remove ${id} 的包，跑完重启一次工作台；别再调这个工具重试。`
+				};
+			}
 			const kept = outcome.keptFor.length === 0 ? "" : `（还有模块在面板上要用其中一份安装，所以那份留着：${outcome.keptFor.join("、")}）`;
 			return {
 				module: outcome.entry,
@@ -14980,7 +15542,7 @@ function registerMarketTools(ctx, market, sources) {
 				branch: result.branch,
 				commit: result.commit,
 				changed: true,
-				text: `已把「${source.label}」设为可发布（${source.url}，分支 ${result.branch}）—— 仓库本身没动。之后发布可以落到它的 ${source.path ?? "market.json"}。`
+				text: `已把「${source.label}」设为可发布（${source.url}，分支 ${result.branch}）—— 仓库本身没动。之后发布可以落到它的 ${source.path ?? "market"}/。`
 			};
 		}
 	};
@@ -17022,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);
@@ -17042,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,
@@ -17218,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),