@agent-native/core 0.103.1 → 0.104.0

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

@@ -730,6 +730,7 @@ export function App() {
   // when the recorder fully stops/cancels. We use this to suppress the
   // popover auto-hide during the macOS screen-picker focus dance.
   const [recordingFlowActive, setRecordingFlowActive] = useState(false);
+  const [recordingStopFinalizing, setRecordingStopFinalizing] = useState(false);
   const [lastRecordingId, setLastRecordingId] = useState<string | null>(null);
   const [authStatus, setAuthStatus] = useState<"unknown" | "authed" | "anon">(
     "unknown",
@@ -1799,26 +1800,38 @@ export function App() {
   });
 
   const loadPendingUploads = useCallback(async () => {
-    try {
-      const nativeList = await invoke<Omit<PendingNativeUpload, "kind">[]>(
+    const [nativeResult, browserResult] = await Promise.allSettled([
+      invoke<Omit<PendingNativeUpload, "kind">[]>(
         "native_fullscreen_pending_uploads",
+      ),
+      listBrowserRecordingBackups(),
+    ]);
+    if (nativeResult.status === "rejected") {
+      console.warn(
+        "[clips-tray] native pending upload lookup failed:",
+        nativeResult.reason,
       );
-      const browserList = await listBrowserRecordingBackups();
-      const nativeUploads = Array.isArray(nativeList)
-        ? nativeList.map((upload) => ({
+    }
+    if (browserResult.status === "rejected") {
+      console.warn(
+        "[clips-tray] browser pending upload lookup failed:",
+        browserResult.reason,
+      );
+    }
+    const nativeUploads =
+      nativeResult.status === "fulfilled" && Array.isArray(nativeResult.value)
+        ? nativeResult.value.map((upload) => ({
             ...upload,
             kind: "native" as const,
           }))
         : [];
-      setPendingUploads(
-        [...nativeUploads, ...browserList].sort((a, b) =>
-          b.savedAt.localeCompare(a.savedAt),
-        ),
-      );
-    } catch (err) {
-      console.warn("[clips-tray] pending upload lookup failed:", err);
-      setPendingUploads([]);
-    }
+    const browserUploads =
+      browserResult.status === "fulfilled" ? browserResult.value : [];
+    setPendingUploads(
+      [...nativeUploads, ...browserUploads].sort((a, b) =>
+        b.savedAt.localeCompare(a.savedAt),
+      ),
+    );
   }, []);
 
   useEffect(() => {
@@ -2373,6 +2386,7 @@ export function App() {
         // Start a silent no-op.
         const handle = recorder;
         recordingStopFinalizingRef.current = true;
+        setRecordingStopFinalizing(true);
         bubbleStreamTransferredToRecorder.current = false;
         bubbleStreamRef.current = null;
         recordingFlowGateRef.current = false;
@@ -2404,6 +2418,7 @@ export function App() {
           await loadPendingUploads();
         } finally {
           recordingStopFinalizingRef.current = false;
+          setRecordingStopFinalizing(false);
           invoke("set_recording_state", { active: false }).catch(() => {});
           if (stopFailed || stopResult?.localOnly) {
             invoke("show_popover").catch(() => {});
@@ -2490,9 +2505,26 @@ export function App() {
   // we just render the normal pre-record panel so the user at least knows
   // where they are. No recording-only UI lives here.
 
+  const pendingUploadBanner = recordingStopFinalizing ? (
+    <FinalizingUploadBanner />
+  ) : pendingUploads.length > 0 ? (
+    <PendingUploadBanner
+      uploads={pendingUploads}
+      retryingUploadId={retryingUploadId}
+      exportingUploadId={exportingUploadId}
+      dismissingUploadId={dismissingUploadId}
+      onExport={exportPendingUpload}
+      onRetry={retryPendingUpload}
+      onDismiss={dismissPendingUpload}
+      onOpenFolder={openPendingUploadFolder}
+      onConnectStorage={(upload) => openVideoStorageSetup(upload.serverUrl)}
+    />
+  ) : null;
+
   if (popoverView === "settings") {
     return (
       <div className="app app-settings" ref={appRef}>
+        {pendingUploadBanner}
         <Setup
           initial={serverUrl}
           serverUrl={serverUrl}
@@ -2527,6 +2559,7 @@ export function App() {
   if (popoverView === "meetings") {
     return (
       <div className="app app-popover-view" ref={appRef}>
+        {pendingUploadBanner}
         <MeetingsPopoverView
           meetings={meetings}
           loading={meetingsLoading}
@@ -2552,6 +2585,7 @@ export function App() {
   if (popoverView === "dictation") {
     return (
       <div className="app app-popover-view" ref={appRef}>
+        {pendingUploadBanner}
         <DictationPopoverView
           voiceEnabled={voiceDictationEnabled}
           voiceShortcut={voiceShortcut}
@@ -2581,6 +2615,7 @@ export function App() {
           submitterEmail={signedInAs}
         />
         <UpdateBanner />
+        {pendingUploadBanner}
         {signInPending ? (
           <div className="signin-pending">
             <div className="signin-pending-spinner" />
@@ -2629,20 +2664,7 @@ export function App() {
     <div className="app" ref={appRef}>
       <Header mode={mode} onModeChange={setMode} submitterEmail={signedInAs} />
       <UpdateBanner />
-
-      {pendingUploads.length > 0 ? (
-        <PendingUploadBanner
-          uploads={pendingUploads}
-          retryingUploadId={retryingUploadId}
-          exportingUploadId={exportingUploadId}
-          dismissingUploadId={dismissingUploadId}
-          onExport={exportPendingUpload}
-          onRetry={retryPendingUpload}
-          onDismiss={dismissPendingUpload}
-          onOpenFolder={openPendingUploadFolder}
-          onConnectStorage={(upload) => openVideoStorageSetup(upload.serverUrl)}
-        />
-      ) : null}
+      {pendingUploadBanner}
 
       {localRecordingMode !== "off" ? (
         <LocalRecordingModeBanner mode={localRecordingMode} />
@@ -3090,6 +3112,22 @@ function PendingUploadBanner({
   );
 }
 
+function FinalizingUploadBanner() {
+  return (
+    <div className="pending-upload-banner">
+      <div className="pending-upload-icon" aria-hidden>
+        <IconUpload size={17} stroke={1.8} />
+      </div>
+      <div className="pending-upload-copy">
+        <div className="pending-upload-title">Still finishing your Clip</div>
+        <div className="pending-upload-sub">
+          Recovery options will appear here if saving does not finish.
+        </div>
+      </div>
+    </div>
+  );
+}
+
 function localRecordingModeLabel(mode: Exclude<LocalRecordingMode, "off">) {
   return mode === "separate"
     ? "Local desktop + camera files"