@youtyan/code-viewer 0.8.4 → 0.8.5

package/dist/code-viewer.js

@@ -26494,7 +26494,7 @@ async function handleUploadFiles(req) {
       return text("file exists", 409);
     return text("upload failed", 500);
   }
-  triggerUpdate();
+  triggerUpdate(uploads.map((upload) => dir ? `${dir}/${upload.name}` : upload.name));
   return json2({
     ok: true,
     files: uploads.map((upload) => upload.name),
@@ -26727,6 +26727,12 @@ async function handleTrashPath(req) {
   const originalFullPath = safeWorktreePath2(path);
   if (!originalFullPath)
     return text("not found", 404);
+  let changedPaths;
+  try {
+    const stats = statSync6(originalFullPath);
+    if (!stats.isDirectory())
+      changedPaths = [path];
+  } catch {}
   const moved = await movePathToTrash(worktreePath(path));
   if (!moved.ok)
     return text(moved.error || "trash failed", 500);
@@ -26739,7 +26745,7 @@ async function handleTrashPath(req) {
       trashPath: moved.trashPath
     }
   };
-  triggerUpdate();
+  triggerUpdate(changedPaths);
   return json2({ ok: true, generation, undo });
 }
 async function handleCreateDirectory(req) {
@@ -26792,7 +26798,7 @@ async function handleCreateDirectory(req) {
       return text("already exists", 409);
     return text("create failed", 500);
   }
-  triggerUpdate();
+  triggerUpdate([targetPath]);
   return json2({ ok: true, path: targetPath, generation });
 }
 async function handleRestoreTrash(req) {
@@ -26824,7 +26830,13 @@ async function handleRestoreTrash(req) {
   const restored = await restoreTrashPath(originalPath, trashPath || undefined);
   if (!restored.ok)
     return text(restored.error || "undo failed", 409);
-  triggerUpdate();
+  let changedPaths;
+  try {
+    const stats = statSync6(worktreePath(originalPath));
+    if (!stats.isDirectory())
+      changedPaths = [originalPath];
+  } catch {}
+  triggerUpdate(changedPaths);
   return json2({ ok: true, generation });
 }
 function annotationSse(kind, sessionId, entryId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youtyan/code-viewer",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "Local browser-based code and git diff viewer",
   "type": "module",
   "bin": {

package/web/app.js

@@ -22945,15 +22945,16 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
   function shouldRenderDiffSidebar(listSame, domIntact) {
     return !listSame || !domIntact;
   }
-  function findDirectDiffCardByKey(target, key) {
+  function collectDiffCardsByKey(target) {
+    const cards = new Map;
     for (const child of Array.from(target.children)) {
       if (!child.classList.contains("gdp-file-shell"))
         continue;
       const card = child;
-      if (card.dataset.key === key)
-        return card;
+      if (card.dataset.key)
+        cards.set(card.dataset.key, card);
     }
-    return null;
+    return cards;
   }
   function createDiffView(deps) {
     const {
@@ -23354,21 +23355,16 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         enqueueLoad(file, card, 0);
       }
     }
-    function invalidateLoadedCard(card, file, changedPaths) {
+    function invalidateLoadedCard(card, file, changedPaths, measuredHeight) {
       if (!card.classList.contains("loaded") && !card.classList.contains("loading"))
         return false;
       if (changedPaths && !changedPaths.has(file.path))
         return false;
       card.dataset.reqId = String(++CLIENT_REQ_SEQ);
+      card.style.minHeight = `${measuredHeight ?? card.offsetHeight}px`;
       card.classList.remove("loaded", "loading", "error");
       card.classList.add("pending");
       card._diffData = null;
-      const body = card.querySelector(".gdp-shell-body");
-      if (body)
-        body.innerHTML = "";
-      const head = card.querySelector(".gdp-shell-header");
-      if (head)
-        head.style.display = "";
       const indicator = card.querySelector(".loading-indicator");
       if (indicator)
         indicator.hidden = false;
@@ -23459,6 +23455,14 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       let invalidatedCards = 0;
       if (listSame && domIntact) {
         const pathsUnknown2 = !changedPaths;
+        const cardsByKey = collectDiffCardsByKey(target);
+        const measuredHeights = new Map;
+        for (const f2 of newFiles) {
+          const key = fileKey(f2);
+          const card = cardsByKey.get(key);
+          if (card && (card.classList.contains("loaded") || card.classList.contains("loading")))
+            measuredHeights.set(key, card.offsetHeight);
+        }
         let sidebarNeedsStatsUpdate = false;
         for (const f2 of newFiles) {
           const key = fileKey(f2);
@@ -23469,7 +23473,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           if (!sigChanged && !pathHint) {
             continue;
           }
-          const card = findDirectDiffCardByKey(target, key);
+          const card = cardsByKey.get(key);
           if (!card)
             continue;
           const sizeChanged = card.dataset.sizeClass !== (f2.size_class || "small");
@@ -23485,7 +23489,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
               stats.innerHTML = '<span class="a">+' + (f2.additions || 0) + "</span>" + '<span class="d">−' + (f2.deletions || 0) + "</span>";
             }
             card._file = f2;
-            const didInvalidate = sigChanged ? invalidateLoadedCard(card, f2, null) : invalidateLoadedCard(card, f2, changedPaths);
+            const didInvalidate = sigChanged ? invalidateLoadedCard(card, f2, null, measuredHeights.get(key)) : invalidateLoadedCard(card, f2, changedPaths, measuredHeights.get(key));
             if (didInvalidate)
               invalidatedCards++;
             else if ((sigChanged || pathHint) && card.classList.contains("pending")) {
@@ -23513,11 +23517,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       }
       if (sidebarNeedsRender && canUpdateSidebar)
         renderSidebar(newFiles);
-      const oldByKey = new Map;
-      target.querySelectorAll(".gdp-file-shell").forEach((c2) => {
-        if (c2.dataset.key)
-          oldByKey.set(c2.dataset.key, c2);
-      });
+      const oldByKey = collectDiffCardsByKey(target);
       const ordered = [];
       for (const f2 of newFiles) {
         const key = fileKey(f2);
@@ -23790,6 +23790,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           return;
         card.classList.remove("loading");
         card.classList.add("error");
+        card.style.minHeight = "";
         const body = card.querySelector(".gdp-shell-body");
         if (!body)
           return;
@@ -23850,6 +23851,8 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     }
     function setFileCollapsed(card, collapsed) {
       card.classList.toggle("gdp-file-collapsed", collapsed);
+      if (collapsed)
+        card.style.minHeight = "";
       card.querySelectorAll(".d2h-files-diff, .d2h-file-diff, .gdp-source-viewer, .gdp-media").forEach((body) => {
         body.classList.toggle("d2h-d-none", collapsed);
       });
@@ -30565,6 +30568,7 @@ code-viewer query agent-help`
     let SIDEBAR_TREE_ITEMS_CACHE = new WeakMap;
     const SIDEBAR_LAZY_LOADED_DIRS = new Set;
     const SIDEBAR_LAZY_LOADING_DIRS = new Map;
+    const SIDEBAR_LAZY_DIR_SIGNATURES = new Map;
     function savedSidebarFontSize() {
       return normalizeViewerFontSize(getSidebarFontSize());
     }
@@ -30930,37 +30934,40 @@ code-viewer query agent-help`
       if (SIDEBAR_TREE_ROOT)
         buildSidebarTreeRows(SIDEBAR_TREE_ROOT);
     }
-    function ensureVirtualSidebarDirLoaded(dir) {
-      if (!shouldLazyLoadSidebarDir(dir))
-        return Promise.resolve();
-      const existing = SIDEBAR_LAZY_LOADING_DIRS.get(dir.path);
-      if (existing)
-        return existing;
+    function fetchSidebarDirEntries(dir) {
       const params = new URLSearchParams;
       params.set("ref", getRepoSidebarRef() || "worktree");
       params.set("path", dir.path);
       appendScopeParams(params);
-      const load = trackLoad(fetch(`/_tree?${params.toString()}`).then((response) => {
+      return trackLoad(fetch(`/_tree?${params.toString()}`).then((response) => {
         if (!response.ok)
           throw new Error("failed to load repository tree");
         return response.json();
-      })).then((meta) => {
-        const entries = meta.entries.map((entry, index) => ({
-          order: dir.minOrder + (index + 1) / 1e5,
-          path: entry.path,
-          display_path: entry.path,
-          type: meta.ref === "worktree" && entry.type === "commit" && !entry.submodule ? "tree" : entry.type,
-          submodule: entry.submodule,
-          children_omitted: entry.children_omitted,
-          children_omitted_reason: entry.children_omitted_reason,
-          is_symlink: entry.is_symlink,
-          symlink_target: entry.symlink_target,
-          symlink_target_type: entry.symlink_target_type,
-          resolved_path: entry.resolved_path,
-          status: entry.status
-        }));
+      })).then((meta) => meta.entries.map((entry, index) => ({
+        order: dir.minOrder + (index + 1) / 1e5,
+        path: entry.path,
+        display_path: entry.path,
+        type: meta.ref === "worktree" && entry.type === "commit" && !entry.submodule ? "tree" : entry.type,
+        submodule: entry.submodule,
+        children_omitted: entry.children_omitted,
+        children_omitted_reason: entry.children_omitted_reason,
+        is_symlink: entry.is_symlink,
+        symlink_target: entry.symlink_target,
+        symlink_target_type: entry.symlink_target_type,
+        resolved_path: entry.resolved_path,
+        status: entry.status
+      })));
+    }
+    function ensureVirtualSidebarDirLoaded(dir) {
+      if (!shouldLazyLoadSidebarDir(dir))
+        return Promise.resolve();
+      const existing = SIDEBAR_LAZY_LOADING_DIRS.get(dir.path);
+      if (existing)
+        return existing;
+      const load = fetchSidebarDirEntries(dir).then((entries) => {
         mergeSidebarTreeEntries(entries);
         SIDEBAR_LAZY_LOADED_DIRS.add(dir.path);
+        SIDEBAR_LAZY_DIR_SIGNATURES.set(dir.path, sidebarItemsSignature(entries));
       }).finally(() => {
         SIDEBAR_LAZY_LOADING_DIRS.delete(dir.path);
       });
@@ -31363,6 +31370,102 @@ code-viewer query agent-help`
       };
       visit(root);
     }
+    function sidebarItemsSignature(items) {
+      return items.map((f2) => [
+        f2.path,
+        f2.type || "blob",
+        f2.status || "",
+        f2.children_omitted ? 1 : 0,
+        f2.children_omitted_reason || "",
+        f2.is_symlink ? 1 : 0,
+        f2.symlink_target || "",
+        f2.resolved_path || "",
+        f2.submodule ? 1 : 0
+      ].join("\x00")).join(`
+`);
+    }
+    function findSidebarTreeDir(node, path) {
+      if (node.path === path)
+        return node;
+      for (const child of Object.values(node.dirs)) {
+        if (path === child.path || path.startsWith(`${child.path}/`))
+          return findSidebarTreeDir(child, path);
+      }
+      return null;
+    }
+    function graftLoadedSidebarDirs(oldRoot, newRoot) {
+      const scope = newRoot.path ? `${newRoot.path}/` : "";
+      const paths = [...SIDEBAR_LAZY_LOADED_DIRS].filter((p2) => p2 !== newRoot.path && (!scope || p2.startsWith(scope))).sort((a2, b2) => a2.length - b2.length);
+      for (const path of paths) {
+        const oldNode = findSidebarTreeDir(oldRoot, path);
+        const newNode = findSidebarTreeDir(newRoot, path);
+        if (!oldNode || !newNode || newNode.children_omitted) {
+          SIDEBAR_LAZY_LOADED_DIRS.delete(path);
+          SIDEBAR_LAZY_DIR_SIGNATURES.delete(path);
+          continue;
+        }
+        if (sidebarTreeNodeHasChildren(newNode))
+          continue;
+        newNode.dirs = oldNode.dirs;
+        newNode.files = oldNode.files;
+      }
+    }
+    function applySidebarDirEntries(dir, entries) {
+      const signature = sidebarItemsSignature(entries);
+      if (SIDEBAR_LAZY_DIR_SIGNATURES.get(dir.path) === signature)
+        return false;
+      SIDEBAR_LAZY_DIR_SIGNATURES.set(dir.path, signature);
+      const oldSubtree = { ...dir };
+      dir.dirs = {};
+      dir.files = [];
+      for (const entry of entries)
+        upsertSidebarTreeEntry(entry, entry.order ?? 0);
+      graftLoadedSidebarDirs(oldSubtree, dir);
+      return true;
+    }
+    function rebuildVirtualSidebarRows() {
+      if (!SIDEBAR_TREE_ROOT)
+        return;
+      SIDEBAR_TREE_ITEMS_CACHE = new WeakMap;
+      buildSidebarTreeRows(SIDEBAR_TREE_ROOT);
+      rerenderVirtualSidebar();
+      if (STATE.activeFile)
+        markActive(STATE.activeFile);
+      applyFilter();
+    }
+    async function refreshRepoSidebarTree(rootFiles) {
+      if (!isRepositorySidebarMode() || !isVirtualSidebarActive())
+        return;
+      if (!SIDEBAR_TREE_ROOT)
+        return;
+      if (sidebarItemsSignature(rootFiles) !== sidebarItemsSignature(SIDEBAR_FILES)) {
+        const newRoot = buildTree(rootFiles);
+        graftLoadedSidebarDirs(SIDEBAR_TREE_ROOT, newRoot);
+        SIDEBAR_FILES = rootFiles;
+        SIDEBAR_TREE_ROOT = newRoot;
+        rebuildVirtualSidebarRows();
+      }
+      const root = SIDEBAR_TREE_ROOT;
+      const refreshed = await Promise.all([...SIDEBAR_LAZY_LOADED_DIRS].map(async (path) => {
+        const node = findSidebarTreeDir(root, path);
+        if (!node)
+          return null;
+        const entries = await fetchSidebarDirEntries(node).catch(() => null);
+        return entries ? { path, entries } : null;
+      }));
+      if (SIDEBAR_TREE_ROOT !== root)
+        return;
+      let childrenChanged = false;
+      for (const result of refreshed) {
+        if (!result)
+          continue;
+        const node = findSidebarTreeDir(root, result.path);
+        if (node && applySidebarDirEntries(node, result.entries))
+          childrenChanged = true;
+      }
+      if (childrenChanged)
+        rebuildVirtualSidebarRows();
+    }
     function renderFlat(files, ul, onFileClick) {
       files.forEach((f2, i2) => {
         const li = document.createElement("li");
@@ -31426,6 +31529,7 @@ code-viewer query agent-help`
       SIDEBAR_ROW_BY_PATH = new Map;
       SIDEBAR_LAZY_LOADED_DIRS.clear();
       SIDEBAR_LAZY_LOADING_DIRS.clear();
+      SIDEBAR_LAZY_DIR_SIGNATURES.clear();
       if (!onFileClick)
         STATE.files = files;
       SIDEBAR_FILES = files;
@@ -31546,7 +31650,8 @@ code-viewer query agent-help`
       setActiveSidebarItem(sidebarItemByPath(path));
       if ($("#filelist").classList.contains("tree-virtual")) {
         renderVirtualSidebarWindow();
-        scrollVirtualSidebarPathIntoView(path);
+        if (options.reveal)
+          scrollVirtualSidebarPathIntoView(path);
         return;
       }
       if (options.reveal) {
@@ -31972,6 +32077,7 @@ code-viewer query agent-help`
     }
     return {
       renderSidebar,
+      refreshRepoSidebarTree,
       applyFilter,
       scheduleApplyFilter,
       flushSidebarFilter,
@@ -32041,6 +32147,7 @@ code-viewer query agent-help`
       markActive,
       applyFilter,
       renderSidebar,
+      refreshRepoSidebarTree,
       rerenderVirtualSidebar,
       ensureVirtualSidebarDirLoaded,
       scrollVirtualSidebarPathIntoView,
@@ -32436,18 +32543,26 @@ code-viewer query agent-help`
       });
       return nav;
     }
+    let REPO_RENDER_SIGNATURE = "";
+    let REPO_RENDER_SEQ = 0;
+    let REPO_RENDER_LOCATION = "";
     async function renderRepo(meta) {
+      const myRender = ++REPO_RENDER_SEQ;
       setProjectName(meta.project || "");
       setPageMode();
       removeStandaloneSource();
       $("#empty").classList.add("hidden");
-      $("#diff").replaceChildren();
       if (!isRepoSidebarReusable(meta.ref))
         $("#totals").textContent = "";
       STATE.files = [];
       clearLoadQueue();
       renderRepoBlobSidebar(meta.path || "", meta.ref);
       const target = $("#diff");
+      const signature = JSON.stringify(meta);
+      if (signature === REPO_RENDER_SIGNATURE && target.querySelector(":scope > .gdp-repo-shell")) {
+        placeSidebarToggle();
+        return;
+      }
       const shell = document.createElement("section");
       shell.className = "gdp-repo-shell";
       const toolbar = document.createElement("div");
@@ -32606,9 +32721,33 @@ code-viewer query agent-help`
         readme.appendChild(wrapper);
         shell.appendChild(readme);
       }
-      target.appendChild(shell);
+      if (myRender !== REPO_RENDER_SEQ || !isActiveRepoRoute(meta.ref || "worktree", meta.path || ""))
+        return;
+      REPO_RENDER_SIGNATURE = signature;
+      const location2 = `${meta.ref || "worktree"}\x00${meta.path || ""}`;
+      const sameLocation = location2 === REPO_RENDER_LOCATION;
+      REPO_RENDER_LOCATION = location2;
+      const savedScroll = window.scrollY;
+      target.replaceChildren(shell);
+      window.scrollTo(0, sameLocation ? savedScroll : 0);
       placeSidebarToggle();
     }
+    function repoTreeEntriesToSidebarItems(entries, ref) {
+      return entries.map((entry, index) => ({
+        order: index + 1,
+        path: entry.path,
+        display_path: entry.path,
+        type: canBrowseRepoEntry(entry, ref) ? "tree" : entry.type,
+        submodule: entry.submodule,
+        children_omitted: entry.children_omitted,
+        children_omitted_reason: entry.children_omitted_reason,
+        is_symlink: entry.is_symlink,
+        symlink_target: entry.symlink_target,
+        symlink_target_type: entry.symlink_target_type,
+        resolved_path: entry.resolved_path,
+        status: entry.status
+      }));
+    }
     function renderRepoBlobSidebar(currentPath, ref) {
       syncRepoTargetInput(ref);
       const normalizedRef = ref || "worktree";
@@ -32639,20 +32778,7 @@ code-viewer query agent-help`
       })).then(async (meta) => {
         if (!isActiveRepoTreeRef(normalizedRef))
           return;
-        const files = meta.entries.map((entry, index) => ({
-          order: index + 1,
-          path: entry.path,
-          display_path: entry.path,
-          type: canBrowseRepoEntry(entry, normalizedRef) ? "tree" : entry.type,
-          submodule: entry.submodule,
-          children_omitted: entry.children_omitted,
-          children_omitted_reason: entry.children_omitted_reason,
-          is_symlink: entry.is_symlink,
-          symlink_target: entry.symlink_target,
-          symlink_target_type: entry.symlink_target_type,
-          resolved_path: entry.resolved_path,
-          status: entry.status
-        }));
+        const files = repoTreeEntriesToSidebarItems(meta.entries, normalizedRef);
         setRepoSidebarRef(normalizedRef);
         renderSidebar(files, (file) => {
           if (file.type === "tree") {
@@ -32700,15 +32826,17 @@ code-viewer query agent-help`
         rerenderVirtualSidebar();
     }
     async function activateRepoSidebarPath(currentPath) {
+      const reveal = getSidebarVirtualActivePath() !== currentPath;
       await loadRepoSidebarAncestors(currentPath);
-      markActive(currentPath, { reveal: true });
+      markActive(currentPath, { reveal });
       applyFilter();
       const row = getSidebarRowByPath(currentPath);
       if (row?.kind === "dir" && row.dir && shouldLazyLoadSidebarDir(row.dir))
         ensureVirtualSidebarDirLoaded(row.dir).then(() => {
           if (getSidebarVirtualActivePath() === currentPath) {
             rerenderVirtualSidebar();
-            scrollVirtualSidebarPathIntoView(currentPath);
+            if (reveal)
+              scrollVirtualSidebarPathIntoView(currentPath);
           }
         });
     }
@@ -32959,6 +33087,42 @@ code-viewer query agent-help`
     }
     let REPO_SIDEBAR_LOAD_REF = null;
     let REPO_SIDEBAR_LOAD = null;
+    let REPO_SIDEBAR_REFRESHING = false;
+    let REPO_SIDEBAR_REFRESH_QUEUED = false;
+    async function refreshRepoSidebar() {
+      const ref = activeRepoTreeRef();
+      if (ref == null)
+        return;
+      if (!isRepoSidebarReusable(ref)) {
+        invalidateRepoSidebar();
+        await renderRepoBlobSidebar(STATE.route.screen === "repo" ? STATE.route.path || "" : "", ref);
+        return;
+      }
+      if (REPO_SIDEBAR_REFRESHING) {
+        REPO_SIDEBAR_REFRESH_QUEUED = true;
+        return;
+      }
+      REPO_SIDEBAR_REFRESHING = true;
+      try {
+        const params = new URLSearchParams;
+        params.set("ref", ref);
+        appendScopeParams(params);
+        const meta = await trackLoad(fetch(`/_tree?${params.toString()}`).then((r2) => {
+          if (!r2.ok)
+            throw new Error("failed to load repository tree");
+          return r2.json();
+        }));
+        if (!isActiveRepoTreeRef(ref) || !isRepoSidebarReusable(ref))
+          return;
+        await refreshRepoSidebarTree(repoTreeEntriesToSidebarItems(meta.entries, ref));
+      } catch {} finally {
+        REPO_SIDEBAR_REFRESHING = false;
+        if (REPO_SIDEBAR_REFRESH_QUEUED) {
+          REPO_SIDEBAR_REFRESH_QUEUED = false;
+          refreshRepoSidebar();
+        }
+      }
+    }
     return {
       loadRepo,
       createFileDetailMeta,
@@ -32972,6 +33136,7 @@ code-viewer query agent-help`
       handleSidebarContextMenu,
       fileEntryIcon,
       invalidateRepoSidebar,
+      refreshRepoSidebar,
       showTrashError
     };
   }
@@ -35989,6 +36154,7 @@ code-viewer query agent-help`
     });
     const {
       renderSidebar,
+      refreshRepoSidebarTree,
       applyFilter,
       scheduleApplyFilter,
       flushSidebarFilter,
@@ -36105,6 +36271,7 @@ code-viewer query agent-help`
       markActive,
       applyFilter,
       renderSidebar,
+      refreshRepoSidebarTree,
       rerenderVirtualSidebar,
       ensureVirtualSidebarDirLoaded,
       scrollVirtualSidebarPathIntoView,
@@ -36169,6 +36336,7 @@ code-viewer query agent-help`
       closeRepoContextMenu,
       handleSidebarContextMenu,
       invalidateRepoSidebar,
+      refreshRepoSidebar,
       showTrashError
     } = REPO_VIEW;
     const SEARCH_PALETTE = createSearchPalette({
@@ -39218,8 +39386,8 @@ code-viewer query agent-help`
         return;
       }
       if (route.screen === "repo") {
-        invalidateRepoSidebar();
         loadRepo();
+        refreshRepoSidebar();
         return;
       }
       if (route.screen !== "diff" && route.screen !== "history") {