ework-web 0.10.95 → 0.10.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.95",
+  "version": "0.10.97",
   "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/store.ts

@@ -76,6 +76,7 @@ export interface IssueRow {
   ai_status: string;
   model: string;
   runtime: string;
+  upstream_issue_number: number | null;
 }
 
 export interface IssueWithMeta extends IssueRow {

package/src/upstream-sync.ts

@@ -23,6 +23,7 @@ interface GiteaIssue {
   user: { login: string } | null;
   created_at: string;
   updated_at: string;
+  pull_request?: unknown;
 }
 
 interface GiteaComment {
@@ -71,7 +72,11 @@ export class UpstreamSync {
   }
 
   private api(path: string): string {
-    return `${this.sync.base_url}/api/v1/repos/${this.sync.upstream_owner}/${this.sync.upstream_repo}${path}`;
+    const base = /github\.com$/i.test(new URL(this.sync.base_url).host)
+        ? "https://api.github.com"
+        : this.sync.base_url;
+      const prefix = base === "https://api.github.com" ? "" : "/api/v1";
+      return `${base}${prefix}/repos/${this.sync.upstream_owner}/${this.sync.upstream_repo}${path}`;
   }
 
   private async fetchJson<T>(path: string): Promise<T | null> {
@@ -85,6 +90,14 @@ export class UpstreamSync {
   // comments silently so the AI isn't woken by a flood of historical entries.
   // Live polls (cursor set) emit webhooks so new upstream activity reaches
   // the daemon exactly like locally-created content.
+  private get isGithub(): boolean {
+    try {
+      return /github\.com$/i.test(new URL(this.sync.base_url).host);
+    } catch {
+      return false;
+    }
+  }
+
   private get isBackfill(): boolean {
     return this.sync.issue_cursor === null;
   }
@@ -92,7 +105,7 @@ export class UpstreamSync {
   private async importIssue(gi: GiteaIssue, emit: boolean): Promise<void> {
     await createIssue(
       this.project.id,
-      gi.title || `#${gi.number}`,
+      (gi.pull_request ? "[PR] " : "") + (gi.title || `#${gi.number}`),
       gi.body ?? "",
       gi.user?.login ?? "upstream",
       {
@@ -119,13 +132,17 @@ export class UpstreamSync {
   }
 
   private async importIssueComments(gi: GiteaIssue, emit: boolean): Promise<number> {
-    const comments = await this.fetchJson<GiteaComment[]>(`/issues/${gi.number}/comments?limit=50&order=asc`);
+    const comments = await this.fetchJson<GiteaComment[]>(this.isGithub
+      ? `/issues/${gi.number}/comments?per_page=50`
+      : `/issues/${gi.number}/comments?limit=50&order=asc`);
     if (!comments) return 0;
     const local = await getIssueByUpstreamNumber(this.project.id, gi.number);
     if (!local) return 0;
     let n = 0;
     for (const gc of comments) {
       if (await getCommentByUpstreamId(gc.id)) continue;
+      // write-back comments carry this marker; importing them would duplicate locally
+      if ((gc.body ?? "").includes("<!-- ework-mirror -->")) continue;
       const row = await postComment(local.id, gc.body ?? "", gc.user?.login ?? "upstream", {
         createdAt: gc.created_at,
         updatedAt: gc.updated_at,
@@ -142,7 +159,9 @@ export class UpstreamSync {
     let cursor: string | null = null;
     for (let page = 1; page <= 20; page++) {
       const issues = await this.fetchJson<GiteaIssue[]>(
-        `/issues?state=open&type=issues&limit=50&page=${page}&sort=created&order=asc`
+        this.isGithub
+          ? `/issues?state=open&per_page=50&page=${page}&sort=created&direction=asc`
+          : `/issues?state=open&type=issues&limit=50&page=${page}&sort=created&order=asc`
       );
       if (!issues || issues.length === 0) break;
       for (const gi of issues) {
@@ -166,7 +185,9 @@ export class UpstreamSync {
   private async liveOnce(): Promise<UpstreamSyncPollResult> {
     const result: UpstreamSyncPollResult = { issuesImported: 0, issuesUpdated: 0, commentsImported: 0 };
     const issues = await this.fetchJson<GiteaIssue[]>(
-      `/issues?state=all&type=issues&limit=30&sort=updated&order=desc`
+      this.isGithub
+      ? `/issues?state=all&per_page=30&sort=updated&direction=desc`
+      : `/issues?state=all&type=issues&limit=30&sort=updated&order=desc`
     );
     let issueCursor = this.sync.issue_cursor;
     if (issues) {
@@ -186,13 +207,16 @@ export class UpstreamSync {
 
     let commentCursor = this.sync.comment_cursor;
     const comments = await this.fetchJson<GiteaComment[]>(
-      `/issues/comments?limit=50&sort=updated&order=asc${
-        this.sync.comment_cursor ? `&since=${encodeURIComponent(this.sync.comment_cursor)}` : ""
-      }`
+      this.isGithub
+      ? `/issues/comments?per_page=100${this.sync.comment_cursor ? `&since=${encodeURIComponent(this.sync.comment_cursor)}` : ""}`
+      : `/issues/comments?limit=50&sort=updated&order=asc${
+          this.sync.comment_cursor ? `&since=${encodeURIComponent(this.sync.comment_cursor)}` : ""
+        }`
     );
     if (comments) {
       for (const gc of comments) {
         if (await getCommentByUpstreamId(gc.id)) continue;
+        if ((gc.body ?? "").includes("<!-- ework-mirror -->")) continue;
         const upstreamNumber = upstreamIssueNumberFromComment(gc);
         if (!upstreamNumber) continue;
         const local = await getIssueByUpstreamNumber(this.project.id, upstreamNumber);

package/src/views/issueThread.ts

@@ -17,6 +17,7 @@ import {
   listCachedModels,
   type CommentRow,
   type IssueWithMeta,
+  type ProjectRow,
 } from "../store";
 import { webUrlFromClone } from "./projectUpstreams";
 
@@ -37,6 +38,22 @@ export interface IssueThreadPayload {
   comments: 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,
@@ -105,7 +122,7 @@ 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 issuePath = `/${owner}/${repo}/issues/${issue.number}`;
+  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);
@@ -188,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, `/${owner}/${repo}/issues/${issue.number}`);
+  const views = await viewsFromComments(rows, `${upstreamRefBase(project) ?? `/${owner}/${repo}`}/issues/${issue.number}`);
   return { issue, views, currentPage: clamped, hasOlder: clamped > 1 };
 }
 
@@ -203,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, `/${owner}/${repo}/issues/${issue.number}`);
+  return await viewsFromComments(rows, `${upstreamRefBase(project) ?? `/${owner}/${repo}`}/issues/${issue.number}`);
 }
 
 export function safeJsonEmbed(v: unknown): string {

package/src/webhooks.ts

@@ -277,6 +277,7 @@ interface PayloadIssue {
   url: string;
   html_url: string;
   number: number;
+  upstream_issue_number?: number | null;
   title: string;
   body: string;
   labels: PayloadLabel[];
@@ -429,6 +430,7 @@ function buildIssue(
     url: `${origin}/api/v1/repos/${encodeURIComponent(project.owner)}/${encodeURIComponent(project.name)}/issues/${issue.number}`,
     html_url: issueUrl,
     number: issue.number,
+    upstream_issue_number: issue.upstream_issue_number ?? null,
     title: issue.title,
     body: issue.body ?? "",
     labels,