@agent-native/core 0.136.4 → 0.137.0

package/corpus/README.md

@@ -31,4 +31,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- template files: 7515
+- template files: 7555

package/corpus/templates/clips/.agents/skills/recording/SKILL.md

@@ -189,6 +189,59 @@ When mode is `screen+camera`, "the bubble" is two different things:
 
 Because that draw loop runs continuously for the whole recording, keep its CPU/GPU cost bounded: a Worker-based timer drives the draw loop at the capture frame rate (`SCREEN_CAPTURE_FRAME_RATE`, 24fps — falling back to `requestAnimationFrame` only if Worker creation fails, e.g. under a strict CSP), the canvas is hard-capped to 1080p-class dimensions (1920px on its longest edge) even if the source display track is Retina/4K, and the bubble's drop shadow is pre-rendered into a small cached sprite (keyed by bubble size) instead of re-blurring with `shadowBlur` every frame.
 
+## Restart (desktop)
+
+Restart throws the current take away and immediately starts another one. It
+must never re-acquire the screen: the toolbar click reaches the popover through
+async Tauri IPC, which carries no user activation, so a second `getDisplayMedia`
+would throw. Instead the dying session hands its live display and mic streams to
+the replacement — `RecorderHandle.discardForRestart()` returns a `RestartHandoff`
+that `startRecording` accepts as `preAcquiredDisplayStream` /
+`preAcquiredAudioStream`.
+
+Ownership is the opposite of the camera's. The popover owns the camera stream for
+the whole session and re-hands it unchanged, so restart must not bump
+`bubbleSessionEpoch` or clear `bubbleStreamTransferredToRecorder`. The handed-off
+display and mic streams belong to the **recorder**, so the new session stops them
+on its own stop/cancel, and whoever asked for the restart must stop them if the
+new session never comes up.
+
+`cancel()` and `discardForRestart()` share one `discardTake(forRestart)` per
+backend, and the difference is which teardown they run. Cancel ends the
+*session*: `hide_overlays` (which destroys the camera bubble window too) and
+`clearRecordingState()`. A restart ends only the *take*, so it uses
+`hide_recording_chrome`, which spares the bubble, and leaves the recording state
+active.
+
+Stop, cancel and restart are mutually exclusive terminal transitions, so each
+gets its own promise slot — never reuse `cancelPromise` for a discard, or a
+cancel arriving mid-restart returns the take-level teardown and the session
+never ends. A cancel that lands after a discard still owes the session half,
+plus stopping the capture the retake never took ownership of. On the app side
+`restartInFlightRef` latches synchronously so stop and cancel events cannot act
+on the recorder a restart is already tearing down.
+
+Native full-screen backends re-acquire capture in Rust and hand off nothing.
+`resolveRestartHandoff` vets the inherited streams before anything is acquired,
+and it treats the two kinds of capture differently: an ended display share is
+fatal and fails with `RESTART_CAPTURE_ENDED_MESSAGE`, because re-acquiring it
+would surface an activation error that names the wrong cause, while an ended
+microphone is just dropped and re-acquired normally. A restart also has to wait
+for the old take's `transcriptionCapture.cancel()` — the engine is process-global
+(`audio_transcription_stop` / `native_speech_stop`), so a late cancel would stop
+the replacement's engine. And `stop()` after a discard must throw rather than
+answer with the discarded take's id, or an aborted recording gets published as a
+finished one. The
+recording-flow latches (`recordingFlowGateRef`, `recordingFlowActive`,
+`clipsForceAlive`, `set_recording_state`) stay held across the restart; releasing
+them the way cancel does lets the popover blur auto-hide fire mid-restart.
+
+Holding those latches has a catch. The `show_toolbar` effect is keyed on
+`isRecording || recordingFlowActive`, so it does not re-run when the flow never
+leaves — but the discard already closed the toolbar window. Restart therefore
+bumps `recordingChromeEpoch` to rebuild it. The countdown needs no such nudge;
+the recorder recreates it on every start.
+
 ## Error recovery
 
 | Failure                       | Handling                                                                  |

