Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

Keep a gateway partner's job token on the monitor it created (#4427)

Rakshith Ramprakash5c1ea5abe18a
diff --git a/apps/api/src/controllers/v2/monitor.ts b/apps/api/src/controllers/v2/monitor.ts
index e39236664..28713cf7d 100644
--- a/apps/api/src/controllers/v2/monitor.ts
+++ b/apps/api/src/controllers/v2/monitor.ts
@@ -2,6 +2,7 @@ import { Response } from "express";
import { z } from "zod";
import { logger as _logger } from "../../lib/logger";
import { RequestWithAuth } from "./types";
+import { externalRequestId } from "../../lib/external-request-id";
import { getScrapeZDR } from "../../lib/zdr-helpers";
import { getMonitorDiffArtifact } from "../../lib/gcs-monitoring";
import {
@@ -210,6 +211,7 @@ export async function createMonitorController(
input,
nextRunAt: schedule.nextRunAt,
intervalMs: schedule.intervalMs,
+ partnerJobToken: externalRequestId(req),
});
trackMonitorConfiguredInterest({
diff --git a/apps/api/src/db/schema/public.ts b/apps/api/src/db/schema/public.ts
index a2070a5d9..7ed04b804 100644
--- a/apps/api/src/db/schema/public.ts
+++ b/apps/api/src/db/schema/public.ts
@@ -454,6 +454,7 @@ export const monitors = pgTable("monitors", {
deleted_at: ts("deleted_at"),
goal: text("goal"),
judge_enabled: boolean("judge_enabled").notNull().default(false),
+ partner_job_token: text("partner_job_token"),
});
export const slack_installations = pgTable("slack_installations", {
diff --git a/apps/api/src/services/monitoring/store.create.test.ts b/apps/api/src/services/monitoring/store.create.test.ts
new file mode 100644
index 000000000..76e643bb1
--- /dev/null
+++ b/apps/api/src/services/monitoring/store.create.test.ts
@@ -0,0 +1,54 @@
+const { insertValues, insertMock } = vi.hoisted(() => {
+ const insertValues: Record<string, unknown>[] = [];
+ const insertMock = vi.fn(() => ({
+ values: (row: Record<string, unknown>) => {
+ insertValues.push(row);
+ return { returning: async () => [row] };
+ },
+ }));
+ return { insertValues, insertMock };
+});
+
+vi.mock("../../db/connection", () => ({
+ db: { insert: insertMock },
+ dbRr: { select: vi.fn() },
+}));
+
+vi.mock("../../db/rpc", () => ({ monitoringClaimDueMonitors: vi.fn() }));
+
+import { createMonitor } from "./store";
+import type { CreateMonitorRequest } from "./types";
+
+const input = {
+ name: "docs",
+ schedule: { cron: "0 * * * *", timezone: "UTC" },
+ retentionDays: 30,
+ targets: [{ type: "scrape", urls: ["https://example.com"] }],
+} as unknown as CreateMonitorRequest;
+
+async function create(partnerJobToken?: string | null) {
+ insertValues.length = 0;
+ await createMonitor({
+ teamId: "11111111-1111-1111-1111-111111111111",
+ input,
+ nextRunAt: new Date("2026-09-01T00:00:00.000Z"),
+ intervalMs: 3_600_000,
+ partnerJobToken,
+ });
+ return insertValues[0];
+}
+
+describe("createMonitor and the partner job token", () => {
+ it("keeps the partner's token on the monitor row", async () => {
+ expect((await create("job-token-abc")).partner_job_token).toBe(
+ "job-token-abc",
+ );
+ });
+
+ // Omitted, not null: a deploy ahead of the migration must still create
+ // ordinary monitors.
+ it("omits the key entirely when nobody sent one", async () => {
+ expect(await create(null)).not.toHaveProperty("partner_job_token");
+ expect(await create(undefined)).not.toHaveProperty("partner_job_token");
+ });
+});
diff --git a/apps/api/src/services/monitoring/store.ts b/apps/api/src/services/monitoring/store.ts
index 7fcc3acbc..1837c7862 100644
--- a/apps/api/src/services/monitoring/store.ts
+++ b/apps/api/src/services/monitoring/store.ts
@@ -351,6 +351,8 @@ export async function createMonitor(params: {
input: CreateMonitorRequest;
nextRunAt: Date;
intervalMs: number;
+ /** Partner's `External-Request-Id`; a scheduled run writes no requests row to find it on later. */
+ partnerJobToken?: string | null;
}): Promise<MonitorRow> {
const targets = ensureTargetIds(params.input.targets);
const judgeEnabled =
@@ -363,7 +365,7 @@ export async function createMonitor(params: {
const estimatedCreditsPerMonth =
estimatedCreditsPerRun * estimateRunsPerMonth(params.intervalMs);
- // Omit goal/judge_enabled when undefined so a pre-migration DB doesn't reject the insert.
+ // Omit goal/judge_enabled/partner_job_token when undefined so a pre-migration DB doesn't reject the insert.
const insert: typeof schema.monitors.$inferInsert = {
id: uuidv7(),
team_id: params.teamId,
@@ -377,6 +379,9 @@ export async function createMonitor(params: {
webhook: params.input.webhook ?? null,
notification: params.input.notification ?? null,
};
+ if (params.partnerJobToken) {
+ insert.partner_job_token = params.partnerJobToken;
+ }
if (params.input.goal !== undefined) {
insert.goal = normalizeGoal(params.input.goal);
}
diff --git a/apps/api/src/services/monitoring/types.ts b/apps/api/src/services/monitoring/types.ts
index 26a6ed883..79944d01d 100644
--- a/apps/api/src/services/monitoring/types.ts
+++ b/apps/api/src/services/monitoring/types.ts
@@ -327,6 +327,7 @@ export type MonitorRow = {
last_check_summary: MonitorSummary | null;
goal: string | null;
judge_enabled: boolean;
+ partner_job_token: string | null;
created_at: string;
updated_at: string;
deleted_at: string | null;