Updates

daemon/index.js

@@ -15,6 +15,7 @@ import { PortalInputBackend } from '../computer-use/portal-input.js';
 import { ComputerActuator } from '../computer-use/actuator.js';
 import { RuntimeTelemetry } from './telemetry.js';
 import { StateRecovery } from './recovery.js';
+import { spokenReply } from '../skills/voice-prompt.js';
 
 export class JarvisDaemon extends EventEmitter {
   constructor() {
@@ -45,24 +46,54 @@ export class JarvisDaemon extends EventEmitter {
   setState(state) { this.state = state; try { this.recovery.save({ state, mode: this.mode }); } catch (error) { this.emit('Error', 'RECOVERY_WRITE', error.message); } this.emit('StateChanged', state); this.log.record('state', { state }).catch(() => {}); }
   async arm() { if (this.locked) return; await resumeQvac().catch(() => {}); this.voice.wake(); this.setState('LISTENING'); }
   async sleep() { this.voice.sleep(); this.setState('SLEEPING'); await suspendQvac().catch((error) => this.emit('Error', 'QVAC_SUSPEND', error.message)); }
-  say(text) { this.lastReply = String(text); this.emit('Reply', this.lastReply); }
+  say(text) {
+    const spoken = spokenReply(text) || spokenReply(this.lastReply) || 'There is nothing to repeat.';
+    this.lastReply = spoken;
+    this.emit('Reply', spoken);
+    this._beginSpeech();
+    this._speakReply(spoken);
+  }
   async ask(text) {
-    this.voice.typedUtterance(); this.setState('THINKING');
+    this.voiceLoop?.interrupt?.();
     try {
+      this.voice.typedUtterance(); this.setState('THINKING');
       const startedAt = Date.now(); const reply = await this.scheduler.run(() => this.harness.ask(text), { lane: 'voice' }); this.telemetry.record('llm', startedAt, { success: true });
-      this.voice.speak(); this.setState('SPEAKING'); this.lastReply = String(reply || ''); this.emit('Reply', this.lastReply); this.voiceLoop?.speak(this.lastReply).catch((error) => this.emit('Error', 'TTS', error.message)); return reply;
+      const spoken = spokenReply(reply);
+      this._beginSpeech(); this.lastReply = spoken; this.emit('Reply', spoken); this._speakReply(spoken); return spoken;
     } catch (error) {
       this.telemetry.record('llm', Date.now(), { success: false }); this.emit('Error', 'QVAC', error.message); this.voice.cancel(); this.setState('ARMED'); throw error;
     }
   }
-  cancel() { this.harness.cancel(); this.scheduler.cancelQueued((job) => job.lane === 'voice'); this.computer.revoke(); this.voice.cancel(); this.setState('ARMED'); cancelQvac().catch((error) => this.emit('Error', 'QVAC_CANCEL', error.message)); }
+  _beginSpeech() {
+    try {
+      if (this.voice.state === 'ARMED' || this.voice.state === 'SLEEPING') this.voice.wake();
+      if (this.voice.state !== 'SPEAKING') this.voice.speak();
+    } catch {}
+    this.setState('SPEAKING');
+  }
+  _finishSpeech() {
+    try { this.voice.finishSpeaking(); } catch {}
+    if (this.state === 'SPEAKING') this.setState('LISTENING');
+  }
+  _speakReply(spoken) {
+    const playing = this.voiceLoop?.speak?.(spoken);
+    if (!playing) { this._finishSpeech(); return; }
+    Promise.resolve(playing).catch((error) => {
+      this.emit('Error', 'TTS', error.message);
+      if (this.state === 'SPEAKING') this._finishSpeech();
+    });
+  }
+  cancel() { this.voiceLoop?.interrupt?.(); this.harness.cancel(); this.scheduler.cancelQueued((job) => job.lane === 'voice'); this.computer.revoke(); this.voice.cancel(); this.setState('ARMED'); cancelQvac().catch((error) => this.emit('Error', 'QVAC_CANCEL', error.message)); }
   computerGrant(persist = false) { const result = this.computer.grant({ persist }); this.emit('ComputerStep', JSON.stringify({ action: 'grant', ...result })); this.input.grant({ persist }).then((backend) => { this.computer.setBackend(backend.backend); this.emit('ComputerStep', JSON.stringify({ action: 'backend', ...backend })); }).catch((error) => this.emit('Error', 'CU_GRANT', error.message)); return result; }
   computerRevoke() { this.input.revoke(); this.computer.revoke(); this.emit('ComputerStep', JSON.stringify({ action: 'revoke' })); }
   async startVoice() {
     if (this.voiceLoop) return;
     const voiceIO = new QvacVoiceAdapter();
-    this.voiceLoop = new VoiceLoop({ daemon: this, wake: createWakeEngine(), asr: voiceIO, tts: voiceIO });
-    try { await this.voiceLoop.start(); } catch (error) { this.voiceLoop = null; this.emit('Error', 'VOICE_UNAVAILABLE', error.message); throw error; }
+    const loop = new VoiceLoop({ daemon: this, wake: createWakeEngine(), asr: voiceIO, tts: voiceIO });
+    this.voiceLoop = loop;
+    try { await loop.start(); this.emit('StateChanged', this.state); } catch (error) {
+      this.voiceLoop = null; await loop.stop?.().catch(() => {}); this.emit('Error', 'VOICE_UNAVAILABLE', error.message); throw error;
+    }
   }
   setPushToTalk(pressed) { this.voiceLoop?.setPushToTalk(pressed); this.emit('PushToTalk', Boolean(pressed)); }
   runtimeStatus() { return JSON.stringify({ local: true, qvac: qvacStatus(), scheduler: this.scheduler.status(), scheduler_metrics: this.scheduler.metrics(), telemetry: this.telemetry.snapshot(), computer: this.computer.status(), voice: this.voiceLoop?.metrics?.snapshot?.() || null, p2p: { enabled: process.env.JARVIS_P2P_ENABLE === '1', inference: false, memorySync: false } }); }