Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

perf: optimize DB queries across all server modules

Gusaed9d4189e9f
diff --git a/src/email-worker/src/imap-poller-do.test.ts b/src/email-worker/src/imap-poller-do.test.ts
index 8a4a29f83..4357421bd 100644
--- a/src/email-worker/src/imap-poller-do.test.ts
+++ b/src/email-worker/src/imap-poller-do.test.ts
@@ -58,6 +58,7 @@ vi.mock("@alook/shared/crypto", () => ({
const mockGetEmailAccount = vi.fn()
const mockUpdateEmailAccount = vi.fn()
const mockIsWhitelisted = vi.fn().mockResolvedValue(true)
+const mockBuildWhitelistSet = vi.fn()
vi.mock("@alook/shared", async () => {
const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared")
@@ -82,6 +83,7 @@ vi.mock("@alook/shared", async () => {
},
whitelist: {
isWhitelisted: (...args: any[]) => mockIsWhitelisted(...args),
+ buildWhitelistSet: (...args: any[]) => mockBuildWhitelistSet(...args),
},
},
}
@@ -164,7 +166,8 @@ beforeEach(() => {
vi.clearAllMocks()
mockGetEmailAccount.mockResolvedValue({ ...ACCOUNT })
mockUpdateEmailAccount.mockResolvedValue(undefined)
- mockIsWhitelisted.mockResolvedValue(true)
+ mockIsWhitelisted.mockReturnValue(true)
+ mockBuildWhitelistSet.mockResolvedValue({ check: (email: string) => mockIsWhitelisted(email) })
mockPostalParse.mockResolvedValue({
from: { name: "", address: "[email protected]" },
subject: "Hi",
@@ -253,7 +256,8 @@ describe("alarm — whitelist filtering", () => {
.mockResolvedValueOnce("* SEARCH 50\r\nS1 OK UID SEARCH completed\r\n")
.mockResolvedValueOnce(buildFetchResponse(50, RAW_EMAIL_1))
mockGetEmailAccount.mockResolvedValue({ ...ACCOUNT, lastSyncedUid: "0" })
- mockIsWhitelisted.mockResolvedValue(true)
+ mockIsWhitelisted.mockReturnValue(true)
+ mockBuildWhitelistSet.mockResolvedValue({ check: () => true })
await ctx.storage.put("accountId", "aea_test1")
await durable.alarm()
@@ -268,7 +272,8 @@ describe("alarm — whitelist filtering", () => {
.mockResolvedValueOnce("* SEARCH 50\r\nS1 OK UID SEARCH completed\r\n")
.mockResolvedValueOnce(buildFetchResponse(50, RAW_EMAIL_1))
mockGetEmailAccount.mockResolvedValue({ ...ACCOUNT, lastSyncedUid: "0" })
- mockIsWhitelisted.mockResolvedValue(false)
+ mockIsWhitelisted.mockReturnValue(false)
+ mockBuildWhitelistSet.mockResolvedValue({ check: () => false })
await ctx.storage.put("accountId", "aea_test1")
await durable.alarm()
diff --git a/src/email-worker/src/imap-poller-do.ts b/src/email-worker/src/imap-poller-do.ts
index 80ac4ab5c..7381059dc 100644
--- a/src/email-worker/src/imap-poller-do.ts
+++ b/src/email-worker/src/imap-poller-do.ts
@@ -15,6 +15,11 @@ const FIRST_SYNC_DAYS = 7
export class ImapPollerDO extends DurableObject<EmailEnv> {
private accountId: string | null = null
+ private _db: ReturnType<typeof createDb> | null = null
+
+ private get db() {
+ return (this._db ??= createDb(this.env.DB))
+ }
async fetch(request: Request): Promise<Response> {
const url = new URL(request.url)
@@ -42,7 +47,7 @@ export class ImapPollerDO extends DurableObject<EmailEnv> {
if (url.pathname === "/status" && request.method === "GET") {
const accountId = await this.ctx.storage.get<string>("accountId")
if (!accountId) return Response.json({ status: "stopped" })
- const db = createDb(this.env.DB)
+ const db = this.db
const account = await queries.emailAccount.getEmailAccountById(db, accountId)
if (!account) return Response.json({ status: "not_found" })
return Response.json({
@@ -63,7 +68,7 @@ export class ImapPollerDO extends DurableObject<EmailEnv> {
const accountId = this.accountId ?? await this.ctx.storage.get<string>("accountId")
if (!accountId) return
- const db = createDb(this.env.DB)
+ const db = this.db
const account = await queries.emailAccount.getEmailAccountById(db, accountId)
if (!account) {
await this.ctx.storage.deleteAlarm()
@@ -124,6 +129,10 @@ export class ImapPollerDO extends DurableObject<EmailEnv> {
const sorted = uids.sort((a, b) => a - b)
const batch = sorted.slice(0, MAX_EMAILS_PER_POLL)
+ const whitelist = await queries.whitelist.buildWhitelistSet(
+ db, account.agentId, account.workspaceId
+ )
+
let maxUid = lastUid
for (const uid of batch) {
const tag = `F${uid}`
@@ -145,9 +154,7 @@ export class ImapPollerDO extends DurableObject<EmailEnv> {
})
const fromAddr = parsed.from?.address || parsed.from?.name || ""
- const isWhitelisted = await queries.whitelist.isWhitelisted(
- db, account.agentId, account.workspaceId, fromAddr
- )
+ const isWhitelisted = whitelist.check(fromAddr)
let meetingInfo: MeetingInfo | null = null
const icsAttachment = parsed.attachments?.find(
diff --git a/src/shared/src/db/queries/agent-link.ts b/src/shared/src/db/queries/agent-link.ts
index 83c26b122..eaa7905ef 100644
--- a/src/shared/src/db/queries/agent-link.ts
+++ b/src/shared/src/db/queries/agent-link.ts
@@ -1,12 +1,20 @@
-import { eq, and, or } from "drizzle-orm";
+import { eq, and, or, inArray } from "drizzle-orm";
import { agentLink, agent } from "../schema";
import type { Database } from "../index";
-export async function listByWorkspace(db: Database, workspaceId: string) {
- return db
+export async function listByWorkspace(
+ db: Database,
+ workspaceId: string,
+ opts?: { limit?: number; offset?: number },
+) {
+ let q = db
.select()
.from(agentLink)
- .where(eq(agentLink.workspaceId, workspaceId));
+ .where(eq(agentLink.workspaceId, workspaceId))
+ .$dynamic();
+ if (opts?.limit) q = q.limit(opts.limit);
+ if (opts?.offset) q = q.offset(opts.offset);
+ return q;
}
export async function listByAgent(db: Database, agentId: string, workspaceId: string) {
@@ -119,3 +127,53 @@ export async function getColleaguesForAgent(
return [...asSource, ...asTarget];
}
+
+export async function getColleaguesForAgents(
+ db: Database,
+ agentIds: string[],
+ workspaceId: string,
+) {
+ if (agentIds.length === 0) return [];
+
+ const asSource = await db
+ .select({
+ agentId: agentLink.sourceAgentId,
+ name: agent.name,
+ emailHandle: agent.emailHandle,
+ description: agent.description,
+ instruction: agentLink.instruction,
+ })
+ .from(agentLink)
+ .innerJoin(
+ agent,
+ and(eq(agent.id, agentLink.targetAgentId), eq(agent.workspaceId, agentLink.workspaceId)),
+ )
+ .where(
+ and(
+ inArray(agentLink.sourceAgentId, agentIds),
+ eq(agentLink.workspaceId, workspaceId),
+ ),
+ );
+
+ const asTarget = await db
+ .select({
+ agentId: agentLink.targetAgentId,
+ name: agent.name,
+ emailHandle: agent.emailHandle,
+ description: agent.description,
+ instruction: agentLink.instruction,
+ })
+ .from(agentLink)
+ .innerJoin(
+ agent,
+ and(eq(agent.id, agentLink.sourceAgentId), eq(agent.workspaceId, agentLink.workspaceId)),
+ )
+ .where(
+ and(
+ inArray(agentLink.targetAgentId, agentIds),
+ eq(agentLink.workspaceId, workspaceId),
+ ),
+ );
+
+ return [...asSource, ...asTarget];
+}
diff --git a/src/shared/src/db/queries/agent.ts b/src/shared/src/db/queries/agent.ts
index 51f505d1e..06a235c07 100644
--- a/src/shared/src/db/queries/agent.ts
+++ b/src/shared/src/db/queries/agent.ts
@@ -1,4 +1,4 @@
-import { eq, and, desc, or, exists } from "drizzle-orm";
+import { eq, and, desc, or, exists, inArray } from "drizzle-orm";
import { agent, agentAccess } from "../schema";
import type { Database } from "../index";
@@ -147,3 +147,11 @@ export async function getAgentByHandle(db: Database, emailHandle: string) {
.where(eq(agent.emailHandle, emailHandle));
return rows[0] ?? null;
}
+
+export async function getAgentsByIds(db: Database, ids: string[], workspaceId: string) {
+ if (ids.length === 0) return [];
+ return db
+ .select()
+ .from(agent)
+ .where(and(inArray(agent.id, ids), eq(agent.workspaceId, workspaceId)));
+}
diff --git a/src/shared/src/db/queries/conversation.ts b/src/shared/src/db/queries/conversation.ts
index fb5f84d87..467a73f4d 100644
--- a/src/shared/src/db/queries/conversation.ts
+++ b/src/shared/src/db/queries/conversation.ts
@@ -1,4 +1,4 @@
-import { eq, and, desc, count, ne, lt, sql } from "drizzle-orm";
+import { eq, and, desc, ne, lt, sql } from "drizzle-orm";
import { conversation, message } from "../schema";
import type { Database } from "../index";
import { TASK_TYPES, type TaskType } from "../../constants";
@@ -81,12 +81,11 @@ export async function listConversationsByAgent(
title: conversation.title,
channel: conversation.channel,
createdAt: conversation.createdAt,
- messageCount: count(message.id).mapWith(Number),
+ messageCount:
+ sql<number>`(SELECT COUNT(*) FROM message WHERE ${message.conversationId} = ${conversation.id} AND ${message.status} = 'active')`.mapWith(Number),
})
.from(conversation)
- .leftJoin(message, and(eq(message.conversationId, conversation.id), eq(message.status, "active")))
.where(and(...conditions))
- .groupBy(conversation.id)
.orderBy(desc(conversation.createdAt));
}
diff --git a/src/shared/src/db/queries/email-account.ts b/src/shared/src/db/queries/email-account.ts
index 3f50fa1f9..a6199bb65 100644
--- a/src/shared/src/db/queries/email-account.ts
+++ b/src/shared/src/db/queries/email-account.ts
@@ -1,4 +1,4 @@
-import { eq, and } from "drizzle-orm";
+import { eq, and, inArray } from "drizzle-orm";
import { agentEmailAccount } from "../schema";
import type { Database } from "../index";
@@ -100,3 +100,11 @@ export async function deleteEmailAccount(db: Database, id: string, workspaceId:
.returning();
return rows[0] ?? null;
}
+
+export async function getEmailAccountsByAgents(db: Database, agentIds: string[], workspaceId: string) {
+ if (agentIds.length === 0) return [];
+ return db
+ .select()
+ .from(agentEmailAccount)
+ .where(and(inArray(agentEmailAccount.agentId, agentIds), eq(agentEmailAccount.workspaceId, workspaceId)));
+}
diff --git a/src/shared/src/db/queries/meeting-session.ts b/src/shared/src/db/queries/meeting-session.ts
index 04b40ebef..d799390b2 100644
--- a/src/shared/src/db/queries/meeting-session.ts
+++ b/src/shared/src/db/queries/meeting-session.ts
@@ -1,4 +1,4 @@
-import { eq, and, desc, lte, isNotNull } from "drizzle-orm";
+import { eq, and, desc, lte, isNotNull, inArray } from "drizzle-orm";
import { meetingSession, agent } from "../schema";
import type { Database } from "../index";
@@ -120,6 +120,26 @@ export async function claimMeetingSession(
return rows[0] ?? null;
}
+export async function claimMeetingSessions(
+ db: Database,
+ ids: string[],
+ workspaceId: string,
+ startedAt: string,
+) {
+ if (ids.length === 0) return [];
+ return db
+ .update(meetingSession)
+ .set({ status: "joining", startedAt, updatedAt: new Date().toISOString() })
+ .where(
+ and(
+ inArray(meetingSession.id, ids),
+ eq(meetingSession.workspaceId, workspaceId),
+ eq(meetingSession.status, "scheduled"),
+ )
+ )
+ .returning();
+}
+
export async function deleteMeetingSession(
db: Database,
id: string,
diff --git a/src/shared/src/db/queries/message.ts b/src/shared/src/db/queries/message.ts
index 2dd3ca4d4..dcc7b603e 100644
--- a/src/shared/src/db/queries/message.ts
+++ b/src/shared/src/db/queries/message.ts
@@ -1,4 +1,4 @@
-import { eq, asc, desc, and, lt, or, count, sql } from "drizzle-orm";
+import { eq, asc, desc, and, lt, gte, or, count } from "drizzle-orm";
import { message } from "../schema";
import type { Database } from "../index";
@@ -209,31 +209,32 @@ export async function listMessagesAroundTask(
const pivot = target[0]!.createdAt;
- const before = await db
- .select()
- .from(message)
- .where(
- and(
- eq(message.conversationId, conversationId),
- eq(message.status, "active"),
- lt(message.createdAt, pivot)
+ const [before, atAndAfter] = await Promise.all([
+ db
+ .select()
+ .from(message)
+ .where(
+ and(
+ eq(message.conversationId, conversationId),
+ eq(message.status, "active"),
+ lt(message.createdAt, pivot)
+ )
)
- )
- .orderBy(desc(message.createdAt))
- .limit(limit);
-
- const atAndAfter = await db
- .select()
- .from(message)
- .where(
- and(
- eq(message.conversationId, conversationId),
- eq(message.status, "active"),
- sql`${message.createdAt} >= ${pivot}`
+ .orderBy(desc(message.createdAt))
+ .limit(limit),
+ db
+ .select()
+ .from(message)
+ .where(
+ and(
+ eq(message.conversationId, conversationId),
+ eq(message.status, "active"),
+ gte(message.createdAt, pivot)
+ )
)
- )
- .orderBy(asc(message.createdAt))
- .limit(limit + 1);
+ .orderBy(asc(message.createdAt))
+ .limit(limit + 1),
+ ]);
return [...before.reverse(), ...atAndAfter];
}
diff --git a/src/shared/src/db/queries/overview.ts b/src/shared/src/db/queries/overview.ts
index 6167c1736..a5b6f5fc3 100644
--- a/src/shared/src/db/queries/overview.ts
+++ b/src/shared/src/db/queries/overview.ts
@@ -1,52 +1,24 @@
-import { eq, and, count, desc, inArray, gte, ne, lt, sql } from "drizzle-orm";
+import { eq, and, count, desc, inArray, ne, sql } from "drizzle-orm";
import { emails, agentEmailAccount, agentTaskQueue, conversation } from "../schema";
import type { Database } from "../index";
import { TASK_TYPES } from "../../constants";
export async function getEmailStatsByWorkspace(db: Database, workspaceId: string) {
- const rows = await db
+ const [stats] = await db
.select({
- direction: emails.direction,
- cnt: count(),
+ inbound: sql<number>`sum(case when ${emails.direction} = 'inbound' then 1 else 0 end)`,
+ outbound: sql<number>`sum(case when ${emails.direction} = 'outbound' then 1 else 0 end)`,
+ unread: sql<number>`sum(case when ${emails.status} = 'unread' and ${emails.direction} = 'inbound' then 1 else 0 end)`,
+ rejected: sql<number>`sum(case when ${emails.isWhitelisted} = 0 and ${emails.direction} = 'inbound' then 1 else 0 end)`,
})
.from(emails)
- .where(eq(emails.workspaceId, workspaceId))
- .groupBy(emails.direction);
-
- const unreadRows = await db
- .select({ cnt: count() })
- .from(emails)
- .where(
- and(
- eq(emails.workspaceId, workspaceId),
- eq(emails.status, "unread"),
- eq(emails.direction, "inbound")
- )
- );
-
- const rejectedRows = await db
- .select({ cnt: count() })
- .from(emails)
- .where(
- and(
- eq(emails.workspaceId, workspaceId),
- eq(emails.isWhitelisted, false),
- eq(emails.direction, "inbound")
- )
- );
-
- let inbound = 0;
- let outbound = 0;
- for (const r of rows) {
- if (r.direction === "inbound") inbound = Number(r.cnt);
- if (r.direction === "outbound") outbound = Number(r.cnt);
- }
+ .where(eq(emails.workspaceId, workspaceId));
return {
- inbound,
- outbound,
- unread: Number(unreadRows[0]?.cnt ?? 0),
- rejected: Number(rejectedRows[0]?.cnt ?? 0),
+ inbound: Number(stats?.inbound ?? 0),
+ outbound: Number(stats?.outbound ?? 0),
+ unread: Number(stats?.unread ?? 0),
+ rejected: Number(stats?.rejected ?? 0),
};
}
@@ -69,60 +41,25 @@ export async function getTaskStatsByWorkspace(
workspaceId: string,
todayStart: string
) {
- const terminalRows = await db
+ const staleThreshold = new Date(Date.now() - 3600 * 1000).toISOString();
+
+ const [stats] = await db
.select({
- status: agentTaskQueue.status,
- cnt: count(),
+ completed: sql<number>`sum(case when ${agentTaskQueue.status} = 'completed' and ${agentTaskQueue.type} != ${TASK_TYPES.KILL_TASK} and ${agentTaskQueue.completedAt} >= ${todayStart} then 1 else 0 end)`,
+ failed: sql<number>`sum(case when ${agentTaskQueue.status} = 'failed' and ${agentTaskQueue.type} != ${TASK_TYPES.KILL_TASK} and ${agentTaskQueue.completedAt} >= ${todayStart} then 1 else 0 end)`,
+ cancelled: sql<number>`sum(case when ${agentTaskQueue.status} = 'cancelled' and ${agentTaskQueue.type} != ${TASK_TYPES.KILL_TASK} and ${agentTaskQueue.completedAt} >= ${todayStart} then 1 else 0 end)`,
+ queued: sql<number>`sum(case when ${agentTaskQueue.status} = 'queued' and ${agentTaskQueue.type} != ${TASK_TYPES.KILL_TASK} then 1 else 0 end)`,
+ stale: sql<number>`sum(case when ${agentTaskQueue.status} = 'running' and ${agentTaskQueue.startedAt} < ${staleThreshold} then 1 else 0 end)`,
})
.from(agentTaskQueue)
- .where(
- and(
- eq(agentTaskQueue.workspaceId, workspaceId),
- ne(agentTaskQueue.type, TASK_TYPES.KILL_TASK),
- gte(agentTaskQueue.completedAt, todayStart),
- inArray(agentTaskQueue.status, ["completed", "failed", "cancelled"])
- )
- )
- .groupBy(agentTaskQueue.status);
-
- const queuedRows = await db
- .select({ cnt: count() })
- .from(agentTaskQueue)
- .where(
- and(
- eq(agentTaskQueue.workspaceId, workspaceId),
- eq(agentTaskQueue.status, "queued"),
- ne(agentTaskQueue.type, TASK_TYPES.KILL_TASK)
- )
- );
-
- const staleThreshold = new Date(Date.now() - 3600 * 1000).toISOString();
- const staleRows = await db
- .select({ cnt: count() })
- .from(agentTaskQueue)
- .where(
- and(
- eq(agentTaskQueue.workspaceId, workspaceId),
- eq(agentTaskQueue.status, "running"),
- lt(agentTaskQueue.startedAt, staleThreshold)
- )
- );
-
- let completed = 0;
- let failed = 0;
- let cancelled = 0;
- for (const r of terminalRows) {
- if (r.status === "completed") completed = Number(r.cnt);
- if (r.status === "failed") failed = Number(r.cnt);
- if (r.status === "cancelled") cancelled = Number(r.cnt);
- }
+ .where(eq(agentTaskQueue.workspaceId, workspaceId));
return {
- completed,
- failed,
- cancelled,
- queued: Number(queuedRows[0]?.cnt ?? 0),
- stale: Number(staleRows[0]?.cnt ?? 0),
+ completed: Number(stats?.completed ?? 0),
+ failed: Number(stats?.failed ?? 0),
+ cancelled: Number(stats?.cancelled ?? 0),
+ queued: Number(stats?.queued ?? 0),
+ stale: Number(stats?.stale ?? 0),
};
}
diff --git a/src/shared/src/db/queries/runtime.ts b/src/shared/src/db/queries/runtime.ts
index 427992741..7ce100976 100644
--- a/src/shared/src/db/queries/runtime.ts
+++ b/src/shared/src/db/queries/runtime.ts
@@ -1,4 +1,4 @@
-import { eq, and, asc, sql } from "drizzle-orm";
+import { eq, and, asc, sql, inArray } from "drizzle-orm";
import { agentRuntime, agent, machine } from "../schema";
import type { Database } from "../index";
@@ -126,12 +126,11 @@ export async function deleteRuntimesByDaemonId(
if (runtimes.length === 0) return;
- for (const r of runtimes) {
- await db
- .update(agent)
- .set({ runtimeId: null, updatedAt: new Date().toISOString() })
- .where(eq(agent.runtimeId, r.id));
- }
+ const runtimeIds = runtimes.map(r => r.id);
+ await db
+ .update(agent)
+ .set({ runtimeId: null, updatedAt: new Date().toISOString() })
+ .where(inArray(agent.runtimeId, runtimeIds));
await db
.delete(agentRuntime)
diff --git a/src/shared/src/db/queries/task-message.ts b/src/shared/src/db/queries/task-message.ts
index 4672211f7..d782896b6 100644
--- a/src/shared/src/db/queries/task-message.ts
+++ b/src/shared/src/db/queries/task-message.ts
@@ -75,7 +75,8 @@ export async function deleteTaskMessages(db: Database, taskId: string) {
}
const HIDDEN_STEP_TYPES = ["status", "log", "tool-result", "text"];
-const CHUNK_SIZE = 50;
+const SQLITE_MAX_PARAMS = 999;
+const FIXED_PARAMS = 1 + HIDDEN_STEP_TYPES.length; // workspaceId + notInArray values
export async function countTaskMessagesByTaskIds(
db: Database,
@@ -84,9 +85,30 @@ export async function countTaskMessagesByTaskIds(
): Promise<Array<{ taskId: string; count: number }>> {
if (taskIds.length === 0) return [];
+ const chunkSize = SQLITE_MAX_PARAMS - FIXED_PARAMS;
+
+ if (taskIds.length <= chunkSize) {
+ const rows = await db
+ .select({
+ taskId: taskMessage.taskId,
+ count: count(taskMessage.id),
+ })
+ .from(taskMessage)
+ .innerJoin(agentTaskQueue, eq(taskMessage.taskId, agentTaskQueue.id))
+ .where(
+ and(
+ inArray(taskMessage.taskId, taskIds),
+ eq(agentTaskQueue.workspaceId, workspaceId),
+ notInArray(taskMessage.type, HIDDEN_STEP_TYPES)
+ )
+ )
+ .groupBy(taskMessage.taskId);
+ return rows.map((r) => ({ taskId: r.taskId, count: r.count }));
+ }
+
const results: Array<{ taskId: string; count: number }> = [];
- for (let i = 0; i < taskIds.length; i += CHUNK_SIZE) {
- const chunk = taskIds.slice(i, i + CHUNK_SIZE);
+ for (let i = 0; i < taskIds.length; i += chunkSize) {
+ const chunk = taskIds.slice(i, i + chunkSize);
const rows = await db
.select({
taskId: taskMessage.taskId,
diff --git a/src/shared/src/db/queries/task.ts b/src/shared/src/db/queries/task.ts
index 5780130a0..e4b6ee05f 100644
--- a/src/shared/src/db/queries/task.ts
+++ b/src/shared/src/db/queries/task.ts
@@ -209,20 +209,46 @@ export async function claimTask(db: Database, agentId: string, workspaceId: stri
if (candidates.length === 0) return null;
- const rows = await db
- .update(agentTaskQueue)
- .set({ status: "dispatched", dispatchedAt: new Date().toISOString() })
- .where(
- and(
- eq(agentTaskQueue.id, candidates[0].id),
- eq(agentTaskQueue.status, "queued")
+ // Atomic claim: UPDATE WHERE status = 'queued' prevents double-dispatch.
+ // If another runtime raced us to this candidate, retry with a fresh candidate.
+ const now = new Date().toISOString();
+ for (let attempt = 0; attempt < 3; attempt++) {
+ const targetId = attempt === 0
+ ? candidates[0].id
+ : (await db
+ .select({ id: agentTaskQueue.id })
+ .from(agentTaskQueue)
+ .where(
+ and(
+ eq(agentTaskQueue.agentId, agentId),
+ eq(agentTaskQueue.workspaceId, workspaceId),
+ eq(agentTaskQueue.status, "queued"),
+ ...(allBlockedConvIds.length > 0
+ ? [notInArray(agentTaskQueue.conversationId, allBlockedConvIds)]
+ : [])
+ )
+ )
+ .orderBy(desc(agentTaskQueue.priority), asc(agentTaskQueue.createdAt))
+ .limit(1)
+ .then(r => r[0]?.id));
+
+ if (!targetId) return null;
+
+ const rows = await db
+ .update(agentTaskQueue)
+ .set({ status: "dispatched", dispatchedAt: now })
+ .where(
+ and(
+ eq(agentTaskQueue.id, targetId),
+ eq(agentTaskQueue.status, "queued")
+ )
)
- )
- .returning();
+ .returning();
- const row = rows[0] ?? null;
- if (!row) return null;
- return ClaimedTaskRowSchema.parse(row);
+ const row = rows[0];
+ if (row) return ClaimedTaskRowSchema.parse(row);
+ }
+ return null;
}
export async function startTask(db: Database, id: string, workspaceId: string) {
@@ -546,22 +572,20 @@ export async function claimKillTasks(
.orderBy(asc(agentTaskQueue.createdAt))
.limit(limit);
- const claimed = [];
- for (const candidate of candidates) {
- const rows = await db
- .update(agentTaskQueue)
- .set({ status: "dispatched", dispatchedAt: new Date().toISOString() })
- .where(
- and(
- eq(agentTaskQueue.id, candidate.id),
- eq(agentTaskQueue.status, "queued")
- )
+ const ids = candidates.map(c => c.id);
+ if (ids.length === 0) return [];
+
+ const rows = await db
+ .update(agentTaskQueue)
+ .set({ status: "dispatched", dispatchedAt: new Date().toISOString() })
+ .where(
+ and(
+ inArray(agentTaskQueue.id, ids),
+ eq(agentTaskQueue.status, "queued")
)
- .returning();
- const row = rows[0];
- if (row) claimed.push(ClaimedTaskRowSchema.parse(row));
- }
- return claimed;
+ )
+ .returning();
+ return rows.map(r => ClaimedTaskRowSchema.parse(r));
}
const KILL_TASK_STALE_SECONDS = 30;
@@ -591,6 +615,30 @@ const DEFAULT_STALE_RUNNING_SECONDS = Number(process.env.ALOOK_STALE_RUNNING_TIM
export async function failStaleRunningTasks(db: Database, workspaceId: string, staleSeconds = DEFAULT_STALE_RUNNING_SECONDS) {
const threshold = new Date(Date.now() - staleSeconds * 1000).toISOString();
+
+ const lastMsg = db
+ .select({
+ taskId: taskMessage.taskId,
+ lastMessageAt: sql<string>`max(${taskMessage.createdAt})`.as("last_message_at"),
+ })
+ .from(taskMessage)
+ .groupBy(taskMessage.taskId)
+ .as("last_msg");
+
+ const staleTasks = await db
+ .select({ id: agentTaskQueue.id })
+ .from(agentTaskQueue)
+ .leftJoin(lastMsg, eq(lastMsg.taskId, agentTaskQueue.id))
+ .where(
+ and(
+ eq(agentTaskQueue.workspaceId, workspaceId),
+ eq(agentTaskQueue.status, "running"),
+ lt(sql`coalesce(${lastMsg.lastMessageAt}, ${agentTaskQueue.startedAt})`, threshold)
+ )
+ );
+
+ if (staleTasks.length === 0) return [];
+
const rows = await db
.update(agentTaskQueue)
.set({
@@ -598,19 +646,7 @@ export async function failStaleRunningTasks(db: Database, workspaceId: string, s
completedAt: new Date().toISOString(),
error: `timed out in running state (no message activity for ${Math.round(staleSeconds / 60)} minutes)`,
})
- .where(
- and(
- eq(agentTaskQueue.workspaceId, workspaceId),
- eq(agentTaskQueue.status, "running"),
- lt(
- sql`coalesce(
- (select max(${taskMessage.createdAt}) from ${taskMessage} where ${taskMessage.taskId} = ${agentTaskQueue.id}),
- ${agentTaskQueue.startedAt}
- )`,
- threshold
- )
- )
- )
+ .where(and(inArray(agentTaskQueue.id, staleTasks.map(t => t.id)), eq(agentTaskQueue.status, "running")))
.returning({ agentId: agentTaskQueue.agentId, workspaceId: agentTaskQueue.workspaceId, conversationId: agentTaskQueue.conversationId });
return rows;
}
@@ -685,8 +721,6 @@ export async function listTraces(
opts?: { status?: string; limit?: number; before?: string; multiAgent?: boolean; agentId?: string; channel?: string }
) {
const limit = opts?.limit ?? 30;
- // When filtering by computed status, overfetch roots to compensate
- const rootFetchLimit = opts?.status ? limit * 10 : limit;
const conditions = [
eq(agentTaskQueue.workspaceId, workspaceId),
@@ -720,6 +754,48 @@ export async function listTraces(
);
}
+ // Push status filter to DB via EXISTS subqueries
+ if (opts?.status) {
+ const traceTask = alias(agentTaskQueue, "trace_task");
+ if (opts.status === "active") {
+ conditions.push(
+ exists(
+ db.select()
+ .from(traceTask)
+ .where(
+ and(
+ eq(traceTask.traceId, agentTaskQueue.traceId),
+ ne(traceTask.type, TASK_TYPES.KILL_TASK),
+ inArray(traceTask.status, ["queued", "dispatched", "running"])
+ )
+ )
+ )
+ );
+ } else if (opts.status === "completed") {
+ conditions.push(
+ sql`NOT EXISTS (SELECT 1 FROM ${agentTaskQueue} tt WHERE tt.trace_id = ${agentTaskQueue.traceId} AND tt.type != ${TASK_TYPES.KILL_TASK} AND tt.status IN ('queued', 'dispatched', 'running', 'failed'))`
+ );
+ } else if (opts.status === "failed") {
+ conditions.push(
+ sql`NOT EXISTS (SELECT 1 FROM ${agentTaskQueue} tt WHERE tt.trace_id = ${agentTaskQueue.traceId} AND tt.type != ${TASK_TYPES.KILL_TASK} AND tt.status IN ('queued', 'dispatched', 'running'))`
+ );
+ const failedTask = alias(agentTaskQueue, "failed_task");
+ conditions.push(
+ exists(
+ db.select()
+ .from(failedTask)
+ .where(
+ and(
+ eq(failedTask.traceId, agentTaskQueue.traceId),
+ ne(failedTask.type, TASK_TYPES.KILL_TASK),
+ eq(failedTask.status, "failed")
+ )
+ )
+ )
+ );
+ }
+ }
+
const rootTasks = await db
.select({
id: agentTaskQueue.id,
@@ -733,12 +809,12 @@ export async function listTraces(
.leftJoin(conversation, eq(agentTaskQueue.conversationId, conversation.id))
.where(and(...conditions))
.orderBy(desc(agentTaskQueue.createdAt))
- .limit(rootFetchLimit + 1);
+ .limit(limit + 1);
if (rootTasks.length === 0) return { traces: [], hasMore: false };
- const moreRootsExist = rootTasks.length > rootFetchLimit;
- const roots = rootTasks.slice(0, rootFetchLimit);
+ const hasMore = rootTasks.length > limit;
+ const roots = rootTasks.slice(0, limit);
const traceIds = roots.map(r => r.traceId).filter((id): id is string => !!id);
if (traceIds.length === 0) return { traces: [], hasMore: false };
@@ -788,8 +864,6 @@ export async function listTraces(
else if (hasFailed) traceStatus = "failed";
else traceStatus = "completed";
- if (opts?.status && traceStatus !== opts.status) continue;
-
const allTerminal = tasks.every(t => ["completed", "failed", "cancelled", "superseded"].includes(t.status));
const completedAt = allTerminal
? tasks.reduce((max, t) => (t.completedAt && t.completedAt > (max ?? "")) ? t.completedAt : max, null as string | null)
@@ -808,8 +882,7 @@ export async function listTraces(
});
}
- const hasMore = moreRootsExist || traces.length > limit;
- return { traces: traces.slice(0, limit), hasMore };
+ return { traces, hasMore };
}
export async function getTraceTree(
diff --git a/src/shared/src/db/queries/whitelist.ts b/src/shared/src/db/queries/whitelist.ts
index 94f2c7197..ab9d440eb 100644
--- a/src/shared/src/db/queries/whitelist.ts
+++ b/src/shared/src/db/queries/whitelist.ts
@@ -71,3 +71,30 @@ export async function isWhitelisted(db: Database, agentId: string, workspaceId:
.limit(1);
return rows.length > 0;
}
+
+/** Pre-fetch whitelist + workspace agent handles for O(1) batch lookups. */
+export async function buildWhitelistSet(
+ db: Database, agentId: string, workspaceId: string
+): Promise<{ check: (email: string) => boolean }> {
+ const [whitelistRows, agentRows] = await Promise.all([
+ db.select({ email: agentWhitelist.email })
+ .from(agentWhitelist)
+ .where(and(eq(agentWhitelist.agentId, agentId), eq(agentWhitelist.workspaceId, workspaceId))),
+ db.select({ emailHandle: agent.emailHandle })
+ .from(agent)
+ .where(eq(agent.workspaceId, workspaceId)),
+ ]);
+
+ const emailSet = new Set(whitelistRows.map(r => r.email));
+ const handleSet = new Set(
+ agentRows.filter(r => r.emailHandle).map(r => r.emailHandle!)
+ );
+
+ return {
+ check(email: string): boolean {
+ const handle = parseEmailHandle(email);
+ if (handle && handleSet.has(handle)) return true;
+ return emailSet.has(email);
+ },
+ };
+}
diff --git a/src/shared/src/db/schema.ts b/src/shared/src/db/schema.ts
index c5f4b6a70..34dfd452c 100644
--- a/src/shared/src/db/schema.ts
+++ b/src/shared/src/db/schema.ts
@@ -25,18 +25,22 @@ export const user = sqliteTable("user", {
updatedAt: text("updatedAt").notNull().$defaultFn(() => new Date().toISOString()),
});
-export const session = sqliteTable("session", {
- id: text("id").primaryKey().$defaultFn(() => nanoid()),
- userId: text("userId")
- .notNull()
- .references(() => user.id, { onDelete: "cascade" }),
- token: text("token").unique().notNull(),
- expiresAt: text("expiresAt").notNull(),
- ipAddress: text("ipAddress"),
- userAgent: text("userAgent"),
- createdAt: text("createdAt").notNull().$defaultFn(() => new Date().toISOString()),
- updatedAt: text("updatedAt").notNull().$defaultFn(() => new Date().toISOString()),
-});
+export const session = sqliteTable(
+ "session",
+ {
+ id: text("id").primaryKey().$defaultFn(() => nanoid()),
+ userId: text("userId")
+ .notNull()
+ .references(() => user.id, { onDelete: "cascade" }),
+ token: text("token").unique().notNull(),
+ expiresAt: text("expiresAt").notNull(),
+ ipAddress: text("ipAddress"),
+ userAgent: text("userAgent"),
+ createdAt: text("createdAt").notNull().$defaultFn(() => new Date().toISOString()),
+ updatedAt: text("updatedAt").notNull().$defaultFn(() => new Date().toISOString()),
+ },
+ (t) => [index("idx_session_token_expires").on(t.token, t.expiresAt)]
+);
export const account = sqliteTable("account", {
id: text("id").primaryKey().$defaultFn(() => nanoid()),
@@ -451,7 +455,10 @@ export const taskMessage = sqliteTable(
output: text("output").notNull().default(""),
createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),
},
- (t) => [index("idx_task_message_task_seq").on(t.taskId, t.seq)]
+ (t) => [
+ index("idx_task_message_task_seq").on(t.taskId, t.seq),
+ index("idx_task_message_task_created").on(t.taskId, t.createdAt),
+ ]
);
export const emails = sqliteTable(
@@ -480,6 +487,11 @@ export const emails = sqliteTable(
columns: [t.agentId, t.workspaceId],
foreignColumns: [agent.id, agent.workspaceId],
}).onDelete("cascade"),
+ index("idx_emails_agent_ws_status").on(t.agentId, t.workspaceId, t.status),
+ index("idx_emails_to_direction").on(t.toEmail, t.direction),
+ index("idx_emails_from_direction").on(t.fromEmail, t.direction),
+ index("idx_emails_message_id").on(t.messageId),
+ index("idx_emails_created_at").on(t.createdAt),
]
);
diff --git a/src/web/migrations/0024_add_missing_indexes.sql b/src/web/migrations/0024_add_missing_indexes.sql
new file mode 100644
index 000000000..0c25a2dcf
--- /dev/null
+++ b/src/web/migrations/0024_add_missing_indexes.sql
@@ -0,0 +1,29 @@
+-- Add missing indexes on emails, taskMessage, and session tables
+
+-- emails: composite index for status-based queries (inbox filtered by status)
+CREATE INDEX IF NOT EXISTS idx_emails_agent_ws_status
+ ON emails(agent_id, workspace_id, status);
+
+-- emails: recipient + direction lookups
+CREATE INDEX IF NOT EXISTS idx_emails_to_direction
+ ON emails(to_email, direction);
+
+-- emails: sender + direction lookups
+CREATE INDEX IF NOT EXISTS idx_emails_from_direction
+ ON emails(from_email, direction);
+
+-- emails: message-id threading lookups
+CREATE INDEX IF NOT EXISTS idx_emails_message_id
+ ON emails(message_id);
+
+-- emails: ordering by created_at
+CREATE INDEX IF NOT EXISTS idx_emails_created_at
+ ON emails(created_at);
+
+-- task_message: stale detection by task + timestamp
+CREATE INDEX IF NOT EXISTS idx_task_message_task_created
+ ON task_message(task_id, created_at);
+
+-- session: auth hot path covering index (token lookup with expiry filter)
+CREATE INDEX IF NOT EXISTS idx_session_token_expires
+ ON session(token, expiresAt);
diff --git a/src/web/src/app/api/agent-links/route.ts b/src/web/src/app/api/agent-links/route.ts
index 70e59c524..4532ee661 100644
--- a/src/web/src/app/api/agent-links/route.ts
+++ b/src/web/src/app/api/agent-links/route.ts
@@ -18,7 +18,11 @@ export const GET = withAuth(async (req: NextRequest, ctx) => {
const { env } = getCloudflareContext();
const db = getDb((env as Env).DB);
- const rows = await queries.agentLink.listByWorkspace(db, ws.workspaceId);
+ const url = new URL(req.url);
+ const limit = Math.min(Number(url.searchParams.get("limit")) || 200, 500);
+ const offset = Number(url.searchParams.get("offset")) || 0;
+
+ const rows = await queries.agentLink.listByWorkspace(db, ws.workspaceId, { limit, offset });
return writeJSON(rows.map(agentLinkToResponse));
});
diff --git a/src/web/src/app/api/daemon/tasks/poll/route.test.ts b/src/web/src/app/api/daemon/tasks/poll/route.test.ts
index 0c1be706c..e082d786e 100644
--- a/src/web/src/app/api/daemon/tasks/poll/route.test.ts
+++ b/src/web/src/app/api/daemon/tasks/poll/route.test.ts
@@ -5,7 +5,8 @@ const mockGetRuntimeIdsByDaemon = vi.fn();
const mockUpsertMachine = vi.fn();
const mockGetMachineByDaemon = vi.fn();
const mockClearPendingUpdateVersion = vi.fn();
-const mockGetAgent = vi.fn();
+const mockClearPendingRescan = vi.fn();
+const mockGetAgentsByIds = vi.fn();
const mockGetMemberByUserAndWorkspace = vi.fn();
const mockGetConversation = vi.fn();
const mockGetUser = vi.fn();
@@ -16,7 +17,9 @@ const mockGetPendingFileRequests = vi.fn();
const mockMarkFileRequestsDispatched = vi.fn();
const mockExpireStaleFileRequests = vi.fn();
const mockListScheduledMeetings = vi.fn();
-const mockClaimMeetingSession = vi.fn();
+const mockClaimMeetingSessions = vi.fn();
+const mockGetEmailAccountsByAgents = vi.fn();
+const mockGetColleaguesForAgents = vi.fn();
vi.mock("@opennextjs/cloudflare", () => ({
getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),
@@ -37,9 +40,10 @@ vi.mock("@alook/shared", async () => {
upsertMachine: (...args: unknown[]) => mockUpsertMachine(...args),
getMachineByDaemon: (...args: unknown[]) => mockGetMachineByDaemon(...args),
clearPendingUpdateVersion: (...args: unknown[]) => mockClearPendingUpdateVersion(...args),
+ clearPendingRescan: (...args: unknown[]) => mockClearPendingRescan(...args),
},
agent: {
- getAgent: (...args: unknown[]) => mockGetAgent(...args),
+ getAgentsByIds: (...args: unknown[]) => mockGetAgentsByIds(...args),
},
member: {
getMemberByUserAndWorkspace: (...args: unknown[]) => mockGetMemberByUserAndWorkspace(...args),
@@ -51,7 +55,7 @@ vi.mock("@alook/shared", async () => {
getUser: (...args: unknown[]) => mockGetUser(...args),
},
emailAccount: {
- getEmailAccountsByAgent: vi.fn().mockResolvedValue([]),
+ getEmailAccountsByAgents: (...args: unknown[]) => mockGetEmailAccountsByAgents(...args),
},
workspaceFileRequest: {
getPendingByWorkspace: (...args: unknown[]) => mockGetPendingFileRequests(...args),
@@ -60,10 +64,10 @@ vi.mock("@alook/shared", async () => {
},
meetingSession: {
listScheduledMeetings: (...args: unknown[]) => mockListScheduledMeetings(...args),
- claimMeetingSession: (...args: unknown[]) => mockClaimMeetingSession(...args),
+ claimMeetingSessions: (...args: unknown[]) => mockClaimMeetingSessions(...args),
},
agentLink: {
- getColleaguesForAgent: vi.fn().mockResolvedValue([]),
+ getColleaguesForAgents: (...args: unknown[]) => mockGetColleaguesForAgents(...args),
},
},
};
@@ -131,6 +135,9 @@ describe("POST /api/daemon/tasks/poll", () => {
mockGetPendingFileRequests.mockResolvedValue([]);
mockExpireStaleFileRequests.mockResolvedValue(undefined);
mockListScheduledMeetings.mockResolvedValue([]);
+ mockGetAgentsByIds.mockResolvedValue([]);
+ mockGetEmailAccountsByAgents.mockResolvedValue([]);
+ mockGetColleaguesForAgents.mockResolvedValue([]);
});
it("returns evicted: true and skips heartbeat when daemon has no runtimes", async () => {
@@ -188,11 +195,12 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", prompt: "do it", status: "dispatched" },
]);
- mockGetAgent.mockResolvedValue({
+ mockGetAgentsByIds.mockResolvedValue([{
+ id: "a1",
instructions: "be helpful",
name: "Bot",
runtimeConfig: { model: "gpt-4" },
- });
+ }]);
const res = await POST(postReq({ daemon_id: "d1", max_tasks: 3 }));
const body = await res.json();
@@ -386,13 +394,13 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", prompt: "hi", status: "dispatched" },
]);
- mockGetAgent.mockResolvedValue({
+ mockGetAgentsByIds.mockResolvedValue([{
id: "a1",
ownerId: "owner1",
instructions: "you are a planner",
name: "Bot",
runtimeConfig: {},
- });
+ }]);
mockGetMemberByUserAndWorkspace.mockResolvedValue({
globalInstruction: "speak chinese",
});
@@ -413,13 +421,13 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", prompt: "hi", status: "dispatched" },
]);
- mockGetAgent.mockResolvedValue({
+ mockGetAgentsByIds.mockResolvedValue([{
id: "a1",
ownerId: "owner1",
instructions: "you are a planner",
name: "Bot",
runtimeConfig: {},
- });
+ }]);
mockGetMemberByUserAndWorkspace.mockResolvedValue({
globalInstruction: "",
});
@@ -438,13 +446,13 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", prompt: "hi", status: "dispatched" },
]);
- mockGetAgent.mockResolvedValue({
+ mockGetAgentsByIds.mockResolvedValue([{
id: "a1",
ownerId: null,
instructions: "just agent",
name: "Bot",
runtimeConfig: {},
- });
+ }]);
const res = await POST(postReq({ daemon_id: "d1" }));
const body = await res.json();
@@ -462,9 +470,10 @@ describe("POST /api/daemon/tasks/poll", () => {
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", prompt: "hi", status: "dispatched" },
{ id: "t2", agentId: "a2", runtimeId: "r1", workspaceId: "w1", prompt: "yo", status: "dispatched" },
]);
- mockGetAgent
- .mockResolvedValueOnce({ id: "a1", ownerId: "owner1", instructions: "inst1", name: "Bot1", runtimeConfig: {} })
- .mockResolvedValueOnce({ id: "a2", ownerId: "owner1", instructions: "inst2", name: "Bot2", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([
+ { id: "a1", ownerId: "owner1", instructions: "inst1", name: "Bot1", runtimeConfig: {} },
+ { id: "a2", ownerId: "owner1", instructions: "inst2", name: "Bot2", runtimeConfig: {} },
+ ]);
mockGetMemberByUserAndWorkspace.mockResolvedValue({ globalInstruction: "global" });
const res = await POST(postReq({ daemon_id: "d1" }));
@@ -483,13 +492,13 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", prompt: "hi", status: "dispatched" },
]);
- mockGetAgent.mockResolvedValue({
+ mockGetAgentsByIds.mockResolvedValue([{
id: "a1",
ownerId: "owner1",
instructions: "",
name: "Bot",
runtimeConfig: {},
- });
+ }]);
mockGetMemberByUserAndWorkspace.mockResolvedValue({
globalInstruction: "global only",
});
@@ -508,7 +517,7 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "hi", status: "dispatched", type: "user_dm_message" },
]);
- mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
mockGetConversation.mockResolvedValue({ userId: "u1" });
mockGetUser.mockResolvedValue({ name: "Gus", email: "[email protected]" });
@@ -526,7 +535,7 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "hi", status: "dispatched", type: "user_dm_message" },
]);
- mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "owner1", instructions: "", name: "Bot", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([{ id: "a1", ownerId: "owner1", instructions: "", name: "Bot", runtimeConfig: {} }]);
mockGetConversation.mockResolvedValue({ userId: "u2" });
mockGetUser.mockResolvedValue({ name: "Alice", email: "[email protected]" });
@@ -544,7 +553,7 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "standup", status: "dispatched", type: "calendar_event" },
]);
- mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
const res = await POST(postReq({ daemon_id: "d1" }));
const body = await res.json();
@@ -560,7 +569,7 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "new email", status: "dispatched", type: "email_notification" },
]);
- mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
const res = await POST(postReq({ daemon_id: "d1" }));
const body = await res.json();
@@ -576,7 +585,7 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "hi", status: "dispatched", type: "user_dm_message" },
]);
- mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
mockGetConversation.mockResolvedValue(null);
const res = await POST(postReq({ daemon_id: "d1" }));
@@ -593,7 +602,7 @@ describe("POST /api/daemon/tasks/poll", () => {
mockClaimTasksForRuntimes.mockResolvedValue([
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "hi", status: "dispatched", type: "user_dm_message" },
]);
- mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
mockGetConversation.mockResolvedValue({ userId: "u1" });
mockGetUser.mockResolvedValue(null);
@@ -612,7 +621,7 @@ describe("POST /api/daemon/tasks/poll", () => {
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "hi", status: "dispatched", type: "user_dm_message" },
{ id: "t2", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c2", prompt: "yo", status: "dispatched", type: "user_dm_message" },
]);
- mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "owner1", instructions: "", name: "Bot", runtimeConfig: {} });
+ mockGetAgentsByIds.mockResolvedValue([{ id: "a1", ownerId: "owner1", instructions: "", name: "Bot", runtimeConfig: {} }]);
mockGetConversation.mockResolvedValue({ userId: "u1" });
mockGetUser.mockResolvedValue({ name: "Gus", email: "[email protected]" });
@@ -704,9 +713,9 @@ describe("POST /api/daemon/tasks/poll", () => {
mockListScheduledMeetings.mockResolvedValue([
{ id: "ms1", agentId: "a1", workspaceId: "w1", meetingUrl: "https://meet.google.com/abc", participants: ["[email protected]"], status: "scheduled", agentName: "Jarvis" },
]);
- mockClaimMeetingSession.mockResolvedValue({
+ mockClaimMeetingSessions.mockResolvedValue([{
id: "ms1", agentId: "a1", workspaceId: "w1", meetingUrl: "https://meet.google.com/abc", participants: ["[email protected]"], status: "joining",
- });
+ }]);
const res = await POST(postReq({ daemon_id: "d1" }));
const body = await res.json();
diff --git a/src/web/src/app/api/daemon/tasks/poll/route.ts b/src/web/src/app/api/daemon/tasks/poll/route.ts
index 1c083937c..0c1826060 100644
--- a/src/web/src/app/api/daemon/tasks/poll/route.ts
+++ b/src/web/src/app/api/daemon/tasks/poll/route.ts
@@ -75,8 +75,31 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
ctx.workspaceId!,
);
+ // Batch-fetch shared data before the task loop to avoid N+1 queries
+ const nonKillTasks = claimed.filter((t) => t.type !== "kill_task");
+ const agentIds = [...new Set(nonKillTasks.map((t) => t.agentId))];
+
+ const [allAgents, allEmailAccounts, allColleagues] = await Promise.all([
+ queries.agent.getAgentsByIds(db, agentIds, ctx.workspaceId!),
+ queries.emailAccount.getEmailAccountsByAgents(db, agentIds, ctx.workspaceId!),
+ queries.agentLink.getColleaguesForAgents(db, agentIds, ctx.workspaceId!).catch(() => [] as Awaited<ReturnType<typeof queries.agentLink.getColleaguesForAgents>>),
+ ]);
+
+ const agentMap = new Map(allAgents.map((a) => [a.id, a]));
+ const emailAccountsByAgent = new Map<string, string[]>();
+ for (const acc of allEmailAccounts) {
+ const list = emailAccountsByAgent.get(acc.agentId) ?? [];
+ list.push(acc.emailAddress);
+ emailAccountsByAgent.set(acc.agentId, list);
+ }
+ const colleaguesByAgent = new Map<string, typeof allColleagues>();
+ for (const c of allColleagues) {
+ const list = colleaguesByAgent.get(c.agentId) ?? [];
+ list.push(c);
+ colleaguesByAgent.set(c.agentId, list);
+ }
+
const tasks = [];
- // Per-request caches: avoid duplicate DB reads when multiple tasks share the same owner/user
const memberCache = new Map<string, { globalInstruction: string } | null>();
const userCache = new Map<string, { name: string; email: string } | null>();
const convoCache = new Map<string, Awaited<ReturnType<typeof queries.conversation.getConversation>> | null>();
@@ -86,14 +109,12 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
continue;
}
- const agent = await queries.agent.getAgent(db, task.agentId, task.workspaceId);
+ const agent = agentMap.get(task.agentId) ?? null;
const emailAddresses: string[] = [];
if (agent) {
if (agent.emailHandle) emailAddresses.push(`${agent.emailHandle}@alook.ai`);
- const customAccounts = await queries.emailAccount.getEmailAccountsByAgent(db, agent.id, task.workspaceId);
- for (const acc of customAccounts) {
- emailAddresses.push(acc.emailAddress);
- }
+ const customAccounts = emailAccountsByAgent.get(agent.id) ?? [];
+ emailAddresses.push(...customAccounts);
}
let instructions = agent?.instructions ?? "";
@@ -112,7 +133,6 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
}
}
- // Resolve owner name
let ownerName: string | null = null;
if (agent?.ownerId) {
if (!userCache.has(agent.ownerId)) {
@@ -122,7 +142,6 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
ownerName = userCache.get(agent.ownerId)?.name ?? null;
}
- // Fetch conversation for channel (all task types) and sender (DM only)
let convo = convoCache.get(task.conversationId) ?? null;
if (task.conversationId && !convoCache.has(task.conversationId)) {
convo = await queries.conversation.getConversation(db, task.conversationId, task.workspaceId);
@@ -146,19 +165,13 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
}
}
- // Resolve colleagues for agent
- let colleagues: { name: string; email: string; description: string; instruction: string }[] = [];
- if (agent) {
- try {
- const raw = await queries.agentLink.getColleaguesForAgent(db, agent.id, task.workspaceId);
- colleagues = raw.map((c) => ({
- name: c.name,
- email: c.emailHandle ? toAlookAddress(c.emailHandle) : "",
- description: c.description,
- instruction: c.instruction,
- }));
- } catch {}
- }
+ const rawColleagues = colleaguesByAgent.get(task.agentId) ?? [];
+ const colleagues = rawColleagues.map((c) => ({
+ name: c.name,
+ email: c.emailHandle ? toAlookAddress(c.emailHandle) : "",
+ description: c.description,
+ instruction: c.instruction,
+ }));
tasks.push({
...taskToResponse(task),
@@ -239,25 +252,23 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
);
if (scheduled.length > 0) {
- const claimed: PollMeetingItem[] = [];
- for (const meeting of scheduled) {
- const updated = await queries.meetingSession.claimMeetingSession(
- db,
- meeting.id,
- ctx.workspaceId,
- now,
- );
- if (updated) {
- claimed.push({
- id: updated.id,
- meeting_url: updated.meetingUrl,
- participants: updated.participants as string[],
- workspace_id: updated.workspaceId,
- agent_name: meeting.agentName || "",
- });
- }
+ const ids = scheduled.map((m) => m.id);
+ const claimedRows = await queries.meetingSession.claimMeetingSessions(
+ db,
+ ids,
+ ctx.workspaceId,
+ now,
+ );
+ if (claimedRows.length > 0) {
+ const agentNameMap = new Map(scheduled.map((m) => [m.id, m.agentName || ""]));
+ meetings = claimedRows.map((row) => ({
+ id: row.id,
+ meeting_url: row.meetingUrl,
+ participants: row.participants as string[],
+ workspace_id: row.workspaceId,
+ agent_name: agentNameMap.get(row.id) || "",
+ }));
}
- if (claimed.length > 0) meetings = claimed;
}
} catch (e) {
log.warn("meeting-claim: failed in poll", { err: String(e) });