dsh-mesh-ui 0.0.7 → 0.0.10

package/lib/client.js

@@ -42,7 +42,7 @@ window.__ModuleLoader__.load({
       var type = deviceType(name)
       return type ? label + ' · ' + type : label
     }
-      // 同一台设备可能有多个 peer 记录（不同 token/入口：phone-node / phone-node-lan / phone-node-exec）。
+      // 同一台设备可能有多个 peer 记录（不同 token/入口：peer-node / peer-node-lan / peer-node-exec）。
   // AI 网络拓扑按「设备」展示：去掉后缀归并，取可达且延迟最优的那条。
   var PEER_SUFFIX = /-(lan|wan|exec|exe|import|local|ctl)$/i
   function peerDeviceKey(name) {
@@ -96,6 +96,7 @@ function nodeLabel(name) { return NODE_LABELS[String(name || '').toLowerCase()]
       return keys
     }
     // 2026-11-10：用户手工调整后认可的默认布局（世界坐标，10000×6000 画布内）
+    // 设备按设备名（home/peer-node/company/peer-node/peer-node）映射，各机通用；服务器两张卡单独一张表
     var DEFAULT_DEVICE_POS = {}
     var DEFAULT_INFRA_POS = {
       aliyun: [4887.59, 2856.78],
@@ -677,7 +678,7 @@ body.light .dm-edge-label { stroke: rgba(255,255,255,.92); }
             h('span', null, '⋯')
           )
         ),
-        h('div', { className: 'dm-hint' }, '拓扑 v19 · 内容 ' + Math.round(layout.W) + '×' + Math.round(layout.H) + 'px · 卡 ' + Math.round(layout.cardW) + '×' + Math.round(layout.cardH) + ' · 缩放 ' + Math.round(view.scale * 100) + '% · 滚轮缩放 / 拖拽平移')
+        h('div', { className: 'dm-hint' }, '拓扑 v21 · 内容 ' + Math.round(layout.W) + '×' + Math.round(layout.H) + 'px · 卡 ' + Math.round(layout.cardW) + '×' + Math.round(layout.cardH) + ' · 缩放 ' + Math.round(view.scale * 100) + '% · 滚轮缩放 / 拖拽平移')
       )
     }
 
@@ -811,6 +812,7 @@ var DOWN_COLOR = "rgba(209,75,65,.7)"
 // 各机 DSH 安装形态（实测/档案）
 var DEVICE_DSH = {}
 function dshTypesFor(devKey) { return DEVICE_DSH[peerDeviceKey(devKey)] || [] }
