ework-web 0.10.80 → 0.10.82

package/package.json

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

@@ -75,6 +75,30 @@ export interface SessionDaemonInfo {
   endpoint: string;
 }
 
+export interface SessionUidInfo {
+  daemonId: number;
+  opencodeSessionId: string | null;
+}
+
+export async function resolveSessionUid(uid: string): Promise<SessionUidInfo | null> {
+  try {
+    const rows = await getDB().all<{ daemon_id: number; opencode_session_id: string | null }>(
+      `SELECT i.owner_daemon_id AS daemon_id, s.opencode_session_id
+       FROM {{d_op_sessions}} s
+       JOIN {{d_issues}} i ON i.uid = s.issue_id
+       WHERE s.uid = ?
+       LIMIT 1`,
+      [uid],
+    );
+    const r = rows[0];
+    if (!r || !r.daemon_id) return null;
+    return { daemonId: r.daemon_id, opencodeSessionId: r.opencode_session_id && r.opencode_session_id !== "" ? r.opencode_session_id : null };
+  } catch (e) {
+    log.info(`coordination: session uid resolve failed (${e instanceof Error ? e.message : String(e)})`);
+    return null;
+  }
+}
+
 export async function getSessionDaemonMap(): Promise<Map<string, SessionDaemonInfo>> {
   try {
     const rows = await getDB().all<{

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, deleteConfig, getConfigAll, initDB, getDB } from "./db";
-import { getActiveDaemons, listAllDaemons, getSessionDaemonMap, resolveDaemonEndpoint, getRunningSessionsForProject } from "./coordination";
+import { getActiveDaemons, listAllDaemons, getSessionDaemonMap, resolveDaemonEndpoint, getRunningSessionsForProject, resolveSessionUid } 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";
@@ -709,8 +709,22 @@ async function handle(req: Request, url: URL, ip: string, ctx: { authed: boolean
 
   const sessionView = url.pathname.match(SESSION_VIEW_RE);
   if (sessionView) {
-    const [, sid] = sessionView;
-    if (!sid) return html(errorPage("404", "bad session path"), 404);
+    const [, rawSid] = sessionView;
+    if (!rawSid) return html(errorPage("404", "bad session path"), 404);
+    // Daemon-internal session UIDs (36-char uuid) appear in pickup acks before
+    // the backend reports its opencode id: redirect once known, hold page if not.
+    let sid = rawSid;
+    if (!sid.startsWith("ses_")) {
+      const uidInfo = await resolveSessionUid(rawSid);
+      if (uidInfo?.opencodeSessionId) {
+        const qs = new URLSearchParams(url.searchParams);
+        qs.set("daemon_id", String(uidInfo.daemonId));
+        return Response.redirect(`${url.origin}/sessions/${encodeURIComponent(uidInfo.opencodeSessionId)}?${qs}`, 302);
+      }
+      if (uidInfo) {
+        return html(errorPage("等待启动", "会话已创建，后端会话 ID 尚未生成（正在准备工作目录）。稍后刷新此页。"), 200);
+      }
+    }
     const desc = url.searchParams.get("asc") !== "1";
     const all = url.searchParams.get("all") === "1";
     const limit = Math.min(5000, Math.max(1, Number(url.searchParams.get("limit")) || 30));

package/src/schema-mysql.sql

@@ -211,3 +211,10 @@ CREATE TABLE IF NOT EXISTS {{project_members}} (
   CONSTRAINT {{fk_pm_user}} FOREIGN KEY (user_login) REFERENCES {{users}}(login) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 CREATE INDEX project_members_user ON {{project_members}} (user_login);
+
+CREATE TABLE IF NOT EXISTS {{config}} (
+  id          BIGINT AUTO_INCREMENT PRIMARY KEY,
+  akey        VARCHAR(255) NOT NULL UNIQUE,
+  value       TEXT NOT NULL,
+  updated_at  VARCHAR(40) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;