@olares/lares-core 0.15.21 → 0.15.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olares/lares-core",
-  "version": "0.15.21",
+  "version": "0.15.22",
   "description": "Lares 共享业务核心：Router、workspace、文件/媒体、Olares 身份（无 UI、无平台壳）",
   "type": "module",
   "repository": {

package/voice/conversation.js

@@ -3,6 +3,18 @@ import { createDeviceInput } from "./device-input.js";
 import { createHostInput } from "./host-input.js";
 import { mintRpcId } from "../larepass/rpc.js";
 
+/** Bound a request without requiring AbortSignal.any / timeout, which some mobile webviews lack. */
+function outputSignal(abort) {
+  const signals = [abort.signal];
+  if (typeof AbortSignal?.timeout === "function") {
+    try { signals.push(AbortSignal.timeout(10_000)); } catch { /* the caller signal still cancels the request */ }
+  }
+  if (signals.length > 1 && typeof AbortSignal.any === "function") {
+    try { return AbortSignal.any(signals); } catch { /* same */ }
+  }
+  return abort.signal;
+}
+
 export function createVoiceConversation({ request, transcribe, playback, onReply = () => {}, onPhase, mode = () => "queue", device = "device", metric = () => {}, readAloud = true, preset, backend, presentationSession = false, endpointSilenceMs, idleTimeoutMs, recoveryTimeoutMs, onText = () => {}, onTranscript = null, input: inputPort, captureConfig, streamInput, preparation }) {
   const voiceId = mintRpcId();
   const headers = { "x-lares-voice-id": voiceId, "x-lares-voice-device": device };
@@ -154,7 +166,7 @@ export function createVoiceConversation({ request, transcribe, playback, onReply
         if (error) throw error;
         const abort = outputAbort = new AbortController();
         try {
-          await call("/session/output", { readAloud: next }, AbortSignal.any([abort.signal, AbortSignal.timeout(10_000)]));
+          await call("/session/output", { readAloud: next }, outputSignal(abort));
           if (!disposed && revision === outputRevision) confirmedReadAloud = next;
         } catch (error) {
           if (!disposed && revision === outputRevision) {

package/voice/panel.js

@@ -56,7 +56,11 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
     }
   };
   const prepare = async (token) => {
-    if (call?.controller.getSnapshot().connection === "paused") { await call.resume({ shouldResume: () => token === intent && state.visible }); return; }
+    if (call?.controller.getSnapshot().connection === "paused") {
+      await call.resume({ shouldResume: () => token === intent && state.visible });
+      if (token === intent && state.visible && state.mode === "continuous" && typeof readAloudPreference === "boolean") await panel.setReadAloud(readAloudPreference);
+      return;
+    }
     if (call?.controller.getSnapshot().connection === "open") return;
     await end(); config = state.mode === "single" && config ? config : structuredClone(await loadConfig());
     if (token !== intent || !state.visible) return;
@@ -87,7 +91,11 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
   };
   const pause = async () => {
     try { if (state.mode === "single") { await finishCapture(); renderDraft(); } else await call?.controller.cancelRecording(); }
-    finally { if (call?.controller.getSnapshot().connection === "open") await call.pause(); }
+    finally {
+      if (call?.controller.getSnapshot().connection === "open") await call.pause();
+      // The banner belongs to the open call. Leaving it must not keep a mute/sync notice on the chat.
+      if (!state.visible) { outputRevision++; emit({ readAloudError: null }); }
+    }
   };
   const insertDraft = async () => {
     if (!state.draft || state.stage !== "preview") return;
@@ -108,6 +116,10 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
       if (!readAloudPending && appliedReadAloud === next && !state.readAloudError) return Promise.resolve(true);
       const revision = ++outputRevision;
       const current = () => target === call && epoch === generation && revision === outputRevision;
+      // Phone playback is local. Asking for silence already stopped it, so a missed
+      // server ack is not a readout failure. A headset can keep playing until the host agrees.
+      const localSilence = next !== true && state.device !== "headset";
+      if (localSilence) emit({ readAloudError: null });
       const pending = { target, value: next, promise: null };
       pending.promise = Promise.resolve().then(() => {
         if (target !== call || epoch !== generation) return;
@@ -116,7 +128,9 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
         if (current()) { appliedReadAloud = next; emit({ readAloudError: null }); }
         return true;
       }, error => {
-        if (current()) emit({ readAloudError: error.code || error.message || "voice_failed" });
+        if (!current()) return false;
+        if (localSilence) { appliedReadAloud = false; emit({ readAloudError: null }); return true; }
+        emit({ readAloudError: error.code || error.message || "voice_failed" });
         return false;
       }).finally(() => { if (readAloudPending === pending) readAloudPending = null; });
       readAloudPending = pending;

package/voice/presentation.js

@@ -6,7 +6,9 @@ export function voicePanelPresentation(view) {
   const preview = view.mode === "single" && ["preview", "processing"].includes(view.stage);
   const preparing = view.busy || capture === "recording" && view.snapshot?.inputReady === false;
   const recording = capture === "recording" && !preparing;
-  const error = view.error || view.snapshot?.error;
+  const reported = view.error || view.snapshot?.error;
+  // A muted call is not a listen session. "Resume to listen again" is the readout copy.
+  const error = reported === "voice_disconnected" && view.snapshot?.outputMuted ? "voice_background" : reported;
   const phase = view.cancelArmed ? "cancel" : error ? "error" : processing ? "processing" : transcribing ? "transcribing" : preparing ? "preparing" : recording ? "recording" : preview ? "preview" : view.snapshot && view.snapshot.playback !== "idle" ? "speaking" : view.snapshot?.agent === "running" ? "working" : "waiting";
   const status = error ? `error.${error}` : ({ cancel: "gesture.cancelRelease", processing: "dictation.processing", transcribing: "mic.transcribing", preparing: "mic.preparing", recording: "call.listening", preview: "dictation.preview", speaking: "dictation.speaking", working: "call.working", waiting: view.mode === "continuous" ? "gesture.waiting" : "dictation.preview" })[phase];
   return { phase, status, preview, recording, pending: processing || transcribing || preparing, error };

package/voice/stream-client.js

@@ -65,8 +65,9 @@ export async function playAudioStream(options) {
           else if (event.type === "done") { await player.finish(); complete = true; resolve(); }
         }).catch(fail);
       });
-      connection.addEventListener("error", () => fail(new Error("voice_disconnected")), { once: true });
-      connection.addEventListener("close", () => { options.signal?.removeEventListener("abort", cancelled); if (!complete) reject(new Error("voice_disconnected")); }, { once: true });
+      const dropped = () => new Error(options.signal?.aborted ? "voice_cancelled" : "voice_disconnected");
+      connection.addEventListener("error", () => fail(dropped()), { once: true });
+      connection.addEventListener("close", () => { options.signal?.removeEventListener("abort", cancelled); if (!complete) reject(dropped()); }, { once: true });
       if (options.signal?.aborted) cancelled();
     });
     return true;
@@ -101,8 +102,9 @@ export async function startTranscriptionStream(options) {
       else if (event.type === "error") fail(new Error(event.code));
     } catch { fail(new Error("voice_stream_failed")); }
   });
-  connection.addEventListener("close", () => fail(new Error("voice_disconnected")), { once: true });
-  connection.addEventListener("error", () => fail(new Error("voice_disconnected")), { once: true });
+  const dropped = () => fail(new Error(options.signal?.aborted ? "voice_cancelled" : "voice_disconnected"));
+  connection.addEventListener("close", dropped, { once: true });
+  connection.addEventListener("error", dropped, { once: true });
   if (options.signal?.aborted) fail(new Error("voice_cancelled"));
   await ready;
   return {