@olares/lares-core 0.15.23 → 0.15.24

package/package.json

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

package/voice/controller.js

@@ -157,14 +157,15 @@ export function createVoiceController({ input, agent, output, voiceId = mintRpcI
       change({ connection: code ? "paused" : "closed", error: code });
       await Promise.allSettled([cancelInput(), stopPlayback()]);
     },
-    async resume({ shouldResume = () => true } = {}) {
+    async resume({ shouldResume = () => true, resumeListening = !manualTurns } = {}) {
       const resumedEpoch = epoch;
       if (state.connection !== "paused") return;
       const running = state.sessionId ? await agent.running(state.sessionId) : false;
       if (resumedEpoch !== epoch || !shouldResume()) return;
       clearTimers();
       change({ connection: "open", agent: running ? "running" : "idle", error: null });
-      touch(); if (!manualTurns) void listen();
+      touch();
+      if (resumeListening) void listen();
     },
   };
   return controller;

package/voice/panel.js

@@ -55,16 +55,28 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
       if (processing === abort) { processing = null; renderDraft(); }
     }
   };
-  const prepare = async (token) => {
+  const readoutWanted = async () => {
+    if (readAloudPreference === true) return true;
+    if (readAloudPreference === false) return false;
+    return (await loadConfig())?.speak === true;
+  };
+  const prepare = async (token, { readout = false } = {}) => {
+    const armed = () => token === intent && (readout || state.visible);
+    if (readout && !await readoutWanted()) 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);
+      await call.resume({ shouldResume: armed, ...(readout ? { resumeListening: false } : {}) });
+      if (armed() && readout) await panel.setReadAloud(true);
+      else if (armed() && state.mode === "continuous" && typeof readAloudPreference === "boolean") await panel.setReadAloud(readAloudPreference);
+      return;
+    }
+    if (call?.controller.getSnapshot().connection === "open") {
+      if (readout && readAloudPreference === true) await panel.setReadAloud(true);
       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;
+    if (!armed()) return;
     if (state.mode === "continuous" && typeof readAloudPreference === "boolean") config = { ...config, speak: readAloudPreference };
+    if (readout && config.speak !== true) return;
     const initialReadAloud = state.mode === "continuous" && config.speak === true;
     const target = state.sessionId, epoch = ++generation;
     const conversation = await create({ mode: state.mode, sessionId: target, config, preparation: inputPreparation,
@@ -73,7 +85,7 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
         const raw = [state.raw, text].filter(Boolean).join(" "); emit({ raw, draft: raw, edited: false }); save();
       }, onDevice(device) { if (epoch === generation) emit({ device }); },
     });
-    if (token !== intent || !state.visible) { await conversation.stop(); return; }
+    if (!armed()) { await conversation.stop(); return; }
     call = conversation; appliedReadAloud = initialReadAloud;
     unsubscribe = call.controller.subscribe(() => {
       if (epoch !== generation) return;
@@ -82,11 +94,12 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
       emit({ snapshot, ...(snapshot.inputLevel == null ? {} : { levels: [...state.levels.slice(-19), snapshot.inputLevel] }),
         ...(snapshot.capture === "recording" && snapshot.inputReady && !state.startedAt ? { startedAt: Date.now(), elapsedMs: 0 } : snapshot.capture !== "recording" && state.startedAt ? { startedAt: null, elapsedMs: Date.now() - state.startedAt } : {}) });
     });
-    await call.start({ sessionId: target, continuous: state.mode === "continuous", manual: state.mode === "continuous" && manualTurns, shouldStart: () => token === intent && state.visible });
-    if (token !== intent || !state.visible) await call.controller.cancelRecording();
+    await call.start({ sessionId: target, continuous: state.mode === "continuous", manual: state.mode === "continuous" && (manualTurns || readout), shouldStart: armed });
+    if (!armed()) await call.controller.cancelRecording();
     else {
       readAloudReady = true;
-      if (state.mode === "continuous" && typeof readAloudPreference === "boolean") await panel.setReadAloud(readAloudPreference);
+      if (readout) await panel.setReadAloud(true);
+      else if (state.mode === "continuous" && typeof readAloudPreference === "boolean") await panel.setReadAloud(readAloudPreference);
     }
   };
   const pause = async () => {
@@ -165,6 +178,12 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
     close() { intent++; cancelPreparation(); cancelProcessing(); emit({ visible: false, holding: false, cancelArmed: false }); if (state.mode === "continuous") void call?.controller.cancelRecording(); return enqueue(pause); },
     pause() { intent++; cancelPreparation(); cancelProcessing(); emit({ holding: false, cancelArmed: false }); if (state.mode === "continuous") void call?.controller.cancelRecording(); return enqueue(pause); },
     start() { armOutput(); const token = ++intent; return enqueue(() => prepare(token)); },
+    openReadout() {
+      if (state.mode !== "continuous") return Promise.resolve();
+      armOutput();
+      const token = ++intent;
+      return enqueue(() => prepare(token, { readout: true }));
+    },
     finish() {
       if (state.busy) return Promise.resolve();
       const token = intent;

package/voice/presentation.js

@@ -7,25 +7,26 @@ export function voicePanelPresentation(view) {
   const preparing = view.busy || capture === "recording" && view.snapshot?.inputReady === false;
   const recording = capture === "recording" && !preparing;
   const reported = view.error || view.snapshot?.error;
+  // Recovery and idle endings are not failures. Hold and send open readout again.
   // 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 error = QUIET_ENDINGS.has(reported) ? null : 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 };
 }
 
-const RESTART_ERRORS = new Set(["voice_recovery_expired", "voice_idle_timeout"]);
+const QUIET_ENDINGS = new Set(["voice_recovery_expired", "voice_idle_timeout"]);
 
 /**
  * A continuous call that has failed is one composer banner.
- * The session can still be resumed while it is paused; once the recovery
- * window has closed, the only way back is a new call.
+ * A paused session can still be resumed. Recovery and idle endings are quiet:
+ * hold-to-speak and send open readout again, without a banner.
  */
 export function voiceCallFailure(view) {
   if (!view?.visible || view.mode !== "continuous") return null;
   const ui = voicePanelPresentation(view);
   if (!ui.error) return null;
-  const recoverable = view.snapshot?.connection === "paused" && !RESTART_ERRORS.has(ui.error);
+  const recoverable = view.snapshot?.connection === "paused" && !QUIET_ENDINGS.has(ui.error);
   return { code: ui.error, action: recoverable ? "resume" : "restart" };
 }
 
@@ -45,7 +46,8 @@ export function voiceDictationPresentation(view, now = Date.now()) {
 }
 
 export function voiceIndicatorPresentation(view, settingsError = null) {
-  const error = view.error || view.snapshot?.error || view.readAloudError || settingsError;
+  const callError = view.error || view.snapshot?.error;
+  const error = (QUIET_ENDINGS.has(callError) ? null : callError) || view.readAloudError || settingsError;
   const continuous = view.mode === "continuous";
   const active = view.visible && (view.snapshot?.connection === "open" || view.busy && !view.snapshot);
   return {