diff --git a/doc/PRODUCT.md b/doc/PRODUCT.md index 82ffb047b15..0edb2caa397 100644 --- a/doc/PRODUCT.md +++ b/doc/PRODUCT.md @@ -235,6 +235,8 @@ and read markers do not establish participation in automatic work. Direct board human API comments, human assignment, and deliberate user mutations do establish participation. Open requests addressed to the person also admit the task until resolution. Ordinary human-created tasks keep their creator's participation. +Responsibility-repair audit entries do not establish personal participation, +even when the repair is attributed to a human operator. These rules apply to existing tasks, Mine, unread counts, badges, and task toasts. Approvals retain their existing recipient and permission rules. diff --git a/server/src/__tests__/issues-service.test.ts b/server/src/__tests__/issues-service.test.ts index bde1ad87d66..11054e63166 100644 --- a/server/src/__tests__/issues-service.test.ts +++ b/server/src/__tests__/issues-service.test.ts @@ -880,6 +880,70 @@ describeEmbeddedPostgres("issueService.list participantAgentId", () => { expect(await db.select().from(activityLog).where(eq(activityLog.companyId, companyId))).toHaveLength(variants.length); }); + it("excludes responsibility repair audits from Mine without hiding ordinary user updates", async () => { + const companyId = await seedAssignableAgentCompany(); + const userId = "board-user"; + const variants = [ + { id: randomUUID(), action: "issue.updated", details: { source: "needs_you_responsibility_repair" }, counts: false }, + { id: randomUUID(), action: "issue.thread_interaction_created", details: { source: "needs_you_responsibility_repair" }, counts: false }, + { id: randomUUID(), action: "issue.inbox_touched", details: { source: "needs_you_responsibility_repair" }, counts: false }, + { id: randomUUID(), action: "issue.updated", details: null, counts: true }, + { id: randomUUID(), action: "issue.updated", details: {}, counts: true }, + { id: randomUUID(), action: "issue.updated", details: { source: "manual_edit" }, counts: true }, + ]; + await db.insert(issues).values(variants.map(({ id }) => ({ + id, companyId, title: "Repaired routine task", status: "blocked", originKind: "routine_execution", + responsibleUserId: "other-user", + }))); + await db.insert(activityLog).values(variants.map(({ id, action, details }) => ({ + companyId, actorType: "user", actorId: userId, action, entityType: "issue", entityId: id, details, + }))); + await db.insert(issueThreadInteractions).values({ + companyId, issueId: variants[0]!.id, kind: "request_confirmation", status: "expired", + addresseeUserId: userId, payload: { version: 1, prompt: "Obsolete request" }, + }); + await db.insert(issueComments).values(variants.map(({ id }) => ({ + companyId, issueId: id, authorType: "system" as const, body: "Routine update", + }))); + + const expectedIds = variants.filter(v => v.counts).map(v => v.id).sort(); + const filters = { touchedByUserId: userId, inboxArchivedByUserId: userId, includeRoutineExecutions: true }; + expect((await svc.list(companyId, filters)).map(v => v.id).sort()).toEqual(expectedIds); + expect((await svc.list(companyId, { ...filters, touchedCandidates: "participation" })).map(v => v.id).sort()).toEqual(expectedIds); + expect(await svc.countUnreadTouchedByUser(companyId, userId)).toBe(expectedIds.length); + expect((await svc.unreadInboxIssueIds(companyId, userId, sql`true`)).sort()).toEqual(expectedIds); + expect(await db.select().from(activityLog).where(eq(activityLog.companyId, companyId))).toHaveLength(variants.length); + }); + + it("keeps repaired tasks in Mine when the viewer has independent participation", async () => { + const companyId = await seedAssignableAgentCompany(); + const userId = "board-user"; + const ids = { creator: randomUUID(), assignee: randomUUID(), commenter: randomUUID(), editor: randomUUID(), addressee: randomUUID() }; + await db.insert(issues).values(Object.entries(ids).map(([kind, id]) => ({ + id, companyId, title: "Participated repaired task", status: "blocked", + originKind: kind === "creator" ? "manual" : "routine_execution", + createdByUserId: kind === "creator" ? userId : null, + assigneeUserId: kind === "assignee" ? userId : null, + }))); + await db.insert(activityLog).values(Object.values(ids).map(id => ({ + companyId, actorType: "user", actorId: userId, action: "issue.updated", entityType: "issue", entityId: id, + details: { source: "needs_you_responsibility_repair" }, + }))); + await db.insert(activityLog).values({ + companyId, actorType: "user", actorId: userId, action: "issue.updated", entityType: "issue", entityId: ids.editor, + }); + await db.insert(issueComments).values({ companyId, issueId: ids.commenter, authorUserId: userId, body: "Following this task" }); + await db.insert(issueThreadInteractions).values({ + companyId, issueId: ids.addressee, kind: "request_confirmation", addresseeUserId: userId, + payload: { version: 1, prompt: "Please confirm" }, + }); + + const expectedIds = Object.values(ids).sort(); + const filters = { touchedByUserId: userId, includeRoutineExecutions: true }; + expect((await svc.list(companyId, filters)).map(v => v.id).sort()).toEqual(expectedIds); + expect((await svc.list(companyId, { ...filters, touchedCandidates: "participation" })).map(v => v.id).sort()).toEqual(expectedIds); + }); + function agentRow(companyId: string, input: { id: string; name: string; diff --git a/server/src/__tests__/task-toast-eligibility.test.ts b/server/src/__tests__/task-toast-eligibility.test.ts index 53dfdb43e17..b935734969b 100644 --- a/server/src/__tests__/task-toast-eligibility.test.ts +++ b/server/src/__tests__/task-toast-eligibility.test.ts @@ -73,6 +73,8 @@ describe.skipIf(!support.supported)("personal task toast eligibility (persisted await db.insert(activityLog).values({ companyId, entityType: "issue", entityId: id, actorType: "user", actorId: "alice", action, details: { source: "source_revalidation", trigger: "read_projection" } }); } + await db.insert(activityLog).values({ companyId, entityType: "issue", entityId: id, actorType: "user", actorId: "alice", + action: "issue.updated", details: { source: "needs_you_responsibility_repair" } }); expect(await taskToastEligible(db, event(id), "alice")).toBe(false); await db.insert(activityLog).values({ companyId, entityType: "issue", entityId: id, actorType: "user", actorId: "alice", action: "issue.updated" }); await onlyAlice(id); diff --git a/server/src/services/issue-participation.ts b/server/src/services/issue-participation.ts index c7c2a815c0f..be270433fad 100644 --- a/server/src/services/issue-participation.ts +++ b/server/src/services/issue-participation.ts @@ -142,6 +142,7 @@ export function userParticipationActivityCondition(companyId: string, userId: st AND ${activityLog.actorType} = 'user' AND ${activityLog.actorId} = ${userId} AND NOT ${automaticReadRecoveryCleanupCondition()} + AND COALESCE(${activityLog.details}->>'source', '') <> 'needs_you_responsibility_repair' AND NOT ( ${activityLog.action} = 'issue.inbox_touched' AND COALESCE(${activityLog.details}->>'source', '') = 'manual_routine_run'