From d6f29bbf39396ad190ca1e41a7b3a1f16bb81ed0 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 11:11:16 +0530
Subject: [PATCH 01/10] fix(github): show all Markdown import files

---
 CHANGELOG.md                       |   6 +
 README.md                          |   2 +-
 desktop-app/resources/index.html   |  25 ++-
 desktop-app/resources/js/script.js | 184 ++++++++++++++++---
 desktop-app/resources/styles.css   | 272 +++++++++++++++++++++++++----
 index.html                         |  25 ++-
 script.js                          | 184 ++++++++++++++++---
 styles.css                         | 272 +++++++++++++++++++++++++----
 wiki/Configuration.md              |   2 +-
 wiki/FAQ.md                        |   2 +-
 wiki/Features.md                   |   4 +-
 wiki/Troubleshooting.md            |   2 +-
 wiki/Usage-Guide.md                |   2 +-
 13 files changed, 839 insertions(+), 143 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aa34a0d..3c7890c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,12 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 - Show secure-backup choices only when Backup is opened.
 - Load the ZIP engine and calculate detailed storage usage only when those features are requested, leaving startup and normal document-opening paths unchanged.
 
+### GitHub Import
+
+- Removed the 30-file display cap so repository and folder results expose every Markdown file found.
+- Added complete subtree traversal when GitHub marks a recursive repository tree response as truncated.
+- Expanded the file-selection modal with a searchable, responsive tree, full and filtered counts, and more visible space on desktop and mobile.
+
 ---
 
 ## v3.9.4
diff --git a/README.md b/README.md
index 417eb2ef..85a106db 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Importing a workspace backup permanently replaces the current workspace after confirmation.
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
-- The public GitHub importer shows at most 30 Markdown files for a repository or folder result.
+- The public GitHub importer shows every Markdown file found in a repository or folder result, with search for large file trees.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
 - Live Share allows up to 64 WebSocket participants and 8 MB per live message.
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index 10bfec0b..c84a912c 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1279,21 +1279,34 @@ <h2 class="about-title">Markdown Viewer</h2>
         <div id="github-import-modal" class="reset-modal-overlay modal-overlay" role="dialog" aria-modal="true" aria-labelledby="github-import-title" aria-hidden="true" style="display:none;">
           <div class="reset-modal-box github-import-modal-box app-modal-box modal-box">
             <div class="modal-header">
-              <div>
+              <span class="github-import-heading-icon" aria-hidden="true"><i class="bi bi-github"></i></span>
+              <div class="github-import-heading">
                 <p id="github-import-title" class="reset-modal-message">Import Markdown from GitHub</p>
-                <p class="modal-subtext">Paste a GitHub file or repository URL.</p>
+                <p id="github-import-subtitle" class="modal-subtext">Paste a GitHub file, folder, or repository URL.</p>
               </div>
               <button type="button" class="modal-close-btn" id="github-import-close" aria-label="Close GitHub import dialog"><i class="lucide lucide-x" aria-hidden="true"></i></button>
             </div>
             <div class="modal-body github-import-modal-body">
-              <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
-              <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
+              <div id="github-import-url-section" class="github-import-url-section">
+                <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
+                <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repository" autocomplete="url" spellcheck="false" />
+                <p class="github-import-url-help">Public repositories are supported. You can import a single file or choose any Markdown files from a repository.</p>
+              </div>
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
+              <div id="github-import-filter-row" class="github-import-filter-row" style="display:none;">
+                <i class="lucide lucide-search" aria-hidden="true"></i>
+                <label class="visually-hidden" for="github-import-filter">Filter Markdown files</label>
+                <input type="search" id="github-import-filter" class="rename-modal-input" placeholder="Filter files by name or path" autocomplete="off" spellcheck="false" />
+              </div>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
-                <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
+                <div class="github-import-selection-summary" aria-live="polite">
+                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
+                  <span class="github-import-summary-divider" aria-hidden="true"></span>
+                  <span id="github-import-available-count" class="github-import-available-count">0 files</span>
+                </div>
                 <button type="button" class="reset-modal-btn" id="github-import-select-all">Select all</button>
               </div>
-              <div id="github-import-tree" class="github-import-tree" style="display:none;"></div>
+              <div id="github-import-tree" class="github-import-tree" role="group" aria-label="Markdown files in repository" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
             </div>
             <div class="reset-modal-actions">
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index daf88105..c85b97a6 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -534,11 +534,16 @@ document.addEventListener("DOMContentLoaded", async function () {
   const mobileLiveShareParticipants = document.getElementById("mobile-live-share-participants");
   const githubImportModal = document.getElementById("github-import-modal");
   const githubImportTitle = document.getElementById("github-import-title");
+  const githubImportSubtitle = document.getElementById("github-import-subtitle");
+  const githubImportUrlSection = document.getElementById("github-import-url-section");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
+  const githubImportFilterRow = document.getElementById("github-import-filter-row");
+  const githubImportFilterInput = document.getElementById("github-import-filter");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
+  const githubImportAvailableCount = document.getElementById("github-import-available-count");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -11178,9 +11183,9 @@ ${selector} .arrowheadPath {
   function isMarkdownPath(path) {
     return /\.(md|markdown)$/i.test(path || "");
   }
-  const MAX_GITHUB_FILES_SHOWN = 30;
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   let lastGitHubImportRequestAt = 0;
+  let githubImportFilterFrame = 0;
   const selectedGitHubImportPaths = new Set();
   let availableGitHubImportPaths = [];
 
@@ -11345,13 +11350,52 @@ ${selector} .arrowheadPath {
     return repoInfo.default_branch;
   }
 
-  async function listMarkdownFiles(owner, repo, ref, basePath) {
+  function isPathInsideGitHubBase(path, normalizedBasePath) {
+    return !normalizedBasePath || path === normalizedBasePath || path.startsWith(normalizedBasePath + "/");
+  }
+
+  function shouldTraverseGitHubTree(path, normalizedBasePath) {
+    if (!normalizedBasePath) return true;
+    return path === normalizedBasePath
+      || normalizedBasePath.startsWith(path + "/")
+      || path.startsWith(normalizedBasePath + "/");
+  }
+
+  async function listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath) {
+    const pendingTrees = [{ path: "", ref }];
+    const markdownPaths = new Set();
+
+    for (let index = 0; index < pendingTrees.length; index++) {
+      const currentTree = pendingTrees[index];
+      const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(currentTree.ref)}`);
+
+      (treeResponse.tree || []).forEach((entry) => {
+        const fullPath = currentTree.path ? `${currentTree.path}/${entry.path}` : entry.path;
+        if (entry.type === "blob" && isMarkdownPath(fullPath) && isPathInsideGitHubBase(fullPath, normalizedBasePath)) {
+          markdownPaths.add(fullPath);
+        } else if (entry.type === "tree" && shouldTraverseGitHubTree(fullPath, normalizedBasePath)) {
+          pendingTrees.push({ path: fullPath, ref: entry.sha });
+        }
+      });
+    }
+
+    return Array.from(markdownPaths).sort((a, b) => a.localeCompare(b));
+  }
+
+  async function listMarkdownFiles(owner, repo, ref, basePath, options = {}) {
     const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(ref)}?recursive=1`);
     const normalizedBasePath = (basePath || "").replace(/^\/+|\/+$/g, "");
 
+    if (treeResponse.truncated) {
+      if (typeof options.onTruncatedTree === "function") {
+        options.onTruncatedTree();
+      }
+      return listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath);
+    }
+
     return (treeResponse.tree || [])
       .filter((entry) => entry.type === "blob" && isMarkdownPath(entry.path))
-      .filter((entry) => !normalizedBasePath || entry.path === normalizedBasePath || entry.path.startsWith(normalizedBasePath + "/"))
+      .filter((entry) => isPathInsideGitHubBase(entry.path, normalizedBasePath))
       .map((entry) => entry.path)
       .sort((a, b) => a.localeCompare(b));
   }
@@ -11377,7 +11421,16 @@ ${selector} .arrowheadPath {
   function updateGitHubImportSelectedCount() {
     if (!githubImportSelectedCount) return;
     const count = selectedGitHubImportPaths.size;
-    githubImportSelectedCount.textContent = `${count} selected`;
+    githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
+  }
+
+  function updateGitHubImportAvailableCount(visibleCount) {
+    if (!githubImportAvailableCount) return;
+    const total = availableGitHubImportPaths.length;
+    const visible = typeof visibleCount === "number" ? visibleCount : total;
+    githubImportAvailableCount.textContent = visible === total
+      ? `${total.toLocaleString()} file${total === 1 ? "" : "s"}`
+      : `${visible.toLocaleString()} of ${total.toLocaleString()} files`;
   }
 
   function updateGitHubSelectAllButtonLabel() {
@@ -11418,18 +11471,40 @@ ${selector} .arrowheadPath {
 
   function renderGitHubImportTree(paths) {
     if (!githubImportTree || !githubImportFileSelect) return;
-    githubImportTree.innerHTML = "";
+    const visiblePaths = Array.from(paths || []);
+    updateGitHubImportAvailableCount(visiblePaths.length);
+    if (!visiblePaths.length) {
+      const emptyState = document.createElement("div");
+      emptyState.className = "github-import-empty-state";
+      const emptyIcon = document.createElement("i");
+      emptyIcon.className = "lucide lucide-search";
+      emptyIcon.setAttribute("aria-hidden", "true");
+      const emptyText = document.createElement("p");
+      emptyText.textContent = "No Markdown files match this filter.";
+      emptyState.append(emptyIcon, emptyText);
+      githubImportTree.replaceChildren(emptyState);
+      return;
+    }
+
     const tree = buildMarkdownFileTree(paths);
 
     const createTreeBranch = function(node, parentPath) {
       const list = document.createElement("ul");
+      list.setAttribute("role", "list");
       const folderNames = Object.keys(node.folders).sort((a, b) => a.localeCompare(b));
       folderNames.forEach((folderName) => {
         const folderPath = parentPath ? `${parentPath}/${folderName}` : folderName;
         const item = document.createElement("li");
+        item.setAttribute("role", "listitem");
         const folderLabel = document.createElement("span");
         folderLabel.className = "github-tree-folder-label";
-        folderLabel.textContent = `📁 ${folderName}`;
+        folderLabel.title = folderPath;
+        const folderIcon = document.createElement("i");
+        folderIcon.className = "lucide lucide-folder";
+        folderIcon.setAttribute("aria-hidden", "true");
+        const folderText = document.createElement("span");
+        folderText.textContent = folderName;
+        folderLabel.append(folderIcon, folderText);
         item.appendChild(folderLabel);
         item.appendChild(createTreeBranch(node.folders[folderName], folderPath));
         list.appendChild(item);
@@ -11439,12 +11514,21 @@ ${selector} .arrowheadPath {
         .sort((a, b) => a.path.localeCompare(b.path))
         .forEach((file) => {
           const fileItem = document.createElement("li");
+          fileItem.setAttribute("role", "listitem");
           const fileButton = document.createElement("button");
           fileButton.type = "button";
           fileButton.className = "github-tree-file-btn";
           fileButton.dataset.path = file.path;
           fileButton.setAttribute("aria-pressed", "false");
-          fileButton.textContent = `📄 ${file.name}`;
+          fileButton.setAttribute("aria-label", file.path);
+          fileButton.title = file.path;
+          const fileIcon = document.createElement("i");
+          fileIcon.className = "lucide lucide-file-text";
+          fileIcon.setAttribute("aria-hidden", "true");
+          const fileName = document.createElement("span");
+          fileName.className = "github-tree-file-name";
+          fileName.textContent = file.name;
+          fileButton.append(fileIcon, fileName);
           fileButton.addEventListener("click", function() {
             toggleGitHubSelectedPath(file.path);
           });
@@ -11455,10 +11539,28 @@ ${selector} .arrowheadPath {
       return list;
     };
 
-    githubImportTree.appendChild(createTreeBranch(tree, ""));
+    githubImportTree.replaceChildren(createTreeBranch(tree, ""));
     syncGitHubSelectionToButtons();
   }
 
+  function applyGitHubImportFilter() {
+    const query = githubImportFilterInput ? githubImportFilterInput.value.trim().toLocaleLowerCase() : "";
+    const filteredPaths = query
+      ? availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query))
+      : availableGitHubImportPaths;
+    renderGitHubImportTree(filteredPaths);
+  }
+
+  function scheduleGitHubImportFilter() {
+    if (githubImportFilterFrame) {
+      cancelAnimationFrame(githubImportFilterFrame);
+    }
+    githubImportFilterFrame = requestAnimationFrame(function() {
+      githubImportFilterFrame = 0;
+      applyGitHubImportFilter();
+    });
+  }
+
   function setGitHubImportLoading(isLoading) {
     if (!githubImportSubmitBtn) return;
     if (isLoading) {
@@ -11490,6 +11592,11 @@ ${selector} .arrowheadPath {
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
+    if (githubImportSubtitle) {
+      githubImportSubtitle.textContent = "Paste a GitHub file, folder, or repository URL.";
+    }
+    githubImportModal.classList.remove("is-file-selection");
+    if (githubImportUrlSection) githubImportUrlSection.style.display = "flex";
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
@@ -11497,10 +11604,17 @@ ${selector} .arrowheadPath {
     githubImportFileSelect.innerHTML = "";
     githubImportFileSelect.style.display = "none";
     githubImportFileSelect.disabled = false;
+    if (githubImportFilterFrame) {
+      cancelAnimationFrame(githubImportFilterFrame);
+      githubImportFilterFrame = 0;
+    }
+    if (githubImportFilterInput) githubImportFilterInput.value = "";
+    if (githubImportFilterRow) githubImportFilterRow.style.display = "none";
     if (githubImportSelectionToolbar) {
       githubImportSelectionToolbar.style.display = "none";
     }
     availableGitHubImportPaths = [];
+    updateGitHubImportAvailableCount();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -11586,14 +11700,21 @@ ${selector} .arrowheadPath {
 
       // Render hierarchical visual skeleton tree while the list is loading
       if (githubImportTree) {
+        githubImportModal.classList.add("is-file-selection");
         renderGitHubImportTreeSkeleton();
         githubImportTree.style.display = "block";
       }
 
       const ref = parsed.ref || await getDefaultBranch(parsed.owner, parsed.repo);
-      const files = await listMarkdownFiles(parsed.owner, parsed.repo, ref, parsed.basePath || "");
+      const files = await listMarkdownFiles(parsed.owner, parsed.repo, ref, parsed.basePath || "", {
+        onTruncatedTree: function() {
+          setGitHubImportMessage("GitHub returned a partial tree. Scanning every folder to find all Markdown files\u2026", { isError: false });
+          announceToScreenReader("Large GitHub repository detected. Scanning every folder.");
+        }
+      });
 
       if (!files.length) {
+        githubImportModal.classList.remove("is-file-selection");
         if (githubImportTree) {
           githubImportTree.innerHTML = "";
           githubImportTree.style.display = "none";
@@ -11603,7 +11724,6 @@ ${selector} .arrowheadPath {
         return;
       }
 
-      const shownFiles = files.slice(0, MAX_GITHUB_FILES_SHOWN);
       if (files.length === 1) {
         const targetPath = files[0];
         announceToScreenReader("Starting GitHub import...");
@@ -11612,43 +11732,46 @@ ${selector} .arrowheadPath {
       }
 
       githubImportFileSelect.innerHTML = "";
+      if (githubImportUrlSection) githubImportUrlSection.style.display = "none";
       githubImportUrlInput.style.display = "none";
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
       githubImportFileSelect.style.display = "none";
+      if (githubImportFilterRow) {
+        githubImportFilterRow.style.display = "flex";
+      }
       if (githubImportSelectionToolbar) {
         githubImportSelectionToolbar.style.display = "flex";
       }
       if (githubImportTree) {
         githubImportTree.style.display = "block";
       }
-      shownFiles.forEach((filePath) => {
-        const option = document.createElement("option");
-        option.value = filePath;
-        option.textContent = filePath;
-        githubImportFileSelect.appendChild(option);
-      });
-      availableGitHubImportPaths = shownFiles.slice();
-      setGitHubSelectedPaths(shownFiles[0] ? [shownFiles[0]] : []);
-      renderGitHubImportTree(shownFiles);
+      availableGitHubImportPaths = files.slice();
+      setGitHubSelectedPaths(files[0] ? [files[0]] : []);
+      renderGitHubImportTree(files);
 
       // Announce load complete
       announceToScreenReader("GitHub files loaded. " + files.length + " files available in the tree.");
 
-      if (files.length > MAX_GITHUB_FILES_SHOWN) {
-        setGitHubImportMessage(`Showing first ${MAX_GITHUB_FILES_SHOWN} of ${files.length} Markdown files.`, { isError: false });
-      } else {
-        setGitHubImportMessage("");
-      }
+      setGitHubImportMessage(`All ${files.length.toLocaleString()} Markdown files are available.`, { isError: false });
       if (githubImportTitle) {
         githubImportTitle.textContent = "Select Markdown file(s) to import";
       }
+      if (githubImportSubtitle) {
+        githubImportSubtitle.textContent = "Choose any files below. Repository folder paths will be preserved.";
+      }
       githubImportSubmitBtn.dataset.step = "select";
       githubImportSubmitBtn.dataset.owner = parsed.owner;
       githubImportSubmitBtn.dataset.repo = parsed.repo;
       githubImportSubmitBtn.dataset.ref = ref;
       githubImportSubmitBtn.textContent = "Import Selected";
+      if (githubImportFilterInput) {
+        requestAnimationFrame(function() {
+          githubImportFilterInput.focus();
+        });
+      }
     } catch (error) {
       console.error("GitHub import failed:", error);
+      githubImportModal.classList.remove("is-file-selection");
       setGitHubImportMessage("GitHub import failed: " + error.message);
       announceToScreenReader("GitHub import failed.");
       if (githubImportTree) {
@@ -17878,6 +18001,19 @@ ${selector} .arrowheadPath {
   if (githubImportFileSelect) {
     githubImportFileSelect.addEventListener("keydown", handleGitHubImportInputKeydown);
   }
+  if (githubImportFilterInput) {
+    githubImportFilterInput.addEventListener("input", scheduleGitHubImportFilter);
+    githubImportFilterInput.addEventListener("keydown", function(e) {
+      if (e.key !== "Escape") return;
+      if (githubImportFilterInput.value) {
+        e.stopPropagation();
+        githubImportFilterInput.value = "";
+        applyGitHubImportFilter();
+      } else {
+        closeGitHubImportModal();
+      }
+    });
+  }
   if (githubImportSelectAllBtn) {
     githubImportSelectAllBtn.addEventListener("click", function() {
       const allPaths = availableGitHubImportPaths.slice();
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 52f2e28c..21fab6c2 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -5932,7 +5932,8 @@ a:focus {
 
 .github-import-error {
   margin: 0;
-  font-size: 12px;
+  flex: 0 0 auto;
+  font-size: var(--ui-font-md);
   color: var(--color-danger-fg, #d73a49);
   text-align: left;
   line-height: 1.5;
@@ -5943,12 +5944,19 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(92vw, 520px);
-  max-width: 520px;
+  width: min(94vw, 640px);
+  max-width: 640px;
   min-width: 0;
   padding: 0;
   gap: 0;
   overflow: hidden;
+  transition: width 0.2s ease, max-width 0.2s ease, height 0.2s ease, transform 0.2s ease, opacity 0.2s ease;
+}
+
+#github-import-modal.is-file-selection .reset-modal-box {
+  width: min(96vw, 960px);
+  max-width: 960px;
+  height: min(88dvh, 820px);
 }
 
 #github-import-modal .reset-modal-message {
@@ -5958,109 +5966,254 @@ a:focus {
 }
 
 #github-import-modal .modal-header {
-  padding: 14px 16px;
+  justify-content: flex-start;
+  padding: 16px 20px;
   border-bottom: 1px solid var(--border-color);
+  background: color-mix(in srgb, var(--header-bg) 94%, var(--accent-color) 6%);
+}
+
+.github-import-heading {
+  flex: 1;
+  min-width: 0;
 }
 
-.github-import-modal-body {
+.github-import-heading-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 38px;
+  height: 38px;
+  flex: 0 0 38px;
+  border: 1px solid color-mix(in srgb, var(--accent-color) 24%, var(--border-color));
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--accent-color) 10%, var(--header-bg));
+  color: var(--text-color);
+  font-size: 20px;
+}
+
+.github-import-url-section {
   display: flex;
   flex-direction: column;
   gap: 8px;
-  max-height: min(56vh, 460px);
-  overflow: auto;
-  padding: 16px;
+}
+
+.github-import-url-help {
+  margin: 0;
+  color: var(--text-secondary, #57606a);
+  font-size: var(--ui-font-md);
+  line-height: 1.5;
+}
+
+#github-import-modal .github-import-modal-body {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  min-height: 0;
+  max-height: min(62vh, 520px);
+  overflow: hidden;
+  padding: 20px;
+}
+
+#github-import-modal.is-file-selection .github-import-modal-body {
+  flex: 1 1 auto;
+  max-height: none;
 }
 
 #github-import-url,
 #github-import-file-select {
-  min-height: 36px;
-  padding: 7px 10px;
-  font-size: var(--ui-font-md);
+  min-height: 44px;
+  padding: 9px 12px;
+  font-size: var(--ui-font-lg);
 }
 
 #github-import-file-select {
   min-height: 180px;
 }
 
+.github-import-filter-row {
+  position: relative;
+  flex: 0 0 auto;
+  align-items: center;
+}
+
+.github-import-filter-row > .lucide {
+  position: absolute;
+  left: 12px;
+  z-index: 1;
+  color: var(--text-secondary, #57606a);
+  font-size: 16px;
+  pointer-events: none;
+}
+
+#github-import-filter {
+  width: 100%;
+  min-height: 40px;
+  padding: 8px 12px 8px 38px;
+}
+
 .github-import-tree {
-  max-height: 320px;
+  flex: 1 1 auto;
+  min-height: 260px;
+  max-height: 440px;
   overflow: auto;
   border: 1px solid var(--border-color);
-  border-radius: 10px;
-  padding: 12px;
-  background: var(--bg-color);
+  border-radius: 12px;
+  padding: 8px;
+  background: var(--editor-bg);
+  overscroll-behavior: contain;
+  scrollbar-gutter: stable;
+}
+
+#github-import-modal.is-file-selection .github-import-tree {
+  min-height: 0;
+  max-height: none;
 }
 
 .github-import-selection-toolbar {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  gap: 8px;
-  padding: 8px 10px;
+  gap: 12px;
+  flex: 0 0 auto;
+  padding: 9px 10px 9px 12px;
   border: 1px solid var(--border-color);
-  border-radius: 8px;
-  background: var(--button-bg);
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--button-bg) 88%, var(--accent-color) 12%);
+}
+
+.github-import-selection-summary {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  min-width: 0;
 }
 
 .github-import-selected-count {
   font-size: var(--ui-font-md);
   font-weight: 600;
   color: var(--text-color);
+  white-space: nowrap;
+}
+
+.github-import-summary-divider {
+  width: 1px;
+  height: 16px;
+  background: var(--border-color);
+}
+
+.github-import-available-count {
+  color: var(--text-secondary, #57606a);
+  font-size: var(--ui-font-md);
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
 }
 
 .github-import-tree ul {
   list-style: none;
   margin: 0;
-  padding-left: 18px;
+  padding-left: 20px;
 }
 
 .github-import-tree>ul {
-  padding-left: 4px;
+  padding-left: 0;
 }
 
 .github-import-tree li {
-  margin: 2px 0;
+  margin: 1px 0;
 }
 
 .github-tree-folder-label {
-  display: inline-block;
-  font-size: 14px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 32px;
+  padding: 5px 8px;
+  font-size: var(--ui-font-md);
+  font-weight: 600;
   color: var(--text-secondary, #57606a);
-  margin-bottom: 4px;
+}
+
+.github-tree-folder-label .lucide,
+.github-tree-file-btn .lucide {
+  flex: 0 0 auto;
+  font-size: 15px;
+}
+
+.github-tree-folder-label .lucide {
+  color: color-mix(in srgb, var(--accent-color) 72%, var(--text-secondary));
 }
 
 .github-tree-file-btn {
-  border: 0;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 36px;
+  border: 1px solid transparent;
   background: transparent;
   color: var(--text-color);
   cursor: pointer;
-  padding: 6px 8px;
-  border-radius: 6px;
+  padding: 7px 9px;
+  border-radius: 8px;
   text-align: left;
   width: 100%;
-  font-size: 14px;
+  font-size: var(--ui-font-md);
+  transition: background-color 0.15s ease, border-color 0.15s ease, color 0.15s ease;
+}
+
+.github-tree-file-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-tree-file-btn:hover {
+  background: var(--button-hover);
 }
 
-.github-tree-file-btn:hover,
 .github-tree-file-btn:focus-visible {
+  border-color: var(--accent-color);
   background: var(--button-hover);
-  outline: none;
+  outline: 2px solid color-mix(in srgb, var(--accent-color) 35%, transparent);
+  outline-offset: 1px;
 }
 
 .github-tree-file-btn.is-selected {
   background: rgba(56, 139, 253, 0.14);
+  border-color: color-mix(in srgb, var(--accent-color) 36%, transparent);
   color: var(--accent-color);
 }
 
+.github-import-empty-state {
+  display: flex;
+  min-height: 180px;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  padding: 24px;
+  color: var(--text-secondary, #57606a);
+  text-align: center;
+}
+
+.github-import-empty-state .lucide {
+  font-size: 24px;
+}
+
+.github-import-empty-state p {
+  margin: 0;
+}
+
 #github-import-modal .reset-modal-actions {
   gap: 8px;
-  padding: 10px 16px;
+  padding: 12px 20px;
   border-top: 1px solid var(--border-color);
+  background: color-mix(in srgb, var(--header-bg) 96%, var(--border-color) 4%);
 }
 
 #github-import-modal .reset-modal-btn {
-  min-height: 34px;
-  padding: 7px 14px;
+  min-height: 38px;
+  padding: 8px 16px;
   font-size: var(--ui-font-md);
 }
 
@@ -6073,9 +6226,31 @@ a:focus {
     gap: 0;
   }
 
-  .github-import-selection-toolbar {
-    flex-direction: column;
-    align-items: stretch;
+  #github-import-modal.is-file-selection .reset-modal-box {
+    height: calc(100dvh - 24px);
+  }
+
+  #github-import-modal .modal-header {
+    padding: 12px 14px;
+  }
+
+  .github-import-heading-icon {
+    width: 36px;
+    height: 36px;
+    flex-basis: 36px;
+  }
+
+  #github-import-modal .github-import-modal-body {
+    padding: 14px;
+  }
+
+  .github-import-selection-summary {
+    flex-wrap: wrap;
+    row-gap: 2px;
+  }
+
+  .github-import-summary-divider {
+    display: none;
   }
 
   #github-import-modal .reset-modal-message {
@@ -6084,14 +6259,35 @@ a:focus {
 
   #github-import-modal .reset-modal-actions {
     flex-direction: row;
+    padding: 10px 14px;
   }
 
   #github-import-modal .reset-modal-btn {
-    width: auto;
+    min-width: 0;
+    min-height: 44px;
+  }
+
+  #github-import-modal .reset-modal-actions .reset-modal-btn {
+    flex: 1;
+  }
+
+  #github-import-filter {
+    min-height: 44px;
+    font-size: 16px;
+  }
+
+  .github-tree-file-btn {
     min-height: 44px;
   }
 }
 
+@media (prefers-reduced-motion: reduce) {
+  #github-import-modal .reset-modal-box,
+  .github-tree-file-btn {
+    transition: none;
+  }
+}
+
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;
diff --git a/index.html b/index.html
index 23e3e69d..d639afac 100644
--- a/index.html
+++ b/index.html
@@ -1372,21 +1372,34 @@ <h2 class="about-title">Markdown Viewer</h2>
         <div id="github-import-modal" class="reset-modal-overlay modal-overlay" role="dialog" aria-modal="true" aria-labelledby="github-import-title" aria-hidden="true" style="display:none;">
           <div class="reset-modal-box github-import-modal-box app-modal-box modal-box">
             <div class="modal-header">
-              <div>
+              <span class="github-import-heading-icon" aria-hidden="true"><i class="bi bi-github"></i></span>
+              <div class="github-import-heading">
                 <p id="github-import-title" class="reset-modal-message">Import Markdown from GitHub</p>
-                <p class="modal-subtext">Paste a GitHub file or repository URL.</p>
+                <p id="github-import-subtitle" class="modal-subtext">Paste a GitHub file, folder, or repository URL.</p>
               </div>
               <button type="button" class="modal-close-btn" id="github-import-close" aria-label="Close GitHub import dialog"><i class="lucide lucide-x" aria-hidden="true"></i></button>
             </div>
             <div class="modal-body github-import-modal-body">
-              <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
-              <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
+              <div id="github-import-url-section" class="github-import-url-section">
+                <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
+                <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repository" autocomplete="url" spellcheck="false" />
+                <p class="github-import-url-help">Public repositories are supported. You can import a single file or choose any Markdown files from a repository.</p>
+              </div>
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
+              <div id="github-import-filter-row" class="github-import-filter-row" style="display:none;">
+                <i class="lucide lucide-search" aria-hidden="true"></i>
+                <label class="visually-hidden" for="github-import-filter">Filter Markdown files</label>
+                <input type="search" id="github-import-filter" class="rename-modal-input" placeholder="Filter files by name or path" autocomplete="off" spellcheck="false" />
+              </div>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
-                <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
+                <div class="github-import-selection-summary" aria-live="polite">
+                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
+                  <span class="github-import-summary-divider" aria-hidden="true"></span>
+                  <span id="github-import-available-count" class="github-import-available-count">0 files</span>
+                </div>
                 <button type="button" class="reset-modal-btn" id="github-import-select-all">Select all</button>
               </div>
-              <div id="github-import-tree" class="github-import-tree" style="display:none;"></div>
+              <div id="github-import-tree" class="github-import-tree" role="group" aria-label="Markdown files in repository" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
             </div>
             <div class="reset-modal-actions">
diff --git a/script.js b/script.js
index daf88105..c85b97a6 100644
--- a/script.js
+++ b/script.js
@@ -534,11 +534,16 @@ document.addEventListener("DOMContentLoaded", async function () {
   const mobileLiveShareParticipants = document.getElementById("mobile-live-share-participants");
   const githubImportModal = document.getElementById("github-import-modal");
   const githubImportTitle = document.getElementById("github-import-title");
+  const githubImportSubtitle = document.getElementById("github-import-subtitle");
+  const githubImportUrlSection = document.getElementById("github-import-url-section");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
+  const githubImportFilterRow = document.getElementById("github-import-filter-row");
+  const githubImportFilterInput = document.getElementById("github-import-filter");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
+  const githubImportAvailableCount = document.getElementById("github-import-available-count");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -11178,9 +11183,9 @@ ${selector} .arrowheadPath {
   function isMarkdownPath(path) {
     return /\.(md|markdown)$/i.test(path || "");
   }
-  const MAX_GITHUB_FILES_SHOWN = 30;
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   let lastGitHubImportRequestAt = 0;
+  let githubImportFilterFrame = 0;
   const selectedGitHubImportPaths = new Set();
   let availableGitHubImportPaths = [];
 
@@ -11345,13 +11350,52 @@ ${selector} .arrowheadPath {
     return repoInfo.default_branch;
   }
 
-  async function listMarkdownFiles(owner, repo, ref, basePath) {
+  function isPathInsideGitHubBase(path, normalizedBasePath) {
+    return !normalizedBasePath || path === normalizedBasePath || path.startsWith(normalizedBasePath + "/");
+  }
+
+  function shouldTraverseGitHubTree(path, normalizedBasePath) {
+    if (!normalizedBasePath) return true;
+    return path === normalizedBasePath
+      || normalizedBasePath.startsWith(path + "/")
+      || path.startsWith(normalizedBasePath + "/");
+  }
+
+  async function listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath) {
+    const pendingTrees = [{ path: "", ref }];
+    const markdownPaths = new Set();
+
+    for (let index = 0; index < pendingTrees.length; index++) {
+      const currentTree = pendingTrees[index];
+      const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(currentTree.ref)}`);
+
+      (treeResponse.tree || []).forEach((entry) => {
+        const fullPath = currentTree.path ? `${currentTree.path}/${entry.path}` : entry.path;
+        if (entry.type === "blob" && isMarkdownPath(fullPath) && isPathInsideGitHubBase(fullPath, normalizedBasePath)) {
+          markdownPaths.add(fullPath);
+        } else if (entry.type === "tree" && shouldTraverseGitHubTree(fullPath, normalizedBasePath)) {
+          pendingTrees.push({ path: fullPath, ref: entry.sha });
+        }
+      });
+    }
+
+    return Array.from(markdownPaths).sort((a, b) => a.localeCompare(b));
+  }
+
+  async function listMarkdownFiles(owner, repo, ref, basePath, options = {}) {
     const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(ref)}?recursive=1`);
     const normalizedBasePath = (basePath || "").replace(/^\/+|\/+$/g, "");
 
+    if (treeResponse.truncated) {
+      if (typeof options.onTruncatedTree === "function") {
+        options.onTruncatedTree();
+      }
+      return listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath);
+    }
+
     return (treeResponse.tree || [])
       .filter((entry) => entry.type === "blob" && isMarkdownPath(entry.path))
-      .filter((entry) => !normalizedBasePath || entry.path === normalizedBasePath || entry.path.startsWith(normalizedBasePath + "/"))
+      .filter((entry) => isPathInsideGitHubBase(entry.path, normalizedBasePath))
       .map((entry) => entry.path)
       .sort((a, b) => a.localeCompare(b));
   }
@@ -11377,7 +11421,16 @@ ${selector} .arrowheadPath {
   function updateGitHubImportSelectedCount() {
     if (!githubImportSelectedCount) return;
     const count = selectedGitHubImportPaths.size;
-    githubImportSelectedCount.textContent = `${count} selected`;
+    githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
+  }
+
+  function updateGitHubImportAvailableCount(visibleCount) {
+    if (!githubImportAvailableCount) return;
+    const total = availableGitHubImportPaths.length;
+    const visible = typeof visibleCount === "number" ? visibleCount : total;
+    githubImportAvailableCount.textContent = visible === total
+      ? `${total.toLocaleString()} file${total === 1 ? "" : "s"}`
+      : `${visible.toLocaleString()} of ${total.toLocaleString()} files`;
   }
 
   function updateGitHubSelectAllButtonLabel() {
@@ -11418,18 +11471,40 @@ ${selector} .arrowheadPath {
 
   function renderGitHubImportTree(paths) {
     if (!githubImportTree || !githubImportFileSelect) return;
-    githubImportTree.innerHTML = "";
+    const visiblePaths = Array.from(paths || []);
+    updateGitHubImportAvailableCount(visiblePaths.length);
+    if (!visiblePaths.length) {
+      const emptyState = document.createElement("div");
+      emptyState.className = "github-import-empty-state";
+      const emptyIcon = document.createElement("i");
+      emptyIcon.className = "lucide lucide-search";
+      emptyIcon.setAttribute("aria-hidden", "true");
+      const emptyText = document.createElement("p");
+      emptyText.textContent = "No Markdown files match this filter.";
+      emptyState.append(emptyIcon, emptyText);
+      githubImportTree.replaceChildren(emptyState);
+      return;
+    }
+
     const tree = buildMarkdownFileTree(paths);
 
     const createTreeBranch = function(node, parentPath) {
       const list = document.createElement("ul");
+      list.setAttribute("role", "list");
       const folderNames = Object.keys(node.folders).sort((a, b) => a.localeCompare(b));
       folderNames.forEach((folderName) => {
         const folderPath = parentPath ? `${parentPath}/${folderName}` : folderName;
         const item = document.createElement("li");
+        item.setAttribute("role", "listitem");
         const folderLabel = document.createElement("span");
         folderLabel.className = "github-tree-folder-label";
-        folderLabel.textContent = `📁 ${folderName}`;
+        folderLabel.title = folderPath;
+        const folderIcon = document.createElement("i");
+        folderIcon.className = "lucide lucide-folder";
+        folderIcon.setAttribute("aria-hidden", "true");
+        const folderText = document.createElement("span");
+        folderText.textContent = folderName;
+        folderLabel.append(folderIcon, folderText);
         item.appendChild(folderLabel);
         item.appendChild(createTreeBranch(node.folders[folderName], folderPath));
         list.appendChild(item);
@@ -11439,12 +11514,21 @@ ${selector} .arrowheadPath {
         .sort((a, b) => a.path.localeCompare(b.path))
         .forEach((file) => {
           const fileItem = document.createElement("li");
+          fileItem.setAttribute("role", "listitem");
           const fileButton = document.createElement("button");
           fileButton.type = "button";
           fileButton.className = "github-tree-file-btn";
           fileButton.dataset.path = file.path;
           fileButton.setAttribute("aria-pressed", "false");
-          fileButton.textContent = `📄 ${file.name}`;
+          fileButton.setAttribute("aria-label", file.path);
+          fileButton.title = file.path;
+          const fileIcon = document.createElement("i");
+          fileIcon.className = "lucide lucide-file-text";
+          fileIcon.setAttribute("aria-hidden", "true");
+          const fileName = document.createElement("span");
+          fileName.className = "github-tree-file-name";
+          fileName.textContent = file.name;
+          fileButton.append(fileIcon, fileName);
           fileButton.addEventListener("click", function() {
             toggleGitHubSelectedPath(file.path);
           });
@@ -11455,10 +11539,28 @@ ${selector} .arrowheadPath {
       return list;
     };
 
-    githubImportTree.appendChild(createTreeBranch(tree, ""));
+    githubImportTree.replaceChildren(createTreeBranch(tree, ""));
     syncGitHubSelectionToButtons();
   }
 
+  function applyGitHubImportFilter() {
+    const query = githubImportFilterInput ? githubImportFilterInput.value.trim().toLocaleLowerCase() : "";
+    const filteredPaths = query
+      ? availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query))
+      : availableGitHubImportPaths;
+    renderGitHubImportTree(filteredPaths);
+  }
+
+  function scheduleGitHubImportFilter() {
+    if (githubImportFilterFrame) {
+      cancelAnimationFrame(githubImportFilterFrame);
+    }
+    githubImportFilterFrame = requestAnimationFrame(function() {
+      githubImportFilterFrame = 0;
+      applyGitHubImportFilter();
+    });
+  }
+
   function setGitHubImportLoading(isLoading) {
     if (!githubImportSubmitBtn) return;
     if (isLoading) {
@@ -11490,6 +11592,11 @@ ${selector} .arrowheadPath {
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
+    if (githubImportSubtitle) {
+      githubImportSubtitle.textContent = "Paste a GitHub file, folder, or repository URL.";
+    }
+    githubImportModal.classList.remove("is-file-selection");
+    if (githubImportUrlSection) githubImportUrlSection.style.display = "flex";
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
@@ -11497,10 +11604,17 @@ ${selector} .arrowheadPath {
     githubImportFileSelect.innerHTML = "";
     githubImportFileSelect.style.display = "none";
     githubImportFileSelect.disabled = false;
+    if (githubImportFilterFrame) {
+      cancelAnimationFrame(githubImportFilterFrame);
+      githubImportFilterFrame = 0;
+    }
+    if (githubImportFilterInput) githubImportFilterInput.value = "";
+    if (githubImportFilterRow) githubImportFilterRow.style.display = "none";
     if (githubImportSelectionToolbar) {
       githubImportSelectionToolbar.style.display = "none";
     }
     availableGitHubImportPaths = [];
+    updateGitHubImportAvailableCount();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -11586,14 +11700,21 @@ ${selector} .arrowheadPath {
 
       // Render hierarchical visual skeleton tree while the list is loading
       if (githubImportTree) {
+        githubImportModal.classList.add("is-file-selection");
         renderGitHubImportTreeSkeleton();
         githubImportTree.style.display = "block";
       }
 
       const ref = parsed.ref || await getDefaultBranch(parsed.owner, parsed.repo);
-      const files = await listMarkdownFiles(parsed.owner, parsed.repo, ref, parsed.basePath || "");
+      const files = await listMarkdownFiles(parsed.owner, parsed.repo, ref, parsed.basePath || "", {
+        onTruncatedTree: function() {
+          setGitHubImportMessage("GitHub returned a partial tree. Scanning every folder to find all Markdown files\u2026", { isError: false });
+          announceToScreenReader("Large GitHub repository detected. Scanning every folder.");
+        }
+      });
 
       if (!files.length) {
+        githubImportModal.classList.remove("is-file-selection");
         if (githubImportTree) {
           githubImportTree.innerHTML = "";
           githubImportTree.style.display = "none";
@@ -11603,7 +11724,6 @@ ${selector} .arrowheadPath {
         return;
       }
 
-      const shownFiles = files.slice(0, MAX_GITHUB_FILES_SHOWN);
       if (files.length === 1) {
         const targetPath = files[0];
         announceToScreenReader("Starting GitHub import...");
@@ -11612,43 +11732,46 @@ ${selector} .arrowheadPath {
       }
 
       githubImportFileSelect.innerHTML = "";
+      if (githubImportUrlSection) githubImportUrlSection.style.display = "none";
       githubImportUrlInput.style.display = "none";
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
       githubImportFileSelect.style.display = "none";
+      if (githubImportFilterRow) {
+        githubImportFilterRow.style.display = "flex";
+      }
       if (githubImportSelectionToolbar) {
         githubImportSelectionToolbar.style.display = "flex";
       }
       if (githubImportTree) {
         githubImportTree.style.display = "block";
       }
-      shownFiles.forEach((filePath) => {
-        const option = document.createElement("option");
-        option.value = filePath;
-        option.textContent = filePath;
-        githubImportFileSelect.appendChild(option);
-      });
-      availableGitHubImportPaths = shownFiles.slice();
-      setGitHubSelectedPaths(shownFiles[0] ? [shownFiles[0]] : []);
-      renderGitHubImportTree(shownFiles);
+      availableGitHubImportPaths = files.slice();
+      setGitHubSelectedPaths(files[0] ? [files[0]] : []);
+      renderGitHubImportTree(files);
 
       // Announce load complete
       announceToScreenReader("GitHub files loaded. " + files.length + " files available in the tree.");
 
-      if (files.length > MAX_GITHUB_FILES_SHOWN) {
-        setGitHubImportMessage(`Showing first ${MAX_GITHUB_FILES_SHOWN} of ${files.length} Markdown files.`, { isError: false });
-      } else {
-        setGitHubImportMessage("");
-      }
+      setGitHubImportMessage(`All ${files.length.toLocaleString()} Markdown files are available.`, { isError: false });
       if (githubImportTitle) {
         githubImportTitle.textContent = "Select Markdown file(s) to import";
       }
+      if (githubImportSubtitle) {
+        githubImportSubtitle.textContent = "Choose any files below. Repository folder paths will be preserved.";
+      }
       githubImportSubmitBtn.dataset.step = "select";
       githubImportSubmitBtn.dataset.owner = parsed.owner;
       githubImportSubmitBtn.dataset.repo = parsed.repo;
       githubImportSubmitBtn.dataset.ref = ref;
       githubImportSubmitBtn.textContent = "Import Selected";
+      if (githubImportFilterInput) {
+        requestAnimationFrame(function() {
+          githubImportFilterInput.focus();
+        });
+      }
     } catch (error) {
       console.error("GitHub import failed:", error);
+      githubImportModal.classList.remove("is-file-selection");
       setGitHubImportMessage("GitHub import failed: " + error.message);
       announceToScreenReader("GitHub import failed.");
       if (githubImportTree) {
@@ -17878,6 +18001,19 @@ ${selector} .arrowheadPath {
   if (githubImportFileSelect) {
     githubImportFileSelect.addEventListener("keydown", handleGitHubImportInputKeydown);
   }
+  if (githubImportFilterInput) {
+    githubImportFilterInput.addEventListener("input", scheduleGitHubImportFilter);
+    githubImportFilterInput.addEventListener("keydown", function(e) {
+      if (e.key !== "Escape") return;
+      if (githubImportFilterInput.value) {
+        e.stopPropagation();
+        githubImportFilterInput.value = "";
+        applyGitHubImportFilter();
+      } else {
+        closeGitHubImportModal();
+      }
+    });
+  }
   if (githubImportSelectAllBtn) {
     githubImportSelectAllBtn.addEventListener("click", function() {
       const allPaths = availableGitHubImportPaths.slice();
diff --git a/styles.css b/styles.css
index 52f2e28c..21fab6c2 100644
--- a/styles.css
+++ b/styles.css
@@ -5932,7 +5932,8 @@ a:focus {
 
 .github-import-error {
   margin: 0;
-  font-size: 12px;
+  flex: 0 0 auto;
+  font-size: var(--ui-font-md);
   color: var(--color-danger-fg, #d73a49);
   text-align: left;
   line-height: 1.5;
@@ -5943,12 +5944,19 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(92vw, 520px);
-  max-width: 520px;
+  width: min(94vw, 640px);
+  max-width: 640px;
   min-width: 0;
   padding: 0;
   gap: 0;
   overflow: hidden;
+  transition: width 0.2s ease, max-width 0.2s ease, height 0.2s ease, transform 0.2s ease, opacity 0.2s ease;
+}
+
+#github-import-modal.is-file-selection .reset-modal-box {
+  width: min(96vw, 960px);
+  max-width: 960px;
+  height: min(88dvh, 820px);
 }
 
 #github-import-modal .reset-modal-message {
@@ -5958,109 +5966,254 @@ a:focus {
 }
 
 #github-import-modal .modal-header {
-  padding: 14px 16px;
+  justify-content: flex-start;
+  padding: 16px 20px;
   border-bottom: 1px solid var(--border-color);
+  background: color-mix(in srgb, var(--header-bg) 94%, var(--accent-color) 6%);
+}
+
+.github-import-heading {
+  flex: 1;
+  min-width: 0;
 }
 
-.github-import-modal-body {
+.github-import-heading-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 38px;
+  height: 38px;
+  flex: 0 0 38px;
+  border: 1px solid color-mix(in srgb, var(--accent-color) 24%, var(--border-color));
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--accent-color) 10%, var(--header-bg));
+  color: var(--text-color);
+  font-size: 20px;
+}
+
+.github-import-url-section {
   display: flex;
   flex-direction: column;
   gap: 8px;
-  max-height: min(56vh, 460px);
-  overflow: auto;
-  padding: 16px;
+}
+
+.github-import-url-help {
+  margin: 0;
+  color: var(--text-secondary, #57606a);
+  font-size: var(--ui-font-md);
+  line-height: 1.5;
+}
+
+#github-import-modal .github-import-modal-body {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  min-height: 0;
+  max-height: min(62vh, 520px);
+  overflow: hidden;
+  padding: 20px;
+}
+
+#github-import-modal.is-file-selection .github-import-modal-body {
+  flex: 1 1 auto;
+  max-height: none;
 }
 
 #github-import-url,
 #github-import-file-select {
-  min-height: 36px;
-  padding: 7px 10px;
-  font-size: var(--ui-font-md);
+  min-height: 44px;
+  padding: 9px 12px;
+  font-size: var(--ui-font-lg);
 }
 
 #github-import-file-select {
   min-height: 180px;
 }
 
+.github-import-filter-row {
+  position: relative;
+  flex: 0 0 auto;
+  align-items: center;
+}
+
+.github-import-filter-row > .lucide {
+  position: absolute;
+  left: 12px;
+  z-index: 1;
+  color: var(--text-secondary, #57606a);
+  font-size: 16px;
+  pointer-events: none;
+}
+
+#github-import-filter {
+  width: 100%;
+  min-height: 40px;
+  padding: 8px 12px 8px 38px;
+}
+
 .github-import-tree {
-  max-height: 320px;
+  flex: 1 1 auto;
+  min-height: 260px;
+  max-height: 440px;
   overflow: auto;
   border: 1px solid var(--border-color);
-  border-radius: 10px;
-  padding: 12px;
-  background: var(--bg-color);
+  border-radius: 12px;
+  padding: 8px;
+  background: var(--editor-bg);
+  overscroll-behavior: contain;
+  scrollbar-gutter: stable;
+}
+
+#github-import-modal.is-file-selection .github-import-tree {
+  min-height: 0;
+  max-height: none;
 }
 
 .github-import-selection-toolbar {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  gap: 8px;
-  padding: 8px 10px;
+  gap: 12px;
+  flex: 0 0 auto;
+  padding: 9px 10px 9px 12px;
   border: 1px solid var(--border-color);
-  border-radius: 8px;
-  background: var(--button-bg);
+  border-radius: 10px;
+  background: color-mix(in srgb, var(--button-bg) 88%, var(--accent-color) 12%);
+}
+
+.github-import-selection-summary {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  min-width: 0;
 }
 
 .github-import-selected-count {
   font-size: var(--ui-font-md);
   font-weight: 600;
   color: var(--text-color);
+  white-space: nowrap;
+}
+
+.github-import-summary-divider {
+  width: 1px;
+  height: 16px;
+  background: var(--border-color);
+}
+
+.github-import-available-count {
+  color: var(--text-secondary, #57606a);
+  font-size: var(--ui-font-md);
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
 }
 
 .github-import-tree ul {
   list-style: none;
   margin: 0;
-  padding-left: 18px;
+  padding-left: 20px;
 }
 
 .github-import-tree>ul {
-  padding-left: 4px;
+  padding-left: 0;
 }
 
 .github-import-tree li {
-  margin: 2px 0;
+  margin: 1px 0;
 }
 
 .github-tree-folder-label {
-  display: inline-block;
-  font-size: 14px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 32px;
+  padding: 5px 8px;
+  font-size: var(--ui-font-md);
+  font-weight: 600;
   color: var(--text-secondary, #57606a);
-  margin-bottom: 4px;
+}
+
+.github-tree-folder-label .lucide,
+.github-tree-file-btn .lucide {
+  flex: 0 0 auto;
+  font-size: 15px;
+}
+
+.github-tree-folder-label .lucide {
+  color: color-mix(in srgb, var(--accent-color) 72%, var(--text-secondary));
 }
 
 .github-tree-file-btn {
-  border: 0;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 36px;
+  border: 1px solid transparent;
   background: transparent;
   color: var(--text-color);
   cursor: pointer;
-  padding: 6px 8px;
-  border-radius: 6px;
+  padding: 7px 9px;
+  border-radius: 8px;
   text-align: left;
   width: 100%;
-  font-size: 14px;
+  font-size: var(--ui-font-md);
+  transition: background-color 0.15s ease, border-color 0.15s ease, color 0.15s ease;
+}
+
+.github-tree-file-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-tree-file-btn:hover {
+  background: var(--button-hover);
 }
 
-.github-tree-file-btn:hover,
 .github-tree-file-btn:focus-visible {
+  border-color: var(--accent-color);
   background: var(--button-hover);
-  outline: none;
+  outline: 2px solid color-mix(in srgb, var(--accent-color) 35%, transparent);
+  outline-offset: 1px;
 }
 
 .github-tree-file-btn.is-selected {
   background: rgba(56, 139, 253, 0.14);
+  border-color: color-mix(in srgb, var(--accent-color) 36%, transparent);
   color: var(--accent-color);
 }
 
+.github-import-empty-state {
+  display: flex;
+  min-height: 180px;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  padding: 24px;
+  color: var(--text-secondary, #57606a);
+  text-align: center;
+}
+
+.github-import-empty-state .lucide {
+  font-size: 24px;
+}
+
+.github-import-empty-state p {
+  margin: 0;
+}
+
 #github-import-modal .reset-modal-actions {
   gap: 8px;
-  padding: 10px 16px;
+  padding: 12px 20px;
   border-top: 1px solid var(--border-color);
+  background: color-mix(in srgb, var(--header-bg) 96%, var(--border-color) 4%);
 }
 
 #github-import-modal .reset-modal-btn {
-  min-height: 34px;
-  padding: 7px 14px;
+  min-height: 38px;
+  padding: 8px 16px;
   font-size: var(--ui-font-md);
 }
 
@@ -6073,9 +6226,31 @@ a:focus {
     gap: 0;
   }
 
-  .github-import-selection-toolbar {
-    flex-direction: column;
-    align-items: stretch;
+  #github-import-modal.is-file-selection .reset-modal-box {
+    height: calc(100dvh - 24px);
+  }
+
+  #github-import-modal .modal-header {
+    padding: 12px 14px;
+  }
+
+  .github-import-heading-icon {
+    width: 36px;
+    height: 36px;
+    flex-basis: 36px;
+  }
+
+  #github-import-modal .github-import-modal-body {
+    padding: 14px;
+  }
+
+  .github-import-selection-summary {
+    flex-wrap: wrap;
+    row-gap: 2px;
+  }
+
+  .github-import-summary-divider {
+    display: none;
   }
 
   #github-import-modal .reset-modal-message {
@@ -6084,14 +6259,35 @@ a:focus {
 
   #github-import-modal .reset-modal-actions {
     flex-direction: row;
+    padding: 10px 14px;
   }
 
   #github-import-modal .reset-modal-btn {
-    width: auto;
+    min-width: 0;
+    min-height: 44px;
+  }
+
+  #github-import-modal .reset-modal-actions .reset-modal-btn {
+    flex: 1;
+  }
+
+  #github-import-filter {
+    min-height: 44px;
+    font-size: 16px;
+  }
+
+  .github-tree-file-btn {
     min-height: 44px;
   }
 }
 
+@media (prefers-reduced-motion: reduce) {
+  #github-import-modal .reset-modal-box,
+  .github-tree-file-btn {
+    transition: none;
+  }
+}
+
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;
diff --git a/wiki/Configuration.md b/wiki/Configuration.md
index 27745d5f..24d89016 100644
--- a/wiki/Configuration.md
+++ b/wiki/Configuration.md
@@ -72,7 +72,7 @@ When running inside Neutralino, dynamic library URLs are rewritten to local `/li
 | Minimum split pane width | 20% |
 | Line-height cache size | 5,000 entries |
 | Local Markdown import | 10 MB per file |
-| GitHub importer shown files | 30 |
+| GitHub importer shown files | All Markdown files found |
 | Share URL warning ceiling | 32,000 characters |
 | Legacy share URL ceiling | 4,096 characters |
 | Server share threshold | 3,000 bytes |
diff --git a/wiki/FAQ.md b/wiki/FAQ.md
index 2a8d2721..ab07e3c7 100644
--- a/wiki/FAQ.md
+++ b/wiki/FAQ.md
@@ -120,7 +120,7 @@ Yes. It supports regular expressions, capture replacements, preserve-case replac
 
 ### Can I import a private GitHub repository?
 
-No. The importer uses public GitHub URLs and does not request a token. Repository and Folder results show at most 30 Markdown files.
+No. The importer uses public GitHub URLs and does not request a token. Repository and folder results show every Markdown file found.
 
 ### Which PDF option should I use?
 
diff --git a/wiki/Features.md b/wiki/Features.md
index a667f82f..fea29582 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -267,7 +267,7 @@ GitHub import:
 - Repository or folder URLs query GitHub's public API to find Markdown files.
 - The modal shows a tree and supports selecting multiple files.
 - Imports create a repository-named folder and reproduce each selected file's nested GitHub directory path inside it.
-- Only the first 30 Markdown files are shown if a repository contains more.
+- Every Markdown file found is shown, with a path filter for navigating large repositories.
 - Requests are rate-limited by the app to avoid hammering GitHub.
 - Selected files are fetched as raw content and opened as separate tabs.
 
@@ -552,7 +552,7 @@ Security limitations:
 - Browser storage quotas can reject very large saved workspaces.
 - Markdown Viewer does not impose a document-count limit; available storage and operating-system/filesystem constraints still apply.
 - An individual local Markdown import is limited to 10 MB.
-- The GitHub importer shows a maximum of 30 Markdown files.
+- The GitHub importer shows every Markdown file found in the selected public repository or folder.
 - Stored Share Snapshot content is limited to 8,000,000 characters. Managed media remains separate and travels as short HTTPS links.
 - The current Share Snapshot UI does not expose its API deletion token, so UI-created stored snapshots normally remain until their 90-day expiry.
 - STL source is limited to 2 MiB and parsed geometry to 300,000 vertices.
diff --git a/wiki/Troubleshooting.md b/wiki/Troubleshooting.md
index d95fa3d8..584ece97 100644
--- a/wiki/Troubleshooting.md
+++ b/wiki/Troubleshooting.md
@@ -79,7 +79,7 @@ Extension matching is case-insensitive. Rename a plain-text file to `.md` only w
 
 - Use a public `github.com` repository, tree, blob, or `raw.githubusercontent.com` Markdown URL.
 - Private repositories are unsupported because Markdown Viewer does not request a token.
-- Repository and folder results show only the first 30 Markdown files.
+- Repository and folder results show every Markdown file found. Use the file filter in the importer to narrow large repository trees.
 - Check GitHub API rate-limit and network responses.
 - Confirm that CSP allows `api.github.com` and `raw.githubusercontent.com`.
 - For a direct file, verify that the URL returns text rather than a login or HTML error page.
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index b4bf5e05..3bf4ea0d 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -119,7 +119,7 @@ Use Import > From GitHub and paste one of these URL types:
 - `https://github.com/owner/repo/blob/main/README.md`
 - `https://raw.githubusercontent.com/owner/repo/main/README.md`
 
-Direct Markdown file URLs import immediately. Repository and folder URLs query GitHub's public API, show a tree of Markdown files, and let you import selected files into separate tabs. Selected files are placed in a repository-named Explorer folder with their nested GitHub directory paths preserved. If more than 30 Markdown files exist, only the first 30 are shown.
+Direct Markdown file URLs import immediately. Repository and folder URLs query GitHub's public API, show a searchable tree containing every Markdown file found, and let you import selected files into separate tabs. Selected files are placed in a repository-named Explorer folder with their nested GitHub directory paths preserved.
 
 GitHub import sends the repository/path request to GitHub and only works for public content. The app does not ask for GitHub credentials.
 

From e13f13129db0bc08ac66e1d6940c0dbc04638eb7 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 11:25:03 +0530
Subject: [PATCH 02/10] fix(github): restore compact importer UI

---
 CHANGELOG.md                       |   1 -
 README.md                          |   2 +-
 desktop-app/resources/index.html   |  25 +--
 desktop-app/resources/js/script.js | 116 +-----------
 desktop-app/resources/styles.css   | 272 ++++-------------------------
 index.html                         |  25 +--
 script.js                          | 116 +-----------
 styles.css                         | 272 ++++-------------------------
 wiki/Features.md                   |   2 +-
 wiki/Troubleshooting.md            |   2 +-
 wiki/Usage-Guide.md                |   2 +-
 11 files changed, 104 insertions(+), 731 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c7890c5..d7d8ff38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,7 +38,6 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 
 - Removed the 30-file display cap so repository and folder results expose every Markdown file found.
 - Added complete subtree traversal when GitHub marks a recursive repository tree response as truncated.
-- Expanded the file-selection modal with a searchable, responsive tree, full and filtered counts, and more visible space on desktop and mobile.
 
 ---
 
diff --git a/README.md b/README.md
index 85a106db..51b906f1 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Importing a workspace backup permanently replaces the current workspace after confirmation.
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
-- The public GitHub importer shows every Markdown file found in a repository or folder result, with search for large file trees.
+- The public GitHub importer shows every Markdown file found in a repository or folder result.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
 - Live Share allows up to 64 WebSocket participants and 8 MB per live message.
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index c84a912c..10bfec0b 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1279,34 +1279,21 @@ <h2 class="about-title">Markdown Viewer</h2>
         <div id="github-import-modal" class="reset-modal-overlay modal-overlay" role="dialog" aria-modal="true" aria-labelledby="github-import-title" aria-hidden="true" style="display:none;">
           <div class="reset-modal-box github-import-modal-box app-modal-box modal-box">
             <div class="modal-header">
-              <span class="github-import-heading-icon" aria-hidden="true"><i class="bi bi-github"></i></span>
-              <div class="github-import-heading">
+              <div>
                 <p id="github-import-title" class="reset-modal-message">Import Markdown from GitHub</p>
-                <p id="github-import-subtitle" class="modal-subtext">Paste a GitHub file, folder, or repository URL.</p>
+                <p class="modal-subtext">Paste a GitHub file or repository URL.</p>
               </div>
               <button type="button" class="modal-close-btn" id="github-import-close" aria-label="Close GitHub import dialog"><i class="lucide lucide-x" aria-hidden="true"></i></button>
             </div>
             <div class="modal-body github-import-modal-body">
-              <div id="github-import-url-section" class="github-import-url-section">
-                <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
-                <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repository" autocomplete="url" spellcheck="false" />
-                <p class="github-import-url-help">Public repositories are supported. You can import a single file or choose any Markdown files from a repository.</p>
-              </div>
+              <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
+              <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
-              <div id="github-import-filter-row" class="github-import-filter-row" style="display:none;">
-                <i class="lucide lucide-search" aria-hidden="true"></i>
-                <label class="visually-hidden" for="github-import-filter">Filter Markdown files</label>
-                <input type="search" id="github-import-filter" class="rename-modal-input" placeholder="Filter files by name or path" autocomplete="off" spellcheck="false" />
-              </div>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
-                <div class="github-import-selection-summary" aria-live="polite">
-                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                  <span class="github-import-summary-divider" aria-hidden="true"></span>
-                  <span id="github-import-available-count" class="github-import-available-count">0 files</span>
-                </div>
+                <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
                 <button type="button" class="reset-modal-btn" id="github-import-select-all">Select all</button>
               </div>
-              <div id="github-import-tree" class="github-import-tree" role="group" aria-label="Markdown files in repository" style="display:none;"></div>
+              <div id="github-import-tree" class="github-import-tree" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
             </div>
             <div class="reset-modal-actions">
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index c85b97a6..a2dca312 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -534,16 +534,11 @@ document.addEventListener("DOMContentLoaded", async function () {
   const mobileLiveShareParticipants = document.getElementById("mobile-live-share-participants");
   const githubImportModal = document.getElementById("github-import-modal");
   const githubImportTitle = document.getElementById("github-import-title");
-  const githubImportSubtitle = document.getElementById("github-import-subtitle");
-  const githubImportUrlSection = document.getElementById("github-import-url-section");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
-  const githubImportFilterRow = document.getElementById("github-import-filter-row");
-  const githubImportFilterInput = document.getElementById("github-import-filter");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
-  const githubImportAvailableCount = document.getElementById("github-import-available-count");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -11185,7 +11180,6 @@ ${selector} .arrowheadPath {
   }
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   let lastGitHubImportRequestAt = 0;
-  let githubImportFilterFrame = 0;
   const selectedGitHubImportPaths = new Set();
   let availableGitHubImportPaths = [];
 
@@ -11421,16 +11415,7 @@ ${selector} .arrowheadPath {
   function updateGitHubImportSelectedCount() {
     if (!githubImportSelectedCount) return;
     const count = selectedGitHubImportPaths.size;
-    githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
-  }
-
-  function updateGitHubImportAvailableCount(visibleCount) {
-    if (!githubImportAvailableCount) return;
-    const total = availableGitHubImportPaths.length;
-    const visible = typeof visibleCount === "number" ? visibleCount : total;
-    githubImportAvailableCount.textContent = visible === total
-      ? `${total.toLocaleString()} file${total === 1 ? "" : "s"}`
-      : `${visible.toLocaleString()} of ${total.toLocaleString()} files`;
+    githubImportSelectedCount.textContent = `${count} selected`;
   }
 
   function updateGitHubSelectAllButtonLabel() {
@@ -11471,40 +11456,18 @@ ${selector} .arrowheadPath {
 
   function renderGitHubImportTree(paths) {
     if (!githubImportTree || !githubImportFileSelect) return;
-    const visiblePaths = Array.from(paths || []);
-    updateGitHubImportAvailableCount(visiblePaths.length);
-    if (!visiblePaths.length) {
-      const emptyState = document.createElement("div");
-      emptyState.className = "github-import-empty-state";
-      const emptyIcon = document.createElement("i");
-      emptyIcon.className = "lucide lucide-search";
-      emptyIcon.setAttribute("aria-hidden", "true");
-      const emptyText = document.createElement("p");
-      emptyText.textContent = "No Markdown files match this filter.";
-      emptyState.append(emptyIcon, emptyText);
-      githubImportTree.replaceChildren(emptyState);
-      return;
-    }
-
+    githubImportTree.innerHTML = "";
     const tree = buildMarkdownFileTree(paths);
 
     const createTreeBranch = function(node, parentPath) {
       const list = document.createElement("ul");
-      list.setAttribute("role", "list");
       const folderNames = Object.keys(node.folders).sort((a, b) => a.localeCompare(b));
       folderNames.forEach((folderName) => {
         const folderPath = parentPath ? `${parentPath}/${folderName}` : folderName;
         const item = document.createElement("li");
-        item.setAttribute("role", "listitem");
         const folderLabel = document.createElement("span");
         folderLabel.className = "github-tree-folder-label";
-        folderLabel.title = folderPath;
-        const folderIcon = document.createElement("i");
-        folderIcon.className = "lucide lucide-folder";
-        folderIcon.setAttribute("aria-hidden", "true");
-        const folderText = document.createElement("span");
-        folderText.textContent = folderName;
-        folderLabel.append(folderIcon, folderText);
+        folderLabel.textContent = `📁 ${folderName}`;
         item.appendChild(folderLabel);
         item.appendChild(createTreeBranch(node.folders[folderName], folderPath));
         list.appendChild(item);
@@ -11514,21 +11477,12 @@ ${selector} .arrowheadPath {
         .sort((a, b) => a.path.localeCompare(b.path))
         .forEach((file) => {
           const fileItem = document.createElement("li");
-          fileItem.setAttribute("role", "listitem");
           const fileButton = document.createElement("button");
           fileButton.type = "button";
           fileButton.className = "github-tree-file-btn";
           fileButton.dataset.path = file.path;
           fileButton.setAttribute("aria-pressed", "false");
-          fileButton.setAttribute("aria-label", file.path);
-          fileButton.title = file.path;
-          const fileIcon = document.createElement("i");
-          fileIcon.className = "lucide lucide-file-text";
-          fileIcon.setAttribute("aria-hidden", "true");
-          const fileName = document.createElement("span");
-          fileName.className = "github-tree-file-name";
-          fileName.textContent = file.name;
-          fileButton.append(fileIcon, fileName);
+          fileButton.textContent = `📄 ${file.name}`;
           fileButton.addEventListener("click", function() {
             toggleGitHubSelectedPath(file.path);
           });
@@ -11539,28 +11493,10 @@ ${selector} .arrowheadPath {
       return list;
     };
 
-    githubImportTree.replaceChildren(createTreeBranch(tree, ""));
+    githubImportTree.appendChild(createTreeBranch(tree, ""));
     syncGitHubSelectionToButtons();
   }
 
-  function applyGitHubImportFilter() {
-    const query = githubImportFilterInput ? githubImportFilterInput.value.trim().toLocaleLowerCase() : "";
-    const filteredPaths = query
-      ? availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query))
-      : availableGitHubImportPaths;
-    renderGitHubImportTree(filteredPaths);
-  }
-
-  function scheduleGitHubImportFilter() {
-    if (githubImportFilterFrame) {
-      cancelAnimationFrame(githubImportFilterFrame);
-    }
-    githubImportFilterFrame = requestAnimationFrame(function() {
-      githubImportFilterFrame = 0;
-      applyGitHubImportFilter();
-    });
-  }
-
   function setGitHubImportLoading(isLoading) {
     if (!githubImportSubmitBtn) return;
     if (isLoading) {
@@ -11592,11 +11528,6 @@ ${selector} .arrowheadPath {
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
-    if (githubImportSubtitle) {
-      githubImportSubtitle.textContent = "Paste a GitHub file, folder, or repository URL.";
-    }
-    githubImportModal.classList.remove("is-file-selection");
-    if (githubImportUrlSection) githubImportUrlSection.style.display = "flex";
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
@@ -11604,17 +11535,10 @@ ${selector} .arrowheadPath {
     githubImportFileSelect.innerHTML = "";
     githubImportFileSelect.style.display = "none";
     githubImportFileSelect.disabled = false;
-    if (githubImportFilterFrame) {
-      cancelAnimationFrame(githubImportFilterFrame);
-      githubImportFilterFrame = 0;
-    }
-    if (githubImportFilterInput) githubImportFilterInput.value = "";
-    if (githubImportFilterRow) githubImportFilterRow.style.display = "none";
     if (githubImportSelectionToolbar) {
       githubImportSelectionToolbar.style.display = "none";
     }
     availableGitHubImportPaths = [];
-    updateGitHubImportAvailableCount();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -11700,7 +11624,6 @@ ${selector} .arrowheadPath {
 
       // Render hierarchical visual skeleton tree while the list is loading
       if (githubImportTree) {
-        githubImportModal.classList.add("is-file-selection");
         renderGitHubImportTreeSkeleton();
         githubImportTree.style.display = "block";
       }
@@ -11714,7 +11637,6 @@ ${selector} .arrowheadPath {
       });
 
       if (!files.length) {
-        githubImportModal.classList.remove("is-file-selection");
         if (githubImportTree) {
           githubImportTree.innerHTML = "";
           githubImportTree.style.display = "none";
@@ -11732,13 +11654,9 @@ ${selector} .arrowheadPath {
       }
 
       githubImportFileSelect.innerHTML = "";
-      if (githubImportUrlSection) githubImportUrlSection.style.display = "none";
       githubImportUrlInput.style.display = "none";
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
       githubImportFileSelect.style.display = "none";
-      if (githubImportFilterRow) {
-        githubImportFilterRow.style.display = "flex";
-      }
       if (githubImportSelectionToolbar) {
         githubImportSelectionToolbar.style.display = "flex";
       }
@@ -11752,26 +11670,17 @@ ${selector} .arrowheadPath {
       // Announce load complete
       announceToScreenReader("GitHub files loaded. " + files.length + " files available in the tree.");
 
-      setGitHubImportMessage(`All ${files.length.toLocaleString()} Markdown files are available.`, { isError: false });
+      setGitHubImportMessage("");
       if (githubImportTitle) {
         githubImportTitle.textContent = "Select Markdown file(s) to import";
       }
-      if (githubImportSubtitle) {
-        githubImportSubtitle.textContent = "Choose any files below. Repository folder paths will be preserved.";
-      }
       githubImportSubmitBtn.dataset.step = "select";
       githubImportSubmitBtn.dataset.owner = parsed.owner;
       githubImportSubmitBtn.dataset.repo = parsed.repo;
       githubImportSubmitBtn.dataset.ref = ref;
       githubImportSubmitBtn.textContent = "Import Selected";
-      if (githubImportFilterInput) {
-        requestAnimationFrame(function() {
-          githubImportFilterInput.focus();
-        });
-      }
     } catch (error) {
       console.error("GitHub import failed:", error);
-      githubImportModal.classList.remove("is-file-selection");
       setGitHubImportMessage("GitHub import failed: " + error.message);
       announceToScreenReader("GitHub import failed.");
       if (githubImportTree) {
@@ -18001,19 +17910,6 @@ ${selector} .arrowheadPath {
   if (githubImportFileSelect) {
     githubImportFileSelect.addEventListener("keydown", handleGitHubImportInputKeydown);
   }
-  if (githubImportFilterInput) {
-    githubImportFilterInput.addEventListener("input", scheduleGitHubImportFilter);
-    githubImportFilterInput.addEventListener("keydown", function(e) {
-      if (e.key !== "Escape") return;
-      if (githubImportFilterInput.value) {
-        e.stopPropagation();
-        githubImportFilterInput.value = "";
-        applyGitHubImportFilter();
-      } else {
-        closeGitHubImportModal();
-      }
-    });
-  }
   if (githubImportSelectAllBtn) {
     githubImportSelectAllBtn.addEventListener("click", function() {
       const allPaths = availableGitHubImportPaths.slice();
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 21fab6c2..52f2e28c 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -5932,8 +5932,7 @@ a:focus {
 
 .github-import-error {
   margin: 0;
-  flex: 0 0 auto;
-  font-size: var(--ui-font-md);
+  font-size: 12px;
   color: var(--color-danger-fg, #d73a49);
   text-align: left;
   line-height: 1.5;
@@ -5944,19 +5943,12 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(94vw, 640px);
-  max-width: 640px;
+  width: min(92vw, 520px);
+  max-width: 520px;
   min-width: 0;
   padding: 0;
   gap: 0;
   overflow: hidden;
-  transition: width 0.2s ease, max-width 0.2s ease, height 0.2s ease, transform 0.2s ease, opacity 0.2s ease;
-}
-
-#github-import-modal.is-file-selection .reset-modal-box {
-  width: min(96vw, 960px);
-  max-width: 960px;
-  height: min(88dvh, 820px);
 }
 
 #github-import-modal .reset-modal-message {
@@ -5966,254 +5958,109 @@ a:focus {
 }
 
 #github-import-modal .modal-header {
-  justify-content: flex-start;
-  padding: 16px 20px;
+  padding: 14px 16px;
   border-bottom: 1px solid var(--border-color);
-  background: color-mix(in srgb, var(--header-bg) 94%, var(--accent-color) 6%);
-}
-
-.github-import-heading {
-  flex: 1;
-  min-width: 0;
 }
 
-.github-import-heading-icon {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 38px;
-  height: 38px;
-  flex: 0 0 38px;
-  border: 1px solid color-mix(in srgb, var(--accent-color) 24%, var(--border-color));
-  border-radius: 10px;
-  background: color-mix(in srgb, var(--accent-color) 10%, var(--header-bg));
-  color: var(--text-color);
-  font-size: 20px;
-}
-
-.github-import-url-section {
+.github-import-modal-body {
   display: flex;
   flex-direction: column;
   gap: 8px;
-}
-
-.github-import-url-help {
-  margin: 0;
-  color: var(--text-secondary, #57606a);
-  font-size: var(--ui-font-md);
-  line-height: 1.5;
-}
-
-#github-import-modal .github-import-modal-body {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  min-height: 0;
-  max-height: min(62vh, 520px);
-  overflow: hidden;
-  padding: 20px;
-}
-
-#github-import-modal.is-file-selection .github-import-modal-body {
-  flex: 1 1 auto;
-  max-height: none;
+  max-height: min(56vh, 460px);
+  overflow: auto;
+  padding: 16px;
 }
 
 #github-import-url,
 #github-import-file-select {
-  min-height: 44px;
-  padding: 9px 12px;
-  font-size: var(--ui-font-lg);
+  min-height: 36px;
+  padding: 7px 10px;
+  font-size: var(--ui-font-md);
 }
 
 #github-import-file-select {
   min-height: 180px;
 }
 
-.github-import-filter-row {
-  position: relative;
-  flex: 0 0 auto;
-  align-items: center;
-}
-
-.github-import-filter-row > .lucide {
-  position: absolute;
-  left: 12px;
-  z-index: 1;
-  color: var(--text-secondary, #57606a);
-  font-size: 16px;
-  pointer-events: none;
-}
-
-#github-import-filter {
-  width: 100%;
-  min-height: 40px;
-  padding: 8px 12px 8px 38px;
-}
-
 .github-import-tree {
-  flex: 1 1 auto;
-  min-height: 260px;
-  max-height: 440px;
+  max-height: 320px;
   overflow: auto;
   border: 1px solid var(--border-color);
-  border-radius: 12px;
-  padding: 8px;
-  background: var(--editor-bg);
-  overscroll-behavior: contain;
-  scrollbar-gutter: stable;
-}
-
-#github-import-modal.is-file-selection .github-import-tree {
-  min-height: 0;
-  max-height: none;
+  border-radius: 10px;
+  padding: 12px;
+  background: var(--bg-color);
 }
 
 .github-import-selection-toolbar {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  gap: 12px;
-  flex: 0 0 auto;
-  padding: 9px 10px 9px 12px;
+  gap: 8px;
+  padding: 8px 10px;
   border: 1px solid var(--border-color);
-  border-radius: 10px;
-  background: color-mix(in srgb, var(--button-bg) 88%, var(--accent-color) 12%);
-}
-
-.github-import-selection-summary {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  min-width: 0;
+  border-radius: 8px;
+  background: var(--button-bg);
 }
 
 .github-import-selected-count {
   font-size: var(--ui-font-md);
   font-weight: 600;
   color: var(--text-color);
-  white-space: nowrap;
-}
-
-.github-import-summary-divider {
-  width: 1px;
-  height: 16px;
-  background: var(--border-color);
-}
-
-.github-import-available-count {
-  color: var(--text-secondary, #57606a);
-  font-size: var(--ui-font-md);
-  font-variant-numeric: tabular-nums;
-  white-space: nowrap;
 }
 
 .github-import-tree ul {
   list-style: none;
   margin: 0;
-  padding-left: 20px;
+  padding-left: 18px;
 }
 
 .github-import-tree>ul {
-  padding-left: 0;
+  padding-left: 4px;
 }
 
 .github-import-tree li {
-  margin: 1px 0;
+  margin: 2px 0;
 }
 
 .github-tree-folder-label {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-height: 32px;
-  padding: 5px 8px;
-  font-size: var(--ui-font-md);
-  font-weight: 600;
+  display: inline-block;
+  font-size: 14px;
   color: var(--text-secondary, #57606a);
-}
-
-.github-tree-folder-label .lucide,
-.github-tree-file-btn .lucide {
-  flex: 0 0 auto;
-  font-size: 15px;
-}
-
-.github-tree-folder-label .lucide {
-  color: color-mix(in srgb, var(--accent-color) 72%, var(--text-secondary));
+  margin-bottom: 4px;
 }
 
 .github-tree-file-btn {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-height: 36px;
-  border: 1px solid transparent;
+  border: 0;
   background: transparent;
   color: var(--text-color);
   cursor: pointer;
-  padding: 7px 9px;
-  border-radius: 8px;
+  padding: 6px 8px;
+  border-radius: 6px;
   text-align: left;
   width: 100%;
-  font-size: var(--ui-font-md);
-  transition: background-color 0.15s ease, border-color 0.15s ease, color 0.15s ease;
-}
-
-.github-tree-file-name {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.github-tree-file-btn:hover {
-  background: var(--button-hover);
+  font-size: 14px;
 }
 
+.github-tree-file-btn:hover,
 .github-tree-file-btn:focus-visible {
-  border-color: var(--accent-color);
   background: var(--button-hover);
-  outline: 2px solid color-mix(in srgb, var(--accent-color) 35%, transparent);
-  outline-offset: 1px;
+  outline: none;
 }
 
 .github-tree-file-btn.is-selected {
   background: rgba(56, 139, 253, 0.14);
-  border-color: color-mix(in srgb, var(--accent-color) 36%, transparent);
   color: var(--accent-color);
 }
 
-.github-import-empty-state {
-  display: flex;
-  min-height: 180px;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 10px;
-  padding: 24px;
-  color: var(--text-secondary, #57606a);
-  text-align: center;
-}
-
-.github-import-empty-state .lucide {
-  font-size: 24px;
-}
-
-.github-import-empty-state p {
-  margin: 0;
-}
-
 #github-import-modal .reset-modal-actions {
   gap: 8px;
-  padding: 12px 20px;
+  padding: 10px 16px;
   border-top: 1px solid var(--border-color);
-  background: color-mix(in srgb, var(--header-bg) 96%, var(--border-color) 4%);
 }
 
 #github-import-modal .reset-modal-btn {
-  min-height: 38px;
-  padding: 8px 16px;
+  min-height: 34px;
+  padding: 7px 14px;
   font-size: var(--ui-font-md);
 }
 
@@ -6226,31 +6073,9 @@ a:focus {
     gap: 0;
   }
 
-  #github-import-modal.is-file-selection .reset-modal-box {
-    height: calc(100dvh - 24px);
-  }
-
-  #github-import-modal .modal-header {
-    padding: 12px 14px;
-  }
-
-  .github-import-heading-icon {
-    width: 36px;
-    height: 36px;
-    flex-basis: 36px;
-  }
-
-  #github-import-modal .github-import-modal-body {
-    padding: 14px;
-  }
-
-  .github-import-selection-summary {
-    flex-wrap: wrap;
-    row-gap: 2px;
-  }
-
-  .github-import-summary-divider {
-    display: none;
+  .github-import-selection-toolbar {
+    flex-direction: column;
+    align-items: stretch;
   }
 
   #github-import-modal .reset-modal-message {
@@ -6259,35 +6084,14 @@ a:focus {
 
   #github-import-modal .reset-modal-actions {
     flex-direction: row;
-    padding: 10px 14px;
   }
 
   #github-import-modal .reset-modal-btn {
-    min-width: 0;
-    min-height: 44px;
-  }
-
-  #github-import-modal .reset-modal-actions .reset-modal-btn {
-    flex: 1;
-  }
-
-  #github-import-filter {
-    min-height: 44px;
-    font-size: 16px;
-  }
-
-  .github-tree-file-btn {
+    width: auto;
     min-height: 44px;
   }
 }
 
-@media (prefers-reduced-motion: reduce) {
-  #github-import-modal .reset-modal-box,
-  .github-tree-file-btn {
-    transition: none;
-  }
-}
-
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;
diff --git a/index.html b/index.html
index d639afac..23e3e69d 100644
--- a/index.html
+++ b/index.html
@@ -1372,34 +1372,21 @@ <h2 class="about-title">Markdown Viewer</h2>
         <div id="github-import-modal" class="reset-modal-overlay modal-overlay" role="dialog" aria-modal="true" aria-labelledby="github-import-title" aria-hidden="true" style="display:none;">
           <div class="reset-modal-box github-import-modal-box app-modal-box modal-box">
             <div class="modal-header">
-              <span class="github-import-heading-icon" aria-hidden="true"><i class="bi bi-github"></i></span>
-              <div class="github-import-heading">
+              <div>
                 <p id="github-import-title" class="reset-modal-message">Import Markdown from GitHub</p>
-                <p id="github-import-subtitle" class="modal-subtext">Paste a GitHub file, folder, or repository URL.</p>
+                <p class="modal-subtext">Paste a GitHub file or repository URL.</p>
               </div>
               <button type="button" class="modal-close-btn" id="github-import-close" aria-label="Close GitHub import dialog"><i class="lucide lucide-x" aria-hidden="true"></i></button>
             </div>
             <div class="modal-body github-import-modal-body">
-              <div id="github-import-url-section" class="github-import-url-section">
-                <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
-                <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repository" autocomplete="url" spellcheck="false" />
-                <p class="github-import-url-help">Public repositories are supported. You can import a single file or choose any Markdown files from a repository.</p>
-              </div>
+              <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
+              <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
-              <div id="github-import-filter-row" class="github-import-filter-row" style="display:none;">
-                <i class="lucide lucide-search" aria-hidden="true"></i>
-                <label class="visually-hidden" for="github-import-filter">Filter Markdown files</label>
-                <input type="search" id="github-import-filter" class="rename-modal-input" placeholder="Filter files by name or path" autocomplete="off" spellcheck="false" />
-              </div>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
-                <div class="github-import-selection-summary" aria-live="polite">
-                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                  <span class="github-import-summary-divider" aria-hidden="true"></span>
-                  <span id="github-import-available-count" class="github-import-available-count">0 files</span>
-                </div>
+                <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
                 <button type="button" class="reset-modal-btn" id="github-import-select-all">Select all</button>
               </div>
-              <div id="github-import-tree" class="github-import-tree" role="group" aria-label="Markdown files in repository" style="display:none;"></div>
+              <div id="github-import-tree" class="github-import-tree" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
             </div>
             <div class="reset-modal-actions">
diff --git a/script.js b/script.js
index c85b97a6..a2dca312 100644
--- a/script.js
+++ b/script.js
@@ -534,16 +534,11 @@ document.addEventListener("DOMContentLoaded", async function () {
   const mobileLiveShareParticipants = document.getElementById("mobile-live-share-participants");
   const githubImportModal = document.getElementById("github-import-modal");
   const githubImportTitle = document.getElementById("github-import-title");
-  const githubImportSubtitle = document.getElementById("github-import-subtitle");
-  const githubImportUrlSection = document.getElementById("github-import-url-section");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
-  const githubImportFilterRow = document.getElementById("github-import-filter-row");
-  const githubImportFilterInput = document.getElementById("github-import-filter");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
-  const githubImportAvailableCount = document.getElementById("github-import-available-count");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -11185,7 +11180,6 @@ ${selector} .arrowheadPath {
   }
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   let lastGitHubImportRequestAt = 0;
-  let githubImportFilterFrame = 0;
   const selectedGitHubImportPaths = new Set();
   let availableGitHubImportPaths = [];
 
@@ -11421,16 +11415,7 @@ ${selector} .arrowheadPath {
   function updateGitHubImportSelectedCount() {
     if (!githubImportSelectedCount) return;
     const count = selectedGitHubImportPaths.size;
-    githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
-  }
-
-  function updateGitHubImportAvailableCount(visibleCount) {
-    if (!githubImportAvailableCount) return;
-    const total = availableGitHubImportPaths.length;
-    const visible = typeof visibleCount === "number" ? visibleCount : total;
-    githubImportAvailableCount.textContent = visible === total
-      ? `${total.toLocaleString()} file${total === 1 ? "" : "s"}`
-      : `${visible.toLocaleString()} of ${total.toLocaleString()} files`;
+    githubImportSelectedCount.textContent = `${count} selected`;
   }
 
   function updateGitHubSelectAllButtonLabel() {
@@ -11471,40 +11456,18 @@ ${selector} .arrowheadPath {
 
   function renderGitHubImportTree(paths) {
     if (!githubImportTree || !githubImportFileSelect) return;
-    const visiblePaths = Array.from(paths || []);
-    updateGitHubImportAvailableCount(visiblePaths.length);
-    if (!visiblePaths.length) {
-      const emptyState = document.createElement("div");
-      emptyState.className = "github-import-empty-state";
-      const emptyIcon = document.createElement("i");
-      emptyIcon.className = "lucide lucide-search";
-      emptyIcon.setAttribute("aria-hidden", "true");
-      const emptyText = document.createElement("p");
-      emptyText.textContent = "No Markdown files match this filter.";
-      emptyState.append(emptyIcon, emptyText);
-      githubImportTree.replaceChildren(emptyState);
-      return;
-    }
-
+    githubImportTree.innerHTML = "";
     const tree = buildMarkdownFileTree(paths);
 
     const createTreeBranch = function(node, parentPath) {
       const list = document.createElement("ul");
-      list.setAttribute("role", "list");
       const folderNames = Object.keys(node.folders).sort((a, b) => a.localeCompare(b));
       folderNames.forEach((folderName) => {
         const folderPath = parentPath ? `${parentPath}/${folderName}` : folderName;
         const item = document.createElement("li");
-        item.setAttribute("role", "listitem");
         const folderLabel = document.createElement("span");
         folderLabel.className = "github-tree-folder-label";
-        folderLabel.title = folderPath;
-        const folderIcon = document.createElement("i");
-        folderIcon.className = "lucide lucide-folder";
-        folderIcon.setAttribute("aria-hidden", "true");
-        const folderText = document.createElement("span");
-        folderText.textContent = folderName;
-        folderLabel.append(folderIcon, folderText);
+        folderLabel.textContent = `📁 ${folderName}`;
         item.appendChild(folderLabel);
         item.appendChild(createTreeBranch(node.folders[folderName], folderPath));
         list.appendChild(item);
@@ -11514,21 +11477,12 @@ ${selector} .arrowheadPath {
         .sort((a, b) => a.path.localeCompare(b.path))
         .forEach((file) => {
           const fileItem = document.createElement("li");
-          fileItem.setAttribute("role", "listitem");
           const fileButton = document.createElement("button");
           fileButton.type = "button";
           fileButton.className = "github-tree-file-btn";
           fileButton.dataset.path = file.path;
           fileButton.setAttribute("aria-pressed", "false");
-          fileButton.setAttribute("aria-label", file.path);
-          fileButton.title = file.path;
-          const fileIcon = document.createElement("i");
-          fileIcon.className = "lucide lucide-file-text";
-          fileIcon.setAttribute("aria-hidden", "true");
-          const fileName = document.createElement("span");
-          fileName.className = "github-tree-file-name";
-          fileName.textContent = file.name;
-          fileButton.append(fileIcon, fileName);
+          fileButton.textContent = `📄 ${file.name}`;
           fileButton.addEventListener("click", function() {
             toggleGitHubSelectedPath(file.path);
           });
@@ -11539,28 +11493,10 @@ ${selector} .arrowheadPath {
       return list;
     };
 
-    githubImportTree.replaceChildren(createTreeBranch(tree, ""));
+    githubImportTree.appendChild(createTreeBranch(tree, ""));
     syncGitHubSelectionToButtons();
   }
 
-  function applyGitHubImportFilter() {
-    const query = githubImportFilterInput ? githubImportFilterInput.value.trim().toLocaleLowerCase() : "";
-    const filteredPaths = query
-      ? availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query))
-      : availableGitHubImportPaths;
-    renderGitHubImportTree(filteredPaths);
-  }
-
-  function scheduleGitHubImportFilter() {
-    if (githubImportFilterFrame) {
-      cancelAnimationFrame(githubImportFilterFrame);
-    }
-    githubImportFilterFrame = requestAnimationFrame(function() {
-      githubImportFilterFrame = 0;
-      applyGitHubImportFilter();
-    });
-  }
-
   function setGitHubImportLoading(isLoading) {
     if (!githubImportSubmitBtn) return;
     if (isLoading) {
@@ -11592,11 +11528,6 @@ ${selector} .arrowheadPath {
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
-    if (githubImportSubtitle) {
-      githubImportSubtitle.textContent = "Paste a GitHub file, folder, or repository URL.";
-    }
-    githubImportModal.classList.remove("is-file-selection");
-    if (githubImportUrlSection) githubImportUrlSection.style.display = "flex";
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
@@ -11604,17 +11535,10 @@ ${selector} .arrowheadPath {
     githubImportFileSelect.innerHTML = "";
     githubImportFileSelect.style.display = "none";
     githubImportFileSelect.disabled = false;
-    if (githubImportFilterFrame) {
-      cancelAnimationFrame(githubImportFilterFrame);
-      githubImportFilterFrame = 0;
-    }
-    if (githubImportFilterInput) githubImportFilterInput.value = "";
-    if (githubImportFilterRow) githubImportFilterRow.style.display = "none";
     if (githubImportSelectionToolbar) {
       githubImportSelectionToolbar.style.display = "none";
     }
     availableGitHubImportPaths = [];
-    updateGitHubImportAvailableCount();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -11700,7 +11624,6 @@ ${selector} .arrowheadPath {
 
       // Render hierarchical visual skeleton tree while the list is loading
       if (githubImportTree) {
-        githubImportModal.classList.add("is-file-selection");
         renderGitHubImportTreeSkeleton();
         githubImportTree.style.display = "block";
       }
@@ -11714,7 +11637,6 @@ ${selector} .arrowheadPath {
       });
 
       if (!files.length) {
-        githubImportModal.classList.remove("is-file-selection");
         if (githubImportTree) {
           githubImportTree.innerHTML = "";
           githubImportTree.style.display = "none";
@@ -11732,13 +11654,9 @@ ${selector} .arrowheadPath {
       }
 
       githubImportFileSelect.innerHTML = "";
-      if (githubImportUrlSection) githubImportUrlSection.style.display = "none";
       githubImportUrlInput.style.display = "none";
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
       githubImportFileSelect.style.display = "none";
-      if (githubImportFilterRow) {
-        githubImportFilterRow.style.display = "flex";
-      }
       if (githubImportSelectionToolbar) {
         githubImportSelectionToolbar.style.display = "flex";
       }
@@ -11752,26 +11670,17 @@ ${selector} .arrowheadPath {
       // Announce load complete
       announceToScreenReader("GitHub files loaded. " + files.length + " files available in the tree.");
 
-      setGitHubImportMessage(`All ${files.length.toLocaleString()} Markdown files are available.`, { isError: false });
+      setGitHubImportMessage("");
       if (githubImportTitle) {
         githubImportTitle.textContent = "Select Markdown file(s) to import";
       }
-      if (githubImportSubtitle) {
-        githubImportSubtitle.textContent = "Choose any files below. Repository folder paths will be preserved.";
-      }
       githubImportSubmitBtn.dataset.step = "select";
       githubImportSubmitBtn.dataset.owner = parsed.owner;
       githubImportSubmitBtn.dataset.repo = parsed.repo;
       githubImportSubmitBtn.dataset.ref = ref;
       githubImportSubmitBtn.textContent = "Import Selected";
-      if (githubImportFilterInput) {
-        requestAnimationFrame(function() {
-          githubImportFilterInput.focus();
-        });
-      }
     } catch (error) {
       console.error("GitHub import failed:", error);
-      githubImportModal.classList.remove("is-file-selection");
       setGitHubImportMessage("GitHub import failed: " + error.message);
       announceToScreenReader("GitHub import failed.");
       if (githubImportTree) {
@@ -18001,19 +17910,6 @@ ${selector} .arrowheadPath {
   if (githubImportFileSelect) {
     githubImportFileSelect.addEventListener("keydown", handleGitHubImportInputKeydown);
   }
-  if (githubImportFilterInput) {
-    githubImportFilterInput.addEventListener("input", scheduleGitHubImportFilter);
-    githubImportFilterInput.addEventListener("keydown", function(e) {
-      if (e.key !== "Escape") return;
-      if (githubImportFilterInput.value) {
-        e.stopPropagation();
-        githubImportFilterInput.value = "";
-        applyGitHubImportFilter();
-      } else {
-        closeGitHubImportModal();
-      }
-    });
-  }
   if (githubImportSelectAllBtn) {
     githubImportSelectAllBtn.addEventListener("click", function() {
       const allPaths = availableGitHubImportPaths.slice();
diff --git a/styles.css b/styles.css
index 21fab6c2..52f2e28c 100644
--- a/styles.css
+++ b/styles.css
@@ -5932,8 +5932,7 @@ a:focus {
 
 .github-import-error {
   margin: 0;
-  flex: 0 0 auto;
-  font-size: var(--ui-font-md);
+  font-size: 12px;
   color: var(--color-danger-fg, #d73a49);
   text-align: left;
   line-height: 1.5;
@@ -5944,19 +5943,12 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(94vw, 640px);
-  max-width: 640px;
+  width: min(92vw, 520px);
+  max-width: 520px;
   min-width: 0;
   padding: 0;
   gap: 0;
   overflow: hidden;
-  transition: width 0.2s ease, max-width 0.2s ease, height 0.2s ease, transform 0.2s ease, opacity 0.2s ease;
-}
-
-#github-import-modal.is-file-selection .reset-modal-box {
-  width: min(96vw, 960px);
-  max-width: 960px;
-  height: min(88dvh, 820px);
 }
 
 #github-import-modal .reset-modal-message {
@@ -5966,254 +5958,109 @@ a:focus {
 }
 
 #github-import-modal .modal-header {
-  justify-content: flex-start;
-  padding: 16px 20px;
+  padding: 14px 16px;
   border-bottom: 1px solid var(--border-color);
-  background: color-mix(in srgb, var(--header-bg) 94%, var(--accent-color) 6%);
-}
-
-.github-import-heading {
-  flex: 1;
-  min-width: 0;
 }
 
-.github-import-heading-icon {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 38px;
-  height: 38px;
-  flex: 0 0 38px;
-  border: 1px solid color-mix(in srgb, var(--accent-color) 24%, var(--border-color));
-  border-radius: 10px;
-  background: color-mix(in srgb, var(--accent-color) 10%, var(--header-bg));
-  color: var(--text-color);
-  font-size: 20px;
-}
-
-.github-import-url-section {
+.github-import-modal-body {
   display: flex;
   flex-direction: column;
   gap: 8px;
-}
-
-.github-import-url-help {
-  margin: 0;
-  color: var(--text-secondary, #57606a);
-  font-size: var(--ui-font-md);
-  line-height: 1.5;
-}
-
-#github-import-modal .github-import-modal-body {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  min-height: 0;
-  max-height: min(62vh, 520px);
-  overflow: hidden;
-  padding: 20px;
-}
-
-#github-import-modal.is-file-selection .github-import-modal-body {
-  flex: 1 1 auto;
-  max-height: none;
+  max-height: min(56vh, 460px);
+  overflow: auto;
+  padding: 16px;
 }
 
 #github-import-url,
 #github-import-file-select {
-  min-height: 44px;
-  padding: 9px 12px;
-  font-size: var(--ui-font-lg);
+  min-height: 36px;
+  padding: 7px 10px;
+  font-size: var(--ui-font-md);
 }
 
 #github-import-file-select {
   min-height: 180px;
 }
 
-.github-import-filter-row {
-  position: relative;
-  flex: 0 0 auto;
-  align-items: center;
-}
-
-.github-import-filter-row > .lucide {
-  position: absolute;
-  left: 12px;
-  z-index: 1;
-  color: var(--text-secondary, #57606a);
-  font-size: 16px;
-  pointer-events: none;
-}
-
-#github-import-filter {
-  width: 100%;
-  min-height: 40px;
-  padding: 8px 12px 8px 38px;
-}
-
 .github-import-tree {
-  flex: 1 1 auto;
-  min-height: 260px;
-  max-height: 440px;
+  max-height: 320px;
   overflow: auto;
   border: 1px solid var(--border-color);
-  border-radius: 12px;
-  padding: 8px;
-  background: var(--editor-bg);
-  overscroll-behavior: contain;
-  scrollbar-gutter: stable;
-}
-
-#github-import-modal.is-file-selection .github-import-tree {
-  min-height: 0;
-  max-height: none;
+  border-radius: 10px;
+  padding: 12px;
+  background: var(--bg-color);
 }
 
 .github-import-selection-toolbar {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  gap: 12px;
-  flex: 0 0 auto;
-  padding: 9px 10px 9px 12px;
+  gap: 8px;
+  padding: 8px 10px;
   border: 1px solid var(--border-color);
-  border-radius: 10px;
-  background: color-mix(in srgb, var(--button-bg) 88%, var(--accent-color) 12%);
-}
-
-.github-import-selection-summary {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  min-width: 0;
+  border-radius: 8px;
+  background: var(--button-bg);
 }
 
 .github-import-selected-count {
   font-size: var(--ui-font-md);
   font-weight: 600;
   color: var(--text-color);
-  white-space: nowrap;
-}
-
-.github-import-summary-divider {
-  width: 1px;
-  height: 16px;
-  background: var(--border-color);
-}
-
-.github-import-available-count {
-  color: var(--text-secondary, #57606a);
-  font-size: var(--ui-font-md);
-  font-variant-numeric: tabular-nums;
-  white-space: nowrap;
 }
 
 .github-import-tree ul {
   list-style: none;
   margin: 0;
-  padding-left: 20px;
+  padding-left: 18px;
 }
 
 .github-import-tree>ul {
-  padding-left: 0;
+  padding-left: 4px;
 }
 
 .github-import-tree li {
-  margin: 1px 0;
+  margin: 2px 0;
 }
 
 .github-tree-folder-label {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-height: 32px;
-  padding: 5px 8px;
-  font-size: var(--ui-font-md);
-  font-weight: 600;
+  display: inline-block;
+  font-size: 14px;
   color: var(--text-secondary, #57606a);
-}
-
-.github-tree-folder-label .lucide,
-.github-tree-file-btn .lucide {
-  flex: 0 0 auto;
-  font-size: 15px;
-}
-
-.github-tree-folder-label .lucide {
-  color: color-mix(in srgb, var(--accent-color) 72%, var(--text-secondary));
+  margin-bottom: 4px;
 }
 
 .github-tree-file-btn {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-height: 36px;
-  border: 1px solid transparent;
+  border: 0;
   background: transparent;
   color: var(--text-color);
   cursor: pointer;
-  padding: 7px 9px;
-  border-radius: 8px;
+  padding: 6px 8px;
+  border-radius: 6px;
   text-align: left;
   width: 100%;
-  font-size: var(--ui-font-md);
-  transition: background-color 0.15s ease, border-color 0.15s ease, color 0.15s ease;
-}
-
-.github-tree-file-name {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.github-tree-file-btn:hover {
-  background: var(--button-hover);
+  font-size: 14px;
 }
 
+.github-tree-file-btn:hover,
 .github-tree-file-btn:focus-visible {
-  border-color: var(--accent-color);
   background: var(--button-hover);
-  outline: 2px solid color-mix(in srgb, var(--accent-color) 35%, transparent);
-  outline-offset: 1px;
+  outline: none;
 }
 
 .github-tree-file-btn.is-selected {
   background: rgba(56, 139, 253, 0.14);
-  border-color: color-mix(in srgb, var(--accent-color) 36%, transparent);
   color: var(--accent-color);
 }
 
-.github-import-empty-state {
-  display: flex;
-  min-height: 180px;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 10px;
-  padding: 24px;
-  color: var(--text-secondary, #57606a);
-  text-align: center;
-}
-
-.github-import-empty-state .lucide {
-  font-size: 24px;
-}
-
-.github-import-empty-state p {
-  margin: 0;
-}
-
 #github-import-modal .reset-modal-actions {
   gap: 8px;
-  padding: 12px 20px;
+  padding: 10px 16px;
   border-top: 1px solid var(--border-color);
-  background: color-mix(in srgb, var(--header-bg) 96%, var(--border-color) 4%);
 }
 
 #github-import-modal .reset-modal-btn {
-  min-height: 38px;
-  padding: 8px 16px;
+  min-height: 34px;
+  padding: 7px 14px;
   font-size: var(--ui-font-md);
 }
 
@@ -6226,31 +6073,9 @@ a:focus {
     gap: 0;
   }
 
-  #github-import-modal.is-file-selection .reset-modal-box {
-    height: calc(100dvh - 24px);
-  }
-
-  #github-import-modal .modal-header {
-    padding: 12px 14px;
-  }
-
-  .github-import-heading-icon {
-    width: 36px;
-    height: 36px;
-    flex-basis: 36px;
-  }
-
-  #github-import-modal .github-import-modal-body {
-    padding: 14px;
-  }
-
-  .github-import-selection-summary {
-    flex-wrap: wrap;
-    row-gap: 2px;
-  }
-
-  .github-import-summary-divider {
-    display: none;
+  .github-import-selection-toolbar {
+    flex-direction: column;
+    align-items: stretch;
   }
 
   #github-import-modal .reset-modal-message {
@@ -6259,35 +6084,14 @@ a:focus {
 
   #github-import-modal .reset-modal-actions {
     flex-direction: row;
-    padding: 10px 14px;
   }
 
   #github-import-modal .reset-modal-btn {
-    min-width: 0;
-    min-height: 44px;
-  }
-
-  #github-import-modal .reset-modal-actions .reset-modal-btn {
-    flex: 1;
-  }
-
-  #github-import-filter {
-    min-height: 44px;
-    font-size: 16px;
-  }
-
-  .github-tree-file-btn {
+    width: auto;
     min-height: 44px;
   }
 }
 
-@media (prefers-reduced-motion: reduce) {
-  #github-import-modal .reset-modal-box,
-  .github-tree-file-btn {
-    transition: none;
-  }
-}
-
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;
diff --git a/wiki/Features.md b/wiki/Features.md
index fea29582..f9c8e5fd 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -267,7 +267,7 @@ GitHub import:
 - Repository or folder URLs query GitHub's public API to find Markdown files.
 - The modal shows a tree and supports selecting multiple files.
 - Imports create a repository-named folder and reproduce each selected file's nested GitHub directory path inside it.
-- Every Markdown file found is shown, with a path filter for navigating large repositories.
+- Every Markdown file found is shown.
 - Requests are rate-limited by the app to avoid hammering GitHub.
 - Selected files are fetched as raw content and opened as separate tabs.
 
diff --git a/wiki/Troubleshooting.md b/wiki/Troubleshooting.md
index 584ece97..317c0df5 100644
--- a/wiki/Troubleshooting.md
+++ b/wiki/Troubleshooting.md
@@ -79,7 +79,7 @@ Extension matching is case-insensitive. Rename a plain-text file to `.md` only w
 
 - Use a public `github.com` repository, tree, blob, or `raw.githubusercontent.com` Markdown URL.
 - Private repositories are unsupported because Markdown Viewer does not request a token.
-- Repository and folder results show every Markdown file found. Use the file filter in the importer to narrow large repository trees.
+- Repository and folder results show every Markdown file found.
 - Check GitHub API rate-limit and network responses.
 - Confirm that CSP allows `api.github.com` and `raw.githubusercontent.com`.
 - For a direct file, verify that the URL returns text rather than a login or HTML error page.
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index 3bf4ea0d..3d93e2c6 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -119,7 +119,7 @@ Use Import > From GitHub and paste one of these URL types:
 - `https://github.com/owner/repo/blob/main/README.md`
 - `https://raw.githubusercontent.com/owner/repo/main/README.md`
 
-Direct Markdown file URLs import immediately. Repository and folder URLs query GitHub's public API, show a searchable tree containing every Markdown file found, and let you import selected files into separate tabs. Selected files are placed in a repository-named Explorer folder with their nested GitHub directory paths preserved.
+Direct Markdown file URLs import immediately. Repository and folder URLs query GitHub's public API, show a tree containing every Markdown file found, and let you import selected files into separate tabs. Selected files are placed in a repository-named Explorer folder with their nested GitHub directory paths preserved.
 
 GitHub import sends the repository/path request to GitHub and only works for public content. The app does not ask for GitHub credentials.
 

From 573f2387a9c7a3251aa2f90b4b7fde6f6195df78 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 18:04:11 +0530
Subject: [PATCH 03/10] fix(import): modernize picker and batch tab actions

---
 CHANGELOG.md                       |   3 +
 README.md                          |   3 +-
 desktop-app/resources/index.html   |  18 +-
 desktop-app/resources/js/script.js | 309 ++++++++++++++++++++++++++---
 desktop-app/resources/styles.css   | 307 +++++++++++++++++++++++++---
 index.html                         |  18 +-
 script.js                          | 309 ++++++++++++++++++++++++++---
 styles.css                         | 307 +++++++++++++++++++++++++---
 wiki/Features.md                   |   6 +-
 wiki/Usage-Guide.md                |   4 +-
 10 files changed, 1158 insertions(+), 126 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7d8ff38..bc851fad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,9 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 
 - Removed the 30-file display cap so repository and folder results expose every Markdown file found.
 - Added complete subtree traversal when GitHub marks a recursive repository tree response as truncated.
+- Widened the GitHub picker, added file search, selected/total counts, an icon-based select-all toggle, and collapsible GitHub-style folder and file rows.
+- Changed local, drag-and-drop, desktop, and GitHub Markdown imports to save documents in Explorer without opening every imported file as a tab.
+- Batched multi-tab close commands so closing hundreds of tabs performs one state update and render instead of repeatedly rebuilding the interface.
 
 ---
 
diff --git a/README.md b/README.md
index 51b906f1..b43f9b22 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,8 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Importing a workspace backup permanently replaces the current workspace after confirmation.
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
-- The public GitHub importer shows every Markdown file found in a repository or folder result.
+- The searchable public GitHub importer shows every Markdown file found in a repository or folder result.
+- Imported Markdown files are saved to Explorer and remain closed until you choose one, preventing large imports from flooding the tab bar.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
 - Live Share allows up to 64 WebSocket participants and 8 MB per live message.
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index 10bfec0b..0ed6cea9 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1281,7 +1281,7 @@ <h2 class="about-title">Markdown Viewer</h2>
             <div class="modal-header">
               <div>
                 <p id="github-import-title" class="reset-modal-message">Import Markdown from GitHub</p>
-                <p class="modal-subtext">Paste a GitHub file or repository URL.</p>
+                <p id="github-import-subtitle" class="modal-subtext">Paste a GitHub file or repository URL.</p>
               </div>
               <button type="button" class="modal-close-btn" id="github-import-close" aria-label="Close GitHub import dialog"><i class="lucide lucide-x" aria-hidden="true"></i></button>
             </div>
@@ -1290,10 +1290,20 @@ <h2 class="about-title">Markdown Viewer</h2>
               <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
-                <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                <button type="button" class="reset-modal-btn" id="github-import-select-all">Select all</button>
+                <label class="github-import-search" for="github-import-search">
+                  <i class="lucide lucide-search" aria-hidden="true"></i>
+                  <input type="search" id="github-import-search" placeholder="Search Markdown files" autocomplete="off" spellcheck="false" />
+                </label>
+                <div class="github-import-selection-summary" aria-live="polite">
+                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
+                  <span class="github-import-count-separator" aria-hidden="true">·</span>
+                  <span id="github-import-total-count" class="github-import-total-count">0 files</span>
+                </div>
+                <button type="button" class="github-import-select-all-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
+                  <i class="lucide lucide-check-check" aria-hidden="true"></i>
+                </button>
               </div>
-              <div id="github-import-tree" class="github-import-tree" style="display:none;"></div>
+              <div id="github-import-tree" class="github-import-tree" role="tree" aria-label="Markdown files in this GitHub location" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
             </div>
             <div class="reset-modal-actions">
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index a2dca312..9e400512 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -534,11 +534,14 @@ document.addEventListener("DOMContentLoaded", async function () {
   const mobileLiveShareParticipants = document.getElementById("mobile-live-share-participants");
   const githubImportModal = document.getElementById("github-import-modal");
   const githubImportTitle = document.getElementById("github-import-title");
+  const githubImportSubtitle = document.getElementById("github-import-subtitle");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
+  const githubImportSearchInput = document.getElementById("github-import-search");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
+  const githubImportTotalCount = document.getElementById("github-import-total-count");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -7746,9 +7749,74 @@ document.addEventListener("DOMContentLoaded", async function () {
       idsToClose = openTabs.map(function(tab) { return tab.id; });
     }
     closeTabMenus();
-    idsToClose.forEach(function(id) {
-      if (tabs.some(function(tab) { return tab.id === id && isTabOpen(tab); })) closeTab(id);
+    if (idsToClose.length === 1) {
+      closeTab(idsToClose[0]);
+      return;
+    }
+    closeTabsInBatch(idsToClose);
+  }
+
+  function closeTabsInBatch(tabIds) {
+    const idsToClose = new Set((tabIds || []).filter(Boolean));
+    if (!idsToClose.size) return;
+
+    // Live sessions have teardown and restore behavior that must keep using the
+    // single-tab path. All ordinary documents can be closed in one state update.
+    if (liveCollaboration && idsToClose.has(liveCollaboration.tabId)) {
+      Array.from(idsToClose).forEach(function(id) {
+        if (tabs.some(function(tab) { return tab.id === id && isTabOpen(tab); })) closeTab(id);
+      });
+      return;
+    }
+
+    const openTabsBeforeClose = getOpenTabs();
+    const activeOpenIndex = openTabsBeforeClose.findIndex(function(tab) { return tab.id === activeTabId; });
+    const activeWillClose = idsToClose.has(activeTabId);
+    const splitWillClose = idsToClose.has(secondarySplitTabId) || (activeWillClose && Boolean(secondarySplitTabId));
+    const changedIds = [];
+    const temporaryIds = new Set();
+
+    if (pendingReviewDelete && idsToClose.has(pendingReviewDelete.tabId)) {
+      cancelReviewDeleteConfirmation();
+    }
+    if (activeWillClose) saveCurrentTabState();
+    saveSecondarySplitState();
+    if (splitWillClose) closeDocumentSplitView({ silent: true, renderTabs: false });
+
+    tabs.forEach(function(tab) {
+      if (!idsToClose.has(tab.id) || !isTabOpen(tab)) return;
+      if (isTemporaryDocument(tab)) {
+        temporaryIds.add(tab.id);
+        shareSnapshotViewOnlyTabIds.delete(tab.id);
+        if (tabHistories[tab.id]) delete tabHistories[tab.id];
+        return;
+      }
+      tab.isOpen = false;
+      changedIds.push(tab.id);
     });
+
+    if (temporaryIds.size) {
+      tabs = tabs.filter(function(tab) { return !temporaryIds.has(tab.id); });
+    }
+    if (changedIds.length) saveTabsToStorage(tabs, changedIds);
+
+    if (activeWillClose) {
+      const remainingOpenTabs = getOpenTabs();
+      const nextTab = remainingOpenTabs.length
+        ? remainingOpenTabs[Math.min(Math.max(activeOpenIndex - 1, 0), remainingOpenTabs.length - 1)]
+        : null;
+      if (nextTab) {
+        void switchTab(nextTab.id).then(renderDocumentSidebar, renderDocumentSidebar);
+      } else {
+        clearActiveDocument();
+        renderDocumentSidebar();
+      }
+    } else {
+      renderDocumentSplitView();
+      renderTabBar(tabs, activeTabId);
+      renderDocumentSidebar();
+    }
+    announceToScreenReader(idsToClose.size + ' tabs closed. Files remain available in Explorer.');
   }
 
   function openTabContextMenu(tab, point, focusTab) {
@@ -11105,16 +11173,37 @@ ${selector} .arrowheadPath {
     mediaProgressHideTimeout = setTimeout(function() { toast.hidden = true; }, 4200);
   }
 
+  function createImportedDocument(content, title, location) {
+    const targetLocation = location || (documentOrganization
+      ? getPreferredDocumentLocation()
+      : { workspaceId: DEFAULT_WORKSPACE_ID, folderId: null });
+    if (targetLocation.workspaceId === SECRET_WORKSPACE_ID && !isSecretWorkspaceUnlocked()) return null;
+    const tab = createTab(content, title, 'split', targetLocation);
+    tab.isOpen = false;
+    normalizeTabDocumentMetadata(tab, { allowSecret: targetLocation.workspaceId === SECRET_WORKSPACE_ID });
+    tabs.push(tab);
+    return tab;
+  }
+
+  async function persistImportedDocuments(documentIds) {
+    const ids = Array.from(documentIds || []).filter(Boolean);
+    if (!ids.length) return;
+    saveTabsToStorage(tabs, ids);
+    await _flushTabsToStorage(tabs, { changedIds: ids });
+    evictInactiveDocumentContent();
+    renderDocumentSidebar();
+  }
+
   function importMarkdownFile(file, location) {
     return new Promise(function(resolve) {
       if (!file) {
-        resolve(false);
+        resolve(null);
         return;
       }
 
       if (file.size > 10 * 1024 * 1024) {
         showUnsupportedFileToast('This Markdown file is too large. The maximum supported size is 10 MB.');
-        resolve(false);
+        resolve(null);
         return;
       }
 
@@ -11127,16 +11216,16 @@ ${selector} .arrowheadPath {
         for (let i = 0; i < checkLength; i++) {
           if (text.charCodeAt(i) === 0) {
             showUnsupportedFileToast('This file appears to be binary. Choose a Markdown file (.md or .markdown).');
-            resolve(false);
+            resolve(null);
             return;
           }
         }
 
-        resolve(newTab(text, getMarkdownFileTitle(file), location) === true);
+        resolve(createImportedDocument(text, getMarkdownFileTitle(file), location));
       };
       reader.onerror = function() {
         alert('Failed to read the file. Please check permissions and try again.');
-        resolve(false);
+        resolve(null);
       };
       reader.readAsText(file);
     });
@@ -11160,17 +11249,25 @@ ${selector} .arrowheadPath {
     const filesToImport = markdownFiles;
 
     let importedCount = 0;
+    const importedDocumentIds = [];
     showImportProgress(filesToImport.length);
     for (let index = 0; index < filesToImport.length; index++) {
-      if (await importMarkdownFile(filesToImport[index], settings.location)) {
+      const importedDocument = await importMarkdownFile(filesToImport[index], settings.location);
+      if (importedDocument) {
         importedCount++;
+        importedDocumentIds.push(importedDocument.id);
       }
       updateImportProgress(index + 1, filesToImport.length);
     }
+    await persistImportedDocuments(importedDocumentIds);
     if (settings.location && settings.location.workspaceId === SECRET_WORKSPACE_ID && isSecretWorkspaceUnlocked()) {
       await flushSecretWorkspaceToStorage();
     }
-    finishImportProgress(importedCount, filesToImport.length);
+    finishImportProgress(importedCount, filesToImport.length, {
+      detail: importedCount === filesToImport.length
+        ? 'Saved to Explorer without opening new tabs.'
+        : undefined
+    });
 
     return importedCount;
   }
@@ -11181,7 +11278,9 @@ ${selector} .arrowheadPath {
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   let lastGitHubImportRequestAt = 0;
   const selectedGitHubImportPaths = new Set();
+  const collapsedGitHubImportFolders = new Set();
   let availableGitHubImportPaths = [];
+  let githubImportSearchTimer = null;
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11223,6 +11322,7 @@ ${selector} .arrowheadPath {
     });
 
     let imported = 0;
+    const importedDocumentIds = [];
     for (let index = 0; index < paths.length; index++) {
       const filePath = paths[index];
       updateImportProgress(index, paths.length, 'Importing ' + getFileName(filePath));
@@ -11230,8 +11330,14 @@ ${selector} .arrowheadPath {
         const markdown = await fetchTextContent(buildRawGitHubUrl(owner, repo, ref, filePath));
         const destinationFolder = ensureGitHubFolderPath(DEFAULT_WORKSPACE_ID, folder, filePath);
         const destination = { workspaceId: DEFAULT_WORKSPACE_ID, folderId: destinationFolder.id };
-        if (newTab(markdown, getFileName(filePath).replace(/\.(md|markdown)$/i, ''), destination)) {
+        const importedDocument = createImportedDocument(
+          markdown,
+          getFileName(filePath).replace(/\.(md|markdown)$/i, ''),
+          destination
+        );
+        if (importedDocument) {
           imported++;
+          importedDocumentIds.push(importedDocument.id);
         }
       } catch (error) {
         console.error('GitHub file import failed:', filePath, error);
@@ -11239,11 +11345,12 @@ ${selector} .arrowheadPath {
       updateImportProgress(index + 1, paths.length, 'Saving to Workspace / ' + folder.name);
     }
 
+    await persistImportedDocuments(importedDocumentIds);
     const failureCount = paths.length - imported;
     finishImportProgress(imported, paths.length, {
       detail: failureCount
         ? failureCount + ' file' + (failureCount === 1 ? '' : 's') + ' could not be imported.'
-        : 'Saved in Workspace / ' + folder.name
+        : 'Saved in Workspace / ' + folder.name + ' without opening new tabs.'
     });
     announceToScreenReader(imported === paths.length
       ? 'GitHub import complete. Files saved in the ' + folder.name + ' folder.'
@@ -11415,14 +11522,28 @@ ${selector} .arrowheadPath {
   function updateGitHubImportSelectedCount() {
     if (!githubImportSelectedCount) return;
     const count = selectedGitHubImportPaths.size;
-    githubImportSelectedCount.textContent = `${count} selected`;
+    githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
+  }
+
+  function updateGitHubImportTotalCount() {
+    if (!githubImportTotalCount) return;
+    const total = availableGitHubImportPaths.length;
+    githubImportTotalCount.textContent = `${total.toLocaleString()} ${total === 1 ? "file" : "files"}`;
   }
 
   function updateGitHubSelectAllButtonLabel() {
     if (!githubImportSelectAllBtn) return;
     const total = availableGitHubImportPaths.length;
     const allSelected = total > 0 && selectedGitHubImportPaths.size === total;
-    githubImportSelectAllBtn.textContent = allSelected ? "Clear All" : "Select All";
+    const actionLabel = allSelected ? "Deselect all files" : "Select all files";
+    githubImportSelectAllBtn.setAttribute("aria-label", actionLabel);
+    githubImportSelectAllBtn.title = actionLabel;
+    githubImportSelectAllBtn.setAttribute("aria-pressed", allSelected ? "true" : "false");
+    githubImportSelectAllBtn.classList.toggle("is-deselect", allSelected);
+    const icon = githubImportSelectAllBtn.querySelector("i");
+    if (icon) {
+      icon.className = `lucide ${allSelected ? "lucide-square-x" : "lucide-check-check"}`;
+    }
   }
 
   function syncGitHubSelectionToButtons() {
@@ -11431,6 +11552,9 @@ ${selector} .arrowheadPath {
       const isSelected = selectedGitHubImportPaths.has(btn.dataset.path);
       btn.classList.toggle("is-selected", isSelected);
       btn.setAttribute("aria-pressed", isSelected ? "true" : "false");
+      btn.setAttribute("aria-label", `${btn.dataset.name || getFileName(btn.dataset.path)}, ${isSelected ? "selected" : "not selected"}`);
+      const checkIcon = btn.querySelector(".github-tree-selection-icon");
+      if (checkIcon) checkIcon.hidden = !isSelected;
     });
   }
 
@@ -11454,22 +11578,78 @@ ${selector} .arrowheadPath {
     updateGitHubSelectAllButtonLabel();
   }
 
+  function getFilteredGitHubImportPaths() {
+    const query = githubImportSearchInput ? githubImportSearchInput.value.trim().toLocaleLowerCase() : "";
+    if (!query) return availableGitHubImportPaths.slice();
+    return availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query));
+  }
+
+  function countMarkdownFilesInTreeNode(node) {
+    return node.files.length + Object.values(node.folders).reduce((total, folder) => {
+      return total + countMarkdownFilesInTreeNode(folder);
+    }, 0);
+  }
+
   function renderGitHubImportTree(paths) {
     if (!githubImportTree || !githubImportFileSelect) return;
-    githubImportTree.innerHTML = "";
-    const tree = buildMarkdownFileTree(paths);
+    githubImportTree.textContent = "";
+    const visiblePaths = Array.isArray(paths) ? paths : getFilteredGitHubImportPaths();
+    const searchActive = Boolean(githubImportSearchInput && githubImportSearchInput.value.trim());
+    if (!visiblePaths.length) {
+      const emptyState = document.createElement("div");
+      emptyState.className = "github-import-tree-empty";
+      emptyState.setAttribute("role", "status");
+      emptyState.innerHTML = '<i class="lucide lucide-search" aria-hidden="true"></i><span>No Markdown files match your search.</span>';
+      githubImportTree.appendChild(emptyState);
+      return;
+    }
+    const tree = buildMarkdownFileTree(visiblePaths);
 
     const createTreeBranch = function(node, parentPath) {
       const list = document.createElement("ul");
+      list.setAttribute("role", "group");
       const folderNames = Object.keys(node.folders).sort((a, b) => a.localeCompare(b));
       folderNames.forEach((folderName) => {
         const folderPath = parentPath ? `${parentPath}/${folderName}` : folderName;
         const item = document.createElement("li");
-        const folderLabel = document.createElement("span");
-        folderLabel.className = "github-tree-folder-label";
-        folderLabel.textContent = `📁 ${folderName}`;
-        item.appendChild(folderLabel);
-        item.appendChild(createTreeBranch(node.folders[folderName], folderPath));
+        item.className = "github-tree-folder-item";
+        item.setAttribute("role", "none");
+        const folderToggle = document.createElement("button");
+        const childBranch = createTreeBranch(node.folders[folderName], folderPath);
+        const collapsed = !searchActive && collapsedGitHubImportFolders.has(folderPath);
+        folderToggle.type = "button";
+        folderToggle.className = "github-tree-folder-label";
+        folderToggle.dataset.folderPath = folderPath;
+        folderToggle.setAttribute("role", "treeitem");
+        folderToggle.setAttribute("aria-expanded", collapsed ? "false" : "true");
+        folderToggle.title = folderPath;
+
+        const chevron = document.createElement("i");
+        chevron.className = `lucide ${collapsed ? "lucide-chevron-right" : "lucide-chevron-down"} github-tree-chevron`;
+        chevron.setAttribute("aria-hidden", "true");
+        const folderIcon = document.createElement("i");
+        folderIcon.className = `lucide ${collapsed ? "lucide-folder" : "lucide-folder-open"} github-tree-folder-icon`;
+        folderIcon.setAttribute("aria-hidden", "true");
+        const folderNameNode = document.createElement("span");
+        folderNameNode.className = "github-import-tree-name";
+        folderNameNode.textContent = folderName;
+        const folderCount = document.createElement("span");
+        folderCount.className = "github-tree-folder-count";
+        folderCount.textContent = countMarkdownFilesInTreeNode(node.folders[folderName]).toLocaleString();
+        folderCount.setAttribute("aria-label", `${folderCount.textContent} Markdown files`);
+
+        childBranch.hidden = collapsed;
+        folderToggle.append(chevron, folderIcon, folderNameNode, folderCount);
+        folderToggle.addEventListener("click", function() {
+          const shouldCollapse = folderToggle.getAttribute("aria-expanded") === "true";
+          folderToggle.setAttribute("aria-expanded", shouldCollapse ? "false" : "true");
+          childBranch.hidden = shouldCollapse;
+          chevron.className = `lucide ${shouldCollapse ? "lucide-chevron-right" : "lucide-chevron-down"} github-tree-chevron`;
+          folderIcon.className = `lucide ${shouldCollapse ? "lucide-folder" : "lucide-folder-open"} github-tree-folder-icon`;
+          if (shouldCollapse) collapsedGitHubImportFolders.add(folderPath);
+          else collapsedGitHubImportFolders.delete(folderPath);
+        });
+        item.append(folderToggle, childBranch);
         list.appendChild(item);
       });
 
@@ -11477,12 +11657,29 @@ ${selector} .arrowheadPath {
         .sort((a, b) => a.path.localeCompare(b.path))
         .forEach((file) => {
           const fileItem = document.createElement("li");
+          fileItem.className = "github-tree-file-item";
+          fileItem.setAttribute("role", "none");
           const fileButton = document.createElement("button");
           fileButton.type = "button";
           fileButton.className = "github-tree-file-btn";
           fileButton.dataset.path = file.path;
+          fileButton.dataset.name = file.name;
+          fileButton.setAttribute("role", "treeitem");
           fileButton.setAttribute("aria-pressed", "false");
-          fileButton.textContent = `📄 ${file.name}`;
+          fileButton.title = file.path;
+
+          const fileIcon = document.createElement("i");
+          fileIcon.className = "lucide lucide-file-text github-tree-file-icon";
+          fileIcon.setAttribute("aria-hidden", "true");
+          const fileName = document.createElement("span");
+          fileName.className = "github-import-tree-name";
+          fileName.textContent = file.name;
+          const selectedIcon = document.createElement("i");
+          selectedIcon.className = "lucide lucide-check github-tree-selection-icon";
+          selectedIcon.setAttribute("aria-hidden", "true");
+          selectedIcon.hidden = true;
+
+          fileButton.append(fileIcon, fileName, selectedIcon);
           fileButton.addEventListener("click", function() {
             toggleGitHubSelectedPath(file.path);
           });
@@ -11493,7 +11690,9 @@ ${selector} .arrowheadPath {
       return list;
     };
 
-    githubImportTree.appendChild(createTreeBranch(tree, ""));
+    const treeFragment = document.createDocumentFragment();
+    treeFragment.appendChild(createTreeBranch(tree, ""));
+    githubImportTree.appendChild(treeFragment);
     syncGitHubSelectionToButtons();
   }
 
@@ -11528,6 +11727,9 @@ ${selector} .arrowheadPath {
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
+    if (githubImportSubtitle) {
+      githubImportSubtitle.textContent = "Paste a GitHub file or repository URL.";
+    }
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
@@ -11539,6 +11741,14 @@ ${selector} .arrowheadPath {
       githubImportSelectionToolbar.style.display = "none";
     }
     availableGitHubImportPaths = [];
+    collapsedGitHubImportFolders.clear();
+    clearTimeout(githubImportSearchTimer);
+    githubImportSearchTimer = null;
+    if (githubImportSearchInput) {
+      githubImportSearchInput.value = "";
+      githubImportSearchInput.disabled = false;
+    }
+    updateGitHubImportTotalCount();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -11577,6 +11787,9 @@ ${selector} .arrowheadPath {
       if (githubImportSelectAllBtn) {
         githubImportSelectAllBtn.disabled = disabled;
       }
+      if (githubImportSearchInput) {
+        githubImportSearchInput.disabled = disabled;
+      }
     };
     const step = githubImportSubmitBtn.dataset.step || "url";
     if (step === "select") {
@@ -11658,27 +11871,32 @@ ${selector} .arrowheadPath {
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
       githubImportFileSelect.style.display = "none";
       if (githubImportSelectionToolbar) {
-        githubImportSelectionToolbar.style.display = "flex";
+        githubImportSelectionToolbar.style.display = "grid";
       }
       if (githubImportTree) {
         githubImportTree.style.display = "block";
       }
       availableGitHubImportPaths = files.slice();
+      updateGitHubImportTotalCount();
       setGitHubSelectedPaths(files[0] ? [files[0]] : []);
-      renderGitHubImportTree(files);
+      renderGitHubImportTree();
 
       // Announce load complete
       announceToScreenReader("GitHub files loaded. " + files.length + " files available in the tree.");
 
       setGitHubImportMessage("");
       if (githubImportTitle) {
-        githubImportTitle.textContent = "Select Markdown file(s) to import";
+        githubImportTitle.textContent = "Select Markdown files to import";
+      }
+      if (githubImportSubtitle) {
+        githubImportSubtitle.textContent = `${files.length.toLocaleString()} Markdown files found. Choose what to save to Explorer.`;
       }
       githubImportSubmitBtn.dataset.step = "select";
       githubImportSubmitBtn.dataset.owner = parsed.owner;
       githubImportSubmitBtn.dataset.repo = parsed.repo;
       githubImportSubmitBtn.dataset.ref = ref;
       githubImportSubmitBtn.textContent = "Import Selected";
+      if (githubImportSearchInput) githubImportSearchInput.focus();
     } catch (error) {
       console.error("GitHub import failed:", error);
       setGitHubImportMessage("GitHub import failed: " + error.message);
@@ -17857,11 +18075,26 @@ ${selector} .arrowheadPath {
         multiSelections: true
       });
       if (result && result.length > 0) {
-        for (const filePath of result) {
-          const content = await Neutralino.filesystem.readFile(filePath);
-          const fileName = filePath.split(/[/\\]/).pop().replace(/\.(md|markdown)$/i, "");
-          if (!newTab(content, fileName)) break;
+        const importedDocumentIds = [];
+        showImportProgress(result.length);
+        for (let index = 0; index < result.length; index++) {
+          const filePath = result[index];
+          try {
+            const content = await Neutralino.filesystem.readFile(filePath);
+            const fileName = filePath.split(/[/\\]/).pop().replace(/\.(md|markdown)$/i, "");
+            const importedDocument = createImportedDocument(content, fileName);
+            if (importedDocument) importedDocumentIds.push(importedDocument.id);
+          } catch (fileError) {
+            console.error("Native file import failed:", filePath, fileError);
+          }
+          updateImportProgress(index + 1, result.length);
         }
+        await persistImportedDocuments(importedDocumentIds);
+        finishImportProgress(importedDocumentIds.length, result.length, {
+          detail: importedDocumentIds.length === result.length
+            ? 'Saved to Explorer without opening new tabs.'
+            : undefined
+        });
       }
     } catch (e) {
       console.error("Native import failed:", e);
@@ -17910,6 +18143,24 @@ ${selector} .arrowheadPath {
   if (githubImportFileSelect) {
     githubImportFileSelect.addEventListener("keydown", handleGitHubImportInputKeydown);
   }
+  if (githubImportSearchInput) {
+    githubImportSearchInput.addEventListener("input", function() {
+      clearTimeout(githubImportSearchTimer);
+      githubImportSearchTimer = setTimeout(function() {
+        renderGitHubImportTree();
+        const visibleCount = getFilteredGitHubImportPaths().length;
+        announceToScreenReader(visibleCount + " Markdown file" + (visibleCount === 1 ? "" : "s") + " shown.");
+      }, 120);
+    });
+    githubImportSearchInput.addEventListener("keydown", function(e) {
+      if (e.key === "Escape" && githubImportSearchInput.value) {
+        e.preventDefault();
+        e.stopPropagation();
+        githubImportSearchInput.value = "";
+        renderGitHubImportTree();
+      }
+    });
+  }
   if (githubImportSelectAllBtn) {
     githubImportSelectAllBtn.addEventListener("click", function() {
       const allPaths = availableGitHubImportPaths.slice();
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 52f2e28c..1819eb01 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -5943,8 +5943,8 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(92vw, 520px);
-  max-width: 520px;
+  width: min(94vw, 760px);
+  max-width: 760px;
   min-width: 0;
   padding: 0;
   gap: 0;
@@ -5965,9 +5965,9 @@ a:focus {
 .github-import-modal-body {
   display: flex;
   flex-direction: column;
-  gap: 8px;
-  max-height: min(56vh, 460px);
-  overflow: auto;
+  gap: 10px;
+  max-height: min(68vh, 620px);
+  overflow: hidden;
   padding: 16px;
 }
 
@@ -5983,75 +5983,274 @@ a:focus {
 }
 
 .github-import-tree {
-  max-height: 320px;
+  min-height: 240px;
+  max-height: min(48vh, 440px);
   overflow: auto;
   border: 1px solid var(--border-color);
-  border-radius: 10px;
-  padding: 12px;
+  border-radius: 8px;
+  padding: 0;
   background: var(--bg-color);
+  overscroll-behavior: contain;
+  scrollbar-gutter: stable;
 }
 
 .github-import-selection-toolbar {
-  display: flex;
+  display: grid;
+  grid-template-columns: minmax(220px, 1fr) auto 40px;
   align-items: center;
-  justify-content: space-between;
   gap: 8px;
-  padding: 8px 10px;
+}
+
+.github-import-search {
+  position: relative;
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  margin: 0;
+}
+
+.github-import-search > .lucide {
+  position: absolute;
+  left: 11px;
+  z-index: 1;
+  width: 16px;
+  height: 16px;
+  color: var(--text-secondary);
+  pointer-events: none;
+}
+
+#github-import-search {
+  width: 100%;
+  min-width: 0;
+  min-height: 40px;
+  padding: 8px 12px 8px 36px;
   border: 1px solid var(--border-color);
   border-radius: 8px;
-  background: var(--button-bg);
+  background: var(--bg-color);
+  color: var(--text-color);
+  font: inherit;
+  font-size: var(--ui-font-md);
+}
+
+#github-import-search::placeholder {
+  color: var(--text-secondary);
+}
+
+#github-import-search:focus-visible {
+  border-color: var(--accent-color);
+  outline: 2px solid color-mix(in srgb, var(--accent-color) 24%, transparent);
+  outline-offset: 1px;
+}
+
+.github-import-selection-summary {
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 6px;
+  min-width: max-content;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  font-variant-numeric: tabular-nums;
 }
 
 .github-import-selected-count {
-  font-size: var(--ui-font-md);
   font-weight: 600;
   color: var(--text-color);
 }
 
+.github-import-count-separator {
+  color: color-mix(in srgb, var(--text-secondary) 66%, transparent);
+}
+
+.github-import-select-all-btn {
+  display: inline-grid;
+  place-items: center;
+  width: 40px;
+  height: 40px;
+  padding: 0;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  background: var(--button-bg);
+  color: var(--text-color);
+  cursor: pointer;
+  transition: background-color 160ms ease, border-color 160ms ease, color 160ms ease;
+}
+
+.github-import-select-all-btn > .lucide {
+  width: 18px;
+  height: 18px;
+}
+
+.github-import-select-all-btn:hover {
+  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
+  background: var(--button-hover);
+}
+
+.github-import-select-all-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-select-all-btn.is-deselect {
+  border-color: color-mix(in srgb, var(--accent-color) 46%, var(--border-color));
+  background: color-mix(in srgb, var(--accent-color) 12%, var(--button-bg));
+  color: var(--accent-color);
+}
+
+.github-import-select-all-btn:disabled {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+
 .github-import-tree ul {
   list-style: none;
   margin: 0;
-  padding-left: 18px;
+  padding-left: 24px;
 }
 
 .github-import-tree>ul {
-  padding-left: 4px;
+  padding-left: 0;
 }
 
 .github-import-tree li {
-  margin: 2px 0;
+  margin: 0;
 }
 
 .github-tree-folder-label {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  min-height: 40px;
+  padding: 7px 10px;
+  border: 0;
+  border-bottom: 1px solid var(--border-color);
+  background: transparent;
+  color: var(--text-color);
+  cursor: pointer;
+  text-align: left;
+  font: inherit;
   font-size: 14px;
+}
+
+.github-tree-folder-label:hover,
+.github-tree-folder-label:focus-visible {
+  background: var(--button-hover);
+}
+
+.github-tree-folder-label:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: -2px;
+}
+
+.github-tree-chevron {
+  width: 14px;
+  height: 14px;
   color: var(--text-secondary, #57606a);
-  margin-bottom: 4px;
+  flex: 0 0 auto;
+}
+
+.github-tree-folder-icon {
+  width: 17px;
+  height: 17px;
+  color: var(--accent-color);
+  flex: 0 0 auto;
+}
+
+.github-tree-folder-count {
+  min-width: 24px;
+  margin-left: auto;
+  padding: 1px 7px;
+  border: 1px solid var(--border-color);
+  border-radius: 999px;
+  background: var(--button-bg);
+  color: var(--text-secondary);
+  font-size: 11px;
+  line-height: 1.45;
+  text-align: center;
+  font-variant-numeric: tabular-nums;
 }
 
 .github-tree-file-btn {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  min-height: 40px;
+  padding: 7px 10px 7px 32px;
   border: 0;
+  border-bottom: 1px solid var(--border-color);
   background: transparent;
   color: var(--text-color);
   cursor: pointer;
-  padding: 6px 8px;
-  border-radius: 6px;
   text-align: left;
-  width: 100%;
+  font: inherit;
   font-size: 14px;
 }
 
 .github-tree-file-btn:hover,
 .github-tree-file-btn:focus-visible {
   background: var(--button-hover);
-  outline: none;
+}
+
+.github-tree-file-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: -2px;
 }
 
 .github-tree-file-btn.is-selected {
-  background: rgba(56, 139, 253, 0.14);
+  background: color-mix(in srgb, var(--accent-color) 12%, transparent);
+  color: var(--accent-color);
+}
+
+.github-tree-file-icon {
+  width: 16px;
+  height: 16px;
+  color: var(--text-secondary);
+  flex: 0 0 auto;
+}
+
+.github-tree-file-btn.is-selected .github-tree-file-icon {
   color: var(--accent-color);
 }
 
+.github-import-tree-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-tree-selection-icon {
+  width: 16px;
+  height: 16px;
+  margin-left: auto;
+  color: var(--accent-color);
+  flex: 0 0 auto;
+}
+
+.github-tree-selection-icon[hidden] {
+  display: none;
+}
+
+.github-import-tree-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  min-height: 220px;
+  padding: 24px;
+  color: var(--text-secondary);
+  text-align: center;
+  font-size: var(--ui-font-md);
+}
+
+.github-import-tree-empty > .lucide {
+  width: 24px;
+  height: 24px;
+}
+
 #github-import-modal .reset-modal-actions {
   gap: 8px;
   padding: 10px 16px;
@@ -6074,8 +6273,35 @@ a:focus {
   }
 
   .github-import-selection-toolbar {
-    flex-direction: column;
-    align-items: stretch;
+    grid-template-columns: minmax(0, 1fr) 44px;
+  }
+
+  .github-import-search {
+    grid-column: 1 / -1;
+  }
+
+  #github-import-search,
+  .github-import-select-all-btn {
+    min-height: 44px;
+  }
+
+  .github-import-select-all-btn {
+    width: 44px;
+    height: 44px;
+  }
+
+  .github-import-selection-summary {
+    justify-content: flex-start;
+  }
+
+  .github-import-tree {
+    min-height: 220px;
+    max-height: min(46vh, 380px);
+  }
+
+  .github-tree-folder-label,
+  .github-tree-file-btn {
+    min-height: 44px;
   }
 
   #github-import-modal .reset-modal-message {
@@ -6092,6 +6318,12 @@ a:focus {
   }
 }
 
+@media (prefers-reduced-motion: reduce) {
+  .github-import-select-all-btn {
+    transition: none;
+  }
+}
+
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;
@@ -6214,11 +6446,32 @@ a:focus {
 
 [dir="rtl"] .github-import-tree ul {
   padding-left: 0;
-  padding-right: 18px;
+  padding-right: 24px;
 }
 
 [dir="rtl"] .github-import-tree>ul {
-  padding-right: 4px;
+  padding-right: 0;
+}
+
+[dir="rtl"] .github-import-search > .lucide {
+  right: 11px;
+  left: auto;
+}
+
+[dir="rtl"] #github-import-search {
+  padding-right: 36px;
+  padding-left: 12px;
+}
+
+[dir="rtl"] .github-tree-file-btn {
+  padding-right: 32px;
+  padding-left: 10px;
+}
+
+[dir="rtl"] .github-tree-folder-count,
+[dir="rtl"] .github-tree-selection-icon {
+  margin-right: auto;
+  margin-left: 0;
 }
 
 [dir="rtl"] .markdown-body .markdown-alert,
diff --git a/index.html b/index.html
index 23e3e69d..5ac59239 100644
--- a/index.html
+++ b/index.html
@@ -1374,7 +1374,7 @@ <h2 class="about-title">Markdown Viewer</h2>
             <div class="modal-header">
               <div>
                 <p id="github-import-title" class="reset-modal-message">Import Markdown from GitHub</p>
-                <p class="modal-subtext">Paste a GitHub file or repository URL.</p>
+                <p id="github-import-subtitle" class="modal-subtext">Paste a GitHub file or repository URL.</p>
               </div>
               <button type="button" class="modal-close-btn" id="github-import-close" aria-label="Close GitHub import dialog"><i class="lucide lucide-x" aria-hidden="true"></i></button>
             </div>
@@ -1383,10 +1383,20 @@ <h2 class="about-title">Markdown Viewer</h2>
               <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
-                <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                <button type="button" class="reset-modal-btn" id="github-import-select-all">Select all</button>
+                <label class="github-import-search" for="github-import-search">
+                  <i class="lucide lucide-search" aria-hidden="true"></i>
+                  <input type="search" id="github-import-search" placeholder="Search Markdown files" autocomplete="off" spellcheck="false" />
+                </label>
+                <div class="github-import-selection-summary" aria-live="polite">
+                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
+                  <span class="github-import-count-separator" aria-hidden="true">·</span>
+                  <span id="github-import-total-count" class="github-import-total-count">0 files</span>
+                </div>
+                <button type="button" class="github-import-select-all-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
+                  <i class="lucide lucide-check-check" aria-hidden="true"></i>
+                </button>
               </div>
-              <div id="github-import-tree" class="github-import-tree" style="display:none;"></div>
+              <div id="github-import-tree" class="github-import-tree" role="tree" aria-label="Markdown files in this GitHub location" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
             </div>
             <div class="reset-modal-actions">
diff --git a/script.js b/script.js
index a2dca312..9e400512 100644
--- a/script.js
+++ b/script.js
@@ -534,11 +534,14 @@ document.addEventListener("DOMContentLoaded", async function () {
   const mobileLiveShareParticipants = document.getElementById("mobile-live-share-participants");
   const githubImportModal = document.getElementById("github-import-modal");
   const githubImportTitle = document.getElementById("github-import-title");
+  const githubImportSubtitle = document.getElementById("github-import-subtitle");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
+  const githubImportSearchInput = document.getElementById("github-import-search");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
+  const githubImportTotalCount = document.getElementById("github-import-total-count");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -7746,9 +7749,74 @@ document.addEventListener("DOMContentLoaded", async function () {
       idsToClose = openTabs.map(function(tab) { return tab.id; });
     }
     closeTabMenus();
-    idsToClose.forEach(function(id) {
-      if (tabs.some(function(tab) { return tab.id === id && isTabOpen(tab); })) closeTab(id);
+    if (idsToClose.length === 1) {
+      closeTab(idsToClose[0]);
+      return;
+    }
+    closeTabsInBatch(idsToClose);
+  }
+
+  function closeTabsInBatch(tabIds) {
+    const idsToClose = new Set((tabIds || []).filter(Boolean));
+    if (!idsToClose.size) return;
+
+    // Live sessions have teardown and restore behavior that must keep using the
+    // single-tab path. All ordinary documents can be closed in one state update.
+    if (liveCollaboration && idsToClose.has(liveCollaboration.tabId)) {
+      Array.from(idsToClose).forEach(function(id) {
+        if (tabs.some(function(tab) { return tab.id === id && isTabOpen(tab); })) closeTab(id);
+      });
+      return;
+    }
+
+    const openTabsBeforeClose = getOpenTabs();
+    const activeOpenIndex = openTabsBeforeClose.findIndex(function(tab) { return tab.id === activeTabId; });
+    const activeWillClose = idsToClose.has(activeTabId);
+    const splitWillClose = idsToClose.has(secondarySplitTabId) || (activeWillClose && Boolean(secondarySplitTabId));
+    const changedIds = [];
+    const temporaryIds = new Set();
+
+    if (pendingReviewDelete && idsToClose.has(pendingReviewDelete.tabId)) {
+      cancelReviewDeleteConfirmation();
+    }
+    if (activeWillClose) saveCurrentTabState();
+    saveSecondarySplitState();
+    if (splitWillClose) closeDocumentSplitView({ silent: true, renderTabs: false });
+
+    tabs.forEach(function(tab) {
+      if (!idsToClose.has(tab.id) || !isTabOpen(tab)) return;
+      if (isTemporaryDocument(tab)) {
+        temporaryIds.add(tab.id);
+        shareSnapshotViewOnlyTabIds.delete(tab.id);
+        if (tabHistories[tab.id]) delete tabHistories[tab.id];
+        return;
+      }
+      tab.isOpen = false;
+      changedIds.push(tab.id);
     });
+
+    if (temporaryIds.size) {
+      tabs = tabs.filter(function(tab) { return !temporaryIds.has(tab.id); });
+    }
+    if (changedIds.length) saveTabsToStorage(tabs, changedIds);
+
+    if (activeWillClose) {
+      const remainingOpenTabs = getOpenTabs();
+      const nextTab = remainingOpenTabs.length
+        ? remainingOpenTabs[Math.min(Math.max(activeOpenIndex - 1, 0), remainingOpenTabs.length - 1)]
+        : null;
+      if (nextTab) {
+        void switchTab(nextTab.id).then(renderDocumentSidebar, renderDocumentSidebar);
+      } else {
+        clearActiveDocument();
+        renderDocumentSidebar();
+      }
+    } else {
+      renderDocumentSplitView();
+      renderTabBar(tabs, activeTabId);
+      renderDocumentSidebar();
+    }
+    announceToScreenReader(idsToClose.size + ' tabs closed. Files remain available in Explorer.');
   }
 
   function openTabContextMenu(tab, point, focusTab) {
@@ -11105,16 +11173,37 @@ ${selector} .arrowheadPath {
     mediaProgressHideTimeout = setTimeout(function() { toast.hidden = true; }, 4200);
   }
 
+  function createImportedDocument(content, title, location) {
+    const targetLocation = location || (documentOrganization
+      ? getPreferredDocumentLocation()
+      : { workspaceId: DEFAULT_WORKSPACE_ID, folderId: null });
+    if (targetLocation.workspaceId === SECRET_WORKSPACE_ID && !isSecretWorkspaceUnlocked()) return null;
+    const tab = createTab(content, title, 'split', targetLocation);
+    tab.isOpen = false;
+    normalizeTabDocumentMetadata(tab, { allowSecret: targetLocation.workspaceId === SECRET_WORKSPACE_ID });
+    tabs.push(tab);
+    return tab;
+  }
+
+  async function persistImportedDocuments(documentIds) {
+    const ids = Array.from(documentIds || []).filter(Boolean);
+    if (!ids.length) return;
+    saveTabsToStorage(tabs, ids);
+    await _flushTabsToStorage(tabs, { changedIds: ids });
+    evictInactiveDocumentContent();
+    renderDocumentSidebar();
+  }
+
   function importMarkdownFile(file, location) {
     return new Promise(function(resolve) {
       if (!file) {
-        resolve(false);
+        resolve(null);
         return;
       }
 
       if (file.size > 10 * 1024 * 1024) {
         showUnsupportedFileToast('This Markdown file is too large. The maximum supported size is 10 MB.');
-        resolve(false);
+        resolve(null);
         return;
       }
 
@@ -11127,16 +11216,16 @@ ${selector} .arrowheadPath {
         for (let i = 0; i < checkLength; i++) {
           if (text.charCodeAt(i) === 0) {
             showUnsupportedFileToast('This file appears to be binary. Choose a Markdown file (.md or .markdown).');
-            resolve(false);
+            resolve(null);
             return;
           }
         }
 
-        resolve(newTab(text, getMarkdownFileTitle(file), location) === true);
+        resolve(createImportedDocument(text, getMarkdownFileTitle(file), location));
       };
       reader.onerror = function() {
         alert('Failed to read the file. Please check permissions and try again.');
-        resolve(false);
+        resolve(null);
       };
       reader.readAsText(file);
     });
@@ -11160,17 +11249,25 @@ ${selector} .arrowheadPath {
     const filesToImport = markdownFiles;
 
     let importedCount = 0;
+    const importedDocumentIds = [];
     showImportProgress(filesToImport.length);
     for (let index = 0; index < filesToImport.length; index++) {
-      if (await importMarkdownFile(filesToImport[index], settings.location)) {
+      const importedDocument = await importMarkdownFile(filesToImport[index], settings.location);
+      if (importedDocument) {
         importedCount++;
+        importedDocumentIds.push(importedDocument.id);
       }
       updateImportProgress(index + 1, filesToImport.length);
     }
+    await persistImportedDocuments(importedDocumentIds);
     if (settings.location && settings.location.workspaceId === SECRET_WORKSPACE_ID && isSecretWorkspaceUnlocked()) {
       await flushSecretWorkspaceToStorage();
     }
-    finishImportProgress(importedCount, filesToImport.length);
+    finishImportProgress(importedCount, filesToImport.length, {
+      detail: importedCount === filesToImport.length
+        ? 'Saved to Explorer without opening new tabs.'
+        : undefined
+    });
 
     return importedCount;
   }
@@ -11181,7 +11278,9 @@ ${selector} .arrowheadPath {
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   let lastGitHubImportRequestAt = 0;
   const selectedGitHubImportPaths = new Set();
+  const collapsedGitHubImportFolders = new Set();
   let availableGitHubImportPaths = [];
+  let githubImportSearchTimer = null;
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11223,6 +11322,7 @@ ${selector} .arrowheadPath {
     });
 
     let imported = 0;
+    const importedDocumentIds = [];
     for (let index = 0; index < paths.length; index++) {
       const filePath = paths[index];
       updateImportProgress(index, paths.length, 'Importing ' + getFileName(filePath));
@@ -11230,8 +11330,14 @@ ${selector} .arrowheadPath {
         const markdown = await fetchTextContent(buildRawGitHubUrl(owner, repo, ref, filePath));
         const destinationFolder = ensureGitHubFolderPath(DEFAULT_WORKSPACE_ID, folder, filePath);
         const destination = { workspaceId: DEFAULT_WORKSPACE_ID, folderId: destinationFolder.id };
-        if (newTab(markdown, getFileName(filePath).replace(/\.(md|markdown)$/i, ''), destination)) {
+        const importedDocument = createImportedDocument(
+          markdown,
+          getFileName(filePath).replace(/\.(md|markdown)$/i, ''),
+          destination
+        );
+        if (importedDocument) {
           imported++;
+          importedDocumentIds.push(importedDocument.id);
         }
       } catch (error) {
         console.error('GitHub file import failed:', filePath, error);
@@ -11239,11 +11345,12 @@ ${selector} .arrowheadPath {
       updateImportProgress(index + 1, paths.length, 'Saving to Workspace / ' + folder.name);
     }
 
+    await persistImportedDocuments(importedDocumentIds);
     const failureCount = paths.length - imported;
     finishImportProgress(imported, paths.length, {
       detail: failureCount
         ? failureCount + ' file' + (failureCount === 1 ? '' : 's') + ' could not be imported.'
-        : 'Saved in Workspace / ' + folder.name
+        : 'Saved in Workspace / ' + folder.name + ' without opening new tabs.'
     });
     announceToScreenReader(imported === paths.length
       ? 'GitHub import complete. Files saved in the ' + folder.name + ' folder.'
@@ -11415,14 +11522,28 @@ ${selector} .arrowheadPath {
   function updateGitHubImportSelectedCount() {
     if (!githubImportSelectedCount) return;
     const count = selectedGitHubImportPaths.size;
-    githubImportSelectedCount.textContent = `${count} selected`;
+    githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
+  }
+
+  function updateGitHubImportTotalCount() {
+    if (!githubImportTotalCount) return;
+    const total = availableGitHubImportPaths.length;
+    githubImportTotalCount.textContent = `${total.toLocaleString()} ${total === 1 ? "file" : "files"}`;
   }
 
   function updateGitHubSelectAllButtonLabel() {
     if (!githubImportSelectAllBtn) return;
     const total = availableGitHubImportPaths.length;
     const allSelected = total > 0 && selectedGitHubImportPaths.size === total;
-    githubImportSelectAllBtn.textContent = allSelected ? "Clear All" : "Select All";
+    const actionLabel = allSelected ? "Deselect all files" : "Select all files";
+    githubImportSelectAllBtn.setAttribute("aria-label", actionLabel);
+    githubImportSelectAllBtn.title = actionLabel;
+    githubImportSelectAllBtn.setAttribute("aria-pressed", allSelected ? "true" : "false");
+    githubImportSelectAllBtn.classList.toggle("is-deselect", allSelected);
+    const icon = githubImportSelectAllBtn.querySelector("i");
+    if (icon) {
+      icon.className = `lucide ${allSelected ? "lucide-square-x" : "lucide-check-check"}`;
+    }
   }
 
   function syncGitHubSelectionToButtons() {
@@ -11431,6 +11552,9 @@ ${selector} .arrowheadPath {
       const isSelected = selectedGitHubImportPaths.has(btn.dataset.path);
       btn.classList.toggle("is-selected", isSelected);
       btn.setAttribute("aria-pressed", isSelected ? "true" : "false");
+      btn.setAttribute("aria-label", `${btn.dataset.name || getFileName(btn.dataset.path)}, ${isSelected ? "selected" : "not selected"}`);
+      const checkIcon = btn.querySelector(".github-tree-selection-icon");
+      if (checkIcon) checkIcon.hidden = !isSelected;
     });
   }
 
@@ -11454,22 +11578,78 @@ ${selector} .arrowheadPath {
     updateGitHubSelectAllButtonLabel();
   }
 
+  function getFilteredGitHubImportPaths() {
+    const query = githubImportSearchInput ? githubImportSearchInput.value.trim().toLocaleLowerCase() : "";
+    if (!query) return availableGitHubImportPaths.slice();
+    return availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query));
+  }
+
+  function countMarkdownFilesInTreeNode(node) {
+    return node.files.length + Object.values(node.folders).reduce((total, folder) => {
+      return total + countMarkdownFilesInTreeNode(folder);
+    }, 0);
+  }
+
   function renderGitHubImportTree(paths) {
     if (!githubImportTree || !githubImportFileSelect) return;
-    githubImportTree.innerHTML = "";
-    const tree = buildMarkdownFileTree(paths);
+    githubImportTree.textContent = "";
+    const visiblePaths = Array.isArray(paths) ? paths : getFilteredGitHubImportPaths();
+    const searchActive = Boolean(githubImportSearchInput && githubImportSearchInput.value.trim());
+    if (!visiblePaths.length) {
+      const emptyState = document.createElement("div");
+      emptyState.className = "github-import-tree-empty";
+      emptyState.setAttribute("role", "status");
+      emptyState.innerHTML = '<i class="lucide lucide-search" aria-hidden="true"></i><span>No Markdown files match your search.</span>';
+      githubImportTree.appendChild(emptyState);
+      return;
+    }
+    const tree = buildMarkdownFileTree(visiblePaths);
 
     const createTreeBranch = function(node, parentPath) {
       const list = document.createElement("ul");
+      list.setAttribute("role", "group");
       const folderNames = Object.keys(node.folders).sort((a, b) => a.localeCompare(b));
       folderNames.forEach((folderName) => {
         const folderPath = parentPath ? `${parentPath}/${folderName}` : folderName;
         const item = document.createElement("li");
-        const folderLabel = document.createElement("span");
-        folderLabel.className = "github-tree-folder-label";
-        folderLabel.textContent = `📁 ${folderName}`;
-        item.appendChild(folderLabel);
-        item.appendChild(createTreeBranch(node.folders[folderName], folderPath));
+        item.className = "github-tree-folder-item";
+        item.setAttribute("role", "none");
+        const folderToggle = document.createElement("button");
+        const childBranch = createTreeBranch(node.folders[folderName], folderPath);
+        const collapsed = !searchActive && collapsedGitHubImportFolders.has(folderPath);
+        folderToggle.type = "button";
+        folderToggle.className = "github-tree-folder-label";
+        folderToggle.dataset.folderPath = folderPath;
+        folderToggle.setAttribute("role", "treeitem");
+        folderToggle.setAttribute("aria-expanded", collapsed ? "false" : "true");
+        folderToggle.title = folderPath;
+
+        const chevron = document.createElement("i");
+        chevron.className = `lucide ${collapsed ? "lucide-chevron-right" : "lucide-chevron-down"} github-tree-chevron`;
+        chevron.setAttribute("aria-hidden", "true");
+        const folderIcon = document.createElement("i");
+        folderIcon.className = `lucide ${collapsed ? "lucide-folder" : "lucide-folder-open"} github-tree-folder-icon`;
+        folderIcon.setAttribute("aria-hidden", "true");
+        const folderNameNode = document.createElement("span");
+        folderNameNode.className = "github-import-tree-name";
+        folderNameNode.textContent = folderName;
+        const folderCount = document.createElement("span");
+        folderCount.className = "github-tree-folder-count";
+        folderCount.textContent = countMarkdownFilesInTreeNode(node.folders[folderName]).toLocaleString();
+        folderCount.setAttribute("aria-label", `${folderCount.textContent} Markdown files`);
+
+        childBranch.hidden = collapsed;
+        folderToggle.append(chevron, folderIcon, folderNameNode, folderCount);
+        folderToggle.addEventListener("click", function() {
+          const shouldCollapse = folderToggle.getAttribute("aria-expanded") === "true";
+          folderToggle.setAttribute("aria-expanded", shouldCollapse ? "false" : "true");
+          childBranch.hidden = shouldCollapse;
+          chevron.className = `lucide ${shouldCollapse ? "lucide-chevron-right" : "lucide-chevron-down"} github-tree-chevron`;
+          folderIcon.className = `lucide ${shouldCollapse ? "lucide-folder" : "lucide-folder-open"} github-tree-folder-icon`;
+          if (shouldCollapse) collapsedGitHubImportFolders.add(folderPath);
+          else collapsedGitHubImportFolders.delete(folderPath);
+        });
+        item.append(folderToggle, childBranch);
         list.appendChild(item);
       });
 
@@ -11477,12 +11657,29 @@ ${selector} .arrowheadPath {
         .sort((a, b) => a.path.localeCompare(b.path))
         .forEach((file) => {
           const fileItem = document.createElement("li");
+          fileItem.className = "github-tree-file-item";
+          fileItem.setAttribute("role", "none");
           const fileButton = document.createElement("button");
           fileButton.type = "button";
           fileButton.className = "github-tree-file-btn";
           fileButton.dataset.path = file.path;
+          fileButton.dataset.name = file.name;
+          fileButton.setAttribute("role", "treeitem");
           fileButton.setAttribute("aria-pressed", "false");
-          fileButton.textContent = `📄 ${file.name}`;
+          fileButton.title = file.path;
+
+          const fileIcon = document.createElement("i");
+          fileIcon.className = "lucide lucide-file-text github-tree-file-icon";
+          fileIcon.setAttribute("aria-hidden", "true");
+          const fileName = document.createElement("span");
+          fileName.className = "github-import-tree-name";
+          fileName.textContent = file.name;
+          const selectedIcon = document.createElement("i");
+          selectedIcon.className = "lucide lucide-check github-tree-selection-icon";
+          selectedIcon.setAttribute("aria-hidden", "true");
+          selectedIcon.hidden = true;
+
+          fileButton.append(fileIcon, fileName, selectedIcon);
           fileButton.addEventListener("click", function() {
             toggleGitHubSelectedPath(file.path);
           });
@@ -11493,7 +11690,9 @@ ${selector} .arrowheadPath {
       return list;
     };
 
-    githubImportTree.appendChild(createTreeBranch(tree, ""));
+    const treeFragment = document.createDocumentFragment();
+    treeFragment.appendChild(createTreeBranch(tree, ""));
+    githubImportTree.appendChild(treeFragment);
     syncGitHubSelectionToButtons();
   }
 
@@ -11528,6 +11727,9 @@ ${selector} .arrowheadPath {
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
+    if (githubImportSubtitle) {
+      githubImportSubtitle.textContent = "Paste a GitHub file or repository URL.";
+    }
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
@@ -11539,6 +11741,14 @@ ${selector} .arrowheadPath {
       githubImportSelectionToolbar.style.display = "none";
     }
     availableGitHubImportPaths = [];
+    collapsedGitHubImportFolders.clear();
+    clearTimeout(githubImportSearchTimer);
+    githubImportSearchTimer = null;
+    if (githubImportSearchInput) {
+      githubImportSearchInput.value = "";
+      githubImportSearchInput.disabled = false;
+    }
+    updateGitHubImportTotalCount();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -11577,6 +11787,9 @@ ${selector} .arrowheadPath {
       if (githubImportSelectAllBtn) {
         githubImportSelectAllBtn.disabled = disabled;
       }
+      if (githubImportSearchInput) {
+        githubImportSearchInput.disabled = disabled;
+      }
     };
     const step = githubImportSubmitBtn.dataset.step || "url";
     if (step === "select") {
@@ -11658,27 +11871,32 @@ ${selector} .arrowheadPath {
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
       githubImportFileSelect.style.display = "none";
       if (githubImportSelectionToolbar) {
-        githubImportSelectionToolbar.style.display = "flex";
+        githubImportSelectionToolbar.style.display = "grid";
       }
       if (githubImportTree) {
         githubImportTree.style.display = "block";
       }
       availableGitHubImportPaths = files.slice();
+      updateGitHubImportTotalCount();
       setGitHubSelectedPaths(files[0] ? [files[0]] : []);
-      renderGitHubImportTree(files);
+      renderGitHubImportTree();
 
       // Announce load complete
       announceToScreenReader("GitHub files loaded. " + files.length + " files available in the tree.");
 
       setGitHubImportMessage("");
       if (githubImportTitle) {
-        githubImportTitle.textContent = "Select Markdown file(s) to import";
+        githubImportTitle.textContent = "Select Markdown files to import";
+      }
+      if (githubImportSubtitle) {
+        githubImportSubtitle.textContent = `${files.length.toLocaleString()} Markdown files found. Choose what to save to Explorer.`;
       }
       githubImportSubmitBtn.dataset.step = "select";
       githubImportSubmitBtn.dataset.owner = parsed.owner;
       githubImportSubmitBtn.dataset.repo = parsed.repo;
       githubImportSubmitBtn.dataset.ref = ref;
       githubImportSubmitBtn.textContent = "Import Selected";
+      if (githubImportSearchInput) githubImportSearchInput.focus();
     } catch (error) {
       console.error("GitHub import failed:", error);
       setGitHubImportMessage("GitHub import failed: " + error.message);
@@ -17857,11 +18075,26 @@ ${selector} .arrowheadPath {
         multiSelections: true
       });
       if (result && result.length > 0) {
-        for (const filePath of result) {
-          const content = await Neutralino.filesystem.readFile(filePath);
-          const fileName = filePath.split(/[/\\]/).pop().replace(/\.(md|markdown)$/i, "");
-          if (!newTab(content, fileName)) break;
+        const importedDocumentIds = [];
+        showImportProgress(result.length);
+        for (let index = 0; index < result.length; index++) {
+          const filePath = result[index];
+          try {
+            const content = await Neutralino.filesystem.readFile(filePath);
+            const fileName = filePath.split(/[/\\]/).pop().replace(/\.(md|markdown)$/i, "");
+            const importedDocument = createImportedDocument(content, fileName);
+            if (importedDocument) importedDocumentIds.push(importedDocument.id);
+          } catch (fileError) {
+            console.error("Native file import failed:", filePath, fileError);
+          }
+          updateImportProgress(index + 1, result.length);
         }
+        await persistImportedDocuments(importedDocumentIds);
+        finishImportProgress(importedDocumentIds.length, result.length, {
+          detail: importedDocumentIds.length === result.length
+            ? 'Saved to Explorer without opening new tabs.'
+            : undefined
+        });
       }
     } catch (e) {
       console.error("Native import failed:", e);
@@ -17910,6 +18143,24 @@ ${selector} .arrowheadPath {
   if (githubImportFileSelect) {
     githubImportFileSelect.addEventListener("keydown", handleGitHubImportInputKeydown);
   }
+  if (githubImportSearchInput) {
+    githubImportSearchInput.addEventListener("input", function() {
+      clearTimeout(githubImportSearchTimer);
+      githubImportSearchTimer = setTimeout(function() {
+        renderGitHubImportTree();
+        const visibleCount = getFilteredGitHubImportPaths().length;
+        announceToScreenReader(visibleCount + " Markdown file" + (visibleCount === 1 ? "" : "s") + " shown.");
+      }, 120);
+    });
+    githubImportSearchInput.addEventListener("keydown", function(e) {
+      if (e.key === "Escape" && githubImportSearchInput.value) {
+        e.preventDefault();
+        e.stopPropagation();
+        githubImportSearchInput.value = "";
+        renderGitHubImportTree();
+      }
+    });
+  }
   if (githubImportSelectAllBtn) {
     githubImportSelectAllBtn.addEventListener("click", function() {
       const allPaths = availableGitHubImportPaths.slice();
diff --git a/styles.css b/styles.css
index 52f2e28c..1819eb01 100644
--- a/styles.css
+++ b/styles.css
@@ -5943,8 +5943,8 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(92vw, 520px);
-  max-width: 520px;
+  width: min(94vw, 760px);
+  max-width: 760px;
   min-width: 0;
   padding: 0;
   gap: 0;
@@ -5965,9 +5965,9 @@ a:focus {
 .github-import-modal-body {
   display: flex;
   flex-direction: column;
-  gap: 8px;
-  max-height: min(56vh, 460px);
-  overflow: auto;
+  gap: 10px;
+  max-height: min(68vh, 620px);
+  overflow: hidden;
   padding: 16px;
 }
 
@@ -5983,75 +5983,274 @@ a:focus {
 }
 
 .github-import-tree {
-  max-height: 320px;
+  min-height: 240px;
+  max-height: min(48vh, 440px);
   overflow: auto;
   border: 1px solid var(--border-color);
-  border-radius: 10px;
-  padding: 12px;
+  border-radius: 8px;
+  padding: 0;
   background: var(--bg-color);
+  overscroll-behavior: contain;
+  scrollbar-gutter: stable;
 }
 
 .github-import-selection-toolbar {
-  display: flex;
+  display: grid;
+  grid-template-columns: minmax(220px, 1fr) auto 40px;
   align-items: center;
-  justify-content: space-between;
   gap: 8px;
-  padding: 8px 10px;
+}
+
+.github-import-search {
+  position: relative;
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  margin: 0;
+}
+
+.github-import-search > .lucide {
+  position: absolute;
+  left: 11px;
+  z-index: 1;
+  width: 16px;
+  height: 16px;
+  color: var(--text-secondary);
+  pointer-events: none;
+}
+
+#github-import-search {
+  width: 100%;
+  min-width: 0;
+  min-height: 40px;
+  padding: 8px 12px 8px 36px;
   border: 1px solid var(--border-color);
   border-radius: 8px;
-  background: var(--button-bg);
+  background: var(--bg-color);
+  color: var(--text-color);
+  font: inherit;
+  font-size: var(--ui-font-md);
+}
+
+#github-import-search::placeholder {
+  color: var(--text-secondary);
+}
+
+#github-import-search:focus-visible {
+  border-color: var(--accent-color);
+  outline: 2px solid color-mix(in srgb, var(--accent-color) 24%, transparent);
+  outline-offset: 1px;
+}
+
+.github-import-selection-summary {
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 6px;
+  min-width: max-content;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  font-variant-numeric: tabular-nums;
 }
 
 .github-import-selected-count {
-  font-size: var(--ui-font-md);
   font-weight: 600;
   color: var(--text-color);
 }
 
+.github-import-count-separator {
+  color: color-mix(in srgb, var(--text-secondary) 66%, transparent);
+}
+
+.github-import-select-all-btn {
+  display: inline-grid;
+  place-items: center;
+  width: 40px;
+  height: 40px;
+  padding: 0;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  background: var(--button-bg);
+  color: var(--text-color);
+  cursor: pointer;
+  transition: background-color 160ms ease, border-color 160ms ease, color 160ms ease;
+}
+
+.github-import-select-all-btn > .lucide {
+  width: 18px;
+  height: 18px;
+}
+
+.github-import-select-all-btn:hover {
+  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
+  background: var(--button-hover);
+}
+
+.github-import-select-all-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-select-all-btn.is-deselect {
+  border-color: color-mix(in srgb, var(--accent-color) 46%, var(--border-color));
+  background: color-mix(in srgb, var(--accent-color) 12%, var(--button-bg));
+  color: var(--accent-color);
+}
+
+.github-import-select-all-btn:disabled {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+
 .github-import-tree ul {
   list-style: none;
   margin: 0;
-  padding-left: 18px;
+  padding-left: 24px;
 }
 
 .github-import-tree>ul {
-  padding-left: 4px;
+  padding-left: 0;
 }
 
 .github-import-tree li {
-  margin: 2px 0;
+  margin: 0;
 }
 
 .github-tree-folder-label {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  min-height: 40px;
+  padding: 7px 10px;
+  border: 0;
+  border-bottom: 1px solid var(--border-color);
+  background: transparent;
+  color: var(--text-color);
+  cursor: pointer;
+  text-align: left;
+  font: inherit;
   font-size: 14px;
+}
+
+.github-tree-folder-label:hover,
+.github-tree-folder-label:focus-visible {
+  background: var(--button-hover);
+}
+
+.github-tree-folder-label:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: -2px;
+}
+
+.github-tree-chevron {
+  width: 14px;
+  height: 14px;
   color: var(--text-secondary, #57606a);
-  margin-bottom: 4px;
+  flex: 0 0 auto;
+}
+
+.github-tree-folder-icon {
+  width: 17px;
+  height: 17px;
+  color: var(--accent-color);
+  flex: 0 0 auto;
+}
+
+.github-tree-folder-count {
+  min-width: 24px;
+  margin-left: auto;
+  padding: 1px 7px;
+  border: 1px solid var(--border-color);
+  border-radius: 999px;
+  background: var(--button-bg);
+  color: var(--text-secondary);
+  font-size: 11px;
+  line-height: 1.45;
+  text-align: center;
+  font-variant-numeric: tabular-nums;
 }
 
 .github-tree-file-btn {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  min-height: 40px;
+  padding: 7px 10px 7px 32px;
   border: 0;
+  border-bottom: 1px solid var(--border-color);
   background: transparent;
   color: var(--text-color);
   cursor: pointer;
-  padding: 6px 8px;
-  border-radius: 6px;
   text-align: left;
-  width: 100%;
+  font: inherit;
   font-size: 14px;
 }
 
 .github-tree-file-btn:hover,
 .github-tree-file-btn:focus-visible {
   background: var(--button-hover);
-  outline: none;
+}
+
+.github-tree-file-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: -2px;
 }
 
 .github-tree-file-btn.is-selected {
-  background: rgba(56, 139, 253, 0.14);
+  background: color-mix(in srgb, var(--accent-color) 12%, transparent);
+  color: var(--accent-color);
+}
+
+.github-tree-file-icon {
+  width: 16px;
+  height: 16px;
+  color: var(--text-secondary);
+  flex: 0 0 auto;
+}
+
+.github-tree-file-btn.is-selected .github-tree-file-icon {
   color: var(--accent-color);
 }
 
+.github-import-tree-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-tree-selection-icon {
+  width: 16px;
+  height: 16px;
+  margin-left: auto;
+  color: var(--accent-color);
+  flex: 0 0 auto;
+}
+
+.github-tree-selection-icon[hidden] {
+  display: none;
+}
+
+.github-import-tree-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  min-height: 220px;
+  padding: 24px;
+  color: var(--text-secondary);
+  text-align: center;
+  font-size: var(--ui-font-md);
+}
+
+.github-import-tree-empty > .lucide {
+  width: 24px;
+  height: 24px;
+}
+
 #github-import-modal .reset-modal-actions {
   gap: 8px;
   padding: 10px 16px;
@@ -6074,8 +6273,35 @@ a:focus {
   }
 
   .github-import-selection-toolbar {
-    flex-direction: column;
-    align-items: stretch;
+    grid-template-columns: minmax(0, 1fr) 44px;
+  }
+
+  .github-import-search {
+    grid-column: 1 / -1;
+  }
+
+  #github-import-search,
+  .github-import-select-all-btn {
+    min-height: 44px;
+  }
+
+  .github-import-select-all-btn {
+    width: 44px;
+    height: 44px;
+  }
+
+  .github-import-selection-summary {
+    justify-content: flex-start;
+  }
+
+  .github-import-tree {
+    min-height: 220px;
+    max-height: min(46vh, 380px);
+  }
+
+  .github-tree-folder-label,
+  .github-tree-file-btn {
+    min-height: 44px;
   }
 
   #github-import-modal .reset-modal-message {
@@ -6092,6 +6318,12 @@ a:focus {
   }
 }
 
+@media (prefers-reduced-motion: reduce) {
+  .github-import-select-all-btn {
+    transition: none;
+  }
+}
+
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;
@@ -6214,11 +6446,32 @@ a:focus {
 
 [dir="rtl"] .github-import-tree ul {
   padding-left: 0;
-  padding-right: 18px;
+  padding-right: 24px;
 }
 
 [dir="rtl"] .github-import-tree>ul {
-  padding-right: 4px;
+  padding-right: 0;
+}
+
+[dir="rtl"] .github-import-search > .lucide {
+  right: 11px;
+  left: auto;
+}
+
+[dir="rtl"] #github-import-search {
+  padding-right: 36px;
+  padding-left: 12px;
+}
+
+[dir="rtl"] .github-tree-file-btn {
+  padding-right: 32px;
+  padding-left: 10px;
+}
+
+[dir="rtl"] .github-tree-folder-count,
+[dir="rtl"] .github-tree-selection-icon {
+  margin-right: auto;
+  margin-left: 0;
 }
 
 [dir="rtl"] .markdown-body .markdown-alert,
diff --git a/wiki/Features.md b/wiki/Features.md
index f9c8e5fd..436adf7d 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -241,7 +241,7 @@ Local file import:
 - Rejects an individual Markdown file larger than 10 MB.
 - Dragging files over the app shows a compact drop notice. Explorer document drags use a Markdown file preview, folders expand on hover, and the Explorer scrolls near its top and bottom edges.
 - The first 8 KB of a file are scanned for null bytes to avoid loading binary files as text.
-- Imported local files open in the active tab or a new tab depending on the action.
+- Imported local files are saved to Explorer without opening new tabs. Select a saved file in Explorer when you want to edit it.
 
 Media insertion:
 
@@ -265,11 +265,11 @@ GitHub import:
 - Accepts `github.com/owner/repo`, `github.com/owner/repo/tree/ref/path`, `github.com/owner/repo/blob/ref/path`, and `raw.githubusercontent.com` file URLs.
 - Direct Markdown file URLs import immediately.
 - Repository or folder URLs query GitHub's public API to find Markdown files.
-- The modal shows a tree and supports selecting multiple files.
+- The wider modal shows a searchable, collapsible GitHub-style tree, selected and total file counts, and an icon-based select-all or deselect-all control.
 - Imports create a repository-named folder and reproduce each selected file's nested GitHub directory path inside it.
 - Every Markdown file found is shown.
 - Requests are rate-limited by the app to avoid hammering GitHub.
-- Selected files are fetched as raw content and opened as separate tabs.
+- Selected files are fetched as raw content and saved to Explorer without opening new tabs.
 
 Limitations and privacy:
 
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index 3d93e2c6..732704c2 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -96,7 +96,7 @@ Scope matching uses Marked's lexer and is best-effort for unusual Markdown.
 
 ### Local Files
 
-Use Import > From files, the mobile import button, or drag and drop to open local Markdown files. Dropping a file on an Explorer folder imports it there; dropping it elsewhere imports it at the default workspace root. Folders expand after a short drag hover, and the Explorer scrolls automatically near its top and bottom edges.
+Use Import > From files, the mobile import button, or drag and drop to save local Markdown files in Explorer. Imported documents remain closed until you select one in Explorer, so large imports do not fill the tab bar. Dropping a file on an Explorer folder imports it there; dropping it elsewhere imports it at the default workspace root. Folders expand after a short drag hover, and the Explorer scrolls automatically near its top and bottom edges.
 
 Paste an image or GIF from the clipboard, drop an image/GIF/video file, or use the media dialog to insert it at the current editor cursor. A progress toast shows preparation and upload status. Still images are optimized, animated GIFs retain their original animation, and MP4, WebM, or Ogg videos are inserted as playable HTML5 media. After first-use consent, the app uploads the file to managed public media storage and inserts a short HTTPS link. Anyone with that unguessable URL can retrieve the media for up to 90 days; after expiry the reference remains in Markdown but the media stops rendering. Documents containing older inline base64 raster images offer to convert them to short links without changing their alt text or title.
 
@@ -119,7 +119,7 @@ Use Import > From GitHub and paste one of these URL types:
 - `https://github.com/owner/repo/blob/main/README.md`
 - `https://raw.githubusercontent.com/owner/repo/main/README.md`
 
-Direct Markdown file URLs import immediately. Repository and folder URLs query GitHub's public API, show a tree containing every Markdown file found, and let you import selected files into separate tabs. Selected files are placed in a repository-named Explorer folder with their nested GitHub directory paths preserved.
+Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs query GitHub's public API and show a searchable, collapsible tree containing every Markdown file found. The toolbar shows selected and total file counts and provides an icon that switches between select all and deselect all. Selected files are placed in a repository-named Explorer folder with their nested GitHub directory paths preserved, and remain closed until you select one in Explorer.
 
 GitHub import sends the repository/path request to GitHub and only works for public content. The app does not ask for GitHub credentials.
 

From 758cbeda07ac15093520c803c11140ae9b1f4a2c Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 18:06:11 +0530
Subject: [PATCH 04/10] fix(ui): preserve importer touch targets

---
 desktop-app/resources/styles.css | 14 ++++++++++++++
 styles.css                       | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 1819eb01..97d12c60 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -6324,6 +6324,20 @@ a:focus {
   }
 }
 
+@media (max-width: 900px) and (max-height: 500px) {
+  #github-import-search,
+  .github-import-select-all-btn,
+  .github-tree-folder-label,
+  .github-tree-file-btn {
+    min-height: 44px;
+  }
+
+  .github-import-select-all-btn {
+    width: 44px;
+    height: 44px;
+  }
+}
+
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;
diff --git a/styles.css b/styles.css
index 1819eb01..97d12c60 100644
--- a/styles.css
+++ b/styles.css
@@ -6324,6 +6324,20 @@ a:focus {
   }
 }
 
+@media (max-width: 900px) and (max-height: 500px) {
+  #github-import-search,
+  .github-import-select-all-btn,
+  .github-tree-folder-label,
+  .github-tree-file-btn {
+    min-height: 44px;
+  }
+
+  .github-import-select-all-btn {
+    width: 44px;
+    height: 44px;
+  }
+}
+
 .frontmatter-table {
   border-collapse: collapse;
   margin-bottom: 1.5em;

From eba027df3104ede64466efca3c5b41e515902aa7 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 18:56:32 +0530
Subject: [PATCH 05/10] feat(github): add secure branch and private imports

---
 CHANGELOG.md                                  |   5 +-
 README.md                                     |   7 +-
 assets/lucide-icons.css                       |   3 +
 desktop-app/resources/index.html              |  68 ++
 desktop-app/resources/js/script.js            | 684 +++++++++++++++++-
 desktop-app/resources/js/workspace-storage.js |  25 +
 desktop-app/resources/styles.css              | 416 ++++++++++-
 index.html                                    |  68 ++
 script.js                                     | 684 +++++++++++++++++-
 styles.css                                    | 416 ++++++++++-
 wiki/FAQ.md                                   |   4 +-
 wiki/Features.md                              |  18 +-
 wiki/Home.md                                  |   2 +-
 wiki/Privacy-and-Security.md                  |   2 +-
 wiki/Troubleshooting.md                       |   4 +-
 wiki/Usage-Guide.md                           |   8 +-
 workspace-storage.js                          |  25 +
 17 files changed, 2328 insertions(+), 111 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc851fad..e246ac85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,7 +38,10 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 
 - Removed the 30-file display cap so repository and folder results expose every Markdown file found.
 - Added complete subtree traversal when GitHub marks a recursive repository tree response as truncated.
-- Widened the GitHub picker, added file search, selected/total counts, an icon-based select-all toggle, and collapsible GitHub-style folder and file rows.
+- Added branch, tag, and commit URL resolution, including branch names containing `/`, and pinned each import to the resolved immutable commit SHA.
+- Added optional private repository access with fine-grained read-only PATs, session-only storage by default, passphrase-protected AES-GCM retention for 1, 7, or 30 days, automatic expiry, and manual removal.
+- Restored the compact 520px GitHub URL step while keeping the searchable file picker at 760px, and added repository, ref, and short-commit context to the selection step.
+- Added file search, selected/total counts, an icon-based select-all toggle, and collapsible GitHub-style folder and file rows using the application typography scale.
 - Changed local, drag-and-drop, desktop, and GitHub Markdown imports to save documents in Explorer without opening every imported file as a tab.
 - Batched multi-tab close commands so closing hundreds of tabs performs one state update and render instead of repeatedly rebuilding the interface.
 
diff --git a/README.md b/README.md
index b43f9b22..deacff06 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Turn a document into a Share Snapshot link for quick handoffs, or start access-c
   <img src="https://github.com/user-attachments/assets/bbacabcf-eb19-4430-af19-1ab791afe01c" alt="3D STL Full screen" width="90%" />
 </p>
 
-- **Import and export:** open local files or public GitHub content; export Markdown, standalone HTML, PNG, Browser Print/Save as PDF, or a legacy raster PDF.
+- **Import and export:** open local files or GitHub content from branches, tags, commits, and optionally private repositories; export Markdown, standalone HTML, PNG, Browser Print/Save as PDF, or a legacy raster PDF.
 
 - **Optional sharing:** create a Share Snapshot with View only or Can edit access, or start a temporary Live Share room with host, Can edit, and View only capabilities.
 
@@ -110,7 +110,7 @@ Markdown Viewer is local-first, not network-free. The following table shows the
 | :--- | :--- |
 | Editing, local imports, Preview, Workspace autosave, and most exports | On the device |
 | Web libraries and uncached renderer dependencies | CDN requests in the web/PWA build |
-| Public GitHub import and emoji lookup | GitHub APIs and raw-content hosts |
+| GitHub import and emoji lookup | Public content uses GitHub APIs and raw-content hosts; private content uses an optional fine-grained PAT only with `api.github.com` |
 | PlantUML, D2, Graphviz, Vega-Lite, WaveDrom, and some diagram previews | Diagram source can be sent to PlantUML, Kroki, or mermaid.ink |
 | Consented image, GIF, and video insertion | Public, content-addressed Cloudflare media storage for 90 days |
 | Large Share Snapshot | Cloudflare KV for 90 days |
@@ -156,7 +156,8 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Importing a workspace backup permanently replaces the current workspace after confirmation.
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
-- The searchable public GitHub importer shows every Markdown file found in a repository or folder result.
+- The searchable GitHub importer shows every Markdown file found in a repository or folder result and resolves branch, tag, and commit URLs to an immutable commit SHA.
+- Private repository access is session-only by default. Optional remembered access is passphrase-encrypted with AES-GCM, expires after 1, 7, or 30 days, and can be removed at any time.
 - Imported Markdown files are saved to Explorer and remain closed until you choose one, preventing large imports from flooding the tab bar.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
diff --git a/assets/lucide-icons.css b/assets/lucide-icons.css
index 00eaf338..dda69892 100644
--- a/assets/lucide-icons.css
+++ b/assets/lucide-icons.css
@@ -25,6 +25,9 @@
   .lucide { background-color: ButtonText; }
 }
 
+.lucide-git-branch { --lucide-icon: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImJsYWNrIiBzdHJva2Utd2lkdGg9IjEuNSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48bGluZSB4MT0iNiIgeDI9IjYiIHkxPSIzIiB5Mj0iMTUiLz48Y2lyY2xlIGN4PSIxOCIgY3k9IjYiIHI9IjMiLz48Y2lyY2xlIGN4PSI2IiBjeT0iMTgiIHI9IjMiLz48cGF0aCBkPSJNMTggOWE5IDkgMCAwIDEtOSA5Ii8+PC9zdmc+"); }
+.lucide-git-commit-horizontal { --lucide-icon: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIiBzdHJva2U9ImJsYWNrIiBzdHJva2Utd2lkdGg9IjEuNSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48Y2lyY2xlIGN4PSIxMiIgY3k9IjEyIiByPSIzIi8+PGxpbmUgeDE9IjMiIHgyPSI5IiB5MT0iMTIiIHkyPSIxMiIvPjxsaW5lIHgxPSIxNSIgeDI9IjIxIiB5MT0iMTIiIHkyPSIxMiIvPjwvc3ZnPg=="); }
+
 .lucide-hat-glasses { --lucide-icon: url("data:image/svg+xml;base64,PCEtLSBAbGljZW5zZSBsdWNpZGUtc3RhdGljIHYxLjI1LjAgLSBJU0MgLS0+PHN2ZyBjbGFzcz0ibHVjaWRlIGx1Y2lkZS1oYXQtZ2xhc3NlcyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgPjxwYXRoIGQ9Ik0xNCAxOGEyIDIgMCAwIDAtNCAwIiAvPjxwYXRoIGQ9Im0xOSAxMS0yLjExLTYuNjU3YTIgMiAwIDAgMC0yLjc1Mi0xLjE0OGwtMS4yNzYuNjFBMiAyIDAgMCAxIDEyIDRIOC41YTIgMiAwIDAgMC0xLjkyNSAxLjQ1Nkw1IDExIiAvPjxwYXRoIGQ9Ik0yIDExaDIwIiAvPjxjaXJjbGUgY3g9IjE3IiBjeT0iMTgiIHI9IjMiIC8+PGNpcmNsZSBjeD0iNyIgY3k9IjE4IiByPSIzIiAvPjwvc3ZnPg=="); }
 .lucide-power { --lucide-icon: url("data:image/svg+xml;base64,PCEtLSBAbGljZW5zZSBsdWNpZGUtc3RhdGljIHYxLjI1LjAgLSBJU0MgLS0+PHN2ZyBjbGFzcz0ibHVjaWRlIGx1Y2lkZS1wb3dlciIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgPjxwYXRoIGQ9Ik0xMiAydjEwIiAvPjxwYXRoIGQ9Ik0xOC40IDYuNmE5IDkgMCAxIDEtMTIuNzcuMDQiIC8+PC9zdmc+"); }
 
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index 0ed6cea9..fd63478a 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1288,7 +1288,75 @@ <h2 class="about-title">Markdown Viewer</h2>
             <div class="modal-body github-import-modal-body">
               <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
               <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
+              <section id="github-import-access" class="github-import-access" aria-labelledby="github-import-access-title">
+                <button type="button" id="github-import-access-toggle" class="github-import-access-toggle" aria-expanded="false" aria-controls="github-import-access-panel">
+                  <span class="github-import-access-icon" aria-hidden="true"><i class="lucide lucide-shield-check"></i></span>
+                  <span class="github-import-access-copy">
+                    <span id="github-import-access-title" class="github-import-access-title">Private repository access</span>
+                    <span id="github-import-access-summary" class="github-import-access-summary">No token stored · public repositories only</span>
+                  </span>
+                  <i class="lucide lucide-chevron-down github-import-access-chevron" aria-hidden="true"></i>
+                </button>
+                <div id="github-import-access-panel" class="github-import-access-panel" hidden>
+                  <p class="github-import-access-intro">Use a fine-grained personal access token limited to the selected repository with <strong>Contents: Read-only</strong>.</p>
+                  <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
+                    <div class="github-import-access-saved">
+                      <i class="lucide lucide-lock-keyhole" aria-hidden="true"></i>
+                      <span id="github-import-access-saved-text">An encrypted token is saved on this device.</span>
+                    </div>
+                    <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
+                    <div class="github-import-access-inline">
+                      <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
+                      <button type="button" id="github-import-pat-unlock" class="github-import-access-secondary-btn">Unlock</button>
+                    </div>
+                  </div>
+                  <div id="github-import-access-form" class="github-import-access-form">
+                    <label class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
+                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" aria-describedby="github-import-pat-help" />
+                    <label class="reset-modal-label" for="github-import-pat-retention">Keep access</label>
+                    <select id="github-import-pat-retention" class="rename-modal-input">
+                      <option value="session">This session only (recommended)</option>
+                      <option value="1">Encrypted for 1 day</option>
+                      <option value="7">Encrypted for 7 days</option>
+                      <option value="30">Encrypted for 30 days</option>
+                    </select>
+                    <div id="github-import-pat-protection" class="github-import-pat-protection" hidden>
+                      <label class="reset-modal-label" for="github-import-pat-passphrase">Protection passphrase</label>
+                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" />
+                      <span class="github-import-field-note">At least 12 characters. This passphrase is never stored and cannot be recovered.</span>
+                    </div>
+                    <div class="github-import-access-actions">
+                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Use secure access</button>
+                      <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn" hidden>
+                        <i class="lucide lucide-trash-2" aria-hidden="true"></i>
+                        Remove access
+                      </button>
+                    </div>
+                  </div>
+                  <p id="github-import-pat-help" class="github-import-access-help">
+                    The token is sent only to <code>api.github.com</code>. Local expiry makes the saved copy unusable, removes it while the app is running or on the next launch, and does not revoke the token on GitHub.
+                    <a href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
+                  </p>
+                  <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
+                </div>
+              </section>
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
+              <div id="github-import-repository-context" class="github-import-repository-context" hidden>
+                <span class="github-import-repository-icon" aria-hidden="true"><i class="bi bi-github"></i></span>
+                <div class="github-import-repository-copy">
+                  <div class="github-import-repository-heading">
+                    <strong id="github-import-repository-name"></strong>
+                    <a id="github-import-commit-link" class="github-import-commit-link" target="_blank" rel="noopener noreferrer">
+                      <i class="lucide lucide-git-commit-horizontal" aria-hidden="true"></i>
+                      <span id="github-import-commit"></span>
+                    </a>
+                  </div>
+                  <div class="github-import-repository-meta">
+                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
+                    <span id="github-import-base-path" class="github-import-base-path" hidden></span>
+                  </div>
+                </div>
+              </div>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
                 <label class="github-import-search" for="github-import-search">
                   <i class="lucide lucide-search" aria-hidden="true"></i>
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index 9e400512..1ceb038a 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -537,7 +537,28 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportSubtitle = document.getElementById("github-import-subtitle");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
+  const githubImportAccess = document.getElementById("github-import-access");
+  const githubImportAccessToggle = document.getElementById("github-import-access-toggle");
+  const githubImportAccessPanel = document.getElementById("github-import-access-panel");
+  const githubImportAccessSummary = document.getElementById("github-import-access-summary");
+  const githubImportAccessUnlock = document.getElementById("github-import-access-unlock");
+  const githubImportAccessSavedText = document.getElementById("github-import-access-saved-text");
+  const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
+  const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
+  const githubImportPatInput = document.getElementById("github-import-pat");
+  const githubImportPatRetention = document.getElementById("github-import-pat-retention");
+  const githubImportPatProtection = document.getElementById("github-import-pat-protection");
+  const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
+  const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
+  const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
+  const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
+  const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
+  const githubImportRepositoryName = document.getElementById("github-import-repository-name");
+  const githubImportCommitLink = document.getElementById("github-import-commit-link");
+  const githubImportCommit = document.getElementById("github-import-commit");
+  const githubImportRef = document.getElementById("github-import-ref");
+  const githubImportBasePath = document.getElementById("github-import-base-path");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSearchInput = document.getElementById("github-import-search");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
@@ -11276,11 +11297,19 @@ ${selector} .arrowheadPath {
     return /\.(md|markdown)$/i.test(path || "");
   }
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
+  const GITHUB_API_VERSION = "2022-11-28";
+  const GITHUB_ACCESS_RECORD_NAME = "githubAccessRecordV1";
+  const GITHUB_PAT_VAULT_VERSION = 1;
+  const GITHUB_PAT_KDF_ITERATIONS = 250000;
   let lastGitHubImportRequestAt = 0;
   const selectedGitHubImportPaths = new Set();
   const collapsedGitHubImportFolders = new Set();
   let availableGitHubImportPaths = [];
   let githubImportSearchTimer = null;
+  let githubAccessToken = "";
+  let githubAccessTokenExpiresAt = 0;
+  let githubPatStoredRecord = null;
+  let githubPatExpiryTimer = null;
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11304,11 +11333,37 @@ ${selector} .arrowheadPath {
     return parentFolder || repositoryFolder;
   }
 
-  async function importGitHubFilesInBackground(owner, repo, ref, filePaths) {
+  function encodeGitHubPath(path) {
+    return String(path || "")
+      .split("/")
+      .filter(Boolean)
+      .map((part) => encodeURIComponent(part))
+      .join("/");
+  }
+
+  function getGitHubRepositoryFolderName(context) {
+    if (!context || !context.repo) return "GitHub import";
+    return context.isDefaultRef || !context.commitSha
+      ? context.repo
+      : `${context.repo} @ ${context.commitSha.slice(0, 7)}`;
+  }
+
+  async function fetchGitHubFileContent(context, filePath) {
+    if (context.isPrivate) {
+      const url = `https://api.github.com/repos/${encodeURIComponent(context.owner)}/${encodeURIComponent(context.repo)}/contents/${encodeGitHubPath(filePath)}?ref=${encodeURIComponent(context.commitSha)}`;
+      return fetchGitHubText(url, {
+        authenticated: true,
+        accept: "application/vnd.github.raw+json"
+      });
+    }
+    return fetchTextContent(buildRawGitHubUrl(context.owner, context.repo, context.commitSha, filePath));
+  }
+
+  async function importGitHubFilesInBackground(context, filePaths) {
     const paths = Array.from(filePaths || []).filter(Boolean);
     if (!paths.length) return 0;
 
-    const folder = ensureWorkspaceFolder(DEFAULT_WORKSPACE_ID, repo);
+    const folder = ensureWorkspaceFolder(DEFAULT_WORKSPACE_ID, getGitHubRepositoryFolderName(context));
     if (!folder) {
       showImportProgress(paths.length, { title: 'GitHub import', detail: 'Preparing repository folder…' });
       finishImportProgress(0, paths.length, { detail: 'The repository folder could not be created.' });
@@ -11327,7 +11382,7 @@ ${selector} .arrowheadPath {
       const filePath = paths[index];
       updateImportProgress(index, paths.length, 'Importing ' + getFileName(filePath));
       try {
-        const markdown = await fetchTextContent(buildRawGitHubUrl(owner, repo, ref, filePath));
+        const markdown = await fetchGitHubFileContent(context, filePath);
         const destinationFolder = ensureGitHubFolderPath(DEFAULT_WORKSPACE_ID, folder, filePath);
         const destination = { workspaceId: DEFAULT_WORKSPACE_ID, folderId: destinationFolder.id };
         const importedDocument = createImportedDocument(
@@ -11358,11 +11413,11 @@ ${selector} .arrowheadPath {
     return imported;
   }
 
-  function startGitHubImport(owner, repo, ref, filePaths) {
+  function startGitHubImport(context, filePaths) {
     const paths = Array.from(filePaths || []).filter(Boolean);
     closeGitHubImportModal();
     if (!paths.length) return;
-    void importGitHubFilesInBackground(owner, repo, ref, paths).catch(function(error) {
+    void importGitHubFilesInBackground(context, paths).catch(function(error) {
       console.error('GitHub import failed:', error);
       showImportProgress(paths.length, { title: 'GitHub import', detail: 'Unable to start import.' });
       finishImportProgress(0, paths.length, { detail: error && error.message ? error.message : 'GitHub import failed.' });
@@ -11370,7 +11425,70 @@ ${selector} .arrowheadPath {
     });
   }
 
-  async function fetchGitHubJson(url) {
+  class GitHubRequestError extends Error {
+    constructor(status, message) {
+      super(message || `GitHub API request failed (${status})`);
+      this.name = "GitHubRequestError";
+      this.status = status;
+    }
+  }
+
+  function clearExpiredGitHubAccessToken() {
+    if (!githubAccessTokenExpiresAt || Date.now() < githubAccessTokenExpiresAt) return;
+    githubAccessToken = "";
+    githubAccessTokenExpiresAt = 0;
+    githubPatStoredRecord = null;
+    if (workspaceStorage && typeof workspaceStorage.deleteMetadata === "function") {
+      void workspaceStorage.init()
+        .then(() => workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME))
+        .catch(() => {});
+    }
+  }
+
+  function scheduleGitHubAccessExpiry(expiresAt) {
+    clearTimeout(githubPatExpiryTimer);
+    githubPatExpiryTimer = null;
+    if (!expiresAt) return;
+    const remaining = Number(expiresAt) - Date.now();
+    if (remaining <= 0) {
+      void removeGitHubAccess({ silent: true })
+        .then(function() {
+          setGitHubAccessStatus("Private repository access expired and was removed from this device.", "success");
+          announceToScreenReader("GitHub private repository access expired and was removed.");
+        })
+        .catch(() => {});
+      return;
+    }
+    githubPatExpiryTimer = setTimeout(function() {
+      scheduleGitHubAccessExpiry(expiresAt);
+    }, Math.min(remaining, 2147483647));
+  }
+
+  function getGitHubAccessToken() {
+    clearExpiredGitHubAccessToken();
+    return githubAccessToken;
+  }
+
+  function getGitHubApiHeaders(accept, authenticated) {
+    const headers = {
+      Accept: accept || "application/vnd.github+json",
+      "X-GitHub-Api-Version": GITHUB_API_VERSION
+    };
+    if (authenticated) {
+      const token = getGitHubAccessToken();
+      if (!token) {
+        throw new Error("Private repository access is locked or has expired.");
+      }
+      headers.Authorization = `Bearer ${token}`;
+    }
+    return headers;
+  }
+
+  async function fetchGitHubResponse(url, options = {}) {
+    const parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== "https:" || parsedUrl.origin !== "https://api.github.com") {
+      throw new Error("Blocked an unsafe GitHub API destination.");
+    }
     const now = Date.now();
     const waitTime = GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS - (now - lastGitHubImportRequestAt);
     if (waitTime > 0) {
@@ -11378,24 +11496,55 @@ ${selector} .arrowheadPath {
     }
     lastGitHubImportRequestAt = Date.now();
     const response = await fetch(url, {
-      headers: {
-        Accept: "application/vnd.github+json"
-      }
+      headers: getGitHubApiHeaders(options.accept, options.authenticated === true),
+      redirect: "error",
+      cache: "no-store"
     });
     if (!response.ok) {
-      throw new Error(`GitHub API request failed (${response.status})`);
+      let message = `GitHub API request failed (${response.status})`;
+      if (response.status === 401) {
+        message = "GitHub rejected the token. Check that it is active and has read-only repository Contents access.";
+      } else if (response.status === 403) {
+        message = "GitHub denied this request. Check token permissions, organization approval, or API rate limits.";
+      }
+      throw new GitHubRequestError(response.status, message);
     }
+    return response;
+  }
+
+  async function fetchGitHubJson(url, options = {}) {
+    const response = await fetchGitHubResponse(url, options);
     return response.json();
   }
 
+  async function fetchGitHubText(url, options = {}) {
+    const response = await fetchGitHubResponse(url, options);
+    return response.text();
+  }
+
   async function fetchTextContent(url) {
-    const response = await fetch(url);
+    const parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== "https:" || parsedUrl.origin !== "https://raw.githubusercontent.com") {
+      throw new Error("Blocked an unsafe GitHub content destination.");
+    }
+    const response = await fetch(url, {
+      redirect: "error",
+      cache: "no-store"
+    });
     if (!response.ok) {
       throw new Error(`Failed to fetch file (${response.status})`);
     }
     return response.text();
   }
 
+  function decodeGitHubPathSegments(pathname) {
+    try {
+      return pathname.split("/").filter(Boolean).map((segment) => decodeURIComponent(segment));
+    } catch (_) {
+      return null;
+    }
+  }
+
   function parseGitHubImportUrl(input) {
     let parsedUrl;
     try {
@@ -11404,14 +11553,22 @@ ${selector} .arrowheadPath {
       return null;
     }
 
+    if (parsedUrl.protocol !== "https:" || parsedUrl.username || parsedUrl.password || parsedUrl.port) {
+      return null;
+    }
     const host = parsedUrl.hostname.replace(/^www\./, "");
-    const segments = parsedUrl.pathname.split("/").filter(Boolean);
+    const segments = decodeGitHubPathSegments(parsedUrl.pathname);
+    if (!segments) return null;
 
     if (host === "raw.githubusercontent.com") {
       if (segments.length < 4) return null;
-      const [owner, repo, ref, ...rest] = segments;
-      const filePath = rest.join("/");
-      return { owner, repo, ref, type: "file", filePath };
+      return {
+        owner: segments[0],
+        repo: segments[1].replace(/\.git$/i, ""),
+        type: "file",
+        locationSegments: segments.slice(2),
+        source: "raw"
+      };
     }
 
     if (host !== "github.com" || segments.length < 2) return null;
@@ -11428,8 +11585,8 @@ ${selector} .arrowheadPath {
         owner,
         repo,
         type: "file",
-        ref: segments[3],
-        filePath: segments.slice(4).join("/")
+        locationSegments: segments.slice(3),
+        source: "blob"
       };
     }
 
@@ -11438,17 +11595,351 @@ ${selector} .arrowheadPath {
         owner,
         repo,
         type: "tree",
-        ref: segments[3],
-        basePath: segments.slice(4).join("/")
+        locationSegments: segments.slice(3),
+        source: "tree"
       };
     }
 
     return { owner, repo, type: "repo" };
   }
 
-  async function getDefaultBranch(owner, repo) {
-    const repoInfo = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`);
-    return repoInfo.default_branch;
+  async function getGitHubRepositoryInfo(owner, repo) {
+    const url = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`;
+    try {
+      return {
+        info: await fetchGitHubJson(url),
+        authenticated: false
+      };
+    } catch (error) {
+      const canRetryWithToken = error instanceof GitHubRequestError
+        && (error.status === 403 || error.status === 404)
+        && Boolean(getGitHubAccessToken());
+      if (!canRetryWithToken) {
+        if (error instanceof GitHubRequestError && error.status === 404) {
+          throw new Error("Repository not found. If it is private, add secure private repository access and try again.");
+        }
+        throw error;
+      }
+      return {
+        info: await fetchGitHubJson(url, { authenticated: true }),
+        authenticated: true
+      };
+    }
+  }
+
+  async function resolveGitHubCommit(owner, repo, refName, authenticated) {
+    const commit = await fetchGitHubJson(
+      `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/commits/${encodeURIComponent(refName)}`,
+      { authenticated }
+    );
+    if (!commit || !commit.sha) {
+      throw new Error("GitHub did not return a commit for this branch, tag, or commit reference.");
+    }
+    return commit;
+  }
+
+  async function resolveGitHubLocation(parsed) {
+    const repository = await getGitHubRepositoryInfo(parsed.owner, parsed.repo);
+    const repoInfo = repository.info || {};
+    const authenticated = Boolean(repository.authenticated || repoInfo.private);
+    const defaultBranch = repoInfo.default_branch || "main";
+    let refName = defaultBranch;
+    let commit = null;
+    let remainder = [];
+
+    if (parsed.type === "repo") {
+      commit = await resolveGitHubCommit(parsed.owner, parsed.repo, refName, authenticated);
+    } else {
+      const segments = Array.from(parsed.locationSegments || []).filter(Boolean);
+      const minimumRemainder = parsed.type === "file" ? 1 : 0;
+      const maximumRefSegments = segments.length - minimumRemainder;
+      for (let count = maximumRefSegments; count >= 1; count--) {
+        const candidate = segments.slice(0, count).join("/");
+        try {
+          commit = await resolveGitHubCommit(parsed.owner, parsed.repo, candidate, authenticated);
+          refName = candidate;
+          remainder = segments.slice(count);
+          break;
+        } catch (error) {
+          if (!(error instanceof GitHubRequestError) || error.status !== 404) throw error;
+        }
+      }
+      if (!commit) {
+        throw new Error("No matching branch, tag, or commit was found in this GitHub URL.");
+      }
+    }
+
+    return {
+      owner: parsed.owner,
+      repo: parsed.repo,
+      type: parsed.type,
+      refName,
+      commitSha: commit.sha,
+      defaultBranch,
+      isDefaultRef: refName === defaultBranch,
+      isPrivate: Boolean(repoInfo.private),
+      authenticated,
+      filePath: parsed.type === "file" ? remainder.join("/") : "",
+      basePath: parsed.type === "tree" ? remainder.join("/") : ""
+    };
+  }
+
+  function getGitHubPatAdditionalData(expiresAt) {
+    return new TextEncoder().encode(`markdown-viewer:${GITHUB_ACCESS_RECORD_NAME}:${expiresAt}`);
+  }
+
+  async function encryptGitHubAccessToken(token, passphrase, expiresAt) {
+    const cryptoApi = getWebCrypto();
+    if (!cryptoApi) throw new Error("Secure token encryption is unavailable in this browser.");
+    const salt = cryptoApi.getRandomValues(new Uint8Array(16));
+    const iv = cryptoApi.getRandomValues(new Uint8Array(12));
+    const key = await deriveSecretWorkspaceKey(passphrase, salt, GITHUB_PAT_KDF_ITERATIONS);
+    const payload = new TextEncoder().encode(JSON.stringify({
+      token,
+      expiresAt,
+      createdAt: Date.now()
+    }));
+    const ciphertext = await cryptoApi.subtle.encrypt(
+      {
+        name: "AES-GCM",
+        iv,
+        additionalData: getGitHubPatAdditionalData(expiresAt),
+        tagLength: 128
+      },
+      key,
+      payload
+    );
+    return {
+      version: GITHUB_PAT_VAULT_VERSION,
+      algorithm: "AES-GCM",
+      kdf: "PBKDF2-SHA-256",
+      iterations: GITHUB_PAT_KDF_ITERATIONS,
+      salt: bytesToBase64(salt),
+      iv: bytesToBase64(iv),
+      ciphertext: bytesToBase64(new Uint8Array(ciphertext)),
+      expiresAt,
+      createdAt: Date.now()
+    };
+  }
+
+  async function decryptGitHubAccessToken(record, passphrase) {
+    if (!record || record.version !== GITHUB_PAT_VAULT_VERSION) {
+      throw new Error("The saved GitHub access record is not supported.");
+    }
+    const expiresAt = Number(record.expiresAt);
+    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) {
+      throw new Error("The saved GitHub access has expired.");
+    }
+    const cryptoApi = getWebCrypto();
+    if (!cryptoApi) throw new Error("Secure token decryption is unavailable in this browser.");
+    const iterations = Number(record.iterations) || GITHUB_PAT_KDF_ITERATIONS;
+    const key = await deriveSecretWorkspaceKey(passphrase, base64ToBytes(record.salt), iterations);
+    const decrypted = await cryptoApi.subtle.decrypt(
+      {
+        name: "AES-GCM",
+        iv: base64ToBytes(record.iv),
+        additionalData: getGitHubPatAdditionalData(expiresAt),
+        tagLength: 128
+      },
+      key,
+      base64ToBytes(record.ciphertext)
+    );
+    const payload = JSON.parse(new TextDecoder().decode(decrypted));
+    if (!payload || payload.expiresAt !== expiresAt || typeof payload.token !== "string") {
+      throw new Error("The saved GitHub access record failed its integrity check.");
+    }
+    return payload.token;
+  }
+
+  function formatGitHubAccessExpiry(expiresAt) {
+    if (!expiresAt) return "this session";
+    return new Intl.DateTimeFormat(undefined, {
+      dateStyle: "medium",
+      timeStyle: "short"
+    }).format(new Date(expiresAt));
+  }
+
+  function setGitHubAccessStatus(message, state) {
+    if (!githubImportAccessStatus) return;
+    githubImportAccessStatus.textContent = message || "";
+    githubImportAccessStatus.hidden = !message;
+    githubImportAccessStatus.classList.toggle("is-error", state === "error");
+    githubImportAccessStatus.classList.toggle("is-success", state === "success");
+  }
+
+  function renderGitHubAccessState() {
+    clearExpiredGitHubAccessToken();
+    const hasActiveToken = Boolean(getGitHubAccessToken());
+    const hasStoredRecord = Boolean(githubPatStoredRecord);
+    if (githubImportAccess) {
+      githubImportAccess.dataset.state = hasActiveToken ? "active" : hasStoredRecord ? "locked" : "empty";
+    }
+    if (githubImportAccessSummary) {
+      githubImportAccessSummary.textContent = hasActiveToken
+        ? `Access ready · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
+        : hasStoredRecord
+          ? `Encrypted token saved · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
+          : "No token stored · public repositories only";
+    }
+    if (githubImportAccessUnlock) {
+      githubImportAccessUnlock.hidden = !hasStoredRecord || hasActiveToken;
+    }
+    if (githubImportAccessSavedText && hasStoredRecord) {
+      githubImportAccessSavedText.textContent = `Encrypted access expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}.`;
+    }
+    if (githubImportPatRemoveBtn) {
+      githubImportPatRemoveBtn.hidden = !hasActiveToken && !hasStoredRecord;
+    }
+  }
+
+  async function loadStoredGitHubAccess() {
+    githubPatStoredRecord = null;
+    if (!workspaceStorage) {
+      renderGitHubAccessState();
+      return;
+    }
+    try {
+      await workspaceStorage.init();
+      const record = await workspaceStorage.getMetadata(GITHUB_ACCESS_RECORD_NAME);
+      if (record && Number(record.expiresAt) <= Date.now()) {
+        if (typeof workspaceStorage.deleteMetadata === "function") {
+          await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+        }
+        setGitHubAccessStatus("Expired private repository access was removed from this device.", "success");
+      } else if (record) {
+        githubPatStoredRecord = record;
+        scheduleGitHubAccessExpiry(record.expiresAt);
+      }
+    } catch (_) {
+      setGitHubAccessStatus("Saved private access could not be read. Session-only access is still available.", "error");
+    }
+    renderGitHubAccessState();
+  }
+
+  async function removeGitHubAccess(options = {}) {
+    clearTimeout(githubPatExpiryTimer);
+    githubPatExpiryTimer = null;
+    githubAccessToken = "";
+    githubAccessTokenExpiresAt = 0;
+    githubPatStoredRecord = null;
+    if (githubImportPatInput) githubImportPatInput.value = "";
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
+    if (workspaceStorage) {
+      await workspaceStorage.init();
+      if (typeof workspaceStorage.deleteMetadata === "function") {
+        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+      } else {
+        await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, null);
+      }
+    }
+    renderGitHubAccessState();
+    if (!options.silent) {
+      setGitHubAccessStatus("Private repository access was removed from this device.", "success");
+      announceToScreenReader("GitHub private repository access removed.");
+    }
+  }
+
+  function validateGitHubPat(token) {
+    if (!token || token.length < 20 || /\s/.test(token)) {
+      throw new Error("Enter a valid personal access token without spaces.");
+    }
+  }
+
+  async function saveGitHubAccess() {
+    if (!githubImportPatInput || !githubImportPatRetention) return;
+    const token = githubImportPatInput.value;
+    validateGitHubPat(token);
+    const retention = githubImportPatRetention.value;
+    let expiresAt = 0;
+    let record = null;
+
+    if (retention !== "session") {
+      const days = Number(retention);
+      const passphrase = githubImportPatPassphrase ? githubImportPatPassphrase.value : "";
+      if (!Number.isFinite(days) || days < 1 || days > 30) {
+        throw new Error("Choose a supported access retention period.");
+      }
+      if (passphrase.length < 12) {
+        throw new Error("Use at least 12 characters for the protection passphrase.");
+      }
+      if (!workspaceStorage) {
+        throw new Error("Encrypted workspace storage is unavailable. Use session-only access instead.");
+      }
+      expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
+      record = await encryptGitHubAccessToken(token, passphrase, expiresAt);
+      await workspaceStorage.init();
+      await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, record);
+    } else if (workspaceStorage) {
+      await workspaceStorage.init();
+      if (typeof workspaceStorage.deleteMetadata === "function") {
+        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+      }
+    }
+
+    githubAccessToken = token;
+    githubAccessTokenExpiresAt = expiresAt;
+    githubPatStoredRecord = record;
+    scheduleGitHubAccessExpiry(expiresAt);
+    githubImportPatInput.value = "";
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    renderGitHubAccessState();
+    setGitHubAccessStatus(
+      expiresAt
+        ? `Private access is ready and encrypted until ${formatGitHubAccessExpiry(expiresAt)}.`
+        : "Private access is ready for this session and was not written to storage.",
+      "success"
+    );
+    announceToScreenReader("GitHub private repository access is ready.");
+  }
+
+  async function unlockStoredGitHubAccess() {
+    if (!githubPatStoredRecord || !githubImportPatUnlockPassphrase) return;
+    const passphrase = githubImportPatUnlockPassphrase.value;
+    if (!passphrase) throw new Error("Enter the protection passphrase.");
+    try {
+      githubAccessToken = await decryptGitHubAccessToken(githubPatStoredRecord, passphrase);
+      githubAccessTokenExpiresAt = Number(githubPatStoredRecord.expiresAt);
+      scheduleGitHubAccessExpiry(githubAccessTokenExpiresAt);
+    } catch (error) {
+      if (Number(githubPatStoredRecord.expiresAt) <= Date.now()) {
+        await removeGitHubAccess({ silent: true });
+        throw new Error("The saved GitHub access expired and was removed.");
+      }
+      throw new Error("The token could not be unlocked. Check the protection passphrase.");
+    } finally {
+      githubImportPatUnlockPassphrase.value = "";
+    }
+    renderGitHubAccessState();
+    setGitHubAccessStatus("Encrypted private repository access is unlocked for this session.", "success");
+    announceToScreenReader("GitHub private repository access unlocked.");
+  }
+
+  function renderGitHubRepositoryContext(context) {
+    if (!githubImportRepositoryContext) return;
+    if (!context) {
+      githubImportRepositoryContext.hidden = true;
+      return;
+    }
+    githubImportRepositoryContext.hidden = false;
+    if (githubImportRepositoryName) {
+      githubImportRepositoryName.textContent = `${context.owner}/${context.repo}`;
+    }
+    if (githubImportCommit) {
+      githubImportCommit.textContent = context.commitSha.slice(0, 7);
+    }
+    if (githubImportCommitLink) {
+      githubImportCommitLink.href = `https://github.com/${encodeURIComponent(context.owner)}/${encodeURIComponent(context.repo)}/tree/${encodeURIComponent(context.commitSha)}`;
+      githubImportCommitLink.title = `Open commit ${context.commitSha} on GitHub`;
+      githubImportCommitLink.setAttribute("aria-label", `Open commit ${context.commitSha} on GitHub`);
+    }
+    if (githubImportRef) {
+      githubImportRef.textContent = context.refName;
+    }
+    if (githubImportBasePath) {
+      githubImportBasePath.textContent = context.basePath ? `/ ${context.basePath}` : "";
+      githubImportBasePath.hidden = !context.basePath;
+    }
   }
 
   function isPathInsideGitHubBase(path, normalizedBasePath) {
@@ -11462,13 +11953,16 @@ ${selector} .arrowheadPath {
       || path.startsWith(normalizedBasePath + "/");
   }
 
-  async function listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath) {
+  async function listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath, authenticated) {
     const pendingTrees = [{ path: "", ref }];
     const markdownPaths = new Set();
 
     for (let index = 0; index < pendingTrees.length; index++) {
       const currentTree = pendingTrees[index];
-      const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(currentTree.ref)}`);
+      const treeResponse = await fetchGitHubJson(
+        `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(currentTree.ref)}`,
+        { authenticated }
+      );
 
       (treeResponse.tree || []).forEach((entry) => {
         const fullPath = currentTree.path ? `${currentTree.path}/${entry.path}` : entry.path;
@@ -11484,14 +11978,18 @@ ${selector} .arrowheadPath {
   }
 
   async function listMarkdownFiles(owner, repo, ref, basePath, options = {}) {
-    const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(ref)}?recursive=1`);
+    const authenticated = options.authenticated === true;
+    const treeResponse = await fetchGitHubJson(
+      `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(ref)}?recursive=1`,
+      { authenticated }
+    );
     const normalizedBasePath = (basePath || "").replace(/^\/+|\/+$/g, "");
 
     if (treeResponse.truncated) {
       if (typeof options.onTruncatedTree === "function") {
         options.onTruncatedTree();
       }
-      return listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath);
+      return listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath, authenticated);
     }
 
     return (treeResponse.tree || [])
@@ -11724,6 +12222,7 @@ ${selector} .arrowheadPath {
 
   function resetGitHubImportModal() {
     if (!githubImportUrlInput || !githubImportFileSelect || !githubImportSubmitBtn) return;
+    if (githubImportModal) githubImportModal.classList.remove("is-selection-step");
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
@@ -11733,6 +12232,16 @@ ${selector} .arrowheadPath {
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
+    if (githubImportAccess) githubImportAccess.hidden = false;
+    if (githubImportAccessToggle) githubImportAccessToggle.setAttribute("aria-expanded", "false");
+    if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
+    if (githubImportPatInput) githubImportPatInput.value = "";
+    if (githubImportPatRetention) githubImportPatRetention.value = "session";
+    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
+    setGitHubAccessStatus("");
+    renderGitHubRepositoryContext(null);
     githubImportUrlInput.disabled = false;
     githubImportFileSelect.innerHTML = "";
     githubImportFileSelect.style.display = "none";
@@ -11758,8 +12267,10 @@ ${selector} .arrowheadPath {
     delete githubImportSubmitBtn.dataset.owner;
     delete githubImportSubmitBtn.dataset.repo;
     delete githubImportSubmitBtn.dataset.ref;
+    githubImportSubmitBtn._githubContext = null;
     githubImportSubmitBtn.textContent = "Import";
     setGitHubImportMessage("");
+    renderGitHubAccessState();
   }
 
   function openGitHubImportModal() {
@@ -11769,6 +12280,7 @@ ${selector} .arrowheadPath {
       focusTarget: githubImportUrlInput,
       onClose: closeGitHubImportModal
     });
+    void loadStoredGitHubAccess();
   }
 
   function closeGitHubImportModal() {
@@ -11790,19 +12302,29 @@ ${selector} .arrowheadPath {
       if (githubImportSearchInput) {
         githubImportSearchInput.disabled = disabled;
       }
+      [
+        githubImportAccessToggle,
+        githubImportPatUnlockPassphrase,
+        githubImportPatUnlockBtn,
+        githubImportPatInput,
+        githubImportPatRetention,
+        githubImportPatPassphrase,
+        githubImportPatSaveBtn,
+        githubImportPatRemoveBtn
+      ].forEach(function(control) {
+        if (control) control.disabled = disabled;
+      });
     };
     const step = githubImportSubmitBtn.dataset.step || "url";
     if (step === "select") {
       const selectedPaths = Array.from(selectedGitHubImportPaths);
-      const owner = githubImportSubmitBtn.dataset.owner;
-      const repo = githubImportSubmitBtn.dataset.repo;
-      const ref = githubImportSubmitBtn.dataset.ref;
-      if (!owner || !repo || !ref || !selectedPaths.length) {
+      const context = githubImportSubmitBtn._githubContext;
+      if (!context || !context.owner || !context.repo || !context.commitSha || !selectedPaths.length) {
         setGitHubImportMessage("Please select at least one file to import.");
         return;
       }
       announceToScreenReader("Importing selected files from GitHub...");
-      startGitHubImport(owner, repo, ref, selectedPaths);
+      startGitHubImport(context, selectedPaths);
       return;
     }
 
@@ -11822,12 +12344,13 @@ ${selector} .arrowheadPath {
     setGitHubImportLoading(true);
     setGitHubImportDialogDisabled(true);
     try {
-      if (parsed.type === "file") {
-        if (!isMarkdownPath(parsed.filePath)) {
+      const context = await resolveGitHubLocation(parsed);
+      if (context.type === "file") {
+        if (!isMarkdownPath(context.filePath)) {
           throw new Error("The provided URL does not point to a Markdown file.");
         }
         announceToScreenReader("Starting GitHub import...");
-        startGitHubImport(parsed.owner, parsed.repo, parsed.ref, [parsed.filePath]);
+        startGitHubImport(context, [context.filePath]);
         return;
       }
 
@@ -11841,8 +12364,8 @@ ${selector} .arrowheadPath {
         githubImportTree.style.display = "block";
       }
 
-      const ref = parsed.ref || await getDefaultBranch(parsed.owner, parsed.repo);
-      const files = await listMarkdownFiles(parsed.owner, parsed.repo, ref, parsed.basePath || "", {
+      const files = await listMarkdownFiles(context.owner, context.repo, context.commitSha, context.basePath, {
+        authenticated: context.authenticated,
         onTruncatedTree: function() {
           setGitHubImportMessage("GitHub returned a partial tree. Scanning every folder to find all Markdown files\u2026", { isError: false });
           announceToScreenReader("Large GitHub repository detected. Scanning every folder.");
@@ -11862,13 +12385,16 @@ ${selector} .arrowheadPath {
       if (files.length === 1) {
         const targetPath = files[0];
         announceToScreenReader("Starting GitHub import...");
-        startGitHubImport(parsed.owner, parsed.repo, ref, [targetPath]);
+        startGitHubImport(context, [targetPath]);
         return;
       }
 
       githubImportFileSelect.innerHTML = "";
+      if (githubImportModal) githubImportModal.classList.add("is-selection-step");
       githubImportUrlInput.style.display = "none";
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
+      if (githubImportAccess) githubImportAccess.hidden = true;
+      renderGitHubRepositoryContext(context);
       githubImportFileSelect.style.display = "none";
       if (githubImportSelectionToolbar) {
         githubImportSelectionToolbar.style.display = "grid";
@@ -11892,9 +12418,10 @@ ${selector} .arrowheadPath {
         githubImportSubtitle.textContent = `${files.length.toLocaleString()} Markdown files found. Choose what to save to Explorer.`;
       }
       githubImportSubmitBtn.dataset.step = "select";
-      githubImportSubmitBtn.dataset.owner = parsed.owner;
-      githubImportSubmitBtn.dataset.repo = parsed.repo;
-      githubImportSubmitBtn.dataset.ref = ref;
+      githubImportSubmitBtn.dataset.owner = context.owner;
+      githubImportSubmitBtn.dataset.repo = context.repo;
+      githubImportSubmitBtn.dataset.ref = context.commitSha;
+      githubImportSubmitBtn._githubContext = context;
       githubImportSubmitBtn.textContent = "Import Selected";
       if (githubImportSearchInput) githubImportSearchInput.focus();
     } catch (error) {
@@ -18129,6 +18656,83 @@ ${selector} .arrowheadPath {
   if (githubImportCloseBtn) {
     githubImportCloseBtn.addEventListener("click", closeGitHubImportModal);
   }
+  if (githubImportAccessToggle && githubImportAccessPanel) {
+    githubImportAccessToggle.addEventListener("click", function() {
+      const expanded = githubImportAccessToggle.getAttribute("aria-expanded") === "true";
+      githubImportAccessToggle.setAttribute("aria-expanded", expanded ? "false" : "true");
+      githubImportAccessPanel.hidden = expanded;
+      if (!expanded) {
+        const target = githubPatStoredRecord && !getGitHubAccessToken()
+          ? githubImportPatUnlockPassphrase
+          : githubImportPatInput;
+        if (target) requestAnimationFrame(() => target.focus({ preventScroll: true }));
+      }
+    });
+  }
+  if (githubImportPatRetention) {
+    githubImportPatRetention.addEventListener("change", function() {
+      const needsPassphrase = githubImportPatRetention.value !== "session";
+      if (githubImportPatProtection) githubImportPatProtection.hidden = !needsPassphrase;
+      if (!needsPassphrase && githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    });
+  }
+  if (githubImportPatSaveBtn) {
+    githubImportPatSaveBtn.addEventListener("click", async function() {
+      const previousText = githubImportPatSaveBtn.textContent;
+      githubImportPatSaveBtn.disabled = true;
+      githubImportPatSaveBtn.textContent = "Securing…";
+      setGitHubAccessStatus("");
+      try {
+        await saveGitHubAccess();
+      } catch (error) {
+        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be saved.", "error");
+      } finally {
+        githubImportPatSaveBtn.disabled = false;
+        githubImportPatSaveBtn.textContent = previousText;
+      }
+    });
+  }
+  if (githubImportPatUnlockBtn) {
+    githubImportPatUnlockBtn.addEventListener("click", async function() {
+      const previousText = githubImportPatUnlockBtn.textContent;
+      githubImportPatUnlockBtn.disabled = true;
+      githubImportPatUnlockBtn.textContent = "Unlocking…";
+      setGitHubAccessStatus("");
+      try {
+        await unlockStoredGitHubAccess();
+      } catch (error) {
+        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be unlocked.", "error");
+      } finally {
+        githubImportPatUnlockBtn.disabled = false;
+        githubImportPatUnlockBtn.textContent = previousText;
+      }
+    });
+  }
+  if (githubImportPatRemoveBtn) {
+    githubImportPatRemoveBtn.addEventListener("click", async function() {
+      githubImportPatRemoveBtn.disabled = true;
+      setGitHubAccessStatus("");
+      try {
+        await removeGitHubAccess();
+      } catch (_) {
+        setGitHubAccessStatus("Private access could not be removed from device storage.", "error");
+      } finally {
+        githubImportPatRemoveBtn.disabled = false;
+      }
+    });
+  }
+  const bindGitHubAccessEnterAction = function(input, actionButton) {
+    if (!input || !actionButton) return;
+    input.addEventListener("keydown", function(event) {
+      if (event.key === "Enter") {
+        event.preventDefault();
+        actionButton.click();
+      }
+    });
+  };
+  bindGitHubAccessEnterAction(githubImportPatUnlockPassphrase, githubImportPatUnlockBtn);
+  bindGitHubAccessEnterAction(githubImportPatInput, githubImportPatSaveBtn);
+  void loadStoredGitHubAccess();
   const handleGitHubImportInputKeydown = function(e) {
     if (e.key === "Enter") {
       e.preventDefault();
diff --git a/desktop-app/resources/js/workspace-storage.js b/desktop-app/resources/js/workspace-storage.js
index b7d9b185..20cde308 100644
--- a/desktop-app/resources/js/workspace-storage.js
+++ b/desktop-app/resources/js/workspace-storage.js
@@ -817,6 +817,31 @@
       await transactionToPromise(transaction);
     }
 
+    async deleteMetadata(key) {
+      if (this.desktop) {
+        if (key === 'vaultSettings') {
+          this.desktopSettings = {};
+          const settingsPath = await this._pathJoin(this.vaultPath, INTERNAL_DIR, 'settings.json');
+          if (await this._pathExists(settingsPath)) await Neutralino.filesystem.remove(settingsPath);
+          return;
+        }
+        if (key === 'secretManifest') {
+          const manifestPath = await this._pathJoin(this.vaultPath, INTERNAL_DIR, 'secret-manifest.json');
+          if (await this._pathExists(manifestPath)) await Neutralino.filesystem.remove(manifestPath);
+          return;
+        }
+        if (Neutralino.storage.removeData) {
+          try {
+            await Neutralino.storage.removeData('markdownViewerMeta_' + key);
+          } catch (_) {}
+        }
+        return;
+      }
+      const transaction = this.db.transaction('metadata', 'readwrite');
+      transaction.objectStore('metadata').delete(key);
+      await transactionToPromise(transaction);
+    }
+
     async getSecretManifest() {
       const stored = await this.getMetadata('secretManifest');
       if (stored) return stored;
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 97d12c60..39942c6a 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -5943,14 +5943,19 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(94vw, 760px);
-  max-width: 760px;
+  width: min(92vw, 520px);
+  max-width: 520px;
   min-width: 0;
   padding: 0;
   gap: 0;
   overflow: hidden;
 }
 
+#github-import-modal.is-selection-step .reset-modal-box {
+  width: min(94vw, 760px);
+  max-width: 760px;
+}
+
 #github-import-modal .reset-modal-message {
   font-size: var(--ui-font-lg);
   line-height: 1.3;
@@ -5967,10 +5972,15 @@ a:focus {
   flex-direction: column;
   gap: 10px;
   max-height: min(68vh, 620px);
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
   padding: 16px;
 }
 
+#github-import-modal.is-selection-step .github-import-modal-body {
+  overflow: hidden;
+}
+
 #github-import-url,
 #github-import-file-select {
   min-height: 36px;
@@ -5982,6 +5992,370 @@ a:focus {
   min-height: 180px;
 }
 
+.github-import-access[hidden],
+.github-import-access-panel[hidden],
+.github-import-access-unlock[hidden],
+.github-import-pat-protection[hidden],
+.github-import-access-danger-btn[hidden],
+.github-import-repository-context[hidden],
+.github-import-base-path[hidden],
+.github-import-access-status[hidden] {
+  display: none !important;
+}
+
+.github-import-access {
+  overflow: hidden;
+  border: 1px solid var(--border-color);
+  border-radius: 9px;
+  background: var(--bg-color);
+}
+
+.github-import-access-toggle {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  width: 100%;
+  min-height: 48px;
+  padding: 8px 10px;
+  border: 0;
+  background: transparent;
+  color: var(--text-color);
+  cursor: pointer;
+  text-align: left;
+  font: inherit;
+}
+
+.github-import-access-toggle:hover,
+.github-import-access-toggle:focus-visible {
+  background: var(--button-hover);
+}
+
+.github-import-access-toggle:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: -2px;
+}
+
+.github-import-access-icon {
+  display: inline-grid;
+  place-items: center;
+  width: 30px;
+  height: 30px;
+  flex: 0 0 auto;
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--text-secondary) 10%, transparent);
+  color: var(--text-secondary);
+}
+
+.github-import-access-icon > .lucide {
+  width: 17px;
+  height: 17px;
+}
+
+.github-import-access[data-state="active"] .github-import-access-icon {
+  background: color-mix(in srgb, #1a7f37 13%, transparent);
+  color: #1a7f37;
+}
+
+.github-import-access[data-state="locked"] .github-import-access-icon {
+  background: color-mix(in srgb, var(--accent-color) 12%, transparent);
+  color: var(--accent-color);
+}
+
+.github-import-access-copy {
+  display: grid;
+  gap: 2px;
+  min-width: 0;
+  flex: 1;
+}
+
+.github-import-access-title {
+  font-size: var(--ui-font-md);
+  font-weight: 700;
+}
+
+.github-import-access-summary {
+  overflow: hidden;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.35;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-import-access-chevron {
+  width: 16px;
+  height: 16px;
+  flex: 0 0 auto;
+  color: var(--text-secondary);
+  transition: transform 160ms ease;
+}
+
+.github-import-access-toggle[aria-expanded="true"] .github-import-access-chevron {
+  transform: rotate(180deg);
+}
+
+.github-import-access-panel {
+  display: grid;
+  gap: 10px;
+  padding: 12px;
+  border-top: 1px solid var(--border-color);
+  background: color-mix(in srgb, var(--button-bg) 55%, var(--bg-color));
+}
+
+.github-import-access-intro,
+.github-import-access-help,
+.github-import-field-note {
+  margin: 0;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.45;
+}
+
+.github-import-access-intro strong {
+  color: var(--text-color);
+}
+
+.github-import-access-form,
+.github-import-access-unlock,
+.github-import-pat-protection {
+  display: grid;
+  gap: 6px;
+}
+
+.github-import-access-unlock {
+  padding: 10px;
+  border: 1px solid color-mix(in srgb, var(--accent-color) 26%, var(--border-color));
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--accent-color) 6%, var(--bg-color));
+}
+
+.github-import-access-saved {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  color: var(--text-color);
+  font-size: var(--ui-font-md);
+  line-height: 1.35;
+}
+
+.github-import-access-saved > .lucide {
+  width: 15px;
+  height: 15px;
+  flex: 0 0 auto;
+  color: var(--accent-color);
+}
+
+.github-import-access-inline {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 8px;
+}
+
+.github-import-access-panel .rename-modal-input {
+  width: 100%;
+  min-height: 38px;
+  padding: 7px 9px;
+  font-size: var(--ui-font-md);
+}
+
+.github-import-access-actions {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  padding-top: 2px;
+}
+
+.github-import-access-primary-btn,
+.github-import-access-secondary-btn,
+.github-import-access-danger-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  min-height: 36px;
+  padding: 7px 11px;
+  border: 1px solid var(--border-color);
+  border-radius: 7px;
+  background: var(--button-bg);
+  color: var(--text-color);
+  cursor: pointer;
+  font: inherit;
+  font-size: var(--ui-font-md);
+  font-weight: 650;
+}
+
+.github-import-access-primary-btn {
+  border-color: var(--accent-color);
+  background: var(--accent-color);
+  color: #fff;
+}
+
+.github-import-access-danger-btn {
+  color: var(--color-danger-fg, #cf222e);
+}
+
+.github-import-access-danger-btn > .lucide {
+  width: 14px;
+  height: 14px;
+}
+
+.github-import-access-primary-btn:hover,
+.github-import-access-secondary-btn:hover,
+.github-import-access-danger-btn:hover {
+  filter: brightness(0.97);
+}
+
+.github-import-access-primary-btn:focus-visible,
+.github-import-access-secondary-btn:focus-visible,
+.github-import-access-danger-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-access-primary-btn:disabled,
+.github-import-access-secondary-btn:disabled,
+.github-import-access-danger-btn:disabled {
+  cursor: not-allowed;
+  opacity: 0.55;
+}
+
+.github-import-access-help a {
+  color: var(--accent-color);
+  font-weight: 600;
+}
+
+.github-import-access-help code {
+  color: var(--text-color);
+  font-size: inherit;
+}
+
+.github-import-access-status {
+  margin: 0;
+  padding: 8px 10px;
+  border: 1px solid var(--border-color);
+  border-radius: 7px;
+  background: var(--bg-color);
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.4;
+}
+
+.github-import-access-status.is-success {
+  border-color: color-mix(in srgb, #1a7f37 34%, var(--border-color));
+  color: #1a7f37;
+}
+
+.github-import-access-status.is-error {
+  border-color: color-mix(in srgb, var(--color-danger-fg, #cf222e) 34%, var(--border-color));
+  color: var(--color-danger-fg, #cf222e);
+}
+
+.github-import-repository-context {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  min-width: 0;
+  padding: 9px 10px;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--button-bg) 62%, var(--bg-color));
+}
+
+.github-import-repository-icon {
+  display: inline-grid;
+  place-items: center;
+  width: 30px;
+  height: 30px;
+  flex: 0 0 auto;
+  border-radius: 8px;
+  background: var(--bg-color);
+  color: var(--text-color);
+}
+
+.github-import-repository-icon > .lucide,
+.github-import-repository-icon > .bi {
+  width: 18px;
+  height: 18px;
+  font-size: 18px;
+  line-height: 1;
+}
+
+.github-import-repository-copy {
+  display: grid;
+  gap: 3px;
+  min-width: 0;
+}
+
+.github-import-repository-heading,
+.github-import-repository-meta,
+.github-import-ref,
+.github-import-commit-link {
+  display: flex;
+  align-items: center;
+}
+
+.github-import-repository-heading {
+  gap: 8px;
+  min-width: 0;
+}
+
+.github-import-repository-heading strong {
+  overflow: hidden;
+  color: var(--text-color);
+  font-size: var(--ui-font-lg);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-import-commit-link {
+  gap: 4px;
+  flex: 0 0 auto;
+  padding: 2px 7px;
+  border: 1px solid var(--border-color);
+  border-radius: 999px;
+  background: var(--bg-color);
+  color: var(--accent-color);
+  font-family: ui-monospace, SFMono-Regular, Consolas, monospace;
+  font-size: var(--ui-font-sm);
+  font-weight: 650;
+  text-decoration: none;
+}
+
+.github-import-commit-link > .lucide,
+.github-import-ref > .lucide {
+  width: 13px;
+  height: 13px;
+}
+
+.github-import-commit-link:hover {
+  border-color: var(--accent-color);
+}
+
+.github-import-commit-link:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-repository-meta {
+  gap: 7px;
+  min-width: 0;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+}
+
+.github-import-ref {
+  gap: 4px;
+  min-width: 0;
+}
+
+.github-import-ref > span,
+.github-import-base-path {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .github-import-tree {
   min-height: 240px;
   max-height: min(48vh, 440px);
@@ -6108,10 +6482,21 @@ a:focus {
   padding-left: 24px;
 }
 
+.github-import-tree ul ul {
+  margin-left: 16px;
+  padding-left: 8px;
+  border-left: 1px solid color-mix(in srgb, var(--border-color) 76%, transparent);
+}
+
 .github-import-tree>ul {
   padding-left: 0;
 }
 
+.github-import-tree>ul>li:last-child>.github-tree-file-btn,
+.github-import-tree>ul>li:last-child>.github-tree-folder-label {
+  border-bottom-color: transparent;
+}
+
 .github-import-tree li {
   margin: 0;
 }
@@ -6130,7 +6515,7 @@ a:focus {
   cursor: pointer;
   text-align: left;
   font: inherit;
-  font-size: 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-tree-folder-label:hover,
@@ -6185,7 +6570,7 @@ a:focus {
   cursor: pointer;
   text-align: left;
   font: inherit;
-  font-size: 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-tree-file-btn:hover,
@@ -6304,6 +6689,13 @@ a:focus {
     min-height: 44px;
   }
 
+  .github-import-access-primary-btn,
+  .github-import-access-secondary-btn,
+  .github-import-access-danger-btn,
+  .github-import-access-panel .rename-modal-input {
+    min-height: 44px;
+  }
+
   #github-import-modal .reset-modal-message {
     font-size: var(--ui-font-lg);
   }
@@ -6319,7 +6711,8 @@ a:focus {
 }
 
 @media (prefers-reduced-motion: reduce) {
-  .github-import-select-all-btn {
+  .github-import-select-all-btn,
+  .github-import-access-chevron {
     transition: none;
   }
 }
@@ -6453,6 +6846,8 @@ a:focus {
 [dir="rtl"] .alert-option,
 [dir="rtl"] .github-import-error,
 [dir="rtl"] #github-import-modal .reset-modal-message,
+[dir="rtl"] .github-import-access-toggle,
+[dir="rtl"] .github-import-access-panel,
 [dir="rtl"] .github-tree-file-btn,
 [dir="rtl"] .frontmatter-table td {
   text-align: right;
@@ -6467,6 +6862,15 @@ a:focus {
   padding-right: 0;
 }
 
+[dir="rtl"] .github-import-tree ul ul {
+  margin-right: 16px;
+  margin-left: 0;
+  padding-right: 8px;
+  padding-left: 0;
+  border-right: 1px solid color-mix(in srgb, var(--border-color) 76%, transparent);
+  border-left: 0;
+}
+
 [dir="rtl"] .github-import-search > .lucide {
   right: 11px;
   left: auto;
diff --git a/index.html b/index.html
index 5ac59239..0fc5b6b2 100644
--- a/index.html
+++ b/index.html
@@ -1381,7 +1381,75 @@ <h2 class="about-title">Markdown Viewer</h2>
             <div class="modal-body github-import-modal-body">
               <label class="reset-modal-label" id="github-import-url-label" for="github-import-url">GitHub URL</label>
               <input type="url" id="github-import-url" class="rename-modal-input" placeholder="https://github.com/owner/repo/blob/main/README.md" autocomplete="url" spellcheck="false" />
+              <section id="github-import-access" class="github-import-access" aria-labelledby="github-import-access-title">
+                <button type="button" id="github-import-access-toggle" class="github-import-access-toggle" aria-expanded="false" aria-controls="github-import-access-panel">
+                  <span class="github-import-access-icon" aria-hidden="true"><i class="lucide lucide-shield-check"></i></span>
+                  <span class="github-import-access-copy">
+                    <span id="github-import-access-title" class="github-import-access-title">Private repository access</span>
+                    <span id="github-import-access-summary" class="github-import-access-summary">No token stored · public repositories only</span>
+                  </span>
+                  <i class="lucide lucide-chevron-down github-import-access-chevron" aria-hidden="true"></i>
+                </button>
+                <div id="github-import-access-panel" class="github-import-access-panel" hidden>
+                  <p class="github-import-access-intro">Use a fine-grained personal access token limited to the selected repository with <strong>Contents: Read-only</strong>.</p>
+                  <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
+                    <div class="github-import-access-saved">
+                      <i class="lucide lucide-lock-keyhole" aria-hidden="true"></i>
+                      <span id="github-import-access-saved-text">An encrypted token is saved on this device.</span>
+                    </div>
+                    <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
+                    <div class="github-import-access-inline">
+                      <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
+                      <button type="button" id="github-import-pat-unlock" class="github-import-access-secondary-btn">Unlock</button>
+                    </div>
+                  </div>
+                  <div id="github-import-access-form" class="github-import-access-form">
+                    <label class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
+                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" aria-describedby="github-import-pat-help" />
+                    <label class="reset-modal-label" for="github-import-pat-retention">Keep access</label>
+                    <select id="github-import-pat-retention" class="rename-modal-input">
+                      <option value="session">This session only (recommended)</option>
+                      <option value="1">Encrypted for 1 day</option>
+                      <option value="7">Encrypted for 7 days</option>
+                      <option value="30">Encrypted for 30 days</option>
+                    </select>
+                    <div id="github-import-pat-protection" class="github-import-pat-protection" hidden>
+                      <label class="reset-modal-label" for="github-import-pat-passphrase">Protection passphrase</label>
+                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" />
+                      <span class="github-import-field-note">At least 12 characters. This passphrase is never stored and cannot be recovered.</span>
+                    </div>
+                    <div class="github-import-access-actions">
+                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Use secure access</button>
+                      <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn" hidden>
+                        <i class="lucide lucide-trash-2" aria-hidden="true"></i>
+                        Remove access
+                      </button>
+                    </div>
+                  </div>
+                  <p id="github-import-pat-help" class="github-import-access-help">
+                    The token is sent only to <code>api.github.com</code>. Local expiry makes the saved copy unusable, removes it while the app is running or on the next launch, and does not revoke the token on GitHub.
+                    <a href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
+                  </p>
+                  <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
+                </div>
+              </section>
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
+              <div id="github-import-repository-context" class="github-import-repository-context" hidden>
+                <span class="github-import-repository-icon" aria-hidden="true"><i class="bi bi-github"></i></span>
+                <div class="github-import-repository-copy">
+                  <div class="github-import-repository-heading">
+                    <strong id="github-import-repository-name"></strong>
+                    <a id="github-import-commit-link" class="github-import-commit-link" target="_blank" rel="noopener noreferrer">
+                      <i class="lucide lucide-git-commit-horizontal" aria-hidden="true"></i>
+                      <span id="github-import-commit"></span>
+                    </a>
+                  </div>
+                  <div class="github-import-repository-meta">
+                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
+                    <span id="github-import-base-path" class="github-import-base-path" hidden></span>
+                  </div>
+                </div>
+              </div>
               <div id="github-import-selection-toolbar" class="github-import-selection-toolbar" style="display:none;">
                 <label class="github-import-search" for="github-import-search">
                   <i class="lucide lucide-search" aria-hidden="true"></i>
diff --git a/script.js b/script.js
index 9e400512..1ceb038a 100644
--- a/script.js
+++ b/script.js
@@ -537,7 +537,28 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportSubtitle = document.getElementById("github-import-subtitle");
   const githubImportUrlInput = document.getElementById("github-import-url");
   const githubImportUrlLabel = document.getElementById("github-import-url-label");
+  const githubImportAccess = document.getElementById("github-import-access");
+  const githubImportAccessToggle = document.getElementById("github-import-access-toggle");
+  const githubImportAccessPanel = document.getElementById("github-import-access-panel");
+  const githubImportAccessSummary = document.getElementById("github-import-access-summary");
+  const githubImportAccessUnlock = document.getElementById("github-import-access-unlock");
+  const githubImportAccessSavedText = document.getElementById("github-import-access-saved-text");
+  const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
+  const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
+  const githubImportPatInput = document.getElementById("github-import-pat");
+  const githubImportPatRetention = document.getElementById("github-import-pat-retention");
+  const githubImportPatProtection = document.getElementById("github-import-pat-protection");
+  const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
+  const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
+  const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
+  const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
+  const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
+  const githubImportRepositoryName = document.getElementById("github-import-repository-name");
+  const githubImportCommitLink = document.getElementById("github-import-commit-link");
+  const githubImportCommit = document.getElementById("github-import-commit");
+  const githubImportRef = document.getElementById("github-import-ref");
+  const githubImportBasePath = document.getElementById("github-import-base-path");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSearchInput = document.getElementById("github-import-search");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
@@ -11276,11 +11297,19 @@ ${selector} .arrowheadPath {
     return /\.(md|markdown)$/i.test(path || "");
   }
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
+  const GITHUB_API_VERSION = "2022-11-28";
+  const GITHUB_ACCESS_RECORD_NAME = "githubAccessRecordV1";
+  const GITHUB_PAT_VAULT_VERSION = 1;
+  const GITHUB_PAT_KDF_ITERATIONS = 250000;
   let lastGitHubImportRequestAt = 0;
   const selectedGitHubImportPaths = new Set();
   const collapsedGitHubImportFolders = new Set();
   let availableGitHubImportPaths = [];
   let githubImportSearchTimer = null;
+  let githubAccessToken = "";
+  let githubAccessTokenExpiresAt = 0;
+  let githubPatStoredRecord = null;
+  let githubPatExpiryTimer = null;
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11304,11 +11333,37 @@ ${selector} .arrowheadPath {
     return parentFolder || repositoryFolder;
   }
 
-  async function importGitHubFilesInBackground(owner, repo, ref, filePaths) {
+  function encodeGitHubPath(path) {
+    return String(path || "")
+      .split("/")
+      .filter(Boolean)
+      .map((part) => encodeURIComponent(part))
+      .join("/");
+  }
+
+  function getGitHubRepositoryFolderName(context) {
+    if (!context || !context.repo) return "GitHub import";
+    return context.isDefaultRef || !context.commitSha
+      ? context.repo
+      : `${context.repo} @ ${context.commitSha.slice(0, 7)}`;
+  }
+
+  async function fetchGitHubFileContent(context, filePath) {
+    if (context.isPrivate) {
+      const url = `https://api.github.com/repos/${encodeURIComponent(context.owner)}/${encodeURIComponent(context.repo)}/contents/${encodeGitHubPath(filePath)}?ref=${encodeURIComponent(context.commitSha)}`;
+      return fetchGitHubText(url, {
+        authenticated: true,
+        accept: "application/vnd.github.raw+json"
+      });
+    }
+    return fetchTextContent(buildRawGitHubUrl(context.owner, context.repo, context.commitSha, filePath));
+  }
+
+  async function importGitHubFilesInBackground(context, filePaths) {
     const paths = Array.from(filePaths || []).filter(Boolean);
     if (!paths.length) return 0;
 
-    const folder = ensureWorkspaceFolder(DEFAULT_WORKSPACE_ID, repo);
+    const folder = ensureWorkspaceFolder(DEFAULT_WORKSPACE_ID, getGitHubRepositoryFolderName(context));
     if (!folder) {
       showImportProgress(paths.length, { title: 'GitHub import', detail: 'Preparing repository folder…' });
       finishImportProgress(0, paths.length, { detail: 'The repository folder could not be created.' });
@@ -11327,7 +11382,7 @@ ${selector} .arrowheadPath {
       const filePath = paths[index];
       updateImportProgress(index, paths.length, 'Importing ' + getFileName(filePath));
       try {
-        const markdown = await fetchTextContent(buildRawGitHubUrl(owner, repo, ref, filePath));
+        const markdown = await fetchGitHubFileContent(context, filePath);
         const destinationFolder = ensureGitHubFolderPath(DEFAULT_WORKSPACE_ID, folder, filePath);
         const destination = { workspaceId: DEFAULT_WORKSPACE_ID, folderId: destinationFolder.id };
         const importedDocument = createImportedDocument(
@@ -11358,11 +11413,11 @@ ${selector} .arrowheadPath {
     return imported;
   }
 
-  function startGitHubImport(owner, repo, ref, filePaths) {
+  function startGitHubImport(context, filePaths) {
     const paths = Array.from(filePaths || []).filter(Boolean);
     closeGitHubImportModal();
     if (!paths.length) return;
-    void importGitHubFilesInBackground(owner, repo, ref, paths).catch(function(error) {
+    void importGitHubFilesInBackground(context, paths).catch(function(error) {
       console.error('GitHub import failed:', error);
       showImportProgress(paths.length, { title: 'GitHub import', detail: 'Unable to start import.' });
       finishImportProgress(0, paths.length, { detail: error && error.message ? error.message : 'GitHub import failed.' });
@@ -11370,7 +11425,70 @@ ${selector} .arrowheadPath {
     });
   }
 
-  async function fetchGitHubJson(url) {
+  class GitHubRequestError extends Error {
+    constructor(status, message) {
+      super(message || `GitHub API request failed (${status})`);
+      this.name = "GitHubRequestError";
+      this.status = status;
+    }
+  }
+
+  function clearExpiredGitHubAccessToken() {
+    if (!githubAccessTokenExpiresAt || Date.now() < githubAccessTokenExpiresAt) return;
+    githubAccessToken = "";
+    githubAccessTokenExpiresAt = 0;
+    githubPatStoredRecord = null;
+    if (workspaceStorage && typeof workspaceStorage.deleteMetadata === "function") {
+      void workspaceStorage.init()
+        .then(() => workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME))
+        .catch(() => {});
+    }
+  }
+
+  function scheduleGitHubAccessExpiry(expiresAt) {
+    clearTimeout(githubPatExpiryTimer);
+    githubPatExpiryTimer = null;
+    if (!expiresAt) return;
+    const remaining = Number(expiresAt) - Date.now();
+    if (remaining <= 0) {
+      void removeGitHubAccess({ silent: true })
+        .then(function() {
+          setGitHubAccessStatus("Private repository access expired and was removed from this device.", "success");
+          announceToScreenReader("GitHub private repository access expired and was removed.");
+        })
+        .catch(() => {});
+      return;
+    }
+    githubPatExpiryTimer = setTimeout(function() {
+      scheduleGitHubAccessExpiry(expiresAt);
+    }, Math.min(remaining, 2147483647));
+  }
+
+  function getGitHubAccessToken() {
+    clearExpiredGitHubAccessToken();
+    return githubAccessToken;
+  }
+
+  function getGitHubApiHeaders(accept, authenticated) {
+    const headers = {
+      Accept: accept || "application/vnd.github+json",
+      "X-GitHub-Api-Version": GITHUB_API_VERSION
+    };
+    if (authenticated) {
+      const token = getGitHubAccessToken();
+      if (!token) {
+        throw new Error("Private repository access is locked or has expired.");
+      }
+      headers.Authorization = `Bearer ${token}`;
+    }
+    return headers;
+  }
+
+  async function fetchGitHubResponse(url, options = {}) {
+    const parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== "https:" || parsedUrl.origin !== "https://api.github.com") {
+      throw new Error("Blocked an unsafe GitHub API destination.");
+    }
     const now = Date.now();
     const waitTime = GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS - (now - lastGitHubImportRequestAt);
     if (waitTime > 0) {
@@ -11378,24 +11496,55 @@ ${selector} .arrowheadPath {
     }
     lastGitHubImportRequestAt = Date.now();
     const response = await fetch(url, {
-      headers: {
-        Accept: "application/vnd.github+json"
-      }
+      headers: getGitHubApiHeaders(options.accept, options.authenticated === true),
+      redirect: "error",
+      cache: "no-store"
     });
     if (!response.ok) {
-      throw new Error(`GitHub API request failed (${response.status})`);
+      let message = `GitHub API request failed (${response.status})`;
+      if (response.status === 401) {
+        message = "GitHub rejected the token. Check that it is active and has read-only repository Contents access.";
+      } else if (response.status === 403) {
+        message = "GitHub denied this request. Check token permissions, organization approval, or API rate limits.";
+      }
+      throw new GitHubRequestError(response.status, message);
     }
+    return response;
+  }
+
+  async function fetchGitHubJson(url, options = {}) {
+    const response = await fetchGitHubResponse(url, options);
     return response.json();
   }
 
+  async function fetchGitHubText(url, options = {}) {
+    const response = await fetchGitHubResponse(url, options);
+    return response.text();
+  }
+
   async function fetchTextContent(url) {
-    const response = await fetch(url);
+    const parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== "https:" || parsedUrl.origin !== "https://raw.githubusercontent.com") {
+      throw new Error("Blocked an unsafe GitHub content destination.");
+    }
+    const response = await fetch(url, {
+      redirect: "error",
+      cache: "no-store"
+    });
     if (!response.ok) {
       throw new Error(`Failed to fetch file (${response.status})`);
     }
     return response.text();
   }
 
+  function decodeGitHubPathSegments(pathname) {
+    try {
+      return pathname.split("/").filter(Boolean).map((segment) => decodeURIComponent(segment));
+    } catch (_) {
+      return null;
+    }
+  }
+
   function parseGitHubImportUrl(input) {
     let parsedUrl;
     try {
@@ -11404,14 +11553,22 @@ ${selector} .arrowheadPath {
       return null;
     }
 
+    if (parsedUrl.protocol !== "https:" || parsedUrl.username || parsedUrl.password || parsedUrl.port) {
+      return null;
+    }
     const host = parsedUrl.hostname.replace(/^www\./, "");
-    const segments = parsedUrl.pathname.split("/").filter(Boolean);
+    const segments = decodeGitHubPathSegments(parsedUrl.pathname);
+    if (!segments) return null;
 
     if (host === "raw.githubusercontent.com") {
       if (segments.length < 4) return null;
-      const [owner, repo, ref, ...rest] = segments;
-      const filePath = rest.join("/");
-      return { owner, repo, ref, type: "file", filePath };
+      return {
+        owner: segments[0],
+        repo: segments[1].replace(/\.git$/i, ""),
+        type: "file",
+        locationSegments: segments.slice(2),
+        source: "raw"
+      };
     }
 
     if (host !== "github.com" || segments.length < 2) return null;
@@ -11428,8 +11585,8 @@ ${selector} .arrowheadPath {
         owner,
         repo,
         type: "file",
-        ref: segments[3],
-        filePath: segments.slice(4).join("/")
+        locationSegments: segments.slice(3),
+        source: "blob"
       };
     }
 
@@ -11438,17 +11595,351 @@ ${selector} .arrowheadPath {
         owner,
         repo,
         type: "tree",
-        ref: segments[3],
-        basePath: segments.slice(4).join("/")
+        locationSegments: segments.slice(3),
+        source: "tree"
       };
     }
 
     return { owner, repo, type: "repo" };
   }
 
-  async function getDefaultBranch(owner, repo) {
-    const repoInfo = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`);
-    return repoInfo.default_branch;
+  async function getGitHubRepositoryInfo(owner, repo) {
+    const url = `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`;
+    try {
+      return {
+        info: await fetchGitHubJson(url),
+        authenticated: false
+      };
+    } catch (error) {
+      const canRetryWithToken = error instanceof GitHubRequestError
+        && (error.status === 403 || error.status === 404)
+        && Boolean(getGitHubAccessToken());
+      if (!canRetryWithToken) {
+        if (error instanceof GitHubRequestError && error.status === 404) {
+          throw new Error("Repository not found. If it is private, add secure private repository access and try again.");
+        }
+        throw error;
+      }
+      return {
+        info: await fetchGitHubJson(url, { authenticated: true }),
+        authenticated: true
+      };
+    }
+  }
+
+  async function resolveGitHubCommit(owner, repo, refName, authenticated) {
+    const commit = await fetchGitHubJson(
+      `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/commits/${encodeURIComponent(refName)}`,
+      { authenticated }
+    );
+    if (!commit || !commit.sha) {
+      throw new Error("GitHub did not return a commit for this branch, tag, or commit reference.");
+    }
+    return commit;
+  }
+
+  async function resolveGitHubLocation(parsed) {
+    const repository = await getGitHubRepositoryInfo(parsed.owner, parsed.repo);
+    const repoInfo = repository.info || {};
+    const authenticated = Boolean(repository.authenticated || repoInfo.private);
+    const defaultBranch = repoInfo.default_branch || "main";
+    let refName = defaultBranch;
+    let commit = null;
+    let remainder = [];
+
+    if (parsed.type === "repo") {
+      commit = await resolveGitHubCommit(parsed.owner, parsed.repo, refName, authenticated);
+    } else {
+      const segments = Array.from(parsed.locationSegments || []).filter(Boolean);
+      const minimumRemainder = parsed.type === "file" ? 1 : 0;
+      const maximumRefSegments = segments.length - minimumRemainder;
+      for (let count = maximumRefSegments; count >= 1; count--) {
+        const candidate = segments.slice(0, count).join("/");
+        try {
+          commit = await resolveGitHubCommit(parsed.owner, parsed.repo, candidate, authenticated);
+          refName = candidate;
+          remainder = segments.slice(count);
+          break;
+        } catch (error) {
+          if (!(error instanceof GitHubRequestError) || error.status !== 404) throw error;
+        }
+      }
+      if (!commit) {
+        throw new Error("No matching branch, tag, or commit was found in this GitHub URL.");
+      }
+    }
+
+    return {
+      owner: parsed.owner,
+      repo: parsed.repo,
+      type: parsed.type,
+      refName,
+      commitSha: commit.sha,
+      defaultBranch,
+      isDefaultRef: refName === defaultBranch,
+      isPrivate: Boolean(repoInfo.private),
+      authenticated,
+      filePath: parsed.type === "file" ? remainder.join("/") : "",
+      basePath: parsed.type === "tree" ? remainder.join("/") : ""
+    };
+  }
+
+  function getGitHubPatAdditionalData(expiresAt) {
+    return new TextEncoder().encode(`markdown-viewer:${GITHUB_ACCESS_RECORD_NAME}:${expiresAt}`);
+  }
+
+  async function encryptGitHubAccessToken(token, passphrase, expiresAt) {
+    const cryptoApi = getWebCrypto();
+    if (!cryptoApi) throw new Error("Secure token encryption is unavailable in this browser.");
+    const salt = cryptoApi.getRandomValues(new Uint8Array(16));
+    const iv = cryptoApi.getRandomValues(new Uint8Array(12));
+    const key = await deriveSecretWorkspaceKey(passphrase, salt, GITHUB_PAT_KDF_ITERATIONS);
+    const payload = new TextEncoder().encode(JSON.stringify({
+      token,
+      expiresAt,
+      createdAt: Date.now()
+    }));
+    const ciphertext = await cryptoApi.subtle.encrypt(
+      {
+        name: "AES-GCM",
+        iv,
+        additionalData: getGitHubPatAdditionalData(expiresAt),
+        tagLength: 128
+      },
+      key,
+      payload
+    );
+    return {
+      version: GITHUB_PAT_VAULT_VERSION,
+      algorithm: "AES-GCM",
+      kdf: "PBKDF2-SHA-256",
+      iterations: GITHUB_PAT_KDF_ITERATIONS,
+      salt: bytesToBase64(salt),
+      iv: bytesToBase64(iv),
+      ciphertext: bytesToBase64(new Uint8Array(ciphertext)),
+      expiresAt,
+      createdAt: Date.now()
+    };
+  }
+
+  async function decryptGitHubAccessToken(record, passphrase) {
+    if (!record || record.version !== GITHUB_PAT_VAULT_VERSION) {
+      throw new Error("The saved GitHub access record is not supported.");
+    }
+    const expiresAt = Number(record.expiresAt);
+    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) {
+      throw new Error("The saved GitHub access has expired.");
+    }
+    const cryptoApi = getWebCrypto();
+    if (!cryptoApi) throw new Error("Secure token decryption is unavailable in this browser.");
+    const iterations = Number(record.iterations) || GITHUB_PAT_KDF_ITERATIONS;
+    const key = await deriveSecretWorkspaceKey(passphrase, base64ToBytes(record.salt), iterations);
+    const decrypted = await cryptoApi.subtle.decrypt(
+      {
+        name: "AES-GCM",
+        iv: base64ToBytes(record.iv),
+        additionalData: getGitHubPatAdditionalData(expiresAt),
+        tagLength: 128
+      },
+      key,
+      base64ToBytes(record.ciphertext)
+    );
+    const payload = JSON.parse(new TextDecoder().decode(decrypted));
+    if (!payload || payload.expiresAt !== expiresAt || typeof payload.token !== "string") {
+      throw new Error("The saved GitHub access record failed its integrity check.");
+    }
+    return payload.token;
+  }
+
+  function formatGitHubAccessExpiry(expiresAt) {
+    if (!expiresAt) return "this session";
+    return new Intl.DateTimeFormat(undefined, {
+      dateStyle: "medium",
+      timeStyle: "short"
+    }).format(new Date(expiresAt));
+  }
+
+  function setGitHubAccessStatus(message, state) {
+    if (!githubImportAccessStatus) return;
+    githubImportAccessStatus.textContent = message || "";
+    githubImportAccessStatus.hidden = !message;
+    githubImportAccessStatus.classList.toggle("is-error", state === "error");
+    githubImportAccessStatus.classList.toggle("is-success", state === "success");
+  }
+
+  function renderGitHubAccessState() {
+    clearExpiredGitHubAccessToken();
+    const hasActiveToken = Boolean(getGitHubAccessToken());
+    const hasStoredRecord = Boolean(githubPatStoredRecord);
+    if (githubImportAccess) {
+      githubImportAccess.dataset.state = hasActiveToken ? "active" : hasStoredRecord ? "locked" : "empty";
+    }
+    if (githubImportAccessSummary) {
+      githubImportAccessSummary.textContent = hasActiveToken
+        ? `Access ready · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
+        : hasStoredRecord
+          ? `Encrypted token saved · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
+          : "No token stored · public repositories only";
+    }
+    if (githubImportAccessUnlock) {
+      githubImportAccessUnlock.hidden = !hasStoredRecord || hasActiveToken;
+    }
+    if (githubImportAccessSavedText && hasStoredRecord) {
+      githubImportAccessSavedText.textContent = `Encrypted access expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}.`;
+    }
+    if (githubImportPatRemoveBtn) {
+      githubImportPatRemoveBtn.hidden = !hasActiveToken && !hasStoredRecord;
+    }
+  }
+
+  async function loadStoredGitHubAccess() {
+    githubPatStoredRecord = null;
+    if (!workspaceStorage) {
+      renderGitHubAccessState();
+      return;
+    }
+    try {
+      await workspaceStorage.init();
+      const record = await workspaceStorage.getMetadata(GITHUB_ACCESS_RECORD_NAME);
+      if (record && Number(record.expiresAt) <= Date.now()) {
+        if (typeof workspaceStorage.deleteMetadata === "function") {
+          await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+        }
+        setGitHubAccessStatus("Expired private repository access was removed from this device.", "success");
+      } else if (record) {
+        githubPatStoredRecord = record;
+        scheduleGitHubAccessExpiry(record.expiresAt);
+      }
+    } catch (_) {
+      setGitHubAccessStatus("Saved private access could not be read. Session-only access is still available.", "error");
+    }
+    renderGitHubAccessState();
+  }
+
+  async function removeGitHubAccess(options = {}) {
+    clearTimeout(githubPatExpiryTimer);
+    githubPatExpiryTimer = null;
+    githubAccessToken = "";
+    githubAccessTokenExpiresAt = 0;
+    githubPatStoredRecord = null;
+    if (githubImportPatInput) githubImportPatInput.value = "";
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
+    if (workspaceStorage) {
+      await workspaceStorage.init();
+      if (typeof workspaceStorage.deleteMetadata === "function") {
+        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+      } else {
+        await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, null);
+      }
+    }
+    renderGitHubAccessState();
+    if (!options.silent) {
+      setGitHubAccessStatus("Private repository access was removed from this device.", "success");
+      announceToScreenReader("GitHub private repository access removed.");
+    }
+  }
+
+  function validateGitHubPat(token) {
+    if (!token || token.length < 20 || /\s/.test(token)) {
+      throw new Error("Enter a valid personal access token without spaces.");
+    }
+  }
+
+  async function saveGitHubAccess() {
+    if (!githubImportPatInput || !githubImportPatRetention) return;
+    const token = githubImportPatInput.value;
+    validateGitHubPat(token);
+    const retention = githubImportPatRetention.value;
+    let expiresAt = 0;
+    let record = null;
+
+    if (retention !== "session") {
+      const days = Number(retention);
+      const passphrase = githubImportPatPassphrase ? githubImportPatPassphrase.value : "";
+      if (!Number.isFinite(days) || days < 1 || days > 30) {
+        throw new Error("Choose a supported access retention period.");
+      }
+      if (passphrase.length < 12) {
+        throw new Error("Use at least 12 characters for the protection passphrase.");
+      }
+      if (!workspaceStorage) {
+        throw new Error("Encrypted workspace storage is unavailable. Use session-only access instead.");
+      }
+      expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
+      record = await encryptGitHubAccessToken(token, passphrase, expiresAt);
+      await workspaceStorage.init();
+      await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, record);
+    } else if (workspaceStorage) {
+      await workspaceStorage.init();
+      if (typeof workspaceStorage.deleteMetadata === "function") {
+        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+      }
+    }
+
+    githubAccessToken = token;
+    githubAccessTokenExpiresAt = expiresAt;
+    githubPatStoredRecord = record;
+    scheduleGitHubAccessExpiry(expiresAt);
+    githubImportPatInput.value = "";
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    renderGitHubAccessState();
+    setGitHubAccessStatus(
+      expiresAt
+        ? `Private access is ready and encrypted until ${formatGitHubAccessExpiry(expiresAt)}.`
+        : "Private access is ready for this session and was not written to storage.",
+      "success"
+    );
+    announceToScreenReader("GitHub private repository access is ready.");
+  }
+
+  async function unlockStoredGitHubAccess() {
+    if (!githubPatStoredRecord || !githubImportPatUnlockPassphrase) return;
+    const passphrase = githubImportPatUnlockPassphrase.value;
+    if (!passphrase) throw new Error("Enter the protection passphrase.");
+    try {
+      githubAccessToken = await decryptGitHubAccessToken(githubPatStoredRecord, passphrase);
+      githubAccessTokenExpiresAt = Number(githubPatStoredRecord.expiresAt);
+      scheduleGitHubAccessExpiry(githubAccessTokenExpiresAt);
+    } catch (error) {
+      if (Number(githubPatStoredRecord.expiresAt) <= Date.now()) {
+        await removeGitHubAccess({ silent: true });
+        throw new Error("The saved GitHub access expired and was removed.");
+      }
+      throw new Error("The token could not be unlocked. Check the protection passphrase.");
+    } finally {
+      githubImportPatUnlockPassphrase.value = "";
+    }
+    renderGitHubAccessState();
+    setGitHubAccessStatus("Encrypted private repository access is unlocked for this session.", "success");
+    announceToScreenReader("GitHub private repository access unlocked.");
+  }
+
+  function renderGitHubRepositoryContext(context) {
+    if (!githubImportRepositoryContext) return;
+    if (!context) {
+      githubImportRepositoryContext.hidden = true;
+      return;
+    }
+    githubImportRepositoryContext.hidden = false;
+    if (githubImportRepositoryName) {
+      githubImportRepositoryName.textContent = `${context.owner}/${context.repo}`;
+    }
+    if (githubImportCommit) {
+      githubImportCommit.textContent = context.commitSha.slice(0, 7);
+    }
+    if (githubImportCommitLink) {
+      githubImportCommitLink.href = `https://github.com/${encodeURIComponent(context.owner)}/${encodeURIComponent(context.repo)}/tree/${encodeURIComponent(context.commitSha)}`;
+      githubImportCommitLink.title = `Open commit ${context.commitSha} on GitHub`;
+      githubImportCommitLink.setAttribute("aria-label", `Open commit ${context.commitSha} on GitHub`);
+    }
+    if (githubImportRef) {
+      githubImportRef.textContent = context.refName;
+    }
+    if (githubImportBasePath) {
+      githubImportBasePath.textContent = context.basePath ? `/ ${context.basePath}` : "";
+      githubImportBasePath.hidden = !context.basePath;
+    }
   }
 
   function isPathInsideGitHubBase(path, normalizedBasePath) {
@@ -11462,13 +11953,16 @@ ${selector} .arrowheadPath {
       || path.startsWith(normalizedBasePath + "/");
   }
 
-  async function listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath) {
+  async function listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath, authenticated) {
     const pendingTrees = [{ path: "", ref }];
     const markdownPaths = new Set();
 
     for (let index = 0; index < pendingTrees.length; index++) {
       const currentTree = pendingTrees[index];
-      const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(currentTree.ref)}`);
+      const treeResponse = await fetchGitHubJson(
+        `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(currentTree.ref)}`,
+        { authenticated }
+      );
 
       (treeResponse.tree || []).forEach((entry) => {
         const fullPath = currentTree.path ? `${currentTree.path}/${entry.path}` : entry.path;
@@ -11484,14 +11978,18 @@ ${selector} .arrowheadPath {
   }
 
   async function listMarkdownFiles(owner, repo, ref, basePath, options = {}) {
-    const treeResponse = await fetchGitHubJson(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(ref)}?recursive=1`);
+    const authenticated = options.authenticated === true;
+    const treeResponse = await fetchGitHubJson(
+      `https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/trees/${encodeURIComponent(ref)}?recursive=1`,
+      { authenticated }
+    );
     const normalizedBasePath = (basePath || "").replace(/^\/+|\/+$/g, "");
 
     if (treeResponse.truncated) {
       if (typeof options.onTruncatedTree === "function") {
         options.onTruncatedTree();
       }
-      return listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath);
+      return listMarkdownFilesFromGitHubSubtrees(owner, repo, ref, normalizedBasePath, authenticated);
     }
 
     return (treeResponse.tree || [])
@@ -11724,6 +12222,7 @@ ${selector} .arrowheadPath {
 
   function resetGitHubImportModal() {
     if (!githubImportUrlInput || !githubImportFileSelect || !githubImportSubmitBtn) return;
+    if (githubImportModal) githubImportModal.classList.remove("is-selection-step");
     if (githubImportTitle) {
       githubImportTitle.textContent = "Import Markdown from GitHub";
     }
@@ -11733,6 +12232,16 @@ ${selector} .arrowheadPath {
     githubImportUrlInput.value = "";
     githubImportUrlInput.style.display = "block";
     if (githubImportUrlLabel) githubImportUrlLabel.style.display = "block";
+    if (githubImportAccess) githubImportAccess.hidden = false;
+    if (githubImportAccessToggle) githubImportAccessToggle.setAttribute("aria-expanded", "false");
+    if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
+    if (githubImportPatInput) githubImportPatInput.value = "";
+    if (githubImportPatRetention) githubImportPatRetention.value = "session";
+    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
+    setGitHubAccessStatus("");
+    renderGitHubRepositoryContext(null);
     githubImportUrlInput.disabled = false;
     githubImportFileSelect.innerHTML = "";
     githubImportFileSelect.style.display = "none";
@@ -11758,8 +12267,10 @@ ${selector} .arrowheadPath {
     delete githubImportSubmitBtn.dataset.owner;
     delete githubImportSubmitBtn.dataset.repo;
     delete githubImportSubmitBtn.dataset.ref;
+    githubImportSubmitBtn._githubContext = null;
     githubImportSubmitBtn.textContent = "Import";
     setGitHubImportMessage("");
+    renderGitHubAccessState();
   }
 
   function openGitHubImportModal() {
@@ -11769,6 +12280,7 @@ ${selector} .arrowheadPath {
       focusTarget: githubImportUrlInput,
       onClose: closeGitHubImportModal
     });
+    void loadStoredGitHubAccess();
   }
 
   function closeGitHubImportModal() {
@@ -11790,19 +12302,29 @@ ${selector} .arrowheadPath {
       if (githubImportSearchInput) {
         githubImportSearchInput.disabled = disabled;
       }
+      [
+        githubImportAccessToggle,
+        githubImportPatUnlockPassphrase,
+        githubImportPatUnlockBtn,
+        githubImportPatInput,
+        githubImportPatRetention,
+        githubImportPatPassphrase,
+        githubImportPatSaveBtn,
+        githubImportPatRemoveBtn
+      ].forEach(function(control) {
+        if (control) control.disabled = disabled;
+      });
     };
     const step = githubImportSubmitBtn.dataset.step || "url";
     if (step === "select") {
       const selectedPaths = Array.from(selectedGitHubImportPaths);
-      const owner = githubImportSubmitBtn.dataset.owner;
-      const repo = githubImportSubmitBtn.dataset.repo;
-      const ref = githubImportSubmitBtn.dataset.ref;
-      if (!owner || !repo || !ref || !selectedPaths.length) {
+      const context = githubImportSubmitBtn._githubContext;
+      if (!context || !context.owner || !context.repo || !context.commitSha || !selectedPaths.length) {
         setGitHubImportMessage("Please select at least one file to import.");
         return;
       }
       announceToScreenReader("Importing selected files from GitHub...");
-      startGitHubImport(owner, repo, ref, selectedPaths);
+      startGitHubImport(context, selectedPaths);
       return;
     }
 
@@ -11822,12 +12344,13 @@ ${selector} .arrowheadPath {
     setGitHubImportLoading(true);
     setGitHubImportDialogDisabled(true);
     try {
-      if (parsed.type === "file") {
-        if (!isMarkdownPath(parsed.filePath)) {
+      const context = await resolveGitHubLocation(parsed);
+      if (context.type === "file") {
+        if (!isMarkdownPath(context.filePath)) {
           throw new Error("The provided URL does not point to a Markdown file.");
         }
         announceToScreenReader("Starting GitHub import...");
-        startGitHubImport(parsed.owner, parsed.repo, parsed.ref, [parsed.filePath]);
+        startGitHubImport(context, [context.filePath]);
         return;
       }
 
@@ -11841,8 +12364,8 @@ ${selector} .arrowheadPath {
         githubImportTree.style.display = "block";
       }
 
-      const ref = parsed.ref || await getDefaultBranch(parsed.owner, parsed.repo);
-      const files = await listMarkdownFiles(parsed.owner, parsed.repo, ref, parsed.basePath || "", {
+      const files = await listMarkdownFiles(context.owner, context.repo, context.commitSha, context.basePath, {
+        authenticated: context.authenticated,
         onTruncatedTree: function() {
           setGitHubImportMessage("GitHub returned a partial tree. Scanning every folder to find all Markdown files\u2026", { isError: false });
           announceToScreenReader("Large GitHub repository detected. Scanning every folder.");
@@ -11862,13 +12385,16 @@ ${selector} .arrowheadPath {
       if (files.length === 1) {
         const targetPath = files[0];
         announceToScreenReader("Starting GitHub import...");
-        startGitHubImport(parsed.owner, parsed.repo, ref, [targetPath]);
+        startGitHubImport(context, [targetPath]);
         return;
       }
 
       githubImportFileSelect.innerHTML = "";
+      if (githubImportModal) githubImportModal.classList.add("is-selection-step");
       githubImportUrlInput.style.display = "none";
       if (githubImportUrlLabel) githubImportUrlLabel.style.display = "none";
+      if (githubImportAccess) githubImportAccess.hidden = true;
+      renderGitHubRepositoryContext(context);
       githubImportFileSelect.style.display = "none";
       if (githubImportSelectionToolbar) {
         githubImportSelectionToolbar.style.display = "grid";
@@ -11892,9 +12418,10 @@ ${selector} .arrowheadPath {
         githubImportSubtitle.textContent = `${files.length.toLocaleString()} Markdown files found. Choose what to save to Explorer.`;
       }
       githubImportSubmitBtn.dataset.step = "select";
-      githubImportSubmitBtn.dataset.owner = parsed.owner;
-      githubImportSubmitBtn.dataset.repo = parsed.repo;
-      githubImportSubmitBtn.dataset.ref = ref;
+      githubImportSubmitBtn.dataset.owner = context.owner;
+      githubImportSubmitBtn.dataset.repo = context.repo;
+      githubImportSubmitBtn.dataset.ref = context.commitSha;
+      githubImportSubmitBtn._githubContext = context;
       githubImportSubmitBtn.textContent = "Import Selected";
       if (githubImportSearchInput) githubImportSearchInput.focus();
     } catch (error) {
@@ -18129,6 +18656,83 @@ ${selector} .arrowheadPath {
   if (githubImportCloseBtn) {
     githubImportCloseBtn.addEventListener("click", closeGitHubImportModal);
   }
+  if (githubImportAccessToggle && githubImportAccessPanel) {
+    githubImportAccessToggle.addEventListener("click", function() {
+      const expanded = githubImportAccessToggle.getAttribute("aria-expanded") === "true";
+      githubImportAccessToggle.setAttribute("aria-expanded", expanded ? "false" : "true");
+      githubImportAccessPanel.hidden = expanded;
+      if (!expanded) {
+        const target = githubPatStoredRecord && !getGitHubAccessToken()
+          ? githubImportPatUnlockPassphrase
+          : githubImportPatInput;
+        if (target) requestAnimationFrame(() => target.focus({ preventScroll: true }));
+      }
+    });
+  }
+  if (githubImportPatRetention) {
+    githubImportPatRetention.addEventListener("change", function() {
+      const needsPassphrase = githubImportPatRetention.value !== "session";
+      if (githubImportPatProtection) githubImportPatProtection.hidden = !needsPassphrase;
+      if (!needsPassphrase && githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    });
+  }
+  if (githubImportPatSaveBtn) {
+    githubImportPatSaveBtn.addEventListener("click", async function() {
+      const previousText = githubImportPatSaveBtn.textContent;
+      githubImportPatSaveBtn.disabled = true;
+      githubImportPatSaveBtn.textContent = "Securing…";
+      setGitHubAccessStatus("");
+      try {
+        await saveGitHubAccess();
+      } catch (error) {
+        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be saved.", "error");
+      } finally {
+        githubImportPatSaveBtn.disabled = false;
+        githubImportPatSaveBtn.textContent = previousText;
+      }
+    });
+  }
+  if (githubImportPatUnlockBtn) {
+    githubImportPatUnlockBtn.addEventListener("click", async function() {
+      const previousText = githubImportPatUnlockBtn.textContent;
+      githubImportPatUnlockBtn.disabled = true;
+      githubImportPatUnlockBtn.textContent = "Unlocking…";
+      setGitHubAccessStatus("");
+      try {
+        await unlockStoredGitHubAccess();
+      } catch (error) {
+        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be unlocked.", "error");
+      } finally {
+        githubImportPatUnlockBtn.disabled = false;
+        githubImportPatUnlockBtn.textContent = previousText;
+      }
+    });
+  }
+  if (githubImportPatRemoveBtn) {
+    githubImportPatRemoveBtn.addEventListener("click", async function() {
+      githubImportPatRemoveBtn.disabled = true;
+      setGitHubAccessStatus("");
+      try {
+        await removeGitHubAccess();
+      } catch (_) {
+        setGitHubAccessStatus("Private access could not be removed from device storage.", "error");
+      } finally {
+        githubImportPatRemoveBtn.disabled = false;
+      }
+    });
+  }
+  const bindGitHubAccessEnterAction = function(input, actionButton) {
+    if (!input || !actionButton) return;
+    input.addEventListener("keydown", function(event) {
+      if (event.key === "Enter") {
+        event.preventDefault();
+        actionButton.click();
+      }
+    });
+  };
+  bindGitHubAccessEnterAction(githubImportPatUnlockPassphrase, githubImportPatUnlockBtn);
+  bindGitHubAccessEnterAction(githubImportPatInput, githubImportPatSaveBtn);
+  void loadStoredGitHubAccess();
   const handleGitHubImportInputKeydown = function(e) {
     if (e.key === "Enter") {
       e.preventDefault();
diff --git a/styles.css b/styles.css
index 97d12c60..39942c6a 100644
--- a/styles.css
+++ b/styles.css
@@ -5943,14 +5943,19 @@ a:focus {
 }
 
 #github-import-modal .reset-modal-box {
-  width: min(94vw, 760px);
-  max-width: 760px;
+  width: min(92vw, 520px);
+  max-width: 520px;
   min-width: 0;
   padding: 0;
   gap: 0;
   overflow: hidden;
 }
 
+#github-import-modal.is-selection-step .reset-modal-box {
+  width: min(94vw, 760px);
+  max-width: 760px;
+}
+
 #github-import-modal .reset-modal-message {
   font-size: var(--ui-font-lg);
   line-height: 1.3;
@@ -5967,10 +5972,15 @@ a:focus {
   flex-direction: column;
   gap: 10px;
   max-height: min(68vh, 620px);
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
   padding: 16px;
 }
 
+#github-import-modal.is-selection-step .github-import-modal-body {
+  overflow: hidden;
+}
+
 #github-import-url,
 #github-import-file-select {
   min-height: 36px;
@@ -5982,6 +5992,370 @@ a:focus {
   min-height: 180px;
 }
 
+.github-import-access[hidden],
+.github-import-access-panel[hidden],
+.github-import-access-unlock[hidden],
+.github-import-pat-protection[hidden],
+.github-import-access-danger-btn[hidden],
+.github-import-repository-context[hidden],
+.github-import-base-path[hidden],
+.github-import-access-status[hidden] {
+  display: none !important;
+}
+
+.github-import-access {
+  overflow: hidden;
+  border: 1px solid var(--border-color);
+  border-radius: 9px;
+  background: var(--bg-color);
+}
+
+.github-import-access-toggle {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  width: 100%;
+  min-height: 48px;
+  padding: 8px 10px;
+  border: 0;
+  background: transparent;
+  color: var(--text-color);
+  cursor: pointer;
+  text-align: left;
+  font: inherit;
+}
+
+.github-import-access-toggle:hover,
+.github-import-access-toggle:focus-visible {
+  background: var(--button-hover);
+}
+
+.github-import-access-toggle:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: -2px;
+}
+
+.github-import-access-icon {
+  display: inline-grid;
+  place-items: center;
+  width: 30px;
+  height: 30px;
+  flex: 0 0 auto;
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--text-secondary) 10%, transparent);
+  color: var(--text-secondary);
+}
+
+.github-import-access-icon > .lucide {
+  width: 17px;
+  height: 17px;
+}
+
+.github-import-access[data-state="active"] .github-import-access-icon {
+  background: color-mix(in srgb, #1a7f37 13%, transparent);
+  color: #1a7f37;
+}
+
+.github-import-access[data-state="locked"] .github-import-access-icon {
+  background: color-mix(in srgb, var(--accent-color) 12%, transparent);
+  color: var(--accent-color);
+}
+
+.github-import-access-copy {
+  display: grid;
+  gap: 2px;
+  min-width: 0;
+  flex: 1;
+}
+
+.github-import-access-title {
+  font-size: var(--ui-font-md);
+  font-weight: 700;
+}
+
+.github-import-access-summary {
+  overflow: hidden;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.35;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-import-access-chevron {
+  width: 16px;
+  height: 16px;
+  flex: 0 0 auto;
+  color: var(--text-secondary);
+  transition: transform 160ms ease;
+}
+
+.github-import-access-toggle[aria-expanded="true"] .github-import-access-chevron {
+  transform: rotate(180deg);
+}
+
+.github-import-access-panel {
+  display: grid;
+  gap: 10px;
+  padding: 12px;
+  border-top: 1px solid var(--border-color);
+  background: color-mix(in srgb, var(--button-bg) 55%, var(--bg-color));
+}
+
+.github-import-access-intro,
+.github-import-access-help,
+.github-import-field-note {
+  margin: 0;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.45;
+}
+
+.github-import-access-intro strong {
+  color: var(--text-color);
+}
+
+.github-import-access-form,
+.github-import-access-unlock,
+.github-import-pat-protection {
+  display: grid;
+  gap: 6px;
+}
+
+.github-import-access-unlock {
+  padding: 10px;
+  border: 1px solid color-mix(in srgb, var(--accent-color) 26%, var(--border-color));
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--accent-color) 6%, var(--bg-color));
+}
+
+.github-import-access-saved {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  color: var(--text-color);
+  font-size: var(--ui-font-md);
+  line-height: 1.35;
+}
+
+.github-import-access-saved > .lucide {
+  width: 15px;
+  height: 15px;
+  flex: 0 0 auto;
+  color: var(--accent-color);
+}
+
+.github-import-access-inline {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 8px;
+}
+
+.github-import-access-panel .rename-modal-input {
+  width: 100%;
+  min-height: 38px;
+  padding: 7px 9px;
+  font-size: var(--ui-font-md);
+}
+
+.github-import-access-actions {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  padding-top: 2px;
+}
+
+.github-import-access-primary-btn,
+.github-import-access-secondary-btn,
+.github-import-access-danger-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  min-height: 36px;
+  padding: 7px 11px;
+  border: 1px solid var(--border-color);
+  border-radius: 7px;
+  background: var(--button-bg);
+  color: var(--text-color);
+  cursor: pointer;
+  font: inherit;
+  font-size: var(--ui-font-md);
+  font-weight: 650;
+}
+
+.github-import-access-primary-btn {
+  border-color: var(--accent-color);
+  background: var(--accent-color);
+  color: #fff;
+}
+
+.github-import-access-danger-btn {
+  color: var(--color-danger-fg, #cf222e);
+}
+
+.github-import-access-danger-btn > .lucide {
+  width: 14px;
+  height: 14px;
+}
+
+.github-import-access-primary-btn:hover,
+.github-import-access-secondary-btn:hover,
+.github-import-access-danger-btn:hover {
+  filter: brightness(0.97);
+}
+
+.github-import-access-primary-btn:focus-visible,
+.github-import-access-secondary-btn:focus-visible,
+.github-import-access-danger-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-access-primary-btn:disabled,
+.github-import-access-secondary-btn:disabled,
+.github-import-access-danger-btn:disabled {
+  cursor: not-allowed;
+  opacity: 0.55;
+}
+
+.github-import-access-help a {
+  color: var(--accent-color);
+  font-weight: 600;
+}
+
+.github-import-access-help code {
+  color: var(--text-color);
+  font-size: inherit;
+}
+
+.github-import-access-status {
+  margin: 0;
+  padding: 8px 10px;
+  border: 1px solid var(--border-color);
+  border-radius: 7px;
+  background: var(--bg-color);
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.4;
+}
+
+.github-import-access-status.is-success {
+  border-color: color-mix(in srgb, #1a7f37 34%, var(--border-color));
+  color: #1a7f37;
+}
+
+.github-import-access-status.is-error {
+  border-color: color-mix(in srgb, var(--color-danger-fg, #cf222e) 34%, var(--border-color));
+  color: var(--color-danger-fg, #cf222e);
+}
+
+.github-import-repository-context {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  min-width: 0;
+  padding: 9px 10px;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--button-bg) 62%, var(--bg-color));
+}
+
+.github-import-repository-icon {
+  display: inline-grid;
+  place-items: center;
+  width: 30px;
+  height: 30px;
+  flex: 0 0 auto;
+  border-radius: 8px;
+  background: var(--bg-color);
+  color: var(--text-color);
+}
+
+.github-import-repository-icon > .lucide,
+.github-import-repository-icon > .bi {
+  width: 18px;
+  height: 18px;
+  font-size: 18px;
+  line-height: 1;
+}
+
+.github-import-repository-copy {
+  display: grid;
+  gap: 3px;
+  min-width: 0;
+}
+
+.github-import-repository-heading,
+.github-import-repository-meta,
+.github-import-ref,
+.github-import-commit-link {
+  display: flex;
+  align-items: center;
+}
+
+.github-import-repository-heading {
+  gap: 8px;
+  min-width: 0;
+}
+
+.github-import-repository-heading strong {
+  overflow: hidden;
+  color: var(--text-color);
+  font-size: var(--ui-font-lg);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.github-import-commit-link {
+  gap: 4px;
+  flex: 0 0 auto;
+  padding: 2px 7px;
+  border: 1px solid var(--border-color);
+  border-radius: 999px;
+  background: var(--bg-color);
+  color: var(--accent-color);
+  font-family: ui-monospace, SFMono-Regular, Consolas, monospace;
+  font-size: var(--ui-font-sm);
+  font-weight: 650;
+  text-decoration: none;
+}
+
+.github-import-commit-link > .lucide,
+.github-import-ref > .lucide {
+  width: 13px;
+  height: 13px;
+}
+
+.github-import-commit-link:hover {
+  border-color: var(--accent-color);
+}
+
+.github-import-commit-link:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-repository-meta {
+  gap: 7px;
+  min-width: 0;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+}
+
+.github-import-ref {
+  gap: 4px;
+  min-width: 0;
+}
+
+.github-import-ref > span,
+.github-import-base-path {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .github-import-tree {
   min-height: 240px;
   max-height: min(48vh, 440px);
@@ -6108,10 +6482,21 @@ a:focus {
   padding-left: 24px;
 }
 
+.github-import-tree ul ul {
+  margin-left: 16px;
+  padding-left: 8px;
+  border-left: 1px solid color-mix(in srgb, var(--border-color) 76%, transparent);
+}
+
 .github-import-tree>ul {
   padding-left: 0;
 }
 
+.github-import-tree>ul>li:last-child>.github-tree-file-btn,
+.github-import-tree>ul>li:last-child>.github-tree-folder-label {
+  border-bottom-color: transparent;
+}
+
 .github-import-tree li {
   margin: 0;
 }
@@ -6130,7 +6515,7 @@ a:focus {
   cursor: pointer;
   text-align: left;
   font: inherit;
-  font-size: 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-tree-folder-label:hover,
@@ -6185,7 +6570,7 @@ a:focus {
   cursor: pointer;
   text-align: left;
   font: inherit;
-  font-size: 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-tree-file-btn:hover,
@@ -6304,6 +6689,13 @@ a:focus {
     min-height: 44px;
   }
 
+  .github-import-access-primary-btn,
+  .github-import-access-secondary-btn,
+  .github-import-access-danger-btn,
+  .github-import-access-panel .rename-modal-input {
+    min-height: 44px;
+  }
+
   #github-import-modal .reset-modal-message {
     font-size: var(--ui-font-lg);
   }
@@ -6319,7 +6711,8 @@ a:focus {
 }
 
 @media (prefers-reduced-motion: reduce) {
-  .github-import-select-all-btn {
+  .github-import-select-all-btn,
+  .github-import-access-chevron {
     transition: none;
   }
 }
@@ -6453,6 +6846,8 @@ a:focus {
 [dir="rtl"] .alert-option,
 [dir="rtl"] .github-import-error,
 [dir="rtl"] #github-import-modal .reset-modal-message,
+[dir="rtl"] .github-import-access-toggle,
+[dir="rtl"] .github-import-access-panel,
 [dir="rtl"] .github-tree-file-btn,
 [dir="rtl"] .frontmatter-table td {
   text-align: right;
@@ -6467,6 +6862,15 @@ a:focus {
   padding-right: 0;
 }
 
+[dir="rtl"] .github-import-tree ul ul {
+  margin-right: 16px;
+  margin-left: 0;
+  padding-right: 8px;
+  padding-left: 0;
+  border-right: 1px solid color-mix(in srgb, var(--border-color) 76%, transparent);
+  border-left: 0;
+}
+
 [dir="rtl"] .github-import-search > .lucide {
   right: 11px;
   left: auto;
diff --git a/wiki/FAQ.md b/wiki/FAQ.md
index ab07e3c7..2759c18e 100644
--- a/wiki/FAQ.md
+++ b/wiki/FAQ.md
@@ -60,7 +60,7 @@ A workspace ZIP contains normal Documents, folder organization, review data, sel
 
 ### Does Markdown leave my device?
 
-Normal editing, local import, Preview, Workspace storage, and most exports stay on the device. Data can leave when you use managed media, public GitHub import, remote diagram rendering, stored Share Snapshot, Live Share, external assets/map tiles, or uncached web libraries.
+Normal editing, local import, Preview, Workspace storage, and most exports stay on the device. Data can leave when you use managed media, GitHub import, remote diagram rendering, stored Share Snapshot, Live Share, external assets/map tiles, or uncached web libraries.
 
 See [Privacy and Security](Privacy-and-Security.md) for the complete table.
 
@@ -120,7 +120,7 @@ Yes. It supports regular expressions, capture replacements, preserve-case replac
 
 ### Can I import a private GitHub repository?
 
-No. The importer uses public GitHub URLs and does not request a token. Repository and folder results show every Markdown file found.
+Yes. Expand **Private repository access** in the GitHub URL dialog and provide a fine-grained PAT restricted to the selected repository with **Contents: Read-only**. Session-only access is recommended and is not written to storage. Remembered access is AES-GCM encrypted under a separate passphrase, expires after the chosen 1-, 7-, or 30-day period, and can be removed at any time. The app cannot revoke the PAT on GitHub; use GitHub settings to revoke or rotate it.
 
 ### Which PDF option should I use?
 
diff --git a/wiki/Features.md b/wiki/Features.md
index 436adf7d..38128ccc 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -263,19 +263,21 @@ Application feedback:
 GitHub import:
 
 - Accepts `github.com/owner/repo`, `github.com/owner/repo/tree/ref/path`, `github.com/owner/repo/blob/ref/path`, and `raw.githubusercontent.com` file URLs.
+- Resolves default branches, explicit branches (including names containing `/`), tags, and commit references to an immutable commit SHA.
 - Direct Markdown file URLs import immediately.
-- Repository or folder URLs query GitHub's public API to find Markdown files.
-- The wider modal shows a searchable, collapsible GitHub-style tree, selected and total file counts, and an icon-based select-all or deselect-all control.
-- Imports create a repository-named folder and reproduce each selected file's nested GitHub directory path inside it.
+- Repository or folder URLs query GitHub's API to find Markdown files.
+- The URL step remains a compact 520px dialog. The 760px selection step shows repository/ref/short-commit context, a searchable and collapsible GitHub-style tree, selected and total file counts, and an icon-based select-all or deselect-all control.
+- Default-branch imports create a repository-named folder. Other refs place the short commit beside the repository name. Each selected file's nested GitHub directory path is reproduced inside it.
 - Every Markdown file found is shown.
 - Requests are rate-limited by the app to avoid hammering GitHub.
-- Selected files are fetched as raw content and saved to Explorer without opening new tabs.
+- Public files are fetched as raw content. Private files use GitHub's authenticated Contents API. Both are saved to Explorer without opening new tabs.
+- Optional private access accepts a fine-grained PAT limited to a selected repository with `Contents: Read-only`. It is session-only by default; optional 1-, 7-, or 30-day retention stores PBKDF2-derived AES-GCM ciphertext under a separate, non-stored passphrase. Expiry and manual removal delete the local record.
 
 Limitations and privacy:
 
 - Local file content is read in the browser or desktop application and is not uploaded by local import.
-- GitHub import sends repository and path information to GitHub and downloads public file contents from GitHub.
-- Private GitHub repositories are not supported because the app does not ask for tokens.
+- GitHub import sends repository, ref, and path information to GitHub. Public requests are anonymous unless GitHub requires authenticated access.
+- A private-repository PAT is attached only to `api.github.com` requests and is never sent to `raw.githubusercontent.com` or the Markdown Viewer backend. Local deletion does not revoke the token on GitHub.
 
 ## Export Markdown to PDF, HTML, PNG, and MD
 
@@ -538,7 +540,7 @@ Security limitations:
 | Local file import | No | Current tab/workspace | Reads selected files only. |
 | Managed media upload | Yes, after first-use consent | Cloudflare KV, content-addressed, 90-day TTL | Publicly retrievable by its unguessable HTTPS URL until expiry; still images 300 KiB optimized, GIF 5 MiB, video 10 MiB. |
 | Markdown/HTML/PDF/PNG export | No, except remote assets already referenced | User download location | Browser may request external images/fonts used by content. |
-| GitHub import | Yes | GitHub API/raw URLs | Public repos only; no token flow. |
+| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Optional fine-grained read-only PAT; session-only by default or passphrase-encrypted with local expiry/removal. |
 | Emoji lookup | Yes | GitHub emoji API response in memory | Used for shortcode picker/lookup. |
 | CDN library loading | Yes | Browser/service-worker cache | Web build only, first use unless cached. |
 | Remote diagram engines | Yes | Third-party renderer response/cache | Source is sent to PlantUML, Kroki, or mermaid.ink depending on renderer/preview. |
@@ -552,7 +554,7 @@ Security limitations:
 - Browser storage quotas can reject very large saved workspaces.
 - Markdown Viewer does not impose a document-count limit; available storage and operating-system/filesystem constraints still apply.
 - An individual local Markdown import is limited to 10 MB.
-- The GitHub importer shows every Markdown file found in the selected public repository or folder.
+- The GitHub importer shows every Markdown file found in the selected public or authorized private repository or folder.
 - Stored Share Snapshot content is limited to 8,000,000 characters. Managed media remains separate and travels as short HTTPS links.
 - The current Share Snapshot UI does not expose its API deletion token, so UI-created stored snapshots normally remain until their 90-day expiry.
 - STL source is limited to 2 MiB and parsed geometry to 300,000 vertices.
diff --git a/wiki/Home.md b/wiki/Home.md
index 5c03b5ce..262d24d6 100644
--- a/wiki/Home.md
+++ b/wiki/Home.md
@@ -54,7 +54,7 @@ See [Installation](Installation.md) before deploying. The stock Docker image has
 | Editing | Editor, Split view, Preview, formatting toolbar, custom undo/redo, Find and Replace, LTR/RTL, large-Document rendering paths |
 | Markdown | CommonMark-style parsing, GFM, tables, tasks, alerts, footnotes, definitions, highlighting, sanitized HTML, and math |
 | Visual content | Mermaid, PlantUML, Graphviz/DOT, D2, Vega-Lite, WaveDrom, Markmap, GeoJSON, TopoJSON, STL, and ABC |
-| Import/export | Local and public GitHub import; Markdown, HTML, Browser Print, legacy raster PDF, and PNG export |
+| Import/export | Local and GitHub branch/tag/commit import, with optional encrypted private-repository access; Markdown, HTML, Browser Print, legacy raster PDF, and PNG export |
 | Sharing | URL-hash or KV-backed Share Snapshot; WebSocket Live Share with host/edit/view capabilities |
 | Delivery | Static web, PWA, Docker, Cloudflare, and seven Neutralino desktop targets |
 
diff --git a/wiki/Privacy-and-Security.md b/wiki/Privacy-and-Security.md
index a39377d5..3ab9f0fe 100644
--- a/wiki/Privacy-and-Security.md
+++ b/wiki/Privacy-and-Security.md
@@ -60,7 +60,7 @@ In the desktop application, replacing or deleting the binary does not remove `Do
 | Feature | Data sent | Destination and retention | Access model |
 | :--- | :--- | :--- | :--- |
 | Web/PWA library loading | Library requests, IP and normal HTTP metadata | cdnjs, jsDelivr, or esm.sh; browser/Service Worker cache | Governed by the remote host |
-| GitHub import | Repository/path request and selected public content downloads | GitHub API and `raw.githubusercontent.com` | Public repositories only; no token flow |
+| GitHub import | Repository/path/ref request and selected content downloads; an optional PAT for private repositories | Public content: GitHub API and `raw.githubusercontent.com`; private content and PAT: `api.github.com` only | Public access is anonymous. Private access is session-only by default or passphrase-encrypted with local expiry and manual removal |
 | Emoji lookup | Emoji API request | GitHub API; response kept in memory/cache | Remote host |
 | Remote diagrams | Diagram source or encoded source | PlantUML, Kroki, or mermaid.ink; response can be browser-cached | Remote renderer receives the source |
 | GeoJSON/TopoJSON maps | Tile and external-asset requests | Configured map-tile or asset host | Remote host |
diff --git a/wiki/Troubleshooting.md b/wiki/Troubleshooting.md
index 317c0df5..a2fd4335 100644
--- a/wiki/Troubleshooting.md
+++ b/wiki/Troubleshooting.md
@@ -78,7 +78,9 @@ Extension matching is case-insensitive. Rename a plain-text file to `.md` only w
 ## GitHub Import Fails or Shows Too Few Files
 
 - Use a public `github.com` repository, tree, blob, or `raw.githubusercontent.com` Markdown URL.
-- Private repositories are unsupported because Markdown Viewer does not request a token.
+- For a private repository, add a fine-grained PAT restricted to that repository with **Contents: Read-only**. If an organization requires approval or SAML authorization, complete that step in GitHub.
+- Branch, tag, and commit URLs are supported. For branch names containing `/`, paste the complete GitHub tree or blob URL so the importer can resolve the longest matching ref.
+- If remembered private access will not unlock, check the protection passphrase. Expired access is deleted locally; create or add a token again if needed.
 - Repository and folder results show every Markdown file found.
 - Check GitHub API rate-limit and network responses.
 - Confirm that CSP allows `api.github.com` and `raw.githubusercontent.com`.
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index 732704c2..84297ec2 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -116,12 +116,16 @@ Use Import > From GitHub and paste one of these URL types:
 
 - `https://github.com/owner/repo`
 - `https://github.com/owner/repo/tree/main/docs`
+- `https://github.com/owner/repo/tree/release/2026/docs`
+- `https://github.com/owner/repo/tree/758cbeda07ac15093520c803c11140ae9b1f4a2c`
 - `https://github.com/owner/repo/blob/main/README.md`
 - `https://raw.githubusercontent.com/owner/repo/main/README.md`
 
-Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs query GitHub's public API and show a searchable, collapsible tree containing every Markdown file found. The toolbar shows selected and total file counts and provides an icon that switches between select all and deselect all. Selected files are placed in a repository-named Explorer folder with their nested GitHub directory paths preserved, and remain closed until you select one in Explorer.
+Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs resolve the default branch, an explicit branch (including names containing `/`), a tag, or a commit to an immutable commit SHA before listing files. The searchable, collapsible tree contains every Markdown file found, shows the repository, ref, and short commit, and uses the same compact type scale as other application modals. The toolbar shows selected and total file counts and provides an icon that switches between select all and deselect all. Default-branch imports use a repository-named Explorer folder; other refs include the short commit beside the repository name. Nested GitHub directory paths are preserved, and imported files remain closed until you select one in Explorer.
 
-GitHub import sends the repository/path request to GitHub and only works for public content. The app does not ask for GitHub credentials.
+Public repositories need no credentials. For a private repository, expand **Private repository access** and use a fine-grained PAT limited to the selected repository with **Contents: Read-only**. The importer first tries public access and sends the token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
+
+**This session only** is the recommended default and never writes the PAT to application storage. The optional 1-, 7-, or 30-day choices require a separate 12-character protection passphrase and store only PBKDF2-derived, AES-GCM authenticated ciphertext. The passphrase is never stored. Expired access becomes unusable and is removed while the app is running or the next time it starts; **Remove access** deletes it immediately. Local removal does not revoke the PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
 
 ## Export Markdown to PDF, HTML, PNG, and MD
 
diff --git a/workspace-storage.js b/workspace-storage.js
index b7d9b185..20cde308 100644
--- a/workspace-storage.js
+++ b/workspace-storage.js
@@ -817,6 +817,31 @@
       await transactionToPromise(transaction);
     }
 
+    async deleteMetadata(key) {
+      if (this.desktop) {
+        if (key === 'vaultSettings') {
+          this.desktopSettings = {};
+          const settingsPath = await this._pathJoin(this.vaultPath, INTERNAL_DIR, 'settings.json');
+          if (await this._pathExists(settingsPath)) await Neutralino.filesystem.remove(settingsPath);
+          return;
+        }
+        if (key === 'secretManifest') {
+          const manifestPath = await this._pathJoin(this.vaultPath, INTERNAL_DIR, 'secret-manifest.json');
+          if (await this._pathExists(manifestPath)) await Neutralino.filesystem.remove(manifestPath);
+          return;
+        }
+        if (Neutralino.storage.removeData) {
+          try {
+            await Neutralino.storage.removeData('markdownViewerMeta_' + key);
+          } catch (_) {}
+        }
+        return;
+      }
+      const transaction = this.db.transaction('metadata', 'readwrite');
+      transaction.objectStore('metadata').delete(key);
+      await transactionToPromise(transaction);
+    }
+
     async getSecretManifest() {
       const stored = await this.getMetadata('secretManifest');
       if (stored) return stored;

From 4a8bc337db4a2996d97cfa7453534cea0b6f52b4 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 20:35:08 +0530
Subject: [PATCH 06/10] feat(github): offer fine-grained and classic PATs

---
 CHANGELOG.md                       |   4 +-
 README.md                          |   4 +-
 desktop-app/resources/index.html   |  33 +++++++-
 desktop-app/resources/js/script.js | 100 ++++++++++++++++++++++-
 desktop-app/resources/styles.css   | 123 ++++++++++++++++++++++++++++-
 index.html                         |  33 +++++++-
 script.js                          | 100 ++++++++++++++++++++++-
 styles.css                         | 123 ++++++++++++++++++++++++++++-
 wiki/FAQ.md                        |   2 +-
 wiki/Features.md                   |   4 +-
 wiki/Troubleshooting.md            |   2 +-
 wiki/Usage-Guide.md                |   2 +-
 12 files changed, 504 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e246ac85..3754347a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,7 +39,9 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 - Removed the 30-file display cap so repository and folder results expose every Markdown file found.
 - Added complete subtree traversal when GitHub marks a recursive repository tree response as truncated.
 - Added branch, tag, and commit URL resolution, including branch names containing `/`, and pinned each import to the resolved immutable commit SHA.
-- Added optional private repository access with fine-grained read-only PATs, session-only storage by default, passphrase-protected AES-GCM retention for 1, 7, or 30 days, automatic expiry, and manual removal.
+- Added optional private repository access with fine-grained PATs marked as recommended and classic PATs offered as a broad-access compatibility fallback.
+- Kept private access session-only by default, with passphrase-protected AES-GCM retention for 1, 7, or 30 days, automatic expiry, and manual removal.
+- Made the compact GitHub URL dialog body visibly scrollable so every private-access control remains reachable on short screens.
 - Restored the compact 520px GitHub URL step while keeping the searchable file picker at 760px, and added repository, ref, and short-commit context to the selection step.
 - Added file search, selected/total counts, an icon-based select-all toggle, and collapsible GitHub-style folder and file rows using the application typography scale.
 - Changed local, drag-and-drop, desktop, and GitHub Markdown imports to save documents in Explorer without opening every imported file as a tab.
diff --git a/README.md b/README.md
index deacff06..004bedd4 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ Markdown Viewer is local-first, not network-free. The following table shows the
 | :--- | :--- |
 | Editing, local imports, Preview, Workspace autosave, and most exports | On the device |
 | Web libraries and uncached renderer dependencies | CDN requests in the web/PWA build |
-| GitHub import and emoji lookup | Public content uses GitHub APIs and raw-content hosts; private content uses an optional fine-grained PAT only with `api.github.com` |
+| GitHub import and emoji lookup | Public content uses GitHub APIs and raw-content hosts; private content uses an optional PAT only with `api.github.com` |
 | PlantUML, D2, Graphviz, Vega-Lite, WaveDrom, and some diagram previews | Diagram source can be sent to PlantUML, Kroki, or mermaid.ink |
 | Consented image, GIF, and video insertion | Public, content-addressed Cloudflare media storage for 90 days |
 | Large Share Snapshot | Cloudflare KV for 90 days |
@@ -157,7 +157,7 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
 - The searchable GitHub importer shows every Markdown file found in a repository or folder result and resolves branch, tag, and commit URLs to an immutable commit SHA.
-- Private repository access is session-only by default. Optional remembered access is passphrase-encrypted with AES-GCM, expires after 1, 7, or 30 days, and can be removed at any time.
+- Private repository access supports fine-grained PATs (recommended) and classic PATs as a broad-access compatibility fallback. Access is session-only by default; optional remembered access is passphrase-encrypted with AES-GCM, expires after 1, 7, or 30 days, and can be removed at any time.
 - Imported Markdown files are saved to Explorer and remain closed until you choose one, preventing large imports from flooding the tab bar.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index fd63478a..1cd7e6e3 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1298,7 +1298,7 @@ <h2 class="about-title">Markdown Viewer</h2>
                   <i class="lucide lucide-chevron-down github-import-access-chevron" aria-hidden="true"></i>
                 </button>
                 <div id="github-import-access-panel" class="github-import-access-panel" hidden>
-                  <p class="github-import-access-intro">Use a fine-grained personal access token limited to the selected repository with <strong>Contents: Read-only</strong>.</p>
+                  <p id="github-import-access-intro" class="github-import-access-intro">Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.</p>
                   <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
                     <div class="github-import-access-saved">
                       <i class="lucide lucide-lock-keyhole" aria-hidden="true"></i>
@@ -1311,7 +1311,31 @@ <h2 class="about-title">Markdown Viewer</h2>
                     </div>
                   </div>
                   <div id="github-import-access-form" class="github-import-access-form">
-                    <label class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
+                    <fieldset class="github-import-token-types">
+                      <legend class="reset-modal-label">Token type</legend>
+                      <div class="github-import-token-type-grid">
+                        <label class="github-import-token-type">
+                          <input type="radio" name="github-import-pat-type" value="fine-grained" checked />
+                          <span class="github-import-token-type-copy">
+                            <span class="github-import-token-type-heading">
+                              <strong>Fine-grained PAT</strong>
+                              <span class="github-import-recommended-badge">Recommended</span>
+                            </span>
+                            <span>Selected repositories or all repositories for one owner.</span>
+                          </span>
+                        </label>
+                        <label class="github-import-token-type">
+                          <input type="radio" name="github-import-pat-type" value="classic" />
+                          <span class="github-import-token-type-copy">
+                            <span class="github-import-token-type-heading">
+                              <strong>Personal access token (classic)</strong>
+                            </span>
+                            <span>Compatibility option with broader repository access.</span>
+                          </span>
+                        </label>
+                      </div>
+                    </fieldset>
+                    <label id="github-import-pat-label" class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
                     <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" aria-describedby="github-import-pat-help" />
                     <label class="reset-modal-label" for="github-import-pat-retention">Keep access</label>
                     <select id="github-import-pat-retention" class="rename-modal-input">
@@ -1334,8 +1358,9 @@ <h2 class="about-title">Markdown Viewer</h2>
                     </div>
                   </div>
                   <p id="github-import-pat-help" class="github-import-access-help">
-                    The token is sent only to <code>api.github.com</code>. Local expiry makes the saved copy unusable, removes it while the app is running or on the next launch, and does not revoke the token on GitHub.
-                    <a href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
+                    <span id="github-import-pat-scope-note">Use selected repositories or all repositories for one owner.</span>
+                    The token is sent only to <code>api.github.com</code>. Local expiry removes the saved copy but does not revoke the token on GitHub.
+                    <a id="github-import-pat-create-link" href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
                   </p>
                   <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
                 </div>
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index 1ceb038a..865e9a88 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -545,12 +545,17 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportAccessSavedText = document.getElementById("github-import-access-saved-text");
   const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
   const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
+  const githubImportPatTypeInputs = Array.from(document.querySelectorAll('input[name="github-import-pat-type"]'));
+  const githubImportAccessIntro = document.getElementById("github-import-access-intro");
+  const githubImportPatLabel = document.getElementById("github-import-pat-label");
   const githubImportPatInput = document.getElementById("github-import-pat");
   const githubImportPatRetention = document.getElementById("github-import-pat-retention");
   const githubImportPatProtection = document.getElementById("github-import-pat-protection");
   const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
+  const githubImportPatScopeNote = document.getElementById("github-import-pat-scope-note");
+  const githubImportPatCreateLink = document.getElementById("github-import-pat-create-link");
   const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
@@ -11308,6 +11313,7 @@ ${selector} .arrowheadPath {
   let githubImportSearchTimer = null;
   let githubAccessToken = "";
   let githubAccessTokenExpiresAt = 0;
+  let githubAccessTokenType = "fine-grained";
   let githubPatStoredRecord = null;
   let githubPatExpiryTimer = null;
 
@@ -11469,6 +11475,56 @@ ${selector} .arrowheadPath {
     return githubAccessToken;
   }
 
+  function normalizeGitHubPatType(value) {
+    return value === "classic" ? "classic" : "fine-grained";
+  }
+
+  function getSelectedGitHubPatType() {
+    const selected = githubImportPatTypeInputs.find(function(input) {
+      return input.checked;
+    });
+    return normalizeGitHubPatType(selected && selected.value);
+  }
+
+  function renderGitHubPatType() {
+    const tokenType = getSelectedGitHubPatType();
+    const isClassic = tokenType === "classic";
+    if (githubImportAccess) {
+      githubImportAccess.dataset.tokenType = tokenType;
+    }
+    if (githubImportAccessIntro) {
+      githubImportAccessIntro.innerHTML = isClassic
+        ? "Classic tokens can work across repository owners, but the <strong>repo</strong> scope grants broad access. Use only when fine-grained access is not suitable."
+        : "Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.";
+    }
+    if (githubImportPatLabel) {
+      githubImportPatLabel.textContent = isClassic
+        ? "Personal access token (classic)"
+        : "Fine-grained PAT";
+    }
+    if (githubImportPatScopeNote) {
+      githubImportPatScopeNote.textContent = isClassic
+        ? "The classic repo scope can access every repository your account can reach."
+        : "Use selected repositories or all repositories for one owner.";
+    }
+    if (githubImportPatCreateLink) {
+      githubImportPatCreateLink.href = isClassic
+        ? "https://github.com/settings/tokens/new"
+        : "https://github.com/settings/personal-access-tokens/new";
+      githubImportPatCreateLink.textContent = isClassic
+        ? "Create a classic token"
+        : "Create a fine-grained token";
+    }
+  }
+
+  function setSelectedGitHubPatType(value) {
+    const tokenType = normalizeGitHubPatType(value);
+    githubImportPatTypeInputs.forEach(function(input) {
+      input.checked = input.value === tokenType;
+    });
+    renderGitHubPatType();
+  }
+
   function getGitHubApiHeaders(accept, authenticated) {
     const headers = {
       Accept: accept || "application/vnd.github+json",
@@ -11771,14 +11827,23 @@ ${selector} .arrowheadPath {
     clearExpiredGitHubAccessToken();
     const hasActiveToken = Boolean(getGitHubAccessToken());
     const hasStoredRecord = Boolean(githubPatStoredRecord);
+    const tokenType = hasActiveToken
+      ? githubAccessTokenType
+      : hasStoredRecord
+        ? normalizeGitHubPatType(githubPatStoredRecord.tokenType)
+        : getSelectedGitHubPatType();
+    const tokenTypeLabel = tokenType === "classic" ? "classic" : "fine-grained";
+    if ((hasActiveToken || hasStoredRecord) && getSelectedGitHubPatType() !== tokenType) {
+      setSelectedGitHubPatType(tokenType);
+    }
     if (githubImportAccess) {
       githubImportAccess.dataset.state = hasActiveToken ? "active" : hasStoredRecord ? "locked" : "empty";
     }
     if (githubImportAccessSummary) {
       githubImportAccessSummary.textContent = hasActiveToken
-        ? `Access ready · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
+        ? `Access ready · ${tokenTypeLabel} · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
         : hasStoredRecord
-          ? `Encrypted token saved · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
+          ? `Encrypted token saved · ${tokenTypeLabel} · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
           : "No token stored · public repositories only";
     }
     if (githubImportAccessUnlock) {
@@ -11808,6 +11873,7 @@ ${selector} .arrowheadPath {
         setGitHubAccessStatus("Expired private repository access was removed from this device.", "success");
       } else if (record) {
         githubPatStoredRecord = record;
+        githubAccessTokenType = normalizeGitHubPatType(record.tokenType);
         scheduleGitHubAccessExpiry(record.expiresAt);
       }
     } catch (_) {
@@ -11821,6 +11887,7 @@ ${selector} .arrowheadPath {
     githubPatExpiryTimer = null;
     githubAccessToken = "";
     githubAccessTokenExpiresAt = 0;
+    githubAccessTokenType = "fine-grained";
     githubPatStoredRecord = null;
     if (githubImportPatInput) githubImportPatInput.value = "";
     if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
@@ -11833,6 +11900,7 @@ ${selector} .arrowheadPath {
         await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, null);
       }
     }
+    setSelectedGitHubPatType("fine-grained");
     renderGitHubAccessState();
     if (!options.silent) {
       setGitHubAccessStatus("Private repository access was removed from this device.", "success");
@@ -11850,6 +11918,7 @@ ${selector} .arrowheadPath {
     if (!githubImportPatInput || !githubImportPatRetention) return;
     const token = githubImportPatInput.value;
     validateGitHubPat(token);
+    const tokenType = getSelectedGitHubPatType();
     const retention = githubImportPatRetention.value;
     let expiresAt = 0;
     let record = null;
@@ -11868,6 +11937,7 @@ ${selector} .arrowheadPath {
       }
       expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
       record = await encryptGitHubAccessToken(token, passphrase, expiresAt);
+      record.tokenType = tokenType;
       await workspaceStorage.init();
       await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, record);
     } else if (workspaceStorage) {
@@ -11879,6 +11949,7 @@ ${selector} .arrowheadPath {
 
     githubAccessToken = token;
     githubAccessTokenExpiresAt = expiresAt;
+    githubAccessTokenType = tokenType;
     githubPatStoredRecord = record;
     scheduleGitHubAccessExpiry(expiresAt);
     githubImportPatInput.value = "";
@@ -11900,6 +11971,7 @@ ${selector} .arrowheadPath {
     try {
       githubAccessToken = await decryptGitHubAccessToken(githubPatStoredRecord, passphrase);
       githubAccessTokenExpiresAt = Number(githubPatStoredRecord.expiresAt);
+      githubAccessTokenType = normalizeGitHubPatType(githubPatStoredRecord.tokenType);
       scheduleGitHubAccessExpiry(githubAccessTokenExpiresAt);
     } catch (error) {
       if (Number(githubPatStoredRecord.expiresAt) <= Date.now()) {
@@ -12236,6 +12308,13 @@ ${selector} .arrowheadPath {
     if (githubImportAccessToggle) githubImportAccessToggle.setAttribute("aria-expanded", "false");
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
     if (githubImportPatInput) githubImportPatInput.value = "";
+    setSelectedGitHubPatType(
+      getGitHubAccessToken()
+        ? githubAccessTokenType
+        : githubPatStoredRecord
+          ? githubPatStoredRecord.tokenType
+          : "fine-grained"
+    );
     if (githubImportPatRetention) githubImportPatRetention.value = "session";
     if (githubImportPatProtection) githubImportPatProtection.hidden = true;
     if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
@@ -12306,6 +12385,7 @@ ${selector} .arrowheadPath {
         githubImportAccessToggle,
         githubImportPatUnlockPassphrase,
         githubImportPatUnlockBtn,
+        ...githubImportPatTypeInputs,
         githubImportPatInput,
         githubImportPatRetention,
         githubImportPatPassphrase,
@@ -18664,11 +18744,23 @@ ${selector} .arrowheadPath {
       if (!expanded) {
         const target = githubPatStoredRecord && !getGitHubAccessToken()
           ? githubImportPatUnlockPassphrase
-          : githubImportPatInput;
-        if (target) requestAnimationFrame(() => target.focus({ preventScroll: true }));
+          : githubImportPatTypeInputs.find(function(input) { return input.checked; }) || githubImportPatInput;
+        if (target) {
+          requestAnimationFrame(function() {
+            target.focus();
+            target.scrollIntoView({ block: "nearest" });
+          });
+        }
       }
     });
   }
+  githubImportPatTypeInputs.forEach(function(input) {
+    input.addEventListener("change", function() {
+      if (!input.checked) return;
+      renderGitHubPatType();
+      setGitHubAccessStatus("");
+    });
+  });
   if (githubImportPatRetention) {
     githubImportPatRetention.addEventListener("change", function() {
       const needsPassphrase = githubImportPatRetention.value !== "session";
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 39942c6a..9ef7e32d 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -5945,6 +5945,7 @@ a:focus {
 #github-import-modal .reset-modal-box {
   width: min(92vw, 520px);
   max-width: 520px;
+  max-height: calc(100dvh - 40px);
   min-width: 0;
   padding: 0;
   gap: 0;
@@ -5969,12 +5970,33 @@ a:focus {
 
 .github-import-modal-body {
   display: flex;
+  flex: 1 1 auto;
   flex-direction: column;
   gap: 10px;
-  max-height: min(68vh, 620px);
+  min-height: 0;
+  max-height: none;
   overflow-x: hidden;
   overflow-y: auto;
   padding: 16px;
+  overscroll-behavior: contain;
+  scrollbar-color: color-mix(in srgb, var(--text-secondary) 45%, transparent) transparent;
+  scrollbar-gutter: stable;
+  scrollbar-width: thin;
+}
+
+.github-import-modal-body::-webkit-scrollbar {
+  width: 8px;
+}
+
+.github-import-modal-body::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.github-import-modal-body::-webkit-scrollbar-thumb {
+  border: 2px solid transparent;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--text-secondary) 45%, transparent);
+  background-clip: padding-box;
 }
 
 #github-import-modal.is-selection-step .github-import-modal-body {
@@ -6004,6 +6026,7 @@ a:focus {
 }
 
 .github-import-access {
+  flex: 0 0 auto;
   overflow: hidden;
   border: 1px solid var(--border-color);
   border-radius: 9px;
@@ -6115,6 +6138,98 @@ a:focus {
   color: var(--text-color);
 }
 
+.github-import-token-types {
+  min-width: 0;
+  margin: 0;
+  padding: 0;
+  border: 0;
+}
+
+.github-import-token-types > .reset-modal-label {
+  display: block;
+  margin-bottom: 6px;
+  padding: 0;
+}
+
+.github-import-token-type-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 8px;
+}
+
+.github-import-token-type {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  min-width: 0;
+  min-height: 68px;
+  padding: 9px;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  background: var(--bg-color);
+  color: var(--text-color);
+  cursor: pointer;
+}
+
+.github-import-token-type:hover {
+  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
+  background: var(--button-hover);
+}
+
+.github-import-token-type:has(input:checked) {
+  border-color: var(--accent-color);
+  background: color-mix(in srgb, var(--accent-color) 8%, var(--bg-color));
+}
+
+.github-import-token-type:has(input:focus-visible) {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-token-type > input {
+  width: 16px;
+  height: 16px;
+  margin: 2px 0 0;
+  flex: 0 0 auto;
+  accent-color: var(--accent-color);
+}
+
+.github-import-token-type-copy {
+  display: grid;
+  gap: 3px;
+  min-width: 0;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.35;
+}
+
+.github-import-token-type-heading {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 5px;
+  color: var(--text-color);
+  font-size: var(--ui-font-md);
+  line-height: 1.3;
+}
+
+.github-import-recommended-badge {
+  padding: 1px 6px;
+  border: 1px solid color-mix(in srgb, #1a7f37 32%, var(--border-color));
+  border-radius: 999px;
+  background: color-mix(in srgb, #1a7f37 10%, var(--bg-color));
+  color: #1a7f37;
+  font-size: var(--ui-font-xs);
+  font-weight: 700;
+  line-height: 1.4;
+}
+
+[data-theme="dark"] .github-import-recommended-badge {
+  border-color: color-mix(in srgb, #3fb950 42%, var(--border-color));
+  background: color-mix(in srgb, #3fb950 12%, var(--bg-color));
+  color: #56d364;
+}
+
 .github-import-access-form,
 .github-import-access-unlock,
 .github-import-pat-protection {
@@ -6710,6 +6825,12 @@ a:focus {
   }
 }
 
+@media (max-width: 430px) {
+  .github-import-token-type-grid {
+    grid-template-columns: minmax(0, 1fr);
+  }
+}
+
 @media (prefers-reduced-motion: reduce) {
   .github-import-select-all-btn,
   .github-import-access-chevron {
diff --git a/index.html b/index.html
index 0fc5b6b2..44b22d59 100644
--- a/index.html
+++ b/index.html
@@ -1391,7 +1391,7 @@ <h2 class="about-title">Markdown Viewer</h2>
                   <i class="lucide lucide-chevron-down github-import-access-chevron" aria-hidden="true"></i>
                 </button>
                 <div id="github-import-access-panel" class="github-import-access-panel" hidden>
-                  <p class="github-import-access-intro">Use a fine-grained personal access token limited to the selected repository with <strong>Contents: Read-only</strong>.</p>
+                  <p id="github-import-access-intro" class="github-import-access-intro">Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.</p>
                   <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
                     <div class="github-import-access-saved">
                       <i class="lucide lucide-lock-keyhole" aria-hidden="true"></i>
@@ -1404,7 +1404,31 @@ <h2 class="about-title">Markdown Viewer</h2>
                     </div>
                   </div>
                   <div id="github-import-access-form" class="github-import-access-form">
-                    <label class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
+                    <fieldset class="github-import-token-types">
+                      <legend class="reset-modal-label">Token type</legend>
+                      <div class="github-import-token-type-grid">
+                        <label class="github-import-token-type">
+                          <input type="radio" name="github-import-pat-type" value="fine-grained" checked />
+                          <span class="github-import-token-type-copy">
+                            <span class="github-import-token-type-heading">
+                              <strong>Fine-grained PAT</strong>
+                              <span class="github-import-recommended-badge">Recommended</span>
+                            </span>
+                            <span>Selected repositories or all repositories for one owner.</span>
+                          </span>
+                        </label>
+                        <label class="github-import-token-type">
+                          <input type="radio" name="github-import-pat-type" value="classic" />
+                          <span class="github-import-token-type-copy">
+                            <span class="github-import-token-type-heading">
+                              <strong>Personal access token (classic)</strong>
+                            </span>
+                            <span>Compatibility option with broader repository access.</span>
+                          </span>
+                        </label>
+                      </div>
+                    </fieldset>
+                    <label id="github-import-pat-label" class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
                     <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" aria-describedby="github-import-pat-help" />
                     <label class="reset-modal-label" for="github-import-pat-retention">Keep access</label>
                     <select id="github-import-pat-retention" class="rename-modal-input">
@@ -1427,8 +1451,9 @@ <h2 class="about-title">Markdown Viewer</h2>
                     </div>
                   </div>
                   <p id="github-import-pat-help" class="github-import-access-help">
-                    The token is sent only to <code>api.github.com</code>. Local expiry makes the saved copy unusable, removes it while the app is running or on the next launch, and does not revoke the token on GitHub.
-                    <a href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
+                    <span id="github-import-pat-scope-note">Use selected repositories or all repositories for one owner.</span>
+                    The token is sent only to <code>api.github.com</code>. Local expiry removes the saved copy but does not revoke the token on GitHub.
+                    <a id="github-import-pat-create-link" href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
                   </p>
                   <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
                 </div>
diff --git a/script.js b/script.js
index 1ceb038a..865e9a88 100644
--- a/script.js
+++ b/script.js
@@ -545,12 +545,17 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportAccessSavedText = document.getElementById("github-import-access-saved-text");
   const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
   const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
+  const githubImportPatTypeInputs = Array.from(document.querySelectorAll('input[name="github-import-pat-type"]'));
+  const githubImportAccessIntro = document.getElementById("github-import-access-intro");
+  const githubImportPatLabel = document.getElementById("github-import-pat-label");
   const githubImportPatInput = document.getElementById("github-import-pat");
   const githubImportPatRetention = document.getElementById("github-import-pat-retention");
   const githubImportPatProtection = document.getElementById("github-import-pat-protection");
   const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
+  const githubImportPatScopeNote = document.getElementById("github-import-pat-scope-note");
+  const githubImportPatCreateLink = document.getElementById("github-import-pat-create-link");
   const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
@@ -11308,6 +11313,7 @@ ${selector} .arrowheadPath {
   let githubImportSearchTimer = null;
   let githubAccessToken = "";
   let githubAccessTokenExpiresAt = 0;
+  let githubAccessTokenType = "fine-grained";
   let githubPatStoredRecord = null;
   let githubPatExpiryTimer = null;
 
@@ -11469,6 +11475,56 @@ ${selector} .arrowheadPath {
     return githubAccessToken;
   }
 
+  function normalizeGitHubPatType(value) {
+    return value === "classic" ? "classic" : "fine-grained";
+  }
+
+  function getSelectedGitHubPatType() {
+    const selected = githubImportPatTypeInputs.find(function(input) {
+      return input.checked;
+    });
+    return normalizeGitHubPatType(selected && selected.value);
+  }
+
+  function renderGitHubPatType() {
+    const tokenType = getSelectedGitHubPatType();
+    const isClassic = tokenType === "classic";
+    if (githubImportAccess) {
+      githubImportAccess.dataset.tokenType = tokenType;
+    }
+    if (githubImportAccessIntro) {
+      githubImportAccessIntro.innerHTML = isClassic
+        ? "Classic tokens can work across repository owners, but the <strong>repo</strong> scope grants broad access. Use only when fine-grained access is not suitable."
+        : "Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.";
+    }
+    if (githubImportPatLabel) {
+      githubImportPatLabel.textContent = isClassic
+        ? "Personal access token (classic)"
+        : "Fine-grained PAT";
+    }
+    if (githubImportPatScopeNote) {
+      githubImportPatScopeNote.textContent = isClassic
+        ? "The classic repo scope can access every repository your account can reach."
+        : "Use selected repositories or all repositories for one owner.";
+    }
+    if (githubImportPatCreateLink) {
+      githubImportPatCreateLink.href = isClassic
+        ? "https://github.com/settings/tokens/new"
+        : "https://github.com/settings/personal-access-tokens/new";
+      githubImportPatCreateLink.textContent = isClassic
+        ? "Create a classic token"
+        : "Create a fine-grained token";
+    }
+  }
+
+  function setSelectedGitHubPatType(value) {
+    const tokenType = normalizeGitHubPatType(value);
+    githubImportPatTypeInputs.forEach(function(input) {
+      input.checked = input.value === tokenType;
+    });
+    renderGitHubPatType();
+  }
+
   function getGitHubApiHeaders(accept, authenticated) {
     const headers = {
       Accept: accept || "application/vnd.github+json",
@@ -11771,14 +11827,23 @@ ${selector} .arrowheadPath {
     clearExpiredGitHubAccessToken();
     const hasActiveToken = Boolean(getGitHubAccessToken());
     const hasStoredRecord = Boolean(githubPatStoredRecord);
+    const tokenType = hasActiveToken
+      ? githubAccessTokenType
+      : hasStoredRecord
+        ? normalizeGitHubPatType(githubPatStoredRecord.tokenType)
+        : getSelectedGitHubPatType();
+    const tokenTypeLabel = tokenType === "classic" ? "classic" : "fine-grained";
+    if ((hasActiveToken || hasStoredRecord) && getSelectedGitHubPatType() !== tokenType) {
+      setSelectedGitHubPatType(tokenType);
+    }
     if (githubImportAccess) {
       githubImportAccess.dataset.state = hasActiveToken ? "active" : hasStoredRecord ? "locked" : "empty";
     }
     if (githubImportAccessSummary) {
       githubImportAccessSummary.textContent = hasActiveToken
-        ? `Access ready · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
+        ? `Access ready · ${tokenTypeLabel} · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
         : hasStoredRecord
-          ? `Encrypted token saved · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
+          ? `Encrypted token saved · ${tokenTypeLabel} · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
           : "No token stored · public repositories only";
     }
     if (githubImportAccessUnlock) {
@@ -11808,6 +11873,7 @@ ${selector} .arrowheadPath {
         setGitHubAccessStatus("Expired private repository access was removed from this device.", "success");
       } else if (record) {
         githubPatStoredRecord = record;
+        githubAccessTokenType = normalizeGitHubPatType(record.tokenType);
         scheduleGitHubAccessExpiry(record.expiresAt);
       }
     } catch (_) {
@@ -11821,6 +11887,7 @@ ${selector} .arrowheadPath {
     githubPatExpiryTimer = null;
     githubAccessToken = "";
     githubAccessTokenExpiresAt = 0;
+    githubAccessTokenType = "fine-grained";
     githubPatStoredRecord = null;
     if (githubImportPatInput) githubImportPatInput.value = "";
     if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
@@ -11833,6 +11900,7 @@ ${selector} .arrowheadPath {
         await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, null);
       }
     }
+    setSelectedGitHubPatType("fine-grained");
     renderGitHubAccessState();
     if (!options.silent) {
       setGitHubAccessStatus("Private repository access was removed from this device.", "success");
@@ -11850,6 +11918,7 @@ ${selector} .arrowheadPath {
     if (!githubImportPatInput || !githubImportPatRetention) return;
     const token = githubImportPatInput.value;
     validateGitHubPat(token);
+    const tokenType = getSelectedGitHubPatType();
     const retention = githubImportPatRetention.value;
     let expiresAt = 0;
     let record = null;
@@ -11868,6 +11937,7 @@ ${selector} .arrowheadPath {
       }
       expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
       record = await encryptGitHubAccessToken(token, passphrase, expiresAt);
+      record.tokenType = tokenType;
       await workspaceStorage.init();
       await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, record);
     } else if (workspaceStorage) {
@@ -11879,6 +11949,7 @@ ${selector} .arrowheadPath {
 
     githubAccessToken = token;
     githubAccessTokenExpiresAt = expiresAt;
+    githubAccessTokenType = tokenType;
     githubPatStoredRecord = record;
     scheduleGitHubAccessExpiry(expiresAt);
     githubImportPatInput.value = "";
@@ -11900,6 +11971,7 @@ ${selector} .arrowheadPath {
     try {
       githubAccessToken = await decryptGitHubAccessToken(githubPatStoredRecord, passphrase);
       githubAccessTokenExpiresAt = Number(githubPatStoredRecord.expiresAt);
+      githubAccessTokenType = normalizeGitHubPatType(githubPatStoredRecord.tokenType);
       scheduleGitHubAccessExpiry(githubAccessTokenExpiresAt);
     } catch (error) {
       if (Number(githubPatStoredRecord.expiresAt) <= Date.now()) {
@@ -12236,6 +12308,13 @@ ${selector} .arrowheadPath {
     if (githubImportAccessToggle) githubImportAccessToggle.setAttribute("aria-expanded", "false");
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
     if (githubImportPatInput) githubImportPatInput.value = "";
+    setSelectedGitHubPatType(
+      getGitHubAccessToken()
+        ? githubAccessTokenType
+        : githubPatStoredRecord
+          ? githubPatStoredRecord.tokenType
+          : "fine-grained"
+    );
     if (githubImportPatRetention) githubImportPatRetention.value = "session";
     if (githubImportPatProtection) githubImportPatProtection.hidden = true;
     if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
@@ -12306,6 +12385,7 @@ ${selector} .arrowheadPath {
         githubImportAccessToggle,
         githubImportPatUnlockPassphrase,
         githubImportPatUnlockBtn,
+        ...githubImportPatTypeInputs,
         githubImportPatInput,
         githubImportPatRetention,
         githubImportPatPassphrase,
@@ -18664,11 +18744,23 @@ ${selector} .arrowheadPath {
       if (!expanded) {
         const target = githubPatStoredRecord && !getGitHubAccessToken()
           ? githubImportPatUnlockPassphrase
-          : githubImportPatInput;
-        if (target) requestAnimationFrame(() => target.focus({ preventScroll: true }));
+          : githubImportPatTypeInputs.find(function(input) { return input.checked; }) || githubImportPatInput;
+        if (target) {
+          requestAnimationFrame(function() {
+            target.focus();
+            target.scrollIntoView({ block: "nearest" });
+          });
+        }
       }
     });
   }
+  githubImportPatTypeInputs.forEach(function(input) {
+    input.addEventListener("change", function() {
+      if (!input.checked) return;
+      renderGitHubPatType();
+      setGitHubAccessStatus("");
+    });
+  });
   if (githubImportPatRetention) {
     githubImportPatRetention.addEventListener("change", function() {
       const needsPassphrase = githubImportPatRetention.value !== "session";
diff --git a/styles.css b/styles.css
index 39942c6a..9ef7e32d 100644
--- a/styles.css
+++ b/styles.css
@@ -5945,6 +5945,7 @@ a:focus {
 #github-import-modal .reset-modal-box {
   width: min(92vw, 520px);
   max-width: 520px;
+  max-height: calc(100dvh - 40px);
   min-width: 0;
   padding: 0;
   gap: 0;
@@ -5969,12 +5970,33 @@ a:focus {
 
 .github-import-modal-body {
   display: flex;
+  flex: 1 1 auto;
   flex-direction: column;
   gap: 10px;
-  max-height: min(68vh, 620px);
+  min-height: 0;
+  max-height: none;
   overflow-x: hidden;
   overflow-y: auto;
   padding: 16px;
+  overscroll-behavior: contain;
+  scrollbar-color: color-mix(in srgb, var(--text-secondary) 45%, transparent) transparent;
+  scrollbar-gutter: stable;
+  scrollbar-width: thin;
+}
+
+.github-import-modal-body::-webkit-scrollbar {
+  width: 8px;
+}
+
+.github-import-modal-body::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.github-import-modal-body::-webkit-scrollbar-thumb {
+  border: 2px solid transparent;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--text-secondary) 45%, transparent);
+  background-clip: padding-box;
 }
 
 #github-import-modal.is-selection-step .github-import-modal-body {
@@ -6004,6 +6026,7 @@ a:focus {
 }
 
 .github-import-access {
+  flex: 0 0 auto;
   overflow: hidden;
   border: 1px solid var(--border-color);
   border-radius: 9px;
@@ -6115,6 +6138,98 @@ a:focus {
   color: var(--text-color);
 }
 
+.github-import-token-types {
+  min-width: 0;
+  margin: 0;
+  padding: 0;
+  border: 0;
+}
+
+.github-import-token-types > .reset-modal-label {
+  display: block;
+  margin-bottom: 6px;
+  padding: 0;
+}
+
+.github-import-token-type-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 8px;
+}
+
+.github-import-token-type {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  min-width: 0;
+  min-height: 68px;
+  padding: 9px;
+  border: 1px solid var(--border-color);
+  border-radius: 8px;
+  background: var(--bg-color);
+  color: var(--text-color);
+  cursor: pointer;
+}
+
+.github-import-token-type:hover {
+  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
+  background: var(--button-hover);
+}
+
+.github-import-token-type:has(input:checked) {
+  border-color: var(--accent-color);
+  background: color-mix(in srgb, var(--accent-color) 8%, var(--bg-color));
+}
+
+.github-import-token-type:has(input:focus-visible) {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-token-type > input {
+  width: 16px;
+  height: 16px;
+  margin: 2px 0 0;
+  flex: 0 0 auto;
+  accent-color: var(--accent-color);
+}
+
+.github-import-token-type-copy {
+  display: grid;
+  gap: 3px;
+  min-width: 0;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  line-height: 1.35;
+}
+
+.github-import-token-type-heading {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 5px;
+  color: var(--text-color);
+  font-size: var(--ui-font-md);
+  line-height: 1.3;
+}
+
+.github-import-recommended-badge {
+  padding: 1px 6px;
+  border: 1px solid color-mix(in srgb, #1a7f37 32%, var(--border-color));
+  border-radius: 999px;
+  background: color-mix(in srgb, #1a7f37 10%, var(--bg-color));
+  color: #1a7f37;
+  font-size: var(--ui-font-xs);
+  font-weight: 700;
+  line-height: 1.4;
+}
+
+[data-theme="dark"] .github-import-recommended-badge {
+  border-color: color-mix(in srgb, #3fb950 42%, var(--border-color));
+  background: color-mix(in srgb, #3fb950 12%, var(--bg-color));
+  color: #56d364;
+}
+
 .github-import-access-form,
 .github-import-access-unlock,
 .github-import-pat-protection {
@@ -6710,6 +6825,12 @@ a:focus {
   }
 }
 
+@media (max-width: 430px) {
+  .github-import-token-type-grid {
+    grid-template-columns: minmax(0, 1fr);
+  }
+}
+
 @media (prefers-reduced-motion: reduce) {
   .github-import-select-all-btn,
   .github-import-access-chevron {
diff --git a/wiki/FAQ.md b/wiki/FAQ.md
index 2759c18e..b1e997c8 100644
--- a/wiki/FAQ.md
+++ b/wiki/FAQ.md
@@ -120,7 +120,7 @@ Yes. It supports regular expressions, capture replacements, preserve-case replac
 
 ### Can I import a private GitHub repository?
 
-Yes. Expand **Private repository access** in the GitHub URL dialog and provide a fine-grained PAT restricted to the selected repository with **Contents: Read-only**. Session-only access is recommended and is not written to storage. Remembered access is AES-GCM encrypted under a separate passphrase, expires after the chosen 1-, 7-, or 30-day period, and can be removed at any time. The app cannot revoke the PAT on GitHub; use GitHub settings to revoke or rotate it.
+Yes. Expand **Private repository access** in the GitHub URL dialog. A fine-grained PAT is recommended: it can cover multiple selected repositories, or all repositories, for one resource owner with **Contents: Read-only**. A classic PAT is available as a compatibility option, but its `repo` scope grants much broader repository access. Session-only access is recommended and is not written to storage. Remembered access is AES-GCM encrypted under a separate passphrase, expires after the chosen 1-, 7-, or 30-day period, and can be removed at any time. The app cannot revoke the PAT on GitHub; use GitHub settings to revoke or rotate it.
 
 ### Which PDF option should I use?
 
diff --git a/wiki/Features.md b/wiki/Features.md
index 38128ccc..f1158afc 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -271,7 +271,7 @@ GitHub import:
 - Every Markdown file found is shown.
 - Requests are rate-limited by the app to avoid hammering GitHub.
 - Public files are fetched as raw content. Private files use GitHub's authenticated Contents API. Both are saved to Explorer without opening new tabs.
-- Optional private access accepts a fine-grained PAT limited to a selected repository with `Contents: Read-only`. It is session-only by default; optional 1-, 7-, or 30-day retention stores PBKDF2-derived AES-GCM ciphertext under a separate, non-stored passphrase. Expiry and manual removal delete the local record.
+- Optional private access accepts fine-grained PATs (recommended) for selected repositories under one owner and classic PATs as a broad-access compatibility fallback. It is session-only by default; optional 1-, 7-, or 30-day retention stores PBKDF2-derived AES-GCM ciphertext under a separate, non-stored passphrase. Expiry and manual removal delete the local record.
 
 Limitations and privacy:
 
@@ -540,7 +540,7 @@ Security limitations:
 | Local file import | No | Current tab/workspace | Reads selected files only. |
 | Managed media upload | Yes, after first-use consent | Cloudflare KV, content-addressed, 90-day TTL | Publicly retrievable by its unguessable HTTPS URL until expiry; still images 300 KiB optimized, GIF 5 MiB, video 10 MiB. |
 | Markdown/HTML/PDF/PNG export | No, except remote assets already referenced | User download location | Browser may request external images/fonts used by content. |
-| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Optional fine-grained read-only PAT; session-only by default or passphrase-encrypted with local expiry/removal. |
+| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Fine-grained PAT recommended; classic PAT available for compatibility. Session-only by default or passphrase-encrypted with local expiry/removal. |
 | Emoji lookup | Yes | GitHub emoji API response in memory | Used for shortcode picker/lookup. |
 | CDN library loading | Yes | Browser/service-worker cache | Web build only, first use unless cached. |
 | Remote diagram engines | Yes | Third-party renderer response/cache | Source is sent to PlantUML, Kroki, or mermaid.ink depending on renderer/preview. |
diff --git a/wiki/Troubleshooting.md b/wiki/Troubleshooting.md
index a2fd4335..d3c2b205 100644
--- a/wiki/Troubleshooting.md
+++ b/wiki/Troubleshooting.md
@@ -78,7 +78,7 @@ Extension matching is case-insensitive. Rename a plain-text file to `.md` only w
 ## GitHub Import Fails or Shows Too Few Files
 
 - Use a public `github.com` repository, tree, blob, or `raw.githubusercontent.com` Markdown URL.
-- For a private repository, add a fine-grained PAT restricted to that repository with **Contents: Read-only**. If an organization requires approval or SAML authorization, complete that step in GitHub.
+- For a private repository, use a fine-grained PAT (recommended) with **Contents: Read-only** for the required repositories under one owner. Use a classic PAT only as a broad-access compatibility fallback. If an organization requires approval or SAML authorization, complete that step in GitHub.
 - Branch, tag, and commit URLs are supported. For branch names containing `/`, paste the complete GitHub tree or blob URL so the importer can resolve the longest matching ref.
 - If remembered private access will not unlock, check the protection passphrase. Expired access is deleted locally; create or add a token again if needed.
 - Repository and folder results show every Markdown file found.
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index 84297ec2..df96b661 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -123,7 +123,7 @@ Use Import > From GitHub and paste one of these URL types:
 
 Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs resolve the default branch, an explicit branch (including names containing `/`), a tag, or a commit to an immutable commit SHA before listing files. The searchable, collapsible tree contains every Markdown file found, shows the repository, ref, and short commit, and uses the same compact type scale as other application modals. The toolbar shows selected and total file counts and provides an icon that switches between select all and deselect all. Default-branch imports use a repository-named Explorer folder; other refs include the short commit beside the repository name. Nested GitHub directory paths are preserved, and imported files remain closed until you select one in Explorer.
 
-Public repositories need no credentials. For a private repository, expand **Private repository access** and use a fine-grained PAT limited to the selected repository with **Contents: Read-only**. The importer first tries public access and sends the token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
+Public repositories need no credentials. For a private repository, expand **Private repository access**. Choose a fine-grained PAT (recommended) with **Contents: Read-only** for multiple selected repositories or all repositories under one owner. Choose a classic PAT only when compatibility across resource owners or another fine-grained limitation requires it; the classic `repo` scope grants broader access. The importer first tries public access and sends the token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
 
 **This session only** is the recommended default and never writes the PAT to application storage. The optional 1-, 7-, or 30-day choices require a separate 12-character protection passphrase and store only PBKDF2-derived, AES-GCM authenticated ciphertext. The passphrase is never stored. Expired access becomes unusable and is removed while the app is running or the next time it starts; **Remove access** deletes it immediately. Local removal does not revoke the PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
 

From 638c484a72310354cc1ae18c68121fd99ffa70f5 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 21:20:48 +0530
Subject: [PATCH 07/10] feat(github): add named private access tokens

---
 CHANGELOG.md                       |   1 +
 README.md                          |   2 +-
 desktop-app/resources/index.html   |  99 +++--
 desktop-app/resources/js/script.js | 595 +++++++++++++++++++----------
 desktop-app/resources/styles.css   | 173 +++------
 index.html                         |  99 +++--
 script.js                          | 595 +++++++++++++++++++----------
 styles.css                         | 173 +++------
 wiki/FAQ.md                        |   2 +-
 wiki/Features.md                   |   4 +-
 wiki/Privacy-and-Security.md       |   2 +-
 wiki/Troubleshooting.md            |   2 +-
 wiki/Usage-Guide.md                |   4 +-
 13 files changed, 1007 insertions(+), 744 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3754347a..110bc783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 - Added branch, tag, and commit URL resolution, including branch names containing `/`, and pinned each import to the resolved immutable commit SHA.
 - Added optional private repository access with fine-grained PATs marked as recommended and classic PATs offered as a broad-access compatibility fallback.
 - Kept private access session-only by default, with passphrase-protected AES-GCM retention for 1, 7, or 30 days, automatic expiry, and manual removal.
+- Replaced the verbose single-token form with a compact add-then-select flow for multiple named tokens, including individual unlock, expiry, and removal controls.
 - Made the compact GitHub URL dialog body visibly scrollable so every private-access control remains reachable on short screens.
 - Restored the compact 520px GitHub URL step while keeping the searchable file picker at 760px, and added repository, ref, and short-commit context to the selection step.
 - Added file search, selected/total counts, an icon-based select-all toggle, and collapsible GitHub-style folder and file rows using the application typography scale.
diff --git a/README.md b/README.md
index 004bedd4..a9e5eef0 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
 - The searchable GitHub importer shows every Markdown file found in a repository or folder result and resolves branch, tag, and commit URLs to an immutable commit SHA.
-- Private repository access supports fine-grained PATs (recommended) and classic PATs as a broad-access compatibility fallback. Access is session-only by default; optional remembered access is passphrase-encrypted with AES-GCM, expires after 1, 7, or 30 days, and can be removed at any time.
+- Private repository access supports multiple named fine-grained PATs (recommended) or classic PATs. Add a token once, then select it by name; access is session-only by default, while optional remembered entries are passphrase-encrypted with AES-GCM, expire after 1, 7, or 30 days, and can be removed individually.
 - Imported Markdown files are saved to Explorer and remain closed until you choose one, preventing large imports from flooding the tab bar.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index 1cd7e6e3..86ae6c2d 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1293,75 +1293,70 @@ <h2 class="about-title">Markdown Viewer</h2>
                   <span class="github-import-access-icon" aria-hidden="true"><i class="lucide lucide-shield-check"></i></span>
                   <span class="github-import-access-copy">
                     <span id="github-import-access-title" class="github-import-access-title">Private repository access</span>
-                    <span id="github-import-access-summary" class="github-import-access-summary">No token stored · public repositories only</span>
+                    <span id="github-import-access-summary" class="github-import-access-summary">No access token added</span>
                   </span>
                   <i class="lucide lucide-chevron-down github-import-access-chevron" aria-hidden="true"></i>
                 </button>
                 <div id="github-import-access-panel" class="github-import-access-panel" hidden>
-                  <p id="github-import-access-intro" class="github-import-access-intro">Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.</p>
-                  <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
-                    <div class="github-import-access-saved">
-                      <i class="lucide lucide-lock-keyhole" aria-hidden="true"></i>
-                      <span id="github-import-access-saved-text">An encrypted token is saved on this device.</span>
+                  <div id="github-import-access-manage" class="github-import-access-manage" hidden>
+                    <label class="reset-modal-label" for="github-import-pat-select">Access token</label>
+                    <select id="github-import-pat-select" class="rename-modal-input"></select>
+                    <div class="github-import-access-selection-row">
+                      <span id="github-import-access-selected-meta" class="github-import-access-selected-meta"></span>
+                      <div class="github-import-access-actions">
+                        <button type="button" id="github-import-pat-add-another" class="github-import-access-secondary-btn">
+                          <i class="lucide lucide-plus" aria-hidden="true"></i>
+                          Add another
+                        </button>
+                        <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn">
+                          <i class="lucide lucide-trash-2" aria-hidden="true"></i>
+                          Remove
+                        </button>
+                      </div>
                     </div>
-                    <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
-                    <div class="github-import-access-inline">
-                      <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
-                      <button type="button" id="github-import-pat-unlock" class="github-import-access-secondary-btn">Unlock</button>
+                    <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
+                      <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
+                      <div class="github-import-access-inline">
+                        <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
+                        <button type="button" id="github-import-pat-unlock" class="github-import-access-primary-btn">Unlock</button>
+                      </div>
                     </div>
                   </div>
                   <div id="github-import-access-form" class="github-import-access-form">
-                    <fieldset class="github-import-token-types">
-                      <legend class="reset-modal-label">Token type</legend>
-                      <div class="github-import-token-type-grid">
-                        <label class="github-import-token-type">
-                          <input type="radio" name="github-import-pat-type" value="fine-grained" checked />
-                          <span class="github-import-token-type-copy">
-                            <span class="github-import-token-type-heading">
-                              <strong>Fine-grained PAT</strong>
-                              <span class="github-import-recommended-badge">Recommended</span>
-                            </span>
-                            <span>Selected repositories or all repositories for one owner.</span>
-                          </span>
-                        </label>
-                        <label class="github-import-token-type">
-                          <input type="radio" name="github-import-pat-type" value="classic" />
-                          <span class="github-import-token-type-copy">
-                            <span class="github-import-token-type-heading">
-                              <strong>Personal access token (classic)</strong>
-                            </span>
-                            <span>Compatibility option with broader repository access.</span>
-                          </span>
-                        </label>
+                    <div class="github-import-access-form-heading">
+                      <strong>Add access token</strong>
+                      <button type="button" id="github-import-pat-add-cancel" class="github-import-access-text-btn" hidden>Cancel</button>
+                    </div>
+                    <div class="github-import-access-form-grid">
+                      <div class="github-import-access-field">
+                        <label class="reset-modal-label" for="github-import-pat-type">Token type</label>
+                        <select id="github-import-pat-type" class="rename-modal-input">
+                          <option value="fine-grained">Fine-grained (Recommended)</option>
+                          <option value="classic">Classic</option>
+                        </select>
+                      </div>
+                      <div class="github-import-access-field">
+                        <label class="reset-modal-label" for="github-import-pat-name">Token name</label>
+                        <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My first access token" autocomplete="off" spellcheck="false" />
                       </div>
-                    </fieldset>
-                    <label id="github-import-pat-label" class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
-                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" aria-describedby="github-import-pat-help" />
-                    <label class="reset-modal-label" for="github-import-pat-retention">Keep access</label>
+                    </div>
+                    <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
+                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
+                    <label class="reset-modal-label" for="github-import-pat-retention">Disposal</label>
                     <select id="github-import-pat-retention" class="rename-modal-input">
-                      <option value="session">This session only (recommended)</option>
-                      <option value="1">Encrypted for 1 day</option>
-                      <option value="7">Encrypted for 7 days</option>
-                      <option value="30">Encrypted for 30 days</option>
+                      <option value="session">End of this session</option>
+                      <option value="1">After 1 day</option>
+                      <option value="7">After 7 days</option>
+                      <option value="30">After 30 days</option>
                     </select>
                     <div id="github-import-pat-protection" class="github-import-pat-protection" hidden>
                       <label class="reset-modal-label" for="github-import-pat-passphrase">Protection passphrase</label>
-                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" />
-                      <span class="github-import-field-note">At least 12 characters. This passphrase is never stored and cannot be recovered.</span>
+                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" placeholder="12+ characters" />
                     </div>
                     <div class="github-import-access-actions">
-                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Use secure access</button>
-                      <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn" hidden>
-                        <i class="lucide lucide-trash-2" aria-hidden="true"></i>
-                        Remove access
-                      </button>
+                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Add access</button>
                     </div>
                   </div>
-                  <p id="github-import-pat-help" class="github-import-access-help">
-                    <span id="github-import-pat-scope-note">Use selected repositories or all repositories for one owner.</span>
-                    The token is sent only to <code>api.github.com</code>. Local expiry removes the saved copy but does not revoke the token on GitHub.
-                    <a id="github-import-pat-create-link" href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
-                  </p>
                   <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
                 </div>
               </section>
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index 865e9a88..f25397e8 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -541,21 +541,23 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportAccessToggle = document.getElementById("github-import-access-toggle");
   const githubImportAccessPanel = document.getElementById("github-import-access-panel");
   const githubImportAccessSummary = document.getElementById("github-import-access-summary");
+  const githubImportAccessManage = document.getElementById("github-import-access-manage");
+  const githubImportAccessForm = document.getElementById("github-import-access-form");
+  const githubImportPatSelect = document.getElementById("github-import-pat-select");
+  const githubImportAccessSelectedMeta = document.getElementById("github-import-access-selected-meta");
+  const githubImportPatAddAnotherBtn = document.getElementById("github-import-pat-add-another");
+  const githubImportPatAddCancelBtn = document.getElementById("github-import-pat-add-cancel");
   const githubImportAccessUnlock = document.getElementById("github-import-access-unlock");
-  const githubImportAccessSavedText = document.getElementById("github-import-access-saved-text");
   const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
   const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
-  const githubImportPatTypeInputs = Array.from(document.querySelectorAll('input[name="github-import-pat-type"]'));
-  const githubImportAccessIntro = document.getElementById("github-import-access-intro");
-  const githubImportPatLabel = document.getElementById("github-import-pat-label");
+  const githubImportPatTypeSelect = document.getElementById("github-import-pat-type");
+  const githubImportPatNameInput = document.getElementById("github-import-pat-name");
   const githubImportPatInput = document.getElementById("github-import-pat");
   const githubImportPatRetention = document.getElementById("github-import-pat-retention");
   const githubImportPatProtection = document.getElementById("github-import-pat-protection");
   const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
-  const githubImportPatScopeNote = document.getElementById("github-import-pat-scope-note");
-  const githubImportPatCreateLink = document.getElementById("github-import-pat-create-link");
   const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
@@ -11303,7 +11305,9 @@ ${selector} .arrowheadPath {
   }
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   const GITHUB_API_VERSION = "2022-11-28";
-  const GITHUB_ACCESS_RECORD_NAME = "githubAccessRecordV1";
+  const GITHUB_ACCESS_VAULT_NAME = "githubAccessVaultV2";
+  const GITHUB_LEGACY_ACCESS_RECORD_NAME = "githubAccessRecordV1";
+  const GITHUB_ACCESS_VAULT_VERSION = 2;
   const GITHUB_PAT_VAULT_VERSION = 1;
   const GITHUB_PAT_KDF_ITERATIONS = 250000;
   let lastGitHubImportRequestAt = 0;
@@ -11311,10 +11315,12 @@ ${selector} .arrowheadPath {
   const collapsedGitHubImportFolders = new Set();
   let availableGitHubImportPaths = [];
   let githubImportSearchTimer = null;
-  let githubAccessToken = "";
-  let githubAccessTokenExpiresAt = 0;
-  let githubAccessTokenType = "fine-grained";
-  let githubPatStoredRecord = null;
+  let githubAccessEntries = [];
+  let githubSelectedAccessId = "";
+  let githubAccessAdding = true;
+  let githubAccessVaultLoaded = false;
+  let githubAccessVaultLoadPromise = null;
+  const githubUnlockedAccessTokens = new Map();
   let githubPatExpiryTimer = null;
 
   function getFileName(path) {
@@ -11439,90 +11445,78 @@ ${selector} .arrowheadPath {
     }
   }
 
-  function clearExpiredGitHubAccessToken() {
-    if (!githubAccessTokenExpiresAt || Date.now() < githubAccessTokenExpiresAt) return;
-    githubAccessToken = "";
-    githubAccessTokenExpiresAt = 0;
-    githubPatStoredRecord = null;
-    if (workspaceStorage && typeof workspaceStorage.deleteMetadata === "function") {
-      void workspaceStorage.init()
-        .then(() => workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME))
-        .catch(() => {});
+  function normalizeGitHubPatType(value) {
+    return value === "classic" ? "classic" : "fine-grained";
+  }
+
+  function createGitHubAccessId() {
+    if (globalThis.crypto && typeof globalThis.crypto.randomUUID === "function") {
+      return "github_access_" + globalThis.crypto.randomUUID();
+    }
+    return "github_access_" + Date.now() + "_" + Math.random().toString(36).slice(2, 10);
+  }
+
+  function getSelectedGitHubAccessEntry() {
+    return githubAccessEntries.find(function(entry) {
+      return entry.id === githubSelectedAccessId;
+    }) || null;
+  }
+
+  function pruneExpiredGitHubAccessEntries() {
+    const now = Date.now();
+    const expiredIds = new Set(
+      githubAccessEntries
+        .filter(function(entry) {
+          return Number(entry.expiresAt) > 0 && Number(entry.expiresAt) <= now;
+        })
+        .map(function(entry) { return entry.id; })
+    );
+    if (!expiredIds.size) return 0;
+    githubAccessEntries = githubAccessEntries.filter(function(entry) {
+      return !expiredIds.has(entry.id);
+    });
+    expiredIds.forEach(function(id) {
+      githubUnlockedAccessTokens.delete(id);
+    });
+    if (!getSelectedGitHubAccessEntry()) {
+      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     }
+    return expiredIds.size;
   }
 
-  function scheduleGitHubAccessExpiry(expiresAt) {
+  function scheduleGitHubAccessExpiry() {
     clearTimeout(githubPatExpiryTimer);
     githubPatExpiryTimer = null;
-    if (!expiresAt) return;
-    const remaining = Number(expiresAt) - Date.now();
+    const expiries = githubAccessEntries
+      .map(function(entry) { return Number(entry.expiresAt) || 0; })
+      .filter(function(expiresAt) { return expiresAt > 0; });
+    if (!expiries.length) return;
+    const nextExpiry = Math.min.apply(Math, expiries);
+    const remaining = nextExpiry - Date.now();
     if (remaining <= 0) {
-      void removeGitHubAccess({ silent: true })
+      const expiredCount = pruneExpiredGitHubAccessEntries();
+      void persistGitHubAccessVault()
         .then(function() {
-          setGitHubAccessStatus("Private repository access expired and was removed from this device.", "success");
-          announceToScreenReader("GitHub private repository access expired and was removed.");
+          renderGitHubAccessState();
+          if (expiredCount) {
+            setGitHubAccessStatus(expiredCount === 1 ? "Expired access removed." : expiredCount + " expired tokens removed.", "success");
+            announceToScreenReader("Expired GitHub access removed.");
+          }
         })
         .catch(() => {});
       return;
     }
     githubPatExpiryTimer = setTimeout(function() {
-      scheduleGitHubAccessExpiry(expiresAt);
+      scheduleGitHubAccessExpiry();
     }, Math.min(remaining, 2147483647));
   }
 
   function getGitHubAccessToken() {
-    clearExpiredGitHubAccessToken();
-    return githubAccessToken;
-  }
-
-  function normalizeGitHubPatType(value) {
-    return value === "classic" ? "classic" : "fine-grained";
-  }
-
-  function getSelectedGitHubPatType() {
-    const selected = githubImportPatTypeInputs.find(function(input) {
-      return input.checked;
-    });
-    return normalizeGitHubPatType(selected && selected.value);
-  }
-
-  function renderGitHubPatType() {
-    const tokenType = getSelectedGitHubPatType();
-    const isClassic = tokenType === "classic";
-    if (githubImportAccess) {
-      githubImportAccess.dataset.tokenType = tokenType;
-    }
-    if (githubImportAccessIntro) {
-      githubImportAccessIntro.innerHTML = isClassic
-        ? "Classic tokens can work across repository owners, but the <strong>repo</strong> scope grants broad access. Use only when fine-grained access is not suitable."
-        : "Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.";
-    }
-    if (githubImportPatLabel) {
-      githubImportPatLabel.textContent = isClassic
-        ? "Personal access token (classic)"
-        : "Fine-grained PAT";
-    }
-    if (githubImportPatScopeNote) {
-      githubImportPatScopeNote.textContent = isClassic
-        ? "The classic repo scope can access every repository your account can reach."
-        : "Use selected repositories or all repositories for one owner.";
-    }
-    if (githubImportPatCreateLink) {
-      githubImportPatCreateLink.href = isClassic
-        ? "https://github.com/settings/tokens/new"
-        : "https://github.com/settings/personal-access-tokens/new";
-      githubImportPatCreateLink.textContent = isClassic
-        ? "Create a classic token"
-        : "Create a fine-grained token";
+    if (pruneExpiredGitHubAccessEntries()) {
+      void persistGitHubAccessVault().catch(() => {});
+      renderGitHubAccessState();
     }
-  }
-
-  function setSelectedGitHubPatType(value) {
-    const tokenType = normalizeGitHubPatType(value);
-    githubImportPatTypeInputs.forEach(function(input) {
-      input.checked = input.value === tokenType;
-    });
-    renderGitHubPatType();
+    return githubUnlockedAccessTokens.get(githubSelectedAccessId) || "";
   }
 
   function getGitHubApiHeaders(accept, authenticated) {
@@ -11672,14 +11666,31 @@ ${selector} .arrowheadPath {
         && Boolean(getGitHubAccessToken());
       if (!canRetryWithToken) {
         if (error instanceof GitHubRequestError && error.status === 404) {
+          const selectedAccess = getSelectedGitHubAccessEntry();
+          if (selectedAccess && !githubUnlockedAccessTokens.has(selectedAccess.id)) {
+            throw new Error(`Unlock "${selectedAccess.name}" to access this private repository.`);
+          }
           throw new Error("Repository not found. If it is private, add secure private repository access and try again.");
         }
         throw error;
       }
-      return {
-        info: await fetchGitHubJson(url, { authenticated: true }),
-        authenticated: true
-      };
+      try {
+        return {
+          info: await fetchGitHubJson(url, { authenticated: true }),
+          authenticated: true
+        };
+      } catch (authenticatedError) {
+        const selectedAccess = getSelectedGitHubAccessEntry();
+        const accessName = selectedAccess ? `"${selectedAccess.name}"` : "The selected token";
+        if (authenticatedError instanceof GitHubRequestError && authenticatedError.status === 401) {
+          throw new Error(`${accessName} was rejected by GitHub. Replace or remove it.`);
+        }
+        if (authenticatedError instanceof GitHubRequestError
+          && (authenticatedError.status === 403 || authenticatedError.status === 404)) {
+          throw new Error(`${accessName} cannot access ${owner}/${repo}. Check its repository access and permissions.`);
+        }
+        throw authenticatedError;
+      }
     }
   }
 
@@ -11740,8 +11751,8 @@ ${selector} .arrowheadPath {
     };
   }
 
-  function getGitHubPatAdditionalData(expiresAt) {
-    return new TextEncoder().encode(`markdown-viewer:${GITHUB_ACCESS_RECORD_NAME}:${expiresAt}`);
+  function getGitHubPatAdditionalData(expiresAt, aadContext) {
+    return new TextEncoder().encode(`markdown-viewer:${aadContext || GITHUB_ACCESS_VAULT_NAME}:${expiresAt}`);
   }
 
   async function encryptGitHubAccessToken(token, passphrase, expiresAt) {
@@ -11759,7 +11770,7 @@ ${selector} .arrowheadPath {
       {
         name: "AES-GCM",
         iv,
-        additionalData: getGitHubPatAdditionalData(expiresAt),
+        additionalData: getGitHubPatAdditionalData(expiresAt, GITHUB_ACCESS_VAULT_NAME),
         tagLength: 128
       },
       key,
@@ -11774,6 +11785,7 @@ ${selector} .arrowheadPath {
       iv: bytesToBase64(iv),
       ciphertext: bytesToBase64(new Uint8Array(ciphertext)),
       expiresAt,
+      aadContext: GITHUB_ACCESS_VAULT_NAME,
       createdAt: Date.now()
     };
   }
@@ -11794,7 +11806,10 @@ ${selector} .arrowheadPath {
       {
         name: "AES-GCM",
         iv: base64ToBytes(record.iv),
-        additionalData: getGitHubPatAdditionalData(expiresAt),
+        additionalData: getGitHubPatAdditionalData(
+          expiresAt,
+          record.aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME
+        ),
         tagLength: 128
       },
       key,
@@ -11823,88 +11838,226 @@ ${selector} .arrowheadPath {
     githubImportAccessStatus.classList.toggle("is-success", state === "success");
   }
 
+  function resetGitHubAccessForm() {
+    if (githubImportPatTypeSelect) githubImportPatTypeSelect.value = "fine-grained";
+    if (githubImportPatNameInput) githubImportPatNameInput.value = "";
+    if (githubImportPatInput) githubImportPatInput.value = "";
+    if (githubImportPatRetention) githubImportPatRetention.value = "session";
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
+  }
+
+  function setGitHubAccessAdding(isAdding, options = {}) {
+    githubAccessAdding = Boolean(isAdding) || !githubAccessEntries.length;
+    if (githubAccessAdding && options.reset !== false) resetGitHubAccessForm();
+    setGitHubAccessStatus("");
+    renderGitHubAccessState();
+    if (githubAccessAdding && options.focus !== false && githubImportPatNameInput) {
+      requestAnimationFrame(function() {
+        githubImportPatNameInput.focus();
+        githubImportPatNameInput.scrollIntoView({ block: "nearest" });
+      });
+    }
+  }
+
+  function getGitHubAccessTypeLabel(type) {
+    return normalizeGitHubPatType(type) === "classic" ? "Classic" : "Fine-grained";
+  }
+
   function renderGitHubAccessState() {
-    clearExpiredGitHubAccessToken();
-    const hasActiveToken = Boolean(getGitHubAccessToken());
-    const hasStoredRecord = Boolean(githubPatStoredRecord);
-    const tokenType = hasActiveToken
-      ? githubAccessTokenType
-      : hasStoredRecord
-        ? normalizeGitHubPatType(githubPatStoredRecord.tokenType)
-        : getSelectedGitHubPatType();
-    const tokenTypeLabel = tokenType === "classic" ? "classic" : "fine-grained";
-    if ((hasActiveToken || hasStoredRecord) && getSelectedGitHubPatType() !== tokenType) {
-      setSelectedGitHubPatType(tokenType);
+    const removedCount = pruneExpiredGitHubAccessEntries();
+    if (removedCount) void persistGitHubAccessVault().catch(() => {});
+    if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
+      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     }
+
+    const selectedEntry = getSelectedGitHubAccessEntry();
+    const hasEntries = githubAccessEntries.length > 0;
+    const isUnlocked = Boolean(selectedEntry && githubUnlockedAccessTokens.has(selectedEntry.id));
+    githubAccessAdding = githubAccessAdding || !hasEntries;
+
     if (githubImportAccess) {
-      githubImportAccess.dataset.state = hasActiveToken ? "active" : hasStoredRecord ? "locked" : "empty";
+      githubImportAccess.dataset.state = !selectedEntry ? "empty" : isUnlocked ? "active" : "locked";
     }
     if (githubImportAccessSummary) {
-      githubImportAccessSummary.textContent = hasActiveToken
-        ? `Access ready · ${tokenTypeLabel} · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
-        : hasStoredRecord
-          ? `Encrypted token saved · ${tokenTypeLabel} · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
-          : "No token stored · public repositories only";
+      githubImportAccessSummary.textContent = selectedEntry
+        ? `${selectedEntry.name} · ${isUnlocked ? "Ready" : "Locked"}`
+        : "No access token added";
+    }
+    if (githubImportAccessManage) {
+      githubImportAccessManage.hidden = !hasEntries || githubAccessAdding;
+    }
+    if (githubImportAccessForm) {
+      githubImportAccessForm.hidden = hasEntries && !githubAccessAdding;
+    }
+    if (githubImportPatAddCancelBtn) {
+      githubImportPatAddCancelBtn.hidden = !hasEntries;
+    }
+    if (githubImportPatSelect) {
+      githubImportPatSelect.replaceChildren();
+      githubAccessEntries.forEach(function(entry) {
+        const option = document.createElement("option");
+        option.value = entry.id;
+        option.textContent = entry.name;
+        githubImportPatSelect.appendChild(option);
+      });
+      githubImportPatSelect.value = githubSelectedAccessId;
     }
-    if (githubImportAccessUnlock) {
-      githubImportAccessUnlock.hidden = !hasStoredRecord || hasActiveToken;
+    if (githubImportAccessSelectedMeta) {
+      githubImportAccessSelectedMeta.textContent = selectedEntry
+        ? `${getGitHubAccessTypeLabel(selectedEntry.tokenType)} · ${selectedEntry.sessionOnly ? "This session" : "Disposes " + formatGitHubAccessExpiry(selectedEntry.expiresAt)}`
+        : "";
     }
-    if (githubImportAccessSavedText && hasStoredRecord) {
-      githubImportAccessSavedText.textContent = `Encrypted access expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}.`;
+    if (githubImportAccessUnlock) {
+      githubImportAccessUnlock.hidden = !selectedEntry || selectedEntry.sessionOnly || isUnlocked;
     }
     if (githubImportPatRemoveBtn) {
-      githubImportPatRemoveBtn.hidden = !hasActiveToken && !hasStoredRecord;
+      githubImportPatRemoveBtn.hidden = !selectedEntry;
     }
+    scheduleGitHubAccessExpiry();
+  }
+
+  async function persistGitHubAccessVault() {
+    if (!workspaceStorage) return;
+    const entries = githubAccessEntries.filter(function(entry) {
+      return !entry.sessionOnly && Number(entry.expiresAt) > Date.now();
+    });
+    await workspaceStorage.init();
+    if (!entries.length) {
+      if (typeof workspaceStorage.deleteMetadata === "function") {
+        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_VAULT_NAME);
+      } else {
+        await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, null);
+      }
+      return;
+    }
+    await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, {
+      version: GITHUB_ACCESS_VAULT_VERSION,
+      entries,
+      updatedAt: Date.now()
+    });
+  }
+
+  function normalizeStoredGitHubAccessEntry(entry, fallbackName, aadContext) {
+    if (!entry || typeof entry.ciphertext !== "string") return null;
+    const expiresAt = Number(entry.expiresAt);
+    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) return null;
+    return {
+      id: typeof entry.id === "string" && entry.id ? entry.id : createGitHubAccessId(),
+      name: typeof entry.name === "string" && entry.name.trim()
+        ? entry.name.trim().slice(0, 60)
+        : fallbackName,
+      tokenType: normalizeGitHubPatType(entry.tokenType),
+      sessionOnly: false,
+      version: GITHUB_PAT_VAULT_VERSION,
+      algorithm: "AES-GCM",
+      kdf: "PBKDF2-SHA-256",
+      iterations: Number(entry.iterations) || GITHUB_PAT_KDF_ITERATIONS,
+      salt: String(entry.salt || ""),
+      iv: String(entry.iv || ""),
+      ciphertext: entry.ciphertext,
+      expiresAt,
+      aadContext: entry.aadContext || aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME,
+      createdAt: Number(entry.createdAt) || Date.now()
+    };
   }
 
   async function loadStoredGitHubAccess() {
-    githubPatStoredRecord = null;
-    if (!workspaceStorage) {
+    if (githubAccessVaultLoaded) {
       renderGitHubAccessState();
       return;
     }
-    try {
-      await workspaceStorage.init();
-      const record = await workspaceStorage.getMetadata(GITHUB_ACCESS_RECORD_NAME);
-      if (record && Number(record.expiresAt) <= Date.now()) {
-        if (typeof workspaceStorage.deleteMetadata === "function") {
-          await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+    if (githubAccessVaultLoadPromise) {
+      await githubAccessVaultLoadPromise;
+      return;
+    }
+    githubAccessVaultLoadPromise = (async function() {
+      if (!workspaceStorage) {
+        githubAccessVaultLoaded = true;
+        renderGitHubAccessState();
+        return;
+      }
+      try {
+        await workspaceStorage.init();
+        const sessionEntries = githubAccessEntries.filter(function(entry) { return entry.sessionOnly; });
+        const vault = await workspaceStorage.getMetadata(GITHUB_ACCESS_VAULT_NAME);
+        const storedEntries = vault && vault.version === GITHUB_ACCESS_VAULT_VERSION && Array.isArray(vault.entries)
+          ? vault.entries
+          : [];
+        const normalizedStoredEntries = storedEntries
+          .map(function(entry, index) {
+            return normalizeStoredGitHubAccessEntry(entry, `Saved GitHub access ${index + 1}`, GITHUB_ACCESS_VAULT_NAME);
+          })
+          .filter(Boolean);
+        const legacyRecord = await workspaceStorage.getMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
+        const legacyEntry = normalizeStoredGitHubAccessEntry(
+          legacyRecord,
+          "Imported GitHub access",
+          GITHUB_LEGACY_ACCESS_RECORD_NAME
+        );
+        const merged = [...sessionEntries, ...normalizedStoredEntries];
+        if (legacyEntry && !merged.some(function(entry) {
+          return entry.id === legacyEntry.id || entry.ciphertext === legacyEntry.ciphertext;
+        })) {
+          merged.push(legacyEntry);
         }
-        setGitHubAccessStatus("Expired private repository access was removed from this device.", "success");
-      } else if (record) {
-        githubPatStoredRecord = record;
-        githubAccessTokenType = normalizeGitHubPatType(record.tokenType);
-        scheduleGitHubAccessExpiry(record.expiresAt);
+        githubAccessEntries = merged;
+        if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
+          githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
+        }
+        githubAccessAdding = !githubAccessEntries.length;
+        githubAccessVaultLoaded = true;
+        if (legacyRecord || normalizedStoredEntries.length !== storedEntries.length) {
+          await persistGitHubAccessVault();
+        }
+        if (legacyRecord) {
+          if (typeof workspaceStorage.deleteMetadata === "function") {
+            await workspaceStorage.deleteMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
+          } else {
+            await workspaceStorage.setMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME, null);
+          }
+        }
+        renderGitHubAccessState();
+      } catch (_) {
+        githubAccessVaultLoaded = true;
+        setGitHubAccessStatus("Saved access could not be loaded.", "error");
+        renderGitHubAccessState();
       }
-    } catch (_) {
-      setGitHubAccessStatus("Saved private access could not be read. Session-only access is still available.", "error");
+    })();
+    try {
+      await githubAccessVaultLoadPromise;
+    } finally {
+      githubAccessVaultLoadPromise = null;
     }
-    renderGitHubAccessState();
   }
 
   async function removeGitHubAccess(options = {}) {
-    clearTimeout(githubPatExpiryTimer);
-    githubPatExpiryTimer = null;
-    githubAccessToken = "";
-    githubAccessTokenExpiresAt = 0;
-    githubAccessTokenType = "fine-grained";
-    githubPatStoredRecord = null;
-    if (githubImportPatInput) githubImportPatInput.value = "";
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    const accessId = options.id || githubSelectedAccessId;
+    const removedIndex = githubAccessEntries.findIndex(function(entry) { return entry.id === accessId; });
+    if (removedIndex < 0) return;
+    const removedEntry = githubAccessEntries[removedIndex];
+    const unlockedToken = githubUnlockedAccessTokens.get(accessId);
+    const previousSelectedId = githubSelectedAccessId;
+    const previousAdding = githubAccessAdding;
+    githubAccessEntries = githubAccessEntries.filter(function(entry) { return entry.id !== accessId; });
+    githubUnlockedAccessTokens.delete(accessId);
+    githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
+    githubAccessAdding = !githubAccessEntries.length;
     if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
-    if (workspaceStorage) {
-      await workspaceStorage.init();
-      if (typeof workspaceStorage.deleteMetadata === "function") {
-        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
-      } else {
-        await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, null);
-      }
+    try {
+      if (!removedEntry.sessionOnly) await persistGitHubAccessVault();
+    } catch (error) {
+      githubAccessEntries.splice(removedIndex, 0, removedEntry);
+      if (unlockedToken) githubUnlockedAccessTokens.set(accessId, unlockedToken);
+      githubSelectedAccessId = previousSelectedId;
+      githubAccessAdding = previousAdding;
+      renderGitHubAccessState();
+      throw error;
     }
-    setSelectedGitHubPatType("fine-grained");
     renderGitHubAccessState();
     if (!options.silent) {
-      setGitHubAccessStatus("Private repository access was removed from this device.", "success");
-      announceToScreenReader("GitHub private repository access removed.");
+      setGitHubAccessStatus(`"${removedEntry.name}" removed.`, "success");
+      announceToScreenReader("GitHub access token removed.");
     }
   }
 
@@ -11914,14 +12067,34 @@ ${selector} .arrowheadPath {
     }
   }
 
+  function validateGitHubAccessName(name) {
+    const normalizedName = String(name || "").trim().replace(/\s+/g, " ");
+    if (!normalizedName) throw new Error("Enter a token name.");
+    if (normalizedName.length > 60) throw new Error("Keep the token name to 60 characters or fewer.");
+    if (githubAccessEntries.some(function(entry) {
+      return entry.name.toLocaleLowerCase() === normalizedName.toLocaleLowerCase();
+    })) {
+      throw new Error("Use a unique token name.");
+    }
+    return normalizedName;
+  }
+
   async function saveGitHubAccess() {
-    if (!githubImportPatInput || !githubImportPatRetention) return;
+    if (!githubImportPatInput || !githubImportPatRetention || !githubImportPatNameInput) return;
+    const name = validateGitHubAccessName(githubImportPatNameInput.value);
     const token = githubImportPatInput.value;
     validateGitHubPat(token);
-    const tokenType = getSelectedGitHubPatType();
+    const tokenType = normalizeGitHubPatType(githubImportPatTypeSelect ? githubImportPatTypeSelect.value : "fine-grained");
     const retention = githubImportPatRetention.value;
     let expiresAt = 0;
-    let record = null;
+    let entry = {
+      id: createGitHubAccessId(),
+      name,
+      tokenType,
+      sessionOnly: retention === "session",
+      expiresAt: 0,
+      createdAt: Date.now()
+    };
 
     if (retention !== "session") {
       const days = Number(retention);
@@ -11936,55 +12109,59 @@ ${selector} .arrowheadPath {
         throw new Error("Encrypted workspace storage is unavailable. Use session-only access instead.");
       }
       expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
-      record = await encryptGitHubAccessToken(token, passphrase, expiresAt);
-      record.tokenType = tokenType;
-      await workspaceStorage.init();
-      await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, record);
-    } else if (workspaceStorage) {
-      await workspaceStorage.init();
-      if (typeof workspaceStorage.deleteMetadata === "function") {
-        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
-      }
+      entry = {
+        ...entry,
+        ...(await encryptGitHubAccessToken(token, passphrase, expiresAt)),
+        id: entry.id,
+        name,
+        tokenType,
+        sessionOnly: false,
+        expiresAt
+      };
     }
 
-    githubAccessToken = token;
-    githubAccessTokenExpiresAt = expiresAt;
-    githubAccessTokenType = tokenType;
-    githubPatStoredRecord = record;
-    scheduleGitHubAccessExpiry(expiresAt);
-    githubImportPatInput.value = "";
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    const previousSelectedId = githubSelectedAccessId;
+    const previousAdding = githubAccessAdding;
+    githubAccessEntries.push(entry);
+    githubUnlockedAccessTokens.set(entry.id, token);
+    githubSelectedAccessId = entry.id;
+    githubAccessAdding = false;
+    try {
+      if (!entry.sessionOnly) await persistGitHubAccessVault();
+    } catch (error) {
+      githubAccessEntries = githubAccessEntries.filter(function(candidate) { return candidate.id !== entry.id; });
+      githubUnlockedAccessTokens.delete(entry.id);
+      githubSelectedAccessId = previousSelectedId;
+      githubAccessAdding = previousAdding;
+      renderGitHubAccessState();
+      throw error;
+    }
+    resetGitHubAccessForm();
     renderGitHubAccessState();
-    setGitHubAccessStatus(
-      expiresAt
-        ? `Private access is ready and encrypted until ${formatGitHubAccessExpiry(expiresAt)}.`
-        : "Private access is ready for this session and was not written to storage.",
-      "success"
-    );
-    announceToScreenReader("GitHub private repository access is ready.");
+    setGitHubAccessStatus(`"${name}" added.`, "success");
+    announceToScreenReader("GitHub access token added.");
   }
 
   async function unlockStoredGitHubAccess() {
-    if (!githubPatStoredRecord || !githubImportPatUnlockPassphrase) return;
+    const selectedEntry = getSelectedGitHubAccessEntry();
+    if (!selectedEntry || selectedEntry.sessionOnly || !githubImportPatUnlockPassphrase) return;
     const passphrase = githubImportPatUnlockPassphrase.value;
     if (!passphrase) throw new Error("Enter the protection passphrase.");
     try {
-      githubAccessToken = await decryptGitHubAccessToken(githubPatStoredRecord, passphrase);
-      githubAccessTokenExpiresAt = Number(githubPatStoredRecord.expiresAt);
-      githubAccessTokenType = normalizeGitHubPatType(githubPatStoredRecord.tokenType);
-      scheduleGitHubAccessExpiry(githubAccessTokenExpiresAt);
+      const token = await decryptGitHubAccessToken(selectedEntry, passphrase);
+      githubUnlockedAccessTokens.set(selectedEntry.id, token);
     } catch (error) {
-      if (Number(githubPatStoredRecord.expiresAt) <= Date.now()) {
-        await removeGitHubAccess({ silent: true });
-        throw new Error("The saved GitHub access expired and was removed.");
+      if (Number(selectedEntry.expiresAt) <= Date.now()) {
+        await removeGitHubAccess({ id: selectedEntry.id, silent: true });
+        throw new Error("The saved access expired and was removed.");
       }
-      throw new Error("The token could not be unlocked. Check the protection passphrase.");
+      throw new Error("Could not unlock this token. Check the passphrase.");
     } finally {
       githubImportPatUnlockPassphrase.value = "";
     }
     renderGitHubAccessState();
-    setGitHubAccessStatus("Encrypted private repository access is unlocked for this session.", "success");
-    announceToScreenReader("GitHub private repository access unlocked.");
+    setGitHubAccessStatus(`"${selectedEntry.name}" unlocked.`, "success");
+    announceToScreenReader("GitHub access token unlocked.");
   }
 
   function renderGitHubRepositoryContext(context) {
@@ -12307,17 +12484,8 @@ ${selector} .arrowheadPath {
     if (githubImportAccess) githubImportAccess.hidden = false;
     if (githubImportAccessToggle) githubImportAccessToggle.setAttribute("aria-expanded", "false");
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
-    if (githubImportPatInput) githubImportPatInput.value = "";
-    setSelectedGitHubPatType(
-      getGitHubAccessToken()
-        ? githubAccessTokenType
-        : githubPatStoredRecord
-          ? githubPatStoredRecord.tokenType
-          : "fine-grained"
-    );
-    if (githubImportPatRetention) githubImportPatRetention.value = "session";
-    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    resetGitHubAccessForm();
+    githubAccessAdding = !githubAccessEntries.length;
     if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
     setGitHubAccessStatus("");
     renderGitHubRepositoryContext(null);
@@ -12383,9 +12551,13 @@ ${selector} .arrowheadPath {
       }
       [
         githubImportAccessToggle,
+        githubImportPatSelect,
+        githubImportPatAddAnotherBtn,
+        githubImportPatAddCancelBtn,
         githubImportPatUnlockPassphrase,
         githubImportPatUnlockBtn,
-        ...githubImportPatTypeInputs,
+        githubImportPatTypeSelect,
+        githubImportPatNameInput,
         githubImportPatInput,
         githubImportPatRetention,
         githubImportPatPassphrase,
@@ -12507,6 +12679,12 @@ ${selector} .arrowheadPath {
     } catch (error) {
       console.error("GitHub import failed:", error);
       setGitHubImportMessage("GitHub import failed: " + error.message);
+      if (githubImportAccessToggle && githubImportAccessPanel
+        && /^(Unlock |".+" (?:cannot access|was rejected))/.test(error.message || "")) {
+        githubImportAccessToggle.setAttribute("aria-expanded", "true");
+        githubImportAccessPanel.hidden = false;
+        renderGitHubAccessState();
+      }
       announceToScreenReader("GitHub import failed.");
       if (githubImportTree) {
         githubImportTree.innerHTML = "";
@@ -18742,9 +18920,12 @@ ${selector} .arrowheadPath {
       githubImportAccessToggle.setAttribute("aria-expanded", expanded ? "false" : "true");
       githubImportAccessPanel.hidden = expanded;
       if (!expanded) {
-        const target = githubPatStoredRecord && !getGitHubAccessToken()
+        const selectedEntry = getSelectedGitHubAccessEntry();
+        const target = selectedEntry && !selectedEntry.sessionOnly && !githubUnlockedAccessTokens.has(selectedEntry.id)
           ? githubImportPatUnlockPassphrase
-          : githubImportPatTypeInputs.find(function(input) { return input.checked; }) || githubImportPatInput;
+          : githubAccessAdding
+            ? githubImportPatNameInput
+            : githubImportPatSelect;
         if (target) {
           requestAnimationFrame(function() {
             target.focus();
@@ -18754,13 +18935,29 @@ ${selector} .arrowheadPath {
       }
     });
   }
-  githubImportPatTypeInputs.forEach(function(input) {
-    input.addEventListener("change", function() {
-      if (!input.checked) return;
-      renderGitHubPatType();
+  if (githubImportPatSelect) {
+    githubImportPatSelect.addEventListener("change", function() {
+      githubSelectedAccessId = githubImportPatSelect.value;
+      if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
       setGitHubAccessStatus("");
+      renderGitHubAccessState();
     });
-  });
+  }
+  if (githubImportPatAddAnotherBtn) {
+    githubImportPatAddAnotherBtn.addEventListener("click", function() {
+      setGitHubAccessAdding(true);
+    });
+  }
+  if (githubImportPatAddCancelBtn) {
+    githubImportPatAddCancelBtn.addEventListener("click", function() {
+      setGitHubAccessAdding(false, { focus: false });
+    });
+  }
+  if (githubImportPatTypeSelect) {
+    githubImportPatTypeSelect.addEventListener("change", function() {
+      setGitHubAccessStatus("");
+    });
+  }
   if (githubImportPatRetention) {
     githubImportPatRetention.addEventListener("change", function() {
       const needsPassphrase = githubImportPatRetention.value !== "session";
@@ -18772,7 +18969,7 @@ ${selector} .arrowheadPath {
     githubImportPatSaveBtn.addEventListener("click", async function() {
       const previousText = githubImportPatSaveBtn.textContent;
       githubImportPatSaveBtn.disabled = true;
-      githubImportPatSaveBtn.textContent = "Securing…";
+      githubImportPatSaveBtn.textContent = "Adding…";
       setGitHubAccessStatus("");
       try {
         await saveGitHubAccess();
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 9ef7e32d..03601ca2 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -6016,6 +6016,8 @@ a:focus {
 
 .github-import-access[hidden],
 .github-import-access-panel[hidden],
+.github-import-access-manage[hidden],
+.github-import-access-form[hidden],
 .github-import-access-unlock[hidden],
 .github-import-pat-protection[hidden],
 .github-import-access-danger-btn[hidden],
@@ -6125,116 +6127,53 @@ a:focus {
   background: color-mix(in srgb, var(--button-bg) 55%, var(--bg-color));
 }
 
-.github-import-access-intro,
-.github-import-access-help,
-.github-import-field-note {
-  margin: 0;
-  color: var(--text-secondary);
-  font-size: var(--ui-font-sm);
-  line-height: 1.45;
-}
-
-.github-import-access-intro strong {
-  color: var(--text-color);
-}
-
-.github-import-token-types {
+.github-import-access-form-heading,
+.github-import-access-selection-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
   min-width: 0;
-  margin: 0;
-  padding: 0;
-  border: 0;
 }
 
-.github-import-token-types > .reset-modal-label {
-  display: block;
-  margin-bottom: 6px;
-  padding: 0;
+.github-import-access-form-heading {
+  font-size: var(--ui-font-md);
 }
 
-.github-import-token-type-grid {
+.github-import-access-form-grid {
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 8px;
 }
 
-.github-import-token-type {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
+.github-import-access-field {
+  display: grid;
+  gap: 5px;
   min-width: 0;
-  min-height: 68px;
-  padding: 9px;
-  border: 1px solid var(--border-color);
-  border-radius: 8px;
-  background: var(--bg-color);
-  color: var(--text-color);
-  cursor: pointer;
 }
 
-.github-import-token-type:hover {
-  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
-  background: var(--button-hover);
-}
-
-.github-import-token-type:has(input:checked) {
-  border-color: var(--accent-color);
-  background: color-mix(in srgb, var(--accent-color) 8%, var(--bg-color));
-}
-
-.github-import-token-type:has(input:focus-visible) {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
+.github-import-access-form,
+.github-import-access-manage,
+.github-import-access-unlock,
+.github-import-pat-protection {
+  display: grid;
+  gap: 8px;
 }
 
-.github-import-token-type > input {
-  width: 16px;
-  height: 16px;
-  margin: 2px 0 0;
-  flex: 0 0 auto;
-  accent-color: var(--accent-color);
+.github-import-access-form .reset-modal-label,
+.github-import-access-manage .reset-modal-label,
+.github-import-pat-protection .reset-modal-label,
+.github-import-access-actions > button {
+  white-space: nowrap;
 }
 
-.github-import-token-type-copy {
-  display: grid;
-  gap: 3px;
+.github-import-access-selected-meta {
   min-width: 0;
+  overflow: hidden;
   color: var(--text-secondary);
   font-size: var(--ui-font-sm);
-  line-height: 1.35;
-}
-
-.github-import-token-type-heading {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 5px;
-  color: var(--text-color);
-  font-size: var(--ui-font-md);
-  line-height: 1.3;
-}
-
-.github-import-recommended-badge {
-  padding: 1px 6px;
-  border: 1px solid color-mix(in srgb, #1a7f37 32%, var(--border-color));
-  border-radius: 999px;
-  background: color-mix(in srgb, #1a7f37 10%, var(--bg-color));
-  color: #1a7f37;
-  font-size: var(--ui-font-xs);
-  font-weight: 700;
-  line-height: 1.4;
-}
-
-[data-theme="dark"] .github-import-recommended-badge {
-  border-color: color-mix(in srgb, #3fb950 42%, var(--border-color));
-  background: color-mix(in srgb, #3fb950 12%, var(--bg-color));
-  color: #56d364;
-}
-
-.github-import-access-form,
-.github-import-access-unlock,
-.github-import-pat-protection {
-  display: grid;
-  gap: 6px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .github-import-access-unlock {
@@ -6244,22 +6183,6 @@ a:focus {
   background: color-mix(in srgb, var(--accent-color) 6%, var(--bg-color));
 }
 
-.github-import-access-saved {
-  display: flex;
-  align-items: center;
-  gap: 7px;
-  color: var(--text-color);
-  font-size: var(--ui-font-md);
-  line-height: 1.35;
-}
-
-.github-import-access-saved > .lucide {
-  width: 15px;
-  height: 15px;
-  flex: 0 0 auto;
-  color: var(--accent-color);
-}
-
 .github-import-access-inline {
   display: grid;
   grid-template-columns: minmax(0, 1fr) auto;
@@ -6310,6 +6233,27 @@ a:focus {
   color: var(--color-danger-fg, #cf222e);
 }
 
+.github-import-access-text-btn {
+  min-height: 28px;
+  padding: 3px 5px;
+  border: 0;
+  background: transparent;
+  color: var(--text-secondary);
+  cursor: pointer;
+  font: inherit;
+  font-size: var(--ui-font-sm);
+}
+
+.github-import-access-text-btn:hover {
+  color: var(--text-color);
+}
+
+.github-import-access-text-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-access-secondary-btn > .lucide,
 .github-import-access-danger-btn > .lucide {
   width: 14px;
   height: 14px;
@@ -6335,16 +6279,6 @@ a:focus {
   opacity: 0.55;
 }
 
-.github-import-access-help a {
-  color: var(--accent-color);
-  font-weight: 600;
-}
-
-.github-import-access-help code {
-  color: var(--text-color);
-  font-size: inherit;
-}
-
 .github-import-access-status {
   margin: 0;
   padding: 8px 10px;
@@ -6826,9 +6760,14 @@ a:focus {
 }
 
 @media (max-width: 430px) {
-  .github-import-token-type-grid {
+  .github-import-access-form-grid {
     grid-template-columns: minmax(0, 1fr);
   }
+
+  .github-import-access-selection-row {
+    align-items: flex-start;
+    flex-direction: column;
+  }
 }
 
 @media (prefers-reduced-motion: reduce) {
diff --git a/index.html b/index.html
index 44b22d59..ea097cfc 100644
--- a/index.html
+++ b/index.html
@@ -1386,75 +1386,70 @@ <h2 class="about-title">Markdown Viewer</h2>
                   <span class="github-import-access-icon" aria-hidden="true"><i class="lucide lucide-shield-check"></i></span>
                   <span class="github-import-access-copy">
                     <span id="github-import-access-title" class="github-import-access-title">Private repository access</span>
-                    <span id="github-import-access-summary" class="github-import-access-summary">No token stored · public repositories only</span>
+                    <span id="github-import-access-summary" class="github-import-access-summary">No access token added</span>
                   </span>
                   <i class="lucide lucide-chevron-down github-import-access-chevron" aria-hidden="true"></i>
                 </button>
                 <div id="github-import-access-panel" class="github-import-access-panel" hidden>
-                  <p id="github-import-access-intro" class="github-import-access-intro">Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.</p>
-                  <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
-                    <div class="github-import-access-saved">
-                      <i class="lucide lucide-lock-keyhole" aria-hidden="true"></i>
-                      <span id="github-import-access-saved-text">An encrypted token is saved on this device.</span>
+                  <div id="github-import-access-manage" class="github-import-access-manage" hidden>
+                    <label class="reset-modal-label" for="github-import-pat-select">Access token</label>
+                    <select id="github-import-pat-select" class="rename-modal-input"></select>
+                    <div class="github-import-access-selection-row">
+                      <span id="github-import-access-selected-meta" class="github-import-access-selected-meta"></span>
+                      <div class="github-import-access-actions">
+                        <button type="button" id="github-import-pat-add-another" class="github-import-access-secondary-btn">
+                          <i class="lucide lucide-plus" aria-hidden="true"></i>
+                          Add another
+                        </button>
+                        <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn">
+                          <i class="lucide lucide-trash-2" aria-hidden="true"></i>
+                          Remove
+                        </button>
+                      </div>
                     </div>
-                    <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
-                    <div class="github-import-access-inline">
-                      <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
-                      <button type="button" id="github-import-pat-unlock" class="github-import-access-secondary-btn">Unlock</button>
+                    <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
+                      <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
+                      <div class="github-import-access-inline">
+                        <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
+                        <button type="button" id="github-import-pat-unlock" class="github-import-access-primary-btn">Unlock</button>
+                      </div>
                     </div>
                   </div>
                   <div id="github-import-access-form" class="github-import-access-form">
-                    <fieldset class="github-import-token-types">
-                      <legend class="reset-modal-label">Token type</legend>
-                      <div class="github-import-token-type-grid">
-                        <label class="github-import-token-type">
-                          <input type="radio" name="github-import-pat-type" value="fine-grained" checked />
-                          <span class="github-import-token-type-copy">
-                            <span class="github-import-token-type-heading">
-                              <strong>Fine-grained PAT</strong>
-                              <span class="github-import-recommended-badge">Recommended</span>
-                            </span>
-                            <span>Selected repositories or all repositories for one owner.</span>
-                          </span>
-                        </label>
-                        <label class="github-import-token-type">
-                          <input type="radio" name="github-import-pat-type" value="classic" />
-                          <span class="github-import-token-type-copy">
-                            <span class="github-import-token-type-heading">
-                              <strong>Personal access token (classic)</strong>
-                            </span>
-                            <span>Compatibility option with broader repository access.</span>
-                          </span>
-                        </label>
+                    <div class="github-import-access-form-heading">
+                      <strong>Add access token</strong>
+                      <button type="button" id="github-import-pat-add-cancel" class="github-import-access-text-btn" hidden>Cancel</button>
+                    </div>
+                    <div class="github-import-access-form-grid">
+                      <div class="github-import-access-field">
+                        <label class="reset-modal-label" for="github-import-pat-type">Token type</label>
+                        <select id="github-import-pat-type" class="rename-modal-input">
+                          <option value="fine-grained">Fine-grained (Recommended)</option>
+                          <option value="classic">Classic</option>
+                        </select>
+                      </div>
+                      <div class="github-import-access-field">
+                        <label class="reset-modal-label" for="github-import-pat-name">Token name</label>
+                        <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My first access token" autocomplete="off" spellcheck="false" />
                       </div>
-                    </fieldset>
-                    <label id="github-import-pat-label" class="reset-modal-label" for="github-import-pat">Fine-grained PAT</label>
-                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" aria-describedby="github-import-pat-help" />
-                    <label class="reset-modal-label" for="github-import-pat-retention">Keep access</label>
+                    </div>
+                    <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
+                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
+                    <label class="reset-modal-label" for="github-import-pat-retention">Disposal</label>
                     <select id="github-import-pat-retention" class="rename-modal-input">
-                      <option value="session">This session only (recommended)</option>
-                      <option value="1">Encrypted for 1 day</option>
-                      <option value="7">Encrypted for 7 days</option>
-                      <option value="30">Encrypted for 30 days</option>
+                      <option value="session">End of this session</option>
+                      <option value="1">After 1 day</option>
+                      <option value="7">After 7 days</option>
+                      <option value="30">After 30 days</option>
                     </select>
                     <div id="github-import-pat-protection" class="github-import-pat-protection" hidden>
                       <label class="reset-modal-label" for="github-import-pat-passphrase">Protection passphrase</label>
-                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" />
-                      <span class="github-import-field-note">At least 12 characters. This passphrase is never stored and cannot be recovered.</span>
+                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" placeholder="12+ characters" />
                     </div>
                     <div class="github-import-access-actions">
-                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Use secure access</button>
-                      <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn" hidden>
-                        <i class="lucide lucide-trash-2" aria-hidden="true"></i>
-                        Remove access
-                      </button>
+                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Add access</button>
                     </div>
                   </div>
-                  <p id="github-import-pat-help" class="github-import-access-help">
-                    <span id="github-import-pat-scope-note">Use selected repositories or all repositories for one owner.</span>
-                    The token is sent only to <code>api.github.com</code>. Local expiry removes the saved copy but does not revoke the token on GitHub.
-                    <a id="github-import-pat-create-link" href="https://github.com/settings/personal-access-tokens/new" target="_blank" rel="noopener noreferrer">Create a fine-grained token</a>
-                  </p>
                   <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
                 </div>
               </section>
diff --git a/script.js b/script.js
index 865e9a88..f25397e8 100644
--- a/script.js
+++ b/script.js
@@ -541,21 +541,23 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportAccessToggle = document.getElementById("github-import-access-toggle");
   const githubImportAccessPanel = document.getElementById("github-import-access-panel");
   const githubImportAccessSummary = document.getElementById("github-import-access-summary");
+  const githubImportAccessManage = document.getElementById("github-import-access-manage");
+  const githubImportAccessForm = document.getElementById("github-import-access-form");
+  const githubImportPatSelect = document.getElementById("github-import-pat-select");
+  const githubImportAccessSelectedMeta = document.getElementById("github-import-access-selected-meta");
+  const githubImportPatAddAnotherBtn = document.getElementById("github-import-pat-add-another");
+  const githubImportPatAddCancelBtn = document.getElementById("github-import-pat-add-cancel");
   const githubImportAccessUnlock = document.getElementById("github-import-access-unlock");
-  const githubImportAccessSavedText = document.getElementById("github-import-access-saved-text");
   const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
   const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
-  const githubImportPatTypeInputs = Array.from(document.querySelectorAll('input[name="github-import-pat-type"]'));
-  const githubImportAccessIntro = document.getElementById("github-import-access-intro");
-  const githubImportPatLabel = document.getElementById("github-import-pat-label");
+  const githubImportPatTypeSelect = document.getElementById("github-import-pat-type");
+  const githubImportPatNameInput = document.getElementById("github-import-pat-name");
   const githubImportPatInput = document.getElementById("github-import-pat");
   const githubImportPatRetention = document.getElementById("github-import-pat-retention");
   const githubImportPatProtection = document.getElementById("github-import-pat-protection");
   const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
-  const githubImportPatScopeNote = document.getElementById("github-import-pat-scope-note");
-  const githubImportPatCreateLink = document.getElementById("github-import-pat-create-link");
   const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
@@ -11303,7 +11305,9 @@ ${selector} .arrowheadPath {
   }
   const GITHUB_IMPORT_MIN_REQUEST_INTERVAL_MS = 800;
   const GITHUB_API_VERSION = "2022-11-28";
-  const GITHUB_ACCESS_RECORD_NAME = "githubAccessRecordV1";
+  const GITHUB_ACCESS_VAULT_NAME = "githubAccessVaultV2";
+  const GITHUB_LEGACY_ACCESS_RECORD_NAME = "githubAccessRecordV1";
+  const GITHUB_ACCESS_VAULT_VERSION = 2;
   const GITHUB_PAT_VAULT_VERSION = 1;
   const GITHUB_PAT_KDF_ITERATIONS = 250000;
   let lastGitHubImportRequestAt = 0;
@@ -11311,10 +11315,12 @@ ${selector} .arrowheadPath {
   const collapsedGitHubImportFolders = new Set();
   let availableGitHubImportPaths = [];
   let githubImportSearchTimer = null;
-  let githubAccessToken = "";
-  let githubAccessTokenExpiresAt = 0;
-  let githubAccessTokenType = "fine-grained";
-  let githubPatStoredRecord = null;
+  let githubAccessEntries = [];
+  let githubSelectedAccessId = "";
+  let githubAccessAdding = true;
+  let githubAccessVaultLoaded = false;
+  let githubAccessVaultLoadPromise = null;
+  const githubUnlockedAccessTokens = new Map();
   let githubPatExpiryTimer = null;
 
   function getFileName(path) {
@@ -11439,90 +11445,78 @@ ${selector} .arrowheadPath {
     }
   }
 
-  function clearExpiredGitHubAccessToken() {
-    if (!githubAccessTokenExpiresAt || Date.now() < githubAccessTokenExpiresAt) return;
-    githubAccessToken = "";
-    githubAccessTokenExpiresAt = 0;
-    githubPatStoredRecord = null;
-    if (workspaceStorage && typeof workspaceStorage.deleteMetadata === "function") {
-      void workspaceStorage.init()
-        .then(() => workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME))
-        .catch(() => {});
+  function normalizeGitHubPatType(value) {
+    return value === "classic" ? "classic" : "fine-grained";
+  }
+
+  function createGitHubAccessId() {
+    if (globalThis.crypto && typeof globalThis.crypto.randomUUID === "function") {
+      return "github_access_" + globalThis.crypto.randomUUID();
+    }
+    return "github_access_" + Date.now() + "_" + Math.random().toString(36).slice(2, 10);
+  }
+
+  function getSelectedGitHubAccessEntry() {
+    return githubAccessEntries.find(function(entry) {
+      return entry.id === githubSelectedAccessId;
+    }) || null;
+  }
+
+  function pruneExpiredGitHubAccessEntries() {
+    const now = Date.now();
+    const expiredIds = new Set(
+      githubAccessEntries
+        .filter(function(entry) {
+          return Number(entry.expiresAt) > 0 && Number(entry.expiresAt) <= now;
+        })
+        .map(function(entry) { return entry.id; })
+    );
+    if (!expiredIds.size) return 0;
+    githubAccessEntries = githubAccessEntries.filter(function(entry) {
+      return !expiredIds.has(entry.id);
+    });
+    expiredIds.forEach(function(id) {
+      githubUnlockedAccessTokens.delete(id);
+    });
+    if (!getSelectedGitHubAccessEntry()) {
+      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     }
+    return expiredIds.size;
   }
 
-  function scheduleGitHubAccessExpiry(expiresAt) {
+  function scheduleGitHubAccessExpiry() {
     clearTimeout(githubPatExpiryTimer);
     githubPatExpiryTimer = null;
-    if (!expiresAt) return;
-    const remaining = Number(expiresAt) - Date.now();
+    const expiries = githubAccessEntries
+      .map(function(entry) { return Number(entry.expiresAt) || 0; })
+      .filter(function(expiresAt) { return expiresAt > 0; });
+    if (!expiries.length) return;
+    const nextExpiry = Math.min.apply(Math, expiries);
+    const remaining = nextExpiry - Date.now();
     if (remaining <= 0) {
-      void removeGitHubAccess({ silent: true })
+      const expiredCount = pruneExpiredGitHubAccessEntries();
+      void persistGitHubAccessVault()
         .then(function() {
-          setGitHubAccessStatus("Private repository access expired and was removed from this device.", "success");
-          announceToScreenReader("GitHub private repository access expired and was removed.");
+          renderGitHubAccessState();
+          if (expiredCount) {
+            setGitHubAccessStatus(expiredCount === 1 ? "Expired access removed." : expiredCount + " expired tokens removed.", "success");
+            announceToScreenReader("Expired GitHub access removed.");
+          }
         })
         .catch(() => {});
       return;
     }
     githubPatExpiryTimer = setTimeout(function() {
-      scheduleGitHubAccessExpiry(expiresAt);
+      scheduleGitHubAccessExpiry();
     }, Math.min(remaining, 2147483647));
   }
 
   function getGitHubAccessToken() {
-    clearExpiredGitHubAccessToken();
-    return githubAccessToken;
-  }
-
-  function normalizeGitHubPatType(value) {
-    return value === "classic" ? "classic" : "fine-grained";
-  }
-
-  function getSelectedGitHubPatType() {
-    const selected = githubImportPatTypeInputs.find(function(input) {
-      return input.checked;
-    });
-    return normalizeGitHubPatType(selected && selected.value);
-  }
-
-  function renderGitHubPatType() {
-    const tokenType = getSelectedGitHubPatType();
-    const isClassic = tokenType === "classic";
-    if (githubImportAccess) {
-      githubImportAccess.dataset.tokenType = tokenType;
-    }
-    if (githubImportAccessIntro) {
-      githubImportAccessIntro.innerHTML = isClassic
-        ? "Classic tokens can work across repository owners, but the <strong>repo</strong> scope grants broad access. Use only when fine-grained access is not suitable."
-        : "Fine-grained tokens can cover multiple selected repositories under one owner. Grant <strong>Contents: Read-only</strong>.";
-    }
-    if (githubImportPatLabel) {
-      githubImportPatLabel.textContent = isClassic
-        ? "Personal access token (classic)"
-        : "Fine-grained PAT";
-    }
-    if (githubImportPatScopeNote) {
-      githubImportPatScopeNote.textContent = isClassic
-        ? "The classic repo scope can access every repository your account can reach."
-        : "Use selected repositories or all repositories for one owner.";
-    }
-    if (githubImportPatCreateLink) {
-      githubImportPatCreateLink.href = isClassic
-        ? "https://github.com/settings/tokens/new"
-        : "https://github.com/settings/personal-access-tokens/new";
-      githubImportPatCreateLink.textContent = isClassic
-        ? "Create a classic token"
-        : "Create a fine-grained token";
+    if (pruneExpiredGitHubAccessEntries()) {
+      void persistGitHubAccessVault().catch(() => {});
+      renderGitHubAccessState();
     }
-  }
-
-  function setSelectedGitHubPatType(value) {
-    const tokenType = normalizeGitHubPatType(value);
-    githubImportPatTypeInputs.forEach(function(input) {
-      input.checked = input.value === tokenType;
-    });
-    renderGitHubPatType();
+    return githubUnlockedAccessTokens.get(githubSelectedAccessId) || "";
   }
 
   function getGitHubApiHeaders(accept, authenticated) {
@@ -11672,14 +11666,31 @@ ${selector} .arrowheadPath {
         && Boolean(getGitHubAccessToken());
       if (!canRetryWithToken) {
         if (error instanceof GitHubRequestError && error.status === 404) {
+          const selectedAccess = getSelectedGitHubAccessEntry();
+          if (selectedAccess && !githubUnlockedAccessTokens.has(selectedAccess.id)) {
+            throw new Error(`Unlock "${selectedAccess.name}" to access this private repository.`);
+          }
           throw new Error("Repository not found. If it is private, add secure private repository access and try again.");
         }
         throw error;
       }
-      return {
-        info: await fetchGitHubJson(url, { authenticated: true }),
-        authenticated: true
-      };
+      try {
+        return {
+          info: await fetchGitHubJson(url, { authenticated: true }),
+          authenticated: true
+        };
+      } catch (authenticatedError) {
+        const selectedAccess = getSelectedGitHubAccessEntry();
+        const accessName = selectedAccess ? `"${selectedAccess.name}"` : "The selected token";
+        if (authenticatedError instanceof GitHubRequestError && authenticatedError.status === 401) {
+          throw new Error(`${accessName} was rejected by GitHub. Replace or remove it.`);
+        }
+        if (authenticatedError instanceof GitHubRequestError
+          && (authenticatedError.status === 403 || authenticatedError.status === 404)) {
+          throw new Error(`${accessName} cannot access ${owner}/${repo}. Check its repository access and permissions.`);
+        }
+        throw authenticatedError;
+      }
     }
   }
 
@@ -11740,8 +11751,8 @@ ${selector} .arrowheadPath {
     };
   }
 
-  function getGitHubPatAdditionalData(expiresAt) {
-    return new TextEncoder().encode(`markdown-viewer:${GITHUB_ACCESS_RECORD_NAME}:${expiresAt}`);
+  function getGitHubPatAdditionalData(expiresAt, aadContext) {
+    return new TextEncoder().encode(`markdown-viewer:${aadContext || GITHUB_ACCESS_VAULT_NAME}:${expiresAt}`);
   }
 
   async function encryptGitHubAccessToken(token, passphrase, expiresAt) {
@@ -11759,7 +11770,7 @@ ${selector} .arrowheadPath {
       {
         name: "AES-GCM",
         iv,
-        additionalData: getGitHubPatAdditionalData(expiresAt),
+        additionalData: getGitHubPatAdditionalData(expiresAt, GITHUB_ACCESS_VAULT_NAME),
         tagLength: 128
       },
       key,
@@ -11774,6 +11785,7 @@ ${selector} .arrowheadPath {
       iv: bytesToBase64(iv),
       ciphertext: bytesToBase64(new Uint8Array(ciphertext)),
       expiresAt,
+      aadContext: GITHUB_ACCESS_VAULT_NAME,
       createdAt: Date.now()
     };
   }
@@ -11794,7 +11806,10 @@ ${selector} .arrowheadPath {
       {
         name: "AES-GCM",
         iv: base64ToBytes(record.iv),
-        additionalData: getGitHubPatAdditionalData(expiresAt),
+        additionalData: getGitHubPatAdditionalData(
+          expiresAt,
+          record.aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME
+        ),
         tagLength: 128
       },
       key,
@@ -11823,88 +11838,226 @@ ${selector} .arrowheadPath {
     githubImportAccessStatus.classList.toggle("is-success", state === "success");
   }
 
+  function resetGitHubAccessForm() {
+    if (githubImportPatTypeSelect) githubImportPatTypeSelect.value = "fine-grained";
+    if (githubImportPatNameInput) githubImportPatNameInput.value = "";
+    if (githubImportPatInput) githubImportPatInput.value = "";
+    if (githubImportPatRetention) githubImportPatRetention.value = "session";
+    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
+  }
+
+  function setGitHubAccessAdding(isAdding, options = {}) {
+    githubAccessAdding = Boolean(isAdding) || !githubAccessEntries.length;
+    if (githubAccessAdding && options.reset !== false) resetGitHubAccessForm();
+    setGitHubAccessStatus("");
+    renderGitHubAccessState();
+    if (githubAccessAdding && options.focus !== false && githubImportPatNameInput) {
+      requestAnimationFrame(function() {
+        githubImportPatNameInput.focus();
+        githubImportPatNameInput.scrollIntoView({ block: "nearest" });
+      });
+    }
+  }
+
+  function getGitHubAccessTypeLabel(type) {
+    return normalizeGitHubPatType(type) === "classic" ? "Classic" : "Fine-grained";
+  }
+
   function renderGitHubAccessState() {
-    clearExpiredGitHubAccessToken();
-    const hasActiveToken = Boolean(getGitHubAccessToken());
-    const hasStoredRecord = Boolean(githubPatStoredRecord);
-    const tokenType = hasActiveToken
-      ? githubAccessTokenType
-      : hasStoredRecord
-        ? normalizeGitHubPatType(githubPatStoredRecord.tokenType)
-        : getSelectedGitHubPatType();
-    const tokenTypeLabel = tokenType === "classic" ? "classic" : "fine-grained";
-    if ((hasActiveToken || hasStoredRecord) && getSelectedGitHubPatType() !== tokenType) {
-      setSelectedGitHubPatType(tokenType);
+    const removedCount = pruneExpiredGitHubAccessEntries();
+    if (removedCount) void persistGitHubAccessVault().catch(() => {});
+    if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
+      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     }
+
+    const selectedEntry = getSelectedGitHubAccessEntry();
+    const hasEntries = githubAccessEntries.length > 0;
+    const isUnlocked = Boolean(selectedEntry && githubUnlockedAccessTokens.has(selectedEntry.id));
+    githubAccessAdding = githubAccessAdding || !hasEntries;
+
     if (githubImportAccess) {
-      githubImportAccess.dataset.state = hasActiveToken ? "active" : hasStoredRecord ? "locked" : "empty";
+      githubImportAccess.dataset.state = !selectedEntry ? "empty" : isUnlocked ? "active" : "locked";
     }
     if (githubImportAccessSummary) {
-      githubImportAccessSummary.textContent = hasActiveToken
-        ? `Access ready · ${tokenTypeLabel} · ${githubAccessTokenExpiresAt ? "expires " + formatGitHubAccessExpiry(githubAccessTokenExpiresAt) : "session only"}`
-        : hasStoredRecord
-          ? `Encrypted token saved · ${tokenTypeLabel} · expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}`
-          : "No token stored · public repositories only";
+      githubImportAccessSummary.textContent = selectedEntry
+        ? `${selectedEntry.name} · ${isUnlocked ? "Ready" : "Locked"}`
+        : "No access token added";
+    }
+    if (githubImportAccessManage) {
+      githubImportAccessManage.hidden = !hasEntries || githubAccessAdding;
+    }
+    if (githubImportAccessForm) {
+      githubImportAccessForm.hidden = hasEntries && !githubAccessAdding;
+    }
+    if (githubImportPatAddCancelBtn) {
+      githubImportPatAddCancelBtn.hidden = !hasEntries;
+    }
+    if (githubImportPatSelect) {
+      githubImportPatSelect.replaceChildren();
+      githubAccessEntries.forEach(function(entry) {
+        const option = document.createElement("option");
+        option.value = entry.id;
+        option.textContent = entry.name;
+        githubImportPatSelect.appendChild(option);
+      });
+      githubImportPatSelect.value = githubSelectedAccessId;
     }
-    if (githubImportAccessUnlock) {
-      githubImportAccessUnlock.hidden = !hasStoredRecord || hasActiveToken;
+    if (githubImportAccessSelectedMeta) {
+      githubImportAccessSelectedMeta.textContent = selectedEntry
+        ? `${getGitHubAccessTypeLabel(selectedEntry.tokenType)} · ${selectedEntry.sessionOnly ? "This session" : "Disposes " + formatGitHubAccessExpiry(selectedEntry.expiresAt)}`
+        : "";
     }
-    if (githubImportAccessSavedText && hasStoredRecord) {
-      githubImportAccessSavedText.textContent = `Encrypted access expires ${formatGitHubAccessExpiry(githubPatStoredRecord.expiresAt)}.`;
+    if (githubImportAccessUnlock) {
+      githubImportAccessUnlock.hidden = !selectedEntry || selectedEntry.sessionOnly || isUnlocked;
     }
     if (githubImportPatRemoveBtn) {
-      githubImportPatRemoveBtn.hidden = !hasActiveToken && !hasStoredRecord;
+      githubImportPatRemoveBtn.hidden = !selectedEntry;
     }
+    scheduleGitHubAccessExpiry();
+  }
+
+  async function persistGitHubAccessVault() {
+    if (!workspaceStorage) return;
+    const entries = githubAccessEntries.filter(function(entry) {
+      return !entry.sessionOnly && Number(entry.expiresAt) > Date.now();
+    });
+    await workspaceStorage.init();
+    if (!entries.length) {
+      if (typeof workspaceStorage.deleteMetadata === "function") {
+        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_VAULT_NAME);
+      } else {
+        await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, null);
+      }
+      return;
+    }
+    await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, {
+      version: GITHUB_ACCESS_VAULT_VERSION,
+      entries,
+      updatedAt: Date.now()
+    });
+  }
+
+  function normalizeStoredGitHubAccessEntry(entry, fallbackName, aadContext) {
+    if (!entry || typeof entry.ciphertext !== "string") return null;
+    const expiresAt = Number(entry.expiresAt);
+    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) return null;
+    return {
+      id: typeof entry.id === "string" && entry.id ? entry.id : createGitHubAccessId(),
+      name: typeof entry.name === "string" && entry.name.trim()
+        ? entry.name.trim().slice(0, 60)
+        : fallbackName,
+      tokenType: normalizeGitHubPatType(entry.tokenType),
+      sessionOnly: false,
+      version: GITHUB_PAT_VAULT_VERSION,
+      algorithm: "AES-GCM",
+      kdf: "PBKDF2-SHA-256",
+      iterations: Number(entry.iterations) || GITHUB_PAT_KDF_ITERATIONS,
+      salt: String(entry.salt || ""),
+      iv: String(entry.iv || ""),
+      ciphertext: entry.ciphertext,
+      expiresAt,
+      aadContext: entry.aadContext || aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME,
+      createdAt: Number(entry.createdAt) || Date.now()
+    };
   }
 
   async function loadStoredGitHubAccess() {
-    githubPatStoredRecord = null;
-    if (!workspaceStorage) {
+    if (githubAccessVaultLoaded) {
       renderGitHubAccessState();
       return;
     }
-    try {
-      await workspaceStorage.init();
-      const record = await workspaceStorage.getMetadata(GITHUB_ACCESS_RECORD_NAME);
-      if (record && Number(record.expiresAt) <= Date.now()) {
-        if (typeof workspaceStorage.deleteMetadata === "function") {
-          await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
+    if (githubAccessVaultLoadPromise) {
+      await githubAccessVaultLoadPromise;
+      return;
+    }
+    githubAccessVaultLoadPromise = (async function() {
+      if (!workspaceStorage) {
+        githubAccessVaultLoaded = true;
+        renderGitHubAccessState();
+        return;
+      }
+      try {
+        await workspaceStorage.init();
+        const sessionEntries = githubAccessEntries.filter(function(entry) { return entry.sessionOnly; });
+        const vault = await workspaceStorage.getMetadata(GITHUB_ACCESS_VAULT_NAME);
+        const storedEntries = vault && vault.version === GITHUB_ACCESS_VAULT_VERSION && Array.isArray(vault.entries)
+          ? vault.entries
+          : [];
+        const normalizedStoredEntries = storedEntries
+          .map(function(entry, index) {
+            return normalizeStoredGitHubAccessEntry(entry, `Saved GitHub access ${index + 1}`, GITHUB_ACCESS_VAULT_NAME);
+          })
+          .filter(Boolean);
+        const legacyRecord = await workspaceStorage.getMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
+        const legacyEntry = normalizeStoredGitHubAccessEntry(
+          legacyRecord,
+          "Imported GitHub access",
+          GITHUB_LEGACY_ACCESS_RECORD_NAME
+        );
+        const merged = [...sessionEntries, ...normalizedStoredEntries];
+        if (legacyEntry && !merged.some(function(entry) {
+          return entry.id === legacyEntry.id || entry.ciphertext === legacyEntry.ciphertext;
+        })) {
+          merged.push(legacyEntry);
         }
-        setGitHubAccessStatus("Expired private repository access was removed from this device.", "success");
-      } else if (record) {
-        githubPatStoredRecord = record;
-        githubAccessTokenType = normalizeGitHubPatType(record.tokenType);
-        scheduleGitHubAccessExpiry(record.expiresAt);
+        githubAccessEntries = merged;
+        if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
+          githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
+        }
+        githubAccessAdding = !githubAccessEntries.length;
+        githubAccessVaultLoaded = true;
+        if (legacyRecord || normalizedStoredEntries.length !== storedEntries.length) {
+          await persistGitHubAccessVault();
+        }
+        if (legacyRecord) {
+          if (typeof workspaceStorage.deleteMetadata === "function") {
+            await workspaceStorage.deleteMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
+          } else {
+            await workspaceStorage.setMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME, null);
+          }
+        }
+        renderGitHubAccessState();
+      } catch (_) {
+        githubAccessVaultLoaded = true;
+        setGitHubAccessStatus("Saved access could not be loaded.", "error");
+        renderGitHubAccessState();
       }
-    } catch (_) {
-      setGitHubAccessStatus("Saved private access could not be read. Session-only access is still available.", "error");
+    })();
+    try {
+      await githubAccessVaultLoadPromise;
+    } finally {
+      githubAccessVaultLoadPromise = null;
     }
-    renderGitHubAccessState();
   }
 
   async function removeGitHubAccess(options = {}) {
-    clearTimeout(githubPatExpiryTimer);
-    githubPatExpiryTimer = null;
-    githubAccessToken = "";
-    githubAccessTokenExpiresAt = 0;
-    githubAccessTokenType = "fine-grained";
-    githubPatStoredRecord = null;
-    if (githubImportPatInput) githubImportPatInput.value = "";
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    const accessId = options.id || githubSelectedAccessId;
+    const removedIndex = githubAccessEntries.findIndex(function(entry) { return entry.id === accessId; });
+    if (removedIndex < 0) return;
+    const removedEntry = githubAccessEntries[removedIndex];
+    const unlockedToken = githubUnlockedAccessTokens.get(accessId);
+    const previousSelectedId = githubSelectedAccessId;
+    const previousAdding = githubAccessAdding;
+    githubAccessEntries = githubAccessEntries.filter(function(entry) { return entry.id !== accessId; });
+    githubUnlockedAccessTokens.delete(accessId);
+    githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
+    githubAccessAdding = !githubAccessEntries.length;
     if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
-    if (workspaceStorage) {
-      await workspaceStorage.init();
-      if (typeof workspaceStorage.deleteMetadata === "function") {
-        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
-      } else {
-        await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, null);
-      }
+    try {
+      if (!removedEntry.sessionOnly) await persistGitHubAccessVault();
+    } catch (error) {
+      githubAccessEntries.splice(removedIndex, 0, removedEntry);
+      if (unlockedToken) githubUnlockedAccessTokens.set(accessId, unlockedToken);
+      githubSelectedAccessId = previousSelectedId;
+      githubAccessAdding = previousAdding;
+      renderGitHubAccessState();
+      throw error;
     }
-    setSelectedGitHubPatType("fine-grained");
     renderGitHubAccessState();
     if (!options.silent) {
-      setGitHubAccessStatus("Private repository access was removed from this device.", "success");
-      announceToScreenReader("GitHub private repository access removed.");
+      setGitHubAccessStatus(`"${removedEntry.name}" removed.`, "success");
+      announceToScreenReader("GitHub access token removed.");
     }
   }
 
@@ -11914,14 +12067,34 @@ ${selector} .arrowheadPath {
     }
   }
 
+  function validateGitHubAccessName(name) {
+    const normalizedName = String(name || "").trim().replace(/\s+/g, " ");
+    if (!normalizedName) throw new Error("Enter a token name.");
+    if (normalizedName.length > 60) throw new Error("Keep the token name to 60 characters or fewer.");
+    if (githubAccessEntries.some(function(entry) {
+      return entry.name.toLocaleLowerCase() === normalizedName.toLocaleLowerCase();
+    })) {
+      throw new Error("Use a unique token name.");
+    }
+    return normalizedName;
+  }
+
   async function saveGitHubAccess() {
-    if (!githubImportPatInput || !githubImportPatRetention) return;
+    if (!githubImportPatInput || !githubImportPatRetention || !githubImportPatNameInput) return;
+    const name = validateGitHubAccessName(githubImportPatNameInput.value);
     const token = githubImportPatInput.value;
     validateGitHubPat(token);
-    const tokenType = getSelectedGitHubPatType();
+    const tokenType = normalizeGitHubPatType(githubImportPatTypeSelect ? githubImportPatTypeSelect.value : "fine-grained");
     const retention = githubImportPatRetention.value;
     let expiresAt = 0;
-    let record = null;
+    let entry = {
+      id: createGitHubAccessId(),
+      name,
+      tokenType,
+      sessionOnly: retention === "session",
+      expiresAt: 0,
+      createdAt: Date.now()
+    };
 
     if (retention !== "session") {
       const days = Number(retention);
@@ -11936,55 +12109,59 @@ ${selector} .arrowheadPath {
         throw new Error("Encrypted workspace storage is unavailable. Use session-only access instead.");
       }
       expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
-      record = await encryptGitHubAccessToken(token, passphrase, expiresAt);
-      record.tokenType = tokenType;
-      await workspaceStorage.init();
-      await workspaceStorage.setMetadata(GITHUB_ACCESS_RECORD_NAME, record);
-    } else if (workspaceStorage) {
-      await workspaceStorage.init();
-      if (typeof workspaceStorage.deleteMetadata === "function") {
-        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_RECORD_NAME);
-      }
+      entry = {
+        ...entry,
+        ...(await encryptGitHubAccessToken(token, passphrase, expiresAt)),
+        id: entry.id,
+        name,
+        tokenType,
+        sessionOnly: false,
+        expiresAt
+      };
     }
 
-    githubAccessToken = token;
-    githubAccessTokenExpiresAt = expiresAt;
-    githubAccessTokenType = tokenType;
-    githubPatStoredRecord = record;
-    scheduleGitHubAccessExpiry(expiresAt);
-    githubImportPatInput.value = "";
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    const previousSelectedId = githubSelectedAccessId;
+    const previousAdding = githubAccessAdding;
+    githubAccessEntries.push(entry);
+    githubUnlockedAccessTokens.set(entry.id, token);
+    githubSelectedAccessId = entry.id;
+    githubAccessAdding = false;
+    try {
+      if (!entry.sessionOnly) await persistGitHubAccessVault();
+    } catch (error) {
+      githubAccessEntries = githubAccessEntries.filter(function(candidate) { return candidate.id !== entry.id; });
+      githubUnlockedAccessTokens.delete(entry.id);
+      githubSelectedAccessId = previousSelectedId;
+      githubAccessAdding = previousAdding;
+      renderGitHubAccessState();
+      throw error;
+    }
+    resetGitHubAccessForm();
     renderGitHubAccessState();
-    setGitHubAccessStatus(
-      expiresAt
-        ? `Private access is ready and encrypted until ${formatGitHubAccessExpiry(expiresAt)}.`
-        : "Private access is ready for this session and was not written to storage.",
-      "success"
-    );
-    announceToScreenReader("GitHub private repository access is ready.");
+    setGitHubAccessStatus(`"${name}" added.`, "success");
+    announceToScreenReader("GitHub access token added.");
   }
 
   async function unlockStoredGitHubAccess() {
-    if (!githubPatStoredRecord || !githubImportPatUnlockPassphrase) return;
+    const selectedEntry = getSelectedGitHubAccessEntry();
+    if (!selectedEntry || selectedEntry.sessionOnly || !githubImportPatUnlockPassphrase) return;
     const passphrase = githubImportPatUnlockPassphrase.value;
     if (!passphrase) throw new Error("Enter the protection passphrase.");
     try {
-      githubAccessToken = await decryptGitHubAccessToken(githubPatStoredRecord, passphrase);
-      githubAccessTokenExpiresAt = Number(githubPatStoredRecord.expiresAt);
-      githubAccessTokenType = normalizeGitHubPatType(githubPatStoredRecord.tokenType);
-      scheduleGitHubAccessExpiry(githubAccessTokenExpiresAt);
+      const token = await decryptGitHubAccessToken(selectedEntry, passphrase);
+      githubUnlockedAccessTokens.set(selectedEntry.id, token);
     } catch (error) {
-      if (Number(githubPatStoredRecord.expiresAt) <= Date.now()) {
-        await removeGitHubAccess({ silent: true });
-        throw new Error("The saved GitHub access expired and was removed.");
+      if (Number(selectedEntry.expiresAt) <= Date.now()) {
+        await removeGitHubAccess({ id: selectedEntry.id, silent: true });
+        throw new Error("The saved access expired and was removed.");
       }
-      throw new Error("The token could not be unlocked. Check the protection passphrase.");
+      throw new Error("Could not unlock this token. Check the passphrase.");
     } finally {
       githubImportPatUnlockPassphrase.value = "";
     }
     renderGitHubAccessState();
-    setGitHubAccessStatus("Encrypted private repository access is unlocked for this session.", "success");
-    announceToScreenReader("GitHub private repository access unlocked.");
+    setGitHubAccessStatus(`"${selectedEntry.name}" unlocked.`, "success");
+    announceToScreenReader("GitHub access token unlocked.");
   }
 
   function renderGitHubRepositoryContext(context) {
@@ -12307,17 +12484,8 @@ ${selector} .arrowheadPath {
     if (githubImportAccess) githubImportAccess.hidden = false;
     if (githubImportAccessToggle) githubImportAccessToggle.setAttribute("aria-expanded", "false");
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
-    if (githubImportPatInput) githubImportPatInput.value = "";
-    setSelectedGitHubPatType(
-      getGitHubAccessToken()
-        ? githubAccessTokenType
-        : githubPatStoredRecord
-          ? githubPatStoredRecord.tokenType
-          : "fine-grained"
-    );
-    if (githubImportPatRetention) githubImportPatRetention.value = "session";
-    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
+    resetGitHubAccessForm();
+    githubAccessAdding = !githubAccessEntries.length;
     if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
     setGitHubAccessStatus("");
     renderGitHubRepositoryContext(null);
@@ -12383,9 +12551,13 @@ ${selector} .arrowheadPath {
       }
       [
         githubImportAccessToggle,
+        githubImportPatSelect,
+        githubImportPatAddAnotherBtn,
+        githubImportPatAddCancelBtn,
         githubImportPatUnlockPassphrase,
         githubImportPatUnlockBtn,
-        ...githubImportPatTypeInputs,
+        githubImportPatTypeSelect,
+        githubImportPatNameInput,
         githubImportPatInput,
         githubImportPatRetention,
         githubImportPatPassphrase,
@@ -12507,6 +12679,12 @@ ${selector} .arrowheadPath {
     } catch (error) {
       console.error("GitHub import failed:", error);
       setGitHubImportMessage("GitHub import failed: " + error.message);
+      if (githubImportAccessToggle && githubImportAccessPanel
+        && /^(Unlock |".+" (?:cannot access|was rejected))/.test(error.message || "")) {
+        githubImportAccessToggle.setAttribute("aria-expanded", "true");
+        githubImportAccessPanel.hidden = false;
+        renderGitHubAccessState();
+      }
       announceToScreenReader("GitHub import failed.");
       if (githubImportTree) {
         githubImportTree.innerHTML = "";
@@ -18742,9 +18920,12 @@ ${selector} .arrowheadPath {
       githubImportAccessToggle.setAttribute("aria-expanded", expanded ? "false" : "true");
       githubImportAccessPanel.hidden = expanded;
       if (!expanded) {
-        const target = githubPatStoredRecord && !getGitHubAccessToken()
+        const selectedEntry = getSelectedGitHubAccessEntry();
+        const target = selectedEntry && !selectedEntry.sessionOnly && !githubUnlockedAccessTokens.has(selectedEntry.id)
           ? githubImportPatUnlockPassphrase
-          : githubImportPatTypeInputs.find(function(input) { return input.checked; }) || githubImportPatInput;
+          : githubAccessAdding
+            ? githubImportPatNameInput
+            : githubImportPatSelect;
         if (target) {
           requestAnimationFrame(function() {
             target.focus();
@@ -18754,13 +18935,29 @@ ${selector} .arrowheadPath {
       }
     });
   }
-  githubImportPatTypeInputs.forEach(function(input) {
-    input.addEventListener("change", function() {
-      if (!input.checked) return;
-      renderGitHubPatType();
+  if (githubImportPatSelect) {
+    githubImportPatSelect.addEventListener("change", function() {
+      githubSelectedAccessId = githubImportPatSelect.value;
+      if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
       setGitHubAccessStatus("");
+      renderGitHubAccessState();
     });
-  });
+  }
+  if (githubImportPatAddAnotherBtn) {
+    githubImportPatAddAnotherBtn.addEventListener("click", function() {
+      setGitHubAccessAdding(true);
+    });
+  }
+  if (githubImportPatAddCancelBtn) {
+    githubImportPatAddCancelBtn.addEventListener("click", function() {
+      setGitHubAccessAdding(false, { focus: false });
+    });
+  }
+  if (githubImportPatTypeSelect) {
+    githubImportPatTypeSelect.addEventListener("change", function() {
+      setGitHubAccessStatus("");
+    });
+  }
   if (githubImportPatRetention) {
     githubImportPatRetention.addEventListener("change", function() {
       const needsPassphrase = githubImportPatRetention.value !== "session";
@@ -18772,7 +18969,7 @@ ${selector} .arrowheadPath {
     githubImportPatSaveBtn.addEventListener("click", async function() {
       const previousText = githubImportPatSaveBtn.textContent;
       githubImportPatSaveBtn.disabled = true;
-      githubImportPatSaveBtn.textContent = "Securing…";
+      githubImportPatSaveBtn.textContent = "Adding…";
       setGitHubAccessStatus("");
       try {
         await saveGitHubAccess();
diff --git a/styles.css b/styles.css
index 9ef7e32d..03601ca2 100644
--- a/styles.css
+++ b/styles.css
@@ -6016,6 +6016,8 @@ a:focus {
 
 .github-import-access[hidden],
 .github-import-access-panel[hidden],
+.github-import-access-manage[hidden],
+.github-import-access-form[hidden],
 .github-import-access-unlock[hidden],
 .github-import-pat-protection[hidden],
 .github-import-access-danger-btn[hidden],
@@ -6125,116 +6127,53 @@ a:focus {
   background: color-mix(in srgb, var(--button-bg) 55%, var(--bg-color));
 }
 
-.github-import-access-intro,
-.github-import-access-help,
-.github-import-field-note {
-  margin: 0;
-  color: var(--text-secondary);
-  font-size: var(--ui-font-sm);
-  line-height: 1.45;
-}
-
-.github-import-access-intro strong {
-  color: var(--text-color);
-}
-
-.github-import-token-types {
+.github-import-access-form-heading,
+.github-import-access-selection-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
   min-width: 0;
-  margin: 0;
-  padding: 0;
-  border: 0;
 }
 
-.github-import-token-types > .reset-modal-label {
-  display: block;
-  margin-bottom: 6px;
-  padding: 0;
+.github-import-access-form-heading {
+  font-size: var(--ui-font-md);
 }
 
-.github-import-token-type-grid {
+.github-import-access-form-grid {
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 8px;
 }
 
-.github-import-token-type {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
+.github-import-access-field {
+  display: grid;
+  gap: 5px;
   min-width: 0;
-  min-height: 68px;
-  padding: 9px;
-  border: 1px solid var(--border-color);
-  border-radius: 8px;
-  background: var(--bg-color);
-  color: var(--text-color);
-  cursor: pointer;
 }
 
-.github-import-token-type:hover {
-  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
-  background: var(--button-hover);
-}
-
-.github-import-token-type:has(input:checked) {
-  border-color: var(--accent-color);
-  background: color-mix(in srgb, var(--accent-color) 8%, var(--bg-color));
-}
-
-.github-import-token-type:has(input:focus-visible) {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
+.github-import-access-form,
+.github-import-access-manage,
+.github-import-access-unlock,
+.github-import-pat-protection {
+  display: grid;
+  gap: 8px;
 }
 
-.github-import-token-type > input {
-  width: 16px;
-  height: 16px;
-  margin: 2px 0 0;
-  flex: 0 0 auto;
-  accent-color: var(--accent-color);
+.github-import-access-form .reset-modal-label,
+.github-import-access-manage .reset-modal-label,
+.github-import-pat-protection .reset-modal-label,
+.github-import-access-actions > button {
+  white-space: nowrap;
 }
 
-.github-import-token-type-copy {
-  display: grid;
-  gap: 3px;
+.github-import-access-selected-meta {
   min-width: 0;
+  overflow: hidden;
   color: var(--text-secondary);
   font-size: var(--ui-font-sm);
-  line-height: 1.35;
-}
-
-.github-import-token-type-heading {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 5px;
-  color: var(--text-color);
-  font-size: var(--ui-font-md);
-  line-height: 1.3;
-}
-
-.github-import-recommended-badge {
-  padding: 1px 6px;
-  border: 1px solid color-mix(in srgb, #1a7f37 32%, var(--border-color));
-  border-radius: 999px;
-  background: color-mix(in srgb, #1a7f37 10%, var(--bg-color));
-  color: #1a7f37;
-  font-size: var(--ui-font-xs);
-  font-weight: 700;
-  line-height: 1.4;
-}
-
-[data-theme="dark"] .github-import-recommended-badge {
-  border-color: color-mix(in srgb, #3fb950 42%, var(--border-color));
-  background: color-mix(in srgb, #3fb950 12%, var(--bg-color));
-  color: #56d364;
-}
-
-.github-import-access-form,
-.github-import-access-unlock,
-.github-import-pat-protection {
-  display: grid;
-  gap: 6px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .github-import-access-unlock {
@@ -6244,22 +6183,6 @@ a:focus {
   background: color-mix(in srgb, var(--accent-color) 6%, var(--bg-color));
 }
 
-.github-import-access-saved {
-  display: flex;
-  align-items: center;
-  gap: 7px;
-  color: var(--text-color);
-  font-size: var(--ui-font-md);
-  line-height: 1.35;
-}
-
-.github-import-access-saved > .lucide {
-  width: 15px;
-  height: 15px;
-  flex: 0 0 auto;
-  color: var(--accent-color);
-}
-
 .github-import-access-inline {
   display: grid;
   grid-template-columns: minmax(0, 1fr) auto;
@@ -6310,6 +6233,27 @@ a:focus {
   color: var(--color-danger-fg, #cf222e);
 }
 
+.github-import-access-text-btn {
+  min-height: 28px;
+  padding: 3px 5px;
+  border: 0;
+  background: transparent;
+  color: var(--text-secondary);
+  cursor: pointer;
+  font: inherit;
+  font-size: var(--ui-font-sm);
+}
+
+.github-import-access-text-btn:hover {
+  color: var(--text-color);
+}
+
+.github-import-access-text-btn:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.github-import-access-secondary-btn > .lucide,
 .github-import-access-danger-btn > .lucide {
   width: 14px;
   height: 14px;
@@ -6335,16 +6279,6 @@ a:focus {
   opacity: 0.55;
 }
 
-.github-import-access-help a {
-  color: var(--accent-color);
-  font-weight: 600;
-}
-
-.github-import-access-help code {
-  color: var(--text-color);
-  font-size: inherit;
-}
-
 .github-import-access-status {
   margin: 0;
   padding: 8px 10px;
@@ -6826,9 +6760,14 @@ a:focus {
 }
 
 @media (max-width: 430px) {
-  .github-import-token-type-grid {
+  .github-import-access-form-grid {
     grid-template-columns: minmax(0, 1fr);
   }
+
+  .github-import-access-selection-row {
+    align-items: flex-start;
+    flex-direction: column;
+  }
 }
 
 @media (prefers-reduced-motion: reduce) {
diff --git a/wiki/FAQ.md b/wiki/FAQ.md
index b1e997c8..5ae2aef6 100644
--- a/wiki/FAQ.md
+++ b/wiki/FAQ.md
@@ -120,7 +120,7 @@ Yes. It supports regular expressions, capture replacements, preserve-case replac
 
 ### Can I import a private GitHub repository?
 
-Yes. Expand **Private repository access** in the GitHub URL dialog. A fine-grained PAT is recommended: it can cover multiple selected repositories, or all repositories, for one resource owner with **Contents: Read-only**. A classic PAT is available as a compatibility option, but its `repo` scope grants much broader repository access. Session-only access is recommended and is not written to storage. Remembered access is AES-GCM encrypted under a separate passphrase, expires after the chosen 1-, 7-, or 30-day period, and can be removed at any time. The app cannot revoke the PAT on GitHub; use GitHub settings to revoke or rotate it.
+Yes. Expand **Private repository access**, choose a token type, give the token a recognizable name, choose its disposal time, and select **Add access**. The form then collapses into a named-token selector; you can add, select, unlock, or remove entries individually. Fine-grained PATs are recommended, while classic PATs remain available for compatibility. Session-only entries are not written to storage. Remembered entries are AES-GCM encrypted under separate passphrases and expire after 1, 7, or 30 days. The app cannot revoke a PAT on GitHub; use GitHub settings to revoke or rotate it.
 
 ### Which PDF option should I use?
 
diff --git a/wiki/Features.md b/wiki/Features.md
index f1158afc..10c51782 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -271,7 +271,7 @@ GitHub import:
 - Every Markdown file found is shown.
 - Requests are rate-limited by the app to avoid hammering GitHub.
 - Public files are fetched as raw content. Private files use GitHub's authenticated Contents API. Both are saved to Explorer without opening new tabs.
-- Optional private access accepts fine-grained PATs (recommended) for selected repositories under one owner and classic PATs as a broad-access compatibility fallback. It is session-only by default; optional 1-, 7-, or 30-day retention stores PBKDF2-derived AES-GCM ciphertext under a separate, non-stored passphrase. Expiry and manual removal delete the local record.
+- Optional private access supports multiple named fine-grained PATs (recommended) or classic PATs in a compact add-then-select flow. Session entries remain only in memory; optional 1-, 7-, or 30-day disposal stores PBKDF2-derived AES-GCM ciphertext under a separate, non-stored passphrase. Expiry and individual removal delete the local entry.
 
 Limitations and privacy:
 
@@ -540,7 +540,7 @@ Security limitations:
 | Local file import | No | Current tab/workspace | Reads selected files only. |
 | Managed media upload | Yes, after first-use consent | Cloudflare KV, content-addressed, 90-day TTL | Publicly retrievable by its unguessable HTTPS URL until expiry; still images 300 KiB optimized, GIF 5 MiB, video 10 MiB. |
 | Markdown/HTML/PDF/PNG export | No, except remote assets already referenced | User download location | Browser may request external images/fonts used by content. |
-| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Fine-grained PAT recommended; classic PAT available for compatibility. Session-only by default or passphrase-encrypted with local expiry/removal. |
+| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Multiple named fine-grained or classic PATs; session-only or passphrase-encrypted with per-entry expiry and removal. |
 | Emoji lookup | Yes | GitHub emoji API response in memory | Used for shortcode picker/lookup. |
 | CDN library loading | Yes | Browser/service-worker cache | Web build only, first use unless cached. |
 | Remote diagram engines | Yes | Third-party renderer response/cache | Source is sent to PlantUML, Kroki, or mermaid.ink depending on renderer/preview. |
diff --git a/wiki/Privacy-and-Security.md b/wiki/Privacy-and-Security.md
index 3ab9f0fe..d7d4ebce 100644
--- a/wiki/Privacy-and-Security.md
+++ b/wiki/Privacy-and-Security.md
@@ -60,7 +60,7 @@ In the desktop application, replacing or deleting the binary does not remove `Do
 | Feature | Data sent | Destination and retention | Access model |
 | :--- | :--- | :--- | :--- |
 | Web/PWA library loading | Library requests, IP and normal HTTP metadata | cdnjs, jsDelivr, or esm.sh; browser/Service Worker cache | Governed by the remote host |
-| GitHub import | Repository/path/ref request and selected content downloads; an optional PAT for private repositories | Public content: GitHub API and `raw.githubusercontent.com`; private content and PAT: `api.github.com` only | Public access is anonymous. Private access is session-only by default or passphrase-encrypted with local expiry and manual removal |
+| GitHub import | Repository/path/ref request and selected content downloads; optional named PATs for private repositories | Public content: GitHub API and `raw.githubusercontent.com`; private content and PAT: `api.github.com` only | Session entries remain in memory; remembered entries are individually passphrase-encrypted with local expiry and removal |
 | Emoji lookup | Emoji API request | GitHub API; response kept in memory/cache | Remote host |
 | Remote diagrams | Diagram source or encoded source | PlantUML, Kroki, or mermaid.ink; response can be browser-cached | Remote renderer receives the source |
 | GeoJSON/TopoJSON maps | Tile and external-asset requests | Configured map-tile or asset host | Remote host |
diff --git a/wiki/Troubleshooting.md b/wiki/Troubleshooting.md
index d3c2b205..0493c801 100644
--- a/wiki/Troubleshooting.md
+++ b/wiki/Troubleshooting.md
@@ -80,7 +80,7 @@ Extension matching is case-insensitive. Rename a plain-text file to `.md` only w
 - Use a public `github.com` repository, tree, blob, or `raw.githubusercontent.com` Markdown URL.
 - For a private repository, use a fine-grained PAT (recommended) with **Contents: Read-only** for the required repositories under one owner. Use a classic PAT only as a broad-access compatibility fallback. If an organization requires approval or SAML authorization, complete that step in GitHub.
 - Branch, tag, and commit URLs are supported. For branch names containing `/`, paste the complete GitHub tree or blob URL so the importer can resolve the longest matching ref.
-- If remembered private access will not unlock, check the protection passphrase. Expired access is deleted locally; create or add a token again if needed.
+- Select the intended named token before importing. If a remembered entry will not unlock, check its protection passphrase. If GitHub rejects it or reports that it cannot access the repository, replace the token or update its repository permissions. Expired entries are deleted locally.
 - Repository and folder results show every Markdown file found.
 - Check GitHub API rate-limit and network responses.
 - Confirm that CSP allows `api.github.com` and `raw.githubusercontent.com`.
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index df96b661..b2e20686 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -123,9 +123,9 @@ Use Import > From GitHub and paste one of these URL types:
 
 Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs resolve the default branch, an explicit branch (including names containing `/`), a tag, or a commit to an immutable commit SHA before listing files. The searchable, collapsible tree contains every Markdown file found, shows the repository, ref, and short commit, and uses the same compact type scale as other application modals. The toolbar shows selected and total file counts and provides an icon that switches between select all and deselect all. Default-branch imports use a repository-named Explorer folder; other refs include the short commit beside the repository name. Nested GitHub directory paths are preserved, and imported files remain closed until you select one in Explorer.
 
-Public repositories need no credentials. For a private repository, expand **Private repository access**. Choose a fine-grained PAT (recommended) with **Contents: Read-only** for multiple selected repositories or all repositories under one owner. Choose a classic PAT only when compatibility across resource owners or another fine-grained limitation requires it; the classic `repo` scope grants broader access. The importer first tries public access and sends the token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
+Public repositories need no credentials. For a private repository, expand **Private repository access**, choose fine-grained (recommended) or classic, enter a name and token, choose a disposal time, and select **Add access**. After adding, the form closes and a dropdown lets you select among multiple named tokens before choosing **Import**. Use **Add another**, **Unlock**, or **Remove** to manage entries. The importer first tries public access and sends the selected token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
 
-**This session only** is the recommended default and never writes the PAT to application storage. The optional 1-, 7-, or 30-day choices require a separate 12-character protection passphrase and store only PBKDF2-derived, AES-GCM authenticated ciphertext. The passphrase is never stored. Expired access becomes unusable and is removed while the app is running or the next time it starts; **Remove access** deletes it immediately. Local removal does not revoke the PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
+**End of this session** never writes the PAT to application storage. The optional 1-, 7-, or 30-day disposal choices require a separate 12-character protection passphrase and store only PBKDF2-derived, AES-GCM authenticated ciphertext. The passphrase is never stored. Expired entries become unusable and are removed while the app is running or the next time it starts. Local removal does not revoke a PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
 
 ## Export Markdown to PDF, HTML, PNG, and MD
 

From 449e3eeb7958555e36f6fd3171118a9b7f7a53ac Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Thu, 30 Jul 2026 22:59:24 +0530
Subject: [PATCH 08/10] docs(contributing): remove obsolete build warning

---
 wiki/Contributing.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/wiki/Contributing.md b/wiki/Contributing.md
index 79c7df3b..7b80ff7a 100644
--- a/wiki/Contributing.md
+++ b/wiki/Contributing.md
@@ -107,8 +107,6 @@ For documentation:
 - search for outdated terminology and unsupported claims; and
 - review `git diff --name-only` to confirm the intended scope.
 
-At commit `5511dc7`, the static validator includes a pre-existing reference to missing `functions/api/report-issue.js`. If that baseline remains, `npm run build` reports the missing asset before documentation changes. Record the baseline failure accurately; do not change product source in a documentation-only pull request.
-
 ## Issue Reports
 
 Search [existing issues](https://github.com/ThisIs-Developer/Markdown-Viewer/issues) before opening a new one. Include:

From 0379a394fe1b8437d1ee8482a3c309ea72f73bd7 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Fri, 31 Jul 2026 00:42:24 +0530
Subject: [PATCH 09/10] refactor(github): simplify private access UI

---
 CHANGELOG.md                       |  11 +-
 README.md                          |   2 +-
 desktop-app/resources/index.html   |  81 ++---
 desktop-app/resources/js/script.js | 468 +++++------------------------
 desktop-app/resources/styles.css   | 211 +++----------
 index.html                         |  81 ++---
 script.js                          | 468 +++++------------------------
 styles.css                         | 211 +++----------
 wiki/FAQ.md                        |   2 +-
 wiki/Features.md                   |   8 +-
 wiki/Privacy-and-Security.md       |   2 +-
 wiki/Troubleshooting.md            |   4 +-
 wiki/Usage-Guide.md                |   6 +-
 13 files changed, 335 insertions(+), 1220 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110bc783..a9755b2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,12 +39,11 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 - Removed the 30-file display cap so repository and folder results expose every Markdown file found.
 - Added complete subtree traversal when GitHub marks a recursive repository tree response as truncated.
 - Added branch, tag, and commit URL resolution, including branch names containing `/`, and pinned each import to the resolved immutable commit SHA.
-- Added optional private repository access with fine-grained PATs marked as recommended and classic PATs offered as a broad-access compatibility fallback.
-- Kept private access session-only by default, with passphrase-protected AES-GCM retention for 1, 7, or 30 days, automatic expiry, and manual removal.
-- Replaced the verbose single-token form with a compact add-then-select flow for multiple named tokens, including individual unlock, expiry, and removal controls.
-- Made the compact GitHub URL dialog body visibly scrollable so every private-access control remains reachable on short screens.
-- Restored the compact 520px GitHub URL step while keeping the searchable file picker at 760px, and added repository, ref, and short-commit context to the selection step.
-- Added file search, selected/total counts, an icon-based select-all toggle, and collapsible GitHub-style folder and file rows using the application typography scale.
+- Added optional private repository access that accepts fine-grained and classic PATs automatically.
+- Kept private access session-only: named tokens remain in memory, disappear on reload or app close, and can be removed individually without a passphrase or unlock step. Retired locally saved GitHub-access records are deleted during upgrade.
+- Replaced the verbose token form with a compact add-then-select flow whose add and remove actions use the same icon-button pattern as the rest of the application.
+- Restored the compact 520px GitHub URL step while keeping the searchable file picker at 760px, and placed repository branch and short-commit context together on the selection step.
+- Added file search, a selected count, matching icon controls for select/deselect all and collapse/expand all, and GitHub-style folder and file rows using the application typography scale.
 - Changed local, drag-and-drop, desktop, and GitHub Markdown imports to save documents in Explorer without opening every imported file as a tab.
 - Batched multi-tab close commands so closing hundreds of tabs performs one state update and render instead of repeatedly rebuilding the interface.
 
diff --git a/README.md b/README.md
index a9e5eef0..b85f9e80 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
 - The searchable GitHub importer shows every Markdown file found in a repository or folder result and resolves branch, tag, and commit URLs to an immutable commit SHA.
-- Private repository access supports multiple named fine-grained PATs (recommended) or classic PATs. Add a token once, then select it by name; access is session-only by default, while optional remembered entries are passphrase-encrypted with AES-GCM, expire after 1, 7, or 30 days, and can be removed individually.
+- Private repository access accepts fine-grained and classic PATs automatically. Multiple named tokens can be added, selected, and removed during the current session; tokens are held only in memory and disappear on reload or app close.
 - Imported Markdown files are saved to Explorer and remain closed until you choose one, preventing large imports from flooding the tab bar.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index 86ae6c2d..316bc15f 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1299,62 +1299,38 @@ <h2 class="about-title">Markdown Viewer</h2>
                 </button>
                 <div id="github-import-access-panel" class="github-import-access-panel" hidden>
                   <div id="github-import-access-manage" class="github-import-access-manage" hidden>
-                    <label class="reset-modal-label" for="github-import-pat-select">Access token</label>
-                    <select id="github-import-pat-select" class="rename-modal-input"></select>
-                    <div class="github-import-access-selection-row">
-                      <span id="github-import-access-selected-meta" class="github-import-access-selected-meta"></span>
-                      <div class="github-import-access-actions">
-                        <button type="button" id="github-import-pat-add-another" class="github-import-access-secondary-btn">
+                    <div class="github-import-access-manage-header">
+                      <label class="reset-modal-label" for="github-import-pat-select">Access token</label>
+                      <div class="github-import-toolbar-actions" role="group" aria-label="Access token actions">
+                        <button type="button" id="github-import-pat-add-another" class="tool-button document-command-btn github-import-toolbar-btn" aria-label="Add another access token" title="Add another access token">
                           <i class="lucide lucide-plus" aria-hidden="true"></i>
-                          Add another
                         </button>
-                        <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn">
+                        <button type="button" id="github-import-pat-remove" class="tool-button document-command-btn github-import-toolbar-btn github-import-remove-token-btn" aria-label="Remove selected access token" title="Remove selected access token">
                           <i class="lucide lucide-trash-2" aria-hidden="true"></i>
-                          Remove
                         </button>
                       </div>
                     </div>
-                    <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
-                      <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
-                      <div class="github-import-access-inline">
-                        <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
-                        <button type="button" id="github-import-pat-unlock" class="github-import-access-primary-btn">Unlock</button>
-                      </div>
-                    </div>
+                    <select id="github-import-pat-select" class="rename-modal-input"></select>
+                    <span id="github-import-access-selected-meta" class="github-import-access-selected-meta"></span>
                   </div>
                   <div id="github-import-access-form" class="github-import-access-form">
                     <div class="github-import-access-form-heading">
                       <strong>Add access token</strong>
-                      <button type="button" id="github-import-pat-add-cancel" class="github-import-access-text-btn" hidden>Cancel</button>
+                      <button type="button" id="github-import-pat-add-cancel" class="tool-button document-command-btn github-import-toolbar-btn" aria-label="Cancel adding access token" title="Cancel" hidden>
+                        <i class="lucide lucide-x" aria-hidden="true"></i>
+                      </button>
                     </div>
-                    <div class="github-import-access-form-grid">
-                      <div class="github-import-access-field">
-                        <label class="reset-modal-label" for="github-import-pat-type">Token type</label>
-                        <select id="github-import-pat-type" class="rename-modal-input">
-                          <option value="fine-grained">Fine-grained (Recommended)</option>
-                          <option value="classic">Classic</option>
-                        </select>
-                      </div>
-                      <div class="github-import-access-field">
-                        <label class="reset-modal-label" for="github-import-pat-name">Token name</label>
-                        <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My first access token" autocomplete="off" spellcheck="false" />
-                      </div>
+                    <div class="github-import-access-field">
+                      <label class="reset-modal-label" for="github-import-pat-name">Token name</label>
+                      <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My access token" autocomplete="off" spellcheck="false" />
                     </div>
-                    <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
-                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
-                    <label class="reset-modal-label" for="github-import-pat-retention">Disposal</label>
-                    <select id="github-import-pat-retention" class="rename-modal-input">
-                      <option value="session">End of this session</option>
-                      <option value="1">After 1 day</option>
-                      <option value="7">After 7 days</option>
-                      <option value="30">After 30 days</option>
-                    </select>
-                    <div id="github-import-pat-protection" class="github-import-pat-protection" hidden>
-                      <label class="reset-modal-label" for="github-import-pat-passphrase">Protection passphrase</label>
-                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" placeholder="12+ characters" />
+                    <div class="github-import-access-field">
+                      <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
+                      <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
                     </div>
-                    <div class="github-import-access-actions">
-                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Add access</button>
+                    <div class="github-import-access-form-footer">
+                      <span class="github-import-access-session-note">Available for this session</span>
+                      <button type="button" id="github-import-pat-save" class="reset-modal-btn">Add access</button>
                     </div>
                   </div>
                   <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
@@ -1366,13 +1342,13 @@ <h2 class="about-title">Markdown Viewer</h2>
                 <div class="github-import-repository-copy">
                   <div class="github-import-repository-heading">
                     <strong id="github-import-repository-name"></strong>
+                  </div>
+                  <div class="github-import-repository-meta">
+                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
                     <a id="github-import-commit-link" class="github-import-commit-link" target="_blank" rel="noopener noreferrer">
                       <i class="lucide lucide-git-commit-horizontal" aria-hidden="true"></i>
                       <span id="github-import-commit"></span>
                     </a>
-                  </div>
-                  <div class="github-import-repository-meta">
-                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
                     <span id="github-import-base-path" class="github-import-base-path" hidden></span>
                   </div>
                 </div>
@@ -1384,12 +1360,15 @@ <h2 class="about-title">Markdown Viewer</h2>
                 </label>
                 <div class="github-import-selection-summary" aria-live="polite">
                   <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                  <span class="github-import-count-separator" aria-hidden="true">·</span>
-                  <span id="github-import-total-count" class="github-import-total-count">0 files</span>
                 </div>
-                <button type="button" class="github-import-select-all-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
-                  <i class="lucide lucide-check-check" aria-hidden="true"></i>
-                </button>
+                <div class="github-import-toolbar-actions" role="group" aria-label="File tree actions">
+                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-toggle-folders" aria-label="Collapse all folders" title="Collapse all folders">
+                    <i class="lucide lucide-fold-vertical" aria-hidden="true"></i>
+                  </button>
+                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
+                    <i class="lucide lucide-check-check" aria-hidden="true"></i>
+                  </button>
+                </div>
               </div>
               <div id="github-import-tree" class="github-import-tree" role="tree" aria-label="Markdown files in this GitHub location" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index f25397e8..ea03a5c1 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -547,15 +547,8 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportAccessSelectedMeta = document.getElementById("github-import-access-selected-meta");
   const githubImportPatAddAnotherBtn = document.getElementById("github-import-pat-add-another");
   const githubImportPatAddCancelBtn = document.getElementById("github-import-pat-add-cancel");
-  const githubImportAccessUnlock = document.getElementById("github-import-access-unlock");
-  const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
-  const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
-  const githubImportPatTypeSelect = document.getElementById("github-import-pat-type");
   const githubImportPatNameInput = document.getElementById("github-import-pat-name");
   const githubImportPatInput = document.getElementById("github-import-pat");
-  const githubImportPatRetention = document.getElementById("github-import-pat-retention");
-  const githubImportPatProtection = document.getElementById("github-import-pat-protection");
-  const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
   const githubImportAccessStatus = document.getElementById("github-import-access-status");
@@ -569,7 +562,7 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSearchInput = document.getElementById("github-import-search");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
-  const githubImportTotalCount = document.getElementById("github-import-total-count");
+  const githubImportToggleFoldersBtn = document.getElementById("github-import-toggle-folders");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -11307,9 +11300,6 @@ ${selector} .arrowheadPath {
   const GITHUB_API_VERSION = "2022-11-28";
   const GITHUB_ACCESS_VAULT_NAME = "githubAccessVaultV2";
   const GITHUB_LEGACY_ACCESS_RECORD_NAME = "githubAccessRecordV1";
-  const GITHUB_ACCESS_VAULT_VERSION = 2;
-  const GITHUB_PAT_VAULT_VERSION = 1;
-  const GITHUB_PAT_KDF_ITERATIONS = 250000;
   let lastGitHubImportRequestAt = 0;
   const selectedGitHubImportPaths = new Set();
   const collapsedGitHubImportFolders = new Set();
@@ -11320,8 +11310,7 @@ ${selector} .arrowheadPath {
   let githubAccessAdding = true;
   let githubAccessVaultLoaded = false;
   let githubAccessVaultLoadPromise = null;
-  const githubUnlockedAccessTokens = new Map();
-  let githubPatExpiryTimer = null;
+  const githubSessionAccessTokens = new Map();
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11445,10 +11434,6 @@ ${selector} .arrowheadPath {
     }
   }
 
-  function normalizeGitHubPatType(value) {
-    return value === "classic" ? "classic" : "fine-grained";
-  }
-
   function createGitHubAccessId() {
     if (globalThis.crypto && typeof globalThis.crypto.randomUUID === "function") {
       return "github_access_" + globalThis.crypto.randomUUID();
@@ -11462,61 +11447,8 @@ ${selector} .arrowheadPath {
     }) || null;
   }
 
-  function pruneExpiredGitHubAccessEntries() {
-    const now = Date.now();
-    const expiredIds = new Set(
-      githubAccessEntries
-        .filter(function(entry) {
-          return Number(entry.expiresAt) > 0 && Number(entry.expiresAt) <= now;
-        })
-        .map(function(entry) { return entry.id; })
-    );
-    if (!expiredIds.size) return 0;
-    githubAccessEntries = githubAccessEntries.filter(function(entry) {
-      return !expiredIds.has(entry.id);
-    });
-    expiredIds.forEach(function(id) {
-      githubUnlockedAccessTokens.delete(id);
-    });
-    if (!getSelectedGitHubAccessEntry()) {
-      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
-    }
-    return expiredIds.size;
-  }
-
-  function scheduleGitHubAccessExpiry() {
-    clearTimeout(githubPatExpiryTimer);
-    githubPatExpiryTimer = null;
-    const expiries = githubAccessEntries
-      .map(function(entry) { return Number(entry.expiresAt) || 0; })
-      .filter(function(expiresAt) { return expiresAt > 0; });
-    if (!expiries.length) return;
-    const nextExpiry = Math.min.apply(Math, expiries);
-    const remaining = nextExpiry - Date.now();
-    if (remaining <= 0) {
-      const expiredCount = pruneExpiredGitHubAccessEntries();
-      void persistGitHubAccessVault()
-        .then(function() {
-          renderGitHubAccessState();
-          if (expiredCount) {
-            setGitHubAccessStatus(expiredCount === 1 ? "Expired access removed." : expiredCount + " expired tokens removed.", "success");
-            announceToScreenReader("Expired GitHub access removed.");
-          }
-        })
-        .catch(() => {});
-      return;
-    }
-    githubPatExpiryTimer = setTimeout(function() {
-      scheduleGitHubAccessExpiry();
-    }, Math.min(remaining, 2147483647));
-  }
-
   function getGitHubAccessToken() {
-    if (pruneExpiredGitHubAccessEntries()) {
-      void persistGitHubAccessVault().catch(() => {});
-      renderGitHubAccessState();
-    }
-    return githubUnlockedAccessTokens.get(githubSelectedAccessId) || "";
+    return githubSessionAccessTokens.get(githubSelectedAccessId) || "";
   }
 
   function getGitHubApiHeaders(accept, authenticated) {
@@ -11667,8 +11599,8 @@ ${selector} .arrowheadPath {
       if (!canRetryWithToken) {
         if (error instanceof GitHubRequestError && error.status === 404) {
           const selectedAccess = getSelectedGitHubAccessEntry();
-          if (selectedAccess && !githubUnlockedAccessTokens.has(selectedAccess.id)) {
-            throw new Error(`Unlock "${selectedAccess.name}" to access this private repository.`);
+          if (selectedAccess && !githubSessionAccessTokens.has(selectedAccess.id)) {
+            throw new Error(`"${selectedAccess.name}" is no longer available. Add the token again.`);
           }
           throw new Error("Repository not found. If it is private, add secure private repository access and try again.");
         }
@@ -11751,85 +11683,6 @@ ${selector} .arrowheadPath {
     };
   }
 
-  function getGitHubPatAdditionalData(expiresAt, aadContext) {
-    return new TextEncoder().encode(`markdown-viewer:${aadContext || GITHUB_ACCESS_VAULT_NAME}:${expiresAt}`);
-  }
-
-  async function encryptGitHubAccessToken(token, passphrase, expiresAt) {
-    const cryptoApi = getWebCrypto();
-    if (!cryptoApi) throw new Error("Secure token encryption is unavailable in this browser.");
-    const salt = cryptoApi.getRandomValues(new Uint8Array(16));
-    const iv = cryptoApi.getRandomValues(new Uint8Array(12));
-    const key = await deriveSecretWorkspaceKey(passphrase, salt, GITHUB_PAT_KDF_ITERATIONS);
-    const payload = new TextEncoder().encode(JSON.stringify({
-      token,
-      expiresAt,
-      createdAt: Date.now()
-    }));
-    const ciphertext = await cryptoApi.subtle.encrypt(
-      {
-        name: "AES-GCM",
-        iv,
-        additionalData: getGitHubPatAdditionalData(expiresAt, GITHUB_ACCESS_VAULT_NAME),
-        tagLength: 128
-      },
-      key,
-      payload
-    );
-    return {
-      version: GITHUB_PAT_VAULT_VERSION,
-      algorithm: "AES-GCM",
-      kdf: "PBKDF2-SHA-256",
-      iterations: GITHUB_PAT_KDF_ITERATIONS,
-      salt: bytesToBase64(salt),
-      iv: bytesToBase64(iv),
-      ciphertext: bytesToBase64(new Uint8Array(ciphertext)),
-      expiresAt,
-      aadContext: GITHUB_ACCESS_VAULT_NAME,
-      createdAt: Date.now()
-    };
-  }
-
-  async function decryptGitHubAccessToken(record, passphrase) {
-    if (!record || record.version !== GITHUB_PAT_VAULT_VERSION) {
-      throw new Error("The saved GitHub access record is not supported.");
-    }
-    const expiresAt = Number(record.expiresAt);
-    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) {
-      throw new Error("The saved GitHub access has expired.");
-    }
-    const cryptoApi = getWebCrypto();
-    if (!cryptoApi) throw new Error("Secure token decryption is unavailable in this browser.");
-    const iterations = Number(record.iterations) || GITHUB_PAT_KDF_ITERATIONS;
-    const key = await deriveSecretWorkspaceKey(passphrase, base64ToBytes(record.salt), iterations);
-    const decrypted = await cryptoApi.subtle.decrypt(
-      {
-        name: "AES-GCM",
-        iv: base64ToBytes(record.iv),
-        additionalData: getGitHubPatAdditionalData(
-          expiresAt,
-          record.aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME
-        ),
-        tagLength: 128
-      },
-      key,
-      base64ToBytes(record.ciphertext)
-    );
-    const payload = JSON.parse(new TextDecoder().decode(decrypted));
-    if (!payload || payload.expiresAt !== expiresAt || typeof payload.token !== "string") {
-      throw new Error("The saved GitHub access record failed its integrity check.");
-    }
-    return payload.token;
-  }
-
-  function formatGitHubAccessExpiry(expiresAt) {
-    if (!expiresAt) return "this session";
-    return new Intl.DateTimeFormat(undefined, {
-      dateStyle: "medium",
-      timeStyle: "short"
-    }).format(new Date(expiresAt));
-  }
-
   function setGitHubAccessStatus(message, state) {
     if (!githubImportAccessStatus) return;
     githubImportAccessStatus.textContent = message || "";
@@ -11839,12 +11692,8 @@ ${selector} .arrowheadPath {
   }
 
   function resetGitHubAccessForm() {
-    if (githubImportPatTypeSelect) githubImportPatTypeSelect.value = "fine-grained";
     if (githubImportPatNameInput) githubImportPatNameInput.value = "";
     if (githubImportPatInput) githubImportPatInput.value = "";
-    if (githubImportPatRetention) githubImportPatRetention.value = "session";
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
-    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
   }
 
   function setGitHubAccessAdding(isAdding, options = {}) {
@@ -11860,28 +11709,24 @@ ${selector} .arrowheadPath {
     }
   }
 
-  function getGitHubAccessTypeLabel(type) {
-    return normalizeGitHubPatType(type) === "classic" ? "Classic" : "Fine-grained";
-  }
-
   function renderGitHubAccessState() {
-    const removedCount = pruneExpiredGitHubAccessEntries();
-    if (removedCount) void persistGitHubAccessVault().catch(() => {});
+    githubAccessEntries = githubAccessEntries.filter(function(entry) {
+      return githubSessionAccessTokens.has(entry.id);
+    });
     if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
       githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     }
 
     const selectedEntry = getSelectedGitHubAccessEntry();
     const hasEntries = githubAccessEntries.length > 0;
-    const isUnlocked = Boolean(selectedEntry && githubUnlockedAccessTokens.has(selectedEntry.id));
     githubAccessAdding = githubAccessAdding || !hasEntries;
 
     if (githubImportAccess) {
-      githubImportAccess.dataset.state = !selectedEntry ? "empty" : isUnlocked ? "active" : "locked";
+      githubImportAccess.dataset.state = selectedEntry ? "active" : "empty";
     }
     if (githubImportAccessSummary) {
       githubImportAccessSummary.textContent = selectedEntry
-        ? `${selectedEntry.name} · ${isUnlocked ? "Ready" : "Locked"}`
+        ? `${selectedEntry.name} · Ready`
         : "No access token added";
     }
     if (githubImportAccessManage) {
@@ -11904,62 +11749,11 @@ ${selector} .arrowheadPath {
       githubImportPatSelect.value = githubSelectedAccessId;
     }
     if (githubImportAccessSelectedMeta) {
-      githubImportAccessSelectedMeta.textContent = selectedEntry
-        ? `${getGitHubAccessTypeLabel(selectedEntry.tokenType)} · ${selectedEntry.sessionOnly ? "This session" : "Disposes " + formatGitHubAccessExpiry(selectedEntry.expiresAt)}`
-        : "";
-    }
-    if (githubImportAccessUnlock) {
-      githubImportAccessUnlock.hidden = !selectedEntry || selectedEntry.sessionOnly || isUnlocked;
+      githubImportAccessSelectedMeta.textContent = selectedEntry ? "Available for this session" : "";
     }
     if (githubImportPatRemoveBtn) {
       githubImportPatRemoveBtn.hidden = !selectedEntry;
     }
-    scheduleGitHubAccessExpiry();
-  }
-
-  async function persistGitHubAccessVault() {
-    if (!workspaceStorage) return;
-    const entries = githubAccessEntries.filter(function(entry) {
-      return !entry.sessionOnly && Number(entry.expiresAt) > Date.now();
-    });
-    await workspaceStorage.init();
-    if (!entries.length) {
-      if (typeof workspaceStorage.deleteMetadata === "function") {
-        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_VAULT_NAME);
-      } else {
-        await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, null);
-      }
-      return;
-    }
-    await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, {
-      version: GITHUB_ACCESS_VAULT_VERSION,
-      entries,
-      updatedAt: Date.now()
-    });
-  }
-
-  function normalizeStoredGitHubAccessEntry(entry, fallbackName, aadContext) {
-    if (!entry || typeof entry.ciphertext !== "string") return null;
-    const expiresAt = Number(entry.expiresAt);
-    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) return null;
-    return {
-      id: typeof entry.id === "string" && entry.id ? entry.id : createGitHubAccessId(),
-      name: typeof entry.name === "string" && entry.name.trim()
-        ? entry.name.trim().slice(0, 60)
-        : fallbackName,
-      tokenType: normalizeGitHubPatType(entry.tokenType),
-      sessionOnly: false,
-      version: GITHUB_PAT_VAULT_VERSION,
-      algorithm: "AES-GCM",
-      kdf: "PBKDF2-SHA-256",
-      iterations: Number(entry.iterations) || GITHUB_PAT_KDF_ITERATIONS,
-      salt: String(entry.salt || ""),
-      iv: String(entry.iv || ""),
-      ciphertext: entry.ciphertext,
-      expiresAt,
-      aadContext: entry.aadContext || aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME,
-      createdAt: Number(entry.createdAt) || Date.now()
-    };
   }
 
   async function loadStoredGitHubAccess() {
@@ -11979,48 +11773,22 @@ ${selector} .arrowheadPath {
       }
       try {
         await workspaceStorage.init();
-        const sessionEntries = githubAccessEntries.filter(function(entry) { return entry.sessionOnly; });
         const vault = await workspaceStorage.getMetadata(GITHUB_ACCESS_VAULT_NAME);
-        const storedEntries = vault && vault.version === GITHUB_ACCESS_VAULT_VERSION && Array.isArray(vault.entries)
-          ? vault.entries
-          : [];
-        const normalizedStoredEntries = storedEntries
-          .map(function(entry, index) {
-            return normalizeStoredGitHubAccessEntry(entry, `Saved GitHub access ${index + 1}`, GITHUB_ACCESS_VAULT_NAME);
-          })
-          .filter(Boolean);
         const legacyRecord = await workspaceStorage.getMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
-        const legacyEntry = normalizeStoredGitHubAccessEntry(
-          legacyRecord,
-          "Imported GitHub access",
-          GITHUB_LEGACY_ACCESS_RECORD_NAME
-        );
-        const merged = [...sessionEntries, ...normalizedStoredEntries];
-        if (legacyEntry && !merged.some(function(entry) {
-          return entry.id === legacyEntry.id || entry.ciphertext === legacyEntry.ciphertext;
-        })) {
-          merged.push(legacyEntry);
-        }
-        githubAccessEntries = merged;
-        if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
-          githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
-        }
-        githubAccessAdding = !githubAccessEntries.length;
-        githubAccessVaultLoaded = true;
-        if (legacyRecord || normalizedStoredEntries.length !== storedEntries.length) {
-          await persistGitHubAccessVault();
-        }
-        if (legacyRecord) {
+        if (vault || legacyRecord) {
           if (typeof workspaceStorage.deleteMetadata === "function") {
+            await workspaceStorage.deleteMetadata(GITHUB_ACCESS_VAULT_NAME);
             await workspaceStorage.deleteMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
           } else {
+            await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, null);
             await workspaceStorage.setMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME, null);
           }
         }
+        githubAccessVaultLoaded = true;
         renderGitHubAccessState();
       } catch (_) {
         githubAccessVaultLoaded = true;
-        setGitHubAccessStatus("Saved access could not be loaded.", "error");
+        setGitHubAccessStatus("Old saved access could not be cleared.", "error");
         renderGitHubAccessState();
       }
     })();
@@ -12033,27 +11801,12 @@ ${selector} .arrowheadPath {
 
   async function removeGitHubAccess(options = {}) {
     const accessId = options.id || githubSelectedAccessId;
-    const removedIndex = githubAccessEntries.findIndex(function(entry) { return entry.id === accessId; });
-    if (removedIndex < 0) return;
-    const removedEntry = githubAccessEntries[removedIndex];
-    const unlockedToken = githubUnlockedAccessTokens.get(accessId);
-    const previousSelectedId = githubSelectedAccessId;
-    const previousAdding = githubAccessAdding;
+    const removedEntry = githubAccessEntries.find(function(entry) { return entry.id === accessId; });
+    if (!removedEntry) return;
     githubAccessEntries = githubAccessEntries.filter(function(entry) { return entry.id !== accessId; });
-    githubUnlockedAccessTokens.delete(accessId);
+    githubSessionAccessTokens.delete(accessId);
     githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     githubAccessAdding = !githubAccessEntries.length;
-    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
-    try {
-      if (!removedEntry.sessionOnly) await persistGitHubAccessVault();
-    } catch (error) {
-      githubAccessEntries.splice(removedIndex, 0, removedEntry);
-      if (unlockedToken) githubUnlockedAccessTokens.set(accessId, unlockedToken);
-      githubSelectedAccessId = previousSelectedId;
-      githubAccessAdding = previousAdding;
-      renderGitHubAccessState();
-      throw error;
-    }
     renderGitHubAccessState();
     if (!options.silent) {
       setGitHubAccessStatus(`"${removedEntry.name}" removed.`, "success");
@@ -12080,90 +11833,26 @@ ${selector} .arrowheadPath {
   }
 
   async function saveGitHubAccess() {
-    if (!githubImportPatInput || !githubImportPatRetention || !githubImportPatNameInput) return;
+    if (!githubImportPatInput || !githubImportPatNameInput) return;
     const name = validateGitHubAccessName(githubImportPatNameInput.value);
     const token = githubImportPatInput.value;
     validateGitHubPat(token);
-    const tokenType = normalizeGitHubPatType(githubImportPatTypeSelect ? githubImportPatTypeSelect.value : "fine-grained");
-    const retention = githubImportPatRetention.value;
-    let expiresAt = 0;
-    let entry = {
+    const entry = {
       id: createGitHubAccessId(),
       name,
-      tokenType,
-      sessionOnly: retention === "session",
-      expiresAt: 0,
       createdAt: Date.now()
     };
 
-    if (retention !== "session") {
-      const days = Number(retention);
-      const passphrase = githubImportPatPassphrase ? githubImportPatPassphrase.value : "";
-      if (!Number.isFinite(days) || days < 1 || days > 30) {
-        throw new Error("Choose a supported access retention period.");
-      }
-      if (passphrase.length < 12) {
-        throw new Error("Use at least 12 characters for the protection passphrase.");
-      }
-      if (!workspaceStorage) {
-        throw new Error("Encrypted workspace storage is unavailable. Use session-only access instead.");
-      }
-      expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
-      entry = {
-        ...entry,
-        ...(await encryptGitHubAccessToken(token, passphrase, expiresAt)),
-        id: entry.id,
-        name,
-        tokenType,
-        sessionOnly: false,
-        expiresAt
-      };
-    }
-
-    const previousSelectedId = githubSelectedAccessId;
-    const previousAdding = githubAccessAdding;
     githubAccessEntries.push(entry);
-    githubUnlockedAccessTokens.set(entry.id, token);
+    githubSessionAccessTokens.set(entry.id, token);
     githubSelectedAccessId = entry.id;
     githubAccessAdding = false;
-    try {
-      if (!entry.sessionOnly) await persistGitHubAccessVault();
-    } catch (error) {
-      githubAccessEntries = githubAccessEntries.filter(function(candidate) { return candidate.id !== entry.id; });
-      githubUnlockedAccessTokens.delete(entry.id);
-      githubSelectedAccessId = previousSelectedId;
-      githubAccessAdding = previousAdding;
-      renderGitHubAccessState();
-      throw error;
-    }
     resetGitHubAccessForm();
     renderGitHubAccessState();
     setGitHubAccessStatus(`"${name}" added.`, "success");
     announceToScreenReader("GitHub access token added.");
   }
 
-  async function unlockStoredGitHubAccess() {
-    const selectedEntry = getSelectedGitHubAccessEntry();
-    if (!selectedEntry || selectedEntry.sessionOnly || !githubImportPatUnlockPassphrase) return;
-    const passphrase = githubImportPatUnlockPassphrase.value;
-    if (!passphrase) throw new Error("Enter the protection passphrase.");
-    try {
-      const token = await decryptGitHubAccessToken(selectedEntry, passphrase);
-      githubUnlockedAccessTokens.set(selectedEntry.id, token);
-    } catch (error) {
-      if (Number(selectedEntry.expiresAt) <= Date.now()) {
-        await removeGitHubAccess({ id: selectedEntry.id, silent: true });
-        throw new Error("The saved access expired and was removed.");
-      }
-      throw new Error("Could not unlock this token. Check the passphrase.");
-    } finally {
-      githubImportPatUnlockPassphrase.value = "";
-    }
-    renderGitHubAccessState();
-    setGitHubAccessStatus(`"${selectedEntry.name}" unlocked.`, "success");
-    announceToScreenReader("GitHub access token unlocked.");
-  }
-
   function renderGitHubRepositoryContext(context) {
     if (!githubImportRepositoryContext) return;
     if (!context) {
@@ -12272,12 +11961,6 @@ ${selector} .arrowheadPath {
     githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
   }
 
-  function updateGitHubImportTotalCount() {
-    if (!githubImportTotalCount) return;
-    const total = availableGitHubImportPaths.length;
-    githubImportTotalCount.textContent = `${total.toLocaleString()} ${total === 1 ? "file" : "files"}`;
-  }
-
   function updateGitHubSelectAllButtonLabel() {
     if (!githubImportSelectAllBtn) return;
     const total = availableGitHubImportPaths.length;
@@ -12286,7 +11969,6 @@ ${selector} .arrowheadPath {
     githubImportSelectAllBtn.setAttribute("aria-label", actionLabel);
     githubImportSelectAllBtn.title = actionLabel;
     githubImportSelectAllBtn.setAttribute("aria-pressed", allSelected ? "true" : "false");
-    githubImportSelectAllBtn.classList.toggle("is-deselect", allSelected);
     const icon = githubImportSelectAllBtn.querySelector("i");
     if (icon) {
       icon.className = `lucide ${allSelected ? "lucide-square-x" : "lucide-check-check"}`;
@@ -12331,6 +12013,52 @@ ${selector} .arrowheadPath {
     return availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query));
   }
 
+  function getGitHubImportFolderPaths(paths) {
+    const folderPaths = new Set();
+    (paths || []).forEach(function(path) {
+      const segments = String(path || "").split("/").filter(Boolean);
+      segments.pop();
+      for (let index = 1; index <= segments.length; index++) {
+        folderPaths.add(segments.slice(0, index).join("/"));
+      }
+    });
+    return Array.from(folderPaths);
+  }
+
+  function updateGitHubFolderToggleButton() {
+    if (!githubImportToggleFoldersBtn) return;
+    const folderPaths = getGitHubImportFolderPaths(availableGitHubImportPaths);
+    const searchActive = Boolean(githubImportSearchInput && githubImportSearchInput.value.trim());
+    const allCollapsed = folderPaths.length > 0 && folderPaths.every(function(path) {
+      return collapsedGitHubImportFolders.has(path);
+    });
+    const actionLabel = allCollapsed ? "Expand all folders" : "Collapse all folders";
+    githubImportToggleFoldersBtn.disabled = searchActive || !folderPaths.length;
+    githubImportToggleFoldersBtn.setAttribute("aria-label", actionLabel);
+    githubImportToggleFoldersBtn.title = searchActive ? "Clear search to change all folders" : actionLabel;
+    githubImportToggleFoldersBtn.setAttribute("aria-pressed", allCollapsed ? "true" : "false");
+    const icon = githubImportToggleFoldersBtn.querySelector("i");
+    if (icon) {
+      icon.className = `lucide ${allCollapsed ? "lucide-unfold-vertical" : "lucide-fold-vertical"}`;
+    }
+  }
+
+  function toggleAllGitHubImportFolders() {
+    const folderPaths = getGitHubImportFolderPaths(availableGitHubImportPaths);
+    if (!folderPaths.length) return;
+    const shouldExpand = folderPaths.every(function(path) {
+      return collapsedGitHubImportFolders.has(path);
+    });
+    collapsedGitHubImportFolders.clear();
+    if (!shouldExpand) {
+      folderPaths.forEach(function(path) {
+        collapsedGitHubImportFolders.add(path);
+      });
+    }
+    renderGitHubImportTree();
+    announceToScreenReader(shouldExpand ? "All GitHub folders expanded." : "All GitHub folders collapsed.");
+  }
+
   function countMarkdownFilesInTreeNode(node) {
     return node.files.length + Object.values(node.folders).reduce((total, folder) => {
       return total + countMarkdownFilesInTreeNode(folder);
@@ -12348,6 +12076,7 @@ ${selector} .arrowheadPath {
       emptyState.setAttribute("role", "status");
       emptyState.innerHTML = '<i class="lucide lucide-search" aria-hidden="true"></i><span>No Markdown files match your search.</span>';
       githubImportTree.appendChild(emptyState);
+      updateGitHubFolderToggleButton();
       return;
     }
     const tree = buildMarkdownFileTree(visiblePaths);
@@ -12395,6 +12124,7 @@ ${selector} .arrowheadPath {
           folderIcon.className = `lucide ${shouldCollapse ? "lucide-folder" : "lucide-folder-open"} github-tree-folder-icon`;
           if (shouldCollapse) collapsedGitHubImportFolders.add(folderPath);
           else collapsedGitHubImportFolders.delete(folderPath);
+          updateGitHubFolderToggleButton();
         });
         item.append(folderToggle, childBranch);
         list.appendChild(item);
@@ -12441,6 +12171,7 @@ ${selector} .arrowheadPath {
     treeFragment.appendChild(createTreeBranch(tree, ""));
     githubImportTree.appendChild(treeFragment);
     syncGitHubSelectionToButtons();
+    updateGitHubFolderToggleButton();
   }
 
   function setGitHubImportLoading(isLoading) {
@@ -12486,7 +12217,6 @@ ${selector} .arrowheadPath {
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
     resetGitHubAccessForm();
     githubAccessAdding = !githubAccessEntries.length;
-    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
     setGitHubAccessStatus("");
     renderGitHubRepositoryContext(null);
     githubImportUrlInput.disabled = false;
@@ -12504,7 +12234,7 @@ ${selector} .arrowheadPath {
       githubImportSearchInput.value = "";
       githubImportSearchInput.disabled = false;
     }
-    updateGitHubImportTotalCount();
+    updateGitHubFolderToggleButton();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -12546,6 +12276,9 @@ ${selector} .arrowheadPath {
       if (githubImportSelectAllBtn) {
         githubImportSelectAllBtn.disabled = disabled;
       }
+      if (githubImportToggleFoldersBtn) {
+        githubImportToggleFoldersBtn.disabled = disabled;
+      }
       if (githubImportSearchInput) {
         githubImportSearchInput.disabled = disabled;
       }
@@ -12554,18 +12287,14 @@ ${selector} .arrowheadPath {
         githubImportPatSelect,
         githubImportPatAddAnotherBtn,
         githubImportPatAddCancelBtn,
-        githubImportPatUnlockPassphrase,
-        githubImportPatUnlockBtn,
-        githubImportPatTypeSelect,
         githubImportPatNameInput,
         githubImportPatInput,
-        githubImportPatRetention,
-        githubImportPatPassphrase,
         githubImportPatSaveBtn,
         githubImportPatRemoveBtn
       ].forEach(function(control) {
         if (control) control.disabled = disabled;
       });
+      if (!disabled) updateGitHubFolderToggleButton();
     };
     const step = githubImportSubmitBtn.dataset.step || "url";
     if (step === "select") {
@@ -12655,7 +12384,6 @@ ${selector} .arrowheadPath {
         githubImportTree.style.display = "block";
       }
       availableGitHubImportPaths = files.slice();
-      updateGitHubImportTotalCount();
       setGitHubSelectedPaths(files[0] ? [files[0]] : []);
       renderGitHubImportTree();
 
@@ -12680,7 +12408,7 @@ ${selector} .arrowheadPath {
       console.error("GitHub import failed:", error);
       setGitHubImportMessage("GitHub import failed: " + error.message);
       if (githubImportAccessToggle && githubImportAccessPanel
-        && /^(Unlock |".+" (?:cannot access|was rejected))/.test(error.message || "")) {
+        && /^".+" (?:is no longer available|cannot access|was rejected)/.test(error.message || "")) {
         githubImportAccessToggle.setAttribute("aria-expanded", "true");
         githubImportAccessPanel.hidden = false;
         renderGitHubAccessState();
@@ -18920,12 +18648,7 @@ ${selector} .arrowheadPath {
       githubImportAccessToggle.setAttribute("aria-expanded", expanded ? "false" : "true");
       githubImportAccessPanel.hidden = expanded;
       if (!expanded) {
-        const selectedEntry = getSelectedGitHubAccessEntry();
-        const target = selectedEntry && !selectedEntry.sessionOnly && !githubUnlockedAccessTokens.has(selectedEntry.id)
-          ? githubImportPatUnlockPassphrase
-          : githubAccessAdding
-            ? githubImportPatNameInput
-            : githubImportPatSelect;
+        const target = githubAccessAdding ? githubImportPatNameInput : githubImportPatSelect;
         if (target) {
           requestAnimationFrame(function() {
             target.focus();
@@ -18938,7 +18661,6 @@ ${selector} .arrowheadPath {
   if (githubImportPatSelect) {
     githubImportPatSelect.addEventListener("change", function() {
       githubSelectedAccessId = githubImportPatSelect.value;
-      if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
       setGitHubAccessStatus("");
       renderGitHubAccessState();
     });
@@ -18953,18 +18675,6 @@ ${selector} .arrowheadPath {
       setGitHubAccessAdding(false, { focus: false });
     });
   }
-  if (githubImportPatTypeSelect) {
-    githubImportPatTypeSelect.addEventListener("change", function() {
-      setGitHubAccessStatus("");
-    });
-  }
-  if (githubImportPatRetention) {
-    githubImportPatRetention.addEventListener("change", function() {
-      const needsPassphrase = githubImportPatRetention.value !== "session";
-      if (githubImportPatProtection) githubImportPatProtection.hidden = !needsPassphrase;
-      if (!needsPassphrase && githubImportPatPassphrase) githubImportPatPassphrase.value = "";
-    });
-  }
   if (githubImportPatSaveBtn) {
     githubImportPatSaveBtn.addEventListener("click", async function() {
       const previousText = githubImportPatSaveBtn.textContent;
@@ -18981,22 +18691,6 @@ ${selector} .arrowheadPath {
       }
     });
   }
-  if (githubImportPatUnlockBtn) {
-    githubImportPatUnlockBtn.addEventListener("click", async function() {
-      const previousText = githubImportPatUnlockBtn.textContent;
-      githubImportPatUnlockBtn.disabled = true;
-      githubImportPatUnlockBtn.textContent = "Unlocking…";
-      setGitHubAccessStatus("");
-      try {
-        await unlockStoredGitHubAccess();
-      } catch (error) {
-        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be unlocked.", "error");
-      } finally {
-        githubImportPatUnlockBtn.disabled = false;
-        githubImportPatUnlockBtn.textContent = previousText;
-      }
-    });
-  }
   if (githubImportPatRemoveBtn) {
     githubImportPatRemoveBtn.addEventListener("click", async function() {
       githubImportPatRemoveBtn.disabled = true;
@@ -19004,7 +18698,7 @@ ${selector} .arrowheadPath {
       try {
         await removeGitHubAccess();
       } catch (_) {
-        setGitHubAccessStatus("Private access could not be removed from device storage.", "error");
+        setGitHubAccessStatus("Private access could not be removed.", "error");
       } finally {
         githubImportPatRemoveBtn.disabled = false;
       }
@@ -19019,7 +18713,6 @@ ${selector} .arrowheadPath {
       }
     });
   };
-  bindGitHubAccessEnterAction(githubImportPatUnlockPassphrase, githubImportPatUnlockBtn);
   bindGitHubAccessEnterAction(githubImportPatInput, githubImportPatSaveBtn);
   void loadStoredGitHubAccess();
   const handleGitHubImportInputKeydown = function(e) {
@@ -19061,6 +18754,9 @@ ${selector} .arrowheadPath {
       setGitHubSelectedPaths(shouldSelectAll ? allPaths : []);
     });
   }
+  if (githubImportToggleFoldersBtn) {
+    githubImportToggleFoldersBtn.addEventListener("click", toggleAllGitHubImportFolders);
+  }
 
   fileInput.addEventListener("change", async function (e) {
     try {
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 03601ca2..382d18ae 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -6018,9 +6018,7 @@ a:focus {
 .github-import-access-panel[hidden],
 .github-import-access-manage[hidden],
 .github-import-access-form[hidden],
-.github-import-access-unlock[hidden],
-.github-import-pat-protection[hidden],
-.github-import-access-danger-btn[hidden],
+.github-import-remove-token-btn[hidden],
 .github-import-repository-context[hidden],
 .github-import-base-path[hidden],
 .github-import-access-status[hidden] {
@@ -6081,11 +6079,6 @@ a:focus {
   color: #1a7f37;
 }
 
-.github-import-access[data-state="locked"] .github-import-access-icon {
-  background: color-mix(in srgb, var(--accent-color) 12%, transparent);
-  color: var(--accent-color);
-}
-
 .github-import-access-copy {
   display: grid;
   gap: 2px;
@@ -6124,11 +6117,12 @@ a:focus {
   gap: 10px;
   padding: 12px;
   border-top: 1px solid var(--border-color);
-  background: color-mix(in srgb, var(--button-bg) 55%, var(--bg-color));
+  background: var(--bg-color);
 }
 
 .github-import-access-form-heading,
-.github-import-access-selection-row {
+.github-import-access-manage-header,
+.github-import-access-form-footer {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -6140,34 +6134,26 @@ a:focus {
   font-size: var(--ui-font-md);
 }
 
-.github-import-access-form-grid {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 8px;
-}
-
 .github-import-access-field {
   display: grid;
-  gap: 5px;
+  gap: 6px;
   min-width: 0;
 }
 
 .github-import-access-form,
-.github-import-access-manage,
-.github-import-access-unlock,
-.github-import-pat-protection {
+.github-import-access-manage {
   display: grid;
-  gap: 8px;
+  gap: 10px;
 }
 
 .github-import-access-form .reset-modal-label,
 .github-import-access-manage .reset-modal-label,
-.github-import-pat-protection .reset-modal-label,
-.github-import-access-actions > button {
+.github-import-access-form-footer > button {
   white-space: nowrap;
 }
 
 .github-import-access-selected-meta {
+  display: block;
   min-width: 0;
   overflow: hidden;
   color: var(--text-secondary);
@@ -6176,19 +6162,6 @@ a:focus {
   white-space: nowrap;
 }
 
-.github-import-access-unlock {
-  padding: 10px;
-  border: 1px solid color-mix(in srgb, var(--accent-color) 26%, var(--border-color));
-  border-radius: 8px;
-  background: color-mix(in srgb, var(--accent-color) 6%, var(--bg-color));
-}
-
-.github-import-access-inline {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) auto;
-  gap: 8px;
-}
-
 .github-import-access-panel .rename-modal-input {
   width: 100%;
   min-height: 38px;
@@ -6196,87 +6169,47 @@ a:focus {
   font-size: var(--ui-font-md);
 }
 
-.github-import-access-actions {
-  display: flex;
+.github-import-toolbar-actions {
+  display: inline-flex;
   align-items: center;
-  flex-wrap: wrap;
-  gap: 8px;
-  padding-top: 2px;
+  flex: 0 0 auto;
+  gap: 4px;
 }
 
-.github-import-access-primary-btn,
-.github-import-access-secondary-btn,
-.github-import-access-danger-btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  min-height: 36px;
-  padding: 7px 11px;
-  border: 1px solid var(--border-color);
+.github-import-toolbar-btn.tool-button {
+  width: 36px;
+  height: 36px;
+  min-width: 36px;
+  padding: 0;
   border-radius: 7px;
-  background: var(--button-bg);
-  color: var(--text-color);
-  cursor: pointer;
-  font: inherit;
-  font-size: var(--ui-font-md);
-  font-weight: 650;
 }
 
-.github-import-access-primary-btn {
-  border-color: var(--accent-color);
-  background: var(--accent-color);
-  color: #fff;
+.github-import-toolbar-btn > .lucide {
+  width: 16px;
+  height: 16px;
 }
 
-.github-import-access-danger-btn {
+.github-import-remove-token-btn {
   color: var(--color-danger-fg, #cf222e);
 }
 
-.github-import-access-text-btn {
-  min-height: 28px;
-  padding: 3px 5px;
-  border: 0;
-  background: transparent;
-  color: var(--text-secondary);
-  cursor: pointer;
-  font: inherit;
-  font-size: var(--ui-font-sm);
-}
-
-.github-import-access-text-btn:hover {
-  color: var(--text-color);
-}
-
-.github-import-access-text-btn:focus-visible {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
-}
-
-.github-import-access-secondary-btn > .lucide,
-.github-import-access-danger-btn > .lucide {
-  width: 14px;
-  height: 14px;
-}
-
-.github-import-access-primary-btn:hover,
-.github-import-access-secondary-btn:hover,
-.github-import-access-danger-btn:hover {
-  filter: brightness(0.97);
+.github-import-access-form-footer {
+  padding-top: 2px;
 }
 
-.github-import-access-primary-btn:focus-visible,
-.github-import-access-secondary-btn:focus-visible,
-.github-import-access-danger-btn:focus-visible {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
+.github-import-access-session-note {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.github-import-access-primary-btn:disabled,
-.github-import-access-secondary-btn:disabled,
-.github-import-access-danger-btn:disabled {
-  cursor: not-allowed;
-  opacity: 0.55;
+.github-import-access-form-footer .reset-modal-btn {
+  min-height: 34px;
+  padding: 7px 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-import-access-status {
@@ -6419,7 +6352,7 @@ a:focus {
 
 .github-import-selection-toolbar {
   display: grid;
-  grid-template-columns: minmax(220px, 1fr) auto 40px;
+  grid-template-columns: minmax(220px, 1fr) auto auto;
   align-items: center;
   gap: 8px;
 }
@@ -6481,48 +6414,10 @@ a:focus {
   color: var(--text-color);
 }
 
-.github-import-count-separator {
-  color: color-mix(in srgb, var(--text-secondary) 66%, transparent);
-}
-
-.github-import-select-all-btn {
-  display: inline-grid;
-  place-items: center;
-  width: 40px;
-  height: 40px;
-  padding: 0;
-  border: 1px solid var(--border-color);
-  border-radius: 8px;
-  background: var(--button-bg);
-  color: var(--text-color);
-  cursor: pointer;
-  transition: background-color 160ms ease, border-color 160ms ease, color 160ms ease;
-}
-
-.github-import-select-all-btn > .lucide {
-  width: 18px;
-  height: 18px;
-}
-
-.github-import-select-all-btn:hover {
-  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
-  background: var(--button-hover);
-}
-
-.github-import-select-all-btn:focus-visible {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
-}
-
-.github-import-select-all-btn.is-deselect {
-  border-color: color-mix(in srgb, var(--accent-color) 46%, var(--border-color));
-  background: color-mix(in srgb, var(--accent-color) 12%, var(--button-bg));
+.github-import-toolbar-btn[aria-pressed="true"] {
+  border-color: color-mix(in srgb, var(--mv-blue) 14%, var(--mv-border));
   color: var(--accent-color);
-}
-
-.github-import-select-all-btn:disabled {
-  cursor: not-allowed;
-  opacity: 0.5;
+  background-color: rgba(3, 102, 214, 0.08);
 }
 
 .github-import-tree ul {
@@ -6707,7 +6602,7 @@ a:focus {
   }
 
   .github-import-selection-toolbar {
-    grid-template-columns: minmax(0, 1fr) 44px;
+    grid-template-columns: minmax(0, 1fr) auto;
   }
 
   .github-import-search {
@@ -6715,13 +6610,14 @@ a:focus {
   }
 
   #github-import-search,
-  .github-import-select-all-btn {
+  .github-import-toolbar-btn.tool-button {
     min-height: 44px;
   }
 
-  .github-import-select-all-btn {
+  .github-import-toolbar-btn.tool-button {
     width: 44px;
     height: 44px;
+    min-width: 44px;
   }
 
   .github-import-selection-summary {
@@ -6738,9 +6634,6 @@ a:focus {
     min-height: 44px;
   }
 
-  .github-import-access-primary-btn,
-  .github-import-access-secondary-btn,
-  .github-import-access-danger-btn,
   .github-import-access-panel .rename-modal-input {
     min-height: 44px;
   }
@@ -6759,19 +6652,8 @@ a:focus {
   }
 }
 
-@media (max-width: 430px) {
-  .github-import-access-form-grid {
-    grid-template-columns: minmax(0, 1fr);
-  }
-
-  .github-import-access-selection-row {
-    align-items: flex-start;
-    flex-direction: column;
-  }
-}
-
 @media (prefers-reduced-motion: reduce) {
-  .github-import-select-all-btn,
+  .github-import-toolbar-btn,
   .github-import-access-chevron {
     transition: none;
   }
@@ -6779,15 +6661,16 @@ a:focus {
 
 @media (max-width: 900px) and (max-height: 500px) {
   #github-import-search,
-  .github-import-select-all-btn,
+  .github-import-toolbar-btn.tool-button,
   .github-tree-folder-label,
   .github-tree-file-btn {
     min-height: 44px;
   }
 
-  .github-import-select-all-btn {
+  .github-import-toolbar-btn.tool-button {
     width: 44px;
     height: 44px;
+    min-width: 44px;
   }
 }
 
diff --git a/index.html b/index.html
index ea097cfc..4b4d428e 100644
--- a/index.html
+++ b/index.html
@@ -1392,62 +1392,38 @@ <h2 class="about-title">Markdown Viewer</h2>
                 </button>
                 <div id="github-import-access-panel" class="github-import-access-panel" hidden>
                   <div id="github-import-access-manage" class="github-import-access-manage" hidden>
-                    <label class="reset-modal-label" for="github-import-pat-select">Access token</label>
-                    <select id="github-import-pat-select" class="rename-modal-input"></select>
-                    <div class="github-import-access-selection-row">
-                      <span id="github-import-access-selected-meta" class="github-import-access-selected-meta"></span>
-                      <div class="github-import-access-actions">
-                        <button type="button" id="github-import-pat-add-another" class="github-import-access-secondary-btn">
+                    <div class="github-import-access-manage-header">
+                      <label class="reset-modal-label" for="github-import-pat-select">Access token</label>
+                      <div class="github-import-toolbar-actions" role="group" aria-label="Access token actions">
+                        <button type="button" id="github-import-pat-add-another" class="tool-button document-command-btn github-import-toolbar-btn" aria-label="Add another access token" title="Add another access token">
                           <i class="lucide lucide-plus" aria-hidden="true"></i>
-                          Add another
                         </button>
-                        <button type="button" id="github-import-pat-remove" class="github-import-access-danger-btn">
+                        <button type="button" id="github-import-pat-remove" class="tool-button document-command-btn github-import-toolbar-btn github-import-remove-token-btn" aria-label="Remove selected access token" title="Remove selected access token">
                           <i class="lucide lucide-trash-2" aria-hidden="true"></i>
-                          Remove
                         </button>
                       </div>
                     </div>
-                    <div id="github-import-access-unlock" class="github-import-access-unlock" hidden>
-                      <label class="reset-modal-label" for="github-import-pat-unlock-passphrase">Protection passphrase</label>
-                      <div class="github-import-access-inline">
-                        <input type="password" id="github-import-pat-unlock-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" />
-                        <button type="button" id="github-import-pat-unlock" class="github-import-access-primary-btn">Unlock</button>
-                      </div>
-                    </div>
+                    <select id="github-import-pat-select" class="rename-modal-input"></select>
+                    <span id="github-import-access-selected-meta" class="github-import-access-selected-meta"></span>
                   </div>
                   <div id="github-import-access-form" class="github-import-access-form">
                     <div class="github-import-access-form-heading">
                       <strong>Add access token</strong>
-                      <button type="button" id="github-import-pat-add-cancel" class="github-import-access-text-btn" hidden>Cancel</button>
+                      <button type="button" id="github-import-pat-add-cancel" class="tool-button document-command-btn github-import-toolbar-btn" aria-label="Cancel adding access token" title="Cancel" hidden>
+                        <i class="lucide lucide-x" aria-hidden="true"></i>
+                      </button>
                     </div>
-                    <div class="github-import-access-form-grid">
-                      <div class="github-import-access-field">
-                        <label class="reset-modal-label" for="github-import-pat-type">Token type</label>
-                        <select id="github-import-pat-type" class="rename-modal-input">
-                          <option value="fine-grained">Fine-grained (Recommended)</option>
-                          <option value="classic">Classic</option>
-                        </select>
-                      </div>
-                      <div class="github-import-access-field">
-                        <label class="reset-modal-label" for="github-import-pat-name">Token name</label>
-                        <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My first access token" autocomplete="off" spellcheck="false" />
-                      </div>
+                    <div class="github-import-access-field">
+                      <label class="reset-modal-label" for="github-import-pat-name">Token name</label>
+                      <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My access token" autocomplete="off" spellcheck="false" />
                     </div>
-                    <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
-                    <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
-                    <label class="reset-modal-label" for="github-import-pat-retention">Disposal</label>
-                    <select id="github-import-pat-retention" class="rename-modal-input">
-                      <option value="session">End of this session</option>
-                      <option value="1">After 1 day</option>
-                      <option value="7">After 7 days</option>
-                      <option value="30">After 30 days</option>
-                    </select>
-                    <div id="github-import-pat-protection" class="github-import-pat-protection" hidden>
-                      <label class="reset-modal-label" for="github-import-pat-passphrase">Protection passphrase</label>
-                      <input type="password" id="github-import-pat-passphrase" class="rename-modal-input" autocomplete="off" spellcheck="false" minlength="12" placeholder="12+ characters" />
+                    <div class="github-import-access-field">
+                      <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
+                      <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
                     </div>
-                    <div class="github-import-access-actions">
-                      <button type="button" id="github-import-pat-save" class="github-import-access-primary-btn">Add access</button>
+                    <div class="github-import-access-form-footer">
+                      <span class="github-import-access-session-note">Available for this session</span>
+                      <button type="button" id="github-import-pat-save" class="reset-modal-btn">Add access</button>
                     </div>
                   </div>
                   <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
@@ -1459,13 +1435,13 @@ <h2 class="about-title">Markdown Viewer</h2>
                 <div class="github-import-repository-copy">
                   <div class="github-import-repository-heading">
                     <strong id="github-import-repository-name"></strong>
+                  </div>
+                  <div class="github-import-repository-meta">
+                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
                     <a id="github-import-commit-link" class="github-import-commit-link" target="_blank" rel="noopener noreferrer">
                       <i class="lucide lucide-git-commit-horizontal" aria-hidden="true"></i>
                       <span id="github-import-commit"></span>
                     </a>
-                  </div>
-                  <div class="github-import-repository-meta">
-                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
                     <span id="github-import-base-path" class="github-import-base-path" hidden></span>
                   </div>
                 </div>
@@ -1477,12 +1453,15 @@ <h2 class="about-title">Markdown Viewer</h2>
                 </label>
                 <div class="github-import-selection-summary" aria-live="polite">
                   <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                  <span class="github-import-count-separator" aria-hidden="true">·</span>
-                  <span id="github-import-total-count" class="github-import-total-count">0 files</span>
                 </div>
-                <button type="button" class="github-import-select-all-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
-                  <i class="lucide lucide-check-check" aria-hidden="true"></i>
-                </button>
+                <div class="github-import-toolbar-actions" role="group" aria-label="File tree actions">
+                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-toggle-folders" aria-label="Collapse all folders" title="Collapse all folders">
+                    <i class="lucide lucide-fold-vertical" aria-hidden="true"></i>
+                  </button>
+                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
+                    <i class="lucide lucide-check-check" aria-hidden="true"></i>
+                  </button>
+                </div>
               </div>
               <div id="github-import-tree" class="github-import-tree" role="tree" aria-label="Markdown files in this GitHub location" style="display:none;"></div>
               <p id="github-import-error" class="github-import-error" role="status" style="display:none;"></p>
diff --git a/script.js b/script.js
index f25397e8..ea03a5c1 100644
--- a/script.js
+++ b/script.js
@@ -547,15 +547,8 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportAccessSelectedMeta = document.getElementById("github-import-access-selected-meta");
   const githubImportPatAddAnotherBtn = document.getElementById("github-import-pat-add-another");
   const githubImportPatAddCancelBtn = document.getElementById("github-import-pat-add-cancel");
-  const githubImportAccessUnlock = document.getElementById("github-import-access-unlock");
-  const githubImportPatUnlockPassphrase = document.getElementById("github-import-pat-unlock-passphrase");
-  const githubImportPatUnlockBtn = document.getElementById("github-import-pat-unlock");
-  const githubImportPatTypeSelect = document.getElementById("github-import-pat-type");
   const githubImportPatNameInput = document.getElementById("github-import-pat-name");
   const githubImportPatInput = document.getElementById("github-import-pat");
-  const githubImportPatRetention = document.getElementById("github-import-pat-retention");
-  const githubImportPatProtection = document.getElementById("github-import-pat-protection");
-  const githubImportPatPassphrase = document.getElementById("github-import-pat-passphrase");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
   const githubImportAccessStatus = document.getElementById("github-import-access-status");
@@ -569,7 +562,7 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
   const githubImportSearchInput = document.getElementById("github-import-search");
   const githubImportSelectedCount = document.getElementById("github-import-selected-count");
-  const githubImportTotalCount = document.getElementById("github-import-total-count");
+  const githubImportToggleFoldersBtn = document.getElementById("github-import-toggle-folders");
   const githubImportSelectAllBtn = document.getElementById("github-import-select-all");
   const githubImportTree = document.getElementById("github-import-tree");
   const githubImportError = document.getElementById("github-import-error");
@@ -11307,9 +11300,6 @@ ${selector} .arrowheadPath {
   const GITHUB_API_VERSION = "2022-11-28";
   const GITHUB_ACCESS_VAULT_NAME = "githubAccessVaultV2";
   const GITHUB_LEGACY_ACCESS_RECORD_NAME = "githubAccessRecordV1";
-  const GITHUB_ACCESS_VAULT_VERSION = 2;
-  const GITHUB_PAT_VAULT_VERSION = 1;
-  const GITHUB_PAT_KDF_ITERATIONS = 250000;
   let lastGitHubImportRequestAt = 0;
   const selectedGitHubImportPaths = new Set();
   const collapsedGitHubImportFolders = new Set();
@@ -11320,8 +11310,7 @@ ${selector} .arrowheadPath {
   let githubAccessAdding = true;
   let githubAccessVaultLoaded = false;
   let githubAccessVaultLoadPromise = null;
-  const githubUnlockedAccessTokens = new Map();
-  let githubPatExpiryTimer = null;
+  const githubSessionAccessTokens = new Map();
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11445,10 +11434,6 @@ ${selector} .arrowheadPath {
     }
   }
 
-  function normalizeGitHubPatType(value) {
-    return value === "classic" ? "classic" : "fine-grained";
-  }
-
   function createGitHubAccessId() {
     if (globalThis.crypto && typeof globalThis.crypto.randomUUID === "function") {
       return "github_access_" + globalThis.crypto.randomUUID();
@@ -11462,61 +11447,8 @@ ${selector} .arrowheadPath {
     }) || null;
   }
 
-  function pruneExpiredGitHubAccessEntries() {
-    const now = Date.now();
-    const expiredIds = new Set(
-      githubAccessEntries
-        .filter(function(entry) {
-          return Number(entry.expiresAt) > 0 && Number(entry.expiresAt) <= now;
-        })
-        .map(function(entry) { return entry.id; })
-    );
-    if (!expiredIds.size) return 0;
-    githubAccessEntries = githubAccessEntries.filter(function(entry) {
-      return !expiredIds.has(entry.id);
-    });
-    expiredIds.forEach(function(id) {
-      githubUnlockedAccessTokens.delete(id);
-    });
-    if (!getSelectedGitHubAccessEntry()) {
-      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
-    }
-    return expiredIds.size;
-  }
-
-  function scheduleGitHubAccessExpiry() {
-    clearTimeout(githubPatExpiryTimer);
-    githubPatExpiryTimer = null;
-    const expiries = githubAccessEntries
-      .map(function(entry) { return Number(entry.expiresAt) || 0; })
-      .filter(function(expiresAt) { return expiresAt > 0; });
-    if (!expiries.length) return;
-    const nextExpiry = Math.min.apply(Math, expiries);
-    const remaining = nextExpiry - Date.now();
-    if (remaining <= 0) {
-      const expiredCount = pruneExpiredGitHubAccessEntries();
-      void persistGitHubAccessVault()
-        .then(function() {
-          renderGitHubAccessState();
-          if (expiredCount) {
-            setGitHubAccessStatus(expiredCount === 1 ? "Expired access removed." : expiredCount + " expired tokens removed.", "success");
-            announceToScreenReader("Expired GitHub access removed.");
-          }
-        })
-        .catch(() => {});
-      return;
-    }
-    githubPatExpiryTimer = setTimeout(function() {
-      scheduleGitHubAccessExpiry();
-    }, Math.min(remaining, 2147483647));
-  }
-
   function getGitHubAccessToken() {
-    if (pruneExpiredGitHubAccessEntries()) {
-      void persistGitHubAccessVault().catch(() => {});
-      renderGitHubAccessState();
-    }
-    return githubUnlockedAccessTokens.get(githubSelectedAccessId) || "";
+    return githubSessionAccessTokens.get(githubSelectedAccessId) || "";
   }
 
   function getGitHubApiHeaders(accept, authenticated) {
@@ -11667,8 +11599,8 @@ ${selector} .arrowheadPath {
       if (!canRetryWithToken) {
         if (error instanceof GitHubRequestError && error.status === 404) {
           const selectedAccess = getSelectedGitHubAccessEntry();
-          if (selectedAccess && !githubUnlockedAccessTokens.has(selectedAccess.id)) {
-            throw new Error(`Unlock "${selectedAccess.name}" to access this private repository.`);
+          if (selectedAccess && !githubSessionAccessTokens.has(selectedAccess.id)) {
+            throw new Error(`"${selectedAccess.name}" is no longer available. Add the token again.`);
           }
           throw new Error("Repository not found. If it is private, add secure private repository access and try again.");
         }
@@ -11751,85 +11683,6 @@ ${selector} .arrowheadPath {
     };
   }
 
-  function getGitHubPatAdditionalData(expiresAt, aadContext) {
-    return new TextEncoder().encode(`markdown-viewer:${aadContext || GITHUB_ACCESS_VAULT_NAME}:${expiresAt}`);
-  }
-
-  async function encryptGitHubAccessToken(token, passphrase, expiresAt) {
-    const cryptoApi = getWebCrypto();
-    if (!cryptoApi) throw new Error("Secure token encryption is unavailable in this browser.");
-    const salt = cryptoApi.getRandomValues(new Uint8Array(16));
-    const iv = cryptoApi.getRandomValues(new Uint8Array(12));
-    const key = await deriveSecretWorkspaceKey(passphrase, salt, GITHUB_PAT_KDF_ITERATIONS);
-    const payload = new TextEncoder().encode(JSON.stringify({
-      token,
-      expiresAt,
-      createdAt: Date.now()
-    }));
-    const ciphertext = await cryptoApi.subtle.encrypt(
-      {
-        name: "AES-GCM",
-        iv,
-        additionalData: getGitHubPatAdditionalData(expiresAt, GITHUB_ACCESS_VAULT_NAME),
-        tagLength: 128
-      },
-      key,
-      payload
-    );
-    return {
-      version: GITHUB_PAT_VAULT_VERSION,
-      algorithm: "AES-GCM",
-      kdf: "PBKDF2-SHA-256",
-      iterations: GITHUB_PAT_KDF_ITERATIONS,
-      salt: bytesToBase64(salt),
-      iv: bytesToBase64(iv),
-      ciphertext: bytesToBase64(new Uint8Array(ciphertext)),
-      expiresAt,
-      aadContext: GITHUB_ACCESS_VAULT_NAME,
-      createdAt: Date.now()
-    };
-  }
-
-  async function decryptGitHubAccessToken(record, passphrase) {
-    if (!record || record.version !== GITHUB_PAT_VAULT_VERSION) {
-      throw new Error("The saved GitHub access record is not supported.");
-    }
-    const expiresAt = Number(record.expiresAt);
-    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) {
-      throw new Error("The saved GitHub access has expired.");
-    }
-    const cryptoApi = getWebCrypto();
-    if (!cryptoApi) throw new Error("Secure token decryption is unavailable in this browser.");
-    const iterations = Number(record.iterations) || GITHUB_PAT_KDF_ITERATIONS;
-    const key = await deriveSecretWorkspaceKey(passphrase, base64ToBytes(record.salt), iterations);
-    const decrypted = await cryptoApi.subtle.decrypt(
-      {
-        name: "AES-GCM",
-        iv: base64ToBytes(record.iv),
-        additionalData: getGitHubPatAdditionalData(
-          expiresAt,
-          record.aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME
-        ),
-        tagLength: 128
-      },
-      key,
-      base64ToBytes(record.ciphertext)
-    );
-    const payload = JSON.parse(new TextDecoder().decode(decrypted));
-    if (!payload || payload.expiresAt !== expiresAt || typeof payload.token !== "string") {
-      throw new Error("The saved GitHub access record failed its integrity check.");
-    }
-    return payload.token;
-  }
-
-  function formatGitHubAccessExpiry(expiresAt) {
-    if (!expiresAt) return "this session";
-    return new Intl.DateTimeFormat(undefined, {
-      dateStyle: "medium",
-      timeStyle: "short"
-    }).format(new Date(expiresAt));
-  }
-
   function setGitHubAccessStatus(message, state) {
     if (!githubImportAccessStatus) return;
     githubImportAccessStatus.textContent = message || "";
@@ -11839,12 +11692,8 @@ ${selector} .arrowheadPath {
   }
 
   function resetGitHubAccessForm() {
-    if (githubImportPatTypeSelect) githubImportPatTypeSelect.value = "fine-grained";
     if (githubImportPatNameInput) githubImportPatNameInput.value = "";
     if (githubImportPatInput) githubImportPatInput.value = "";
-    if (githubImportPatRetention) githubImportPatRetention.value = "session";
-    if (githubImportPatPassphrase) githubImportPatPassphrase.value = "";
-    if (githubImportPatProtection) githubImportPatProtection.hidden = true;
   }
 
   function setGitHubAccessAdding(isAdding, options = {}) {
@@ -11860,28 +11709,24 @@ ${selector} .arrowheadPath {
     }
   }
 
-  function getGitHubAccessTypeLabel(type) {
-    return normalizeGitHubPatType(type) === "classic" ? "Classic" : "Fine-grained";
-  }
-
   function renderGitHubAccessState() {
-    const removedCount = pruneExpiredGitHubAccessEntries();
-    if (removedCount) void persistGitHubAccessVault().catch(() => {});
+    githubAccessEntries = githubAccessEntries.filter(function(entry) {
+      return githubSessionAccessTokens.has(entry.id);
+    });
     if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
       githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     }
 
     const selectedEntry = getSelectedGitHubAccessEntry();
     const hasEntries = githubAccessEntries.length > 0;
-    const isUnlocked = Boolean(selectedEntry && githubUnlockedAccessTokens.has(selectedEntry.id));
     githubAccessAdding = githubAccessAdding || !hasEntries;
 
     if (githubImportAccess) {
-      githubImportAccess.dataset.state = !selectedEntry ? "empty" : isUnlocked ? "active" : "locked";
+      githubImportAccess.dataset.state = selectedEntry ? "active" : "empty";
     }
     if (githubImportAccessSummary) {
       githubImportAccessSummary.textContent = selectedEntry
-        ? `${selectedEntry.name} · ${isUnlocked ? "Ready" : "Locked"}`
+        ? `${selectedEntry.name} · Ready`
         : "No access token added";
     }
     if (githubImportAccessManage) {
@@ -11904,62 +11749,11 @@ ${selector} .arrowheadPath {
       githubImportPatSelect.value = githubSelectedAccessId;
     }
     if (githubImportAccessSelectedMeta) {
-      githubImportAccessSelectedMeta.textContent = selectedEntry
-        ? `${getGitHubAccessTypeLabel(selectedEntry.tokenType)} · ${selectedEntry.sessionOnly ? "This session" : "Disposes " + formatGitHubAccessExpiry(selectedEntry.expiresAt)}`
-        : "";
-    }
-    if (githubImportAccessUnlock) {
-      githubImportAccessUnlock.hidden = !selectedEntry || selectedEntry.sessionOnly || isUnlocked;
+      githubImportAccessSelectedMeta.textContent = selectedEntry ? "Available for this session" : "";
     }
     if (githubImportPatRemoveBtn) {
       githubImportPatRemoveBtn.hidden = !selectedEntry;
     }
-    scheduleGitHubAccessExpiry();
-  }
-
-  async function persistGitHubAccessVault() {
-    if (!workspaceStorage) return;
-    const entries = githubAccessEntries.filter(function(entry) {
-      return !entry.sessionOnly && Number(entry.expiresAt) > Date.now();
-    });
-    await workspaceStorage.init();
-    if (!entries.length) {
-      if (typeof workspaceStorage.deleteMetadata === "function") {
-        await workspaceStorage.deleteMetadata(GITHUB_ACCESS_VAULT_NAME);
-      } else {
-        await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, null);
-      }
-      return;
-    }
-    await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, {
-      version: GITHUB_ACCESS_VAULT_VERSION,
-      entries,
-      updatedAt: Date.now()
-    });
-  }
-
-  function normalizeStoredGitHubAccessEntry(entry, fallbackName, aadContext) {
-    if (!entry || typeof entry.ciphertext !== "string") return null;
-    const expiresAt = Number(entry.expiresAt);
-    if (!Number.isFinite(expiresAt) || expiresAt <= Date.now()) return null;
-    return {
-      id: typeof entry.id === "string" && entry.id ? entry.id : createGitHubAccessId(),
-      name: typeof entry.name === "string" && entry.name.trim()
-        ? entry.name.trim().slice(0, 60)
-        : fallbackName,
-      tokenType: normalizeGitHubPatType(entry.tokenType),
-      sessionOnly: false,
-      version: GITHUB_PAT_VAULT_VERSION,
-      algorithm: "AES-GCM",
-      kdf: "PBKDF2-SHA-256",
-      iterations: Number(entry.iterations) || GITHUB_PAT_KDF_ITERATIONS,
-      salt: String(entry.salt || ""),
-      iv: String(entry.iv || ""),
-      ciphertext: entry.ciphertext,
-      expiresAt,
-      aadContext: entry.aadContext || aadContext || GITHUB_LEGACY_ACCESS_RECORD_NAME,
-      createdAt: Number(entry.createdAt) || Date.now()
-    };
   }
 
   async function loadStoredGitHubAccess() {
@@ -11979,48 +11773,22 @@ ${selector} .arrowheadPath {
       }
       try {
         await workspaceStorage.init();
-        const sessionEntries = githubAccessEntries.filter(function(entry) { return entry.sessionOnly; });
         const vault = await workspaceStorage.getMetadata(GITHUB_ACCESS_VAULT_NAME);
-        const storedEntries = vault && vault.version === GITHUB_ACCESS_VAULT_VERSION && Array.isArray(vault.entries)
-          ? vault.entries
-          : [];
-        const normalizedStoredEntries = storedEntries
-          .map(function(entry, index) {
-            return normalizeStoredGitHubAccessEntry(entry, `Saved GitHub access ${index + 1}`, GITHUB_ACCESS_VAULT_NAME);
-          })
-          .filter(Boolean);
         const legacyRecord = await workspaceStorage.getMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
-        const legacyEntry = normalizeStoredGitHubAccessEntry(
-          legacyRecord,
-          "Imported GitHub access",
-          GITHUB_LEGACY_ACCESS_RECORD_NAME
-        );
-        const merged = [...sessionEntries, ...normalizedStoredEntries];
-        if (legacyEntry && !merged.some(function(entry) {
-          return entry.id === legacyEntry.id || entry.ciphertext === legacyEntry.ciphertext;
-        })) {
-          merged.push(legacyEntry);
-        }
-        githubAccessEntries = merged;
-        if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
-          githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
-        }
-        githubAccessAdding = !githubAccessEntries.length;
-        githubAccessVaultLoaded = true;
-        if (legacyRecord || normalizedStoredEntries.length !== storedEntries.length) {
-          await persistGitHubAccessVault();
-        }
-        if (legacyRecord) {
+        if (vault || legacyRecord) {
           if (typeof workspaceStorage.deleteMetadata === "function") {
+            await workspaceStorage.deleteMetadata(GITHUB_ACCESS_VAULT_NAME);
             await workspaceStorage.deleteMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME);
           } else {
+            await workspaceStorage.setMetadata(GITHUB_ACCESS_VAULT_NAME, null);
             await workspaceStorage.setMetadata(GITHUB_LEGACY_ACCESS_RECORD_NAME, null);
           }
         }
+        githubAccessVaultLoaded = true;
         renderGitHubAccessState();
       } catch (_) {
         githubAccessVaultLoaded = true;
-        setGitHubAccessStatus("Saved access could not be loaded.", "error");
+        setGitHubAccessStatus("Old saved access could not be cleared.", "error");
         renderGitHubAccessState();
       }
     })();
@@ -12033,27 +11801,12 @@ ${selector} .arrowheadPath {
 
   async function removeGitHubAccess(options = {}) {
     const accessId = options.id || githubSelectedAccessId;
-    const removedIndex = githubAccessEntries.findIndex(function(entry) { return entry.id === accessId; });
-    if (removedIndex < 0) return;
-    const removedEntry = githubAccessEntries[removedIndex];
-    const unlockedToken = githubUnlockedAccessTokens.get(accessId);
-    const previousSelectedId = githubSelectedAccessId;
-    const previousAdding = githubAccessAdding;
+    const removedEntry = githubAccessEntries.find(function(entry) { return entry.id === accessId; });
+    if (!removedEntry) return;
     githubAccessEntries = githubAccessEntries.filter(function(entry) { return entry.id !== accessId; });
-    githubUnlockedAccessTokens.delete(accessId);
+    githubSessionAccessTokens.delete(accessId);
     githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
     githubAccessAdding = !githubAccessEntries.length;
-    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
-    try {
-      if (!removedEntry.sessionOnly) await persistGitHubAccessVault();
-    } catch (error) {
-      githubAccessEntries.splice(removedIndex, 0, removedEntry);
-      if (unlockedToken) githubUnlockedAccessTokens.set(accessId, unlockedToken);
-      githubSelectedAccessId = previousSelectedId;
-      githubAccessAdding = previousAdding;
-      renderGitHubAccessState();
-      throw error;
-    }
     renderGitHubAccessState();
     if (!options.silent) {
       setGitHubAccessStatus(`"${removedEntry.name}" removed.`, "success");
@@ -12080,90 +11833,26 @@ ${selector} .arrowheadPath {
   }
 
   async function saveGitHubAccess() {
-    if (!githubImportPatInput || !githubImportPatRetention || !githubImportPatNameInput) return;
+    if (!githubImportPatInput || !githubImportPatNameInput) return;
     const name = validateGitHubAccessName(githubImportPatNameInput.value);
     const token = githubImportPatInput.value;
     validateGitHubPat(token);
-    const tokenType = normalizeGitHubPatType(githubImportPatTypeSelect ? githubImportPatTypeSelect.value : "fine-grained");
-    const retention = githubImportPatRetention.value;
-    let expiresAt = 0;
-    let entry = {
+    const entry = {
       id: createGitHubAccessId(),
       name,
-      tokenType,
-      sessionOnly: retention === "session",
-      expiresAt: 0,
       createdAt: Date.now()
     };
 
-    if (retention !== "session") {
-      const days = Number(retention);
-      const passphrase = githubImportPatPassphrase ? githubImportPatPassphrase.value : "";
-      if (!Number.isFinite(days) || days < 1 || days > 30) {
-        throw new Error("Choose a supported access retention period.");
-      }
-      if (passphrase.length < 12) {
-        throw new Error("Use at least 12 characters for the protection passphrase.");
-      }
-      if (!workspaceStorage) {
-        throw new Error("Encrypted workspace storage is unavailable. Use session-only access instead.");
-      }
-      expiresAt = Date.now() + days * 24 * 60 * 60 * 1000;
-      entry = {
-        ...entry,
-        ...(await encryptGitHubAccessToken(token, passphrase, expiresAt)),
-        id: entry.id,
-        name,
-        tokenType,
-        sessionOnly: false,
-        expiresAt
-      };
-    }
-
-    const previousSelectedId = githubSelectedAccessId;
-    const previousAdding = githubAccessAdding;
     githubAccessEntries.push(entry);
-    githubUnlockedAccessTokens.set(entry.id, token);
+    githubSessionAccessTokens.set(entry.id, token);
     githubSelectedAccessId = entry.id;
     githubAccessAdding = false;
-    try {
-      if (!entry.sessionOnly) await persistGitHubAccessVault();
-    } catch (error) {
-      githubAccessEntries = githubAccessEntries.filter(function(candidate) { return candidate.id !== entry.id; });
-      githubUnlockedAccessTokens.delete(entry.id);
-      githubSelectedAccessId = previousSelectedId;
-      githubAccessAdding = previousAdding;
-      renderGitHubAccessState();
-      throw error;
-    }
     resetGitHubAccessForm();
     renderGitHubAccessState();
     setGitHubAccessStatus(`"${name}" added.`, "success");
     announceToScreenReader("GitHub access token added.");
   }
 
-  async function unlockStoredGitHubAccess() {
-    const selectedEntry = getSelectedGitHubAccessEntry();
-    if (!selectedEntry || selectedEntry.sessionOnly || !githubImportPatUnlockPassphrase) return;
-    const passphrase = githubImportPatUnlockPassphrase.value;
-    if (!passphrase) throw new Error("Enter the protection passphrase.");
-    try {
-      const token = await decryptGitHubAccessToken(selectedEntry, passphrase);
-      githubUnlockedAccessTokens.set(selectedEntry.id, token);
-    } catch (error) {
-      if (Number(selectedEntry.expiresAt) <= Date.now()) {
-        await removeGitHubAccess({ id: selectedEntry.id, silent: true });
-        throw new Error("The saved access expired and was removed.");
-      }
-      throw new Error("Could not unlock this token. Check the passphrase.");
-    } finally {
-      githubImportPatUnlockPassphrase.value = "";
-    }
-    renderGitHubAccessState();
-    setGitHubAccessStatus(`"${selectedEntry.name}" unlocked.`, "success");
-    announceToScreenReader("GitHub access token unlocked.");
-  }
-
   function renderGitHubRepositoryContext(context) {
     if (!githubImportRepositoryContext) return;
     if (!context) {
@@ -12272,12 +11961,6 @@ ${selector} .arrowheadPath {
     githubImportSelectedCount.textContent = `${count.toLocaleString()} selected`;
   }
 
-  function updateGitHubImportTotalCount() {
-    if (!githubImportTotalCount) return;
-    const total = availableGitHubImportPaths.length;
-    githubImportTotalCount.textContent = `${total.toLocaleString()} ${total === 1 ? "file" : "files"}`;
-  }
-
   function updateGitHubSelectAllButtonLabel() {
     if (!githubImportSelectAllBtn) return;
     const total = availableGitHubImportPaths.length;
@@ -12286,7 +11969,6 @@ ${selector} .arrowheadPath {
     githubImportSelectAllBtn.setAttribute("aria-label", actionLabel);
     githubImportSelectAllBtn.title = actionLabel;
     githubImportSelectAllBtn.setAttribute("aria-pressed", allSelected ? "true" : "false");
-    githubImportSelectAllBtn.classList.toggle("is-deselect", allSelected);
     const icon = githubImportSelectAllBtn.querySelector("i");
     if (icon) {
       icon.className = `lucide ${allSelected ? "lucide-square-x" : "lucide-check-check"}`;
@@ -12331,6 +12013,52 @@ ${selector} .arrowheadPath {
     return availableGitHubImportPaths.filter((path) => path.toLocaleLowerCase().includes(query));
   }
 
+  function getGitHubImportFolderPaths(paths) {
+    const folderPaths = new Set();
+    (paths || []).forEach(function(path) {
+      const segments = String(path || "").split("/").filter(Boolean);
+      segments.pop();
+      for (let index = 1; index <= segments.length; index++) {
+        folderPaths.add(segments.slice(0, index).join("/"));
+      }
+    });
+    return Array.from(folderPaths);
+  }
+
+  function updateGitHubFolderToggleButton() {
+    if (!githubImportToggleFoldersBtn) return;
+    const folderPaths = getGitHubImportFolderPaths(availableGitHubImportPaths);
+    const searchActive = Boolean(githubImportSearchInput && githubImportSearchInput.value.trim());
+    const allCollapsed = folderPaths.length > 0 && folderPaths.every(function(path) {
+      return collapsedGitHubImportFolders.has(path);
+    });
+    const actionLabel = allCollapsed ? "Expand all folders" : "Collapse all folders";
+    githubImportToggleFoldersBtn.disabled = searchActive || !folderPaths.length;
+    githubImportToggleFoldersBtn.setAttribute("aria-label", actionLabel);
+    githubImportToggleFoldersBtn.title = searchActive ? "Clear search to change all folders" : actionLabel;
+    githubImportToggleFoldersBtn.setAttribute("aria-pressed", allCollapsed ? "true" : "false");
+    const icon = githubImportToggleFoldersBtn.querySelector("i");
+    if (icon) {
+      icon.className = `lucide ${allCollapsed ? "lucide-unfold-vertical" : "lucide-fold-vertical"}`;
+    }
+  }
+
+  function toggleAllGitHubImportFolders() {
+    const folderPaths = getGitHubImportFolderPaths(availableGitHubImportPaths);
+    if (!folderPaths.length) return;
+    const shouldExpand = folderPaths.every(function(path) {
+      return collapsedGitHubImportFolders.has(path);
+    });
+    collapsedGitHubImportFolders.clear();
+    if (!shouldExpand) {
+      folderPaths.forEach(function(path) {
+        collapsedGitHubImportFolders.add(path);
+      });
+    }
+    renderGitHubImportTree();
+    announceToScreenReader(shouldExpand ? "All GitHub folders expanded." : "All GitHub folders collapsed.");
+  }
+
   function countMarkdownFilesInTreeNode(node) {
     return node.files.length + Object.values(node.folders).reduce((total, folder) => {
       return total + countMarkdownFilesInTreeNode(folder);
@@ -12348,6 +12076,7 @@ ${selector} .arrowheadPath {
       emptyState.setAttribute("role", "status");
       emptyState.innerHTML = '<i class="lucide lucide-search" aria-hidden="true"></i><span>No Markdown files match your search.</span>';
       githubImportTree.appendChild(emptyState);
+      updateGitHubFolderToggleButton();
       return;
     }
     const tree = buildMarkdownFileTree(visiblePaths);
@@ -12395,6 +12124,7 @@ ${selector} .arrowheadPath {
           folderIcon.className = `lucide ${shouldCollapse ? "lucide-folder" : "lucide-folder-open"} github-tree-folder-icon`;
           if (shouldCollapse) collapsedGitHubImportFolders.add(folderPath);
           else collapsedGitHubImportFolders.delete(folderPath);
+          updateGitHubFolderToggleButton();
         });
         item.append(folderToggle, childBranch);
         list.appendChild(item);
@@ -12441,6 +12171,7 @@ ${selector} .arrowheadPath {
     treeFragment.appendChild(createTreeBranch(tree, ""));
     githubImportTree.appendChild(treeFragment);
     syncGitHubSelectionToButtons();
+    updateGitHubFolderToggleButton();
   }
 
   function setGitHubImportLoading(isLoading) {
@@ -12486,7 +12217,6 @@ ${selector} .arrowheadPath {
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
     resetGitHubAccessForm();
     githubAccessAdding = !githubAccessEntries.length;
-    if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
     setGitHubAccessStatus("");
     renderGitHubRepositoryContext(null);
     githubImportUrlInput.disabled = false;
@@ -12504,7 +12234,7 @@ ${selector} .arrowheadPath {
       githubImportSearchInput.value = "";
       githubImportSearchInput.disabled = false;
     }
-    updateGitHubImportTotalCount();
+    updateGitHubFolderToggleButton();
     setGitHubSelectedPaths([]);
     if (githubImportTree) {
       githubImportTree.innerHTML = "";
@@ -12546,6 +12276,9 @@ ${selector} .arrowheadPath {
       if (githubImportSelectAllBtn) {
         githubImportSelectAllBtn.disabled = disabled;
       }
+      if (githubImportToggleFoldersBtn) {
+        githubImportToggleFoldersBtn.disabled = disabled;
+      }
       if (githubImportSearchInput) {
         githubImportSearchInput.disabled = disabled;
       }
@@ -12554,18 +12287,14 @@ ${selector} .arrowheadPath {
         githubImportPatSelect,
         githubImportPatAddAnotherBtn,
         githubImportPatAddCancelBtn,
-        githubImportPatUnlockPassphrase,
-        githubImportPatUnlockBtn,
-        githubImportPatTypeSelect,
         githubImportPatNameInput,
         githubImportPatInput,
-        githubImportPatRetention,
-        githubImportPatPassphrase,
         githubImportPatSaveBtn,
         githubImportPatRemoveBtn
       ].forEach(function(control) {
         if (control) control.disabled = disabled;
       });
+      if (!disabled) updateGitHubFolderToggleButton();
     };
     const step = githubImportSubmitBtn.dataset.step || "url";
     if (step === "select") {
@@ -12655,7 +12384,6 @@ ${selector} .arrowheadPath {
         githubImportTree.style.display = "block";
       }
       availableGitHubImportPaths = files.slice();
-      updateGitHubImportTotalCount();
       setGitHubSelectedPaths(files[0] ? [files[0]] : []);
       renderGitHubImportTree();
 
@@ -12680,7 +12408,7 @@ ${selector} .arrowheadPath {
       console.error("GitHub import failed:", error);
       setGitHubImportMessage("GitHub import failed: " + error.message);
       if (githubImportAccessToggle && githubImportAccessPanel
-        && /^(Unlock |".+" (?:cannot access|was rejected))/.test(error.message || "")) {
+        && /^".+" (?:is no longer available|cannot access|was rejected)/.test(error.message || "")) {
         githubImportAccessToggle.setAttribute("aria-expanded", "true");
         githubImportAccessPanel.hidden = false;
         renderGitHubAccessState();
@@ -18920,12 +18648,7 @@ ${selector} .arrowheadPath {
       githubImportAccessToggle.setAttribute("aria-expanded", expanded ? "false" : "true");
       githubImportAccessPanel.hidden = expanded;
       if (!expanded) {
-        const selectedEntry = getSelectedGitHubAccessEntry();
-        const target = selectedEntry && !selectedEntry.sessionOnly && !githubUnlockedAccessTokens.has(selectedEntry.id)
-          ? githubImportPatUnlockPassphrase
-          : githubAccessAdding
-            ? githubImportPatNameInput
-            : githubImportPatSelect;
+        const target = githubAccessAdding ? githubImportPatNameInput : githubImportPatSelect;
         if (target) {
           requestAnimationFrame(function() {
             target.focus();
@@ -18938,7 +18661,6 @@ ${selector} .arrowheadPath {
   if (githubImportPatSelect) {
     githubImportPatSelect.addEventListener("change", function() {
       githubSelectedAccessId = githubImportPatSelect.value;
-      if (githubImportPatUnlockPassphrase) githubImportPatUnlockPassphrase.value = "";
       setGitHubAccessStatus("");
       renderGitHubAccessState();
     });
@@ -18953,18 +18675,6 @@ ${selector} .arrowheadPath {
       setGitHubAccessAdding(false, { focus: false });
     });
   }
-  if (githubImportPatTypeSelect) {
-    githubImportPatTypeSelect.addEventListener("change", function() {
-      setGitHubAccessStatus("");
-    });
-  }
-  if (githubImportPatRetention) {
-    githubImportPatRetention.addEventListener("change", function() {
-      const needsPassphrase = githubImportPatRetention.value !== "session";
-      if (githubImportPatProtection) githubImportPatProtection.hidden = !needsPassphrase;
-      if (!needsPassphrase && githubImportPatPassphrase) githubImportPatPassphrase.value = "";
-    });
-  }
   if (githubImportPatSaveBtn) {
     githubImportPatSaveBtn.addEventListener("click", async function() {
       const previousText = githubImportPatSaveBtn.textContent;
@@ -18981,22 +18691,6 @@ ${selector} .arrowheadPath {
       }
     });
   }
-  if (githubImportPatUnlockBtn) {
-    githubImportPatUnlockBtn.addEventListener("click", async function() {
-      const previousText = githubImportPatUnlockBtn.textContent;
-      githubImportPatUnlockBtn.disabled = true;
-      githubImportPatUnlockBtn.textContent = "Unlocking…";
-      setGitHubAccessStatus("");
-      try {
-        await unlockStoredGitHubAccess();
-      } catch (error) {
-        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be unlocked.", "error");
-      } finally {
-        githubImportPatUnlockBtn.disabled = false;
-        githubImportPatUnlockBtn.textContent = previousText;
-      }
-    });
-  }
   if (githubImportPatRemoveBtn) {
     githubImportPatRemoveBtn.addEventListener("click", async function() {
       githubImportPatRemoveBtn.disabled = true;
@@ -19004,7 +18698,7 @@ ${selector} .arrowheadPath {
       try {
         await removeGitHubAccess();
       } catch (_) {
-        setGitHubAccessStatus("Private access could not be removed from device storage.", "error");
+        setGitHubAccessStatus("Private access could not be removed.", "error");
       } finally {
         githubImportPatRemoveBtn.disabled = false;
       }
@@ -19019,7 +18713,6 @@ ${selector} .arrowheadPath {
       }
     });
   };
-  bindGitHubAccessEnterAction(githubImportPatUnlockPassphrase, githubImportPatUnlockBtn);
   bindGitHubAccessEnterAction(githubImportPatInput, githubImportPatSaveBtn);
   void loadStoredGitHubAccess();
   const handleGitHubImportInputKeydown = function(e) {
@@ -19061,6 +18754,9 @@ ${selector} .arrowheadPath {
       setGitHubSelectedPaths(shouldSelectAll ? allPaths : []);
     });
   }
+  if (githubImportToggleFoldersBtn) {
+    githubImportToggleFoldersBtn.addEventListener("click", toggleAllGitHubImportFolders);
+  }
 
   fileInput.addEventListener("change", async function (e) {
     try {
diff --git a/styles.css b/styles.css
index 03601ca2..382d18ae 100644
--- a/styles.css
+++ b/styles.css
@@ -6018,9 +6018,7 @@ a:focus {
 .github-import-access-panel[hidden],
 .github-import-access-manage[hidden],
 .github-import-access-form[hidden],
-.github-import-access-unlock[hidden],
-.github-import-pat-protection[hidden],
-.github-import-access-danger-btn[hidden],
+.github-import-remove-token-btn[hidden],
 .github-import-repository-context[hidden],
 .github-import-base-path[hidden],
 .github-import-access-status[hidden] {
@@ -6081,11 +6079,6 @@ a:focus {
   color: #1a7f37;
 }
 
-.github-import-access[data-state="locked"] .github-import-access-icon {
-  background: color-mix(in srgb, var(--accent-color) 12%, transparent);
-  color: var(--accent-color);
-}
-
 .github-import-access-copy {
   display: grid;
   gap: 2px;
@@ -6124,11 +6117,12 @@ a:focus {
   gap: 10px;
   padding: 12px;
   border-top: 1px solid var(--border-color);
-  background: color-mix(in srgb, var(--button-bg) 55%, var(--bg-color));
+  background: var(--bg-color);
 }
 
 .github-import-access-form-heading,
-.github-import-access-selection-row {
+.github-import-access-manage-header,
+.github-import-access-form-footer {
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -6140,34 +6134,26 @@ a:focus {
   font-size: var(--ui-font-md);
 }
 
-.github-import-access-form-grid {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 8px;
-}
-
 .github-import-access-field {
   display: grid;
-  gap: 5px;
+  gap: 6px;
   min-width: 0;
 }
 
 .github-import-access-form,
-.github-import-access-manage,
-.github-import-access-unlock,
-.github-import-pat-protection {
+.github-import-access-manage {
   display: grid;
-  gap: 8px;
+  gap: 10px;
 }
 
 .github-import-access-form .reset-modal-label,
 .github-import-access-manage .reset-modal-label,
-.github-import-pat-protection .reset-modal-label,
-.github-import-access-actions > button {
+.github-import-access-form-footer > button {
   white-space: nowrap;
 }
 
 .github-import-access-selected-meta {
+  display: block;
   min-width: 0;
   overflow: hidden;
   color: var(--text-secondary);
@@ -6176,19 +6162,6 @@ a:focus {
   white-space: nowrap;
 }
 
-.github-import-access-unlock {
-  padding: 10px;
-  border: 1px solid color-mix(in srgb, var(--accent-color) 26%, var(--border-color));
-  border-radius: 8px;
-  background: color-mix(in srgb, var(--accent-color) 6%, var(--bg-color));
-}
-
-.github-import-access-inline {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) auto;
-  gap: 8px;
-}
-
 .github-import-access-panel .rename-modal-input {
   width: 100%;
   min-height: 38px;
@@ -6196,87 +6169,47 @@ a:focus {
   font-size: var(--ui-font-md);
 }
 
-.github-import-access-actions {
-  display: flex;
+.github-import-toolbar-actions {
+  display: inline-flex;
   align-items: center;
-  flex-wrap: wrap;
-  gap: 8px;
-  padding-top: 2px;
+  flex: 0 0 auto;
+  gap: 4px;
 }
 
-.github-import-access-primary-btn,
-.github-import-access-secondary-btn,
-.github-import-access-danger-btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  min-height: 36px;
-  padding: 7px 11px;
-  border: 1px solid var(--border-color);
+.github-import-toolbar-btn.tool-button {
+  width: 36px;
+  height: 36px;
+  min-width: 36px;
+  padding: 0;
   border-radius: 7px;
-  background: var(--button-bg);
-  color: var(--text-color);
-  cursor: pointer;
-  font: inherit;
-  font-size: var(--ui-font-md);
-  font-weight: 650;
 }
 
-.github-import-access-primary-btn {
-  border-color: var(--accent-color);
-  background: var(--accent-color);
-  color: #fff;
+.github-import-toolbar-btn > .lucide {
+  width: 16px;
+  height: 16px;
 }
 
-.github-import-access-danger-btn {
+.github-import-remove-token-btn {
   color: var(--color-danger-fg, #cf222e);
 }
 
-.github-import-access-text-btn {
-  min-height: 28px;
-  padding: 3px 5px;
-  border: 0;
-  background: transparent;
-  color: var(--text-secondary);
-  cursor: pointer;
-  font: inherit;
-  font-size: var(--ui-font-sm);
-}
-
-.github-import-access-text-btn:hover {
-  color: var(--text-color);
-}
-
-.github-import-access-text-btn:focus-visible {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
-}
-
-.github-import-access-secondary-btn > .lucide,
-.github-import-access-danger-btn > .lucide {
-  width: 14px;
-  height: 14px;
-}
-
-.github-import-access-primary-btn:hover,
-.github-import-access-secondary-btn:hover,
-.github-import-access-danger-btn:hover {
-  filter: brightness(0.97);
+.github-import-access-form-footer {
+  padding-top: 2px;
 }
 
-.github-import-access-primary-btn:focus-visible,
-.github-import-access-secondary-btn:focus-visible,
-.github-import-access-danger-btn:focus-visible {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
+.github-import-access-session-note {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--text-secondary);
+  font-size: var(--ui-font-sm);
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
-.github-import-access-primary-btn:disabled,
-.github-import-access-secondary-btn:disabled,
-.github-import-access-danger-btn:disabled {
-  cursor: not-allowed;
-  opacity: 0.55;
+.github-import-access-form-footer .reset-modal-btn {
+  min-height: 34px;
+  padding: 7px 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-import-access-status {
@@ -6419,7 +6352,7 @@ a:focus {
 
 .github-import-selection-toolbar {
   display: grid;
-  grid-template-columns: minmax(220px, 1fr) auto 40px;
+  grid-template-columns: minmax(220px, 1fr) auto auto;
   align-items: center;
   gap: 8px;
 }
@@ -6481,48 +6414,10 @@ a:focus {
   color: var(--text-color);
 }
 
-.github-import-count-separator {
-  color: color-mix(in srgb, var(--text-secondary) 66%, transparent);
-}
-
-.github-import-select-all-btn {
-  display: inline-grid;
-  place-items: center;
-  width: 40px;
-  height: 40px;
-  padding: 0;
-  border: 1px solid var(--border-color);
-  border-radius: 8px;
-  background: var(--button-bg);
-  color: var(--text-color);
-  cursor: pointer;
-  transition: background-color 160ms ease, border-color 160ms ease, color 160ms ease;
-}
-
-.github-import-select-all-btn > .lucide {
-  width: 18px;
-  height: 18px;
-}
-
-.github-import-select-all-btn:hover {
-  border-color: color-mix(in srgb, var(--accent-color) 42%, var(--border-color));
-  background: var(--button-hover);
-}
-
-.github-import-select-all-btn:focus-visible {
-  outline: 2px solid var(--accent-color);
-  outline-offset: 2px;
-}
-
-.github-import-select-all-btn.is-deselect {
-  border-color: color-mix(in srgb, var(--accent-color) 46%, var(--border-color));
-  background: color-mix(in srgb, var(--accent-color) 12%, var(--button-bg));
+.github-import-toolbar-btn[aria-pressed="true"] {
+  border-color: color-mix(in srgb, var(--mv-blue) 14%, var(--mv-border));
   color: var(--accent-color);
-}
-
-.github-import-select-all-btn:disabled {
-  cursor: not-allowed;
-  opacity: 0.5;
+  background-color: rgba(3, 102, 214, 0.08);
 }
 
 .github-import-tree ul {
@@ -6707,7 +6602,7 @@ a:focus {
   }
 
   .github-import-selection-toolbar {
-    grid-template-columns: minmax(0, 1fr) 44px;
+    grid-template-columns: minmax(0, 1fr) auto;
   }
 
   .github-import-search {
@@ -6715,13 +6610,14 @@ a:focus {
   }
 
   #github-import-search,
-  .github-import-select-all-btn {
+  .github-import-toolbar-btn.tool-button {
     min-height: 44px;
   }
 
-  .github-import-select-all-btn {
+  .github-import-toolbar-btn.tool-button {
     width: 44px;
     height: 44px;
+    min-width: 44px;
   }
 
   .github-import-selection-summary {
@@ -6738,9 +6634,6 @@ a:focus {
     min-height: 44px;
   }
 
-  .github-import-access-primary-btn,
-  .github-import-access-secondary-btn,
-  .github-import-access-danger-btn,
   .github-import-access-panel .rename-modal-input {
     min-height: 44px;
   }
@@ -6759,19 +6652,8 @@ a:focus {
   }
 }
 
-@media (max-width: 430px) {
-  .github-import-access-form-grid {
-    grid-template-columns: minmax(0, 1fr);
-  }
-
-  .github-import-access-selection-row {
-    align-items: flex-start;
-    flex-direction: column;
-  }
-}
-
 @media (prefers-reduced-motion: reduce) {
-  .github-import-select-all-btn,
+  .github-import-toolbar-btn,
   .github-import-access-chevron {
     transition: none;
   }
@@ -6779,15 +6661,16 @@ a:focus {
 
 @media (max-width: 900px) and (max-height: 500px) {
   #github-import-search,
-  .github-import-select-all-btn,
+  .github-import-toolbar-btn.tool-button,
   .github-tree-folder-label,
   .github-tree-file-btn {
     min-height: 44px;
   }
 
-  .github-import-select-all-btn {
+  .github-import-toolbar-btn.tool-button {
     width: 44px;
     height: 44px;
+    min-width: 44px;
   }
 }
 
diff --git a/wiki/FAQ.md b/wiki/FAQ.md
index 5ae2aef6..7ac57295 100644
--- a/wiki/FAQ.md
+++ b/wiki/FAQ.md
@@ -120,7 +120,7 @@ Yes. It supports regular expressions, capture replacements, preserve-case replac
 
 ### Can I import a private GitHub repository?
 
-Yes. Expand **Private repository access**, choose a token type, give the token a recognizable name, choose its disposal time, and select **Add access**. The form then collapses into a named-token selector; you can add, select, unlock, or remove entries individually. Fine-grained PATs are recommended, while classic PATs remain available for compatibility. Session-only entries are not written to storage. Remembered entries are AES-GCM encrypted under separate passphrases and expire after 1, 7, or 30 days. The app cannot revoke a PAT on GitHub; use GitHub settings to revoke or rotate it.
+Yes. Expand **Private repository access**, give the token a recognizable name, enter either a fine-grained or classic PAT, and select **Add access**. The app detects both formats automatically. The form then collapses into a named-token selector so you can add, select, or remove entries individually. Tokens remain in memory for the current session only and are not written to application storage, so no passphrase or unlock step is needed. The app cannot revoke a PAT on GitHub; use GitHub settings to revoke or rotate it.
 
 ### Which PDF option should I use?
 
diff --git a/wiki/Features.md b/wiki/Features.md
index 10c51782..6f621da0 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -266,12 +266,12 @@ GitHub import:
 - Resolves default branches, explicit branches (including names containing `/`), tags, and commit references to an immutable commit SHA.
 - Direct Markdown file URLs import immediately.
 - Repository or folder URLs query GitHub's API to find Markdown files.
-- The URL step remains a compact 520px dialog. The 760px selection step shows repository/ref/short-commit context, a searchable and collapsible GitHub-style tree, selected and total file counts, and an icon-based select-all or deselect-all control.
-- Default-branch imports create a repository-named folder. Other refs place the short commit beside the repository name. Each selected file's nested GitHub directory path is reproduced inside it.
+- The URL step remains a compact 520px dialog. The 760px selection step shows repository context with branch and short commit side by side, a searchable and collapsible GitHub-style tree, a selected-file count, and matching icon controls for select/deselect all and collapse/expand all folders.
+- Default-branch imports create a repository-named folder. Each selected file's nested GitHub directory path is reproduced inside it.
 - Every Markdown file found is shown.
 - Requests are rate-limited by the app to avoid hammering GitHub.
 - Public files are fetched as raw content. Private files use GitHub's authenticated Contents API. Both are saved to Explorer without opening new tabs.
-- Optional private access supports multiple named fine-grained PATs (recommended) or classic PATs in a compact add-then-select flow. Session entries remain only in memory; optional 1-, 7-, or 30-day disposal stores PBKDF2-derived AES-GCM ciphertext under a separate, non-stored passphrase. Expiry and individual removal delete the local entry.
+- Optional private access accepts fine-grained and classic PATs automatically in a compact add-then-select flow. Multiple named tokens remain only in memory for the current session and can be removed individually without a passphrase or unlock step.
 
 Limitations and privacy:
 
@@ -540,7 +540,7 @@ Security limitations:
 | Local file import | No | Current tab/workspace | Reads selected files only. |
 | Managed media upload | Yes, after first-use consent | Cloudflare KV, content-addressed, 90-day TTL | Publicly retrievable by its unguessable HTTPS URL until expiry; still images 300 KiB optimized, GIF 5 MiB, video 10 MiB. |
 | Markdown/HTML/PDF/PNG export | No, except remote assets already referenced | User download location | Browser may request external images/fonts used by content. |
-| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Multiple named fine-grained or classic PATs; session-only or passphrase-encrypted with per-entry expiry and removal. |
+| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Multiple named fine-grained or classic PATs; session-only in memory with individual removal. |
 | Emoji lookup | Yes | GitHub emoji API response in memory | Used for shortcode picker/lookup. |
 | CDN library loading | Yes | Browser/service-worker cache | Web build only, first use unless cached. |
 | Remote diagram engines | Yes | Third-party renderer response/cache | Source is sent to PlantUML, Kroki, or mermaid.ink depending on renderer/preview. |
diff --git a/wiki/Privacy-and-Security.md b/wiki/Privacy-and-Security.md
index d7d4ebce..0ed5478b 100644
--- a/wiki/Privacy-and-Security.md
+++ b/wiki/Privacy-and-Security.md
@@ -60,7 +60,7 @@ In the desktop application, replacing or deleting the binary does not remove `Do
 | Feature | Data sent | Destination and retention | Access model |
 | :--- | :--- | :--- | :--- |
 | Web/PWA library loading | Library requests, IP and normal HTTP metadata | cdnjs, jsDelivr, or esm.sh; browser/Service Worker cache | Governed by the remote host |
-| GitHub import | Repository/path/ref request and selected content downloads; optional named PATs for private repositories | Public content: GitHub API and `raw.githubusercontent.com`; private content and PAT: `api.github.com` only | Session entries remain in memory; remembered entries are individually passphrase-encrypted with local expiry and removal |
+| GitHub import | Repository/path/ref request and selected content downloads; optional named PATs for private repositories | Public content: GitHub API and `raw.githubusercontent.com`; private content and PAT: `api.github.com` only | Fine-grained and classic PATs are accepted automatically, remain in memory for the current session, and are never written to application storage |
 | Emoji lookup | Emoji API request | GitHub API; response kept in memory/cache | Remote host |
 | Remote diagrams | Diagram source or encoded source | PlantUML, Kroki, or mermaid.ink; response can be browser-cached | Remote renderer receives the source |
 | GeoJSON/TopoJSON maps | Tile and external-asset requests | Configured map-tile or asset host | Remote host |
diff --git a/wiki/Troubleshooting.md b/wiki/Troubleshooting.md
index 0493c801..c61f1af1 100644
--- a/wiki/Troubleshooting.md
+++ b/wiki/Troubleshooting.md
@@ -78,9 +78,9 @@ Extension matching is case-insensitive. Rename a plain-text file to `.md` only w
 ## GitHub Import Fails or Shows Too Few Files
 
 - Use a public `github.com` repository, tree, blob, or `raw.githubusercontent.com` Markdown URL.
-- For a private repository, use a fine-grained PAT (recommended) with **Contents: Read-only** for the required repositories under one owner. Use a classic PAT only as a broad-access compatibility fallback. If an organization requires approval or SAML authorization, complete that step in GitHub.
+- For a private repository, add either a fine-grained or classic PAT with permission to read the required repository. The app detects both formats automatically. If an organization requires approval or SAML authorization, complete that step in GitHub.
 - Branch, tag, and commit URLs are supported. For branch names containing `/`, paste the complete GitHub tree or blob URL so the importer can resolve the longest matching ref.
-- Select the intended named token before importing. If a remembered entry will not unlock, check its protection passphrase. If GitHub rejects it or reports that it cannot access the repository, replace the token or update its repository permissions. Expired entries are deleted locally.
+- Select the intended named token before importing. If GitHub rejects it or reports that it cannot access the repository, replace the token or update its repository permissions. Tokens are session-only and must be added again after reload or app close.
 - Repository and folder results show every Markdown file found.
 - Check GitHub API rate-limit and network responses.
 - Confirm that CSP allows `api.github.com` and `raw.githubusercontent.com`.
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index b2e20686..0151ac41 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -121,11 +121,11 @@ Use Import > From GitHub and paste one of these URL types:
 - `https://github.com/owner/repo/blob/main/README.md`
 - `https://raw.githubusercontent.com/owner/repo/main/README.md`
 
-Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs resolve the default branch, an explicit branch (including names containing `/`), a tag, or a commit to an immutable commit SHA before listing files. The searchable, collapsible tree contains every Markdown file found, shows the repository, ref, and short commit, and uses the same compact type scale as other application modals. The toolbar shows selected and total file counts and provides an icon that switches between select all and deselect all. Default-branch imports use a repository-named Explorer folder; other refs include the short commit beside the repository name. Nested GitHub directory paths are preserved, and imported files remain closed until you select one in Explorer.
+Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs resolve the default branch, an explicit branch (including names containing `/`), a tag, or a commit to an immutable commit SHA before listing files. The searchable, collapsible tree contains every Markdown file found, shows the repository with its branch and short commit side by side, and uses the same compact type scale as other application modals. The toolbar shows the selected-file count and provides matching icon controls for select/deselect all and collapse/expand all folders. Default-branch imports use a repository-named Explorer folder. Nested GitHub directory paths are preserved, and imported files remain closed until you select one in Explorer.
 
-Public repositories need no credentials. For a private repository, expand **Private repository access**, choose fine-grained (recommended) or classic, enter a name and token, choose a disposal time, and select **Add access**. After adding, the form closes and a dropdown lets you select among multiple named tokens before choosing **Import**. Use **Add another**, **Unlock**, or **Remove** to manage entries. The importer first tries public access and sends the selected token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
+Public repositories need no credentials. For a private repository, expand **Private repository access**, enter a recognizable name and either a fine-grained or classic PAT, and select **Add access**. The app accepts both PAT formats automatically. After adding, the form closes and a dropdown lets you select among multiple named tokens before choosing **Import**. Use the icon controls to add another token or remove the selected one. The importer first tries public access and sends the selected token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
 
-**End of this session** never writes the PAT to application storage. The optional 1-, 7-, or 30-day disposal choices require a separate 12-character protection passphrase and store only PBKDF2-derived, AES-GCM authenticated ciphertext. The passphrase is never stored. Expired entries become unusable and are removed while the app is running or the next time it starts. Local removal does not revoke a PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
+GitHub access tokens are session-only. They remain in memory and are never written to application storage, so they disappear on reload or app close and do not require a protection passphrase or unlock step. Local removal does not revoke a PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
 
 ## Export Markdown to PDF, HTML, PNG, and MD
 

From 6fde0b3836b1276f365bf3a25acc4ab57438d209 Mon Sep 17 00:00:00 2001
From: Baivab Sarkar <baivabsarkar@gmail.com>
Date: Fri, 31 Jul 2026 01:21:05 +0530
Subject: [PATCH 10/10] refactor(github): refine importer controls

---
 CHANGELOG.md                       |   8 +-
 README.md                          |   2 +-
 desktop-app/resources/index.html   |  27 +++---
 desktop-app/resources/js/script.js | 140 +++++++++++++++++++++++++----
 desktop-app/resources/styles.css   | 104 +++++++++++++--------
 index.html                         |  27 +++---
 script.js                          | 140 +++++++++++++++++++++++++----
 styles.css                         | 104 +++++++++++++--------
 wiki/FAQ.md                        |   2 +-
 wiki/Features.md                   |   6 +-
 wiki/Privacy-and-Security.md       |   2 +-
 wiki/Troubleshooting.md            |   2 +-
 wiki/Usage-Guide.md                |   4 +-
 13 files changed, 417 insertions(+), 151 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9755b2d..c89030a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,10 +40,10 @@ The following changes are implemented on `main` after `v3.9.4` but are not yet p
 - Added complete subtree traversal when GitHub marks a recursive repository tree response as truncated.
 - Added branch, tag, and commit URL resolution, including branch names containing `/`, and pinned each import to the resolved immutable commit SHA.
 - Added optional private repository access that accepts fine-grained and classic PATs automatically.
-- Kept private access session-only: named tokens remain in memory, disappear on reload or app close, and can be removed individually without a passphrase or unlock step. Retired locally saved GitHub-access records are deleted during upgrade.
-- Replaced the verbose token form with a compact add-then-select flow whose add and remove actions use the same icon-button pattern as the rest of the application.
-- Restored the compact 520px GitHub URL step while keeping the searchable file picker at 760px, and placed repository branch and short-commit context together on the selection step.
-- Added file search, a selected count, matching icon controls for select/deselect all and collapse/expand all, and GitHub-style folder and file rows using the application typography scale.
+- Kept private access session-only: named tokens remain in memory, disappear on reload or app close, support an optional earlier expiry date, and can be removed individually without a passphrase or unlock step. Retired locally saved GitHub-access records are deleted during upgrade.
+- Replaced the verbose token form with a compact add-then-select flow. Add/remove success and failure use application toasts instead of expanding the form with inline status text.
+- Restored the compact 520px GitHub URL step while keeping the searchable file picker at 760px. Repository name and ref metadata share one line; explicit tree/blob URLs show the branch or ref, while repository URLs show only the resolved commit.
+- Added file search, a compact selected-count badge, borderless toolbar-style controls for select/deselect all and collapse/expand all, and GitHub-style folder and file rows using the application typography scale.
 - Changed local, drag-and-drop, desktop, and GitHub Markdown imports to save documents in Explorer without opening every imported file as a tab.
 - Batched multi-tab close commands so closing hundreds of tabs performs one state update and render instead of repeatedly rebuilding the interface.
 
diff --git a/README.md b/README.md
index b85f9e80..fef648c0 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Remote renderer services receive the source of the diagram they render. Do not s
 - Workspace backups do not include trash, desktop history, or crash-recovery journals.
 - A local Markdown file larger than 10 MB is rejected.
 - The searchable GitHub importer shows every Markdown file found in a repository or folder result and resolves branch, tag, and commit URLs to an immutable commit SHA.
-- Private repository access accepts fine-grained and classic PATs automatically. Multiple named tokens can be added, selected, and removed during the current session; tokens are held only in memory and disappear on reload or app close.
+- Private repository access accepts fine-grained and classic PATs automatically. Multiple named tokens can be added, selected, and removed during the current session, with an optional earlier expiry date; tokens are held only in memory and disappear on reload or app close.
 - Imported Markdown files are saved to Explorer and remain closed until you choose one, preventing large imports from flooding the tab bar.
 - Managed source media is limited to 25 MiB before processing; stored payload limits are 300 KiB for still images, 5 MiB for GIFs, and 10 MiB for videos.
 - Stored Share Snapshot content is limited to 8,000,000 characters and expires after 90 days.
diff --git a/desktop-app/resources/index.html b/desktop-app/resources/index.html
index 316bc15f..9ffb674e 100644
--- a/desktop-app/resources/index.html
+++ b/desktop-app/resources/index.html
@@ -1325,6 +1325,10 @@ <h2 class="about-title">Markdown Viewer</h2>
                       <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My access token" autocomplete="off" spellcheck="false" />
                     </div>
                     <div class="github-import-access-field">
+                      <label class="reset-modal-label" for="github-import-pat-expiry">Expiry date <span class="github-import-optional-label">(optional)</span></label>
+                      <input type="datetime-local" id="github-import-pat-expiry" class="rename-modal-input" autocomplete="off" />
+                    </div>
+                    <div class="github-import-access-field github-import-access-token-field">
                       <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
                       <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
                     </div>
@@ -1333,7 +1337,6 @@ <h2 class="about-title">Markdown Viewer</h2>
                       <button type="button" id="github-import-pat-save" class="reset-modal-btn">Add access</button>
                     </div>
                   </div>
-                  <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
                 </div>
               </section>
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
@@ -1344,7 +1347,7 @@ <h2 class="about-title">Markdown Viewer</h2>
                     <strong id="github-import-repository-name"></strong>
                   </div>
                   <div class="github-import-repository-meta">
-                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
+                    <span id="github-import-ref-item" class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
                     <a id="github-import-commit-link" class="github-import-commit-link" target="_blank" rel="noopener noreferrer">
                       <i class="lucide lucide-git-commit-horizontal" aria-hidden="true"></i>
                       <span id="github-import-commit"></span>
@@ -1358,16 +1361,16 @@ <h2 class="about-title">Markdown Viewer</h2>
                   <i class="lucide lucide-search" aria-hidden="true"></i>
                   <input type="search" id="github-import-search" placeholder="Search Markdown files" autocomplete="off" spellcheck="false" />
                 </label>
-                <div class="github-import-selection-summary" aria-live="polite">
-                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                </div>
-                <div class="github-import-toolbar-actions" role="group" aria-label="File tree actions">
-                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-toggle-folders" aria-label="Collapse all folders" title="Collapse all folders">
-                    <i class="lucide lucide-fold-vertical" aria-hidden="true"></i>
-                  </button>
-                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
-                    <i class="lucide lucide-check-check" aria-hidden="true"></i>
-                  </button>
+                <div class="github-import-selection-actions">
+                  <output id="github-import-selected-count" class="github-import-selected-count" aria-live="polite">0 selected</output>
+                  <div class="github-import-toolbar-actions" role="group" aria-label="File tree actions">
+                    <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-toggle-folders" aria-label="Collapse all folders" title="Collapse all folders">
+                      <i class="lucide lucide-fold-vertical" aria-hidden="true"></i>
+                    </button>
+                    <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
+                      <i class="lucide lucide-check-check" aria-hidden="true"></i>
+                    </button>
+                  </div>
                 </div>
               </div>
               <div id="github-import-tree" class="github-import-tree" role="tree" aria-label="Markdown files in this GitHub location" style="display:none;"></div>
diff --git a/desktop-app/resources/js/script.js b/desktop-app/resources/js/script.js
index ea03a5c1..5651c042 100644
--- a/desktop-app/resources/js/script.js
+++ b/desktop-app/resources/js/script.js
@@ -548,15 +548,16 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportPatAddAnotherBtn = document.getElementById("github-import-pat-add-another");
   const githubImportPatAddCancelBtn = document.getElementById("github-import-pat-add-cancel");
   const githubImportPatNameInput = document.getElementById("github-import-pat-name");
+  const githubImportPatExpiryInput = document.getElementById("github-import-pat-expiry");
   const githubImportPatInput = document.getElementById("github-import-pat");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
-  const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
   const githubImportRepositoryName = document.getElementById("github-import-repository-name");
   const githubImportCommitLink = document.getElementById("github-import-commit-link");
   const githubImportCommit = document.getElementById("github-import-commit");
+  const githubImportRefItem = document.getElementById("github-import-ref-item");
   const githubImportRef = document.getElementById("github-import-ref");
   const githubImportBasePath = document.getElementById("github-import-base-path");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
@@ -11311,6 +11312,7 @@ ${selector} .arrowheadPath {
   let githubAccessVaultLoaded = false;
   let githubAccessVaultLoadPromise = null;
   const githubSessionAccessTokens = new Map();
+  let githubAccessExpiryTimer = null;
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11448,6 +11450,8 @@ ${selector} .arrowheadPath {
   }
 
   function getGitHubAccessToken() {
+    const expiredEntries = pruneExpiredGitHubAccessEntries();
+    if (expiredEntries.length) renderGitHubAccessState();
     return githubSessionAccessTokens.get(githubSelectedAccessId) || "";
   }
 
@@ -11459,7 +11463,7 @@ ${selector} .arrowheadPath {
     if (authenticated) {
       const token = getGitHubAccessToken();
       if (!token) {
-        throw new Error("Private repository access is locked or has expired.");
+        throw new Error("The selected GitHub access token is unavailable or expired. Add it again.");
       }
       headers.Authorization = `Bearer ${token}`;
     }
@@ -11676,6 +11680,7 @@ ${selector} .arrowheadPath {
       commitSha: commit.sha,
       defaultBranch,
       isDefaultRef: refName === defaultBranch,
+      hasExplicitRef: parsed.type !== "repo",
       isPrivate: Boolean(repoInfo.private),
       authenticated,
       filePath: parsed.type === "file" ? remainder.join("/") : "",
@@ -11683,23 +11688,92 @@ ${selector} .arrowheadPath {
     };
   }
 
-  function setGitHubAccessStatus(message, state) {
-    if (!githubImportAccessStatus) return;
-    githubImportAccessStatus.textContent = message || "";
-    githubImportAccessStatus.hidden = !message;
-    githubImportAccessStatus.classList.toggle("is-error", state === "error");
-    githubImportAccessStatus.classList.toggle("is-success", state === "success");
+  function toGitHubExpiryInputValue(timestamp) {
+    const date = new Date(timestamp);
+    const localDate = new Date(date.getTime() - (date.getTimezoneOffset() * 60000));
+    return localDate.toISOString().slice(0, 16);
+  }
+
+  function parseGitHubAccessExpiry(value) {
+    if (!value) return null;
+    const expiresAt = new Date(value).getTime();
+    if (!Number.isFinite(expiresAt)) {
+      throw new Error("Enter a valid expiry date.");
+    }
+    if (expiresAt <= Date.now()) {
+      throw new Error("Choose an expiry date in the future.");
+    }
+    return expiresAt;
+  }
+
+  function formatGitHubAccessExpiry(expiresAt) {
+    if (!expiresAt || !Number.isFinite(Number(expiresAt))) return "Available for this session";
+    try {
+      return "Expires " + new Intl.DateTimeFormat(undefined, {
+        dateStyle: "medium",
+        timeStyle: "short"
+      }).format(new Date(expiresAt));
+    } catch (_) {
+      return "Expires " + new Date(expiresAt).toLocaleString();
+    }
+  }
+
+  function pruneExpiredGitHubAccessEntries(options = {}) {
+    const expiredEntries = githubAccessEntries.filter(function(entry) {
+      return Number(entry.expiresAt) > 0 && Number(entry.expiresAt) <= Date.now();
+    });
+    if (!expiredEntries.length) return [];
+    const expiredIds = new Set(expiredEntries.map(function(entry) { return entry.id; }));
+    githubAccessEntries = githubAccessEntries.filter(function(entry) {
+      return !expiredIds.has(entry.id);
+    });
+    expiredIds.forEach(function(id) {
+      githubSessionAccessTokens.delete(id);
+    });
+    if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
+      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
+    }
+    githubAccessAdding = !githubAccessEntries.length;
+    if (options.notify !== false) {
+      const message = expiredEntries.length === 1
+        ? `"${expiredEntries[0].name}" expired and was removed.`
+        : `${expiredEntries.length} GitHub access tokens expired and were removed.`;
+      showAppToast(message, {
+        tone: "warning",
+        title: "GitHub access expired",
+        dedupeKey: "github-access-expired"
+      });
+    }
+    return expiredEntries;
+  }
+
+  function scheduleGitHubAccessExpiry() {
+    clearTimeout(githubAccessExpiryTimer);
+    githubAccessExpiryTimer = null;
+    const expiries = githubAccessEntries
+      .map(function(entry) { return Number(entry.expiresAt) || 0; })
+      .filter(function(expiresAt) { return expiresAt > 0; });
+    if (!expiries.length) return;
+    const delay = Math.max(0, Math.min(Math.min.apply(Math, expiries) - Date.now(), 2147483647));
+    githubAccessExpiryTimer = setTimeout(function() {
+      const expiredEntries = pruneExpiredGitHubAccessEntries();
+      if (expiredEntries.length) renderGitHubAccessState();
+      else scheduleGitHubAccessExpiry();
+    }, delay);
   }
 
   function resetGitHubAccessForm() {
     if (githubImportPatNameInput) githubImportPatNameInput.value = "";
+    if (githubImportPatExpiryInput) {
+      githubImportPatExpiryInput.value = "";
+      githubImportPatExpiryInput.min = toGitHubExpiryInputValue(Date.now() + 60000);
+    }
     if (githubImportPatInput) githubImportPatInput.value = "";
   }
 
   function setGitHubAccessAdding(isAdding, options = {}) {
     githubAccessAdding = Boolean(isAdding) || !githubAccessEntries.length;
     if (githubAccessAdding && options.reset !== false) resetGitHubAccessForm();
-    setGitHubAccessStatus("");
     renderGitHubAccessState();
     if (githubAccessAdding && options.focus !== false && githubImportPatNameInput) {
       requestAnimationFrame(function() {
@@ -11710,6 +11784,7 @@ ${selector} .arrowheadPath {
   }
 
   function renderGitHubAccessState() {
+    pruneExpiredGitHubAccessEntries();
     githubAccessEntries = githubAccessEntries.filter(function(entry) {
       return githubSessionAccessTokens.has(entry.id);
     });
@@ -11749,11 +11824,14 @@ ${selector} .arrowheadPath {
       githubImportPatSelect.value = githubSelectedAccessId;
     }
     if (githubImportAccessSelectedMeta) {
-      githubImportAccessSelectedMeta.textContent = selectedEntry ? "Available for this session" : "";
+      githubImportAccessSelectedMeta.textContent = selectedEntry
+        ? formatGitHubAccessExpiry(selectedEntry.expiresAt)
+        : "";
     }
     if (githubImportPatRemoveBtn) {
       githubImportPatRemoveBtn.hidden = !selectedEntry;
     }
+    scheduleGitHubAccessExpiry();
   }
 
   async function loadStoredGitHubAccess() {
@@ -11788,7 +11866,11 @@ ${selector} .arrowheadPath {
         renderGitHubAccessState();
       } catch (_) {
         githubAccessVaultLoaded = true;
-        setGitHubAccessStatus("Old saved access could not be cleared.", "error");
+        showAppToast("Old saved GitHub access could not be cleared.", {
+          tone: "error",
+          title: "GitHub access cleanup failed",
+          dedupeKey: "github-access-cleanup-failed"
+        });
         renderGitHubAccessState();
       }
     })();
@@ -11809,7 +11891,12 @@ ${selector} .arrowheadPath {
     githubAccessAdding = !githubAccessEntries.length;
     renderGitHubAccessState();
     if (!options.silent) {
-      setGitHubAccessStatus(`"${removedEntry.name}" removed.`, "success");
+      showAppToast(`"${removedEntry.name}" was removed.`, {
+        tone: "success",
+        title: "GitHub access removed",
+        icon: "lucide-check-check",
+        dedupeKey: "github-access-feedback"
+      });
       announceToScreenReader("GitHub access token removed.");
     }
   }
@@ -11836,10 +11923,12 @@ ${selector} .arrowheadPath {
     if (!githubImportPatInput || !githubImportPatNameInput) return;
     const name = validateGitHubAccessName(githubImportPatNameInput.value);
     const token = githubImportPatInput.value;
+    const expiresAt = parseGitHubAccessExpiry(githubImportPatExpiryInput ? githubImportPatExpiryInput.value : "");
     validateGitHubPat(token);
     const entry = {
       id: createGitHubAccessId(),
       name,
+      expiresAt,
       createdAt: Date.now()
     };
 
@@ -11849,7 +11938,12 @@ ${selector} .arrowheadPath {
     githubAccessAdding = false;
     resetGitHubAccessForm();
     renderGitHubAccessState();
-    setGitHubAccessStatus(`"${name}" added.`, "success");
+    showAppToast(`"${name}" is ready for this session.`, {
+      tone: "success",
+      title: "GitHub access added",
+      icon: "lucide-check-check",
+      dedupeKey: "github-access-feedback"
+    });
     announceToScreenReader("GitHub access token added.");
   }
 
@@ -11874,6 +11968,9 @@ ${selector} .arrowheadPath {
     if (githubImportRef) {
       githubImportRef.textContent = context.refName;
     }
+    if (githubImportRefItem) {
+      githubImportRefItem.hidden = !context.hasExplicitRef;
+    }
     if (githubImportBasePath) {
       githubImportBasePath.textContent = context.basePath ? `/ ${context.basePath}` : "";
       githubImportBasePath.hidden = !context.basePath;
@@ -12217,7 +12314,6 @@ ${selector} .arrowheadPath {
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
     resetGitHubAccessForm();
     githubAccessAdding = !githubAccessEntries.length;
-    setGitHubAccessStatus("");
     renderGitHubRepositoryContext(null);
     githubImportUrlInput.disabled = false;
     githubImportFileSelect.innerHTML = "";
@@ -12288,6 +12384,7 @@ ${selector} .arrowheadPath {
         githubImportPatAddAnotherBtn,
         githubImportPatAddCancelBtn,
         githubImportPatNameInput,
+        githubImportPatExpiryInput,
         githubImportPatInput,
         githubImportPatSaveBtn,
         githubImportPatRemoveBtn
@@ -18661,7 +18758,6 @@ ${selector} .arrowheadPath {
   if (githubImportPatSelect) {
     githubImportPatSelect.addEventListener("change", function() {
       githubSelectedAccessId = githubImportPatSelect.value;
-      setGitHubAccessStatus("");
       renderGitHubAccessState();
     });
   }
@@ -18680,11 +18776,14 @@ ${selector} .arrowheadPath {
       const previousText = githubImportPatSaveBtn.textContent;
       githubImportPatSaveBtn.disabled = true;
       githubImportPatSaveBtn.textContent = "Adding…";
-      setGitHubAccessStatus("");
       try {
         await saveGitHubAccess();
       } catch (error) {
-        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be saved.", "error");
+        showAppToast(error && error.message ? error.message : "Private access could not be saved.", {
+          tone: "error",
+          title: "GitHub access not added",
+          dedupeKey: "github-access-feedback"
+        });
       } finally {
         githubImportPatSaveBtn.disabled = false;
         githubImportPatSaveBtn.textContent = previousText;
@@ -18694,11 +18793,14 @@ ${selector} .arrowheadPath {
   if (githubImportPatRemoveBtn) {
     githubImportPatRemoveBtn.addEventListener("click", async function() {
       githubImportPatRemoveBtn.disabled = true;
-      setGitHubAccessStatus("");
       try {
         await removeGitHubAccess();
       } catch (_) {
-        setGitHubAccessStatus("Private access could not be removed.", "error");
+        showAppToast("Private access could not be removed.", {
+          tone: "error",
+          title: "GitHub access not removed",
+          dedupeKey: "github-access-feedback"
+        });
       } finally {
         githubImportPatRemoveBtn.disabled = false;
       }
diff --git a/desktop-app/resources/styles.css b/desktop-app/resources/styles.css
index 382d18ae..f42bc59f 100644
--- a/desktop-app/resources/styles.css
+++ b/desktop-app/resources/styles.css
@@ -6020,8 +6020,8 @@ a:focus {
 .github-import-access-form[hidden],
 .github-import-remove-token-btn[hidden],
 .github-import-repository-context[hidden],
-.github-import-base-path[hidden],
-.github-import-access-status[hidden] {
+.github-import-ref[hidden],
+.github-import-base-path[hidden] {
   display: none !important;
 }
 
@@ -6146,6 +6146,16 @@ a:focus {
   gap: 10px;
 }
 
+.github-import-access-form {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.github-import-access-form-heading,
+.github-import-access-token-field,
+.github-import-access-form-footer {
+  grid-column: 1 / -1;
+}
+
 .github-import-access-form .reset-modal-label,
 .github-import-access-manage .reset-modal-label,
 .github-import-access-form-footer > button {
@@ -6177,11 +6187,19 @@ a:focus {
 }
 
 .github-import-toolbar-btn.tool-button {
-  width: 36px;
-  height: 36px;
-  min-width: 36px;
+  width: 30px;
+  height: 30px;
+  min-width: 30px;
   padding: 0;
+  border-color: transparent;
   border-radius: 7px;
+  background: transparent;
+}
+
+.github-import-toolbar-btn.tool-button:hover,
+.github-import-toolbar-btn.tool-button:focus-visible {
+  border-color: transparent;
+  background: var(--toolbar-control-hover);
 }
 
 .github-import-toolbar-btn > .lucide {
@@ -6206,31 +6224,16 @@ a:focus {
   white-space: nowrap;
 }
 
-.github-import-access-form-footer .reset-modal-btn {
-  min-height: 34px;
-  padding: 7px 14px;
-  font-size: var(--ui-font-md);
-}
-
-.github-import-access-status {
-  margin: 0;
-  padding: 8px 10px;
-  border: 1px solid var(--border-color);
-  border-radius: 7px;
-  background: var(--bg-color);
+.github-import-optional-label {
   color: var(--text-secondary);
   font-size: var(--ui-font-sm);
-  line-height: 1.4;
-}
-
-.github-import-access-status.is-success {
-  border-color: color-mix(in srgb, #1a7f37 34%, var(--border-color));
-  color: #1a7f37;
+  font-weight: 400;
 }
 
-.github-import-access-status.is-error {
-  border-color: color-mix(in srgb, var(--color-danger-fg, #cf222e) 34%, var(--border-color));
-  color: var(--color-danger-fg, #cf222e);
+.github-import-access-form-footer .reset-modal-btn {
+  min-height: 34px;
+  padding: 7px 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-import-repository-context {
@@ -6264,9 +6267,12 @@ a:focus {
 }
 
 .github-import-repository-copy {
-  display: grid;
-  gap: 3px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
   min-width: 0;
+  flex: 1 1 auto;
+  overflow: hidden;
 }
 
 .github-import-repository-heading,
@@ -6278,6 +6284,7 @@ a:focus {
 }
 
 .github-import-repository-heading {
+  flex: 1 1 auto;
   gap: 8px;
   min-width: 0;
 }
@@ -6320,13 +6327,16 @@ a:focus {
 }
 
 .github-import-repository-meta {
+  flex: 0 1 auto;
   gap: 7px;
   min-width: 0;
   color: var(--text-secondary);
   font-size: var(--ui-font-sm);
+  white-space: nowrap;
 }
 
 .github-import-ref {
+  flex: 0 1 auto;
   gap: 4px;
   min-width: 0;
 }
@@ -6352,7 +6362,7 @@ a:focus {
 
 .github-import-selection-toolbar {
   display: grid;
-  grid-template-columns: minmax(220px, 1fr) auto auto;
+  grid-template-columns: minmax(220px, 1fr) auto;
   align-items: center;
   gap: 8px;
 }
@@ -6398,24 +6408,31 @@ a:focus {
   outline-offset: 1px;
 }
 
-.github-import-selection-summary {
+.github-import-selection-actions {
   display: inline-flex;
   align-items: center;
   justify-content: flex-end;
-  gap: 6px;
+  gap: 8px;
   min-width: max-content;
-  color: var(--text-secondary);
-  font-size: var(--ui-font-sm);
-  font-variant-numeric: tabular-nums;
 }
 
 .github-import-selected-count {
-  font-weight: 600;
+  display: inline-flex;
+  align-items: center;
+  min-height: 30px;
+  margin: 0;
+  padding: 0 9px;
+  border-radius: 7px;
+  background: var(--toolbar-control-hover);
   color: var(--text-color);
+  font-size: var(--ui-font-sm);
+  font-weight: 600;
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
 }
 
 .github-import-toolbar-btn[aria-pressed="true"] {
-  border-color: color-mix(in srgb, var(--mv-blue) 14%, var(--mv-border));
+  border-color: transparent;
   color: var(--accent-color);
   background-color: rgba(3, 102, 214, 0.08);
 }
@@ -6620,8 +6637,13 @@ a:focus {
     min-width: 44px;
   }
 
-  .github-import-selection-summary {
-    justify-content: flex-start;
+  .github-import-selection-actions {
+    justify-content: space-between;
+  }
+
+  .github-import-selected-count {
+    min-height: 44px;
+    padding-inline: 10px;
   }
 
   .github-import-tree {
@@ -6652,6 +6674,12 @@ a:focus {
   }
 }
 
+@media (max-width: 420px) {
+  .github-import-access-form {
+    grid-template-columns: minmax(0, 1fr);
+  }
+}
+
 @media (prefers-reduced-motion: reduce) {
   .github-import-toolbar-btn,
   .github-import-access-chevron {
diff --git a/index.html b/index.html
index 4b4d428e..c14864d6 100644
--- a/index.html
+++ b/index.html
@@ -1418,6 +1418,10 @@ <h2 class="about-title">Markdown Viewer</h2>
                       <input type="text" id="github-import-pat-name" class="rename-modal-input" maxlength="60" placeholder="My access token" autocomplete="off" spellcheck="false" />
                     </div>
                     <div class="github-import-access-field">
+                      <label class="reset-modal-label" for="github-import-pat-expiry">Expiry date <span class="github-import-optional-label">(optional)</span></label>
+                      <input type="datetime-local" id="github-import-pat-expiry" class="rename-modal-input" autocomplete="off" />
+                    </div>
+                    <div class="github-import-access-field github-import-access-token-field">
                       <label class="reset-modal-label" for="github-import-pat">Personal access token</label>
                       <input type="password" id="github-import-pat" class="rename-modal-input" autocomplete="off" spellcheck="false" />
                     </div>
@@ -1426,7 +1430,6 @@ <h2 class="about-title">Markdown Viewer</h2>
                       <button type="button" id="github-import-pat-save" class="reset-modal-btn">Add access</button>
                     </div>
                   </div>
-                  <p id="github-import-access-status" class="github-import-access-status" role="status" aria-live="polite" hidden></p>
                 </div>
               </section>
               <select id="github-import-file-select" class="rename-modal-input" aria-label="Select Markdown files" style="display:none;"></select>
@@ -1437,7 +1440,7 @@ <h2 class="about-title">Markdown Viewer</h2>
                     <strong id="github-import-repository-name"></strong>
                   </div>
                   <div class="github-import-repository-meta">
-                    <span class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
+                    <span id="github-import-ref-item" class="github-import-ref"><i class="lucide lucide-git-branch" aria-hidden="true"></i><span id="github-import-ref"></span></span>
                     <a id="github-import-commit-link" class="github-import-commit-link" target="_blank" rel="noopener noreferrer">
                       <i class="lucide lucide-git-commit-horizontal" aria-hidden="true"></i>
                       <span id="github-import-commit"></span>
@@ -1451,16 +1454,16 @@ <h2 class="about-title">Markdown Viewer</h2>
                   <i class="lucide lucide-search" aria-hidden="true"></i>
                   <input type="search" id="github-import-search" placeholder="Search Markdown files" autocomplete="off" spellcheck="false" />
                 </label>
-                <div class="github-import-selection-summary" aria-live="polite">
-                  <span id="github-import-selected-count" class="github-import-selected-count">0 selected</span>
-                </div>
-                <div class="github-import-toolbar-actions" role="group" aria-label="File tree actions">
-                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-toggle-folders" aria-label="Collapse all folders" title="Collapse all folders">
-                    <i class="lucide lucide-fold-vertical" aria-hidden="true"></i>
-                  </button>
-                  <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
-                    <i class="lucide lucide-check-check" aria-hidden="true"></i>
-                  </button>
+                <div class="github-import-selection-actions">
+                  <output id="github-import-selected-count" class="github-import-selected-count" aria-live="polite">0 selected</output>
+                  <div class="github-import-toolbar-actions" role="group" aria-label="File tree actions">
+                    <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-toggle-folders" aria-label="Collapse all folders" title="Collapse all folders">
+                      <i class="lucide lucide-fold-vertical" aria-hidden="true"></i>
+                    </button>
+                    <button type="button" class="tool-button document-command-btn github-import-toolbar-btn" id="github-import-select-all" aria-label="Select all files" title="Select all files">
+                      <i class="lucide lucide-check-check" aria-hidden="true"></i>
+                    </button>
+                  </div>
                 </div>
               </div>
               <div id="github-import-tree" class="github-import-tree" role="tree" aria-label="Markdown files in this GitHub location" style="display:none;"></div>
diff --git a/script.js b/script.js
index ea03a5c1..5651c042 100644
--- a/script.js
+++ b/script.js
@@ -548,15 +548,16 @@ document.addEventListener("DOMContentLoaded", async function () {
   const githubImportPatAddAnotherBtn = document.getElementById("github-import-pat-add-another");
   const githubImportPatAddCancelBtn = document.getElementById("github-import-pat-add-cancel");
   const githubImportPatNameInput = document.getElementById("github-import-pat-name");
+  const githubImportPatExpiryInput = document.getElementById("github-import-pat-expiry");
   const githubImportPatInput = document.getElementById("github-import-pat");
   const githubImportPatSaveBtn = document.getElementById("github-import-pat-save");
   const githubImportPatRemoveBtn = document.getElementById("github-import-pat-remove");
-  const githubImportAccessStatus = document.getElementById("github-import-access-status");
   const githubImportFileSelect = document.getElementById("github-import-file-select");
   const githubImportRepositoryContext = document.getElementById("github-import-repository-context");
   const githubImportRepositoryName = document.getElementById("github-import-repository-name");
   const githubImportCommitLink = document.getElementById("github-import-commit-link");
   const githubImportCommit = document.getElementById("github-import-commit");
+  const githubImportRefItem = document.getElementById("github-import-ref-item");
   const githubImportRef = document.getElementById("github-import-ref");
   const githubImportBasePath = document.getElementById("github-import-base-path");
   const githubImportSelectionToolbar = document.getElementById("github-import-selection-toolbar");
@@ -11311,6 +11312,7 @@ ${selector} .arrowheadPath {
   let githubAccessVaultLoaded = false;
   let githubAccessVaultLoadPromise = null;
   const githubSessionAccessTokens = new Map();
+  let githubAccessExpiryTimer = null;
 
   function getFileName(path) {
     return (path || "").split("/").pop() || "document.md";
@@ -11448,6 +11450,8 @@ ${selector} .arrowheadPath {
   }
 
   function getGitHubAccessToken() {
+    const expiredEntries = pruneExpiredGitHubAccessEntries();
+    if (expiredEntries.length) renderGitHubAccessState();
     return githubSessionAccessTokens.get(githubSelectedAccessId) || "";
   }
 
@@ -11459,7 +11463,7 @@ ${selector} .arrowheadPath {
     if (authenticated) {
       const token = getGitHubAccessToken();
       if (!token) {
-        throw new Error("Private repository access is locked or has expired.");
+        throw new Error("The selected GitHub access token is unavailable or expired. Add it again.");
       }
       headers.Authorization = `Bearer ${token}`;
     }
@@ -11676,6 +11680,7 @@ ${selector} .arrowheadPath {
       commitSha: commit.sha,
       defaultBranch,
       isDefaultRef: refName === defaultBranch,
+      hasExplicitRef: parsed.type !== "repo",
       isPrivate: Boolean(repoInfo.private),
       authenticated,
       filePath: parsed.type === "file" ? remainder.join("/") : "",
@@ -11683,23 +11688,92 @@ ${selector} .arrowheadPath {
     };
   }
 
-  function setGitHubAccessStatus(message, state) {
-    if (!githubImportAccessStatus) return;
-    githubImportAccessStatus.textContent = message || "";
-    githubImportAccessStatus.hidden = !message;
-    githubImportAccessStatus.classList.toggle("is-error", state === "error");
-    githubImportAccessStatus.classList.toggle("is-success", state === "success");
+  function toGitHubExpiryInputValue(timestamp) {
+    const date = new Date(timestamp);
+    const localDate = new Date(date.getTime() - (date.getTimezoneOffset() * 60000));
+    return localDate.toISOString().slice(0, 16);
+  }
+
+  function parseGitHubAccessExpiry(value) {
+    if (!value) return null;
+    const expiresAt = new Date(value).getTime();
+    if (!Number.isFinite(expiresAt)) {
+      throw new Error("Enter a valid expiry date.");
+    }
+    if (expiresAt <= Date.now()) {
+      throw new Error("Choose an expiry date in the future.");
+    }
+    return expiresAt;
+  }
+
+  function formatGitHubAccessExpiry(expiresAt) {
+    if (!expiresAt || !Number.isFinite(Number(expiresAt))) return "Available for this session";
+    try {
+      return "Expires " + new Intl.DateTimeFormat(undefined, {
+        dateStyle: "medium",
+        timeStyle: "short"
+      }).format(new Date(expiresAt));
+    } catch (_) {
+      return "Expires " + new Date(expiresAt).toLocaleString();
+    }
+  }
+
+  function pruneExpiredGitHubAccessEntries(options = {}) {
+    const expiredEntries = githubAccessEntries.filter(function(entry) {
+      return Number(entry.expiresAt) > 0 && Number(entry.expiresAt) <= Date.now();
+    });
+    if (!expiredEntries.length) return [];
+    const expiredIds = new Set(expiredEntries.map(function(entry) { return entry.id; }));
+    githubAccessEntries = githubAccessEntries.filter(function(entry) {
+      return !expiredIds.has(entry.id);
+    });
+    expiredIds.forEach(function(id) {
+      githubSessionAccessTokens.delete(id);
+    });
+    if (!githubAccessEntries.some(function(entry) { return entry.id === githubSelectedAccessId; })) {
+      githubSelectedAccessId = githubAccessEntries[0] ? githubAccessEntries[0].id : "";
+    }
+    githubAccessAdding = !githubAccessEntries.length;
+    if (options.notify !== false) {
+      const message = expiredEntries.length === 1
+        ? `"${expiredEntries[0].name}" expired and was removed.`
+        : `${expiredEntries.length} GitHub access tokens expired and were removed.`;
+      showAppToast(message, {
+        tone: "warning",
+        title: "GitHub access expired",
+        dedupeKey: "github-access-expired"
+      });
+    }
+    return expiredEntries;
+  }
+
+  function scheduleGitHubAccessExpiry() {
+    clearTimeout(githubAccessExpiryTimer);
+    githubAccessExpiryTimer = null;
+    const expiries = githubAccessEntries
+      .map(function(entry) { return Number(entry.expiresAt) || 0; })
+      .filter(function(expiresAt) { return expiresAt > 0; });
+    if (!expiries.length) return;
+    const delay = Math.max(0, Math.min(Math.min.apply(Math, expiries) - Date.now(), 2147483647));
+    githubAccessExpiryTimer = setTimeout(function() {
+      const expiredEntries = pruneExpiredGitHubAccessEntries();
+      if (expiredEntries.length) renderGitHubAccessState();
+      else scheduleGitHubAccessExpiry();
+    }, delay);
   }
 
   function resetGitHubAccessForm() {
     if (githubImportPatNameInput) githubImportPatNameInput.value = "";
+    if (githubImportPatExpiryInput) {
+      githubImportPatExpiryInput.value = "";
+      githubImportPatExpiryInput.min = toGitHubExpiryInputValue(Date.now() + 60000);
+    }
     if (githubImportPatInput) githubImportPatInput.value = "";
   }
 
   function setGitHubAccessAdding(isAdding, options = {}) {
     githubAccessAdding = Boolean(isAdding) || !githubAccessEntries.length;
     if (githubAccessAdding && options.reset !== false) resetGitHubAccessForm();
-    setGitHubAccessStatus("");
     renderGitHubAccessState();
     if (githubAccessAdding && options.focus !== false && githubImportPatNameInput) {
       requestAnimationFrame(function() {
@@ -11710,6 +11784,7 @@ ${selector} .arrowheadPath {
   }
 
   function renderGitHubAccessState() {
+    pruneExpiredGitHubAccessEntries();
     githubAccessEntries = githubAccessEntries.filter(function(entry) {
       return githubSessionAccessTokens.has(entry.id);
     });
@@ -11749,11 +11824,14 @@ ${selector} .arrowheadPath {
       githubImportPatSelect.value = githubSelectedAccessId;
     }
     if (githubImportAccessSelectedMeta) {
-      githubImportAccessSelectedMeta.textContent = selectedEntry ? "Available for this session" : "";
+      githubImportAccessSelectedMeta.textContent = selectedEntry
+        ? formatGitHubAccessExpiry(selectedEntry.expiresAt)
+        : "";
     }
     if (githubImportPatRemoveBtn) {
       githubImportPatRemoveBtn.hidden = !selectedEntry;
     }
+    scheduleGitHubAccessExpiry();
   }
 
   async function loadStoredGitHubAccess() {
@@ -11788,7 +11866,11 @@ ${selector} .arrowheadPath {
         renderGitHubAccessState();
       } catch (_) {
         githubAccessVaultLoaded = true;
-        setGitHubAccessStatus("Old saved access could not be cleared.", "error");
+        showAppToast("Old saved GitHub access could not be cleared.", {
+          tone: "error",
+          title: "GitHub access cleanup failed",
+          dedupeKey: "github-access-cleanup-failed"
+        });
         renderGitHubAccessState();
       }
     })();
@@ -11809,7 +11891,12 @@ ${selector} .arrowheadPath {
     githubAccessAdding = !githubAccessEntries.length;
     renderGitHubAccessState();
     if (!options.silent) {
-      setGitHubAccessStatus(`"${removedEntry.name}" removed.`, "success");
+      showAppToast(`"${removedEntry.name}" was removed.`, {
+        tone: "success",
+        title: "GitHub access removed",
+        icon: "lucide-check-check",
+        dedupeKey: "github-access-feedback"
+      });
       announceToScreenReader("GitHub access token removed.");
     }
   }
@@ -11836,10 +11923,12 @@ ${selector} .arrowheadPath {
     if (!githubImportPatInput || !githubImportPatNameInput) return;
     const name = validateGitHubAccessName(githubImportPatNameInput.value);
     const token = githubImportPatInput.value;
+    const expiresAt = parseGitHubAccessExpiry(githubImportPatExpiryInput ? githubImportPatExpiryInput.value : "");
     validateGitHubPat(token);
     const entry = {
       id: createGitHubAccessId(),
       name,
+      expiresAt,
       createdAt: Date.now()
     };
 
@@ -11849,7 +11938,12 @@ ${selector} .arrowheadPath {
     githubAccessAdding = false;
     resetGitHubAccessForm();
     renderGitHubAccessState();
-    setGitHubAccessStatus(`"${name}" added.`, "success");
+    showAppToast(`"${name}" is ready for this session.`, {
+      tone: "success",
+      title: "GitHub access added",
+      icon: "lucide-check-check",
+      dedupeKey: "github-access-feedback"
+    });
     announceToScreenReader("GitHub access token added.");
   }
 
@@ -11874,6 +11968,9 @@ ${selector} .arrowheadPath {
     if (githubImportRef) {
       githubImportRef.textContent = context.refName;
     }
+    if (githubImportRefItem) {
+      githubImportRefItem.hidden = !context.hasExplicitRef;
+    }
     if (githubImportBasePath) {
       githubImportBasePath.textContent = context.basePath ? `/ ${context.basePath}` : "";
       githubImportBasePath.hidden = !context.basePath;
@@ -12217,7 +12314,6 @@ ${selector} .arrowheadPath {
     if (githubImportAccessPanel) githubImportAccessPanel.hidden = true;
     resetGitHubAccessForm();
     githubAccessAdding = !githubAccessEntries.length;
-    setGitHubAccessStatus("");
     renderGitHubRepositoryContext(null);
     githubImportUrlInput.disabled = false;
     githubImportFileSelect.innerHTML = "";
@@ -12288,6 +12384,7 @@ ${selector} .arrowheadPath {
         githubImportPatAddAnotherBtn,
         githubImportPatAddCancelBtn,
         githubImportPatNameInput,
+        githubImportPatExpiryInput,
         githubImportPatInput,
         githubImportPatSaveBtn,
         githubImportPatRemoveBtn
@@ -18661,7 +18758,6 @@ ${selector} .arrowheadPath {
   if (githubImportPatSelect) {
     githubImportPatSelect.addEventListener("change", function() {
       githubSelectedAccessId = githubImportPatSelect.value;
-      setGitHubAccessStatus("");
       renderGitHubAccessState();
     });
   }
@@ -18680,11 +18776,14 @@ ${selector} .arrowheadPath {
       const previousText = githubImportPatSaveBtn.textContent;
       githubImportPatSaveBtn.disabled = true;
       githubImportPatSaveBtn.textContent = "Adding…";
-      setGitHubAccessStatus("");
       try {
         await saveGitHubAccess();
       } catch (error) {
-        setGitHubAccessStatus(error && error.message ? error.message : "Private access could not be saved.", "error");
+        showAppToast(error && error.message ? error.message : "Private access could not be saved.", {
+          tone: "error",
+          title: "GitHub access not added",
+          dedupeKey: "github-access-feedback"
+        });
       } finally {
         githubImportPatSaveBtn.disabled = false;
         githubImportPatSaveBtn.textContent = previousText;
@@ -18694,11 +18793,14 @@ ${selector} .arrowheadPath {
   if (githubImportPatRemoveBtn) {
     githubImportPatRemoveBtn.addEventListener("click", async function() {
       githubImportPatRemoveBtn.disabled = true;
-      setGitHubAccessStatus("");
       try {
         await removeGitHubAccess();
       } catch (_) {
-        setGitHubAccessStatus("Private access could not be removed.", "error");
+        showAppToast("Private access could not be removed.", {
+          tone: "error",
+          title: "GitHub access not removed",
+          dedupeKey: "github-access-feedback"
+        });
       } finally {
         githubImportPatRemoveBtn.disabled = false;
       }
diff --git a/styles.css b/styles.css
index 382d18ae..f42bc59f 100644
--- a/styles.css
+++ b/styles.css
@@ -6020,8 +6020,8 @@ a:focus {
 .github-import-access-form[hidden],
 .github-import-remove-token-btn[hidden],
 .github-import-repository-context[hidden],
-.github-import-base-path[hidden],
-.github-import-access-status[hidden] {
+.github-import-ref[hidden],
+.github-import-base-path[hidden] {
   display: none !important;
 }
 
@@ -6146,6 +6146,16 @@ a:focus {
   gap: 10px;
 }
 
+.github-import-access-form {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.github-import-access-form-heading,
+.github-import-access-token-field,
+.github-import-access-form-footer {
+  grid-column: 1 / -1;
+}
+
 .github-import-access-form .reset-modal-label,
 .github-import-access-manage .reset-modal-label,
 .github-import-access-form-footer > button {
@@ -6177,11 +6187,19 @@ a:focus {
 }
 
 .github-import-toolbar-btn.tool-button {
-  width: 36px;
-  height: 36px;
-  min-width: 36px;
+  width: 30px;
+  height: 30px;
+  min-width: 30px;
   padding: 0;
+  border-color: transparent;
   border-radius: 7px;
+  background: transparent;
+}
+
+.github-import-toolbar-btn.tool-button:hover,
+.github-import-toolbar-btn.tool-button:focus-visible {
+  border-color: transparent;
+  background: var(--toolbar-control-hover);
 }
 
 .github-import-toolbar-btn > .lucide {
@@ -6206,31 +6224,16 @@ a:focus {
   white-space: nowrap;
 }
 
-.github-import-access-form-footer .reset-modal-btn {
-  min-height: 34px;
-  padding: 7px 14px;
-  font-size: var(--ui-font-md);
-}
-
-.github-import-access-status {
-  margin: 0;
-  padding: 8px 10px;
-  border: 1px solid var(--border-color);
-  border-radius: 7px;
-  background: var(--bg-color);
+.github-import-optional-label {
   color: var(--text-secondary);
   font-size: var(--ui-font-sm);
-  line-height: 1.4;
-}
-
-.github-import-access-status.is-success {
-  border-color: color-mix(in srgb, #1a7f37 34%, var(--border-color));
-  color: #1a7f37;
+  font-weight: 400;
 }
 
-.github-import-access-status.is-error {
-  border-color: color-mix(in srgb, var(--color-danger-fg, #cf222e) 34%, var(--border-color));
-  color: var(--color-danger-fg, #cf222e);
+.github-import-access-form-footer .reset-modal-btn {
+  min-height: 34px;
+  padding: 7px 14px;
+  font-size: var(--ui-font-md);
 }
 
 .github-import-repository-context {
@@ -6264,9 +6267,12 @@ a:focus {
 }
 
 .github-import-repository-copy {
-  display: grid;
-  gap: 3px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
   min-width: 0;
+  flex: 1 1 auto;
+  overflow: hidden;
 }
 
 .github-import-repository-heading,
@@ -6278,6 +6284,7 @@ a:focus {
 }
 
 .github-import-repository-heading {
+  flex: 1 1 auto;
   gap: 8px;
   min-width: 0;
 }
@@ -6320,13 +6327,16 @@ a:focus {
 }
 
 .github-import-repository-meta {
+  flex: 0 1 auto;
   gap: 7px;
   min-width: 0;
   color: var(--text-secondary);
   font-size: var(--ui-font-sm);
+  white-space: nowrap;
 }
 
 .github-import-ref {
+  flex: 0 1 auto;
   gap: 4px;
   min-width: 0;
 }
@@ -6352,7 +6362,7 @@ a:focus {
 
 .github-import-selection-toolbar {
   display: grid;
-  grid-template-columns: minmax(220px, 1fr) auto auto;
+  grid-template-columns: minmax(220px, 1fr) auto;
   align-items: center;
   gap: 8px;
 }
@@ -6398,24 +6408,31 @@ a:focus {
   outline-offset: 1px;
 }
 
-.github-import-selection-summary {
+.github-import-selection-actions {
   display: inline-flex;
   align-items: center;
   justify-content: flex-end;
-  gap: 6px;
+  gap: 8px;
   min-width: max-content;
-  color: var(--text-secondary);
-  font-size: var(--ui-font-sm);
-  font-variant-numeric: tabular-nums;
 }
 
 .github-import-selected-count {
-  font-weight: 600;
+  display: inline-flex;
+  align-items: center;
+  min-height: 30px;
+  margin: 0;
+  padding: 0 9px;
+  border-radius: 7px;
+  background: var(--toolbar-control-hover);
   color: var(--text-color);
+  font-size: var(--ui-font-sm);
+  font-weight: 600;
+  font-variant-numeric: tabular-nums;
+  white-space: nowrap;
 }
 
 .github-import-toolbar-btn[aria-pressed="true"] {
-  border-color: color-mix(in srgb, var(--mv-blue) 14%, var(--mv-border));
+  border-color: transparent;
   color: var(--accent-color);
   background-color: rgba(3, 102, 214, 0.08);
 }
@@ -6620,8 +6637,13 @@ a:focus {
     min-width: 44px;
   }
 
-  .github-import-selection-summary {
-    justify-content: flex-start;
+  .github-import-selection-actions {
+    justify-content: space-between;
+  }
+
+  .github-import-selected-count {
+    min-height: 44px;
+    padding-inline: 10px;
   }
 
   .github-import-tree {
@@ -6652,6 +6674,12 @@ a:focus {
   }
 }
 
+@media (max-width: 420px) {
+  .github-import-access-form {
+    grid-template-columns: minmax(0, 1fr);
+  }
+}
+
 @media (prefers-reduced-motion: reduce) {
   .github-import-toolbar-btn,
   .github-import-access-chevron {
diff --git a/wiki/FAQ.md b/wiki/FAQ.md
index 7ac57295..1ed5ba35 100644
--- a/wiki/FAQ.md
+++ b/wiki/FAQ.md
@@ -120,7 +120,7 @@ Yes. It supports regular expressions, capture replacements, preserve-case replac
 
 ### Can I import a private GitHub repository?
 
-Yes. Expand **Private repository access**, give the token a recognizable name, enter either a fine-grained or classic PAT, and select **Add access**. The app detects both formats automatically. The form then collapses into a named-token selector so you can add, select, or remove entries individually. Tokens remain in memory for the current session only and are not written to application storage, so no passphrase or unlock step is needed. The app cannot revoke a PAT on GitHub; use GitHub settings to revoke or rotate it.
+Yes. Expand **Private repository access**, give the token a recognizable name, optionally choose an earlier expiry date, enter either a fine-grained or classic PAT, and select **Add access**. The app detects both formats automatically and confirms success or failure with a toast. The form then collapses into a named-token selector so you can add, select, or remove entries individually. Tokens remain in memory for the current session only and are not written to application storage, so no passphrase or unlock step is needed. The app cannot revoke a PAT on GitHub; use GitHub settings to revoke or rotate it.
 
 ### Which PDF option should I use?
 
diff --git a/wiki/Features.md b/wiki/Features.md
index 6f621da0..ce9b956d 100644
--- a/wiki/Features.md
+++ b/wiki/Features.md
@@ -266,12 +266,12 @@ GitHub import:
 - Resolves default branches, explicit branches (including names containing `/`), tags, and commit references to an immutable commit SHA.
 - Direct Markdown file URLs import immediately.
 - Repository or folder URLs query GitHub's API to find Markdown files.
-- The URL step remains a compact 520px dialog. The 760px selection step shows repository context with branch and short commit side by side, a searchable and collapsible GitHub-style tree, a selected-file count, and matching icon controls for select/deselect all and collapse/expand all folders.
+- The URL step remains a compact 520px dialog. The 760px selection step keeps repository name and metadata on one line, shows a branch/ref only for explicit tree/blob URLs, always links the short commit, and provides a searchable GitHub-style tree with a selected-count badge plus matching borderless controls for select/deselect all and collapse/expand all folders.
 - Default-branch imports create a repository-named folder. Each selected file's nested GitHub directory path is reproduced inside it.
 - Every Markdown file found is shown.
 - Requests are rate-limited by the app to avoid hammering GitHub.
 - Public files are fetched as raw content. Private files use GitHub's authenticated Contents API. Both are saved to Explorer without opening new tabs.
-- Optional private access accepts fine-grained and classic PATs automatically in a compact add-then-select flow. Multiple named tokens remain only in memory for the current session and can be removed individually without a passphrase or unlock step.
+- Optional private access accepts fine-grained and classic PATs automatically in a compact add-then-select flow. Multiple named tokens remain only in memory for the current session, can have an optional earlier expiry date, and can be removed individually without a passphrase or unlock step. Token results use application toasts instead of inline form status text.
 
 Limitations and privacy:
 
@@ -540,7 +540,7 @@ Security limitations:
 | Local file import | No | Current tab/workspace | Reads selected files only. |
 | Managed media upload | Yes, after first-use consent | Cloudflare KV, content-addressed, 90-day TTL | Publicly retrievable by its unguessable HTTPS URL until expiry; still images 300 KiB optimized, GIF 5 MiB, video 10 MiB. |
 | Markdown/HTML/PDF/PNG export | No, except remote assets already referenced | User download location | Browser may request external images/fonts used by content. |
-| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Multiple named fine-grained or classic PATs; session-only in memory with individual removal. |
+| GitHub import | Yes | Public: GitHub API/raw URLs. Private: `api.github.com` only | Multiple named fine-grained or classic PATs; session-only in memory with optional earlier expiry and individual removal. |
 | Emoji lookup | Yes | GitHub emoji API response in memory | Used for shortcode picker/lookup. |
 | CDN library loading | Yes | Browser/service-worker cache | Web build only, first use unless cached. |
 | Remote diagram engines | Yes | Third-party renderer response/cache | Source is sent to PlantUML, Kroki, or mermaid.ink depending on renderer/preview. |
diff --git a/wiki/Privacy-and-Security.md b/wiki/Privacy-and-Security.md
index 0ed5478b..59bf7aab 100644
--- a/wiki/Privacy-and-Security.md
+++ b/wiki/Privacy-and-Security.md
@@ -60,7 +60,7 @@ In the desktop application, replacing or deleting the binary does not remove `Do
 | Feature | Data sent | Destination and retention | Access model |
 | :--- | :--- | :--- | :--- |
 | Web/PWA library loading | Library requests, IP and normal HTTP metadata | cdnjs, jsDelivr, or esm.sh; browser/Service Worker cache | Governed by the remote host |
-| GitHub import | Repository/path/ref request and selected content downloads; optional named PATs for private repositories | Public content: GitHub API and `raw.githubusercontent.com`; private content and PAT: `api.github.com` only | Fine-grained and classic PATs are accepted automatically, remain in memory for the current session, and are never written to application storage |
+| GitHub import | Repository/path/ref request and selected content downloads; optional named PATs for private repositories | Public content: GitHub API and `raw.githubusercontent.com`; private content and PAT: `api.github.com` only | Fine-grained and classic PATs are accepted automatically, remain in memory for the current session, support optional earlier in-session expiry, and are never written to application storage |
 | Emoji lookup | Emoji API request | GitHub API; response kept in memory/cache | Remote host |
 | Remote diagrams | Diagram source or encoded source | PlantUML, Kroki, or mermaid.ink; response can be browser-cached | Remote renderer receives the source |
 | GeoJSON/TopoJSON maps | Tile and external-asset requests | Configured map-tile or asset host | Remote host |
diff --git a/wiki/Troubleshooting.md b/wiki/Troubleshooting.md
index c61f1af1..7251d3ee 100644
--- a/wiki/Troubleshooting.md
+++ b/wiki/Troubleshooting.md
@@ -80,7 +80,7 @@ Extension matching is case-insensitive. Rename a plain-text file to `.md` only w
 - Use a public `github.com` repository, tree, blob, or `raw.githubusercontent.com` Markdown URL.
 - For a private repository, add either a fine-grained or classic PAT with permission to read the required repository. The app detects both formats automatically. If an organization requires approval or SAML authorization, complete that step in GitHub.
 - Branch, tag, and commit URLs are supported. For branch names containing `/`, paste the complete GitHub tree or blob URL so the importer can resolve the longest matching ref.
-- Select the intended named token before importing. If GitHub rejects it or reports that it cannot access the repository, replace the token or update its repository permissions. Tokens are session-only and must be added again after reload or app close.
+- Select the intended named token before importing. If GitHub rejects it or reports that it cannot access the repository, replace the token or update its repository permissions. Check the toast for the specific failure. Tokens are session-only, may expire earlier if you selected an expiry date, and must be added again after reload or app close.
 - Repository and folder results show every Markdown file found.
 - Check GitHub API rate-limit and network responses.
 - Confirm that CSP allows `api.github.com` and `raw.githubusercontent.com`.
diff --git a/wiki/Usage-Guide.md b/wiki/Usage-Guide.md
index 0151ac41..56eb285a 100644
--- a/wiki/Usage-Guide.md
+++ b/wiki/Usage-Guide.md
@@ -121,11 +121,11 @@ Use Import > From GitHub and paste one of these URL types:
 - `https://github.com/owner/repo/blob/main/README.md`
 - `https://raw.githubusercontent.com/owner/repo/main/README.md`
 
-Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs resolve the default branch, an explicit branch (including names containing `/`), a tag, or a commit to an immutable commit SHA before listing files. The searchable, collapsible tree contains every Markdown file found, shows the repository with its branch and short commit side by side, and uses the same compact type scale as other application modals. The toolbar shows the selected-file count and provides matching icon controls for select/deselect all and collapse/expand all folders. Default-branch imports use a repository-named Explorer folder. Nested GitHub directory paths are preserved, and imported files remain closed until you select one in Explorer.
+Direct Markdown file URLs import immediately into Explorer. Repository and folder URLs resolve the default branch, an explicit branch (including names containing `/`), a tag, or a commit to an immutable commit SHA before listing files. The searchable, collapsible tree contains every Markdown file found and uses the same compact type scale as other application modals. Repository name and metadata stay on one line: explicit tree/blob URLs show the branch or ref beside the short commit, while a repository URL shows only the short commit. The toolbar places the selected-file count in a compact badge beside matching borderless controls for select/deselect all and collapse/expand all folders. Default-branch imports use a repository-named Explorer folder. Nested GitHub directory paths are preserved, and imported files remain closed until you select one in Explorer.
 
 Public repositories need no credentials. For a private repository, expand **Private repository access**, enter a recognizable name and either a fine-grained or classic PAT, and select **Add access**. The app accepts both PAT formats automatically. After adding, the form closes and a dropdown lets you select among multiple named tokens before choosing **Import**. Use the icon controls to add another token or remove the selected one. The importer first tries public access and sends the selected token only to `api.github.com` when authenticated access is needed. Private file content is downloaded through GitHub's Contents API rather than the raw-content host.
 
-GitHub access tokens are session-only. They remain in memory and are never written to application storage, so they disappear on reload or app close and do not require a protection passphrase or unlock step. Local removal does not revoke a PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
+GitHub access tokens are session-only. They remain in memory and are never written to application storage, so they disappear on reload or app close and do not require a protection passphrase or unlock step. You can optionally choose an earlier expiry date; the app removes the token from memory at that time. Adding, removing, expiring, or rejecting a token is reported through the application toast surface. Local removal does not revoke a PAT on GitHub, so revoke it separately in GitHub settings if it may have been exposed.
 
 ## Export Markdown to PDF, HTML, PNG, and MD