Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
fix: active task data isolation between workspace members
Gus1b1800f1cb60
diff --git a/src/shared/src/db/queries/inbox.ts b/src/shared/src/db/queries/inbox.tsindex 27e64ea51..dc233cfbe 100644--- a/src/shared/src/db/queries/inbox.ts+++ b/src/shared/src/db/queries/inbox.ts@@ -119,12 +119,22 @@ export async function findLatestAssistantMessageId(return rows[0]?.id ?? null;}+export async function cleanupOrphanedUnread(db: Database, userId: string, workspaceId: string) {+ await db.run(sql`+ DELETE FROM inbox_unread+ WHERE user_id = ${userId}+ AND workspace_id = ${workspaceId}+ AND conversation_id NOT IN (SELECT id FROM conversation)+ `);+}+export async function listUnreadConversations(db: Database,userId: string,workspaceId: string,opts?: { limit?: number; before?: string; types?: string[] }) {+ await cleanupOrphanedUnread(db, userId, workspaceId);const limit = opts?.limit ?? 30;const beforeClause = opts?.before? sql`AND u.completed_at < ${opts.before}`@@ -186,10 +196,11 @@ export async function getUnreadCount(const rows = await db.all<{ count: number }>(sql`SELECT COUNT(*) AS count- FROM inbox_unread- WHERE user_id = ${userId}- AND workspace_id = ${workspaceId}- AND task_type IN (${typePlaceholders})+ FROM inbox_unread u+ INNER JOIN conversation c ON c.id = u.conversation_id+ WHERE u.user_id = ${userId}+ AND u.workspace_id = ${workspaceId}+ AND u.task_type IN (${typePlaceholders})`);return rows[0]?.count ?? 0;diff --git a/src/shared/src/db/queries/task.ts b/src/shared/src/db/queries/task.tsindex 3ef19dd8d..cef43618a 100644--- a/src/shared/src/db/queries/task.ts+++ b/src/shared/src/db/queries/task.ts@@ -486,7 +486,8 @@ export async function countRunningTasks(db: Database, agentId: string, workspaceexport async function listActiveTaskCountsByWorkspace(db: Database,workspaceId: string,- agentIds?: string[]+ agentIds?: string[],+ userId?: string) {const conditions = [eq(agentTaskQueue.workspaceId, workspaceId),@@ -496,12 +497,16 @@ export async function listActiveTaskCountsByWorkspace(if (agentIds && agentIds.length > 0) {conditions.push(inArray(agentTaskQueue.agentId, agentIds));}+ if (userId) {+ conditions.push(eq(conversation.userId, userId));+ }return db.select({agentId: agentTaskQueue.agentId,count: count(),}).from(agentTaskQueue)+ .innerJoin(conversation, eq(agentTaskQueue.conversationId, conversation.id)).where(and(...conditions)).groupBy(agentTaskQueue.agentId).limit(200);@@ -510,7 +515,8 @@ export async function listActiveTaskCountsByWorkspace(export async function listActiveTasksByWorkspace(db: Database,workspaceId: string,- agentIds?: string[]+ agentIds?: string[],+ userId?: string) {const conditions = [eq(agentTaskQueue.workspaceId, workspaceId),@@ -520,6 +526,9 @@ export async function listActiveTasksByWorkspace(if (agentIds && agentIds.length > 0) {conditions.push(inArray(agentTaskQueue.agentId, agentIds));}+ if (userId) {+ conditions.push(eq(conversation.userId, userId));+ }return db.select({id: agentTaskQueue.id,@@ -532,7 +541,7 @@ export async function listActiveTasksByWorkspace(channel: conversation.channel,}).from(agentTaskQueue)- .leftJoin(conversation, eq(agentTaskQueue.conversationId, conversation.id))+ .innerJoin(conversation, eq(agentTaskQueue.conversationId, conversation.id)).where(and(...conditions)).orderBy(desc(agentTaskQueue.createdAt)).limit(50);@@ -541,8 +550,18 @@ export async function listActiveTasksByWorkspace(export async function listActiveTasksByAgent(db: Database,agentId: string,- workspaceId: string+ workspaceId: string,+ userId?: string) {+ const conditions = [+ eq(agentTaskQueue.agentId, agentId),+ eq(agentTaskQueue.workspaceId, workspaceId),+ inArray(agentTaskQueue.status, ["queued", "dispatched", "running"]),+ ne(agentTaskQueue.type, TASK_TYPES.KILL_TASK),+ ];+ if (userId) {+ conditions.push(eq(conversation.userId, userId));+ }return db.select({id: agentTaskQueue.id,@@ -551,14 +570,8 @@ export async function listActiveTasksByAgent(createdAt: agentTaskQueue.createdAt,}).from(agentTaskQueue)- .where(- and(- eq(agentTaskQueue.agentId, agentId),- eq(agentTaskQueue.workspaceId, workspaceId),- inArray(agentTaskQueue.status, ["queued", "dispatched", "running"]),- ne(agentTaskQueue.type, TASK_TYPES.KILL_TASK)- )- )+ .innerJoin(conversation, eq(agentTaskQueue.conversationId, conversation.id))+ .where(and(...conditions)).orderBy(desc(agentTaskQueue.priority), asc(agentTaskQueue.createdAt)).limit(100);}diff --git a/src/shared/test/queries/inbox.test.ts b/src/shared/test/queries/inbox.test.tsindex fb0fa0138..d0a0e68ac 100644--- a/src/shared/test/queries/inbox.test.ts+++ b/src/shared/test/queries/inbox.test.ts@@ -23,6 +23,7 @@ describe("inbox exports", () => {it("exports deleteAllUnreadEntries", () => { expect(typeof inboxQueries.deleteAllUnreadEntries).toBe("function"); });it("exports findLatestAssistantMessageId", () => { expect(typeof inboxQueries.findLatestAssistantMessageId).toBe("function"); });it("exports isUnreadEligible", () => { expect(typeof inboxQueries.isUnreadEligible).toBe("function"); });+ it("exports cleanupOrphanedUnread", () => { expect(typeof inboxQueries.cleanupOrphanedUnread).toBe("function"); });});// ---------------------------------------------------------------------------@@ -160,6 +161,18 @@ describe("deleteAllUnreadEntries", () => {});});+// ---------------------------------------------------------------------------+// cleanupOrphanedUnread+// ---------------------------------------------------------------------------++describe("cleanupOrphanedUnread", () => {+ it("calls db.run for DELETE", async () => {+ const mockDb = createMockDb([]);+ await inboxQueries.cleanupOrphanedUnread(mockDb, "u1", "w1");+ expect(mockDb.run).toHaveBeenCalled();+ });+});+// ---------------------------------------------------------------------------// TC9 / TC11: listUnreadConversations (rewritten query)// ---------------------------------------------------------------------------diff --git a/src/shared/test/queries/task.test.ts b/src/shared/test/queries/task.test.tsindex f7dd696fd..71dfca05f 100644--- a/src/shared/test/queries/task.test.ts+++ b/src/shared/test/queries/task.test.ts@@ -42,12 +42,12 @@ describe("task query module exports", () => {});describe("task query function signatures", () => {- it("listActiveTaskCountsByWorkspace accepts (db, workspaceId, agentIds?)", () => {- expect(taskQueries.listActiveTaskCountsByWorkspace.length).toBe(3);+ it("listActiveTaskCountsByWorkspace accepts (db, workspaceId, agentIds?, userId?)", () => {+ expect(taskQueries.listActiveTaskCountsByWorkspace.length).toBe(4);});- it("listActiveTasksByAgent accepts (db, agentId, workspaceId)", () => {- expect(taskQueries.listActiveTasksByAgent.length).toBe(3);+ it("listActiveTasksByAgent accepts (db, agentId, workspaceId, userId?)", () => {+ expect(taskQueries.listActiveTasksByAgent.length).toBe(4);});});diff --git a/src/web/src/app/api/agents/[id]/active-tasks/route.test.ts b/src/web/src/app/api/agents/[id]/active-tasks/route.test.tsindex 7c548669f..c69af453f 100644--- a/src/web/src/app/api/agents/[id]/active-tasks/route.test.ts+++ b/src/web/src/app/api/agents/[id]/active-tasks/route.test.ts@@ -105,4 +105,16 @@ describe("GET /api/agents/[id]/active-tasks", () => {expect(res.status).toBe(200);expect(body.tasks).toEqual([]);});++ it("passes userId to query for data isolation", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1" });+ mockListActiveTasksByAgent.mockResolvedValue([]);++ await GET(+ new NextRequest("http://localhost/api/agents/a1/active-tasks"),+ withParams("a1")+ );++ expect(mockListActiveTasksByAgent).toHaveBeenCalledWith({}, "a1", "w1", "u1");+ });});diff --git a/src/web/src/app/api/agents/[id]/active-tasks/route.ts b/src/web/src/app/api/agents/[id]/active-tasks/route.tsindex d0c22399a..cb3f4153b 100644--- a/src/web/src/app/api/agents/[id]/active-tasks/route.ts+++ b/src/web/src/app/api/agents/[id]/active-tasks/route.ts@@ -17,7 +17,7 @@ export const GET = withAuth(async (req, ctx) => {const agent = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);if (!agent) return writeError("agent not found", 404);- const tasks = await queries.task.listActiveTasksByAgent(db, id, ws.workspaceId);+ const tasks = await queries.task.listActiveTasksByAgent(db, id, ws.workspaceId, ctx.userId);return writeJSON({tasks: tasks.map((t) => ({diff --git a/src/web/src/app/api/agents/active-task-counts/route.test.ts b/src/web/src/app/api/agents/active-task-counts/route.test.tsindex 06542f862..3b414ce3c 100644--- a/src/web/src/app/api/agents/active-task-counts/route.test.ts+++ b/src/web/src/app/api/agents/active-task-counts/route.test.ts@@ -78,7 +78,7 @@ describe("GET /api/agents/active-task-counts", () => {expect(res.status).toBe(200);expect(body).toEqual({ counts: { ag1: 3 } });- expect(mockListActiveTaskCountsByWorkspace).toHaveBeenCalledWith({}, "w1", ["ag1"]);+ expect(mockListActiveTaskCountsByWorkspace).toHaveBeenCalledWith({}, "w1", ["ag1"], "u1");});it("returns empty counts when no active tasks", async () => {diff --git a/src/web/src/app/api/agents/active-task-counts/route.ts b/src/web/src/app/api/agents/active-task-counts/route.tsindex 22c3e9978..e5cbe709c 100644--- a/src/web/src/app/api/agents/active-task-counts/route.ts+++ b/src/web/src/app/api/agents/active-task-counts/route.ts@@ -23,7 +23,7 @@ export const GET = withAuth(async (req, ctx) => {if (visibleAgentIds.length === 0) return writeJSON({ counts: {} });- const rows = await queries.task.listActiveTaskCountsByWorkspace(db, ws.workspaceId, visibleAgentIds);+ const rows = await queries.task.listActiveTaskCountsByWorkspace(db, ws.workspaceId, visibleAgentIds, ctx.userId);const counts: Record<string, number> = {};for (const row of rows) {counts[row.agentId] = Number(row.count);diff --git a/src/web/src/app/api/agents/active-tasks/route.test.ts b/src/web/src/app/api/agents/active-tasks/route.test.tsindex e8c8edaaa..790e31eb7 100644--- a/src/web/src/app/api/agents/active-tasks/route.test.ts+++ b/src/web/src/app/api/agents/active-tasks/route.test.ts@@ -52,7 +52,7 @@ describe("GET /api/agents/active-tasks", () => {expect(body.tasks[0]).toMatchObject({id: "t1", agent_id: "a1", agent: { name: "Agent 1", avatarUrl: "u" }, channel: "default",});- expect(mockListActive).toHaveBeenCalledWith({}, "w1", ["a1"]);+ expect(mockListActive).toHaveBeenCalledWith({}, "w1", ["a1"], "u1");});it("passes visible agent IDs to the query for filtering", async () => {@@ -68,7 +68,7 @@ describe("GET /api/agents/active-tasks", () => {]);const res = await GET(new NextRequest("http://localhost/x"), {});const body = await res.json();- expect(mockListActive).toHaveBeenCalledWith({}, "w1", ["a1"]);+ expect(mockListActive).toHaveBeenCalledWith({}, "w1", ["a1"], "u1");expect(body.tasks).toHaveLength(1);expect(body.tasks[0].agent_id).toBe("a1");});diff --git a/src/web/src/app/api/agents/active-tasks/route.ts b/src/web/src/app/api/agents/active-tasks/route.tsindex b59793928..6af8e744f 100644--- a/src/web/src/app/api/agents/active-tasks/route.ts+++ b/src/web/src/app/api/agents/active-tasks/route.ts@@ -23,7 +23,7 @@ export const GET = withAuth(async (req, ctx) => {const agentMap = new Map(agents.map((a) => [a.id, { name: a.name, avatarUrl: a.avatarUrl }]));if (visibleAgentIds.length === 0) return writeJSON({ tasks: [] });- const tasks = await queries.task.listActiveTasksByWorkspace(db, ws.workspaceId, visibleAgentIds);+ const tasks = await queries.task.listActiveTasksByWorkspace(db, ws.workspaceId, visibleAgentIds, ctx.userId);return writeJSON({tasks: tasks.map((t) => ({diff --git a/src/web/src/app/api/daemon/routes.test.ts b/src/web/src/app/api/daemon/routes.test.tsindex 476f74702..cc5e8c4c9 100644--- a/src/web/src/app/api/daemon/routes.test.ts+++ b/src/web/src/app/api/daemon/routes.test.ts@@ -517,11 +517,14 @@ describe("daemon route body validation", () => {createDb: vi.fn(() => ({})),queries: {task: {- getTask: vi.fn().mockResolvedValue({ id: "t1", workspaceId: "w1" }),+ getTask: vi.fn().mockResolvedValue({ id: "t1", workspaceId: "w1", conversationId: "c1" }),},taskMessage: {createTaskMessage: vi.fn().mockResolvedValue(undefined),},+ conversation: {+ getConversation: vi.fn().mockResolvedValue({ id: "c1", userId: "u1" }),+ },},};});@@ -563,9 +566,12 @@ describe("daemon route body validation", () => {createDb: vi.fn(() => ({})),queries: {task: {- getTask: vi.fn().mockResolvedValue({ id: "t1", workspaceId: "w1" }),+ getTask: vi.fn().mockResolvedValue({ id: "t1", workspaceId: "w1", conversationId: "c1" }),},taskMessage: { createTaskMessage: createMock },+ conversation: {+ getConversation: vi.fn().mockResolvedValue({ id: "c1", userId: "owner-u2" }),+ },},};});@@ -589,7 +595,7 @@ describe("daemon route body validation", () => {expect(res.status).toBe(200);expect(broadcastMock).toHaveBeenCalledWith(- daemonAuth.userId,+ "owner-u2",expect.objectContaining({type: "task.messages",taskId: "t1",@@ -615,9 +621,12 @@ describe("daemon route body validation", () => {createDb: vi.fn(() => ({})),queries: {task: {- getTask: vi.fn().mockResolvedValue({ id: "t1", workspaceId: "w1" }),+ getTask: vi.fn().mockResolvedValue({ id: "t1", workspaceId: "w1", conversationId: "c1" }),},taskMessage: { createTaskMessage: vi.fn().mockResolvedValue(undefined) },+ conversation: {+ getConversation: vi.fn().mockResolvedValue({ id: "c1", userId: "owner-u2" }),+ },},};});diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.test.ts b/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.test.tsindex 866fc7579..8a0640628 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.test.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/complete/route.test.ts@@ -3,6 +3,7 @@ import { NextRequest } from "next/server";const mockCompleteTask = vi.fn();const mockTaskToResponse = vi.fn();+const mockGetConversation = vi.fn();let mockAuthCtx: Record<string, unknown> = { userId: "u1", email: "[email protected]", workspaceId: "w1" };@@ -15,6 +16,9 @@ vi.mock("@alook/shared", async () => {return {...real,createDb: vi.fn(() => ({})),+ queries: {+ conversation: { getConversation: (...args: any[]) => mockGetConversation(...args) },+ },};});vi.mock("@/lib/middleware/auth", () => ({@@ -41,6 +45,11 @@ vi.mock("@/lib/api/responses", () => ({vi.mock("@/lib/broadcast", () => ({broadcastToUser: vi.fn().mockResolvedValue(undefined),}));+vi.mock("@/lib/cache", () => ({+ invalidate: vi.fn().mockResolvedValue(undefined),+ invalidateInboxCounts: vi.fn().mockResolvedValue(undefined),+ cacheKeys: { overviewTaskStats: (w: string, d: string) => `ts:${w}:${d}` },+}));import { POST } from "./route";@@ -61,9 +70,10 @@ describe("POST /api/daemon/tasks/[taskId]/complete", () => {mockAuthCtx = { userId: "u1", email: "[email protected]", workspaceId: "w1" };});- it("returns completed task", async () => {- const fakeTask = { id: "t1", status: "completed" };+ it("returns completed task and broadcasts to conversation owner", async () => {+ const fakeTask = { id: "t1", agentId: "a1", conversationId: "c1", status: "completed" };mockCompleteTask.mockResolvedValue(fakeTask);+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });mockTaskToResponse.mockReturnValue({ id: "t1", status: "completed" });const res = await POST(makeReq("t1", { output: "done" }), withParams("t1"));@@ -72,6 +82,10 @@ describe("POST /api/daemon/tasks/[taskId]/complete", () => {expect(res.status).toBe(200);expect(body).toEqual({ id: "t1", status: "completed" });expect(mockCompleteTask).toHaveBeenCalledWith("t1", "w1", expect.any(String), "");+ const { broadcastToUser } = await import("@/lib/broadcast");+ expect(broadcastToUser).toHaveBeenCalledWith("owner-u2", expect.objectContaining({ type: "task.updated", status: "completed" }));+ const { invalidateInboxCounts } = await import("@/lib/cache");+ expect(invalidateInboxCounts).toHaveBeenCalledWith("owner-u2", "w1");});it("returns 403 when workspaceId is missing (session auth)", async () => {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.tsindex 39d3114a0..88402d57d 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@@ -1,5 +1,6 @@import { NextRequest } from "next/server";import { getCloudflareContext } from "@opennextjs/cloudflare"+import { queries } from "@alook/shared"import { getDb } from "@/lib/db"import { withAuth } from "@/lib/middleware/auth";import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";@@ -38,8 +39,11 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {);const dateStr = new Date().toISOString().slice(0, 10);invalidate(cacheKeys.overviewTaskStats(ctx.workspaceId, dateStr)).catch(() => {});- invalidateInboxCounts(ctx.userId, ctx.workspaceId).catch(() => {});- broadcastToUser(ctx.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "completed" }).catch(() => {});+ const conv = await queries.conversation.getConversation(db, task.conversationId, ctx.workspaceId);+ if (conv) {+ invalidateInboxCounts(conv.userId, ctx.workspaceId).catch(() => {});+ broadcastToUser(conv.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "completed" }).catch(() => {});+ }return writeJSON(taskToResponse(task));} catch (e: unknown) {return writeError(e instanceof Error ? e.message : "Unknown error", 400);diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.test.ts b/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.test.tsindex 417bbe5b7..1dd85bf36 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.test.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/fail/route.test.ts@@ -3,6 +3,7 @@ import { NextRequest } from "next/server";const mockFailTask = vi.fn();const mockTaskToResponse = vi.fn();+const mockGetConversation = vi.fn();let mockAuthCtx: Record<string, unknown> = { userId: "u1", email: "[email protected]", workspaceId: "w1" };@@ -15,6 +16,9 @@ vi.mock("@alook/shared", async () => {return {...real,createDb: vi.fn(() => ({})),+ queries: {+ conversation: { getConversation: (...args: any[]) => mockGetConversation(...args) },+ },};});vi.mock("@/lib/middleware/auth", () => ({@@ -41,6 +45,11 @@ vi.mock("@/lib/api/responses", () => ({vi.mock("@/lib/broadcast", () => ({broadcastToUser: vi.fn().mockResolvedValue(undefined),}));+vi.mock("@/lib/cache", () => ({+ invalidate: vi.fn().mockResolvedValue(undefined),+ invalidateInboxCounts: vi.fn().mockResolvedValue(undefined),+ cacheKeys: { overviewTaskStats: (w: string, d: string) => `ts:${w}:${d}` },+}));import { POST } from "./route";@@ -61,9 +70,10 @@ describe("POST /api/daemon/tasks/[taskId]/fail", () => {mockAuthCtx = { userId: "u1", email: "[email protected]", workspaceId: "w1" };});- it("returns failed task", async () => {- const fakeTask = { id: "t1", status: "failed" };+ it("returns failed task and broadcasts to conversation owner", async () => {+ const fakeTask = { id: "t1", agentId: "a1", conversationId: "c1", status: "failed" };mockFailTask.mockResolvedValue(fakeTask);+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });mockTaskToResponse.mockReturnValue({ id: "t1", status: "failed" });const res = await POST(makeReq("t1", { error: "boom" }), withParams("t1"));@@ -72,6 +82,10 @@ describe("POST /api/daemon/tasks/[taskId]/fail", () => {expect(res.status).toBe(200);expect(body).toEqual({ id: "t1", status: "failed" });expect(mockFailTask).toHaveBeenCalledWith("t1", "w1", "boom");+ const { broadcastToUser } = await import("@/lib/broadcast");+ expect(broadcastToUser).toHaveBeenCalledWith("owner-u2", expect.objectContaining({ type: "task.updated", status: "failed" }));+ const { invalidateInboxCounts } = await import("@/lib/cache");+ expect(invalidateInboxCounts).toHaveBeenCalledWith("owner-u2", "w1");});it("returns 403 when workspaceId is missing (session auth)", async () => {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.tsindex 98345688a..4f95c1f03 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@@ -1,5 +1,6 @@import { NextRequest } from "next/server";import { getCloudflareContext } from "@opennextjs/cloudflare"+import { queries } from "@alook/shared"import { getDb } from "@/lib/db"import { withAuth } from "@/lib/middleware/auth";import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";@@ -30,8 +31,11 @@ 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(() => {});- invalidateInboxCounts(ctx.userId, ctx.workspaceId).catch(() => {});- broadcastToUser(ctx.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "failed" }).catch(() => {});+ const conv = await queries.conversation.getConversation(db, task.conversationId, ctx.workspaceId);+ if (conv) {+ invalidateInboxCounts(conv.userId, ctx.workspaceId).catch(() => {});+ broadcastToUser(conv.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "failed" }).catch(() => {});+ }return writeJSON(taskToResponse(task));} catch (e: unknown) {return writeError(e instanceof Error ? e.message : "Unknown error", 400);diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.ts b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.tsindex b682af081..0304621e9 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.test.ts@@ -15,6 +15,7 @@ vi.mock("@/lib/db", () => ({getDb: vi.fn(() => ({})),withD1Retry: vi.fn((fn: () => Promise<any>) => fn()),}));+const mockGetConversation = vi.fn();vi.mock("@alook/shared", async () => {const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");return {@@ -28,6 +29,9 @@ vi.mock("@alook/shared", async () => {task: {getTask: (...args: any[]) => mockGetTask(...args),},+ conversation: {+ getConversation: (...args: any[]) => mockGetConversation(...args),+ },},};});@@ -103,7 +107,8 @@ describe("POST /api/daemon/tasks/[taskId]/messages", () => {});it("creates messages for workspace-scoped task", async () => {- mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1" });+ mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1", conversationId: "c1" });+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });mockCreateTaskMessage.mockResolvedValue({ id: "m1" });const res = await POST(@@ -163,8 +168,9 @@ describe("POST /api/daemon/tasks/[taskId]/messages", () => {expect(mockCreateTaskMessage).not.toHaveBeenCalled();});- it("only broadcasts text and error messages via WebSocket", async () => {- mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1" });+ it("only broadcasts text and error messages via WebSocket to conversation owner", async () => {+ mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1", conversationId: "c1" });+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });mockCreateTaskMessage.mockResolvedValue({ id: "m1" });const res = await POST(@@ -187,13 +193,15 @@ describe("POST /api/daemon/tasks/[taskId]/messages", () => {expect(body.status).toBe("ok");expect(mockCreateTaskMessage).toHaveBeenCalledTimes(3);expect(mockBroadcastToUser).toHaveBeenCalledTimes(1);+ expect(mockBroadcastToUser.mock.calls[0][0]).toBe("owner-u2");const broadcastPayload = mockBroadcastToUser.mock.calls[0][1];expect(broadcastPayload.messages).toHaveLength(1);expect(broadcastPayload.messages[0].type).toBe("text");});it("stores thinking messages but does not broadcast them", async () => {- mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1" });+ mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1", conversationId: "c1" });+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });mockCreateTaskMessage.mockResolvedValue({ id: "m1" });const res = await POST(@@ -221,7 +229,8 @@ describe("POST /api/daemon/tasks/[taskId]/messages", () => {});it("does not broadcast when all messages are tool-result", async () => {- mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1" });+ mockGetTask.mockResolvedValue({ id: "t1", workspaceId: "w1", conversationId: "c1" });+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });mockCreateTaskMessage.mockResolvedValue({ id: "m1" });await POST(diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.ts b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.tsindex 5192421c0..33b3f7667 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/messages/route.ts@@ -101,7 +101,10 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {content: m.content || "",output: m.output || "",}));- broadcastToUser(ctx.userId, { type: "task.messages", taskId, messages: wsMessages }).catch(() => {});+ const conv = await queries.conversation.getConversation(db, task.conversationId, ctx.workspaceId);+ if (conv) {+ broadcastToUser(conv.userId, { type: "task.messages", taskId, messages: wsMessages }).catch(() => {});+ }}return writeJSON({ status: "ok" });diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/start/route.test.ts b/src/web/src/app/api/daemon/tasks/[taskId]/start/route.test.tsindex 519486612..0eea7650d 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/start/route.test.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/start/route.test.ts@@ -3,6 +3,7 @@ import { NextRequest } from "next/server";const mockStartTask = vi.fn();const mockTaskToResponse = vi.fn();+const mockGetConversation = vi.fn();let mockAuthCtx: Record<string, unknown> = { userId: "u1", email: "[email protected]", workspaceId: "w1" };@@ -13,6 +14,9 @@ vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));vi.mock("@alook/shared", () => ({createDb: vi.fn(() => ({})),+ queries: {+ conversation: { getConversation: (...args: any[]) => mockGetConversation(...args) },+ },}));vi.mock("@/lib/middleware/auth", () => ({withAuth: vi.fn((handler: any) => async (req: any, ctx?: any) => {@@ -51,13 +55,15 @@ describe("POST /api/daemon/tasks/[taskId]/start", () => {mockAuthCtx = { userId: "u1", email: "[email protected]", workspaceId: "w1" };});- it("returns started task", async () => {+ it("returns started task and broadcasts to conversation owner", async () => {const fakeTask = {id: "t1",agentId: "a1",+ conversationId: "c1",status: "running",};mockStartTask.mockResolvedValue(fakeTask);+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });mockTaskToResponse.mockReturnValue({ id: "t1", status: "running" });const res = await POST(@@ -71,6 +77,23 @@ describe("POST /api/daemon/tasks/[taskId]/start", () => {expect(res.status).toBe(200);expect(body).toEqual({ id: "t1", status: "running" });expect(mockStartTask).toHaveBeenCalledWith("t1", "w1");+ const { broadcastToUser } = await import("@/lib/broadcast");+ expect(broadcastToUser).toHaveBeenCalledWith("owner-u2", expect.objectContaining({ type: "task.updated", status: "running" }));+ });++ it("skips broadcast gracefully when conversation not found", async () => {+ const fakeTask = { id: "t1", agentId: "a1", conversationId: "c-deleted", status: "running" };+ mockStartTask.mockResolvedValue(fakeTask);+ mockGetConversation.mockResolvedValue(null);+ mockTaskToResponse.mockReturnValue({ id: "t1", status: "running" });++ const res = await POST(+ new NextRequest("http://localhost/api/daemon/tasks/t1/start", { method: "POST" }),+ withParams("t1")+ );+ expect(res.status).toBe(200);+ const { broadcastToUser } = await import("@/lib/broadcast");+ expect(broadcastToUser).not.toHaveBeenCalled();});it("returns 400 when task not in dispatched status", async () => {diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/start/route.ts b/src/web/src/app/api/daemon/tasks/[taskId]/start/route.tsindex 3f2fb573b..0c64ecea9 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/start/route.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/start/route.ts@@ -1,4 +1,5 @@import { getCloudflareContext } from "@opennextjs/cloudflare"+import { queries } from "@alook/shared"import { getDb } from "@/lib/db"import { withAuth } from "@/lib/middleware/auth";import { writeJSON, writeError } from "@/lib/middleware/helpers";@@ -22,7 +23,10 @@ export const POST = withAuth(async (_req, ctx) => {const taskService = new TaskService(db);try {const task = await taskService.startTask(taskId, ctx.workspaceId);- broadcastToUser(ctx.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "running" }).catch(() => {});+ const conv = await queries.conversation.getConversation(db, task.conversationId, ctx.workspaceId);+ if (conv) {+ broadcastToUser(conv.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "running" }).catch(() => {});+ }return writeJSON(taskToResponse(task));} catch (err: unknown) {return writeError(err instanceof Error ? err.message : "Unknown error", 400);diff --git a/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.test.ts b/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.test.tsindex 43f2b4a2b..612b20905 100644--- a/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.test.ts+++ b/src/web/src/app/api/daemon/tasks/[taskId]/supersede/route.test.ts@@ -1,10 +1,17 @@import { describe, it, expect, vi, beforeEach } from "vitest";import { NextRequest } from "next/server";+const mockGetConversation = vi.fn();+vi.mock("@opennextjs/cloudflare", () => ({getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),}));vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));+vi.mock("@alook/shared", () => ({+ queries: {+ conversation: { getConversation: (...args: any[]) => mockGetConversation(...args) },+ },+}));const mockSupersede = vi.fn();vi.mock("@/lib/services/task", () => ({@@ -48,12 +55,17 @@ describe("POST /api/daemon/tasks/[taskId]/supersede", () => {expect(res.status).toBe(400);});- it("supersedes a task scoped to the token workspace", async () => {- mockSupersede.mockResolvedValue({ id: "t1", agentId: "a1", status: "superseded" });+ it("supersedes a task and broadcasts to conversation owner", async () => {+ mockSupersede.mockResolvedValue({ id: "t1", agentId: "a1", conversationId: "c1", status: "superseded" });+ mockGetConversation.mockResolvedValue({ id: "c1", userId: "owner-u2" });const res = await post({ taskId: "t1" });expect(res.status).toBe(200);expect(mockSupersede).toHaveBeenCalledWith("t1", "w1");expect((await res.json()).id).toBe("t1");+ const { broadcastToUser } = await import("@/lib/broadcast");+ expect(broadcastToUser).toHaveBeenCalledWith("owner-u2", expect.objectContaining({ type: "task.updated", status: "superseded" }));+ const { invalidateInboxCounts } = await import("@/lib/cache");+ expect(invalidateInboxCounts).toHaveBeenCalledWith("owner-u2", "w1");});it("400 when supersede throws (e.g. task not in workspace)", async () => {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.tsindex dfffb041e..b05f14098 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@@ -1,5 +1,6 @@import { NextRequest } from "next/server";import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";import { getDb } from "@/lib/db";import { withAuth } from "@/lib/middleware/auth";import { writeJSON, writeError } from "@/lib/middleware/helpers";@@ -26,8 +27,11 @@ 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(() => {});- invalidateInboxCounts(ctx.userId, ctx.workspaceId).catch(() => {});- broadcastToUser(ctx.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "superseded" }).catch(() => {});+ const conv = await queries.conversation.getConversation(db, task.conversationId, ctx.workspaceId);+ if (conv) {+ invalidateInboxCounts(conv.userId, ctx.workspaceId).catch(() => {});+ broadcastToUser(conv.userId, { type: "task.updated", taskId, agentId: task.agentId, status: "superseded" }).catch(() => {});+ }return writeJSON(taskToResponse(task));} catch (e: unknown) {return writeError(e instanceof Error ? e.message : "Unknown error", 400);