@goodandready/dsh-voice 0.9.17 → 0.9.18

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') {
@@ -59,7 +66,14 @@ 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) {
+          if (child.status === 'killed') {
+            whisperError = 'whisper server process was killed'
+          } else if (child.status === 'completed') {
+            const code = child.result?.exitCode ?? (res && res.code)
+            if (code !== 0 && code !== null && code !== undefined) {
+              whisperError = `whisper server process exited with code ${code}`
+            }
+          } else if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
             whisperError = `whisper server process exited with code ${res.code}`
           }
         }).catch((err) => {
@@ -69,18 +83,31 @@ 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) {
+          if (child.status === 'killed') {
+            whisperError = '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}`
+            return false
+          }
+          if (child.status === 'exited' || child.status === 'failed') {
+            whisperError = `whisper server process exited prematurely with status ${child.status}`
+            return false
+          }
+          if (child.exitCode !== null && child.exitCode !== undefined) {
+            whisperError = `whisper server process exited prematurely with code ${child.exitCode}`
+            return false
+          }
         }
       }
       whisperError = 'whisper server process started but failed health check on port 8001'
@@ -110,7 +137,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 +155,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') {
@@ -151,7 +184,14 @@ 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) {
+          if (sensevoiceChild.status === 'killed') {
+            sensevoiceError = 'sensevoice process was killed'
+          } else if (sensevoiceChild.status === 'completed') {
+            const code = sensevoiceChild.result?.exitCode ?? (res && res.code)
+            if (code !== 0 && code !== null && code !== undefined) {
+              sensevoiceError = `sensevoice process exited with code ${code}`
+            }
+          } else if (res && res.code !== 0 && res.code !== null && res.code !== undefined) {
             sensevoiceError = `sensevoice process exited with code ${res.code}`
           }
         }).catch((err) => {
@@ -161,18 +201,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 +248,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/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, renameSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename, dirname, isAbsolute, resolve } from 'node:path';
@@ -203,15 +203,23 @@ export function checkProfileLock(profileDir) {
       return { locked: true, pid };
     }
     // 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).
+    // using atomic rename coordinator so a successor's live lock is never deleted (#205).
     try {
-      const freshPid = readLockPid(lockPath);
-      if (freshPid !== pid) {
-        return { locked: true, pid: freshPid };
+      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 {}
+        return { locked: false, cleanedStale: true };
       }
-      unlinkSync(lockPath);
-      return { locked: false, cleanedStale: true };
+      try { renameSync(staleName, lockPath); } catch {}
+      return { locked: true, pid: renamedPid };
     } catch {
+      if (!existsSync(lockPath)) return { locked: false };
+      const currentPid = readLockPid(lockPath);
+      if (currentPid !== null && isProcessAlive(currentPid)) {
+        return { locked: true, pid: currentPid };
+      }
       return { locked: false };
     }
   }

package/package.json

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