@agent-native/core 0.161.7 → 0.161.8

package/corpus/README.md

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

package/corpus/templates/content/server/plugins/agent-chat.ts

@@ -5,6 +5,7 @@ import {
 } from "@agent-native/core/server";
 
 import actionsRegistry from "../../.generated/actions-registry.js";
+import { A2A_RECEIVER_OWNERSHIP_FLAG } from "../../shared/feature-flags.js";
 import {
   publicDocumentExtraContext,
   resolvePublicViewerOwner,
@@ -32,6 +33,7 @@ const INITIAL_TOOL_NAMES = [
 export default createAgentChatPlugin({
   appId: "content",
   durableBackgroundRuns: true,
+  a2aReceiverOwnershipFlag: A2A_RECEIVER_OWNERSHIP_FLAG,
   actions: loadActionsFromStaticRegistry(actionsRegistry),
   initialToolNames: INITIAL_TOOL_NAMES,
   mcp: {

package/corpus/templates/content/server/plugins/feature-flags.ts

@@ -0,0 +1,5 @@
+import { createFeatureFlagsPlugin } from "@agent-native/core/server";
+
+import { CONTENT_FEATURE_FLAGS } from "../../shared/feature-flags.js";
+
+export default createFeatureFlagsPlugin({ flags: CONTENT_FEATURE_FLAGS });

package/corpus/templates/content/shared/feature-flags.ts

@@ -0,0 +1,15 @@
+import {
+  defineFeatureFlag,
+  defineFeatureFlags,
+} from "@agent-native/core/feature-flags";
+
+export const A2A_RECEIVER_OWNERSHIP_FLAG = defineFeatureFlag({
+  key: "content.a2a-receiver-ownership",
+  displayName: "A2A receiver ownership",
+  description:
+    "Prefer Content's declared local capabilities when another app delegates an objective to Content.",
+});
+
+export const CONTENT_FEATURE_FLAGS = defineFeatureFlags([
+  A2A_RECEIVER_OWNERSHIP_FLAG,
+]);

package/corpus/templates/slides/.agents/skills/slide-editing/SKILL.md

@@ -90,6 +90,15 @@ To edit a slide's content:
    preserve quote, speaker, date, metric, and uncertainty status. Existing HTML
    or visual similarity is not proof of source fidelity.
 
+## Skipping a Slide
+
+Set a slide's `skipped: true` via a `patch-deck` `patch-slide` operation to
+exclude it from Present/Presenter playback without deleting it — the slide
+stays in the deck, editor, and exports. Set `skipped: false` (or omit it) to
+include it again. The rail's right-click menu on each slide thumbnail offers
+Cut, Copy, Paste, Delete, New slide, Duplicate slide, and Skip slide as the
+same operations.
+
 ## Click-to-reveal animations
 
 Animations are metadata over the final slide HTML, not alternate slide markup.

package/corpus/templates/slides/actions/patch-deck.ts

@@ -113,6 +113,12 @@ const SlideFieldsSchema = z.object({
     .describe(
       "Complete ordered on-click reveal list. Include every intended target in order; unlisted elements remain visible. Use elementPath from the final HTML and 0-based indexes.",
     ),
+  skipped: z
+    .boolean()
+    .optional()
+    .describe(
+      "Exclude this slide from Present/Presenter playback without deleting it.",
+    ),
 });
 
 /** Update fields on a single existing slide */
@@ -165,6 +171,7 @@ const AddSlideOp = z.object({
         .optional(),
       animations: z.array(z.unknown()).optional(),
       splitByParagraph: z.boolean().optional(),
+      skipped: z.boolean().optional(),
     })
     .passthrough(),
 });
@@ -346,6 +353,7 @@ export function applyOperation(deck: any, op: Operation): void {
         slide.excalidrawData = fields.excalidrawData;
       if (fields.transition !== undefined) slide.transition = fields.transition;
       if (fields.animations !== undefined) slide.animations = fields.animations;
+      if (fields.skipped !== undefined) slide.skipped = fields.skipped;
       break;
     }
 

package/corpus/templates/slides/app/components/editor/EditorSidebar.tsx

@@ -17,6 +17,7 @@ import {
 import { CSS } from "@dnd-kit/utilities";
 import { appStateKeyForBrowserTab } from "@shared/app-state-tabs";
 import { hashSlideContent, type DeckFitState } from "@shared/slide-fit";
+import { IconEyeOff } from "@tabler/icons-react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
 
@@ -25,6 +26,14 @@ import type { SlideOverflowInfo } from "@/components/deck/SlideRenderer";
 import { AddSlidePopover } from "@/components/editor/AddSlidePopover";
 import { AiEditingMarker } from "@/components/editor/AiEditingMarker";
 import GeneratingSlidePreview from "@/components/editor/GeneratingSlidePreview";
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuShortcut,
+  ContextMenuTrigger,
+} from "@/components/ui/context-menu";
 import {
   Tooltip,
   TooltipContent,
@@ -33,6 +42,7 @@ import {
 import { defaultSlideContent, type Slide } from "@/context/DeckContext";
 import { getAspectRatioDims, type AspectRatio } from "@/lib/aspect-ratios";
 import { TAB_ID } from "@/lib/tab-id";
+import { shortcutLabel } from "@/lib/utils";
 
 import type { DesignSystemData } from "../../../shared/api";
 import { isSlideTextEditingTarget } from "./slide-text-targets";
@@ -78,6 +88,19 @@ interface EditorSidebarProps {
    *  this component's own useAgentGenerating() call) so the run stays
    *  correctly scoped and trackable across a sidebar remount. */
   addSlideAgentSubmit: (message: string, context: string) => void;
+  /** Whether a slide is currently on the cut/copy clipboard, so the rail's
+   *  right-click menu can disable Paste when there's nothing to paste. */
+  hasSlideClipboard?: boolean;
+  onCutSlide?: (slideId: string) => void;
+  onCopySlide?: (slideId: string) => void;
+  /** Pastes the clipboard slide directly after this slide. */
+  onPasteSlide?: (slideId: string) => void;
+  onDeleteSlide?: (slideId: string) => void;
+  /** Inserts a new blank slide directly after this slide. */
+  onNewSlideAfter?: (slideId: string) => void;
+  onDuplicateSlide?: (slideId: string) => void;
+  /** Toggles whether this slide is excluded from Present/Presenter mode. */
+  onToggleSkipSlide?: (slideId: string) => void;
 }
 
 const DECK_FIT_STATE_KEYS = [
@@ -176,6 +199,15 @@ function SortableSlideThumb({
   onOverflowChange,
   readOnly = false,
   aiEditing = false,
+  canDelete = true,
+  hasSlideClipboard = false,
+  onCutSlide,
+  onCopySlide,
+  onPasteSlide,
+  onDeleteSlide,
+  onNewSlideAfter,
+  onDuplicateSlide,
+  onToggleSkipSlide,
 }: {
   slide: Slide;
   index: number;
@@ -188,6 +220,16 @@ function SortableSlideThumb({
   designSystem?: DesignSystemData;
   onOverflowChange: (info: SlideOverflowInfo) => void;
   aiEditing?: boolean;
+  /** False when this is the deck's last remaining slide — Cut/Delete stay enabled elsewhere but must not remove it. */
+  canDelete?: boolean;
+  hasSlideClipboard?: boolean;
+  onCutSlide?: (slideId: string) => void;
+  onCopySlide?: (slideId: string) => void;
+  onPasteSlide?: (slideId: string) => void;
+  onDeleteSlide?: (slideId: string) => void;
+  onNewSlideAfter?: (slideId: string) => void;
+  onDuplicateSlide?: (slideId: string) => void;
+  onToggleSkipSlide?: (slideId: string) => void;
 }) {
   const t = useT();
   const {
@@ -217,76 +259,139 @@ function SortableSlideThumb({
 
   return (
     <div ref={setNodeRef} style={style}>
-      <button
-        ref={(node) => registerButtonRef(slide.id, node)}
-        type="button"
-        {...(readOnly ? {} : attributes)}
-        {...(readOnly ? {} : listeners)}
-        onClick={(event) => {
-          // Safari does not focus a button on click, and the slide copy/paste
-          // and delete shortcuts are scoped to a focused thumbnail.
-          event.currentTarget.focus();
-          onSelect();
-        }}
-        onFocus={onSelect}
-        aria-label={t("editorSidebar.selectSlide", { number: index + 1 })}
-        aria-current={isActive ? "true" : undefined}
-        data-slide-thumbnail-id={slide.id}
-        className={`w-full text-left flex items-start gap-1.5 p-1.5 rounded-lg transition-[background-color,box-shadow] duration-150 ${
-          isActive ? "bg-accent" : ""
-        } ${
-          readOnly ? "" : "cursor-grab active:cursor-grabbing"
-        } focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1`}
-      >
-        {/* Index and slide presence share the fixed rail so presence does not resize the row. */}
-        <div className="relative flex-shrink-0 w-4 self-stretch">
-          <span className="block text-center text-[10px] font-medium leading-5 text-muted-foreground/70">
-            {index + 1}
-          </span>
-          {(showAiMarker || humanPresenceUsers.length > 0) && (
-            <div className="absolute left-1/2 top-5 z-10 flex -translate-x-1/2 flex-col items-center gap-1">
-              {showAiMarker && (
-                <AiEditingMarker className="size-4 text-[8px]" />
-              )}
-              {humanPresenceUsers.slice(0, 4).map((u, i) => (
-                <PresenceAvatarTip key={i} user={u} size={14} />
-              ))}
-              {humanPresenceUsers.length > 4 && (
-                <span className="flex h-4 min-w-4 items-center justify-center rounded-full bg-muted px-1 text-[8px] font-medium leading-none text-muted-foreground ring-1 ring-black/40">
-                  +{humanPresenceUsers.length - 4}
-                </span>
+      <ContextMenu>
+        <ContextMenuTrigger asChild disabled={readOnly}>
+          <button
+            ref={(node) => registerButtonRef(slide.id, node)}
+            type="button"
+            {...(readOnly ? {} : attributes)}
+            {...(readOnly ? {} : listeners)}
+            onClick={(event) => {
+              // Safari does not focus a button on click, and the slide copy/paste
+              // and delete shortcuts are scoped to a focused thumbnail.
+              event.currentTarget.focus();
+              onSelect();
+            }}
+            onFocus={onSelect}
+            aria-label={t("editorSidebar.selectSlide", { number: index + 1 })}
+            aria-current={isActive ? "true" : undefined}
+            data-slide-thumbnail-id={slide.id}
+            className={`w-full text-left flex items-start gap-1.5 p-1.5 rounded-lg transition-[background-color,box-shadow] duration-150 ${
+              isActive ? "bg-accent" : ""
+            } ${
+              readOnly ? "" : "cursor-grab active:cursor-grabbing"
+            } focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1`}
+          >
+            {/* Index and slide presence share the fixed rail so presence does not resize the row. */}
+            <div className="relative flex-shrink-0 w-4 self-stretch">
+              <span className="block text-center text-[10px] font-medium leading-5 text-muted-foreground/70">
+                {index + 1}
+              </span>
+              {(showAiMarker || humanPresenceUsers.length > 0) && (
+                <div className="absolute left-1/2 top-5 z-10 flex -translate-x-1/2 flex-col items-center gap-1">
+                  {showAiMarker && (
+                    <AiEditingMarker className="size-4 text-[8px]" />
+                  )}
+                  {humanPresenceUsers.slice(0, 4).map((u, i) => (
+                    <PresenceAvatarTip key={i} user={u} size={14} />
+                  ))}
+                  {humanPresenceUsers.length > 4 && (
+                    <span className="flex h-4 min-w-4 items-center justify-center rounded-full bg-muted px-1 text-[8px] font-medium leading-none text-muted-foreground ring-1 ring-black/40">
+                      +{humanPresenceUsers.length - 4}
+                    </span>
+                  )}
+                </div>
               )}
             </div>
-          )}
-        </div>
 
-        {/* Thumbnail */}
-        <div className="flex-1 min-w-0">
-          {/* Each thumbnail paints a full-resolution slide canvas scaled down by
-           * transform, so a long rail keeps dozens of large layers live and the
-           * browser drops frames or paints stale tiles. `content-visibility`
-           * lets it skip everything below the fold; `aspect-ratio` keeps the row
-           * the right height while its contents are skipped. */}
-          <div
-            className="w-full overflow-hidden rounded border"
-            style={{
-              borderColor:
-                humanPresenceUsers.length > 0
-                  ? humanPresenceUsers[0].color + "66"
-                  : "rgba(255,255,255,0.06)",
-              aspectRatio: `${thumbDims.width} / ${thumbDims.height}`,
-              contentVisibility: "auto",
-            }}
+            {/* Thumbnail */}
+            <div className="flex-1 min-w-0">
+              {/* Each thumbnail paints a full-resolution slide canvas scaled down by
+               * transform, so a long rail keeps dozens of large layers live and the
+               * browser drops frames or paints stale tiles. `content-visibility`
+               * lets it skip everything below the fold; `aspect-ratio` keeps the row
+               * the right height while its contents are skipped. */}
+              <div
+                className={`relative w-full overflow-hidden rounded border ${
+                  slide.skipped ? "opacity-40" : ""
+                }`}
+                style={{
+                  borderColor:
+                    humanPresenceUsers.length > 0
+                      ? humanPresenceUsers[0].color + "66"
+                      : // guard:allow-raw-color — thumbnail border sits on an arbitrary-colored slide render, not app chrome
+                        "rgba(255,255,255,0.06)",
+                  aspectRatio: `${thumbDims.width} / ${thumbDims.height}`,
+                  contentVisibility: "auto",
+                }}
+              >
+                <SlideRenderer
+                  slide={slide}
+                  aspectRatio={aspectRatio}
+                  designSystem={designSystem}
+                  onOverflowChange={onOverflowChange}
+                />
+                {slide.skipped && (
+                  // guard:allow-raw-color — dims an arbitrary-colored slide render, not app chrome; must stay black regardless of theme
+                  <div className="absolute inset-0 z-10 flex items-center justify-center bg-black/40">
+                    {/* guard:allow-raw-color — icon sits on the black scrim above, not app chrome */}
+                    <IconEyeOff className="size-6 text-white/80" />
+                  </div>
+                )}
+              </div>
+            </div>
+          </button>
+        </ContextMenuTrigger>
+        <ContextMenuContent
+          onCloseAutoFocus={(event) => {
+            // Radix restores focus to the trigger (this slide's thumbnail
+            // button) when the menu closes. That button's onFocus reselects
+            // its own slide, which clobbers New/Duplicate/Paste's deliberate
+            // selection of the newly created slide. Our handlers already set
+            // the right active slide explicitly, so skip the auto-focus.
+            event.preventDefault();
+          }}
+        >
+          <ContextMenuItem
+            disabled={!canDelete}
+            onSelect={() => onCutSlide?.(slide.id)}
           >
-            <SlideRenderer
-              slide={slide}
-              aspectRatio={aspectRatio}
-              designSystem={designSystem}
-              onOverflowChange={onOverflowChange}
-            />
-          </div>
-        </div>
-      </button>
+            {t("editorSidebar.cut")}
+            <ContextMenuShortcut>{shortcutLabel("cmd+x")}</ContextMenuShortcut>
+          </ContextMenuItem>
+          <ContextMenuItem onSelect={() => onCopySlide?.(slide.id)}>
+            {t("editorSidebar.copy")}
+            <ContextMenuShortcut>{shortcutLabel("cmd+c")}</ContextMenuShortcut>
+          </ContextMenuItem>
+          <ContextMenuItem
+            disabled={!hasSlideClipboard}
+            onSelect={() => onPasteSlide?.(slide.id)}
+          >
+            {t("editorSidebar.paste")}
+            <ContextMenuShortcut>{shortcutLabel("cmd+v")}</ContextMenuShortcut>
+          </ContextMenuItem>
+          <ContextMenuSeparator />
+          <ContextMenuItem onSelect={() => onNewSlideAfter?.(slide.id)}>
+            {t("editorSidebar.newSlide")}
+          </ContextMenuItem>
+          <ContextMenuItem onSelect={() => onDuplicateSlide?.(slide.id)}>
+            {t("editorSidebar.duplicateSlide")}
+          </ContextMenuItem>
+          <ContextMenuItem onSelect={() => onToggleSkipSlide?.(slide.id)}>
+            {slide.skipped
+              ? t("editorSidebar.unskipSlide")
+              : t("editorSidebar.skipSlide")}
+          </ContextMenuItem>
+          <ContextMenuSeparator />
+          <ContextMenuItem
+            disabled={!canDelete}
+            onSelect={() => onDeleteSlide?.(slide.id)}
+            className="text-destructive focus:text-destructive"
+          >
+            {t("editorSidebar.deleteSlide")}
+          </ContextMenuItem>
+        </ContextMenuContent>
+      </ContextMenu>
     </div>
   );
 }
@@ -352,6 +457,14 @@ export default function EditorSidebar({
   onAwaitAddSlidePersisted,
   onRemoveFailedSlide,
   addSlideAgentSubmit,
+  hasSlideClipboard,
+  onCutSlide,
+  onCopySlide,
+  onPasteSlide,
+  onDeleteSlide,
+  onNewSlideAfter,
+  onDuplicateSlide,
+  onToggleSkipSlide,
 }: EditorSidebarProps) {
   const t = useT();
   const [describeAnchorEl, setDescribeAnchorEl] =
@@ -549,6 +662,15 @@ export default function EditorSidebar({
                 aspectRatio={aspectRatio}
                 designSystem={designSystem}
                 aiEditing={aiEditedSlideIds.has(slide.id)}
+                canDelete={slides.length > 1}
+                hasSlideClipboard={hasSlideClipboard}
+                onCutSlide={onCutSlide}
+                onCopySlide={onCopySlide}
+                onPasteSlide={onPasteSlide}
+                onDeleteSlide={onDeleteSlide}
+                onNewSlideAfter={onNewSlideAfter}
+                onDuplicateSlide={onDuplicateSlide}
+                onToggleSkipSlide={onToggleSkipSlide}
                 onOverflowChange={(info) =>
                   handleSlideOverflowChange(slide, info)
                 }

package/corpus/templates/slides/app/components/presentation/PresentationView.tsx

@@ -202,7 +202,7 @@ export default function PresentationView({
   const safeSlides = useMemo(
     () =>
       (Array.isArray(slides) ? slides : [])
-        .filter(Boolean)
+        .filter((slide): slide is Slide => Boolean(slide) && !slide.skipped)
         .map((slide, index) => ({
           ...slide,
           id: slide.id || `slide-${index}`,
@@ -212,6 +212,27 @@ export default function PresentationView({
         })),
     [slides],
   );
+  // `startIndex` is a raw index into the full (unfiltered) deck.slides array —
+  // e.g. from the editor's current slide or a `?slide=N` deep link. Skipped
+  // slides are absent from safeSlides, so translate it to the nearest visible
+  // slide's position within safeSlides rather than clamping the raw index
+  // directly, which would land on the wrong slide whenever a skip precedes it.
+  const initialIndex = useMemo(() => {
+    const rawSlides = (Array.isArray(slides) ? slides : []).filter(Boolean);
+    if (rawSlides.length === 0) return 0;
+    const clampedRaw = Math.max(0, Math.min(startIndex, rawSlides.length - 1));
+    for (let i = clampedRaw; i < rawSlides.length; i++) {
+      if (!rawSlides[i]?.skipped) {
+        return rawSlides.slice(0, i).filter((s) => !s?.skipped).length;
+      }
+    }
+    for (let i = clampedRaw - 1; i >= 0; i--) {
+      if (!rawSlides[i]?.skipped) {
+        return rawSlides.slice(0, i).filter((s) => !s?.skipped).length;
+      }
+    }
+    return 0;
+  }, [slides, startIndex]);
   const clampIndex = useCallback(
     (index: number) => {
       if (safeSlides.length === 0) return 0;
@@ -221,7 +242,7 @@ export default function PresentationView({
     [safeSlides.length],
   );
   const [currentIndex, setCurrentIndex] = useState(() =>
-    clampIndex(startIndex),
+    clampIndex(initialIndex),
   );
   const [prevIndex, setPrevIndex] = useState<number | null>(null);
   const [direction, setDirection] = useState<"next" | "prev">("next");
@@ -239,24 +260,36 @@ export default function PresentationView({
 
   const isShared = deckId.startsWith("__shared__/");
 
+  // `safeSlides` excludes skipped slides, so its index isn't the deck index
+  // DeckEditor's `?slide=N` param expects. Map back to the raw position so
+  // exiting/opening Presenter lands on the same slide it's currently showing.
+  const visibleRawIndices = useMemo(() => {
+    const rawSlides = (Array.isArray(slides) ? slides : []).filter(Boolean);
+    const rawIndices: number[] = [];
+    rawSlides.forEach((slide, i) => {
+      if (!slide?.skipped) rawIndices.push(i);
+    });
+    return rawIndices;
+  }, [slides]);
+  const toRawIndex = useCallback(
+    (filteredIndex: number) =>
+      visibleRawIndices[filteredIndex] ?? filteredIndex,
+    [visibleRawIndices],
+  );
+
   // Exit handlers read these instead of closing over `currentIndex`/`deckId`/
   // `isShared` so the mount-only fullscreenchange listener still lands on the
   // right deck and slide even if this component is reused for a different
   // deck without remounting (e.g. an agent-driven navigation).
   const currentIndexRef = useRef(currentIndex);
   currentIndexRef.current = currentIndex;
+  const visibleRawIndicesRef = useRef(visibleRawIndices);
+  visibleRawIndicesRef.current = visibleRawIndices;
   const deckIdRef = useRef(deckId);
   deckIdRef.current = deckId;
   const isSharedRef = useRef(isShared);
   isSharedRef.current = isShared;
 
-  useEffect(() => {
-    setCurrentIndex((prev) => clampIndex(prev));
-    setPrevIndex((prev) =>
-      prev !== null && prev >= safeSlides.length ? null : prev,
-    );
-  }, [clampIndex, safeSlides.length]);
-
   const clearTransitionTimer = useCallback(() => {
     if (transitionTimerRef.current !== null) {
       window.clearTimeout(transitionTimerRef.current);
@@ -266,14 +299,57 @@ export default function PresentationView({
 
   useEffect(() => clearTransitionTimer, [clearTransitionTimer]);
 
+  // One atomic effect handles both cases so they can't race each other:
+  // - A genuine deep link or deck switch (startIndex/deckId changed) reseeds
+  //   from initialIndex. This component is reused across deck navigation
+  //   (see the exit-handler refs above), so a new deck at the same `?slide=`
+  //   must still reset instead of inheriting the previous deck's position.
+  // - Otherwise, a skip toggle or reorder changed safeSlides without a new
+  //   deep link. A length-only clamp would silently swap in a different
+  //   slide at the same index, so follow the previously-shown slide's id to
+  //   its new position, falling back to a raw clamp only when it's gone.
+  const prevDeepLinkKeyRef = useRef({ startIndex, deckId });
+  const prevSafeSlideIdsRef = useRef<string[]>(safeSlides.map((s) => s.id));
   useEffect(() => {
-    clearTransitionTimer();
-    queuedNavigationRef.current = null;
-    setCurrentIndex(clampIndex(startIndex));
-    setCurrentStep(0);
-    setPrevIndex(null);
-    setAnimating(false);
-  }, [clearTransitionTimer, clampIndex, startIndex]);
+    const prevKey = prevDeepLinkKeyRef.current;
+    const isDeepLinkChange =
+      prevKey.startIndex !== startIndex || prevKey.deckId !== deckId;
+    prevDeepLinkKeyRef.current = { startIndex, deckId };
+
+    if (isDeepLinkChange) {
+      prevSafeSlideIdsRef.current = safeSlides.map((s) => s.id);
+      clearTransitionTimer();
+      queuedNavigationRef.current = null;
+      setCurrentIndex(clampIndex(initialIndex));
+      setCurrentStep(0);
+      setPrevIndex(null);
+      setAnimating(false);
+      return;
+    }
+
+    // Read the prior ids before overwriting the ref below — the lookup needs
+    // the slide order from before this update, not the one it's producing.
+    const activeId = prevSafeSlideIdsRef.current[currentIndexRef.current];
+    const newIds = safeSlides.map((s) => s.id);
+    const followedIndex = activeId ? newIds.indexOf(activeId) : -1;
+    prevSafeSlideIdsRef.current = newIds;
+    setCurrentIndex(
+      followedIndex >= 0 ? followedIndex : clampIndex(currentIndexRef.current),
+    );
+    setPrevIndex((prev) =>
+      prev !== null && prev >= safeSlides.length ? null : prev,
+    );
+    if (followedIndex < 0) {
+      // The active slide is gone (e.g. just skipped) and we fell back to a
+      // different one — its reveal/transition state doesn't apply here.
+      clearTransitionTimer();
+      queuedNavigationRef.current = null;
+      setCurrentStep(0);
+      setPrevIndex(null);
+      setAnimating(false);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [safeSlides, startIndex, deckId]);
 
   const currentSlide = safeSlides[currentIndex];
   const animSteps = currentSlide ? getAnimationSteps(currentSlide) : null;
@@ -359,7 +435,10 @@ export default function PresentationView({
       const token = deckId.replace("__shared__/", "");
       navigate(`/share/${token}`);
     } else {
-      navigate(`/deck/${deckId}?slide=${currentIndexRef.current + 1}`);
+      const rawIndex =
+        visibleRawIndicesRef.current[currentIndexRef.current] ??
+        currentIndexRef.current;
+      navigate(`/deck/${deckId}?slide=${rawIndex + 1}`);
     }
   }, [navigate, deckId, isShared]);
 
@@ -405,13 +484,13 @@ export default function PresentationView({
   const openPresenterWindow = useCallback(() => {
     const url = new URL(window.location.href);
     url.searchParams.set("presenter", "1");
-    url.searchParams.set("slide", String(currentIndex + 1));
+    url.searchParams.set("slide", String(toRawIndex(currentIndex) + 1));
     window.open(
       url.toString(),
       `slides-presenter-${deckId}`,
       "width=1200,height=760",
     );
-  }, [currentIndex, deckId]);
+  }, [currentIndex, deckId, toRawIndex]);
 
   useEffect(() => {
     const handleKey = (e: KeyboardEvent) => {
@@ -480,9 +559,10 @@ export default function PresentationView({
           const token = deckIdRef.current.replace("__shared__/", "");
           navigate(`/share/${token}`);
         } else {
-          navigate(
-            `/deck/${deckIdRef.current}?slide=${currentIndexRef.current + 1}`,
-          );
+          const rawIndex =
+            visibleRawIndicesRef.current[currentIndexRef.current] ??
+            currentIndexRef.current;
+          navigate(`/deck/${deckIdRef.current}?slide=${rawIndex + 1}`);
         }
       }
     };