@parallelworks/ui 0.16.0 → 0.17.0

package/dist/file-explorer/index.js

@@ -1,21 +1,21 @@
 import { AccessIcon, AlertIcon, AngleDownIcon, AngleRightIcon, AngleUpIcon, ChevronLeftIcon, ChevronRightIcon, ClipboardIcon, CloseIcon, CloudUploadIcon, CollapseIcon, CustomizeIcon, DiskIcon, DocumentIcon, DownloadFileIcon, ExpandIcon, ExpandVerticalIcon, EyeIcon, FileIcon, FileTextIcon, FolderIcon, FolderOpenIcon, ImageIcon, LinkIcon, LockIcon, MinimizeIcon, MusicIcon, PdfIcon, RefreshIcon, ShareIcon, SpreadsheetIcon, SuccessIcon, TrashIcon, UploadIcon, UserIcon, VideoIcon, ZipIcon, ZoomInIcon, ZoomOutIcon } from "../icons.js";
-import { c as ConfirmModal, f as Markdown, h as Callout, m as CopyToClipboard, n as CreateModal, p as CopyCodeBlock } from "../chunks/CreateModal-B7smkHkv.js";
-import { a as useProvisionCorsRules, c as useStrings, i as useNotify, s as useSlots } from "../chunks/Provider-CbFVFB7O.js";
+import { c as ConfirmModal, f as Markdown, h as Callout, m as CopyToClipboard, n as CreateModal, p as CopyCodeBlock } from "../chunks/CreateModal-BbV5cTj7.js";
+import { i as useNotify, l as useSlots, o as useProvisionCorsRules, u as useStrings } from "../chunks/Provider-DHmZ3v9i.js";
 import { n as TOOLTIP_ID, r as TooltipInfo } from "../chunks/Tooltip-n9w7Tkt1.js";
-import { t as StatusBadge } from "../chunks/StatusBadge-zvEtK16a.js";
+import { t as StatusBadge } from "../chunks/StatusBadge-C1Blx_cW.js";
 import { t as Loader } from "../chunks/Loader-BXoXTZGc.js";
-import { _ as useRowMenuActive, d as assembleRowMenu, f as copySubmenu, g as useRowMenu, u as MoreButton } from "../chunks/PageHeader-CoZWF0pJ.js";
-import { n as Table } from "../chunks/Table-CutP1bRt.js";
-import { C as ListSkeleton, E as RowSelectCheckbox, O as listTableFixedProps, k as listTableProps, x as ListActionsHeader } from "../chunks/list-CduoUsMW.js";
+import { _ as useRowMenuActive, d as assembleRowMenu, f as copySubmenu, g as useRowMenu, u as MoreButton } from "../chunks/PageHeader-MxuOs9cH.js";
+import { n as Table } from "../chunks/Table-C6JdFFiJ.js";
+import { C as ListSkeleton, E as RowSelectCheckbox, O as listTableFixedProps, k as listTableProps, x as ListActionsHeader } from "../chunks/list-7k0eaI5N.js";
 import cx from "classnames";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Suspense, createContext, lazy, memo, use, useCallback, useEffect, useEffectEvent, useId, useLayoutEffect, useMemo, useRef, useState, useTransition } from "react";
+import { useLocalStorage } from "usehooks-ts";
 import { createPortal } from "react-dom";
 import { Menu, MenuButton, MenuItem, MenuItems, MenuSeparator } from "@headlessui/react";
 import Skeleton from "react-loading-skeleton";
 import { DateTime } from "luxon";
 import { Resizable } from "re-resizable";
