@olares/lares-mobile 0.15.30 → 0.15.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olares/lares-mobile",
-  "version": "0.15.30",
+  "version": "0.15.32",
   "description": "Lares chat component for LarePass",
   "type": "module",
   "repository": {
@@ -28,7 +28,7 @@
     "vue": "^3.2.0"
   },
   "dependencies": {
-    "@olares/lares-core": "0.15.30",
+    "@olares/lares-core": "0.15.32",
     "markdown-it": "^14.3.0"
   }
 }

package/src/App.vue

@@ -127,6 +127,7 @@ import { createVoiceConversation } from "@olares/lares-core/voice/conversation";
 import { createUnifiedConversation } from "@olares/lares-core/voice/unified-conversation";
 import { createAnswerPlayer } from "./chat/playback.js";
 import { createReplySpeaker, createSentencePlayer, readoutState, speakable } from "@olares/lares-core/voice/speech";
+import { createScreenWakeLock } from "@olares/lares-core/voice/wake-lock";
 import { prepareBrowserCapture } from "@olares/lares-core/voice/browser-capture";
 import { playAudioStream, createStreamingCapture } from "@olares/lares-core/voice/stream-client";
 import { voiceHeaders, wavBlob } from "@olares/lares-core/voice/client";
@@ -561,6 +562,9 @@ export default {
     this.intake = new FileIntake((file, sessionId, options) => this.runtime.upload(file, options, sessionId));
     this.imageUploadControllers = new Map();
     this.player = createAnswerPlayer();
+    // A locked screen suspends the WebView and cuts a long answer short; hold
+    // the screen for as long as a readout is actually playing.
+    this.readoutWake = createScreenWakeLock();
     this.voicePanel = createVoicePanel({
       armOutput: () => this.player?.unlock(),
       create: (options) => this.createMobileVoiceConversation(options),
@@ -591,6 +595,8 @@ export default {
       const view = this.voicePanel.getSnapshot(); this.voicePanelState = view;
       this.voiceCall = view.snapshot?.connection === "closed" ? null : view.snapshot;
       this.voicePhase = view.snapshot?.capture || "idle"; this.voiceError = view.error || view.snapshot?.error || "";
+      // The call no longer owns the answer: a cancelled take gives it back.
+      if (this.voiceSuspended && view.snapshot?.connection !== "open") this.resumeSuspendedReadout();
     });
     this.replySpeaker = createReplySpeaker();
     this.reader = createSentencePlayer({
@@ -607,6 +613,7 @@ export default {
       halt: () => this.player?.stop(),
       silence: (source) => void this.runtime.interruptSpeech?.(source),
       fail: (err) => this.showSpeakProblem(err),
+      onState: (active) => this.setReadoutAwake(active),
     });
 
     this.bindIntake(this.sessionId);
@@ -624,12 +631,30 @@ export default {
     this.conversationUnsub = subscribeConversationSettings((section) => {
       this.busyEnter = section.busyEnter;
     });
+    this.voiceReadoutPaused = false;
     this.voiceVisibilityHandler = () => {
-      if (document.hidden) { this.reader.stop(); void this.voicePanel.pause().catch(() => {}); }
+      if (document.hidden) {
+        // A locked screen or an app switch is a pause, not the end of the
+        // answer: stopping here marks the utterance read and it never resumes.
+        if (this.reader.canPause && this.reader.pause()) this.voiceReadoutPaused = true;
+        void this.voicePanel.pause().catch(() => {});
+        return;
+      }
+      if (this.readoutActive) void this.readoutWake?.hold();
+      if (this.voiceReadoutPaused) { this.voiceReadoutPaused = false; this.reader.resume(); }
+    };
+    this.voicePageHideHandler = () => {
+      if (this.reader.canPause && this.reader.pause()) this.voiceReadoutPaused = true;
+      void this.voicePanel.pause().catch(() => {});
     };
-    this.voiceOfflineHandler = () => { this.reader.stop(); void this.voicePanel.pause().catch(() => {}); };
+    this.voicePageShowHandler = () => {
+      if (this.voiceReadoutPaused) { this.voiceReadoutPaused = false; this.reader.resume(); }
+    };
+    this.voiceOfflineHandler = () => { this.stopReadout(); void this.voicePanel.pause().catch(() => {}); };
     window.addEventListener("offline", this.voiceOfflineHandler);
     document.addEventListener("visibilitychange", this.voiceVisibilityHandler);
+    window.addEventListener("pagehide", this.voicePageHideHandler);
+    window.addEventListener("pageshow", this.voicePageShowHandler);
     window.addEventListener("keydown", this.onVoiceShortcut, true);
     this.voiceClock = setInterval(() => {
       if (this.voicePhase === "recording") this.voiceElapsed += 1;
@@ -640,13 +665,16 @@ export default {
     this.restoreLog();
   },
   deactivated() {
-    this.reader.stop();
+    this.stopReadout();
     void this.voicePanel?.pause().catch(() => {});
     this.captureLog();
   },
   beforeUnmount() {
     window.removeEventListener("offline", this.voiceOfflineHandler);
     document.removeEventListener("visibilitychange", this.voiceVisibilityHandler);
+    window.removeEventListener("pagehide", this.voicePageHideHandler);
+    window.removeEventListener("pageshow", this.voicePageShowHandler);
+    this.readoutWake?.release();
     window.removeEventListener("keydown", this.onVoiceShortcut, true);
     clearInterval(this.voiceClock);
     this.captureLog();
@@ -716,7 +744,7 @@ export default {
       }
       if (sessionChanged && snap.sessionId !== this.voiceAdoptingSession) {
         void this.voicePanel?.pause().catch(() => {});
-        this.reader.stop();
+        this.stopReadout();
         this.player?.stop();
       }
       if (sessionChanged) this.voiceAdoptingSession = null;
@@ -733,9 +761,12 @@ export default {
       // A paused call is not speaking. Only an open call owns the reply;
       // leaving it set after the keyboard returns is how later answers stay silent.
       const voiceSpeaking = this.voiceCall?.connection === "open";
-      if (voiceSpeaking) this.reader.stop();
+      if (voiceSpeaking) this.suspendReadout();
       const target = this.voiceSpeak && !voiceSpeaking && !document.hidden ? speakable(utterance, this.voiceStreaming) : null;
-      if (target) this.reader.follow({ ...target, sessionId: snap.sessionId, source: { sessionId: snap.sessionId, turn: target.turn, step: target.step, attemptId: target.attemptId }, key: `${snap.sessionId}:${target.key}` });
+      if (target) this.followReadout({ ...target, sessionId: snap.sessionId, source: { sessionId: snap.sessionId, turn: target.turn, step: target.step, attemptId: target.attemptId }, key: `${snap.sessionId}:${target.key}` });
+      // A cancelled voice take did not own the answer: play it again. A take
+      // that submitted a turn grew the transcript, so the call owns it.
+      if (!voiceSpeaking) this.resumeSuspendedReadout();
       this.failed = snap.failed;
       this.error = snap.error;
       this.sessions = snap.sessions ?? this.sessions;
@@ -1276,7 +1307,7 @@ export default {
     },
     async onVoiceShortcut(event) {
       if (this.chatDevice !== "desktop" || document.hidden || navigator.onLine === false || event.composedPath?.().some(node => node?.hasAttribute?.("data-voice-shortcut-recorder"))) return;
-      if (event.key === "Escape" && !event.defaultPrevented) { this.reader.stop(); void this.voicePanel.pause().catch(() => {}); return; }
+      if (event.key === "Escape" && !event.defaultPrevented) { this.stopReadout(); void this.voicePanel.pause().catch(() => {}); return; }
       const action = matchVoiceShortcut(event, this.voiceSettings?.config?.dictationShortcuts);
       if (!action || !laresVoiceAvailability(this.voiceSettings).dictation) return;
       event.preventDefault();
@@ -1326,7 +1357,7 @@ export default {
       const device = settings.config.device === "headset" ? "headset" : "device";
       onDevice(device);
       if (settings.config.backend === "realtime" && continuous) throw new Error("voice_manual_realtime_unavailable");
-      this.reader.stop(); this.player?.stop(); this.player?.unlock();
+      this.suspendReadout(); this.player?.stop(); this.player?.unlock();
       if (config.transport !== "legacy") {
         return createUnifiedConversation({ request: (path, options) => this.runtime.voiceRequest(path, options), socket: (ticket) => this.runtime.voiceSocket(ticket),
           device: captureSource("mobile", config.device), readAloud: continuous && config.speak, preset: config.preset, presentationSession: true,
@@ -1340,7 +1371,7 @@ export default {
         send: (value) => conversation.speak(value),
         play: (sentence) => sentence.bluetooth === "played" ? Promise.resolve() : this.player.play(wavBlob(sentence.audio)),
         halt: () => this.player.stop(), silence: () => {},
-        onState: (playing) => conversation?.playbackState(playing),
+        onState: (playing) => { conversation?.playbackState(playing); this.setReadoutAwake(playing); },
         onOutput: (value) => readoutState.publish(value?.status === "error" ? null : value),
         fail: (error) => { void conversation.controller.disconnect(error?.code || error?.message || "voice_playback_failed"); },
       });
@@ -1368,6 +1399,39 @@ export default {
         onError: (error) => { this.voiceError = error.message; },
       });
     },
+    followReadout(value) {
+      if (!value) return;
+      this.lastReadout = value;
+      this.reader.follow(value);
+    },
+    suspendReadout() {
+      const key = this.reader?.key;
+      if (!key) return;
+      if (this.lastReadout?.key === key) {
+        this.voiceSuspended = this.lastReadout;
+        this.voiceSuspendedItems = this.items?.length ?? 0;
+      }
+      this.reader.suspend?.();
+    },
+    resumeSuspendedReadout() {
+      const suspended = this.voiceSuspended;
+      if (!suspended) return;
+      this.voiceSuspended = null;
+      const taken = (this.items?.length ?? 0) > this.voiceSuspendedItems;
+      if (taken) this.reader.consume(suspended.key);
+      else if (suspended.sessionId === this.sessionId && this.voiceSpeak && !document.hidden) this.followReadout(suspended);
+    },
+    stopReadout() {
+      this.voiceSuspended = null;
+      this.voiceSuspendedItems = 0;
+      this.lastReadout = null;
+      this.reader.stop();
+    },
+    setReadoutAwake(active) {
+      this.readoutActive = Boolean(active);
+      if (this.readoutActive) void this.readoutWake?.hold();
+      else this.readoutWake?.release();
+    },
     showSpeakProblem(err) {
       this.speakNotice = speakProblemText(this.t, err);
     },
@@ -1384,7 +1448,7 @@ export default {
       this.voiceSpeak = next;
       this.speakBusy = true;
       if (!next) {
-        this.reader.stop();
+        this.stopReadout();
         this.player?.stop();
         void this.runtime.interruptSpeech?.();
       }
@@ -1549,10 +1613,10 @@ export default {
       const text = this.draft.trim();
       if (!this.canSend) return;
       this.player?.unlock();
-      // A typed reply is the chat's. An open voice call would keep the reader
-      // quiet and then not speak this text, so pause it and let the reader take the answer.
+      // A typed reply is the chat's. Stop the old readout before pausing the
+      // call, so the pause cannot hand a suspended answer back for a moment.
+      this.stopReadout();
       if (this.voiceCall?.connection === "open") await this.voicePanel.pause();
-      this.reader.stop();
       const sessionId = this.sessionId;
       const images = this.draftImages.filter((row) => draftImageStatus(row) === "ready");
       const wasRunning = this.running;

package/src/settings/TtsSettings.vue

@@ -17,6 +17,10 @@
     <p v-if="view.errors.ttsModel" class="lares-tts__alert" role="alert">{{ t('settings.saveFailed') }}</p>
     <p v-if="!state.model" class="lares-tts__hint">{{ t('preferences.modelsMissing') }}</p>
     <p v-else-if="state.loading" class="lares-tts__hint" role="status">{{ t('tts.loading') }}</p>
+    <div v-if="state.stale" class="lares-tts__status" role="status">
+      <p>{{ t('tts.stale') }}</p>
+      <button type="button" @click="controller.load()">{{ t('dictation.retry') }}</button>
+    </div>
     <div v-else-if="state.error" class="lares-tts__status" role="alert">
       <p>{{ t('tts.loadFailed') }}</p>
       <button type="button" @click="controller.load()">{{ t('dictation.retry') }}</button>