@goodandready/dsh-voice 0.9.18 → 0.9.20

package/lib/client.js

@@ -884,11 +884,23 @@ window.__ModuleLoader__.load({
       const span = target && target.span
       if (span) {
         if (typeof span.insert === 'function') {
-          try { span.insert(text); return true } catch (_) {}
+          try {
+            const r = span.insert(text)
+            if (r !== false) return true
+            return false
+          } catch (_) {}
         } else if (typeof span.insertText === 'function') {
-          try { span.insertText(text); return true } catch (_) {}
+          try {
+            const r = span.insertText(text)
+            if (r !== false) return true
+            return false
+          } catch (_) {}
         } else if (typeof span === 'function') {
-          try { span(text); return true } catch (_) {}
+          try {
+            const r = span(text)
+            if (r !== false) return true
+            return false
+          } catch (_) {}
         }
       }
       const actions = (target && target.actions) || voice.inputActions
@@ -898,13 +910,28 @@ window.__ModuleLoader__.load({
         return false
       }
       if (typeof actions.insertText === 'function') {
-        try { actions.insertText(text); return true } catch (_) {}
+        try {
+          const res = actions.insertText(text, span)
+          if (res !== false) {
+            if (target && typeof actions.captureInsertion === 'function') {
+              try { target.span = actions.captureInsertion() } catch (_) {}
+            }
+            return true
+          }
+          return false
+        } catch (_) {
+          return false
+        }
       }
       const draft = input && typeof input.draft === 'string' ? input.draft : ''
       const before = draft
       const sep = (!draft || draft.endsWith('\n') || text.startsWith('\n')) ? '' : ' '
       const after = draft + sep + text
-      actions.setDraft(after)
+      try {
+        actions.setDraft(after)
+      } catch (_) {
+        return false
+      }
       const limit = Number(voice.settings.historyLimit)
       if (limit > 0) {
         insertHistory.push({ before, added: sep + text, after })
@@ -914,10 +941,10 @@ window.__ModuleLoader__.load({
     }
 
     function appendDraft(text, target) {
-      if (voice.disposed || !text) return
+      if (voice.disposed || !text) return false
       let clean = voice.settings.voiceCommands ? applyVoiceCommands(text) : tidyPhrase(text)
-      if (!clean) return
-      insertDraftText(clean, target)
+      if (!clean) return false
+      return insertDraftText(clean, target)
     }
 
     function announceVoice(phase) {
@@ -1291,7 +1318,7 @@ voice._chainsPromise = null
               }
             }
             if (action === 'send' || action === 'clear' || action === 'newline') {
-              executeVoiceAction(action, text)
+              executeVoiceAction(action, text, target)
               return
             }
             if (action === 'cancel') {
@@ -1300,8 +1327,12 @@ voice._chainsPromise = null
             }
             const delay = Number(voice.settings.sendDelayMs) || 0
             if (text && delay > 0 && !voice.holding) {
-              appendDraft(text, target)
-              voice.set({ phase: 'pending', pending: { text, undoOnly: true, leftMs: delay } })
+              const ok = appendDraft(text, target)
+              if (ok !== false) {
+                voice.set({ phase: 'pending', pending: { text, target, undoOnly: true, leftMs: delay } })
+              } else {
+                voice.set({ phase: 'idle' })
+              }
               return
             }
             if (text) appendDraft(text, target)
@@ -1464,8 +1495,12 @@ voice._chainsPromise = null
           voice.browserFinals = null
           if (!said) { voice.set({ phase: 'idle' }); return }
           if (mode === 'message') {
-            appendDraft(said, target)
-            voice.set({ phase: 'pending', pending: { text: said, leftMs: voice.settings.autoSendMs } })
+            const ok = appendDraft(said, target)
+            if (ok !== false) {
+              voice.set({ phase: 'pending', pending: { text: said, target, totalMs: voice.settings.autoSendMs, leftMs: voice.settings.autoSendMs } })
+            } else {
+              voice.set({ phase: 'idle' })
+            }
           } else {
             voice.set({ phase: 'idle' })
           }
@@ -1525,14 +1560,18 @@ voice._chainsPromise = null
               }
             }
             if (action === 'send' || action === 'clear' || action === 'newline') {
-              executeVoiceAction(action, text)
+              executeVoiceAction(action, text, target)
               return
             }
             if (action === 'cancel') { cancelCurrent(); return }
-            appendDraft(text, target)
+            const ok = appendDraft(text, target)
             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 } })
