@goodandready/dsh-voice 0.9.8 → 0.9.10

package/lib/client.js

@@ -922,7 +922,6 @@ window.__ModuleLoader__.load({
         }
       })
     }
-
     // ------------------------------------------------------------ recording
     function teardown(rec) {
       if (!rec) return
@@ -932,7 +931,6 @@ window.__ModuleLoader__.load({
       if (rec.analyser) { try { rec.analyser.disconnect() } catch (e) { /* already disconnected */ } }
       if (rec.audioCtx) { try { rec.audioCtx.close() } catch (e) { /* already closed */ } }
     }
-
     if (typeof window !== 'undefined') {
       const onPageUnload = () => {
         if (voice.rec) teardown(voice.rec)
@@ -943,12 +941,10 @@ window.__ModuleLoader__.load({
       window.addEventListener('pagehide', onPageUnload)
       window.addEventListener('beforeunload', onPageUnload)
     }
-
     function waitStop(recorder) {
       if (!recorder || recorder.state === 'inactive') return Promise.resolve()
       return new Promise((resolve) => recorder.addEventListener('stop', resolve, { once: true }))
     }
-
     async function openMic(mode) {
       if (typeof navigator === 'undefined' || !navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
         throw new Error(t('micUnavailable'))
@@ -982,7 +978,6 @@ window.__ModuleLoader__.load({
         if (rec.audioCtx.state === 'suspended') { rec.audioCtx.resume().catch(() => {}) }
         const src = rec.audioCtx.createMediaStreamSource(stream)
         rec.srcNode = src
-
         let lastNode = src
         try {
           const filter = rec.audioCtx.createBiquadFilter()
@@ -993,7 +988,6 @@ window.__ModuleLoader__.load({
           lastNode = filter
           rec.filterNode = filter
         } catch (e) { /* audio filter fallback */ }
-
         rec.analyser = rec.audioCtx.createAnalyser()
         rec.analyser.fftSize = 128
         lastNode.connect(rec.analyser)
@@ -1002,7 +996,6 @@ window.__ModuleLoader__.load({
       recorder.start()
       return rec
     }
-
     function currentLevel(rec) {
       if (!rec || !rec.analyser) return 0
       const data = new Uint8Array(rec.analyser.frequencyBinCount)
@@ -1010,7 +1003,6 @@ window.__ModuleLoader__.load({
       let sum = 0
       for (let i = 0; i < data.length; i++) sum += data[i]
       const raw = Math.min(1, (sum / data.length / 255) * 2.2)
-
       const gateDb = Number(voice.settings && voice.settings.noiseGateDb !== undefined ? voice.settings.noiseGateDb : -45)
       if (gateDb > -90) {
         const gateAmp = Math.pow(10, gateDb / 20) * 2.2
@@ -1018,11 +1010,9 @@ window.__ModuleLoader__.load({
       }
       return raw
     }
-
     // Cut the current phrase: stop the recorder, send the finished file and
     // immediately start a new recording with the same recorder.
     let dictationQueue = Promise.resolve()
-
     function cutPhrase() {
       const rec = voice.rec
       if (!rec || rec.cutting || rec.closing) return
@@ -1037,6 +1027,7 @@ window.__ModuleLoader__.load({
         return
       }
       stopped.then(async () => {
+        if (rec.cancelled || voice.activeOpId !== opId) return
         const blob = new Blob(rec.chunks, { type: rec.mime })
         rec.chunks = []
         rec.silenceMs = 0
@@ -1107,6 +1098,7 @@ window.__ModuleLoader__.load({
     // Browser recognition instead of file recording. Returns false when the
     // browser cannot do it — then fall back to the normal path.
     function startBrowserLeg(mode, language) {
+      if (voice.settings && voice.settings.localOnly) return false
       if (!browserRecognitionAvailable()) return false
       const finals = []
       voice.caption = ''
@@ -1163,6 +1155,7 @@ window.__ModuleLoader__.load({
 
     function startRecording(mode) {
       if (voice.phase !== 'idle' && voice.phase !== 'error') return
+      voice.activeOpId = (voice.activeOpId || 0) + 1
       if (voice.isTtsSpeaking) {
         if (voice.settings.bargeIn) {
           triggerBargeIn()
@@ -1326,6 +1319,7 @@ window.__ModuleLoader__.load({
     }
 
     function cancelCurrent() {
+      voice.activeOpId = (voice.activeOpId || 0) + 1
       announceVoice('end')
       focusComposer()
       if (voice.browser) {
@@ -1372,6 +1366,8 @@ window.__ModuleLoader__.load({
       const rec = voice.rec
       if (!rec || rec.closing) return
       rec.closing = true
+      voice.activeOpId = (voice.activeOpId || 0) + 1
+      const opId = voice.activeOpId
       const mode = rec.mode
       const stopped = waitStop(rec.recorder)
       try {
@@ -1391,6 +1387,7 @@ window.__ModuleLoader__.load({
         voice.set({ phase: 'processing' })
         try {
           const out = await sendAudio(blob, rec.mime, mode)
+          if (rec.cancelled || voice.activeOpId !== opId || voice.phase === 'idle') return
           if (out.command) { runSessionCommand(out.command); return }
           const text = out.text || ''
           const action = out.action || null
@@ -1429,6 +1426,7 @@ window.__ModuleLoader__.load({
             voice.set({ phase: 'idle' })
           }
         } catch (e) {
+          if (rec.cancelled || voice.activeOpId !== opId || voice.phase === 'idle') return
           voice.set({ phase: 'error', error: String(e && e.message ? e.message : e) })
         }
       })
@@ -1980,9 +1978,12 @@ window.__ModuleLoader__.load({
               // The composer needs fresh settings without opening the card.
               Object.assign(voice.settings, {
                 beep: !!(data && data.beep),
+                localOnly: !!(data && data.localOnly),
                 micDeviceId: String((data && data.micDeviceId) || ''),
                 historyLimit: Number(data && data.historyLimit),
                 voiceCommands: !!(data && data.voiceCommands),
+                vadSilenceMs: Number(data && data.modes && data.modes.dictation && data.modes.dictation.vadSilenceMs) || 700,
+                autoSendMs: Number(data && data.modes && data.modes.message && data.modes.message.autoSendMs) || 4000,
                 sendDelayMs: Number(data && data.modes && data.modes.dictation && data.modes.dictation.sendDelayMs) || 0,
                 stream: !!(data && data.modes && data.modes.dictation && data.modes.dictation.stream),
                 streamChunkMs: Number(data && data.modes && data.modes.dictation && data.modes.dictation.streamChunkMs) || 1200,
@@ -2673,7 +2674,8 @@ window.__ModuleLoader__.load({
       const draft = props.draft
       const setTop = props.setTop
       const writable = props.writable
-      const [jargonInput, setJargonInput] = React.useState(null)
+      const jargonInput = props.jargonInput
+      const setJargonInput = props.setJargonInput
 
       return React.createElement('div', { className: 'cb-section-card' },
         React.createElement('div', { className: 'cb-section-title' },
@@ -2694,14 +2696,14 @@ window.__ModuleLoader__.load({
             rows: 3,
             disabled: !writable,
             placeholder: t('jargonPlaceholder'),
-            value: jargonInput !== null
+            value: jargonInput !== null && jargonInput !== undefined
               ? jargonInput
               : (Array.isArray(draft && draft.jargonDictionary)
                   ? draft.jargonDictionary.map((item) => item && item.from ? `${item.from} -> ${item.to}` : '').filter(Boolean).join('\n')
                   : ''),
-            onChange: (e) => setJargonInput(e.target.value),
+            onChange: (e) => setJargonInput && setJargonInput(e.target.value),
             onBlur: () => {
-              if (jargonInput === null) return
+              if (jargonInput === null || jargonInput === undefined) return
               const lines = jargonInput.split('\n')
               const parsed = lines
                 .map((line) => {
@@ -2883,6 +2885,7 @@ window.__ModuleLoader__.load({
 
       // Hotkey picker: not a name field — press the key you want.
       const [catching, setCatching] = React.useState(false)
+      const [jargonInput, setJargonInput] = React.useState(null)
       React.useEffect(() => {
         if (!catching) return undefined
         const onKey = (event) => {
@@ -2956,6 +2959,7 @@ window.__ModuleLoader__.load({
           vadSilenceMs: Number(val.dictation && val.dictation.vadSilenceMs) || 700,
           autoSendMs: Number(val.message && val.message.autoSendMs) || 4000,
           beep: !!val.beep,
+          localOnly: !!val.localOnly,
           micDeviceId: String(val.micDeviceId || ''),
           historyLimit: Number(val.historyLimit) || 20,
           voiceCommands: !!val.voiceCommands,
@@ -3099,7 +3103,7 @@ window.__ModuleLoader__.load({
         })
         try { window.dispatchEvent(new CustomEvent('dsh-voice:settings-saved')) } catch (noEvents) { /* nobody */ }
 
-        setSaved(true)
+        setSaved(true); setJargonInput(null)
         setTimeout(() => setSaved(false), 2000)
         fetchStatus()
       }
@@ -3356,6 +3360,8 @@ window.__ModuleLoader__.load({
           draft: draft,
           setTop: setTop,
           writable: writable,
+          jargonInput: jargonInput,
+          setJargonInput: setJargonInput,
         }),
 
         // 10. Provider Telemetry & Latency Dashboard

package/lib/index.js

@@ -92,27 +92,38 @@ export function apply(ctx, baseConfig) {
   async function startWhisper() {
     if (startingWhisper) return false
     startingWhisper = true
-    const cfg = live()
-    if (!cfg.autoStart) return false
-    // Without a model path there is nothing to start: the package cannot know
-    // where a user's model lives and must not launch a random binary.
-    if (!cfg.whisperModel) return false
-    if (await whisperAlive()) {
-      whisperError = null
-      return true
-    }
     try {
+      const cfg = live()
+      if (!cfg.autoStart) return false
+      // Without a model path there is nothing to start: the package cannot know
+      // where a user's model lives and must not launch a random binary.
+      if (!cfg.whisperModel) return false
+      if (await whisperAlive()) {
+        whisperError = null
+        return true
+      }
       if (child && typeof child.kill === 'function') {
         try { child.kill() } catch { /* ignore */ }
         child = null
       }
-      const spec = ctx.shell.resolve({
-        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}`,
-        timeoutMs: 0,
-        stdoutMaxBytes: 4 * 1024 * 1024,
-      })
-      child = ctx.shell.start(spec)
+      const spec = typeof ctx.shell?.resolve === 'function'
+        ? ctx.shell.resolve({
+            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}`,
+            timeoutMs: 0,
+            stdoutMaxBytes: 4 * 1024 * 1024,
+          })
+        : {
+            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}`,
+            timeoutMs: 0,
+            stdoutMaxBytes: 4 * 1024 * 1024,
+          }
+      child = typeof ctx.shell?.execute === 'function'
+        ? ctx.shell.execute(spec)
+        : typeof ctx.shell?.start === 'function'
+          ? ctx.shell.start(spec)
+          : null
       if (child && typeof child.on === 'function') {
         child.on('error', (err) => {
           whisperError = err?.message || String(err)
@@ -123,6 +134,15 @@ export function apply(ctx, baseConfig) {
           }
         })
       }
+      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}`
+          }
+        }).catch((err) => {
+          whisperError = err?.message || String(err)
+        })
+      }
       // Wait for it to become healthy (up to 30s for cold model loading on Metal/CPU).
       for (let i = 0; i < 60; i++) {
         await new Promise((r) => setTimeout(r, 500))
@@ -134,6 +154,10 @@ export function apply(ctx, baseConfig) {
           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
+        }
       }
       whisperError = 'whisper server process started but failed health check on port 8001'
       return false
@@ -164,14 +188,14 @@ export function apply(ctx, baseConfig) {
   async function startSensevoice() {
     if (startingSensevoice) return false
     startingSensevoice = true
-    const cfg = live()
-    if (!cfg.sensevoiceAutostart) return false
-    if (!cfg.sensevoiceModel) return false
-    if (await sensevoiceAlive()) {
-      sensevoiceError = null
-      return true
-    }
     try {
+      const cfg = live()
+      if (!cfg.sensevoiceAutostart) return false
+      if (!cfg.sensevoiceModel) return false
+      if (await sensevoiceAlive()) {
+        sensevoiceError = null
+        return true
+      }
       if (sensevoiceChild && typeof sensevoiceChild.kill === 'function') {
         try { sensevoiceChild.kill() } catch { /* ignore */ }
         sensevoiceChild = null
@@ -180,15 +204,28 @@ export function apply(ctx, baseConfig) {
       try { port = new URL(cfg.sensevoiceUrl).port || '6006' } catch { /* invalid URL */ }
       const tokensPath = findTokensFile(path.dirname(cfg.sensevoiceModel))
       const tokensArg = tokensPath ? ` --tokens=${JSON.stringify(tokensPath)}` : ''
-      const spec = ctx.shell.resolve({
-        command: `${JSON.stringify(cfg.sensevoiceBin)}`
-          + ` --sense-voice-model=${JSON.stringify(cfg.sensevoiceModel)}`
-          + tokensArg
-          + ` --port=${port} --num-threads=4`,
-        timeoutMs: 0,
-        stdoutMaxBytes: 4 * 1024 * 1024,
-      })
-      sensevoiceChild = ctx.shell.start(spec)
+      const spec = typeof ctx.shell?.resolve === 'function'
+        ? ctx.shell.resolve({
+            command: `${JSON.stringify(cfg.sensevoiceBin)}`
+              + ` --sense-voice-model=${JSON.stringify(cfg.sensevoiceModel)}`
+              + tokensArg
+              + ` --port=${port} --num-threads=4`,
+            timeoutMs: 0,
+            stdoutMaxBytes: 4 * 1024 * 1024,
+          })
+        : {
+            command: `${JSON.stringify(cfg.sensevoiceBin)}`
+              + ` --sense-voice-model=${JSON.stringify(cfg.sensevoiceModel)}`
+              + tokensArg
+              + ` --port=${port} --num-threads=4`,
+            timeoutMs: 0,
+            stdoutMaxBytes: 4 * 1024 * 1024,
+          }
+      sensevoiceChild = typeof ctx.shell?.execute === 'function'
+        ? ctx.shell.execute(spec)
+        : typeof ctx.shell?.start === 'function'
+          ? ctx.shell.start(spec)
+          : null
       if (sensevoiceChild && typeof sensevoiceChild.on === 'function') {
         sensevoiceChild.on('error', (err) => {
           sensevoiceError = err?.message || String(err)
@@ -199,6 +236,15 @@ export function apply(ctx, baseConfig) {
           }
         })
       }
+      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}`
+          }
+        }).catch((err) => {
+          sensevoiceError = err?.message || String(err)
+        })
+      }
       // Wait for it to become healthy (up to 30s).
       for (let i = 0; i < 60; i++) {
         await new Promise((r) => setTimeout(r, 500))
@@ -210,6 +256,10 @@ export function apply(ctx, baseConfig) {
           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
+        }
       }
       sensevoiceError = 'sensevoice process started but failed health check'
       return false
@@ -486,8 +536,41 @@ export function apply(ctx, baseConfig) {
     liveConfig: live,
     isAlive: sensevoiceAlive,
     updateConfig: async (patch) => {
-      if (scope && typeof scope.patch === 'function') {
-        scope.patch(patch)
+      let saved = false
+      const current = live()
+      const merged = { ...current, ...patch }
+      if (settingsService) {
+        let rev
+        try {
+          rev = settingsService.describe?.()?.find?.((r) => r.ns === NS)?.revision
+        } catch { /* ignore revision lookup errors */ }
+
+        if (typeof settingsService.replace === 'function') {
+          await settingsService.replace(NS, merged, rev)
+          saved = true
+        } else if (typeof settingsService.update === 'function') {
+          await settingsService.update(NS, merged, rev)
+          saved = true
+        }
+      }
+
+      if (scope) {
+        if (typeof scope.replace === 'function') {
+          await scope.replace(merged)
+          saved = true
+        } else if (typeof scope.patch === 'function') {
+          await scope.patch(merged)
+          saved = true
+        } else if (typeof scope.set === 'function') {
+          for (const [k, v] of Object.entries(merged)) {
+            await scope.set(k, v).catch(() => {})
+          }
+          saved = true
+        }
+      }
+
+      if (!saved) {
+        throw new Error('failed to persist settings: neither settingsService nor scope available')
       }
     },
     startSensevoice,

package/lib/polish.js

@@ -1,3 +1,4 @@
+import { isLoopback } from './http-util.js'
 // Transcript polish. Pure factory: inject fetch, key resolver, LLM, config.
 // On any failure return the original text — polish must never block input.
 
@@ -14,6 +15,15 @@ export function createPolishText({ resolveKey, fetchImpl, getConfig, llm, getAge
     const enable = modeCfg && (modeCfg.polish === true || modeCfg.polishSend === true)
     if (!enable || !text) return text
     const cfg = getConfig() || {}
+    if (cfg.localOnly) {
+      if (!cfg.polishBaseUrl) return text
+      try {
+        const u = new URL(cfg.polishBaseUrl)
+        if (!isLoopback(u.hostname)) return text
+      } catch {
+        return text
+      }
+    }
     const ask =
       'Fix the punctuation and spelling of this dictated text and split it into '
       + 'paragraphs where the speaker changes topic. Remove filler words ("um", "uh", '

package/lib/updater.js

@@ -198,23 +198,25 @@ export function checkProfileLock(profileDir) {
   const lockPath = resolve(profileDir, 'package.json.lock');
   if (!existsSync(lockPath)) return { locked: false };
   const pid = readLockPid(lockPath);
-  if (pid && isProcessAlive(pid)) {
-    return { locked: true, pid };
-  }
-  // Stale lock: PID is dead or unreadable; clean it up to prevent permanent blockage
-  try {
-    unlinkSync(lockPath);
-    return { locked: false, cleanedStale: true };
-  } catch {
-    return { locked: false };
+  if (pid !== null) {
+    if (isProcessAlive(pid)) {
+      return { locked: true, pid };
+    }
+    try {
+      unlinkSync(lockPath);
+      return { locked: false, cleanedStale: true };
+    } catch {
+      return { locked: false };
+    }
   }
+  return { locked: true, pid: null };
 }
 
 async function installExact(target, packageSpec, options) {
   if (target.cliEntry === undefined) throw new Error('Automatic update is unavailable in this runtime.');
   const lockCheck = checkProfileLock(target.profileDir);
   if (lockCheck.locked) {
-    throw new Error(`Another package installation is currently in progress (PID ${lockCheck.pid}).`);
+    throw new Error(`Another package installation is currently in progress${lockCheck.pid ? ` (PID ${lockCheck.pid})` : ''}.`);
   }
   await new Promise((resolvePromise, reject) => {
     const child = spawn(process.execPath, [
@@ -228,28 +230,34 @@ async function installExact(target, packageSpec, options) {
       env: { ...process.env, NO_COLOR: '1' },
     });
     let detail = '';
+    let timedOut = false;
+    let killTimer = null;
     child.stdout?.on('data', chunk => { detail = (detail + String(chunk)).slice(-4_000); });
     child.stderr?.on('data', chunk => { detail = (detail + String(chunk)).slice(-4_000); });
-    const timer = setTimeout(() => {
-      child.kill('SIGTERM');
-      setTimeout(() => {
-        if (!child.killed) {
-          try { child.kill('SIGKILL'); } catch { /* ignore */ }
-        }
-        checkProfileLock(target.profileDir);
-      }, 1000).unref?.();
-      reject(new Error('Update timed out; use the normal DSH update flow.'));
+    const timeoutTimer = setTimeout(() => {
+      timedOut = true;
+      try { child.kill('SIGTERM'); } catch { /* ignore */ }
+      killTimer = setTimeout(() => {
+        try { child.kill('SIGKILL'); } catch { /* ignore */ }
+      }, 1000);
     }, UPDATE_TIMEOUT_MS);
     child.once('error', error => {
-      clearTimeout(timer);
+      clearTimeout(timeoutTimer);
+      if (killTimer) clearTimeout(killTimer);
       checkProfileLock(target.profileDir);
       reject(error);
     });
     child.once('exit', code => {
-      clearTimeout(timer);
+      clearTimeout(timeoutTimer);
+      if (killTimer) clearTimeout(killTimer);
       checkProfileLock(target.profileDir);
-      if (code === 0) resolvePromise();
-      else reject(new Error(detail.trim() || `Update exited with code ${String(code)}.`));
+      if (timedOut) {
+        reject(new Error('Update timed out; use the normal DSH update flow.'));
+      } else if (code === 0) {
+        resolvePromise();
+      } else {
+        reject(new Error(detail.trim() || `Update exited with code ${String(code)}.`));
+      }
     });
   });
 }
@@ -293,7 +301,7 @@ export function registerPluginUpdater(ctx, options) {
         if (installing || lockStatus.locked) {
           json(response, 409, {
             error: lockStatus.locked
-              ? `Another package installation is currently in progress (PID ${lockStatus.pid}).`
+              ? `Another package installation is currently in progress${lockStatus.pid ? ` (PID ${lockStatus.pid})` : ''}.`
               : 'This plugin is already updating.',
           });
           return;

package/package.json

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