ework-web 0.10.94 → 0.10.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.94",
+  "version": "0.10.96",
   "type": "module",
   "description": "ework-web — standalone multi-project issue tracker. Local SQLite-backed, no external API dependency. Bun + TypeScript + SSR HTML.",
   "license": "MIT",

package/src/index.ts

@@ -1850,7 +1850,7 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
             login: c.author,
             avatar: "",
             created_at: c.created_at,
-            body_html: renderMarkdown(c.body),
+            body_html: renderMarkdown(c.body, "", `/${owner}/${repo}/issues/${issue.number}`),
           };
         }
         let closed = false;

package/src/render/markdown.ts

@@ -33,11 +33,40 @@ const PURIFY_OPTS = {
   ALLOWED_URI_REGEXP: /^(?:(?:https?|mailto):|\/|\.\/|\.\.\/|#)/i,
 };
 
-export function renderMarkdown(body: string, baseDir = ""): string {
+export function renderMarkdown(body: string, baseDir = "", baseIssuePath = ""): string {
   const dirty = marked.parse(body ?? "");
   const html = typeof dirty === "string" ? dirty : "";
   const clean = purify.sanitize(html, PURIFY_OPTS) as unknown as string;
-  return linkifyAbsPaths(linkifySessionIDs(clean), baseDir);
+  return linkifyIssueRefs(linkifyAbsPaths(linkifySessionIDs(clean), baseDir), baseIssuePath);
+}
+
+// Linkify #N issue references inside rendered issue content. Only applied
+// when the caller supplies the current issue's path — same-repo shorthand
+// (#204) resolves against it. Skips tag interiors and existing anchors,
+// same token-scanning approach as linkifySessionIDs.
+export function linkifyIssueRefs(html: string, baseIssuePath = ""): string {
+  if (!baseIssuePath) return html;
+  const issuePath = baseIssuePath.replace(/\/+$/, "");
+  let out = "";
+  let inA = false;
+  let inCode = false;
+  const re = /(<[^>]*>)|([^<]+)/g;
+  let m: RegExpExecArray | null;
+  while ((m = re.exec(html)) !== null) {
+    if (m[1] !== undefined) {
+      const tag = m[1];
+      if (/^<a[\s>]/i.test(tag)) inA = true;
+      else if (/^<\/a[\s>]/i.test(tag)) inA = false;
+      else if (/^<pre[\s>]/i.test(tag) || /^<code[\s>]/i.test(tag)) inCode = true;
+      else if (/^<\/pre[\s>]/i.test(tag) || /^<\/code[\s>]/i.test(tag)) inCode = false;
+      out += tag;
+    } else if (m[2] !== undefined) {
+      out += inA || inCode
+        ? m[2]
+        : m[2].replace(/(^|[^\w#])#([1-9][0-9]{0,4})(?![0-9\w])/g, (_all, pre: string, num: string) => `${pre}<a href="${issuePath.replace(/\/issues\/\d+$/, "")}/issues/${num}">#${num}</a>`);
+    }
+  }
+  return out;
 }
 
 // Linkify ses_ IDs in text nodes only — skips tag interiors (don't corrupt

package/src/views/issueThread.ts

@@ -17,6 +17,7 @@ import {
   listCachedModels,
   type CommentRow,
   type IssueWithMeta,
+  type ProjectRow,
 } from "../store";
 import { webUrlFromClone } from "./projectUpstreams";
 
@@ -37,7 +38,23 @@ export interface IssueThreadPayload {
   comments: CommentView[];
 }
 
-function toView(c: CommentRow): CommentView {
+// Issues in a project cloned from an upstream are that upstream's issues:
+// #204 in a github-mirrored repo means github.com/o/r/issues/204. Normalize
+// the configured remote (https/git@/ssh/git forms) to its web base; projects
+// without an upstream keep resolving refs against this ework install.
+export function upstreamRefBase(project: Pick<ProjectRow, "upstream_urls">): string | null {
+  const url = getDefaultUpstreamUrl(project);
+  if (!url) return null;
+  let m = url.match(/^git@([^:]+):(.+)$/);
+  if (m?.[1] && m[2]) return `https://${m[1]}/${m[2].replace(/\.git$/, "")}`;
+  m = url.match(/^(?:ssh|git):\/\/(?:git@)?([^\/]+)\/(.+)$/);
+  if (m?.[1] && m[2]) return `https://${m[1]}/${m[2].replace(/\.git$/, "")}`;
+  m = url.match(/^https?:\/\/([^\/]+)\/(.+)$/);
+  if (m?.[1] && m[2]) return `https://${m[1]}/${m[2].replace(/\.git$/, "")}`;
+  return null;
+}
+
+function toView(c: CommentRow, issuePath = ""): CommentView {
   return {
     id: c.id,
     tag: classifyActor(c.body, c.author_kind),
@@ -45,13 +62,13 @@ function toView(c: CommentRow): CommentView {
     login: c.author,
     avatar: "",
     created_at: c.created_at,
-    body_html: renderMarkdown(c.body),
+    body_html: renderMarkdown(c.body, "", issuePath),
     display_name: c.author_display_name ?? null,
   };
 }
 
-export async function viewsFromComments(rows: CommentRow[]): Promise<CommentView[]> {
-  const views = rows.map((r) => toView(r));
+export async function viewsFromComments(rows: CommentRow[], issuePath = ""): Promise<CommentView[]> {
+  const views = rows.map((r) => toView(r, issuePath));
   await hydrateReactions(views);
   return views;
 }
@@ -105,12 +122,13 @@ export async function buildIssueThread(
   const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE));
   const currentPage = totalPages;
   const { rows } = await listCommentsPage(issue.id, currentPage, PAGE_SIZE);
-  const views = await viewsFromComments(rows);
+  const issuePath = `${upstreamRefBase(project) ?? `/${owner}/${repo}`}/issues/${issue.number}`;
+  const views = await viewsFromComments(rows, issuePath);
   const hasOlder = currentPage > 1;
   const displayViews = orderForDisplay(views, cfg.commentSort);
   const payload = payloadFromComments(issue, displayViews, currentPage, hasOlder, cfg.commentSort);
 
-  const descriptionHtml = renderMarkdown(issue.body);
+  const descriptionHtml = renderMarkdown(issue.body, "", issuePath);
   const descriptionCollapsed = issue.body.length > 1200;
   const upstreamWebUrl = (() => {
     const clone = getDefaultUpstreamUrl(project);
@@ -187,7 +205,7 @@ export async function fetchIssuePage(
   const issue = await getIssueWithMeta(project.id, number);
   if (!issue) throw new StoreError(404, `#${number} 不存在`);
   const { rows, page: clamped } = await listCommentsPage(issue.id, page, PAGE_SIZE);
-  const views = await viewsFromComments(rows);
+  const views = await viewsFromComments(rows, `${upstreamRefBase(project) ?? `/${owner}/${repo}`}/issues/${issue.number}`);
   return { issue, views, currentPage: clamped, hasOlder: clamped > 1 };
 }
 
@@ -202,7 +220,7 @@ export async function fetchIssueSince(
   const issue = await getIssueWithMeta(project.id, number);
   if (!issue) throw new StoreError(404, `#${number} 不存在`);
   const rows = await listCommentsSince(issue.id, sinceISO);
-  return await viewsFromComments(rows);
+  return await viewsFromComments(rows, `${upstreamRefBase(project) ?? `/${owner}/${repo}`}/issues/${issue.number}`);
 }
 
 export function safeJsonEmbed(v: unknown): string {