ework-web 0.10.102 → 0.10.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.102",
+  "version": "0.10.104",
   "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

@@ -95,6 +95,7 @@ export interface CommentRow {
   author_kind?: UserKind;
   author_display_name?: string | null;
   model?: string;
+  upstream_comment_id?: number | null;
 }
 
 export interface LabelRow {
@@ -627,6 +628,20 @@ export async function getIssueByUpstreamNumber(projectId: number, upstreamNumber
   );
 }
 
+export async function linkIssueToUpstream(issueId: number, upstreamNumber: number): Promise<boolean> {
+  try {
+    const res = await getDB().run(
+      "UPDATE {{issues}} SET upstream_issue_number = ?, updated_at = ? WHERE id = ? AND upstream_issue_number IS NULL",
+      [upstreamNumber, now(), issueId]
+    );
+    return res.changes > 0;
+  } catch {
+    // Unique index (project_id, upstream_issue_number): another row already
+    // holds this mapping — leave it alone, the existing winner stays linked.
+    return false;
+  }
+}
+
 export async function getCommentByUpstreamId(upstreamCommentId: number): Promise<CommentRow | null> {
   return await getDB().get<CommentRow>(
     "SELECT * FROM {{comments}} WHERE upstream_comment_id = ?",

package/src/upstream-sync.ts

@@ -3,7 +3,9 @@ import {
   type ProjectRow,
   type IssueRow,
   getProjectById,
+  getIssue,
   getIssueByUpstreamNumber,
+  linkIssueToUpstream,
   getCommentByUpstreamId,
   createIssue,
   ensureUser,
@@ -110,6 +112,22 @@ export class UpstreamSync {
   }
 
   private async importIssue(gi: GiteaIssue, emit: boolean): Promise<void> {
+    const body = gi.body ?? "";
+    // Issues ework-mirror created upstream reference their origin issue by
+    // number in the footer. Linking instead of importing prevents the echo
+    // loop (local → mirror → GitHub → poll → twin) while keeping comment and
+    // state sync flowing to the original.
+    const mirrored = body.includes("<!-- ework-mirror -->")
+      ? body.match(/Mirrored from ework issue #(\d+)/)
+      : null;
+    if (mirrored?.[1]) {
+      const origin = await getIssue(this.project.id, Number(mirrored[1]));
+      if (origin) {
+        await linkIssueToUpstream(origin.id, gi.number);
+        return;
+      }
+    }
+    if (body.includes("<!-- ework-mirror -->")) return;
     await ensureUser(gi.user?.login ?? "upstream", fromGithubBot(gi.user?.login) ? "bot" : "human");
     await createIssue(
       this.project.id,

package/src/views/projectUpstreams.ts

@@ -82,7 +82,7 @@ function syncCardHtml(project: ProjectRow, sync: UpstreamSyncRow | null): string
 ${statusHtml}
 <div class="form-grid">
 <div><label for="s-base">上游地址（Gitea 根地址，如 http://host:3000）</label>
-<input id="s-base" name="base_url" type="url" placeholder="http://192.168.10.96:3300" value="${escapeAttr(baseUrl)}" required></div>
+<input id="s-base" name="base_url" type="url" placeholder="http://192.168.1.100:3300" value="${escapeAttr(baseUrl)}" required></div>
 <div><label for="s-owner">上游 owner</label>
 <input id="s-owner" name="upstream_owner" value="${escapeAttr(sync?.upstream_owner ?? project.owner)}" required></div>
 <div><label for="s-repo">上游 repo</label>

package/src/webhooks.ts

@@ -307,6 +307,9 @@ interface PayloadComment {
   updated_at: string;
   user: PayloadUser;
   author_kind?: string;
+  /** Set when this comment was imported from an upstream tracker — receivers
+   * must skip echoing it back (defense beyond the body marker). */
+  upstream_comment_id?: number | null;
 }
 
 interface IssueEventPayload {
@@ -467,6 +470,7 @@ function buildComment(
     body: comment.body,
     created_at: comment.created_at,
     updated_at: comment.updated_at,
+    upstream_comment_id: comment.upstream_comment_id ?? null,
     user: buildUser(comment.author, origin),
   };
 }