ework-web 0.10.9 → 0.10.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-web",
-  "version": "0.10.9",
+  "version": "0.10.11",
   "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/daemon-deploy.ts

@@ -121,7 +121,7 @@ function buildSetupScript(envBlock: string, daemonPort: number, mysqlHostRaw: st
     `sleep 3`,
     `STATUS=$(curl -sf --max-time 5 http://127.0.0.1:${String(daemonPort)}/api/status 2>/dev/null) || { echo "DAEMON_FAILED: status check failed"; echo "=== daemon log (last 20 lines) ==="; tail -20 ~/.local/share/ework-aio/run/daemon.log 2>/dev/null || echo "(no log)"; exit 1; }`,
     `echo "$STATUS"`,
-    `echo "$STATUS" | grep -q '"driver":"mysql"' || { echo "DAEMON_FAILED: daemon is NOT on MySQL (still SQLite?)"; tail -20 ~/.local/share/ework-aio/run/daemon.log 2>/dev/null; exit 1; }`,
+    `echo "$STATUS" | grep -Eq '"driver" *: *"mysql"' || { echo "DAEMON_FAILED: daemon is NOT on MySQL (still SQLite?)"; tail -20 ~/.local/share/ework-aio/run/daemon.log 2>/dev/null; exit 1; }`,
     `echo "=== hostname: $(hostname) ==="`,
     `echo DAEMON_STARTED`,
   ].join("\n");

package/src/index.ts

@@ -1004,6 +1004,41 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
     });
   }
 