package/corpus/templates/clips/actions/import-loom-recording.ts

@@ -387,11 +387,18 @@ export default defineAction({
       await writeAppState("navigate", { view: "recording", recordingId: id });
 
       try {
+        console.log("[import-loom-recording] dispatching loom-import job", {
+          recordingId: id,
+          provider: providerId,
+        });
         await dispatchPostFinalizeJob({
           recordingId: id,
           kind: "loom-import",
           requireAccepted: true,
         });
+        console.log("[import-loom-recording] loom-import job accepted", {
+          recordingId: id,
+        });
       } catch (err) {
         const failureReason = `Could not start the Loom import: ${
           err instanceof Error ? err.message : String(err)

package/corpus/templates/clips/actions/lib/loom-import-job.ts

@@ -55,6 +55,11 @@ export async function failLoomImport(
   failureReason: string,
   claimId?: string,
 ): Promise<LoomImportJobResult> {
+  console.error("[loom-import] failed", {
+    recordingId,
+    claimId,
+    failureReason,
+  });
   const now = new Date().toISOString();
   const [updated] = await getDb()
     .update(schema.recordings)
@@ -140,9 +145,16 @@ export async function runLoomImportJob({
     );
   }
 
+  console.log("[loom-import] job started", { recordingId, claimId });
+
   let media: Awaited<ReturnType<typeof downloadLoomVideo>>;
   try {
     media = await downloadLoomVideo({ loomId, shareUrl });
+    console.log("[loom-import] download complete", {
+      recordingId,
+      bytes: media.sizeBytes,
+      mimeType: media.mimeType,
+    });
   } catch (err) {
     return failLoomImport(
       recordingId,
@@ -167,6 +179,10 @@ export async function runLoomImportJob({
         claimId,
       );
     }
+    console.log("[loom-import] reupload complete", {
+      recordingId,
+      videoUrl: upload.url,
+    });
 
     const now = new Date().toISOString();
     const [mediaReady] = await db
@@ -187,11 +203,15 @@ export async function runLoomImportJob({
       )
       .returning({ id: schema.recordings.id });
     if (!mediaReady) {
-      return {
-        status: "failed",
-        failureReason: "The Loom import lease was lost before media was saved.",
-      };
+      const failureReason =
+        "The Loom import lease was lost before media was saved.";
+      console.warn("[loom-import] lease lost before ready", {
+        recordingId,
+        claimId,
+      });
+      return { status: "failed", failureReason };
     }
+    console.log("[loom-import] recording ready", { recordingId });
 
     void queueBuilderMediaCompression({
       recordingId,

package/corpus/templates/clips/app/components/import-menu.tsx

@@ -0,0 +1,109 @@
+import { useT } from "@agent-native/core/client/i18n";
+import { IconChevronDown, IconLink, IconUpload } from "@tabler/icons-react";
+import { Link } from "react-router";
+
+import { Button, type ButtonProps } from "@/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
+
+type MenuSide = "top" | "right" | "bottom" | "left";
+type MenuAlign = "start" | "center" | "end";
+
+export interface ImportMenuProps {
+  uploadHref?: string;
+  onUpload?: () => void;
+  importLoomHref?: string;
+  className?: string;
+  disabled?: boolean;
+  iconOnly?: boolean;
+  menuAlign?: MenuAlign;
+  menuSide?: MenuSide;
+  size?: ButtonProps["size"];
+  variant?: ButtonProps["variant"];
+}
+
+export function ImportMenu({
+  uploadHref,
+  onUpload,
+  importLoomHref,
+  className,
+  disabled,
+  iconOnly = false,
+  menuAlign = "center",
+  menuSide,
+  size = iconOnly ? "icon" : "default",
+  variant = "outline",
+}: ImportMenuProps) {
+  const t = useT();
+
+  if (!uploadHref && !onUpload && !importLoomHref) return null;
+
+  const trigger = (
+    <Button
+      type="button"
+      variant={variant}
+      size={size}
+      disabled={disabled}
+      aria-label={t("preRecord.import")}
+      className={cn(!iconOnly && "gap-2", className)}
+    >
+      <IconUpload />
+      {!iconOnly ? (
+        <>
+          {t("preRecord.import")}
+          <IconChevronDown />
+        </>
+      ) : null}
+    </Button>
+  );
+
+  return (
+    <DropdownMenu>
+      {iconOnly ? (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <DropdownMenuTrigger asChild>{trigger}</DropdownMenuTrigger>
+          </TooltipTrigger>
+          <TooltipContent side={menuSide ?? "right"}>
+            {t("preRecord.import")}
+          </TooltipContent>
+        </Tooltip>
+      ) : (
+        <DropdownMenuTrigger asChild>{trigger}</DropdownMenuTrigger>
+      )}
+      <DropdownMenuContent align={menuAlign} side={menuSide} className="w-56">
+        {uploadHref ? (
+          <DropdownMenuItem asChild>
+            <Link to={uploadHref}>
+              <IconUpload />
+              {t("preRecord.uploadVideo")}
+            </Link>
+          </DropdownMenuItem>
+        ) : onUpload ? (
+          <DropdownMenuItem onSelect={onUpload}>
+            <IconUpload />
+            {t("preRecord.uploadVideo")}
+          </DropdownMenuItem>
+        ) : null}
+        {importLoomHref ? (
+          <DropdownMenuItem asChild>
+            <Link to={importLoomHref}>
+              <IconLink />
+              {t("preRecord.importLoom")}
+            </Link>
+          </DropdownMenuItem>
+        ) : null}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}

package/corpus/templates/clips/app/components/library/library-grid.tsx

@@ -8,13 +8,12 @@ import {
   IconChevronLeft,
   IconChevronRight,
   IconPlayerRecord,
-  IconUpload,
-  IconLink,
 } from "@tabler/icons-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { NavLink } from "react-router";
 import { toast } from "sonner";
 
+import { ImportMenu } from "@/components/import-menu";
 import { CreateFolderDialog } from "@/components/library/create-folder-dialog";
 import { ShareRecordingDialog } from "@/components/player/share-dialog";
 import { Button } from "@/components/ui/button";
@@ -101,22 +100,13 @@ function NewRecordingTile({
           {t("navigation.newRecording")}
         </NavLink>
       </Button>
-      <div className="flex items-center gap-3">
-        <NavLink
-          to={uploadHref}
-          className="flex items-center gap-1.5 text-xs font-medium text-muted-foreground hover:text-foreground"
-        >
-          <IconUpload className="h-3.5 w-3.5" />
-          {t("preRecord.uploadVideo")}
-        </NavLink>
-        <NavLink
-          to={importHref}
-          className="flex items-center gap-1.5 text-xs font-medium text-muted-foreground hover:text-foreground"
-        >
-          <IconLink className="h-3.5 w-3.5" />
-          {t("preRecord.importLoom")}
-        </NavLink>
-      </div>
+      <ImportMenu
+        uploadHref={uploadHref}
+        importLoomHref={importHref}
+        size="sm"
+        variant="ghost"
+        className="h-auto px-0 text-xs font-medium text-muted-foreground hover:bg-transparent hover:text-foreground"
+      />
     </div>
   );
 }

package/corpus/templates/clips/app/components/library/library-layout.tsx

@@ -32,8 +32,6 @@ import {
   IconShare,
   IconSettings,
   IconSearch,
-  IconUpload,
-  IconLink,
 } from "@tabler/icons-react";
 import { ReactNode, useEffect, useMemo, useState } from "react";
 import { NavLink, useLocation, useParams } from "react-router";
@@ -43,6 +41,7 @@ import {
   CaptureInstallButton,
   CaptureInstallInlineLink,
 } from "@/components/capture-install-options";
+import { ImportMenu } from "@/components/import-menu";
 import {
   AlertDialog,
   AlertDialogAction,
@@ -400,34 +399,14 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
               </div>
 
               <div className="flex flex-col items-center gap-1 px-2">
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <NavLink
-                      to="/record?autoUpload=1"
-                      aria-label={t("preRecord.uploadVideo")}
-                      className="flex h-9 w-9 items-center justify-center rounded-md text-muted-foreground hover:bg-accent/60 hover:text-foreground"
-                    >
-                      <IconUpload className="h-4 w-4" />
-                    </NavLink>
-                  </TooltipTrigger>
-                  <TooltipContent side="right">
-                    {t("preRecord.uploadVideo")}
-                  </TooltipContent>
-                </Tooltip>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <NavLink
-                      to="/import"
-                      aria-label={t("preRecord.importLoom")}
-                      className="flex h-9 w-9 items-center justify-center rounded-md text-muted-foreground hover:bg-accent/60 hover:text-foreground"
-                    >
-                      <IconLink className="h-4 w-4" />
-                    </NavLink>
-                  </TooltipTrigger>
-                  <TooltipContent side="right">
-                    {t("preRecord.importLoom")}
-                  </TooltipContent>
-                </Tooltip>
+                <ImportMenu
+                  uploadHref="/record?autoUpload=1"
+                  importLoomHref="/import"
+                  iconOnly
+                  variant="ghost"
+                  menuSide="right"
+                  menuAlign="start"
+                />
               </div>
 
               <nav className="mt-3 flex flex-col items-center gap-1 px-2">
@@ -463,28 +442,13 @@ export function LibraryLayout({ children }: LibraryLayoutProps) {
                     {t("navigation.newRecording")}
                   </NavLink>
                 </Button>
-                <Button
-                  className="mt-1.5 w-full gap-1.5 text-muted-foreground"
+                <ImportMenu
+                  uploadHref="/record?autoUpload=1"
+                  importLoomHref="/import"
                   size="sm"
                   variant="ghost"
-                  asChild
-                >
-                  <NavLink to="/record?autoUpload=1">
-                    <IconUpload className="h-4 w-4" />
-                    {t("preRecord.uploadVideo")}
-                  </NavLink>
-                </Button>
-                <Button
-                  className="mt-1.5 w-full gap-1.5 text-muted-foreground"
-                  size="sm"
-                  variant="ghost"
-                  asChild
-                >
-                  <NavLink to="/import">
-                    <IconLink className="h-4 w-4" />
-                    {t("preRecord.importLoom")}
-                  </NavLink>
-                </Button>
+                  className="mt-1.5 w-full"
+                />
               </div>
 
               <nav className="mt-3 space-y-0.5 px-2">

package/corpus/templates/clips/app/components/library/sort-menu.tsx

@@ -7,6 +7,11 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 export type SortKey = "recent" | "views" | "oldest";
 
@@ -24,12 +29,21 @@ interface SortMenuProps {
 export function SortMenu({ value, onChange }: SortMenuProps) {
   return (
     <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button variant="outline" size="sm" className="gap-1.5 h-9">
-          <IconArrowsSort className="h-3.5 w-3.5" />
-          <span className="text-xs">{LABELS[value]}</span>
-        </Button>
-      </DropdownMenuTrigger>
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <DropdownMenuTrigger asChild>
+            <Button
+              variant="outline"
+              size="icon"
+              className="h-9 w-9"
+              aria-label={LABELS[value]}
+            >
+              <IconArrowsSort className="h-3.5 w-3.5" />
+            </Button>
+          </DropdownMenuTrigger>
+        </TooltipTrigger>
+        <TooltipContent>{LABELS[value]}</TooltipContent>
+      </Tooltip>
       <DropdownMenuContent align="end" className="w-44">
         {(Object.keys(LABELS) as SortKey[]).map((key) => (
           <DropdownMenuItem

package/corpus/templates/clips/app/components/recorder/pre-record-panel.tsx

@@ -7,16 +7,14 @@ import {
   IconChevronDown,
   IconDeviceDesktop,
   IconDeviceScreen,
-  IconLink,
   IconMicrophone,
   IconPlayerRecord,
-  IconUpload,
   IconVideo,
 } from "@tabler/icons-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Link } from "react-router";
 
 import { CaptureInstallInlineLink } from "@/components/capture-install-options";
+import { ImportMenu } from "@/components/import-menu";
 import { Button } from "@/components/ui/button";
 import {
   Collapsible,
@@ -66,15 +64,14 @@ export interface PreRecordPanelProps {
   initialDisplaySurface?: DisplaySurface | null;
   /** Called when the user picks a local video file to upload. */
   onUpload?: (file: File) => void;
-  /** When set, shows an "Import Loom" link pointing at the dedicated
-   * Loom-import page instead of an inline import form. */
+  /** When set, includes an "Import Loom" option in the shared import menu. */
   importLoomHref?: string;
   onCancel?: () => void;
   busy?: boolean;
   cameraSize?: CameraBubbleSize;
   onCameraSizeChange?: (size: CameraBubbleSize) => void;
   /** Opens the file picker once on mount, e.g. when arriving from a
-   * dedicated "Upload video" entry point elsewhere in the app. */
+   * dedicated upload entry point elsewhere in the app. */
   autoOpenUpload?: boolean;
 }
 
@@ -924,34 +921,13 @@ export function PreRecordPanel({
 
         {(onUpload || importLoomHref) && (
           <>
-            <div
-              className={cn(
-                "grid gap-2",
-                onUpload && importLoomHref && "sm:grid-cols-2",
-              )}
-            >
-              {onUpload ? (
-                <button
-                  type="button"
-                  disabled={busy}
-                  onClick={() => fileInputRef.current?.click()}
-                  className="flex w-full cursor-pointer items-center justify-center gap-2 rounded-lg px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground disabled:cursor-not-allowed disabled:opacity-60"
-                >
-                  <IconUpload className="h-4 w-4" />
-                  {t("preRecord.uploadVideo")}
-                </button>
-              ) : null}
-
-              {importLoomHref ? (
-                <Link
-                  to={importLoomHref}
-                  className="flex w-full cursor-pointer items-center justify-center gap-2 rounded-lg px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
-                >
-                  <IconLink className="h-4 w-4" />
-                  {t("preRecord.importLoom")}
-                </Link>
-              ) : null}
-            </div>
+            <ImportMenu
+              onUpload={
+                onUpload ? () => fileInputRef.current?.click() : undefined
+              }
+              importLoomHref={importLoomHref}
+              disabled={busy}
+            />
 
             {onUpload ? (
               <input

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

@@ -1,5 +1,4 @@
 import { useT } from "@agent-native/core/client/i18n";
-import { IconPlayerRecord } from "@tabler/icons-react";
 import { NavLink } from "react-router";
 
 import { LibraryGrid } from "@/components/library/library-grid";
@@ -38,7 +37,6 @@ export default function LibraryIndexRoute() {
             asChild
           >
             <NavLink to="/record" aria-label={t("navigation.newRecording")}>
-              <IconPlayerRecord className="h-4 w-4" />
               <span className="hidden sm:inline">
                 {t("navigation.newRecording")}
               </span>

package/corpus/templates/clips/changelog/2026-08-03-restart-during-a-recording-now-immediately-starts-a-fresh-ta.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-08-03
+---
+
+Restart during a recording now immediately starts a fresh take instead of cancelling.

package/corpus/templates/clips/changelog/2026-08-04-cleaner-library-controls-with-an-icon-only-sort-button.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-08-04
+---
+
+Cleaner Library controls with a simpler New recording button and icon-only sort control

package/corpus/templates/clips/changelog/2026-08-04-upload-and-loom-imports-now-live-under-one-import-menu.md

@@ -0,0 +1,6 @@
+---
+type: improved
+date: 2026-08-04
+---
+
+Upload and Loom imports now live under one Import menu