@agent-native/core 0.108.0 → 0.109.1

package/corpus/templates/clips/app/i18n/ja-JP.ts

@@ -630,6 +630,17 @@ const messages = {
     languageDescription:
       "このアカウントのインターフェイス言語を選択します。Clips はデバイス間で設定を記憶します。",
     languageLabel: "インターフェイス言語",
+    uploadWorkspaceTitle: "アクティブなワークスペース",
+    uploadWorkspaceDescription:
+      "デスクトップからのアップロードを含む新しい Clips 録画で使用するワークスペースを選択します。",
+    uploadWorkspaceLabel: "現在のワークスペース",
+    uploadWorkspacePlaceholder: "ワークスペースを選択",
+    uploadWorkspaceHint:
+      "変更すると、ワークスペースに関連する Clips の表示も更新されます。",
+    uploadWorkspaceSaving: "ワークスペースを保存中…",
+    uploadWorkspaceSaved: "アクティブなワークスペースを更新しました",
+    uploadWorkspaceSaveFailed:
+      "アクティブなワークスペースを更新できませんでした",
     whatsNew: "最新情報",
     changelogEmpty: "まだ更新はありません。",
     viewAllUpdates: "すべての更新を見る",
@@ -1383,7 +1394,7 @@ Clips のユーザー向けの主な変更はここに記録されます。コ
     uploadFailed: "アップロードに失敗しました",
     connectStorageToFinish: "開いてストレージを接続し、保存を完了します。",
     retryFromClipsMenu:
-      "Clips メニューから再試行できます。録画し直す必要はありません。",
+      "メニューバーからClipsを開いて、この保存済みアップロードを再試行できます。録画し直す必要はありません。",
     removeFailedClip: "失敗したクリップを削除します。",
     remove: "削除",
     viewsCount: "{{count}} 回表示",

package/corpus/templates/clips/app/i18n/ko-KR.ts

@@ -623,6 +623,16 @@ const messages = {
     languageDescription:
       "이 계정의 인터페이스 언어를 선택하세요. Clips가 여러 기기에서 기억합니다.",
     languageLabel: "인터페이스 언어",
+    uploadWorkspaceTitle: "활성 워크스페이스",
+    uploadWorkspaceDescription:
+      "데스크톱 업로드를 포함한 새 Clips 녹화에 사용할 워크스페이스를 선택하세요.",
+    uploadWorkspaceLabel: "현재 워크스페이스",
+    uploadWorkspacePlaceholder: "워크스페이스 선택",
+    uploadWorkspaceHint:
+      "변경하면 워크스페이스와 관련된 Clips 화면도 업데이트됩니다.",
+    uploadWorkspaceSaving: "워크스페이스 저장 중…",
+    uploadWorkspaceSaved: "활성 워크스페이스가 업데이트됨",
+    uploadWorkspaceSaveFailed: "활성 워크스페이스를 업데이트할 수 없음",
     whatsNew: "새 소식",
     changelogEmpty: "아직 업데이트가 없습니다.",
     viewAllUpdates: "모든 업데이트 보기",
@@ -1366,7 +1376,7 @@ Clips의 모든 사용자 대상 변경 사항은 여기에 기록됩니다. 명
     uploadFailed: "업로드 실패",
     connectStorageToFinish: "열어서 저장소를 연결하고 저장을 완료하세요.",
     retryFromClipsMenu:
-      "Clips 메뉴에서 다시 시도하세요. 다시 녹화할 필요는 없습니다.",
+      "메뉴 막대에서 Clips를 열어 저장된 업로드를 다시 시도하세요. 다시 녹화할 필요가 없습니다.",
     removeFailedClip: "실패한 클립 제거.",
     remove: "제거",
     viewsCount: "조회수 {{count}}회",

package/corpus/templates/clips/app/i18n/pt-BR.ts

@@ -633,6 +633,16 @@ const messages = {
     languageDescription:
       "Escolha o idioma da interface para esta conta. O Clips lembrará em todos os seus dispositivos.",
     languageLabel: "Idioma da interface",
+    uploadWorkspaceTitle: "Espaço ativo",
+    uploadWorkspaceDescription:
+      "Escolha o espaço que o Clips usará para novas gravações, incluindo uploads do desktop.",
+    uploadWorkspaceLabel: "Espaço atual",
+    uploadWorkspacePlaceholder: "Escolha um espaço",
+    uploadWorkspaceHint:
+      "Isso também atualiza as telas do Clips vinculadas ao espaço.",
+    uploadWorkspaceSaving: "Salvando espaço…",
+    uploadWorkspaceSaved: "Espaço ativo atualizado",
+    uploadWorkspaceSaveFailed: "Não foi possível atualizar o espaço ativo",
     whatsNew: "Novidades",
     changelogEmpty: "Ainda não há atualizações.",
     viewAllUpdates: "Ver todas as atualizações",
@@ -1386,7 +1396,7 @@ Todas as mudanças visíveis para usuários do Clips são documentadas aqui. Voc
     connectStorageToFinish:
       "Abra para conectar o armazenamento e concluir o salvamento.",
     retryFromClipsMenu:
-      "Tente novamente pelo menu do Clips; não precisa gravar de novo.",
+      "Abra o Clips pela barra de menus para tentar novamente este upload salvo; não é preciso gravar de novo.",
     removeFailedClip: "Remover este clip com falha.",
     remove: "Remover",
     viewsCount: "{{count}} visualizações",

package/corpus/templates/clips/app/i18n/zh-CN.ts

@@ -598,6 +598,15 @@ const messages = {
     languageDescription:
       "选择此账号的界面语言。Clips 会在不同设备上记住你的选择。",
     languageLabel: "界面语言",
+    uploadWorkspaceTitle: "当前工作区",
+    uploadWorkspaceDescription:
+      "选择 Clips 用于新录制内容（包括桌面上传）的工作区。",
+    uploadWorkspaceLabel: "当前工作区",
+    uploadWorkspacePlaceholder: "选择工作区",
+    uploadWorkspaceHint: "切换后，Clips 中与工作区相关的视图也会更新。",
+    uploadWorkspaceSaving: "正在保存工作区…",
+    uploadWorkspaceSaved: "当前工作区已更新",
+    uploadWorkspaceSaveFailed: "无法更新当前工作区",
     whatsNew: "最新变化",
     changelogEmpty: "暂无更新。",
     viewAllUpdates: "查看所有更新",
@@ -1326,7 +1335,8 @@ Clips 中所有面向用户的重要更改都会记录在这里。你可以随
     savedLocally: "已保存到本地",
     uploadFailed: "上传失败",
     connectStorageToFinish: "打开以连接存储并完成保存。",
-    retryFromClipsMenu: "从 Clips 菜单重试；无需重新录制。",
+    retryFromClipsMenu:
+      "从菜单栏打开 Clips，重试这个已保存的上传；无需重新录制。",
     removeFailedClip: "移除此失败剪辑。",
     remove: "移除",
     viewsCount: "{{count}} 次观看",

package/corpus/templates/clips/app/i18n/zh-TW.ts

@@ -598,6 +598,15 @@ const messages = {
     languageDescription:
       "選取此帳號的介面語言。Clips 會在不同設備上記住你的選取。",
     languageLabel: "介面語言",
+    uploadWorkspaceTitle: "目前工作區",
+    uploadWorkspaceDescription:
+      "選擇 Clips 用於新錄製內容（包括桌面上傳）的工作區。",
+    uploadWorkspaceLabel: "目前工作區",
+    uploadWorkspacePlaceholder: "選擇工作區",
+    uploadWorkspaceHint: "切換後，Clips 中與工作區相關的檢視也會更新。",
+    uploadWorkspaceSaving: "正在儲存工作區…",
+    uploadWorkspaceSaved: "目前工作區已更新",
+    uploadWorkspaceSaveFailed: "無法更新目前工作區",
     whatsNew: "最新變化",
     changelogEmpty: "暫無更新。",
     viewAllUpdates: "檢視所有更新",
@@ -1302,7 +1311,8 @@ const messages = {
     savedLocally: "已儲存到本機",
     uploadFailed: "上傳失敗",
     connectStorageToFinish: "開啟以連線儲存並完成儲存。",
-    retryFromClipsMenu: "從 Clips 選單重試；不需要重新錄製。",
+    retryFromClipsMenu:
+      "從選單列開啟 Clips 以重試這個已儲存的上傳；不需要重新錄製。",
     removeFailedClip: "移除此失敗剪輯。",
     remove: "移除",
     viewsCount: "{{count}} 次觀看",

package/corpus/templates/clips/app/routes/_app.settings._index.tsx

@@ -12,7 +12,7 @@ import {
   useT,
   type SettingsSearchEntry,
 } from "@agent-native/core/client";
-import { TeamPage } from "@agent-native/core/client/org";
+import { TeamPage, useOrg, useSwitchOrg } from "@agent-native/core/client/org";
 import {
   BUILDER_CREDITS_UPGRADE_URL,
   type BuilderCreditsStatus,
@@ -30,6 +30,7 @@ import {
   IconServer,
   IconTrash,
   IconUser,
+  IconUsersGroup,
 } from "@tabler/icons-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { toast } from "sonner";
@@ -394,6 +395,8 @@ export default function SettingsIndexRoute() {
   const { session } = useSession();
   const t = useT();
   const agentSettingsTabs = useAgentSettingsTabs();
+  const { data: org } = useOrg();
+  const switchOrg = useSwitchOrg();
   const email = session?.email ?? "";
   const storageStatus = useVideoStorageStatus();
   const builderStatus = useBuilderStatus();
@@ -505,6 +508,22 @@ export default function SettingsIndexRoute() {
     void refreshApiKeyStatus();
   }, [refreshApiKeyStatus]);
 
+  const orgs = org?.orgs ?? [];
+
+  async function handleUploadWorkspaceChange(organizationId: string) {
+    if (!organizationId || organizationId === org?.orgId) return;
+    try {
+      await switchOrg.mutateAsync(organizationId);
+      toast.success(t("settings.uploadWorkspaceSaved"));
+    } catch (err) {
+      toast.error(
+        err instanceof Error
+          ? err.message
+          : t("settings.uploadWorkspaceSaveFailed"),
+      );
+    }
+  }
+
   async function handleSave() {
     setSaving(true);
     try {
@@ -761,6 +780,13 @@ export default function SettingsIndexRoute() {
         keywords: "storage s3 builder bucket cloud video",
         hash: "video-storage",
       },
+      {
+        id: "clips-upload-workspace",
+        label: t("settings.uploadWorkspaceTitle"),
+        keywords:
+          "upload recordings desktop destination organization workspace",
+        hash: "upload-workspace",
+      },
       {
         id: "clips-slack",
         label: t("settings.slackTitle"),
@@ -835,6 +861,51 @@ export default function SettingsIndexRoute() {
                 </CardContent>
               </Card>
 
+              {orgs.length > 0 ? (
+                <Card id="upload-workspace" className="scroll-mt-16">
+                  <CardHeader>
+                    <CardTitle className="flex items-center gap-2 text-base">
+                      <IconUsersGroup className="size-4 text-primary" />
+                      {t("settings.uploadWorkspaceTitle")}
+                    </CardTitle>
+                    <CardDescription>
+                      {t("settings.uploadWorkspaceDescription")}
+                    </CardDescription>
+                  </CardHeader>
+                  <CardContent className="max-w-md space-y-1.5">
+                    <Label htmlFor="upload-workspace-select">
+                      {t("settings.uploadWorkspaceLabel")}
+                    </Label>
+                    <Select
+                      value={org?.orgId ?? undefined}
+                      onValueChange={handleUploadWorkspaceChange}
+                      disabled={switchOrg.isPending || orgs.length < 2}
+                    >
+                      <SelectTrigger id="upload-workspace-select">
+                        <SelectValue
+                          placeholder={t("settings.uploadWorkspacePlaceholder")}
+                        />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {orgs.map((workspace) => (
+                          <SelectItem
+                            key={workspace.orgId}
+                            value={workspace.orgId}
+                          >
+                            {workspace.orgName}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                    <p className="text-xs text-muted-foreground">
+                      {switchOrg.isPending
+                        ? t("settings.uploadWorkspaceSaving")
+                        : t("settings.uploadWorkspaceHint")}
+                    </p>
+                  </CardContent>
+                </Card>
+              ) : null}
+
               <Card id="video-storage" className="scroll-mt-16">
                 <CardHeader>
                   <CardTitle className="text-base flex items-center gap-2">

package/corpus/templates/clips/app/routes/r.$recordingId.tsx

@@ -92,7 +92,7 @@ import { cn } from "@/lib/utils";
 import { STALE_PENDING_TRANSCRIPT_REASON } from "../../shared/transcript-status";
 
 const UPLOAD_STUCK_TIMEOUT_MS = 5 * 60 * 1000;
-const PROCESSING_STUCK_TIMEOUT_MS = 2 * 60 * 1000;
+const PROCESSING_STUCK_TIMEOUT_MS = 12 * 60 * 1000;
 const READY_MEDIA_SETTLE_POLL_MS = 20 * 1000;
 const READY_MEDIA_SETTLE_POLL_INTERVAL_MS = 1000;
 

package/corpus/templates/clips/app/routes/record.tsx

@@ -9,7 +9,7 @@ import { useLiveTranscription } from "@agent-native/core/client/transcription/us
 import type { BrowserDiagnosticsData } from "@shared/browser-diagnostics";
 import {
   isStoredButUnservableFinalizeError,
-  waitForReadyRecordingAfterFinalizeError,
+  waitForAcceptedRecordingAfterFinalizeError,
 } from "@shared/finalize-recovery";
 import {
   chunkUploadParallelism,
@@ -1733,7 +1733,7 @@ export default function RecordRoute() {
             createdId &&
             (err as { name?: string } | null)?.name !== "AbortError"
           ) {
-            const recovered = await waitForReadyRecordingAfterFinalizeError({
+            const recovered = await waitForAcceptedRecordingAfterFinalizeError({
               uploadUrl: uploadBase,
               recordingId: createdId,
               preferAuthenticated: true,
@@ -1764,7 +1764,7 @@ export default function RecordRoute() {
             chunkRes.status !== 413 &&
             !isUploadSizeError(error.message)
           ) {
-            const recovered = await waitForReadyRecordingAfterFinalizeError({
+            const recovered = await waitForAcceptedRecordingAfterFinalizeError({
               uploadUrl: uploadBase,
               recordingId: createdId,
               preferAuthenticated: true,

package/corpus/templates/clips/app/routes/share.$shareId.tsx

@@ -67,6 +67,7 @@ import { parsePlaybackSpeed } from "@/lib/playback-speed";
 import { isStorageSetupFailureReason } from "@/lib/storage-failures";
 
 import { getDb, schema } from "../../server/db";
+import { resolvePlayerThumbnailUrl } from "../../server/lib/player-thumbnail-url";
 import {
   buildAgentApiUrls,
   CLIPS_AGENT_ACCESS_PARAM,
@@ -226,8 +227,10 @@ export async function loader({ params, url }: LoaderFunctionArgs) {
     id: rec.id,
     title: rec.title,
     description: rec.description,
-    thumbnailUrl: rec.thumbnailUrl,
-    animatedThumbnailUrl: rec.animatedThumbnailUrl,
+    thumbnailUrl: rec.password
+      ? null
+      : resolvePlayerThumbnailUrl(rec, { appPath }),
+    animatedThumbnailUrl: null,
     visibility: rec.visibility,
     status: rec.status,
     archivedAt: rec.archivedAt,
@@ -286,7 +289,7 @@ const CLIPS_TEMPLATE_URL = "https://www.agent-native.com/templates/clips";
 const CLIPS_AGENT_DOCS_URL =
   "https://www.agent-native.com/docs/template-clips#agent-readable-clips";
 const UPLOAD_STUCK_TIMEOUT_MS = 5 * 60 * 1000;
-const PROCESSING_STUCK_TIMEOUT_MS = 2 * 60 * 1000;
+const PROCESSING_STUCK_TIMEOUT_MS = 12 * 60 * 1000;
 
 type ViewerPlatform = "mac" | "windows" | "linux";
 

package/corpus/templates/clips/changelog/2026-07-17-choose-which-workspace-receives-new-clips-recordings-and-des.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-07-17
+---
+
+Choose which workspace receives new Clips recordings and desktop uploads

package/corpus/templates/clips/changelog/2026-07-17-clips-now-retries-storage-verification-in-the-background-ins.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+Clips now retries storage verification in the background instead of failing completed uploads prematurely.

package/corpus/templates/clips/changelog/2026-07-17-create-folders-directly-from-the-move-menu.md

@@ -0,0 +1,6 @@
+---
+type: added
+date: 2026-07-17
+---
+
+Create folders directly from the move menu

package/corpus/templates/clips/changelog/2026-07-17-failed-desktop-uploads-now-offer-a-direct-way-to-reopen-clip.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-17
+---
+
+Failed desktop uploads now offer a direct way to reopen Clips and retry without re-recording.

package/corpus/templates/clips/changelog/2026-07-17-fixed-broken-thumbnail-icons-appearing-over-playable-clip-em.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-17
+---
+
+Fixed broken thumbnail icons appearing over playable clip embeds

package/corpus/templates/clips/changelog/2026-07-17-playback-comments-stay-readable-at-faster-playback-speeds.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-07-17
+---
+
+Playback comments stay readable at faster playback speeds

package/corpus/templates/clips/chrome-extension/src/finalize-recovery.ts

@@ -2,6 +2,9 @@ export {
   authenticatedRecordingStatusUrl,
   publicRecordingStatusUrl,
   readyRecordingFromPublicPayload,
+  waitForAcceptedRecordingAfterFinalizeError,
   waitForReadyRecordingAfterFinalizeError,
+  type RecoveredFinalizeRecording,
+  type RecoveredProcessingRecording,
   type RecoveredReadyRecording,
 } from "@shared/finalize-recovery";

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

@@ -35,7 +35,7 @@ import {
 } from "@shared/recording-core";
 import { MAX_UPLOAD_BYTES } from "@shared/upload-limits";
 
-import { waitForReadyRecordingAfterFinalizeError } from "./finalize-recovery";
+import { waitForAcceptedRecordingAfterFinalizeError } from "./finalize-recovery";
 import {
   createNativeTranscriptionCapture,
   type NativeTranscriptionCapture,
@@ -875,7 +875,7 @@ async function uploadChunk(
       if (extra.isFinal && res.status === 504) {
         triedFinalUploadRecovery = true;
         await res.text().catch(() => "");
-        const recovered = await waitForReadyRecordingAfterFinalizeError({
+        const recovered = await waitForAcceptedRecordingAfterFinalizeError({
           uploadUrl: recording.uploadUrl,
           recordingId: recording.recordingId,
           authToken: recording.authToken,
@@ -1619,7 +1619,7 @@ async function finalizeStop(recording: ActiveRecording): Promise<void> {
     const error = err instanceof Error ? err : new Error(String(err));
 
     if (isFinalUploadRecoveryCandidate(error)) {
-      const recovered = await waitForReadyRecordingAfterFinalizeError({
+      const recovered = await waitForAcceptedRecordingAfterFinalizeError({
         uploadUrl: recording.uploadUrl,
         recordingId: recording.recordingId,
         authToken: recording.authToken,

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

@@ -70,6 +70,7 @@ import {
   exportBrowserRecordingBackup,
   listBrowserRecordingBackups,
   retryBrowserRecordingBackup,
+  scheduleNativeBackupCleanupAfterProcessing,
   shouldUseNativeFullscreenRecording,
   startRecording,
   type LocalExportedFile,
@@ -1894,12 +1895,23 @@ export function App() {
     try {
       const authToken = loadDesktopAuthToken(targetServerUrl);
       if (upload.kind === "native") {
-        await invoke("native_fullscreen_recording_retry_upload", {
-          serverUrl: targetServerUrl,
-          recordingId: upload.recordingId,
-          authToken,
-          cookie: typeof document !== "undefined" ? document.cookie || "" : "",
-        });
+        const result = await invoke<{ verificationPending?: boolean }>(
+          "native_fullscreen_recording_retry_upload",
+          {
+            serverUrl: targetServerUrl,
+            recordingId: upload.recordingId,
+            authToken,
+            cookie:
+              typeof document !== "undefined" ? document.cookie || "" : "",
+          },
+        );
+        if (result.verificationPending) {
+          scheduleNativeBackupCleanupAfterProcessing({
+            serverUrl: targetServerUrl,
+            recordingId: upload.recordingId,
+            authToken,
+          });
+        }
       } else {
         await retryBrowserRecordingBackup({
           recordingId: upload.recordingId,
@@ -4569,7 +4581,7 @@ function Setup({
       <div className="setup-section">
         <SettingLabel
           label="Clip Drafts"
-          hint="Clips dismissed after an upload problem stay in Movies/Clips/Drafts until you remove them in Finder."
+          hint="Only clips you dismiss from the saved-upload card appear in Movies/Clips/Drafts. To retry a failed upload, return to the Clips popover and use Retry."
         />
         <button
           type="button"

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

@@ -51,7 +51,10 @@ import { invoke } from "@tauri-apps/api/core";
 import { emit, listen, type UnlistenFn } from "@tauri-apps/api/event";
 import { open as openExternal } from "@tauri-apps/plugin-shell";
 
-import { waitForReadyRecordingAfterFinalizeError } from "../../../shared/finalize-recovery";
+import {
+  waitForAcceptedRecordingAfterFinalizeError,
+  waitForReadyRecordingAfterFinalizeError,
+} from "../../../shared/finalize-recovery";
 import type { LocalRecordingMode } from "../shared/config";
 import { createAudioCue, type AudioCue } from "./audio-cue";
 import { createCameraCompositeStream } from "./camera-composite";
@@ -752,7 +755,56 @@ async function markBrowserRecordingBackupError(
   });
 }
 
-async function recoverReadyRecordingAfterFinalizeError({
+function scheduleBrowserBackupCleanupAfterProcessing(args: {
+  serverUrl: string;
+  recordingId: string;
+  authToken?: string;
+}): void {
+  void waitForReadyRecordingAfterFinalizeError({
+    uploadUrl: chunkUrl(args.serverUrl, args.recordingId, 0, false),
+    recordingId: args.recordingId,
+    authToken: args.authToken,
+    preferAuthenticated: true,
+    timeoutMs: 12 * 60 * 1000,
+  })
+    .then((recovered) => {
+      if (recovered?.status === "ready") {
+        return deleteBrowserRecordingBackup(args.recordingId);
+      }
+    })
+    .catch((err) => {
+      console.warn(
+        "[clips-recorder] background backup cleanup check failed:",
+        err,
+      );
+    });
+}
+
+export function scheduleNativeBackupCleanupAfterProcessing(args: {
+  serverUrl: string;
+  recordingId: string;
+  authToken?: string;
+}): void {
+  void waitForReadyRecordingAfterFinalizeError({
+    uploadUrl: chunkUrl(args.serverUrl, args.recordingId, 0, false),
+    recordingId: args.recordingId,
+    authToken: args.authToken,
+    preferAuthenticated: true,
+    timeoutMs: 12 * 60 * 1000,
+  })
+    .then((recovered) => {
+      if (recovered?.status === "ready") {
+        return invoke("native_fullscreen_recording_dismiss_upload", {
+          recordingId: args.recordingId,
+        });
+      }
+    })
+    .catch((err) => {
+      console.warn("[clips-recorder] native backup cleanup check failed:", err);
+    });
+}
+
+async function recoverAcceptedRecordingAfterFinalizeError({
   serverUrl,
   recordingId,
   authToken,
@@ -760,19 +812,27 @@ async function recoverReadyRecordingAfterFinalizeError({
   serverUrl: string;
   recordingId: string;
   authToken?: string;
-}): Promise<boolean> {
-  const recovered = await waitForReadyRecordingAfterFinalizeError({
+}): Promise<"processing" | "ready" | null> {
+  const recovered = await waitForAcceptedRecordingAfterFinalizeError({
     uploadUrl: chunkUrl(serverUrl, recordingId, 0, false),
     recordingId,
     authToken,
     preferAuthenticated: true,
   });
-  if (!recovered) return false;
+  if (!recovered) return null;
+  if (recovered.status === "processing") {
+    scheduleBrowserBackupCleanupAfterProcessing({
+      serverUrl,
+      recordingId,
+      authToken,
+    });
+    return "processing";
+  }
   await markBrowserRecordingBackupError(
     recordingId,
     "Upload completed, but its final receipt could not be verified. The local backup was kept.",
   ).catch(() => {});
-  return true;
+  return "ready";
 }
 
 export async function listBrowserRecordingBackups(): Promise<
@@ -951,10 +1011,21 @@ export async function retryBrowserRecordingBackup(input: {
           validatedChunks,
           input.authToken,
         );
-        verifyFinalizeReceipt(receipt, meta);
+        const receiptStatus = verifyFinalizeReceipt(receipt, meta);
+        if (receiptStatus === "processing") {
+          scheduleBrowserBackupCleanupAfterProcessing({
+            serverUrl: meta.serverUrl,
+            recordingId: meta.recordingId,
+            authToken: input.authToken,
+          });
+          return {
+            recordingId: meta.recordingId,
+            viewUrl: `/r/${meta.recordingId}`,
+          };
+        }
       } catch (err) {
         if (
-          await recoverReadyRecordingAfterFinalizeError({
+          await recoverAcceptedRecordingAfterFinalizeError({
             serverUrl: meta.serverUrl,
             recordingId: meta.recordingId,
             authToken: input.authToken,
@@ -1007,10 +1078,21 @@ export async function retryBrowserRecordingBackup(input: {
         new Blob([], { type: meta.mimeType }),
         input.authToken,
       );
-      verifyFinalizeReceipt(receipt, meta);
+      const receiptStatus = verifyFinalizeReceipt(receipt, meta);
+      if (receiptStatus === "processing") {
+        scheduleBrowserBackupCleanupAfterProcessing({
+          serverUrl: meta.serverUrl,
+          recordingId: meta.recordingId,
+          authToken: input.authToken,
+        });
+        return {
+          recordingId: meta.recordingId,
+          viewUrl: `/r/${meta.recordingId}`,
+        };
+      }
     } catch (err) {
       if (
-        await recoverReadyRecordingAfterFinalizeError({
+        await recoverAcceptedRecordingAfterFinalizeError({
           serverUrl: meta.serverUrl,
           recordingId: meta.recordingId,
           authToken: input.authToken,
@@ -1143,6 +1225,7 @@ interface NativeFullscreenUploadResult {
   durationMs: number;
   width?: number;
   height?: number;
+  verificationPending?: boolean;
 }
 
 interface NativeFullscreenSaveResult {
@@ -2490,7 +2573,7 @@ async function startNativeFullscreenRecording(
             uploadResult = await uploadPromise;
           } catch (err) {
             if (
-              await recoverReadyRecordingAfterFinalizeError({
+              await recoverAcceptedRecordingAfterFinalizeError({
                 serverUrl: params.serverUrl,
                 recordingId: id,
                 authToken: params.authToken,
@@ -2505,6 +2588,13 @@ async function startNativeFullscreenRecording(
             );
             throw err;
           }
+          if (uploadResult.verificationPending) {
+            scheduleNativeBackupCleanupAfterProcessing({
+              serverUrl: params.serverUrl,
+              recordingId: id,
+              authToken: params.authToken,
+            });
+          }
           const transcriptSaved = await transcriptSavePromise;
           if (!transcriptSaved && capturedTranscript?.text.trim()) {
             // The first write runs in parallel with native upload. Retry once
@@ -3878,15 +3968,23 @@ async function startRecordingInner(
             const receipt = bodyText
               ? (JSON.parse(bodyText) as FinalizeReceipt)
               : null;
-            verifyFinalizeReceipt(receipt, {
+            const receiptStatus = verifyFinalizeReceipt(receipt, {
               bytes: backupBytes,
               durationMs,
             });
+            if (receiptStatus === "processing") {
+              scheduleBrowserBackupCleanupAfterProcessing({
+                serverUrl: params.serverUrl,
+                recordingId: id,
+                authToken: params.authToken,
+              });
+              return { recordingId: id, viewUrl };
+            }
           } catch (err) {
             console.error("[clips-recorder] finalize fetch failed:", err);
             const error = err instanceof Error ? err : new Error(String(err));
             if (
-              await recoverReadyRecordingAfterFinalizeError({
+              await recoverAcceptedRecordingAfterFinalizeError({
                 serverUrl: params.serverUrl,
                 recordingId: id,
                 authToken: params.authToken,