ework-web 0.10.21 → 0.10.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.21",
+  "version": "0.10.23",
   "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/coordination.ts

@@ -68,3 +68,38 @@ export async function listAllDaemons(): Promise<DaemonDetail[]> {
     return [];
   }
 }
+
+export interface SessionDaemonInfo {
+  daemonId: number;
+  displayName: string;
+  endpoint: string;
+}
+
+export async function getSessionDaemonMap(): Promise<Map<string, SessionDaemonInfo>> {
+  try {
+    const rows = await getDB().all<{
+      opencode_session_id: string;
+      daemon_id: number;
+      display_name: string | null;
+      internal_endpoint: string | null;
+    }>(
+      `SELECT s.opencode_session_id, d.id AS daemon_id, d.display_name, d.internal_endpoint
+       FROM {{d_op_sessions}} s
+       JOIN {{d_issues}} i ON i.uid = s.issue_id
+       LEFT JOIN {{d_daemons}} d ON d.id = i.owner_daemon_id
+       WHERE s.opencode_session_id IS NOT NULL AND s.opencode_session_id != ''`,
+    );
+    const map = new Map<string, SessionDaemonInfo>();
+    for (const r of rows) {
+      map.set(r.opencode_session_id, {
+        daemonId: r.daemon_id,
+        displayName: r.display_name ?? `daemon-${r.daemon_id}`,
+        endpoint: r.internal_endpoint ?? "",
+      });
+    }
+    return map;
+  } catch (e) {
+    log.info(`coordination: session-daemon map failed (${e instanceof Error ? e.message : String(e)})`);
+    return new Map();
+  }
+}

package/src/db.ts

@@ -375,7 +375,8 @@ class MysqlDriver implements AsyncDatabase {
         try {
           await pool.query(stmt);
         } catch (e) {
-          if (e && typeof e === "object" && "errno" in e && (e as { errno: number }).errno === 1061) continue;
+          const errno = (e as { errno?: number }).errno;
+          if (errno === 1061 || errno === 30000) continue;
           throw e;
         }
       }
