@gehennawu/dsh-service 1.3.0 → 1.4.0

package/index.js

@@ -1745,12 +1745,37 @@ function pruneSessionErrors(session, cutoff) {
   }
 }
 
-function foldUsageEvents(ctx, record, previous, events) {
+function validSessionOffset(value) {
+  return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 && !Object.is(value, -0) ? value : undefined
+}
+
+// alpha.4 moves the fork cut out of SessionHeader and into body-bearing reads;
+// older DSH releases expose it as header/meta.seedLength. Keep this normalization
+// at the persistence seam so the usage fold never has to know which runtime spoke.
+function inheritedEventCountFor(record, read) {
+  const fromRead = validSessionOffset(read?.inheritedEventCount)
+  if (fromRead !== undefined) return fromRead
+  const fromMeta = validSessionOffset(read?.meta?.seedLength)
+  if (fromMeta !== undefined) return fromMeta
+  const fromHeader = validSessionOffset(record?.header?.seedLength)
+  return fromHeader ?? 0
+}
+
+function usageReadStart(previous) {
+  return previous === undefined ? 0 : Math.max(0, previous.lastSeq + 1)
+}
+
+function usageReadEvents(read) {
+  return Array.isArray(read?.events) ? read.events : []
+}
+
+function foldUsageEvents(ctx, record, previous, events, inheritedEventCount = 0) {
   const project = projectForCwd(ctx, record.header.cwd)
-  const session = previous || { revision: '', lastSeq: Math.max(0, record.header.seedLength || 0) - 1, project, currentModel: null, hours: {} }
+  const cut = validSessionOffset(inheritedEventCount) ?? 0
+  const session = previous || { revision: '', lastSeq: cut - 1, project, currentModel: null, hours: {} }
   session.project = project
   for (const event of events) {
-    if (event.seq < (record.header.seedLength || 0)) continue
+    if (event.seq < cut) continue
     session.lastSeq = Math.max(session.lastSeq, event.seq)
     if (event.type === 'request/header') {
       const provider = event.data?.header?.config?.provider
@@ -1848,9 +1873,10 @@ async function refreshUsageIndex(ctx, dshHome, index) {
     const revision = revisionKey(record.revision)
     const previous = index.sessions[id]
     if (previous?.revision === revision) continue
-    const fromSeq = previous === undefined ? Math.max(0, record.header.seedLength || 0) : previous.lastSeq + 1
+    const fromSeq = usageReadStart(previous)
     const read = await persistence.readFrom(record.header.id, fromSeq)
-    const next = foldUsageEvents(ctx, record, previous, read.events)
+    const inheritedEventCount = inheritedEventCountFor(record, read)
+    const next = foldUsageEvents(ctx, record, previous, usageReadEvents(read), inheritedEventCount)
     next.revision = revision
     index.sessions[id] = next
   }
@@ -2274,7 +2300,11 @@ async function collectDiagnostics(ctx, dshHome, runtimeEnv) {
     pluginReport = { available: false, total: 0, issues: [] }
   }
   if (!pluginReport.available) add('plugins', 'info', 'unavailable')
-  else checks.push(pluginCheckItem(pluginReport))
+  else {
+    const pluginCheck = pluginCheckItem(pluginReport)
+    if (pluginCheck.status === 'info') pluginCheck.advisory = true
+    checks.push(pluginCheck)
+  }
 
   // v1.3 插件兼容性：对照已核实的 alpha 破坏面清单（client-runtime 供应商移除、SQLite
   // persistence 移除、聊天/统计条 CSS 哈希漂移、data-time-hover-root 删除）扫描启用插件的
@@ -3187,7 +3217,15 @@ function buildSubagentDispatchRecord(agent, parent, dispatch, options = {}) {
 
 /** 父会话事件尾向上扫最近一条带数字 `data.turn` 的事件（≤scanLimit 条）；无则 undefined。 */
 function lastSubagentTurn(parent, scanLimit = 50) {
-  const events = parent?.session?.events
+  let events
+  try {
+    if (typeof parent?.session?.snapshotEvents === 'function') events = parent.session.snapshotEvents()
+  } catch (_) {
+    events = undefined
+  }
+  if (!Array.isArray(events)) {
+    try { events = parent?.session?.events } catch (_) { events = undefined }
+  }
   if (!Array.isArray(events)) return undefined
   const limit = Number.isFinite(scanLimit) && scanLimit > 0 ? scanLimit : 50
   const from = Math.max(0, events.length - limit)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gehennawu/dsh-service",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "DSH Web 运维面板：安全重启、健康监控、备份和 Linux 权限维护。",
   "type": "module",
   "scripts": {

package/plugin-compat.js

@@ -338,6 +338,9 @@ export async function collectPluginCompat(ctx, options = {}) {
     const moduleName = entry?.options?.name
     if (typeof entry?.id !== 'string' || typeof moduleName !== 'string') continue
     if (entry.disabled === true) continue
+    // 无法形成合法包名的条目跳过且不计 scanned：`cordis:include` 这类 Cordis 内建声明名、
+    // 相对路径/`file:` 形态不是可扫描的 npm 插件（没有清单可查），不该渲染「未能扫描」提示。
+    if (packageNameOf(moduleName) === null) continue
     scanned += 1
     let result
     if (options.noCache === true) {

package/plugin-health.js

@@ -27,41 +27,76 @@ export const PLUGIN_FIBER_STATE = Object.freeze({
   UNLOADING: 5,
 })
 
-/** 异常相位 → 检查项等级：失败是真故障（error），依赖未就绪/加载中按 warning 提示。 */
+/** 异常相位 → 检查项等级：失败是真故障；启动中按 warning；已释放/未知按 info。 */
 export function issueLevelOf(phase) {
   switch (phase) {
     case 'failed': return 'error'
     case 'pending':
     case 'loading':
     case 'unloading': return 'warning'
+    case 'disposed':
+    case 'unknown': return 'info'
     default: return null
   }
 }
 
-/** fiber.state 数值 → 相位串；未知/无 fiber 一律按加载中（瞬态/声明未挂载）。 */
+/** fiber.state 数值 → 相位串；无 fiber 是启动瞬态，未知数值明确标为 unknown。 */
 function phaseOfState(state) {
   switch (state) {
     case PLUGIN_FIBER_STATE.PENDING: return 'pending'
     case PLUGIN_FIBER_STATE.LOADING: return 'loading'
     case PLUGIN_FIBER_STATE.ACTIVE: return 'active'
     case PLUGIN_FIBER_STATE.FAILED: return 'failed'
+    case PLUGIN_FIBER_STATE.DISPOSED: return 'disposed'
     case PLUGIN_FIBER_STATE.UNLOADING: return 'unloading'
-    default: return 'loading'
+    default: return 'unknown'
   }
 }
 
+const DEFAULT_STARTUP_GRACE_MS = 5000
+const MAX_PLUGIN_ERROR_LENGTH = 4096
+
+function clipPluginError(value) {
+  let message
+  try {
+    message = String(value?.message || value)
+  } catch (_) {
+    message = 'unknown plugin failure'
+  }
+  message = message
+    .replace(/(Bearer\s+)[^\s]+/gi, '$1<redacted>')
+    .replace(/([?&](?:api[_-]?key|token|access[_-]?token|secret|password)=)[^&\s]+/gi, '$1<redacted>')
+    .replace(/((?:api[_-]?key|access[_-]?token|secret|password)\s*[:=]\s*)[^,;\s]+/gi, '$1<redacted>')
+    .replace(/(?:[A-Za-z]:[\\/]|\/home\/|\/workspace\/)[^\s"'`]+/g, '<redacted-path>')
+  return message.length > MAX_PLUGIN_ERROR_LENGTH ? `${message.slice(0, MAX_PLUGIN_ERROR_LENGTH - 1)}…` : message
+}
+
+function startupAgeMs(entry, now, options) {
+  if (typeof options.ageOf === 'function') {
+    const age = Number(options.ageOf(entry))
+    return Number.isFinite(age) && age >= 0 ? age : Infinity
+  }
+  const startedAt = Number(entry?.fiber?.startedAt ?? entry?.startedAt)
+  return Number.isFinite(startedAt) && startedAt >= 0 ? Math.max(0, now - startedAt) : 0
+}
+
 /**
  * 收集插件健康体检结果。
  *
  * @param ctx 宿主插件上下文（供 `ctx.get('loader')`）
+ * @param options 可选测试/运行时参数：`now`、`startupGraceMs`、`ageOf(entry)`
  * @returns {available: boolean, total: number, issues: PluginIssue[]}——loader 缺席时
- *   available=false（调用方降级为 info 检查项，不含任何插件数据）。
+ *   available=false（调用方降级为 info 检查项，不含任何插件数据）。启动中的 pending/loading 默认有 5 秒宽限。
  */
-export async function collectPluginHealth(ctx) {
+export async function collectPluginHealth(ctx, options = {}) {
   const loader = ctx.get('loader')
   if (loader === undefined) return { available: false, total: 0, issues: [] }
   const issues = []
   let total = 0
+  const now = Number.isFinite(options.now) ? options.now : Date.now()
+  const startupGraceMs = Number.isFinite(options.startupGraceMs) && options.startupGraceMs >= 0
+    ? options.startupGraceMs
+    : DEFAULT_STARTUP_GRACE_MS
   for (const entry of loader.entries()) {
     if (entry?.options?.group === true) continue
     const moduleName = entry?.options?.name
@@ -72,8 +107,9 @@ export async function collectPluginHealth(ctx) {
     const fiber = entry.fiber
     const phase = fiber === undefined ? 'loading' : phaseOfState(fiber.state)
     if (phase === 'active') continue
+    if ((phase === 'pending' || phase === 'loading') && startupGraceMs > 0 && startupAgeMs(entry, now, options) < startupGraceMs) continue
     const error = phase === 'failed' && fiber?._error != null
-      ? String(fiber._error?.message || fiber._error)
+      ? clipPluginError(fiber._error)
       : null
     const missingDeps = phase === 'pending'
       ? Object.keys(fiber.inject || {}).filter((key) => !(fiber.store !== undefined && fiber.store[key]))
@@ -90,17 +126,18 @@ export async function collectPluginHealth(ctx) {
 }
 
 /**
- * 聚合为一个诊断检查项（追加在 checks 尾部）。detail 三段 `total:failed:pending`：
- * 客户端用它渲染「共 N 个插件，全部正常」或异常摘要；停用插件完全不进统计
- * （failed 是 error，其余异常相位归 pending 桶按 warning 处理）。
+ * 聚合为一个诊断检查项（追加在 checks 尾部）。detail 四段 `total:failed:pending:informational`：
+ * 客户端用它渲染「共 N 个插件，全部正常」或异常摘要；停用插件完全不进统计。
+ * 旧客户端仍可读取前三段；failed 是 error，启动/卸载相位按 warning，disposed/unknown 单独作为 info。
  */
 export function pluginCheckItem(report) {
   const failed = report.issues.filter((issue) => issue.phase === 'failed').length
-  const pending = report.issues.filter((issue) => issue.phase !== 'failed').length
+  const pending = report.issues.filter((issue) => issue.phase === 'pending' || issue.phase === 'loading' || issue.phase === 'unloading').length
+  const informational = report.issues.filter((issue) => issue.phase === 'disposed' || issue.phase === 'unknown').length
   return {
     id: 'plugins',
-    status: failed > 0 ? 'error' : pending > 0 ? 'warning' : 'ok',
-    detail: `${report.total}:${failed}:${pending}`,
+    status: failed > 0 ? 'error' : pending > 0 ? 'warning' : informational > 0 ? 'info' : 'ok',
+    detail: `${report.total}:${failed}:${pending}:${informational}`,
   }
 }