@youtyan/code-viewer 0.5.4 → 0.6.0

package/web/app.js

@@ -400,7 +400,8 @@
     { action: "start-g-sequence", key: "g", scope: "main" },
     { action: "layout-unified", key: "u" },
     { action: "layout-split", key: "s" },
-    { action: "toggle-theme", key: "t" }
+    { action: "toggle-theme", key: "t" },
+    { action: "open-help", key: "?", shift: true }
   ];
   function resolveKeymapAction(event, context) {
     const key = event.key.toLowerCase();
@@ -9637,14 +9638,10 @@ ${frontmatter.yaml}
       calculatingDiff: "Computing diff…",
       diffError: "Failed to compute diff",
       noChanges: "No changes detected.",
-      before: "Before",
       loading: "Loading…",
       loadError: "Failed to load",
       saveNote: "Save",
       noteInputPlaceholder: "Enter a note",
-      inserted: "Added",
-      updated: "Updated",
-      deleted: "Deleted",
       tableCount: (n2) => `${n2} tables`,
       rowCount: (n2) => ` (${n2})`,
       listTitle: (n2) => `Snapshots (${n2})`,
@@ -9926,14 +9923,10 @@ ${frontmatter.yaml}
       calculatingDiff: "差分を計算中...",
       diffError: "差分の計算に失敗しました",
       noChanges: "変更は検出されませんでした。",
-      before: "更新前",
       loading: "読み込み中...",
       loadError: "読み込みに失敗しました",
       saveNote: "保存",
       noteInputPlaceholder: "メモを入力",
-      inserted: "追加",
-      updated: "更新",
-      deleted: "削除",
       tableCount: (n2) => `${n2}テーブル`,
       rowCount: (n2) => ` (${n2}件)`,
       listTitle: (n2) => `スナップショット (${n2}件)`,
@@ -14551,10 +14544,8 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     const getJson = (path) => trackLoad(fetch(path));
     const changeTypeLabel = (type) => {
       if (type === "inserted")
-        return text2().snapshot.inserted;
-      if (type === "updated")
-        return text2().snapshot.updated;
-      return text2().snapshot.deleted;
+        return "+";
+      return "−";
     };
     const snapshotLabel = (s2) => {
       const date = new Date(s2.createdAt).toLocaleString();
@@ -15360,11 +15351,19 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
             allCols.add(k);
       }
       const columns = [...allCols];
-      const table2 = document.createElement("table");
-      table2.className = "db-snap-diff-grid";
+      const colHeaderWrap = document.createElement("div");
+      colHeaderWrap.className = "db-snapshot-diff-col-header-wrap";
+      const colHeaderTable = document.createElement("table");
+      colHeaderTable.className = "db-snap-diff-grid";
+      const colHeaderColgroup = document.createElement("colgroup");
+      for (let i2 = 0;i2 < columns.length + 1; i2++) {
+        colHeaderColgroup.appendChild(document.createElement("col"));
+      }
+      colHeaderTable.appendChild(colHeaderColgroup);
       const thead = document.createElement("thead");
       const headRow = document.createElement("tr");
       const thType = document.createElement("th");
+      thType.className = "snap-diff-type-cell";
       thType.textContent = "";
       headRow.appendChild(thType);
       for (const col of columns) {
@@ -15373,16 +15372,25 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         headRow.appendChild(th);
       }
       thead.appendChild(headRow);
-      table2.appendChild(thead);
+      colHeaderTable.appendChild(thead);
+      colHeaderWrap.appendChild(colHeaderTable);
+      const rowsViewport = document.createElement("div");
+      rowsViewport.className = "db-snapshot-diff-rows-viewport";
+      const bodyTable = document.createElement("table");
+      bodyTable.className = "db-snap-diff-grid";
+      const bodyColgroup = document.createElement("colgroup");
+      for (let i2 = 0;i2 < columns.length + 1; i2++) {
+        bodyColgroup.appendChild(document.createElement("col"));
+      }
+      bodyTable.appendChild(bodyColgroup);
       const tbody = document.createElement("tbody");
       for (const row of rows) {
         if (row.changeType === "updated" && row.beforeValues && row.afterValues) {
           const trBefore = document.createElement("tr");
-          trBefore.className = "snap-diff-del";
+          trBefore.className = "snap-diff-del snap-diff-record-start";
           const tdTypeBefore = document.createElement("td");
           tdTypeBefore.className = "snap-diff-type-cell";
-          tdTypeBefore.textContent = text2().snapshot.before;
-          tdTypeBefore.rowSpan = 2;
+          tdTypeBefore.textContent = "−";
           trBefore.appendChild(tdTypeBefore);
           for (const col of columns) {
             const td = document.createElement("td");
@@ -15395,7 +15403,11 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           }
           tbody.appendChild(trBefore);
           const trAfter = document.createElement("tr");
-          trAfter.className = "snap-diff-add";
+          trAfter.className = "snap-diff-add snap-diff-record-end";
+          const tdTypeAfter = document.createElement("td");
+          tdTypeAfter.className = "snap-diff-type-cell";
+          tdTypeAfter.textContent = "+";
+          trAfter.appendChild(tdTypeAfter);
           for (const col of columns) {
             const td = document.createElement("td");
             const bs = row.beforeValues[col] == null ? "NULL" : String(row.beforeValues[col]);
@@ -15408,7 +15420,8 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           tbody.appendChild(trAfter);
         } else {
           const tr = document.createElement("tr");
-          tr.className = row.changeType === "inserted" ? "snap-diff-add" : "snap-diff-del";
+          const sideClass = row.changeType === "inserted" ? "snap-diff-add" : "snap-diff-del";
+          tr.className = `${sideClass} snap-diff-record-start snap-diff-record-end`;
           const tdType = document.createElement("td");
           tdType.className = "snap-diff-type-cell";
           tdType.textContent = changeTypeLabel(row.changeType);
@@ -15416,6 +15429,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           const values = row.changeType === "inserted" ? row.afterValues : row.beforeValues;
           for (const col of columns) {
             const td = document.createElement("td");
+            td.classList.add("snap-diff-changed-cell");
             const v = values?.[col];
             td.textContent = v == null ? "NULL" : String(v);
             tr.appendChild(td);
@@ -15423,8 +15437,32 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           tbody.appendChild(tr);
         }
       }
-      table2.appendChild(tbody);
-      container.appendChild(table2);
+      bodyTable.appendChild(tbody);
+      rowsViewport.appendChild(bodyTable);
+      container.append(colHeaderWrap, rowsViewport);
+      rowsViewport.addEventListener("scroll", () => {
+        colHeaderWrap.scrollLeft = rowsViewport.scrollLeft;
+      });
+      const syncColumnWidths = () => {
+        if (disposed)
+          return;
+        const firstRow = tbody.querySelector("tr");
+        if (!firstRow)
+          return;
+        const cells = firstRow.children;
+        const bodyCols = bodyColgroup.children;
+        const headerCols = colHeaderColgroup.children;
+        for (let i2 = 0;i2 < cells.length; i2++) {
+          const w = cells[i2].offsetWidth;
+          if (bodyCols[i2])
+            bodyCols[i2].style.width = `${w}px`;
+          if (headerCols[i2])
+            headerCols[i2].style.width = `${w}px`;
+        }
+      };
+      requestAnimationFrame(syncColumnWidths);
+      const ro = new ResizeObserver(syncColumnWidths);
+      ro.observe(bodyTable);
       if (total > rows.length) {
         const more = document.createElement("div");
         more.className = "db-snapshot-diff-more";
@@ -20198,6 +20236,20 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     const b2 = Math.max(1, Math.floor(Math.max(start, end)));
     return a2 === b2 ? `@${path}#${a2}` : `@${path}#${a2}-${b2}`;
   }
+  function fileReferenceWithCodeClipboardText(path, start, end, lines, lang) {
+    const ref = fileReferenceClipboardText(path, start, end);
+    if (!ref)
+      return "";
+    if (!lines || lines.length === 0)
+      return ref;
+    const fence2 = (lang || "").trim();
+    return `${ref}
+
+\`\`\`${fence2}
+${lines.join(`
+`)}
+\`\`\``;
+  }
 
   // web-src/core/ws-highlight.ts
   function isWhitespaceOnlyInlineHighlight(text2) {
@@ -20228,6 +20280,16 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
   function shouldRenderDiffSidebar(listSame, domIntact) {
     return !listSame || !domIntact;
   }
+  function findDirectDiffCardByKey(target, key) {
+    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;
+    }
+    return null;
+  }
   function createDiffView(deps) {
     const {
       $,
@@ -20443,11 +20505,17 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     let CLIENT_REQ_SEQ = 0;
     const LOAD_QUEUE = [];
     let ACTIVE_LOADS = 0;
+    let LOAD_EPOCH = 0;
     const MAX_PARALLEL = 2;
     let lazyObserver = null;
     let scrollSpyInstalled = false;
     let prevListSignature = "";
     let prevCardSignatures = new Map;
+    function resetLoadScheduling() {
+      LOAD_EPOCH++;
+      LOAD_QUEUE.length = 0;
+      ACTIVE_LOADS = 0;
+    }
     function fileKey(f2) {
       return f2.key || f2.path;
     }
@@ -20497,11 +20565,12 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       }
     }
     function invalidateLoadedCard(card, file, changedPaths) {
-      if (!card.classList.contains("loaded"))
+      if (!card.classList.contains("loaded") && !card.classList.contains("loading"))
         return false;
       if (changedPaths && !changedPaths.has(file.path))
         return false;
-      card.classList.remove("loaded", "error");
+      card.dataset.reqId = String(++CLIENT_REQ_SEQ);
+      card.classList.remove("loaded", "loading", "error");
       card.classList.add("pending");
       card._diffData = null;
       const body = card.querySelector(".gdp-shell-body");
@@ -20531,6 +20600,25 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         }
       }
     }
+    function resetReusableCard(card, file) {
+      card.classList.remove("loaded", "loading", "error", "manual-load");
+      card.classList.add("pending");
+      card.replaceChildren();
+      const tmp = createPlaceholder(file);
+      while (tmp.firstChild)
+        card.appendChild(tmp.firstChild);
+      card.dataset.path = file.path;
+      card.dataset.key = fileKey(file);
+      card.dataset.sizeClass = file.size_class || "small";
+      card.dataset.status = file.status || "M";
+      card.dataset.reqId = String(++CLIENT_REQ_SEQ);
+      delete card.dataset.manualRendered;
+      delete card.dataset.manualLoad;
+      delete card.dataset.manualMode;
+      card.style.minHeight = `${file.estimated_height_px || 80}px`;
+      card._diffData = null;
+      card._file = null;
+    }
     function renderShell(meta, changedPaths) {
       const newFiles = meta.files || [];
       const newListSig = computeListSignature(newFiles);
@@ -20559,7 +20647,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           empty.classList.remove("hidden");
           target.replaceChildren();
         }
-        LOAD_QUEUE.length = 0;
+        resetLoadScheduling();
         return {
           structureChanged: sidebarNeedsRender,
           invalidatedCards: 0,
@@ -20571,39 +20659,33 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       for (const f2 of newFiles) {
         newCardSigs.set(fileKey(f2), computeCardSignature(f2));
       }
+      const pathsUnknown = !changedPaths;
+      const contentMayNeedReload = !listSame || pathsUnknown || (changedPaths ? newFiles.some((file) => {
+        const key = fileKey(file);
+        return prevCardSignatures.get(key) !== newCardSigs.get(key) || changedPaths.has(file.path);
+      }) : false);
+      if (contentMayNeedReload)
+        resetLoadScheduling();
       let invalidatedCards = 0;
       if (listSame && domIntact) {
-        const pathsUnknown = !changedPaths;
+        const pathsUnknown2 = !changedPaths;
         let sidebarNeedsStatsUpdate = false;
         for (const f2 of newFiles) {
           const key = fileKey(f2);
           const oldSig = prevCardSignatures.get(key);
-          const newSig = newCardSigs.get(key);
+          const newSig = newCardSigs.get(key) ?? computeCardSignature(f2);
           const sigChanged = oldSig !== newSig;
-          const pathHint = pathsUnknown || changedPaths.has(f2.path);
+          const pathHint = pathsUnknown2 || changedPaths.has(f2.path);
           if (!sigChanged && !pathHint) {
             continue;
           }
-          const card = target.querySelector(`.gdp-file-shell[data-key="${CSS.escape(key)}"]`);
+          const card = findDirectDiffCardByKey(target, key);
           if (!card)
             continue;
           const sizeChanged = card.dataset.sizeClass !== (f2.size_class || "small");
           const statusChanged = card.dataset.status !== (f2.status || "M");
           if (sizeChanged || statusChanged) {
-            card.classList.remove("loaded", "error");
-            card.classList.add("pending");
-            card.replaceChildren();
-            const tmp = createPlaceholder(f2);
-            while (tmp.firstChild)
-              card.appendChild(tmp.firstChild);
-            card.dataset.sizeClass = f2.size_class || "small";
-            card.dataset.status = f2.status || "M";
-            delete card.dataset.manualRendered;
-            delete card.dataset.manualLoad;
-            delete card.dataset.manualMode;
-            card.style.minHeight = `${f2.estimated_height_px || 80}px`;
-            card._diffData = null;
-            card._file = null;
+            resetReusableCard(card, f2);
             activatePendingCard(card, f2);
             invalidatedCards++;
             sidebarNeedsStatsUpdate = true;
@@ -20616,6 +20698,9 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
             const didInvalidate = sigChanged ? invalidateLoadedCard(card, f2, null) : invalidateLoadedCard(card, f2, changedPaths);
             if (didInvalidate)
               invalidatedCards++;
+            else if ((sigChanged || pathHint) && card.classList.contains("pending")) {
+              activatePendingCard(card, f2);
+            }
             if (sigChanged)
               sidebarNeedsStatsUpdate = true;
           }
@@ -20650,21 +20735,11 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           oldByKey.delete(key);
           const sizeChanged = old.dataset.sizeClass !== (f2.size_class || "small");
           const statusChanged = old.dataset.status !== (f2.status || "M");
-          if (sizeChanged || statusChanged) {
-            old.classList.remove("loaded", "error");
-            old.classList.add("pending");
-            old.replaceChildren();
-            const tmp = createPlaceholder(f2);
-            while (tmp.firstChild)
-              old.appendChild(tmp.firstChild);
-            old.dataset.sizeClass = f2.size_class || "small";
-            old.dataset.status = f2.status || "M";
-            delete old.dataset.manualRendered;
-            delete old.dataset.manualLoad;
-            delete old.dataset.manualMode;
-            old.style.minHeight = `${f2.estimated_height_px || 80}px`;
-            old._diffData = null;
-            old._file = null;
+          const oldSig = prevCardSignatures.get(key);
+          const newSig = newCardSigs.get(key) ?? computeCardSignature(f2);
+          const sigChanged = oldSig !== newSig;
+          if (sizeChanged || statusChanged || sigChanged) {
+            resetReusableCard(old, f2);
             invalidatedCards++;
           } else {
             const stats = old.querySelector(".gdp-shell-header .stats");
@@ -20756,20 +20831,29 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         renderManualLoadPlaceholder(card, file);
         return;
       }
-      if (LOAD_QUEUE.find((item) => item.card === card))
+      if (LOAD_QUEUE.find((item) => item.card === card && item.epoch === LOAD_EPOCH))
         return;
-      LOAD_QUEUE.push({ file, card, priority: priority || 0 });
+      LOAD_QUEUE.push({
+        file,
+        card,
+        priority: priority || 0,
+        epoch: LOAD_EPOCH
+      });
       LOAD_QUEUE.sort((a2, b2) => b2.priority - a2.priority);
       pumpQueue();
     }
     function pumpQueue() {
       while (ACTIVE_LOADS < MAX_PARALLEL && LOAD_QUEUE.length) {
         const item = LOAD_QUEUE.shift();
+        if (item.epoch !== LOAD_EPOCH)
+          continue;
         if (item.card.classList.contains("loaded") || item.card.classList.contains("loading"))
           continue;
         ACTIVE_LOADS++;
         loadFile(item.file, item.card).finally(() => {
-          ACTIVE_LOADS--;
+          if (item.epoch === LOAD_EPOCH) {
+            ACTIVE_LOADS = Math.max(0, ACTIVE_LOADS - 1);
+          }
           pumpQueue();
         });
       }
@@ -21414,7 +21498,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       });
     }
     function clearLoadQueue() {
-      LOAD_QUEUE.length = 0;
+      resetLoadScheduling();
     }
     return {
       renderMeta,
@@ -21900,6 +21984,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     let hasMore = false;
     let loading = false;
     let generation = 0;
+    let selectionGeneration = 0;
     let selectedSha = "";
     let query = "";
     let mode = "history";
@@ -22160,11 +22245,12 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       return page.commits.length > 0;
     }
     async function selectCommit(commit, options = {}) {
+      const selectionGen = ++selectionGeneration;
       const gen = generation;
       selectedSha = commit.sha;
       updateActiveRow();
       await updateCommitInfo(commit);
-      if (gen !== generation)
+      if (selectionGen !== selectionGeneration || gen !== generation)
         return;
       if (options.updateUrl !== false) {
         const range = commitDiffRange(commit);
@@ -22181,13 +22267,14 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           deps.setRoute({ screen: "history", ref, commit: commit.sha, range }, true);
         }
       }
-      if (gen !== generation)
+      if (selectionGen !== selectionGeneration || gen !== generation)
         return;
       await deps.applyCommitRange(commitDiffRange(commit), pathFilter || undefined);
-      if (gen !== generation)
+      if (selectionGen !== selectionGeneration || gen !== generation)
         return;
     }
     async function selectWorktree(options = {}) {
+      const selectionGen = ++selectionGeneration;
       const gen = generation;
       selectedSha = HISTORY_WORKTREE_COMMIT;
       updateActiveRow();
@@ -22207,10 +22294,10 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
           deps.setRoute({ screen: "history", ref, commit: selectedSha, range }, true);
         }
       }