+              if (ok !== false) {
+                voice.set({ phase: 'pending', pending: { text, target, totalMs: voice.settings.autoSendMs, leftMs: voice.settings.autoSendMs, audioUrl: noteUrl } })
+              } else {
+                voice.set({ phase: 'idle' })
+              }
             } else {
               voice.set({ phase: 'idle' })
             }
@@ -1549,26 +1588,29 @@ voice._chainsPromise = null
         }
       })
     }
-    function clearDraft() {
-      const actions = voice.inputActions
+    function clearDraft(target) {
+      const activeTarget = target || voice._activeTarget
+      const actions = (activeTarget && activeTarget.actions) || voice.inputActions
       if (actions && typeof actions.setDraft === 'function') actions.setDraft('')
     }
 
     // Voice actions (#29-7): spoken triggers perform composer actions.
-    function executeVoiceAction(action, rawText) {
+    function executeVoiceAction(action, rawText, target) {
+      const activeTarget = target || voice._activeTarget
+      const actions = (activeTarget && activeTarget.actions) || voice.inputActions
       if (action === 'send') {
         const text = rawText.replace(/(^|[\s,.!?])(отправь|пошли|send)([\s,.!?]|$)/gi, '').trim()
-        if (text) appendDraft(text)
-        if (typeof voice.inputActions?.submit === 'function') {
-          voice.inputActions.submit()
+        if (text) appendDraft(text, activeTarget)
+        if (typeof actions?.submit === 'function') {
+          actions.submit()
         }
         voice.set({ phase: 'idle' })
       } else if (action === 'clear') {
-        clearDraft()
+        clearDraft(activeTarget)
         voice.set({ phase: 'idle' })
       } else if (action === 'newline') {
         const payload = (rawText.replace(/(^|[\s,.!?])(с новой строки|новая строка|абзац|new line|paragraph)([\s,.!?]|$)/gi, '').trim())
-        appendDraft(payload)
+        appendDraft(payload, activeTarget)
         voice.set({ phase: 'idle' })
       }
     }
@@ -1577,7 +1619,8 @@ voice._chainsPromise = null
       const pending = voice.pending
       if (!pending) return
       const text = pending.text
-      const actions = voice.inputActions
+      const target = pending.target || voice._activeTarget
+      const actions = (target && target.actions) || voice.inputActions
       voice.pending = null
       voice.set({ phase: 'idle' })
 
@@ -3935,6 +3978,7 @@ voice._chainsPromise = null
       startRecording,
       cancelCurrent,
       stopCurrent,
+      submitPending,
       loadWebGpuWhisper,
     }
     return module.exports

package/lib/local-daemon.js

@@ -65,16 +65,45 @@ export function createLocalDaemons({ live, ctx }) {
         })
       }
       if (child && child.done && typeof child.done.then === 'function') {
-        child.done.then((res) => {
+        child.done.then(async (res) => {
+          let code = res && res.code
+          let detail = ''
+          if (typeof child.readOutput === 'function') {
+            try {
+              const out = child.readOutput()
+              if (out && out.stderr) detail = String(out.stderr).trim()
+              else if (out && out.stdout) detail = String(out.stdout).trim()
+            } catch (_) {}
+          } else if (typeof child.read === 'function') {
+            try {
+              const out = child.read()
+              if (out && out.stderr) detail = String(out.stderr).trim()
+            } catch (_) {}
+          }
+          if (typeof child.result === 'function') {
+            try {
+              const r = await child.result()
+              if (r) {
+                if (r.exitCode !== undefined && r.exitCode !== null) code = r.exitCode
+                if (r.stderr && !detail) detail = String(r.stderr).trim()
+              }
+            } catch (err) {
+              const msg = err && err.message ? err.message : String(err)
+              if (msg && !detail) detail = msg.trim()
+            }
+          } else if (child.result && typeof child.result === 'object') {
+            code = child.result.exitCode ?? code
+            if (child.result.stderr && !detail) detail = String(child.result.stderr).trim()
+          }
           if (child.status === 'killed') {
-            whisperError = 'whisper server process was killed'
+            whisperError = detail ? `whisper server process was killed: ${detail}` : 'whisper server process was killed'
           } else if (child.status === 'completed') {
-            const code = child.result?.exitCode ?? (res && res.code)
+            code = code ?? child.exitCode ?? 0
             if (code !== 0 && code !== null && code !== undefined) {
-              whisperError = `whisper server process exited with code ${code}`
+              whisperError = `whisper server process exited with code ${code}${detail ? `: ${detail}` : ''}`
             }
-          } else if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
-            whisperError = `whisper server process exited with code ${res.code}`
+          } else if (code !== 0 && code !== null && code !== undefined) {
+            whisperError = `whisper server process exited with code ${code}${detail ? `: ${detail}` : ''}`
           }
         }).catch((err) => {
           whisperError = err?.message || String(err)
@@ -91,21 +120,50 @@ export function createLocalDaemons({ live, ctx }) {
           return true
         }
         if (child) {
+          let detail = ''
+          if (typeof child.readOutput === 'function') {
+            try {
+              const out = child.readOutput()
+              if (out && out.stderr) detail = String(out.stderr).trim()
+              else if (out && out.stdout) detail = String(out.stdout).trim()
+            } catch (_) {}
+          } else if (typeof child.read === 'function') {
+            try {
+              const out = child.read()
+              if (out && out.stderr) detail = String(out.stderr).trim()
+            } catch (_) {}
+          }
+          let code = child.exitCode
+          if (typeof child.result === 'function') {
+            try {
+              const r = await child.result()
+              if (r) {
+                if (r.exitCode !== undefined && r.exitCode !== null) code = r.exitCode
+                if (r.stderr && !detail) detail = String(r.stderr).trim()
+              }
+            } catch (err) {
+              const msg = err && err.message ? err.message : String(err)
+              if (msg && !detail) detail = msg.trim()
+            }
+          } else if (child.result && typeof child.result === 'object') {
+            code = child.result.exitCode ?? code
+            if (child.result.stderr && !detail) detail = String(child.result.stderr).trim()
+          }
           if (child.status === 'killed') {
-            whisperError = 'whisper server process was killed'
+            whisperError = detail ? `whisper server process was killed: ${detail}` : 'whisper server process was killed'
             return false
           }
           if (child.status === 'completed') {
-            const code = child.result?.exitCode ?? child.exitCode ?? 0
-            whisperError = `whisper server process exited prematurely with code ${code}`
+            code = code ?? 0
+            whisperError = `whisper server process exited prematurely with code ${code}${detail ? `: ${detail}` : ''}`
             return false
           }
           if (child.status === 'exited' || child.status === 'failed') {
-            whisperError = `whisper server process exited prematurely with status ${child.status}`
+            whisperError = `whisper server process exited prematurely with status ${child.status}${detail ? `: ${detail}` : ''}`
             return false
           }
           if (child.exitCode !== null && child.exitCode !== undefined) {
-            whisperError = `whisper server process exited prematurely with code ${child.exitCode}`
+            whisperError = `whisper server process exited prematurely with code ${child.exitCode}${detail ? `: ${detail}` : ''}`
             return false
           }
         }
@@ -183,16 +241,30 @@ export function createLocalDaemons({ live, ctx }) {
         })
       }
       if (sensevoiceChild && sensevoiceChild.done && typeof sensevoiceChild.done.then === 'function') {
-        sensevoiceChild.done.then((res) => {
+        sensevoiceChild.done.then(async (res) => {
+          let code = res && res.code
+          let detail = ''
+          if (typeof sensevoiceChild.result === 'function') {
+            try {
+              const r = await sensevoiceChild.result()
+              if (r) {
+                if (r.exitCode !== undefined && r.exitCode !== null) code = r.exitCode
+                if (r.stderr) detail = String(r.stderr).trim()
+              }
+            } catch (_) {}
+          } else if (sensevoiceChild.result && typeof sensevoiceChild.result === 'object') {
+            code = sensevoiceChild.result.exitCode ?? code
+            if (sensevoiceChild.result.stderr) detail = String(sensevoiceChild.result.stderr).trim()
+          }
           if (sensevoiceChild.status === 'killed') {
-            sensevoiceError = 'sensevoice process was killed'
+            sensevoiceError = detail ? `sensevoice process was killed: ${detail}` : 'sensevoice process was killed'
           } else if (sensevoiceChild.status === 'completed') {
-            const code = sensevoiceChild.result?.exitCode ?? (res && res.code)
+            code = code ?? sensevoiceChild.exitCode ?? 0
             if (code !== 0 && code !== null && code !== undefined) {
-              sensevoiceError = `sensevoice process exited with code ${code}`
+              sensevoiceError = `sensevoice process exited with code ${code}${detail ? `: ${detail}` : ''}`
             }
-          } else if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
-            sensevoiceError = `sensevoice process exited with code ${res.code}`
+          } else if (code !== 0 && code !== null && code !== undefined) {
+            sensevoiceError = `sensevoice process exited with code ${code}${detail ? `: ${detail}` : ''}`
           }
         }).catch((err) => {
           sensevoiceError = err?.message || String(err)
@@ -209,21 +281,50 @@ export function createLocalDaemons({ live, ctx }) {
           return true
         }
         if (sensevoiceChild) {
+          let detail = ''
+          if (typeof sensevoiceChild.readOutput === 'function') {
+            try {
+              const out = sensevoiceChild.readOutput()
+              if (out && out.stderr) detail = String(out.stderr).trim()
+              else if (out && out.stdout) detail = String(out.stdout).trim()
+            } catch (_) {}
+          } else if (typeof sensevoiceChild.read === 'function') {
+            try {
+              const out = sensevoiceChild.read()
+              if (out && out.stderr) detail = String(out.stderr).trim()
+            } catch (_) {}
+          }
+          let code = sensevoiceChild.exitCode
+          if (typeof sensevoiceChild.result === 'function') {
+            try {
+              const r = await sensevoiceChild.result()
+              if (r) {
+                if (r.exitCode !== undefined && r.exitCode !== null) code = r.exitCode
+                if (r.stderr && !detail) detail = String(r.stderr).trim()
+              }
+            } catch (err) {
+              const msg = err && err.message ? err.message : String(err)
+              if (msg && !detail) detail = msg.trim()
+            }
+          } else if (sensevoiceChild.result && typeof sensevoiceChild.result === 'object') {
+            code = sensevoiceChild.result.exitCode ?? code
+            if (sensevoiceChild.result.stderr && !detail) detail = String(sensevoiceChild.result.stderr).trim()
+          }
           if (sensevoiceChild.status === 'killed') {
-            sensevoiceError = 'sensevoice process was killed'
+            sensevoiceError = detail ? `sensevoice process was killed: ${detail}` : 'sensevoice process was killed'
             return false
           }
           if (sensevoiceChild.status === 'completed') {
-            const code = sensevoiceChild.result?.exitCode ?? sensevoiceChild.exitCode ?? 0
-            sensevoiceError = `sensevoice process exited prematurely with code ${code}`
+            code = code ?? 0
+            sensevoiceError = `sensevoice process exited prematurely with code ${code}${detail ? `: ${detail}` : ''}`
             return false
           }
           if (sensevoiceChild.status === 'exited' || sensevoiceChild.status === 'failed') {
-            sensevoiceError = `sensevoice process exited prematurely with status ${sensevoiceChild.status}`
+            sensevoiceError = `sensevoice process exited prematurely with status ${sensevoiceChild.status}${detail ? `: ${detail}` : ''}`
             return false
           }
           if (sensevoiceChild.exitCode !== null && sensevoiceChild.exitCode !== undefined) {
-            sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}`
+            sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}${detail ? `: ${detail}` : ''}`
             return false
           }
         }

package/lib/sensevoice-installer.js

@@ -232,16 +232,36 @@ export function registerSensevoiceInstaller(ctx, { liveConfig, isAlive, updateCo
 }
 
 export function buildSensevoiceArgs(cfg, port) {
-  const modelDir = cfg?.sensevoiceModel ? path.dirname(cfg.sensevoiceModel) : getDefaultModelDir()
-  const tokensPath = findTokensFile(modelDir)
+  let modelPath = String(cfg?.sensevoiceModel || '')
+  const modelDir = modelPath ? path.dirname(modelPath) : getDefaultModelDir()
+  const tokensPath = (cfg?.sensevoiceTokens && existsSync(cfg.sensevoiceTokens))
+    ? cfg.sensevoiceTokens
+    : findTokensFile(modelDir)
   const tokensArg = tokensPath ? ` --tokens=${JSON.stringify(tokensPath)}` : ''
   const rawProv = String(cfg?.sensevoiceProvider || '').trim().toLowerCase()
-  const normProv = rawProv === 'rknpu' ? 'rknn' : rawProv
+  let normProv = rawProv === 'rknpu' ? 'rknn' : rawProv
+
+  if (normProv === 'rknn') {
+    const ext = path.extname(modelPath).toLowerCase()
+    if (ext === '.onnx') {
+      const rknnCandidate = path.join(modelDir, path.basename(modelPath, ext) + '.rknn')
+      const defaultRknn = path.join(modelDir, 'model.rknn')
+      if (existsSync(rknnCandidate)) {
+        modelPath = rknnCandidate
+      } else if (existsSync(defaultRknn)) {
+        modelPath = defaultRknn
+      } else {
+        // Guard: ordinary ONNX model cannot be loaded by sherpa-onnx RKNN runtime (#221)
+        normProv = 'cpu'
+      }
+    }
+  }
+
   const provider = (normProv && normProv !== 'cpu')
     ? ` --provider=${normProv}`
     : ''
   const threads = Number(cfg?.sensevoiceThreads) || 4
-  return ` --sense-voice-model=${JSON.stringify(cfg?.sensevoiceModel || '')}`
+  return ` --sense-voice-model=${JSON.stringify(modelPath)}`
     + tokensArg
     + ` --port=${port} --num-threads=${threads}`
     + provider

package/lib/updater.js

@@ -2,7 +2,7 @@
 // Implements canonical DSH plugin-updater specification.
 
 import { spawn } from 'node:child_process';
-import { existsSync, readFileSync, unlinkSync, renameSync } from 'node:fs';
+import { existsSync, readFileSync, unlinkSync, statSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename, dirname, isAbsolute, resolve } from 'node:path';
@@ -202,18 +202,21 @@ export function checkProfileLock(profileDir) {
     if (isProcessAlive(pid)) {
       return { locked: true, pid };
     }
-    // Verify before unlinking: ensure the file content still holds the dead pid we read,
-    // using atomic rename coordinator so a successor's live lock is never deleted (#205).
+    // Stale lock: PID is not running.
+    // Verify before unlinking: re-check PID to ensure a concurrent live successor
+    // was not written during the check (#205).
     try {
-      const staleName = `${lockPath}.stale.${Date.now()}.${Math.random().toString(36).slice(2)}`;
-      renameSync(lockPath, staleName);
-      const renamedPid = readLockPid(staleName);
-      if (renamedPid === pid) {
-        try { unlinkSync(staleName); } catch {}
+      const p1 = readLockPid(lockPath);
+      if (p1 !== null && isProcessAlive(p1)) return { locked: true, pid: p1 };
+      const p2 = readLockPid(lockPath);
+      if (p2 !== null && isProcessAlive(p2)) return { locked: true, pid: p2 };
+      if (p1 === pid && p2 === pid) {
+        unlinkSync(lockPath);
         return { locked: false, cleanedStale: true };
       }
-      try { renameSync(staleName, lockPath); } catch {}
-      return { locked: true, pid: renamedPid };
+      if (p2 !== null && isProcessAlive(p2)) return { locked: true, pid: p2 };
+      if (p1 !== null && isProcessAlive(p1)) return { locked: true, pid: p1 };
+      return { locked: false };
     } catch {
       if (!existsSync(lockPath)) return { locked: false };
       const currentPid = readLockPid(lockPath);
@@ -223,7 +226,17 @@ export function checkProfileLock(profileDir) {
       return { locked: false };
     }
   }
-  return { locked: true, pid: null };
+  // Lockfile without valid PID: check age (> 10 min)
+  try {
+    const stat = statSync(lockPath);
+    if (Date.now() - stat.mtimeMs > 10 * 60_000) {
+      try { unlinkSync(lockPath); } catch {}
+      return { locked: false, cleanedStale: true };
+    }
+    return { locked: true, pid: null };
+  } catch {
+    return { locked: false };
+  }
 }
 
 async function installExact(target, packageSpec, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-voice",
-  "version": "0.9.18",
+  "version": "0.9.20",
   "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",