@agent-native/core 0.90.2 → 0.90.4

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

@@ -10,7 +10,6 @@ import {
 
 import {
   chooseFallbackAudioInput,
-  findAudioInputBySavedLabel,
   isPseudoMediaDeviceId,
   isSelectableAudioInputDevice,
   normalizedMediaDeviceId,
@@ -272,17 +271,30 @@ export function useMediaDevices({
   useEffect(() => {
     if (isPseudoMediaDeviceId(micId) || !micId || mics.length === 0) return;
     if (mics.some((d) => d.deviceId === micId)) return;
-    const rematch = findAudioInputBySavedLabel(mics, {
+    // The selected mic (e.g. Bluetooth headset unplugged mid-session) is gone.
+    // Prefer rematching by saved label, then fall back to the best available
+    // input so we don't stay pinned to a device that no longer exists.
+    const fallback = chooseFallbackAudioInput(mics, {
       savedLabel: micLabel,
       avoidDeviceIds: [micId],
     });
-    if (!rematch) return;
+    if (!fallback) {
+      // Nothing concrete left; drop to the OS default rather than keeping the
+      // disconnected device selected.
+      setMicId("");
+      setMicLabel("");
+      return;
+    }
     console.warn(
-      "[clips-recorder] saved mic id was missing; rematched by label",
-      { previousDeviceId: micId, nextDeviceId: rematch.deviceId },
+      "[clips-recorder] saved mic id was missing; fell back to available input",
+      {
+        previousDeviceId: micId,
+        nextDeviceId: fallback.deviceId,
+        reason: fallback.reason,
+      },
     );
-    setMicId(rematch.deviceId);
-    setMicLabel(rematch.label);
+    setMicId(fallback.deviceId);
+    setMicLabel(fallback.label);
   }, [micId, micLabel, mics]);
 
   useEffect(() => saveString(CAM_KEY, cameraId), [cameraId]);

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

@@ -8,6 +8,8 @@ export const MACOS_SCREEN_PERMISSION_MESSAGE =
   "Grant Screen Recording permission in macOS Settings, then restart Clips and try again.";
 export const MACOS_SPEECH_PERMISSION_MESSAGE =
   "Grant Speech Recognition and Microphone access, then try again. If you just changed access, restart Clips before retrying.";
+export const MACOS_UPDATE_RESTART_MESSAGE =
+  "An update was downloaded and needs a restart to finish installing. Restart Clips, then record again.";
 
 export function isHardCapturePermissionError(message: string): boolean {
   return /permission denied by system|blocked by system|system settings|screen recording|privacy|sandbox/i.test(

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

@@ -999,7 +999,6 @@ async function captureTitleForRecording(params: {
 }
 
 const COUNTDOWN_EVENT_TIMEOUT_MS = 5000;
-const COUNTDOWN_OVERLAY_SETTLE_MS = 120;
 
 function wait(ms: number): Promise<void> {
   return new Promise((resolve) => window.setTimeout(resolve, ms));
@@ -1652,10 +1651,6 @@ async function runRecordingCountdown(wantsScreen: boolean) {
     console.warn("[clips-recorder] countdown timed out — proceeding");
     return;
   }
-  // The countdown webview emits before it finishes closing. Give macOS a
-  // brief beat to remove the overlay and any shortcut handling before capture
-  // starts, so the first frame/audio sample is the real recording.
-  await wait(COUNTDOWN_OVERLAY_SETTLE_MS);
 }
 
 function showFinalizingFeedback() {
@@ -1852,29 +1847,35 @@ async function startNativeFullscreenRecording(
       }).catch((err) => {
         console.warn("[clips-recorder] mic warm failed:", err);
       });
-    const countdownPromise = runRecordingCountdown(true);
     if (localOnly) {
+      const countdownPromise = runRecordingCountdown(true);
       id = localFolderName;
       await Promise.all([countdownPromise, warmMic(id)]);
     } else {
-      const captureTitle = await captureTitleForRecording({
+      const captureTitlePromise = captureTitleForRecording({
         mode: params.mode,
         source: params.source,
       });
-      console.time("[clips-recorder] createServerRecording duration");
-      const recordingPromise = createServerRecording(
-        params.serverUrl,
-        wantsCamera,
-        wantsRecordedAudio,
-        captureTitle,
-        {
-          mimeType: NATIVE_FULLSCREEN_MIME_TYPE,
-          requestStreaming: true,
-          streamingUploadClient: "desktop-native",
-        },
-      ).finally(() => {
-        console.timeEnd("[clips-recorder] createServerRecording duration");
-      });
+      const countdownPromise = runRecordingCountdown(true);
+      const recordingPromise = (async () => {
+        const captureTitle = await captureTitlePromise;
+        console.time("[clips-recorder] createServerRecording duration");
+        try {
+          return await createServerRecording(
+            params.serverUrl,
+            wantsCamera,
+            wantsRecordedAudio,
+            captureTitle,
+            {
+              mimeType: NATIVE_FULLSCREEN_MIME_TYPE,
+              requestStreaming: true,
+              streamingUploadClient: "desktop-native",
+            },
+          );
+        } finally {
+          console.timeEnd("[clips-recorder] createServerRecording duration");
+        }
+      })();
       // The recording id usually lands well before the countdown ends — warm
       // native capture as soon as it does so setup overlaps the 3-2-1.
       const warmAndId = (async () => {
@@ -1918,6 +1919,11 @@ async function startNativeFullscreenRecording(
     // Capture is now live — after rebasing the transcript timeline, stamp the
     // timer baseline so the toolbar clock lines up with the real start.
     startedAt = Date.now();
+    emit("clips:toolbar-enabled", true).catch(() => {});
+    emit("clips:recorder-state", {
+      paused: false,
+      elapsedMs: 0,
+    }).catch(() => {});
     localCameraExport?.start(2_000);
   } catch (err) {
     await localCameraExport?.cancel().catch(() => {});

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

@@ -45,9 +45,15 @@ async function runCheck() {
     const notes = update.body ?? undefined;
     setStatus({ state: "available", version, notes });
 
+    // Download ONLY — do not install here. On macOS `install` swaps the .app
+    // bundle on disk while this process keeps running, which invalidates the
+    // running process's Screen Recording (TCC) grant and breaks capture until
+    // relaunch. We defer the swap to `installAndRestart()` so a downloaded-but-
+    // not-yet-installed update leaves the running app fully functional; the
+    // user records normally until they choose to restart.
     let total = 0;
     let downloaded = 0;
-    await update.downloadAndInstall((event) => {
+    await update.download((event) => {
       if (event.event === "Started") {
         total = event.data.contentLength ?? 0;
         downloaded = 0;
@@ -98,10 +104,27 @@ export function useUpdateStatus(): UpdateStatus {
 }
 
 export async function installAndRestart(): Promise<void> {
-  // downloadAndInstall already applied the bundle; relaunch completes it.
+  // Perform the deferred bundle swap now, then relaunch onto the new binary.
+  // Installing immediately before relaunch keeps the window where the on-disk
+  // bundle no longer matches the running process as short as possible — the
+  // process is torn down by `relaunch()` right after, so capture never runs
+  // against a swapped-out bundle.
+  if (pendingUpdate) {
+    await pendingUpdate.install();
+  }
   await relaunch();
 }
 
+/**
+ * True once an update has been downloaded and is waiting for the user to
+ * restart. The recording flow uses this to explain a post-download capture
+ * failure as "restart to finish updating" instead of a misleading "grant
+ * permissions" message — see `app.tsx` recError routing.
+ */
+export function isUpdatePendingRestart(): boolean {
+  return cachedStatus.state === "downloaded";
+}
+
 /**
  * Manual retry entry point. Used by the UpdateBanner's error state to let
  * users re-attempt after a signature-verification / download / network

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

@@ -23,9 +23,8 @@ const DEFAULT_AUTO_HIDE_MS = 30_000;
 const SNOOZE_MS = 5 * 60_000;
 
 /**
- * Open a meeting join URL via the Tauri shell plugin. Centralized here so
- * both the notification's "Take Notes" and the watcher's
- * `meetings:start-transcription` event use the same path.
+ * Open a meeting join URL via the Tauri shell plugin. Used by the
+ * notification's dedicated Join CTA (notes start is a separate action).
  */
 async function openJoinUrl(url: string | null | undefined): Promise<void> {
   if (!url) return;
@@ -41,7 +40,7 @@ async function openJoinUrl(url: string | null | undefined): Promise<void> {
  * Variants:
  *
  *   - Calendar event: solid left bar (green), meeting title, time,
- *     "Start notes" + "Snooze 5 min" buttons.
+ *     "Start notes" + optional "Join" + "Snooze 5 min" buttons.
  *   - Ad-hoc call: dashed left bar (slate), "Call detected", app name,
  *     same controls.
  *
@@ -170,11 +169,6 @@ export function MeetingNotification() {
     if (!data || pending) return;
     setPending(true);
     setError(null);
-    // Open the join URL right away so the user feels the click — the
-    // recording action runs in parallel.
-    if (data.joinUrl) {
-      openJoinUrl(data.joinUrl);
-    }
     emit("meetings:start-transcription", {
       meetingId: data.meetingId,
       joinUrl: data.joinUrl,
@@ -185,25 +179,20 @@ export function MeetingNotification() {
     });
   }
 
+  async function joinMeeting() {
+    if (!data?.joinUrl) return;
+    await openJoinUrl(data.joinUrl);
+  }
+
   function snooze() {
     if (!data) return;
     // Hand the snooze to the Rust watcher so the reminder re-fires after the
     // delay even though this overlay window closes right away. A setTimeout
-    // here would be torn down with the window and never fire, and re-emitting
-    // immediately (as before) just re-showed the same banner instantly.
+    // here would be torn down with the window and never fire.
     invoke("meetings_snooze", {
       meetingId: data.meetingId,
       minutes: Math.round(SNOOZE_MS / 60_000),
     }).catch(() => {});
-    const payload = data;
-    // Hide the current banner and re-fire the same payload after the snooze
-    // delay. We re-emit through Tauri so the in-app banner overlay window
-    // (which is what hosts this React component) can rerender with a fresh
-    // auto-hide timer.
-    emit("meetings:show-notification", {
-      ...payload,
-      subtitle: `${payload.subtitle} (snoozed)`,
-    } as NotificationData).catch(() => {});
     hideNotification();
   }
 
@@ -212,6 +201,7 @@ export function MeetingNotification() {
   }
 
   const isCalendar = data.type === "calendar";
+  const hasJoin = Boolean(data.joinUrl);
 
   return (
     <div
@@ -227,7 +217,9 @@ export function MeetingNotification() {
         scheduleAutoHide(DEFAULT_AUTO_HIDE_MS);
       }}
     >
-      <div className="meeting-notification">
+      <div
+        className={`meeting-notification${hasJoin ? " meeting-notification-with-join" : ""}`}
+      >
         <div
           className={`meeting-notification-bar ${isCalendar ? "meeting-notification-bar-calendar" : "meeting-notification-bar-adhoc"}`}
         />
@@ -243,13 +235,22 @@ export function MeetingNotification() {
         </div>
         <div className="meeting-notification-actions">
           <button
-            className="meeting-notification-btn"
+            className="meeting-notification-btn meeting-notification-btn-primary"
             onClick={takeNotes}
             disabled={pending}
             data-no-drag
           >
             {pending ? "Starting…" : "Start notes"}
           </button>
+          {hasJoin ? (
+            <button
+              className="meeting-notification-btn meeting-notification-btn-secondary"
+              onClick={joinMeeting}
+              data-no-drag
+            >
+              Join
+            </button>
+          ) : null}
           <button
             className="meeting-notification-btn meeting-notification-btn-secondary"
             onClick={snooze}

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

@@ -1096,7 +1096,7 @@ body[data-clips-route="recording-pill"] #root {
 
 .bottom-row {
   display: grid;
-  grid-template-columns: repeat(3, 1fr);
+  grid-template-columns: repeat(4, 1fr);
   gap: 4px;
 }
 
@@ -1138,6 +1138,145 @@ body[data-clips-route="recording-pill"] #root {
   font-weight: 500;
 }
 
+/* ------------------------------------------------------------------------- */
+/* Popover drill-in views                                                     */
+/* ------------------------------------------------------------------------- */
+
+.app-popover-view {
+  gap: 0;
+  padding: 0;
+}
+
+.popover-view {
+  min-height: 260px;
+}
+
+.popover-view-header {
+  margin-bottom: 2px;
+}
+
+.popover-view-header-spacer {
+  flex: 1;
+}
+
+.popover-view-link {
+  font-size: 11px;
+}
+
+.popover-empty-card {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 12px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius);
+  background: var(--surface);
+}
+
+.popover-empty-card strong {
+  font-size: 13px;
+  color: var(--fg);
+}
+
+.popover-card-heading {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.popover-list {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.popover-list-item {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  padding: 9px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius);
+  background: var(--surface);
+}
+
+.popover-list-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--fg-muted);
+  flex-shrink: 0;
+}
+
+.popover-list-main {
+  flex: 1;
+  min-width: 0;
+}
+
+.popover-list-title {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--fg);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.popover-list-sub {
+  margin-top: 1px;
+  font-size: 11px;
+  color: var(--fg-subtle);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.popover-list-action {
+  flex-shrink: 0;
+  border: 1px solid var(--border-strong);
+  border-radius: var(--radius-sm);
+  background: var(--bg);
+  color: var(--fg);
+  padding: 6px 8px;
+  font-size: 11px;
+  font-weight: 600;
+  cursor: pointer;
+}
+
+.popover-list-action:hover {
+  background: var(--surface-hover);
+}
+
+.popover-list-action-primary {
+  border-color: var(--brand);
+  background: var(--brand);
+  color: var(--bg);
+}
+
+.popover-list-action-primary:hover {
+  background: var(--brand-hover);
+}
+
+.popover-kv {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding-top: 6px;
+  border-top: 1px solid var(--border);
+  font-size: 11px;
+}
+
+.popover-kv span {
+  color: var(--fg-subtle);
+}
+
+.popover-kv strong {
+  min-width: 0;
+  text-align: right;
+  font-size: 11px;
+}
+
 .badge {
   position: absolute;
   top: -4px;
@@ -3468,7 +3607,19 @@ body[data-clips-route="recording-pill"] #root {
   color: white;
   pointer-events: auto;
   min-width: 280px;
-  max-width: 320px;
+  max-width: 400px;
+}
+
+.meeting-notification-with-join {
+  flex-wrap: wrap;
+  align-items: flex-start;
+  row-gap: 10px;
+}
+
+.meeting-notification-with-join .meeting-notification-actions {
+  flex: 1 1 100%;
+  justify-content: flex-end;
+  padding-left: 13px; /* align under content past the bar */
 }
 
 .meeting-notification-bar {
@@ -3536,6 +3687,20 @@ body[data-clips-route="recording-pill"] #root {
   cursor: progress;
 }
 
+.meeting-notification-btn-primary {
+  background: #ffffff;
+  color: #111827;
+}
+
+.meeting-notification-btn-primary:hover {
+  background: #f3f4f6;
+}
+
+.meeting-notification-btn-primary:disabled {
+  background: rgba(255, 255, 255, 0.7);
+  color: #374151;
+}
+
 .meeting-notification-actions {
   display: inline-flex;
   align-items: center;

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

@@ -648,7 +648,7 @@ pub async fn native_fullscreen_recording_available() -> Result<bool, String> {
 /// the countdown by now; this is just a safety net so a slow/denied mic can't
 /// stall the start.
 #[cfg(target_os = "macos")]
-const MIC_WARM_TIMEOUT_MS: u64 = 1500;
+const MIC_WARM_TIMEOUT_MS: u64 = 250;
 
 /// Acquire a backend (ScreenCaptureKit, or the screencapture fallback) and
 /// store it as the active session. Shared by the immediate-start command and
@@ -1538,6 +1538,13 @@ fn take_and_finalize_active_session(
             session.lost_segment_duration.as_secs()
         );
     }
+
+    if let Some(paused_at) = session.paused_at.take() {
+        session.paused_total = session
+            .paused_total
+            .checked_add(paused_at.elapsed())
+            .unwrap_or(session.paused_total);
+    }
     let duration_ms = session
         .started_at
         .elapsed()

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

@@ -16,8 +16,8 @@ use crate::util::{
 };
 
 const MEETING_NOTIFICATION_LABEL: &str = "meeting-notif";
-const NOTIFICATION_W_LOGICAL: u32 = 380;
-const NOTIFICATION_H_LOGICAL: u32 = 132;
+const NOTIFICATION_W_LOGICAL: u32 = 420;
+const NOTIFICATION_H_LOGICAL: u32 = 148;
 const NOTIFICATION_TOP_MARGIN_LOGICAL: u32 = 44;
 const NOTIFICATION_RIGHT_MARGIN_LOGICAL: u32 = 24;
 
@@ -125,11 +125,7 @@ pub async fn notify_meeting_starting(
     } else {
         format!("in {} min", (starts_in_secs / 60).max(1))
     };
-    let body = if join_url.is_some() {
-        format!("{} — Start notes", pretty_in)
-    } else {
-        format!("Starts {}", pretty_in)
-    };
+    let body = format!("Starts {}", pretty_in);
     dlog!(
         "[clips-tray] notify_meeting_starting id={} title={} body={}",
         meeting_id,

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

@@ -25,21 +25,22 @@ pub struct MeetingItem {
 
 pub const MEETING_ID_PREFIX: &str = "meeting:";
 
-/// Build the "Upcoming Meetings" submenu populated with up to 3 events. If
+/// Build the "Start Meeting Notes" submenu populated with up to 3 events. If
 /// the list is empty, returns a submenu containing a single disabled "No
-/// upcoming meetings" item — keeps the menu structure stable.
+/// meetings ready" item — keeps the menu structure stable. Selecting a real
+/// meeting starts live notes immediately.
 pub fn build_meetings_section(
     app: &AppHandle,
     upcoming: Vec<MeetingItem>,
 ) -> Result<Submenu<Wry>, Box<dyn std::error::Error>> {
     let mut builder: SubmenuBuilder<'_, Wry, AppHandle> =
-        SubmenuBuilder::new(app, "Upcoming Meetings");
+        SubmenuBuilder::new(app, "Start Meeting Notes");
 
     if upcoming.is_empty() {
         let placeholder = MenuItem::with_id(
             app,
             "meeting:none",
-            "No upcoming meetings",
+            "No meetings ready",
             false,
             None::<&str>,
         )?;

package/corpus/templates/clips/server/routes/_agent-native/clips/user-prefs.put.ts

@@ -1,5 +1,5 @@
 import { getSession } from "@agent-native/core/server";
-import { putUserSetting } from "@agent-native/core/settings";
+import { getUserSetting, putUserSetting } from "@agent-native/core/settings";
 import { defineEventHandler, getHeader, readBody, setResponseStatus } from "h3";
 
 const CLIPS_USER_PREFS_KEY = "clips-user-prefs";
@@ -17,11 +17,19 @@ export default defineEventHandler(async (event) => {
     return { error: "Invalid settings payload" };
   }
 
-  await putUserSetting(
-    session.email,
-    CLIPS_USER_PREFS_KEY,
-    body as Record<string, unknown>,
-    { requestSource: getHeader(event, "x-request-source") || undefined },
-  );
-  return body;
+  // Merge so partial Settings saves (playback, notifications, …) don't wipe
+  // AI-tool prefs written from the recording page popover.
+  const existing =
+    (await getUserSetting(session.email, CLIPS_USER_PREFS_KEY)) ?? {};
+  const next = {
+    ...(typeof existing === "object" && existing && !Array.isArray(existing)
+      ? existing
+      : {}),
+    ...(body as Record<string, unknown>),
+  };
+
+  await putUserSetting(session.email, CLIPS_USER_PREFS_KEY, next, {
+    requestSource: getHeader(event, "x-request-source") || undefined,
+  });
+  return next;
 });

package/corpus/templates/clips/server/routes/api/recordings/[recordingId]/thumbnail.post.ts

@@ -165,6 +165,7 @@ export default defineEventHandler(async (event: H3Event) => {
       mimeType,
       filename: `thumb-${recordingId}.${ext}`,
       ownerEmail,
+      recordAsset: false,
     });
 
     let url: string;

package/corpus/templates/clips/server/routes/api/uploads/[recordingId]/abort.post.ts

@@ -6,10 +6,12 @@
  */
 
 import {
+  readAppState,
   writeAppState,
   deleteAppStateByPrefix,
 } from "@agent-native/core/application-state";
 import { runWithRequestContext } from "@agent-native/core/server";
+import { isStoredButUnservableFinalizeError } from "@shared/finalize-recovery.js";
 import { and, eq } from "drizzle-orm";
 import {
   defineEventHandler,
@@ -50,6 +52,7 @@ export default defineEventHandler(async (event: H3Event) => {
         id: schema.recordings.id,
         status: schema.recordings.status,
         videoUrl: schema.recordings.videoUrl,
+        failureReason: schema.recordings.failureReason,
       })
       .from(schema.recordings)
       .where(
@@ -68,10 +71,14 @@ export default defineEventHandler(async (event: H3Event) => {
       return { ok: true, recordingId, alreadyReady: true, chunksCleared: 0 };
     }
 
+    const preserveRecoveryState =
+      isStoredButUnservableFinalizeError(failureReason) ||
+      isStoredButUnservableFinalizeError(existing.failureReason);
+
     // Already a terminal failure (e.g. a duplicate/retried abort call, or
     // finalize's own failChunkAssembly already flipped it) — no-op instead of
     // re-clearing chunk state and overwriting the original failureReason.
-    if (existing.status === "failed") {
+    if (existing.status === "failed" && !preserveRecoveryState) {
       return { ok: true, recordingId, alreadyFailed: true, chunksCleared: 0 };
     }
 
@@ -85,17 +92,27 @@ export default defineEventHandler(async (event: H3Event) => {
       })
       .where(eq(schema.recordings.id, recordingId));
 
+    const existingUploadStateRaw = await readAppState(
+      `recording-upload-${recordingId}`,
+    ).catch(() => null);
+    const existingUploadState =
+      existingUploadStateRaw && typeof existingUploadStateRaw === "object"
+        ? (existingUploadStateRaw as Record<string, unknown>)
+        : {};
     await writeAppState(`recording-upload-${recordingId}`, {
+      ...existingUploadState,
       recordingId,
       status: "failed",
       failureReason,
       updatedAt: now,
     });
 
-    const cleared = await deleteAppStateByPrefix(
-      `recording-chunks-${recordingId}-`,
-    );
-    await deleteResumableSession(recordingId).catch(() => {});
+    const cleared = preserveRecoveryState
+      ? 0
+      : await deleteAppStateByPrefix(`recording-chunks-${recordingId}-`);
+    if (!preserveRecoveryState) {
+      await deleteResumableSession(recordingId).catch(() => {});
+    }
     await writeAppState("refresh-signal", { ts: Date.now() });
 
     return { ok: true, recordingId, chunksCleared: cleared };