dsh-dafeiyu-emotion 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.2.6
+
+- Fixed a blocking `Config` validation error: the 12 MiB `maxAudioBytes` default violated the old 1 MiB step relative to the 256 KiB minimum. Removed the schema step so the shipped default and the settings inputs validate.
+- Added `scripts/test-config-schema.mjs`, which now parses `Config({})` and the shipped defaults before release.
+- Settings changes now apply live: saving `enabled` or `language` broadcasts to the mounted fish-ear, hides it when disabled, and stops the native shortcut from starting a recording.
+- Added request-scoped cancellation. Cancelling a queued request no longer kills the worker serving another session; `close()` invalidates queued work.
+- Added visible keyboard focus to the three numeric settings inputs.
+- `statusCopy` now shows “已停用” instead of “已就绪” when the plugin is disabled.
+- Numeric config patches now require real integers instead of accepting booleans, `null`, or numeric strings.
+- Removed the undeclared `settings.plugin.item` slot registration; the supported slots are `plugins.bundle.config` and `settings.plugins.tab`.
+- Marked `Config` fields volatile at construction instead of mutating the exported schema.
+- Weakened the auto-send success copy so a host that silently refuses `submit()` does not produce a false “delivered” claim.
+
+## 0.2.5
+
+- Exported the Schemastery `Config` schema so DSH can persist setting changes from the panel.
+- Marked every config field volatile, matching the DSH settings service contract.
+- 0.2.4 shipped the settings UI; on hosts that require a registered volatile schema, saving failed. Install 0.2.5 for the full read/write path.
+
 ## 0.2.4
 
 - Added a full settings card for DSH's plugin settings, with live status for lightweight and enhanced modes.

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.4.tgz \
-  https://github.com/LiDu-china/dsh-dafeiyu-emotion/releases/download/v0.2.4/dsh-dafeiyu-emotion-0.2.4.tgz
-dsh plugin --profile desktop add "D:/path/to/dsh-dafeiyu-emotion-0.2.4.tgz"
+curl -L -o dsh-dafeiyu-emotion-0.2.6.tgz \
+  https://github.com/LiDu-china/dsh-dafeiyu-emotion/releases/download/v0.2.6/dsh-dafeiyu-emotion-0.2.6.tgz
+dsh plugin --profile desktop add "D:/path/to/dsh-dafeiyu-emotion-0.2.6.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.4` 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.6` 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.4.md

