mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-14 01:50:39 +09:00
## Thinking Path
> - Paperclip orchestrates AI agents for zero-human companies
> - Routines are recurring tasks that trigger agents on a schedule or
via webhook
> - Routine triggers store their schedule as a `cronExpression` +
`timezone` in the database
> - The `GET /companies/:companyId/routines` list endpoint is the
primary way API consumers (and the UI) discover all routines and their
triggers
> - But the list endpoint was silently dropping `cronExpression` and
`timezone` from each trigger object — the DB query fetched them, but the
explicit object-construction mapping only forwarded seven other fields
> - This PR fixes the mapping to include `cronExpression` and
`timezone`, and extends the `RoutineListItem.triggers` type to match
> - The benefit is that API consumers can now see the actual schedule
from the list endpoint, and future UI components reading from the list
cache will get accurate schedule data
## What Changed
- **`server/src/services/routines.ts`** — Added `cronExpression` and
`timezone` to the explicit trigger object mapping inside
`routinesService.list()`. The DB query (`listTriggersForRoutineIds`)
already fetched all columns via `SELECT *`; the values were being
discarded during object construction.
- **`packages/shared/src/types/routine.ts`** — Extended
`RoutineListItem.triggers` `Pick<RoutineTrigger, ...>` to include
`cronExpression` and `timezone` so the TypeScript type contract matches
the actual runtime shape.
- **`server/src/__tests__/routines-e2e.test.ts`** — Added assertions to
the existing schedule-trigger E2E test that verify both `cronExpression`
and `timezone` are present in the `GET /companies/:companyId/routines`
list response.
## Verification
```bash
# Run the route + service unit tests
npx vitest run server/src/__tests__/routines-routes.test.ts server/src/__tests__/routines-service.test.ts
# → 21 tests pass
# Confirm cronExpression appears in list response
curl /api/companies/{id}/routines | jq '.[].triggers[].cronExpression'
# → now returns the actual cron string instead of undefined
```
Manual reproduction per the issue:
1. Create a routine with a schedule trigger (`cronExpression: "47 14 * *
*"`, `timezone: "America/Mexico_City"`)
2. `GET /api/companies/{id}/routines` — trigger object now includes
`cronExpression` and `timezone`
## Risks
Low risk. The change only adds two fields to an existing response shape
— no fields removed, no behavior changed. The `cronExpression` is `null`
for non-schedule trigger kinds (webhook, etc.), consistent with
`RoutineTrigger.cronExpression: string | null`. No migration required.
## Model Used
- **Provider:** Anthropic
- **Model:** Claude Sonnet 4.6 (`claude-sonnet-4-6`)
- **Context window:** 200k tokens
- **Mode:** Extended thinking + tool use (agentic)
- Secondary adversarial review: OpenAI Codex (via codex-companion
plugin)
## Checklist
- [x] I have included a thinking path that traces from project context
to this change
- [x] I have specified the model used (with version and capability
details)
- [x] I have run tests locally and they pass
- [x] I have added or updated tests where applicable
- [ ] If this change affects the UI, I have included before/after
screenshots (API-only fix; no UI rendering change)
- [ ] I have updated relevant documentation to reflect my changes (no
doc changes needed)
- [x] I have considered and documented any risks above
- [x] I will address all Greptile and reviewer comments before
requesting merge
499 lines
16 KiB
TypeScript
499 lines
16 KiB
TypeScript
import { randomUUID } from "node:crypto";
|
|
import { eq } from "drizzle-orm";
|
|
import express from "express";
|
|
import request from "supertest";
|
|
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import {
|
|
activityLog,
|
|
agentWakeupRequests,
|
|
agents,
|
|
companies,
|
|
companyMemberships,
|
|
createDb,
|
|
executionWorkspaces,
|
|
heartbeatRunEvents,
|
|
heartbeatRuns,
|
|
instanceSettings,
|
|
issues,
|
|
principalPermissionGrants,
|
|
projectWorkspaces,
|
|
projects,
|
|
routineRuns,
|
|
routines,
|
|
routineTriggers,
|
|
} from "@paperclipai/db";
|
|
import {
|
|
getEmbeddedPostgresTestSupport,
|
|
startEmbeddedPostgresTestDatabase,
|
|
} from "./helpers/embedded-postgres.js";
|
|
import { accessService } from "../services/access.js";
|
|
|
|
function registerRoutineServiceMock() {
|
|
vi.doMock("../services/routines.js", async () => {
|
|
const actual = await vi.importActual<typeof import("../services/routines.js")>("../services/routines.js");
|
|
|
|
return {
|
|
...actual,
|
|
routineService: (db: any) =>
|
|
actual.routineService(db, {
|
|
heartbeat: {
|
|
wakeup: async (agentId: string, wakeupOpts: any) => {
|
|
const issueId =
|
|
(typeof wakeupOpts?.payload?.issueId === "string" && wakeupOpts.payload.issueId) ||
|
|
(typeof wakeupOpts?.contextSnapshot?.issueId === "string" && wakeupOpts.contextSnapshot.issueId) ||
|
|
null;
|
|
if (!issueId) return null;
|
|
|
|
const issue = await db
|
|
.select({ companyId: issues.companyId })
|
|
.from(issues)
|
|
.where(eq(issues.id, issueId))
|
|
.then((rows: Array<{ companyId: string }>) => rows[0] ?? null);
|
|
if (!issue) return null;
|
|
|
|
const queuedRunId = randomUUID();
|
|
await db.insert(heartbeatRuns).values({
|
|
id: queuedRunId,
|
|
companyId: issue.companyId,
|
|
agentId,
|
|
invocationSource: wakeupOpts?.source ?? "assignment",
|
|
triggerDetail: wakeupOpts?.triggerDetail ?? null,
|
|
status: "queued",
|
|
contextSnapshot: { ...(wakeupOpts?.contextSnapshot ?? {}), issueId },
|
|
});
|
|
await db
|
|
.update(issues)
|
|
.set({
|
|
executionRunId: queuedRunId,
|
|
executionLockedAt: new Date(),
|
|
})
|
|
.where(eq(issues.id, issueId));
|
|
return { id: queuedRunId };
|
|
},
|
|
},
|
|
}),
|
|
};
|
|
});
|
|
}
|
|
|
|
const embeddedPostgresSupport = await getEmbeddedPostgresTestSupport();
|
|
const describeEmbeddedPostgres = embeddedPostgresSupport.supported ? describe : describe.skip;
|
|
|
|
if (!embeddedPostgresSupport.supported) {
|
|
console.warn(
|
|
`Skipping embedded Postgres routine route tests on this host: ${embeddedPostgresSupport.reason ?? "unsupported environment"}`,
|
|
);
|
|
}
|
|
|
|
describeEmbeddedPostgres("routine routes end-to-end", () => {
|
|
let db!: ReturnType<typeof createDb>;
|
|
let tempDb: Awaited<ReturnType<typeof startEmbeddedPostgresTestDatabase>> | null = null;
|
|
|
|
beforeAll(async () => {
|
|
tempDb = await startEmbeddedPostgresTestDatabase("paperclip-routines-e2e-");
|
|
db = createDb(tempDb.connectionString);
|
|
}, 20_000);
|
|
|
|
afterEach(async () => {
|
|
await db.delete(activityLog);
|
|
await db.delete(routineRuns);
|
|
await db.delete(routineTriggers);
|
|
await db.delete(heartbeatRunEvents);
|
|
await db.delete(heartbeatRuns);
|
|
await db.delete(agentWakeupRequests);
|
|
await db.delete(issues);
|
|
await db.delete(executionWorkspaces);
|
|
await db.delete(projectWorkspaces);
|
|
await db.delete(principalPermissionGrants);
|
|
await db.delete(companyMemberships);
|
|
await db.delete(routines);
|
|
await db.delete(projects);
|
|
await db.delete(agents);
|
|
await db.delete(companies);
|
|
await db.delete(instanceSettings);
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await tempDb?.cleanup();
|
|
});
|
|
|
|
beforeEach(() => {
|
|
vi.resetModules();
|
|
vi.doUnmock("@paperclipai/shared/telemetry");
|
|
vi.doUnmock("../telemetry.js");
|
|
vi.doUnmock("../services/access.js");
|
|
vi.doUnmock("../services/issues.js");
|
|
vi.doUnmock("../services/companies.js");
|
|
vi.doUnmock("../services/projects.js");
|
|
vi.doUnmock("../services/company-skills.js");
|
|
vi.doUnmock("../services/assets.js");
|
|
vi.doUnmock("../services/agent-instructions.js");
|
|
vi.doUnmock("../services/workspace-runtime.js");
|
|
vi.doUnmock("../services/index.js");
|
|
vi.doUnmock("../services/routines.js");
|
|
vi.doUnmock("../routes/routines.js");
|
|
vi.doUnmock("../routes/authz.js");
|
|
vi.doUnmock("../middleware/index.js");
|
|
registerRoutineServiceMock();
|
|
});
|
|
|
|
async function createApp(actor: Record<string, unknown>) {
|
|
const [{ routineRoutes }, { errorHandler }] = await Promise.all([
|
|
vi.importActual<typeof import("../routes/routines.js")>("../routes/routines.js"),
|
|
vi.importActual<typeof import("../middleware/index.js")>("../middleware/index.js"),
|
|
]);
|
|
const app = express();
|
|
app.use(express.json());
|
|
app.use((req, _res, next) => {
|
|
(req as any).actor = actor;
|
|
next();
|
|
});
|
|
app.use("/api", routineRoutes(db));
|
|
app.use(errorHandler);
|
|
return app;
|
|
}
|
|
|
|
async function postRoutineRun(
|
|
app: express.Express,
|
|
routineId: string,
|
|
body: Record<string, unknown>,
|
|
) {
|
|
let response = await request(app)
|
|
.post(`/api/routines/${routineId}/run`)
|
|
.send(body);
|
|
if (response.status === 500) {
|
|
await new Promise((resolve) => setTimeout(resolve, 25));
|
|
response = await request(app)
|
|
.post(`/api/routines/${routineId}/run`)
|
|
.send(body);
|
|
}
|
|
return response;
|
|
}
|
|
|
|
async function seedFixture() {
|
|
const companyId = randomUUID();
|
|
const agentId = randomUUID();
|
|
const projectId = randomUUID();
|
|
const userId = randomUUID();
|
|
const issuePrefix = `T${companyId.replace(/-/g, "").slice(0, 6).toUpperCase()}`;
|
|
|
|
await db.insert(companies).values({
|
|
id: companyId,
|
|
name: "Paperclip",
|
|
issuePrefix,
|
|
requireBoardApprovalForNewAgents: false,
|
|
});
|
|
|
|
await db.insert(agents).values({
|
|
id: agentId,
|
|
companyId,
|
|
name: "CodexCoder",
|
|
role: "engineer",
|
|
status: "active",
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
runtimeConfig: {},
|
|
permissions: {},
|
|
});
|
|
|
|
await db.insert(projects).values({
|
|
id: projectId,
|
|
companyId,
|
|
name: "Routine Project",
|
|
status: "in_progress",
|
|
});
|
|
|
|
const access = accessService(db);
|
|
const membership = await access.ensureMembership(companyId, "user", userId, "owner", "active");
|
|
await access.setMemberPermissions(
|
|
companyId,
|
|
membership.id,
|
|
[{ permissionKey: "tasks:assign" }],
|
|
userId,
|
|
);
|
|
|
|
return { companyId, agentId, projectId, userId };
|
|
}
|
|
|
|
it("supports creating, scheduling, and manually running a routine through the API", async () => {
|
|
const { companyId, agentId, projectId, userId } = await seedFixture();
|
|
const app = await createApp({
|
|
type: "board",
|
|
userId,
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
companyIds: [companyId],
|
|
});
|
|
|
|
const createRes = await request(app)
|
|
.post(`/api/companies/${companyId}/routines`)
|
|
.send({
|
|
projectId,
|
|
title: "Daily standup prep",
|
|
description: "Summarize blockers and open PRs",
|
|
assigneeAgentId: agentId,
|
|
priority: "high",
|
|
concurrencyPolicy: "coalesce_if_active",
|
|
catchUpPolicy: "skip_missed",
|
|
});
|
|
|
|
expect([200, 201]).toContain(createRes.status);
|
|
expect(createRes.body.title).toBe("Daily standup prep");
|
|
expect(createRes.body.assigneeAgentId).toBe(agentId);
|
|
|
|
const routineId = createRes.body.id as string;
|
|
|
|
const triggerRes = await request(app)
|
|
.post(`/api/routines/${routineId}/triggers`)
|
|
.send({
|
|
kind: "schedule",
|
|
label: "Weekday morning",
|
|
cronExpression: "0 10 * * 1-5",
|
|
timezone: "UTC",
|
|
});
|
|
|
|
expect([200, 201], JSON.stringify(triggerRes.body)).toContain(triggerRes.status);
|
|
expect(triggerRes.body.trigger.kind).toBe("schedule");
|
|
expect(triggerRes.body.trigger.enabled).toBe(true);
|
|
expect(triggerRes.body.secretMaterial).toBeNull();
|
|
|
|
const runRes = await postRoutineRun(app, routineId, {
|
|
source: "manual",
|
|
payload: { origin: "e2e-test" },
|
|
});
|
|
|
|
expect(runRes.status).toBe(202);
|
|
expect(runRes.body.status).toBe("issue_created");
|
|
expect(runRes.body.source).toBe("manual");
|
|
expect(runRes.body.linkedIssueId).toBeTruthy();
|
|
|
|
const listRes = await request(app).get(`/api/companies/${companyId}/routines`);
|
|
expect(listRes.status).toBe(200);
|
|
const listed = listRes.body.find((r: { id: string }) => r.id === routineId);
|
|
expect(listed).toBeDefined();
|
|
expect(listed.triggers).toHaveLength(1);
|
|
expect(listed.triggers[0].cronExpression).toBe("0 10 * * 1-5");
|
|
expect(listed.triggers[0].timezone).toBe("UTC");
|
|
|
|
const detailRes = await request(app).get(`/api/routines/${routineId}`);
|
|
expect(detailRes.status).toBe(200);
|
|
expect(detailRes.body.triggers).toHaveLength(1);
|
|
expect(detailRes.body.triggers[0]?.id).toBe(triggerRes.body.trigger.id);
|
|
expect(detailRes.body.recentRuns).toHaveLength(1);
|
|
expect(detailRes.body.recentRuns[0]?.id).toBe(runRes.body.id);
|
|
expect(detailRes.body.activeIssue?.id).toBe(runRes.body.linkedIssueId);
|
|
|
|
const runsRes = await request(app).get(`/api/routines/${routineId}/runs?limit=10`);
|
|
expect(runsRes.status).toBe(200);
|
|
const [persistedRun] = await db
|
|
.select({ id: routineRuns.id })
|
|
.from(routineRuns)
|
|
.where(eq(routineRuns.id, runRes.body.id));
|
|
expect(persistedRun?.id).toBe(runRes.body.id);
|
|
|
|
const [issue] = await db
|
|
.select({
|
|
id: issues.id,
|
|
originId: issues.originId,
|
|
originKind: issues.originKind,
|
|
executionRunId: issues.executionRunId,
|
|
})
|
|
.from(issues)
|
|
.where(eq(issues.id, runRes.body.linkedIssueId));
|
|
|
|
expect(issue).toMatchObject({
|
|
id: runRes.body.linkedIssueId,
|
|
originId: routineId,
|
|
originKind: "routine_execution",
|
|
});
|
|
expect(issue?.executionRunId).toBeTruthy();
|
|
|
|
const actions = await db
|
|
.select({
|
|
action: activityLog.action,
|
|
})
|
|
.from(activityLog)
|
|
.where(eq(activityLog.companyId, companyId));
|
|
|
|
expect(actions.map((entry) => entry.action)).toEqual(
|
|
expect.arrayContaining([
|
|
"routine.created",
|
|
"routine.trigger_created",
|
|
"routine.run_triggered",
|
|
]),
|
|
);
|
|
}, 15_000);
|
|
|
|
it("runs routines with variable inputs and interpolates the execution issue description", async () => {
|
|
const { companyId, agentId, projectId, userId } = await seedFixture();
|
|
const app = await createApp({
|
|
type: "board",
|
|
userId,
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
companyIds: [companyId],
|
|
});
|
|
|
|
const createRes = await request(app)
|
|
.post(`/api/companies/${companyId}/routines`)
|
|
.send({
|
|
projectId,
|
|
title: "Repository triage",
|
|
description: "Review {{repo}} for {{priority}} bugs",
|
|
assigneeAgentId: agentId,
|
|
variables: [
|
|
{ name: "repo", type: "text", required: true },
|
|
{ name: "priority", type: "select", required: true, defaultValue: "high", options: ["high", "low"] },
|
|
],
|
|
});
|
|
|
|
expect([200, 201], JSON.stringify(createRes.body)).toContain(createRes.status);
|
|
|
|
const runRes = await postRoutineRun(app, createRes.body.id, {
|
|
source: "manual",
|
|
variables: { repo: "paperclip" },
|
|
});
|
|
|
|
expect(runRes.status).toBe(202);
|
|
expect(runRes.body.triggerPayload).toEqual({
|
|
variables: {
|
|
repo: "paperclip",
|
|
priority: "high",
|
|
},
|
|
});
|
|
|
|
const [issue] = await db
|
|
.select({ description: issues.description })
|
|
.from(issues)
|
|
.where(eq(issues.id, runRes.body.linkedIssueId));
|
|
|
|
expect(issue?.description).toBe("Review paperclip for high bugs");
|
|
});
|
|
|
|
it("allows drafting a routine without defaults and running it with one-off overrides", async () => {
|
|
const { companyId, agentId, projectId, userId } = await seedFixture();
|
|
const app = await createApp({
|
|
type: "board",
|
|
userId,
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
companyIds: [companyId],
|
|
});
|
|
|
|
const createRes = await request(app)
|
|
.post(`/api/companies/${companyId}/routines`)
|
|
.send({
|
|
title: "Draft routine",
|
|
description: "No saved defaults",
|
|
});
|
|
|
|
expect([200, 201], JSON.stringify(createRes.body)).toContain(createRes.status);
|
|
expect(createRes.body.projectId ?? null).toBeNull();
|
|
expect(createRes.body.assigneeAgentId ?? null).toBeNull();
|
|
expect(createRes.body.status).toBe("paused");
|
|
|
|
const runRes = await postRoutineRun(app, createRes.body.id, {
|
|
source: "manual",
|
|
projectId,
|
|
assigneeAgentId: agentId,
|
|
});
|
|
|
|
expect(runRes.status).toBe(202);
|
|
expect(runRes.body.status).toBe("issue_created");
|
|
|
|
const [issue] = await db
|
|
.select({
|
|
projectId: issues.projectId,
|
|
assigneeAgentId: issues.assigneeAgentId,
|
|
})
|
|
.from(issues)
|
|
.where(eq(issues.id, runRes.body.linkedIssueId));
|
|
|
|
expect(issue).toEqual({
|
|
projectId,
|
|
assigneeAgentId: agentId,
|
|
});
|
|
});
|
|
|
|
it("persists execution workspace selections from manual routine runs", async () => {
|
|
const { companyId, agentId, projectId, userId } = await seedFixture();
|
|
const projectWorkspaceId = randomUUID();
|
|
const executionWorkspaceId = randomUUID();
|
|
const app = await createApp({
|
|
type: "board",
|
|
userId,
|
|
source: "session",
|
|
isInstanceAdmin: false,
|
|
companyIds: [companyId],
|
|
});
|
|
|
|
await db.insert(projectWorkspaces).values({
|
|
id: projectWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
name: "Primary workspace",
|
|
isPrimary: true,
|
|
sharedWorkspaceKey: "routine-primary",
|
|
});
|
|
await db.insert(executionWorkspaces).values({
|
|
id: executionWorkspaceId,
|
|
companyId,
|
|
projectId,
|
|
projectWorkspaceId,
|
|
mode: "isolated_workspace",
|
|
strategyType: "git_worktree",
|
|
name: "Routine worktree",
|
|
status: "active",
|
|
providerType: "git_worktree",
|
|
});
|
|
await db
|
|
.update(projects)
|
|
.set({
|
|
executionWorkspacePolicy: {
|
|
enabled: true,
|
|
defaultMode: "shared_workspace",
|
|
defaultProjectWorkspaceId: projectWorkspaceId,
|
|
},
|
|
})
|
|
.where(eq(projects.id, projectId));
|
|
await db.insert(instanceSettings).values({
|
|
experimental: { enableIsolatedWorkspaces: true },
|
|
});
|
|
|
|
const createRes = await request(app)
|
|
.post(`/api/companies/${companyId}/routines`)
|
|
.send({
|
|
projectId,
|
|
title: "Workspace-aware routine",
|
|
assigneeAgentId: agentId,
|
|
});
|
|
|
|
expect([200, 201], JSON.stringify(createRes.body)).toContain(createRes.status);
|
|
|
|
const runRes = await postRoutineRun(app, createRes.body.id, {
|
|
source: "manual",
|
|
executionWorkspaceId,
|
|
executionWorkspacePreference: "reuse_existing",
|
|
executionWorkspaceSettings: { mode: "isolated_workspace" },
|
|
});
|
|
|
|
expect(runRes.status).toBe(202);
|
|
|
|
const [issue] = await db
|
|
.select({
|
|
projectWorkspaceId: issues.projectWorkspaceId,
|
|
executionWorkspaceId: issues.executionWorkspaceId,
|
|
executionWorkspacePreference: issues.executionWorkspacePreference,
|
|
executionWorkspaceSettings: issues.executionWorkspaceSettings,
|
|
})
|
|
.from(issues)
|
|
.where(eq(issues.id, runRes.body.linkedIssueId));
|
|
|
|
expect(issue).toEqual({
|
|
projectWorkspaceId,
|
|
executionWorkspaceId,
|
|
executionWorkspacePreference: "reuse_existing",
|
|
executionWorkspaceSettings: { mode: "isolated_workspace" },
|
|
});
|
|
});
|
|
});
|