@olares/lares-core 0.15.14 → 0.15.16

package/i18n/voice.js

@@ -1,4 +1,12 @@
 export const ZH = {
+  "pc.conversation": "开始语音对话",
+  "pc.pause": "暂停语音对话",
+  "pc.resume": "继续语音对话",
+  "pc.finish": "完成听写",
+  "pc.retry": "重试",
+  "pc.paused": "语音已暂停",
+  "pc.speaking": "正在朗读",
+  "pc.finishFirst": "请先完成或取消听写",
   "input.keyboard": "键盘",
   "input.stopSpeaking": "停止朗读",
   "gesture.cancelRelease": "松开取消",
@@ -24,6 +32,7 @@ export const ZH = {
   "dictation.discard": "放弃",
   "dictation.original": "查看原文",
   "dictation.processing": "正在整理文字…",
+  "dictation.processingFailed": "文字整理失败，原始转写已保留",
   "dictation.preview": "预览并编辑",
   "dictation.retry": "重试",
   "dictation.useOriginal": "使用原文",
@@ -233,6 +242,14 @@ export const ZH = {
 };
 
 export const EN = {
+  "pc.conversation": "Start voice conversation",
+  "pc.pause": "Pause voice conversation",
+  "pc.resume": "Resume voice conversation",
+  "pc.finish": "Finish dictation",
+  "pc.retry": "Retry",
+  "pc.paused": "Voice paused",
+  "pc.speaking": "Speaking",
+  "pc.finishFirst": "Finish or discard dictation first",
   "input.keyboard": "Keyboard",
   "input.stopSpeaking": "Stop speaking",
   "gesture.cancelRelease": "Release to cancel",
@@ -258,6 +275,7 @@ export const EN = {
   "dictation.discard": "Discard",
   "dictation.original": "View original",
   "dictation.processing": "Refining text…",
+  "dictation.processingFailed": "Text processing failed. Original transcript preserved.",
   "dictation.preview": "Preview and edit",
   "dictation.retry": "Retry",
   "dictation.useOriginal": "Use original",

package/package.json

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

package/voice/panel.js

@@ -1,13 +1,13 @@
 import { DICTATION_PRESETS } from "./dictation.js";
 
 /** The panel owns drafts and turn policy; adapters only supply settings, audio and insertion ports. */
-export function createVoicePanel({ create, complete, loadConfig = async () => ({}), process = async ({ text }) => text, onSession = () => {} }) {
+export function createVoicePanel({ create, complete, loadConfig = async () => ({}), process = async ({ text }) => text, onSession = () => {}, manualTurns = true, inlineDictation = false }) {
   let state = { visible: false, inputActive: false, previewVisible: false, mode: "single", sessionId: null, raw: "", draft: "", edited: false, preset: "clean", stage: "idle", snapshot: null, busy: false, error: null, device: "", levels: [], startedAt: null, elapsedMs: 0, holding: false, cancelArmed: false };
   let call = null, config = null, generation = 0, intent = 0, processing = null;
   let unsubscribe = () => {};
   let serial = Promise.resolve();
   const drafts = new Map(), listeners = new Set();
-  const emit = (patch) => { state = { ...state, ...patch }; state.previewVisible = state.visible && state.mode === "single" && (state.stage === "preview" || state.stage === "processing" && state.previewVisible); state.inputActive = state.visible && !state.previewVisible; for (const listener of listeners) listener(); };
+  const emit = (patch) => { state = { ...state, ...patch }; state.previewVisible = !inlineDictation && state.visible && state.mode === "single" && (state.stage === "preview" || state.stage === "processing" && state.previewVisible); state.inputActive = state.visible && !state.previewVisible; for (const listener of listeners) listener(); };
   const save = () => state.mode === "single" && drafts.set(state.sessionId, { raw: state.raw, draft: state.draft, edited: state.edited, preset: state.preset, config });
   const cancelProcessing = () => { processing?.abort(); processing = null; };
   const enqueue = (operation) => {
@@ -72,13 +72,19 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
       emit({ snapshot, ...(snapshot.inputLevel == null ? {} : { levels: [...state.levels.slice(-19), snapshot.inputLevel] }),
         ...(snapshot.capture === "recording" && state.snapshot?.capture !== "recording" ? { 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", shouldStart: () => token === intent && state.visible });
+    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();
   };
   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(); }
   };
+  const insertDraft = async () => {
+    if (!state.draft || state.stage !== "preview") return;
+    await complete({ sessionId: state.sessionId, text: state.draft });
+    drafts.delete(state.sessionId); config = null;
+    emit({ raw: "", draft: "", edited: false, stage: "idle", visible: false }); await end();
+  };
   const panel = {
     getSnapshot: () => state,
     subscribe(listener) { listeners.add(listener); return () => listeners.delete(listener); },
@@ -105,7 +111,16 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
     close() { intent++; cancelProcessing(); emit({ visible: false, holding: false, cancelArmed: false }); if (state.mode === "continuous") void call?.controller.cancelRecording(); return enqueue(pause); },
     pause() { intent++; cancelProcessing(); emit({ holding: false, cancelArmed: false }); if (state.mode === "continuous") void call?.controller.cancelRecording(); return enqueue(pause); },
     start() { const token = ++intent; return enqueue(() => prepare(token)); },
-    finish: () => state.busy ? Promise.resolve() : enqueue(async () => { await finishCapture(); if (state.raw) await transform(state.preset); else renderDraft(); }),
+    finish() {
+      if (state.busy) return Promise.resolve();
+      const token = intent;
+      return enqueue(async () => {
+        await finishCapture();
+        if (token !== intent) return;
+        if (state.raw) await transform(state.preset); else renderDraft();
+        if (inlineDictation && token === intent && state.visible && state.draft && !state.error) await insertDraft();
+      });
+    },
     edit(text) { cancelProcessing(); emit({ draft: text, edited: true, stage: "preview" }); save(); },
     selectPreset(preset, replaceEdited = false) {
       if (state.edited && !replaceEdited) return Promise.resolve(false);
@@ -127,12 +142,8 @@ export function createVoicePanel({ create, complete, loadConfig = async () => ({
       if (!call) return Promise.resolve();
       return Promise.resolve(cancel || !call.controller.getSnapshot().inputReady ? call.controller.cancelRecording() : call.controller.stopRecording());
     },
-    complete() { return enqueue(async () => {
-      if (!state.draft || state.stage !== "preview") return;
-      await complete({ sessionId: state.sessionId, text: state.draft });
-      drafts.delete(state.sessionId); config = null; emit({ raw: "", draft: "", edited: false, stage: "idle", visible: false }); await end();
-    }); },
-    discard() { intent++; cancelProcessing(); return enqueue(async () => { await end(); drafts.delete(state.sessionId); config = null; emit({ raw: "", draft: "", edited: false, stage: "idle", visible: false }); }); },
+    complete() { return enqueue(insertDraft); },
+    discard() { intent++; cancelProcessing(); void call?.controller.cancelRecording().catch(() => {}); return enqueue(async () => { await end(); drafts.delete(state.sessionId); config = null; emit({ raw: "", draft: "", edited: false, stage: "idle", visible: false }); }); },
     end() { intent++; emit({ holding: false, cancelArmed: false }); return enqueue(async () => { await end(); emit({ visible: false }); }); },
     dispose() { intent++; cancelProcessing(); return enqueue(async () => { try { await end(); } finally { listeners.clear(); drafts.clear(); } }); },
   };

package/voice/presentation.js

@@ -20,3 +20,32 @@ export function voiceInputPresentation(view, now = Date.now()) {
   const label = ui.pending ? ui.status : view.cancelArmed ? "gesture.cancelRelease" : view.holding ? "gesture.release" : view.mode === "single" ? ui.error ? "dictation.retry" : "dictation.finish" : "dictation.hold";
   return { ...ui, label, elapsed, disabled: ui.pending && !view.holding, timed: ui.recording || view.holding };
 }
+
+export function voiceDictationPresentation(view, now = Date.now()) {
+  const ui = voiceInputPresentation(view, now);
+  const processingFailed = Boolean(view.raw && view.error && view.error !== "voice_draft_changed");
+  return { ...ui, waveform: ui.phase === "recording" && !ui.error, processingFailed, recoverable: Boolean(view.raw && ui.error) };
+}
+
+/** Discovery establishes capability; a transient connection error does not revoke it. */
+export function voiceAvailability(settings) {
+  if (!settings) return { dictation: false, conversation: false, reason: "loading" };
+  const config = settings.config || {};
+  const available = (models, selected) => Array.isArray(models) && models.length > 0 && (!selected || models.includes(selected));
+  const dictation = available(settings.sttModels, config.model);
+  const chat = config.preset === "direct" || available(settings.chatModels, config.chatModel === "default-chat" ? "" : config.chatModel);
+  const pipeline = dictation && available(settings.ttsModels, config.ttsModel) && chat;
+  // Automatic turns against native Realtime still require independent acceptance.
+  return { dictation, conversation: config.backend !== "realtime" && pipeline, reason: !dictation ? "asr" : !pipeline ? "conversation" : config.backend === "realtime" ? "realtime" : null };
+}
+
+export function voicePrimaryAction({ view, available, empty, running, disabled = false, nativeDisabled = false }) {
+  if (view.visible && view.mode === "single") return { action: view.error || view.snapshot?.error ? "retry" : "finish", disabled: disabled || view.busy || view.stage === "processing" || view.snapshot?.capture === "transcribing" };
+  if (!empty) return { action: "native", disabled: nativeDisabled };
+  if (view.visible && view.mode === "continuous") {
+    const active = view.busy || view.snapshot?.connection === "open";
+    return { action: active ? "pause" : available ? "resume" : "native", disabled: disabled || !active && !available };
+  }
+  if (running) return { action: "native", disabled: nativeDisabled };
+  return { action: available ? "conversation" : "native", disabled: disabled || !available };
+}