-import { useLocalStorage } from "usehooks-ts";
 import { useVirtualizer } from "@tanstack/react-virtual";
 //#region src/file-explorer/lib/utils.ts
 function formatFileSize(bytes) {
@@ -38,143 +38,143 @@ function getNodeName(node) {
 	const parts = removeTrailingSlash(node.path || "").split("/");
 	return parts[parts.length - 1] ?? "";
 }
-function buildTreeFromStorage(storage, unsortedParents) {
-	if (!storage) return {
-		treeMap: {},
-		parentToChildrenMap: {}
-	};
-	const objects = storage.objects ?? [];
-	const cspBucketName = storage.bucketName || storage.name;
-	const storagePath = storage.user ? ensureTrailingSlash(`${storage.user}/${storage.name}`) : ensureTrailingSlash(storage.name);
-	const treeMap = { [storagePath]: {
-		name: storage.name,
-		displayName: storage?.displayName,
-		path: storagePath,
-		relativePath: "",
-		type: "directory",
-		created: storage.created,
-		modified: storage.modified,
-		storageId: storage.id,
-		storageName: cspBucketName,
-		storageNodeIcon: storage.type,
-		storageImageUrl: storage.imageUrl,
-		storageType: storage.type,
-		root: true
-	} };
-	const directories = objects.filter((obj) => obj.type === "directory");
-	const files = objects.filter((obj) => obj.type === "file");
-	directories.forEach((dir) => {
-		const fullPath = ensureTrailingSlash(`${storagePath}${removeLeadingSlash(removeTrailingSlash(dir.path))}`);
-		treeMap[fullPath] = {
-			name: getNodeName(dir),
-			path: fullPath,
-			relativePath: dir?.key || dir.path,
-			type: dir.type,
-			created: dir?.created,
-			modified: dir?.modified,
-			storageId: storage.id,
-			storageName: cspBucketName
-		};
-	});
-	files.forEach((file) => {
-		const relativeFilePath = removeLeadingSlash(file.path);
-		const fullPath = `${storagePath}${relativeFilePath}`;
-		treeMap[fullPath] = {
-			name: getNodeName(file),
-			path: fullPath,
-			relativePath: file.key || relativeFilePath,
-			type: file.type,
-			size: file.size,
-			created: file?.created,
-			modified: file?.modified,
-			contentType: file?.contentType,
-			hash: file?.hash,
-			storageClass: file?.storageClass,
-			storageId: storage.id,
-			storageName: cspBucketName
-		};
-	});
-	const parentToChildrenMap = { [storagePath]: [] };
-	Object.values(treeMap).forEach((node) => {
-		if (node.path === storagePath) return;
-		const cleanPath = node.path.endsWith("/") && node.path.length > 1 ? node.path.slice(0, -1) : node.path;
-		const lastSlash = cleanPath.lastIndexOf("/");
-		const parentPath = lastSlash <= 0 ? storagePath : ensureTrailingSlash(cleanPath.substring(0, lastSlash + 1));
-		if (!parentToChildrenMap[parentPath]) parentToChildrenMap[parentPath] = [];
-		parentToChildrenMap[parentPath].push(node);
-	});
-	Object.entries(parentToChildrenMap).forEach(([parentPath, childrenArr]) => {
-		if (unsortedParents?.has(parentPath)) return;
-		childrenArr.sort((a, b) => {
-			if (a.type !== b.type) return a.type === "directory" ? -1 : 1;
-			return a.name.localeCompare(b.name);
-		});
-	});
+function toNode(entry, storage, storagePath, storageName) {
+	const relativePath = removeLeadingSlash(entry.path);
+	const isDirectory = entry.type === "directory";
 	return {
-		treeMap,
-		parentToChildrenMap
+		name: getNodeName(entry),
+		path: isDirectory ? ensureTrailingSlash(`${storagePath}${removeTrailingSlash(relativePath)}`) : `${storagePath}${relativePath}`,
+		relativePath: entry.key || (isDirectory ? entry.path : relativePath),
+		type: entry.type,
+		size: entry.size,
+		created: entry.created,
+		modified: entry.modified,
+		contentType: entry.contentType,
+		hash: entry.hash,
+		storageClass: entry.storageClass,
+		storageId: storage.id,
+		storageName
 	};
 }
-function buildTreeFromUserStorages(storages, options) {
-	if (storages.length === 1 && !options?.forceUserHierarchy) return buildTreeFromStorage(storages[0], options?.unsortedParents);
-	const treeMap = {};
-	const parentToChildrenMap = {};
-	const userGroups = {};
-	for (const storage of storages) {
-		const username = storage.user ?? "";
-		if (!userGroups[username]) userGroups[username] = [];
-		userGroups[username].push(storage);
+function compareNodes(a, b) {
+	if (a.type !== b.type) return a.type === "directory" ? -1 : 1;
+	return (a.displayName || a.name).localeCompare(b.displayName || b.name);
+}
+function extendsEntries(next, previous) {
+	return next.length >= previous.length && previous.every((entry, i) => next[i] === entry);
+}
+function childrenOf(dir, sorted) {
+	if (sorted) {
+		dir.sorted ??= [...dir.directories, ...dir.files].sort(compareNodes);
+		return dir.sorted;
 	}
-	for (const username of Object.keys(userGroups)) {
-		const userPath = ensureTrailingSlash(username);
-		treeMap[userPath] = {
-			name: username,
-			path: userPath,
+	dir.unsorted ??= [...dir.directories, ...dir.files];
+	return dir.unsorted;
+}
+/** One accumulator per listed directory, so a landed page costs the page and not
+*  the tree. One builder per explorer instance. */
+function createTreeBuilder() {
+	const directories = /* @__PURE__ */ new Map();
+	let last = null;
+	function unchanged(storages, options) {
+		if (!last || last.storages !== storages || last.options.forceUserHierarchy !== options.forceUserHierarchy || last.options.unsortedParents !== options.unsortedParents) return false;
+		const before = last.options.listings;
+		if (options.listings.size !== before.size) return false;
+		for (const [dirPath, listing] of options.listings) if (before.get(dirPath)?.entries !== listing.entries) return false;
+		return true;
+	}
+	function nodesFor(dirPath, storage, storagePath, storageName, entries) {
+		const cached = directories.get(dirPath);
+		const reusable = cached?.storageName === storageName ? cached : void 0;
+		if (reusable && reusable.entries === entries) return reusable;
+		let dir;
+		if (reusable && extendsEntries(entries, reusable.entries)) dir = reusable;
+		else {
+			dir = {
+				entries: [],
+				storageName,
+				directories: [],
+				files: []
+			};
+			directories.set(dirPath, dir);
+		}
+		for (let i = dir.entries.length; i < entries.length; i++) {
+			const node = toNode(entries[i], storage, storagePath, storageName);
+			if (node.path === dirPath) continue;
+			if (node.type === "directory") dir.directories.push(node);
+			else dir.files.push(node);
+		}
+		dir.entries = entries;
+		dir.unsorted = void 0;
+		dir.sorted = void 0;
+		return dir;
+	}
+	function addStorage(storage, storagePath, options, tree) {
+		const storageName = storage.bucketName || storage.name;
+		const root = {
+			name: storage.name,
+			displayName: storage.displayName,
+			path: storagePath,
+			relativePath: "",
 			type: "directory",
-			displayName: username
+			created: storage.created,
+			modified: storage.modified,
+			storageId: storage.id,
+			storageName,
+			storageNodeIcon: storage.type,
+			storageImageUrl: storage.imageUrl,
+			storageType: storage.type,
+			root: true
 		};
-		parentToChildrenMap[userPath] = [];
-		for (const storage of userGroups[username] ?? []) {
-			const cspBucketName = storage.bucketName || storage.name;
-			const storageFullPath = ensureTrailingSlash(`${userPath}${removeLeadingAndTrailingSlashes(storage.name)}`);
-			treeMap[storageFullPath] = {
-				name: storage.name,
-				displayName: storage?.displayName,
-				path: storageFullPath,
-				relativePath: "",
-				type: "directory",
-				created: storage?.created,
-				modified: storage?.modified,
-				storageId: storage.id,
-				storageName: cspBucketName,
-				storageNodeIcon: storage.type,
-				storageImageUrl: storage.imageUrl,
-				storageType: storage.type,
-				root: true
-			};
-			parentToChildrenMap[userPath].push(treeMap[storageFullPath]);
-			if (storage.objects) {
-				const { treeMap: storageTree, parentToChildrenMap: storageChildren } = buildTreeFromStorage(storage, options?.unsortedParents);
-				Object.assign(treeMap, storageTree);
-				for (const [parent, children] of Object.entries(storageChildren)) {
-					if (!parentToChildrenMap[parent]) parentToChildrenMap[parent] = [];
-					parentToChildrenMap[parent].push(...children);
-				}
-			}
+		tree.treeMap[storagePath] = root;
+		for (const [dirPath, listing] of options.listings) {
+			if (!dirPath.startsWith(storagePath)) continue;
+			const children = childrenOf(nodesFor(dirPath, storage, storagePath, storageName, listing.entries), !options.unsortedParents?.has(dirPath));
+			if (children.length === 0) continue;
+			for (const node of children) tree.treeMap[node.path] = node;
+			tree.parentToChildrenMap[dirPath] = children;
 		}
+		return root;
 	}
-	Object.entries(parentToChildrenMap).forEach(([parentPath, childrenArr]) => {
-		if (options?.unsortedParents?.has(parentPath)) return;
-		childrenArr.sort((a, b) => {
-			if (a.type !== b.type) return a.type === "directory" ? -1 : 1;
-			const aLabel = a.displayName || a.name;
-			const bLabel = b.displayName || b.name;
-			return aLabel.localeCompare(bLabel);
-		});
-	});
-	return {
-		treeMap,
-		parentToChildrenMap
+	return (storages, options) => {
+		if (last && unchanged(storages, options)) return last.tree;
+		const tree = {
+			treeMap: {},
+			parentToChildrenMap: {},
+			rootNodes: []
+		};
+		if (storages.length === 1 && !options.forceUserHierarchy) {
+			const storage = storages[0];
+			const storagePath = ensureTrailingSlash(storage.user ? `${storage.user}/${storage.name}` : storage.name);
+			tree.rootNodes.push(addStorage(storage, storagePath, options, tree));
+		} else {
+			const userGroups = {};
+			for (const storage of storages) {
+				const username = storage.user ?? "";
+				if (!userGroups[username]) userGroups[username] = [];
+				userGroups[username].push(storage);
+			}
+			for (const username of Object.keys(userGroups)) {
+				const userPath = ensureTrailingSlash(username);
+				const userNode = {
+					name: username,
+					path: userPath,
+					type: "directory",
+					displayName: username
+				};
+				tree.treeMap[userPath] = userNode;
+				tree.rootNodes.push(userNode);
+				const storageRoots = (userGroups[username] ?? []).map((storage) => addStorage(storage, ensureTrailingSlash(`${userPath}${removeLeadingAndTrailingSlashes(storage.name)}`), options, tree));
+				tree.parentToChildrenMap[userPath] = storageRoots.sort(compareNodes);
+			}
+		}
+		for (const dirPath of directories.keys()) if (!options.listings.has(dirPath)) directories.delete(dirPath);
+		last = {
+			storages,
+			options,
+			tree
+		};
+		return tree;
 	};
 }
 function getNodeChildren(parentToChildrenMap, parentPath) {
@@ -277,6 +277,9 @@ function getCspUri(csp, cspBucketName, key) {
 	if (!scheme) return null;
 	return `${scheme}://${cspBucketName}/${key}`;
 }
+function getUriScheme(uri) {
+	return uri.match(/^([a-z0-9+.-]+):\/\//i)?.[1] ?? "";
+}
 function removeLeadingSlash(path) {
 	return path.replace(/^\/+/, "");
 }
@@ -1686,46 +1689,60 @@ function beginLoadingMore(listings, path) {
 	const listing = listings.get(path);
 	if (!listing) return listings;
 	return new Map(listings).set(path, {
-		...listing.cursor ? { cursor: listing.cursor } : {},
-		pagesLoaded: listing.pagesLoaded,
-		loadingMore: true
+		...listing,
+		loadingMore: true,
+		error: void 0
 	});
 }
-/** `expectedPagesLoaded` is captured before the request: a mismatch means a refresh
-*  reset this directory while the page was in flight. */
-function advanceListing(listings, path, page, expectedPagesLoaded) {
-	if ((listings.get(path)?.pagesLoaded ?? 0) !== expectedPagesLoaded) return listings;
+function advanceListing(listings, path, page) {
+	const listing = listings.get(path);
 	return new Map(listings).set(path, {
-		...page.cursor ? { cursor: page.cursor } : {},
-		pagesLoaded: expectedPagesLoaded + 1,
-		loadingMore: false
+		cursor: page.cursor,
+		pagesLoaded: (listing?.pagesLoaded ?? 0) + 1,
+		loadingMore: false,
+		entries: [...listing?.entries ?? [], ...page.entries]
 	});
 }
-/** Always a new map, since the hydration walk only re-runs on a `listings` change.
-*  `pagesLoaded` stays put, so a failed first page still reads as unlisted. */
+/** Subfolders the page no longer names lose their records, or a re-created folder
+*  would show old contents; the rest keep theirs, since a refresh lists them
+*  alongside this one and a parent landing later must not undo a child's page. */
+function replaceListing(listings, path, page) {
+	const prefix = ensureTrailingSlash(path);
+	const subfolders = new Set(page.entries.filter((entry) => entry.type === "directory").map(getNodeName));
+	const next = new Map(listings);
+	next.delete(path);
+	for (const key of listings.keys()) {
+		if (!key.startsWith(prefix)) continue;
+		if (!subfolders.has(key.slice(prefix.length).split("/")[0] ?? "")) next.delete(key);
+	}
+	return advanceListing(next, path, page);
+}
+/** `pagesLoaded` stays put, so a failed first page still reads as unlisted. */
 function recordListingError(listings, path, error) {
 	const listing = listings.get(path);
 	return new Map(listings).set(path, {
-		...listing?.cursor ? { cursor: listing.cursor } : {},
+		cursor: listing?.cursor,
 		pagesLoaded: listing?.pagesLoaded ?? 0,
 		loadingMore: false,
-		error
+		error,
+		entries: listing?.entries ?? []
+	});
+}
+/** Keeps the cursor and pages, so a retry resumes paging instead of starting over. */
+function clearListingError(listings, path) {
+	const listing = listings.get(path);
+	if (!listing) return listings;
+	return new Map(listings).set(path, {
+		...listing,
+		error: void 0
 	});
 }
-/** Slash-terminates the prefix: without it, clearing `logs` would also clear
-*  `logs-archive/`. */
 function clearListingsUnder(listings, path) {
-	const prefix = path.endsWith("/") ? path : `${path}/`;
+	const prefix = ensureTrailingSlash(path);
 	const next = new Map(listings);
 	for (const key of listings.keys()) if (key === path || key.startsWith(prefix)) next.delete(key);
 	return next;
 }
-/** The same prefix rule for the attempt sets that shadow `listings`. They gate
-*  re-listing, so a path left behind here reads as tried-and-empty forever. */
-function forgetPathsUnder(paths, path) {
-	const prefix = path.endsWith("/") ? path : `${path}/`;
-	for (const key of [...paths]) if (key === path || key.startsWith(prefix)) paths.delete(key);
-}
 /** Tree paths whose children should keep arrival order, since sorting them would
 *  reshuffle rows under the user mid-scroll. */
 function incompletePaths(listings) {
@@ -1734,11 +1751,11 @@ function incompletePaths(listings) {
 	return paths;
 }
 /** What a deep link needs next. Pure so the walk is table-testable. */
-function nextHydrationStep({ targetResolved, ancestors, isListableDir, listings, inFlight, attempted, pagesPulled }) {
+function nextHydrationStep({ targetResolved, ancestors, isListableDir, listings, inFlight, pagesPulled }) {
 	for (const path of ancestors) {
 		if (!isListableDir(path)) continue;
 		if (inFlight.has(path)) return { kind: "done" };
-		if (!isListed(listings, path) && !attempted.has(path)) return {
+		if (!listings.has(path)) return {
 			kind: "fetch",
 			path
 		};
@@ -1746,20 +1763,23 @@ function nextHydrationStep({ targetResolved, ancestors, isListableDir, listings,
 	if (targetResolved) return { kind: "done" };
 	const deepest = [...ancestors].reverse().find(isListableDir);
 	if (!deepest) return { kind: "done" };
-	if (!hasMore(listings, deepest)) return { kind: "stuck" };
-	if (loadMoreError(listings, deepest)) return { kind: "stuck" };
-	if (pagesPulled >= 20) return { kind: "stuck" };
+	if (!hasMore(listings, deepest)) return {
+		kind: "stuck",
+		path: deepest
+	};
+	if (loadMoreError(listings, deepest)) return {
+		kind: "stuck",
+		path: deepest
+	};
+	if (pagesPulled >= 20) return {
+		kind: "stuck",
+		path: deepest
+	};
 	return isLoadingMore(listings, deepest) ? { kind: "done" } : {
 		kind: "more",
 		path: deepest
 	};
 }
-/** `replace` drops the directory's previous contents first, which is how a refresh
-*  sheds deleted objects rather than re-adding them. */
-function nextObjects(previous, page, options) {
-	if (!options.replace) return [...previous, ...page];
-	return [...previous.filter((obj) => !(obj.path.startsWith(options.dirPath) && obj.path !== options.dirPath)), ...page];
-}
 //#endregion
 //#region src/file-explorer/FilePreview/StreamedBadge.tsx
 function StreamedBadge() {
@@ -2537,7 +2557,7 @@ function useObjectText(url, { enabled, maxBytes, maxLines, knownSize, cacheKey,
 }
 //#endregion
 //#region src/file-explorer/FilePreview/Viewer.tsx
-var CodePreviewEditor = lazy(() => import("../chunks/CodePreviewEditor-DuMZMA_k.js"));
+var CodePreviewEditor = lazy(() => import("../chunks/CodePreviewEditor-UAtnpmOV.js"));
 var PREVIEW_MARKDOWN_CONTROLS = {
 	table: { fullscreen: false },
 	mermaid: { fullscreen: false }
@@ -3873,8 +3893,8 @@ function flattenTreeRows(roots, parentToChildrenMap, expandedPaths, options) {
 			isExpanded
 		});
 		if (!isExpanded) return;
-		if (options?.loadingPaths?.has(node.path)) {
-			if (children.length === 0) rows.push(statusRow("skeleton", node, depth + 1));
+		if (options?.loadingPaths?.has(node.path) && children.length === 0) {
+			rows.push(statusRow("skeleton", node, depth + 1));
 			return;
 		}
 		const limit = options?.fileLimits?.get(node.path) ?? 50;
@@ -4276,7 +4296,7 @@ function useTreePitchAudit(scrollEl, rows, items) {
 //#region src/file-explorer/FileExplorer.tsx
 function UriCard({ value }) {
 	const t = useStrings().fileExplorer;
-	const scheme = value.match(/^([a-z0-9+.-]+):\/\//i)?.[1] ?? "";
+	const scheme = getUriScheme(value);
 	return /* @__PURE__ */ jsxs(CopyToClipboard, {
 		text: value,
 		showIcon: false,
@@ -4348,10 +4368,8 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 	const notify = useNotify();
 	const slots = useSlots();
 	const fileExplorerContext = useFileExplorer();
-	const [localStorages, setLocalStorages] = useState(storages);
 	const [listings, setListings] = useState(() => /* @__PURE__ */ new Map());
-	const fetchesInFlightRef = useRef(/* @__PURE__ */ new Set());
-	const listAttemptsRef = useRef(/* @__PURE__ */ new Set());
+	const fetchesInFlightRef = useRef(/* @__PURE__ */ new Map());
 	const incompleteDirsRef = useRef(/* @__PURE__ */ new Set());
 	const incompleteDirs = useMemo(() => {
 		const next = incompletePaths(listings);
@@ -4360,13 +4378,15 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 		incompleteDirsRef.current = next;
 		return next;
 	}, [listings]);
-	const { treeMap, parentToChildrenMap } = useMemo(() => {
-		return buildTreeFromUserStorages(localStorages, {
-			forceUserHierarchy: showUserHierarchy,
-			unsortedParents: incompleteDirs
-		});
-	}, [
-		localStorages,
+	const [buildTree] = useState(createTreeBuilder);
+	const { treeMap, parentToChildrenMap, rootNodes } = useMemo(() => buildTree(storages, {
+		listings,
+		forceUserHierarchy: showUserHierarchy,
+		unsortedParents: incompleteDirs
+	}), [
+		buildTree,
+		storages,
+		listings,
 		showUserHierarchy,
 		incompleteDirs
 	]);
@@ -4427,11 +4447,6 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 	const isUploadSizeExceeded = (size) => {
 		return size > MAX_UPLOAD_SIZE;
 	};
-	const rootNodes = useMemo(() => {
-		const childPaths = /* @__PURE__ */ new Set();
-		for (const children of Object.values(parentToChildrenMap)) for (const child of children) childPaths.add(child.path);
-		return Object.values(treeMap).filter((node) => node.type === "directory" && node.path.endsWith("/") && !childPaths.has(node.path));
-	}, [treeMap, parentToChildrenMap]);
 	const handleToggleExpand = useCallback((path) => {
 		setExpandedPaths((prev) => {
 			const next = new Set(prev);
@@ -4443,7 +4458,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 		setExpandedPaths(new Set([""]));
 	}, []);
 	const getStorageProviderAndClient = async (storageId) => {
-		const storage = localStorages.find((s) => s.id === storageId);
+		const storage = storages.find((s) => s.id === storageId);
 		if (!storage) {
 			notify.error(t.messages.storageUnavailable);
 			return;
@@ -4473,17 +4488,12 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 		const silent = !more && (options?.silent ?? false);
 		const nodeStorageId = node.storageId ?? "";
 		if (!options?.replace && fetchesInFlightRef.current.has(node.path)) return { corsError: false };
-		fetchesInFlightRef.current.add(node.path);
+		const request = silent ? void 0 : {};
+		if (request) fetchesInFlightRef.current.set(node.path, request);
+		const owns = () => request !== void 0 && fetchesInFlightRef.current.get(node.path) === request;
 		if (more) setListings((prev) => beginLoadingMore(prev, node.path));
-		else {
-			if (options?.replace) {
-				setListings((prev) => clearListingsUnder(prev, node.path));
-				forgetPathsUnder(listAttemptsRef.current, node.path);
-			}
-			if (!silent) setLoadingPaths((prev) => new Set(prev).add(node.path));
-		}
+		else if (request) setLoadingPaths((prev) => new Set(prev).add(node.path));
 		const cursor = more ? listings.get(node.path)?.cursor : void 0;
-		const pagesBefore = options?.replace ? 0 : listings.get(node.path)?.pagesLoaded ?? 0;
 		try {
 			const factory = await getStorageProviderAndClient(node.storageId);
 			if (!factory) throw new Error("Failed to connect to storage provider.");
@@ -4493,21 +4503,17 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 				const dir_path = node.root ? "" : node.relativePath ?? "";
 				const input = provider.listDirectoryInput(storage, dir_path, cursor ? { cursor } : {});
 				const objects = await client.listDirectory(input);
-				const newObjects = provider.convertDataToStorageObjects(objects);
+				const entries = provider.convertDataToStorageObjects(objects);
 				const nextCursor = provider.nextPageCursor?.(objects);
-				const updatedStorage = {
-					...storage,
-					objects: nextObjects(storage.objects || [], newObjects, {
-						replace: options?.replace ?? false,
-						dirPath: dir_path
-					})
-				};
-				if (!silent) {
-					setLocalStorages((prev) => prev.map((s) => s.id === storage.id ? updatedStorage : s));
-					setListings((prev) => advanceListing(prev, node.path, nextCursor ? { cursor: nextCursor } : {}, pagesBefore));
+				if (owns()) {
+					const page = {
+						entries,
+						cursor: nextCursor
+					};
+					setListings((prev) => options?.replace ? replaceListing(prev, node.path, page) : advanceListing(prev, node.path, page));
 				}
 			}
-			if (!silent) setHasCorsIssue((prev) => {
+			if (owns()) setHasCorsIssue((prev) => {
 				if (!prev.has(nodeStorageId)) return prev;
 				const next = new Map(prev);
 				next.delete(nodeStorageId);
@@ -4515,26 +4521,23 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 			});
 			return { corsError: false };
 		} catch (error) {
-			const errorMessage = error instanceof CorsError ? error.message || "CORS error" : error instanceof Error ? error.message : "Unknown error";
-			setListings((prev) => recordListingError(prev, node.path, errorMessage));
-			if (error instanceof CorsError) {
-				if (!silent) {
-					const message = `Failed to load contents for ${node?.displayName || node?.name}: ${errorMessage}`;
-					updateConnectionIssuesMessage((prev) => new Map(prev).set(nodeStorageId, message));
-					setHasCorsIssue((prev) => new Map(prev).set(nodeStorageId, true));
-				}
-				return { corsError: true };
+			const isCorsError = error instanceof CorsError;
+			const errorMessage = isCorsError ? error.message || "CORS error" : error instanceof Error ? error.message : "Unknown error";
+			if (owns()) {
+				setListings((prev) => recordListingError(options?.replace ? clearListingsUnder(prev, node.path) : prev, node.path, errorMessage));
+				updateConnectionIssuesMessage((prev) => new Map(prev).set(nodeStorageId, `Failed to load contents for ${node?.displayName || node?.name}: ${errorMessage}`));
+				if (isCorsError) setHasCorsIssue((prev) => new Map(prev).set(nodeStorageId, true));
 			}
-			const message = `Failed to load contents for ${node?.displayName || node?.name}: ${errorMessage}`;
-			updateConnectionIssuesMessage((prev) => new Map(prev).set(nodeStorageId, message));
-			return { corsError: false };
+			return { corsError: isCorsError };
 		} finally {
-			fetchesInFlightRef.current.delete(node.path);
-			if (!more && !silent) setLoadingPaths((prev) => {
-				const next = new Set(prev);
-				next.delete(node.path);
-				return next;
-			});
+			if (owns()) {
+				fetchesInFlightRef.current.delete(node.path);
+				if (!more) setLoadingPaths((prev) => {
+					const next = new Set(prev);
+					next.delete(node.path);
+					return next;
+				});
+			}
 		}
 	});
 	const handleSelectTreeItem = async (path, node) => {
@@ -4556,8 +4559,8 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 			return next;
 		});
 	}, [normalizedSelectedPath]);
-	const [stuckPath, setStuckPath] = useState(null);
-	const hydrationStuck = stuckPath === normalizedSelectedPath;
+	const [stuck, setStuck] = useState(null);
+	const hydrationStuck = stuck?.target === normalizedSelectedPath;
 	const hydrationPagesRef = useRef({
 		path: "",
 		pages: 0
@@ -4577,18 +4580,19 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 			},
 			listings,
 			inFlight: fetchesInFlightRef.current,
-			attempted: listAttemptsRef.current,
 			pagesPulled: hydrationPagesRef.current.pages
 		});
 		if (step.kind === "stuck") {
-			setStuckPath(normalizedSelectedPath);
+			setStuck({
+				target: normalizedSelectedPath,
+				deepest: step.path
+			});
 			return;
 		}
 		if (step.kind === "done") return;
 		const node = treeMap[step.path];
 		if (!node) return;
 		if (step.kind === "fetch") {
-			listAttemptsRef.current.add(step.path);
 			fetchNodeChildren(node);
 			return;
 		}
@@ -4602,8 +4606,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 	useEffect(() => {
 		for (const path of expandedPaths) {
 			const node = treeMap[path];
-			if (node?.type === "directory" && node.storageId && !isListed(listings, path) && !listAttemptsRef.current.has(path) && !fetchesInFlightRef.current.has(path)) {
-				listAttemptsRef.current.add(path);
+			if (node?.type === "directory" && node.storageId && !listings.has(path) && !fetchesInFlightRef.current.has(path)) {
 				fetchNodeChildren(node);
 				return;
 			}
@@ -4806,7 +4809,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 	};
 	const openCreateFolder = async (node) => {
 		if (!isStorageDirectory(node)) return;
-		if (!parentToChildrenMap[node.path]) await fetchNodeChildren(node);
+		if (!isListed(listings, node.path)) await fetchNodeChildren(node);
 		setCreateFolderTarget(node);
 	};
 	const getCreateFolderActions = (node, storage) => {
@@ -4859,15 +4862,11 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 			icon: isFile ? /* @__PURE__ */ jsx(FileTextIcon, {}) : /* @__PURE__ */ jsx(FolderIcon, {}),
 			onSelect: () => handleSelectTreeItem(node.path, node)
 		}];
-		const uriExtras = [{
-			label: "PW URI",
-			value: pwUri,
+		const uriExtras = [pwUri, cspUri].filter((uri) => !!uri).map((value) => ({
+			label: `${getUriScheme(value).toUpperCase()} URI`,
+			value,
 			icon: /* @__PURE__ */ jsx(LinkIcon, {})
-		}, {
-			label: "S3 URI",
-			value: cspUri,
-			icon: /* @__PURE__ */ jsx(LinkIcon, {})
-		}].filter((u) => u.value);
+		}));
 		return assembleRowMenu({
 			lead,
 			actions,
@@ -4921,7 +4920,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 		else if (selectedNode && selectedNode.type === "file") filesToDownload = [selectedNode];
 		if (filesToDownload.length === 0) return "";
 		const commands = filesToDownload.map((node) => {
-			const storage = localStorages.find((s) => s.id === node.storageId);
+			const storage = storages.find((s) => s.id === node.storageId);
 			if (!storage?.user || !storage.name) return "";
 			return `pw buckets cp ${shellSingleQuote(getPwUri(storage.user, storage.name, getObjectKeyFromNode(node)))} ${shellSingleQuote(`./${node.name}`)}`;
 		});
@@ -5053,7 +5052,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 			notify.error(t.messages.uploadUnsupported);
 			return;
 		}
-		const sessionId = fileExplorerContext.addUploadSession(storageName, cleanTargetPath, pendingUpload.uploadNodes, client, provider, targetNode, fetchNodeChildren);
+		const sessionId = fileExplorerContext.addUploadSession(storageName, cleanTargetPath, pendingUpload.uploadNodes, client, provider, targetNode, (node) => fetchNodeChildren(node, { replace: true }));
 		const sessionQueueIndex = fileExplorerContext.getUploadQueueIndex(sessionId);
 		if (sessionQueueIndex === -1) {
 			notify.update(sessionId, {
@@ -5181,12 +5180,13 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 					children: !selectedNode && normalizedSelectedPath ? hydrationStuck ? /* @__PURE__ */ jsx(NotFoundPreview, {
 						path: normalizedSelectedPath,
 						onRetry: () => {
-							listAttemptsRef.current.clear();
+							const deepest = stuck?.deepest;
 							hydrationPagesRef.current = {
 								path: "",
 								pages: 0
 							};
-							setStuckPath(null);
+							setStuck(null);
+							if (deepest) setListings((prev) => hasMore(prev, deepest) ? clearListingError(prev, deepest) : clearListingsUnder(prev, deepest));
 						}
 					}) : /* @__PURE__ */ jsx(ListSkeleton, {}) : !selectedNode && showUserHierarchy ? /* @__PURE__ */ jsxs("div", {
 						className: "overflow-auto h-full",
@@ -5391,7 +5391,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 										onSelectAll: handleBatchCheckbox
 									})
 								}), /* @__PURE__ */ jsx(NoDataAvailablePreview, {
-									selectedStorage: localStorages.find((s) => s.id === selectedNode.storageId) || null,
+									selectedStorage: storages.find((s) => s.id === selectedNode.storageId) || null,
 									canWrite: selectedNodeCanWrite,
 									onRefresh: handleRefresh,
 									error: hasCorsIssue.get(selectedNode.storageId ?? "") ? new CorsError(connectionIssuesMessage.get(selectedNode.storageId ?? "") || "") : null,
@@ -5424,7 +5424,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 									})]
 								}), effectiveTab === "preview" && previewable ? /* @__PURE__ */ jsx(FilePreviewInline, {
 									node: selectedNode,
-									storage: localStorages.find((s) => s.id === selectedNode.storageId) ?? null,
+									storage: storages.find((s) => s.id === selectedNode.storageId) ?? null,
 									getPresignedUrl,
 									onOpenFull: openPreview,
 									onDownload: downloadNode,
@@ -5551,7 +5551,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 				open: previewOpen,
 				node: previewNode,
 				siblings: previewSiblings,
-				storage: localStorages.find((s) => s.id === previewNode?.storageId) ?? null,
+				storage: storages.find((s) => s.id === previewNode?.storageId) ?? null,
 				getPresignedUrl,
 				onNavigate: setPreviewNode,
 				onClose: closePreview,
@@ -5658,7 +5658,7 @@ function FileExplorer({ storages, onRefresh, refreshKey, onOpenFile, showUserHie
 				open: accessDrawerOpen,
 				setOpen: setAccessDrawerOpen,
 				groups,
-				storage: localStorages.find((s) => s.id === selectedNode.storageId)
+				storage: storages.find((s) => s.id === selectedNode.storageId)
 			})
 		]
 	});