+// LAN peer 判定：-lan 后缀 / 内网 IP / kind=lan（实际数据里 peer-node-lan 的 kind 是 frp）
 function isLanPeer(peer) {
   var t = (peer && peer.tunnel) || {}
   var name = String((peer && peer.name) || '')
@@ -1291,6 +1293,32 @@ function deviceLinkState(data, peer, lanMap) {
         return v
       }
 
+      // 2026-11-10：设备状态与拓扑同口径 —— 任一链路可达即算在线（HTTP 探测偶发超时不再误判红点）
+      var lanUpByDev = {}
+      ;(data.peers || []).forEach(function (p) {
+        if (!isLanPeer(p)) return
+        var tu = p.tunnel || {}
+        lanUpByDev[peerDeviceKey(p.name)] = tu.probe ? tu.probe.up === true : Boolean(p.up)
+      })
+      function peerLinkState(peer) {
+        var t = peer.tunnel || {}
+        var httpUp = Boolean(peer.up)
+        var tcpUp = t.probe ? t.probe.up === true : false
+        var sk = sakuraTunnelOf(data, peerDeviceKey(peer.name))
+        var sakuraUp = sk ? sk.online === true : null
+        var lanUp = lanUpByDev[peerDeviceKey(peer.name)] === true
+        return {
+          httpUp: httpUp, tcpUp: tcpUp, sakuraUp: sakuraUp, lanUp: lanUp,
+          up: httpUp || tcpUp || sakuraUp === true || lanUp
+        }
+      }
+      function linkStateText(ls) {
+        return "公网 " + ((ls.httpUp || ls.tcpUp) ? "✅" : "❌")
+          + " / 樱花 " + (ls.sakuraUp == null ? "—" : (ls.sakuraUp ? "✅" : "❌"))
+          + (ls.lanUp ? " / LAN ✅" : "")
+          + (ls.httpUp ? "" : "（HTTP 超时，隧道" + (ls.tcpUp ? "通" : "断") + "）")
+      }
+
       var devices = [{
         key: 'local',
         name: nodeDisplay(data.nodeName) + '（本机）',
@@ -1308,11 +1336,12 @@ function deviceLinkState(data, peer, lanMap) {
         ]
       }].concat(peers.map(function (peer) {
         var t = peer.tunnel || {}
+        var ls = peerLinkState(peer)
         var hwp = peer.hardware || {}
         return {
           key: 'peer:' + peer.name,
           name: nodeDisplay(peerDeviceKey(peer.name)),
-          up: Boolean(peer.up),
+          up: ls.up,
           rows: [
             ['设备类型', formFactorOf(hwp)],
             ['操作系统', hwp.os || peer.os || '—'],
@@ -1322,7 +1351,8 @@ function deviceLinkState(data, peer, lanMap) {
             ['DSH 版本', dshVerOf(peer)],
             ['IP 类型', ipKindOf(peer)],
             ['端口号', t.port ? String(t.port) : '—'],
-            ['公网穿透类型', relayKindOf(peer)]
+            ['公网穿透类型', relayKindOf(peer)],
+            ['链路状态', linkStateText(ls)]
           ]
         }
       }))
@@ -1899,6 +1929,11 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
 
       function loadSession() {
         if (!selected || !selected.sessionId) return
+        // 2026-11-10：本机任务（local）没有对端会话，不要发 peer call
+        if (/^(local|self|localhost)$/i.test(String(selected.node || ''))) {
+          flash('bad', '本机任务（local）没有对端会话；请在 DSH 侧栏查看本机会话')
+          return
+        }
         setSessionLoading(true)
         dgFetch(DG_API_SESSION + '?node=' + encodeURIComponent(selected.node) + '&sessionId=' + encodeURIComponent(selected.sessionId) + '&limit=60')
           .then(function (json) {
@@ -2019,6 +2054,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
             loading ? h('span', { className: 'dm-dg-loading' }, h('span', { className: 'dm-dg-spin' }), '刷新中') : '刷新')
         ),
         notice ? h('div', { className: 'dm-dg-notice ' + notice.type }, notice.text) : null,
+        selected && selected.staleActive ? h('div', { className: 'dm-dg-notice warn' }, '该任务已超过 ' + Math.round(selected.staleAfterSec / 60) + ' 分钟没有更新，可能已失联；可点「刷新状态」再查对端，或重新发起委托。') : null,
         h('div', { className: 'dm-dg-body', style: { '--dm-dg-list-w': listWidth + 'px' } },
           h('section', { className: 'dm-dg-pane' },
             h('div', { className: 'dm-dg-pane-head' }, '委托列表', h('span', { className: 'dm-dg-sub' }, '(' + visibleTasks.length + (visibleTasks.length !== tasks.length ? '/' + tasks.length : '') + ')')),
@@ -2040,7 +2076,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
                   key: task.taskId,
                   className: 'dm-dg-row ' + tone + (task.taskId === selectedId ? ' active' : ''),
                   onClick: function () { if (task.taskId !== selectedId) selectTask(task) },
-                  title: task.goal || ''
+                  title: task.staleActive ? '超过 ' + Math.round(task.staleAfterSec / 60) + ' 分钟无更新（疑似失联，可点刷新状态）' : (task.goal || '')
                 },
                   h('div', { className: 'dm-dg-row-top' },
                     task.activeFresh ? h(LoadingSpinner, { size: 12 }) : null,
@@ -2050,7 +2086,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
                       h('span', { className: 'dm-dg-arrow' }, '→'),
                       h('span', { className: 'dm-dg-to' }, (task.nodeLabel || task.node || '?') + (task.instance ? ' · ' + task.instance : ''))
                     ),
-                    dgChip(task.state),
+                    dgChip(task.displayState || task.state),
                     h('span', { className: 'dm-dg-row-time' }, (task.isActive ? '更新 ' : '完成 ') + dgClock(task.displayAt || task.updatedAt))
                   ),
                   h('div', { className: 'dm-dg-goal' }, task.goal || '(无目标)'),
@@ -2084,7 +2120,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
                         h('span', { className: 'dm-dg-k' }, '状态'),
                         h('span', { className: 'dm-dg-v' },
                           selected.activeFresh ? h(LoadingSpinner, { size: 13 }) : null,
-                          dgChip(selected.state)
+                          dgChip(selected.displayState || selected.state)
                         )
                       ),
                       kv('委托方', (selected.fromLabel || selected.from || '—') + ((selected.fromIsLocal || (localNode && selected.from === localNode)) ? '（本机）' : '')),
@@ -2163,7 +2199,7 @@ body[data-ds-dark-theme] .dm-dg-fs-item.active { background:rgba(88,166,255,.28)
                       '对端会话',
                       h('span', { className: 'dm-dg-sub' }, session ? ('轮次 ' + (session.totalMessages || sessionMessages.length) + ' · 帧 ' + (session.frameCount || '—') + ' · ' + Math.round((session.bytes || 0) / 1024) + ' KB') : '只读'),
                       h('span', { className: 'dm-dg-spacer' }),
-                      h('button', { type: 'button', className: 'dm-dg-btn primary', onClick: loadSession, disabled: sessionLoading || !selected.sessionId },
+                      h('button', { type: 'button', className: 'dm-dg-btn primary', onClick: loadSession, disabled: sessionLoading || !selected.sessionId || /^(local|self|localhost)$/i.test(String(selected.node || '')) },
                         sessionLoading ? h('span', { className: 'dm-dg-loading' }, h('span', { className: 'dm-dg-spin' }), '加载中') : (session ? '重新加载' : '加载会话'))
                     ),
                     h('div', { className: 'dm-dg-sec-body' },

package/lib/delegations.js

@@ -26,53 +26,76 @@ function readJson(file, fallback = null) {
   }
 }
 
-/** 委托列表（本地台账，按更新时间倒序）。 */
+/** 委托列表（本地台账，按更新时间倒序）。
+ *  - 过滤 selftest 污染记录（selftest 曾把测试任务写进真实台账）
+ *  - 活跃任务超过阈值未更新 → displayState=stalled（UI 不再显示无限 loading）
+ */
 export function listDelegations(limit = 50) {
   const data = readJson(join(meshHome(), 'delegations.json'), { tasks: {} })
   const localNode = readJson(join(meshHome(), 'config.json'), {})?.node?.name || ''
-  const tasks = Object.values(data?.tasks || {}).map((task) => {
-    const start = Date.parse(task.createdAt || '')
-    const end = Date.parse(task.updatedAt || '') || Date.now()
-    const from = task.from || ''
-    return {
-      taskId: task.taskId || '',
-      conversationId: task.conversationId || '',
-      sessionId: task.sessionId || '',
-      from,
-      fromLabel: nodeLabel(from),
-      fromIsLocal: Boolean(from) && from === localNode,
-      fromInstance: task.fromInstance || '',
-      node: task.node || '',
-      nodeLabel: nodeLabel(task.node),
-      toIsLocal: Boolean(task.node) && task.node === localNode,
-      instance: task.instance || '',
-      workspace: task.workspace || '',
-      dedicated: Boolean(task.dedicated),
-      state: task.state || 'unknown',
-      startedAt: task.startedAt || '',
-      finishedAt: task.finishedAt || '',
-      isActive: ['working', 'submitted', 'accepted', 'question', 'provisioning', 'running'].indexOf(task.state || '') >= 0,
-      activeFresh: ['working', 'submitted', 'accepted', 'question', 'provisioning', 'running'].indexOf(task.state || '') >= 0 && (Date.now() - Date.parse(task.updatedAt || 0) < 12 * 3600 * 1000),
-      displayAt: task.finishedAt || task.updatedAt || '',
-      policy: task.requestedPolicy || task.policy || '',
-      goal: String(task.goal || ''),
-      createdAt: task.createdAt || '',
-      updatedAt: task.updatedAt || '',
-      durationSec: (() => {
-        if (!Number.isFinite(start)) return null
-        const value = Math.max(0, Math.round((end - start) / 1000))
-        return value > 12 * 3600 ? null : value // 台账 updatedAt 会被轮询刷新，超长值不可信
-      })(),
-      stalledReason: task.stalledReason || '',
-      lastSummary: task.summary || ''
-    }
-  })
+  const ACTIVE_STATES = ['working', 'submitted', 'accepted', 'question', 'provisioning', 'running']
+  // 超过这些时间没有 updatedAt 更新，就认为“疑似失联”（不直接改文件，UI 只展示）
+  const STALE_AFTER_MS = {
+    submitted: 15 * 60 * 1000,
+    accepted: 15 * 60 * 1000,
+    provisioning: 15 * 60 * 1000,
+    working: 60 * 60 * 1000,
+    running: 60 * 60 * 1000,
+    question: 6 * 60 * 60 * 1000
+  }
+  const nowMs = Date.now()
+  const tasks = Object.values(data?.tasks || {})
+    .filter((task) => task && task.from !== 'selftest')
+    .map((task) => {
+      const start = Date.parse(task.createdAt || '')
+      const end = Date.parse(task.updatedAt || '') || nowMs
+      const from = task.from || ''
+      const state = task.state || 'unknown'
+      const isActive = ACTIVE_STATES.indexOf(state) >= 0
+      const updatedMs = Date.parse(task.updatedAt || task.createdAt || '')
+      const ageMs = Number.isFinite(updatedMs) ? nowMs - updatedMs : Infinity
+      const staleAfter = STALE_AFTER_MS[state] ?? 60 * 60 * 1000
+      const staleActive = isActive && ageMs > staleAfter
+      return {
+        taskId: task.taskId || '',
+        conversationId: task.conversationId || '',
+        sessionId: task.sessionId || '',
+        from,
+        fromLabel: nodeLabel(from),
+        fromIsLocal: Boolean(from) && from === localNode,
+        fromInstance: task.fromInstance || '',
+        node: task.node || '',
+        nodeLabel: nodeLabel(task.node),
+        toIsLocal: Boolean(task.node) && task.node === localNode,
+        instance: task.instance || '',
+        workspace: task.workspace || '',
+        dedicated: Boolean(task.dedicated),
+        state,
+        displayState: staleActive ? 'stalled' : state,
+        isActive,
+        staleActive,
+        staleAfterSec: Math.round(staleAfter / 1000),
+        activeFresh: isActive && !staleActive,
+        displayAt: task.finishedAt || task.updatedAt || '',
+        policy: task.requestedPolicy || task.policy || '',
+        goal: String(task.goal || ''),
+        createdAt: task.createdAt || '',
+        updatedAt: task.updatedAt || '',
+        durationSec: (() => {
+          if (!Number.isFinite(start)) return null
+          const value = Math.max(0, Math.round((end - start) / 1000))
+          return value > 12 * 3600 ? null : value // 台账 updatedAt 会被轮询刷新，超长值不可信
+        })(),
+        stalledReason: task.stalledReason || '',
+        lastSummary: task.summary || ''
+      }
+    })
   tasks.sort((a, b) => {
     if (a.activeFresh !== b.activeFresh) return a.activeFresh ? -1 : 1
     return String(b.displayAt || b.updatedAt || '').localeCompare(String(a.displayAt || a.updatedAt || ''))
   })
   const byState = {}
-  for (const task of tasks) byState[task.state] = (byState[task.state] || 0) + 1
+  for (const task of tasks) byState[task.displayState] = (byState[task.displayState] || 0) + 1
   return { total: tasks.length, byState, localNode, tasks: tasks.slice(0, Math.max(1, Math.min(limit, 200))) }
 }
 

package/lib/index.js

@@ -176,6 +176,8 @@ export function apply(ctx) {
     }),
     readonlyRoute('/api/dsh-mesh/session', async (url) => {
       const node = String(url.searchParams.get('node') || '')
+      // 2026-11-10：本机任务（node=local）没有对端会话，直接给出明确错误，避免 peer call --to local 报 unknown peer
+      if (/^(local|self|localhost)$/i.test(node)) return { ok: false, code: "E_LOCAL_NODE", error: "本机任务（local）没有对端会话；请在 DSH 侧栏查看本机会话" }
       const sessionId = String(url.searchParams.get('sessionId') || '')
       const limit = Number(url.searchParams.get('limit')) || 40
       if (!node || !sessionId) return { ok: false, error: 'node and sessionId required' }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "dsh-mesh-ui",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "description": "DSH settings-page panel for dsh-mesh: AI network topology, peer health, and delegation panel. Read-only; data is collected from the local mesh CLI.",
   "icon": "icon.svg",
   "type": "module",
   "engines": {
-    "node": "^22.19.0 || >=24.0.0"
+    "node": "^22.19.0 || >=24.0.0",
+    "dsh": ">=0.2.0-rc.2 <0.3.0"
   },
   "main": "lib/index.js",
   "exports": {
@@ -14,9 +15,7 @@
     "./package.json": "./package.json"
   },
   "dsh": {
-    "engines": {
-      "dsh": ">=0.2.0-rc.2"
-    },
+    "manifestVersion": 1,
     "bundle": {
       "patch": "./cordis.patch.yml"
     },
@@ -29,6 +28,7 @@
     }
   },
   "peerDependencies": {
+    "@deepseek-ai/dsh": ">=0.2.0-rc.2 <0.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },