Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

perf: reduce D1 roundtrips and KV scans in hot paths

Gus9d73b84fb8a5
diff --git a/src/shared/src/db/queries/conversation.ts b/src/shared/src/db/queries/conversation.ts
index b4f9a9987..21466062f 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, ne, lt, sql, count as drizzleCount } from "drizzle-orm";
+import { eq, and, desc, ne, lt, sql, count as drizzleCount, inArray } from "drizzle-orm";
import { conversation, message } from "../schema";
import type { Database } from "../index";
import { TASK_TYPES, type TaskType } from "../../constants";
@@ -37,6 +37,14 @@ export async function getConversation(db: Database, id: string, workspaceId: str
return rows[0] ?? null;
}
+export async function getConversationsByIds(db: Database, ids: string[], workspaceId: string) {
+ if (ids.length === 0) return [];
+ return db
+ .select()
+ .from(conversation)
+ .where(and(inArray(conversation.id, ids), eq(conversation.workspaceId, workspaceId)));
+}
+
export async function listConversations(
db: Database,
workspaceId: string,
diff --git a/src/web/src/app/api/agents/[id]/email-accounts/[accountId]/route.ts b/src/web/src/app/api/agents/[id]/email-accounts/[accountId]/route.ts
index af73c29a3..69dc383d3 100644
--- a/src/web/src/app/api/agents/[id]/email-accounts/[accountId]/route.ts
+++ b/src/web/src/app/api/agents/[id]/email-accounts/[accountId]/route.ts
@@ -79,6 +79,7 @@ export const PATCH = withAuth(async (req, ctx) => {
if (!updated) return writeError("update failed", 500)
await invalidate(cacheKeys.allEmailAccounts(ws.workspaceId));
+ await invalidate(cacheKeys.overviewEmailAccounts(ws.workspaceId));
const hasCredentialChange = body.imapUsername || body.imapPassword || body.smtpUsername || body.smtpPassword || body.imapHost || body.smtpHost
if (hasCredentialChange) {
@@ -110,6 +111,7 @@ export const DELETE = withAuth(async (req, ctx) => {
if (!deleted) return writeError("delete failed", 500)
await invalidate(cacheKeys.allEmailAccounts(ws.workspaceId));
+ await invalidate(cacheKeys.overviewEmailAccounts(ws.workspaceId));
return writeJSON({ ok: true })
})
diff --git a/src/web/src/app/api/agents/[id]/email-accounts/route.ts b/src/web/src/app/api/agents/[id]/email-accounts/route.ts
index 4e933b545..a323d491a 100644
--- a/src/web/src/app/api/agents/[id]/email-accounts/route.ts
+++ b/src/web/src/app/api/agents/[id]/email-accounts/route.ts
@@ -97,6 +97,7 @@ export const POST = withAuth(async (req, ctx) => {
}
await invalidate(cacheKeys.allEmailAccounts(ws.workspaceId));
+ await invalidate(cacheKeys.overviewEmailAccounts(ws.workspaceId));
return writeJSON(accountToResponse(account), 201)
})
diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.ts b/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.ts
index 199b485e9..39d3114a0 100644
--- a/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.ts
+++ b/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.ts
@@ -7,7 +7,7 @@ import { taskToResponse } from "@/lib/api/responses";
import { TaskService } from "@/lib/services/task";
import { CompleteTaskRequestSchema } from "@alook/shared";
import { broadcastToUser } from "@/lib/broadcast";
-import { invalidate, invalidateByPrefix, cacheKeys } from "@/lib/cache";
+import { invalidate, invalidateInboxCounts, cacheKeys } from "@/lib/cache";
export const POST = withAuth(async (req: NextRequest, ctx) => {
if (!ctx.workspaceId) {
@@ -38,7 +38,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
);
const dateStr = new Date().toISOString().slice(0, 10);
invalidate(cacheKeys.overviewTaskStats(ctx.workspaceId, dateStr)).catch(() => {});
- invalidateByPrefix(cacheKeys.inboxCountPrefix(ctx.userId, ctx.workspaceId)).catch(() => {});
+ invalidateInboxCounts(ctx.userId, ctx.workspaceId).catch(() => {});
broadcastToUser(ctx.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "completed" }).catch(() => {});
return writeJSON(taskToResponse(task));
} catch (e: unknown) {
diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.ts b/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.ts
index 286efd8b1..98345688a 100644
--- a/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.ts
+++ b/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.ts
@@ -7,7 +7,7 @@ import { taskToResponse } from "@/lib/api/responses";
import { TaskService } from "@/lib/services/task";
import { FailTaskRequestSchema } from "@alook/shared";
import { broadcastToUser } from "@/lib/broadcast";
-import { invalidate, invalidateByPrefix, cacheKeys } from "@/lib/cache";
+import { invalidate, invalidateInboxCounts, cacheKeys } from "@/lib/cache";
export const POST = withAuth(async (req: NextRequest, ctx) => {
if (!ctx.workspaceId) {
@@ -30,7 +30,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const task = await taskService.failTask(taskId, ctx.workspaceId, body.error);
const dateStr = new Date().toISOString().slice(0, 10);
invalidate(cacheKeys.overviewTaskStats(ctx.workspaceId, dateStr)).catch(() => {});
- invalidateByPrefix(cacheKeys.inboxCountPrefix(ctx.userId, ctx.workspaceId)).catch(() => {});
+ invalidateInboxCounts(ctx.userId, ctx.workspaceId).catch(() => {});
broadcastToUser(ctx.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "failed" }).catch(() => {});
return writeJSON(taskToResponse(task));
} catch (e: unknown) {
diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.ts b/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.ts
index 276fb3d0b..dfffb041e 100644
--- a/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.ts
+++ b/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.ts
@@ -6,7 +6,7 @@ import { writeJSON, writeError } from "@/lib/middleware/helpers";
import { taskToResponse } from "@/lib/api/responses";
import { TaskService } from "@/lib/services/task";
import { broadcastToUser } from "@/lib/broadcast";
-import { invalidate, invalidateByPrefix, cacheKeys } from "@/lib/cache";
+import { invalidate, invalidateInboxCounts, cacheKeys } from "@/lib/cache";
export const POST = withAuth(async (req: NextRequest, ctx) => {
if (!ctx.workspaceId) {
@@ -26,7 +26,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const task = await taskService.supersedeTask(taskId, ctx.workspaceId);
const dateStr = new Date().toISOString().slice(0, 10);
invalidate(cacheKeys.overviewTaskStats(ctx.workspaceId, dateStr)).catch(() => {});
- invalidateByPrefix(cacheKeys.inboxCountPrefix(ctx.userId, ctx.workspaceId)).catch(() => {});
+ invalidateInboxCounts(ctx.userId, ctx.workspaceId).catch(() => {});
broadcastToUser(ctx.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "superseded" }).catch(() => {});
return writeJSON(taskToResponse(task));
} catch (e: unknown) {
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 858e37750..acddea94c 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
@@ -10,6 +10,7 @@ const mockGetAgentsByIds = vi.fn();
const mockGetAllAgentsForWorkspace = vi.fn();
const mockGetMemberByUserAndWorkspace = vi.fn();
const mockGetConversation = vi.fn();
+const mockGetConversationsByIds = vi.fn();
const mockGetUser = vi.fn();
const mockClaimTasksForRuntimes = vi.fn();
const mockSweepStaleState = vi.fn();
@@ -57,6 +58,7 @@ vi.mock("@alook/shared", async () => {
},
conversation: {
getConversation: (...args: unknown[]) => mockGetConversation(...args),
+ getConversationsByIds: (...args: unknown[]) => mockGetConversationsByIds(...args),
},
user: {
getUser: (...args: unknown[]) => mockGetUser(...args),
@@ -168,6 +170,7 @@ describe("POST /api/daemon/tasks/poll", () => {
mockGetAllAgentsForWorkspace.mockResolvedValue([]);
mockGetAllEmailAccountsForWorkspace.mockResolvedValue([]);
mockGetAllColleaguesForWorkspace.mockResolvedValue([]);
+ mockGetConversationsByIds.mockResolvedValue([]);
});
it("returns evicted: true when daemon has no runtimes", async () => {
@@ -487,7 +490,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" },
]);
mockGetAllAgentsForWorkspace.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
- mockGetConversation.mockResolvedValue({ userId: "u1" });
+ mockGetConversationsByIds.mockResolvedValue([{ id: "c1", userId: "u1" }]);
mockGetUser.mockResolvedValue({ name: "Gus", email: "[email protected]" });
const res = await POST(postReq({ daemon_id: "d1" }));
@@ -505,7 +508,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" },
]);
mockGetAllAgentsForWorkspace.mockResolvedValue([{ id: "a1", ownerId: "owner1", instructions: "", name: "Bot", runtimeConfig: {} }]);
- mockGetConversation.mockResolvedValue({ userId: "u2" });
+ mockGetConversationsByIds.mockResolvedValue([{ id: "c1", userId: "u2" }]);
mockGetUser.mockResolvedValue({ name: "Alice", email: "[email protected]" });
const res = await POST(postReq({ daemon_id: "d1" }));
@@ -523,6 +526,7 @@ describe("POST /api/daemon/tasks/poll", () => {
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "standup", status: "dispatched", type: "calendar_event" },
]);
mockGetAllAgentsForWorkspace.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
+ mockGetConversationsByIds.mockResolvedValue([{ id: "c1", userId: "u1" }]);
const res = await POST(postReq({ daemon_id: "d1" }));
const body = await res.json();
@@ -539,6 +543,7 @@ describe("POST /api/daemon/tasks/poll", () => {
{ id: "t1", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c1", prompt: "new email", status: "dispatched", type: "email_notification" },
]);
mockGetAllAgentsForWorkspace.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
+ mockGetConversationsByIds.mockResolvedValue([{ id: "c1", userId: "u1" }]);
const res = await POST(postReq({ daemon_id: "d1" }));
const body = await res.json();
@@ -555,7 +560,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" },
]);
mockGetAllAgentsForWorkspace.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
- mockGetConversation.mockResolvedValue(null);
+ mockGetConversationsByIds.mockResolvedValue([]);
const res = await POST(postReq({ daemon_id: "d1" }));
const body = await res.json();
@@ -572,7 +577,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" },
]);
mockGetAllAgentsForWorkspace.mockResolvedValue([{ id: "a1", ownerId: "u1", instructions: "", name: "Bot", runtimeConfig: {} }]);
- mockGetConversation.mockResolvedValue({ userId: "u1" });
+ mockGetConversationsByIds.mockResolvedValue([{ id: "c1", userId: "u1" }]);
mockGetUser.mockResolvedValue(null);
const res = await POST(postReq({ daemon_id: "d1" }));
@@ -591,7 +596,7 @@ describe("POST /api/daemon/tasks/poll", () => {
{ id: "t2", agentId: "a1", runtimeId: "r1", workspaceId: "w1", conversationId: "c2", prompt: "yo", status: "dispatched", type: "user_dm_message" },
]);
mockGetAllAgentsForWorkspace.mockResolvedValue([{ id: "a1", ownerId: "owner1", instructions: "", name: "Bot", runtimeConfig: {} }]);
- mockGetConversation.mockResolvedValue({ userId: "u1" });
+ mockGetConversationsByIds.mockResolvedValue([{ id: "c1", userId: "u1" }, { id: "c2", userId: "u1" }]);
mockGetUser.mockResolvedValue({ name: "Gus", email: "[email protected]" });
const res = await POST(postReq({ daemon_id: "d1" }));
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 039e7a4c5..90125ef7c 100644
--- a/src/web/src/app/api/daemon/tasks/poll/route.ts
+++ b/src/web/src/app/api/daemon/tasks/poll/route.ts
@@ -59,71 +59,74 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
} catch { runMisc = true; }
if (runMisc) {
- try {
- const machineRow = await queries.machine.getMachineByDaemon(
- db,
- body.daemon_id,
- ctx.workspaceId,
- );
- if (machineRow?.pendingUpdateVersion && body.cli_version) {
- pendingUpdate = semverGte(body.cli_version, machineRow.pendingUpdateVersion)
- ? undefined
- : { version: machineRow.pendingUpdateVersion };
- await queries.machine.clearPendingUpdateVersion(db, body.daemon_id, ctx.workspaceId);
- broadcastToUser(ctx.userId, {
- type: "runtime.status",
- daemonId: body.daemon_id,
- workspaceId: ctx.workspaceId,
- status: "online",
- }).catch(() => {});
- }
+ const CLAIM_WINDOW_MS = 5 * 60 * 1000;
+ const windowEnd = new Date(Date.now() + CLAIM_WINDOW_MS);
+ const now = new Date().toISOString();
+
+ const [machineResult, meetingResult] = await Promise.allSettled([
+ queries.machine.getMachineByDaemon(db, body.daemon_id, ctx.workspaceId),
+ queries.meetingSession.listScheduledMeetings(db, ctx.workspaceId, windowEnd.toISOString()),
+ ]);
+
+ if (machineResult.status === "fulfilled") {
+ const machineRow = machineResult.value;
+ try {
+ if (machineRow?.pendingUpdateVersion && body.cli_version) {
+ pendingUpdate = semverGte(body.cli_version, machineRow.pendingUpdateVersion)
+ ? undefined
+ : { version: machineRow.pendingUpdateVersion };
+ await queries.machine.clearPendingUpdateVersion(db, body.daemon_id, ctx.workspaceId);
+ broadcastToUser(ctx.userId, {
+ type: "runtime.status",
+ daemonId: body.daemon_id,
+ workspaceId: ctx.workspaceId,
+ status: "online",
+ }).catch(() => {});
+ }
- if (machineRow?.pendingRescan) {
- pendingRescan = true;
- await queries.machine.clearPendingRescan(db, body.daemon_id, ctx.workspaceId);
+ if (machineRow?.pendingRescan) {
+ pendingRescan = true;
+ await queries.machine.clearPendingRescan(db, body.daemon_id, ctx.workspaceId);
+ }
+ } catch (e) {
+ log.warn("pending check failed", { daemonId: body.daemon_id, err: String(e) });
}
- } catch (e) {
- log.warn("pending check failed", { daemonId: body.daemon_id, err: String(e) });
+ } else {
+ log.warn("pending check failed", { daemonId: body.daemon_id, err: String(machineResult.reason) });
}
- // Meeting claim — 5min claim window, 30s throttle is safe
- try {
- const CLAIM_WINDOW_MS = 5 * 60 * 1000;
- const windowEnd = new Date(Date.now() + CLAIM_WINDOW_MS);
- const now = new Date().toISOString();
-
- const scheduled = await queries.meetingSession.listScheduledMeetings(
- db,
- ctx.workspaceId,
- windowEnd.toISOString(),
- );
-
- if (scheduled.length > 0) {
- const ids = scheduled.map((m) => m.id);
- const claimedRows = await queries.meetingSession.claimMeetingSessions(
- db,
- ids,
- ctx.workspaceId,
- now,
- );
- if (claimedRows.length > 0) {
- const scheduledMap = new Map(scheduled.map((m) => [m.id, m]));
- meetings = claimedRows.map((row) => {
- const sched = scheduledMap.get(row.id);
- return {
- id: row.id,
- meeting_url: row.meetingUrl,
- participants: row.participants as string[],
- workspace_id: row.workspaceId,
- agent_id: row.agentId,
- agent_name: sched?.agentName || "",
- title: sched?.title || undefined,
- };
- });
+ if (meetingResult.status === "fulfilled") {
+ const scheduled = meetingResult.value;
+ try {
+ if (scheduled.length > 0) {
+ const ids = scheduled.map((m) => m.id);
+ const claimedRows = await queries.meetingSession.claimMeetingSessions(
+ db,
+ ids,
+ ctx.workspaceId,
+ now,
+ );
+ if (claimedRows.length > 0) {
+ const scheduledMap = new Map(scheduled.map((m) => [m.id, m]));
+ meetings = claimedRows.map((row) => {
+ const sched = scheduledMap.get(row.id);
+ return {
+ id: row.id,
+ meeting_url: row.meetingUrl,
+ participants: row.participants as string[],
+ workspace_id: row.workspaceId,
+ agent_id: row.agentId,
+ agent_name: sched?.agentName || "",
+ title: sched?.title || undefined,
+ };
+ });
+ }
}
+ } catch (e) {
+ log.warn("meeting-claim: failed in poll", { err: String(e) });
}
- } catch (e) {
- log.warn("meeting-claim: failed in poll", { err: String(e) });
+ } else {
+ log.warn("meeting-claim: failed in poll", { err: String(meetingResult.reason) });
}
}
diff --git a/src/web/src/app/api/inbox/read-all/route.ts b/src/web/src/app/api/inbox/read-all/route.ts
index 74ad9dd81..b25cd9d2c 100644
--- a/src/web/src/app/api/inbox/read-all/route.ts
+++ b/src/web/src/app/api/inbox/read-all/route.ts
@@ -4,7 +4,7 @@ import { queries } from "@alook/shared";
import { getDb } from "@/lib/db";
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { invalidateByPrefix, cacheKeys } from "@/lib/cache";
+import { invalidateInboxCounts } from "@/lib/cache";
export const POST = withAuth(async (req: NextRequest, ctx) => {
const ws = await withWorkspaceMember(req, ctx);
@@ -14,7 +14,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const db = getDb((env as Env).DB);
await queries.inbox.markAllConversationsRead(db, ctx.userId, ws.workspaceId);
- invalidateByPrefix(cacheKeys.inboxCountPrefix(ctx.userId, ws.workspaceId)).catch(() => {});
+ invalidateInboxCounts(ctx.userId, ws.workspaceId).catch(() => {});
return new NextResponse(null, { status: 204 });
});
diff --git a/src/web/src/app/api/inbox/read/route.ts b/src/web/src/app/api/inbox/read/route.ts
index 6f662036c..966b2258a 100644
--- a/src/web/src/app/api/inbox/read/route.ts
+++ b/src/web/src/app/api/inbox/read/route.ts
@@ -4,7 +4,7 @@ import { queries } from "@alook/shared";
import { getDb } from "@/lib/db";
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { invalidateByPrefix, cacheKeys } from "@/lib/cache";
+import { invalidateInboxCounts } from "@/lib/cache";
export const POST = withAuth(async (req: NextRequest, ctx) => {
const ws = await withWorkspaceMember(req, ctx);
@@ -29,7 +29,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
}
await queries.inbox.markConversationRead(db, ctx.userId, body.conversationId);
- invalidateByPrefix(cacheKeys.inboxCountPrefix(ctx.userId, ws.workspaceId)).catch(() => {});
+ invalidateInboxCounts(ctx.userId, ws.workspaceId).catch(() => {});
return new NextResponse(null, { status: 204 });
});
diff --git a/src/web/src/app/api/workspaces/[id]/overview/route.ts b/src/web/src/app/api/workspaces/[id]/overview/route.ts
index cefe3d07f..f946d1410 100644
--- a/src/web/src/app/api/workspaces/[id]/overview/route.ts
+++ b/src/web/src/app/api/workspaces/[id]/overview/route.ts
@@ -42,7 +42,7 @@ export const GET = withAuth(async (req, ctx) => {
calendarEvents,
] = await Promise.all([
cached(cacheKeys.overviewEmailStats(ws.workspaceId), 60, () => queries.overview.getEmailStatsByWorkspace(db, ws.workspaceId)),
- queries.overview.getEmailAccountsByWorkspace(db, ws.workspaceId),
+ cached(cacheKeys.overviewEmailAccounts(ws.workspaceId), 300, () => queries.overview.getEmailAccountsByWorkspace(db, ws.workspaceId)),
cached(cacheKeys.overviewTaskStats(ws.workspaceId, dateStr), 60, () => queries.overview.getTaskStatsByWorkspace(db, ws.workspaceId, todayISO)),
queries.overview.getRecentTerminalTasks(db, ws.workspaceId, visibleAgentIds, 15),
queries.overview.getConversationCountsByAgent(db, ws.workspaceId, visibleAgentIds),
diff --git a/src/web/src/lib/cache.ts b/src/web/src/lib/cache.ts
index 16b52fd51..fd382509c 100644
--- a/src/web/src/lib/cache.ts
+++ b/src/web/src/lib/cache.ts
@@ -138,12 +138,20 @@ export async function invalidateMany(keys: string[]): Promise<void> {
})));
}
-export async function invalidateByPrefix(prefix: string): Promise<void> {
- const kv = getKV();
- if (!kv) return;
- const listed = await kv.list({ prefix }).catch(() => null);
- if (!listed || listed.keys.length === 0) return;
- await Promise.all(listed.keys.map((k) => kv.delete(k.name).catch(() => {})));
+const INBOX_TYPE_COMBOS = [
+ "*",
+ "user_dm_message",
+ "calendar_event",
+ "email_notification",
+ "calendar_event,email_notification",
+ "calendar_event,user_dm_message",
+ "email_notification,user_dm_message",
+ "calendar_event,email_notification,user_dm_message",
+];
+
+export function invalidateInboxCounts(userId: string, workspaceId: string): Promise<void> {
+ const prefix = `inbox:${userId}:${workspaceId}:`;
+ return invalidateMany(INBOX_TYPE_COMBOS.map((combo) => `${prefix}${combo}`));
}
export const cacheKeys = {
@@ -159,6 +167,7 @@ export const cacheKeys = {
allColleagues: (workspaceId: string) => `col:${workspaceId}`,
agentLinks: (workspaceId: string) => `al:${workspaceId}`,
allHandles: (workspaceId: string) => `handles:${workspaceId}`,
+ overviewEmailAccounts: (workspaceId: string) => `ov_ea:${workspaceId}`,
overviewEmailStats: (workspaceId: string) => `ov_email:${workspaceId}`,
overviewTaskStats: (workspaceId: string, dateStr: string) => `ov_task:${workspaceId}:${dateStr}`,
allAgentAccess: (workspaceId: string) => `aa:${workspaceId}`,
@@ -167,7 +176,6 @@ export const cacheKeys = {
activeTaskCounts: (workspaceId: string) => `atc:${workspaceId}`,
inboxCount: (userId: string, workspaceId: string, types?: string[]) =>
`inbox:${userId}:${workspaceId}:${types ? [...types].sort().join(",") : "*"}`,
- inboxCountPrefix: (userId: string, workspaceId: string) => `inbox:${userId}:${workspaceId}:`,
hasPendingFileRequest: (workspaceId: string) => `fr_p:${workspaceId}`,
pins: (workspaceId: string, userId: string) => `pins:${workspaceId}:${userId}`,
};
diff --git a/src/web/src/lib/services/task-payload-builder.test.ts b/src/web/src/lib/services/task-payload-builder.test.ts
index 323bfe281..c7bda6f5d 100644
--- a/src/web/src/lib/services/task-payload-builder.test.ts
+++ b/src/web/src/lib/services/task-payload-builder.test.ts
@@ -6,6 +6,7 @@ const mockGetAllColleaguesForWorkspace = vi.fn();
const mockGetMemberByUserAndWorkspace = vi.fn();
const mockGetUser = vi.fn();
const mockGetConversation = vi.fn();
+const mockGetConversationsByIds = vi.fn();
vi.mock("@alook/shared", async () => {
const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");
@@ -29,6 +30,7 @@ vi.mock("@alook/shared", async () => {
},
conversation: {
getConversation: (...args: unknown[]) => mockGetConversation(...args),
+ getConversationsByIds: (...args: unknown[]) => mockGetConversationsByIds(...args),
},
},
};
@@ -95,6 +97,7 @@ describe("TaskPayloadBuilder", () => {
mockGetAllAgentsForWorkspace.mockResolvedValue([]);
mockGetAllEmailAccountsForWorkspace.mockResolvedValue([]);
mockGetAllColleaguesForWorkspace.mockResolvedValue([]);
+ mockGetConversationsByIds.mockResolvedValue([]);
});
it("returns empty array for empty input", async () => {
@@ -126,7 +129,7 @@ describe("TaskPayloadBuilder", () => {
]);
mockGetUser.mockResolvedValue({ name: "Owner", email: "[email protected]" });
mockGetMemberByUserAndWorkspace.mockResolvedValue({ globalInstruction: "" });
- mockGetConversation.mockResolvedValue({ userId: "sender1", channel: "slack" });
+ mockGetConversationsByIds.mockResolvedValue([{ id: "c1", userId: "sender1", channel: "slack" }]);
mockGetUser
.mockResolvedValueOnce({ name: "Owner", email: "[email protected]" })
.mockResolvedValueOnce({ name: "Sender", email: "[email protected]" });
@@ -155,7 +158,7 @@ describe("TaskPayloadBuilder", () => {
mockGetAllColleaguesForWorkspace.mockResolvedValue([]);
mockGetMemberByUserAndWorkspace.mockResolvedValue({ globalInstruction: "speak english" });
mockGetUser.mockResolvedValue({ name: "Owner", email: "[email protected]" });
- mockGetConversation.mockResolvedValue(null);
+ mockGetConversationsByIds.mockResolvedValue([]);
const task = makeTask();
const result = await builder.buildFullPayloads([task], "w1");
@@ -167,7 +170,7 @@ describe("TaskPayloadBuilder", () => {
mockGetAllAgentsForWorkspace.mockResolvedValue([]);
mockGetAllEmailAccountsForWorkspace.mockResolvedValue([]);
mockGetAllColleaguesForWorkspace.mockResolvedValue([]);
- mockGetConversation.mockResolvedValue(null);
+ mockGetConversationsByIds.mockResolvedValue([]);
const task = makeTask({ agentId: "nonexistent" });
const result = await builder.buildFullPayloads([task], "w1");
@@ -184,7 +187,7 @@ describe("TaskPayloadBuilder", () => {
mockGetAllColleaguesForWorkspace.mockResolvedValue([]);
mockGetMemberByUserAndWorkspace.mockResolvedValue({ globalInstruction: "" });
mockGetUser.mockResolvedValue({ name: "Owner", email: "[email protected]" });
- mockGetConversation.mockResolvedValue(null);
+ mockGetConversationsByIds.mockResolvedValue([]);
const task1 = makeTask({ id: "t1", agentId: "a1" });
const task2 = makeTask({ id: "t2", agentId: "a1" });
diff --git a/src/web/src/lib/services/task-payload-builder.ts b/src/web/src/lib/services/task-payload-builder.ts
index 6ec239bcf..8ed674951 100644
--- a/src/web/src/lib/services/task-payload-builder.ts
+++ b/src/web/src/lib/services/task-payload-builder.ts
@@ -39,9 +39,14 @@ export class TaskPayloadBuilder {
colleaguesByAgent.set(c.agentId, list);
}
+ const convoIds = [...new Set(nonKillTasks.map((t) => t.conversationId).filter(Boolean))];
+ const convos = convoIds.length > 0
+ ? await queries.conversation.getConversationsByIds(this.db, convoIds, workspaceId)
+ : [];
+ const convoMap = new Map(convos.map((c) => [c.id, c]));
+
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>();
const results = [];
for (const task of tasks) {
@@ -87,11 +92,7 @@ export class TaskPayloadBuilder {
ownerName = userCache.get(agent.ownerId)?.name ?? null;
}
- let convo = convoCache.get(task.conversationId) ?? null;
- if (task.conversationId && !convoCache.has(task.conversationId)) {
- convo = await queries.conversation.getConversation(this.db, task.conversationId, workspaceId);
- convoCache.set(task.conversationId, convo);
- }
+ const convo = convoMap.get(task.conversationId) ?? null;
const taskChannel = convo?.channel ?? "default";
let sender: { name: string; email: string; is_owner: boolean } | null = null;
diff --git a/src/web/src/lib/services/task.test.ts b/src/web/src/lib/services/task.test.ts
index e6cb856f0..95c92bc15 100644
--- a/src/web/src/lib/services/task.test.ts
+++ b/src/web/src/lib/services/task.test.ts
@@ -32,6 +32,7 @@ vi.mock("@alook/shared", () => ({
},
agent: {
getAgent: vi.fn(),
+ getAgentsByIds: vi.fn(),
updateAgentStatus: vi.fn(),
},
message: {
@@ -207,10 +208,10 @@ describe("TaskService", () => {
{ agentId: "a1", workspaceId: "w1", id: "t1", runtimeId: "r1" },
{ agentId: "a1", workspaceId: "w1", id: "t2", runtimeId: "r1" },
]);
- agentQ.getAgent.mockResolvedValue({
+ agentQ.getAgentsByIds.mockResolvedValue([{
id: "a1",
maxConcurrentTasks: 5,
- });
+ }]);
taskQ.countRunningTasks.mockResolvedValue(0);
taskQ.claimTask.mockResolvedValue({
id: "t1",
@@ -230,7 +231,10 @@ describe("TaskService", () => {
{ agentId: "a2", workspaceId: "w1", id: "t2", runtimeId: "r1" },
{ agentId: "a3", workspaceId: "w1", id: "t3", runtimeId: "r1" },
]);
- agentQ.getAgent.mockResolvedValue({ id: "a1", maxConcurrentTasks: 5 });
+ agentQ.getAgentsByIds.mockResolvedValue([
+ { id: "a1", maxConcurrentTasks: 5 },
+ { id: "a2", maxConcurrentTasks: 5 },
+ ]);
taskQ.countRunningTasks.mockResolvedValue(0);
let callCount = 0;
@@ -247,7 +251,7 @@ describe("TaskService", () => {
taskQ.listPendingTasksByRuntimes.mockResolvedValue([
{ agentId: "a1", workspaceId: "w1", id: "t1", runtimeId: "r1" },
]);
- agentQ.getAgent.mockResolvedValue({ id: "a1", maxConcurrentTasks: 5 });
+ agentQ.getAgentsByIds.mockResolvedValue([{ id: "a1", maxConcurrentTasks: 5 }]);
taskQ.countRunningTasks.mockResolvedValue(0);
taskQ.claimTask.mockResolvedValue({
id: "t1",
@@ -264,7 +268,10 @@ describe("TaskService", () => {
{ agentId: "a1", workspaceId: "w1", id: "t1", runtimeId: "r1" },
{ agentId: "a2", workspaceId: "w1", id: "t2", runtimeId: "r2" },
]);
- agentQ.getAgent.mockResolvedValue({ id: "a1", maxConcurrentTasks: 5 });
+ agentQ.getAgentsByIds.mockResolvedValue([
+ { id: "a1", maxConcurrentTasks: 5 },
+ { id: "a2", maxConcurrentTasks: 5 },
+ ]);
taskQ.countRunningTasks.mockResolvedValue(0);
let callCount = 0;
diff --git a/src/web/src/lib/services/task.ts b/src/web/src/lib/services/task.ts
index caad355f9..d669c0cf0 100644
--- a/src/web/src/lib/services/task.ts
+++ b/src/web/src/lib/services/task.ts
@@ -61,16 +61,18 @@ export class TaskService {
async claimTask(agentId: string, workspaceId: string) {
const agent = await agentQueries.getAgent(this.db, agentId, workspaceId);
+ return this.claimTaskWithAgent(agentId, workspaceId, agent);
+ }
+
+ private async claimTaskWithAgent(agentId: string, workspaceId: string, agent: Awaited<ReturnType<typeof agentQueries.getAgent>>) {
if (!agent) {
return null;
}
const running = await taskQueries.countRunningTasks(this.db, agentId, workspaceId);
if (running >= agent.maxConcurrentTasks) {
- // At max capacity — check if a steerable replacement exists to bypass the limit
const steerable = await taskQueries.findSteerableReplacement(this.db, agentId, workspaceId);
if (!steerable) return null;
- // Re-check excluding the predecessor being replaced
const runningExcluding = await taskQueries.countRunningTasks(this.db, agentId, workspaceId, steerable.predecessorId);
if (runningExcluding >= agent.maxConcurrentTasks) return null;
}
@@ -104,8 +106,14 @@ export class TaskService {
uniqueCandidates.push(candidate);
}
+ if (uniqueCandidates.length === 0) return claimed;
+
+ const agentIds = [...new Set(uniqueCandidates.map((c) => c.agentId))];
+ const agents = await agentQueries.getAgentsByIds(this.db, agentIds, workspaceId);
+ const agentMap = new Map(agents.map((a) => [a.id, a]));
+
const results = await Promise.all(
- uniqueCandidates.map((c) => this.claimTask(c.agentId, c.workspaceId))
+ uniqueCandidates.map((c) => this.claimTaskWithAgent(c.agentId, c.workspaceId, agentMap.get(c.agentId) ?? null))
);
for (const task of results) {