From 94fcda59a064b5e8952d1bccb6b9a153c39acda1 Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Wed, 28 Jan 2026 22:41:00 -0500
Subject: Commits list

---
 cgithub/views/commits.eta | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 cgithub/views/commits.eta

(limited to 'cgithub/views/commits.eta')

diff --git a/cgithub/views/commits.eta b/cgithub/views/commits.eta
new file mode 100644
index 0000000..2ddcba3
--- /dev/null
+++ b/cgithub/views/commits.eta
@@ -0,0 +1,25 @@
+<% layout("./layout.eta") %>
+
+<%~ include("./_nav.eta", {...it, isTree: false}) %>
+
+<% for (const group of it.commitGroups) { %>
+  <h3><%= group.title %></h3>
+  <% for (const commit of group.commits) { %>
+    <div class="commit">
+      <div>
+        <div>
+          <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/commit/<%= commit.oid %>"><%= commit.shortMessage %></a>
+        </div>
+        <div class="commit-author">
+          by
+          <% for (const author of commit.authors) { %>
+            <a href="/<%= author.login %>"><%= author.login %></a>
+          <% } %>
+        </div>
+      </div>
+      <div class="commit-sha">
+        <code><%= commit.oid.substring(0, 7) %></code>
+      </div>
+    </div>
+  <% } %>
+<% } %>
-- 
cgit v1.3.1


From 866f99c414cb3d102483ce21c68a0e62b394baaa Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Tue, 11 Aug 2026 13:32:44 -0400
Subject: Keep the ref picker on the current view and path

---
 cgithub/public/static/refs.js |  6 +++--
 cgithub/src/app.test.ts       | 52 ++++++++++++++++++++++++++++++++++++++++++-
 cgithub/src/app.ts            | 12 +++++++---
 cgithub/views/_nav.eta        |  4 ++--
 cgithub/views/_refs.eta       |  6 ++++-
 cgithub/views/_tree.eta       |  2 +-
 cgithub/views/blob.eta        |  2 +-
 cgithub/views/commits.eta     |  2 +-
 8 files changed, 74 insertions(+), 12 deletions(-)

(limited to 'cgithub/views/commits.eta')

