From 929359b4bce866092755ef25281cba257ee45fc0 Mon Sep 17 00:00:00 2001
From: dtoro <d.toro.v@pm.me>
Date: Sun, 15 Mar 2026 21:11:57 +0100
Subject: [PATCH] feat: refactor menus

---
 frontend/src/app/canvas/CanvasPage.tsx        |  85 +++---
 .../app/recollections/RecollectionLayout.tsx  |  15 +-
 .../app/recollections/RecollectionMenubar.tsx |  20 +-
 .../RecollectionMenubarContext.tsx            |  18 +-
 .../RecollectionTitleContent.tsx              | 220 ++++++++++++++
 .../RecollectionTitleDataContext.tsx          |  44 +++
 .../recollections/flux/FluxMenubarContent.tsx | 287 ++++--------------
 .../src/app/recollections/logos/LogosPage.tsx |   7 +-
 8 files changed, 406 insertions(+), 290 deletions(-)
 create mode 100644 frontend/src/app/recollections/RecollectionTitleContent.tsx
 create mode 100644 frontend/src/app/recollections/RecollectionTitleDataContext.tsx

diff --git a/frontend/src/app/canvas/CanvasPage.tsx b/frontend/src/app/canvas/CanvasPage.tsx
index 169aa15..353edec 100644
--- a/frontend/src/app/canvas/CanvasPage.tsx
+++ b/frontend/src/app/canvas/CanvasPage.tsx
@@ -4,6 +4,7 @@
  */
 
 import React, { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useLocation } from 'react-router-dom'
 import {
   ReactFlow,
   ReactFlowProvider,
@@ -36,7 +37,7 @@ import { ContextMenu, ContextMenuTrigger } from '@/components/ui/context-menu'
 import { CanvasContextMenuContent } from '@/app/canvas/CanvasContextMenuContent'
 import { useCanvasConnectionPathFromStore } from '@/app/canvas/useCanvasConnectionPathFromStore'
 import { dispatchCanvasCommand } from '@/app/canvas/canvasStore'
-import { useRecollectionMenubar } from '@/app/recollections/RecollectionMenubarContext'
+import { useRecollectionTitleData } from '@/app/recollections/RecollectionTitleDataContext'
 import { FluxMenubarContent } from '@/app/recollections/flux/FluxMenubarContent'
 import { createContextualNode } from '@/app/canvas/ContextualZoomNode'
 import { ViewportDisplayProvider } from '@/app/canvas/ViewportDisplayContext'
@@ -428,52 +429,57 @@ export function CanvasPage({ recollectionId }: CanvasPageProps) {
     flowActionsRef.current?.pasteAtViewportCenter?.()
   }, [])
 
-  const { setCustomContent } = useRecollectionMenubar()
+  const { pathname } = useLocation()
+  const isFluxActive = pathname.endsWith('/flux')
+  const { setTitleData } = useRecollectionTitleData()
   useEffect(() => {
-    setCustomContent(
-      <FluxMenubarContent
-        onImport={handleImportRecollection}
-        onExport={handleExportRecollection}
-        onSave={
-          recollectionId
-            ? () => {
-                save()
-                toast.success('Saved')
-              }
-            : undefined
-        }
-        canSave={Boolean(recollectionId)}
-        saveStatus={saveStatus}
-        undo={undo}
-        redo={redo}
-        canUndo={canUndo}
-        canRedo={canRedo}
-        onDuplicate={handleDuplicate}
-        onCopy={handleCopy}
-        onPaste={handlePaste}
-        canDuplicate={selectedNodes.length > 0}
-        canCopy={selectedNodes.length === 1}
-        onFitView={() => flowActionsRef.current?.fitView?.()}
-      />
-    )
-    return () => setCustomContent(null)
+    setTitleData({
+      saveStatus,
+      onSave: recollectionId
+        ? () => {
+            save()
+            toast.success('Saved')
+          }
+        : undefined,
+      canSave: Boolean(recollectionId),
+      onImport: handleImportRecollection,
+      onExport: handleExportRecollection,
+    })
+    return () => setTitleData(null)
   }, [
-    setCustomContent,
-    recollectionId,
+    setTitleData,
     saveStatus,
-    canUndo,
-    canRedo,
-    selectedNodes.length,
+    recollectionId,
     save,
-    undo,
-    redo,
-    handleDuplicate,
-    handleCopy,
-    handlePaste,
     handleImportRecollection,
     handleExportRecollection,
   ])
 
