ework-web 0.10.116 → 0.10.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.116",
+  "version": "0.10.118",
   "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/render/layout.ts

@@ -246,7 +246,7 @@ export function renderLayout(props: LayoutProps, inner: string, initialItems: st
   <span style="opacity:.5">/</span>
   <a href="${escapeAttr(repoIssuesHref)}" style="color:var(--header-text)">${escapeHtml(props.repoPath)}</a>
   <span class="num">#${props.issueNumber}</span>
-  ${props.upstreamUrl ? `<a href="${escapeAttr(props.upstreamUrl)}" target="_blank" rel="noopener" title="upstream" style="color:var(--header-text);text-decoration:none;font-size:.85em">↗</a>` : ""}
+  ${props.upstreamUrl ? `<a href="${escapeAttr(props.upstreamUrl)}" target="_blank" rel="noopener" title="跳转到上游项目" style="color:var(--header-text);text-decoration:none;font-size:.85em">↗</a>` : ""}
 </header>
 <div class="meta-bar">
   <h1>${escapeHtml(props.issueTitle)}</h1>
@@ -264,7 +264,7 @@ export function renderLayout(props: LayoutProps, inner: string, initialItems: st
     }).join("")}</span>` : ""}
     ${(labelsHtml || labelPickerBtn) ? `<span class="label-group">${labelsHtml}${labelPickerBtn}</span>` : ""}
     <span class="count" id="count">…</span>
-    ${props.upstreamWebUrl ? `<a class="upstream-link" href="${escapeAttr(props.upstreamWebUrl)}" target="_blank" rel="noopener noreferrer" title="跳转到上游仓库">🔗 查看上游</a>` : ""}
+    ${props.upstreamWebUrl ? `<a class="upstream-link" href="${escapeAttr(props.upstreamWebUrl)}" target="_blank" rel="noopener noreferrer" title="跳转到上游 issue">🔗 查看上游</a>` : ""}
   </div>
 </div>
 ${props.descriptionHtml.trim() ? `<div class="desc-wrap">

package/src/store.ts

@@ -451,6 +451,9 @@ export async function listAllIssues(opts: ListIssuesOpts = {}): Promise<IssueWit
 }
 
 export interface CreateIssueOpts {
+  /** Preferred local number (upstream imports keep local==upstream). Falls
+   *  back to autoincrement when the number is taken. */
+  number?: number;
   createdAt?: string;
   updatedAt?: string;
   state?: "open" | "closed";
@@ -484,9 +487,15 @@ export async function createIssue(
   const state: "open" | "closed" = opts.state ?? "open";
   const closedAt = state === "closed" ? isoOr(opts.closedAt ?? undefined, updatedAt) : null;
   return await getDB().transaction(async () => {
-    const next = (await getDB().get<{ n: number }>(
-      "SELECT COALESCE(MAX(number), 0) + 1 AS n FROM {{issues}} WHERE project_id = ?", [projectId]
-    ))!;
+    const want = opts.number && opts.number > 0 ? opts.number : null;
+    const taken = want
+      ? await getDB().get<{ id: number }>("SELECT id FROM {{issues}} WHERE project_id = ? AND number = ?", [projectId, want])
+      : undefined;
+    const next = want && !taken
+      ? { n: want }
+      : (await getDB().get<{ n: number }>(
+          "SELECT COALESCE(MAX(number), 0) + 1 AS n FROM {{issues}} WHERE project_id = ?", [projectId]
+        ))!;
     const info = await getDB().run(
       "INSERT INTO {{issues}} (project_id, number, title, body, state, author, created_at, updated_at, closed_at, model, runtime, upstream_issue_number) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
       [projectId, next.n, title, body, state, author, createdAt, updatedAt, closedAt, opts.model ?? "", opts.runtime ?? "", opts.upstreamIssueNumber ?? null]

package/src/upstream-sync.ts

@@ -139,6 +139,7 @@ export class UpstreamSync {
         updatedAt: gi.updated_at,
         state: gi.state === "closed" ? "closed" : "open",
         upstreamIssueNumber: gi.number,
+        number: gi.number,
       }
     );
     // PRs the sandbox agent opens itself carry the ework-agent-pr marker;

package/src/views/issueThread.ts

@@ -21,7 +21,6 @@ import {
   type ProjectRow,
 } from "../store";
 import { getConfigAll } from "../db";
-import { webUrlFromClone } from "./projectUpstreams";
 
 export const PAGE_SIZE = 30;
 
@@ -134,10 +133,14 @@ export async function buildIssueThread(
   const payload = payloadFromComments(issue, displayViews, currentPage, hasOlder, cfg.commentSort);
   const descriptionHtml = renderMarkdown(issue.body, "", issuePath);
   const descriptionCollapsed = issue.body.length > 1200;
+  // 🔗 查看上游 points at the mapped upstream ISSUE (falling back to the
+  // repo root when this issue has no upstream mapping). The header ↗ is the
+  // project-level jump (see upstreamUrl below).
   const upstreamWebUrl = (() => {
-    const clone = getDefaultUpstreamUrl(project);
-    if (!clone) return null;
-    return webUrlFromClone(clone);
+    const base = upstreamRefBase(project);
+    if (!base) return null;
+    if (issue.upstream_issue_number) return `${base}/issues/${issue.upstream_issue_number}`;
+    return base;
   })();
   const labels = await listLabelsForIssue(issue.id);
   const viewerUser = viewerLogin ? await getUserByLogin(viewerLogin) : null;
@@ -192,9 +195,7 @@ export async function buildIssueThread(
     {
       title: `${issue.title} · ${owner}/${repo}#${number}`,
       issueTitle: issue.title,
-      upstreamUrl: issue.upstream_issue_number && upstreamRefBase(project)
-        ? `${upstreamRefBase(project)}/issues/${issue.upstream_issue_number}`
-        : undefined,
+      upstreamUrl: upstreamRefBase(project) ?? undefined,
       repoPath: `${owner}/${repo}`,
       issueNumber: number,
       state: issue.state,

package/src/views/issues.ts

@@ -21,7 +21,7 @@ function issueRow(it: IssueWithMeta, q: string, state: string, labels: LabelRow[
   const modelChip = it.model ? ` · <span class="row-model" title="模型">${escapeHtml(it.model)}</span>` : "";
   return `<a class="row" href="${escapeAttr(href)}">
     <div class="row-title">${title}${chips}</div>
-    <div class="row-meta">${projectStr} · #${it.number} · 💬 ${it.comment_count} · ${relTime(it.updated_at)}${aiBadge ? ` · ${aiBadge}` : ""}${modelChip}</div>
+    <div class="row-meta">${projectStr} · #${it.number}${it.author ? ` · <span class="row-author" title="创建者">👤 ${escapeHtml(it.author)}</span>` : ""} · 💬 ${it.comment_count} · ${relTime(it.updated_at)}${aiBadge ? ` · ${aiBadge}` : ""}${modelChip}</div>
   </a>`;
 }