@dsh-workbench/core 1.1.11 → 1.1.13

package/README.md

@@ -166,6 +166,7 @@ dsh-workbench migrate --force  # 已经迁过一次、想再补并一次
 | 自检说「连接浏览器 · 还没连上」/ 面板取不到数据 | 扩展没装或没启用：从 [Chrome 应用商店](https://chromewebstore.google.com/detail/opencli/ildkmabpimmkaediidaifkhjpohdnifk)装 OpenCLI，在扩展页确认启用，保持浏览器开着，回「准备工作台」那一屏点「重试」。多个浏览器账号会要求先选默认的那个：按页面上给的那条命令做 |
 | 体检说「连接浏览器 · 还没连上」，可面板照样能用 | 本机全局 opencli 与隔离运行时版本不一致，daemon 被顶成对方那版；下一条浏览器命令会自动把它重启回来，复检后改回「已连接」 |
 | Desktop 里体检一直「没连上」 | 浏览器没开。「准备工作台」那一屏有「打开浏览器」，点了才开上次承载扩展的那个（没记住就用 Chrome），开完自动复检；点了会切到 Chrome 前台（冷启动抢焦点，静默做不到）。仍连不上多半是扩展没装或被禁用 |
+| 准备页停住、说「命令行没有返回」 | 命令发出去了、结果没回来（宿主那边的子进程没起来，常见于 Windows 沙箱的残留锁文件）。完全退出工作台（托盘图标也要退），清掉系统临时目录里 `dsh-` 开头的残留，再打开；反复出现就升级 dsh 客户端。重装 Node / npm / pnpm 没用 —— 工具本身是好的 |
 | 模型列表里只有出厂的几个、没有自己配的供应商 | 新 profile 不带设置。设置 → 工作台设置 → 配置同步 → 勾 `llm-` 那几行 → 同步 |
 | 配置同步里某行说 `@x 还没装` | 那一行点名的包不在这个 profile 的 `node_modules` 里：`dsh plugin --profile workbench add @x`（或在模块市场装），装完 dsh 会自行重组，它报 `restartReason` 时才重启 |
 | 启动被拒，说 dsh 太旧 | `npm i -g @deepseek-ai/dsh@latest`，装完重启工作台 |

package/client.js

@@ -802,7 +802,7 @@ window.__ModuleLoader__.load({
       react$1.useLayoutEffect;
       var useMemo$10 = react$1.useMemo;
       react$1.useCallback;
-      var useRef$24 = react$1.useRef;
+      var useRef$23 = react$1.useRef;
       react$1.useSyncExternalStore;
       //#endregion
       //#region ../shared/dist/components/Activity.js
@@ -1587,7 +1587,7 @@ window.__ModuleLoader__.load({
       	const { fields, onSubmit, submit, cancel, extra, busy = false, disabled = false, problem } = props;
       	const [done, setDone] = useState$43(false);
       	const [reveal, setReveal] = useState$43(0);
-      	const rootRef = useRef$24(null);
+      	const rootRef = useRef$23(null);
       	const shown = visibleFieldsOf(fields);
       	const problems = formProblemsOf(shown, done);
       	reportDuplicateKeys(shown);
@@ -2103,11 +2103,11 @@ window.__ModuleLoader__.load({
       	const [openState, setOpenState] = useState$43(false);
       	const [query, setQuery] = useState$43("");
       	const [cursor, setCursor] = useState$43(null);
-      	const boxRef = useRef$24(null);
-      	const triggerRef = useRef$24(null);
-      	const wasOpenRef = useRef$24(false);
-      	const pickedRef = useRef$24(false);
-      	const closedByUsRef = useRef$24(false);
+      	const boxRef = useRef$23(null);
+      	const triggerRef = useRef$23(null);
+      	const wasOpenRef = useRef$23(false);
+      	const pickedRef = useRef$23(false);
+      	const closedByUsRef = useRef$23(false);
       	const open = openProp ?? openState;
       	const setOpen = (next) => {
       		if (openProp === void 0) setOpenState(next);
@@ -3581,6 +3581,7 @@ window.__ModuleLoader__.load({
       	"env.stepFailed.install": "install failed",
       	"env.stepFailed.path": "installed but not found",
       	"env.stepFailed.shell": "cannot reach the command line",
+      	"env.stepFailed.host": "the command never returned",
       	"env.toolchain.ok": "Looks good",
       	"env.toolchain.warn": "Almost ready",
       	"env.runtime.ok": "Ready",
@@ -3593,9 +3594,11 @@ window.__ModuleLoader__.load({
       	"env.fix.why": "The workbench uses its own background tool (installed separately from the one in your terminal), and it is not set up on this machine yet.",
       	"env.fix.whyPath": "The background tool is installed, but this environment cannot find it — usually a PATH or shell-session issue.",
       	"env.fix.whyShell": "The workbench cannot reach the command line on this machine, so it cannot fetch data — you cannot install this from here; someone needs to fix the background environment.",
+      	"env.fix.whyHost": "The workbench runs a few checks on the command line and collects what they return; this time the command went out and nothing came back. The tools themselves are most likely fine — reinstalling Node / npm / pnpm will not help.",
       	"env.fix.step": "Run this in a terminal, then hit Retry:",
       	"env.fix.stepPath": "Open a new terminal window (or make sure npm’s global bin directory is on PATH), then hit Retry.",
       	"env.fix.stepShell": "Restart the workbench (or dsh); if it keeps happening, the workbench still cannot reach the command line.",
+      	"env.fix.stepHost": "Quit the workbench completely (including the tray icon), clear the dsh-* leftovers in the system temp folder, then open it again. If it keeps happening, update dsh.",
       	"env.fix.permission": "Permission denied: rerun with sudo, or point npm’s global directory at your home.",
       	"env.fix.network": "Network unreachable: check your network or proxy, then retry.",
       	"env.fix.details": "Details (for troubleshooting)",
@@ -4347,6 +4350,7 @@ window.__ModuleLoader__.load({
       		"env.stepFailed.install": "装不上",
       		"env.stepFailed.path": "装了但还找不到",
       		"env.stepFailed.shell": "连不上命令行",
+      		"env.stepFailed.host": "命令行没有返回",
       		"env.toolchain.ok": "正常",
       		"env.toolchain.warn": "还没完全准备好",
       		"env.runtime.ok": "已就绪",
@@ -4359,9 +4363,11 @@ window.__ModuleLoader__.load({
       		"env.fix.why": "工作台用它自己那份后台工具（与你在终端里那套分开装，互不影响），这台机器上还没装好它。",
       		"env.fix.whyPath": "后台工具装上了，但当前环境还找不到它 —— 通常是 PATH 或终端会话的问题。",
       		"env.fix.whyShell": "工作台拿不到这台机器的命令行，所以取不了数据 —— 这一步你装不了，需要有人处理后台环境。",
+      		"env.fix.whyHost": "工作台要靠命令行跑几条检查，再把结果收回来；这次命令发出去了，结果一直没回来。工具本身多半是好的 —— 重装 Node / npm / pnpm 不会有帮助。",
       		"env.fix.step": "在终端里运行下面这条命令，装好之后点「重试」：",
       		"env.fix.stepPath": "新开一个终端窗口（或确认 npm 的全局 bin 目录在 PATH 里），然后点「重试」。",
       		"env.fix.stepShell": "重启一次工作台（或 dsh）；如果反复出现，说明工作台还是拿不到命令行。",
+      		"env.fix.stepHost": "完全退出工作台（托盘图标也要退），清掉系统临时目录里 dsh- 开头的残留，再重新打开；反复出现就升级 dsh。",
       		"env.fix.permission": "权限不够：在命令前加 sudo 重跑，或先把 npm 的全局目录配到你的用户目录。",
       		"env.fix.network": "网络不通：检查网络或代理设置后重试。",
       		"env.fix.details": "详细输出（排障用）",
@@ -10390,11 +10396,17 @@ window.__ModuleLoader__.load({
       		...registry === void 0 || registry === "" ? {} : { registry }
       	});
       }
-      function readModuleVersions(force = false) {
-      	return apiGet(MODULE_VERSIONS_ROUTE, force ? { force: "1" } : void 0);
+      function readModuleVersions(force = false, check = true) {
+      	return apiGet(MODULE_VERSIONS_ROUTE, {
+      		...force ? { force: "1" } : {},
+      		...check ? {} : { check: "0" }
+      	});
       }
-      function readInstalledPlugins(force = false) {
-      	return apiGet(INSTALLED_PLUGINS_ROUTE, force ? { force: "1" } : void 0);
+      function readInstalledPlugins(force = false, check = true) {
+      	return apiGet(INSTALLED_PLUGINS_ROUTE, {
+      		...force ? { force: "1" } : {},
+      		...check ? {} : { check: "0" }
+      	});
       }
       //#endregion
       //#region src/app/layouts/market/use-module-versions.ts
@@ -10423,6 +10435,10 @@ window.__ModuleLoader__.load({
       	modules: -1,
       	plugins: -1
       };
+      var newestDataSeq = {
+      	modules: -1,
+      	plugins: -1
+      };
       var epoch = 0;
       var allSeq = 0;
       function bumpModuleVersionsEpoch() {
@@ -10449,9 +10465,39 @@ window.__ModuleLoader__.load({
       		};
       	});
       }
-      function moduleVersionsCheckedAt(now) {
-      	const at = [now.modulesCheck.checkedAt, now.pluginsCheck.checkedAt].filter((one) => one !== null);
-      	return at.length === 0 ? null : Math.max(...at);
+      function withPreviousLatest(modules, previous) {
+      	if (previous.length === 0) return modules;
+      	const byPkg = new Map(previous.map((module) => [module.pkg, module]));
+      	return modules.map((module) => {
+      		const old = byPkg.get(module.pkg);
+      		if (old === void 0) return module;
+      		return {
+      			...module,
+      			...module.latest === void 0 && old.latest !== void 0 ? { latest: old.latest } : {},
+      			...module.latestBlocked === void 0 && old.latestBlocked !== void 0 ? { latestBlocked: old.latestBlocked } : {},
+      			...module.latestUnavailable === void 0 && old.latestUnavailable !== void 0 ? { latestUnavailable: old.latestUnavailable } : {}
+      		};
+      	});
+      }
+      function withPreviousPluginLatest(plugins, previous) {
+      	if (previous.length === 0) return plugins;
+      	const byPkg = new Map(previous.map((plugin) => [plugin.pkg, plugin]));
+      	return plugins.map((plugin) => {
+      		const old = byPkg.get(plugin.pkg);
+      		if (old === void 0 || plugin.latest !== void 0 || old.latest === void 0) return plugin;
+      		return {
+      			...plugin,
+      			latest: old.latest
+      		};
+      	});
+      }
+      function withPreviousWorkbenchLatest(next, previous) {
+      	if (next === null || previous === null) return next;
+      	if (next.latest !== void 0 || previous.latest === void 0 || next.pkg !== previous.pkg) return next;
+      	return {
+      		...next,
+      		latest: previous.latest
+      	};
       }
       function moduleVersionsChecking(value) {
       	return value.allChecking || value.modulesCheck.checking || value.pluginsCheck.checking;
@@ -10482,72 +10528,104 @@ window.__ModuleLoader__.load({
       		checkedAt: ok ? at : seat.checkedAt
       	};
       }
-      function readModulesOnce(force) {
-      	return Promise.all([readModuleVersions(force), readMarketInstalled()]).catch(() => null);
+      function readModulesOnce(force, check) {
+      	return Promise.all([readModuleVersions(force, check), readMarketInstalled()]).catch(() => null);
       }
-      function readPluginsOnce(force) {
-      	return readInstalledPlugins(force).catch(() => null);
+      function readPluginsOnce(force, check) {
+      	return readInstalledPlugins(force, check).catch(() => null);
       }
-      function runModuleVersionsRead(force = false, fresh = false, scope = "all") {
+      function readKey(run) {
+      	return `${run.kind}:${run.scope}:${run.force ? "force" : "cached"}`;
+      }
+      function superseded(run, part, ticket) {
+      	if (run.kind === "data") return ticket < newestDataSeq[part];
+      	return !run.force && ticket < newestForceSeq[part];
+      }
+      function runRead(run) {
       	const at = epoch;
-      	const running = inFlight.get(scope);
-      	if (!fresh && running !== void 0 && running.force === force && running.epoch === at) return running.promise;
-      	const allTicket = scope === "all" ? allSeq += 1 : allSeq;
+      	const key = readKey(run);
+      	const running = inFlight.get(key);
+      	if (!run.fresh && running !== void 0 && running.epoch === at) return running.promise;
+      	const check = run.kind === "check";
+      	const allTicket = run.scope === "all" ? allSeq += 1 : allSeq;
       	const tickets = /* @__PURE__ */ new Map();
-      	for (const part of partsOf(scope)) {
+      	for (const part of partsOf(run.scope)) {
       		const ticket = seq$1[part] += 1;
       		tickets.set(part, ticket);
-      		if (force) newestForceSeq[part] = ticket;
+      		if (run.force) newestForceSeq[part] = ticket;
+      		if (!check) newestDataSeq[part] = ticket;
       	}
-      	publish$1(checking(scope));
-      	const modulesRead = tickets.has("modules") ? readModulesOnce(force) : null;
-      	const pluginsRead = tickets.has("plugins") ? readPluginsOnce(force) : null;
-      	const promise = Promise.all([modulesRead, pluginsRead]).then(([modules, plugins]) => {
-      		if (at !== epoch) return;
-      		const now = Date.now();
-      		const modulesTicket = tickets.get("modules");
-      		const pluginsTicket = tickets.get("plugins");
-      		const modulesLanded = modulesTicket !== void 0 && (force || modulesTicket >= newestForceSeq.modules);
-      		const pluginsLanded = pluginsTicket !== void 0 && (force || pluginsTicket >= newestForceSeq.plugins);
-      		const modulesOk = modulesLanded && modules !== null && modules[0].ok === true;
-      		const pluginsOk = pluginsLanded && plugins !== null && plugins.ok === true;
+      	if (check) publish$1(checking(run.scope));
+      	const modulesTicket = tickets.get("modules");
+      	const pluginsTicket = tickets.get("plugins");
+      	const modulesRead = modulesTicket === void 0 ? null : readModulesOnce(run.force, check).then((response) => {
+      		if (at !== epoch || response === null || superseded(run, "modules", modulesTicket)) return;
+      		const [modules, market] = response;
+      		const payload = modules.ok === true ? modules : null;
+      		const listed = payload === null ? null : withMarketUpdates(payload.modules, market.ok === true ? market.modules : []);
+      		const shown = listed === null ? null : check ? listed : withPreviousLatest(listed, state.modules ?? []);
       		publish$1({
       			...state,
-      			modules: modulesOk ? withMarketUpdates(modules[0].modules, modules[1].ok === true ? modules[1].modules : []) : state.modules,
-      			workbench: modulesOk ? modules[0].workbench ?? null : state.workbench,
-      			selfUpdate: modulesOk ? modules[0].selfUpdate ?? null : state.selfUpdate,
-      			plugins: pluginsOk ? plugins.plugins : state.plugins,
+      			modules: shown ?? state.modules,
+      			workbench: payload === null ? state.workbench : check ? payload.workbench ?? null : withPreviousWorkbenchLatest(payload.workbench ?? null, state.workbench),
+      			selfUpdate: payload === null ? state.selfUpdate : payload.selfUpdate ?? null,
       			read: true,
-      			allChecking: scope === "all" && allTicket === allSeq ? false : state.allChecking,
-      			modulesCheck: modulesLanded && modulesTicket !== void 0 ? landed(state.modulesCheck, modulesTicket, seq$1.modules, modulesOk, now) : state.modulesCheck,
-      			pluginsCheck: pluginsLanded && pluginsTicket !== void 0 ? landed(state.pluginsCheck, pluginsTicket, seq$1.plugins, pluginsOk, now) : state.pluginsCheck
+      			...check ? { modulesCheck: landed(state.modulesCheck, modulesTicket, seq$1.modules, payload !== null, Date.now()) } : {}
+      		});
+      	});
+      	const pluginsRead = pluginsTicket === void 0 ? null : readPluginsOnce(run.force, check).then((response) => {
+      		if (at !== epoch || response === null || superseded(run, "plugins", pluginsTicket)) return;
+      		const ok = response.ok === true;
+      		publish$1({
+      			...state,
+      			plugins: ok ? check ? response.plugins : withPreviousPluginLatest(response.plugins, state.plugins ?? []) : state.plugins,
+      			...check ? { pluginsCheck: landed(state.pluginsCheck, pluginsTicket, seq$1.plugins, ok, Date.now()) } : {}
+      		});
+      	});
+      	const promise = Promise.all([modulesRead, pluginsRead]).then(() => {
+      		if (at !== epoch || !check || run.scope !== "all" || allTicket !== allSeq) return;
+      		if (!state.allChecking) return;
+      		publish$1({
+      			...state,
+      			allChecking: false
       		});
       	}).finally(() => {
-      		if (inFlight.get(scope)?.promise === promise) inFlight.delete(scope);
+      		if (inFlight.get(key)?.promise === promise) inFlight.delete(key);
       	});
-      	inFlight.set(scope, {
-      		force,
+      	inFlight.set(key, {
       		epoch: at,
       		promise
       	});
       	return promise;
       }
+      function runModuleVersionsRead(force = false, fresh = false, scope = "all") {
+      	return runRead({
+      		kind: "check",
+      		force,
+      		fresh,
+      		scope
+      	});
+      }
+      function runInstalledRead(options = {}) {
+      	return runRead({
+      		kind: "data",
+      		force: false,
+      		fresh: options.fresh === true,
+      		scope: "all"
+      	});
+      }
       function useModuleVersions() {
       	const value = (0, react.useSyncExternalStore)(subscribeModuleVersions, moduleVersionsValue);
       	const factRev = useFactRevision(CAPABILITY_FACT);
-      	const mountedRef = (0, react.useRef)(false);
       	(0, react.useEffect)(() => {
-      		const first = !mountedRef.current;
-      		mountedRef.current = true;
-      		if (first && !shouldProbeOnEnter({
-      			checkedAt: moduleVersionsCheckedAt(state),
-      			now: Date.now(),
-      			staleMs: MARKET_STALE_MS
-      		})) return;
-      		runModuleVersionsRead(false);
+      		runInstalledRead();
       	}, [factRev]);
       	const reload = (0, react.useCallback)((options) => {
-      		runModuleVersionsRead(options?.force === true, options?.fresh === true, options?.scope ?? "all");
+      		if (options?.check === true) {
+      			runModuleVersionsRead(options.force === true, options.fresh === true, options.scope ?? "all");
+      			return;
+      		}
+      		runInstalledRead({ fresh: options?.fresh === true });
       	}, []);
       	return {
       		...value,
@@ -10564,29 +10642,36 @@ window.__ModuleLoader__.load({
       			bumpModuleVersionsEpoch();
       			bumpCapabilityEpoch();
       			forceProbe();
-      			reloadVersions({
-      				force: true,
-      				fresh: true
-      			});
-      			return;
-      		}
-      		reloadCapability();
+      		} else reloadCapability();
       		reloadVersions();
       	}, [
       		reloadCapability,
       		reloadVersions,
       		forceProbe
       	]);
-      	const checkPart = (0, react.useCallback)((part) => reloadVersions({
-      		force: true,
-      		fresh: true,
-      		scope: part
-      	}), [reloadVersions]);
+      	const check = (0, react.useCallback)((options) => {
+      		reloadVersions({
+      			check: true,
+      			force: options?.force === true,
+      			fresh: true,
+      			...options?.scope === void 0 ? {} : { scope: options.scope }
+      		});
+      	}, [reloadVersions]);
+      	const recheck = (0, react.useCallback)(() => {
+      		bumpCapabilityEpoch();
+      		forceProbe();
+      		check({ force: true });
+      	}, [check, forceProbe]);
+      	const checkPart = (0, react.useCallback)((part) => {
+      		check({
+      			force: true,
+      			scope: part
+      		});
+      	}, [check]);
       	const enteredRef = (0, react.useRef)(false);
       	(0, react.useEffect)(() => {
       		if (enteredRef.current) return;
       		enteredRef.current = true;
-      		reloadVersions();
       		if (!shouldProbeOnEnter({
       			checkedAt,
       			now: Date.now(),
@@ -10594,13 +10679,15 @@ window.__ModuleLoader__.load({
       		})) return;
       		markNextProbeSilent();
       		forceProbe();
+      		check();
       	}, [
       		checkedAt,
       		forceProbe,
-      		reloadVersions
+      		check
       	]);
       	return {
       		reload,
+      		recheck,
       		checkPart
       	};
       }
@@ -11297,7 +11384,7 @@ window.__ModuleLoader__.load({
       	const openAddModule = (0, react.useCallback)(() => setAdding(true), []);
       	const updates = (0, react.useMemo)(() => marketUpdatesOf(modules), [modules]);
       	const installed = modules === null ? void 0 : withClientRefusals(modules, units.refusals());
-      	const { reload, checkPart } = useMarketReload({
+      	const { reload, recheck, checkPart } = useMarketReload({
       		checkedAt,
       		forceProbe,
       		reloadCapability,
@@ -11328,7 +11415,7 @@ window.__ModuleLoader__.load({
       		busy,
       		checking: checking || versionsAllChecking,
       		onTab: setTab,
-      		onReload: () => reload({ force: true }),
+      		onReload: recheck,
       		onAdd: openAddModule
       	}), devMarket.strip, /* @__PURE__ */ (0, react.createElement)("div", {
       		id: `${MARKET_PANEL_ID}-panel-installed`,
@@ -12958,8 +13045,27 @@ window.__ModuleLoader__.load({
       function failedStepText(guidance, t) {
       	if (guidance === "path") return t("env.stepFailed.path");
       	if (guidance === "shell") return t("env.stepFailed.shell");
+      	if (guidance === "host") return t("env.stepFailed.host");
       	return t("env.stepFailed.install");
       }
+      function guidanceTextOf(guidance, t) {
+      	if (guidance === "path") return {
+      		why: t("env.fix.whyPath"),
+      		step: t("env.fix.stepPath")
+      	};
+      	if (guidance === "shell") return {
+      		why: t("env.fix.whyShell"),
+      		step: t("env.fix.stepShell")
+      	};
+      	if (guidance === "host") return {
+      		why: t("env.fix.whyHost"),
+      		step: t("env.fix.stepHost")
+      	};
+      	return {
+      		why: t("env.fix.why"),
+      		step: t("env.fix.step")
+      	};
+      }
       function stepDetailText(step, snapshot, t) {
       	if (step.status === "failed") return failedStepText(snapshot.guidance, t);
       	if (step.status === "pending" || step.status === "running") return "";
@@ -13303,10 +13409,9 @@ window.__ModuleLoader__.load({
       		errorBox.hidden = snapshot.error === void 0;
       		const commandText = snapshot.steps.find((step) => step.status === "failed" && step.command !== void 0)?.command;
       		const guidance = snapshot.guidance ?? "install";
-      		const why = guidance === "path" ? t("env.fix.whyPath") : guidance === "shell" ? t("env.fix.whyShell") : t("env.fix.why");
-      		const step = guidance === "path" ? t("env.fix.stepPath") : guidance === "shell" ? t("env.fix.stepShell") : t("env.fix.step");
-      		fixWhy.textContent = why;
-      		fixStep.textContent = step;
+      		const advice = guidanceTextOf(guidance, t);
+      		fixWhy.textContent = advice.why;
+      		fixStep.textContent = advice.step;
       		const showCommand = guidance === "install" && commandText !== void 0;
       		fixCommand.set(showCommand ? commandText : void 0);
       		fixAdvice.textContent = !showCommand ? "" : snapshot.failure === "permission" ? t("env.fix.permission") : snapshot.failure === "network" ? t("env.fix.network") : "";