dsh-dafeiyu-emotion 0.2.7 → 0.2.10

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.2.10
+
+- Removed `settings` from the hard inject list. A hard `settings` dependency can deadlock host startup while the settings service is still building plugin `Config` projections.
+- Settings are now resolved with `ctx.inject(['settings'], ...)` after the host is up; `/config` is read-only until then and becomes writable when the service arrives.
+- Added a regression assertion that `settings` is not a hard dependency.
+
+## 0.2.9
+
+- Fixed the host startup timeout: `apply` synchronously called `settings.describe()` while the host was still mounting plugins, which could deadlock startup for 60 seconds.
+- `apply` now uses the patch config only; settings are read/written through `/config` after the host is up.
+- Added cycle/depth guards to `plainConfig()` so an unexpected volatile-ref cycle cannot hang startup or a settings request.
+- Added a regression test where `settings.describe()` throws if called during `apply`.
+
+## 0.2.8
+
+- Fixed `backendRoot` showing as `[object Object]` on the settings page. DSH projects volatile `Config` fields as `{ get() }` refs; `readSettings()` and `resolveOptions()` now unwrap them before path/string/number handling.
+- Added `plainConfig` regression coverage so a volatile ref can never be stringified into a fake path again.
+
 ## 0.2.7
 
 - Fixed a host activation failure: `apply` read `ctx.settings` while the plugin only declared `webServer`. Cordis throws `cannot get property "settings" without inject`, so the whole host plugin failed to mount and `/plugins/dsh-dafeiyu-emotion/config` returned 404.

package/README.md

@@ -111,9 +111,9 @@ dsh plugin --profile desktop add github:LiDu-china/dsh-dafeiyu-emotion
 ### 通过 Release tarball
 
 ```bash
-curl -L -o dsh-dafeiyu-emotion-0.2.7.tgz \
-  https://github.com/LiDu-china/dsh-dafeiyu-emotion/releases/download/v0.2.7/dsh-dafeiyu-emotion-0.2.7.tgz
-dsh plugin --profile desktop add "D:/path/to/dsh-dafeiyu-emotion-0.2.7.tgz"
+curl -L -o dsh-dafeiyu-emotion-0.2.10.tgz \
+  https://github.com/LiDu-china/dsh-dafeiyu-emotion/releases/download/v0.2.10/dsh-dafeiyu-emotion-0.2.10.tgz
+dsh plugin --profile desktop add "D:/path/to/dsh-dafeiyu-emotion-0.2.10.tgz"
 ```
 
 > DSH Desktop 的 profile 由 Electron 应用管理；命令行安装请使用桌面应用自带的 `dsh` 命令。

package/docs/MARKETPLACE.md

