@youtyan/code-viewer 0.8.6 → 0.8.7

package/dist/code-viewer.js

@@ -1449,18 +1449,13 @@ function resolveGitArgs(args) {
   return [commandForExternal("git"), ...args.slice(1)];
 }
 function gitFailureMessage(res, fallback) {
-  if (isCommandNotFoundResult("git", res))
-    return commandNotFoundDetail("git");
-  return res.stderr?.trim() || fallback;
+  const message = isCommandNotFoundResult("git", res) ? commandNotFoundDetail("git") : res.stderr?.trim() || fallback;
+  console.error(`[code-viewer] ${fallback} (git exit ${res.code}): ${message}`);
+  return message;
 }
 function gitFailureResult(res, fallback) {
-  if (!isCommandNotFoundResult("git", res)) {
-    return { error: fallback };
-  }
-  return {
-    error: commandNotFoundDetail("git"),
-    status: 503
-  };
+  const error = gitFailureMessage(res, fallback);
+  return isCommandNotFoundResult("git", res) ? { error, status: 503 } : { error };
 }
 function runGitRefLookup(args, cwd) {
   const res = run(args, cwd);
@@ -2534,10 +2529,19 @@ async function untrackedMetaAsync(cwd) {
   return results.filter((meta) => meta !== null);
 }
 async function fileMetaResultAsync(args, cwd, includeUntracked = false) {
-  const ns = await nameStatusResultAsync(args, cwd);
+  let ns;
+  let nm;
+  if (args.includes("--")) {
+    [ns, nm] = await Promise.all([
+      nameStatusResultAsync(args, cwd),
+      numstatZResultAsync(args, cwd)
+    ]);
+  } else {
+    ns = await nameStatusResultAsync(args, cwd);
+    nm = await numstatZResultAsync(args, cwd);
+  }
   if (ns.error)
     return { files: [], error: ns.error };
-  const nm = await numstatZResultAsync(args, cwd);
   if (nm.error)
     return { files: [], error: nm.error };
   const byPath = new Map(nm.files.map((file) => [file.path, file]));
@@ -15054,6 +15058,7 @@ function startWorktreeUpdateWatch(options) {
   const initialScanAsync = options.initialScanMode === "async" || (!options.watch || options.watch === nodeWatch) && !options.readdirSync;
   const initialScanQueue = [];
   let initialScanTimer = null;
+  let processingInitialScan = false;
   const pendingPathInspections = new Map;
   let pathInspectionTimer = null;
   let timer = null;
@@ -15141,8 +15146,14 @@ function startWorktreeUpdateWatch(options) {
       return;
     }
     const next = initialScanQueue.shift();
-    if (next)
-      watchDirectory(next, true);
+    if (next) {
+      processingInitialScan = true;
+      try {
+        watchDirectory(next, true);
+      } finally {
+        processingInitialScan = false;
+      }
+    }
     if (watchers.size >= maxWatchedDirectories) {
       reportWatchLimit();
       initialScanQueue.length = 0;
@@ -15160,7 +15171,7 @@ function startWorktreeUpdateWatch(options) {
     if (children.length > remaining)
       reportWatchLimit();
     initialScanQueue.push(...children.slice(0, remaining));
-    if (!initialScanTimer)
+    if (!initialScanTimer && !processingInitialScan)
       initialScanTimer = setTimer(processInitialScanQueue, 5000);
   };
   const processChangedPath = (changed, fullChangedPath) => {
@@ -24819,7 +24830,7 @@ function buildQuery(params) {
   const s = q.toString();
   return s ? `?${s}` : "";
 }
-function fileToMeta(file, range, extraQs) {
+function fileToMeta(file, range, extraQs, responseGeneration) {
   const sizeClass = classify(file);
   const q = {
     path: file.path,
@@ -24827,6 +24838,7 @@ function fileToMeta(file, range, extraQs) {
     status: file.status,
     from: range.from,
     to: range.to,
+    generation: responseGeneration,
     ...extraQs
   };
   if (file.untracked)
@@ -24865,7 +24877,7 @@ async function computePayload(extras, range, pathFilter = "", responseGeneration
     };
   }
   const { args, refs } = buildRangeArgs(range);
-  const fullArgs = [...extras, ...args];
+  const fullArgs = pathFilter ? [...extras, ...args, "--", pathFilter] : [...extras, ...args];
   const metaResult = await fileMetaResultAsync(fullArgs, cwd, false);
   const files = metaResult.files;
   if (!metaResult.error && includeUntracked(range, refs)) {
@@ -24883,7 +24895,7 @@ async function computePayload(extras, range, pathFilter = "", responseGeneration
     if (e === "--ignore-blank-lines")
       extraQs.ignore_blank = "1";
   }
-  const meta = filteredFiles.map((file) => fileToMeta(file, range, extraQs));
+  const meta = filteredFiles.map((file) => fileToMeta(file, range, extraQs, responseGeneration));
   const totals = meta.reduce((acc, file) => {
     acc.additions += file.additions || 0;
     acc.deletions += file.deletions || 0;
@@ -24902,7 +24914,7 @@ async function computePayload(extras, range, pathFilter = "", responseGeneration
   };
 }
 async function handleDiffJson(url) {
-  const responseGeneration = generation;
+  let responseGeneration = generation;
   const extras = [];
   if (url.searchParams.get("ignore_ws") === "1")
     extras.push("-w");
@@ -24928,9 +24940,15 @@ async function handleDiffJson(url) {
   const requestSequence = ++diffMetaRequestSequence;
   latestDiffMetaRequest.set(key, requestSequence);
   try {
-    const payload = await computePayload(extras, range, path, responseGeneration);
-    if (latestDiffMetaRequest.get(key) !== requestSequence || responseGeneration !== generation)
+    let payload = await computePayload(extras, range, path, responseGeneration);
+    if (latestDiffMetaRequest.get(key) !== requestSequence)
       return json2(payload);
+    if (responseGeneration !== generation) {
+      responseGeneration = generation;
+      payload = await computePayload(extras, range, path, responseGeneration);
+      if (latestDiffMetaRequest.get(key) !== requestSequence || responseGeneration !== generation)
+        return json2(payload);
+    }
     const sig = JSON.stringify({ ...payload, generation: undefined });
     if (noCache && (!cached || cached.sig !== sig)) {
       generation++;
@@ -25399,7 +25417,7 @@ async function handleFileBlame(url) {
   return json2({ ...result, base, ref, generation: responseGeneration });
 }
 async function handleFileDiff(url) {
-  const responseGeneration = generation;
+  const serverGenerationAtRequest = generation;
   const path = url.searchParams.get("path") || "";
   if (!safePath(path))
     return text("invalid path", 400);
@@ -25413,6 +25431,9 @@ async function handleFileDiff(url) {
     from: url.searchParams.get("from") || "",
     to: url.searchParams.get("to") || ""
   };
+  const requestedGeneration = Number(url.searchParams.get("generation"));
+  const usesWorktree = !range.from || range.from === "worktree" || !range.to || range.to === "worktree";
+  const responseGeneration = !usesWorktree && Number.isSafeInteger(requestedGeneration) && requestedGeneration > 0 ? requestedGeneration : serverGenerationAtRequest;
   if (isSameWorktreeRange(range)) {
     return json2({
       path,
@@ -25466,7 +25487,7 @@ async function handleFileDiff(url) {
         errStatus = res.status ?? 500;
       }
     }
-    if (!errText && responseGeneration === generation)
+    if (!errText && serverGenerationAtRequest === generation)
       setTimedCacheEntry(fileCache, cacheKey, { diffText });
   }
   if (errStatus)

package/package.json

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

package/web/app.js

@@ -227,6 +227,8 @@ ${lines.join(`
   function shouldAutoLoadForRoute(route, options = {}) {
     if (route.screen === "history")
       return options.historyWorktreeSelected === true;
+    if (route.screen === "diff")
+      return !route.range.from || route.range.from === "worktree" || !route.range.to || route.range.to === "worktree";
     if (route.screen === "database" || route.screen === "journal" || route.screen === "help" || route.screen === "unknown")
       return false;
     return true;
@@ -9791,14 +9793,18 @@ ${frontmatter.yaml}
     sticky.appendChild(tabsHost);
     return { sticky, header, tabsHost };
   }
-  function mountFileShellCard(deps, target, card, repoTarget = deps.repoFileTargetFromRoute()) {
+  function mountFileShellCard(deps, target, card, repoTarget = deps.repoFileTargetFromRoute(), options = {}) {
     const root = deps.$("#diff");
     if (repoTarget) {
       const layout = document.createElement("div");
       layout.className = "gdp-repo-blob-layout";
       layout.appendChild(card);
       root.prepend(layout);
-      Promise.resolve(deps.renderRepoBlobSidebar(target.path, repoTarget)).catch(() => {}).finally(() => deps.placeSidebarToggle());
+      if (options.loadSidebar !== false) {
+        Promise.resolve(deps.renderRepoBlobSidebar(target.path, repoTarget)).catch((error2) => {
+          console.error("[code-viewer] failed to load repository sidebar", error2);
+        }).finally(() => deps.placeSidebarToggle());
+      }
     } else {
       root.prepend(card);
     }
@@ -23773,7 +23779,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         if (fresh && card.isConnected)
           enqueueLoad(fresh, card, 0);
       };
-      return trackLoad(fetch(url).then(async (r2) => {
+      const request = trackLoad(fetch(url).then(async (r2) => {
         if (!r2.ok)
           throw new Error(await r2.text());
         return r2.json();
@@ -23793,9 +23799,10 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         if (String(myReq) !== card.dataset.reqId)
           return;
         renderFile(file, data, card);
-      }).catch(() => {
+      }).catch((error2) => {
         if (String(myReq) !== card.dataset.reqId)
           return;
+        console.error("[code-viewer] failed to load diff", error2);
         card.classList.remove("loading");
         card.classList.add("error");
         card.style.minHeight = "";
@@ -23812,13 +23819,24 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
             enqueueLoad(file, card, 1);
           });
       });
+      const completed = request.finally(() => {
+        if (card._loadPromise === completed)
+          delete card._loadPromise;
+      });
+      card._loadPromise = completed;
+      return completed;
     }
     async function loadDiffFile(path) {
-      const card = document.querySelector(diffCardSelector(path));
+      const root = getDiffRoot?.() || document;
+      const card = root.querySelector(diffCardSelector(path));
       if (!card || card.classList.contains("gdp-standalone-source"))
         return false;
       if (card.classList.contains("loaded"))
         return true;
+      if (card.classList.contains("loading") && card._loadPromise) {
+        await card._loadPromise;
+        return card.classList.contains("loaded");
+      }
       const file = card._file || STATE.files.find((x) => x.path === path);
       if (!file)
         return false;
@@ -25609,7 +25627,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       (el.closest(".gdp-repo-blob-layout") || el).remove();
     });
   }
-  function renderFileHistoryShell(deps, route) {
+  function renderFileHistoryShell(deps, route, options = {}) {
     removeFileHistoryShell();
     const target = { path: route.path, ref: route.ref };
     const card = document.createElement("article");
@@ -25645,7 +25663,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     body.appendChild(embed);
     wrapper.appendChild(body);
     card.appendChild(wrapper);
-    mountFileShellCard(deps, target, card, target.ref);
+    mountFileShellCard(deps, target, card, target.ref, options);
     return {
       ...panelDom,
       commitInfo,
@@ -30161,14 +30179,34 @@ code-viewer query agent-help`
     if (!popBody || !popSearch)
       return;
     let popTarget = null;
+    let refsLoaded = false;
+    let refsLoading = false;
+    let refsError = false;
+    let refsInFlight = null;
     function fetchRefs() {
-      return fetch("/_refs").then((r2) => r2.json()).then((refs) => {
+      if (refsLoaded)
+        return Promise.resolve();
+      if (refsInFlight)
+        return refsInFlight;
+      refsLoading = true;
+      refsError = false;
+      const request = fetch("/_refs").then((r2) => r2.json()).then((refs) => {
         Object.assign(REFS, refs);
-      }).catch(() => {
-        return;
+        refsLoaded = true;
+        if (!popover.hidden && popTab !== "commits")
+          buildPopBody(popSearch.value);
+      }).catch((error2) => {
+        refsError = true;
+        console.error("[code-viewer] failed to load refs", error2);
+      }).finally(() => {
+        refsLoading = false;
+        refsInFlight = null;
+        if (!popover.hidden && popTab !== "commits")
+          buildPopBody(popSearch.value);
       });
+      refsInFlight = request;
+      return request;
     }
-    fetchRefs();
     let popTab = "commits";
     const COMMIT_PAGE_SIZE = 50;
     let commitSearchTimer = null;
@@ -30309,6 +30347,10 @@ code-viewer query agent-help`
         } else if (commitHasMore) {
           html.push('<div class="rp-empty">scroll for more commits...</div>');
         }
+      } else if (refsLoading) {
+        html.push('<div class="rp-empty">loading refs...</div>');
+      } else if (refsError) {
+        html.push('<div class="rp-empty">failed to load refs</div>');
       } else if (popTab === "branches") {
         const branches = (REFS.branches || []).filter((b2) => m(b2.name));
         if (!branches.length) {
@@ -30443,6 +30485,14 @@ code-viewer query agent-help`
         });
         if (popTab === "commits")
           scheduleCommitSearch(popSearch.value);
+        else {
+          if (commitSearchTimer) {
+            clearTimeout(commitSearchTimer);
+            commitSearchTimer = null;
+          }
+          commitSearchLoading = false;
+          fetchRefs();
+        }
         buildPopBody(popSearch.value);
       });
     });
@@ -37650,7 +37700,7 @@ code-viewer query agent-help`
         setPreferredSourceTab: (tab) => SOURCE_VIEW.setPreferredSourceTab(tab),
         createFileBreadcrumb: (path, ref) => DIFF_VIEW.createFileBreadcrumb(path, ref),
         emptyText: () => uiText().diff
-      }, historyRoute);
+      }, historyRoute, { loadSidebar: false });
       activeFileHistoryDiffHost = mount.diffHost;
       activeFileHistoryEmptyHost = mount.emptyHost;
       return mount;
@@ -37705,7 +37755,17 @@ code-viewer query agent-help`
         parkRangeForHistory();
         setPageMode();
         const mount = renderFileHistoryShell2(route);
-        HISTORY_VIEW.enterHistory({ mount });
+        HISTORY_VIEW.enterHistory({ mount }).then(async () => {
+          const currentRoute = STATE.route;
+          if (currentRoute.screen !== "file" || currentRoute.view !== "history" || currentRoute.path !== route.path || currentRoute.ref !== route.ref)
+            return;
+          await loadDiffFile(route.path);
+          const routeAfterDiff = STATE.route;
+          if (routeAfterDiff.screen !== "file" || routeAfterDiff.view !== "history" || routeAfterDiff.path !== route.path || routeAfterDiff.ref !== route.ref)
+            return;
+          await REPO_VIEW.renderRepoBlobSidebar(route.path, route.ref);
+          placeSidebarToggle();
+        });
         return true;
       }
       return false;