@goodandready/dsh-voice 0.9.20 → 0.9.22

package/lib/local-daemon.js

@@ -134,37 +134,40 @@ export function createLocalDaemons({ live, ctx }) {
             } 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()
+          const isTerminal = (child.status && child.status !== 'running') || (code !== null && code !== undefined)
+          if (isTerminal) {
+            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()
               }
-            } 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 = detail ? `whisper server process was killed: ${detail}` : 'whisper server process was killed'
+              return false
+            }
+            if (child.status === 'completed') {
+              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
             }
-          } 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 = detail ? `whisper server process was killed: ${detail}` : 'whisper server process was killed'
-            return false
-          }
-          if (child.status === 'completed') {
-            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
           }
         }
       }
@@ -295,37 +298,40 @@ export function createLocalDaemons({ live, ctx }) {
             } 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()
+          const isTerminal = (sensevoiceChild.status && sensevoiceChild.status !== 'running') || (code !== null && code !== undefined)
+          if (isTerminal) {
+            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()
               }
-            } 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 = detail ? `sensevoice process was killed: ${detail}` : 'sensevoice process was killed'
+              return false
+            }
+            if (sensevoiceChild.status === 'completed') {
+              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}${detail ? `: ${detail}` : ''}`
+              return false
+            }
+            if (sensevoiceChild.exitCode !== null && sensevoiceChild.exitCode !== undefined) {
+              sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}${detail ? `: ${detail}` : ''}`
+              return false
             }
-          } 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 = detail ? `sensevoice process was killed: ${detail}` : 'sensevoice process was killed'
-            return false
-          }
-          if (sensevoiceChild.status === 'completed') {
-            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}${detail ? `: ${detail}` : ''}`
-            return false
-          }
-          if (sensevoiceChild.exitCode !== null && sensevoiceChild.exitCode !== undefined) {
-            sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}${detail ? `: ${detail}` : ''}`
-            return false
           }
         }
       }

package/lib/updater.js

@@ -197,25 +197,34 @@ export function isProcessAlive(pid) {
 export function checkProfileLock(profileDir) {
   const lockPath = resolve(profileDir, 'package.json.lock');
   if (!existsSync(lockPath)) return { locked: false };
+  let initialStat;
+  try { initialStat = statSync(lockPath); } catch { return { locked: false }; }
   const pid = readLockPid(lockPath);
   if (pid !== null) {
     if (isProcessAlive(pid)) {
       return { locked: true, pid };
     }
     // Stale lock: PID is not running.
-    // Verify before unlinking: re-check PID to ensure a concurrent live successor
+    // Verify before unlinking: re-check PID and stat to ensure a concurrent live successor
     // was not written during the check (#205).
     try {
       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) {
+      const p3 = readLockPid(lockPath);
+      if (p3 !== null && isProcessAlive(p3)) return { locked: true, pid: p3 };
+      const currentStat = statSync(lockPath);
+      if (currentStat.mtimeMs !== initialStat.mtimeMs || currentStat.size !== initialStat.size) {
+        const live = readLockPid(lockPath);
+        if (live !== null && isProcessAlive(live)) return { locked: true, pid: live };
+      }
+      if (p1 === pid && p2 === pid && p3 === pid) {
         unlinkSync(lockPath);
         return { locked: false, cleanedStale: true };
       }
-      if (p2 !== null && isProcessAlive(p2)) return { locked: true, pid: p2 };
-      if (p1 !== null && isProcessAlive(p1)) return { locked: true, pid: p1 };
+      const pFinal = readLockPid(lockPath);
+      if (pFinal !== null && isProcessAlive(pFinal)) return { locked: true, pid: pFinal };
       return { locked: false };
     } catch {
       if (!existsSync(lockPath)) return { locked: false };

package/package.json

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