ework-web 0.10.32 → 0.10.33

package/package.json

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

@@ -642,11 +642,31 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
     if (!daemonEp && daemonIdParam) {
       const id = Number(daemonIdParam);
       if (Number.isFinite(id) && id > 0) {
-        const ep = await resolveDaemonEndpoint(id);
+        const sessionMap = await getSessionDaemonMap();
+        const mapped = sessionMap.get(sid);
+        const effectiveId = mapped && mapped.daemonId !== id ? mapped.daemonId : id;
+        if (mapped && mapped.daemonId !== id) {
+          log.info(`session ${sid}: URL daemon_id=${id} but DB says daemon ${mapped.daemonId}, redirecting`);
+        }
+        const ep = await resolveDaemonEndpoint(effectiveId);
         if (ep) {
           const client = new RemoteOpencodeClient(ep);
-          const { html: body } = await buildSessionView(client, sid, desc, cfg.collapseLines, limit, all);
-          return html(body);
+          try {
+            const { html: body } = await buildSessionView(client, sid, desc, cfg.collapseLines, limit, all);
+            return html(body);
+          } catch (e) {
+            const status = e instanceof OpencodeError ? e.status : 500;
+            if (status === 404) {
+              return html(errorPage(
+                "会话不在该 daemon 上",
+                `会话 ${sid} 在 daemon ${effectiveId} (${ep}) 上找不到 (HTTP ${status})。\n\n` +
+                `URL 指定的 daemon_id=${id}，数据库映射的 daemon=${mapped?.daemonId ?? "无"}。\n` +
+                `可能原因：daemon 重启后 ID 变化，或会话在另一个 daemon 上创建。\n\n` +
+                `可用 daemon 列表见 /sessions 页面。`,
+              ), 404);
+            }
+            throw e;
+          }
         }
       }
     }
@@ -682,7 +702,9 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
         if (ep) daemonParam = ep;
       }
     }
-    if (daemonParam && !isLocalhost(daemonParam)) {
+    // daemon_id explicit → always browse via daemon API (multi-daemon localhost setup would 404 on local FS)
+    const daemonIdExplicit = url.searchParams.has("daemon_id");
+    if (daemonParam && (!isLocalhost(daemonParam) || daemonIdExplicit)) {
       try {
         const mode = url.searchParams.get("mode") ?? "tail";
         const order = url.searchParams.get("order") ?? "desc";

package/src/views/issueList.ts

@@ -6,7 +6,7 @@ export const LIST_PAGE_SIZE = 50;
 
 function labelChip(label: LabelRow, owner: string, repo: string, state: string): string {
   const href = `/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues?state=${state}&label=${encodeURIComponent(label.name)}`;
-  return `<a class="issue-label" href="${escapeAttr(href)}" style="background:${escapeAttr(label.color)}" title="${escapeAttr(label.description ?? "")}">${escapeHtml(label.name)}</a>`;
+  return `<a class="issue-label" href="${escapeAttr(href)}" style="--lc:${escapeAttr(label.color)}" title="${escapeAttr(label.description ?? "")}">${escapeHtml(label.name)}</a>`;
 }
 
 function issueRow(
@@ -78,9 +78,10 @@ export async function buildIssueList(
 .row-title{font-weight:500;overflow-wrap:anywhere}
 .row-meta{color:var(--text-muted);font-size:12px;margin-top:.2rem}
 .empty{color:var(--text-muted);text-align:center;padding:2rem;font-size:13px}
-.row-labels{display:inline;gap:.2rem;margin-left:.4rem}
-.issue-label{display:inline-block;padding:0 5px;border-radius:6px;font-size:10px;font-weight:600;color:#fff;text-decoration:none;line-height:16px;white-space:nowrap;vertical-align:1px}
-.issue-label:hover{opacity:.85;text-decoration:none}
+  .row-labels{display:inline;margin-left:.3rem}
+  .issue-label{display:inline;color:var(--text-muted);font-size:11px;text-decoration:none;margin-left:.35rem;white-space:nowrap}
+  .issue-label::before{content:"";display:inline-block;width:7px;height:7px;border-radius:50%;background:var(--lc);margin-right:2px;vertical-align:middle}
+  .issue-label:hover{color:var(--text);text-decoration:underline}
 .label-filter{font-size:13px;color:var(--text-muted);margin-bottom:.4rem}
 .label-filter strong{color:var(--text)}
 .label-clear{color:var(--text-muted);text-decoration:none;margin-left:.3rem}

package/src/views/issues.ts

@@ -6,7 +6,7 @@ export const FEED_PAGE_SIZE = 50;
 
 function labelChip(label: LabelRow, owner: string, repo: string, state: string): string {
   const href = `/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues?state=${state}&label=${encodeURIComponent(label.name)}`;
-  return `<a class="issue-label" href="${escapeAttr(href)}" style="background:${escapeAttr(label.color)}" title="${escapeAttr(label.description ?? "")}">${escapeHtml(label.name)}</a>`;
+  return `<a class="issue-label" href="${escapeAttr(href)}" style="--lc:${escapeAttr(label.color)}" title="${escapeAttr(label.description ?? "")}">${escapeHtml(label.name)}</a>`;
 }
 
 function issueRow(it: IssueWithMeta, q: string, state: string, labels: LabelRow[]): string {
@@ -59,9 +59,10 @@ export async function buildIssuesFeed(
 .row-title{font-weight:500;overflow-wrap:anywhere}
 .row-meta{color:var(--text-muted);font-size:12px;margin-top:.2rem}
 .empty{color:var(--text-muted);text-align:center;padding:2rem;font-size:13px}
-.row-labels{display:inline;gap:.2rem;margin-left:.4rem}
-.issue-label{display:inline-block;padding:0 5px;border-radius:6px;font-size:10px;font-weight:600;color:#fff;text-decoration:none;line-height:16px;white-space:nowrap;vertical-align:1px}
-.issue-label:hover{opacity:.85;text-decoration:none}
+  .row-labels{display:inline;margin-left:.3rem}
+  .issue-label{display:inline;color:var(--text-muted);font-size:11px;text-decoration:none;margin-left:.35rem;white-space:nowrap}
+  .issue-label::before{content:"";display:inline-block;width:7px;height:7px;border-radius:50%;background:var(--lc);margin-right:2px;vertical-align:middle}
+  .issue-label:hover{color:var(--text);text-decoration:underline}
 .label-filter{font-size:13px;color:var(--text-muted);margin-bottom:.4rem}
 .label-filter strong{color:var(--text)}
 </style></head><body>