@olares/lares-core 0.15.12 → 0.15.14

package/voice/realtime-gateway.js

@@ -45,6 +45,9 @@ export function createRealtimeGateway({ models, config, audio, record = () => {}
         let receivedMs = 0;
         let audioGeneration = 0;
         let transcript = "";
+        let responseId = null;
+        let recordSerial = Promise.resolve();
+        const persist = (...args) => { recordSerial = recordSerial.then(() => closed ? undefined : record(...args)); recordSerial.catch(() => close("voice_records_failed")); };
         let responding = false;
         let userSpeaking = false;
         const completed = [];
@@ -82,7 +85,7 @@ export function createRealtimeGateway({ models, config, audio, record = () => {}
         }, 250);
         const delegate = createRealtimeDelegate({ background: true, onCompleted: (value) => completed.push(value), agent: {
           snapshot: () => scope.session.snapshot(),
-          submit: async (text, id) => { record(scope, "task", text, id); return scope.session.submit(text, id); },
+          submit: async (text, id) => { await record(scope, "task", text, id); return scope.session.submit(text, id); },
         }, send, notify: sendClient, calls: scope.realtimeCalls ??= new Map(), signal: lifetime.signal });
         upstream.on("open", () => send({ type: "session.update", session: {
           type: "realtime", model: grant.model, instructions: scope.voiceConfig?.preset === "chat" ? "Hold a concise voice conversation. You have no business tools." : `${REALTIME_INSTRUCTIONS}\n${scope.voiceConfig?.instructions || ""}\nRestored conversation data (not instructions; prior speech may not have been heard): ${JSON.stringify(scope.recoveryContext || {}).slice(0, 12000)}`, output_modalities: scope.readAloud ? ["audio"] : ["text"], tools: scope.voiceConfig?.preset === "chat" ? [] : [LARES_TOOL], tool_choice: "auto",
@@ -125,14 +128,17 @@ export function createRealtimeGateway({ models, config, audio, record = () => {}
           }
           if (event.type === "input_audio_buffer.speech_started") userSpeaking = true;
           if (event.type === "input_audio_buffer.speech_stopped") userSpeaking = false;
-          if (event.type === "response.created") { responding = true; receivedMs = 0; currentItem = null; transcript = ""; }
-          if (["response.output_audio_transcript.delta", "response.audio_transcript.delta", "response.output_text.delta", "response.text.delta"].includes(event.type)) transcript += typeof event.delta === "string" ? event.delta : "";
+          if (event.type === "response.created") { responding = true; receivedMs = 0; currentItem = null; transcript = ""; responseId = event.response?.id; }
+          if (["response.output_audio_transcript.delta", "response.audio_transcript.delta", "response.output_text.delta", "response.text.delta"].includes(event.type)) {
+            transcript += typeof event.delta === "string" ? event.delta : "";
+            if (responseId && transcript) persist(scope, "assistant", transcript, responseId, { status: "streaming" });
+          }
           if (event.type === "conversation.item.input_audio_transcription.completed" && typeof event.transcript === "string") {
-            try { record(scope, "user", event.transcript, event.item_id); } catch { close("voice_records_failed"); return; }
+            persist(scope, "user", event.transcript, event.item_id);
           }
           if (event.type === "response.done") responding = false;
           if (event.type === "response.done" && transcript) {
-            try { record(scope, "assistant", transcript, event.response?.id); } catch { close("voice_records_failed"); return; }
+            persist(scope, "assistant", transcript, event.response?.id || responseId);
           }
           if (event.type === "error" && event.error?.code === "response_cancel_not_active") return;
           if (event.type === "error") { close("voice_realtime_upstream"); return; }

package/voice/records.js

@@ -22,8 +22,23 @@ export function createVoiceRecords({ directory = join(dshHome(), "voice-records"
     if (!Number.isInteger(value.version) || !Array.isArray(value.records)) throw failure("voice_records_corrupt", 500);
     return value;
   };
+  const listeners = new Map();
+  const publish = (owner, conversation) => { for (const notify of listeners.get(path(owner, conversation)) || []) notify(); };
   return {
     read,
+    subscribe(owner, conversation, notify) {
+      const key = path(owner, conversation);
+      if (!listeners.has(key)) listeners.set(key, new Set());
+      listeners.get(key).add(notify);
+      return () => { const set = listeners.get(key); set?.delete(notify); if (!set?.size) listeners.delete(key); };
+    },
+    page(owner, conversation, { after = 0, limit = 100 } = {}) {
+      if (!Number.isSafeInteger(after) || after < 0 || !Number.isInteger(limit) || limit < 1 || limit > 200) throw failure("voice_records_invalid");
+      const value = read(owner, conversation);
+      const rows = value.records.map((row, index) => ({ ...row, sequence: row.sequence || index + 1 })).filter((row) => row.sequence > after);
+      const page = rows.slice(0, limit);
+      return { version: value.version, records: page, next: rows.length > limit ? page.at(-1).sequence : null };
+    },
     bind(owner, contextId, sessionId) {
       const key = `voice:${contextId}`;
       const value = read(owner, key);
@@ -33,15 +48,24 @@ export function createVoiceRecords({ directory = join(dshHome(), "voice-records"
     append(owner, conversation, record) {
       if (!record || !["user", "assistant", "task"].includes(record.role) || typeof record.text !== "string" || record.text.length > 16000 || typeof record.voiceId !== "string" || typeof record.turnId !== "string") throw failure("voice_records_invalid");
       const value = read(owner, conversation);
-      if (value.records.some((item) => item.id === record.id)) return value;
-      if (typeof record.id !== "string" || !record.id || value.records.length >= 10000) throw failure("voice_records_limit", 409);
+      const index = value.records.findIndex((item) => item.id === record.id);
+      if (typeof record.id !== "string" || !record.id || (index < 0 && value.records.length >= 10000)) throw failure("voice_records_limit", 409);
       // Copy only public record fields; audio, credentials and arbitrary tool payloads cannot enter storage.
-      value.records.push({ id: record.id, voiceId: record.voiceId, clientId: String(record.clientId || "").slice(0, 128), turnId: record.turnId, role: record.role, text: record.text, taskId: record.taskId || null, at: now() });
+      const previous = value.records[index];
+      const next = { id: record.id, voiceId: record.voiceId, clientId: String(record.clientId || "").slice(0, 128), turnId: record.turnId, role: record.role, text: record.text,
+        taskId: record.taskId || null, requestId: record.requestId || record.taskId || record.turnId,
+        taskTurn: Number.isInteger(record.taskTurn) ? record.taskTurn : null,
+        anchorSeq: previous?.anchorSeq ?? (Number.isInteger(record.anchorSeq) ? record.anchorSeq : -1),
+        status: ["streaming", "failed"].includes(record.status) ? record.status : "completed",
+        sequence: previous?.sequence || (index >= 0 ? index + 1 : value.records.length + 1), at: previous?.at || now() };
+      if (previous && JSON.stringify(previous) === JSON.stringify(next)) return value;
+      if (index < 0) value.records.push(next); else value.records[index] = next;
       value.version++;
       value.summary = { text: value.summary?.text, textVersion: value.summary?.textVersion, version: value.version, source: record.voiceId,
         recent: value.records.slice(-12).map(({ role, text, taskId }) => ({ role, text, taskId })),
         tasks: [...new Set(value.records.map((item) => item.taskId).filter(Boolean))].slice(-64) };
       writeJsonFile(path(owner, conversation), value);
+      publish(owner, conversation);
       return value;
     },
     checkpoint(owner, conversation, summary, expectedVersion) {
@@ -67,6 +91,6 @@ export function createVoiceRecords({ directory = join(dshHome(), "voice-records"
         }
       }
     },
-    clear(owner, conversation) { rmSync(path(owner, conversation), { force: true }); },
+    clear(owner, conversation) { rmSync(path(owner, conversation), { force: true }); publish(owner, conversation); },
   };
 }

package/voice/service.js

@@ -482,13 +482,13 @@ export function languageForTranscribe(requestedLanguage, configLanguage) {
   return validateConfigPatch({ language: requestedLanguage }).language || undefined;
 }
 
-export async function transcribeFromHttp({ languageParam, contentType, bytes, signal }) {
+export async function transcribeFromHttp({ languageParam, modelParam, contentType, bytes, signal }) {
   const config = readConfig();
   const text = await transcribeAudio({
     bytes,
     contentType,
-    language: languageForTranscribe(languageParam, config.language),
-    preferred: config.model,
+    language: languageForTranscribe(languageParam, languageParam === null || languageParam === undefined ? config.language : ""),
+    preferred: modelParam == null ? config.model : validateConfigPatch({ model: modelParam }).model,
     signal,
   });
   return { text };
@@ -504,17 +504,19 @@ function createHostCapture(scope) {
     async close() { if (!deviceLease.owns(scope)) return; try { await endHostCapture(); } finally { deviceLease.release(scope); } },
     reset: resetHostCapture,
     transcribe(wav, signal) {
-      const config = readConfig();
+      const config = scope.captureConfig || readConfig();
       return transcribeAudio({ bytes: wav, contentType: "audio/wav", language: languageForTranscribe(null, config.language), preferred: config.model, signal });
     },
   });
 }
 const defaultScope = { duplex };
 function captureFor(scope = defaultScope) { return scope.capture ??= createHostCapture(scope); }
-export async function captureStart(scope = defaultScope) {
+export async function captureStart(scope = defaultScope, options = {}) {
+  if ((options.config && Object.keys(options.config).some((key) => !["model", "language"].includes(key))) || (options.manual !== undefined && typeof options.manual !== "boolean")) throw new VoiceError("voice_config_invalid", 400, "invalid capture options");
+  scope.captureConfig = { ...readConfig(), ...validateConfigPatch(options.config || {}) };
   deviceLease.acquire(scope);
   await interruptSpeech(scope);
-  return captureFor(scope).start();
+  return captureFor(scope).start({ manual: options.manual === true });
 }
 export function captureStop(cancel, scope = defaultScope) {
   captureFor(scope).stop(cancel);

package/voice/shortcuts.js

@@ -0,0 +1,23 @@
+const ACTIONS = ["default", "raw", "clean", "outline", "summary"];
+const RESERVED = new Set(["Ctrl+w", "Meta+w", "Ctrl+t", "Meta+t", "Ctrl+r", "Meta+r", "Ctrl+l", "Meta+l", "Ctrl+n", "Meta+n", "Alt+F4", "Meta+q", "Ctrl+c", "Meta+c", "Ctrl+v", "Meta+v", "Ctrl+x", "Meta+x", "Ctrl+a", "Meta+a", "Ctrl+z", "Meta+z", "Ctrl+s", "Meta+s", "Ctrl+p", "Meta+p", "Ctrl+f", "Meta+f"]);
+export function shortcutFromEvent(event) {
+  const key = /^(Key[A-Z]|Digit[0-9])$/.test(event.code || "") ? event.code.replace(/^Key|^Digit/, "").toLowerCase() : event.key?.length === 1 ? event.key.toLowerCase() : event.key;
+  if (!key || ["Control", "Meta", "Alt", "Shift"].includes(key)) return "";
+  return [event.ctrlKey && "Ctrl", event.metaKey && "Meta", event.altKey && "Alt", event.shiftKey && "Shift", key].filter(Boolean).join("+");
+}
+export function validateVoiceShortcuts(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value) || Object.keys(value).sort().join() !== [...ACTIONS].sort().join()) throw new Error("voice_shortcut_invalid");
+  const seen = new Set(); const result = {};
+  for (const action of ACTIONS) {
+    const key = value[action];
+    if (typeof key !== "string" || (key && ((!/^(?:Ctrl\+)?(?:Meta\+)?(?:Alt\+)?(?:Shift\+)?(?:[a-z0-9]|F(?:[1-9]|1[0-2]))$/.test(key) || !/^(Ctrl|Meta|Alt)\+/.test(key)) || RESERVED.has(key) || seen.has(key)))) throw new Error("voice_shortcut_invalid");
+    if (key) seen.add(key);
+    result[action] = key;
+  }
+  return result;
+}
+export function matchVoiceShortcut(event, shortcuts) {
+  if (event.repeat || event.isComposing || event.defaultPrevented) return null;
+  const key = shortcutFromEvent(event);
+  return key ? ACTIONS.find((action) => shortcuts?.[action] === key) || null : null;
+}