dshmarket 1.14.0 → 1.14.1

package/client/client.js

@@ -94,6 +94,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			cancelOp: "取消",
 			cancelled: "已取消",
 			busyWait: "已有操作正在进行，请等它结束（同一时间只执行一个安装/更新/卸载）",
+			agentBusyUpdate: "有 agent 正在运行，请等它完成或取消后再更新——更新会直接替换插件文件，工作中的 agent 可能中途报错或新旧版本混用。",
+			agentBusyInstall: "有 agent 正在运行，请等它完成或取消后再安装——安装会修改插件文件，工作中的 agent 可能中途报错。",
 			approveBuilds: "放行构建脚本并重试",
 			buildsSkipped: "该插件需要运行构建脚本才能工作，出于安全默认被拦下。点击下方按钮为它放行并重装：",
 			restartNow: "立即重启",
@@ -400,6 +402,8 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			cancelOp: "Cancel",
 			cancelled: "Cancelled",
 			busyWait: "Another operation is already running — please wait for it to finish (one install/update/uninstall at a time)",
+			agentBusyUpdate: "An agent is currently working — wait for it to finish (or cancel it) before updating. Updates replace plugin files in place, so a working agent can fail or mix versions mid-turn.",
+			agentBusyInstall: "An agent is currently working — wait for it to finish (or cancel it) before installing. Installing changes plugin files, so a working agent can fail mid-turn.",
 			approveBuilds: "Allow build scripts and retry",
 			buildsSkipped: "This plugin needs its build scripts to run; they are blocked by default for safety. Click below to allow them and reinstall:",
 			restartNow: "Restart now",
@@ -713,11 +717,30 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 			return plugins.filter((p) => p.category === "theme").sort((a, b) => (b.stars || 0) - (a.stars || 0));
 		}
 		/**
-		* Category chip order: collapsed with an active non-'all' chip, the active
-		* one moves to the front so it stays visible inside the two-row clip.
+		* Category chip order: collapsed with an active non-'all' chip that would
+		* otherwise be clipped out of the two-row preview, the active one moves to
+		* the front so it stays visible.
+		*
+		* Reported as "点了某个分类，标签就跑到前面来了，好奇怪": the earlier version
+		* moved the active chip to the front unconditionally, so clicking a category
+		* that was ALREADY visible inside the two rows still reshuffled it — and
+		* every chip after it — for no reason, since nothing was at risk of being
+		* hidden. `visibleCount` is how many chips (the 'all' chip included) the
+		* two-row clip fits; a category already within that budget in its natural
+		* position is left exactly where it was.
+		*
+		* `visibleCount === null` (not yet measured, e.g. the very first collapsed
+		* render) keeps the old unconditional behaviour: with no measurement to
+		* check against, guaranteeing visibility is the safe default.
 		*/
-		function orderedCategories(categories, active, open) {
-			return open || active === "all" ? categories : [active, ...categories.filter((id) => id !== active)];
+		function orderedCategories(categories, active, open, visibleCount = null) {
+			if (open || active === "all") return categories;
+			if (visibleCount !== null) {
+				const budget = Math.max(0, visibleCount - 1);
+				const naturalIndex = categories.indexOf(active);
+				if (naturalIndex !== -1 && naturalIndex < budget) return categories;
+			}
+			return [active, ...categories.filter((id) => id !== active)];
 		}
 		/**
 		* Page-number list for the discover pager. With few pages it is simply
@@ -2933,6 +2956,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 						refreshInstalled();
 					} else {
 						if (status === 409) {
+							if (body.agentsBusy === true) {
+								const running = Array.isArray(body.runningAgents) && body.runningAgents.length > 0 ? ` (${body.runningAgents.join(", ")})` : "";
+								setInstallError(t("agentBusyInstall") + running);
+								return;
+							}
 							setInstallError(t("busyWait"));
 							return;
 						}
@@ -3042,6 +3070,11 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 						refreshInstalled();
 					} else {
 						if (status === 409) {
+							if (body.agentsBusy === true) {
+								const running = Array.isArray(body.runningAgents) && body.runningAgents.length > 0 ? ` (${body.runningAgents.join(", ")})` : "";
+								setInstallError(t("agentBusyUpdate") + running);
+								return;
+							}
 							setInstallError(t("busyWait"));
 							return;
 						}
@@ -4488,7 +4521,7 @@ window.__ModuleLoader__.load({ id: "dshmarket", factory: (require) => {
 										ref: catsWrapRef,
 										className: visibleCats === null ? `${Market_module_css_default.catsWrap} ${Market_module_css_default.catsCollapsed}` : Market_module_css_default.catsWrap,
 										children: (() => {
-											const ordered = orderedCategories(categories, cat, catsOpen);
+											const ordered = orderedCategories(categories, cat, catsOpen, visibleCats);
 											const shown = catsOpen || visibleCats === null ? ordered : ordered.slice(0, Math.max(0, visibleCats - 1));
 											return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 												/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Pill, {