@goodandready/dsh-voice 0.9.19 → 0.9.21

package/lib/client.js

@@ -912,7 +912,12 @@ window.__ModuleLoader__.load({
       if (typeof actions.insertText === 'function') {
         try {
           const res = actions.insertText(text, span)
-          if (res !== false) return true
+          if (res !== false) {
+            if (target && typeof actions.captureInsertion === 'function') {
+              try { target.span = actions.captureInsertion() } catch (_) {}
+            }
+            return true
+          }
           return false
         } catch (_) {
           return false
@@ -936,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) {
@@ -1322,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, target, 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)
@@ -1486,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, target, totalMs: voice.settings.autoSendMs, 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' })
           }
@@ -1551,10 +1564,14 @@ voice._chainsPromise = null
               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, target, 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' })
             }

package/lib/local-daemon.js

@@ -68,17 +68,32 @@ export function createLocalDaemons({ live, ctx }) {
         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 = String(r.stderr).trim()
+                if (r.stderr && !detail) detail = String(r.stderr).trim()
               }
-            } catch (_) {}
+            } 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 = String(child.result.stderr).trim()
+            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'
@@ -106,18 +121,21 @@ export function createLocalDaemons({ live, ctx }) {
         }
         if (child) {
           let detail = ''
-          if (typeof child.read === 'function') {
+          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 (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
+          let code = child.exitCode
+          const isTerminal = (child.status && child.status !== 'running') || (code !== null && code !== undefined)
+          if (isTerminal) {
             if (typeof child.result === 'function') {
               try {
                 const r = await child.result()
@@ -125,22 +143,31 @@ export function createLocalDaemons({ live, ctx }) {
                   if (r.exitCode !== undefined && r.exitCode !== null) code = r.exitCode
                   if (r.stderr && !detail) detail = String(r.stderr).trim()
                 }
-              } catch (_) {}
+              } 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()
             }
-            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
+            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
+            }
           }
         }
       }
@@ -257,22 +284,54 @@ export function createLocalDaemons({ live, ctx }) {
           return true
         }
         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
+          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 (_) {}
           }
-          if (sensevoiceChild.exitCode !== null && sensevoiceChild.exitCode !== undefined) {
-            sensevoiceError = `sensevoice process exited prematurely with code ${sensevoiceChild.exitCode}`
-            return false
+          let code = sensevoiceChild.exitCode
+          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()
+              }
+            } 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

@@ -203,17 +203,21 @@ export function checkProfileLock(profileDir) {
       return { locked: true, pid };
     }
     // Stale lock: PID is not running.
-    // Verify before unlinking: ensure the file content still holds the dead pid we read,
-    // without renaming the canonical file away so live successors are never hidden (#205).
+    // Verify before unlinking: re-check PID to ensure a concurrent live successor
+    // was not written during the check (#205).
     try {
-      const currentPid = readLockPid(lockPath);
-      if (currentPid === pid) {
+      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 };
+      const p3 = readLockPid(lockPath);
+      if (p3 !== null && isProcessAlive(p3)) return { locked: true, pid: p3 };
+      if (p1 === pid && p2 === pid && p3 === pid) {
         unlinkSync(lockPath);
         return { locked: false, cleanedStale: true };
       }
-      if (currentPid !== null && isProcessAlive(currentPid)) {
-        return { locked: true, pid: currentPid };
-      }
+      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.19",
+  "version": "0.9.21",
   "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",