+  const fluxMenubarProps = useMemo(
+    () => ({
+      undo,
+      redo,
+      canUndo,
+      canRedo,
+      onDuplicate: handleDuplicate,
+      onCopy: handleCopy,
+      onPaste: handlePaste,
+      canDuplicate: selectedNodes.length > 0,
+      canCopy: selectedNodes.length === 1,
+      onFitView: () => flowActionsRef.current?.fitView?.(),
+    }),
+    [
+      canUndo,
+      canRedo,
+      selectedNodes.length,
+      undo,
+      redo,
+      handleDuplicate,
+      handleCopy,
+      handlePaste,
+    ]
+  )
+
   const graphContextValue = useMemo(
     () => ({ setNodes, setEdges, graphRef, edges }),
     [setNodes, setEdges, edges]
@@ -682,6 +688,7 @@ export function CanvasPage({ recollectionId }: CanvasPageProps) {
       onContextMenu={onCanvasContextMenu}
       style={{ position: 'relative' }}
     >
+      {isFluxActive && <FluxMenubarContent {...fluxMenubarProps} />}
       <div role="status" aria-live="polite" aria-atomic className="sr-only">
         {ariaAnnouncement}
       </div>
diff --git a/frontend/src/app/recollections/RecollectionLayout.tsx b/frontend/src/app/recollections/RecollectionLayout.tsx
index 34f9ef8..3e13370 100644
--- a/frontend/src/app/recollections/RecollectionLayout.tsx
+++ b/frontend/src/app/recollections/RecollectionLayout.tsx
@@ -6,6 +6,8 @@ import React, { useEffect } from 'react'
 import { Link, useParams } from 'react-router-dom'
 import { usePlatform } from '@/app/kosmos/KosmosContext'
 import { RecollectionMenubarProvider } from './RecollectionMenubarContext'
+import { RecollectionTitleDataProvider } from './RecollectionTitleDataContext'
+import { RecollectionTitleContent } from './RecollectionTitleContent'
 import { RecollectionMenubar } from './RecollectionMenubar'
 import { FlippingCardView } from './FlippingCardView'
 
@@ -33,12 +35,15 @@ export function RecollectionLayout() {
 
   return (
     <RecollectionMenubarProvider>
-      <div className="flex min-h-0 flex-1 flex-col">
-        <RecollectionMenubar />
-        <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
-          <FlippingCardView />
+      <RecollectionTitleDataProvider>
+        <RecollectionTitleContent />
+        <div className="flex min-h-0 flex-1 flex-col">
+          <RecollectionMenubar />
+          <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
+            <FlippingCardView />
+          </div>
         </div>
-      </div>
+      </RecollectionTitleDataProvider>
     </RecollectionMenubarProvider>
   )
 }
diff --git a/frontend/src/app/recollections/RecollectionMenubar.tsx b/frontend/src/app/recollections/RecollectionMenubar.tsx
index 6629545..6e7dcfb 100644
--- a/frontend/src/app/recollections/RecollectionMenubar.tsx
+++ b/frontend/src/app/recollections/RecollectionMenubar.tsx
@@ -1,9 +1,9 @@
 /**
- * Shared base menubar for a recollection: Back, optional custom content (from context), Logos/Flux switcher.
+ * Recollection menubar: Back | title + save status | registered menus (middle) | Logos | Flux.
  */
 
 import React from 'react'
-import { Link, NavLink, useParams, useLocation } from 'react-router-dom'
+import { Link, NavLink, useParams } from 'react-router-dom'
 import { usePlatform } from '@/app/kosmos/KosmosContext'
 import { ArrowLeft } from 'lucide-react'
 import { FluxIcon, LogosIcon } from '@/lib/icons'
@@ -11,20 +11,17 @@ import { useRecollectionMenubar } from './RecollectionMenubarContext'
 
 export function RecollectionMenubar() {
   const { recollectionId } = useParams<{ recollectionId: string }>()
-  const { pathname } = useLocation()
   const { recollections } = usePlatform()
-  const { customContent } = useRecollectionMenubar()
+  const { titleContent, customContent } = useRecollectionMenubar()
 
-  const isFlux = pathname.endsWith('/flux')
   const recollection = recollectionId ? recollections.find((p) => p.id === recollectionId) : null
   const base = recollectionId ? `/recollections/${recollectionId}` : ''
-  const defaultMiddle = recollection ? (
+  const defaultTitle = recollection ? (
     <span className="truncate text-sm font-medium text-muted-foreground">{recollection.name}</span>
   ) : null
-  const middleContent = isFlux ? (customContent ?? defaultMiddle) : defaultMiddle
 
   return (
-    <div className="flex h-9 w-full shrink-0 items-center gap-2 border-b border-border/40 bg-background px-2">
+    <div className="flex h-9 w-full shrink-0 items-center gap-2 overflow-visible border-b border-border/40 bg-background px-2">
       <Link
         to="/recollections"
         aria-label="Back to recollections"
@@ -32,8 +29,11 @@ export function RecollectionMenubar() {
       >
         <ArrowLeft className="size-4" />
       </Link>
-      <div className="flex min-w-0 flex-1 items-center">
-        {middleContent}
+      <div className="flex min-w-0 shrink-0 items-center gap-1.5">
+        {titleContent ?? defaultTitle}
+      </div>
+      <div className="flex min-w-0 flex-1 items-center gap-1 overflow-visible">
+        {customContent}
       </div>
       {base && (
         <nav className="flex shrink-0 items-center gap-0.5" aria-label="Recollection pages">
diff --git a/frontend/src/app/recollections/RecollectionMenubarContext.tsx b/frontend/src/app/recollections/RecollectionMenubarContext.tsx
index 7b809c9..77c6320 100644
--- a/frontend/src/app/recollections/RecollectionMenubarContext.tsx
+++ b/frontend/src/app/recollections/RecollectionMenubarContext.tsx
@@ -1,12 +1,16 @@
 /**
- * Context for the recollection menubar: pages (Logos, Flux) can register custom content
- * to show in the middle of the shared menubar.
+ * Context for the recollection menubar:
+ * - Title (next to back): optional title + status, e.g. recollection name and save state when on Flux.
+ * - Middle: registrable menus (Edit, View when on Flux). Set via customContent.
  */
 
 import React, { createContext, useCallback, useContext, useState } from 'react'
 
 export type RecollectionMenubarContextValue = {
-  /** Content to show in the middle of the menubar (menus, title, etc.). Set to null to use default (recollection name only). */
+  /** Content next to the back button (e.g. title + save status, with optional dropdown). Null = use default recollection name. */
+  titleContent: React.ReactNode
+  setTitleContent: (content: React.ReactNode) => void
+  /** Registrable menus in the middle of the bar (e.g. Edit, View when on Flux). */
   customContent: React.ReactNode
   setCustomContent: (content: React.ReactNode) => void
 }
@@ -14,13 +18,17 @@ export type RecollectionMenubarContextValue = {
 const RecollectionMenubarContext = createContext<RecollectionMenubarContextValue | null>(null)
 
 export function RecollectionMenubarProvider({ children }: { children: React.ReactNode }) {
+  const [titleContent, setTitleContentState] = useState<React.ReactNode>(null)
   const [customContent, setCustomContentState] = useState<React.ReactNode>(null)
+  const setTitleContent = useCallback((content: React.ReactNode) => {
+    setTitleContentState(() => content)
+  }, [])
   const setCustomContent = useCallback((content: React.ReactNode) => {
     setCustomContentState(() => content)
   }, [])
   const value: RecollectionMenubarContextValue = React.useMemo(
-    () => ({ customContent, setCustomContent }),
-    [customContent, setCustomContent]
+    () => ({ titleContent, setTitleContent, customContent, setCustomContent }),
+    [titleContent, setTitleContent, customContent, setCustomContent]
   )
   return (
     <RecollectionMenubarContext.Provider value={value}>
diff --git a/frontend/src/app/recollections/RecollectionTitleContent.tsx b/frontend/src/app/recollections/RecollectionTitleContent.tsx
new file mode 100644
index 0000000..56a1734
--- /dev/null
+++ b/frontend/src/app/recollections/RecollectionTitleContent.tsx
@@ -0,0 +1,220 @@
+/**
+ * Shared title + save status block (same for Logos and Flux). Registered with the menubar
+ * from the layout; gets save/import/export from RecollectionTitleDataContext (set by CanvasPage).
+ */
+
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import { useParams } from 'react-router-dom'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuPortal,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { Kbd, KbdGroup } from '@/components/ui/kbd'
+import { usePlatform } from '@/app/kosmos/KosmosContext'
+import { useRecollectionMenubar } from './RecollectionMenubarContext'
+import { useRecollectionTitleData } from './RecollectionTitleDataContext'
+import { CheckCircle2, ChevronDown, CircleDot, Download, FolderOpen, Loader2, Pencil, Save } from 'lucide-react'
+import { Input } from '@/components/ui/input'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
+
+const SAVE_KEYS = { key: 's', shiftKey: false }
+
+function matchKey(ev: KeyboardEvent, want: { key: string; shiftKey: boolean }) {
+  const mod = ev.ctrlKey || ev.metaKey
+  return ev.key.toLowerCase() === want.key && !!mod && !!ev.shiftKey === want.shiftKey
+}
+
+/** Registers the shared title + save dropdown as titleContent. Renders nothing. */
+export function RecollectionTitleContent() {
+  const { setTitleContent } = useRecollectionMenubar()
+  const { titleData } = useRecollectionTitleData()
+  const { recollectionId } = useParams<{ recollectionId: string }>()
+  const { recollections, renameRecollection } = usePlatform()
+  const recollectionName = useMemo(
+    () => (recollectionId ? recollections.find((p) => p.id === recollectionId)?.name ?? null : null),
+    [recollectionId, recollections]
+  )
+
+  const [isRenaming, setIsRenaming] = useState(false)
+  const [renameValue, setRenameValue] = useState('')
+  const renameInputRef = useRef<HTMLInputElement>(null)
+  const ignoreNextBlurRef = useRef(false)
+  const [showSavedBriefly, setShowSavedBriefly] = useState(false)
+  const savedBrieflyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+  const prevSaveStatusRef = useRef<string>('saved')
+  const saveStatus = titleData?.saveStatus ?? 'saved'
+
+  useEffect(() => {
+    if (saveStatus === 'unsaved') {
+      setShowSavedBriefly(false)
+      if (savedBrieflyTimerRef.current) {
+        clearTimeout(savedBrieflyTimerRef.current)
+        savedBrieflyTimerRef.current = null
+      }
+    } else if (prevSaveStatusRef.current === 'saving' && saveStatus === 'saved') {
+      setShowSavedBriefly(true)
+      if (savedBrieflyTimerRef.current) clearTimeout(savedBrieflyTimerRef.current)
+      savedBrieflyTimerRef.current = setTimeout(() => {
+        savedBrieflyTimerRef.current = null
+        setShowSavedBriefly(false)
+      }, 2500)
+    }
+    prevSaveStatusRef.current = saveStatus
+  }, [saveStatus])
+
+  useEffect(() => {
+    return () => {
+      if (savedBrieflyTimerRef.current) clearTimeout(savedBrieflyTimerRef.current)
+    }
+  }, [])
+
+  useEffect(() => {
+    if (isRenaming) {
+      setRenameValue(recollectionName ?? '')
+      ignoreNextBlurRef.current = true
+      const t = setTimeout(() => {
+        renameInputRef.current?.focus()
+        renameInputRef.current?.select()
+      }, 100)
+      return () => clearTimeout(t)
+    }
+  }, [isRenaming, recollectionName])
+
+  const applyRename = useCallback(() => {
+    if (!recollectionId || !renameRecollection) return
+    const trimmed = renameValue.trim()
+    if (trimmed) renameRecollection(recollectionId, trimmed)
+    setIsRenaming(false)
+  }, [recollectionId, renameRecollection, renameValue])
+
+  const handleRenameBlur = useCallback(() => {
+    if (ignoreNextBlurRef.current) {
+      ignoreNextBlurRef.current = false
+      return
+    }
+    applyRename()
+  }, [applyRename])
+
+  useEffect(() => {
+    const onKeyDown = (ev: KeyboardEvent) => {
+      if (matchKey(ev, SAVE_KEYS) && titleData?.onSave && (titleData?.canSave !== false)) {
+        ev.preventDefault()
+        ev.stopPropagation()
+        titleData.onSave()
+      }
+    }
+    window.addEventListener('keydown', onKeyDown, true)
+    return () => window.removeEventListener('keydown', onKeyDown, true)
+  }, [titleData?.onSave, titleData?.canSave])
+
+  const trigger = useMemo(() => {
+    if (recollectionId && isRenaming) {
+      return (
+        <Input
+          ref={renameInputRef}
+          type="text"
+          value={renameValue}
+          onChange={(e) => setRenameValue(e.target.value)}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter') { e.preventDefault(); applyRename() }
+            else if (e.key === 'Escape') { e.preventDefault(); setIsRenaming(false) }
+          }}
+          onBlur={handleRenameBlur}
+          className="h-7 text-sm font-medium font-serif w-[140px]"
+          aria-label="Recollection name"
+          onClick={(e) => e.stopPropagation()}
+        />
+      )
+    }
+    return (
+      <span className="flex items-center gap-1.5 truncate">
+        <span className="truncate text-sm font-medium font-serif max-w-[180px]">
+          {recollectionName ?? 'Untitled'}
+        </span>
+        <TooltipProvider delayDuration={300}>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <span
+                className="shrink-0 flex items-center text-muted-foreground cursor-default"
+                aria-live="polite"
+                aria-label={
+                  saveStatus === 'saving' ? 'Saving' : saveStatus === 'unsaved' ? 'Unsaved changes' : 'All changes saved'
+                }
+              >
+                {saveStatus === 'saving' && <Loader2 className="size-3.5 animate-spin" aria-hidden />}
+                {saveStatus === 'unsaved' && <CircleDot className="size-3.5" aria-hidden />}
+                {saveStatus !== 'unsaved' && (saveStatus === 'saved' || showSavedBriefly) && (
+                  <CheckCircle2 className="size-3.5 text-muted-foreground/70" aria-hidden />
+                )}
+              </span>
+            </TooltipTrigger>
+            <TooltipContent side="bottom">
+              {saveStatus === 'saving' ? 'Saving…' : saveStatus === 'unsaved' ? 'Unsaved changes' : 'All changes saved'}
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      </span>
+    )
+  }, [recollectionId, isRenaming, renameValue, recollectionName, saveStatus, showSavedBriefly, applyRename, handleRenameBlur])
+
+  const dropdownContent = useMemo(() => (
+    <>
+      {recollectionId && (
+        <>
+          {titleData?.onSave != null && (
+            <>
+              <DropdownMenuItem
+                onClick={titleData.onSave}
+                disabled={titleData.canSave === false}
+                className="gap-2"
+              >
+                <Save className="h-4 w-4" />
+                Save
+                <span className="ml-auto pl-4"><KbdGroup><Kbd>⌘S</Kbd></KbdGroup></span>
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
+            </>
+          )}
+          <DropdownMenuItem onClick={() => setIsRenaming(true)} className="gap-2">
+            <Pencil className="h-4 w-4" />
+            Rename
+          </DropdownMenuItem>
+          <DropdownMenuSeparator />
+        </>
+      )}
+      <DropdownMenuItem onClick={titleData?.onImport} className="gap-2" disabled={!titleData?.onImport}>
+        <FolderOpen className="h-4 w-4" />
+        Import…
+      </DropdownMenuItem>
+      <DropdownMenuItem onClick={titleData?.onExport} className="gap-2" disabled={!titleData?.onExport}>
+        <Download className="h-4 w-4" />
+        Export…
+      </DropdownMenuItem>
+    </>
+  ), [recollectionId, titleData?.onSave, titleData?.canSave, titleData?.onImport, titleData?.onExport])
+
+  const titleNode = useMemo(() => (
+    <DropdownMenu>
+      <DropdownMenuTrigger className="flex items-center gap-1.5 rounded-sm px-2 py-1 text-sm outline-none focus:bg-accent focus:text-accent-foreground hover:bg-accent hover:text-accent-foreground data-[state=open]:bg-accent">
+        {trigger}
+        <ChevronDown className="size-3.5 shrink-0 text-muted-foreground" />
+      </DropdownMenuTrigger>
+      <DropdownMenuPortal>
+        <DropdownMenuContent align="start" className="z-[200] min-w-[12rem]">
+          {dropdownContent}
+        </DropdownMenuContent>
+      </DropdownMenuPortal>
+    </DropdownMenu>
+  ), [trigger, dropdownContent])
+
+  useLayoutEffect(() => {
+    setTitleContent(titleNode)
+    return () => setTitleContent(null)
+  }, [titleNode, setTitleContent])
+
+  return null
+}
diff --git a/frontend/src/app/recollections/RecollectionTitleDataContext.tsx b/frontend/src/app/recollections/RecollectionTitleDataContext.tsx
new file mode 100644
index 0000000..bc87929
--- /dev/null
+++ b/frontend/src/app/recollections/RecollectionTitleDataContext.tsx
@@ -0,0 +1,44 @@
+/**
+ * Context for the shared recollection title + save block (used by both Logos and Flux).
+ * CanvasPage sets save status and actions; layout consumes them to render the title slot.
+ */
+
+import React, { createContext, useCallback, useContext, useState } from 'react'
+import type { SaveStatus } from '@/app/canvas/useCanvasGraph'
+
+export type RecollectionTitleData = {
+  saveStatus: SaveStatus
+  onSave?: () => void
+  canSave?: boolean
+  onImport: () => void
+  onExport: () => void
+}
+
+export type RecollectionTitleDataContextValue = {
+  titleData: RecollectionTitleData | null
+  setTitleData: (data: RecollectionTitleData | null) => void
+}
+
+const RecollectionTitleDataContext = createContext<RecollectionTitleDataContextValue | null>(null)
+
+export function RecollectionTitleDataProvider({ children }: { children: React.ReactNode }) {
+  const [titleData, setTitleDataState] = useState<RecollectionTitleData | null>(null)
+  const setTitleData = useCallback((data: RecollectionTitleData | null) => {
+    setTitleDataState(() => data)
+  }, [])
+  const value = React.useMemo(
+    () => ({ titleData, setTitleData }),
+    [titleData, setTitleData]
+  )
+  return (
+    <RecollectionTitleDataContext.Provider value={value}>
+      {children}
+    </RecollectionTitleDataContext.Provider>
+  )
+}
+
+export function useRecollectionTitleData(): RecollectionTitleDataContextValue {
+  const ctx = useContext(RecollectionTitleDataContext)
+  if (!ctx) throw new Error('useRecollectionTitleData must be used within RecollectionTitleDataProvider')
+  return ctx
+}
diff --git a/frontend/src/app/recollections/flux/FluxMenubarContent.tsx b/frontend/src/app/recollections/flux/FluxMenubarContent.tsx
index ba72061..e1f895c 100644
--- a/frontend/src/app/recollections/flux/FluxMenubarContent.tsx
+++ b/frontend/src/app/recollections/flux/FluxMenubarContent.tsx
@@ -1,10 +1,9 @@
 /**
- * Flux-specific menubar content: Recollection/Edit/View menus and centered title with save status.
- * Registered with the recollection menubar when the Flux page is active.
+ * Flux-specific menubar: registers Edit and View menus in the middle slot.
+ * Title + save status are shared and registered by the layout (RecollectionTitleContent).
  */
 
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { useParams } from 'react-router-dom'
+import React, { useEffect, useMemo } from 'react'
 import {
   Menubar,
   MenubarContent,
@@ -14,18 +13,10 @@ import {
   MenubarTrigger
 } from '@/components/ui/menubar'
 import { Kbd, KbdGroup } from '@/components/ui/kbd'
-import { usePlatform } from '@/app/kosmos/KosmosContext'
-import { CheckCircle2, CircleDot, ClipboardPaste, Copy, CopyPlus, Download, FolderOpen, Loader2, Pencil, Redo2, Save, Undo2 } from 'lucide-react'
-import { Input } from '@/components/ui/input'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import type { SaveStatus } from '@/app/canvas/useCanvasGraph'
+import { useRecollectionMenubar } from '@/app/recollections/RecollectionMenubarContext'
+import { ClipboardPaste, Copy, CopyPlus, Redo2, Undo2 } from 'lucide-react'
 
 export type FluxMenubarContentProps = {
-  onImport: () => void
-  onExport: () => void
-  onSave?: () => void
-  canSave?: boolean
-  saveStatus?: SaveStatus
   undo: () => void
   redo: () => void
   canUndo: boolean
@@ -40,198 +31,48 @@ export type FluxMenubarContentProps = {
 
 const UNDO_KEYS = { key: 'z', shiftKey: false }
 const REDO_KEYS = { key: 'z', shiftKey: true }
-const SAVE_KEYS = { key: 's', shiftKey: false }
 
 function matchKey(ev: KeyboardEvent, want: { key: string; shiftKey: boolean }) {
   const mod = ev.ctrlKey || ev.metaKey
   return ev.key.toLowerCase() === want.key && !!mod && !!ev.shiftKey === want.shiftKey
 }
 
-export function FluxMenubarContent({
-  onImport,
-  onExport,
-  onSave,
-  canSave = true,
-  saveStatus = 'saved',
-  undo,
-  redo,
-  canUndo,
-  canRedo,
-  onDuplicate,
-  onCopy,
-  onPaste,
-  canDuplicate = false,
-  canCopy = false,
-  onFitView,
-}: FluxMenubarContentProps) {
-  const { recollectionId } = useParams<{ recollectionId: string }>()
-  const { recollections, renameRecollection } = usePlatform()
-  const recollectionName = useMemo(
-    () => (recollectionId ? recollections.find((p) => p.id === recollectionId)?.name ?? null : null),
-    [recollectionId, recollections]
-  )
+export function FluxMenubarContent(props: FluxMenubarContentProps) {
+  const { setCustomContent } = useRecollectionMenubar()
 
-  const [isRenamingRecollection, setIsRenamingRecollection] = useState(false)
-  const [renameValue, setRenameValue] = useState('')
-  const [showSavedBriefly, setShowSavedBriefly] = useState(false)
-  const renameInputRef = useRef<HTMLInputElement>(null)
-  const ignoreNextBlurRef = useRef(false)
-  const savedBrieflyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const prevSaveStatusRef = useRef<SaveStatus>(saveStatus)
-
-  useEffect(() => {
-    if (saveStatus === 'unsaved') {
-      setShowSavedBriefly(false)
-      if (savedBrieflyTimerRef.current) {
-        clearTimeout(savedBrieflyTimerRef.current)
-        savedBrieflyTimerRef.current = null
-      }
-    } else if (prevSaveStatusRef.current === 'saving' && saveStatus === 'saved') {
-      setShowSavedBriefly(true)
-      if (savedBrieflyTimerRef.current) clearTimeout(savedBrieflyTimerRef.current)
-      savedBrieflyTimerRef.current = setTimeout(() => {
-        savedBrieflyTimerRef.current = null
-        setShowSavedBriefly(false)
-      }, 2500)
-    }
-    prevSaveStatusRef.current = saveStatus
-  }, [saveStatus])
-
-  useEffect(() => {
-    return () => {
-      if (savedBrieflyTimerRef.current) {
-        clearTimeout(savedBrieflyTimerRef.current)
-        savedBrieflyTimerRef.current = null
-      }
-    }
-  }, [])
-
-  useEffect(() => {
-    if (isRenamingRecollection) {
-      setRenameValue(recollectionName ?? '')
-      ignoreNextBlurRef.current = true
-      const t = setTimeout(() => {
-        renameInputRef.current?.focus()
-        renameInputRef.current?.select()
-      }, 100)
-      return () => clearTimeout(t)
-    }
-  }, [isRenamingRecollection, recollectionName])
-
-  const applyRename = useCallback(() => {
-    if (!recollectionId || !renameRecollection) return
-    const trimmed = renameValue.trim()
-    if (trimmed) renameRecollection(recollectionId, trimmed)
-    setIsRenamingRecollection(false)
-  }, [recollectionId, renameRecollection, renameValue])
-
-  const cancelRename = useCallback(() => setIsRenamingRecollection(false), [])
-
-  const handleRenameBlur = useCallback(() => {
-    if (ignoreNextBlurRef.current) {
-      ignoreNextBlurRef.current = false
-      return
-    }
-    applyRename()
-  }, [applyRename])
-
-  useEffect(() => {
-    const onKeyDown = (ev: KeyboardEvent) => {
-      if (matchKey(ev, UNDO_KEYS)) {
-        if (canUndo) {
-          ev.preventDefault()
-          ev.stopPropagation()
-          undo()
-        }
-        return
-      }
-      if (matchKey(ev, REDO_KEYS)) {
-        if (canRedo) {
-          ev.preventDefault()
-          ev.stopPropagation()
-          redo()
-        }
-        return
-      }
-      if (matchKey(ev, SAVE_KEYS)) {
-        if (onSave && canSave) {
-          ev.preventDefault()
-          ev.stopPropagation()
-          onSave()
-        }
-      }
-    }
-    window.addEventListener('keydown', onKeyDown, true)
-    return () => window.removeEventListener('keydown', onKeyDown, true)
-  }, [undo, redo, canUndo, canRedo, onSave, canSave])
-
-  return (
-    <div className="relative flex flex-1 min-w-0 items-center">
-      <Menubar className="flex-1 shrink-0 rounded-none border-0 border-b-0 bg-transparent p-0 shadow-none min-w-0">
-        <MenubarMenu>
-          <MenubarTrigger className="font-normal text-muted-foreground">Recollection</MenubarTrigger>
-          <MenubarContent>
-            {recollectionId && (
-              <>
-                {onSave != null && (
-                  <>
-                    <MenubarItem onClick={onSave} disabled={!canSave} className="gap-2">
-                      <Save className="h-4 w-4" />
-                      Save
-                      <span className="ml-auto pl-4">
-                        <KbdGroup><Kbd>⌘S</Kbd></KbdGroup>
-                      </span>
-                    </MenubarItem>
-                    <MenubarSeparator />
-                  </>
-                )}
-                <MenubarItem onClick={() => setIsRenamingRecollection(true)} className="gap-2">
-                  <Pencil className="h-4 w-4" />
-                  Rename
-                </MenubarItem>
-                <MenubarSeparator />
-              </>
-            )}
-            <MenubarItem onClick={onImport} className="gap-2">
-              <FolderOpen className="h-4 w-4" />
-              Import…
-            </MenubarItem>
-            <MenubarItem onClick={onExport} className="gap-2">
-              <Download className="h-4 w-4" />
-              Export…
-            </MenubarItem>
-          </MenubarContent>
-        </MenubarMenu>
+  const menus = useMemo(
+    () => (
+      <Menubar className="shrink-0 rounded-none border-0 bg-transparent p-0 shadow-none">
         <MenubarMenu>
           <MenubarTrigger className="font-normal text-muted-foreground">Edit</MenubarTrigger>
           <MenubarContent>
-            <MenubarItem onClick={undo} disabled={!canUndo} className="gap-2">
+            <MenubarItem onClick={props.undo} disabled={!props.canUndo} className="gap-2">
               <Undo2 className="h-4 w-4" />
               Undo
               <span className="ml-auto pl-4"><KbdGroup><Kbd>⌘ + Z</Kbd></KbdGroup></span>
             </MenubarItem>
-            <MenubarItem onClick={redo} disabled={!canRedo} className="gap-2">
+            <MenubarItem onClick={props.redo} disabled={!props.canRedo} className="gap-2">
               <Redo2 className="h-4 w-4" />
               Redo
               <span className="ml-auto pl-4"><KbdGroup><Kbd>⌘ + ⇧ + Z</Kbd></KbdGroup></span>
             </MenubarItem>
-            {(onDuplicate != null || onCopy != null || onPaste != null) && <MenubarSeparator />}
-            {onDuplicate != null && (
-              <MenubarItem onClick={onDuplicate} disabled={!canDuplicate} className="gap-2">
+            {(props.onDuplicate != null || props.onCopy != null || props.onPaste != null) && <MenubarSeparator />}
+            {props.onDuplicate != null && (
+              <MenubarItem onClick={props.onDuplicate} disabled={!props.canDuplicate} className="gap-2">
                 <CopyPlus className="h-4 w-4" />
                 Duplicate
                 <span className="ml-auto pl-4"><KbdGroup><Kbd>⌘D</Kbd></KbdGroup></span>
               </MenubarItem>
             )}
-            {onCopy != null && (
-              <MenubarItem onClick={onCopy} disabled={!canCopy} className="gap-2">
+            {props.onCopy != null && (
+              <MenubarItem onClick={props.onCopy} disabled={!props.canCopy} className="gap-2">
                 <Copy className="h-4 w-4" />
                 Copy
                 <span className="ml-auto pl-4"><KbdGroup><Kbd>⌘C</Kbd></KbdGroup></span>
               </MenubarItem>
             )}
-            {onPaste != null && (
-              <MenubarItem onClick={onPaste} className="gap-2">
+            {props.onPaste != null && (
+              <MenubarItem onClick={props.onPaste} className="gap-2">
                 <ClipboardPaste className="h-4 w-4" />
                 Paste
                 <span className="ml-auto pl-4"><KbdGroup><Kbd>⌘V</Kbd></KbdGroup></span>
@@ -242,8 +83,8 @@ export function FluxMenubarContent({
         <MenubarMenu>
           <MenubarTrigger className="font-normal text-muted-foreground">View</MenubarTrigger>
           <MenubarContent>
-            {onFitView && (
-              <MenubarItem onClick={onFitView} className="gap-2">
+            {props.onFitView && (
+              <MenubarItem onClick={props.onFitView} className="gap-2">
                 Fit View
                 <span className="ml-auto pl-4"><KbdGroup><Kbd>⌘0</Kbd></KbdGroup></span>
               </MenubarItem>
@@ -251,55 +92,41 @@ export function FluxMenubarContent({
           </MenubarContent>
         </MenubarMenu>
       </Menubar>
-      {recollectionId && (
-        <div className="absolute left-1/2 top-0 flex h-full -translate-x-1/2 items-center justify-center gap-2 max-w-[50%] min-w-[120px] pointer-events-none">
-          <div className="pointer-events-auto flex items-center justify-center gap-2">
-            {isRenamingRecollection ? (
-              <Input
-                ref={renameInputRef}
-                type="text"
-                value={renameValue}
-                onChange={(e) => setRenameValue(e.target.value)}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter') { e.preventDefault(); applyRename() }
-                  else if (e.key === 'Escape') { e.preventDefault(); cancelRename() }
-                }}
-                onBlur={handleRenameBlur}
-                className="h-7 text-sm font-medium text-center font-serif"
-                aria-label="Recollection name"
-              />
-            ) : (
-              <>
-                <span className="truncate text-sm font-medium text-foreground font-serif">
-                  {recollectionName ?? 'Untitled'}
-                </span>
-                <TooltipProvider delayDuration={300}>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <span
-                        className="shrink-0 flex items-center text-muted-foreground cursor-default"
-                        aria-live="polite"
-                        aria-label={
-                          saveStatus === 'saving' ? 'Saving' : saveStatus === 'unsaved' ? 'Unsaved changes' : 'All changes saved'
-                        }
-                      >
-                        {saveStatus === 'saving' && <Loader2 className="size-3.5 animate-spin" aria-hidden />}
-                        {saveStatus === 'unsaved' && <CircleDot className="size-3.5" aria-hidden />}
-                        {saveStatus !== 'unsaved' && (saveStatus === 'saved' || showSavedBriefly) && (
-                          <CheckCircle2 className="size-3.5 text-muted-foreground/70" aria-hidden />
-                        )}
-                      </span>
-                    </TooltipTrigger>
-                    <TooltipContent side="bottom">
-                      {saveStatus === 'saving' ? 'Saving…' : saveStatus === 'unsaved' ? 'Unsaved changes' : 'All changes saved'}
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-              </>
-            )}
-          </div>
-        </div>
-      )}
-    </div>
+    ),
+    [
+      props.undo,
+      props.redo,
+      props.canUndo,
+      props.canRedo,
+      props.onDuplicate,
+      props.onCopy,
+      props.onPaste,
+      props.canDuplicate,
+      props.canCopy,
+      props.onFitView,
+    ]
   )
+
+  useEffect(() => {
+    const onKeyDown = (ev: KeyboardEvent) => {
+      if (matchKey(ev, UNDO_KEYS) && props.canUndo) {
+        ev.preventDefault()
+        ev.stopPropagation()
+        props.undo()
+      } else if (matchKey(ev, REDO_KEYS) && props.canRedo) {
+        ev.preventDefault()
+        ev.stopPropagation()
+        props.redo()
+      }
+    }
+    window.addEventListener('keydown', onKeyDown, true)
+    return () => window.removeEventListener('keydown', onKeyDown, true)
+  }, [props.undo, props.redo, props.canUndo, props.canRedo])
+
+  useEffect(() => {
+    setCustomContent(menus)
+    return () => setCustomContent(null)
+  }, [menus, setCustomContent])
+
+  return null
 }
diff --git a/frontend/src/app/recollections/logos/LogosPage.tsx b/frontend/src/app/recollections/logos/LogosPage.tsx
index 3d0d1db..a64a6ec 100644
--- a/frontend/src/app/recollections/logos/LogosPage.tsx
+++ b/frontend/src/app/recollections/logos/LogosPage.tsx
@@ -3,14 +3,19 @@
  */
 
 import React, { useEffect } from 'react'
+import { useLocation } from 'react-router-dom'
 import { useRecollectionMenubar } from '../RecollectionMenubarContext'
 
 export function LogosPage() {
+  const { pathname } = useLocation()
   const { setCustomContent } = useRecollectionMenubar()
+  const isLogosActive = pathname.endsWith('/logos') || pathname.match(/\/recollections\/[^/]+\/?$/)
+
   useEffect(() => {
+    if (!isLogosActive) return
     setCustomContent(null)
     return () => setCustomContent(null)
-  }, [setCustomContent])
+  }, [isLogosActive, setCustomContent])
 
   return (
     <div className="flex h-full min-h-0 flex-1 flex-col items-center justify-center p-8 text-muted-foreground">