+  if (url.pathname === "/api/router/daemons" && req.method === "GET") {
+    if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
+    try {
+      const routerUrl = cfg.daemonWebhookUrl.replace(/\/$/, "");
+      const res = await fetch(`${routerUrl}/api/daemons`, { signal: AbortSignal.timeout(5000) });
+      const data = await res.json();
+      return json(data);
+    } catch (e) {
+      return json({ daemons: [], error: errMsg(e) });
+    }
+  }
+
+  if (url.pathname === "/api/router/strategy") {
+    if (!ctx.user || ctx.user.is_admin !== 1) return json({ error: "admin required" }, 403);
+    const routerUrl = cfg.daemonWebhookUrl.replace(/\/$/, "");
+    try {
+      if (req.method === "GET") {
+        const res = await fetch(`${routerUrl}/api/strategy`, { signal: AbortSignal.timeout(5000) });
+        return json(await res.json());
+      }
+      if (req.method === "POST") {
+        const body = await req.text();
+        const res = await fetch(`${routerUrl}/api/strategy`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body,
+          signal: AbortSignal.timeout(5000),
+        });
+        return json(await res.json(), res.ok ? 200 : 400);
+      }
+    } catch (e) {
+      return json({ error: errMsg(e) }, 502);
+    }
+  }
+
   if (url.pathname === "/settings") {
     if (req.method === "GET") {
       return html(buildSettingsPage(cfg, url.searchParams.get("saved") === "1", ctx.user!, await listCachedModels()).html);

package/src/opencode.ts

@@ -84,7 +84,16 @@ export class OpencodeClient {
   private readonly bin: string;
   private readonly dbPath: string;
   private readonly timeoutMs: number;
-  private readonly maxBytes = 50 * 1024 * 1024;
+  private readonly maxBytes = 100 * 1024 * 1024;
+  // exportSession is called on every page view, poll (/since), and load-more
+  // (/batch). For huge sessions (7000+ msgs → 50MB+ JSON) re-running the
+  // opencode export subprocess per request hammers the server. Cache the parsed
+  // result briefly so repeated requests within a viewing session reuse it.
+  // Staleness: a poll misses within CACHE_TTL_MS, so new messages appear with
+  // at most that delay — acceptable for a session viewer (not real-time-critical).
+  private readonly exportCache = new Map<string, { data: SessionExport; expires: number }>();
+  private static readonly CACHE_TTL_MS = 30_000;
+  private static readonly CACHE_MAX = 2;
 
   constructor(cfg: Config) {
     this.bin = cfg.opencodeBin;
@@ -142,9 +151,33 @@ export class OpencodeClient {
     if (!/^[A-Za-z0-9_-]+$/.test(id)) {
       throw new OpencodeError(`bad session id: ${id}`, 400);
     }
-    const raw = await this.runJSON(["export", id]);
-    const exp = parseSessionExport(raw);
-    if (!exp) throw new OpencodeError(`malformed export for ${id}`, 502);
+    const now = Date.now();
+    const hit = this.exportCache.get(id);
+    if (hit && hit.expires > now) return hit.data;
+    // Prefer a direct read-only DB pass: no subprocess, no 50MB stdout cap, no
+    // per-poll re-export cost beyond the SQL + JSON.parse. Fall back to the
+    // `opencode export` CLI if the DB path rejects (e.g. schema drift after an
+    // opencode upgrade) so the viewer stays robust.
+    let exp: SessionExport | null = null;
+    try {
+      exp = this.exportSessionFromDB(id);
+    } catch (e) {
+      if (e instanceof OpencodeError && (e.status === 400 || e.status === 404)) throw e;
+    }
+    if (!exp) {
+      const raw = await this.runJSON(["export", id]);
+      exp = parseSessionExport(raw);
+      if (!exp) throw new OpencodeError(`malformed export for ${id}`, 502);
+    }
+    if (this.exportCache.size >= OpencodeClient.CACHE_MAX) {
+      let oldestKey: string | null = null;
+      let oldestExp = Infinity;
+      for (const [k, v] of this.exportCache) {
+        if (v.expires < oldestExp) { oldestExp = v.expires; oldestKey = k; }
+      }
+      if (oldestKey) this.exportCache.delete(oldestKey);
+    }
+    this.exportCache.set(id, { data: exp, expires: now + OpencodeClient.CACHE_TTL_MS });
     return exp;
   }
 
@@ -159,12 +192,6 @@ export class OpencodeClient {
     return stdout;
   }
 
-  // List available models from `opencode models`. Output is plain text — one
-  // `provider/model` per line — with plugin banners (e.g. "[opencode-ework]
-  // registered 5 tools: ...") on stderr. We strip any line that doesn't
-  // match the `provider/model` shape, dedupe, sort. Errors (binary missing,
-  // non-zero exit) return an empty array — the settings UI degrades to a
-  // free-text input.
   async listModels(): Promise<string[]> {
     try {
       const { stdout, code } = await this.run(["models"]);
@@ -189,6 +216,65 @@ export class OpencodeClient {
     }
   }
 
+  // Direct read-only DB pass producing the same SessionExport shape as the CLI,
+  // so the rest of the renderer is unchanged. message.data carries role/agent/
+  // time/tokens; part.data carries {type,text/tool/state}. User messages store
+  // the model as a bare `model` string, assistant messages as `modelID` — accept
+  // either. 404 (no such session) propagates so the caller can return a real
+  // not-found; other query errors bubble up to trigger the CLI fallback.
+  private exportSessionFromDB(id: string): SessionExport {
+    let db: Database;
+    try {
+      db = new Database(this.dbPath, { readonly: true });
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      throw new OpencodeError(`cannot open opencode DB (${this.dbPath}): ${msg}`, 502);
+    }
+    try {
+      const srow = db
+        .prepare("SELECT id, title, directory, version, time_created, time_updated FROM session WHERE id = ?")
+        .get(id) as { id: string; title: string; directory: string; version: string; time_created: number; time_updated: number } | null;
+      if (!srow) throw new OpencodeError(`session not found: ${id}`, 404);
+      const info: SessionInfo = {
+        id: srow.id,
+        title: srow.title || "(untitled)",
+        directory: srow.directory ?? "",
+        version: srow.version ?? "",
+        time: { created: srow.time_created, updated: srow.time_updated },
+      };
+      const mrows = db
+        .prepare("SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created, id")
+        .all(id) as Array<{ id: string; data: string }>;
+      const prows = db
+        .prepare("SELECT message_id, data FROM part WHERE session_id = ? ORDER BY message_id, id")
+        .all(id) as Array<{ message_id: string; data: string }>;
+      const partsByMsg = new Map<string, MessagePart[]>();
+      for (const p of prows) {
+        let pd: unknown;
+        try { pd = JSON.parse(p.data); } catch { continue; }
+        const part = parsePart(pd);
+        if (!part) continue;
+        const arr = partsByMsg.get(p.message_id);
+        if (arr) arr.push(part); else partsByMsg.set(p.message_id, [part]);
+      }
+      const messages: SessionMessage[] = [];
+      for (const m of mrows) {
+        let md: unknown;
+        try { md = JSON.parse(m.data); } catch { continue; }
+        const mi = parseMessageInfoDB(m.id, md);
+        if (!mi) continue;
+        messages.push({ info: mi, parts: partsByMsg.get(m.id) ?? [] });
+      }
+      return { info, messages };
+    } catch (e) {
+      if (e instanceof OpencodeError) throw e;
+      const msg = e instanceof Error ? e.message : String(e);
+      throw new OpencodeError(`session export query failed: ${msg}`, 502);
+    } finally {
+      db.close();
+    }
+  }
+
   // --- subprocess plumbing ---
 
   private async runJSON(args: string[]): Promise<unknown> {
@@ -447,6 +533,26 @@ function parseSessionInfo(v: unknown): SessionInfo | null {
   };
 }
 
+// DB-direct counterpart of parseMessageInfo: message.data stores the model as a
+// bare `model` string (user msgs) or `modelID` string (assistant msgs) — accept
+// either so both roles render their model label correctly.
+function parseMessageInfoDB(id: string, v: unknown): MessageInfo | null {
+  if (!v || typeof v !== "object") return null;
+  const o = v as Record<string, unknown>;
+  const role = typeof o.role === "string" ? o.role : "";
+  if (!role) return null;
+  const timeRaw = o.time && typeof o.time === "object" ? (o.time as Record<string, unknown>) : null;
+  const modelID = typeof o.modelID === "string" ? o.modelID : (typeof o.model === "string" ? o.model : undefined);
+  return {
+    role,
+    id,
+    agent: typeof o.agent === "string" ? o.agent : undefined,
+    modelID,
+    time: timeRaw && typeof timeRaw.created === "number" ? { created: timeRaw.created } : undefined,
+    tokens: parseTokens(o.tokens),
+  };
+}
+
 function parseMessage(v: unknown): SessionMessage | null {
   if (!v || typeof v !== "object") return null;
   const o = v as Record<string, unknown>;

package/src/static/daemon-groups.js

@@ -0,0 +1,100 @@
+(async function() {
+  const tbody = document.getElementById("groups-tbody");
+  const bindingsList = document.getElementById("bindings-list");
+  const strategySelect = document.getElementById("strategy-select");
+  const result = document.getElementById("strategy-result");
+  const saveBtn = document.getElementById("strategy-save");
+  const addBindingBtn = document.getElementById("binding-add");
+
+  let currentStrategy = { strategy: "least-loaded", groupBindings: {}, daemonGroups: {} };
+
+  function showResult(msg, ok) {
+    result.textContent = msg;
+    result.className = "db-result " + (ok ? "db-ok" : "db-err");
+    setTimeout(() => { result.textContent = ""; result.className = "db-result"; }, 3000);
+  }
+
+  async function load() {
+    try {
+      const [daemonsRes, strategyRes] = await Promise.all([
+        fetch("/api/router/daemons").then(r => r.json()),
+        fetch("/api/router/strategy").then(r => r.json()),
+      ]);
+      const daemons = daemonsRes.daemons || [];
+      currentStrategy = strategyRes;
+      strategySelect.value = currentStrategy.strategy || "least-loaded";
+
+      tbody.innerHTML = daemons.map(d => {
+        const groups = (currentStrategy.daemonGroups || {})[d.id] || [];
+        return `<tr>
+          <td>${d.id}</td>
+          <td>${d.displayName || "?"}<br><span style="font-size:11px;color:var(--text-muted)">${d.endpoint}</span></td>
+          <td><span class="pill ${d.status}">${d.status}</span></td>
+          <td><input type="text" data-daemon-id="${d.id}" value="${groups.join(", ")}" placeholder="group-a, group-b" style="width:100%;padding:.25rem .4rem;border:1px solid var(--border);border-radius:4px;background:var(--bg);color:var(--text);font-size:12px"></td>
+        </tr>`;
+      }).join("") || '<tr><td colspan="4" class="daemon-empty">没有已注册的 daemon（节点启动后自动出现）</td></tr>';
+
+      renderBindings();
+    } catch (e) {
+      tbody.innerHTML = '<tr><td colspan="4" class="daemon-empty">无法连接 router — 确认 router 已启动</td></tr>';
+    }
+  }
+
+  function renderBindings() {
+    const bindings = currentStrategy.groupBindings || {};
+    const keys = Object.keys(bindings);
+    bindingsList.innerHTML = keys.length === 0
+      ? '<p class="hint" style="margin:0 0 .5rem">暂无绑定</p>'
+      : keys.map(k => `<div style="display:flex;align-items:center;gap:.5rem;margin:.3rem 0;font-size:13px">
+          <code>${k}</code> → <span style="color:var(--accent)">${bindings[k]}</span>
+          <button type="button" class="secondary" data-binding-key="${k}" style="padding:.2rem .5rem;font-size:11px">删除</button>
+        </div>`).join("");
+
+    bindingsList.querySelectorAll("button[data-binding-key]").forEach(btn => {
+      btn.onclick = () => {
+        delete currentStrategy.groupBindings[btn.dataset.bindingKey];
+        renderBindings();
+      };
+    });
+  }
+
+  addBindingBtn.onclick = () => {
+    const repo = document.getElementById("binding-repo").value.trim();
+    const group = document.getElementById("binding-group").value.trim();
+    if (!repo || !group) return;
+    if (!currentStrategy.groupBindings) currentStrategy.groupBindings = {};
+    currentStrategy.groupBindings[repo] = group;
+    document.getElementById("binding-repo").value = "";
+    document.getElementById("binding-group").value = "";
+    renderBindings();
+  };
+
+  saveBtn.onclick = async () => {
+    currentStrategy.strategy = strategySelect.value;
+    const newGroups = {};
+    tbody.querySelectorAll("input[data-daemon-id]").forEach(input => {
+      const id = parseInt(input.dataset.daemonId, 10);
+      const groups = input.value.split(",").map(s => s.trim()).filter(Boolean);
+      if (groups.length > 0) newGroups[id] = groups;
+    });
+    currentStrategy.daemonGroups = newGroups;
+
+    try {
+      const res = await fetch("/api/router/strategy", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(currentStrategy),
+      });
+      const data = await res.json();
+      if (res.ok) {
+        showResult("✓ 策略已保存", true);
+      } else {
+        showResult("✗ " + (data.error || "保存失败"), false);
+      }
+    } catch (e) {
+      showResult("✗ " + e.message, false);
+    }
+  };
+
+  load();
+})();

package/src/views/settings.ts

@@ -170,6 +170,44 @@ ${modelRefreshForm}
 ${ttsLink}
 ${buildDbSection(viewer)}
 ${buildDaemonSection(viewer)}
+${viewer.is_admin === 1 ? buildGroupsSection() : ""}
 </main></body></html>`;
   return { html };
 }
+
+function buildGroupsSection(): string {
+  return `
+<section class="sg" id="groups-section">
+  <h2>Daemon 分组与路由策略</h2>
+  <p class="hint">配置 daemon 分组和 webhook 派发策略。Router 自动摘除心跳超时的节点（120s）。</p>
+  <div class="sf">
+    <span>路由策略</span>
+    <select id="strategy-select">
+      <option value="least-loaded">least-loaded（负载最低优先）</option>
+      <option value="round-robin">round-robin（轮询）</option>
+      <option value="first-available">first-available（按 ID 顺序）</option>
+      <option value="group">group（按分组路由）</option>
+    </select>
+  </div>
+  <div id="daemon-groups-editor" style="margin-top:.7rem">
+    <table class="daemon-list" id="groups-table">
+      <thead><tr><th>ID</th><th>节点</th><th>状态</th><th>分组</th></tr></thead>
+      <tbody id="groups-tbody"></tbody>
+    </table>
+  </div>
+  <div id="bindings-editor" style="margin-top:.7rem">
+    <h2 style="margin-bottom:.5rem">Repo → 分组绑定</h2>
+    <div id="bindings-list"></div>
+    <div class="db-controls">
+      <input type="text" id="binding-repo" placeholder="owner/repo" style="padding:.35rem .5rem;border:1px solid var(--border);border-radius:6px;background:var(--bg);color:var(--text);font-size:13px;flex:1">
+      <input type="text" id="binding-group" placeholder="group-name" style="padding:.35rem .5rem;border:1px solid var(--border);border-radius:6px;background:var(--bg);color:var(--text);font-size:13px;flex:1">
+      <button type="button" id="binding-add" class="secondary">添加绑定</button>
+    </div>
+  </div>
+  <div class="db-controls" style="margin-top:.7rem">
+    <button type="button" id="strategy-save">保存策略</button>
+  </div>
+  <div class="db-result" id="strategy-result"></div>
+</section>
+<script src="/static/daemon-groups.js"></script>`;
+}