-      if (gen !== generation)
+      if (selectionGen !== selectionGeneration || gen !== generation)
         return;
       await deps.applyCommitRange(range, pathFilter || undefined);
-      if (gen !== generation)
+      if (selectionGen !== selectionGeneration || gen !== generation)
         return;
     }
     let lookupFailed = false;
@@ -22307,6 +22394,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         hasMore = false;
         loading = false;
         inFlight = null;
+        selectionGeneration++;
         selectedSha = "";
         setBanner("");
         await updateCommitInfo(null);
@@ -22323,6 +22411,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       if (scope2.commit) {
         await resolveDeepLink(scope2.commit);
       } else {
+        selectionGeneration++;
         selectedSha = "";
         updateActiveRow();
         await updateCommitInfo(null);
@@ -22352,6 +22441,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
       generation++;
       loading = false;
       inFlight = null;
+      selectionGeneration++;
       selectedSha = "";
       setBanner("");
       setStatusText("");
@@ -22376,6 +22466,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
         return;
       query = value;
       generation++;
+      selectionGeneration++;
       commits = [];
       hasMore = false;
       loading = false;
@@ -22538,6 +22629,308 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     };
   }
 
+  // web-src/views/help-keybindings.ts
+  var HIDDEN_HELP_KEYBINDING_ACTIONS = new Set([
+    "start-g-sequence"
+  ]);
+  var HELP_KEYBINDING_GROUPS = [
+    {
+      title: { en: "Global", ja: "グローバル" },
+      rows: [
+        {
+          selectors: [{ action: "open-file-palette" }],
+          description: {
+            en: "Open file palette",
+            ja: "ファイルパレットを開く"
+          }
+        },
+        {
+          selectors: [{ action: "open-grep-palette" }],
+          description: {
+            en: "Open grep palette",
+            ja: "grep パレットを開く"
+          }
+        },
+        {
+          selectors: [{ action: "focus-file-filter" }],
+          description: {
+            en: "Focus file filter",
+            ja: "ファイルフィルターへフォーカス"
+          }
+        },
+        {
+          selectors: [{ action: "open-help" }],
+          description: {
+            en: "Open this help (keybindings)",
+            ja: "このヘルプ（キーバインド）を開く"
+          }
+        },
+        {
+          selectors: [{ action: "toggle-theme" }],
+          description: { en: "Toggle theme", ja: "テーマ切り替え" }
+        },
+        {
+          selectors: [
+            { action: "annotation-previous" },
+            { action: "annotation-next" }
+          ],
+          description: {
+            en: "Previous / next annotation",
+            ja: "前 / 次の注釈へ移動"
+          }
+        },
+        {
+          selectors: [{ action: "layout-unified" }, { action: "layout-split" }],
+          description: {
+            en: "Switch unified / split layout",
+            ja: "統合 / 分割レイアウトへ切り替え"
+          }
+        },
+        {
+          selectors: [{ action: "cancel-source-load" }],
+          description: {
+            en: "Cancel active source load",
+            ja: "進行中のソース読み込みを中断"
+          }
+        }
+      ]
+    },
+    {
+      title: { en: "Panels", ja: "パネル" },
+      rows: [
+        {
+          selectors: [{ action: "focus-sidebar" }],
+          description: { en: "Focus sidebar", ja: "サイドバーへフォーカス" }
+        },
+        {
+          selectors: [{ action: "focus-main" }],
+          description: {
+            en: "Focus main panel",
+            ja: "メインパネルへフォーカス"
+          }
+        }
+      ]
+    },
+    {
+      title: { en: "Sidebar", ja: "サイドバー" },
+      rows: [
+        {
+          selectors: [{ action: "sidebar-next" }, { action: "sidebar-previous" }],
+          description: {
+            en: "Move selection down / up",
+            ja: "選択を下 / 上へ移動"
+          }
+        },
+        {
+          selectors: [
+            { action: "sidebar-page-down" },
+            { action: "sidebar-page-up" }
+          ],
+          description: {
+            en: "Move selection by half a page",
+            ja: "半ページ分選択を移動"
+          }
+        },
+        {
+          selectors: [
+            { action: "goto-top", pendingG: true },
+            { action: "goto-bottom", shift: true, pendingG: false }
+          ],
+          description: { en: "Move to top / bottom", ja: "先頭 / 末尾へ移動" }
+        },
+        {
+          selectors: [{ action: "open-sidebar-item" }],
+          description: { en: "Open selected item", ja: "選択項目を開く" }
+        },
+        {
+          selectors: [
+            { action: "sidebar-collapse" },
+            { action: "sidebar-expand" }
+          ],
+          description: {
+            en: "Collapse / expand directory",
+            ja: "ディレクトリを閉じる / 開く"
+          }
+        }
+      ]
+    },
+    {
+      title: { en: "Main Panel", ja: "メインパネル" },
+      rows: [
+        {
+          selectors: [
+            { action: "scroll-main-down", scope: "main" },
+            { action: "scroll-main-up", scope: "main" }
+          ],
+          description: {
+            en: "Move code cursor down / up",
+            ja: "コードカーソルを下 / 上へ移動"
+          }
+        },
+        {
+          selectors: [
+            {
+              action: "scroll-main-page-down",
+              scope: "main",
+              key: "d",
+              ctrl: true
+            },
+            {
+              action: "scroll-main-page-up",
+              scope: "main",
+              key: "u",
+              ctrl: true
+            }
+          ],
+          description: {
+            en: "Move code cursor by half a page",
+            ja: "コードカーソルを半ページ分移動"
+          }
+        },
+        {
+          selectors: [
+            { action: "scroll-main-page-down", scope: "main", key: "pagedown" },
+            { action: "scroll-main-page-up", scope: "main", key: "pageup" }
+          ],
+          description: {
+            en: "Move code cursor by a page",
+            ja: "コードカーソルを1ページ分移動"
+          }
+        },
+        {
+          selectors: [
+            {
+              action: "scroll-main-page-down",
+              scope: "main",
+              key: "arrowdown",
+              ctrl: true
+            },
+            {
+              action: "scroll-main-page-up",
+              scope: "main",
+              key: "arrowup",
+              ctrl: true
+            }
+          ],
+          description: {
+            en: "Move code cursor by a page",
+            ja: "コードカーソルを1ページ分移動"
+          }
+        },
+        {
+          selectors: [
+            { action: "goto-top", pendingG: true },
+            { action: "goto-bottom", shift: true, pendingG: false }
+          ],
+          description: {
+            en: "Move code cursor to top / bottom",
+            ja: "コードカーソルを先頭 / 末尾へ移動"
+          }
+        },
+        {
+          selectors: [
+            { action: "tab-preview", scope: "main", pendingG: true },
+            { action: "tab-code", scope: "main", pendingG: true }
+          ],
+          description: {
+            en: "Switch to Preview / Code tab",
+            ja: "Preview / Code タブへ切り替え"
+          }
+        }
+      ]
+    }
+  ];
+  function matchesSelector(binding, selector) {
+    if (binding.action !== selector.action)
+      return false;
+    if (selector.key !== undefined && binding.key !== selector.key)
+      return false;
+    if (selector.scope !== undefined && binding.scope !== selector.scope)
+      return false;
+    if (selector.ctrl !== undefined && !!binding.ctrl !== selector.ctrl)
+      return false;
+    if (selector.meta !== undefined && !!binding.meta !== selector.meta)
+      return false;
+    if (selector.alt !== undefined && !!binding.alt !== selector.alt)
+      return false;
+    if (selector.shift !== undefined && !!binding.shift !== selector.shift)
+      return false;
+    if (selector.pendingG !== undefined && !!binding.pendingG !== selector.pendingG)
+      return false;
+    return true;
+  }
+  function formatKeyName(key, shifted) {
+    const lower = key.toLowerCase();
+    if (lower === "escape")
+      return "Escape";
+    if (lower === "enter")
+      return "Enter";
+    if (lower === "pagedown")
+      return "PageDown";
+    if (lower === "pageup")
+      return "PageUp";
+    if (lower === "arrowdown")
+      return "ArrowDown";
+    if (lower === "arrowup")
+      return "ArrowUp";
+    if (key === "?")
+      return "?";
+    if (shifted && key.length === 1)
+      return key.toUpperCase();
+    return key;
+  }
+  function formatKeyBinding(binding) {
+    const key = formatKeyName(binding.key, !!binding.shift || !!binding.ctrl || !!binding.meta || !!binding.alt);
+    if (binding.pendingG && !binding.ctrl && !binding.meta && !binding.alt && !binding.shift && binding.key.length === 1)
+      return `g${key}`;
+    const parts = [];
+    if (binding.pendingG)
+      parts.push("g");
+    if (binding.ctrl)
+      parts.push("Ctrl");
+    if (binding.meta)
+      parts.push("Meta");
+    if (binding.alt)
+      parts.push("Alt");
+    if (binding.shift && binding.key !== "?")
+      parts.push("Shift");
+    parts.push(key);
+    return parts.join("+");
+  }
+  function addUnique(values, next) {
+    if (!values.includes(next))
+      values.push(next);
+  }
+  function collectRowCoverage(row, bindings) {
+    const coverage = [];
+    const seen = new Set;
+    for (const selector of row.selectors) {
+      for (const binding of bindings) {
+        if (!matchesSelector(binding, selector))
+          continue;
+        const label = formatKeyBinding(binding);
+        const key = `${binding.action}\x00${binding.scope || ""}\x00${label}`;
+        if (seen.has(key))
+          continue;
+        seen.add(key);
+        coverage.push({ action: selector.action, binding, label });
+      }
+    }
+    return coverage;
+  }
+  function buildRow(row, language, bindings) {
+    const labels = [];
+    for (const item of collectRowCoverage(row, bindings))
+      addUnique(labels, item.label);
+    return [labels.join(" / "), row.description[language]];
+  }
+  function buildHelpKeybindingGroups(language, bindings = DEFAULT_KEY_BINDINGS) {
+    return HELP_KEYBINDING_GROUPS.map((group) => ({
+      title: group.title[language],
+      rows: group.rows.map((row) => buildRow(row, language, bindings))
+    }));
+  }
+
   // web-src/views/help-page.ts
   var HELP_LANGUAGES = ["en", "ja"];
   var HELP_SECTIONS = [
@@ -22546,6 +22939,7 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
     "annotations",
     "database",
     "skills",
+    "mcp",
     "keybindings"
   ];
   var HELP_CONTENT = {
@@ -22633,6 +23027,21 @@ ${entry.message}` : entry.detail ?? entry.message ?? "";
                 {
                   kind: "paragraph",
                   text: "Each row reports OK / WARN / ERROR with a remediation hint when relevant. The check groups are Runtime (Node / Bun / NODE_MODULE_VERSION), Package (version + execution origin including npx cache), SQLite driver, Snapshot store, Git, Discovery summary, Docker / Compose (CLI / v2 plugin / daemon / compose config dry-parse / compose ps health per discovered service), and Server. The most common hint is the npx cache fix for better-sqlite3 NODE_MODULE_VERSION mismatch (rm -rf ~/.npm/_npx then re-run with npx -y @youtyan/code-viewer@latest)."
+                },
+                {
+                  kind: "paragraph",
+                  text: 'From the terminal — and for AI agents or CI — the same report is available without a browser. `code-viewer doctor` prints a status summary; add `--json` for the full DoctorReport (matches the /_doctor endpoint). Exit code is 1 when worstStatus is "error", so it doubles as a CI gate.'
+                },
+                {
+                  kind: "command",
+                  title: "Doctor summary in the terminal",
+                  command: "code-viewer doctor"
+                },
+                {
+                  kind: "command",
+                  title: "Doctor JSON for agents and CI",
+                  command: `code-viewer doctor --json
+code-viewer doctor --cwd /path/to/repo --port 64160 --json`
                 }
               ]
             }
@@ -22948,7 +23357,7 @@ code-viewer query clear --db app.db`
                 {
                   kind: "command",
                   title: "Search across all tables",
-                  command: 'code-viewer query search --db app.db --term "john@example.com" \\\n  --tables users,orders --include-non-text --max-hits 20'
+                  command: 'code-viewer query search --db app.db --term "sample@example.com" \\\n  --tables users,orders --include-non-text --max-hits 20'
                 },
                 {
                   kind: "command",
@@ -22965,16 +23374,12 @@ code-viewer query snapshot delete --id snap-abc123`
                 {
                   kind: "command",
                   title: "Diff two snapshots",
-                  command: `code-viewer query diff create --before snap-abc123 --after snap-def456 \\
-  --note "User registration test"
-code-viewer query diff list --db app.db --json
-code-viewer query diff delete --id diff-xyz789`
+                  command: "code-viewer query diff tables --before snap-abc123 --after snap-def456 --json"
                 },
                 {
                   kind: "command",
                   title: "Inspect a diff",
-                  command: `code-viewer query diff tables --id diff-xyz789
-code-viewer query diff rows --id diff-xyz789 --table users --type inserted --limit 50`
+                  command: "code-viewer query diff rows --before snap-abc123 --after snap-def456 --table users --limit 50"
                 },
                 {
                   kind: "command",
@@ -23060,63 +23465,120 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
             }
           ]
         },
-        keybindings: {
-          nav: "Keybindings",
-          title: "Keyboard Shortcuts",
-          intro: "Use these shortcuts to move between panels and navigate files without leaving the keyboard.",
+        mcp: {
+          nav: "MCP Server",
+          title: "MCP Server",
+          intro: "While code-viewer is running, the same server also exposes a local, read-only MCP endpoint at /_mcp so AI agents can call status, file, search, and datastore tools directly over JSON-RPC instead of spawning code-viewer CLI subprocesses.",
           groups: [
             {
-              title: "Global",
+              title: "Connect to the endpoint",
               blocks: [
                 {
-                  kind: "table",
-                  rows: [
-                    ["Ctrl+K", "Open file palette"],
-                    ["Ctrl+G", "Open grep palette"],
-                    ["/", "Focus file filter"],
-                    ["t", "Toggle theme"],
-                    ["[ / ]", "Previous / next annotation"]
-                  ]
-                }
-              ]
-            },
-            {
-              title: "Panels",
-              blocks: [
+                  kind: "paragraph",
+                  text: "The endpoint speaks JSON-RPC 2.0 over the Streamable HTTP transport (initialize, ping, tools/list, tools/call). It accepts POST requests with an application/json body only, and is guarded by the same localhost / same-origin check as every other route."
+                },
                 {
-                  kind: "table",
-                  rows: [
-                    ["Ctrl+H", "Focus sidebar"],
-                    ["Ctrl+L", "Focus main panel"]
-                  ]
+                  kind: "command",
+                  title: "Endpoint URL (port from the printed startup URL)",
+                  command: "http://127.0.0.1:<port>/_mcp"
                 }
               ]
             },
             {
-              title: "Sidebar",
+              title: "Available tools",
               blocks: [
                 {
                   kind: "table",
                   rows: [
-                    ["j / k", "Move selection down / up"],
-                    ["Ctrl+D / Ctrl+U", "Move selection by half a page"],
-                    ["gg / Shift+G", "Move to top / bottom"],
-                    ["Enter", "Open selected item"],
-                    ["h / l", "Collapse / expand directory"]
+                    [
+                      "code_viewer_agent_help",
+                      "Index of every AI-facing CLI subcommand."
+                    ],
+                    [
+                      "code_viewer_status",
+                      "Branch, remote, changed files, and recent commits."
+                    ],
+                    [
+                      "code_viewer_file_show",
+                      "Read a file (optionally a line range) at any ref."
+                    ],
+                    [
+                      "code_viewer_file_blame",
+                      "Per-line blame (sha / author / time / summary)."
+                    ],
+                    [
+                      "code_viewer_file_history",
+                      "Commit history for one path (follows renames)."
+                    ],
+                    [
+                      "code_viewer_file_diff",
+                      "Unified diff for one path (preview-capped by default)."
+                    ],
+                    [
+                      "code_viewer_search_files",
+                      "Rank repository paths by fuzzy or glob match."
+                    ],
+                    [
+                      "code_viewer_search_code",
+                      "Grep the repository (rg / git grep / fallback)."
+                    ],
+                    [
+                      "code_viewer_datastore_sources",
+                      "Discover read-only datastore source ids."
+                    ],
+                    [
+                      "code_viewer_datastore_schemas",
+                      "List schemas for one SQL datastore."
+                    ],
+                    [
+                      "code_viewer_datastore_schema",
+                      "Inspect tables, indexes, FKs, and columns."
+                    ],
+                    [
+                      "code_viewer_datastore_columns",
+                      "Inspect columns for one SQL table."
+                    ],
+                    [
+                      "code_viewer_datastore_ddl",
+                      "Inspect the CREATE statement and triggers."
+                    ],
+                    [
+                      "code_viewer_datastore_query",
+                      "Run a read-only SELECT / PRAGMA / EXPLAIN / WITH."
+                    ],
+                    [
+                      "code_viewer_datastore_history",
+                      "Inspect saved query history."
+                    ]
                   ]
                 }
               ]
-            },
+            }
+          ]
+        },
+        keybindings: {
+          nav: "Keybindings",
+          title: "Keyboard Shortcuts",
+          intro: "Use these shortcuts to move between panels and navigate files without leaving the keyboard.",
+          groups: [
             {
-              title: "Main Panel",
+              title: "Line selection",
               blocks: [
                 {
                   kind: "table",
                   rows: [
-                    ["j / k", "Move code cursor down / up"],
-                    ["Ctrl+D / Ctrl+U", "Move code cursor by half a page"],
-                    ["gg / Shift+G", "Move code cursor to top / bottom"],
-                    ["gp / gc", "Switch to Preview / Code tab"]
+                    [
+                      "Drag on line numbers",
+                      "Highlight a range; the floating copy pill prepares @path#L1-L9"
+                    ],
+                    [
+                      "Click the pill",
+                      "Copy @path#L1-L9 to the clipboard for pasting into Claude Code / Codex"
+                    ],
+                    [
+                      "Shift+Click the pill",
+                      "Copy @path#L1-L9 plus a fenced code block of the selected lines — paste straight to an AI without re-fetching the file"
+                    ]
                   ]
                 }
               ]
@@ -23209,6 +23671,21 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
                 {
                   kind: "paragraph",
                   text: "各項目は OK / WARN / ERROR で表示され、必要に応じて対処手順のヒントが付きます。診断グループは Runtime (Node / Bun / NODE_MODULE_VERSION)、Package (バージョン + 実行元: npx cache / global / local / bunx)、SQLite driver、Snapshot store、Git、Discovery summary、Docker / Compose (CLI / v2 plugin / daemon / compose config dry parse / compose ps による各サービスのヘルス)、Server (待ち受けポート) の 8 つ。よくあるヒントは npx キャッシュ起因の better-sqlite3 NODE_MODULE_VERSION 不一致で、rm -rf ~/.npm/_npx の後に npx -y @youtyan/code-viewer@latest を再実行する手順を表示します。"
+                },
+                {
+                  kind: "paragraph",
+                  text: 'ターミナルからは `code-viewer doctor` で同じレポートを取得できます。AI エージェントや CI からは `--json` で /_doctor と同じ DoctorReport を受け取れます。worstStatus が "error" なら exit code 1 を返すので CI ガードに直接使えます。'
+                },
+                {
+                  kind: "command",
+                  title: "ターミナル用 doctor サマリー",
+                  command: "code-viewer doctor"
+                },
+                {
+                  kind: "command",
+                  title: "AI / CI 用 doctor JSON",
+                  command: `code-viewer doctor --json
+code-viewer doctor --cwd /path/to/repo --port 64160 --json`
                 }
               ]
             }
@@ -23524,7 +24001,7 @@ code-viewer query clear --db app.db`
                 {
                   kind: "command",
                   title: "テーブル横断の全文検索",
-                  command: 'code-viewer query search --db app.db --term "john@example.com" \\\n  --tables users,orders --include-non-text --max-hits 20'
+                  command: 'code-viewer query search --db app.db --term "sample@example.com" \\\n  --tables users,orders --include-non-text --max-hits 20'
                 },
                 {
                   kind: "command",
@@ -23541,16 +24018,12 @@ code-viewer query snapshot delete --id snap-abc123`
                 {
                   kind: "command",
                   title: "2 つのスナップショットを diff",
-                  command: `code-viewer query diff create --before snap-abc123 --after snap-def456 \\
-  --note "ユーザー登録テストの差分"
-code-viewer query diff list --db app.db --json
-code-viewer query diff delete --id diff-xyz789`
+                  command: "code-viewer query diff tables --before snap-abc123 --after snap-def456 --json"
                 },
                 {
                   kind: "command",
                   title: "diff の中身を確認",
-                  command: `code-viewer query diff tables --id diff-xyz789
-code-viewer query diff rows --id diff-xyz789 --table users --type inserted --limit 50`
+                  command: "code-viewer query diff rows --before snap-abc123 --after snap-def456 --table users --limit 50"
                 },
                 {
                   kind: "command",
@@ -23636,63 +24109,117 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
             }
           ]
         },
-        keybindings: {
-          nav: "キーバインド",
-          title: "キーバインド",
-          intro: "キーボードだけでパネル移動、ファイル選択、スクロールを行うためのショートカットです。",
+        mcp: {
+          nav: "MCPサーバー",
+          title: "MCPサーバー",
+          intro: "code-viewer を起動している間、同じサーバーがローカルの read-only な MCP エンドポイント (/_mcp) も公開します。AI エージェントは code-viewer の CLI をサブプロセスとして起動する代わりに、status / file / search / datastore の各ツールを JSON-RPC 経由で直接呼び出せます。",
           groups: [
             {
-              title: "グローバル",
+              title: "エンドポイントへの接続",
               blocks: [
                 {
-                  kind: "table",
-                  rows: [
-                    ["Ctrl+K", "ファイルパレットを開く"],
-                    ["Ctrl+G", "grep パレットを開く"],
-                    ["/", "ファイルフィルターへフォーカス"],
-                    ["t", "テーマ切り替え"],
-                    ["[ / ]", "前 / 次の注釈へ移動"]
-                  ]
-                }
-              ]
-            },
-            {
-              title: "パネル",
-              blocks: [
+                  kind: "paragraph",
+                  text: "エンドポイントは JSON-RPC 2.0 の Streamable HTTP トランスポート (initialize / ping / tools/list / tools/call) で応答します。受け付けるのは application/json ボディの POST リクエストのみで、他のルートと同じ localhost / 同一オリジンチェックで保護されています。"
+                },
                 {
-                  kind: "table",
-                  rows: [
-                    ["Ctrl+H", "サイドバーへフォーカス"],
-                    ["Ctrl+L", "メインパネルへフォーカス"]
-                  ]
+                  kind: "command",
+                  title: "エンドポイント URL (port は起動時に表示される URL と同じ)",
+                  command: "http://127.0.0.1:<port>/_mcp"
                 }
               ]
             },
             {
-              title: "サイドバー",
+              title: "利用できるツール",
               blocks: [
                 {
                   kind: "table",
                   rows: [
-                    ["j / k", "選択を下 / 上へ移動"],
-                    ["Ctrl+D / Ctrl+U", "半ページ分選択を移動"],
-                    ["gg / Shift+G", "先頭 / 末尾へ移動"],
-                    ["Enter", "選択項目を開く"],
-                    ["h / l", "ディレクトリを閉じる / 開く"]
+                    [
+                      "code_viewer_agent_help",
+                      "AI 向け CLI サブコマンドの一覧索引。"
+                    ],
+                    [
+                      "code_viewer_status",
+                      "ブランチ、remote、変更ファイル、直近のコミット。"
+                    ],
+                    [
+                      "code_viewer_file_show",
+                      "任意の ref でファイル(または行範囲)を読む。"
+                    ],
+                    [
+                      "code_viewer_file_blame",
+                      "行単位の blame (sha / author / time / summary)。"
+                    ],
+                    [
+                      "code_viewer_file_history",
+                      "1ファイルのコミット履歴(リネーム追跡あり)。"
+                    ],
+                    [
+                      "code_viewer_file_diff",
+                      "1ファイルの unified diff(既定はプレビュー上限あり)。"
+                    ],
+                    [
+                      "code_viewer_search_files",
+                      "ファジー / glob マッチでリポジトリのパスを順位付け。"
+                    ],
+                    [
+                      "code_viewer_search_code",
+                      "リポジトリを grep する (rg / git grep / フォールバック)。"
+                    ],
+                    [
+                      "code_viewer_datastore_sources",
+                      "read-only なデータストアの source id を発見。"
+                    ],
+                    [
+                      "code_viewer_datastore_schemas",
+                      "SQL データストア1件のスキーマ一覧。"
+                    ],
+                    [
+                      "code_viewer_datastore_schema",
+                      "テーブル、インデックス、外部キー、カラムを調査。"
+                    ],
+                    [
+                      "code_viewer_datastore_columns",
+                      "SQL テーブル1件のカラムを調査。"
+                    ],
+                    ["code_viewer_datastore_ddl", "CREATE 文とトリガーを調査。"],
+                    [
+                      "code_viewer_datastore_query",
+                      "read-only な SELECT / PRAGMA / EXPLAIN / WITH を実行。"
+                    ],
+                    [
+                      "code_viewer_datastore_history",
+                      "保存済みのクエリ履歴を調査。"
+                    ]
                   ]
                 }
               ]
-            },
+            }
+          ]
+        },
+        keybindings: {
+          nav: "キーバインド",
+          title: "キーバインド",
+          intro: "キーボードだけでパネル移動、ファイル選択、スクロールを行うためのショートカットです。",
+          groups: [
             {
-              title: "メインパネル",
+              title: "行選択",
               blocks: [
                 {
                   kind: "table",
                   rows: [
-                    ["j / k", "コードカーソルを下 / 上へ移動"],
-                    ["Ctrl+D / Ctrl+U", "コードカーソルを半ページ分移動"],
-                    ["gg / Shift+G", "コードカーソルを先頭 / 末尾へ移動"],
-                    ["gp / gc", "Preview / Code タブへ切り替え"]
+                    [
+                      "行番号でドラッグ",
+                      "範囲をハイライトし、フロートする Copy ピルが @path#L1-L9 を用意"
+                    ],
+                    [
+                      "ピルをクリック",
+                      "@path#L1-L9 をコピー（Claude Code / Codex への貼り付け用）"
+                    ],
+                    [
+                      "Shift+ピルをクリック",
+                      "@path#L1-L9 と選択行の実コード（フェンス付き）をまとめてコピー — AI へ直接貼れて、ファイル再取得不要"
+                    ]
                   ]
                 }
               ]
@@ -23708,6 +24235,19 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
   function helpSectionFromRoute(route) {
     return route.screen === "help" && HELP_SECTIONS.includes(route.section) ? route.section : "overview";
   }
+  function openHelpKeybindings(deps) {
+    const route = deps.getRoute();
+    deps.cancelActiveSourceLoad("navigation");
+    deps.setRoute({
+      screen: "help",
+      lang: route.screen === "help" ? helpLanguageFromRoute(route) : deps.getLanguage(),
+      section: "keybindings",
+      range: deps.currentRange()
+    });
+    deps.setPageMode();
+    deps.renderHelpPage();
+    deps.setStatus("live");
+  }
   function renderHelpCommand(block2) {
     const wrap = document.createElement("div");
     wrap.className = "gdp-help-command";
@@ -23776,6 +24316,13 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
       const section = helpSectionFromRoute(deps.getRoute());
       const content = HELP_CONTENT[lang];
       const sectionContent = content.sections[section];
+      const sectionGroups = section === "keybindings" ? [
+        ...buildHelpKeybindingGroups(lang).map((group) => ({
+          title: group.title,
+          blocks: [{ kind: "table", rows: group.rows }]
+        })),
+        ...sectionContent.groups
+      ] : sectionContent.groups;
       const shell = document.createElement("section");
       shell.className = "gdp-help-shell";
       const header = document.createElement("header");
@@ -23825,7 +24372,7 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
       const intro = document.createElement("p");
       intro.textContent = sectionContent.intro;
       article.append(h2, intro);
-      sectionContent.groups.forEach((group) => {
+      sectionGroups.forEach((group) => {
         const groupSection = document.createElement("section");
         groupSection.className = "gdp-help-group";
         const groupTitle = document.createElement("h3");
@@ -24233,39 +24780,109 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
     return { setupHunkExpand };
   }
 
+  // web-src/core/html-escape.ts
+  function escapeHtml2(value) {
+    return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+  }
+
   // web-src/views/line-ref-pill.ts
   var COPY_ICON = '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" fill="currentColor">' + '<path d="M0 6.75C0 5.784.784 5 1.75 5h1.5a.75.75 0 0 1 0 1.5h-1.5a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-1.5a.75.75 0 0 1 1.5 0v1.5A1.75 1.75 0 0 1 9.25 16h-7.5A1.75 1.75 0 0 1 0 14.25Z"/>' + '<path d="M5 1.75C5 .784 5.784 0 6.75 0h7.5C15.216 0 16 .784 16 1.75v7.5A1.75 1.75 0 0 1 14.25 11h-7.5A1.75 1.75 0 0 1 5 9.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h7.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"/>' + "</svg>";
   var CHECK_ICON = '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" fill="currentColor">' + '<path d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.75.75 0 0 1 1.06-1.06L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"/>' + "</svg>";
-  function escapeHtml2(value) {
-    return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+  function langFromPath(path) {
+    const m = path.match(/\.([^./]+)$/);
+    if (!m)
+      return "";
+    return EXT_TO_LANG[m[1].toLowerCase()] || "";
+  }
+  function readRenderedLines(path, start, end) {
+    const card = document.querySelector(`.gdp-file-shell[data-path="${CSS.escape(path)}"]`);
+    if (!card)
+      return [];
+    const out = [];
+    for (let line = start;line <= end; line++) {
+      const sourceRow = card.querySelector(`.gdp-source-table tr[data-line="${String(line)}"]`);
+      if (sourceRow) {
+        const code2 = sourceRow.querySelector(".gdp-source-line-code");
+        out.push(code2?.textContent ?? "");
+      }
+    }
+    if (out.length > 0 && out.some((value) => value.length > 0))
+      return out;
+    const diffRows = card.querySelectorAll("table.d2h-diff-table tr");
+    if (diffRows.length === 0)
+      return [];
+    const collected = new Map;
+    diffRows.forEach((row) => {
+      const sideCell = row.querySelector("td.d2h-code-linenumber, td.d2h-code-side-linenumber");
+      if (!sideCell)
+        return;
+      const side = sideCell.closest(".d2h-file-side-diff");
+      const wrapper = sideCell.closest(".d2h-file-wrapper");
+      if (side && wrapper) {
+        const sides = wrapper.querySelectorAll(".d2h-file-side-diff");
+        if (sides.length >= 2 && side !== sides[1])
+          return;
+      }
+      const numText = sideCell.querySelector(".line-num2")?.textContent ?? sideCell.textContent ?? "";
+      const line = Number(numText.trim());
+      if (!Number.isInteger(line) || line < start || line > end)
+        return;
+      const codeCell = row.querySelector(".d2h-code-line-ctn");
+      if (codeCell)
+        collected.set(line, codeCell.textContent ?? "");
+    });
+    if (collected.size === 0)
+      return [];
+    const ordered = [];
+    for (let line = start;line <= end; line++) {
+      ordered.push(collected.get(line) ?? "");
+    }
+    return ordered;
   }
   function createLineRefPill() {
     const pill = document.createElement("button");
     pill.id = "line-ref-pill";
     pill.type = "button";
-    pill.title = "選択行の参照をコピー（Claude Code / Codex に貼り付け用）";
+    pill.title = "選択行の参照をコピー（Claude Code / Codex に貼り付け用）。Shift+Click でコード本体も添付。";
     pill.hidden = true;
     document.body.appendChild(pill);
     let refText = "";
+    let currentPath = "";
+    let currentStart = 0;
+    let currentEnd = 0;
     let feedbackTimer = null;
     function render(state) {
-      pill.classList.toggle("copied", state === "copied");
+      pill.classList.toggle("copied", state === "copied" || state === "copied-code");
       if (state === "copied") {
         pill.innerHTML = `${CHECK_ICON}<span class="lrp-label">Copied!</span>`;
         return;
       }
+      if (state === "copied-code") {
+        pill.innerHTML = `${CHECK_ICON}<span class="lrp-label">Copied + code</span>`;
+        return;
+      }
       if (state === "failed") {
         pill.innerHTML = `${COPY_ICON}<span class="lrp-label">copy failed</span>`;
         return;
       }
       pill.innerHTML = `${COPY_ICON}<span class="lrp-label">Copy</span>` + `<span class="lrp-ref">${escapeHtml2(refText)}</span>`;
     }
-    pill.addEventListener("click", async () => {
+    pill.addEventListener("click", async (event) => {
       if (!refText)
         return;
+      const withCode = event.shiftKey;
+      let payload = refText;
+      let copiedCode = false;
+      if (withCode && currentPath) {
+        const lines = readRenderedLines(currentPath, currentStart, currentEnd);
+        if (lines.length > 0) {
+          payload = fileReferenceWithCodeClipboardText(currentPath, currentStart, currentEnd, lines, langFromPath(currentPath));
+          copiedCode = true;
+        }
+      }
       try {
-        await navigator.clipboard.writeText(refText);
-        render("copied");
+        await navigator.clipboard.writeText(payload);
+        render(copiedCode ? "copied-code" : "copied");
       } catch {
         render("failed");
       }
@@ -24284,6 +24901,9 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
           return;
         const changed = next !== refText;
         refText = next;
+        currentPath = path;
+        currentStart = Math.max(1, Math.floor(Math.min(start, end)));
+        currentEnd = Math.max(1, Math.floor(Math.max(start, end)));
         if (feedbackTimer) {
           clearTimeout(feedbackTimer);
           feedbackTimer = null;
@@ -24298,6 +24918,9 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
       },
       hide() {
         refText = "";
+        currentPath = "";
+        currentStart = 0;
+        currentEnd = 0;
         pill.hidden = true;
       }
     };
@@ -24563,6 +25186,11 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
     wireRefSelectorInput(refToInput, () => deps.setRange(refFromInput.value, refToInput.value));
     wireRefSelectorInput(deps.$("#repo-target"), (ref) => {
       const route = deps.getRoute();
+      if (route.screen === "repo") {
+        deps.setRoute({ ...route, ref, range: deps.currentRange() });
+        deps.loadRepo();
+        return;
+      }
       if (route.screen !== "file")
         return;
       const nextRoute = {
@@ -25526,6 +26154,13 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
     function renderSidebar(files, onFileClick) {
       const ul = $("#filelist");
       const repoSidebar = !!onFileClick;
+      if (!repoSidebar) {
+        const repoTarget = document.querySelector("#repo-target-wrap");
+        if (repoTarget) {
+          repoTarget.hidden = true;
+          repoTarget.style.display = "none";
+        }
+      }
       const treeMode = STATE.sbView === "tree" || repoSidebar;
       ul.innerHTML = "";
       ul.classList.toggle("tree", treeMode);
@@ -26174,8 +26809,10 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
       const wrap = document.querySelector("#repo-target-wrap");
       if (!input || !wrap)
         return;
-      input.value = ref || "worktree";
-      wrap.hidden = activeRepoTreeRef() == null;
+      const activeRef = activeRepoTreeRef();
+      input.value = activeRef || ref || "worktree";
+      wrap.hidden = activeRef == null;
+      wrap.style.display = activeRef == null ? "none" : "";
       syncSidebarHeaderHeight();
     }
     function activeRepoTreeRef() {
@@ -29961,8 +30598,8 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
           view: "view",
           tree: "tree",
           flat: "flat",
-          filter: "Filter files...",
-          filterTitle: "Filter files. Use /pattern/ for regex. Cmd/Ctrl+K focuses this field.",
+          filter: "Filter files…  /  ⌘K",
+          filterTitle: "Filter files. Use /pattern/ for regex. Press / to focus this field, Cmd/Ctrl+K for the full-file palette, Ctrl+G for grep, ? for help.",
           hide: "hide sidebar"
         },
         history: {
@@ -30067,8 +30704,8 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
           view: "表示",
           tree: "ツリー",
           flat: "一覧",
-          filter: "ファイルを絞り込み...",
-          filterTitle: "ファイルを絞り込みます。正規表現は /pattern/。Cmd/Ctrl+K でフォーカス。",
+          filter: "ファイル絞り込み…  /  ⌘K",
+          filterTitle: "ファイルを絞り込みます。/pattern/ は正規表現。/ でこの欄にフォーカス、Cmd/Ctrl+K で全ファイルパレット、Ctrl+G で grep、? でヘルプ。",
           hide: "サイドバーを隠す"
         },
         history: {
@@ -30804,13 +31441,21 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
     function setPageMode() {
       const historyPanelRoute = STATE.route.screen === "history";
       const fileHistoryRoute = isFileHistoryRoute(STATE.route);
+      const fileRepoBlobRoute = STATE.route.screen === "file" && (STATE.route.view === "blob" || STATE.route.view === "blame" || STATE.route.view === "history");
+      const repoSidebarRoute = STATE.route.screen === "repo" || fileRepoBlobRoute;
       document.body.classList.toggle("gdp-file-detail-page", STATE.route.screen === "file");
-      document.body.classList.toggle("gdp-repo-blob-page", STATE.route.screen === "file" && (STATE.route.view === "blob" || STATE.route.view === "blame" || STATE.route.view === "history"));
+      document.body.classList.toggle("gdp-repo-blob-page", fileRepoBlobRoute);
       document.body.classList.toggle("gdp-repo-page", STATE.route.screen === "repo");
+      document.body.classList.toggle("gdp-diff-page", STATE.route.screen === "diff");
       document.body.classList.toggle("gdp-help-page", STATE.route.screen === "help");
       document.body.classList.toggle("gdp-history-page", historyPanelRoute);
       document.body.classList.toggle("gdp-file-history-page", fileHistoryRoute);
       document.body.classList.toggle("gdp-database-page", STATE.route.screen === "database");
+      const repoTargetWrap = document.querySelector("#repo-target-wrap");
+      if (!repoSidebarRoute && repoTargetWrap) {
+        repoTargetWrap.hidden = true;
+        repoTargetWrap.style.display = "none";
+      }
       placeSidebarToggle();
       syncSidebarHeaderHeight();
       const historyPanel = $("#history-panel");
@@ -31405,6 +32050,19 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
         $("#theme").click();
         return true;
       }
+      if (action === "open-help") {
+        openHelpKeybindings({
+          getRoute: () => STATE.route,
+          getLanguage: () => STATE.language,
+          currentRange,
+          setRoute,
+          setPageMode,
+          renderHelpPage,
+          setStatus,
+          cancelActiveSourceLoad
+        });
+        return true;
+      }
       return false;
     }
     document.addEventListener("keydown", handleVirtualSourcePagingKeydown, {
@@ -31575,6 +32233,8 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
       getRoute: () => STATE.route,
       setRoute,
       applyCommitRange: (range, pathFilter) => {
+        cancelInFlightRequests();
+        DIFF_VIEW.clearLoadQueue();
         STATE.from = range.from;
         STATE.to = range.to;
         activeHistoryPathFilter = pathFilter || null;
@@ -31706,6 +32366,7 @@ code-viewer query diff rows --id diff-xyz789 --table users --type inserted --lim
       currentRange,
       setRange,
       setRoute,
+      loadRepo,
       renderStandaloneSource,
       getFrom: () => STATE.from,
       getTo: () => STATE.to,