@agent-native/core 0.164.12 → 0.164.17

package/corpus/templates/content/app/components/editor/VisualEditor.tsx

@@ -76,6 +76,7 @@ import {
   LocalMdxComponentNode,
 } from "./extensions/LocalMdxComponentNode";
 import {
+  CompatibleCode,
   createNotionEditorExtensions,
   focusMostRecentEmptyToggleSummary,
   type NotionPageLink,
@@ -771,6 +772,20 @@ interface VisualEditorProps {
    * whose type has no NFM analog (via the shared registry-block side-map).
    */
   notionPageId?: string | null;
+  onHistoryControllerChange?: (
+    controller: VisualEditorHistoryController | null,
+  ) => void;
+  onHistoryStateChange?: (state: VisualEditorHistoryState) => void;
+}
+
+export interface VisualEditorHistoryState {
+  canUndo: boolean;
+  canRedo: boolean;
+}
+
+export interface VisualEditorHistoryController {
+  undo: () => boolean;
+  redo: () => boolean;
 }
 
 export type { NotionPageLink };
@@ -968,6 +983,27 @@ function isActiveSlashCommandDraft(editor: CoreEditor): boolean {
   return /^\s*\/[a-zA-Z0-9]*$/.test(textBefore);
 }
 
+export function runPersistableHistoryCommand(
+  editor: CoreEditor,
+  command: "undo" | "redo",
+): boolean {
+  let applied = false;
+  for (let index = 0; index < 20; index += 1) {
+    const changed = editor
+      .chain()
+      .focus()
+      .command(({ tr }) => {
+        tr.setMeta(LOCAL_FILE_USER_EDIT_META, true);
+        return true;
+      })
+      [command]()
+      .run();
+    applied ||= changed;
+    if (!changed || !isActiveSlashCommandDraft(editor)) break;
+  }
+  return applied;
+}
+
 interface VisualEditorExtensionOptions {
   documentId?: string;
   ydoc?: YDoc | null;
@@ -1610,6 +1646,7 @@ export function createVisualEditorExtensions({
     },
     starterKit: {
       blockquote: false,
+      code: false,
       paragraph: false,
       heading: { levels: [1, 2, 3, 4, 5, 6] },
       horizontalRule: {},
@@ -1618,6 +1655,7 @@ export function createVisualEditorExtensions({
     collab:
       ydoc || localAwareness ? { ydoc, awareness: localAwareness, user } : null,
     extraExtensions: [
+      CompatibleCode,
       EmptyLineParagraph,
       NotionBlockquote,
       CodeBlock,
@@ -1957,6 +1995,8 @@ export function VisualEditor({
   notionPageLinks = [],
   onOpenNotionPageLink,
   notionPageId,
+  onHistoryControllerChange,
+  onHistoryStateChange,
 }: VisualEditorProps) {
   const t = useT();
   const [isDraggingMedia, setIsDraggingMedia] = useState(false);
@@ -1967,6 +2007,8 @@ export function VisualEditor({
   onChangeRef.current = onChange;
   const onSaveContentRef = useRef(onSaveContent);
   onSaveContentRef.current = onSaveContent;
+  const onHistoryStateChangeRef = useRef(onHistoryStateChange);
+  onHistoryStateChangeRef.current = onHistoryStateChange;
   const notionPageLinksRef = useRef(notionPageLinks);
   notionPageLinksRef.current = notionPageLinks;
   const onMediaSourceCommittedRef = useRef<
@@ -2150,6 +2192,7 @@ export function VisualEditor({
     }
   };
 
+  const historyEditorRef = useRef<CoreEditor | null>(null);
   const editor = useEditor({
     extensions,
     // With Collaboration (ydoc) active, content is owned by the Y.XmlFragment —
@@ -2240,8 +2283,22 @@ export function VisualEditor({
           if (view.editable) markUserEditIntent();
           return false;
         },
-        keydown(view) {
+        keydown(view, event) {
           if (view.editable) markUserEditIntent();
+          if (
+            view.editable &&
+            (event.metaKey || event.ctrlKey) &&
+            !event.altKey &&
+            event.key.toLowerCase() === "z" &&
+            historyEditorRef.current
+          ) {
+            event.preventDefault();
+            runPersistableHistoryCommand(
+              historyEditorRef.current,
+              event.shiftKey ? "redo" : "undo",
+            );
+            return true;
+          }
           return false;
         },
         cut(view) {
@@ -2276,6 +2333,12 @@ export function VisualEditor({
       },
     },
     editable,
+    onTransaction: ({ editor }) => {
+      onHistoryStateChangeRef.current?.({
+        canUndo: editor.can().undo(),
+        canRedo: editor.can().redo(),
+      });
+    },
     onUpdate: ({ editor, transaction }) => {
       const guards = guardsRef.current;
       // `shouldIgnoreUpdate` covers: not editable, mid-programmatic setContent,
@@ -2326,6 +2389,23 @@ export function VisualEditor({
       });
     },
   });
+  historyEditorRef.current = editor;
+
+  useEffect(() => {
+    if (!editor) {
+      onHistoryControllerChange?.(null);
+      return;
+    }
+    onHistoryControllerChange?.({
+      undo: () => runPersistableHistoryCommand(editor, "undo"),
+      redo: () => runPersistableHistoryCommand(editor, "redo"),
+    });
+    onHistoryStateChange?.({
+      canUndo: editor.can().undo(),
+      canRedo: editor.can().redo(),
+    });
+    return () => onHistoryControllerChange?.(null);
+  }, [editor, onHistoryControllerChange, onHistoryStateChange]);
 
   const handleImageFileInputChange = useCallback(
     async (event: Event) => {

package/corpus/templates/content/app/components/editor/database/sidebar.tsx

@@ -14,6 +14,8 @@ import {
   IconDatabase,
   IconDots,
   IconFileText,
+  IconFolder,
+  IconFolderOpen,
   IconPlus,
   IconStar,
   IconTrash,
@@ -266,6 +268,7 @@ export function ContentFilesSidebarView({
     : undefined;
   const manualReorderEnabled =
     Boolean(manualReorder) &&
+    !items.some((item) => item.document.source?.kind === "folder") &&
     (sidebarOrder?.mode ?? "custom") === "custom" &&
     activeView.sorts.length === 0 &&
     activeView.filters.length === 0 &&
@@ -746,6 +749,39 @@ function DatabaseSidebarRow({
 
   const title = item.document.title || untitledLabel;
 
+  if (item.document.source?.kind === "folder") {
+    return (
+      <div className="group relative min-w-0">
+        <button
+          type="button"
+          className="flex h-7 w-full min-w-0 items-center gap-1.5 rounded pe-1.5 text-start text-sm text-foreground/85 hover:bg-muted hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          style={{
+            paddingInlineStart: `${databaseSidebarRowIndent(depth, hasChildren)}px`,
+          }}
+          aria-label={`${expanded ? t("sidebar.collapse") : t("sidebar.expand")} ${title}`}
+          aria-expanded={expanded}
+          onClick={() => onToggleExpanded?.(!expanded)}
+          onPointerUp={(event) => event.currentTarget.blur()}
+        >
+          <span className="flex size-7 shrink-0 items-center justify-center text-muted-foreground">
+            <IconChevronRight
+              className={cn(
+                "size-3.5 transition-transform",
+                expanded && "rotate-90",
+              )}
+            />
+          </span>
+          {expanded ? (
+            <IconFolderOpen className="size-3.5 shrink-0 text-muted-foreground" />
+          ) : (
+            <IconFolder className="size-3.5 shrink-0 text-muted-foreground" />
+          )}
+          <span className="min-w-0 flex-1 truncate">{title}</span>
+        </button>
+      </div>
+    );
+  }
+
   return (
     <>
       <div className="group relative min-w-0">

package/corpus/templates/content/app/components/editor/extensions/NotionExtensions.tsx

@@ -1,4 +1,5 @@
 import { findTrailingPlainInlineMath } from "@shared/inline-math";
+import { NFM_COLORS } from "@shared/nfm";
 import {
   escapeHtml,
   indentMarkdown,
@@ -12,6 +13,7 @@ import {
   IconFileText,
 } from "@tabler/icons-react";
 import { InputRule, type Editor } from "@tiptap/core";
+import { Code } from "@tiptap/extension-code";
 import type { Fragment, Node as ProseMirrorNode } from "@tiptap/pm/model";
 import { Selection } from "@tiptap/pm/state";
 import {
@@ -745,12 +747,19 @@ export const NotionSpanMark = Mark.create({
   renderHTML({ HTMLAttributes }) {
     const attrs = parseAttrsJson(HTMLAttributes.attrsJson as string);
     const style: string[] = [];
+    const classes: string[] = [];
 
-    if (HTMLAttributes.color) {
-      style.push(`color: ${HTMLAttributes.color}`);
+    if (
+      NFM_COLORS.has(HTMLAttributes.color) &&
+      !HTMLAttributes.color.endsWith("_bg")
+    ) {
+      classes.push(`notion-block-color--${HTMLAttributes.color}`);
     }
-    if (HTMLAttributes.bgColor) {
-      style.push(`background-color: ${HTMLAttributes.bgColor}`);
+    if (
+      NFM_COLORS.has(HTMLAttributes.bgColor) &&
+      HTMLAttributes.bgColor.endsWith("_bg")
+    ) {
+      classes.push(`notion-block-bg--${HTMLAttributes.bgColor.slice(0, -3)}`);
     }
     if (HTMLAttributes.underline === "true") {
       style.push("text-decoration: underline");
@@ -764,6 +773,7 @@ export const NotionSpanMark = Mark.create({
         bg_color: HTMLAttributes.bgColor || undefined,
         underline: HTMLAttributes.underline || undefined,
         href: HTMLAttributes.href || undefined,
+        class: classes.length ? classes.join(" ") : undefined,
         style: style.length ? style.join("; ") : undefined,
       }),
       0,
@@ -787,6 +797,10 @@ export const NotionSpanMark = Mark.create({
   },
 });
 
+export const CompatibleCode = Code.extend({
+  excludes: "",
+});
+
 export const NotionToggle = Node.create({
   name: "notionToggle",
   priority: 1000,

package/corpus/templates/content/app/components/editor/local-source-write-state.ts

@@ -0,0 +1,52 @@
+export interface PendingLocalSourceWrite {
+  title: string;
+  content: string;
+}
+
+export type LocalSourceReadDisposition =
+  | "pending-self-write"
+  | "conflict"
+  | "external-change"
+  | "unchanged";
+
+export function localSourceRevisionForSave(
+  queuedRevision: string | null | undefined,
+  currentRevision: string | undefined,
+) {
+  return queuedRevision === undefined ? currentRevision : queuedRevision;
+}
+
+export function localSourceRevisionForQueuedEdit(
+  pendingRevision: string | null | undefined,
+  currentRevision: string | undefined,
+) {
+  return pendingRevision === undefined
+    ? (currentRevision ?? null)
+    : pendingRevision;
+}
+
+export function classifyLocalSourceRead(args: {
+  diskTitle: string;
+  diskContent: string;
+  localContent: string;
+  lastSavedTitle: string;
+  lastSavedContent: string;
+  pendingWrite: PendingLocalSourceWrite | null;
+  hasPendingSave?: boolean;
+}): LocalSourceReadDisposition {
+  if (
+    args.pendingWrite?.title === args.diskTitle &&
+    args.pendingWrite.content === args.diskContent
+  ) {
+    return "pending-self-write";
+  }
+
+  const hasUnsavedEdit =
+    args.hasPendingSave === true || args.localContent !== args.lastSavedContent;
+  const diskChanged =
+    args.diskContent !== args.lastSavedContent ||
+    args.diskTitle !== args.lastSavedTitle;
+
+  if (hasUnsavedEdit && diskChanged) return "conflict";
+  return diskChanged ? "external-change" : "unchanged";
+}

package/corpus/templates/content/app/components/sidebar/DocumentSidebar.tsx

@@ -51,6 +51,7 @@ import {
   IconChevronRight,
   IconDots,
   IconTrash,
+  IconGitBranch,
 } from "@tabler/icons-react";
 import { useQueryClient } from "@tanstack/react-query";
 import {
@@ -127,8 +128,20 @@ import {
   buildDocumentTree,
   filterDocumentTreeDocuments,
   documentQueryFilter,
+  rollbackOptimisticCreatedDocument,
+  restoreDeletedDocumentSnapshots,
 } from "@/hooks/use-documents";
 import { useLocalStorage } from "@/hooks/use-local-storage";
+import {
+  getDesktopContentFiles,
+  type DesktopContentFilesFolder,
+} from "@/lib/desktop-content-files";
+import {
+  consumeLiveLocalFolderActivation,
+  liveLocalFolderSourceId,
+  pendingLiveLocalFolderActivation,
+  subscribeLiveLocalFolderActivation,
+} from "@/lib/local-folder-live-sync";
 import {
   markDocumentCreationPending,
   shouldCreateDocumentOptimistically,
@@ -140,6 +153,11 @@ import {
   isDirectLocalDocument,
 } from "./document-sidebar-sections";
 import { DocumentSidebarIcon, DocumentTreeItem } from "./DocumentTreeItem";
+import {
+  firstLocalSourceDocumentId,
+  localSourceItemIdentity,
+  projectLocalSourceHierarchy,
+} from "./local-source-hierarchy";
 import {
   contentSpaceAvailability,
   contentSpaceForStoredSelection,
@@ -433,6 +451,57 @@ function WorkspaceSidebarItem({
   onToggleFavorite: (item: ContentDatabaseItem) => void;
 }) {
   const t = useT();
+  const [localWorkingCopies, setLocalWorkingCopies] = useState<
+    DesktopContentFilesFolder[]
+  >([]);
+  const [selectedWorkingCopyId, setSelectedWorkingCopyId] = useState<
+    string | null
+  >(null);
+  useEffect(() => {
+    const desktop = getDesktopContentFiles();
+    if (!desktop) return;
+    let active = true;
+    const refresh = async (preferFolderId?: string) => {
+      const result = await desktop.getFolder(
+        preferFolderId ? { folderId: preferFolderId } : undefined,
+      );
+      if (!active || !result.ok) return;
+      const folders = result.folders ?? [result.folder];
+      const main = folders.find((folder) => folder.kind !== "temporary");
+      const repositoryId = main?.repository?.localId;
+      const related = repositoryId
+        ? folders.filter(
+            (folder) => folder.repository?.localId === repositoryId,
+          )
+        : folders;
+      setLocalWorkingCopies(related);
+      setSelectedWorkingCopyId((current) =>
+        preferFolderId && related.some((folder) => folder.id === preferFolderId)
+          ? preferFolderId
+          : current && related.some((folder) => folder.id === current)
+            ? current
+            : (main?.id ?? related[0]?.id ?? null),
+      );
+      if (
+        preferFolderId &&
+        related.some((folder) => folder.id === preferFolderId)
+      ) {
+        consumeLiveLocalFolderActivation(preferFolderId);
+      }
+    };
+    void refresh(pendingLiveLocalFolderActivation() ?? undefined);
+    const remove = desktop.onChange?.((event) => {
+      void refresh(event.reason === "attached" ? event.folderId : undefined);
+    });
+    const removeActivation = subscribeLiveLocalFolderActivation((folderId) => {
+      void refresh(folderId);
+    });
+    return () => {
+      active = false;
+      remove?.();
+      removeActivation();
+    };
+  }, []);
   const activeFilesDatabaseId = useDeferredFilesDatabaseId(
     space.filesDatabaseId,
     expanded,
@@ -442,6 +511,89 @@ function WorkspaceSidebarItem({
   const filesDatabaseData = isContentDatabaseUnavailable(filesDatabase.data)
     ? undefined
     : filesDatabase.data;
+  const workspaceSourceIds = new Set(
+    filesDatabaseData?.items.flatMap((item) => {
+      const identity = localSourceItemIdentity(item);
+      return identity ? [identity] : [];
+    }) ?? [],
+  );
+  const workspaceRootPaths = new Set(
+    filesDatabaseData?.items.flatMap((item) => {
+      const rootPath = item.document.source?.rootPath;
+      return rootPath ? [rootPath] : [];
+    }) ?? [],
+  );
+  const relatedWorkingCopies = localWorkingCopies.filter((folder) => {
+    const sourceId = folder.id ? liveLocalFolderSourceId(folder.id) : null;
+    const rootPath =
+      folder.kind === "temporary"
+        ? folder.name
+        : (folder.sourcePrefix ?? folder.name);
+    return (
+      (typeof sourceId === "string" && workspaceSourceIds.has(sourceId)) ||
+      workspaceRootPaths.has(folder.id ?? rootPath) ||
+      workspaceRootPaths.has(rootPath)
+    );
+  });
+  const selectedWorkingCopy =
+    relatedWorkingCopies.find(
+      (folder) => folder.id === selectedWorkingCopyId,
+    ) ??
+    relatedWorkingCopies.find((folder) => folder.kind !== "temporary") ??
+    relatedWorkingCopies[0];
+  const selectedSourceRoot = selectedWorkingCopy
+    ? (selectedWorkingCopy.id ??
+      (selectedWorkingCopy.kind === "temporary"
+        ? selectedWorkingCopy.name
+        : (selectedWorkingCopy.sourcePrefix ?? selectedWorkingCopy.name)))
+    : undefined;
+  const selectedSourceId = selectedWorkingCopy?.id
+    ? liveLocalFolderSourceId(selectedWorkingCopy.id)
+    : undefined;
+  const workingCopySourceIds = new Set(
+    relatedWorkingCopies.flatMap((folder) => {
+      const sourceId = folder.id ? liveLocalFolderSourceId(folder.id) : null;
+      return sourceId ? [sourceId] : [];
+    }),
+  );
+  const hasRelatedLocalFiles = filesDatabaseData?.items.some(
+    (item) =>
+      item.document.source?.mode === "local-files" &&
+      (workingCopySourceIds.has(localSourceItemIdentity(item) ?? "") ||
+        relatedWorkingCopies.some(
+          (folder) =>
+            item.document.source?.rootPath ===
+            (folder.id ??
+              (folder.kind === "temporary"
+                ? folder.name
+                : (folder.sourcePrefix ?? folder.name))),
+        )),
+  );
+  const visibleFilesDatabaseData = filesDatabaseData
+    ? {
+        ...filesDatabaseData,
+        items: projectLocalSourceHierarchy(filesDatabaseData.items, {
+          sourceId: selectedSourceId,
+          rootPath: selectedSourceRoot,
+        }),
+      }
+    : undefined;
+  const openedWorkingCopyIdRef = useRef<string | null>(null);
+  useEffect(() => {
+    if (
+      selectedWorkingCopy?.kind !== "temporary" ||
+      !selectedWorkingCopy.id ||
+      openedWorkingCopyIdRef.current === selectedWorkingCopy.id
+    ) {
+      return;
+    }
+    const firstDocumentId = firstLocalSourceDocumentId(
+      visibleFilesDatabaseData?.items ?? [],
+    );
+    if (!firstDocumentId) return;
+    openedWorkingCopyIdRef.current = selectedWorkingCopy.id;
+    onActivate(space, firstDocumentId);
+  }, [onActivate, selectedWorkingCopy, space, visibleFilesDatabaseData]);
   const resolvedFilesDatabaseId = filesDatabaseData?.database.id ?? null;
   const filesPersonalView = useContentDatabasePersonalView(
     resolvedFilesDatabaseId,
@@ -605,6 +757,62 @@ function WorkspaceSidebarItem({
       </div>
       {expanded ? (
         <div className="min-w-0 pb-1 ps-4">
+          {relatedWorkingCopies.some((folder) => folder.kind === "temporary") &&
+          selectedWorkingCopy &&
+          hasRelatedLocalFiles ? (
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <button
+                  type="button"
+                  className="mb-1 flex min-h-8 w-full min-w-0 items-center gap-2 rounded-md px-2 text-start text-xs hover:bg-accent/40"
+                  title={selectedWorkingCopy.updatedAt}
+                  data-working-copy-switcher
+                >
+                  <span className="min-w-0 flex-1">
+                    <span className="block truncate font-medium">
+                      {selectedWorkingCopy.kind === "temporary"
+                        ? selectedWorkingCopy.name
+                        : t("localFiles.mainFolder")}
+                    </span>
+                    {selectedWorkingCopy.repository?.branch ||
+                    selectedWorkingCopy.repository?.commit ? (
+                      <span className="flex items-center gap-1 truncate font-mono text-[10px] text-muted-foreground">
+                        <IconGitBranch size={11} />
+                        {selectedWorkingCopy.repository.branch ??
+                          selectedWorkingCopy.repository.commit?.slice(0, 8)}
+                      </span>
+                    ) : null}
+                  </span>
+                  <IconChevronDown size={13} className="shrink-0" />
+                </button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="start" className="w-64">
+                {relatedWorkingCopies.map((folder) => (
+                  <DropdownMenuItem
+                    key={folder.id}
+                    onSelect={() => setSelectedWorkingCopyId(folder.id ?? null)}
+                    title={folder.updatedAt}
+                  >
+                    <span className="min-w-0">
+                      <span className="block truncate">
+                        {folder.kind === "temporary"
+                          ? folder.name
+                          : t("localFiles.mainFolder")}
+                      </span>
+                      {folder.repository?.branch ||
+                      folder.repository?.commit ? (
+                        <span className="flex items-center gap-1 truncate font-mono text-[10px] text-muted-foreground">
+                          <IconGitBranch size={11} />
+                          {folder.repository.branch ??
+                            folder.repository.commit?.slice(0, 8)}
+                        </span>
+                      ) : null}
+                    </span>
+                  </DropdownMenuItem>
+                ))}
+              </DropdownMenuContent>
+            </DropdownMenu>
+          ) : null}
           {failed ? (
             <QueryErrorState
               compact
@@ -618,7 +826,7 @@ function WorkspaceSidebarItem({
             />
           ) : (
             <ContentFilesSidebarView
-              data={filesDatabaseData}
+              data={visibleFilesDatabaseData}
               overrides={filesPersonalView.data?.overrides}
               isLoading={filesDatabase.isLoading || filesPersonalView.isLoading}
               activeDocumentId={activeDocumentId}
@@ -1153,12 +1361,16 @@ export function DocumentSidebar({
         createdAt: now,
         updatedAt: now,
       });
+      const previousDocuments = queryClient.getQueryData(
+        LIST_DOCUMENTS_QUERY_KEY,
+      );
+      const previousPath = `${location.pathname}${location.search}${location.hash}`;
 
       // Optimistically inject into caches so UI updates immediately
       queryClient.setQueryData(LIST_DOCUMENTS_QUERY_KEY, (old: any) => {
         const docs: Document[] =
           old?.documents ?? (Array.isArray(old) ? old : []);
-        return { documents: [...docs, tempDoc] };
+        return withDocumentsCacheShape(old, [...docs, tempDoc]);
       });
       queryClient.setQueryData(["action", "get-document", { id }], tempDoc);
       if (rootFilesDatabaseId) {
@@ -1207,7 +1419,11 @@ export function DocumentSidebar({
           });
         }
       } catch (err) {
-        // Revert optimistic updates
+        rollbackOptimisticCreatedDocument(
+          queryClient,
+          id,
+          previousDocuments !== undefined,
+        );
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
@@ -1218,7 +1434,10 @@ export function DocumentSidebar({
             (current) => removeOptimisticItemFromContentDatabase(current, id),
           );
         }
-        navigate("/");
+        navigate(previousPath, {
+          replace: true,
+          flushSync: true,
+        });
         toast.error(t("sidebar.failedCreatePage"), {
           description:
             err instanceof Error ? err.message : t("empty.genericError"),
@@ -1228,6 +1447,9 @@ export function DocumentSidebar({
     [
       createDocument,
       localFileMode,
+      location.hash,
+      location.pathname,
+      location.search,
       navigate,
       navigateToDocument,
       onNavigate,
@@ -1284,6 +1506,13 @@ export function DocumentSidebar({
         navigationCandidates.find((doc) => doc.isFavorite) ??
         [...navigationCandidates].sort(compareDocumentsByPosition)[0] ??
         null;
+      const previousDocuments = queryClient.getQueryData(
+        LIST_DOCUMENTS_QUERY_KEY,
+      );
+      const previousDocumentQueries = [...deletedIds].flatMap((deletedId) =>
+        queryClient.getQueriesData(documentQueryFilter(deletedId)),
+      );
+      const previousPath = `${location.pathname}${location.search}${location.hash}`;
 
       queryClient.setQueryData(LIST_DOCUMENTS_QUERY_KEY, (old: unknown) => {
         const cachedDocs: Document[] =
@@ -1317,11 +1546,17 @@ export function DocumentSidebar({
           queryKey: ["action", "list-documents"],
         });
       } catch (err) {
+        restoreDeletedDocumentSnapshots(
+          queryClient,
+          previousDocuments,
+          previousDocumentQueries,
+          deletedIds,
+        );
         queryClient.invalidateQueries({
           queryKey: ["action", "list-documents"],
         });
-        if (activeDeleted && activeDocumentId) {
-          navigate(`/page/${activeDocumentId}`, {
+        if (activeDeleted) {
+          navigate(previousPath, {
             replace: true,
             flushSync: true,
           });
@@ -1338,6 +1573,9 @@ export function DocumentSidebar({
       deleteDocument,
       documents,
       localFileMode,
+      location.hash,
+      location.pathname,
+      location.search,
       navigate,
       queryClient,
     ],