weifuwu 0.24.0 → 0.24.1

package/dist/index.js

@@ -183,8 +183,8 @@ async function sendResponse(res, response, opts) {
   }
   res.end();
 }
-async function createTestServer(handler) {
-  const server = serve(handler, { port: 0, shutdown: false });
+async function createTestServer(handler, options) {
+  const server = serve(handler, { ...options, port: options?.port ?? 0, shutdown: false });
   await server.ready;
   return { server, url: `http://localhost:${server.port}` };
 }
@@ -2695,9 +2695,10 @@ var Table = class {
   _buildSET(data) {
     const sets = [];
     const values = [];
+    const d = data;
     for (const { prop, db } of this.colEntries) {
-      if (prop in data && data[prop] !== void 0) {
-        const val = data[prop];
+      if (prop in d && d[prop] !== void 0) {
+        const val = d[prop];
         if (val instanceof SQL) {
           sets.push(`"${db}" = ${val.toSQL()}`);
         } else {
@@ -2706,7 +2707,7 @@ var Table = class {
         }
       }
     }
-    if (this.hasColumn("updated_at") && !data.updated_at) {
+    if (this.hasColumn("updated_at") && !d.updated_at) {
       sets.push('"updated_at" = NOW()');
     }
     return { sets, values };
@@ -3231,7 +3232,7 @@ h2{color:#dc2626}.desc{color:#555}</style>
     const redirectUri = form.get("redirect_uri") || "";
     const scope = form.get("scope") || "";
     const state = form.get("state") || "";
-    const userId = parseInt(form.get("user_id") || "0", 10);
+    const userId2 = parseInt(form.get("user_id") || "0", 10);
     const codeChallenge = form.get("code_challenge") || "";
     const codeChallengeMethod = form.get("code_challenge_method") || "";
     if (!approve) {
@@ -3242,7 +3243,7 @@ h2{color:#dc2626}.desc{color:#555}</style>
     const expiresAt = new Date(Date.now() + 10 * 60 * 1e3);
     await pg.sql`
       INSERT INTO "_oauth2_codes" ("code", "client_id", "user_id", "redirect_uri", "code_challenge", "code_challenge_method", "scope", "expires_at")
-      VALUES (${code}, ${clientId}, ${userId}, ${redirectUri}, ${codeChallenge || null}, ${codeChallengeMethod || null}, ${scope || null}, ${expiresAt})
+      VALUES (${code}, ${clientId}, ${userId2}, ${redirectUri}, ${codeChallenge || null}, ${codeChallengeMethod || null}, ${scope || null}, ${expiresAt})
     `;
     const loc = `${redirectUri}?code=${code}${state ? `&state=${state}` : ""}`;
     return Response.redirect(loc, 302);
@@ -3418,12 +3419,12 @@ function registerOAuthLoginRoutes(router, deps, providers) {
     );
     return row ?? null;
   }
-  async function linkProvider(userId, provider, providerId, email, name, avatarUrl) {
+  async function linkProvider(userId2, provider, providerId, email, name, avatarUrl) {
     await sql2.unsafe(
       `INSERT INTO ${escapeIdent(providerTable)} (user_id, provider, provider_id, email, name, avatar_url)
        VALUES ($1, $2, $3, $4, $5, $6)
        ON CONFLICT (provider, provider_id) DO NOTHING`,
-      [userId, provider, providerId, email, name, avatarUrl]
+      [userId2, provider, providerId, email, name, avatarUrl]
     );
   }
   async function findOrCreateUser(provider, providerId, email, name, avatarUrl) {
@@ -3765,7 +3766,7 @@ function user(options) {
       const payload = jwt2.verify(token, secret);
       if (payload.token_type === "client_credentials") return null;
       if (!hasDb || !findById) return null;
-      const row = await findById(payload.sub);
+      const row = await findById(Number(payload.sub));
       if (!row) return null;
       return stripPassword(row);
     } catch {
@@ -3774,27 +3775,26 @@ function user(options) {
   }
   const headerName = options.header ?? "Authorization";
   async function resolveUser(req, ctx) {
-    const sessionUserId = ctx.session?.userId;
+    const s = ctx;
+    const sessionUserId = s.session?.userId;
     if (sessionUserId !== void 0 && sessionUserId !== null) {
       if (hasDb) {
         const row = await findById(sessionUserId);
         if (row) {
           return stripPassword(row);
         }
-        if (typeof ctx.session?.destroy === "function") {
-          ;
-          ctx.session.destroy();
-        } else {
-          delete ctx.session?.userId;
+        if (typeof s.session?.destroy === "function") {
+          s.session.destroy();
+        } else if (s.session) {
+          delete s.session.userId;
         }
       } else if (options.resolveUser) {
         const userData = await options.resolveUser(sessionUserId);
         if (userData) {
           return userData;
         }
-        if (typeof ctx.session?.destroy === "function") {
-          ;
-          ctx.session.destroy();
+        if (typeof s.session?.destroy === "function") {
+          s.session.destroy();
         }
         console.warn(`[${currentTraceId()}] user: session userId ${sessionUserId} resolved to null`);
       } else {
@@ -3854,7 +3854,7 @@ function user(options) {
       try {
         const payload = jwt2.verify(token, secret);
         if (payload.token_type === "client_credentials") return null;
-        const row = await findById(payload.sub);
+        const row = await findById(Number(payload.sub));
         if (row) return stripPassword(row);
       } catch {
       }
@@ -3915,13 +3915,13 @@ function user(options) {
       try {
         const body = await parseBody2(req);
         const result = await login(body);
-        if (ctx.session) {
-          ;
-          ctx.session.userId = result.user.id;
-          ctx.session.role = result.user.role;
+        const s = ctx;
+        if (s.session) {
+          s.session.userId = result.user.id;
+          s.session.role = result.user.role;
         }
         const res = Response.json(result);
-        if (!ctx.session) {
+        if (!s.session) {
           res.headers.set("Set-Cookie", `session=${result.token}; HttpOnly; SameSite=Lax; Path=/`);
         }
         return res;
@@ -4695,6 +4695,27 @@ function buildColumnDDL(tenantId, field) {
 }
 
 // tenant/rest.ts
+function userId(ctx) {
+  return ctx.user?.id ?? null;
+}
+function extractCount(rows) {
+  return Number(rows[0]?.count ?? 0);
+}
+function asJson(val) {
+  return val;
+}
+function tableRef(s, name) {
+  return s(name);
+}
+function withTenant(ctx, data) {
+  ;
+  data.tenant_id = ctx.tenant.id;
+  return data;
+}
+function withoutTenant(data) {
+  delete data.tenant_id;
+  return data;
+}
 function zodType(field) {
   let t;
   switch (field.type) {
@@ -4752,7 +4773,7 @@ function buildRouter(sql2, usersTable) {
     `;
     await sql2`
       INSERT INTO "_tenant_members" ("tenant_id", "user_id", "role")
-      VALUES (${tenant2.id}, ${ctx.user.id}, 'admin')
+      VALUES (${tenant2.id}, ${userId(ctx)}, 'admin')
     `;
     return Response.json(tenant2, { status: 201 });
   });
@@ -4760,7 +4781,7 @@ function buildRouter(sql2, usersTable) {
     const rows = await sql2`
       SELECT t.*, tm.role FROM "_tenants" t
       JOIN "_tenant_members" tm ON tm.tenant_id = t.id
-      WHERE tm.user_id = ${ctx.user.id}
+      WHERE tm.user_id = ${userId(ctx)}
     `;
     return Response.json(rows);
   });
@@ -4769,7 +4790,7 @@ function buildRouter(sql2, usersTable) {
     if (err) return err;
     const { email, role = "member" } = await req.json();
     const [user2] = await sql2`
-      SELECT id FROM ${sql2(usersTable)} WHERE "email" = ${email} LIMIT 1
+      SELECT id FROM ${tableRef(sql2, usersTable)} WHERE "email" = ${email} LIMIT 1
     `;
     if (!user2) return Response.json({ error: "User not found" }, { status: 404 });
     const [existing] = await sql2`
@@ -4786,10 +4807,10 @@ function buildRouter(sql2, usersTable) {
   r.delete("/sys/tenants/members/:userId", async (req, ctx) => {
     const err = requireAdmin(ctx);
     if (err) return err;
-    const userId = parseInt(ctx.params.userId, 10);
+    const userId2 = parseInt(ctx.params.userId, 10);
     await sql2`
       DELETE FROM "_tenant_members"
-      WHERE tenant_id = ${ctx.tenant.id} AND user_id = ${userId}
+      WHERE tenant_id = ${ctx.tenant.id} AND user_id = ${userId2}
     `;
     return Response.json({ ok: true });
   });
@@ -4815,7 +4836,7 @@ function buildRouter(sql2, usersTable) {
     }
     const [row] = await sql2`
       INSERT INTO "_user_tables" ("tenant_id", "slug", "label", "fields")
-      VALUES (${ctx.tenant.id}, ${body.slug}, ${body.label || ""}, ${body.fields})
+      VALUES (${ctx.tenant.id}, ${body.slug}, ${body.label || ""}, ${asJson(body.fields)})
       RETURNING *
     `;
     return Response.json(row, { status: 201 });
@@ -4850,7 +4871,7 @@ function buildRouter(sql2, usersTable) {
     const merged = [...table.fields, ...newFields];
     await sql2`
       UPDATE "_user_tables"
-      SET fields = ${merged}
+      SET fields = ${asJson(merged)}
       WHERE id = ${table.id}
     `;
     return Response.json({ ...table, fields: merged });
@@ -4898,7 +4919,7 @@ function buildRouter(sql2, usersTable) {
             [ctx.tenant.id]
           )
         ]);
-        return Response.json({ rows: rows2, count: Number(countResult2[0]?.count ?? 0) });
+        return Response.json({ rows: rows2, count: extractCount(countResult2) });
       } catch {
         return Response.json({ error: "Invalid search_vector" }, { status: 400 });
       }
@@ -4914,7 +4935,7 @@ function buildRouter(sql2, usersTable) {
         [ctx.tenant.id]
       )
     ]);
-    return Response.json({ rows, count: Number(countResult[0]?.count ?? 0) });
+    return Response.json({ rows, count: extractCount(countResult) });
   });
   r.post("/:_slug", async (req, ctx) => {
     const table = await resolveTable(ctx);
@@ -4925,11 +4946,10 @@ function buildRouter(sql2, usersTable) {
       shape[f.name] = zodType(f);
     }
     const zodSchema = z3.object(shape);
-    const parsed = zodSchema.parse(data);
-    parsed.tenant_id = ctx.tenant.id;
+    const parsed = withTenant(ctx, zodSchema.parse(data));
     delete parsed.id;
     const name = internalName(ctx);
-    const [row] = await sql2`INSERT INTO ${sql2(name)} ${sql2(parsed)} RETURNING *`;
+    const [row] = await sql2`INSERT INTO ${tableRef(sql2, name)} ${sql2(parsed)} RETURNING *`;
     return Response.json(row, { status: 201 });
   });
   r.get("/:_slug/:id", async (_req, ctx) => {
@@ -4937,7 +4957,7 @@ function buildRouter(sql2, usersTable) {
     if (!table) return Response.json({ error: "Table not found" }, { status: 404 });
     const name = internalName(ctx);
     const [row] = await sql2`
-      SELECT * FROM ${sql2(name)}
+      SELECT * FROM ${tableRef(sql2, name)}
       WHERE id = ${parseInt(ctx.params.id, 10)} AND tenant_id = ${ctx.tenant.id}
       LIMIT 1
     `;
@@ -4953,13 +4973,12 @@ function buildRouter(sql2, usersTable) {
       shape[f.name] = zodType(f);
     }
     const zodSchema = z3.object(shape).partial();
-    const parsed = zodSchema.parse(data);
+    const parsed = withoutTenant(zodSchema.parse(data));
     delete parsed.id;
-    delete parsed.tenant_id;
     if (Object.keys(parsed).length === 0) {
       const name2 = internalName(ctx);
       const [row2] = await sql2`
-        SELECT * FROM ${sql2(name2)}
+        SELECT * FROM ${tableRef(sql2, name2)}
         WHERE id = ${parseInt(ctx.params.id, 10)} AND tenant_id = ${ctx.tenant.id}
         LIMIT 1
       `;
@@ -4967,7 +4986,7 @@ function buildRouter(sql2, usersTable) {
     }
     const name = internalName(ctx);
     const [row] = await sql2`
-      UPDATE ${sql2(name)} SET ${sql2(parsed)}
+      UPDATE ${tableRef(sql2, name)} SET ${sql2(parsed)}
       WHERE id = ${parseInt(ctx.params.id, 10)} AND tenant_id = ${ctx.tenant.id}
       RETURNING *
     `;
@@ -4977,7 +4996,7 @@ function buildRouter(sql2, usersTable) {
   r.delete("/:_slug/:id", async (_req, ctx) => {
     const name = internalName(ctx);
     const result = await sql2`
-      DELETE FROM ${sql2(name)}
+      DELETE FROM ${tableRef(sql2, name)}
       WHERE id = ${parseInt(ctx.params.id, 10)} AND tenant_id = ${ctx.tenant.id}
       RETURNING 1
     `;
@@ -5018,7 +5037,7 @@ function buildRouter(sql2, usersTable) {
             [parentId2, ctx.tenant.id]
           )
         ]);
-        return Response.json({ rows, count: Number(countResult[0]?.count ?? 0) });
+        return Response.json({ rows, count: extractCount(countResult) });
       }
       return Response.json({ error: "POST not supported on M2M nested routes" }, { status: 400 });
     }
@@ -5035,7 +5054,7 @@ function buildRouter(sql2, usersTable) {
           [parentId, ctx.tenant.id]
         )
       ]);
-      return Response.json({ rows, count: Number(countResult[0]?.count ?? 0) });
+      return Response.json({ rows, count: extractCount(countResult) });
     }
     const body = await req.json();
     const shape = {};
@@ -5047,7 +5066,7 @@ function buildRouter(sql2, usersTable) {
     parsed.tenant_id = ctx.tenant.id;
     parsed[relField.name] = parentId;
     delete parsed.id;
-    const [row] = await sql2`INSERT INTO ${sql2(childName)} ${sql2(parsed)} RETURNING *`;
+    const [row] = await sql2`INSERT INTO ${tableRef(sql2, childName)} ${sql2(parsed)} RETURNING *`;
     return Response.json(row, { status: 201 });
   }
   r.get("/:_slug/:id/:_nested", async (req, ctx) => handleNested(req, ctx, "GET"));
@@ -5117,7 +5136,6 @@ function buildObjectType(table, ctx) {
       if (other.id === table.id) continue;
       const relField = findRelation(other.fields, table.slug);
       if (relField) {
-        const otherName = pascalCase(other.slug);
         fields[other.slug] = {
           type: new GraphQLList(new GraphQLNonNull(buildObjectType(other, ctx))),
           args: {
@@ -5632,7 +5650,7 @@ async function loadAgent(agents, agentId) {
   return row ?? null;
 }
 function createRunner(deps) {
-  const { sql: sql2, agents, runs, provider, modelName, userTools } = deps;
+  const { sql: sql2, agents, runs, provider, userTools } = deps;
   function truncate(s, max = 200) {
     return s.length > max ? s.slice(0, max) + "..." : s;
   }
@@ -5942,32 +5960,32 @@ function createWSHandler(deps) {
     prefix: "messager:"
   });
   const userConnections = /* @__PURE__ */ new Map();
-  function trackConnection(userId, ws) {
-    let conns = userConnections.get(userId);
+  function trackConnection(userId2, ws) {
+    let conns = userConnections.get(userId2);
     if (!conns) {
       conns = /* @__PURE__ */ new Set();
-      userConnections.set(userId, conns);
+      userConnections.set(userId2, conns);
     }
     conns.add(ws);
   }
   function untrackConnection(ws) {
-    for (const [userId, conns] of userConnections) {
+    for (const [userId2, conns] of userConnections) {
       conns.delete(ws);
-      if (conns.size === 0) userConnections.delete(userId);
+      if (conns.size === 0) userConnections.delete(userId2);
     }
   }
   return {
     handler: {
       open(ws, ctx) {
-        const userId = ctx.user?.id;
-        if (!userId) {
+        const userId2 = ctx.user?.id;
+        if (!userId2) {
           ws.close(4001, "Unauthorized");
           return;
         }
       },
       async message(ws, ctx, data) {
-        const userId = ctx.user?.id;
-        if (!userId) return;
+        const userId2 = ctx.user?.id;
+        if (!userId2) return;
         let msg;
         try {
           msg = JSON.parse(data.toString());
@@ -5981,12 +5999,12 @@ function createWSHandler(deps) {
             if (!content || !channel_id) return;
             const [row] = await sql2`
               INSERT INTO "_messages" ("channel_id", "sender_id", "sender_type", "content")
-              VALUES (${channel_id}, ${userId}, 'user', ${content})
+              VALUES (${channel_id}, ${userId2}, 'user', ${content})
               RETURNING *
             `;
             const message = row;
             hub.join(`messager:${channel_id}`, ws);
-            trackConnection(userId, ws);
+            trackConnection(userId2, ws);
             broadcastToChannel(hub, channel_id, { type: "message", data: message });
             if (agents) {
               const insertMsg = (data2) => sql2`
@@ -6005,7 +6023,7 @@ function createWSHandler(deps) {
             broadcastToChannel(hub, channel_id, {
               type: "typing",
               channel_id,
-              user_id: userId,
+              user_id: userId2,
               is_typing: is_typing ?? false
             });
             break;
@@ -6016,12 +6034,12 @@ function createWSHandler(deps) {
             await sql2`
               UPDATE "_channel_members"
               SET last_read_id = ${last_message_id}, last_read_at = NOW()
-              WHERE channel_id = ${channel_id} AND member_id = ${userId} AND member_type = 'user'
+              WHERE channel_id = ${channel_id} AND member_id = ${userId2} AND member_type = 'user'
             `;
             broadcastToChannel(hub, channel_id, {
               type: "read",
               channel_id,
-              user_id: userId,
+              user_id: userId2,
               last_message_id
             });
             break;
@@ -6075,7 +6093,7 @@ function buildRouter3(deps) {
     return Response.json(channel, { status: 201 });
   });
   r.get("/channels", async (_req, ctx) => {
-    const userId = ctx.user?.id ?? 1;
+    const userId2 = ctx.user?.id ?? 1;
     const rows = await sql2`
       SELECT c.*, (
         SELECT content FROM "_messages"
@@ -6084,7 +6102,7 @@ function buildRouter3(deps) {
       ) AS last_message
       FROM "_channels" c
       JOIN "_channel_members" m ON m.channel_id = c.id
-      WHERE m.member_id = ${userId} AND m.member_type = 'user'
+      WHERE m.member_id = ${userId2} AND m.member_type = 'user'
       ORDER BY c.created_at DESC
     `;
     return Response.json(rows);
@@ -6157,9 +6175,9 @@ function buildRouter3(deps) {
   r.post("/channels/:id/read", async (req, ctx) => {
     const channelId = parseInt(ctx.params.id, 10);
     const body = await req.json();
-    const userId = body.user_id ?? ctx.user?.id ?? 1;
+    const userId2 = body.user_id ?? ctx.user?.id ?? 1;
     await members.updateMany(
-      [eq("channel_id", channelId), eq("member_id", userId), eq("member_type", "user")],
+      [eq("channel_id", channelId), eq("member_id", userId2), eq("member_type", "user")],
       { last_read_id: body.last_message_id }
     );
     return Response.json({ ok: true });
@@ -7349,8 +7367,9 @@ function errorBoundary(errorPath) {
       const mod = await compile(errorPath);
       const ErrorComponent = mod.default;
       if (!ErrorComponent) throw err;
-      const layouts = (ctx.layoutStack || []).map((l) => l.component);
-      const base = (ctx.mountPath || "").replace(/\/$/, "");
+      const ctx2 = ctx;
+      const layouts = (ctx2.layoutStack || []).map((l) => l.component);
+      const base = (ctx2.mountPath || "").replace(/\/$/, "");
       let element = createElement2(ErrorComponent, {
         error: err instanceof Error ? err : new Error(String(err)),
         reset: () => {
@@ -7360,10 +7379,10 @@ function errorBoundary(errorPath) {
       const { renderToReadableStream } = await import("react-dom/server");
       const stream = await renderToReadableStream(element);
       return streamResponse(stream, {
-        ctx,
+        ctx: ctx2,
         base,
         isDev: isDev(),
-        tailwind: ctx.tailwind,
+        tailwind: ctx2.tailwind,
         status: 500
       });
     }
@@ -7743,10 +7762,10 @@ async function getSession(sql2, id2) {
   const { data: rows } = await sessions.readMany(sql2, { id: id2, active: true });
   return rows[0] ?? null;
 }
-async function listSessions(sql2, userId) {
+async function listSessions(sql2, userId2) {
   const opts = { orderBy: { updated_at: "desc" } };
-  if (userId !== void 0) {
-    const { data: rows2 } = await sessions.readMany(sql2, { user_id: userId, active: true }, opts);
+  if (userId2 !== void 0) {
+    const { data: rows2 } = await sessions.readMany(sql2, { user_id: userId2, active: true }, opts);
     return rows2;
   }
   const { data: rows } = await sessions.readMany(sql2, { active: true }, opts);
@@ -8367,9 +8386,9 @@ function createWSHandler2(deps) {
   const { sql: sql2, model, workspace, systemPrompt, skills, skillsRegistry, permissions: permissions2, pendingQuestions } = deps;
   return {
     open(ws, ctx) {
-      const userId = ctx.user?.id ?? 0;
+      const userId2 = ctx.user?.id ?? 0;
       const mountPath = ctx.mountPath ?? "";
-      clients2.set(ws, { userId, mountPath });
+      clients2.set(ws, { userId: userId2, mountPath });
     },
     async message(ws, ctx, data) {
       const client = clients2.get(ws);
@@ -8878,7 +8897,7 @@ function analytics(options) {
     if (pg) await migratePg(pg.sql, pg.table);
   };
   const close = async () => {
-    if (store2) store2.stopCleanup();
+    store2?.stopCleanup();
   };
   const mod = r;
   mod.middleware = middleware;
@@ -10193,7 +10212,7 @@ function iii(opts = {}) {
   mod.migrate = async () => {
     await stream.migrate();
   };
-  mod.shutdown = async () => {
+  mod.close = async () => {
     for (const [, p] of pending) {
       clearTimeout(p.timer);
       p.reject(new Error("Engine shutting down"));
@@ -10205,7 +10224,6 @@ function iii(opts = {}) {
     triggers.clear();
     await stream.close();
   };
-  mod.close = mod.shutdown;
   return mod;
 }
 
@@ -10410,7 +10428,7 @@ function registerWorker(url) {
     onStream(handler) {
       handlers.set("__stream__", handler);
     },
-    shutdown() {
+    close() {
       intentionalClose = true;
       if (reconnectTimer) clearTimeout(reconnectTimer);
       ws?.close();
@@ -10459,7 +10477,7 @@ var MemoryStore = class {
       if (entry.expires < now) this.store.delete(key);
     }
   }
-  close() {
+  async close() {
     clearInterval(this.interval);
     this.store.clear();
   }
@@ -10495,6 +10513,9 @@ var RedisStore = class {
   async destroy(sid) {
     await this.redis.del(this.key(sid));
   }
+  async close() {
+    this.redis.disconnect();
+  }
 };
 var COOKIE_SEPARATOR = ".";
 function signSessionId(sid, secret) {
@@ -10568,6 +10589,7 @@ function session(options) {
   } else if (options?.store === "redis") {
     if (!options.redis) throw new Error('session: redis client required when store: "redis"');
     store2 = new RedisStore(options.redis);
+    closeStore = () => store2.close();
   } else {
     const mem = new MemoryStore();
     store2 = mem;
@@ -10647,8 +10669,8 @@ function session(options) {
     }
     return res;
   });
-  mw.close = () => {
-    closeStore?.();
+  mw.close = async () => {
+    await closeStore?.();
   };
   mw.store = store2;
   return mw;
@@ -10742,7 +10764,7 @@ var MemoryCache = class {
       }
     }
   }
-  close() {
+  async close() {
     clearInterval(this.interval);
     this.store.clear();
     this.tagIndex.clear();
@@ -10883,8 +10905,8 @@ function cache2(options) {
   mw.store = store2;
   mw.invalidate = async (tag) => store2.invalidate(tag);
   mw.flush = async () => store2.flush();
-  mw.close = () => {
-    closeStore?.();
+  mw.close = async () => {
+    await closeStore?.();
   };
   return mw;
 }
@@ -11468,17 +11490,17 @@ function permissions(options) {
     );
     return created.id;
   }
-  async function assignRole(userId, role) {
+  async function assignRole(userId2, role) {
     const roleId = await ensureRole(role);
     await sql2.unsafe(
       `INSERT INTO ${escapeIdent6(userRolesTable)} (user_id, role_id) VALUES ($1, $2) ON CONFLICT DO NOTHING`,
-      [userId, roleId]
+      [userId2, roleId]
     );
   }
-  async function removeRole(userId, role) {
+  async function removeRole(userId2, role) {
     await sql2.unsafe(
       `DELETE FROM ${escapeIdent6(userRolesTable)} WHERE user_id = $1 AND role_id = (SELECT id FROM ${escapeIdent6(rolesTable)} WHERE name = $2)`,
-      [userId, role]
+      [userId2, role]
     );
   }
   async function grantPermission(role, permission) {
@@ -11494,31 +11516,31 @@ function permissions(options) {
       [role, permission]
     );
   }
-  async function getUserRoles(userId) {
+  async function getUserRoles(userId2) {
     const rows = await sql2.unsafe(
       `SELECT r.name FROM ${escapeIdent6(userRolesTable)} ur
        JOIN ${escapeIdent6(rolesTable)} r ON r.id = ur.role_id
        WHERE ur.user_id = $1 ORDER BY r.name`,
-      [userId]
+      [userId2]
     );
     return rows.map((r) => r.name);
   }
-  async function getUserPermissions(userId) {
+  async function getUserPermissions(userId2) {
     const rows = await sql2.unsafe(
       `SELECT DISTINCT rp.permission FROM ${escapeIdent6(userRolesTable)} ur
        JOIN ${escapeIdent6(rolePermsTable)} rp ON rp.role_id = ur.role_id
        WHERE ur.user_id = $1 ORDER BY rp.permission`,
-      [userId]
+      [userId2]
     );
     return rows.map((r) => r.permission);
   }
   const mw = (async (req, ctx, next) => {
-    const userId = ctx.user?.id;
+    const userId2 = ctx.user?.id;
     let roles = /* @__PURE__ */ new Set();
     let perms = /* @__PURE__ */ new Set();
-    if (userId) {
-      const userRoles = await getUserRoles(userId);
-      const userPerms = userId ? await getUserPermissions(userId) : [];
+    if (userId2) {
+      const userRoles = await getUserRoles(userId2);
+      const userPerms = userId2 ? await getUserPermissions(userId2) : [];
       roles = new Set(userRoles);
       perms = new Set(userPerms);
       const hasWildcard = userPerms.includes("*");

package/dist/kb/types.d.ts

@@ -41,6 +41,14 @@ export interface KBListEntry {
     title: string;
     chunks: number;
 }
+export interface KBInjected {
+    search(query: string, searchOptions?: KBSearchOptions): Promise<KBSearchResult[]>;
+}
+declare module '../types.ts' {
+    interface Context {
+        kb?: KBInjected;
+    }
+}
 export interface KBModule {
     /**
      * Ingest a document: chunk → embed → store.

package/dist/logdb/types.d.ts

@@ -1,5 +1,6 @@
 import type { PostgresClient } from '../postgres/types.ts';
 import type { Router } from '../router.ts';
+import type { Closeable } from '../types.ts';
 export interface LogdbOptions {
     pg: PostgresClient;
     table?: string;
@@ -18,7 +19,7 @@ export interface LogEntryInput {
     message: string;
     metadata?: Record<string, unknown>;
 }
-export interface LogdbModule extends Router {
+export interface LogdbModule extends Router, Closeable {
     log(input: LogEntryInput): Promise<LogEntry>;
     migrate(): Promise<void>;
     clean(retentionMonths: number): Promise<number>;