@goodandready/dsh-voice 0.9.10 → 0.9.12

package/lib/client.js

@@ -62,7 +62,7 @@ window.__ModuleLoader__.load({
       'hide': 'Hide',
       'title': 'Voice',
       'recordSlot': 'Voice recording',
-      'browserHint': 'the browser does the recognition, no key needed',
+      'browserHint': 'Web Speech recognition (uses page/browser language when auto, Chrome sends audio to Google)',
       'openaiHint': 'whisper-1 · key OPENAI_API_KEY',
       'siliconflowHint': 'FunAudioLLM/SenseVoiceSmall · key SILICONFLOW_API_KEY',
       'deepinfraHint': 'openai/whisper-large-v3-turbo · key DEEPINFRA_API_KEY',
@@ -89,6 +89,12 @@ window.__ModuleLoader__.load({
       'hotkeyHint1': 'Hold it to record, release to send to the agent, Esc cancels. ',
       'hotkeyHint2': 'Any key will do: a letter, an F-key or a modifier.',
       'language': 'Language',
+      'langAuto': 'Auto-detect',
+      'langRu': 'Russian (ru)',
+      'langEn': 'English (en)',
+      'langZh': 'Chinese (zh)',
+      'langUk': 'Ukrainian (uk)',
+      'langDe': 'German (de)',
       'dictationHint': 'Speech is cut at pauses and the text is appended to the input.',
       'pauseMs': 'Pause that ends a phrase, ms',
       'pauseHint': 'Lower means more frequent chunks and faster text, but a higher risk of cutting a word',
@@ -204,6 +210,9 @@ window.__ModuleLoader__.load({
       'updating': 'Updating…',
       'updateSuccess': 'Updated successfully! Restart DSH to apply.',
       'updateFailed': 'Update failed. Check logs.',
+      'updateCheckFailed': 'Update check failed',
+      'checkingUpdates': 'Checking updates…',
+      'updateStatusUnknown': 'Version status unknown',
       'sensevoiceTitle': 'SenseVoice Local ASR (1-Click Setup)',
       'sensevoiceDesc': 'Ultra-fast offline speech recognition on CPU (50–100ms latency, Russian/English).',
       'installSensevoice': 'Install SenseVoice-Small (1-Click)',
@@ -256,7 +265,7 @@ window.__ModuleLoader__.load({
       'hide': '隐藏',
       'title': '语音',
       'recordSlot': '语音录制',
-      'browserHint': '浏览器直接识别，无需密钥',
+      'browserHint': 'Web Speech 语音识别 (设为 auto 时使用页面或浏览器语言，Chrome 会上传音频至 Google)',
       'openaiHint': 'whisper-1 · 密钥 OPENAI_API_KEY',
       'siliconflowHint': 'FunAudioLLM/SenseVoiceSmall · 密钥 SILICONFLOW_API_KEY',
       'deepinfraHint': 'openai/whisper-large-v3-turbo · 密钥 DEEPINFRA_API_KEY',
@@ -283,6 +292,12 @@ window.__ModuleLoader__.load({
       'hotkeyHint1': '按住录音，松开发送给智能体，按 Esc 取消。',
       'hotkeyHint2': '支持任意按键：字母键、功能键 (F1-F12) 或修饰键。',
       'language': '识别语言',
+      'langAuto': '自动检测',
+      'langRu': '俄语 (ru)',
+      'langEn': '英语 (en)',
+      'langZh': '中文 (zh)',
+      'langUk': '乌克兰语 (uk)',
+      'langDe': '德语 (de)',
       'dictationHint': '语音按停顿自动切句，文字实时追加至输入框。',
       'pauseMs': '断句静音停顿时长（毫秒）',
       'pauseHint': '数值越小切分越频繁、出字越快，但可能切断未说完的词',
@@ -398,6 +413,9 @@ window.__ModuleLoader__.load({
       'updating': '正在更新…',
       'updateSuccess': '更新成功！请重启 DSH 生效。',
       'updateFailed': '更新失败，请查看日志。',
+      'updateCheckFailed': '检查更新失败',
+      'checkingUpdates': '正在检查更新…',
+      'updateStatusUnknown': '版本状态未知',
       'sensevoiceTitle': 'SenseVoice 本地 ASR (一键部署)',
       'sensevoiceDesc': 'CPU 上超低延迟离线语音识别 (50–100ms，中英俄多语种)。',
       'installSensevoice': '一键安装 SenseVoice-Small',
@@ -507,13 +525,34 @@ window.__ModuleLoader__.load({
       subscribe(l) { this.listeners.add(l); return () => this.listeners.delete(l) },
     }
 
-    if (typeof window !== 'undefined') {
-      window.addEventListener('dsh:tts:start', () => {
-        voice.set({ isTtsSpeaking: true })
-      })
-      window.addEventListener('dsh:tts:stop', () => {
-        voice.set({ isTtsSpeaking: false })
-      })
+    function registerGlobalLifecycle() {
+      if (typeof window === 'undefined') return () => {}
+      const onTtsStart = () => voice.set({ isTtsSpeaking: true })
+      const onTtsStop = () => voice.set({ isTtsSpeaking: false })
+      const onSettingsSaved = () => { voice._chainsPromise = null }
+      const onPageUnload = () => {
+        if (voice.rec && typeof voice.teardownRec === 'function') voice.teardownRec(voice.rec)
+        if (voice.browser) {
+          try { voice.browser.abort() } catch (_) {}
+        }
+      }
+
+      window.addEventListener('dsh:tts:start', onTtsStart)
+      window.addEventListener('dsh:tts:stop', onTtsStop)
+      window.addEventListener('dsh-voice:settings-saved', onSettingsSaved)
+      window.addEventListener('pagehide', onPageUnload)
+      window.addEventListener('beforeunload', onPageUnload)
+
+      return () => {
+        window.removeEventListener('dsh:tts:start', onTtsStart)
+        window.removeEventListener('dsh:tts:stop', onTtsStop)
+        window.removeEventListener('dsh-voice:settings-saved', onSettingsSaved)
+        window.removeEventListener('pagehide', onPageUnload)
+        window.removeEventListener('beforeunload', onPageUnload)
+        onPageUnload()
+        if (typeof voice.clearGlobalHotkey === 'function') voice.clearGlobalHotkey()
+        voice.set({ phase: 'idle', caption: '', interimTranscript: '', isTtsSpeaking: false })
+      }
     }
 
     function triggerBargeIn() {
@@ -702,11 +741,15 @@ window.__ModuleLoader__.load({
     }
 
     function tidyPhrase(text) {
-      let s = String(text || '').trim()
-      if (!s) return s
+      if (!text) return ''
+      if (/^\n+$/.test(text)) return text
+      const lead = (text.match(/^\n+/) || [''])[0]
+      const trail = (text.match(/\n+$/) || [''])[0]
+      let s = String(text).trim()
+      if (!s) return lead || trail || ''
       s = s.replace(/\s*,\s*/g, ', ')
-      s = s.replace(/(^|[.!?\n]\s+)([a-zа-яё])/gi, (m, lead, ch) => lead + ch.toUpperCase())
-      return s
+      s = s.replace(/(^|[.!?\n]\s+)([a-zа-яё])/gi, (m, l, ch) => l + ch.toUpperCase())
+      return lead + s + trail
     }
 
     // Functional speech edit commands (#37): spoken line breaks and punctuation -> symbols.
@@ -724,7 +767,12 @@ window.__ModuleLoader__.load({
     function applyVoiceCommands(text) {
       let s = text
       for (const [re, to] of VOICE_COMMANDS) s = s.replace(re, to)
-      return s.replace(/[ \t]*\n[ \t]*/g, '\n').replace(/[ \t]+/g, ' ').trim()
+      if (/^\n+$/.test(s)) return s
+      const lead = (s.match(/^\n+/) || [''])[0]
+      const trail = (s.match(/\n+$/) || [''])[0]
+      const trimmed = s.replace(/[ \t]*\n[ \t]*/g, '\n').replace(/[ \t]+/g, ' ').trim()
+      if (!trimmed) return lead || trail || ''
+      return lead + trimmed + trail
     }
 
     // Insert history for undo (#29-9). Browser-only storage.
@@ -747,22 +795,33 @@ window.__ModuleLoader__.load({
       return t('undone')
     }
 
-    function appendDraft(text) {
+    function insertDraftText(text) {
       const actions = voice.inputActions
-      if (!actions || typeof actions.setDraft !== 'function') {
+      if (!actions || (typeof actions.setDraft !== 'function' && typeof actions.insertText !== 'function')) {
         voice.set({ phase: 'error', error: t('composerUnavailable') })
-        return
+        return false
+      }
+      if (typeof actions.insertText === 'function') {
+        try { actions.insertText(text); return true } catch (_) {}
       }
-      let clean = voice.settings.voiceCommands ? applyVoiceCommands(text) : tidyPhrase(text)
-      if (!clean) return
       const draft = voice.input && typeof voice.input.draft === 'string' ? voice.input.draft : ''
       const before = draft
-      actions.setDraft(draft ? draft + ' ' + clean : clean)
+      const sep = (!draft || draft.endsWith('\n') || text.startsWith('\n')) ? '' : ' '
+      const after = draft + sep + text
+      actions.setDraft(after)
       const limit = Number(voice.settings.historyLimit)
       if (limit > 0) {
-        insertHistory.push({ before, added: draft ? ' ' + clean : clean, after: draft ? draft + ' ' + clean : clean })
+        insertHistory.push({ before, added: sep + text, after })
         while (insertHistory.length > limit) insertHistory.shift()
       }
+      return true
+    }
+
+    function appendDraft(text) {
+      if (!text) return
+      let clean = voice.settings.voiceCommands ? applyVoiceCommands(text) : tidyPhrase(text)
+      if (!clean) return
+      insertDraftText(clean)
     }
 
     // Human-readable key name.
@@ -851,6 +910,21 @@ window.__ModuleLoader__.load({
       return speechRecognitionCtor() !== null
     }
 
+    function resolveBrowserRecognitionLang(lang) {
+      if (lang && lang !== 'auto') {
+        if (lang.includes('-')) return lang
+        const BCP47 = { ru: 'ru-RU', en: 'en-US', zh: 'zh-CN', uk: 'uk-UA', de: 'de-DE' }
+        return BCP47[lang.toLowerCase()] || lang
+      }
+      if (typeof document !== 'undefined' && document.documentElement && document.documentElement.lang) {
+        return document.documentElement.lang
+      }
+      if (typeof navigator !== 'undefined' && navigator.language) {
+        return navigator.language
+      }
+      return 'en-US'
+    }
+
     /**
      * @param options {{lang: string, continuous: boolean, onInterim, onFinal, onError}}
      * @returns {{stop: Function, abort: Function}}
@@ -858,10 +932,12 @@ window.__ModuleLoader__.load({
     function startBrowserRecognition(options) {
       const Ctor = speechRecognitionCtor()
       const recognition = new Ctor()
-      recognition.lang = options.lang && options.lang !== 'auto' ? options.lang : 'ru-RU'
+      recognition.lang = resolveBrowserRecognitionLang(options.lang)
       recognition.continuous = options.continuous !== false
       recognition.interimResults = true
       let stopped = false
+      let stopPromise = null
+      let resolveStop = null
 
       recognition.onresult = (event) => {
         let interim = ''
@@ -878,12 +954,18 @@ window.__ModuleLoader__.load({
         // no-speech and aborted are normal life, not failures.
         const code = event && event.error
         if (code === 'no-speech' || code === 'aborted') return
+        stopped = true
+        try { recognition.abort() } catch (_) {}
+        if (resolveStop) { resolveStop(); resolveStop = null }
         options.onError(code || t('recognitionError'))
       }
       // The browser ends recognition on its own (pauses, timeout). Restart
       // until we stop it, otherwise dictation dies silently on the first pause.
       recognition.onend = () => {
-        if (stopped) return
+        if (stopped) {
+          if (resolveStop) { resolveStop(); resolveStop = null }
+          return
+        }
         try { recognition.start() } catch (alreadyRunning) { /* already running */ }
       }
 
@@ -891,30 +973,39 @@ window.__ModuleLoader__.load({
         options.onError(String(cannotStart && cannotStart.message || cannotStart))
       }
       return {
-        stop() { stopped = true; try { recognition.stop() } catch (already) { /* already stopped */ } },
-        abort() { stopped = true; try { recognition.abort() } catch (already) { /* already stopped */ } },
+        stop() {
+          if (stopPromise) return stopPromise
+          stopped = true
+          stopPromise = new Promise((resolve) => {
+            resolveStop = resolve
+            try { recognition.stop() } catch (already) { resolve() }
+            setTimeout(resolve, 800)
+          })
+          return stopPromise
+        },
+        abort() {
+          stopped = true
+          if (resolveStop) { resolveStop(); resolveStop = null }
+          try { recognition.abort() } catch (already) { /* already stopped */ }
+        },
       }
     }
 
     // Fetch the mode chain from the host once. Only needed to decide whether
 
-    voice._core = { tidyPhrase, applyVoiceCommands, VOICE_COMMANDS, undoLastInsert, insertHistory }
-    // to use browser recognition or record a file.
-    let chainsPromise = null
-    if (typeof window !== 'undefined') {
-      window.addEventListener('dsh-voice:settings-saved', () => { chainsPromise = null })
-    }
+    voice._core = { tidyPhrase, applyVoiceCommands, VOICE_COMMANDS, undoLastInsert, insertHistory, insertDraftText, appendDraft, resolveBrowserRecognitionLang }
+    voice._chainsPromise = null
     function modeChain(mode) {
-      if (!chainsPromise) {
-        chainsPromise = fetch('/dsh-voice/status', { cache: 'no-store' })
+      if (!voice._chainsPromise) {
+        voice._chainsPromise = fetch('/dsh-voice/status', { cache: 'no-store' })
           .then((res) => res.json())
           .then((data) => (data && data.modes) || {})
           .catch(() => {
-            chainsPromise = null
+            voice._chainsPromise = null
             return {}
           })
       }
-      return chainsPromise.then((modes) => {
+      return voice._chainsPromise.then((modes) => {
         const row = modes[mode] || {}
         return {
           chain: Array.isArray(row.chain) ? row.chain.map((e) => e && e.provider) : [],
@@ -931,16 +1022,7 @@ window.__ModuleLoader__.load({
       if (rec.analyser) { try { rec.analyser.disconnect() } catch (e) { /* already disconnected */ } }
       if (rec.audioCtx) { try { rec.audioCtx.close() } catch (e) { /* already closed */ } }
     }
-    if (typeof window !== 'undefined') {
-      const onPageUnload = () => {
-        if (voice.rec) teardown(voice.rec)
-        if (voice.browser) {
-          try { voice.browser.abort() } catch (e) { /* ignore */ }
-        }
-      }
-      window.addEventListener('pagehide', onPageUnload)
-      window.addEventListener('beforeunload', onPageUnload)
-    }
+    voice.teardownRec = teardown
     function waitStop(recorder) {
       if (!recorder || recorder.state === 'inactive') return Promise.resolve()
       return new Promise((resolve) => recorder.addEventListener('stop', resolve, { once: true }))
@@ -992,7 +1074,6 @@ window.__ModuleLoader__.load({
         rec.analyser.fftSize = 128
         lastNode.connect(rec.analyser)
       }
-      // No timeslice: only then each stop() yields a standalone webm file.
       recorder.start()
       return rec
     }
@@ -1010,8 +1091,6 @@ window.__ModuleLoader__.load({
       }
       return raw
     }
-    // Cut the current phrase: stop the recorder, send the finished file and
-    // immediately start a new recording with the same recorder.
     let dictationQueue = Promise.resolve()
     function cutPhrase() {
       const rec = voice.rec
@@ -1047,40 +1126,22 @@ window.__ModuleLoader__.load({
           if (rec.cancelled) return
           const text = out && out.text ? out.text : ''
           const action = out && out.action ? out.action : null
-
           if (voice.settings.structuredPromptVoice !== false && text) {
             const promptInfo = findActiveStructuredPrompt()
             if (promptInfo && submitToStructuredPrompt(text, promptInfo)) {
               return
             }
           }
-
-          if (action === 'send') {
-            if (text) appendDraft(text)
-            if (voice.inputActions && typeof voice.inputActions.send === 'function') {
-              voice.inputActions.send()
-            }
+          if (action === 'send' || action === 'clear' || action === 'newline') {
+            executeVoiceAction(action, text)
             return
           }
           if (action === 'cancel') {
             cancelCurrent()
             return
           }
-          if (action === 'clear') {
-            if (voice.inputActions && typeof voice.inputActions.clear === 'function') {
-              voice.inputActions.clear()
-            }
-            return
-          }
-          if (action === 'newline') {
-            appendDraft(text ? (text + '\n') : '\n')
-            return
-          }
-
           const delay = Number(voice.settings.sendDelayMs) || 0
           if (text && delay > 0 && !voice.holding) {
-            // Delayed insert with a cancel window (#29-5): text is already
-            // inserted; the window only allows undoing it.
             appendDraft(text)
             voice.set({ phase: 'pending', pending: { text, undoOnly: true, leftMs: delay } })
             return
@@ -1094,9 +1155,6 @@ window.__ModuleLoader__.load({
         })
       })
     }
-
-    // Browser recognition instead of file recording. Returns false when the
-    // browser cannot do it — then fall back to the normal path.
     function startBrowserLeg(mode, language) {
       if (voice.settings && voice.settings.localOnly) return false
       if (!browserRecognitionAvailable()) return false
@@ -1111,12 +1169,13 @@ window.__ModuleLoader__.load({
             voice.interimTranscript = text
           }
           voice.notify()
-          // Wake-word (#45): if interim starts with the trigger phrase, stop
-          // browser listening and switch to normal recording.
           const ww = String(voice.settings.wakeWord || '').trim().toLowerCase()
           if (ww && mode === 'dictation' && !voice.rec) {
             const t = String(text || '').trim().toLowerCase()
             if (t.startsWith(ww)) {
+              if (voice.browser && typeof voice.browser.abort === 'function') {
+                try { voice.browser.abort() } catch (_) {}
+              }
               voice.browser = null
               voice.caption = ''
               voice.interimTranscript = ''
@@ -1137,12 +1196,10 @@ window.__ModuleLoader__.load({
           finals.push(text)
           voice.caption = ''
           voice.interimTranscript = ''
-          // Dictation appends immediately; messages accumulate until release.
           if (mode === 'dictation') appendDraft(text)
           else voice.notify()
         },
         onError: (reason) => {
-          // Browser failed after start — say so instead of pretending to listen.
           voice.browser = null
           voice.interimTranscript = ''
           voice.set({ phase: 'error', error: t('browserFailed') + reason })
@@ -1152,7 +1209,6 @@ window.__ModuleLoader__.load({
       voice.notify()
       return true
     }
-
     function startRecording(mode) {
       if (voice.phase !== 'idle' && voice.phase !== 'error') return
       voice.activeOpId = (voice.activeOpId || 0) + 1
@@ -1168,7 +1224,6 @@ window.__ModuleLoader__.load({
       dictationQueue = Promise.resolve()
       voice.set({ phase: 'recording', mode, error: '', levels: [], caption: '', interimTranscript: '' })
       modeChain(mode).then((info) => {
-        // Browser leg only when it is explicitly first in the chain.
         if (info.chain[0] === 'browser' && startBrowserLeg(mode, info.language)) return
         openMic(mode)
           .then((rec) => {
@@ -1182,47 +1237,50 @@ window.__ModuleLoader__.load({
           .catch((err) => voice.set({ phase: 'error', error: String(err && err.message ? err.message : err), rec: null }))
       })
     }
-
     function startDictation() { startRecording('dictation') }
     function startMessage() { startRecording('message') }
-
     // --------------------------------------------------------- hold gesture
-    //
-    // Two gestures on one button: a short click toggles recording until the
-    // next click; hold records only while pressed. Release sends.
-    //
-    // Distinguished by time: release before the threshold is a click.
     const HOLD_THRESHOLD_MS = 350
-
     const hold = { active: false, mode: null, startedAt: 0, armed: false }
-
-    function beginHold(mode) {
+    let activePointerCleanup = null
+    function beginHold(mode, pointerEvent) {
       if (hold.armed || (voice.phase !== 'idle' && voice.phase !== 'error')) return
       hold.armed = true
       hold.mode = mode
       hold.startedAt = Date.now()
       hold.active = false
-      // Start recording immediately: waiting for the threshold loses the first word.
+      if (pointerEvent?.target?.setPointerCapture && pointerEvent.pointerId !== undefined) {
+        try { pointerEvent.target.setPointerCapture(pointerEvent.pointerId) } catch (e) {}
+      }
+      if (typeof window !== 'undefined') {
+        if (activePointerCleanup) { try { activePointerCleanup() } catch (e) {} }
+        const onUp = () => endHold(false)
+        const onCancel = () => endHold(true)
+        window.addEventListener('pointerup', onUp, true)
+        window.addEventListener('pointercancel', onCancel, true)
+        window.addEventListener('blur', onCancel, true)
+        activePointerCleanup = () => {
+          window.removeEventListener('pointerup', onUp, true)
+          window.removeEventListener('pointercancel', onCancel, true)
+          window.removeEventListener('blur', onCancel, true)
+          activePointerCleanup = null
+        }
+      }
       startRecording(mode)
       voice.holding = true
       voice.notify()
     }
-
     function endHold(cancelled) {
       if (!hold.armed) return
+      if (activePointerCleanup) { try { activePointerCleanup() } catch (e) {} }
       const heldMs = Date.now() - hold.startedAt
       hold.armed = false
       hold.active = false
       voice.holding = false
-      // Short press is a click: recording is already on, leave it running;
-      // the second click will stop it.
       if (!cancelled && heldMs < HOLD_THRESHOLD_MS) { voice.notify(); return }
       if (cancelled) cancelCurrent()
       else stopCurrent()
     }
-
-    // Hotkey: holding a key is easier than aiming the mouse. While the key is
-    // down we record; Escape cancels.
     function hotkeyMatches(event, name) {
       if (!event || !name) return false
       if (typeof name === 'string' && name.includes('+')) {
@@ -1244,7 +1302,6 @@ window.__ModuleLoader__.load({
       if (name === 'Meta') return event.key === 'Meta'
       return event.code === name || event.key === name
     }
-
     function isAllowedInEditable(name) {
       if (!name) return false
       if (['Control', 'Alt', 'Shift', 'Meta'].includes(name)) return true
@@ -1253,9 +1310,7 @@ window.__ModuleLoader__.load({
       if (['Tab', 'Pause', 'ScrollLock', 'Insert'].includes(name)) return true
       return false
     }
-
     let activeHotkeyCleanup = null
-
     function clearGlobalHotkey() {
       if (typeof activeHotkeyCleanup === 'function') {
         try { activeHotkeyCleanup() } catch (_) { /* ignore */ }
@@ -1266,31 +1321,35 @@ window.__ModuleLoader__.load({
         window.__dsh_voice_hotkey_cleanup = null
       }
     }
-
+    voice.clearGlobalHotkey = clearGlobalHotkey
     function installHotkey(ctx, keyName, mode) {
       clearGlobalHotkey()
       if (typeof document === 'undefined' || !keyName) return () => {}
       const down = (event) => {
         if (event.repeat) return
-        // A modifier, function key or combo does not fight the text field:
-        // modifiers/combos do not type plain text. A plain letter key must not be hijacked while typing.
         const target = event.target
-        const isEditable = target && (
-          target.tagName === 'INPUT' ||
-          target.tagName === 'TEXTAREA' ||
-          target.isContentEditable ||
-          (typeof target.getAttribute === 'function' && target.getAttribute('contenteditable') === 'true')
-        )
+        const isEditable = target && (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable || (typeof target.getAttribute === 'function' && target.getAttribute('contenteditable') === 'true'))
         if (isEditable && !isAllowedInEditable(keyName)) return
-
         if (hotkeyMatches(event, keyName)) {
           event.preventDefault()
           event.stopPropagation()
           beginHold(mode)
         }
       }
+    function isHotkeyRelease(event, name) {
+      if (!event || !name) return false
+      if (typeof name === 'string' && name.includes('+')) {
+        const parts = name.split('+')
+        if (event.code === parts[parts.length - 1] || event.key === parts[parts.length - 1]) return true
+        for (let i = 0; i < parts.length - 1; i++) {
+          if (event.key === parts[i] || event.code === parts[i]) return true
+        }
+        return false
+      }
+      return event.code === name || event.key === name
+    }
       const up = (event) => {
-        if (hotkeyMatches(event, keyName)) {
+        if (hold.armed && isHotkeyRelease(event, keyName)) {
           event.preventDefault()
           endHold(false)
         } else if (event.key === 'Escape' && hold.armed) {
@@ -1317,7 +1376,6 @@ window.__ModuleLoader__.load({
       }
       return cleanup
     }
-
     function cancelCurrent() {
       voice.activeOpId = (voice.activeOpId || 0) + 1
       announceVoice('end')
@@ -1340,27 +1398,25 @@ window.__ModuleLoader__.load({
       } catch (e) { /* already stopped */ }
       stopped.then(() => { teardown(rec); voice.rec = null; voice.set({ phase: 'idle', error: '' }) })
     }
-
-    // Stop on the second click: dictation flushes the tail; a voice message
-    // sends the whole recording and opens the cancel window.
     function stopCurrent() {
       announceVoice('end')
       focusComposer()
       if (voice.browser) {
         const mode = voice.mode
-        const said = (voice.browserFinals || []).join(' ').trim()
-        voice.browser.stop()
+        const b = voice.browser
         voice.browser = null
-        voice.browserFinals = null
         voice.caption = ''
-        if (!said) { voice.set({ phase: 'idle' }); return }
-        if (mode === 'message') {
-          appendDraft(said)
-          voice.set({ phase: 'pending', pending: { text: said, leftMs: voice.settings.autoSendMs } })
-        } else {
-          // Dictation already appended while speaking — nothing extra to add.
-          voice.set({ phase: 'idle' })
-        }
+        Promise.resolve(b.stop()).then(() => {
+          const said = (voice.browserFinals || []).join(' ').trim()
+          voice.browserFinals = null
+          if (!said) { voice.set({ phase: 'idle' }); return }
+          if (mode === 'message') {
+            appendDraft(said)
+            voice.set({ phase: 'pending', pending: { text: said, leftMs: voice.settings.autoSendMs } })
+          } else {
+            voice.set({ phase: 'idle' })
+          }
+        })
         return
       }
       const rec = voice.rec
@@ -1377,67 +1433,101 @@ window.__ModuleLoader__.load({
         const blob = new Blob(rec.chunks, { type: rec.mime })
         teardown(rec)
         voice.rec = null
-        if (blob.size < 1200) { voice.set({ phase: 'idle' }); return }
+        if (blob.size < (mode === 'dictation' ? 600 : 1200)) {
+          if (mode === 'dictation') { try { await dictationQueue } catch (_) {} }
+          voice.set({ phase: 'idle' })
+          return
+        }
         if (voice.lastNote && voice.lastNote.url) {
-          try { URL.revokeObjectURL(voice.lastNote.url) } catch (e) { /* ignore */ }
+          try { URL.revokeObjectURL(voice.lastNote.url) } catch (e) {}
         }
         let noteUrl = ''
-        try { noteUrl = URL.createObjectURL(blob) } catch (e) { /* ignore */ }
+        try { noteUrl = URL.createObjectURL(blob) } catch (e) {}
         voice.lastNote = { blob, url: noteUrl, mime: rec.mime, text: '' }
         voice.set({ phase: 'processing' })
-        try {
-          const out = await sendAudio(blob, rec.mime, mode)
+        const processTail = async () => {
           if (rec.cancelled || voice.activeOpId !== opId || voice.phase === 'idle') return
-          if (out.command) { runSessionCommand(out.command); return }
-          const text = out.text || ''
-          const action = out.action || null
-          if (!text && !action) { voice.set({ phase: 'error', error: t('nothingHeard') }); return }
-
-          if (voice.settings.structuredPromptVoice !== false && text) {
-            const promptInfo = findActiveStructuredPrompt()
-            if (promptInfo && submitToStructuredPrompt(text, promptInfo)) {
-              voice.set({ phase: 'idle' })
+          try {
+            const out = await sendAudio(blob, rec.mime, mode)
+            if (rec.cancelled || voice.activeOpId !== opId || voice.phase === 'idle') return
+            if (out.command) { runSessionCommand(out.command); return }
+            const text = out.text || ''
+            const action = out.action || null
+            if (!text && !action) {
+              if (mode === 'message') voice.set({ phase: 'error', error: t('nothingHeard') })
+              else voice.set({ phase: 'idle' })
               return
             }
-          }
-
-          if (action === 'send') {
-            if (text) appendDraft(text)
-            submitPending()
-            return
-          }
-          if (action === 'cancel') {
-            cancelCurrent()
-            return
-          }
-          if (action === 'clear') {
-            if (voice.inputActions && typeof voice.inputActions.clear === 'function') {
-              voice.inputActions.clear()
+            if (voice.settings.structuredPromptVoice !== false && text) {
+              const promptInfo = findActiveStructuredPrompt()
+              if (promptInfo && submitToStructuredPrompt(text, promptInfo)) {
+                voice.set({ phase: 'idle' })
+                return
+              }
             }
-            voice.set({ phase: 'idle' })
-            return
-          }
-
-          appendDraft(text)
-          if (voice.lastNote) voice.lastNote.text = text
-          if (mode === 'message') {
-            voice.set({ phase: 'pending', pending: { text: text, totalMs: voice.settings.autoSendMs, leftMs: voice.settings.autoSendMs, audioUrl: noteUrl } })
-          } else {
-            voice.set({ phase: 'idle' })
+            if (action === 'send' || action === 'clear' || action === 'newline') {
+              executeVoiceAction(action, text)
+              return
+            }
+            if (action === 'cancel') { cancelCurrent(); return }
+            appendDraft(text)
+            if (voice.lastNote) voice.lastNote.text = text
+            if (mode === 'message') {
+              voice.set({ phase: 'pending', pending: { text, totalMs: voice.settings.autoSendMs, leftMs: voice.settings.autoSendMs, audioUrl: noteUrl } })
+            } else {
+              voice.set({ phase: 'idle' })
+            }
+          } catch (e) {
+            if (rec.cancelled || voice.activeOpId !== opId || voice.phase === 'idle') return
+            voice.set({ phase: 'error', error: String(e && e.message ? e.message : e) })
           }
-        } catch (e) {
-          if (rec.cancelled || voice.activeOpId !== opId || voice.phase === 'idle') return
-          voice.set({ phase: 'error', error: String(e && e.message ? e.message : e) })
+        }
+        if (mode === 'dictation') {
+          dictationQueue = dictationQueue.then(processTail)
+          try { await dictationQueue } catch (_) {}
+        } else {
+          await processTail()
         }
       })
     }
-
+    function clearDraft() {
+      const actions = voice.inputActions
+      if (!actions || typeof actions.setDraft !== 'function') {
+        voice.set({ phase: 'error', error: t('composerUnavailable') })
+        return false
+      }
+      actions.setDraft('')
+      return true
+    }
+    function executeVoiceAction(action, text) {
+      if (action === 'send') {
+        if (text) appendDraft(text)
+        submitPending()
+        return true
+      }
+      if (action === 'clear') {
+        const ok = clearDraft()
+        if (ok && voice.phase !== 'recording') voice.set({ phase: 'idle' })
+        return ok
+      }
+      if (action === 'newline') {
+        const payload = text ? (text.endsWith('\n') ? text : text + '\n') : '\n'
+        appendDraft(payload)
+        if (voice.phase !== 'recording') voice.set({ phase: 'idle' })
+        return true
+      }
+      if (action === 'cancel') { cancelCurrent(); return true }
+      return false
+    }
+    voice.executeVoiceAction = executeVoiceAction
     function submitPending() {
       voice.pending = null
-      voice.set({ phase: 'idle' })
       const actions = voice.inputActions
-      if (!actions || typeof actions.submit !== 'function') return
-      // Polish the whole draft before submit (#46). Errors do not block.
+      if (!actions || typeof actions.submit !== 'function') {
+        voice.set({ phase: 'error', error: t('composerUnavailable') })
+        return
+      }
+      voice.set({ phase: 'idle' })
       if (voice.settings.polishSend) {
         const run = async () => {
           try {
@@ -1467,36 +1557,23 @@ window.__ModuleLoader__.load({
       }
       setTimeout(() => { try { actions.submit() } catch (e) { /* composer busy */ } }, 0)
     }
-
-    // Session voice commands (#48): clean "send/cancel/stop/continue".
     function runSessionCommand(cmd) {
       const actions = voice.inputActions
       voice.set({ phase: 'idle', pending: null })
-      switch (cmd) {
-        case 'send':
-        case 'continue':
-          if (actions && typeof actions.submit === 'function') actions.submit()
-          break
-        case 'cancel':
-        case 'stop':
-          // Clear wait/recording; leave the draft text intentionally untouched.
-          break
-        default:
-          break
+      if ((cmd === 'send' || cmd === 'continue') && actions && typeof actions.submit === 'function') {
+        actions.submit()
       }
     }
-
     function keepPending() {
       voice.pending = null
       voice.set({ phase: 'idle' })
     }
-
     // ----------------------------------------------------------- components
     function VoiceButtons(props) {
       const v = useVoice()
       voice.inputActions = props.inputActions
       voice.input = props.input
-      if (v.phase !== 'idle' && v.phase !== 'error') return null
+      if (v.phase !== 'idle' && v.phase !== 'error' && !hold.armed) return null
       const err = v.phase === 'error'
       const hk = voice.hotkey ? ` (${voice.hotkey})` : ''
       return React.createElement(React.Fragment, null,
@@ -1507,13 +1584,17 @@ window.__ModuleLoader__.load({
           onClick: startDictation,
         }, micIcon()),
         React.createElement('button', {
-          type: 'button', className: 'dvo-btn', 'data-err': err ? '1' : '0',
+          type: 'button', className: 'dvo-btn' + (hold.armed ? ' dvo-btn-active' : ''), 'data-err': err ? '1' : '0',
           title: err ? v.error : (t('messageBtn') + hk),
           'aria-label': err ? v.error : (t('messageBtn') + hk),
-          // Hold: record while pressed; leaving the control cancels.
-          onPointerDown: (e) => { e.preventDefault(); beginHold('message') },
+          onPointerDown: (e) => { e.preventDefault(); beginHold('message', e) },
           onPointerUp: () => endHold(false),
-          onPointerLeave: () => { if (hold.armed) endHold(true) },
+          onPointerCancel: () => endHold(true),
+          onPointerLeave: (e) => {
+            if (hold.armed && (!e.target || typeof e.target.hasPointerCapture !== 'function' || !e.target.hasPointerCapture(e.pointerId))) {
+              endHold(true)
+            }
+          },
         }, waveIcon()),
         voice.lastNote && voice.lastNote.url
           ? React.createElement('button', {
@@ -2066,34 +2147,42 @@ window.__ModuleLoader__.load({
       if (key) return t(key)
       return MODEL_HINT_STATIC[provider] || ''
     }
-    const LANGS = ['auto', 'ru', 'en', 'uk', 'de']
+    const SUPPORTED_LANGS = [
+      { code: '', labelKey: 'langAuto', defaultLabel: 'auto' },
+      { code: 'ru', labelKey: 'langRu', defaultLabel: 'ru' },
+      { code: 'en', labelKey: 'langEn', defaultLabel: 'en' },
+      { code: 'zh', labelKey: 'langZh', defaultLabel: 'zh' },
+      { code: 'uk', labelKey: 'langUk', defaultLabel: 'uk' },
+      { code: 'de', labelKey: 'langDe', defaultLabel: 'de' },
+    ]
+    const LANGS = SUPPORTED_LANGS.map((o) => o.code)
 
     const SET_CSS =
-      '.cb-page{display:flex;flex-direction:column;gap:18px;padding:4px 0 24px;max-width:960px}' +
-      '.cb-section-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;padding:16px 18px;display:flex;flex-direction:column;gap:12px}' +
-      '.cb-section-title{font-size:15px;font-weight:600;color:var(--dsw-alias-label-primary);display:flex;align-items:center;justify-content:space-between}' +
-      '.cb-section-desc{font-size:13px;color:var(--dsw-alias-label-secondary);margin-top:-4px;line-height:1.4}' +
-      '.cb-row{display:flex;flex-wrap:wrap;gap:10px;align-items:center}' +
-      '.cb-grid-2{display:grid;grid-template-columns:repeat(auto-fit, minmax(260px, 1fr));gap:12px}' +
-      '.cb-badge{font-size:11px;padding:2px 8px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);display:inline-flex;align-items:center;gap:4px;font-weight:500}' +
-      '.cb-badge-ok{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary);background:color-mix(in srgb, var(--dsw-alias-state-success-primary) 8%, transparent)}' +
-      '.cb-badge-warn{border-color:var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-state-warning-primary);background:color-mix(in srgb, var(--dsw-alias-state-warning-primary) 8%, transparent)}' +
-      '.cb-badge-bad{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 8%, transparent)}' +
-      '.cb-input{height:34px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 10px;font-size:13px;box-sizing:border-box}' +
-      '.cb-input:focus{outline:none;border-color:var(--dsw-alias-state-brand-primary)}' +
-      '.cb-btn{appearance:none;font:inherit;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:6px 12px;font-size:13px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);font-weight:500;display:inline-flex;align-items:center;justify-content:center;gap:6px;transition:all .15s ease}' +
-      '.cb-btn:hover:not(:disabled){background:var(--dsw-alias-bg-layer-4, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2))}' +
-      '.cb-btn-primary{background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-layer-3);border-color:transparent}' +
-      '.cb-btn-primary:hover:not(:disabled){background:var(--dsw-alias-label-primary) !important;color:var(--dsw-alias-bg-layer-3) !important;opacity:0.88}' +
-      '.cb-btn-danger{color:var(--dsw-alias-state-error-primary);border-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 30%, transparent)}' +
-      '.cb-btn-mini{border:1px solid var(--dsw-alias-border-l2);background:transparent;color:var(--dsw-alias-label-primary);border-radius:6px;width:28px;height:28px;cursor:pointer;flex:none;display:inline-flex;align-items:center;justify-content:center;padding:0;font-size:13px}' +
-      '.cb-btn-mini:hover:not(:disabled){background:var(--dsw-alias-bg-layer-2)}' +
-      '.cb-field{display:flex;flex-direction:column;gap:6px;padding:6px 0;font-size:13px;color:var(--dsw-alias-label-primary)}' +
-      '.cb-field select,.cb-field input[type="text"],.cb-field input[type="number"],.cb-field textarea{height:34px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 10px;font-size:13px;box-sizing:border-box}' +
-      '.cb-field textarea{height:auto;padding:8px 10px;font-family:inherit}' +
-      '.cb-check-label{display:flex;align-items:center;gap:8px;cursor:pointer;font-size:13px;color:var(--dsw-alias-label-primary);user-select:none}' +
-      '.cb-check-label input[type="checkbox"]{width:16px;height:16px;cursor:pointer}' +
-      '.cb-alert-err{padding:10px 14px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 10%, transparent);color:var(--dsw-alias-state-error-primary);font-size:13px}' +
+      '.dvo-settings-root.cb-page,.dvo-settings-root .cb-page{display:flex;flex-direction:column;gap:18px;padding:4px 0 24px;max-width:960px}' +
+      '.dvo-settings-root .cb-section-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;padding:16px 18px;display:flex;flex-direction:column;gap:12px}' +
+      '.dvo-settings-root .cb-section-title{font-size:15px;font-weight:600;color:var(--dsw-alias-label-primary);display:flex;align-items:center;justify-content:space-between}' +
+      '.dvo-settings-root .cb-section-desc{font-size:13px;color:var(--dsw-alias-label-secondary);margin-top:-4px;line-height:1.4}' +
+      '.dvo-settings-root .cb-row{display:flex;flex-wrap:wrap;gap:10px;align-items:center}' +
+      '.dvo-settings-root .cb-grid-2{display:grid;grid-template-columns:repeat(auto-fit, minmax(260px, 1fr));gap:12px}' +
+      '.dvo-settings-root .cb-badge{font-size:11px;padding:2px 8px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);display:inline-flex;align-items:center;gap:4px;font-weight:500}' +
+      '.dvo-settings-root .cb-badge-ok{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary);background:color-mix(in srgb, var(--dsw-alias-state-success-primary) 8%, transparent)}' +
+      '.dvo-settings-root .cb-badge-warn{border-color:var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-state-warning-primary);background:color-mix(in srgb, var(--dsw-alias-state-warning-primary) 8%, transparent)}' +
+      '.dvo-settings-root .cb-badge-bad,.dvo-settings-root .cb-badge-err{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 8%, transparent)}' +
+      '.dvo-settings-root .cb-input{height:34px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 10px;font-size:13px;box-sizing:border-box}' +
+      '.dvo-settings-root .cb-input:focus{outline:none;border-color:var(--dsw-alias-state-brand-primary)}' +
+      '.dvo-settings-root .cb-btn{appearance:none;font:inherit;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:6px 12px;font-size:13px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);font-weight:500;display:inline-flex;align-items:center;justify-content:center;gap:6px;transition:all .15s ease}' +
+      '.dvo-settings-root .cb-btn:hover:not(:disabled){background:var(--dsw-alias-bg-layer-4, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2))}' +
+      '.dvo-settings-root .cb-btn-primary{background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-layer-3);border-color:transparent}' +
+      '.dvo-settings-root .cb-btn-primary:hover:not(:disabled){background:var(--dsw-alias-label-primary) !important;color:var(--dsw-alias-bg-layer-3) !important;opacity:0.88}' +
+      '.dvo-settings-root .cb-btn-danger{color:var(--dsw-alias-state-error-primary);border-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 30%, transparent)}' +
+      '.dvo-settings-root .cb-btn-mini{border:1px solid var(--dsw-alias-border-l2);background:transparent;color:var(--dsw-alias-label-primary);border-radius:6px;width:28px;height:28px;cursor:pointer;flex:none;display:inline-flex;align-items:center;justify-content:center;padding:0;font-size:13px}' +
+      '.dvo-settings-root .cb-btn-mini:hover:not(:disabled){background:var(--dsw-alias-bg-layer-2)}' +
+      '.dvo-settings-root .cb-field{display:flex;flex-direction:column;gap:6px;padding:6px 0;font-size:13px;color:var(--dsw-alias-label-primary)}' +
+      '.dvo-settings-root .cb-field select,.dvo-settings-root .cb-field input[type="text"],.dvo-settings-root .cb-field input[type="number"],.dvo-settings-root .cb-field textarea{height:34px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 10px;font-size:13px;box-sizing:border-box}' +
+      '.dvo-settings-root .cb-field textarea{height:auto;padding:8px 10px;font-family:inherit}' +
+      '.dvo-settings-root .cb-check-label{display:flex;align-items:center;gap:8px;cursor:pointer;font-size:13px;color:var(--dsw-alias-label-primary);user-select:none}' +
+      '.dvo-settings-root .cb-check-label input[type="checkbox"]{width:16px;height:16px;cursor:pointer}' +
+      '.dvo-settings-root .cb-alert-err{padding:10px 14px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 10%, transparent);color:var(--dsw-alias-state-error-primary);font-size:13px}' +
       '.dvs-wrap{display:flex;flex-direction:column;gap:18px;padding:4px 0;max-width:960px}' +
       '.dvs-block{display:flex;flex-direction:column;gap:10px}' +
       '.dvs-h{font-size:14px;font-weight:600;color:var(--dsw-alias-label-primary)}' +
@@ -2115,12 +2204,19 @@ window.__ModuleLoader__.load({
       '.dvo-pcardOpen .dvo-pchev{transform:rotate(180deg)}' +
       '.dvo-pbody{border-top:1px solid var(--dsw-alias-border-l2);margin:0 16px;padding-bottom:12px}'
     const setCssId = 'dsh-voice/settings.module.css'
-    if (typeof document !== 'undefined' && !document.querySelector('style[data-dsh-plugin="dsh-voice"][data-plugin-css="' + setCssId + '"]')) {
-      const tag = document.createElement('style')
-      tag.textContent = SET_CSS
-      tag.setAttribute('data-dsh-plugin', 'dsh-voice')
-      tag.dataset.pluginCss = setCssId
-      document.head.appendChild(tag)
+    function installSettingsCss() {
+      if (typeof document === 'undefined') return () => {}
+      let tag = document.querySelector('style[data-dsh-plugin="dsh-voice"][data-plugin-css="' + setCssId + '"]')
+      if (!tag) {
+        tag = document.createElement('style')
+        tag.textContent = SET_CSS
+        tag.setAttribute('data-dsh-plugin', 'dsh-voice')
+        tag.dataset.pluginCss = setCssId
+        document.head.appendChild(tag)
+      }
+      return () => {
+        if (tag && tag.parentNode) tag.parentNode.removeChild(tag)
+      }
     }
 
         function createErrorBoundary() {
@@ -2633,8 +2729,12 @@ window.__ModuleLoader__.load({
           if (!res.ok) throw new Error(`HTTP ${res.status}`)
           const data = await res.json()
           setUpdaterStatus(data)
+          if (data && data.latestCheckFailed) {
+            setUpdaterMsg(t('updateCheckFailed'))
+          }
         } catch (e) {
-          /* best effort update check */
+          setUpdaterStatus(null)
+          setUpdaterMsg(t('updateCheckFailed') + ': ' + (e?.message || String(e)))
         } finally {
           setUpdaterLoading(false)
         }
@@ -2816,16 +2916,24 @@ window.__ModuleLoader__.load({
         ),
         React.createElement('div', { className: 'cb-section-desc' }, t('versionHint')),
         React.createElement('div', { className: 'cb-row', style: { alignItems: 'center', gap: '12px' } },
-          React.createElement('span', { className: 'cb-badge cb-badge-ok' },
-            'v' + ((updaterStatus && updaterStatus.currentVersion) || '0.9.6')
-          ),
-          updaterStatus && updaterStatus.updateAvailable
-            ? React.createElement('span', { className: 'cb-badge cb-badge-warn' },
-                t('updateAvailable') + ': v' + updaterStatus.latestVersion
-              )
-            : React.createElement('span', { className: 'cb-badge cb-badge-ok' },
-                t('upToDate')
-              ),
+          updaterStatus && updaterStatus.currentVersion
+            ? React.createElement('span', { className: 'cb-badge cb-badge-ok' }, 'v' + updaterStatus.currentVersion)
+            : null,
+          updaterLoading && (!updaterStatus || !updaterStatus.currentVersion)
+            ? React.createElement('span', { className: 'cb-badge' }, '⏳ ' + t('checkingUpdates'))
+            : !updaterStatus
+              ? React.createElement('span', { className: 'cb-badge cb-badge-warn' }, '❓ ' + t('updateStatusUnknown'))
+              : updaterStatus.updateAvailable
+                ? React.createElement('span', { className: 'cb-badge cb-badge-warn' },
+                    t('updateAvailable') + ': v' + updaterStatus.latestVersion
+                  )
+                : updaterStatus.latestCheckFailed
+                  ? React.createElement('span', { className: 'cb-badge cb-badge-warn' },
+                      '⚠️ ' + t('updateCheckFailed')
+                    )
+                  : React.createElement('span', { className: 'cb-badge cb-badge-ok' },
+                      t('upToDate')
+                    ),
           updaterStatus && updaterStatus.updateAvailable
             ? React.createElement('button', {
                 type: 'button', className: 'cb-btn cb-btn-primary', style: { fontSize: '12px', padding: '4px 10px' },
@@ -2865,6 +2973,7 @@ window.__ModuleLoader__.load({
       const [err, setErr] = React.useState('')
       const [serverConfig, setServerConfig] = React.useState(null)
       const [configLoading, setConfigLoading] = React.useState(true)
+      const [revision, setRevision] = React.useState(null)
 
       React.useEffect(() => {
         let alive = true
@@ -2873,6 +2982,7 @@ window.__ModuleLoader__.load({
           .then((data) => {
             if (alive && data && data.ok && data.config) {
               setServerConfig(data.config)
+              if (typeof data.revision === 'number') setRevision(data.revision)
               setDraft((curr) => curr || deepClone(data.config))
             }
           })
@@ -3041,14 +3151,15 @@ window.__ModuleLoader__.load({
           const res = await fetch('/dsh-voice/config', {
             method: 'PUT',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ config: draft }),
+            body: JSON.stringify({ config: draft, expectedRevision: (typeof revision === 'number' ? revision : undefined) }),
           })
           const data = await res.json()
           if (res.ok && data && data.ok) {
             httpOk = true
-            if (data.config) {
-              setServerConfig(data.config)
-            }
+            if (data.config) setServerConfig(data.config)
+            if (typeof data.revision === 'number') setRevision(data.revision)
+          } else if (res.status === 409) {
+            httpError = data?.error?.message || 'Settings conflict: parallel changes detected'
           } else {
             httpError = data?.error?.message || data?.error || res.statusText || 'Save failed'
           }
@@ -3056,7 +3167,7 @@ window.__ModuleLoader__.load({
           httpError = e?.message || String(e)
         }
 
-        if (scope && typeof scope.set === 'function') {
+        if (httpOk && scope && typeof scope.set === 'function') {
           for (const k of Object.keys(draft)) {
             try {
               await scope.set(k, draft[k])
@@ -3119,13 +3230,22 @@ window.__ModuleLoader__.load({
           .filter((k) => k && BUILTIN.indexOf(k) < 0),
       )
 
-      const langField = (mode) => React.createElement('div', { className: 'cb-field' },
-        React.createElement('label', null, t('language')),
-        React.createElement('select', {
-          value: modeVal(mode, 'language', 'ru'), disabled: !writable,
-          onChange: (e) => setIn(mode, 'language', e.target.value),
-        }, LANGS.map((o) => React.createElement('option', { key: o, value: o }, o))),
-      )
+      const langField = (mode) => {
+        const val = modeVal(mode, 'language', '')
+        const opts = SUPPORTED_LANGS.slice()
+        if (val && !opts.some((o) => o.code === val)) {
+          opts.push({ code: val, labelKey: val, defaultLabel: val })
+        }
+        return React.createElement('div', { className: 'cb-field' },
+          React.createElement('label', null, t('language')),
+          React.createElement('select', {
+            value: val, disabled: !writable,
+            onChange: (e) => setIn(mode, 'language', e.target.value),
+          }, opts.map((o) => React.createElement('option', { key: o.code || 'auto', value: o.code },
+            t(o.labelKey) !== o.labelKey ? t(o.labelKey) : o.defaultLabel
+          ))),
+        )
+      }
 
       const numField = (mode, key, label, hint) => React.createElement('div', { className: 'cb-field' },
         React.createElement('label', null, label),
@@ -3142,7 +3262,7 @@ window.__ModuleLoader__.load({
       const whisperRunning = !!(statusData && statusData.whisperRunning)
       const providerCount = (statusData && Array.isArray(statusData.providers)) ? statusData.providers.length : chainOptions.length
 
-      return React.createElement('div', { className: 'cb-page' },
+      return React.createElement('div', { className: 'cb-page dvo-settings-root' },
         // 1. Connection & Engine Status Card
         React.createElement(ConnectionStatusCard, {
           t: t,
@@ -3418,13 +3538,14 @@ window.__ModuleLoader__.load({
             ),
             React.createElement('span', { className: 'dvo-pchev' }, chevronIcon()),
           ),
-          (page || open) ? React.createElement('div', { className: 'dvo-pbody' }, React.createElement(VoiceSection, props)) : null,
+          (page || open) ? React.createElement('div', { className: 'dvo-pbody dvo-settings-root' }, React.createElement(VoiceSection, props)) : null,
         ),
       )
     }
 
     function registerSettings(ctx) {
       ctx.effect(() => {
+        const offCss = installSettingsCss()
         const offItem = ctx.slots.inject('plugins.item', () => ctx.slots.register(
           {
             name: 'plugins.item',
@@ -3455,6 +3576,7 @@ window.__ModuleLoader__.load({
           PluginCard,
         ))
         return () => {
+          if (typeof offCss === 'function') offCss()
           if (typeof offItem === 'function') offItem()
           if (typeof offRow === 'function') offRow()
           if (typeof offLegacy === 'function') offLegacy()
@@ -3478,6 +3600,9 @@ window.__ModuleLoader__.load({
         const undo = [addLocale('en', en), addLocale('zh', zh)]
         return () => { for (const off of undo) off() }
       }, 'dsh-voice: locale dictionaries')
+      ctx.effect(() => {
+        return registerGlobalLifecycle()
+      }, 'dsh-voice: global lifecycle')
       moduleT = ctx.locale.bind(NS)
       registerComposer(ctx)
       registerSettings(ctx)

package/lib/config-routes.js

@@ -27,9 +27,14 @@ export function registerConfigRoutes(ctx, {
         return
       }
 
-      // 3. GET: return live configuration snapshot
+      // 3. GET: return live configuration snapshot with revision
       if (req.method === 'GET') {
-        writeJson(res, 200, { ok: true, config: live() })
+        let rev
+        try {
+          const settingsService = getSettingsService?.()
+          rev = settingsService?.describe?.()?.find?.((r) => r.ns === NS)?.revision
+        } catch { /* ignore revision lookup errors */ }
+        writeJson(res, 200, { ok: true, config: live(), revision: rev })
         return
       }
 
@@ -62,6 +67,9 @@ export function registerConfigRoutes(ctx, {
       const rawConfig = payload && typeof payload.config === 'object' && payload.config !== null
         ? payload.config
         : payload
+      const expectedRevision = (typeof payload?.expectedRevision === 'number')
+        ? payload.expectedRevision
+        : ((typeof payload?.revision === 'number') ? payload.revision : undefined)
 
       if (!rawConfig || typeof rawConfig !== 'object' || Array.isArray(rawConfig)) {
         writeJson(res, 400, { ok: false, error: { code: 'body', message: 'body must be a JSON object' } })
@@ -88,21 +96,35 @@ export function registerConfigRoutes(ctx, {
       try {
         let saved = false
         if (settingsService) {
-          let rev
+          let currentRev
           try {
-            rev = settingsService.describe?.()?.find?.((r) => r.ns === NS)?.revision
+            currentRev = settingsService.describe?.()?.find?.((r) => r.ns === NS)?.revision
           } catch { /* ignore revision lookup errors */ }
 
+          if (typeof expectedRevision === 'number' && typeof currentRev === 'number' && expectedRevision !== currentRev) {
+            writeJson(res, 409, {
+              ok: false,
+              error: {
+                code: 'conflict',
+                message: `Settings revision conflict: expected ${expectedRevision}, current is ${currentRev}`,
+                currentRevision: currentRev,
+              },
+            })
+            return
+          }
+
+          const targetRev = (typeof expectedRevision === 'number') ? expectedRevision : currentRev
+
           if (typeof settingsService.replace === 'function') {
-            await settingsService.replace(NS, merged, rev)
+            await settingsService.replace(NS, merged, targetRev)
             saved = true
           } else if (typeof settingsService.update === 'function') {
-            await settingsService.update(NS, merged, rev)
+            await settingsService.update(NS, merged, targetRev)
             saved = true
           }
         }
 
-        if (scope) {
+        if (!saved && scope) {
           if (typeof scope.replace === 'function') {
             await scope.replace(merged)
             saved = true
@@ -110,10 +132,11 @@ export function registerConfigRoutes(ctx, {
             await scope.patch(merged)
             saved = true
           } else if (typeof scope.set === 'function') {
-            for (const [k, v] of Object.entries(merged)) {
-              await scope.set(k, v).catch(() => {})
+            const entries = Object.entries(merged)
+            for (const [k, v] of entries) {
+              await scope.set(k, v)
             }
-            saved = true
+            if (entries.length > 0) saved = true
           }
         }
 
@@ -126,7 +149,11 @@ export function registerConfigRoutes(ctx, {
           triggerAutostart()
         }
 
-        writeJson(res, 200, { ok: true, config: live() })
+        let newRev
+        try {
+          newRev = settingsService?.describe?.()?.find?.((r) => r.ns === NS)?.revision
+        } catch {}
+        writeJson(res, 200, { ok: true, config: live(), revision: newRev })
       } catch (err) {
         writeJson(res, 500, { ok: false, error: { code: 'save', message: String(err?.message || err) } })
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-voice",
-  "version": "0.9.10",
+  "version": "0.9.12",
   "description": "Voice input for DeepSeek Harness: dictation chunked by pauses and voice messages, each with its own provider fallback chain (Deepgram, Groq, HuggingFace, local whisper.cpp, plus any OpenAI-compatible API of your own).",
   "license": "MIT",
   "type": "module",