dsh-m 0.10.2 → 0.10.3

package/CHANGELOG.md

@@ -8,6 +8,12 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## 中文
 
+### 0.10.3 修复：操作泵恢复记账对账（挂账 1）+ D3 applied core 直钉（挂账 3）
+
+- **需求（2026-10-18，0.10.2 dogfood 收尾盘点挂账）**：面板随宿主换装重载会打断泵的最后落账，残留的 running 记录被恢复流程一律标「进程重启中断」——0.10.2 自升级事件中升级实际成功（intent ledger resolved ok + 三面账写穿）却被记为失败，审计误导；另：D3 `applied → needsRestart=false` 缺 core 层直接钉（此前仅 client 层间接覆盖，评审挂账 3）。
+- **方案**：① `restoreRecords` 增第三参 `installedVersionOf`（账实复读缝，main.jsx 以 `api("installed")` 实读实现，与 stillApplies 同款实读纪律）——升级类 running 残留若账面已到 `meta.toVersion` → 改判 done（`meta.reconciledAfterRestart` 留痕）；未到目标保持中断原语义；不传第三参行为不变（既有调用方零迁移）。② 三处升级站点 enqueue meta 携带 `toVersion`（chip=state.latest、已装列表=it.latestVersion、市场卡=it.latest）——中断恢复对账的比对依据。
+- **验证**：typecheck 零错误；全量测试（新增 6：T-D3 applied core 直钉 + 恢复对账改判/未到/向后兼容三形态 + 三站点 meta 单行锚；18 例既有失败 028 本机环境清单零新增）。
+
 ### 0.10.2 修复：D3 自升级 post-write 伪失败账实改判 + 静默自升级（0.10.0→0.10.1 dogfood 实证轮）
 
 - **需求（2026-10-18 凌晨，首次 D3 真机 dogfood——0.10.0→0.10.1 自升级事件）**：自升级报失败（`application=failed、error=already-installed`）但三面账（manifest/node_modules/lock）均已写入 0.10.1——宿主对自身 bundle 换装存在 **post-write 伪失败**：installBundle 写穿后 manifest 含该名，宿主完成路径自触守卫（自指操作伪影；守卫源码 `specPackageName` 对 tarball URL 同样可解析包名）。另：0.10.1 引入的自升级确认框破坏既有「点击即升级」体验（主人裁决撤除）。
@@ -679,6 +685,12 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## English
 
+### Fixes in 0.10.3 — operation-pump restore ledger reconciliation (pending item 1) + D3 applied core-level pin (pending item 3)
+
+- **Need (2026-10-18, pending items from the 0.10.2 dogfood wrap-up)**: a panel reload during the host's own bundle swap interrupts the pump's final ledger write, and the leftover running record is unconditionally labeled「进程重启中断」(process-restart interrupted) by the restore flow — in the 0.10.2 self-upgrade event the upgrade had actually succeeded (intent ledger resolved ok + all three ledgers written through) yet was recorded as failed, misleading the audit trail. Separately: D3 `applied → needsRestart=false` lacked a core-level pin (previously covered only indirectly at the client layer; review pending item 3).
+- **Approach**: ① `restoreRecords` gains a third parameter `installedVersionOf` (an account-reality re-read seam implemented in main.jsx via `api("installed")`, same live-read discipline as stillApplies) — an upgrade-kind running leftover whose ledger has reached `meta.toVersion` is re-judged as done (`meta.reconciledAfterRestart` recorded); anything else keeps the interrupted semantics; omitting the third parameter preserves the old behavior (zero migration for existing callers). ② the three upgrade sites now carry `toVersion` in the enqueue meta (chip=state.latest, installed list=it.latestVersion, market card=it.latest) — the comparison basis for the restore reconciliation.
+- **Verification**: typecheck clean; full suite (6 new: T-D3 applied core-level pin + three restore-reconciliation shapes + three site meta anchors; 18 pre-existing failures are the 028 machine-environment set, zero new).
+
 ### Fixes in 0.10.2 — account-reality reconciliation for D3 self-upgrade post-write pseudo-failure + silent self-upgrade (first D3 dogfood round)
 
 - **Need (2026-10-18 early morning, first real-machine D3 dogfood — the 0.10.0→0.10.1 self-upgrade event)**: the self-upgrade reported failure (`application=failed、error=already-installed`) while all three ledgers (manifest/node_modules/lock) had already been written to 0.10.1 — the host has a **post-write pseudo-failure** for its own bundle swap: installBundle writes through, the manifest then contains the name, and the host's completion path trips its own guard (self-referential artifact; the guard's `specPackageName` resolves package names from tarball URLs too). Separately: the 0.10.1 self-upgrade confirmation dialog broke the existing "click to upgrade" experience (owner ordered its removal).

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 });
@@ -4168,7 +4186,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 +4588,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 });
@@ -5216,7 +5234,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 +5750,29 @@ 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);
       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/package.json

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

package/registry.json

@@ -8,7 +8,7 @@
       "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",
@@ -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",