Multiplayer agent harness for work.
Round fractional paging parameters instead of failing with a 500 on Postgres (#1924)
Regan Bella87b7bb415d7
diff --git a/src/api/app-sessions.ts b/src/api/app-sessions.tsindex 538804d60..4ad52cb1b 100644--- a/src/api/app-sessions.ts+++ b/src/api/app-sessions.ts@@ -484,7 +484,7 @@ export function createSessionMethods(},async searchSessions(principalId, query, limit = SEARCH_HIT_LIMIT): Promise<SessionSearchHit[]> {- const capped = Math.max(1, Math.min(limit, 100));+ const capped = Math.max(1, Math.min(Math.floor(limit), 100));const hits = await deps.sessions.searchEntries(principalId, query, capped);if (!hits.length) return [];const allowed = new Map(diff --git a/src/api/routes/admin/observability.ts b/src/api/routes/admin/observability.tsindex c9daa42d2..bc0c2d27d 100644--- a/src/api/routes/admin/observability.ts+++ b/src/api/routes/admin/observability.ts@@ -344,7 +344,7 @@ export async function listAdminAudit(ctx: ApiCtx): Promise<void> {const resourceContains = ctx.url.searchParams.get("resource") ?? undefined;const filtered = action !== undefined || resourceContains !== undefined;const cap = filtered ? AUDIT_FILTERED_LIMIT : AUDIT_TAIL_LIMIT;- const requested = Number(ctx.url.searchParams.get("limit"));+ const requested = Math.floor(Number(ctx.url.searchParams.get("limit")));const fallback = filtered ? cap : AUDIT_TAIL_LIMIT;const limit = Number.isFinite(requested) && requested > 0 ? Math.min(requested, cap) : fallback;const events = (diff --git a/src/api/routes/admin/sessions.ts b/src/api/routes/admin/sessions.tsindex c34ee284c..26eb0b1e9 100644--- a/src/api/routes/admin/sessions.ts+++ b/src/api/routes/admin/sessions.ts@@ -181,7 +181,7 @@ export async function listAdminSessions(ctx: ApiCtx): Promise<void> {};const limit = Math.min(SESSIONS_PAGE_LIMIT_MAX,- Math.max(1, Number(url.searchParams.get("limit")) || SESSIONS_PAGE_LIMIT_DEFAULT),+ Math.max(1, Math.floor(Number(url.searchParams.get("limit"))) || SESSIONS_PAGE_LIMIT_DEFAULT),);if (originFilter === "cron" && !cronId) {const groups = (await deps.sessions?.scopeCronGroups(scope, orgWide)) ?? [];@@ -230,7 +230,9 @@ export async function listAdminSessions(ctx: ApiCtx): Promise<void> {const cursorParam = url.searchParams.get("cursor");const cursorMatch = cursorParam ? /^(\d+)~(.+)$/.exec(cursorParam) : null;const before = cursorMatch ? { lastActivity: Number(cursorMatch[1]), id: cursorMatch[2]! } : undefined;- const offset = before ? 0 : Math.min(Math.max(0, Number(url.searchParams.get("offset")) || 0), lastOffset);+ const offset = before+ ? 0+ : Math.min(Math.max(0, Math.floor(Number(url.searchParams.get("offset"))) || 0), lastOffset);const summaries =(await deps.sessions?.scopeSessionSummaries(scope, orgWide, {limit,@@ -325,7 +327,7 @@ export async function getAdminSession(ctx: ApiCtx): Promise<void> {if (!scoped) return;const { actor, scope, record: session } = scoped;audit(deps, { principalId: actor.id, action: "session.read", resource: id, scopeLabel: session.scopeId });- const want = Math.max(1, Number(url.searchParams.get("limit")) || TRANSCRIPT_LIMIT_DEFAULT);+ const want = Math.max(1, Math.floor(Number(url.searchParams.get("limit"))) || TRANSCRIPT_LIMIT_DEFAULT);const all = want >= TRANSCRIPT_LIMIT_MAX;const limit = Math.min(want, TRANSCRIPT_LIMIT_MAX);const raw = deps.sessionsdiff --git a/src/api/routes/admin/slack-mirror.ts b/src/api/routes/admin/slack-mirror.tsindex f3ce752c5..1d1d29230 100644--- a/src/api/routes/admin/slack-mirror.ts+++ b/src/api/routes/admin/slack-mirror.ts@@ -55,7 +55,7 @@ export async function listSlackMirrorMessages(ctx: ApiCtx): Promise<void> {if (!container && !q) return sendJson(res, 400, { error: "bad_request", message: "container or q required" });const limit = Math.min(SLACK_MIRROR_PAGE_MAX,- Math.max(1, Number(url.searchParams.get("limit")) || SLACK_MIRROR_PAGE_DEFAULT),+ Math.max(1, Math.floor(Number(url.searchParams.get("limit"))) || SLACK_MIRROR_PAGE_DEFAULT),);audit(deps, {principalId: actor.id,@@ -113,9 +113,9 @@ export async function listAmbientJudgments(ctx: ApiCtx): Promise<void> {.split(",").map((d) => d.trim()).filter((d): d is "act" | "ignore" | "fastlane" => d === "act" || d === "ignore" || d === "fastlane");- const before = Number(url.searchParams.get("before")) || undefined;- const beforeId = Number(url.searchParams.get("beforeId")) || undefined;- const limit = Math.min(200, Math.max(1, Number(url.searchParams.get("limit")) || 100));+ const before = Math.floor(Number(url.searchParams.get("before"))) || undefined;+ const beforeId = Math.floor(Number(url.searchParams.get("beforeId"))) || undefined;+ const limit = Math.min(200, Math.max(1, Math.floor(Number(url.searchParams.get("limit"))) || 100));const [judgments, counts] = await Promise.all([store.list({...(container ? { container } : {}),@@ -156,9 +156,9 @@ export async function listAckEmojiPicks(ctx: ApiCtx): Promise<void> {.split(",").map((d) => d.trim()).filter((d): d is "picked" | "declined" => d === "picked" || d === "declined");- const before = Number(url.searchParams.get("before")) || undefined;- const beforeId = Number(url.searchParams.get("beforeId")) || undefined;- const limit = Math.min(200, Math.max(1, Number(url.searchParams.get("limit")) || 100));+ const before = Math.floor(Number(url.searchParams.get("before"))) || undefined;+ const beforeId = Math.floor(Number(url.searchParams.get("beforeId"))) || undefined;+ const limit = Math.min(200, Math.max(1, Math.floor(Number(url.searchParams.get("limit"))) || 100));const [picks, counts] = await Promise.all([store.list({...(channel ? { channel } : {}),diff --git a/test/admin-paging-params.test.ts b/test/admin-paging-params.test.tsnew file mode 100644index 000000000..5b20d0dc8--- /dev/null+++ b/test/admin-paging-params.test.ts@@ -0,0 +1,60 @@+import "./support/auto-fake-sprites.ts";+import { test } from "node:test";+import assert from "node:assert/strict";+import { mkdtempSync } from "node:fs";+import { tmpdir } from "node:os";+import { join } from "node:path";+import type { AddressInfo } from "node:net";+import { createInsecureTestServer } from "../src/api/server.ts";+import { buildApp } from "../src/wiring.ts";+import type { TurnRequest } from "../src/types.ts";+import { testConfig } from "./support/test-config.ts";++const URL = process.env.DATABASE_URL;++test("admin list endpoints accept fractional limit and offset values", { skip: !URL }, async () => {+ const config = testConfig({+ dataDir: mkdtempSync(join(tmpdir(), "admin-paging-")),+ databaseUrl: URL,+ adminGrants: "admin-alice:org_admin",+ });+ const built = buildApp(config);+ const server = createInsecureTestServer(built.app, {+ admin: built.admin,+ sessions: built.sessions,+ auditLog: built.auditLog,+ errors: built.errors,+ runs: built.runs,+ workspace: built.workspace,+ files: built.files,+ config: built.config,+ deliveries: built.deliveries,+ crons: built.crons,+ });+ server.listen(0);+ const base = `http://localhost:${(server.address() as AddressInfo).port}`;+ const headers = { "x-admin-actor": "admin-alice@default-org" };+ try {+ const dm: TurnRequest = {+ surface: "test",+ actor: { externalId: "U1" },+ conversation: { kind: "dm", threadRef: "dm:U1:paging" },+ text: "hello",+ };+ assert.equal((await built.app.turn(dm)).status, "ok");+ for (const path of [+ "/v1/admin/sessions?scope=org:default-org&limit=1.5",+ "/v1/admin/sessions?scope=org:default-org&offset=0.5",+ "/v1/admin/audit?scope=org:default-org&limit=2.5",+ ]) {+ const res = await fetch(base + path, { headers });+ assert.equal(res.status, 200, `${path} -> ${res.status} ${await res.text()}`);+ }+ const page = (await (+ await fetch(`${base}/v1/admin/sessions?scope=org:default-org&limit=1.9`, { headers })+ ).json()) as { limit: number };+ assert.equal(page.limit, 1);+ } finally {+ await new Promise<void>((resolve) => server.close(() => resolve()));+ }+});