@@ -0,0 +1,14 @@
+## 设置页与侧边栏
+
+- 新增 DSH 插件设置卡片：启用/停用、识别语言、VoiceSense 目录、Python 路径、录音上限、启动/分析超时。
+- 安装 Better Sidebar 后，可在右侧边栏 `+` 菜单固定「情绪耳朵」，在对话旁边直接调整。
+- 顶部实时显示轻量模式、增强模式、模型加载中、后端目录缺失或等待 Voice Input。
+- 保存后立即写入 DSH 设置；路径或超时变化时自动重启语音 worker。
+
+## 安装
+
+```bash
+dsh plugin --profile desktop add dsh-dafeiyu-emotion
+```
+
+完整变更见 [CHANGELOG](https://github.com/LiDu-china/dsh-dafeiyu-emotion/blob/main/CHANGELOG.md)。

package/docs/RELEASE-0.2.5.md

@@ -0,0 +1,19 @@
+## 设置页与侧边栏
+
+- 新增 DSH 插件设置卡片：启用/停用、识别语言、VoiceSense 目录、Python 路径、录音上限、启动/分析超时。
+- 安装 Better Sidebar 后，可在右侧边栏 `+` 菜单固定「情绪耳朵」，在对话旁边直接调整。
+- 顶部实时显示轻量模式、增强模式、模型加载中、后端目录缺失或等待 Voice Input。
+- 保存后立即写入 DSH 设置；路径或超时变化时自动重启语音 worker。
+
+## 0.2.5 修复
+
+- 导出 DSH 所需的 Schemastery `Config` schema，并把每个字段标记为 volatile。
+- 0.2.4 的设置面板可以显示，但在要求注册 schema 的宿主上保存会失败；0.2.5 修复完整读写链路。
+
+## 安装
+
+```bash
+dsh plugin --profile desktop add dsh-dafeiyu-emotion
+```
+
+完整变更见 [CHANGELOG](https://github.com/LiDu-china/dsh-dafeiyu-emotion/blob/main/CHANGELOG.md)。

package/docs/RELEASE-0.2.6.md

@@ -0,0 +1,20 @@
+## 0.2.6
+
+这是一个恢复可安装性并收紧设置链路的修复版本。
+
+- 修复 `Config` 的 `maxAudioBytes` 默认值与旧 1 MiB step 冲突的问题；0.2.5 在部分宿主上会因为 schema 校验失败而无法激活。
+- 设置页保存 `enabled` / `language` 后立即通知已挂载的鱼耳：关闭时隐藏按钮并禁用 `Alt+V`，切换语言时使用新值。
+- 取消一个排队中的分析请求不再杀掉正在服务另一个会话的 worker。
+- 三个数字输入框补上可见键盘焦点。
+- 插件停用后状态卡显示“已停用”，不再显示“已就绪”。
+- 数字配置只接受真实整数，拒绝布尔值、`null` 和数字字符串。
+- 删除当前宿主未声明的 `settings.plugin.item` slot 注册。
+- 新增 `Config` schema 解析测试，避免默认值再次违反自身约束。
+
+## 安装
+
+```bash
+dsh plugin --profile desktop add dsh-dafeiyu-emotion
+```
+
+完整变更见 [CHANGELOG](https://github.com/LiDu-china/dsh-dafeiyu-emotion/blob/main/CHANGELOG.md)。

package/lib/client.js

@@ -552,6 +552,13 @@ window.__ModuleLoader__.load({
     }
 
     function statusCopy(health, config) {
+      if (config?.enabled === false || health?.enabled === false) {
+        return {
+          label: '已停用',
+          tone: 'muted',
+          detail: '在设置里重新启用后，鱼耳和语音快捷键会恢复。',
+        }
+      }
       if (!health) {
         return {
           label: '正在检测',
@@ -674,6 +681,8 @@ window.__ModuleLoader__.load({
         'aria-label': label,
         style: {
           display: 'inline-flex',
+          flexWrap: 'wrap',
+          maxWidth: '100%',
           gap: 2,
           padding: 3,
           border: `1px solid ${T.border}`,
@@ -805,6 +814,9 @@ window.__ModuleLoader__.load({
           setConfig(payload)
           setDraft(payload)
           setNotice({ kind: 'success', text: '设置已保存' })
+          try {
+            window.dispatchEvent(new CustomEvent('dsh-dafeiyu-emotion:config', { detail: payload }))
+          } catch {}
           await refreshHealth()
         } catch (error) {
           setNotice({ kind: 'error', text: error instanceof Error ? error.message : String(error) })
@@ -896,6 +908,14 @@ window.__ModuleLoader__.load({
         boxSizing: 'border-box',
         transition: 'border-color 150ms ease, outline-color 150ms ease',
       }
+      const focusRing = (event) => {
+        event.currentTarget.style.outlineColor = `color-mix(in srgb, ${T.brand} 28%, transparent)`
+        event.currentTarget.style.borderColor = T.brand
+      }
+      const blurRing = (event) => {
+        event.currentTarget.style.outlineColor = 'transparent'
+        event.currentTarget.style.borderColor = T.border
+      }
       const numberStyle = { ...inputStyle, width: 96, textAlign: 'right', fontVariantNumeric: 'tabular-nums' }
       const secondaryButton = {
         height: 32,
@@ -948,7 +968,7 @@ window.__ModuleLoader__.load({
               : 'linear-gradient(135deg, color-mix(in srgb, #3e7cb1 10%, transparent), transparent 62%)',
           },
         },
-          h('div', { style: { display: 'flex', alignItems: 'center', gap: 12 } },
+          h('div', { style: { display: 'flex', alignItems: 'center', gap: 12, flexWrap: 'wrap' } },
             h('div', {
               style: {
                 width: 44,
@@ -989,6 +1009,7 @@ window.__ModuleLoader__.load({
                 gap: 5,
                 height: 24,
                 padding: '0 9px',
+                flexShrink: 0,
                 border: `1px solid color-mix(in srgb, ${color} 24%, transparent)`,
                 borderRadius: 999,
                 background: `color-mix(in srgb, ${color} 11%, transparent)`,
@@ -1221,6 +1242,8 @@ window.__ModuleLoader__.load({
                 disabled,
                 'aria-label': '单次录音上限（MB）',
                 onChange: (event) => update('maxAudioBytes', Math.round(clamp(Number(event.target.value) || 1, 1, 32)) * 1024 * 1024),
+                onFocus: focusRing,
+                onBlur: blurRing,
                 style: numberStyle,
               }),
               h('span', { style: { color: T.faint, fontSize: 11.5 } }, 'MB'),
@@ -1238,6 +1261,8 @@ window.__ModuleLoader__.load({
                 disabled,
                 'aria-label': '后端启动超时（秒）',
                 onChange: (event) => update('startupTimeoutMs', Math.round(clamp(Number(event.target.value) || 10, 10, 600)) * 1000),
+                onFocus: focusRing,
+                onBlur: blurRing,
                 style: numberStyle,
               }),
               h('span', { style: { color: T.faint, fontSize: 11.5 } }, '秒'),
@@ -1255,6 +1280,8 @@ window.__ModuleLoader__.load({
                 disabled,
                 'aria-label': '单次分析超时（秒）',
                 onChange: (event) => update('requestTimeoutMs', Math.round(clamp(Number(event.target.value) || 10, 10, 600)) * 1000),
+                onFocus: focusRing,
+                onBlur: blurRing,
                 style: numberStyle,
               }),
               h('span', { style: { color: T.faint, fontSize: 11.5 } }, '秒'),
@@ -1276,7 +1303,7 @@ window.__ModuleLoader__.load({
         },
           notice
             ? h('span', {
-                role: 'status',
+                role: notice.kind === 'error' ? 'alert' : 'status',
                 style: {
                   display: 'inline-flex',
                   alignItems: 'center',
@@ -1322,7 +1349,8 @@ window.__ModuleLoader__.load({
       const [analysis, setAnalysis] = useState(null)
       const [sent, setSent] = useState(false)
       const [sending, setSending] = useState(false)
-      const [pluginEnabled, setPluginEnabled] = useState(true)
+      const [pluginEnabled, setPluginEnabled] = useState(null)
+      const [language, setLanguage] = useState('zh')
       const recorder = useRef(null)
       const abort = useRef(null)
       const timer = useRef(null)
@@ -1401,7 +1429,7 @@ window.__ModuleLoader__.load({
       }
 
       const start = async () => {
-        if (locked || recorder.current) return
+        if (pluginEnabled !== true || locked || recorder.current) return
         const run = ++generation.current
         clearTimers()
         setMessage('')
@@ -1477,7 +1505,7 @@ window.__ModuleLoader__.load({
             body: JSON.stringify({
               audioBase64: bytesToBase64(wav),
               sampleRate: 16000,
-              language: 'zh',
+              language,
               prosody: capture.prosody,
             }),
             signal: abort.current.signal,
@@ -1538,7 +1566,7 @@ window.__ModuleLoader__.load({
           inputActions.submit()
           if (!isRunCurrent(run, generation)) return false
           setSent(true)
-          setMessage(`听出${payload.emotionZh || '你的情绪'}，已提交给大肥鱼`)
+          setMessage(`听出${payload.emotionZh || '你的情绪'}，已填入并提交；若未出现请重试`)
           await sleep(1350)
           if (isRunCurrent(run, generation)) await reset()
           return true
@@ -1571,9 +1599,9 @@ window.__ModuleLoader__.load({
 
       useEffect(() => {
         shortcutAction.current = {
-          canHandle: () => canUseVoiceShortcut(phase, locked),
+          canHandle: () => pluginEnabled === true && canUseVoiceShortcut(phase, locked),
           run: () => {
-            if (locked) return false
+            if (pluginEnabled !== true || locked) return false
             if (phase === 'idle') {
               void start()
               return true
@@ -1589,7 +1617,7 @@ window.__ModuleLoader__.load({
             return false
           },
         }
-      }, [locked, phase, sessionId])
+      }, [locked, phase, sessionId, pluginEnabled])
 
       useEffect(() => registerVoiceShortcut({
         canHandle: () => shortcutAction.current?.canHandle?.() === true,
@@ -1598,18 +1626,34 @@ window.__ModuleLoader__.load({
 
       useEffect(() => {
         let active = true
+        const applyConfig = (next) => {
+          if (!active || !next) return
+          setPluginEnabled(next.enabled !== false)
+          if (next.language) setLanguage(next.language)
+        }
         fetch(CONFIG_ENDPOINT, { cache: 'no-store' })
           .then((response) => (response.ok ? response.json() : null))
           .then((next) => {
-            if (active && next) setPluginEnabled(next.enabled !== false)
+            if (!next) {
+              if (active) setPluginEnabled(true)
+              return
+            }
+            applyConfig(next)
+          })
+          .catch(() => {
+            // An older host may not expose /config yet. Keep the fish-ear
+            // visible rather than silently removing the entry point.
+            if (active) setPluginEnabled(true)
           })
-          .catch(() => {})
+        const onConfig = (event) => applyConfig(event.detail)
+        window.addEventListener?.('dsh-dafeiyu-emotion:config', onConfig)
         return () => {
           active = false
+          window.removeEventListener?.('dsh-dafeiyu-emotion:config', onConfig)
         }
       }, [])
 
-      if (!pluginEnabled) return null
+      if (pluginEnabled !== true) return null
 
       if (phase === 'idle') {
         return h('button', {
@@ -1744,7 +1788,7 @@ window.__ModuleLoader__.load({
           return () => {}
         }
       }
-      for (const slot of ['plugins.bundle.config', 'settings.plugins.tab', 'settings.plugin.item']) {
+      for (const slot of ['plugins.bundle.config', 'settings.plugins.tab']) {
         try {
           ctx.slots.inject(slot, registerSettingsCard(slot))
         } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-dafeiyu-emotion",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "大肥鱼语音情绪耳朵：听语气、识别情绪，并让 DSH 按对方当下的状态自然回复。 · Voice + emotion-aware companion for DeepSeek Harness.",
   "type": "module",
   "main": "src/index.js",
@@ -62,9 +62,10 @@
   },
   "scripts": {
     "check": "node --check src/index.js && node --check lib/client.js",
-    "test": "node --check src/index.js && node --check lib/client.js && node --test scripts/test-shortcut-registration.mjs scripts/test-delivery-policy.mjs scripts/test-analyze-handler.mjs scripts/test-config-handler.mjs scripts/test-client-registration.mjs"
+    "test": "node --check src/index.js && node --check lib/client.js && node --test scripts/test-config-schema.mjs scripts/test-config-handler.mjs scripts/test-analyze-handler.mjs scripts/test-backend-cancel.mjs scripts/test-delivery-policy.mjs scripts/test-shortcut-registration.mjs scripts/test-client-registration.mjs"
   },
   "dependencies": {
+    "@deepseek-ai/schemastery": "3.18.5",
     "dsh-dafeiyu": "0.1.23"
   },
   "dsh": {

package/scripts/test-analyze-handler.mjs

@@ -99,6 +99,17 @@ async function call(handler, req) {
   assert.equal(json(res).error, '只允许本机访问')
 }
 
+// Disabling the plugin must stop analysis even if the route stays mounted.
+{
+  const { ctx, handlers } = makeCtx(undefined)
+  apply(ctx, { enabled: false, backendRoot: '' })
+  const res = await call(handlers.get(ANALYZE), makeReq({
+    body: { audioBase64: 'AA==' },
+  }))
+  assert.equal(res.status, 503)
+  assert.match(json(res).error, /已.*关闭/)
+}
+
 // Wrong method is rejected.
 {
   const { ctx, handlers } = makeCtx(undefined)

package/scripts/test-backend-cancel.mjs

@@ -0,0 +1,56 @@
+import assert from 'node:assert/strict'
+
+import { VoiceBackend } from '../src/index.js'
+
+function makeBackend() {
+  return new VoiceBackend({
+    enabled: true,
+    backendRoot: '',
+    pythonPath: '',
+    language: 'zh',
+    maxAudioBytes: 12 * 1024 * 1024,
+    startupTimeoutMs: 180000,
+    requestTimeoutMs: 180000,
+  }, { debug() {} })
+}
+
+// Cancelling a queued request must not kill the worker serving another one.
+{
+  const backend = makeBackend()
+  let killed = 0
+  backend.proc = {
+    killed: false,
+    kill() {
+      killed += 1
+      this.killed = true
+    },
+  }
+  backend.activeRequestId = 7
+  backend.cancel(8)
+  assert.equal(killed, 0, 'a non-active request must not kill the worker')
+  backend.cancel(7)
+  assert.equal(killed, 1, 'the active request may stop its own worker')
+}
+
+// close() invalidates queued work and records the generation boundary.
+{
+  const backend = makeBackend()
+  const generation = backend.generation
+  await backend.close()
+  assert.equal(backend.closed, true)
+  assert.equal(backend.generation, generation + 1)
+  await assert.rejects(() => backend.ensureStarted(), /已关闭/)
+}
+
+// Re-enabling through syncOptions clears the closed latch without starting a
+// worker immediately; the next request starts it on demand.
+{
+  const backend = makeBackend()
+  backend.closed = true
+  backend.options.enabled = true
+  backend.syncOptions({ ...backend.options, enabled: false })
+  assert.equal(backend.closed, false)
+  assert.equal(backend.proc, null)
+}
+
+console.log('backend cancellation tests passed')

package/scripts/test-client-registration.mjs

@@ -117,13 +117,13 @@ client.apply(ctx)
 assert.ok(injected.includes('conversation.input.activity'), 'voice activity slot is injected')
 assert.ok(injected.includes('plugins.bundle.config'), 'bundle config slot is injected')
 assert.ok(injected.includes('settings.plugins.tab'), 'settings tab slot is injected')
-assert.ok(injected.includes('settings.plugin.item'), 'settings item slot is injected')
+assert.equal(injected.includes('settings.plugin.item'), false, 'undeclared settings item slot is not injected')
 
 const names = registrations.map((entry) => entry.spec.name)
 assert.ok(names.includes('conversation.input.activity'))
 assert.ok(names.includes('plugins.bundle.config'))
 assert.ok(names.includes('settings.plugins.tab'))
-assert.ok(names.includes('settings.plugin.item'))
+assert.equal(names.includes('settings.plugin.item'), false)
 
 for (const entry of registrations) {
   assert.equal(entry.spec.id, 'dsh-dafeiyu-emotion')

package/scripts/test-config-handler.mjs

@@ -96,6 +96,9 @@ async function call(handler, req) {
   assert.throws(() => normalizeConfigPatch({ language: 'fr' }), /language/)
   assert.throws(() => normalizeConfigPatch({ backendRoot: 'C:\\bad\u0000path' }), /本地路径/)
   assert.throws(() => normalizeConfigPatch(null), /对象/)
+  assert.throws(() => normalizeConfigPatch({ maxAudioBytes: true }), /整数/)
+  assert.throws(() => normalizeConfigPatch({ maxAudioBytes: 1024.5 }), /整数/)
+  assert.throws(() => normalizeConfigPatch({ startupTimeoutMs: '12000' }), /整数/)
 }
 
 // GET returns the current runtime values.
@@ -183,6 +186,11 @@ async function call(handler, req) {
   })
   const invalid = await call(handler, makeReq({ method: 'PATCH', body: undefined }))
   assert.equal(invalid.status, 400)
+  const tooLarge = await call(handler, makeReq({
+    method: 'PATCH',
+    body: { backendRoot: 'x'.repeat(20000) },
+  }))
+  assert.equal(tooLarge.status, 413)
 }
 
 console.log('config handler tests passed')

package/scripts/test-config-schema.mjs

@@ -0,0 +1,53 @@
+import assert from 'node:assert/strict'
+
+import { Config } 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
+// makes the whole plugin fail to activate, not just the settings card.
+assert.doesNotThrow(() => Config({}), 'empty config must validate')
+assert.doesNotThrow(
+  () => Config({ maxAudioBytes: 12 * 1024 * 1024 }),
+  'the shipped 12 MiB default must validate',
+)
+assert.doesNotThrow(
+  () => Config({ startupTimeoutMs: 12000, requestTimeoutMs: 12000 }),
+  'non-five-second timeouts must validate',
+)
+assert.doesNotThrow(
+  () => Config({
+    enabled: false,
+    backendRoot: 'D:/voice-sense',
+    pythonPath: 'D:/voice-sense/.venv-ser/Scripts/python.exe',
+    language: 'auto',
+    maxAudioBytes: 8 * 1024 * 1024,
+    startupTimeoutMs: 180000,
+    requestTimeoutMs: 180000,
+  }),
+  'a full settings payload must validate',
+)
+
+for (const key of [
+  'enabled',
+  'backendRoot',
+  'pythonPath',
+  'language',
+  'maxAudioBytes',
+  'startupTimeoutMs',
+  'requestTimeoutMs',
+]) {
+  assert.equal(Config.dict[key]?.meta?.volatile, true, `${key} must be volatile`)
+}
+
+assert.throws(
+  () => Config({ maxAudioBytes: 1 }),
+  /maxAudioBytes/,
+  'below-min values must be rejected by the schema',
+)
+assert.throws(
+  () => Config({ language: 'fr' }),
+  /language/,
+  'unknown languages must be rejected by the schema',
+)
+
+console.log('config schema tests passed')

package/src/index.js

@@ -5,6 +5,7 @@ import { createInterface } from 'node:readline'
 import { tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import Schema from '@deepseek-ai/schemastery'
 
 export const name = 'dsh-dafeiyu-emotion'
 export const inject = ['webServer']
@@ -30,6 +31,38 @@ const DEFAULTS = Object.freeze({
 const CONFIG_FIELDS = new Set(Object.keys(DEFAULTS))
 const LANGUAGES = new Set(['zh', 'en', 'auto'])
 
+export const Config = Schema.object({
+  enabled: Schema.boolean().default(true).description('启用情绪耳朵').volatile(),
+  backendRoot: Schema.string().default('').description('VoiceSense 项目目录').volatile(),
+  pythonPath: Schema.string().default('').description('Python 解释器路径').volatile(),
+  language: Schema.union([
+    Schema.const('zh').description('中文'),
+    Schema.const('en').description('English'),
+    Schema.const('auto').description('自动'),
+  ]).default('zh').description('识别语言').volatile(),
+  // Avoid step(): DSH validates numbers against (value - min) / step, and
+  // the old 1 MiB step rejected the 12 MiB default. The custom settings card
+  // already enforces its own input granularity.
+  maxAudioBytes: Schema.number()
+    .min(256 * 1024)
+    .max(32 * 1024 * 1024)
+    .default(12 * 1024 * 1024)
+    .description('单次录音上限（字节）')
+    .volatile(),
+  startupTimeoutMs: Schema.number()
+    .min(10000)
+    .max(600000)
+    .default(180000)
+    .description('后端启动超时（毫秒）')
+    .volatile(),
+  requestTimeoutMs: Schema.number()
+    .min(10000)
+    .max(600000)
+    .default(180000)
+    .description('单次分析超时（毫秒）')
+    .volatile(),
+}).description('大肥鱼语音情绪耳朵')
+
 const EMOTION_ZH = Object.freeze({
   happy: '喜悦',
   sad: '低落',
@@ -158,8 +191,10 @@ function normalizeConfigPatch(value) {
       patch[key] = text
       continue
     }
-    const numeric = Number(next)
-    if (!Number.isFinite(numeric)) throw new HttpError(400, `${key} 必须是数字`)
+    if (typeof next !== 'number' || !Number.isFinite(next) || !Number.isInteger(next)) {
+      throw new HttpError(400, `${key} 必须是整数`)
+    }
+    const numeric = next
     if (key === 'maxAudioBytes') {
       patch.maxAudioBytes = Math.round(Math.min(32 * 1024 * 1024, Math.max(256 * 1024, numeric)))
     } else {
@@ -453,7 +488,11 @@ class VoiceBackend {
     this.startupAbort = null
     this.pending = new Map()
     this.nextId = 0
+    this.nextQueueId = 0
+    this.activeRequestId = null
     this.queue = Promise.resolve()
+    this.closed = false
+    this.generation = 0
     this.stderr = []
     this.lastError = null
   }
@@ -484,8 +523,13 @@ class VoiceBackend {
     } catch {}
   }
 
-  /** Abort the in-flight worker so a cancelled request cannot block the queue. */
-  cancel() {
+  /**
+   * Abort one request. A queued request that has not reached the worker yet
+   * must not kill the worker serving the active request; its own AbortSignal
+   * will make it exit before it writes anything.
+   */
+  cancel(requestId) {
+    if (requestId !== undefined && this.activeRequestId !== requestId) return
     const proc = this.proc
     if (!proc) return
     this.stopProcess(proc, { error: createAbortError(), preserveLastError: true })
@@ -500,6 +544,7 @@ class VoiceBackend {
   syncOptions(previous = {}) {
     const next = this.options
     this.python = locatePython(next)
+    this.closed = !next.enabled
     const restart = previous.backendRoot !== next.backendRoot
       || previous.pythonPath !== next.pythonPath
       || previous.startupTimeoutMs !== next.startupTimeoutMs
@@ -530,6 +575,9 @@ class VoiceBackend {
   }
 
   ensureStarted() {
+    if (this.closed || !this.options.enabled) {
+      return Promise.reject(new Error('情绪耳朵已关闭'))
+    }
     if (this.proc && !this.proc.killed && this.ready) return Promise.resolve()
     if (this.startup) return this.startup
     this.startup = new Promise((resolvePromise, rejectPromise) => {
@@ -668,14 +716,25 @@ class VoiceBackend {
     return this.startup
   }
 
-  request(wavPath) {
+  request(wavPath, signal) {
+    const requestId = ++this.nextQueueId
+    const generation = this.generation
     const run = async () => {
+      if (this.closed || generation !== this.generation) throw new Error('语音后端已关闭')
+      if (signal?.aborted) throw createAbortError()
       await this.ensureStarted()
+      if (this.closed || generation !== this.generation) throw new Error('语音后端已关闭')
+      if (signal?.aborted) throw createAbortError()
       const proc = this.proc
       if (!proc || proc.killed || !proc.stdin) throw new Error('语音后端不可用')
+      this.activeRequestId = requestId
       const id = ++this.nextId
       let settled = false
       let timer
+      const onAbort = () => {
+        if (this.activeRequestId === requestId) this.cancel(requestId)
+      }
+      signal?.addEventListener?.('abort', onAbort, { once: true })
       const result = new Promise((resolvePromise, rejectPromise) => {
         const finish = (callback, value) => {
           if (settled) return
@@ -702,20 +761,30 @@ class VoiceBackend {
         this.lastError = `语音后端写入失败：${wrapped.message}`
         this.stopProcess(proc, { error: wrapped, preserveLastError: true })
         result.catch(() => {})
+        signal?.removeEventListener?.('abort', onAbort)
+        if (this.activeRequestId === requestId) this.activeRequestId = null
         throw wrapped
       }
-      return result
+      try {
+        return await result
+      } finally {
+        signal?.removeEventListener?.('abort', onAbort)
+        if (this.activeRequestId === requestId) this.activeRequestId = null
+      }
     }
     const task = this.queue.then(run, run)
     this.queue = task.catch(() => {})
     return task
   }
 
-  async analyze(wavPath) {
-    return decorateAnalysis(await this.request(wavPath))
+  async analyze(wavPath, signal) {
+    return decorateAnalysis(await this.request(wavPath, signal))
   }
 
   async close() {
+    this.closed = true
+    this.generation += 1
+    this.activeRequestId = null
     const proc = this.proc
     this.startupAbort?.()
     this.proc = null
@@ -803,7 +872,6 @@ function createAnalyzeHandler(runtime, backend, getSpeechToText) {
     const onClose = () => {
       if (res.writableEnded) return
       controller?.abort()
-      backend.cancel()
     }
     try {
       controller = new AbortController()
@@ -832,7 +900,7 @@ function createAnalyzeHandler(runtime, backend, getSpeechToText) {
       }
       if (options.backendRoot && existsSync(options.backendRoot)) {
         try {
-          analysis = await backend.analyze(wavPath.replaceAll('\\', '/'))
+          analysis = await backend.analyze(wavPath.replaceAll('\\', '/'), controller.signal)
         } catch (error) {
           localError = error instanceof Error ? error.message : String(error)
         }
@@ -959,6 +1027,7 @@ export function apply(ctx, rawConfig = {}) {
 }
 
 export {
+  VoiceBackend,
   buildFallbackAnalysis,
   createConfigHandler,
   decorateAnalysis,