@dsh-workbench/core 1.1.4 → 1.1.6

package/dist/host/index.js

@@ -1,8 +1,8 @@
-import path, { basename, 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";
-import fs, { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import fs, { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, unlinkSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import writeFileAtomic from "write-file-atomic";
@@ -142,7 +142,9 @@ var NEED_KEYS = [
 	"commands",
 	"version",
 	"sources",
-	"secret"
+	"secret",
+	"install",
+	"docs"
 ];
 var SOURCE_KEYS = [
 	"kind",
@@ -203,7 +205,7 @@ function sourcesProblemsOf(raw, at, allowed) {
 	if (raw === void 0) return [];
 	if (!Array.isArray(raw)) return [`${at}.sources 要是数组`];
 	if (raw.length === 0) return [`${at}.sources 是空数组 —— 不代装就整条删掉`];
-	if (allowed.length === 0) return [`${at} 这种需要不支持 sources —— 它没有「从哪装」这回事`];
+	if (allowed.length === 0) return [`${at} 这种需要不支持 sources —— 要代装就写 install（一条命令）`];
 	const errors = [];
 	raw.forEach((source, index) => {
 		const one = sourceProblemsOf(source, `${at}.sources[${index}]`);
@@ -222,11 +224,40 @@ function commonProblemsOf(raw, at) {
 	if (raw["id"] !== void 0 && text$3(raw["id"]) === "") errors.push(`${at}.id 是空串`);
 	return errors;
 }
+function binInstallProblemsOf(raw, at) {
+	if (raw === void 0) return [];
+	if (!isRecord$1(raw)) return [`${at}.install 要是对象`];
+	const errors = [];
+	for (const key of Object.keys(raw)) if (![
+		"kind",
+		"line",
+		"platforms",
+		"package",
+		"registryEnv",
+		"registryDefault"
+	].includes(key)) errors.push(`${at}.install 有不认识的字段 ${key}`);
+	const kind = text$3(raw["kind"]);
+	if (kind !== "command" && kind !== "npm") errors.push(`${at}.install.kind 只认 command（一条命令）或 npm（一个包，装进隔离运行时）`);
+	if (kind === "command" && text$3(raw["line"]) === "") errors.push(`${at}.install.line 没写 —— 要一条能直接粘进终端的命令`);
+	if (kind === "npm" && text$3(raw["package"]) === "") errors.push(`${at}.install.package 没写 —— 这个命令由哪个 npm 包提供`);
+	if (raw["registryDefault"] !== void 0 && !REGISTRY_PATTERN.test(text$3(raw["registryDefault"]))) errors.push(`${at}.install.registryDefault 要是 http(s):// 或 file:// 的源地址`);
+	if (raw["platforms"] !== void 0) {
+		if (!Array.isArray(raw["platforms"]) || raw["platforms"].length === 0) errors.push(`${at}.install.platforms 要是非空数组`);
+		else if (raw["platforms"].some((one) => ![
+			"darwin",
+			"linux",
+			"win32"
+		].includes(text$3(one)))) errors.push(`${at}.install.platforms 只认 darwin / linux / win32`);
+	}
+	return errors;
+}
 function perKindProblemsOf(kind, raw, at) {
 	const errors = [];
 	if (kind === "bin" || kind === "lib" || kind === "env") {
 		if (text$3(raw["name"]) === "") errors.push(`${at}.name 没写`);
 	}
+	if (kind === "bin") errors.push(...binInstallProblemsOf(raw["install"], at));
+	if (raw["docs"] !== void 0 && text$3(raw["docs"]) === "") errors.push(`${at}.docs 是空串`);
 	if (kind === "extension") {
 		if (text$3(raw["runtime"]) === "") errors.push(`${at}.runtime 没写 —— 扩展属于哪个运行时（如 opencli）`);
 		if (text$3(raw["name"]) === "") errors.push(`${at}.name 没写`);
@@ -1100,7 +1131,7 @@ var PHASES = [
 	"ready",
 	"error"
 ];
-function asRecord$6(value) {
+function asRecord$7(value) {
 	return typeof value === "object" && value !== null ? value : void 0;
 }
 function textOf$5(value, max) {
@@ -1114,7 +1145,7 @@ function atOf(value) {
 	return Math.trunc(value);
 }
 function errorOf(raw) {
-	const record = asRecord$6(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);
@@ -1131,7 +1162,7 @@ function errorOf(raw) {
 *   或一条都认不出（`unit` / `route` / `phase` / `at` 缺一）时 `ok: false` + 中文原因；认不出的单条静默跳过。
 */
 function parseCardsReport(payload) {
-	const record = asRecord$6(payload);
+	const record = asRecord$7(payload);
 	if (record === void 0) return {
 		ok: false,
 		message: "请求体要是一个对象"
@@ -1148,7 +1179,7 @@ function parseCardsReport(payload) {
 	};
 	const cards = [];
 	for (const item of raw.slice(0, 32)) {
-		const card = asRecord$6(item);
+		const card = asRecord$7(item);
 		if (card === void 0) continue;
 		const unit = textOf$5(card["unit"], 200);
 		const route = textOf$5(card["route"], 400);
@@ -1182,7 +1213,7 @@ function parseCardsReport(payload) {
 * @returns `workspace` / `unit` / `reason` 都不能空，缺一给 `ok: false` + 中文原因；`at` 缺省或不合法时取当前时间。
 */
 function parseCrashReport(payload) {
-	const record = asRecord$6(payload);
+	const record = asRecord$7(payload);
 	if (record === void 0) return {
 		ok: false,
 		message: "请求体要是一个对象"
@@ -1343,7 +1374,7 @@ var TARGET_CODE = {
 	name: "workbench/no-name",
 	requestId: "workbench/no-request-id"
 };
-function asRecord$5(value) {
+function asRecord$6(value) {
 	return typeof value === "object" && value !== null ? value : {};
 }
 function stringsOf$3(value) {
@@ -1386,7 +1417,7 @@ function requestOf$1(action, value) {
 	};
 }
 function parseProvisionBody(body) {
-	const raw = asRecord$5(body);
+	const raw = asRecord$6(body);
 	const action = raw.action;
 	if (typeof action !== "string" || !PROVISION_ACTIONS.includes(action)) return {
 		ok: false,
@@ -1426,6 +1457,7 @@ var WorkbenchDataError = class extends Error {
 	hint;
 	project;
 	helpUrl;
+	failure;
 	constructor(code, message, extra = {}) {
 		super(message);
 		this.name = "WorkbenchDataError";
@@ -1434,6 +1466,7 @@ var WorkbenchDataError = class extends Error {
 		if (extra.hint !== void 0) this.hint = extra.hint;
 		if (extra.project !== void 0) this.project = extra.project;
 		if (extra.helpUrl !== void 0) this.helpUrl = extra.helpUrl;
+		if (extra.failure !== void 0) this.failure = extra.failure;
 	}
 };
 //#endregion
@@ -1481,7 +1514,8 @@ function toErrorPayload(error) {
 			...data.detail === void 0 ? {} : { detail: data.detail },
 			...data.hint === void 0 ? {} : { hint: data.hint },
 			...data.helpUrl === void 0 ? {} : { helpUrl: data.helpUrl },
-			...data.project === void 0 ? {} : { project: data.project }
+			...data.project === void 0 ? {} : { project: data.project },
+			...data.failure === void 0 ? {} : { failure: data.failure }
 		};
 	}
 	return {
@@ -2231,7 +2265,10 @@ function tokenFamilyOf(name) {
 	return cut === -1 ? rest : rest.slice(0, cut);
 }
 //#endregion
-//#region ../shared/dist/host/tool-approval.js
+//#region ../shared/dist/contract/approval.js
+/**
+* agent 自己那句"这次想干什么"的参数名：插件命令族必填，审批屏把它画在详情座里，不进标题。
+*/
 var APPROVAL_NOTE_ARG = "approval_note";
 function oneLine(text) {
 	return text.replace(/\s+/g, " ").trim();
@@ -2295,10 +2332,11 @@ async function approvalFor(call, context = {}) {
 		reason: facts.blocked
 	};
 	if (context.skipAsk === true) return void 0;
+	const note = context.declaredNote === true && verdict.noteInDetail !== true ? approvalNoteOf(call) : void 0;
 	return {
 		kind: "ask",
 		reason: verdict.reason,
-		displayReason: compose(facts, verdict, context.declaredNote === true ? approvalNoteOf(call) : void 0)
+		displayReason: compose(facts, verdict, note)
 	};
 }
 //#endregion
@@ -2518,6 +2556,188 @@ function backgroundLine(command, argv) {
 	].join(" ");
 }
 //#endregion
+//#region ../shared/dist/host/install-failure.js
+var TARGET_FLAGS = [
+	"--prefix",
+	"--cache",
+	"--dir",
+	"--store-dir"
+];
+var INSTALL_VERBS = /^\s*npm\s+(i|install|add)\b/;
+var NPM_PATH = /^npm (?:error|ERR!) path (.+)$/m;
+function commandTokens(command) {
+	const tokens = [];
+	const token = /'([^']*)'|"([^"]*)"|(\S+)/g;
+	for (let match = token.exec(command); match !== null; match = token.exec(command)) tokens.push(match[1] ?? match[2] ?? match[3] ?? "");
+	return tokens;
+}
+function installTargets(command) {
+	const tokens = commandTokens(command);
+	const targets = [];
+	for (let index = 0; index < tokens.length - 1; index += 1) if (TARGET_FLAGS.includes(tokens[index] ?? "")) targets.push(tokens[index + 1] ?? "");
+	return targets.filter((target) => target !== "");
+}
+function failurePathIn(output) {
+	const path = NPM_PATH.exec(output)?.[1]?.trim();
+	return path === void 0 || path === "" ? void 0 : path;
+}
+function nearestDir(path) {
+	let at = path;
+	for (;;) {
+		const here = () => {
+			try {
+				return statSync(at).isDirectory();
+			} catch {
+				return false;
+			}
+		};
+		if (here()) return at;
+		const up = dirname(at);
+		if (up === at) return void 0;
+		at = up;
+	}
+}
+function writeStateOf(dir) {
+	try {
+		accessSync(dir, constants.W_OK);
+		return "ok";
+	} catch (error) {
+		return error.code === "EACCES" ? "denied" : "unknown";
+	}
+}
+function dirFacts(dir) {
+	try {
+		const stats = statSync(dir);
+		return {
+			mode: (stats.mode & 511).toString(8),
+			owner: {
+				uid: stats.uid,
+				gid: stats.gid
+			},
+			writable: writeStateOf(dir) === "ok"
+		};
+	} catch {
+		return;
+	}
+}
+function currentUser() {
+	return {
+		uid: process.getuid?.() ?? -1,
+		gid: process.getgid?.() ?? -1
+	};
+}
+function classifyInstallFailure(output) {
+	const text = output.toLowerCase();
+	if (/enospc|no space left/.test(text)) return "disk-full";
+	if (/eacces|eperm|permission denied|operation not permitted|access is denied/.test(text)) return "permission";
+	return "unknown";
+}
+function installFailureOf(facts) {
+	const kind = facts.kind ?? classifyInstallFailure(facts.output);
+	const path = facts.path;
+	const base = {
+		command: facts.command,
+		exitCode: facts.exitCode,
+		output: facts.output,
+		...path === void 0 ? {} : { path },
+		...facts.mode === void 0 ? {} : { mode: facts.mode },
+		...facts.owner === void 0 ? {} : { owner: facts.owner },
+		current: facts.current
+	};
+	if (kind === "disk-full") return {
+		...base,
+		kind,
+		fix: path === void 0 ? { kind: "handoff" } : {
+			kind: "space",
+			path
+		}
+	};
+	if (kind === "permission" && path !== void 0) {
+		const owner = facts.owner;
+		if (owner !== void 0 && owner.uid !== facts.current.uid && facts.current.uid >= 0) return {
+			...base,
+			kind,
+			fix: {
+				kind: "chown",
+				path,
+				uid: facts.current.uid,
+				gid: facts.current.gid
+			}
+		};
+		if (facts.writable === false) return {
+			...base,
+			kind,
+			fix: {
+				kind: "chmod",
+				path
+			}
+		};
+		if (facts.writable === true) return {
+			...base,
+			kind: "sandbox",
+			fix: { kind: "handoff" }
+		};
+	}
+	return {
+		...base,
+		kind,
+		fix: { kind: "handoff" }
+	};
+}
+function diagnoseInstallFailure(input) {
+	const current = currentUser();
+	const candidates = [
+		failurePathIn(input.output),
+		...installTargets(input.command),
+		input.fallback
+	].filter((path) => path !== void 0 && path !== "");
+	for (const candidate of candidates) {
+		const dir = nearestDir(candidate);
+		if (dir === void 0) continue;
+		const facts = dirFacts(dir);
+		if (facts === void 0) continue;
+		return installFailureOf({
+			command: input.command,
+			exitCode: input.exitCode,
+			output: input.output,
+			path: dir,
+			mode: facts.mode,
+			owner: facts.owner,
+			writable: facts.writable,
+			current
+		});
+	}
+	return installFailureOf({
+		command: input.command,
+		exitCode: input.exitCode,
+		output: input.output,
+		current
+	});
+}
+function installWriteProblem(input) {
+	if (!INSTALL_VERBS.test(input.command)) return void 0;
+	const current = currentUser();
+	const candidates = [...installTargets(input.command), input.fallback].filter((path) => path !== void 0 && path !== "");
+	for (const candidate of candidates) {
+		const dir = nearestDir(candidate);
+		if (dir === void 0) continue;
+		if (writeStateOf(dir) !== "denied") continue;
+		const facts = dirFacts(dir);
+		if (facts === void 0) continue;
+		return installFailureOf({
+			command: input.command,
+			exitCode: null,
+			output: "",
+			kind: "permission",
+			path: dir,
+			mode: facts.mode,
+			owner: facts.owner,
+			writable: facts.writable,
+			current
+		});
+	}
+}
+//#endregion
 //#region ../shared/dist/host/paths.js
 function isolatedRoot() {
 	return `${workbenchRoot()}/opencli`;
@@ -2531,6 +2751,46 @@ function vendorPluginsDir() {
 function libsPrefix() {
 	return `${isolatedRoot()}/libs`;
 }
+var OPENCLI_NPM_PACKAGE = "@jackwener/opencli";
+function toolchainOpencliDir() {
+	return `${isolatedRoot()}/toolchain/node_modules/${OPENCLI_NPM_PACKAGE}`;
+}
+function libsBinDir() {
+	return `${libsPrefix()}/node_modules/.bin`;
+}
+/**
+* 把隔离运行时的共用依赖 bin 目录放到 PATH 最前面（可执行文件都从这儿找）。
+* @param env 改哪份环境（默认当前进程）。
+* @returns 真的插进去了就 `true`；已经在里面就 `false`。
+*/
+function ensureLibsBinOnPath(env = process.env) {
+	const dir = libsBinDir();
+	const parts = (env.PATH ?? "").split(delimiter).filter((one) => one !== "");
+	if (parts.includes(dir)) return false;
+	env.PATH = [dir, ...parts].join(delimiter);
+	return true;
+}
+//#endregion
+//#region ../shared/dist/host/runtime-links.js
+/**
+* 让共用依赖也能 import opencli：把隔离运行时里那份 opencli 链接到 libs 的 node_modules。
+* 跑在 libs 里的命令（比如 opencli-workflow 带的 gitops）会按包名找 @jackwener/opencli，
+* 找不到就起不来 —— 它不在 libs 的依赖里，是运行时提供的那一份。
+* @returns 这次真的建了链接就 `true`；已经有了、或运行时那份还没装，就是 `false`。
+*/
+function ensureLibsOpencliPeer() {
+	const link = `${libsPrefix()}/node_modules/${OPENCLI_NPM_PACKAGE}`;
+	if (existsSync(link)) return false;
+	const target = toolchainOpencliDir();
+	if (!existsSync(target)) return false;
+	try {
+		mkdirSync(dirname(link), { recursive: true });
+		symlinkSync(target, link);
+		return true;
+	} catch {
+		return false;
+	}
+}
 //#endregion
 //#region ../shared/dist/host/adapters.js
 var WORKBENCH_ADAPTERS = "workbenchAdapters";
@@ -4066,7 +4326,7 @@ function registryFailure(change) {
 //#endregion
 //#region ../shared/dist/host/plugin.js
 var OPENCLI_MANIFEST_FILE = "opencli-plugin.json";
-function asRecord$4(value) {
+function asRecord$5(value) {
 	return typeof value === "object" && value !== null ? value : void 0;
 }
 function isCommandFile(name) {
@@ -4078,7 +4338,7 @@ function pluginManifestOf(dir) {
 	try {
 		const parsed = JSON.parse(readFileSync(join(dir, OPENCLI_MANIFEST_FILE), "utf8"));
 		if (Array.isArray(parsed)) return void 0;
-		return asRecord$4(parsed);
+		return asRecord$5(parsed);
 	} catch {
 		return;
 	}
@@ -4636,6 +4896,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";
@@ -4657,100 +4922,102 @@ 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 asRecord$3(value) {
+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;
 }
-function asText$3(value) {
+function asText$4(value) {
 	return typeof value === "string" ? value.trim() : "";
 }
 function asTextArray(value) {
 	return Array.isArray(value) ? value.flatMap((item) => typeof item === "string" && item.trim() !== "" ? [item.trim()] : []) : [];
 }
 function asLocalized(value) {
-	const record = asRecord$3(value);
+	const record = asRecord$4(value);
 	if (record === void 0) return void 0;
-	const zh = asText$3(record["zh"]);
-	const en = asText$3(record["en"]);
+	const zh = asText$4(record["zh"]);
+	const en = asText$4(record["en"]);
 	return zh === "" && en === "" ? void 0 : {
 		...zh === "" ? {} : { zh },
 		...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$3(raw);
-	if (record === void 0) return problem("source", "source 必须是一个对象", at);
+	const record = asRecord$4(raw);
+	if (record === void 0) return problem$1("source", "source 必须是一个对象", at);
 	if (record["type"] === "npm") {
 		const registry = record["registry"];
-		if (registry !== void 0 && asText$3(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$3(registry) }
+			...registry === void 0 ? {} : { registry: asText$4(registry) }
 		};
 	}
 	if (record["type"] === "git") {
-		const url = asText$3(record["url"]);
-		const commit = asText$3(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);
+		const url = asText$4(record["url"]);
+		const commit = asText$4(record["commit"]);
+		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",
 			url,
 			commit,
-			...path === void 0 || asText$3(path) === "" ? {} : { path: asText$3(path) }
+			...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$3(raw);
-	if (record === void 0) return problem("version", "版本必须是一个对象", at);
-	const version = asText$3(record["version"]);
-	if (!isValidVersion(version)) return problem("version", `版本号不是合法 SemVer：${JSON.stringify(version)}`, at);
+	const record = asRecord$4(raw);
+	if (record === void 0) return problem$1("version", "版本必须是一个对象", at);
+	const version = asText$4(record["version"]);
+	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);
-	const engines = asRecord$3(record["engines"]);
-	const dsh = engines === void 0 ? "" : asText$3(engines["dsh"]);
+	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 {
 		version,
 		source,
@@ -4759,43 +5026,43 @@ 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$3(raw);
+	const record = asRecord$4(raw);
 	if (record === void 0) return void 0;
 	const workbench = record["workbench"] === true;
-	const unit = asText$3(record["unit"]);
-	const category = asText$3(record["category"]);
+	const unit = asText$4(record["unit"]);
+	const category = asText$4(record["category"]);
 	const labels = asTextArray(record["labels"]);
 	const keywords = asTextArray(record["keywords"]);
-	const sortKeysRecord = asRecord$3(record["sortKeys"]);
+	const sortKeysRecord = asRecord$4(record["sortKeys"]);
 	const sortKeys = sortKeysRecord === void 0 ? void 0 : Object.fromEntries(Object.entries(sortKeysRecord).flatMap(([key, value]) => typeof value === "string" || typeof value === "number" ? [[key, value]] : []));
 	return {
 		...workbench ? { workbench: true } : {},
@@ -4807,28 +5074,28 @@ function metadataOf(raw) {
 	};
 }
 function entryOf$1(raw, at) {
-	const record = asRecord$3(raw);
-	if (record === void 0) return problem("plugin", "插件条目必须是对象", at);
-	const name = asText$3(record["name"]);
-	if (name === "" || name.length > 214 || !NPM_NAME.test(name)) return problem("name", `不是合法 npm 包名：${JSON.stringify(name)}`, at);
+	const record = asRecord$4(raw);
+	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$1("name", `不是合法 npm 包名：${JSON.stringify(name)}`, at);
 	const versions = versionsOf$1(record["versions"], `${at}.versions`);
 	if ("kind" in versions) return versions;
-	const icon = asText$3(record["icon"]);
+	const icon = asText$4(record["icon"]);
 	if (icon !== "") {
 		const badIcon = iconProblem(icon);
 		if (badIcon !== void 0) return badIcon;
 	}
 	const title = asLocalized(record["title"]);
 	const description = asLocalized(record["description"]);
-	const author = asText$3(record["author"]);
-	const owner = asText$3(record["owner"]);
+	const author = asText$4(record["author"]);
+	const owner = asText$4(record["owner"]);
 	if (owner !== "") {
 		const badOwner = ownerProblem(owner);
 		if (badOwner !== void 0) return badOwner;
 	}
-	const homepage = asText$3(record["homepage"]);
+	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,
@@ -4842,19 +5109,19 @@ function entryOf$1(raw, at) {
 	};
 }
 function parseMarketIndex(raw) {
-	const record = asRecord$3(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 = [];
@@ -4866,7 +5133,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);
@@ -4878,7 +5145,7 @@ function parseMarketIndex(raw) {
 	};
 	const title = asLocalized(record["title"]);
 	const description = asLocalized(record["description"]);
-	const metadata = asRecord$3(record["metadata"]);
+	const metadata = asRecord$4(record["metadata"]);
 	return {
 		ok: true,
 		index: {
@@ -4896,10 +5163,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 ?? [];
 }
@@ -4932,32 +5202,32 @@ function marketSourceKey(source) {
 	return createHash("sha256").update(canonical).digest("hex").slice(0, 16);
 }
 function parseSourceConfig(raw) {
-	const record = asRecord$3(raw);
+	const record = asRecord$4(raw);
 	if (record === void 0) return {
 		ok: false,
-		problem: problem("source", "索引源必须是对象")
+		problem: problem$1("source", "索引源必须是对象")
 	};
-	const id = asText$3(record["id"]);
-	const label = asText$3(record["label"]);
+	const id = asText$4(record["id"]);
+	const label = asText$4(record["label"]);
 	const kind = record["kind"];
-	const url = asText$3(record["url"]);
+	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,
@@ -4971,15 +5241,15 @@ 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$3(record["ref"]);
-	const path = asText$3(record["path"]);
-	const localPath = asText$3(record["localPath"]);
+	const ref = asText$4(record["ref"]);
+	const path = asText$4(record["path"]);
+	const localPath = asText$4(record["localPath"]);
 	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,
@@ -4995,31 +5265,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
@@ -5064,8 +5573,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();
@@ -5285,6 +5797,72 @@ function normalizeWhitespace(rows) {
 	return out.join("\n").replace(/\n+$/, "");
 }
 //#endregion
+//#region ../shared/dist/host/installed-sources.js
+var FILE_NAME = ".dsh-workbench-sources.json";
+var FILE_VERSION = 1;
+function asRecord$3(value) {
+	return typeof value === "object" && value !== null ? value : void 0;
+}
+function asText$3(value) {
+	return typeof value === "string" ? value.trim() : "";
+}
+function installedSourcesFile(profileDir) {
+	return path.join(profileDir, FILE_NAME);
+}
+function readInstalledSources(profileDir) {
+	if (profileDir === null) return {};
+	let parsed;
+	try {
+		parsed = JSON.parse(fs.readFileSync(installedSourcesFile(profileDir), "utf8"));
+	} catch {
+		return {};
+	}
+	const packages = asRecord$3(asRecord$3(parsed)?.packages);
+	if (packages === void 0) return {};
+	const found = {};
+	for (const [pkg, value] of Object.entries(packages)) {
+		const record = asRecord$3(value);
+		if (record === void 0) continue;
+		const version = asText$3(record.version);
+		const registry = asText$3(record.registry);
+		if (pkg === "" || version === "" || registry === "") continue;
+		found[pkg] = {
+			version,
+			registry
+		};
+	}
+	return found;
+}
+function packageSourceOf(profileDir, pkg) {
+	return readInstalledSources(profileDir)[pkg];
+}
+function writeInstalledSources(profileDir, sources) {
+	const file = installedSourcesFile(profileDir);
+	const temp = `${file}.tmp`;
+	const text = `${JSON.stringify({
+		version: FILE_VERSION,
+		packages: sources
+	}, null, 2)}\n`;
+	fs.writeFileSync(temp, text, { mode: 384 });
+	fs.renameSync(temp, file);
+}
+function rememberPackageSource(profileDir, pkg, source) {
+	const trimmed = pkg.trim();
+	if (trimmed === "" || source.version.trim() === "" || source.registry.trim() === "") return;
+	const all = { ...readInstalledSources(profileDir) };
+	all[trimmed] = {
+		version: source.version.trim(),
+		registry: source.registry.trim()
+	};
+	writeInstalledSources(profileDir, all);
+}
+function forgetPackageSource(profileDir, pkg) {
+	const all = { ...readInstalledSources(profileDir) };
+	if (all[pkg] === void 0) return;
+	delete all[pkg];
+	writeInstalledSources(profileDir, all);
+}
+//#endregion
 //#region ../shared/dist/contract/protocol/dsh-plugins.js
 var DSH_PLUGINS_ROUTE = "dsh-plugins";
 //#endregion
@@ -5483,8 +6061,10 @@ function moduleVersionsHandler(ctx, shell, running, selfUpdate) {
 		const force = param(search, "force") === "1";
 		const fallback = (await manager.registries())?.resolved ?? void 0;
 		const modules = await Promise.all(found.map(async (module) => {
-			const registry = module.registry ?? fallback;
-			const latest = shell === void 0 || registry === void 0 ? void 0 : await supply.latestVersion({
+			const local = module.local === true;
+			const fromRegistry = module.fromRegistry !== false;
+			const registry = fromRegistry ? module.registry ?? fallback : void 0;
+			const latest = local || !fromRegistry || shell === void 0 || registry === void 0 ? void 0 : await supply.latestVersion({
 				shell,
 				name: module.pkg,
 				registry,
@@ -5516,7 +6096,10 @@ function moduleVersionsHandler(ctx, shell, running, selfUpdate) {
 				...title === void 0 ? {} : { title },
 				...latest === void 0 ? {} : { latest },
 				...latestBlocked === void 0 ? {} : { latestBlocked },
-				...module.local === true ? { local: true } : {},
+				...local ? {
+					local: true,
+					latestUnavailable: "local"
+				} : latest !== void 0 ? {} : { latestUnavailable: !fromRegistry ? "not-registry" : registry === void 0 ? "no-registry" : "probe-failed" },
 				...refused === void 0 ? {} : { refused }
 			};
 		}));
@@ -6139,7 +6722,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
@@ -9817,10 +10400,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;
@@ -9861,8 +10450,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 }
 		},
@@ -9959,7 +10548,7 @@ function publishPreviewOf(root, unit, options = {}) {
 		name,
 		publisher: author,
 		unit,
-		artifactPath: marketArtifactPath(name)
+		artifactPath: marketArtifactRoot(name)
 	});
 	return {
 		name,
@@ -11708,6 +12297,22 @@ function registerRecordTools(ctx, store) {
 	];
 }
 //#endregion
+//#region src/modules/panels/model/market-install-error.ts
+var INSTALL_PROBLEM = {
+	permission: "没有写入权限",
+	"disk-full": "磁盘满了",
+	sandbox: "被系统拦住了",
+	unknown: "命令失败"
+};
+function installError(failure) {
+	const tail = tailLines(failure.output, 6);
+	const stamp = failure.exitCode === null ? "" : `（退出码 ${failure.exitCode}）`;
+	return new WorkbenchDataError("install-failed", `${INSTALL_PROBLEM[failure.kind]}${stamp}${tail === "" ? "" : `：${tail}`}`, {
+		detail: failure.output,
+		failure
+	});
+}
+//#endregion
 //#region src/modules/panels/model/market-dependency.ts
 var DEPENDENCY_KINDS = ["extension", "lib"];
 function dependencyId(kind, name) {
@@ -11929,7 +12534,8 @@ async function settle(deps, spec, options, change) {
 		kind: "unknown",
 		pkg
 	};
-	await deps.rememberSource(deps.manager, pkg, options?.registry);
+	const registry = options?.registry ?? (module.kind === "module" ? module.registry : void 0);
+	await deps.rememberSource(deps.manager, pkg, registry, module.kind === "module" ? module.version : void 0);
 	return {
 		change,
 		module,
@@ -12043,7 +12649,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 {
@@ -12098,7 +12779,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
 	};
@@ -12108,15 +12789,150 @@ 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
+//#region src/modules/panels/model/market-registry.ts
+async function rememberInstalledSource(deps, manager, pkg, registry, version) {
+	const { registries, profileDir, logger } = deps;
+	const wanted = registry?.trim() ?? "";
+	if (wanted === "") return;
+	if (profileDir !== void 0 && profileDir !== null && version !== void 0 && version.trim() !== "") try {
+		rememberPackageSource(profileDir, pkg, {
+			version,
+			registry: wanted
+		});
+	} catch (error) {
+		logger?.warn?.(`[dsh-workbench] 记 ${pkg} 这次的来源失败：${String(error)}`);
+	}
+	if (registries === void 0) return;
+	const scope = scopeOf$2(pkg);
+	if (scope === null) return;
+	const known = await manager.registries().catch(() => null);
+	if (known !== null && sameRegistry(known.resolved, wanted)) return;
+	try {
+		const added = registries.remember([{
+			scope,
+			registry: wanted
+		}]);
+		if (added.length > 0) logger?.info?.(`[dsh-workbench] 把 ${added.join("、")} 记进 profile 的 .npmrc（卸载只认 pnpm 的配置）`);
+	} catch (error) {
+		logger?.warn?.(`[dsh-workbench] 记这个 scope 的源失败：${String(error)}`);
+	}
+}
+async function retryAfterRegistryFix(deps, manager, pkg, change) {
+	const { registries, logger } = deps;
+	if (registries === void 0 || !registryFailure(change)) return change;
+	const known = await manager.registries().catch(() => null);
+	const missing = registries.sources().filter((entry) => !sameRegistry(entry.registry, known?.resolved ?? null));
+	if (missing.length === 0) return change;
+	let added;
+	try {
+		added = registries.remember(missing);
+	} catch (error) {
+		logger?.warn?.(`[dsh-workbench] 卸 ${pkg} 撞上源，但补配置失败：${String(error)}`);
+		return change;
+	}
+	if (added.length === 0) return change;
+	logger?.warn?.(`[dsh-workbench] 卸 ${pkg} 撞上源：补 ${added.join("、")} 后重试一次`);
+	return await manager.remove(pkg).catch(() => null) ?? change;
+}
+//#endregion
+//#region src/modules/panels/model/market-remove.ts
+var chain = Promise.resolve();
+function serialized(operation) {
+	const run = chain.then(operation, operation);
+	chain = run.then(() => void 0, () => void 0);
+	return run;
+}
+function forgetSource(options) {
+	const dir = options.profileDir;
+	if (dir === void 0 || dir === null) return;
+	try {
+		forgetPackageSource(dir, options.pkg);
+	} catch (error) {
+		options.logger?.warn?.(`[dsh-workbench] 清 ${options.pkg} 的来源记录失败：${String(error)}`);
+	}
+}
+function swapScopeFor(options) {
+	const dir = options.profileDir;
+	const notebook = options.registryFix.registries;
+	if (dir === void 0 || dir === null || notebook?.swapScope === void 0) return void 0;
+	const source = packageSourceOf(dir, options.pkg);
+	const scope = scopeOf$2(options.pkg);
+	if (source === void 0 || scope === null) return void 0;
+	try {
+		return notebook.swapScope(scope, source.registry);
+	} catch (error) {
+		options.logger?.warn?.(`[dsh-workbench] 临时把 ${scope} 指到 ${source.registry} 失败，卸载照走：${String(error)}`);
+		return;
+	}
+}
+async function removeOnce(options) {
+	const { manager, pkg, registryFix, logger } = options;
+	const first = await manager.remove(pkg);
+	if (first === null) throw new Error("插件管理器回的卸载结果看不懂。");
+	const settled = await retryAfterRegistryFix(registryFix, manager, pkg, first);
+	if (settled.application !== "failed" && settled.application !== "cancelled") {
+		forgetSource(options);
+		return settled;
+	}
+	const put = await manager.setEnabled?.(pkg, true);
+	logger?.warn?.(`[dsh-workbench] ${pkg} 没卸成（${settled.errorCode ?? settled.application}）—— 已把它那一行放回名单，别让一次失败留在"装着但关着"`);
+	return put ?? settled;
+}
+function removeDshBundle(options) {
+	return serialized(async () => {
+		const restore = swapScopeFor(options);
+		try {
+			return await removeOnce(options);
+		} finally {
+			try {
+				restore?.();
+			} catch (error) {
+				options.logger?.warn?.(`[dsh-workbench] 还原 .npmrc 失败：${String(error)}`);
+			}
+		}
+	});
+}
+//#endregion
 //#region src/modules/panels/model/market-dependency-update.ts
 async function updateDependencyRow(target, deps) {
 	if (target.conflict !== void 0) throw new Error(`这一行有两份来源，先统一声明再更新：${target.conflict}`);
@@ -12326,14 +13142,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,
@@ -12400,12 +13216,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);
@@ -12434,17 +13250,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 });
@@ -12453,7 +13270,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,
@@ -12473,7 +13290,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;
@@ -12489,42 +13306,6 @@ function createEnvDropper(options) {
 	};
 }
 //#endregion
-//#region src/modules/panels/model/market-registry.ts
-async function rememberInstalledSource(deps, manager, pkg, registry) {
-	const { registries, logger } = deps;
-	if (registries === void 0 || registry === void 0) return;
-	const scope = scopeOf$2(pkg);
-	if (scope === null) return;
-	const known = await manager.registries().catch(() => null);
-	if (known !== null && sameRegistry(known.resolved, registry)) return;
-	try {
-		const added = registries.remember([{
-			scope,
-			registry
-		}]);
-		if (added.length > 0) logger?.info?.(`[dsh-workbench] 把 ${added.join("、")} 记进 profile 的 .npmrc（卸载只认 pnpm 的配置）`);
-	} catch (error) {
-		logger?.warn?.(`[dsh-workbench] 记这个 scope 的源失败：${String(error)}`);
-	}
-}
-async function retryAfterRegistryFix(deps, manager, pkg, change) {
-	const { registries, logger } = deps;
-	if (registries === void 0 || !registryFailure(change)) return change;
-	const known = await manager.registries().catch(() => null);
-	const missing = registries.sources().filter((entry) => !sameRegistry(entry.registry, known?.resolved ?? null));
-	if (missing.length === 0) return change;
-	let added;
-	try {
-		added = registries.remember(missing);
-	} catch (error) {
-		logger?.warn?.(`[dsh-workbench] 卸 ${pkg} 撞上源，但补配置失败：${String(error)}`);
-		return change;
-	}
-	if (added.length === 0) return change;
-	logger?.warn?.(`[dsh-workbench] 卸 ${pkg} 撞上源：补 ${added.join("、")} 后重试一次`);
-	return await manager.remove(pkg).catch(() => null) ?? change;
-}
-//#endregion
 //#region src/modules/panels/model/market-restart.ts
 function restartLogLine(change) {
 	if (change === null || change === void 0 || change.application !== "restart-required") return;
@@ -12534,7 +13315,7 @@ function restartLogLine(change) {
 //#endregion
 //#region src/modules/panels/model/market.ts
 function createMarketService(options) {
-	const { manifests, manifestsNow, probe, shell, logger, supply: supplyOption, onInstalled, onUninstalled, isReleased, bundles, installed, modules, workbench, registries, ledger, references, dshHome, profileName } = options;
+	const { manifests, manifestsNow, probe, shell, logger, supply: supplyOption, onInstalled, onUninstalled, isReleased, bundles, installed, modules, workbench, registries, profileDir, ledger, references, dshHome, profileName } = options;
 	const supply = supplyOption ?? requireSupply();
 	const command = options.command ?? "opencli";
 	const catalog = () => manifestsNow?.() ?? manifests;
@@ -12573,11 +13354,18 @@ function createMarketService(options) {
 	}
 	async function run(line, optional = false) {
 		if (shell === void 0) throw new Error("没有执行缝（shell 服务不可用），装 / 卸做不了。");
+		const blocked = installWriteProblem({
+			command: line,
+			fallback: isolatedRoot()
+		});
+		if (blocked !== void 0) throw installError(blocked);
 		const result = await runShell(shell, line, { timeoutMs: INSTALL_TIMEOUT_MS });
-		if (result.exitCode !== 0 && !optional) {
-			const tail = tailLines(result.stderr || result.stdout, 6);
-			throw new Error(`命令失败（退出码 ${result.exitCode}）${tail === "" ? "" : `：${tail}`}`);
-		}
+		if (result.exitCode !== 0 && !optional) throw installError(diagnoseInstallFailure({
+			command: line,
+			exitCode: result.exitCode,
+			output: result.stderr || result.stdout,
+			fallback: isolatedRoot()
+		}));
 	}
 	async function runAll(commands) {
 		for (const step of commands) await run(step.line, step.optional === true);
@@ -12662,26 +13450,24 @@ function createMarketService(options) {
 	}
 	const registryFix = {
 		...registries === void 0 ? {} : { registries },
+		...profileDir === void 0 || profileDir === null ? {} : { profileDir },
 		...logger === void 0 ? {} : { logger }
 	};
-	async function removeInstalledBundle(manager, pkg) {
-		const first = await manager.remove(pkg);
-		if (first === null) throw new Error("插件管理器回的卸载结果看不懂。");
-		const settled = await retryAfterRegistryFix(registryFix, manager, pkg, first);
-		if (settled.application !== "failed" && settled.application !== "cancelled") return settled;
-		const put = await manager.setEnabled?.(pkg, true);
-		logger?.warn?.(`[dsh-workbench] ${pkg} 没卸成（${settled.errorCode ?? settled.application}）—— 已把它那一行放回名单，别让一次失败留在"装着但关着"`);
-		return put ?? settled;
-	}
 	function routeDeps(manager) {
 		return {
 			manager,
 			command,
 			supply,
 			runAll,
-			rememberSource: (manager, pkg, registry) => rememberInstalledSource(registryFix, manager, pkg, registry),
+			rememberSource: (manager, pkg, registry, version) => rememberInstalledSource(registryFix, manager, pkg, registry, version),
 			supplyAfter,
-			remove: (pkg) => removeInstalledBundle(manager, pkg),
+			remove: (pkg) => removeDshBundle({
+				manager,
+				pkg,
+				profileDir,
+				registryFix,
+				...logger === void 0 ? {} : { logger }
+			}),
 			...shell === void 0 ? {} : { shell },
 			...installed === void 0 ? {} : { installed },
 			...ledger === void 0 ? {} : { ledger },
@@ -12716,7 +13502,7 @@ function createMarketService(options) {
 			return snapshot();
 		},
 		async install(unit) {
-			const absent = (await capabilityOf(unit, true)).needs.filter((state) => state.status === "missing" && (state.kind === "extension" || state.kind === "lib"));
+			const absent = (await capabilityOf(unit, true)).needs.filter((state) => state.status === "missing" && (state.kind === "extension" || state.kind === "lib" || state.kind === "bin"));
 			if (absent.length === 0) {
 				onInstalled?.(unit);
 				return entryOf(unit, true);
@@ -12728,6 +13514,8 @@ function createMarketService(options) {
 				}
 				if (state.command === void 0) throw new Error(`没有可执行的安装命令（${state.detail}）`);
 				await run(state.command);
+				ensureLibsOpencliPeer();
+				ensureLibsBinOnPath();
 			}
 			await probeSharing({
 				action: "install",
@@ -12811,15 +13599,22 @@ 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 removeInstalledBundle(manager, pkg);
+			const change = await removeDshBundle({
+				manager,
+				pkg,
+				profileDir,
+				registryFix,
+				...logger === void 0 ? {} : { logger }
+			});
 			if (change.application !== "applied" || unit === void 0) return {
 				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,
@@ -12831,15 +13626,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);
@@ -13571,7 +14373,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 });
@@ -13596,17 +14398,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();
@@ -13617,26 +14408,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);
@@ -13984,16 +14854,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)) {
@@ -14262,7 +15147,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}）`;
@@ -14396,6 +15281,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,
@@ -14551,7 +15444,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"}/。`
 			};
 		}
 	};
@@ -15342,6 +16235,7 @@ var OWNED = [{
 			modules: () => supply.profileModules(profileDir),
 			workbench: (pkg) => supply.readProfilePackage(profileDir, pkg),
 			registries: supply.createRegistryNotebook(profileDir),
+			profileDir,
 			ledger,
 			references: () => {
 				const gaps = supply.declarationGaps(profileDir);
@@ -16878,6 +17772,8 @@ async function apply(ctx, config) {
 	}
 	if (shell === void 0) ctx.logger?.warn?.("[dsh-workbench] 没有 shell 服务：需要执行缝的套件会降级");
 	else {
+		ensureLibsOpencliPeer();
+		if (ensureLibsBinOnPath() && ctx.logger?.info !== void 0) ctx.logger.info("[dsh-workbench] PATH 前插共用依赖的 bin 目录：装了的包，命令直接可用");
 		adapters.probe.registerPreflight({
 			routes,
 			ctx,