dsh-m 0.10.2 → 0.10.4

package/README.en.md

@@ -1,10 +1,9 @@
 # dsh-m — Plugin Marketplace for DeepSeek Harness
 
-[![Release](https://img.shields.io/github/v/release/iasiv5/dsh-m?label=Release&sort=semver)](https://github.com/iasiv5/dsh-m/releases)
 [![npm](https://img.shields.io/npm/v/dsh-m?label=npm)](https://www.npmjs.com/package/dsh-m)
 [![Registry Check](https://img.shields.io/github/actions/workflow/status/iasiv5/dsh-m/registry.yml?branch=main&label=Registry%20Check)](https://github.com/iasiv5/dsh-m/actions/workflows/registry.yml)
 [![License](https://img.shields.io/github/license/iasiv5/dsh-m?label=License)](./LICENSE)
-[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20%E2%86%92%200.2.0--rc.2-2563eb)](#compatibility--faq)
+[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20%E2%86%92%200.2.1--rc.2-2563eb)](#compatibility--faq)
 
 English · [中文](./README.md)
 
@@ -80,6 +79,7 @@ The GUI and Agent tools manage the **current host profile** (Web or Desktop). Th
 | `0.1.5-rc.1 / rc.2` | `register()` scope | Checked; rc.1 also page-tested |
 | `0.1.7-rc.1 / rc.2` | `.volatile()` + `settings.update` | Checked |
 | `0.2.0-rc.1 / rc.2` | Same as 0.1.7 | rc.2 and restart path live-tested |
+| `0.2.1-rc.2` | Same as 0.2.0 | Install/upgrade and D3 self-upgrade dogfooded (0.10.x line) |
 
 **Is Desktop identical to Web?** No. Desktop browsing, new-package installation, and toggles act on the desktop profile. Upgrades and uninstalls require capabilities from the official host `pluginManager`; if absent, dsh-m returns a structured refusal and guidance. Desktop uses the official app lifecycle rather than Web's one-click restart; quit and reopen as instructed. Favorites, operations, and installed states are separate between profiles.
 

package/README.md

@@ -1,10 +1,9 @@
 # dsh-m — DeepSeek Harness 插件市场
 
-[![Release](https://img.shields.io/github/v/release/iasiv5/dsh-m?label=Release&sort=semver)](https://github.com/iasiv5/dsh-m/releases)
 [![npm](https://img.shields.io/npm/v/dsh-m?label=npm)](https://www.npmjs.com/package/dsh-m)
 [![Registry Check](https://img.shields.io/github/actions/workflow/status/iasiv5/dsh-m/registry.yml?branch=main&label=Registry%20Check)](https://github.com/iasiv5/dsh-m/actions/workflows/registry.yml)
 [![License](https://img.shields.io/github/license/iasiv5/dsh-m?label=License)](./LICENSE)
-[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20%E2%86%92%200.2.0--rc.2-2563eb)](#兼容与常见问题)
+[![DSH Web](https://img.shields.io/badge/DSH%20Web-0.1.2--rc.1%20%E2%86%92%200.2.1--rc.2-2563eb)](#兼容与常见问题)
 
 [English](./README.en.md) · 中文
 
@@ -80,6 +79,7 @@ GUI 与 Agent 工具始终跟随**当前宿主 profile**（Web / Desktop）；
 | `0.1.5-rc.1 / rc.2` | `register()` scope | 已核对；rc.1 另有页面实测 |
 | `0.1.7-rc.1 / rc.2` | `.volatile()` + `settings.update` | 已核对 |
 | `0.2.0-rc.1 / rc.2` | 同 0.1.7 通路 | rc.2 与重启链路实测 |
+| `0.2.1-rc.2` | 同 0.2.0 通路 | 装机/升级与 D3 自升级 dogfood 实测（0.10.x 线） |
 
 **Desktop 与 Web 完全一样吗？** 不是。Desktop 的浏览、安装新包和开关作用于 desktop profile；升级/卸载等操作需宿主官方 `pluginManager` 提供相应能力，缺失时返回结构化拒绝和指引。Desktop 不提供 Web 的一键重启；变更需按应用提示退出并重新打开。两边的收藏、操作记录和已装状态互不串联。
 

package/lib/client.js

@@ -1562,7 +1562,7 @@ function createOperationsStore(storage) {
     }
   };
 }
-async function restoreRecords(records, stillApplies) {
+async function restoreRecords(records, stillApplies, installedVersionOf) {
   const list = Array.isArray(records) ? records : [];
   const out = [];
   for (const rec of list) {
@@ -1584,6 +1584,24 @@ async function restoreRecords(records, stillApplies) {
     } else if (rec.status === "input") {
       out.push({ ...rec, status: "failed", error: "\u5F85\u51B3\u786E\u8BA4\u4E0D\u53EF\u6062\u590D\uFF0C\u8BF7\u91CD\u65B0\u53D1\u8D77", updatedAt: Date.now() });
     } else if (rec.status === "running") {
+      if (rec.kind === "upgrade" && rec.meta && typeof rec.meta.toVersion === "string" && rec.meta.toVersion !== "" && typeof installedVersionOf === "function") {
+        let installed;
+        try {
+          installed = await installedVersionOf(rec);
+        } catch {
+          installed = void 0;
+        }
+        if (installed === rec.meta.toVersion) {
+          out.push({
+            ...rec,
+            status: "done",
+            error: void 0,
+            meta: { ...rec.meta, reconciledAfterRestart: true },
+            updatedAt: Date.now()
+          });
+          continue;
+        }
+      }
       out.push({ ...rec, status: "failed", error: "\u8FDB\u7A0B\u91CD\u542F\u4E2D\u65AD", updatedAt: Date.now() });
     } else {
       out.push({ ...rec });
@@ -2351,6 +2369,8 @@ var ZH = {
   "op.degraded": "\u5347\u7EA7\u5931\u8D25\uFF1A\u65B0\u7248\u5B89\u88C5\u672A\u6210\u529F\uFF0C\u5DF2\u81EA\u52A8\u6062\u590D\u65E7\u7248 {restoredTo}\u2014\u2014\u63D2\u4EF6\u5F53\u524D\u53EF\u7528\uFF0C\u53EF\u7A0D\u540E\u91CD\u8BD5\u3002",
   "notify.selfupgraded": "dsh-m \u5DF2\u5347\u7EA7\uFF08v{from} \u2192 v{to}\uFF09",
   "notify.selfupgraded.failed": "dsh-m \u5347\u7EA7\u5931\u8D25\uFF1A{err}",
+  "selfupgrade.reconciled.done": "dsh-m \u81EA\u5347\u7EA7\u5DF2\u5B8C\u6210\uFF08\u5F00\u673A\u5BF9\u8D26\u786E\u8BA4\uFF09\uFF1A{from} \u2192 {to}\u3002",
+  "selfupgrade.reconciled.failed": "dsh-m \u81EA\u5347\u7EA7\u672A\u5B8C\u6210\uFF08\u5F00\u673A\u5BF9\u8D26\u786E\u8BA4\uFF09\uFF1A\u76EE\u6807 {to} \u672A\u88C5\u673A\uFF0C\u5F53\u524D\u4ECD\u4E3A {current}\uFF0C\u53EF\u91CD\u8BD5\u3002",
   "failed.install": "\u5B89\u88C5\u5931\u8D25\uFF1A{err}",
   "failed.uninstall": "\u5378\u8F7D\u5931\u8D25\uFF1A{err}",
   "failed.upgrade": "\u5347\u7EA7\u5931\u8D25\uFF1A{err}",
@@ -2652,6 +2672,8 @@ var EN = {
   "op.degraded": "Upgrade failed: the new version did not install \u2014 rolled back to {restoredTo}. The plugin still works; you can retry later.",
   "notify.selfupgraded": "dsh-m upgraded (v{from} \u2192 v{to})",
   "notify.selfupgraded.failed": "dsh-m upgrade failed: {err}",
+  "selfupgrade.reconciled.done": "dsh-m self-upgrade finished (confirmed by boot reconciliation): {from} \u2192 {to}.",
+  "selfupgrade.reconciled.failed": "dsh-m self-upgrade did not complete (confirmed by boot reconciliation): target {to} is not installed \u2014 still {current}; you can retry.",
   "failed.install": "Install failed: {err}",
   "failed.uninstall": "Uninstall failed: {err}",
   "failed.upgrade": "Upgrade failed: {err}",
@@ -4168,7 +4190,7 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind, o
         const r = await api("upgrade", { pkg: it.installedPkg });
         const m = opUpgradeMeta2(r);
         return m ? { ...r, opMeta: m } : r;
-      });
+      }, { toVersion: it.latest });
       const degraded = oc.degradedOutcome(res);
       if (degraded) {
         notify({ kind: "warn", text: degraded.text });
@@ -4570,7 +4592,7 @@ function InstalledTab({ notify, installed, updates, onMutation, ops }) {
         const r = await api("upgrade", { pkg: it.pkg });
         const m = opUpgradeMeta2(r);
         return m ? { ...r, opMeta: m } : r;
-      });
+      }, { toVersion: it.latestVersion });
       const degraded = oc.degradedOutcome(res);
       if (degraded) {
         notify({ kind: "warn", text: degraded.text });
@@ -5198,6 +5220,12 @@ function DshmVersionChip({ version, notify, initialCheck, ops }) {
       if (data && typeof data === "object" && typeof data.current === "string") {
         writeSelfCheckCache2(typeof window !== "undefined" && window.localStorage ? window.localStorage : null, data);
         setCheck(data);
+        const ir = data.intentResolved;
+        if (ir && ir.ok) {
+          notify({ kind: "ok", text: lookup("selfupgrade.reconciled.done", { from: ir.fromVersion ? `v${ir.fromVersion}` : "\u2014", to: `v${ir.installedVersion}` }) });
+        } else if (ir) {
+          notify({ kind: "warn", text: lookup("selfupgrade.reconciled.failed", { to: `v${ir.intentVersion}`, current: `v${version}` }) });
+        }
       }
     }).catch(() => {
     });
@@ -5216,7 +5244,7 @@ function DshmVersionChip({ version, notify, initialCheck, ops }) {
       const res = await (ops ? ops.runOp("upgrade", "dsh-m", async () => {
         const r = await api("self-upgrade");
         return { ...r, opMeta: { from: version, to: r.version || "latest" } };
-      }, { npm: "dsh-m" }) : api("self-upgrade"));
+      }, { npm: "dsh-m", toVersion: state.latest }) : api("self-upgrade"));
       clearSelfCheckCache2(typeof window !== "undefined" && window.localStorage ? window.localStorage : null);
       setCheck({ current: version, latest: null, outdated: false, ahead: false });
       notify({
@@ -5732,19 +5760,34 @@ function MarketPanel({ onClose }) {
       if (opsPumpCtx && opsPumpCtx.syncOps === syncOps) opsPumpCtx = null;
     };
   }, [stillApplies, dispatchRestored, syncOps, refreshViews]);
+  const installedVersionOf = useCallback(async (r) => {
+    try {
+      const fresh = await api("installed", { probe: false });
+      const items = fresh && Array.isArray(fresh.items) ? fresh.items : [];
+      const row = items.find((it) => it && it.pkg === r.target);
+      return row && typeof row.version === "string" ? row.version : void 0;
+    } catch {
+      return void 0;
+    }
+  }, []);
   const restoredRef = useRef(false);
   useEffect(() => {
     if (restoredRef.current || !installed.data) return;
     restoredRef.current = true;
     void (async () => {
-      const restored = await restoreRecords2(opsStore.list(), stillApplies);
+      const restored = await restoreRecords2(opsStore.list(), stillApplies, installedVersionOf);
+      for (const r of restored) {
+        if (r.status === "done" && r.meta && r.meta.reconciledAfterRestart) {
+          notify({ kind: "ok", text: lookup("upgrade.reconciled.done", { pkg: r.target, to: `v${r.meta.toVersion}` }) });
+        }
+      }
       opsStore.replaceAll(restored);
       syncOps();
       if (restored.some((r) => r.status === "queued")) {
         void opsPump.kick();
       }
     })();
-  }, [installed.data, stillApplies, syncOps]);
+  }, [installed.data, stillApplies, installedVersionOf, syncOps]);
   const counts = {
     market: marketCommunity.data ? marketCommunity.data.total : null,
     installed: installed.data ? installed.data.items.length : null

package/lib/core/host-api.js

@@ -281,7 +281,14 @@ export function createApiDispatcher(ctx) {
                             if (rec && rec.status === 'delegated') {
                                 const match = rec.version === ctx.pkg.version;
                                 await d.resolveUpgradeIntent({ ok: match, installedVersion: match ? ctx.pkg.version : undefined });
-                                intentResolved = { ok: match, target: rec.target, ...(match ? { installedVersion: ctx.pkg.version } : {}) };
+                                intentResolved = {
+                                    ok: match,
+                                    target: rec.target,
+                                    // 0.10.4：intentVersion/fromVersion 透出——client 据此补「对账确认」横幅（成功/未完成双形态）
+                                    intentVersion: rec.version,
+                                    ...(rec.fromVersion !== undefined ? { fromVersion: rec.fromVersion } : {}),
+                                    ...(match ? { installedVersion: ctx.pkg.version } : {}),
+                                };
                             }
                         }
                         catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",
@@ -20,8 +20,6 @@
     "registry.json",
     "README.md",
     "README.en.md",
-    "CHANGELOG.md",
-    "docs/DESIGN.md",
     "LICENSE"
   ],
   "keywords": [

package/registry.json

@@ -4,11 +4,11 @@
     {
       "id": "dsh-m",
       "name": "DSH Marketplace",
-      "description": "自定义清单的 DSH 插件市场，收录/安装/卸载/升级；已适配 DSH 0.2.0-rc.2，支持 web 与 desktop 双 profile，详见仓库。",
+      "description": "自定义清单的 DSH 插件市场，收录/安装/卸载/升级；已适配 DSH 0.2.1-rc.2，支持 web 与 desktop 双 profile，详见仓库。",
       "category": "essentials",
       "alsoCategories": ["self-dev"],
       "tags": ["市场", "插件管理"],
-      "verified": ["0.1.2-rc.1", "0.1.5-rc.1", "0.1.5-rc.2", "0.1.7-rc.1", "0.1.7-rc.2", "0.2.0-rc.1", "0.2.0-rc.2"],
+      "verified": ["0.1.2-rc.1", "0.1.5-rc.1", "0.1.5-rc.2", "0.1.7-rc.1", "0.1.7-rc.2", "0.2.0-rc.1", "0.2.0-rc.2", "0.2.1-rc.2"],
       "source": "npm",
       "npm": "dsh-m",
       "github": "iasiv5/dsh-m",
@@ -17,11 +17,11 @@
     {
       "id": "dsh-skins",
       "name": "DSH Skins",
-      "description": "DSH Web 皮肤插件：多套品牌皮肤侧栏热切换，一键回到官方界面。已适配 0.1.7-rc.2 与 0.2.0-rc.1/rc.2，详见仓库。",
+      "description": "DSH Web 皮肤插件：多套品牌皮肤侧栏热切换，一键回到官方界面。已适配 web 与 Desktop 0.2.0-rc.1+，详见仓库。",
       "category": "essentials",
       "alsoCategories": ["self-dev"],
       "tags": ["皮肤", "主题", "美化", "界面"],
-      "verified": ["0.1.2-rc.1", "0.1.7-rc.2", "0.2.0-rc.1", "0.2.0-rc.2"],
+      "verified": ["0.2.0-rc.1", "0.2.0-rc.2", "0.2.1-rc.2"],
       "source": "npm",
       "npm": "@iasiv5/dsh-skins",
       "github": "iasiv5/dsh-skins",
@@ -91,7 +91,7 @@
       "description": "替换官方 Connection 跳过 BrowserAuth，免 Token；已适配七个已审计精确版本对，详见仓库。仅支持 web profile；desktop 宿主一律自动休眠（多进程树判别），desktop 用户请保持最新版。",
       "category": "self-dev",
       "tags": ["BrowserAuth", "连接", "安全", "工具"],
-      "verified": ["0.1.2-rc.1", "0.1.5-rc.1", "0.1.5-rc.2", "0.1.7-rc.1", "0.1.7-rc.2", "0.2.0-rc.1", "0.2.0-rc.2"],
+      "verified": ["0.1.2-rc.1", "0.1.5-rc.1", "0.1.5-rc.2", "0.1.7-rc.1", "0.1.7-rc.2", "0.2.0-rc.1", "0.2.0-rc.2", "0.2.1-rc.2"],
       "source": "npm",
       "npm": "@iasiv5/dsh-skip-browser-auth",
       "github": "iasiv5/dsh-skip-browser-auth",