dsh-mesh-ui 0.0.7 → 0.0.8

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],
@@ -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) || '')
@@ -2019,6 +2021,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 +2043,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 +2053,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 +2087,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)) ? '（本机）' : '')),

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mesh-ui",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "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",