dsh-m 0.2.13 → 0.2.14

package/lib/client.js

@@ -604,6 +604,8 @@ var ZH = {
   "warn.unlink": "\u5378\u8F7D\u53EA\u79FB\u9664 profile \u5BF9\u672C\u5730\u76EE\u5F55\u7684\u5F15\u7528\uFF08{path}\uFF09\uFF0C\u4E0D\u4F1A\u5220\u9664\u76EE\u5F55\u672C\u8EAB\u3002",
   "warn.core": "\u8FD9\u662F file: \u5B89\u88C5\u7684\u6838\u5FC3/\u5F52\u6863\u5305\uFF0C\u5378\u8F7D\u53EF\u80FD\u5F71\u54CD DSH \u529F\u80FD\uFF0C\u4E14\u9700\u8981\u624B\u52A8\u6062\u590D\u3002",
   "profile.hint": "web profile\uFF1A{path}",
+  "dsh.chip.copyhint": "\u70B9\u51FB\u590D\u5236\u7248\u672C\u53F7",
+  "dsh.chip.copied": "\u5DF2\u590D\u5236 \u2713",
   "title.panel": "\u63D2\u4EF6\u5E02\u573A",
   "title.full": "DeepSeek Harness \u63D2\u4EF6\u5E02\u573A"
 };
@@ -770,6 +772,8 @@ var EN = {
   "warn.unlink": "Uninstalling only removes the profile's reference to the local directory ({path}); the directory itself is kept.",
   "warn.core": "This is a core/archive package installed via file:. Uninstalling may affect DSH features and requires manual restore.",
   "profile.hint": "web profile: {path}",
+  "dsh.chip.copyhint": "Click to copy version",
+  "dsh.chip.copied": "Copied \u2713",
   "title.panel": "Plugin Marketplace",
   "title.full": "DeepSeek Harness Plugin Marketplace"
 };
