@agent-native/core 0.91.2 → 0.92.0

package/corpus/templates/clips/changelog/2026-07-08-meeting-reminder-dropdowns-now-expand-fully-instead-of-being.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-08
+---
+
+Meeting reminder dropdowns now expand fully instead of being cut off.

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

@@ -713,6 +713,7 @@ export function App() {
   const [meetingStartMessage, setMeetingStartMessage] = useState<string | null>(
     null,
   );
+  const [activeMeetingId, setActiveMeetingId] = useState<string | null>(null);
   const [readinessOpen, setReadinessOpen] = useState<boolean>(
     () => !loadBool(READINESS_REVIEWED_KEY, false),
   );
@@ -1140,6 +1141,7 @@ export function App() {
   }, [authStatus, callClipsAction]);
 
   const startMeetingNotes = useCallback((meeting: PopoverMeeting) => {
+    setActiveMeetingId(meeting.id);
     setMeetingStartMessage(`Starting notes for ${meeting.title}…`);
     emit("meetings:start-transcription", {
       meetingId: meeting.id,
@@ -1147,10 +1149,98 @@ export function App() {
       reason: "user",
     }).catch((err) => {
       console.error("[clips-popover] start meeting notes failed:", err);
+      setActiveMeetingId(null);
       setMeetingStartMessage("Could not start notes. Try again from Meetings.");
     });
   }, []);
 
+  const startMeetingNotesAndJoin = useCallback(
+    (meeting: PopoverMeeting) => {
+      if (meeting.joinUrl) {
+        openExternal(meeting.joinUrl).catch((err) => {
+          console.error("[clips-popover] open meeting join url failed:", err);
+        });
+      }
+      startMeetingNotes(meeting);
+    },
+    [startMeetingNotes],
+  );
+
+  const showActiveMeetingPill = useCallback((meetingId: string) => {
+    invoke("recording_pill_show", { meetingId, mode: "meeting" }).catch(
+      (err) => {
+        console.error("[clips-popover] show meeting pill failed:", err);
+      },
+    );
+    emit("clips:pill-context", { meetingId, mode: "meeting" }).catch(() => {});
+  }, []);
+
+  useEffect(() => {
+    invoke<string | null>("get_active_meeting_id")
+      .then((meetingId) => {
+        if (meetingId) setActiveMeetingId(meetingId);
+      })
+      .catch(() => {});
+
+    let stopped = false;
+    const unlistens: Array<() => void> = [];
+    const track = (promise: Promise<() => void>) => {
+      promise
+        .then((unlisten) => {
+          if (stopped) {
+            unlisten();
+            return;
+          }
+          unlistens.push(unlisten);
+        })
+        .catch(() => {});
+    };
+    track(
+      listen<{ meetingId?: string | null }>(
+        "meetings:transcription-started",
+        (event) => {
+          if (event.payload?.meetingId) {
+            setActiveMeetingId(event.payload.meetingId);
+          }
+        },
+      ),
+    );
+    track(
+      listen<{ meetingId?: string | null }>(
+        "meetings:transcription-stopped",
+        (event) => {
+          setActiveMeetingId((current) =>
+            !event.payload?.meetingId || event.payload.meetingId === current
+              ? null
+              : current,
+          );
+        },
+      ),
+    );
+    track(
+      listen<{ meetingId?: string | null }>(
+        "meetings:transcription-error",
+        (event) => {
+          setActiveMeetingId((current) =>
+            !event.payload?.meetingId || event.payload.meetingId === current
+              ? null
+              : current,
+          );
+        },
+      ),
+    );
+    return () => {
+      stopped = true;
+      unlistens.forEach((unlisten) => unlisten());
+      unlistens.length = 0;
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!popoverVisible || !activeMeetingId) return;
+    showActiveMeetingPill(activeMeetingId);
+  }, [activeMeetingId, popoverVisible, showActiveMeetingPill]);
+
   useMeetingTranscription({
     callClipsAction,
     serverUrl,
@@ -2419,6 +2509,7 @@ export function App() {
           loading={meetingsLoading}
           error={meetingsError}
           startMessage={meetingStartMessage}
+          activeMeetingId={activeMeetingId}
           meetingsEnabled={featureConfig?.meetingsEnabled !== false}
           onBack={() => setPopoverView("recorder")}
           onRefresh={fetchUpcomingMeetings}
@@ -2428,6 +2519,8 @@ export function App() {
           }
           onOpenSettings={() => setPopoverView("settings")}
           onStartNotes={startMeetingNotes}
+          onStartNotesAndJoin={startMeetingNotesAndJoin}
+          onShowActiveMeeting={showActiveMeetingPill}
         />
       </div>
     );
@@ -3326,6 +3419,7 @@ function MeetingsPopoverView({
   loading,
   error,
   startMessage,
+  activeMeetingId,
   meetingsEnabled,
   onBack,
   onRefresh,
@@ -3333,11 +3427,14 @@ function MeetingsPopoverView({
   onOpenMeeting,
   onOpenSettings,
   onStartNotes,
+  onStartNotesAndJoin,
+  onShowActiveMeeting,
 }: {
   meetings: PopoverMeeting[];
   loading: boolean;
   error: string | null;
   startMessage: string | null;
+  activeMeetingId: string | null;
   meetingsEnabled: boolean;
   onBack: () => void;
   onRefresh: () => void;
@@ -3345,6 +3442,8 @@ function MeetingsPopoverView({
   onOpenMeeting: (meetingId: string) => void;
   onOpenSettings: () => void;
   onStartNotes: (meeting: PopoverMeeting) => void;
+  onStartNotesAndJoin: (meeting: PopoverMeeting) => void;
+  onShowActiveMeeting: (meetingId: string) => void;
 }) {
   return (
     <div className="setup popover-view">
@@ -3402,6 +3501,8 @@ function MeetingsPopoverView({
         <div className="popover-list">
           {meetings.map((meeting) => {
             const canStart = meetingCanStartNotes(meeting);
+            const hasJoin = Boolean(meeting.joinUrl);
+            const isActive = activeMeetingId === meeting.id;
             return (
               <div className="popover-list-item" key={meeting.id}>
                 <div className="popover-list-icon">
@@ -3414,13 +3515,32 @@ function MeetingsPopoverView({
                     {meeting.platform ? ` · ${meeting.platform}` : ""}
                   </div>
                 </div>
-                {canStart ? (
+                {isActive ? (
+                  <button
+                    type="button"
+                    className="popover-list-action popover-list-action-active"
+                    onClick={() => onShowActiveMeeting(meeting.id)}
+                    title="Meeting notes are recording"
+                  >
+                    <span className="popover-list-action-dot" aria-hidden />
+                    Recording
+                  </button>
+                ) : canStart ? (
                   <button
                     type="button"
                     className="popover-list-action popover-list-action-primary"
-                    onClick={() => onStartNotes(meeting)}
+                    onClick={() =>
+                      hasJoin
+                        ? onStartNotesAndJoin(meeting)
+                        : onStartNotes(meeting)
+                    }
+                    title={
+                      hasJoin
+                        ? "Start notes and join the meeting"
+                        : "Start meeting notes"
+                    }
                   >
-                    Start notes
+                    {hasJoin ? "Start + join" : "Start notes"}
                   </button>
                 ) : (
                   <button

package/corpus/templates/clips/desktop/src/hooks/useMeetingTranscription.ts

@@ -245,6 +245,14 @@ export function useMeetingTranscription({
       const existing = sessionRef.current;
       if (existing) {
         if (!existing.stopping && existing.meetingId === meetingId) {
+          await invoke("recording_pill_show", {
+            meetingId: existing.meetingId,
+            mode: "meeting",
+          }).catch(() => {});
+          emit("clips:pill-context", {
+            meetingId: existing.meetingId,
+            mode: "meeting",
+          }).catch(() => {});
           emit("meetings:hide-notification", { meetingId }).catch(() => {});
           return;
         }
@@ -282,7 +290,13 @@ export function useMeetingTranscription({
         };
         sessionRef.current = session;
         await invoke("set_recording_state", { active: true }).catch(() => {});
-        await invoke("set_meeting_active", { active: true }).catch(() => {});
+        await invoke("set_meeting_active", {
+          active: true,
+          meetingId: resolvedMeetingId,
+        }).catch(() => {});
+        emit("meetings:transcription-started", {
+          meetingId: resolvedMeetingId,
+        }).catch(() => {});
 
         const scheduleFlush = () => {
           if (session.flushTimer) window.clearTimeout(session.flushTimer);

package/corpus/templates/clips/desktop/src/overlays/meeting-notification.tsx

@@ -6,6 +6,7 @@ import {
   IconX,
 } from "@tabler/icons-react";
 import { invoke } from "@tauri-apps/api/core";
+import { LogicalSize } from "@tauri-apps/api/dpi";
 import { emit, listen } from "@tauri-apps/api/event";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import { open as openExternal } from "@tauri-apps/plugin-shell";
@@ -37,6 +38,9 @@ interface TranscriptionStatusPayload {
 
 const SNOOZE_MS = 5 * 60_000;
 const FALLBACK_AUTO_HIDE_MS = 6 * 60_000;
+const NOTIFICATION_WINDOW_WIDTH = 440;
+const NOTIFICATION_COLLAPSED_HEIGHT = 120;
+const NOTIFICATION_MENU_HEIGHT = 224;
 
 /**
  * Open a meeting join URL via the Tauri shell plugin.
@@ -50,6 +54,17 @@ async function openJoinUrl(url: string | null | undefined): Promise<void> {
   }
 }
 
+function resizeNotificationWindow(expanded: boolean) {
+  const height = expanded
+    ? NOTIFICATION_MENU_HEIGHT
+    : NOTIFICATION_COLLAPSED_HEIGHT;
+  getCurrentWindow()
+    .setSize(new LogicalSize(NOTIFICATION_WINDOW_WIDTH, height))
+    .catch((err) => {
+      console.warn("[clips-meeting-notif] resize failed", err);
+    });
+}
+
 function ProviderGlyph({ provider }: { provider: MeetingJoinProvider }) {
   // Lightweight glyphs — keep the overlay free of extra assets. Zoom blue
   // camera / Meet green / Teams purple, otherwise a generic video icon.
@@ -115,6 +130,14 @@ export function MeetingNotification() {
     dataRef.current = data;
   }, [data]);
 
+  useEffect(() => {
+    resizeNotificationWindow(Boolean(data && menuOpen));
+  }, [data, menuOpen]);
+
+  useEffect(() => {
+    return () => resizeNotificationWindow(false);
+  }, []);
+
   useEffect(() => {
     const win = getCurrentWindow();
     if (data) {

package/corpus/templates/clips/desktop/src/styles.css

@@ -1195,6 +1195,7 @@ body[data-clips-route="recording-pill"] #root {
   display: flex;
   flex-direction: column;
   gap: 6px;
+  margin-bottom: 4px;
 }
 
 .popover-list-item {
@@ -1264,6 +1265,27 @@ body[data-clips-route="recording-pill"] #root {
   background: var(--brand-hover);
 }
 
+.popover-list-action-active {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  border-color: rgba(34, 197, 94, 0.36);
+  background: rgba(34, 197, 94, 0.12);
+  color: #4ade80;
+}
+
+.popover-list-action-active:hover {
+  background: rgba(34, 197, 94, 0.18);
+}
+
+.popover-list-action-dot {
+  width: 6px;
+  height: 6px;
+  border-radius: 999px;
+  background: currentColor;
+  box-shadow: 0 0 0 3px rgba(34, 197, 94, 0.12);
+}
+
 .popover-kv {
   display: flex;
   align-items: center;
@@ -1425,7 +1447,7 @@ body[data-clips-route="recording-pill"] #root {
    content isn't flush with the panel edge. Must follow `.setup` so it wins
    over the shorthand padding above. */
 .setup.popover-view {
-  padding-bottom: 20px;
+  padding-bottom: 26px;
 }
 
 .setup h2 {

package/corpus/templates/clips/desktop/src-tauri/src/adhoc_meetings_watcher.rs

@@ -123,9 +123,7 @@ async fn tick_macos(
     config: &crate::config::FeatureConfig,
 ) -> Result<(), String> {
     let front = crate::util::frontmost_bundle_id();
-    let matched = front
-        .as_deref()
-        .and_then(match_vc_bundle);
+    let matched = front.as_deref().and_then(match_vc_bundle);
 
     let Some((platform, title)) = matched else {
         // VC app left front — clear session dedupe so a later re-focus can

package/corpus/templates/clips/desktop/src-tauri/src/clips/mod.rs

@@ -15,8 +15,8 @@ use tauri::{
 
 use crate::dlog;
 use crate::state::{
-    DictationActive, LastTranscript, MeetingActive, RecordingActive, TrayAnchor, VoiceTargetBundle,
-    VoiceWakePopover,
+    ActiveMeetingId, DictationActive, LastTranscript, MeetingActive, RecordingActive, TrayAnchor,
+    VoiceTargetBundle, VoiceWakePopover,
 };
 use crate::util::{
     build_overlay_url, configure_overlay_behavior, hide_voice_wake_popover, is_recording_active,
@@ -969,8 +969,11 @@ pub async fn hide_overlays(app: AppHandle) -> Result<(), String> {
             let _ = w.close();
         }
     }
-    // A recording pill may be owned by meeting or voice flows; tear it down too.
-    let _ = crate::recording_indicator::recording_pill_hide(app).await;
+    // The meeting pill belongs to the live notes session, not the popover's
+    // camera/bubble lifecycle. Keep it visible when the popover closes.
+    if !crate::util::is_meeting_active(&app) {
+        let _ = crate::recording_indicator::recording_pill_hide(app).await;
+    }
     Ok(())
 }
 
@@ -1887,16 +1890,37 @@ pub async fn set_recording_state(app: AppHandle, active: bool) -> Result<(), Str
 /// teardown in `lib.rs`: quit stays instant when no meeting is active, and
 /// only waits for a graceful stop when one is.
 #[tauri::command]
-pub async fn set_meeting_active(app: AppHandle, active: bool) -> Result<(), String> {
-    dlog!("[clips-tray] set_meeting_active active={}", active);
+pub async fn set_meeting_active(
+    app: AppHandle,
+    active: bool,
+    meeting_id: Option<String>,
+) -> Result<(), String> {
+    dlog!(
+        "[clips-tray] set_meeting_active active={} meeting_id={:?}",
+        active,
+        meeting_id
+    );
     if let Some(state) = app.try_state::<MeetingActive>() {
         if let Ok(mut g) = state.0.lock() {
             *g = active;
         }
     }
+    if let Some(state) = app.try_state::<ActiveMeetingId>() {
+        if let Ok(mut g) = state.0.lock() {
+            *g = if active { meeting_id } else { None };
+        }
+    }
+    crate::tray::rebuild_tray_menu(&app);
     Ok(())
 }
 
+#[tauri::command]
+pub async fn get_active_meeting_id(app: AppHandle) -> Result<Option<String>, String> {
+    Ok(app
+        .try_state::<ActiveMeetingId>()
+        .and_then(|s| s.0.lock().ok().and_then(|g| g.clone())))
+}
+
 /// Guards the quit-teardown handshake in `lib.rs`'s `ExitRequested` handler:
 /// 0 = not requested, 1 = requested (waiting on JS), 2 = done (safe to let
 /// the process exit — including the watchdog's own forced exit, which must
@@ -1937,6 +1961,16 @@ pub async fn reset_state(app: AppHandle) -> Result<(), String> {
             *g = false;
         }
     }
+    if let Some(state) = app.try_state::<MeetingActive>() {
+        if let Ok(mut g) = state.0.lock() {
+            *g = false;
+        }
+    }
+    if let Some(state) = app.try_state::<ActiveMeetingId>() {
+        if let Ok(mut g) = state.0.lock() {
+            *g = None;
+        }
+    }
     if let Some(w) = app.get_webview_window(REGION_GUIDES_LABEL) {
         let _ = w.close();
     }

package/corpus/templates/clips/desktop/src-tauri/src/lib.rs

@@ -33,8 +33,8 @@ use tauri::{Emitter, Manager};
 
 use clips::{position_popover, toggle_popover};
 use state::{
-    DictationActive, DictationEnabled, LastTranscript, MeetingActive, PopoverShownAt,
-    RecordingActive, TrayAnchor, TrayMeetings, VoiceTargetBundle, VoiceWakePopover,
+    ActiveMeetingId, DictationActive, DictationEnabled, LastTranscript, MeetingActive,
+    PopoverShownAt, RecordingActive, TrayAnchor, TrayMeetings, VoiceTargetBundle, VoiceWakePopover,
 };
 use util::{
     configure_overlay_behavior, is_recording_active, present_interactive_window,
@@ -95,6 +95,7 @@ pub fn run() {
             clips::paste_last_dictation,
             clips::set_recording_state,
             clips::set_meeting_active,
+            clips::get_active_meeting_id,
             clips::quit_teardown_done,
             clips::reset_state,
             clips::save_bubble_position,
@@ -204,6 +205,7 @@ pub fn run() {
         .manage(PopoverShownAt::default())
         .manage(RecordingActive::default())
         .manage(MeetingActive::default())
+        .manage(ActiveMeetingId::default())
         .manage(DictationEnabled::default())
         .manage(DictationActive::default())
         .manage(VoiceWakePopover::default())

package/corpus/templates/clips/desktop/src-tauri/src/meetings_watcher.rs

@@ -289,9 +289,7 @@ async fn tick_once(app: &AppHandle, client: &reqwest::Client) -> Result<(), Stri
     let limit = MEETING_POLL_LIMIT.to_string();
     // Include meetings that started within the hold window so a late-open
     // desktop still surfaces the reminder until 5 minutes after start.
-    let within_min = ((NOTIFY_LEAD_SECS + NOTIFY_HOLD_AFTER_START_SECS) / 60
-        + 1)
-    .to_string();
+    let within_min = ((NOTIFY_LEAD_SECS + NOTIFY_HOLD_AFTER_START_SECS) / 60 + 1).to_string();
     let mut req = client.get(&url).query(&[
         ("view", "upcoming"),
         ("limit", limit.as_str()),
@@ -368,8 +366,8 @@ async fn tick_once(app: &AppHandle, client: &reqwest::Client) -> Result<(), Stri
 
             // Eligible from 1 min before start through 5 min after start.
             // secs_until > 0 => still upcoming; negative => already started.
-            let in_window = secs_until <= NOTIFY_LEAD_SECS
-                && secs_until >= -NOTIFY_HOLD_AFTER_START_SECS;
+            let in_window =
+                secs_until <= NOTIFY_LEAD_SECS && secs_until >= -NOTIFY_HOLD_AFTER_START_SECS;
 
             let eligible = match g.snoozed_until.get(&m.id).copied() {
                 Some(until) if now_ts < until => false, // still snoozed

package/corpus/templates/clips/desktop/src-tauri/src/native_screen.rs

@@ -65,22 +65,22 @@ const AUDIO_DENOISE_FILTER: &str = "afftdn=nr=10:nf=-50:tn=1";
 // explicit output rate the AAC track ends up at 192 kHz and plays back slow.
 const AUDIO_OUTPUT_SAMPLE_RATE: u32 = 48000;
 
- // Pre-gain for mic-only native captures. ScreenCaptureKit records without
- // WebRTC AGC (unlike Loom / the browser path), so speech often lands well
- // below -16 LUFS. 12 dB before loudnorm matches Loom-ish perceptual loudness
- // for MacBook mics; loudnorm still clamps true peaks at TP=-1.5.
+// Pre-gain for mic-only native captures. ScreenCaptureKit records without
+// WebRTC AGC (unlike Loom / the browser path), so speech often lands well
+// below -16 LUFS. 12 dB before loudnorm matches Loom-ish perceptual loudness
+// for MacBook mics; loudnorm still clamps true peaks at TP=-1.5.
 const AUDIO_MIC_PREGAIN_FILTER: &str = "volume=12dB";
 // After the mic+system centered downmix (0.5*L+0.5*R) each source is ~
- // 6 dB quieter. Restore energy before loudnorm so dual-capture clips are not
- // systematically quieter than mic-only. Dual still mixes two sources so peaks
- // may compress more under loudnorm than mic-only — by design when both sides
- // compete for the same LUFS budget.
+// 6 dB quieter. Restore energy before loudnorm so dual-capture clips are not
+// systematically quieter than mic-only. Dual still mixes two sources so peaks
+// may compress more under loudnorm than mic-only — by design when both sides
+// compete for the same LUFS budget.
 const AUDIO_DOWNMIX_MAKEUP_FILTER: &str = "volume=6dB";
 
- // Loudness normalization, optionally preceded by the centered-stereo downmix
- // that repairs the mic+system L/R split and denoise for native mic captures.
- // Pair with `-ar AUDIO_OUTPUT_SAMPLE_RATE` so loudnorm's 192 kHz output is
- // resampled back.
+// Loudness normalization, optionally preceded by the centered-stereo downmix
+// that repairs the mic+system L/R split and denoise for native mic captures.
+// Pair with `-ar AUDIO_OUTPUT_SAMPLE_RATE` so loudnorm's 192 kHz output is
+// resampled back.
 fn audio_filter_chain(downmix: bool, denoise: bool, mic_pregain: bool) -> String {
     let mut filters = Vec::new();
     if downmix {
@@ -4479,7 +4479,11 @@ fn normalize_audio_with_ffmpeg(
         .arg("-b:a")
         .arg(audio_bitrate)
         .arg("-af")
-        .arg(audio_filter_chain(downmix_audio, denoise_audio, mic_pregain))
+        .arg(audio_filter_chain(
+            downmix_audio,
+            denoise_audio,
+            mic_pregain,
+        ))
         .arg("-ac")
         .arg("2")
         .arg("-ar")
@@ -4568,9 +4572,11 @@ fn transcode_with_ffmpeg(
     }
 
     if normalize_audio {
-        command
-            .arg("-af")
-            .arg(audio_filter_chain(downmix_audio, denoise_audio, mic_pregain));
+        command.arg("-af").arg(audio_filter_chain(
+            downmix_audio,
+            denoise_audio,
+            mic_pregain,
+        ));
     }
 
     let duration_rate_limit =
@@ -5055,9 +5061,7 @@ mod audio_track_probe_tests {
         );
         assert_eq!(
             audio_filter_chain(false, true, true),
-            format!(
-                "{AUDIO_DENOISE_FILTER},{AUDIO_MIC_PREGAIN_FILTER},{AUDIO_LOUDNESS_FILTER}"
-            )
+            format!("{AUDIO_DENOISE_FILTER},{AUDIO_MIC_PREGAIN_FILTER},{AUDIO_LOUDNESS_FILTER}")
         );
         assert_eq!(
             audio_filter_chain(true, true, false),

package/corpus/templates/clips/desktop/src-tauri/src/shortcuts.rs

@@ -10,8 +10,8 @@ use crate::clips::{remember_voice_target, toggle_popover};
 use crate::dlog;
 use crate::state::{DictationActive, VoiceWakePopover};
 use crate::util::{
-    hide_voice_wake_popover, is_dictation_active, is_recording_active, set_dictation_active,
-    show_without_activation,
+    hide_voice_wake_popover, is_dictation_active, is_meeting_active, is_recording_active,
+    set_dictation_active, show_without_activation,
 };
 
 fn escape_shortcut() -> Shortcut {
@@ -513,7 +513,7 @@ pub fn build_shortcut_plugin() -> tauri_plugin_global_shortcut::Builder<tauri::W
             // global shortcut stops it rather than re-opening the
             // popover. Keeps parity with the tray-icon click
             // behaviour in `on_tray_icon_event`.
-            if is_recording_active(app) {
+            if is_recording_active(app) && !is_meeting_active(app) {
                 let _ = app.emit("clips:recorder-stop", ());
             } else {
                 toggle_popover(app);

package/corpus/templates/clips/desktop/src-tauri/src/silence_detector.rs

@@ -408,4 +408,3 @@ fn audio_recently_silent(state: &tauri::State<'_, DetectorState>, threshold_ms:
         .unwrap_or(false);
     mic_silent && system_silent
 }
-

package/corpus/templates/clips/desktop/src-tauri/src/state.rs

@@ -34,6 +34,11 @@ pub struct RecordingActive(pub Mutex<bool>);
 #[derive(Default)]
 pub struct MeetingActive(pub Mutex<bool>);
 
+/// Active meeting id, when meeting notes are currently running. Kept separate
+/// from `MeetingActive` so older boolean-only state checks stay simple.
+#[derive(Default)]
+pub struct ActiveMeetingId(pub Mutex<Option<String>>);
+
 #[allow(dead_code)]
 /// Whether dictation is toggled on.
 #[derive(Default)]

package/corpus/templates/clips/desktop/src-tauri/src/tray.rs

@@ -8,7 +8,7 @@ use crate::clips::{force_show_popover, toggle_popover};
 use crate::dlog;
 use crate::state::{TrayAnchor, TrayMeetings};
 use crate::tray_meetings::{build_meetings_section, handle_meeting_menu_click, MeetingItem};
-use crate::util::is_recording_active;
+use crate::util::{is_meeting_active, is_recording_active};
 use crate::TRAY_PNG;
 
 /// Build the full tray menu with the given upcoming-meetings list. Used both
@@ -22,15 +22,18 @@ fn build_menu_with_meetings(
     let meetings_submenu = build_meetings_section(app, meetings)?;
     let show_item = MenuItem::with_id(app, "show", "Show popover", true, None::<&str>)?;
     let recording_active = is_recording_active(app);
+    let meeting_active = is_meeting_active(app);
     let stop_item = MenuItem::with_id(
         app,
         "stop",
-        if recording_active {
+        if meeting_active {
+            "Stop meeting notes"
+        } else if recording_active {
             "Stop recording"
         } else {
             "No active recording"
         },
-        recording_active,
+        recording_active || meeting_active,
         None::<&str>,
     )?;
     let has_last_dictation = app
@@ -132,7 +135,11 @@ pub fn build_tray(app: &tauri::App) -> Result<(), Box<dyn std::error::Error>> {
             match id_ref {
                 "show" => force_show_popover(app),
                 "stop" => {
-                    let _ = app.emit("clips:recorder-stop", ());
+                    if is_meeting_active(app) {
+                        let _ = app.emit("clips:pill-stop", serde_json::json!({}));
+                    } else {
+                        let _ = app.emit("clips:recorder-stop", ());
+                    }
                 }
                 "paste-last-dictation" => {
                     let app = app.clone();
@@ -213,8 +220,13 @@ pub fn build_tray(app: &tauri::App) -> Result<(), Box<dyn std::error::Error>> {
             {
                 let app = tray.app_handle();
                 let active = is_recording_active(app);
-                dlog!("[clips-tray] tray click — is_recording_active={}", active);
-                if active {
+                let meeting_active = is_meeting_active(app);
+                dlog!(
+                    "[clips-tray] tray click — is_recording_active={} is_meeting_active={}",
+                    active,
+                    meeting_active
+                );
+                if active && !meeting_active {
                     let _ = app.emit("clips:recorder-stop", ());
                 } else {
                     toggle_popover(app);