merge: resolve conflicts with origin/main (auto-fix formatting)

server/lib/web/actions.ts

@@ -21,7 +21,10 @@ async function readJsonBody(event: H3Event): Promise<Record<string, unknown> | n
   }
 }
 
-async function userOctokit(event: H3Event, userId: string): Promise<Awaited<ReturnType<typeof getUserOctokit>>> {
+async function userOctokit(
+  event: H3Event,
+  userId: string,
+): Promise<Awaited<ReturnType<typeof getUserOctokit>>> {
   return getUserOctokit(userId, cfEnv(event).KV);
 }
 
@@ -123,16 +126,7 @@ export async function apiClose(event: H3Event): Promise<Record<string, unknown>>
 export async function apiReact(event: H3Event): Promise<Record<string, unknown>> {
   const userId = await bearerUserId(event);
   const body = await readJsonBody(event);
-  const reactions = [
-    "+1",
-    "-1",
-    "laugh",
-    "confused",
-    "heart",
-    "hooray",
-    "rocket",
-    "eyes",
-  ] as const;
+  const reactions = ["+1", "-1", "laugh", "confused", "heart", "hooray", "rocket", "eyes"] as const;
   if (
     !body ||
     !isNonEmptyString(body.owner) ||
@@ -151,14 +145,7 @@ export async function apiReact(event: H3Event): Promise<Record<string, unknown>>
       repo: body.repo,
       issue_number: body.issueNumber,
       content: body.reaction as
-        | "+1"
-        | "-1"
-        | "laugh"
-        | "confused"
-        | "heart"
-        | "hooray"
-        | "rocket"
-        | "eyes",
+        "+1" | "-1" | "laugh" | "confused" | "heart" | "hooray" | "rocket" | "eyes",
     });
   } catch (err) {
     log.error({ err }, "Failed to create reaction");

server/lib/web/admin.ts

@@ -402,7 +402,10 @@ export async function adminInvite(event: H3Event): Promise<void> {
   }
   const session = await getAdminSession(env.KV, getHeader(event, "cookie"));
   if (!session) {
-    await sendRedirect(event, `/auth/github?redirect=${encodeURIComponent(`/admin/invite?token=${token}`)}`);
+    await sendRedirect(
+      event,
+      `/auth/github?redirect=${encodeURIComponent(`/admin/invite?token=${token}`)}`,
+    );
     return;
   }
   const result = await acceptInvite(env.KV, token, session.userId, session.login);
@@ -480,8 +483,7 @@ export async function adminApiGroupsPut(event: H3Event): Promise<Record<string,
       const members = g.members ?? normalizeGroupMembers(g);
       const stillMine = members.some(
         (m) =>
-          m.role === "owner" &&
-          identityMatches([m.login], auth.session.userId, auth.session.login),
+          m.role === "owner" && identityMatches([m.login], auth.session.userId, auth.session.login),
       );
       const otherOwner = ownerCount(members) > 1;
       if (!stillMine && !otherOwner) {
@@ -648,7 +650,10 @@ export async function adminApiLogs(event: H3Event): Promise<Record<string, unkno
 }
 
 /** GET /admin/api/logs/:id */
-export async function adminApiLogsById(event: H3Event, id: number): Promise<Record<string, unknown>> {
+export async function adminApiLogsById(
+  event: H3Event,
+  id: number,
+): Promise<Record<string, unknown>> {
   const auth = await requireAnyAccess(event);
   const env = cfEnv(event);
   if (!Number.isInteger(id) || id <= 0) return respondError(event, 400, "Invalid log id");
@@ -783,7 +788,10 @@ export async function adminGroupInvitesGet(
 }
 
 /** DELETE /admin/api/invites/:token */
-export async function adminInviteDelete(event: H3Event, token: string): Promise<Record<string, unknown>> {
+export async function adminInviteDelete(
+  event: H3Event,
+  token: string,
+): Promise<Record<string, unknown>> {
   await requireAnyAccess(event);
   const env = cfEnv(event);
   const invite = await getInvite(env.KV, token);

server/lib/web/auth.ts

@@ -64,11 +64,7 @@ export function requireGroup(event: H3Event, groupId: string): GroupAccess {
 }
 
 /** Requires at least `min` role in the group (owner|admin|viewer). */
-export function requireGroupRole(
-  event: H3Event,
-  groupId: string,
-  min: GroupRole,
-): GroupAccess {
+export function requireGroupRole(event: H3Event, groupId: string, min: GroupRole): GroupAccess {
   const access = requireGroup(event, groupId);
   if (!access.ok) return access;
   const auth = currentAuth(event);
@@ -98,7 +94,6 @@ export async function bearerUserId(event: H3Event): Promise<string> {
   if (!auth?.startsWith("Bearer "))
     throw createError({ statusCode: 401, statusMessage: "Missing authorization" });
   const userId = await findUserIdByToken(env.KV, auth.slice(7));
-  if (!userId)
-    throw createError({ statusCode: 401, statusMessage: "Invalid or expired token" });
+  if (!userId) throw createError({ statusCode: 401, statusMessage: "Invalid or expired token" });
   return userId;
 }

server/lib/web/oauth.ts

@@ -157,8 +157,11 @@ export async function handleInstallPage(event: H3Event): Promise<string | void>
     return;
   }
   const accountLogin =
-    (await getInstallationAccount(env.GITHUB_APP_ID ?? "", env.GITHUB_PRIVATE_KEY ?? "", installationId)) ??
-    "";
+    (await getInstallationAccount(
+      env.GITHUB_APP_ID ?? "",
+      env.GITHUB_PRIVATE_KEY ?? "",
+      installationId,
+    )) ?? "";
   const groups = await loadGroups(env.KV);
   const scope = resolveScope(env, groups, session.userId, session.login);
   const owned = groups.filter((g) => roleAt(scope, g.id) === "owner");
@@ -216,8 +219,11 @@ export async function handleInstallBind(event: H3Event): Promise<void> {
 
   // Default: auto-create a dedicated inst-{id} group.
   const accountLogin =
-    (await getInstallationAccount(env.GITHUB_APP_ID ?? "", env.GITHUB_PRIVATE_KEY ?? "", installationId)) ??
-    "";
+    (await getInstallationAccount(
+      env.GITHUB_APP_ID ?? "",
+      env.GITHUB_PRIVATE_KEY ?? "",
+      installationId,
+    )) ?? "";
   const group = await ensureInstallationGroup(env.KV, installationId, accountLogin);
   if (!group) {
     await sendRedirect(event, "/admin?error=install");
@@ -248,7 +254,10 @@ export async function handleInstallBind(event: H3Event): Promise<void> {
         adminIds: [...new Set([...(group.adminIds ?? []), session.login])],
       };
       const all = await loadGroups(env.KV);
-      await saveGroups(env.KV, all.map((g) => (g.id === group.id ? updated : g)));
+      await saveGroups(
+        env.KV,
+        all.map((g) => (g.id === group.id ? updated : g)),
+      );
       await recordAudit(env.DB, {
         ts: Date.now(),
         actorId: session.userId,

server/lib/webhook.ts

@@ -117,10 +117,7 @@ export async function processWebhook(
 }
 
 /** h3 wrapper for `POST /webhook` / `POST /webhook/:groupId`. */
-export async function handleWebhookRequest(
-  event: H3Event,
-  tenantId?: string,
-): Promise<unknown> {
+export async function handleWebhookRequest(event: H3Event, tenantId?: string): Promise<unknown> {
   const contentLength = Number(getHeader(event, "content-length") ?? 0);
   if (contentLength > MAX_BODY_SIZE) {
     setResponseStatus(event, 413);