@@ -885,6 +889,14 @@ var CSS = `
 [data-slot="sidebar.footer.action"]{display:flex!important;flex-direction:column;width:100%;min-width:0}
 [data-slot="sidebar.footer.action"]>*{flex:none;min-width:0}
 .dshm-empty{text-align:center;color:var(--dsw-alias-label-caption,#6b7280);font-size:13px;padding:32px 0}
+/* \u5934\u90E8 DSH \u7248\u672C chip\uFF1A\u7B49\u5BBD\u5C0F\u5B57\u5706\u89D2\uFF0Chover \u5C55\u5F00\u8BE6\u60C5\uFF0C\u70B9\u51FB\u590D\u5236\uFF082026-09-14 \u5B9A\u7A3F\uFF09 */
+.dshm-dshchip{position:relative;display:inline-flex;align-items:center;gap:4px;border:1px solid var(--dsw-alias-border-l2,#e5e7eb);background:var(--dsw-alias-bg-layer-1,#f5f6f8);color:var(--dsw-alias-label-secondary,#4b5563);border-radius:999px;padding:4px 10px;font:11px/1 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;cursor:pointer;white-space:nowrap;flex:none}
+.dshm-dshchip:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(38,49,72,.06));color:var(--dsw-alias-label-primary,inherit)}
+.dshm-dshchip-v{font-weight:600;color:var(--dsw-alias-label-primary,inherit)}
+.dshm-dshchip-tip{position:absolute;top:calc(100% + 7px);right:0;visibility:hidden;opacity:0;transition:opacity .12s;z-index:60;background:var(--dsw-alias-bg-overlay,#fff);border:1px solid var(--dsw-alias-border-l2,#e5e7eb);border-radius:9px;box-shadow:var(--dsw-shadow-lv1,0 2px 8px rgb(20 24 32 / 8%));padding:7px 10px;text-align:left;pointer-events:none}
+.dshm-dshchip:hover .dshm-dshchip-tip,.dshm-dshchip:focus-visible .dshm-dshchip-tip{visibility:visible;opacity:1}
+.dshm-dshchip-tiprow{font:12px/16px ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-weight:600;color:var(--dsw-alias-label-primary,inherit)}
+.dshm-dshchip-tipsub{display:block;margin-top:2px;font-size:10px;line-height:14px;color:var(--dsw-alias-label-caption,#9ca3af)}
 `;
 function ensureCss() {
   if (typeof document === "undefined" || document.getElementById("dshm-css")) return;
@@ -1646,10 +1658,44 @@ var TABS = [
   ["installed", "tab.installed", "installed"],
   ["settings", "tab.settings", null]
 ];
+function DshVersionChip({ version }) {
+  const [copied, setCopied] = useState(false);
+  const copy = async () => {
+    try {
+      await navigator.clipboard.writeText(version);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 1600);
+    } catch {
+    }
+  };
+  return h(
+    "button",
+    { type: "button", className: "dshm-dshchip", onClick: copy, "aria-label": `DSH ${version}` },
+    "DSH ",
+    h("span", { className: "dshm-dshchip-v" }, version),
+    h(
+      "span",
+      { className: "dshm-dshchip-tip", role: "tooltip" },
+      h("span", { className: "dshm-dshchip-tiprow" }, `DSH ${version}`),
+      h("span", { className: "dshm-dshchip-tipsub" }, lookup(copied ? "dsh.chip.copied" : "dsh.chip.copyhint"))
+    )
+  );
+}
 function MarketPanel({ onClose }) {
   const [tab, setTab] = useState("market");
   const market = useMarketData();
   const installed = useAsync(() => api("installed"), []);
+  const [dshVersion, setDshVersion] = useState(null);
+  useEffect(() => {
+    let live = true;
+    api("ping").then((r) => {
+      if (live) setDshVersion(typeof r?.dshVersion === "string" && r.dshVersion ? r.dshVersion : null);
+    }).catch(() => {
+    });
+    return () => {
+      live = false;
+    };
+  }, []);
   const refreshViews = useCallback(
     () => refreshAfterMutation2({ marketReload: market.reload, installedReload: installed.reload }),
     [market.reload, installed.reload]
@@ -1707,6 +1753,7 @@ function MarketPanel({ onClose }) {
           )
         ),
         h("span", { className: "dshm-spacer" }),
+        dshVersion ? h(DshVersionChip, { version: dshVersion }) : null,
         h("button", { className: "dshm-btn", onClick: onClose }, lookup("common.close"))
       ),
       h(

package/lib/core/dsh-version.js

@@ -0,0 +1,103 @@
+/**
+ * DSH 运行版本解析（市场面板头部 chip 数据源，2026-09-14 设计定稿）。
+ *
+ * 通路（查证结论，三条免费路径已证伪）：生产 host 内 dshArgv() 以 process.argv[1]
+ * 定位 launcher entry（…/@deepseek-ai/dsh/lib/bin.js，restart.ts 拉起重启即复用同一
+ * 定位），从 entry 向上至多三级找 package.json 读 version——官方 bin.js 的 readVersion
+ * 同款做法。CLI/PATH 模式或读取失败回退 spawn `dsh --version`（短超时）。
+ *
+ * 结果进程内缓存（版本随进程恒定）；两级皆失败返回 null，客户端据此隐藏 chip。
+ * 注意：`window.__DSH_BOOT__` 只有内容哈希 rev 无 semver；settings.yaml 无版本键；
+ * .pnpm 目录名多版本残留无判据——均不走。
+ */
+import { dirname, join } from 'node:path';
+import { readFileSync } from 'node:fs';
+import { spawn } from 'node:child_process';
+import { dshArgv } from './dsh-cli.js';
+/** 从 `dsh --version` 输出提取 semver：容忍 v 前缀与前后散文，取首个命中。 */
+export function parseDshVersionOutput(text) {
+    const m = /\bv?([0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?)/.exec(text ?? '');
+    return m ? m[1] : null;
+}
+/**
+ * 生产通路：launcher entry 定位 + 就近向上找 package.json。
+ * 纯同步、无 spawn；任何一步失败返回 null（不抛）。
+ */
+export function readLauncherPackageVersion(input = {}) {
+    try {
+        const argv = dshArgv(input);
+        const entry = argv.args.length > 0 ? argv.args[argv.args.length - 1] : undefined;
+        // 与 dshArgv 同一判定：entry 必须长得像 launcher bin，否则是 CLI/PATH 模式
+        if (!entry || !/[\\/](?:bin\.(?:js|ts)|dsh)$/.test(entry))
+            return null;
+        let dir = dirname(entry);
+        for (let up = 0; up < 3; up++) {
+            try {
+                const pkg = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
+                if (typeof pkg?.version === 'string' && pkg.version)
+                    return pkg.version;
+            }
+            catch {
+                /* 该级无 package.json / 不可读，继续向上一级 */
+            }
+            dir = dirname(dir);
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+function spawnDshVersion(timeoutMs) {
+    return new Promise((resolveP) => {
+        let settled = false;
+        const done = (v) => {
+            if (!settled) {
+                settled = true;
+                resolveP(v);
+            }
+        };
+        let child;
+        try {
+            child = spawn('dsh', ['--version'], { stdio: ['ignore', 'pipe', 'ignore'], shell: process.platform === 'win32' });
+        }
+        catch {
+            done(null);
+            return;
+        }
+        let out = '';
+        const timer = setTimeout(() => {
+            try {
+                child.kill('SIGKILL');
+            }
+            catch {
+                /* already dead */
+            }
+            done(null);
+        }, timeoutMs);
+        child.stdout?.on('data', (d) => {
+            out += String(d);
+        });
+        child.on('error', () => {
+            clearTimeout(timer);
+            done(null);
+        });
+        child.on('close', () => {
+            clearTimeout(timer);
+            done(parseDshVersionOutput(out));
+        });
+    });
+}
+let cache = null;
+/** 进程内缓存的一次性解析；null = 两级皆失败（调用方按「未知」处理）。 */
+export function resolveDshVersion(opts = {}) {
+    if (!cache) {
+        const direct = readLauncherPackageVersion();
+        cache = direct != null ? Promise.resolve(direct) : spawnDshVersion(opts.fallbackTimeoutMs ?? 3_000);
+    }
+    return cache;
+}
+/** 仅测试：清空进程内缓存。 */
+export function resetDshVersionCacheForTest() {
+    cache = null;
+}

package/lib/core/host-api.js

@@ -7,6 +7,7 @@
  * trustedRestartRequest host-equivalence guard → typed method/业务错误映射 → 其他 500。
  */
 import { BOOT_ID, publicInstallStatus } from './dsh-cli.js';
+import { resolveDshVersion } from './dsh-version.js';
 import { listInstalledWithMeta, listMarket, installFromRegistry, uninstallPlugin, upgradePlugin, } from './market.js';
 import { runProfileTransaction, TransactionError, makeNpmWarmPackument } from './profile-transaction.js';
 import { readInstalledPluginReadme } from './installed.js';
@@ -162,8 +163,13 @@ export function createApiDispatcher(ctx) {
         npmLatest: ctx.deps?.npmLatest ?? npmLatest,
         runTransaction: ctx.deps?.runTransaction ?? runProfileTransaction,
         scheduleRestart: ctx.deps?.scheduleRestart ?? scheduleRestart,
+        resolveDshVersion: ctx.deps?.resolveDshVersion ?? resolveDshVersion,
     };
     const cfg = () => ctx.controller.config;
+    // DSH 版本一次性解析，dispatcher 创建即预热（首个 ping 不吃 spawn 回退的延迟）
+    const dshVersionP = Promise.resolve()
+        .then(() => d.resolveDshVersion())
+        .catch(() => null);
     return async function handleApi(req, res) {
         const abort = new AbortController();
         res.once('close', () => abort.abort());
@@ -173,7 +179,14 @@ export function createApiDispatcher(ctx) {
             let payload;
             switch (method) {
                 case 'ping':
-                    payload = { plugin: ctx.pkg.name, version: ctx.pkg.version, node: process.version, boot: BOOT_ID };
+                    payload = {
+                        plugin: ctx.pkg.name,
+                        version: ctx.pkg.version,
+                        node: process.version,
+                        boot: BOOT_ID,
+                        // DSH 运行版本（头部 chip 数据源）；解析失败 → undefined → JSON 序列化时字段缺席
+                        dshVersion: (await dshVersionP) ?? undefined,
+                    };
                     break;
                 case 'self-check': {
                     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",