@zfdx123/dsh-session-cleaner 1.0.5 → 1.0.7

package/client.js

@@ -143,15 +143,31 @@ window.__ModuleLoader__.load({
      * look. Null means the delete still works through the browser's own
      * confirmation, and every glyph falls back to the hand-drawn SVG.
      */
+    /**
+     * Whether a value can be rendered as a React component.
+     *
+     * `typeof x === 'function'` is NOT enough: the shell's `Button` is built with
+     * `React.forwardRef(...)`, so its `typeof` is always `'object'`
+     * (`$$typeof = Symbol(react.forward_ref)`, `render` is the function). A guard
+     * that asks for `typeof primitives.Button === 'function'` is therefore always
+     * false, which throws away the whole kit even though Modal/Input/Switch really
+     * are functions — the failure looks like "only the icons are wrong".
+     */
+    function isRenderable(value) {
+      if (typeof value === 'function') return true
+      if (typeof value !== 'object' || value === null) return false
+      return value.$$typeof === Symbol.for('react.forward_ref') || value.$$typeof === Symbol.for('react.memo')
+    }
+
     function loadPrimitives(require) {
       try {
         const primitives = require(PRIMITIVES)
         if (
-          typeof primitives?.Modal === 'function' &&
-          typeof primitives?.Button === 'function' &&
-          typeof primitives?.IconSearchOutline === 'function' &&
-          typeof primitives?.IconChevronDownOutline === 'function' &&
-          typeof primitives?.IconTrashOutline === 'function'
+          isRenderable(primitives?.Modal) &&
+          isRenderable(primitives?.Button) &&
+          isRenderable(primitives?.IconSearchOutlineRegular) &&
+          isRenderable(primitives?.IconChevronDownOutlineRegular) &&
+          isRenderable(primitives?.IconTrashOutlineRegular)
         )
           return primitives
       } catch (error) {
@@ -701,7 +717,7 @@ window.__ModuleLoader__.load({
               React.createElement(Glyph, {
                 key: 'chevron',
                 primitives,
-                name: 'IconChevronDownOutline',
+                name: 'IconChevronDownOutlineRegular',
                 size: 12,
                 box: Object.assign({}, S.chevron, collapsed ? S.chevronFolded : {}),
                 fallback: ChevronIcon,
@@ -723,7 +739,7 @@ window.__ModuleLoader__.load({
           React.createElement(Glyph, {
             key: 'i',
             primitives,
-            name: 'IconSearchOutline',
+            name: 'IconSearchOutlineRegular',
             size: 16,
             box: S.searchGlyph,
             fallback: SearchIcon,
@@ -981,7 +997,7 @@ window.__ModuleLoader__.load({
      * root mounted behind it. Null keeps the hand-drawn SVG above in charge.
      */
     function kitTrashIcon(primitives) {
-      const Icon = kitIcon(primitives, 'IconTrashOutline')
+      const Icon = kitIcon(primitives, 'IconTrashOutlineRegular')
       if (Icon === null) return null
       try {
         const scratch = document.createElement('span')
@@ -992,7 +1008,7 @@ window.__ModuleLoader__.load({
         root.unmount()
         return node
       } catch (error) {
-        report('icon-fallback', { icon: 'IconTrashOutline', message: String(error?.message ?? error) })
+        report('icon-fallback', { icon: 'IconTrashOutlineRegular', message: String(error?.message ?? error) })
         return null
       }
     }
@@ -1091,6 +1107,21 @@ window.__ModuleLoader__.load({
         report('trigger', { name: name.slice(0, 60) })
       }
 
+      // 目录请求的序号：只有最新一次的结果允许写进 `catalog`。
+      //
+      // 回归：启动时一次拉取（下面 1142 行）与「行内 id 没解出来时」的重试
+      // （1124 行）会同时在飞，先发的旧响应可能后到并覆盖 `catalog`。已经插进去的
+      // 菜单项不会被重建（标签看起来是对的），但 `catalog` 会一直陈旧到刷新页面，
+      // 于是**下一个**打开的菜单会把运行中的会话显示成可删除。
+      let catalogSeq = 0
+      const loadCatalog = () => {
+        const seq = (catalogSeq += 1)
+        return fetchCatalog().then((resolved) => {
+          if (catalogSeq === seq) catalog = resolved
+          return resolved
+        })
+      }
+
       const attempt = (added) => {
         const found = findSessionMenu(added)
         if (found === undefined) return
@@ -1105,10 +1136,9 @@ window.__ModuleLoader__.load({
           pendingRow = null
           return
         }
-        fetchCatalog()
+        loadCatalog()
           .then((resolved) => {
-            catalog = resolved
-            if (found.menu.isConnected) augmentMenu(found, row, catalog, ctx, dict)
+            if (found.menu.isConnected) augmentMenu(found, row, resolved, ctx, dict)
           })
           .catch(() => {})
       }
@@ -1123,9 +1153,8 @@ window.__ModuleLoader__.load({
       })
       document.addEventListener('pointerdown', onPointerDown, true)
       observer.observe(document.body, { childList: true, subtree: true })
-      fetchCatalog()
+      loadCatalog()
         .then((resolved) => {
-          catalog = resolved
           report('catalog', { ok: resolved !== null, known: resolved === null ? 0 : resolved.byId.size })
         })
         .catch(() => {})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zfdx123/dsh-session-cleaner",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "会话清理：在运行中的 web 运行时里彻底删除 DSH 会话——实时 store 条目、工作区记录、磁盘产物与投影缓存行一并清掉，并在会话行菜单里加一个删除入口。",
   "license": "MIT",
   "homepage": "https://github.com/zfdx123/dsh-atelier/tree/main/packages/dsh-session-cleaner#readme",