@agent-native/core 0.153.10 → 0.154.0

package/corpus/templates/analytics/server/plugins/agent-chat.ts

@@ -105,6 +105,9 @@ function hasPartialDashboardBuild(
 export const BOUNDED_STRUCTURED_LOOKUP_GUIDANCE =
   "BOUNDED STRUCTURED LOOKUP FAST PATH — Treat existing analytics work like an engineer treats existing code: grep before writing. For an ordinary count, aggregate, grouped metric, trend, or record lookup, first call `search-analytics-query-catalog` once with focused metric/entity terms. It searches accessible dashboard names, chart titles/descriptions/saved queries, shipped dashboard patterns, and data-dictionary definitions together. Prefer the strongest approved dictionary or saved-chart match, preserve its source and business logic, adapt only the requested filters and explicit time window, then run one bounded query against that source. A user-named source wins, but still use a matching saved definition when it supplies the source's proven query shape. If there is no useful match, inspect only the most likely source schema or ask one clarification; do not fan out across providers. Do not separately list every dashboard, call data-source status, browse the whole dictionary, load provider catalogs/corpus tools, or query a second source after a strong match. Once the query succeeds, answer immediately with its source, time window, filters, row count, and only necessary caveats. Do not enrich, cross-check, retry, or add breakdowns unless the user requested them, the first query failed, or its result conflicts with the known definition. The words `all`, `total`, or `exact` in a structured aggregate do not by themselves make it a corpus investigation. Never repeat an identical invalid or failed tool call; correct its arguments once or surface the error. This does not waive the real-data requirement: never answer from a guess, stale value, or unverified result. ";
 
+export const DASHBOARD_REFERENCE_GUIDANCE =
+  "DASHBOARD REFERENCE DISCOVERY — When the user asks to replicate, clone, or adapt an existing dashboard, this branch takes precedence over the ordinary metric fast path: call `search-dashboard-references` with focused terms before creating, editing, or querying anything. It searches accessible active saved dashboard ids, names, descriptions, and serialized config with bounded SQL wildcard matches, including legacy saved dashboards. Treat each result as a reference to inspect with `get-sql-dashboard` when `kind` is `sql` or `get-explorer-dashboard` when `kind` is `explorer`, not as proof that its source is authoritative for the new request. Do not automatically route a replication request to first-party Analytics or copy its source semantics without checking the user's requested provider and scope. ";
+
 export const BUILT_IN_FIRST_PARTY_SOURCE_GUIDANCE =
   "BUILT-IN FIRST-PARTY SOURCE — Analytics always provides one built-in first-party source alongside connected external providers such as BigQuery, HubSpot, Gong, Slack, and the other configured integrations. This does not replace or restrict external sources. When `search-analytics-query-catalog` identifies a first-party dashboard/chart definition, preserve its event semantics and use `query-agent-native-analytics` over `analytics_events` or `session_recordings` as appropriate. When the user names an external provider, or the catalog identifies one as authoritative, query that provider instead. Do not report the first-party source as disconnected merely because an external provider is not configured. If the authoritative query returns no rows, report that grounded result with its scope and time window. ";
 
@@ -146,11 +149,12 @@ export function analyticsSourceGuidanceOpening(): string {
     // Measured in production: this ran in under 1% of data threads while the
     // equivalent instruction sat ~7000 words deep. Threads that did call it used
     // roughly a third the tool calls. Keep it first and keep it imperative.
-    "START HERE — For any question about a metric, cohort, list, count, or trend, your FIRST tool call is `search-analytics-query-catalog`. This is the analytics equivalent of grepping a codebase before writing new code: someone has very likely already built and saved the query you need, and its saved SQL tells you the exact source, table, and column names so you do not have to discover them. Adapt the closest saved query to the requested filters and time window, run it once, and stop. Only fall back to schema discovery or provider catalogs when the catalog search returns nothing usable — and never run more than one schema-discovery pass before querying. " +
+    "START HERE — For an ordinary metric, cohort, list, count, or trend question, your FIRST tool call is `search-analytics-query-catalog`. For a request to replicate, clone, or adapt an existing dashboard, your FIRST tool call is `search-dashboard-references` instead; inspect the returned dashboard before choosing a source or writing anything. The catalog path is the analytics equivalent of grepping a codebase before writing new code: someone has very likely already built and saved the query you need, and its saved SQL tells you the exact source, table, and column names so you do not have to discover them. Adapt the closest saved query to the requested filters and time window, run it once, and stop. Only fall back to schema discovery or provider catalogs when the catalog search returns nothing usable — and never run more than one schema-discovery pass before querying. " +
     ANALYTICS_CROSS_APP_ROUTING_GUIDANCE +
     'ONE BOUNDED CALL — List, filter, count, and cohort questions ("which X, excluding Y") are a single query, not a loop. Express the include filter, the exclude filter, and the aggregation in one SQL statement or one `run-code` script that filters server-side. Never page through a cohort across separate tool calls and never fan out per item to apply a filter; that is what turns a ten-second answer into a twenty-minute one. ' +
     "Apply real-data requirements only when presenting analytics results, source records, or derived metrics. Do not call data-source tools for workflow migration, recurring-job setup, UI/code fixes, settings help, conceptual planning, or other non-data tasks unless the user explicitly asks for data. " +
     NON_ANALYTICS_REQUEST_GUIDANCE +
+    DASHBOARD_REFERENCE_GUIDANCE +
     BOUNDED_STRUCTURED_LOOKUP_GUIDANCE +
     BUILT_IN_FIRST_PARTY_SOURCE_GUIDANCE +
     ANALYTICS_OBSERVABILITY_INCIDENT_GUIDANCE +
@@ -761,7 +765,7 @@ export function realDataFinalGuard(
     }
     return {
       retryMessage:
-        'This is a dashboard construction/template-clone request. Resolve the named template\'s id (use `list-sql-dashboards` if you only have a title) and call `get-sql-dashboard` with `includeConfig: true` first. If its panels are `chartType: "extension"`, use `get-extension` then `create-extension` to clone/adapt it, then `update-dashboard` to save the new dashboard. Do not invent SQL panels for an extension-backed template. Ask one clarifying filter question if needed. Only run a data-source query before presenting numbers or authoring invented SQL.',
+        'This is a dashboard construction/template-clone request. First call `search-dashboard-references` with the named template terms. Inspect the matching result with `get-sql-dashboard` when `kind` is `sql` or `get-explorer-dashboard` when `kind` is `explorer`, using full config only when needed. If its panels are `chartType: "extension"`, use `get-extension` then `create-extension` to clone/adapt it, then `update-dashboard` to save the new dashboard. Do not invent SQL panels for an extension-backed template. Ask one clarifying filter question if needed. Only run a data-source query before presenting numbers or authoring invented SQL.',
       fallbackMessage:
         "I need to inspect the template dashboard (and its extension, if it uses one) before creating the new one. Tell me the template dashboard name, or confirm the org/account filter, and I'll clone it without inventing metrics.",
       // Expand the tool surface so a corrective retry can always reach the

package/corpus/templates/calendar/app/components/calendar/EventDialog.tsx

@@ -244,7 +244,7 @@ export function EventDialog({
               </div>
               <p className="text-xs text-muted-foreground">
                 {t("eventDialog.pressToSave", {
-                  shortcut: `${shortcutModifierLabel()}+↵`,
+                  shortcut: `${shortcutModifierLabel()} Enter`,
                 })}
               </p>
             </div>

package/corpus/templates/calendar/app/lib/utils.ts

@@ -8,5 +8,5 @@ export function isMacPlatform(): boolean {
 }
 
 export function shortcutModifierLabel(): string {
-  return isMacPlatform() ? "\u2318" : "Ctrl";
+  return isMacPlatform() ? "Cmd" : "Ctrl";
 }

package/corpus/templates/clips/app/components/recorder/recorder-engine.ts

@@ -8,6 +8,10 @@ import {
   isLikelyPhoneMicLabel,
   type AudioInputFallback,
 } from "@shared/media-device-selection";
+import {
+  createMicAudioCleanup,
+  type MicAudioCleanupHandle,
+} from "@shared/mic-audio-cleanup";
 import {
   SCREEN_CAPTURE_FRAME_RATE,
   screenCaptureDisplayOptions,
@@ -505,6 +509,7 @@ export class RecorderEngine {
   private cameraComposite: CameraCompositeHandle | null = null;
   private audioMixCtx: AudioContext | null = null;
   private audioMixSources: MediaStreamAudioSourceNode[] = [];
+  private micAudioCleanup: MicAudioCleanupHandle[] = [];
   private recorder: MediaRecorder | null = null;
   private mimeType: string = "video/webm";
 
@@ -1355,6 +1360,7 @@ export class RecorderEngine {
     // Full stream teardown happens in the finally block below.
     this.cameraLive = false;
     this.audioMixSources = [];
+    this.stopMicAudioCleanup();
     this.audioMixCtx?.close().catch(() => {});
     this.audioMixCtx = null;
     for (const s of [this.cameraStream, this.rawCameraStream, this.micStream]) {
@@ -1801,11 +1807,18 @@ export class RecorderEngine {
   private buildMixedAudioTrack(
     streams: (MediaStream | null | undefined)[],
   ): MediaStreamTrack | null {
-    const audioTracks = streams
+    const audioInputs = streams
       .filter((s): s is MediaStream => s != null)
-      .flatMap((s) => s.getAudioTracks());
-    if (audioTracks.length === 0) return null;
-    if (audioTracks.length === 1) return audioTracks[0];
+      .flatMap((stream) =>
+        stream.getAudioTracks().map((track) => ({
+          track,
+          isMicrophone: stream === this.micStream,
+        })),
+      );
+    if (audioInputs.length === 0) return null;
+    if (audioInputs.length === 1 && !audioInputs[0].isMicrophone) {
+      return audioInputs[0].track;
+    }
 
     const ctx = this.audioMixCtx ?? new AudioContext();
     this.audioMixCtx = ctx;
@@ -1814,7 +1827,15 @@ export class RecorderEngine {
     }
     this.audioMixSources = [];
     const dest = ctx.createMediaStreamDestination();
-    for (const track of audioTracks) {
+    for (const input of audioInputs) {
+      let track = input.track;
+      if (input.isMicrophone) {
+        const cleanup = createMicAudioCleanup(new MediaStream([track]), {
+          audioContext: ctx,
+        });
+        this.micAudioCleanup.push(cleanup);
+        track = cleanup.stream.getAudioTracks()[0] ?? track;
+      }
       const source = ctx.createMediaStreamSource(new MediaStream([track]));
       source.connect(dest);
       this.audioMixSources.push(source);
@@ -1822,6 +1843,11 @@ export class RecorderEngine {
     return dest.stream.getAudioTracks()[0];
   }
 
+  private stopMicAudioCleanup(): void {
+    for (const cleanup of this.micAudioCleanup) cleanup.stop();
+    this.micAudioCleanup = [];
+  }
+
   private buildCombinedStream(): MediaStream {
     if (this.opts.mode === "screen") {
       return this.buildDisplayRecordingStream();
@@ -2356,6 +2382,7 @@ export class RecorderEngine {
     // aren't mistaken for a disconnect.
     this.cameraLive = false;
     this.audioMixSources = [];
+    this.stopMicAudioCleanup();
     this.audioMixCtx?.close().catch(() => {});
     this.audioMixCtx = null;
     this.cameraComposite?.cleanup();

package/corpus/templates/clips/app/components/sharing/share-ui.tsx

@@ -6,7 +6,7 @@ import {
 import { useT } from "@agent-native/core/client/i18n";
 import {
   IconCheck,
-  IconCopy,
+  IconLink,
   IconLock,
   IconSend2,
   IconTrash,
@@ -273,10 +273,12 @@ export function CopyField({
   label,
   value,
   disabled,
+  description,
 }: {
   label: string;
   value: string;
   disabled?: boolean;
+  description?: string;
 }) {
   const t = useT();
   const [copied, setCopied] = useState(false);
@@ -287,26 +289,24 @@ export function CopyField({
     setTimeout(() => setCopied(false), 1400);
   };
   return (
-    <div>
-      {label ? (
-        <ShareSectionLabel className="mb-1">{label}</ShareSectionLabel>
-      ) : null}
-      <div className="flex items-stretch gap-2">
-        <Input
-          readOnly
-          value={value}
-          className="flex-1 h-9 font-mono text-xs"
-        />
+    <div className="flex items-center justify-between gap-3">
+      <div className="min-w-0">
+        {label ? <div className="text-sm font-medium">{label}</div> : null}
+        {description ? (
+          <div className="text-xs text-muted-foreground">{description}</div>
+        ) : null}
+      </div>
+      <div aria-live="polite" className="shrink-0">
         <Button
           type="button"
           variant="outline"
-          size="icon"
+          size="sm"
           onClick={copy}
-          aria-label={t("shareUi.copy")}
           disabled={disabled}
-          className="h-9 w-9"
+          className="h-9"
         >
-          {copied ? <IconCheck size={14} /> : <IconCopy size={14} />}
+          {copied ? <IconCheck size={14} /> : <IconLink size={14} />}
+          {copied ? t("recordRoute.linkCopied") : t("shareUi.copy")}
         </Button>
       </div>
     </div>

package/corpus/templates/clips/app/i18n/en-US.ts

@@ -647,13 +647,13 @@ const messages = {
     collapse: "Collapse",
     changelogMarkdown: `# Changelog
 
-All notable user-facing changes to Clips are documented here. Open it any time from the command menu (Cmd+K -> "What's new") or from Settings.
+All notable user-facing changes to Clips are documented here. Open it any time from the command menu (Cmd K -> "What's new") or from Settings.
 
 ## 2026-06-23
 
 ### Added
 
-- See what's new right inside Clips. A changelog now lives in the command menu (Cmd+K) and in Settings.`,
+- See what's new right inside Clips. A changelog now lives in the command menu (Cmd K) and in Settings.`,
     playback: "Playback",
     defaultPlaybackSpeed: "Default playback speed",
     playbackDescription: "Applied automatically when you open a recording.",
@@ -1193,7 +1193,7 @@ All notable user-facing changes to Clips are documented here. Open it any time f
     seekTo: "Seek to {{time}}",
   },
   editorToolbar: {
-    undoTooltip: "Undo (Cmd/Ctrl+Z)",
+    undoTooltip: "Undo (Cmd/Ctrl Z)",
     playPauseTooltip: "Play / Pause (Space)",
     sourceDuration: "({{duration}} src)",
     previewSpeed: "Preview speed",

package/corpus/templates/clips/app/lib/utils.ts

@@ -8,7 +8,7 @@ export function isMacPlatform(): boolean {
 }
 
 export function shortcutModifierLabel(): string {
-  return isMacPlatform() ? "\u2318" : "Ctrl";
+  return isMacPlatform() ? "Cmd" : "Ctrl";
 }
 
 export function shortcutLabel(shortcut: string): string {
@@ -18,14 +18,13 @@ export function shortcutLabel(shortcut: string): string {
     .map((part) => {
       const token = part.trim();
       const lower = token.toLowerCase();
-      if (lower === "cmd" || lower === "meta") return isMac ? "\u2318" : "Ctrl";
+      if (lower === "cmd" || lower === "meta") return isMac ? "Cmd" : "Ctrl";
       if (lower === "ctrl" || lower === "control") return "Ctrl";
-      if (lower === "alt" || lower === "option")
-        return isMac ? "\u2325" : "Alt";
-      if (lower === "shift") return isMac ? "\u21e7" : "Shift";
+      if (lower === "alt" || lower === "option") return "Alt";
+      if (lower === "shift") return "Shift";
       if (lower === "enter") return "Enter";
       if (lower === "space") return "Space";
       return token.length === 1 ? token.toUpperCase() : token;
     })
-    .join("+");
+    .join(" ");
 }

package/corpus/templates/clips/chrome-extension/src/offscreen.ts

@@ -22,6 +22,7 @@ import {
   isLikelyPhoneMicLabel,
   type AudioInputFallback,
 } from "@shared/media-device-selection";
+import { createMicAudioCleanup } from "@shared/mic-audio-cleanup";
 import { scheduleReadyChime } from "@shared/recording-audio";
 import {
   SCREEN_CAPTURE_FRAME_RATE,
@@ -210,6 +211,7 @@ type ActiveRecording = {
   outputStream: MediaStream;
   sourceStreams: MediaStream[];
   audioContext: AudioContext | null;
+  cleanupAudio: () => void;
   chunkIndex: number;
   uploadChain: Promise<void>;
   uploadPromises: Promise<unknown>[];
@@ -787,17 +789,38 @@ async function buildCompositor(
 
 async function createMixedAudio(
   streams: MediaStream[],
-): Promise<{ audioContext: AudioContext | null; tracks: MediaStreamTrack[] }> {
-  const audioTracks = streams.flatMap((stream) => stream.getAudioTracks());
-  if (!audioTracks.length) return { audioContext: null, tracks: [] };
-  if (audioTracks.length === 1) {
-    return { audioContext: null, tracks: audioTracks };
+  microphoneStream: MediaStream | null,
+): Promise<{
+  audioContext: AudioContext | null;
+  tracks: MediaStreamTrack[];
+  cleanup: () => void;
+}> {
+  const audioInputs = streams.flatMap((stream) =>
+    stream.getAudioTracks().map((track) => ({
+      track,
+      isMicrophone: stream === microphoneStream,
+    })),
+  );
+  if (!audioInputs.length) {
+    return { audioContext: null, tracks: [], cleanup() {} };
+  }
+  if (audioInputs.length === 1 && !audioInputs[0].isMicrophone) {
+    return { audioContext: null, tracks: [audioInputs[0].track], cleanup() {} };
   }
 
   const audioContext = new AudioContext();
   await audioContext.resume().catch(() => undefined);
   const destination = audioContext.createMediaStreamDestination();
-  for (const track of audioTracks) {
+  const micCleanup: Array<{ stop: () => void }> = [];
+  for (const input of audioInputs) {
+    let track = input.track;
+    if (input.isMicrophone) {
+      const cleanup = createMicAudioCleanup(new MediaStream([track]), {
+        audioContext,
+      });
+      micCleanup.push(cleanup);
+      track = cleanup.stream.getAudioTracks()[0] ?? track;
+    }
     // One source per track (not per stream) so each input is isolated in the
     // mix graph and can be detached independently.
     const source = audioContext.createMediaStreamSource(
@@ -817,7 +840,16 @@ async function createMixedAudio(
       }
     });
   }
-  return { audioContext, tracks: destination.stream.getAudioTracks() };
+  let cleanedUp = false;
+  return {
+    audioContext,
+    tracks: destination.stream.getAudioTracks(),
+    cleanup() {
+      if (cleanedUp) return;
+      cleanedUp = true;
+      for (const cleanup of micCleanup) cleanup.stop();
+    },
+  };
 }
 
 async function uploadChunk(
@@ -1081,6 +1113,7 @@ function disposePrepared(): void {
 
 function cleanup(recording: ActiveRecording): void {
   recording.stopCompositor?.();
+  recording.cleanupAudio();
   stopStreams([recording.outputStream, ...recording.sourceStreams]);
   void recording.audioContext?.close().catch(() => undefined);
 }
@@ -1215,7 +1248,7 @@ async function begin(message: BeginMessage): Promise<{
       ? [ready.cameraStream]
       : []),
   ];
-  const mixedAudio = await createMixedAudio(audioInputs);
+  const mixedAudio = await createMixedAudio(audioInputs, ready.micStream);
 
   const outputStream = new MediaStream([videoTrack, ...mixedAudio.tracks]);
   const mimeType = pickMimeType() || "video/webm";
@@ -1257,6 +1290,7 @@ async function begin(message: BeginMessage): Promise<{
       ...(compositor ? [compositor.canvasStream] : []),
     ],
     audioContext: mixedAudio.audioContext,
+    cleanupAudio: mixedAudio.cleanup,
     chunkIndex: 0,
     uploadChain: Promise.resolve(),
     uploadPromises: [],
@@ -1802,6 +1836,7 @@ async function restart(
   // Tear down the old compositor + mixing context; keep the capture tracks alive
   // so the next BEGIN can build a fresh compositor/recorder on the same streams.
   recording.stopCompositor?.();
+  recording.cleanupAudio();
   void recording.audioContext?.close().catch(() => undefined);
   activeRecording = null;
 

package/corpus/templates/clips/desktop/src/app.tsx

@@ -739,6 +739,14 @@ function meetingCanStartNotes(meeting: PopoverMeeting): boolean {
   );
 }
 
+function humanReadableShortcutLabel(shortcut: string): string {
+  return shortcut
+    .split("+")
+    .map((token) => token.trim())
+    .filter(Boolean)
+    .join(" ");
+}
+
 function voiceShortcutLabel(
   shortcut: VoiceShortcutPreference,
   customShortcut: string,
@@ -747,13 +755,15 @@ function voiceShortcutLabel(
     case "fn":
       return "Fn";
     case "cmd-shift-space":
-      return "Cmd+Shift+Space";
+      return "Cmd Shift Space";
     case "ctrl-shift-space":
-      return "Ctrl+Shift+Space";
+      return "Ctrl Shift Space";
     case "custom":
-      return customShortcut || "Custom shortcut";
+      return customShortcut
+        ? humanReadableShortcutLabel(customShortcut)
+        : "Custom shortcut";
     case "both":
-      return "Fn, Cmd+Shift+Space, or Ctrl+Shift+Space";
+      return "Fn, Cmd Shift Space, or Ctrl Shift Space";
   }
 }
 
@@ -5983,10 +5993,10 @@ function Setup({
   const shortcutHint: Record<VoiceShortcutPreference, string> = {
     fn: "Press the Fn / globe key to dictate. macOS requires Input Monitoring for this one shortcut.",
     "cmd-shift-space":
-      "Press Cmd+Shift+Space to dictate. This does not need Input Monitoring.",
-    "ctrl-shift-space": "Press Ctrl+Shift+Space to dictate.",
+      "Press Cmd Shift Space to dictate. This does not need Input Monitoring.",
+    "ctrl-shift-space": "Press Ctrl Shift Space to dictate.",
     custom: `Press ${voiceCustomShortcut || "your recorded shortcut"} to dictate.`,
-    both: "Any of Fn, Cmd+Shift+Space, or Ctrl+Shift+Space. Includes Fn, so macOS may ask for Input Monitoring.",
+    both: "Any of Fn, Cmd Shift Space, or Ctrl Shift Space. Includes Fn, so macOS may ask for Input Monitoring.",
   };
   const fnShortcutSelected = voiceShortcut === "fn" || voiceShortcut === "both";
   const modeHint: Record<VoiceMode, string> = {
@@ -7373,7 +7383,7 @@ function Setup({
           />
           <DesktopSettingsRow
             label="Open Clips"
-            description="Open the tray popover; Cmd+Shift+L remains available."
+            description="Open the tray popover; Cmd Shift L remains available."
             control={
               <ShortcutRecorder
                 value={popoverCustomShortcut}
@@ -7383,7 +7393,7 @@ function Setup({
             }
           >
             <>
-              <span>Leave this empty to use only Cmd+Shift+L.</span>
+              <span>Leave this empty to use only Cmd Shift L.</span>
               {shortcutRegistrationError ? (
                 <span className="setup-warning">
                   {shortcutRegistrationError}
@@ -7707,8 +7717,8 @@ function Setup({
                       )
                     }
                   >
-                    <option value="cmd-shift-space">Cmd+Shift+Space</option>
-                    <option value="ctrl-shift-space">Ctrl+Shift+Space</option>
+                    <option value="cmd-shift-space">Cmd Shift Space</option>
+                    <option value="ctrl-shift-space">Ctrl Shift Space</option>
                     <option value="custom">Custom shortcut</option>
                     <option value="fn">
                       Fn (globe, needs Input Monitoring)
@@ -8239,7 +8249,11 @@ function ShortcutRecorder({
           event.stopPropagation();
         }}
       >
-        {recording ? "Press shortcut..." : value || placeholder}
+        {recording
+          ? "Press shortcut..."
+          : value
+            ? humanReadableShortcutLabel(value)
+            : placeholder}
       </button>
       {value ? (
         <button

package/corpus/templates/clips/desktop/src/lib/recorder.ts

@@ -55,6 +55,10 @@ import {
   waitForAcceptedRecordingAfterFinalizeError,
   waitForReadyRecordingAfterFinalizeError,
 } from "../../../shared/finalize-recovery";
+import {
+  createMicAudioCleanup,
+  type MicAudioCleanupHandle,
+} from "../../../shared/mic-audio-cleanup";
 import type { LocalRecordingMode } from "../shared/config";
 import { createAudioCue, type AudioCue } from "./audio-cue";
 import { createCameraCompositeStream } from "./camera-composite";
@@ -541,35 +545,45 @@ interface RecordingAudio {
 }
 
 /**
- * Build the audio track(s) for the recording. When BOTH a mic track and a
- * system/display-audio track are present they're mixed into a single track via
- * WebAudio (one audio track keeps players + our finalize step happy). With only
- * one source we pass it through untouched.
+ * Build the audio track(s) for the recording. Microphone tracks pass through
+ * the cleanup graph whether or not system/display audio is also present, then
+ * both sources are mixed into one track when needed.
  */
 function buildRecordingAudio(
   micTracks: MediaStreamTrack[],
   systemTracks: MediaStreamTrack[],
 ): RecordingAudio {
-  if (!micTracks.length || !systemTracks.length) {
-    // 0 or 1 source — no mixing needed (prefer mic when it's the only one).
+  if (!micTracks.length) {
+    // System-only audio keeps its original stereo signal; there is no
+    // microphone path to clean in this branch.
     return {
-      tracks: micTracks.length ? micTracks : systemTracks,
+      tracks: systemTracks,
       cleanup() {},
     };
   }
   const AudioCtx = window.AudioContext || (window as any).webkitAudioContext;
   if (!AudioCtx) {
-    // No WebAudio — fall back to mic only.
+    // No WebAudio — keep the capture alive with the raw microphone signal.
     return { tracks: micTracks, cleanup() {} };
   }
   const ctx: AudioContext = new AudioCtx();
   const destination = ctx.createMediaStreamDestination();
-  for (const tracks of [micTracks, systemTracks]) {
+  const micCleanup: MicAudioCleanupHandle[] = [];
+  const cleanedMicTracks = micTracks.map((track) => {
+    const cleanup = createMicAudioCleanup(new MediaStream([track]), {
+      audioContext: ctx,
+    });
+    micCleanup.push(cleanup);
+    return cleanup.stream.getAudioTracks()[0] ?? track;
+  });
+  for (const tracks of [cleanedMicTracks, systemTracks]) {
+    if (!tracks.length) continue;
     ctx.createMediaStreamSource(new MediaStream(tracks)).connect(destination);
   }
   return {
     tracks: destination.stream.getAudioTracks(),
     cleanup() {
+      for (const cleanup of micCleanup) cleanup.stop();
       ctx.close().catch(() => {});
     },
   };