dsh-my-observability 0.1.7 → 0.3.0

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 本文件记录 dsh-my-observability 的所有版本变更。格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
 
+## [0.3.0] - 2026-09-07
+
+### 变更
+
+- feat(observability): #155 错误上报统一——plugin_error 事件类型 + /errors API (#177)
+- feat(observability): #155 资源监控扩展——新增 $DSH_HOME 目录总大小监控 (#176)
+- feat(observability): #155 插件状态查询聚合——统一 status-query 事件 + /plugin-status API (#170)
+- chore(plugins): #165 清理失效的 dsh.client.inject 声明（13 插件） (#167)
+
+## [0.2.0] - 2026-09-07
+
+### 变更
+
+- feat(observability): #155 错误上报统一——plugin_error 事件类型 + /errors API (#177)
+- feat(observability): #155 资源监控扩展——新增 $DSH_HOME 目录总大小监控 (#176)
+- feat(observability): #155 插件状态查询聚合——统一 status-query 事件 + /plugin-status API (#170)
+- chore(plugins): #165 清理失效的 dsh.client.inject 声明（13 插件） (#167)
+
 ## [0.1.7] - 2026-09-06
 
 ### 变更

package/lib/audit.js

@@ -71,17 +71,21 @@ function summarizeParams(payload) {
 function handlePluginEvent(name, payload, record) {
   const sessionId = payload?.sessionId
   if (typeof sessionId !== 'string' || sessionId === '') return
-  record({
-    type: 'plugin_event',
-    sessionId,
-    data: {
-      plugin: pluginNameOf(name),
-      event: eventNameOf(name),
-      action: truncate(String(payload?.action ?? '')),
-      reason: truncate(String(payload?.reason ?? '')),
-      params: summarizeParams(payload),
-    },
-  })
+  const { type, data } = buildPluginEventData(name, payload)
+  record({ type, sessionId, data })
+}
+
+function buildPluginEventData(name, payload) {
+  const data = {
+    plugin: pluginNameOf(name),
+    event: eventNameOf(name),
+    action: truncate(String(payload?.action ?? '')),
+    reason: truncate(String(payload?.reason ?? '')),
+    params: summarizeParams(payload),
+  }
+  const error = typeof payload?.error === 'string' && payload.error !== '' ? truncate(payload.error) : null
+  if (error !== null) data.error = error
+  return { type: error !== null ? 'plugin_error' : 'plugin_event', data }
 }
 
 /**

package/lib/resource-monitor.js

@@ -14,7 +14,9 @@
  * 采样自身开销：15s 一次 process.cpuUsage/memoryUsage + fs.stat（<0.01% CPU、
  * 零分配大对象），远低于「监控不能放大被监控对象」的护栏（resource-budget-review）。
  */
-import { statSync } from 'node:fs'
+import { statSync, readdirSync } from 'node:fs'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
 import { evaluateResourceAlerts, shouldEnterDegrade, shouldExitDegrade, DEFAULT_LIMITS } from './resource-rules.js'
 import { jsonlFile } from './store-persist.js'
 
@@ -31,6 +33,7 @@ export function createResourceMonitor(ctx, options = {}) {
   const state = {
     timer: null,
     file: jsonlFile(),
+    dshHome: process.env.DSH_HOME || join(homedir(), '.dsh'),
     lastSample: null,
     lastCpu: process.cpuUsage(),
     history: [],
@@ -59,6 +62,12 @@ function sample(state, limits, onDegrade, onRecover) {
   } catch {
     // 审计文件尚未创建：字节为 0
   }
+  let homeBytes = 0
+  try {
+    homeBytes = dshHomeSize(state.dshHome)
+  } catch {
+    // $DSH_HOME 不可达
+  }
   const prev = state.lastSample
   if (prev !== null) {
     const deltaMs = Math.max(now - prev.time, 1)
@@ -66,7 +75,7 @@ function sample(state, limits, onDegrade, onRecover) {
     const cpuPercent = (cpuDelta / 1000 / deltaMs) * 100
     const byteDelta = fileBytes - prev.fileBytes
     const writeRateBytesPerHour = byteDelta > 0 ? (byteDelta / deltaMs) * 3600 * 1000 : 0
-    const sample = { time: now, cpuPercent, memoryBytes, fileBytes, writeRateBytesPerHour }
+    const sample = { time: now, cpuPercent, memoryBytes, fileBytes, writeRateBytesPerHour, homeBytes }
     state.history.push(sample)
     if (state.history.length > MAX_HISTORY) state.history.splice(0, state.history.length - MAX_HISTORY)
     state.lastSample = sample
@@ -78,7 +87,7 @@ function sample(state, limits, onDegrade, onRecover) {
       degraded: state.degraded,
     }
   }
-  state.lastSample = { time: now, fileBytes, memoryBytes, cpuPercent: 0, writeRateBytesPerHour: 0 }
+  state.lastSample = { time: now, fileBytes, memoryBytes, cpuPercent: 0, writeRateBytesPerHour: 0, homeBytes }
   return { ...state.lastSample, history: [...state.history], alerts: [], degraded: state.degraded }
 }
 
@@ -116,3 +125,25 @@ function stopMonitor(state) {
     state.timer = null
   }
 }
+
+/** 递归计算目录总字节（best-effort，跳过不可达文件）。 */
+function dshHomeSize(dir) {
+  let total = 0
+  try {
+    for (const entry of readdirSync(dir, { withFileTypes: true })) {
+      const full = join(dir, entry.name)
+      if (entry.isDirectory()) {
+        total += dshHomeSize(full)
+      } else if (entry.isFile()) {
+        try {
+          total += statSync(full).size
+        } catch {
+          // 文件不可达
+        }
+      }
+    }
+  } catch {
+    // 目录不可达
+  }
+  return total
+}

package/lib/routes.js

@@ -67,6 +67,13 @@ function isMethod(method, request, name, verb) {
 
 /** 按 method 分派到具体 handler；未识别返回 false（调用方回 404）。 */
 async function dispatchMethod(method, request, response, url, ctx, store, monitor, options) {
+  const handled = await dispatchCore(method, request, response, url, ctx, store, monitor, options)
+  if (handled) return true
+  return dispatchExtended(method, request, response, url, ctx, store)
+}
+
+/** 核心路由（复杂度 ≤10）。 */
+async function dispatchCore(method, request, response, url, ctx, store, monitor, options) {
   if (isMethod(method, request, 'sessions', 'GET')) {
     writeJson(response, 200, { ok: true, value: store.sessions() })
     return true
@@ -105,6 +112,19 @@ async function dispatchMethod(method, request, response, url, ctx, store, monito
   return false
 }
 
+/** 扩展路由（#154/#155 新增）。 */
+function dispatchExtended(method, request, response, url, ctx, store) {
+  if (isMethod(method, request, 'plugin-status', 'GET')) {
+    void handlePluginStatus(ctx, response)
+    return true
+  }
+  if (isMethod(method, request, 'errors', 'GET')) {
+    handleErrors(store, url, response)
+    return true
+  }
+  return false
+}
+
 // ── handlers ───────────────────────────────────────────────────────────────
 
 /** 状态：审计统计 + 功能开关（aiReview 只暴露开关）。 */
@@ -117,6 +137,44 @@ function statusValue(store, options) {
   }
 }
 
+/**
+ * 插件状态聚合：广播 plugin:status-query 事件，收集所有插件状态。
+ * 每个插件返回 { plugin, config, running, lastActions }（config 脱敏，lastActions ≤5）。
+ * 超时 3s 未响应的插件标记为 { plugin, running: false, error: 'timeout' }。
+ */
+async function handlePluginStatus(ctx, response) {
+  const TIMEOUT_MS = 3000
+  const results = []
+  try {
+    // 广播查询事件，带超时
+    const statuses = await Promise.allSettled(
+      (ctx.bundler?.plugins ?? []).map(async (p) => {
+        const name = p.name ?? p.constructor?.name ?? 'unknown'
+        try {
+          const result = await Promise.race([
+            ctx.emit('plugin:status-query', { plugin: name }),
+            new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), TIMEOUT_MS)),
+          ])
+          return result ?? { plugin: name, running: true, config: {}, lastActions: [] }
+        } catch {
+          return { plugin: name, running: false, error: 'timeout' }
+        }
+      }),
+    )
+    for (const s of statuses) {
+      results.push(s.status === 'fulfilled' ? s.value : { plugin: 'unknown', running: false, error: 'rejected' })
+    }
+  } catch {
+    // bundler 不可用时返回空列表
+  }
+  writeJson(response, 200, { ok: true, value: results })
+}
+
+/** 错误事件查询（#155 错误上报统一）：返回 plugin_error 类型事件。 */
+function handleErrors(store, url, response) {
+  writeJson(response, 200, { ok: true, value: store.events(null, 'plugin_error', limitOf(url)) })
+}
+
 /** git status：非仓库路径 400。 */
 async function handleGitStatus(response, repoPath) {
   if (repoPath === '') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-my-observability",
-  "version": "0.1.7",
+  "version": "0.3.0",
   "description": "DSH 可观测性 + Git 工程工具插件：会话轨迹回放（时间轴）、事件审计（agent 行为记录）、结构化 Git 提交（Conventional Commits）、增量 diff 审查（提交前审查）。DSH web plugin: trajectory replay timeline, event audit log, structured git commits, pre-commit incremental diff review.",
   "type": "module",
   "main": "lib/index.js",
@@ -37,10 +37,7 @@
       "patch": "./cordis.patch.yml"
     },
     "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime"
-      ]
+      "platform": "web"
     }
   },
   "peerDependencies": {