@@ -456,10 +457,17 @@ export function getDB(): AsyncDatabase {
 export async function getConfigAll(): Promise<Record<string, string>> {
   try {
     const driver = getDB();
-    const rows = await driver.all<{ akey: string; value: string }>("SELECT akey, value FROM {{config}}");
-    const out: Record<string, string> = {};
-    for (const r of rows) out[r.akey] = r.value;
-    return out;
+    try {
+      const rows = await driver.all<{ akey: string; value: string }>("SELECT akey, value FROM {{config}}");
+      const out: Record<string, string> = {};
+      for (const r of rows) out[r.akey] = r.value;
+      return out;
+    } catch {
+      const rows = await driver.all<{ key: string; value: string }>("SELECT key, value FROM {{config}}");
+      const out: Record<string, string> = {};
+      for (const r of rows) out[r.key] = r.value;
+      return out;
+    }
   } catch {
     return {};
   }
@@ -467,13 +475,25 @@ export async function getConfigAll(): Promise<Record<string, string>> {
 
 export async function setConfig(key: string, value: string): Promise<void> {
   const now = new Date().toISOString();
-  await getDB().run(
-    "INSERT INTO {{config}} (akey, value, updated_at) VALUES (?, ?, ?) " +
-      "ON CONFLICT(akey) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at",
-    [key, value, now]
-  );
+  try {
+    await getDB().run(
+      "INSERT INTO {{config}} (akey, value, updated_at) VALUES (?, ?, ?) " +
+        "ON CONFLICT(akey) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at",
+      [key, value, now]
+    );
+  } catch {
+    await getDB().run(
+      "INSERT INTO {{config}} (key, value, updated_at) VALUES (?, ?, ?) " +
+        "ON CONFLICT(key) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at",
+      [key, value, now]
+    );
+  }
 }
 
 export async function deleteConfig(key: string): Promise<void> {
-  await getDB().run("DELETE FROM {{config}} WHERE akey = ?", [key]);
+  try {
+    await getDB().run("DELETE FROM {{config}} WHERE akey = ?", [key]);
+  } catch {
+    await getDB().run("DELETE FROM {{config}} WHERE key = ?", [key]);
+  }
 }

package/src/index.ts

@@ -6,7 +6,7 @@ import { homedir } from "os";
 import { loadConfig, DB_OVERRIDABLE, parseOverride, resolveTtsBackend } from "./config";
 import type { Config } from "./config";
 import { setConfig, initDB, getDB } from "./db";
-import { getActiveDaemons, listAllDaemons } from "./coordination";
+import { getActiveDaemons, listAllDaemons, getSessionDaemonMap } from "./coordination";
 import { testMysqlConnection, migrateSqliteToMysql, writeMysqlEnv, migrateMysqlToSqlite, writeSqliteEnv, migrateDaemonSqliteToMysql, generateMysqlDDL } from "./db-admin";
 import type { MysqlTargetOpts } from "./db-admin";
 import { checkAuth, makeAuthCookieHeader, clearAuthCookieHeader, loginHTML, sanitizeNext, ensureBootstrapAdmin, ensureBootstrapSystem, isReservedSystemLogin } from "./auth";
@@ -610,7 +610,8 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
   if (url.pathname.match(SESSIONS_RE)) {
     const q = url.searchParams.get("q")?.trim() ?? "";
     try {
-      const { html: body } = await buildSessionList(opencode, q);
+      const daemonMap = await getSessionDaemonMap();
+      const { html: body } = await buildSessionList(opencode, q, daemonMap);
       return html(body);
     } catch (e) {
       return html(errorPage("加载失败", errMsg(e)), e instanceof OpencodeError ? e.status : 502);

package/src/opencode.ts

@@ -29,6 +29,7 @@ export interface SessionListItem {
   directory?: string;
   peakTokens?: number;
   msgCount?: number;
+  daemon?: { displayName: string; endpoint: string };
 }
 
 export interface SessionInfo {

package/src/views/sessionLog.ts

@@ -1,4 +1,5 @@
 import type { OpencodeClientInterface, SessionListItem, SessionExport, SessionMessage, MessagePart, ToolState } from "../opencode";
+import type { SessionDaemonInfo } from "../coordination";
 import { THEME_CSS, escapeHtml, escapeAttr, tabNavHTML } from "../render/layout";
 import { renderMarkdown, linkifySessionIDs, linkifyAbsPaths } from "../render/markdown";
 import { BUILD_ID } from "../build";
@@ -8,8 +9,19 @@ import { homedir } from "os";
 
 const LIST_LIMIT = 100;
 
-export async function buildSessionList(client: OpencodeClientInterface, q: string): Promise<{ html: string }> {
+export async function buildSessionList(
+  client: OpencodeClientInterface,
+  q: string,
+  daemonMap?: Map<string, SessionDaemonInfo>,
+): Promise<{ html: string }> {
   let sessions = await client.listSessions(LIST_LIMIT);
+  if (daemonMap) {
+    sessions = sessions.map((s) => {
+      const di = daemonMap.get(s.id);
+      if (di) return { ...s, daemon: { displayName: di.displayName, endpoint: di.endpoint } };
+      return s;
+    });
+  }
   const needle = q.trim().toLowerCase();
   if (needle) {
     sessions = sessions.filter((s) => s.title.toLowerCase().includes(needle) || s.id.toLowerCase().includes(needle));
@@ -32,6 +44,7 @@ export async function buildSessionList(client: OpencodeClientInterface, q: strin
 .srow .st{font-weight:600;color:var(--text);font-size:15px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .srow .sm{display:flex;gap:1rem;color:var(--text-muted);font-size:12px;margin-top:.25rem;flex-wrap:wrap}
 .srow .sid{font-family:ui-monospace,SFMono-Regular,Menlo,monospace}
+.sd-badge{background:var(--bg);border:1px solid var(--border);border-radius:4px;padding:0 .3rem;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:11px}
 .empty{padding:2rem;text-align:center;color:var(--text-muted)}
 </style></head><body>
 <header class="nav" style="display:flex;align-items:center;gap:.5rem;padding:.55rem 1rem;background:var(--header-bg);color:var(--header-text);font-size:13px"><a href="/" style="color:var(--header-text)">🏠 ework-web</a><span style="opacity:.8"> · OpenCode 会话 ${sessions.length}</span></header>
@@ -50,6 +63,7 @@ function sessionRow(s: SessionListItem): string {
   const badges = [
     s.peakTokens ? `<span>🧮 峰值 ${kfmt(s.peakTokens)}</span>` : "",
     s.msgCount ? `<span>💬 ${s.msgCount}</span>` : "",
+    s.daemon ? `<span class="sd-badge" title="${escapeAttr(s.daemon.endpoint)}">🖥️ ${escapeHtml(s.daemon.displayName)} ${escapeHtml(s.daemon.endpoint)}</span>` : "",
   ].join("");
   return `<a class="srow" href="${escapeAttr(href)}">
   <div class="st">${escapeHtml(s.title)}</div>