diff --git a/server/src/__tests__/heartbeat-responsible-user-invariant.test.ts b/server/src/__tests__/heartbeat-responsible-user-invariant.test.ts index bf91718cb1b..906e026ade8 100644 --- a/server/src/__tests__/heartbeat-responsible-user-invariant.test.ts +++ b/server/src/__tests__/heartbeat-responsible-user-invariant.test.ts @@ -17,7 +17,10 @@ import { heartbeatRuns, issueComments, issues, + routines, + routineRuns, } from "@paperclipai/db"; +import { createRoutineSchema } from "@paperclipai/shared"; import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, @@ -26,6 +29,7 @@ import { heartbeatService } from "../services/heartbeat.ts"; import { runningProcesses } from "../adapters/index.ts"; import { drainHeartbeatRunsToQuiescence } from "./helpers/drain-heartbeat-runs.js"; import { createLifecycleDriver } from "../services/agent-lifecycle-driver.js"; +import { routineService } from "../services/routines.js"; const mockAdapterExecute = vi.hoisted(() => vi.fn(async () => ({ @@ -115,6 +119,7 @@ describeEmbeddedPostgres("heartbeat responsible-user invariant", () => { await drainHeartbeatRunsToQuiescence(db, heartbeat); await db.delete(issueComments); await db.delete(activityLog); + await db.delete(routines); await deleteHeartbeatRunsAfterEvents(db); await db.delete(agentWakeupRequests); await db.delete(agentRuntimeState); @@ -495,6 +500,45 @@ describeEmbeddedPostgres("heartbeat responsible-user invariant", () => { expect(completed?.responsibleUserId).toBe(triggeringUserId); }); + it("launches a manual routine run with the caller's identity and selected agent", async () => { + const { companyId, agentId, ownerUserId } = await seedCompany(); + const callerUserId = `caller-${randomUUID()}`; + await db.insert(authUsers).values({ + id: callerUserId, name: "Manual caller", email: `${callerUserId}@example.test`, + createdAt: new Date(), updatedAt: new Date(), + }); + await db.insert(companyMemberships).values({ + companyId, principalType: "user", principalId: callerUserId, + membershipRole: "member", status: "active", + }); + const [callerAgent] = await db.insert(agents).values({ + companyId, name: "Caller's agent", adapterType: "codex_local", status: "idle", + adapterConfig: {}, runtimeConfig: {}, permissions: {}, + }).returning(); + const svc = routineService(db, { heartbeat }); + const routine = await svc.create(companyId, createRoutineSchema.parse({ + title: "Shared routine", assigneeAgentId: agentId, + }), { userId: ownerUserId }); + + const run = await svc.runRoutine(routine.id, { + source: "manual", assigneeAgentId: callerAgent.id, + }, { userId: callerUserId }); + + const [task] = await db.select().from(issues).where(eq(issues.id, run.linkedIssueId!)); + const [execution] = await db.select().from(heartbeatRuns).where(and( + eq(heartbeatRuns.companyId, companyId), eq(heartbeatRuns.agentId, callerAgent.id), + )); + expect(task).toMatchObject({ responsibleUserId: callerUserId, assigneeAgentId: callerAgent.id }); + expect(run.responsibleUserId).toBe(callerUserId); + expect(execution.responsibleUserId).toBe(callerUserId); + const completed = await waitForRun(db, execution.id); + expect(completed).toMatchObject({ status: "succeeded", responsibleUserId: callerUserId }); + const [savedRoutine] = await db.select().from(routines).where(eq(routines.id, routine.id)); + expect(savedRoutine.responsibleUserId).toBe(ownerUserId); + const [savedRun] = await db.select().from(routineRuns).where(eq(routineRuns.id, run.id)); + expect(savedRun.responsibleUserId).toBe(callerUserId); + }); + it("falls back to the company default for system-originated runs without an issue", async () => { const { agentId, ownerUserId } = await seedCompany(); const run = await heartbeat.wakeup(agentId, { diff --git a/server/src/__tests__/routines-service.test.ts b/server/src/__tests__/routines-service.test.ts index 5ac0a62f0ae..4a8718230cf 100644 --- a/server/src/__tests__/routines-service.test.ts +++ b/server/src/__tests__/routines-service.test.ts @@ -1728,7 +1728,7 @@ describeEmbeddedPostgres("routine service live-execution coalescing", () => { payload: { issueId: run.linkedIssueId, mutation: "create" }, requestedByActorType: undefined, requestedByActorId: null, - contextSnapshot: { issueId: run.linkedIssueId, source: "routine.dispatch" }, + contextSnapshot: { issueId: run.linkedIssueId, source: "routine.dispatch", responsibleUserId: routine.responsibleUserId }, }, }, ]); diff --git a/server/src/services/issue-assignment-wakeup.ts b/server/src/services/issue-assignment-wakeup.ts index c94aaef77bf..b4b8ed3fd57 100644 --- a/server/src/services/issue-assignment-wakeup.ts +++ b/server/src/services/issue-assignment-wakeup.ts @@ -32,6 +32,7 @@ export function queueIssueAssignmentWakeup(input: { requestedByActorType?: "user" | "agent" | "system"; requestedByActorId?: string | null; requestedByActorCompanyId?: string; + responsibleUserId?: string | null; taskKey?: string | null; /** Latest issue comment that caused this wakeup. Included in both payload * and context so the heartbeat can build the exact turn that was requested. */ @@ -70,6 +71,7 @@ export function queueIssueAssignmentWakeup(input: { contextSnapshot: { issueId: input.issue.id, source: input.contextSource, + ...(input.responsibleUserId ? { responsibleUserId: input.responsibleUserId } : {}), ...(input.taskKey ? { taskKey: input.taskKey } : {}), ...(input.wakeCommentId ? { wakeCommentId: input.wakeCommentId } : {}), ...(input.wakeCommentIds?.length ? { wakeCommentIds: input.wakeCommentIds } : {}), diff --git a/server/src/services/routines.ts b/server/src/services/routines.ts index 06884a1fa29..fd5b6c0e35c 100644 --- a/server/src/services/routines.ts +++ b/server/src/services/routines.ts @@ -2016,6 +2016,7 @@ export function routineService( reason: "issue_assigned", mutation: "create", contextSource: "routine.dispatch", + responsibleUserId, requestedByActorType: interactionActorAgentId ? "agent" : input.actor?.userId ? "user" : input.source === "schedule" ? "system" : undefined, requestedByActorId: interactionActorAgentId ?? input.actor?.userId ?? null, requestedByActorCompanyId: interactionActorCompanyId,