dsh-xrxs-lingting 0.4.0-dev.50 → 0.4.0-dev.52

package/README.md

@@ -110,3 +110,5 @@ npm run smoke:client -- /path/to/cinlyn-desktop
 该检查不代替安装后对授权、录音、转写和回放的人工验证。
 
 布局回归验证：`node scripts/smoke-layout-browser.mjs <playwright/index.mjs 路径>`，使用 Chrome 无头浏览器运行真实插件产物，验证页面边界、弹窗居中、转写面板层级、窗口缩放与卸载后聊天恢复。使用合成录音状态，不访问业务数据、不采集声音。
+
+设备切换：支持的桌面原生模块会在默认输出变化时重新连接系统采集，插件重新采样并替换默认麦克风输入，保留同一录音与转写连接。操作系统切换设备期间可能存在短暂音频缺口；持续无法恢复才报错暂停。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-xrxs-lingting",
-  "version": "0.4.0-dev.50",
+  "version": "0.4.0-dev.52",
   "type": "module",
   "scripts": {
     "dev": "vite --host 127.0.0.1",

package/plugin-dist/client.js

@@ -1384,7 +1384,21 @@ var XinLingtingService = class {
       this.emit({ operation: null });
     }
   };
-  finish = async () => {
+  finish = async (recordId) => {
+    if (recordId && this.snapshot.active?.id !== recordId) {
+      if (this.snapshot.operation) throw new Error("\u6B63\u5728\u5904\u7406\u5176\u4ED6\u5F55\u97F3\u64CD\u4F5C\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002");
+      this.emit({ operation: "finishing" });
+      try {
+        const record = await this.loadDetail(recordId);
+        if (record.id !== recordId || record.status !== "paused") throw new Error("\u8BB0\u5F55\u72B6\u6001\u5DF2\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\u3002");
+        await this.http.send(this.requests.stop(recordId, msToSeconds(record.durationMs)));
+        this.emit({ catalogVersion: this.snapshot.catalogVersion + 1 });
+        recordProgress(this).track(recordId);
+      } finally {
+        this.emit({ operation: null });
+      }
+      return;
+    }
     const active = this.snapshot.active;
     if (this.snapshot.operation || !active || active.status === "finishing") return;
     const needTeardown = active.status !== "finish-error";
@@ -1606,6 +1620,117 @@ function toSegment(segment) {
   return { id: segment.id, speaker: speakerLabel(segment.speakerId), text: segment.text, final: segment.final };
 }
 
+// src/audio/microphone-switch.ts
+function followDefaultMicrophone(options) {
+  let current = options.initial;
+  let stopped = false;
+  let running = false;
+  let queued = false;
+  let cancelAcquire;
+  let cancelDelay;
+  const delay = () => new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      cancelDelay = void 0;
+      resolve();
+    }, 250);
+    cancelDelay = () => {
+      clearTimeout(timer);
+      cancelDelay = void 0;
+      resolve();
+    };
+  });
+  const watch = (stream) => {
+    stream.getAudioTracks().forEach((track) => {
+      track.onended = () => {
+        void reconnect();
+      };
+    });
+  };
+  const reconnect = async () => {
+    if (stopped) return;
+    if (running) {
+      queued = true;
+      return;
+    }
+    running = true;
+    const began = Date.now();
+    try {
+      do {
+        queued = false;
+        try {
+          const next = await new Promise((resolve, reject) => {
+            let settled = false;
+            const finishError = (error) => {
+              if (settled) return;
+              settled = true;
+              clearTimeout(timer);
+              cancelAcquire = void 0;
+              reject(error);
+            };
+            const timer = setTimeout(() => finishError(new Error("Microphone recovery timed out")), Math.max(0, 8e3 - (Date.now() - began)));
+            cancelAcquire = () => finishError(new Error("Recording stopped"));
+            Promise.resolve().then(options.acquire).then((stream) => {
+              if (settled || stopped) {
+                stream.getTracks().forEach((track) => track.stop());
+                return;
+              }
+              settled = true;
+              clearTimeout(timer);
+              cancelAcquire = void 0;
+              resolve(stream);
+            }, finishError);
+          });
+          if (stopped) {
+            next.getTracks().forEach((track) => track.stop());
+            return;
+          }
+          if (!next.getAudioTracks().some((track) => track.readyState === "live")) {
+            next.getTracks().forEach((track) => track.stop());
+            throw new Error("Microphone is not live");
+          }
+          const previous = current;
+          try {
+            options.replace(next, previous);
+          } catch (error) {
+            next.getTracks().forEach((track) => track.stop());
+            throw error;
+          }
+          current = next;
+          previous.getTracks().forEach((track) => {
+            track.onended = null;
+            track.stop();
+          });
+          watch(current);
+        } catch {
+          if (stopped) return;
+          if (Date.now() - began >= 8e3) {
+            if (!current.getAudioTracks().some((track) => track.readyState === "live")) options.failed();
+            return;
+          }
+          await delay();
+          queued = true;
+        }
+      } while (queued && !stopped);
+    } finally {
+      running = false;
+    }
+  };
+  const changed = () => {
+    void reconnect();
+  };
+  watch(current);
+  options.devices.addEventListener?.("devicechange", changed);
+  return () => {
+    stopped = true;
+    cancelDelay?.();
+    cancelAcquire?.();
+    options.devices.removeEventListener?.("devicechange", changed);
+    current.getTracks().forEach((track) => {
+      track.onended = null;
+    });
+  };
+}
+
 // src/audio/worklet-source.ts
 var captureWorkletSource = `
 class LingtingCaptureProcessor extends AudioWorkletProcessor {
@@ -1663,6 +1788,12 @@ function publishAudioStatus(next) {
   status = next;
   listeners.forEach((listener) => listener());
 }
+var recoveries = [];
+function noteAudioRecovery(samples, rate) {
+  if (!Number.isFinite(samples) || samples <= 0 || !Number.isFinite(rate) || rate < 8e3) return;
+  recoveries.push({ at: Date.now(), droppedMs: samples / rate * 1e3 });
+  if (recoveries.length > 50) recoveries.shift();
+}
 
 // src/audio/native-system.ts
 function nativeSystemAudio() {
@@ -1691,7 +1822,7 @@ class NativeSystemSource extends AudioWorkletProcessor {
   accept(data) {
       if (this.failed) return;
       if (!data || !(data.samples instanceof Float32Array) || !Number.isFinite(data.sampleRate) || data.sampleRate < 8000 || data.sampleRate > 192000) return;
-      if (this.rate && this.rate !== data.sampleRate) { this.fail('\u7CFB\u7EDF\u58F0\u97F3\u91C7\u6837\u7387\u5DF2\u53D8\u5316\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002'); return; }
+      if (this.rate && this.rate !== data.sampleRate) { this.read = 0; this.write = 0; this.started = false; this.buffer.fill(0); }
       this.rate = data.sampleRate;
       // Bound latency, not just memory. After a render stall, retain the newest
       // 100 ms instead of spending minutes playing stale audio or killing capture.
@@ -1784,6 +1915,7 @@ var MeetingCapture = class {
   emitting = false;
   stopSystem = null;
   systemNode = null;
+  stopMicrophoneSwitch = null;
   async start(onChunk, onError) {
     if (this.context || this.starting) throw new Error("\u91C7\u96C6\u5DF2\u5728\u8FDB\u884C\u4E2D\u3002");
     this.starting = true;
@@ -1822,7 +1954,6 @@ var MeetingCapture = class {
       for (const stream of this.streams) {
         for (const track of stream.getAudioTracks()) {
           if (track.readyState !== "live") throw new Error("\u97F3\u9891\u8BBE\u5907\u5DF2\u65AD\u5F00\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002");
-          track.onended = () => fail(stream === microphone ? "\u9EA6\u514B\u98CE\u5DF2\u65AD\u5F00\uFF0C\u5F55\u97F3\u5DF2\u6682\u505C\uFF0C\u8BF7\u68C0\u67E5\u8BBE\u5907\u540E\u7EE7\u7EED\u3002" : "\u7CFB\u7EDF\u58F0\u97F3\u91C7\u96C6\u5DF2\u505C\u6B62\uFF0C\u5F55\u97F3\u5DF2\u6682\u505C\uFF0C\u8BF7\u91CD\u65B0\u6388\u6743\u540E\u7EE7\u7EED\u3002");
         }
       }
       const context = new AudioContext();
@@ -1836,7 +1967,7 @@ var MeetingCapture = class {
           return;
         }
         stalledSince ??= Date.now();
-        if (Date.now() - stalledSince >= 5e3) {
+        if (Date.now() - stalledSince >= 8e3) {
           fail("\u97F3\u9891\u5904\u7406\u6062\u590D\u8D85\u65F6\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002");
           return;
         }
@@ -1846,7 +1977,8 @@ var MeetingCapture = class {
           return;
         }
         recovering = true;
-        void context.resume().catch(() => fail("\u97F3\u9891\u5904\u7406\u65E0\u6CD5\u6062\u590D\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002")).finally(() => {
+        void context.resume().catch(() => {
+        }).finally(() => {
           recovering = false;
         });
       };
@@ -1870,7 +2002,6 @@ var MeetingCapture = class {
       const sources = [context.createMediaStreamSource(microphone)];
       this.nodes.push(sources[0]);
       let startSystem;
-      let recoveryWarning;
       if (system) {
         const sessionId = crypto.randomUUID();
         const source = new AudioWorkletNode(context, "lingting-native-system", {
@@ -1884,8 +2015,7 @@ var MeetingCapture = class {
           if (generation !== this.generation) return;
           if (event.data?.error) fail(event.data.error);
           if (event.data?.droppedSamples > 0) {
-            recoveryWarning = "\u7CFB\u7EDF\u58F0\u97F3\u5904\u7406\u66FE\u77ED\u6682\u79EF\u538B\uFF0C\u5DF2\u6062\u590D\u5B9E\u65F6\u5F55\u97F3\uFF1B\u90E8\u5206\u7CFB\u7EDF\u58F0\u97F3\u53EF\u80FD\u7F3A\u5931\u3002";
-            publishAudioStatus({ mode: this.mode, microphone: 0, system: 0, warning: recoveryWarning });
+            noteAudioRecovery(event.data.droppedSamples, event.data.sampleRate);
           }
         };
         const receivePort = (event) => {
@@ -1924,6 +2054,24 @@ var MeetingCapture = class {
         this.nodes.push(source, analyser, gain);
         analysers.push(analyser);
       }
+      this.stopMicrophoneSwitch = followDefaultMicrophone({
+        devices,
+        initial: microphone,
+        acquire: () => devices.getUserMedia({ audio: { channelCount: 1, echoCancellation: true, noiseSuppression: true, autoGainControl: true } }),
+        replace: (next, previous) => {
+          if (generation !== this.generation) throw new Error("\u5F55\u97F3\u5DF2\u53D6\u6D88\u3002");
+          const replacement = context.createMediaStreamSource(next);
+          replacement.connect(analysers[0]);
+          const oldSource = sources[0];
+          oldSource.disconnect();
+          sources[0] = replacement;
+          this.nodes = this.nodes.filter((item) => item !== oldSource);
+          this.nodes.push(replacement);
+          this.streams = this.streams.filter((item) => item !== previous);
+          this.streams.push(next);
+        },
+        failed: () => fail("\u9EA6\u514B\u98CE\u5207\u6362\u540E\u672A\u80FD\u6062\u590D\uFF0C\u5F55\u97F3\u5DF2\u6682\u505C\uFF0C\u8BF7\u68C0\u67E5\u8BBE\u5907\u8FDE\u63A5\u3002")
+      });
       const mute = context.createGain();
       mute.gain.value = 0;
       node.connect(mute);
@@ -1944,12 +2092,7 @@ var MeetingCapture = class {
           analyser.getFloatTimeDomainData(samples);
           return Math.min(1, Math.sqrt(samples.reduce((sum, sample) => sum + sample * sample, 0) / samples.length) * 4);
         });
-        publishAudioStatus({
-          mode: this.mode,
-          microphone: this.emitting ? levels[0] : 0,
-          system: this.emitting ? levels[1] ?? 0 : 0,
-          warning: recoveryWarning
-        });
+        publishAudioStatus({ mode: this.mode, microphone: this.emitting ? levels[0] : 0, system: this.emitting ? levels[1] ?? 0 : 0 });
       }, 200);
     } catch (error) {
       if (generation === this.generation) await this.stop();
@@ -1970,6 +2113,8 @@ var MeetingCapture = class {
   }
   async stop() {
     ++this.generation;
+    this.stopMicrophoneSwitch?.();
+    this.stopMicrophoneSwitch = null;
     this.emitting = false;
     if (this.timer) clearInterval(this.timer);
     this.timer = null;
@@ -3008,6 +3153,23 @@ function RecordViewer({ service, recordId, onLoaded }) {
   const [refreshing, setRefreshing] = (0, import_react13.useState)(false);
   const [summaryError, setSummaryError] = (0, import_react13.useState)("");
   const [resuming, setResuming] = (0, import_react13.useState)(false);
+  const [confirmFinish, setConfirmFinish] = (0, import_react13.useState)(false);
+  const [finishing, setFinishing] = (0, import_react13.useState)(false);
+  const finishRecording = async () => {
+    if (finishing || resuming) return;
+    setFinishing(true);
+    setResumeError("");
+    try {
+      await service.finish(recordId);
+      setLoaded((current) => current ? { ...current, status: "finishing" } : current);
+      setConfirmFinish(false);
+    } catch (e) {
+      setResumeError(e instanceof Error ? e.message : "\u7ED3\u675F\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\u3002");
+      setConfirmFinish(false);
+    } finally {
+      setFinishing(false);
+    }
+  };
   const [resumeError, setResumeError] = (0, import_react13.useState)("");
   const [shareOpen, setShareOpen] = (0, import_react13.useState)(false);
   (0, import_react13.useEffect)(() => {
@@ -3140,12 +3302,20 @@ function RecordViewer({ service, recordId, onLoaded }) {
       ] })
     ] }),
     loaded.status === "paused" && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "lt-resume", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("button", { className: "lt-primary", onClick: () => void resumeRecording(), disabled: resuming, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("button", { className: "lt-primary", onClick: () => void resumeRecording(), disabled: resuming || finishing, children: [
         resuming ? /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Spinner, { size: 15 }) : /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Mic, { size: 15 }),
         resuming ? "\u6B63\u5728\u7EE7\u7EED\u2026" : "\u7EE7\u7EED\u5F55\u97F3"
       ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("button", { className: "button danger", disabled: resuming || finishing, onClick: () => setConfirmFinish(true), children: "\u7ED3\u675F\u7075\u542C" }),
       /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { children: "\u7EE7\u7EED\u540E\u5B9E\u65F6\u8F6C\u5199\u56DE\u5230\u8FD9\u4E2A\u9762\u677F" })
     ] }),
+    confirmFinish && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(Modal, { title: "\u7ED3\u675F\u8FD9\u573A\u7075\u542C\uFF1F", busy: finishing, onClose: () => setConfirmFinish(false), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("p", { children: "\u7ED3\u675F\u540E\u5C06\u6574\u7406\u5DF2\u6709\u8F6C\u5199\uFF0C\u65E0\u6CD5\u7EE7\u7EED\u8FD9\u573A\u5F55\u97F3\u3002" }),
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "modal-actions", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("button", { className: "button", disabled: finishing, onClick: () => setConfirmFinish(false), children: "\u6682\u4E0D\u7ED3\u675F" }),
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("button", { className: "button danger", disabled: finishing, onClick: () => void finishRecording(), children: finishing ? "\u6B63\u5728\u7ED3\u675F\u2026" : "\u7ED3\u675F\u7075\u542C" })
+      ] })
+    ] }),
     resumeError && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "lt-resume-error", children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(ErrorNotice, { action: "\u77E5\u9053\u4E86", onAction: () => setResumeError(""), children: resumeError }) }),
     (loaded.status === "finishing" || loaded.status === "interrupted") && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "lt-settling", children: [
       /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Spinner, { size: 13 }),
@@ -4292,7 +4462,7 @@ function MeetingPrompt({ service }) {
   const meeting = useMeetingPrompt({ service });
   if (!meeting.prompt) return null;
   const appName = meeting.prompt.appName;
-  const headline = meeting.pending ? "\u6B63\u5728\u5F00\u542F\u7075\u542C" : meeting.error ? "\u7075\u542C\u542F\u52A8\u672A\u5B8C\u6210" : meeting.confidence === "suspected" ? `\u68C0\u6D4B\u5230\u53EF\u80FD\u7684\u901A\u8BDD\u6D3B\u52A8\uFF08${appName}\uFF09` : `\u68C0\u6D4B\u5230${appName}\u4F1A\u8BAE`;
+  const headline = meeting.pending ? "\u6B63\u5728\u5F00\u542F\u7075\u542C" : meeting.error ? "\u7075\u542C\u542F\u52A8\u672A\u5B8C\u6210" : meeting.confidence === "suspected" ? `\u68C0\u6D4B\u5230\u53EF\u80FD\u7684\u901A\u8BDD\u6D3B\u52A8\uFF08${appName}\uFF09` : `${appName}\u53EF\u80FD\u6B63\u5728\u901A\u8BDD`;
   return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("aside", { className: "lingting-root lt-meeting", "aria-label": "\u4F1A\u8BAE\u63D0\u9192", children: [
     /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: "lt-meeting-head", children: [
       /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Headphones, { size: 16 }),
@@ -5450,7 +5620,7 @@ function mountBusinessSurface(doc) {
     else center.style.removeProperty("position");
   } };
 }
-function BusinessSurface({ children }) {
+function BusinessSurface({ children, onClose }) {
   const [target, setTarget] = (0, import_react22.useState)(null);
   (0, import_react22.useLayoutEffect)(() => {
     let mounted = null;
@@ -5461,9 +5631,18 @@ function BusinessSurface({ children }) {
       setTarget(mounted?.target ?? null);
     };
     attach();
+    const onSidebarClick = (event) => {
+      const element = event.target instanceof Element ? event.target : null;
+      const button = element?.closest("button");
+      if (!button?.closest('[data-slot="sidebar"]')) return;
+      const label = button.getAttribute("aria-label")?.trim();
+      if (label && /^(新会话|新建会话|New session)$/i.test(label)) onClose();
+    };
+    document.addEventListener("click", onSidebarClick, true);
     const observer = new MutationObserver(attach);
     observer.observe(document.body, { childList: true, subtree: true });
     return () => {
+      document.removeEventListener("click", onSidebarClick, true);
       observer.disconnect();
       mounted?.dispose();
     };
@@ -5537,7 +5716,7 @@ async function apply(ctx) {
   function Overlay() {
     const page = (0, import_react23.useSyncExternalStore)(business.subscribe, business.getSnapshot, business.getSnapshot);
     return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
-      !hostBusiness && page.activeId === ID && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(BusinessSurface, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Page, { activeId: page.activeId }) }),
+      !hostBusiness && page.activeId === ID && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(BusinessSurface, { onClose: () => business.close(), children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Page, { activeId: page.activeId }) }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(PanelBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(XinHostNotice, { store: hostState }) }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(PanelBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(LingtingSidebar, { service, controller, onOpenPage: () => business.open(ID) }) }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(PanelBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(MeetingPrompt, { service }) })

package/plugin-dist/index.js

@@ -756,7 +756,7 @@ function createMeetingPolicy(options = {}) {
     }
     if (!config.enabled) return { prompt: null, suppressed: "disabled" };
     const candidates = sessions.filter(
-      (session) => session.state === "meeting" && session.confidence !== "none" && (restartSuppression.get(session.appId) ?? 0) <= at && (config.apps.length === 0 || config.apps.includes(session.appId)) && !config.mutedApps.includes(session.appId)
+      (session) => session.state === "meeting" && session.confidence === "high" && (restartSuppression.get(session.appId) ?? 0) <= at && (config.apps.length === 0 || config.apps.includes(session.appId)) && !config.mutedApps.includes(session.appId)
     );
     if (candidates.length === 0) return { prompt: null, suppressed: null };
     if (inQuietHours(config, new Date(at))) return { prompt: null, suppressed: "quiet-hours" };
@@ -929,7 +929,7 @@ function createMeetingRuntime(options = {}) {
       const result = await supervisor.command("prompt.show", {
         promptId: record.promptId,
         title: "\u7075\u542C",
-        subtitle: `\u68C0\u6D4B\u5230${record.appName}\u4F1A\u8BAE`,
+        subtitle: `${record.appName}\u53EF\u80FD\u6B63\u5728\u901A\u8BDD`,
         message: "\u9700\u8981\u6211\u5E2E\u4F60\u5F00\u542F\u5F55\u97F3\u8F6C\u5199\u5417\uFF1F\u53EF\u4EE5\u751F\u6210\u5F55\u97F3\u7EAA\u8981\u5E76\u5BF9\u5185\u5BB9\u63D0\u95EE",
         acceptLabel: "\u5F00\u542F\u5F55\u97F3\u8F6C\u5199",
         ignoreLabel: "\u5FFD\u7565",