Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions apps/web/app/api/agent/tasks/[taskId]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { NextRequest, NextResponse } from "next/server"
import { agentAuth } from "@/lib/agent-auth"
import { createAuditLog, formatChangedFields } from "@/lib/api/audit-log"
import { validateAgentTaskPatchInput } from "@/lib/api/agent-task-validation"
import { createTaskReadMarkerRows } from "@/lib/api/task-read-marker-writes"
import { getTaskFreshnessUpdate } from "@/lib/api/task-freshness"
import { serializeTaskReadMarkers } from "@/lib/api/task-read-markers"
import { agentTaskUpdater } from "@/lib/api/task-updater"
Expand Down Expand Up @@ -336,25 +337,14 @@ export async function PATCH(request: NextRequest, { params }: RouteContext) {
},
})

await Promise.all(
readAgents.map((readAgent) =>
tx.taskReadMarker.upsert({
where: {
taskId_agentId_status: {
taskId: task.id,
agentId: readAgent.id,
status: nextStatus,
},
},
create: {
taskId: task.id,
agentId: readAgent.id,
status: nextStatus,
},
update: { readAt: new Date() },
})
)
)
await tx.taskReadMarker.createMany({
data: createTaskReadMarkerRows({
taskId: task.id,
readAgents,
status: nextStatus,
}),
skipDuplicates: true,
})
}

if (shouldClearNextStatusReads) {
Expand Down
32 changes: 25 additions & 7 deletions apps/web/app/api/agent/tasks/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { NextRequest, NextResponse } from "next/server"
import { Status } from "@/generated/prisma/enums"
import { agentAuth } from "@/lib/agent-auth"
import { createAuditLog } from "@/lib/api/audit-log"
import { createTaskReadMarkerRows } from "@/lib/api/task-read-marker-writes"
import { serializeTaskReadMarkers } from "@/lib/api/task-read-markers"
import { agentTaskUpdater } from "@/lib/api/task-updater"
import { prisma } from "@/lib/prisma"
Expand Down Expand Up @@ -325,7 +326,7 @@ export async function POST(request: NextRequest) {
skipDuplicates: true,
})

return tx.task.create({
const createdTask = await tx.task.create({
data: {
projectId,
assignedAgentId,
Expand All @@ -336,13 +337,23 @@ export async function POST(request: NextRequest) {
summaryUpdatedAt: note ? new Date() : null,
blockingReason: blockingReason || null,
...agentTaskUpdater(agent),
readMarkers: {
create: project.company.agents.map((readAgent) => ({
agentId: readAgent.id,
status: status as Status,
})),
},
},
select: { id: true },
})

if (project.company.agents.length) {
await tx.taskReadMarker.createMany({
data: createTaskReadMarkerRows({
taskId: createdTask.id,
readAgents: project.company.agents,
status: status as Status,
}),
skipDuplicates: true,
})
}

return tx.task.findUniqueOrThrow({
where: { id: createdTask.id },
select: {
id: true,
name: true,
Expand All @@ -364,6 +375,13 @@ export async function POST(request: NextRequest) {
},
orderBy: { createdAt: "asc" },
},
project: {
select: {
id: true,
name: true,
description: true,
},
},
taskUpdatedAt: true,
taskUpdatedById: true,
taskUpdatedByName: true,
Expand Down
21 changes: 21 additions & 0 deletions apps/web/lib/api/task-read-marker-writes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Status } from "@/generated/prisma/enums"

type ReadMarkerAgent = {
id: string
}

export function createTaskReadMarkerRows({
taskId,
readAgents,
status,
}: {
taskId: string
readAgents: ReadMarkerAgent[]
status: Status
}) {
return readAgents.map((readAgent) => ({
taskId,
agentId: readAgent.id,
status,
}))
}
15 changes: 15 additions & 0 deletions apps/web/lib/api/task-read-markers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import assert from "node:assert/strict"
import { describe, it } from "node:test"

import { Status } from "@/generated/prisma/enums"
import { createTaskReadMarkerRows } from "./task-read-marker-writes"
import { getStoredSummaryUpdatedAt, serializeTaskReadMarkers } from "./task-read-markers"

const markerAgent = { AgentId: "main" }
Expand Down Expand Up @@ -41,4 +42,18 @@ describe("Agent API task serialization", () => {
null
)
})

it("builds task/status-scoped read marker rows for explicit readBy writes", () => {
assert.deepEqual(
createTaskReadMarkerRows({
taskId: "task-1",
readAgents: [{ id: "agent-main" }, { id: "agent-kaito" }],
status: Status.done,
}),
[
{ taskId: "task-1", agentId: "agent-main", status: Status.done },
{ taskId: "task-1", agentId: "agent-kaito", status: Status.done },
]
)
})
})
Loading