Merge branch 'users' into main

Players library, circular NPC tokens, disposition types; keep main overlay/release fixes.

Co-authored-by: Cursor <cursoragent@cursor.com>

app/renderer/shared/PresentationView.tsx

@@ -15,6 +15,11 @@ import { MaterialOverlay } from './materials/MaterialOverlay';
 import { useMaterialsOverlayState } from './materials/useMaterialsOverlayState';
 import { NpcsSceneOverlay } from './npcs/NpcsSceneOverlay';
 import { useNpcsOverlayState } from './npcs/useNpcsOverlayState';
+import { SceneNpcTokensOverlay } from './playerToken/SceneNpcTokensOverlay';
+import { ScenePlayerTokensOverlay } from './playerToken/ScenePlayerTokensOverlay';
+import { useAppPlayers } from './playerToken/useAppPlayers';
+import { useSceneNpcTokensSession } from './playerToken/useSceneNpcTokensSession';
+import { useScenePlayerTokensSession } from './playerToken/useScenePlayerTokensSession';
 import { SceneOverlayHost } from './sceneOverlay/SceneOverlayHost';
 import { useSceneViewState } from './sceneView/useSceneViewState';
 import { SceneTokensOverlay } from './tokens/SceneTokensOverlay';
@@ -26,6 +31,7 @@ import styles from './PresentationView.module.css';
 import { RotatedImage } from './RotatedImage';
 import { useAssetUrl } from './useAssetImageUrl';
 import { useVideoPlaybackState } from './video/useVideoPlaybackState';
+import { DEFAULT_NPC_TOKEN_SESSION_SCALE } from '../../shared/types/appPlayers';
 
 export type PresentationViewProps = {
   session: SessionState | null;
@@ -48,7 +54,10 @@ export function PresentationView({
   const [materialsOverlay] = useMaterialsOverlayState();
   const [npcsOverlay] = useNpcsOverlayState();
   const appTokens = useAppTokens();
+  const { players: appPlayers } = useAppPlayers();
   const [sceneTokensSession] = useSceneTokensSession();
+  const [sceneNpcTokensSession] = useSceneNpcTokensSession();
+  const [scenePlayerTokensSession] = useScenePlayerTokensSession();
   const [vp] = useVideoPlaybackState();
   const videoElRef = useRef<HTMLVideoElement | null>(null);
   const [contentRect, setContentRect] = React.useState<{ x: number; y: number; w: number; h: number } | null>(
@@ -187,6 +196,24 @@ export function PresentationView({
           viewport={contentRect}
         />
       ) : null}
+      {scene?.previewAssetType === 'image' && contentRect ? (
+        <SceneNpcTokensOverlay
+          placements={scene.npcTokens ?? []}
+          library={project?.npcs ?? []}
+          session={sceneNpcTokensSession}
+          viewport={contentRect}
+          grid={scene.grid}
+        />
+      ) : null}
+      {scene?.previewAssetType === 'image' && contentRect ? (
+        <ScenePlayerTokensOverlay
+          library={appPlayers}
+          session={scenePlayerTokensSession}
+          displayScale={sceneNpcTokensSession.scale ?? DEFAULT_NPC_TOKEN_SESSION_SCALE}
+          viewport={contentRect}
+          grid={scene.grid}
+        />
+      ) : null}
       {scene?.previewAssetType === 'image' && contentRect ? (
         <SceneTrapsOverlay
           traps={scene.traps ?? []}