@xrxs-ai/dsh-xrxs-plugins-store 0.2.4 → 0.2.6

package/lib/client.js

@@ -462,6 +462,13 @@ function formatDate(text) {
   if (d === null) return text;
   return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
 }
+function formatShortDate(text) {
+  const d = parseTime(text);
+  if (d === null) return text;
+  const now = /* @__PURE__ */ new Date();
+  const yearPrefix = d.getFullYear() === now.getFullYear() ? "" : `${String(d.getFullYear() % 100).padStart(2, "0")}-`;
+  return `${yearPrefix}${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
+}
 function formatRelative(text) {
   const parsed = parseTime(text);
   if (parsed === null) return text;
@@ -1042,30 +1049,8 @@ var MARKET_CSS = `
   font-size: 13px; line-height: 20px; color: var(--dsw-alias-label-primary, #1f2329);
   text-align: right; word-break: break-all;
 }
-.xps-mk-version {
-  display: flex; justify-content: space-between; align-items: center; gap: 8px;
-  width: 100%; box-sizing: border-box; padding: 4px 8px;
-  border: none; border-radius: 8px; background: transparent; cursor: pointer;
-  color: var(--dsw-alias-label-primary, #1f2329);
-  font-family: var(--dsw-font-mono, ui-monospace, SFMono-Regular, Menlo, monospace);
-  font-size: 12px; line-height: 18px; text-align: left;
-  transition: background-color 0.15s ease;
-}
-.xps-mk-version:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(31, 35, 41, 0.06)); }
-.xps-mk-version:active { background: var(--dsw-alias-interactive-bg-active, rgba(38, 49, 72, 0.1)); }
-.xps-mk-version:focus-visible {
-  outline: 2px solid var(--dsw-alias-brand-primary, #3370ff);
-  outline-offset: -2px;
-}
-.xps-mk-version-active, .xps-mk-version-active:hover {
-  background: var(--dsw-alias-interactive-bg-active, rgba(38, 49, 72, 0.1));
-  color: var(--dsw-alias-label-primary, #1f2329);
-}
-.xps-mk-version-date {
-  flex: none; font-size: 11px; line-height: 17px;
-  font-family: inherit;
-  color: var(--dsw-alias-label-tertiary, #8f959e);
-}
+/* \u8BE6\u60C5\u9875\u7248\u672C\u5386\u53F2\u4E0B\u62C9:\u5360\u6EE1\u5361\u7247\u5BBD(.xps-mk-select \u9ED8\u8BA4 flex:none \u53EA\u9002\u914D\u5DE5\u5177\u680F) */
+.xps-mk-version-select { display: block; width: 100%; margin-top: 8px; }
 
 /* README markdown \u767D\u540D\u5355\u6E32\u67D3 */
 .xps-md {
@@ -1125,8 +1110,7 @@ var MARKET_CSS = `
   .xps-mk-chip,
   .xps-mk-row,
   .xps-mk-page,
-  .xps-mk-select,
-  .xps-mk-version {
+  .xps-mk-select {
     transition: none;
   }
   .xps-mk-page:active:not(:disabled) {
@@ -2267,6 +2251,12 @@ function ConfirmDialog3(props) {
     ] })
   ] }) });
 }
+function byInstalledAtDesc(a, b) {
+  const ta = a.installedAt ?? "";
+  const tb = b.installedAt ?? "";
+  if (ta !== tb) return ta < tb ? 1 : -1;
+  return a.name.localeCompare(b.name);
+}
 function InstalledPage() {
   ensureMarketStyles();
   const { items, push, dismiss } = useToasts();
@@ -2280,7 +2270,7 @@ function InstalledPage() {
   const load = (0, import_react5.useCallback)(() => {
     setList(null);
     setError(false);
-    void getInstalled().then((installed) => setList(installed)).catch(() => {
+    void getInstalled().then((installed) => setList([...installed].sort(byInstalledAtDesc))).catch(() => {
       setList([]);
       setError(true);
     });
@@ -2549,6 +2539,24 @@ function satisfies(version, range) {
 
 // src/client/pages/market/InstallButton.tsx
 var import_react6 = require("react");
+
+// src/client/pages/market/version.ts
+function compareVersions(a, b) {
+  const parse = (text) => text.trim().replace(/^v/, "").split(".").map((part) => {
+    const numeric = /^\d+/.exec(part);
+    return numeric === null ? 0 : Number(numeric[0]);
+  });
+  const left = parse(a);
+  const right = parse(b);
+  const length = Math.max(left.length, right.length);
+  for (let index = 0; index < length; index += 1) {
+    const diff = (left[index] ?? 0) - (right[index] ?? 0);
+    if (diff !== 0) return diff > 0 ? 1 : -1;
+  }
+  return 0;
+}
+
+// src/client/pages/market/InstallButton.tsx
 var import_jsx_runtime15 = require("react/jsx-runtime");
 function InstallButton(props) {
   const [phase, setPhase] = (0, import_react6.useState)("idle");
@@ -2556,10 +2564,11 @@ function InstallButton(props) {
   const [buildConfirm, setBuildConfirm] = (0, import_react6.useState)(null);
   const [approving, setApproving] = (0, import_react6.useState)(false);
   const compat = checkCompat(props.compatRange, props.dshVersion);
-  const verb = props.installed?.updateAvailable === true ? "\u66F4\u65B0" : "\u5B89\u88C5";
-  const variant = verb === "\u66F4\u65B0" ? "update" : "primary";
-  if (props.installed !== void 0 && !props.installed.updateAvailable) {
-    return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "xps-mk-install", onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Button, { size: props.size ?? "medium", variant: "primary", disabled: true, title: "\u5DF2\u5B89\u88C5\u6700\u65B0\u7248\u672C,\u91CD\u88C5\u540C\u7248\u672C\u4E0D\u4F1A\u5237\u65B0", children: "\u5DF2\u5B89\u88C5" }) });
+  const sameAsInstalled = props.installed !== void 0 && props.installed.version === props.version;
+  const verb = props.installed === void 0 || sameAsInstalled ? "\u5B89\u88C5" : compareVersions(props.version, props.installed.version) >= 0 ? "\u66F4\u65B0" : "\u964D\u7EA7";
+  const variant = verb === "\u5B89\u88C5" ? "primary" : "update";
+  if (sameAsInstalled) {
+    return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "xps-mk-install", onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Button, { size: props.size ?? "medium", variant: "primary", disabled: true, title: "\u5DF2\u5B89\u88C5\u6B64\u7248\u672C,\u91CD\u88C5\u540C\u7248\u672C\u4E0D\u4F1A\u5237\u65B0", children: "\u5DF2\u5B89\u88C5" }) });
   }
   if (compat.ok === false) {
     return /* @__PURE__ */ (0, import_jsx_runtime15.jsx)("span", { className: "xps-mk-install", onClick: (e) => e.stopPropagation(), children: /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(
@@ -3233,12 +3242,32 @@ function PluginDetailPage(props) {
   const [dshVersion, setDshVersion] = (0, import_react8.useState)(null);
   const [installed, setInstalled] = (0, import_react8.useState)(null);
   const toasts = useToasts();
+  const installedSeq = (0, import_react8.useRef)(0);
   const loadInstalled = (0, import_react8.useCallback)(
-    (name) => {
-      getInstalled().then((list) => setInstalled(list.find((item) => item.name === name) ?? null)).catch(() => setInstalled(null));
+    (...names) => {
+      const seq = ++installedSeq.current;
+      getInstalled().then((list) => {
+        if (seq === installedSeq.current) {
+          setInstalled(list.find((item) => names.includes(item.name)) ?? null);
+        }
+      }).catch(() => {
+        if (seq === installedSeq.current) setInstalled(null);
+      });
     },
     []
   );
+  const selectVersion = (version) => {
+    setSelectedVersion(version);
+    if (detail !== null) loadInstalled(pluginId, detail.name);
+  };
+  (0, import_react8.useEffect)(() => {
+    if (detail === null) return;
+    const onVisible = () => {
+      if (document.visibilityState === "visible") loadInstalled(pluginId, detail.name);
+    };
+    document.addEventListener("visibilitychange", onVisible);
+    return () => document.removeEventListener("visibilitychange", onVisible);
+  }, [detail, pluginId, loadInstalled]);
   (0, import_react8.useEffect)(() => {
     let alive = true;
     getHostInfo().then((info) => {
@@ -3255,7 +3284,6 @@ function PluginDetailPage(props) {
     setDetail(null);
     setSelectedVersion(null);
     setInstalled(null);
-    if (pluginId !== "") loadInstalled(pluginId);
     getPluginDetail(pluginId).then((d) => {
       if (!alive) return;
       if (d === null) {
@@ -3264,6 +3292,7 @@ function PluginDetailPage(props) {
         setDetail(d);
         setSelectedVersion(d.version);
         setStatus("ready");
+        loadInstalled(pluginId, d.name);
       }
     }).catch(() => {
       if (alive) setStatus("error");
@@ -3351,7 +3380,7 @@ function PluginDetailPage(props) {
           sourceType: detail.sourceType,
           dshVersion,
           installed: installed ?? void 0,
-          onInstalled: () => loadInstalled(detail.name),
+          onInstalled: () => loadInstalled(pluginId, detail.name),
           onToast: toasts.push
         }
       )
@@ -3380,24 +3409,22 @@ function PluginDetailPage(props) {
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("div", { className: "xps-mk-card", children: [
           /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("div", { className: "xps-mk-card-title", children: "\u7248\u672C\u5386\u53F2" }),
-          detail.versions.map((v) => /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)(
-            "button",
+          /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
+            "select",
             {
-              type: "button",
-              className: `xps-mk-version${v.version === displayVersion ? " xps-mk-version-active" : ""}`,
-              title: `\u5207\u6362\u5230 v${v.version}`,
-              onClick: () => setSelectedVersion(v.version),
-              children: [
-                /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("span", { children: [
-                  "v",
-                  v.version,
-                  v.version === detail.version ? " \xB7 \u6700\u65B0" : ""
-                ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("span", { className: "xps-mk-version-date", children: formatDate(v.publishedAt) })
-              ]
-            },
-            v.version
-          ))
+              className: "xps-mk-select xps-mk-version-select",
+              value: displayVersion,
+              title: "\u5207\u6362\u7248\u672C",
+              onChange: (e) => selectVersion(e.target.value),
+              children: detail.versions.map((v) => /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("option", { value: v.version, children: [
+                "v",
+                v.version,
+                " \xB7 ",
+                formatShortDate(v.publishedAt),
+                v.version === detail.version ? " \xB7 \u6700\u65B0" : ""
+              ] }, v.version))
+            }
+          )
         ] })
       ] })
     ] })
@@ -3652,21 +3679,82 @@ var rightStyle2 = {
   alignItems: "flex-end",
   gap: 4
 };
+var PENDING_UPDATE_KEY = "xrxs-plugins-store:self-update-pending";
+function readPendingUpdate() {
+  try {
+    const raw = localStorage.getItem(PENDING_UPDATE_KEY);
+    if (raw === null) return null;
+    const parsed = JSON.parse(raw);
+    return typeof parsed.version === "string" ? parsed.version : null;
+  } catch {
+    return null;
+  }
+}
+function writePendingUpdate(version) {
+  try {
+    localStorage.setItem(PENDING_UPDATE_KEY, JSON.stringify({ version }));
+  } catch {
+  }
+}
+function clearPendingUpdate() {
+  try {
+    localStorage.removeItem(PENDING_UPDATE_KEY);
+  } catch {
+  }
+}
 function messageOf3(error, fallback) {
   return error instanceof Error && error.message !== "" ? error.message : fallback;
 }
+function versionAtLeast(current, target) {
+  const parse = (text) => text.trim().replace(/^v/, "").split(".").map((part) => {
+    const numeric = /^\d+/.exec(part);
+    return numeric === null ? 0 : Number(numeric[0]);
+  });
+  const left = parse(current);
+  const right = parse(target);
+  const length = Math.max(left.length, right.length);
+  for (let index = 0; index < length; index += 1) {
+    const diff = (left[index] ?? 0) - (right[index] ?? 0);
+    if (diff !== 0) return diff > 0;
+  }
+  return true;
+}
 function GeneralUpdateRow() {
-  const [phase, setPhase] = (0, import_react11.useState)({ kind: "checking" });
+  const [phase, setPhase] = (0, import_react11.useState)(() => {
+    const pending = readPendingUpdate();
+    return pending !== null ? { kind: "updated", version: pending } : { kind: "checking" };
+  });
   const [error, setError] = (0, import_react11.useState)("");
   const check = () => {
     setPhase({ kind: "checking" });
     setError("");
-    void checkSelfUpdate().then((result) => setPhase({ kind: "checked", check: result })).catch((err) => {
+    void checkSelfUpdate().then((result) => {
+      const pending = readPendingUpdate();
+      if (pending !== null && result.current !== null && versionAtLeast(result.current, pending)) {
+        clearPendingUpdate();
+        setPhase({ kind: "checked", check: result });
+        return;
+      }
+      setPhase({ kind: "checked", check: result });
+    }).catch((err) => {
       setPhase({ kind: "checked", check: { current: null, latest: null, updateAvailable: false } });
       setError(messageOf3(err, "\u68C0\u67E5\u66F4\u65B0\u5931\u8D25"));
     });
   };
-  (0, import_react11.useEffect)(check, []);
+  (0, import_react11.useEffect)(() => {
+    if (readPendingUpdate() !== null) {
+      void checkSelfUpdate().then((result) => {
+        const pending = readPendingUpdate();
+        if (pending !== null && result.current !== null && versionAtLeast(result.current, pending)) {
+          clearPendingUpdate();
+          setPhase({ kind: "checked", check: result });
+        }
+      }).catch(() => {
+      });
+      return;
+    }
+    check();
+  }, []);
   const handleUpdate = (target, check0) => {
     setPhase({ kind: "updating", check: check0 });
     setError("");
@@ -3675,6 +3763,7 @@ function GeneralUpdateRow() {
         setPhase({ kind: "degraded", command: result.command, version: target });
         return;
       }
+      writePendingUpdate(target);
       setPhase({ kind: "updated", version: target });
     }).catch((err) => {
       setPhase({ kind: "checked", check: check0 });

package/lib/host/installer.d.ts

@@ -88,6 +88,9 @@ export interface InstalledEntry {
     managed: boolean;
     /** 已装包自身 package.json 的 description(file: 本地装的包不在市场里,简介只能从这里来);读不到为 null。 */
     description: string | null;
+    /** 安装时间(ISO 8601);取 node_modules/<name> 的创建时间(pnpm 装包时建立,更新重装会刷新)。
+     *  目录缺失/文件系统不支持 birthtime 时为 null,页面把它排在最后。 */
+    installedAt: string | null;
 }
 /** 已装列表:读 <DSH_HOME>/profiles/<profile>/package.json 依赖 + dsh.profile.bundles 层栈
  *  (desktop profile 被 CLI 独占时读文件不受影响;设计文档 §3.3)。

package/lib/host/installer.js

@@ -1,7 +1,7 @@
 import { createHash } from 'node:crypto';
 import { spawn } from 'node:child_process';
 import { existsSync, readdirSync, statSync } from 'node:fs';
-import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
+import { lstat, mkdir, readFile, rename, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename, delimiter, dirname, join } from 'node:path';
 import { ApiError } from "./api-client.js";
@@ -437,7 +437,18 @@ export async function listInstalledFromProfile(host) {
         }
         if (version === '')
             version = versionFromFileSpec(spec) ?? '';
-        return { name, version, managed: bundles.has(name), description };
+        // 安装时间:lstat 链接本身(pnpm 的 node_modules 项是指向 .pnpm 的符号链接,
+        // 链接创建时间 = 装包时间);birthtime 不可用(≤0/非法)退 mtime,再不行置 null
+        let installedAt = null;
+        try {
+            const link = await lstat(join(profileDir, 'node_modules', ...name.split('/')));
+            const time = link.birthtimeMs > 0 ? link.birthtime : link.mtime;
+            installedAt = Number.isNaN(time.getTime()) || time.getTime() <= 0 ? null : time.toISOString();
+        }
+        catch {
+            // 路径不存在:installedAt 保持 null
+        }
+        return { name, version, managed: bundles.has(name), description, installedAt };
     }));
 }
 const OUTPUT_CAP = 512 * 1024;

package/lib/host/routes.js

@@ -301,7 +301,11 @@ async function fetchLatestVersionMap(deps) {
             const version = optionalString(item.version);
             if (name === undefined || version === undefined)
                 continue;
-            map.set(name, { version, summary: optionalString(item.summary) ?? null });
+            map.set(name, {
+                version,
+                displayName: optionalString(item.displayName) ?? null,
+                summary: optionalString(item.summary) ?? null,
+            });
         }
     }
     catch (error) {
@@ -321,6 +325,9 @@ async function handleInstalled(rc) {
             latestVersion,
             updateAvailable: latestVersion !== null && latestVersion !== entry.version,
             managed: entry.managed,
+            installedAt: entry.installedAt,
+            // 展示名来自市场;本机手装/离线的包没有,client 半自行回退包名
+            displayName: meta?.displayName ?? null,
             // 市场简介优先;file: 本地装的包不在市场里,回退该包自己 package.json 的 description
             summary: meta?.summary ?? entry.description,
         };

package/lib/host/self-update.d.ts

@@ -12,7 +12,10 @@ import { type InstallOutcome, type InstallerDeps } from './installer.ts';
 export declare const SELF_PACKAGE_NAME = "@xrxs-ai/dsh-xrxs-plugins-store";
 /** 当前运行实例的版本(包根 package.json);读不到为 null(极端情况:裸文件运行)。
  *  依次尝试:模块相对层级(tsc 产物 lib/host/ 与源码 src/host/ 都是上一级的上一级)、
- *  按包名 resolve(profile 安装布局变化时的兜底);读到的包名必须匹配,防止层级猜错读成别的包。 */
+ *  按包名 resolve(profile 安装布局变化时的兜底);读到的包名必须匹配,防止层级猜错读成别的包。
+ *  模块级缓存且首次读取后不再重读:这里要报的是「运行实例」的版本,不是磁盘版本 ——
+ *  更新落盘后宿主可能只重挂 client 而不重载 host 模块,重读磁盘会把还在运行的旧实例
+ *  报成新版本;重启后 host 模块重新加载,缓存自然取到新版本。 */
 export declare function currentSelfVersion(): string | null;
 export interface SelfUpdateCheck {
     /** 当前运行实例版本;读不到为 null(无法比较,不可更新) */
@@ -21,7 +24,9 @@ export interface SelfUpdateCheck {
     latest: string | null;
     updateAvailable: boolean;
 }
-/** 查 npm latest 并与当前版本比较;registry 查询失败时 latest 为 null(不抛,便于 UI 展示「检查失败」)。 */
+/** 查 npm latest 并与当前版本比较;registry 查询失败时 latest 为 null(不抛,便于 UI 展示「检查失败」)。
+ *  当前版本走模块级缓存:报运行实例的版本 —— 更新落盘、宿主尚未重载时,磁盘已是新版本,
+ *  但内存里跑的还是旧实例,报旧值才能让 client 半的「已更新待重启」记录正确保留到重启。 */
 export declare function checkSelfUpdate(): Promise<SelfUpdateCheck>;
 /** 应用更新:复用安装链路装确切版本(不装 latest tag,避免「检查到装的」漂移)。 */
 export declare function applySelfUpdate(version: string, deps: InstallerDeps): Promise<InstallOutcome>;

package/lib/host/self-update.js

@@ -20,7 +20,10 @@ const LATEST_TIMEOUT_MS = 10_000;
 let cachedVersion = null;
 /** 当前运行实例的版本(包根 package.json);读不到为 null(极端情况:裸文件运行)。
  *  依次尝试:模块相对层级(tsc 产物 lib/host/ 与源码 src/host/ 都是上一级的上一级)、
- *  按包名 resolve(profile 安装布局变化时的兜底);读到的包名必须匹配,防止层级猜错读成别的包。 */
+ *  按包名 resolve(profile 安装布局变化时的兜底);读到的包名必须匹配,防止层级猜错读成别的包。
+ *  模块级缓存且首次读取后不再重读:这里要报的是「运行实例」的版本,不是磁盘版本 ——
+ *  更新落盘后宿主可能只重挂 client 而不重载 host 模块,重读磁盘会把还在运行的旧实例
+ *  报成新版本;重启后 host 模块重新加载,缓存自然取到新版本。 */
 export function currentSelfVersion() {
     if (cachedVersion !== null)
         return cachedVersion;
@@ -50,7 +53,9 @@ export function currentSelfVersion() {
     }
     return cachedVersion;
 }
-/** 查 npm latest 并与当前版本比较;registry 查询失败时 latest 为 null(不抛,便于 UI 展示「检查失败」)。 */
+/** 查 npm latest 并与当前版本比较;registry 查询失败时 latest 为 null(不抛,便于 UI 展示「检查失败」)。
+ *  当前版本走模块级缓存:报运行实例的版本 —— 更新落盘、宿主尚未重载时,磁盘已是新版本,
+ *  但内存里跑的还是旧实例,报旧值才能让 client 半的「已更新待重启」记录正确保留到重启。 */
 export async function checkSelfUpdate() {
     const current = currentSelfVersion();
     let latest = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xrxs-ai/dsh-xrxs-plugins-store",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "DSH 私有插件市场插件(静态持久 bundle,双 face)",
   "type": "module",
   "license": "MIT",