Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(web): filter overview data by agent visibility

Gener9b3ac3ed24c2
diff --git a/src/shared/src/db/queries/overview.ts b/src/shared/src/db/queries/overview.ts
index c75509150..6167c1736 100644
--- a/src/shared/src/db/queries/overview.ts
+++ b/src/shared/src/db/queries/overview.ts
@@ -129,8 +129,10 @@ export async function getTaskStatsByWorkspace(
export async function getRecentTerminalTasks(
db: Database,
workspaceId: string,
+ visibleAgentIds: string[],
limit = 15
) {
+ if (visibleAgentIds.length === 0) return [];
return db
.select({
id: agentTaskQueue.id,
@@ -146,6 +148,7 @@ export async function getRecentTerminalTasks(
.where(
and(
eq(agentTaskQueue.workspaceId, workspaceId),
+ inArray(agentTaskQueue.agentId, visibleAgentIds),
ne(agentTaskQueue.type, TASK_TYPES.KILL_TASK),
inArray(agentTaskQueue.status, ["completed", "failed", "cancelled"])
)
@@ -154,13 +157,19 @@ export async function getRecentTerminalTasks(
.limit(limit);
}
-export async function getConversationCountsByAgent(db: Database, workspaceId: string) {
+export async function getConversationCountsByAgent(db: Database, workspaceId: string, visibleAgentIds: string[]) {
+ if (visibleAgentIds.length === 0) return [];
return db
.select({
agentId: conversation.agentId,
cnt: count(),
})
.from(conversation)
- .where(eq(conversation.workspaceId, workspaceId))
+ .where(
+ and(
+ eq(conversation.workspaceId, workspaceId),
+ inArray(conversation.agentId, visibleAgentIds)
+ )
+ )
.groupBy(conversation.agentId);
}
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 54f0a2245..0fc9492c2 100644
--- a/src/web/src/app/api/workspaces/[id]/overview/route.ts
+++ b/src/web/src/app/api/workspaces/[id]/overview/route.ts
@@ -20,6 +20,9 @@ export const GET = withAuth(async (req, ctx) => {
weekEnd.setDate(weekEnd.getDate() + 7);
const weekEndISO = weekEnd.toISOString();
+ const visibleAgents = await queries.agent.listAgents(db, ws.workspaceId, ctx.userId);
+ const visibleAgentIds = visibleAgents.map((a) => a.id);
+
const [
emailStats,
emailAccounts,
@@ -33,8 +36,8 @@ export const GET = withAuth(async (req, ctx) => {
queries.overview.getEmailStatsByWorkspace(db, ws.workspaceId),
queries.overview.getEmailAccountsByWorkspace(db, ws.workspaceId),
queries.overview.getTaskStatsByWorkspace(db, ws.workspaceId, todayISO),
- queries.overview.getRecentTerminalTasks(db, ws.workspaceId, 15),
- queries.overview.getConversationCountsByAgent(db, ws.workspaceId),
+ queries.overview.getRecentTerminalTasks(db, ws.workspaceId, visibleAgentIds, 15),
+ queries.overview.getConversationCountsByAgent(db, ws.workspaceId, visibleAgentIds),
queries.member.listMembers(db, ws.workspaceId),
queries.workspaceInvite.listActiveInvites(db, ws.workspaceId),
queries.calendarEvent.listCalendarEvents(db, ws.workspaceId, {