diff --git a/cgithub/public/static/refs.js b/cgithub/public/static/refs.js
index ffff505..f3e07e8 100644
--- a/cgithub/public/static/refs.js
+++ b/cgithub/public/static/refs.js
@@ -7,7 +7,9 @@ document.addEventListener("DOMContentLoaded", () => {
   const dialog = document.querySelector(".ref-selector-menu");
   if (dialog) {
     const list = dialog.querySelector(".ref-selector-list");
-    const { owner, repo } = dialog.dataset;
+    // The view and path let the picker link to the same place on another ref
+    // rather than to the repository root.
+    const { owner, repo, view, path = "" } = dialog.dataset;
     const cache = {};
 
     async function load(type) {
@@ -17,7 +19,7 @@ document.addEventListener("DOMContentLoaded", () => {
       }
       list.textContent = "Loading…";
       try {
-        const res = await fetch(`/api/${owner}/${repo}/refs/${type}`);
+        const res = await fetch(`/api/${owner}/${repo}/refs/${type}/${view}/${path}`);
         const html = res.ok ? await res.text() : "";
         cache[type] = html || "Failed to load.";
         list.innerHTML = cache[type];
diff --git a/cgithub/src/app.test.ts b/cgithub/src/app.test.ts
index 498d8a6..6544f03 100644
--- a/cgithub/src/app.test.ts
+++ b/cgithub/src/app.test.ts
@@ -8,6 +8,56 @@ import { createApp } from "./app.ts";
 const eta = new Eta({ views: path.join(import.meta.dirname, "..", "views") });
 const app = createApp(eta);
 
+describe("branch picker", () => {
+  const repo = { owner: "actions", name: "deploy-pages" };
+  const refs = [{ name: "main", isDefault: true }, { name: "v4" }];
+
+  it("should keep the current view and path", () => {
+    const blob = eta.render("_refs.eta", {
+      repo,
+      refs,
+      type: "branches",
+      view: "blob",
+      path: "src/main.ts",
+    });
+    const tree = eta.render("_refs.eta", {
+      repo,
+      refs,
+      type: "branches",
+      view: "tree",
+      path: "src",
+    });
+
+    assert.match(blob, /href="\/actions\/deploy-pages\/blob\/main\/src\/main.ts"/);
+    assert.match(blob, /href="\/actions\/deploy-pages\/blob\/v4\/src\/main.ts"/);
+    assert.match(tree, /href="\/actions\/deploy-pages\/tree\/v4\/src"/);
+  });
+
+  it("should link to the root tree without a path", () => {
+    const html = eta.render("_refs.eta", { repo, refs, type: "branches", view: "tree", path: "" });
+
+    assert.match(html, /href="\/actions\/deploy-pages\/tree\/main"/);
+  });
+
+  it("should not build ref links for views it does not serve", async () => {
+    const res = await app.request("http://cgithub.example/api/a/b/refs/branches/raw/README.md");
+
+    assert.strictEqual(res.status, 404);
+  });
+
+  it("should tell the refs endpoint where the picker was opened", () => {
+    const nav = { repo, branch: "main", path: "src" };
+
+    const blob = eta.render("_nav.eta", { ...nav, view: "blob", path: "src/main.ts" });
+    assert.match(blob, /data-view="blob" data-path="src\/main.ts"/);
+    assert.match(
+      eta.render("_nav.eta", { ...nav, view: "tree" }),
+      /data-view="tree" data-path="src"/,
+    );
+    assert.doesNotMatch(eta.render("_nav.eta", { ...nav, view: "tree", path: "" }), /data-path=/);
+  });
+});
+
 describe("redirects to GitHub", () => {
   // An HTTP redirect would be caught by the extension's declarativeNetRequest
   // rules and bounced straight back here.
@@ -21,7 +71,7 @@ describe("redirects to GitHub", () => {
     const body = await res.text();
     assert.match(
       body,
-      /<meta http-equiv="refresh" content="2; url=https:\/\/github.com\/a\/b\/c\?x=1">/,
+      /<meta http-equiv="refresh" content="1; url=https:\/\/github.com\/a\/b\/c\?x=1">/,
     );
     assert.doesNotMatch(body, /<script/);
   });
diff --git a/cgithub/src/app.ts b/cgithub/src/app.ts
index 9a7ee8e..81e47fd 100644
--- a/cgithub/src/app.ts
+++ b/cgithub/src/app.ts
@@ -155,12 +155,18 @@ export function createApp(eta: Eta) {
   // be visited directly. Keep the site's initial page loads plain server-
   // rendered HTML while still surfacing data (branches/tags, latest commit)
   // that would otherwise require an extra scrape on every page view.
-  app.get("/api/:owner/:repo/refs/:type", async (c) => {
-    const { owner, repo, type } = c.req.param();
+  // The view and path are where the picker was opened, so each ref can link to
+  // the same page on another ref.
+  app.get("/api/:owner/:repo/refs/:type/:view/:path{.*}?", async (c) => {
+    const { owner, repo, type, view, path = "" } = c.req.param();
     if (type !== "branches" && type !== "tags") {
       return c.notFound();
     }
-    return tryRenderFragment(c, "_refs.eta", getGitHubRefs(owner, repo, type));
+    if (view !== "tree" && view !== "blob" && view !== "commits") {
+      return c.notFound();
+    }
+    const refs = getGitHubRefs(owner, repo, type).then((data) => ({ ...data, view, path }));
+    return tryRenderFragment(c, "_refs.eta", refs);
   });
 
   app.get("/api/:owner/:repo/latest-commit/:branch/:path{.*}?", async (c) => {
diff --git a/cgithub/views/_nav.eta b/cgithub/views/_nav.eta
index eb7ed42..a20fbbc 100644
--- a/cgithub/views/_nav.eta
+++ b/cgithub/views/_nav.eta
@@ -6,7 +6,7 @@
   <button type="button" class="ref-selector-button branch" command="show-modal" commandfor="ref-selector-menu">
     <img src="/static/icons/git-branch.svg" alt="branch" class="icon"> <%= refLabel %> ▾
   </button>
-  <dialog class="ref-selector-menu" id="ref-selector-menu" closedby="any" data-owner="<%= it.repo.owner %>" data-repo="<%= it.repo.name %>">
+  <dialog class="ref-selector-menu" id="ref-selector-menu" closedby="any" data-owner="<%= it.repo.owner %>" data-repo="<%= it.repo.name %>" data-view="<%= it.view %>"<% if (it.path && it.path !== "/") { %> data-path="<%= it.path %>"<% } %>>
     <div class="ref-selector-tabs">
       <button type="button" class="active" data-ref-type="branches">Branches</button>
       <button type="button" data-ref-type="tags">Tags</button>
@@ -22,7 +22,7 @@
       currentPath += (currentPath ? '/' : '') + part;
       const isLast = i === pathParts.length - 1;
       if (isLast) {
-        %>/<%= part %><%= it.isTree ? "/" : "" %><%
+        %>/<%= part %><%= it.view === "tree" ? "/" : "" %><%
       } else {
         %>/<a href="/<%= it.repo.owner %>/<%= it.repo.name %>/tree/<%= it.branch %>/<%= currentPath %>"><%= part %></a><%
       }
diff --git a/cgithub/views/_refs.eta b/cgithub/views/_refs.eta
index 2450c4b..9d951cc 100644
--- a/cgithub/views/_refs.eta
+++ b/cgithub/views/_refs.eta
@@ -1,10 +1,14 @@
+<%
+const linkPrefix = `/${it.repo.owner}/${it.repo.name}/${it.view}/`;
+const linkSuffix = it.path ? `/${it.path}` : "";
+%>
 <% if (it.refs.length === 0) { %>
   <div class="ref-selector-empty">No <%= it.type %> found.</div>
 <% } else { %>
   <ul class="ref-selector-items">
     <% for (const ref of it.refs) { %>
       <li>
-        <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/tree/<%= ref.name %>"><%= ref.name %></a>
+        <a href="<%= linkPrefix %><%= ref.name %><%= linkSuffix %>"><%= ref.name %></a>
         <% if (ref.isDefault) { %><span class="ref-selector-badge">default</span><% } %>
       </li>
     <% } %>
diff --git a/cgithub/views/_tree.eta b/cgithub/views/_tree.eta
index fc7707b..a3c943d 100644
--- a/cgithub/views/_tree.eta
+++ b/cgithub/views/_tree.eta
@@ -1,4 +1,4 @@
-<%~ include("./_nav.eta", {...it, isTree: true}) %>
+<%~ include("./_nav.eta", {...it, view: "tree"}) %>
 
 <% const commitPath = it.path && it.path !== "/" ? it.path : ""; %>
 <div class="placeholder commit box" data-src="/api/<%= it.repo.owner %>/<%= it.repo.name %>/latest-commit/<%= it.branch %>/<%= commitPath %>">
diff --git a/cgithub/views/blob.eta b/cgithub/views/blob.eta
index 50f92a9..ed1e84b 100644
--- a/cgithub/views/blob.eta
+++ b/cgithub/views/blob.eta
@@ -1,6 +1,6 @@
 <% layout("./layout.eta"); it.searchType = "code" %>
 
-<%~ include("./_nav.eta", it) %>
+<%~ include("./_nav.eta", {...it, view: "blob"}) %>
 
 <div>
   <% if (it.language) { %>
diff --git a/cgithub/views/commits.eta b/cgithub/views/commits.eta
index 2ddcba3..5cf0beb 100644
--- a/cgithub/views/commits.eta
+++ b/cgithub/views/commits.eta
@@ -1,6 +1,6 @@
 <% layout("./layout.eta") %>
 
-<%~ include("./_nav.eta", {...it, isTree: false}) %>
+<%~ include("./_nav.eta", {...it, view: "commits"}) %>
 
 <% for (const group of it.commitGroups) { %>
   <h3><%= group.title %></h3>
-- 
cgit v1.3.1


From a61a96c6d72d4297b2539f4033fbfbd0a3d178ab Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Thu, 3 Sep 2026 01:37:35 -0400
Subject: Link blobs to their history and back

Nothing in a commits payload says whether the path it lists is a file or
a directory: currentBlobPath, despite the name, is only the path filter,
and is set for a directory just the same. GitHub's own UI cannot tell
either, and points its browse button at /blob/<oid>/<path> so that the
redirect resolves a file to its blob. We do the same, and the blob route
already turns that redirect into one of our own tree URLs.

Breadcrumbs now stay in the view they were clicked from, so walking up
from a history lands in the history of each parent directory rather than
in its listing. The last crumb remains the page you are already on.

A path with no commits now says so rather than rendering an empty page.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01R7pRKdmTvNDgT4ZXrwkbH8
---
 cgithub/CLAUDE.md           |  1 +
 cgithub/src/app.test.ts     | 56 +++++++++++++++++++++++++++++++++++++++++++++
 cgithub/src/scraper.test.ts | 33 ++++++++++++++++++++++++++
 cgithub/views/_nav.eta      |  7 ++++--
 cgithub/views/blob.eta      |  3 +++
 cgithub/views/commits.eta   |  8 +++++++
 6 files changed, 106 insertions(+), 2 deletions(-)

(limited to 'cgithub/views/commits.eta')

diff --git a/cgithub/CLAUDE.md b/cgithub/CLAUDE.md
index c0c211d..3f0cd61 100644
--- a/cgithub/CLAUDE.md
+++ b/cgithub/CLAUDE.md
@@ -33,6 +33,7 @@ pnpm test
 - `GET /:owner/:repo` - Repository info with directory listing
 - `GET /:owner/:repo/tree/:branch/:path*` - Directory listing
 - `GET /:owner/:repo/blob/:branch/:path` - File content view
+- `GET /:owner/:repo/commits/:branch/:path*` - Commit history of the repository, a directory, or a file
 - `GET /:owner/:repo/wiki` - Wiki home page
 - `GET /:owner/:repo/wiki/:page` - Wiki page (also `/:page/:oid` for a revision)
 - `GET /:owner/:repo/wiki/_pages` - Wiki page index
diff --git a/cgithub/src/app.test.ts b/cgithub/src/app.test.ts
index 265465e..8519d91 100644
--- a/cgithub/src/app.test.ts
+++ b/cgithub/src/app.test.ts
@@ -155,6 +155,62 @@ describe("blob view", () => {
   });
 });
 
+describe("commit history", () => {
+  const repo = { owner: "actions", name: "deploy-pages" };
+  const oid = "b39c421b98f49d83ae50ec502c3ddfc3bf28f2c6";
+  const commitGroups = [
+    {
+      title: "Apr 18, 2023",
+      commits: [
+        { oid, shortMessage: "Remove deprecated input parameters", authors: [{ login: "jmg" }] },
+      ],
+    },
+  ];
+  const history = { repo, branch: "main", path: "src/index.js", commitGroups };
+
+  // A commits payload never says whether its path is a file or a directory, so
+  // every link goes to the tree and GitHub redirects a file's to its blob.
+  it("should browse a file's history at each of its commits", () => {
+    const html = eta.render("commits.eta", history);
+
+    assert.match(html, new RegExp(`href="/actions/deploy-pages/blob/${oid}/src/index.js">Browse`));
+  });
+
+  it("should browse a directory's history the same way", () => {
+    const html = eta.render("commits.eta", { ...history, path: "src" });
+
+    assert.match(html, new RegExp(`href="/actions/deploy-pages/blob/${oid}/src">Browse`));
+  });
+
+  it("should browse the whole repository when the history has no path", () => {
+    const html = eta.render("commits.eta", { ...history, path: "" });
+
+    assert.match(html, new RegExp(`href="/actions/deploy-pages/blob/${oid}">Browse`));
+  });
+
+  // Walking up from a history stays in the history, and its last crumb is the
+  // page you are already on, just as a blob or a tree ends on itself.
+  it("should walk up through the history of each parent directory", () => {
+    const html = eta.render("commits.eta", { ...history, path: "src/lib/index.js" });
+
+    assert.match(html, /href="\/actions\/deploy-pages\/commits\/main">\(top\)</);
+    assert.match(html, /href="\/actions\/deploy-pages\/commits\/main\/src">src</);
+    assert.match(html, /href="\/actions\/deploy-pages\/commits\/main\/src\/lib">lib<\/a>\/index\.js/);
+  });
+
+  it("should say so when a path has no history", () => {
+    const html = eta.render("commits.eta", { ...history, commitGroups: [] });
+
+    assert.match(html, /No commits found\./);
+  });
+
+  it("should link a blob to its own history", () => {
+    const html = eta.render("blob.eta", { ...history, textLines: ["x"] });
+
+    assert.match(html, /href="\/actions\/deploy-pages\/commits\/main\/src\/index.js">History/);
+  });
+});
+
 describe("embedded files", () => {
   function stubGitHub(t: TestContext, body: string, contentType: string, status = 200) {
     t.mock.method(
diff --git a/cgithub/src/scraper.test.ts b/cgithub/src/scraper.test.ts
index 2690f71..f6be2b6 100644
--- a/cgithub/src/scraper.test.ts
+++ b/cgithub/src/scraper.test.ts
@@ -195,6 +195,39 @@ describe("GitHub scraper", () => {
       assert.ok(data.commitGroups.length > 0);
     });
 
+    // GitHub serves a file's history from the same route as a directory's.
+    it("should fetch the history of a blob", async () => {
+      const data = await getGitHubCommits("actions", "deploy-pages", "main", "src/index.js");
+
+      assert.strictEqual(data.path, "src/index.js");
+
+      assert.ok(data.commitGroups.length > 0);
+      const commit = data.commitGroups[0].commits[0];
+      assert.strictEqual(commit.oid.length, 40);
+      assert.ok(commit.shortMessage.length > 0);
+    });
+
+    // What a history page's "Browse" link resolves to: the file as it stood at
+    // one of its commits. Nothing in a commits payload says whether the path is
+    // a file or a directory, so those links all point at the tree and rely on
+    // GitHub redirecting a file's to its blob.
+    it("should redirect a blob browsed at a commit to its blob view", async () => {
+      const oid = "b39c421b98f49d83ae50ec502c3ddfc3bf28f2c6";
+
+      await assert.rejects(getGitHubTree("actions", "deploy-pages", oid, "src/index.js"), (err) => {
+        assert(err instanceof RedirectError, "error should be a RedirectError");
+        assert.strictEqual(err.location, `/actions/deploy-pages/blob/${oid}/src/index.js`);
+        return true;
+      });
+
+      const data = await getGitHubBlob("actions", "deploy-pages", oid, "src/index.js");
+
+      assert.strictEqual(data.branch, oid);
+      assert.strictEqual(data.path, "src/index.js");
+      assert.strictEqual(data.size, "1.37 KB / 51 lines / 40 loc");
+      assert.strictEqual(data.textLines?.length, 51);
+    });
+
     it("should fetch releases", async () => {
       const data = await getGitHubReleases("actions", "deploy-pages");
 
diff --git a/cgithub/views/_nav.eta b/cgithub/views/_nav.eta
index a20fbbc..a20741b 100644
--- a/cgithub/views/_nav.eta
+++ b/cgithub/views/_nav.eta
@@ -14,7 +14,10 @@
     <div class="ref-selector-list">Loading…</div>
   </dialog>
   <% if (it.path && it.path !== "/") { %>
-    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/tree/<%= it.branch %>">(top)</a><%
+    <%
+    const crumbHrefBase = `/${it.repo.owner}/${it.repo.name}/${it.view === "blob" ? "tree" : it.view}/${it.branch}`;
+    %>
+    <a href="<%= crumbHrefBase %>">(top)</a><%
     const pathParts = it.path.split('/').filter(p => p);
     let currentPath = '';
     for (let i = 0; i < pathParts.length; i++) {
@@ -24,7 +27,7 @@
       if (isLast) {
         %>/<%= part %><%= it.view === "tree" ? "/" : "" %><%
       } else {
-        %>/<a href="/<%= it.repo.owner %>/<%= it.repo.name %>/tree/<%= it.branch %>/<%= currentPath %>"><%= part %></a><%
+        %>/<a href="<%= crumbHrefBase %>/<%= currentPath %>"><%= part %></a><%
       }
     } %>
   <% } %>
diff --git a/cgithub/views/blob.eta b/cgithub/views/blob.eta
index be9a57e..2014b14 100644
--- a/cgithub/views/blob.eta
+++ b/cgithub/views/blob.eta
@@ -7,6 +7,9 @@
     <div>language: <%= it.language %></div>
   <% } %>
   <div><%= it.size %></div>
+  <div>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/commits/<%= it.branch %>/<%= it.path %>">History</a>
+  </div>
   <div>
     <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/raw/<%= it.branch %>/<%= it.path %>">View raw</a>
   </div>
diff --git a/cgithub/views/commits.eta b/cgithub/views/commits.eta
index 5cf0beb..c29693d 100644
--- a/cgithub/views/commits.eta
+++ b/cgithub/views/commits.eta
@@ -2,6 +2,12 @@
 
 <%~ include("./_nav.eta", {...it, view: "commits"}) %>
 
+<% const pathSuffix = it.path && it.path !== "/" ? "/" + it.path : "" %>
+
+<% if (it.commitGroups.length === 0) { %>
+  <div class="box">No commits found.</div>
+<% } %>
+
 <% for (const group of it.commitGroups) { %>
   <h3><%= group.title %></h3>
   <% for (const commit of group.commits) { %>
@@ -19,6 +25,8 @@
       </div>
       <div class="commit-sha">
         <code><%= commit.oid.substring(0, 7) %></code>
+        <% /* Like GitHub, blindly link to blob and redirect for trees */ %>
+        <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/blob/<%= commit.oid %><%= pathSuffix %>">Browse</a>
       </div>
     </div>
   <% } %>
-- 
cgit v1.3.1


From 53ac3bc511a45e4e2e3f234a8b8dcf853b0c38d9 Mon Sep 17 00:00:00 2001
From: Joe Mou <dev@mou.fo>
Date: Fri, 4 Sep 2026 21:26:21 -0400
Subject: Split the page shell out of the repository layout

layout.eta was two things at once: the HTML shell every page needs and
the repository chrome around it. owner.eta, being the one page that is
not about a repository, could use neither and carried its own copy of
the shell, which had drifted -- its footer named no build commit and
did not link to the original page on GitHub.

The shell moves to views/layouts/base.eta, taking its title and any
deferred scripts as layout data, and the chrome to views/layouts/repo.eta,
a layout over it that adds the clone commands, nav, search box, and the
"/" shortcut that focuses it. Repository pages point at repo.eta and
render as before; owner.eta uses base.eta directly and so gains the
footer it was missing.

Templates now live in more than one directory, so scripts/build.ts walks
views/ recursively and keys each template by its path underneath it.
Names crossing a directory are written from the views root
("/layouts/base.eta"), the one form both Eta's filesystem resolver and
the precompiled resolver in worker.ts agree on; siblings stay relative.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ba5p88cWtCq42vf3uweweL
---
 cgithub/CLAUDE.md              |   2 +-
 cgithub/scripts/build.ts       |  20 ++++++--
 cgithub/src/app.ts             |   2 +-
 cgithub/src/worker.ts          |   5 +-
 cgithub/views/blob.eta         |   2 +-
 cgithub/views/commits.eta      |   2 +-
 cgithub/views/issues.eta       |   2 +-
 cgithub/views/layout.eta       |  66 -------------------------
 cgithub/views/layouts/base.eta |  17 +++++++
 cgithub/views/layouts/repo.eta |  59 +++++++++++++++++++++++
 cgithub/views/owner.eta        | 107 ++++++++++++++++++-----------------------
 cgithub/views/pulls.eta        |   2 +-
 cgithub/views/release.eta      |   2 +-
 cgithub/views/releases.eta     |   2 +-
 cgithub/views/repo.eta         |   2 +-
 cgithub/views/tree.eta         |   2 +-
 cgithub/views/wiki.eta         |   2 +-
 cgithub/views/wikiPages.eta    |   2 +-
 18 files changed, 156 insertions(+), 142 deletions(-)
 delete mode 100644 cgithub/views/layout.eta
 create mode 100644 cgithub/views/layouts/base.eta
 create mode 100644 cgithub/views/layouts/repo.eta

(limited to 'cgithub/views/commits.eta')

diff --git a/cgithub/CLAUDE.md b/cgithub/CLAUDE.md
index edb33f5..6c6dc60 100644
--- a/cgithub/CLAUDE.md
+++ b/cgithub/CLAUDE.md
@@ -24,7 +24,7 @@ pnpm test
 - `src/worker.ts` - Cloudflare Workers entry (config in `wrangler.jsonc`)
 - `src/scraper.ts` - GitHub HTML fetching and JSON extraction logic
 
-**Templates:** `views/*.eta` - Eta templates with layout inheritance (`layout.eta` as base). On Workers, runtime code generation is disallowed, so `scripts/build.ts` precompiles templates to `src/views.generated.ts`. The same script records the build's `git describe` output in `src/build.generated.ts` for the page footer. Both are gitignored and regenerated by the `dev`/`deploy` scripts.
+**Templates:** `views/*.eta` - Eta templates with layout inheritance. `views/layouts/base.eta` is the HTML shell every page uses; `views/layouts/repo.eta` wraps it with the repository header, nav, and search box. Templates address each other from the views root (`/layouts/base.eta`) or as siblings (`./_tree`). On Workers, runtime code generation is disallowed, so `scripts/build.ts` precompiles templates to `src/views.generated.ts`. The same script records the build's `git describe` output in `src/build.generated.ts` for the page footer. Both are gitignored and regenerated by the `dev`/`deploy` scripts.
 
 **Static files:** `public/static/*`, served by Workers Static Assets.
 
diff --git a/cgithub/scripts/build.ts b/cgithub/scripts/build.ts
index 76d88a0..4908532 100644
--- a/cgithub/scripts/build.ts
+++ b/cgithub/scripts/build.ts
@@ -14,10 +14,22 @@ const root = path.join(import.meta.dirname, "..");
 const viewsDir = path.join(root, "views");
 const eta = new Eta({ views: viewsDir });
 
-const names = fs
-  .readdirSync(viewsDir)
-  .filter((name) => name.endsWith(".eta"))
-  .sort();
+// Names are the templates' paths under views/, e.g. "layouts/base.eta", which
+// is how the templates address each other (see src/worker.ts).
+function templateNames(dir: string, prefix = ""): string[] {
+  const names: string[] = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const name = prefix + entry.name;
+    if (entry.isDirectory()) {
+      names.push(...templateNames(path.join(dir, entry.name), `${name}/`));
+    } else if (entry.name.endsWith(".eta")) {
+      names.push(name);
+    }
+  }
+  return names.sort();
+}
+
+const names = templateNames(viewsDir);
 
 let out = `// @ts-nocheck
 // Generated by scripts/build.ts -- do not edit.
diff --git a/cgithub/src/app.ts b/cgithub/src/app.ts
index 2fa5832..a040aaa 100644
--- a/cgithub/src/app.ts
+++ b/cgithub/src/app.ts
@@ -39,7 +39,7 @@ export function createApp(eta: Eta) {
   const app = new Hono();
 
   app.use(async (c, next) => {
-    // Include render data for layout.eta.
+    // Include render data for views/layouts/base.eta.
     c.setRenderer((template, data) =>
       c.html(eta.render(template, { ...data, githubUrl: githubUrlFor(c), buildCommit })),
     );
diff --git a/cgithub/src/worker.ts b/cgithub/src/worker.ts
index 7bf9100..e59c690 100644
--- a/cgithub/src/worker.ts
+++ b/cgithub/src/worker.ts
@@ -9,8 +9,11 @@ import { views } from "./views.generated.ts";
 // cache: true, Eta serves them from the cache and never compiles.
 const eta = new Eta({ cache: true });
 
+// Templates name each other as siblings ("./_tree") or from the views root
+// ("/layouts/base.eta"); either way the name is the path under views/ that
+// scripts/build.ts keyed the template by.
 eta.resolvePath = (templatePath: string) => {
-  let name = templatePath.replace(/^\.\//, "");
+  let name = templatePath.replace(/^\.?\//, "");
   if (!name.endsWith(".eta")) name += ".eta";
   return name;
 };
diff --git a/cgithub/views/blob.eta b/cgithub/views/blob.eta
index 2014b14..9f6706e 100644
--- a/cgithub/views/blob.eta
+++ b/cgithub/views/blob.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta"); it.searchType = "code" %>
+<% layout("/layouts/repo.eta"); it.searchType = "code" %>
 
 <%~ include("./_nav.eta", {...it, view: "blob"}) %>
 
diff --git a/cgithub/views/commits.eta b/cgithub/views/commits.eta
index c29693d..a80ef07 100644
--- a/cgithub/views/commits.eta
+++ b/cgithub/views/commits.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <%~ include("./_nav.eta", {...it, view: "commits"}) %>
 
diff --git a/cgithub/views/issues.eta b/cgithub/views/issues.eta
index 646da46..754afb8 100644
--- a/cgithub/views/issues.eta
+++ b/cgithub/views/issues.eta
@@ -1,4 +1,4 @@
-<% layout("./layout"); it.searchType = "issues" %>
+<% layout("/layouts/repo.eta"); it.searchType = "issues" %>
 
 <table>
   <% for (const issue of it.issues) { %>
diff --git a/cgithub/views/layout.eta b/cgithub/views/layout.eta
deleted file mode 100644
index 37289dd..0000000
--- a/cgithub/views/layout.eta
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title><%= it.repo.owner %>/<%= it.repo.name %> - <%= it.path || '/' %></title>
-  <link rel="stylesheet" href="/static/style.css">
-  <script src="/static/refs.js" defer></script>
-</head>
-<body>
-  <div class="box">
-    <div class="repo"><a href="/<%= it.repo.owner %>"><%= it.repo.owner %></a>/<a href="/<%= it.repo.owner %>/<%= it.repo.name %>"><%= it.repo.name %></a></div>
-    <pre><code>git clone https://github.com/<%= it.repo.owner %>/<%= it.repo.name %>.git
-git clone git@github.com:<%= it.repo.owner %>/<%= it.repo.name %>.git</code></pre>
-    <nav>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>">Code</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/issues">Issues</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/pulls">Pull requests</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/releases">Releases</a>
-      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/wiki">Wiki</a>
-      <% if (it.branch) { %>
-        <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/commits/<%= it.branch %><%= it.path && it.path !== '/' ? '/' + it.path : '' %>">Commits</a>
-      <% } %>
-    </nav>
-    <form action="/<%= it.repo.owner %>/<%= it.repo.name %>/search" method="get">
-      <input id="search-input" type="text" name="q" placeholder="Search…" value="<%= it.q ?? "" %>">
-      <select name="type">
-        <option value="issues" <%= it.searchType === "issues" ? "selected" : "" %>>Issues</option>
-        <option value="pullrequests" <%= it.searchType === "pullrequests" ? "selected" : "" %>>Pull requests</option>
-        <option value="code" <%= it.searchType === "code" || it.searchType == null ? "selected" : "" %>>Code</option>
-      </select>
-      <button type="submit">Search</button>
-    </form>
-  </div>
-
-  <%~ it.body %>
-
-  <footer>Generated by cgithub commit <code><%= it.buildCommit %></code> · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
-
-  <script>
-    document.addEventListener("keydown", function(e) {
-      let shortcut = "";
-      if (e.ctrlKey || e.metaKey) shortcut += "C-";
-      if (e.altKey) shortcut += "A-";
-      if (e.shiftKey) shortcut += "S-";
-      shortcut += e.key;
-
-      if (shortcut === "Escape") {
-        document.activeElement.blur();
-        return;
-      }
-
-      if (["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName)) {
-        return;
-      }
-
-      if (shortcut === "/") {
-        e.preventDefault();
-        const input = document.getElementById('search-input');
-        input.select();
-        input.scrollIntoView({ block: "nearest" });
-      }
-    });
-  </script>
-</body>
-</html>
diff --git a/cgithub/views/layouts/base.eta b/cgithub/views/layouts/base.eta
new file mode 100644
index 0000000..fb644f5
--- /dev/null
+++ b/cgithub/views/layouts/base.eta
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title><%= it.title %></title>
+  <link rel="stylesheet" href="/static/style.css">
+  <% for (const src of it.scripts ?? []) { %>
+    <script src="<%= src %>" defer></script>
+  <% } %>
+</head>
+<body>
+  <%~ it.body %>
+
+  <footer>Generated by cgithub commit <code><%= it.buildCommit %></code> · <a href="<%= it.githubUrl %>" rel="noreferrer">View original</a></footer>
+</body>
+</html>
diff --git a/cgithub/views/layouts/repo.eta b/cgithub/views/layouts/repo.eta
new file mode 100644
index 0000000..e4f7880
--- /dev/null
+++ b/cgithub/views/layouts/repo.eta
@@ -0,0 +1,59 @@
+<%
+layout("/layouts/base.eta", {
+  title: `${it.repo.owner}/${it.repo.name} - ${it.path || "/"}`,
+  scripts: ["/static/refs.js"],
+})
+%>
+
+<div class="box">
+  <div class="repo"><a href="/<%= it.repo.owner %>"><%= it.repo.owner %></a>/<a href="/<%= it.repo.owner %>/<%= it.repo.name %>"><%= it.repo.name %></a></div>
+  <pre><code>git clone https://github.com/<%= it.repo.owner %>/<%= it.repo.name %>.git
+git clone git@github.com:<%= it.repo.owner %>/<%= it.repo.name %>.git</code></pre>
+  <nav>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>">Code</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/issues">Issues</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/pulls">Pull requests</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/releases">Releases</a>
+    <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/wiki">Wiki</a>
+    <% if (it.branch) { %>
+      <a href="/<%= it.repo.owner %>/<%= it.repo.name %>/commits/<%= it.branch %><%= it.path && it.path !== '/' ? '/' + it.path : '' %>">Commits</a>
+    <% } %>
+  </nav>
+  <form action="/<%= it.repo.owner %>/<%= it.repo.name %>/search" method="get">
+    <input id="search-input" type="text" name="q" placeholder="Search…" value="<%= it.q ?? "" %>">
+    <select name="type">
+      <option value="issues" <%= it.searchType === "issues" ? "selected" : "" %>>Issues</option>
+      <option value="pullrequests" <%= it.searchType === "pullrequests" ? "selected" : "" %>>Pull requests</option>
+      <option value="code" <%= it.searchType === "code" || it.searchType == null ? "selected" : "" %>>Code</option>
+    </select>
+    <button type="submit">Search</button>
+  </form>
+</div>
+
+<%~ it.body %>
+
+<script>
+  document.addEventListener("keydown", function(e) {
+    let shortcut = "";
+    if (e.ctrlKey || e.metaKey) shortcut += "C-";
+    if (e.altKey) shortcut += "A-";
+    if (e.shiftKey) shortcut += "S-";
+    shortcut += e.key;
+
+    if (shortcut === "Escape") {
+      document.activeElement.blur();
+      return;
+    }
+
+    if (["INPUT", "TEXTAREA", "SELECT"].includes(document.activeElement.tagName)) {
+      return;
+    }
+
+    if (shortcut === "/") {
+      e.preventDefault();
+      const input = document.getElementById('search-input');
+      input.select();
+      input.scrollIntoView({ block: "nearest" });
+    }
+  });
+</script>
diff --git a/cgithub/views/owner.eta b/cgithub/views/owner.eta
index e5667fb..b3304fb 100644
--- a/cgithub/views/owner.eta
+++ b/cgithub/views/owner.eta
@@ -1,65 +1,54 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title><%= it.name ? `${it.name} (${it.login})` : it.login %></title>
-  <link rel="stylesheet" href="/static/style.css">
-</head>
-<body>
-  <div class="box">
-    <% if (it.avatarUrl) { %>
-      <img class="avatar" src="<%= it.avatarUrl %>" alt="" width="64" height="64">
-    <% } %>
-    <div class="repo"><%= it.name || it.login %></div>
-    <div><%= it.login %><%= it.type === "organization" ? " (organization)" : "" %></div>
-    <% if (it.location) { %>
-      <div><%= it.location %></div>
-    <% } %>
-    <% if (it.nav.length > 0) { %>
-      <nav>
-        <% for (const item of it.nav) { %>
-          <a href="<%= item.href %>"><%= item.text %></a>
-        <% } %>
-      </nav>
-    <% } %>
-  </div>
+<% layout("/layouts/base.eta", { title: it.name ? `${it.name} (${it.login})` : it.login }) %>
 
-  <% if (it.bio || it.links.length > 0 || it.followers || it.company) { %>
-    <div class="box repo-info">
-      <% if (it.bio) { %>
-        <div class="description"><%= it.bio %></div>
-      <% } %>
-      <% for (const link of it.links) { %>
-        <div class="detail"><img src="/static/icons/link.svg" alt="" class="icon"> <a href="<%= link.href %>" rel="noopener noreferrer"><%= link.text %></a></div>
-      <% } %>
-      <% if (it.followers) { %>
-        <div class="detail"><img src="/static/icons/eye.svg" alt="" class="icon"> <%= it.followers %> followers<%= it.following ? ` · ${it.following} following` : "" %></div>
-      <% } %>
-      <% if (it.company) { %>
-        <div class="detail"><%= it.company %></div>
-      <% } %>
-    </div>
+<div class="box">
+  <% if (it.avatarUrl) { %>
+    <img class="avatar" src="<%= it.avatarUrl %>" alt="" width="64" height="64">
   <% } %>
-
-  <% if (it.pinned.length > 0) { %>
-    <section>
-      <h2>Pinned</h2>
-      <% for (const repo of it.pinned) { %>
-        <%~ include("./_ownerRepo", { repo, login: it.login }) %>
-      <% } %>
-    </section>
+  <div class="repo"><%= it.name || it.login %></div>
+  <div><%= it.login %><%= it.type === "organization" ? " (organization)" : "" %></div>
+  <% if (it.location) { %>
+    <div><%= it.location %></div>
   <% } %>
-
-  <% if (it.repos.length > 0) { %>
-    <section>
-      <h2>Repositories</h2>
-      <% for (const repo of it.repos) { %>
-        <%~ include("./_ownerRepo", { repo, login: it.login }) %>
+  <% if (it.nav.length > 0) { %>
+    <nav>
+      <% for (const item of it.nav) { %>
+        <a href="<%= item.href %>"><%= item.text %></a>
       <% } %>
-    </section>
+    </nav>
   <% } %>
+</div>
+
+<% if (it.bio || it.links.length > 0 || it.followers || it.company) { %>
+  <div class="box repo-info">
+    <% if (it.bio) { %>
+      <div class="description"><%= it.bio %></div>
+    <% } %>
+    <% for (const link of it.links) { %>
+      <div class="detail"><img src="/static/icons/link.svg" alt="" class="icon"> <a href="<%= link.href %>" rel="noopener noreferrer"><%= link.text %></a></div>
+    <% } %>
+    <% if (it.followers) { %>
+      <div class="detail"><img src="/static/icons/eye.svg" alt="" class="icon"> <%= it.followers %> followers<%= it.following ? ` · ${it.following} following` : "" %></div>
+    <% } %>
+    <% if (it.company) { %>
+      <div class="detail"><%= it.company %></div>
+    <% } %>
+  </div>
+<% } %>
 
-  <footer>Generated by cgithub</footer>
-</body>
-</html>
+<% if (it.pinned.length > 0) { %>
+  <section>
+    <h2>Pinned</h2>
+    <% for (const repo of it.pinned) { %>
+      <%~ include("./_ownerRepo", { repo, login: it.login }) %>
+    <% } %>
+  </section>
+<% } %>
+
+<% if (it.repos.length > 0) { %>
+  <section>
+    <h2>Repositories</h2>
+    <% for (const repo of it.repos) { %>
+      <%~ include("./_ownerRepo", { repo, login: it.login }) %>
+    <% } %>
+  </section>
+<% } %>
diff --git a/cgithub/views/pulls.eta b/cgithub/views/pulls.eta
index 9ec5ca1..697f6b1 100644
--- a/cgithub/views/pulls.eta
+++ b/cgithub/views/pulls.eta
@@ -1,4 +1,4 @@
-<% layout("./layout"); it.searchType = "pullrequests" %>
+<% layout("/layouts/repo.eta"); it.searchType = "pullrequests" %>
 
 <table>
   <% for (const pull of it.pulls) { %>
diff --git a/cgithub/views/release.eta b/cgithub/views/release.eta
index 46dd5db..64cca35 100644
--- a/cgithub/views/release.eta
+++ b/cgithub/views/release.eta
@@ -1,3 +1,3 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <%~ include("./_release.eta", { repo: it.repo, release: it.release, linkToDetail: false }) %>
diff --git a/cgithub/views/releases.eta b/cgithub/views/releases.eta
index 840908c..4ede28b 100644
--- a/cgithub/views/releases.eta
+++ b/cgithub/views/releases.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <% for (const release of it.releases) { %>
   <%~ include("./_release.eta", { repo: it.repo, release, linkToDetail: true }) %>
diff --git a/cgithub/views/repo.eta b/cgithub/views/repo.eta
index 5dc6beb..60746df 100644
--- a/cgithub/views/repo.eta
+++ b/cgithub/views/repo.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta") %>
+<% layout("/layouts/repo.eta") %>
 
 <% if (it.info) { %>
   <div class="box repo-info">
diff --git a/cgithub/views/tree.eta b/cgithub/views/tree.eta
index 41ded06..fabf5b9 100644
--- a/cgithub/views/tree.eta
+++ b/cgithub/views/tree.eta
@@ -1,3 +1,3 @@
-<% layout("./layout.eta"); it.searchType = "code" %>
+<% layout("/layouts/repo.eta"); it.searchType = "code" %>
 
 <%~ include("./_tree.eta", it) %>
diff --git a/cgithub/views/wiki.eta b/cgithub/views/wiki.eta
index d6047e1..781caff 100644
--- a/cgithub/views/wiki.eta
+++ b/cgithub/views/wiki.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta"); it.path = "wiki/" + it.title %>
+<% layout("/layouts/repo.eta"); it.path = "wiki/" + it.title %>
 
 <%~ include("./_wikiNav.eta", it) %>
 
diff --git a/cgithub/views/wikiPages.eta b/cgithub/views/wikiPages.eta
index 58d6d21..eb90781 100644
--- a/cgithub/views/wikiPages.eta
+++ b/cgithub/views/wikiPages.eta
@@ -1,4 +1,4 @@
-<% layout("./layout.eta"); it.path = "wiki/_pages" %>
+<% layout("/layouts/repo.eta"); it.path = "wiki/_pages" %>
 
 <%~ include("./_wikiNav.eta", it) %>
 
-- 
cgit v1.3.1