@@ -72,7 +72,7 @@ https://github.com/LiDu-china/dsh-dafeiyu-emotion/releases/download/v0.2.3/dsh-d
 dsh plugin --profile desktop add dsh-dafeiyu-emotion
 ```
 
-Published as `dsh-dafeiyu-emotion@0.2.7` on npm. The 1024Store entry refreshes its one-click install automatically. GitHub-source and Release-tarball installs remain available as fallbacks.
+Published as `dsh-dafeiyu-emotion@0.2.9` on npm. The 1024Store entry refreshes its one-click install automatically. GitHub-source and Release-tarball installs remain available as fallbacks.
 
 ## Privacy
 

package/docs/RELEASE-0.2.10.md

@@ -0,0 +1,20 @@
+## 0.2.10
+
+修复 Host 启动阶段的依赖死锁，并修正 volatile 配置解包。
+
+- 移除 `settings` 硬依赖。改为 `ctx.inject(['settings'], ...)` 动态获取，避免 settings 服务尚未就绪时插件 fiber 一直 pending。
+- `apply` 不再调用 `settings.describe()`，只在 `/config` 请求时读取运行时配置。
+- `plainConfig()` 改为递归栈 + `finally` 清理，修复共享对象被误判为循环引用而丢失的问题。
+- 新增共享引用、真实循环、`settings.describe()` 不应在启动阶段调用的回归测试。
+
+## 注意
+
+当前环境如果仍无法启动，请先确认 `magpie-mcp-git` / `magpie-mcp-anysearch` 没有阻塞 Host 启动。这两个 MCP 客户端在连接不可用时会等待重试，可能把 Host 启动拖过 60 秒。
+
+## 安装
+
+```bash
+dsh plugin --profile desktop add dsh-dafeiyu-emotion
+```
+
+升级后请完全退出并重新启动 the agent harness。

package/docs/RELEASE-0.2.8.md

@@ -0,0 +1,16 @@
+## 0.2.8
+
+修复设置页把增强后端目录显示成 `[object Object]` 的问题。
+
+- DSH 的 settings 服务会把 `Config` 的 volatile 字段投影成 `{ get() }` 引用。
+- 0.2.7 直接对引用做 `String()`，得到 `[object Object]`，再被 `resolve()` 拼成 `C:\...\profiles\desktop\[object Object]`，于是状态卡显示“后端目录不存在”。
+- 0.2.8 在 `readSettings()` 和 `resolveOptions()` 中统一用 `plainConfig()` 递归解包，再处理路径、语言和数字。
+- 新增回归测试，确保 volatile ref 不会被字符串化成假路径。
+
+## 安装
+
+```bash
+dsh plugin --profile desktop add dsh-dafeiyu-emotion
+```
+
+升级后请完全退出并重新启动 the agent harness，让 Host 重新读取 0.2.8。

package/docs/RELEASE-0.2.9.md

@@ -0,0 +1,17 @@
+## 0.2.9
+
+修复“the agent harness 打不开 / Host startup exceeded 60 seconds”。
+
+- 根因：0.2.8 在 `apply` 期间同步调用 `settings.describe()`。此时 Host 还在挂载插件，遍历所有插件配置可能造成启动死锁，最终 60 秒超时。
+- 0.2.9 的 `apply` 只读取 `cordis.patch.yml` 的 patch 配置，不再在启动事务里调用 `settings.describe()`。
+- 设置页的读取/写入仍通过 `/plugins/dsh-dafeiyu-emotion/config`；`PATCH` 会更新共享运行时配置并调用 `settings.update()` 持久化。
+- `plainConfig()` 增加循环引用和深度保护，避免异常 volatile ref 卡死启动或设置请求。
+- 新增回归测试：`settings.describe()` 在 `apply` 期间如果被调用会直接抛错。
+
+## 安装
+
+```bash
+dsh plugin --profile desktop add dsh-dafeiyu-emotion
+```
+
+升级后请完全退出并重新启动 the agent harness。若之前因 0.2.8 无法启动，可先进入安全模式或临时移除插件，再安装 0.2.9。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-dafeiyu-emotion",
-  "version": "0.2.7",
+  "version": "0.2.10",
   "description": "大肥鱼语音情绪耳朵：听语气、识别情绪，并让 DSH 按对方当下的状态自然回复。 · Voice + emotion-aware companion for DeepSeek Harness.",
   "type": "module",
   "main": "src/index.js",

package/scripts/test-analyze-handler.mjs

@@ -5,7 +5,7 @@ import { Readable } from 'node:stream'
 import { apply, inject } from '../src/index.js'
 
 assert.ok(inject.includes('webServer'), 'webServer must be a declared dependency')
-assert.ok(inject.includes('settings'), 'settings must be a declared dependency')
+assert.equal(inject.includes('settings'), false, 'settings must be resolved dynamically, not as a hard dependency')
 
 const ANALYZE = '/plugins/dsh-dafeiyu-emotion/analyze'
 const HEALTH = '/plugins/dsh-dafeiyu-emotion/health'
@@ -14,6 +14,12 @@ function makeCtx(speechToText) {
   const handlers = new Map()
   const ctx = {
     logger: { debug() {}, info() {}, error() {} },
+    settings: {
+      async update() {},
+      describe() {
+        throw new Error('settings.describe must not run during host startup')
+      },
+    },
     effect(run) {
       const dispose = run()
       return typeof dispose === 'function' ? dispose : () => {}
@@ -40,6 +46,14 @@ function makeCtx(speechToText) {
             return typeof dispose === 'function' ? dispose : () => {}
           },
         })
+      } else if (dependencies.includes('settings')) {
+        callback({
+          settings: ctx.settings,
+          effect(run) {
+            const dispose = run()
+            return typeof dispose === 'function' ? dispose : () => {}
+          },
+        })
       }
     },
   }

package/scripts/test-config-schema.mjs

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict'
 
-import { Config } from '../src/index.js'
+import { Config, plainConfig, resolveOptions } from '../src/index.js'
 
 // The DSH settings service parses the schema with its defaults before a plugin
 // row can become configurable. A default that violates its own step/min/max
@@ -50,4 +50,45 @@ assert.throws(
   'unknown languages must be rejected by the schema',
 )
 
+// DSH projects volatile fields as { get() } refs. They must be unwrapped
+// before path resolution; otherwise backendRoot becomes "[object Object]".
+{
+  const ref = (value) => ({ get: () => value })
+  assert.deepEqual(
+    plainConfig({
+      backendRoot: ref('D:/voice-sense'),
+      nested: { language: ref('auto') },
+    }),
+    {
+      backendRoot: 'D:/voice-sense',
+      nested: { language: 'auto' },
+    },
+  )
+  const options = resolveOptions({
+    backendRoot: ref('D:/voice-sense'),
+    pythonPath: ref(''),
+    language: ref('auto'),
+    maxAudioBytes: ref(8 * 1024 * 1024),
+  })
+  assert.equal(options.backendRoot.includes('[object Object]'), false)
+  assert.ok(options.backendRoot.endsWith('voice-sense'))
+  assert.equal(options.language, 'auto')
+  assert.equal(options.maxAudioBytes, 8 * 1024 * 1024)
+
+  const shared = { x: 1 }
+  assert.deepEqual(
+    plainConfig({ a: shared, b: shared }),
+    { a: { x: 1 }, b: { x: 1 } },
+    'a shared object must survive in both branches',
+  )
+  assert.deepEqual(
+    plainConfig({ a: [shared, shared] }),
+    { a: [{ x: 1 }, { x: 1 }] },
+    'a shared array element must survive twice',
+  )
+  const cycle = {}
+  cycle.self = cycle
+  assert.deepEqual(plainConfig(cycle), { self: undefined }, 'a real cycle must be cut')
+}
+
 console.log('config schema tests passed')

package/src/index.js

@@ -8,7 +8,7 @@ import { fileURLToPath } from 'node:url'
 import Schema from '@deepseek-ai/schemastery'
 
 export const name = 'dsh-dafeiyu-emotion'
-export const inject = ['webServer', 'settings']
+export const inject = ['webServer']
 
 const ANALYZE_ENDPOINT = '/plugins/dsh-dafeiyu-emotion/analyze'
 const HEALTH_ENDPOINT = '/plugins/dsh-dafeiyu-emotion/health'
@@ -137,17 +137,39 @@ function asNumber(value, fallback) {
   return Number.isFinite(numeric) ? numeric : fallback
 }
 
+/**
+ * DSH settings projects volatile Config fields as live refs (`{ get() }`).
+ * Unwrap them before path/string/number handling, otherwise String(ref)
+ * becomes "[object Object]" and a path is resolved into the profile cwd.
+ */
+function plainConfig(value, stack = new WeakSet(), depth = 0) {
+  if (depth > 20) return undefined
+  if (value && typeof value === 'object') {
+    if (stack.has(value)) return undefined
+    stack.add(value)
+    try {
+      if (typeof value.get === 'function') return plainConfig(value.get(), stack, depth + 1)
+      if (Array.isArray(value)) return value.map((child) => plainConfig(child, stack, depth + 1))
+      return Object.fromEntries(Object.entries(value).map(([key, child]) => [key, plainConfig(child, stack, depth + 1)]))
+    } finally {
+      stack.delete(value)
+    }
+  }
+  return value
+}
+
 function resolveOptions(raw = {}) {
+  const value = plainConfig(raw)
   return {
-    enabled: raw.enabled !== false,
-    backendRoot: String(raw.backendRoot || process.env.DSH_DAFEIYU_EMOTION_BACKEND || DEFAULTS.backendRoot).trim()
-      ? resolve(String(raw.backendRoot || process.env.DSH_DAFEIYU_EMOTION_BACKEND || DEFAULTS.backendRoot))
+    enabled: value.enabled !== false,
+    backendRoot: String(value.backendRoot || process.env.DSH_DAFEIYU_EMOTION_BACKEND || DEFAULTS.backendRoot).trim()
+      ? resolve(String(value.backendRoot || process.env.DSH_DAFEIYU_EMOTION_BACKEND || DEFAULTS.backendRoot))
       : '',
-    pythonPath: String(raw.pythonPath || '').trim(),
-    language: ['zh', 'en', 'auto'].includes(raw.language) ? raw.language : DEFAULTS.language,
-    maxAudioBytes: Math.min(32 * 1024 * 1024, Math.max(256 * 1024, asNumber(raw.maxAudioBytes, DEFAULTS.maxAudioBytes))),
-    startupTimeoutMs: Math.min(600000, Math.max(10000, asNumber(raw.startupTimeoutMs, DEFAULTS.startupTimeoutMs))),
-    requestTimeoutMs: Math.min(600000, Math.max(10000, asNumber(raw.requestTimeoutMs, DEFAULTS.requestTimeoutMs))),
+    pythonPath: String(value.pythonPath || '').trim(),
+    language: ['zh', 'en', 'auto'].includes(value.language) ? value.language : DEFAULTS.language,
+    maxAudioBytes: Math.min(32 * 1024 * 1024, Math.max(256 * 1024, asNumber(value.maxAudioBytes, DEFAULTS.maxAudioBytes))),
+    startupTimeoutMs: Math.min(600000, Math.max(10000, asNumber(value.startupTimeoutMs, DEFAULTS.startupTimeoutMs))),
+    requestTimeoutMs: Math.min(600000, Math.max(10000, asNumber(value.requestTimeoutMs, DEFAULTS.requestTimeoutMs))),
   }
 }
 
@@ -209,7 +231,7 @@ function readSettings(service) {
   try {
     const entry = service.describe().find((row) => row?.ns === SETTINGS_NAMESPACE)
     if (!entry) return null
-    return { ...(entry.value || {}), ...(entry.user || {}) }
+    return plainConfig({ ...(entry.value || {}), ...(entry.user || {}) })
   } catch {
     return null
   }
@@ -936,12 +958,16 @@ function createAnalyzeHandler(runtime, backend, getSpeechToText) {
 
 export function apply(ctx, rawConfig = {}) {
   const logger = ctx.logger ?? console
-  let settingsService = ctx.settings
+  // Resolve settings through ctx.inject below instead of a hard dependency.
+  // A hard `settings` inject can deadlock host startup while the settings
+  // service is still building the plugin Config projections.
+  let settingsService
   const runtime = {
-    options: resolveOptions({
-      ...rawConfig,
-      ...(readSettings(settingsService) || {}),
-    }),
+    // Do not call settings.describe() here: this runs inside the host's
+    // startup transaction and describing every plugin can deadlock the host.
+    // The patch config is authoritative at mount time; PATCH updates the
+    // shared runtime object and settings.update persists it for the next boot.
+    options: resolveOptions(rawConfig),
   }
   const backend = new VoiceBackend(runtime.options, logger)
   if (runtime.options.backendRoot && !existsSync(runtime.options.backendRoot)) {
@@ -950,11 +976,6 @@ export function apply(ctx, rawConfig = {}) {
   let speechToText
   ctx.inject(['settings'], (settingsCtx) => {
     settingsService = settingsCtx.settings
-    const stored = readSettings(settingsService)
-    if (!stored) return
-    const before = { ...runtime.options }
-    Object.assign(runtime.options, resolveOptions({ ...runtime.options, ...stored }))
-    backend.syncOptions(before)
   })
   ctx.inject(['speechToText'], (speechCtx) => {
     speechToText = speechCtx.speechToText
@@ -1032,6 +1053,8 @@ export {
   createConfigHandler,
   decorateAnalysis,
   normalizeConfigPatch,
+  plainConfig,
   publicConfig,
+  resolveOptions,
   transcribeWithSpeech,
 }