@goodandready/dsh-voice 0.9.9 → 0.9.10

package/lib/client.js

@@ -1982,6 +1982,8 @@ window.__ModuleLoader__.load({
                 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,

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/package.json

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