@goodandready/dsh-voice 0.9.17 → 0.9.19

package/lib/local-daemon.js

@@ -6,6 +6,7 @@ export function createLocalDaemons({ live, ctx }) {
   let child = null
   let whisperError = null
   let startingWhisper = false
+  let disposed = false
 
   async function whisperAlive() {
     const rawUrl = String(live().whisperUrl || '').trim()
@@ -20,7 +21,7 @@ export function createLocalDaemons({ live, ctx }) {
   }
 
   async function startWhisper() {
-    if (startingWhisper) return false
+    if (startingWhisper || disposed) return false
     startingWhisper = true
     try {
       const cfg = live()
@@ -36,15 +37,21 @@ export function createLocalDaemons({ live, ctx }) {
       }
       const command = `${JSON.stringify(cfg.whisperBin)} -m ${JSON.stringify(cfg.whisperModel)}`
         + ` --host 127.0.0.1 --port 8001 -t 8 -p 1 -l ${isAutoLang(cfg.dictation.language) ? 'auto' : cfg.dictation.language}`
-      const specOpts = { command, timeoutMs: 0, stdoutMaxBytes: 4 * 1024 * 1024 }
+      const specOpts = { command, onExpiry: 'none', timeoutMs: 0, stdoutMaxBytes: 4 * 1024 * 1024 }
       const spec = typeof ctx.shell?.resolve === 'function' ? ctx.shell.resolve(specOpts) : specOpts
 
       if (typeof ctx.shell?.execute === 'function') {
         child = await ctx.shell.execute(spec)
       } else if (typeof ctx.shell?.start === 'function') {
         child = await ctx.shell.start(spec)
-      } else {
-        child = null
+      }
+
+      if (disposed) {
+        if (child && typeof child.kill === 'function') {
+          try { child.kill() } catch { /* ignore */ }
+          child = null
+        }
+        return false
       }
 
       if (child && typeof child.on === 'function') {
@@ -58,9 +65,30 @@ export function createLocalDaemons({ live, ctx }) {
         })
       }
       if (child && child.done && typeof child.done.then === 'function') {
-        child.done.then((res) => {
-          if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
-            whisperError = `whisper server process exited with code ${res.code}`
+        child.done.then(async (res) => {
+          let code = res && res.code
+          let detail = ''
+          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 = String(r.stderr).trim()
+              }
+            } catch (_) {}
+          } else if (child.result && typeof child.result === 'object') {
+            code = child.result.exitCode ?? code
+            if (child.result.stderr) detail = String(child.result.stderr).trim()
+          }
+          if (child.status === 'killed') {
+            whisperError = detail ? `whisper server process was killed: ${detail}` : 'whisper server process was killed'
+          } else if (child.status === 'completed') {
+            code = code ?? child.exitCode ?? 0
+            if (code !== 0 && code !== null && code !== undefined) {
+              whisperError = `whisper server process exited with code ${code}${detail ? `: ${detail}` : ''}`
+            }
+          } 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)
@@ -69,18 +97,51 @@ export function createLocalDaemons({ live, ctx }) {
 
       // Wait for it to become healthy (up to 30s for cold model loading on Metal/CPU).
       for (let i = 0; i < 60; i++) {
+        if (disposed) return false
         await new Promise((r) => setTimeout(r, 500))
+        if (disposed) return false
         if (await whisperAlive()) {
           whisperError = null
           return true
         }
-        if (child && child.exitCode !== null && child.exitCode !== undefined) {
-          whisperError = `whisper server process exited prematurely with code ${child.exitCode}`
-          return false
-        }
-        if (child && (child.status === 'exited' || child.status === 'failed')) {
-          whisperError = `whisper server process exited prematurely with status ${child.status}`
-          return false
+        if (child) {
+          let detail = ''
+          if (typeof child.read === 'function') {
+            try {
+              const out = child.read()
+              if (out && out.stderr) detail = String(out.stderr).trim()
+            } catch (_) {}
+          }
+          if (child.status === 'killed') {
+            whisperError = detail ? `whisper server process was killed: ${detail}` : 'whisper server process was killed'
+            return false
+          }
+          if (child.status === 'completed') {
+            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 (_) {}
+            } else if (child.result && typeof child.result === 'object') {
+              code = child.result.exitCode ?? code
+              if (child.result.stderr && !detail) detail = String(child.result.stderr).trim()
+            }
+            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}${detail ? `: ${detail}` : ''}`
+            return false
+          }
+          if (child.exitCode !== null && child.exitCode !== undefined) {
+            whisperError = `whisper server process exited prematurely with code ${child.exitCode}${detail ? `: ${detail}` : ''}`
+            return false
+          }
         }
       }
       whisperError = 'whisper server process started but failed health check on port 8001'
@@ -110,7 +171,7 @@ export function createLocalDaemons({ live, ctx }) {
   }
 
   async function startSensevoice() {
-    if (startingSensevoice) return false
+    if (startingSensevoice || disposed) return false
     startingSensevoice = true
     try {
       const cfg = live()
@@ -128,15 +189,21 @@ export function createLocalDaemons({ live, ctx }) {
       try { port = new URL(cfg.sensevoiceUrl).port || '6006' } catch { /* invalid URL */ }
       const cmdArgs = buildSensevoiceArgs(cfg, port)
       const commandStr = `${JSON.stringify(cfg.sensevoiceBin)}${cmdArgs}`
-      const specOpts = { command: commandStr, timeoutMs: 0, stdoutMaxBytes: 4 * 1024 * 1024 }
+      const specOpts = { command: commandStr, onExpiry: 'none', timeoutMs: 0, stdoutMaxBytes: 4 * 1024 * 1024 }
       const spec = typeof ctx.shell?.resolve === 'function' ? ctx.shell.resolve(specOpts) : specOpts
 
       if (typeof ctx.shell?.execute === 'function') {
         sensevoiceChild = await ctx.shell.execute(spec)
       } else if (typeof ctx.shell?.start === 'function') {
         sensevoiceChild = await ctx.shell.start(spec)
-      } else {
-        sensevoiceChild = null
+      }
+
+      if (disposed) {
+        if (sensevoiceChild && typeof sensevoiceChild.kill === 'function') {
+          try { sensevoiceChild.kill() } catch { /* ignore */ }
+          sensevoiceChild = null
+        }
+        return false
       }
 
       if (sensevoiceChild && typeof sensevoiceChild.on === 'function') {
@@ -150,9 +217,30 @@ export function createLocalDaemons({ live, ctx }) {
         })
       }
       if (sensevoiceChild && sensevoiceChild.done && typeof sensevoiceChild.done.then === 'function') {
-        sensevoiceChild.done.then((res) => {
-          if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
-            sensevoiceError = `sensevoice process exited with code ${res.code}`
+        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 = detail ? `sensevoice process was killed: ${detail}` : 'sensevoice process was killed'
+          } else if (sensevoiceChild.status === 'completed') {
+            code = code ?? sensevoiceChild.exitCode ?? 0
+            if (code !== 0 && code !== null && code !== undefined) {
+              sensevoiceError = `sensevoice process exited with code ${code}${detail ? `: ${detail}` : ''}`
+            }
+          } else if (code !== 0 && code !== null && code !== undefined) {
+            sensevoiceError = `sensevoice process exited with code ${code}${detail ? `: ${detail}` : ''}`
           }
         }).catch((err) => {
           sensevoiceError = err?.message || String(err)
@@ -161,18 +249,31 @@ export function createLocalDaemons({ live, ctx }) {
 
       // Wait for it to become healthy (up to 30s).
       for (let i = 0; i < 60; i++) {
+        if (disposed) return false
         await new Promise((r) => setTimeout(r, 500))
+        if (disposed) return false
         if (await sensevoiceAlive()) {
           sensevoiceError = null
           return true
         }
-        if (sensevoiceChild && sensevoiceChild.exitCode !== null && sensevoiceChild.exitCode !== undefined) {
-          sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}`
-          return false
-        }
-        if (sensevoiceChild && (sensevoiceChild.status === 'exited' || sensevoiceChild.status === 'failed')) {
-          sensevoiceError = `sensevoice process exited prematurely with status ${sensevoiceChild.status}`
-          return false
+        if (sensevoiceChild) {
+          if (sensevoiceChild.status === 'killed') {
+            sensevoiceError = '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}`
+            return false
+          }
+          if (sensevoiceChild.status === 'exited' || sensevoiceChild.status === 'failed') {
+            sensevoiceError = `sensevoice process exited prematurely with status ${sensevoiceChild.status}`
+            return false
+          }
+          if (sensevoiceChild.exitCode !== null && sensevoiceChild.exitCode !== undefined) {
+            sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}`
+            return false
+          }
         }
       }
       sensevoiceError = 'sensevoice process started but failed health check'
@@ -195,6 +296,7 @@ export function createLocalDaemons({ live, ctx }) {
   }
 
   function dispose() {
+    disposed = true
     if (child && typeof child.kill === 'function') {
       try { child.kill() } catch { /* ignore */ }
       child = null

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 } 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,20 +202,39 @@ export function checkProfileLock(profileDir) {
     if (isProcessAlive(pid)) {
       return { locked: true, pid };
     }
+    // Stale lock: PID is not running.
     // Verify before unlinking: ensure the file content still holds the dead pid we read,
-    // so we don't delete a successor's live lock acquired in the interim (#205).
+    // without renaming the canonical file away so live successors are never hidden (#205).
     try {
-      const freshPid = readLockPid(lockPath);
-      if (freshPid !== pid) {
-        return { locked: true, pid: freshPid };
+      const currentPid = readLockPid(lockPath);
+      if (currentPid === pid) {
+        unlinkSync(lockPath);
+        return { locked: false, cleanedStale: true };
       }
-      unlinkSync(lockPath);
-      return { locked: false, cleanedStale: true };
+      if (currentPid !== null && isProcessAlive(currentPid)) {
+        return { locked: true, pid: currentPid };
+      }
+      return { locked: false };
     } catch {
+      if (!existsSync(lockPath)) return { locked: false };
+      const currentPid = readLockPid(lockPath);
+      if (currentPid !== null && isProcessAlive(currentPid)) {
+        return { locked: true, pid: currentPid };
+      }
       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.17",
+  "version": "0.9.19",
   "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",