Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

feat: use zod schema for server validation

Guscb8350f3d8de
diff --git a/src/shared/index.ts b/src/shared/index.ts
index 4f2b9a943..b00ce8767 100644
--- a/src/shared/index.ts
+++ b/src/shared/index.ts
@@ -84,6 +84,15 @@ export {
FailTaskRequestSchema,
MessageItemSchema,
ReportMessagesRequestSchema,
+ CreateAgentRequestSchema,
+ UpdateAgentRequestSchema,
+ CreateConversationRequestSchema,
+ CreateMessageRequestSchema,
+ EmailAttachmentSchema,
+ SendEmailRequestSchema,
+ UpdateEmailStatusRequestSchema,
+ EmailNotifyRequestSchema,
+ CreateWorkspaceRequestSchema,
} from "./schemas";
export type {
diff --git a/src/shared/schemas.ts b/src/shared/schemas.ts
index 85f0b0e23..4bf9e5648 100644
--- a/src/shared/schemas.ts
+++ b/src/shared/schemas.ts
@@ -177,3 +177,118 @@ export const ReportMessagesRequestSchema = z.object({
messages: z.array(MessageItemSchema),
});
export type ReportMessagesRequest = z.infer<typeof ReportMessagesRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Agent request schemas
+// ---------------------------------------------------------------------------
+
+const RuntimeConfigSchema = z
+ .object({ model: z.string().max(100).optional() })
+ .passthrough()
+ .optional();
+
+export const CreateAgentRequestSchema = z.object({
+ name: z.string().min(1, "name is required"),
+ description: z.string().optional().default(""),
+ instructions: z.string().optional().default(""),
+ runtime_id: z.string().min(1, "runtime_id is required"),
+ runtime_config: RuntimeConfigSchema,
+ max_concurrent_tasks: z.number().int().optional(),
+ email_handle: z.string().optional(),
+});
+export type CreateAgentRequest = z.infer<typeof CreateAgentRequestSchema>;
+
+export const UpdateAgentRequestSchema = z
+ .object({
+ name: z.string().min(1).optional(),
+ description: z.string().optional(),
+ instructions: z.string().optional(),
+ runtime_id: z.string().min(1).optional(),
+ runtime_config: RuntimeConfigSchema,
+ })
+ .refine(
+ (v) =>
+ v.name !== undefined ||
+ v.description !== undefined ||
+ v.instructions !== undefined ||
+ v.runtime_id !== undefined ||
+ v.runtime_config !== undefined,
+ { message: "at least one field is required" },
+ );
+export type UpdateAgentRequest = z.infer<typeof UpdateAgentRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Conversation request schemas
+// ---------------------------------------------------------------------------
+
+export const CreateConversationRequestSchema = z.object({
+ agent_id: z.string().min(1, "agent_id is required"),
+});
+export type CreateConversationRequest = z.infer<
+ typeof CreateConversationRequestSchema
+>;
+
+// ---------------------------------------------------------------------------
+// Message request schema (JSON body only — FormData path is separate)
+// ---------------------------------------------------------------------------
+
+export const CreateMessageRequestSchema = z.object({
+ content: z.string().min(1, "content is required"),
+});
+export type CreateMessageRequest = z.infer<typeof CreateMessageRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Email request schemas
+// ---------------------------------------------------------------------------
+
+export const EmailAttachmentSchema = z.object({
+ key: z.string().min(1),
+ filename: z.string().min(1),
+ size: z.number().int().nonnegative().optional(),
+ contentType: z.string().min(1),
+});
+
+export const SendEmailRequestSchema = z.object({
+ agentId: z.string().min(1, "agentId is required"),
+ to: z.string().min(1, "to is required"),
+ subject: z.string().min(1, "subject is required"),
+ htmlBody: z.string().default(""),
+ inReplyTo: z.string().optional(),
+ references: z.string().optional(),
+ attachments: z.array(EmailAttachmentSchema).optional(),
+});
+export type SendEmailRequest = z.infer<typeof SendEmailRequestSchema>;
+
+export const UpdateEmailStatusRequestSchema = z.object({
+ status: z.enum(["unread", "read", "archived"]),
+});
+export type UpdateEmailStatusRequest = z.infer<
+ typeof UpdateEmailStatusRequestSchema
+>;
+
+export const EmailNotifyRequestSchema = z.object({
+ agentId: z.string().min(1),
+ workspaceId: z.string().min(1),
+ r2Key: z.string().min(1),
+ from: z.string().min(1),
+ to: z.string().optional(),
+ subject: z.string().min(1),
+ isWhitelisted: z.boolean(),
+ forwarded: z.boolean().optional().default(false),
+ messageId: z.string().optional().default(""),
+ inReplyTo: z.string().optional().default(""),
+ references: z.string().optional().default(""),
+});
+export type EmailNotifyRequest = z.infer<typeof EmailNotifyRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Workspace request schemas
+// ---------------------------------------------------------------------------
+
+export const CreateWorkspaceRequestSchema = z.object({
+ name: z.string().min(1, "name is required"),
+ slug: z.string().min(1, "slug is required"),
+});
+export type CreateWorkspaceRequest = z.infer<
+ typeof CreateWorkspaceRequestSchema
+>;
diff --git a/src/shared/src/index.ts b/src/shared/src/index.ts
index 29a6fb23f..4fc861b6c 100644
--- a/src/shared/src/index.ts
+++ b/src/shared/src/index.ts
@@ -98,6 +98,15 @@ export {
DeleteCalendarEventRequestSchema,
CalendarEventApiSchema,
AddWhitelistRequestSchema,
+ CreateAgentRequestSchema,
+ UpdateAgentRequestSchema,
+ CreateConversationRequestSchema,
+ CreateMessageRequestSchema,
+ EmailAttachmentSchema,
+ SendEmailRequestSchema,
+ UpdateEmailStatusRequestSchema,
+ EmailNotifyRequestSchema,
+ CreateWorkspaceRequestSchema,
} from "./schemas";
export type {
diff --git a/src/shared/src/schemas.ts b/src/shared/src/schemas.ts
index b23306077..19b99af38 100644
--- a/src/shared/src/schemas.ts
+++ b/src/shared/src/schemas.ts
@@ -305,3 +305,118 @@ export const AddWhitelistRequestSchema = z.object({
email: z.string().email(),
});
export type AddWhitelistRequest = z.infer<typeof AddWhitelistRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Agent request schemas
+// ---------------------------------------------------------------------------
+
+const RuntimeConfigSchema = z
+ .object({ model: z.string().max(100).optional() })
+ .passthrough()
+ .optional();
+
+export const CreateAgentRequestSchema = z.object({
+ name: z.string().min(1, "name is required"),
+ description: z.string().optional().default(""),
+ instructions: z.string().optional().default(""),
+ runtime_id: z.string().min(1, "runtime_id is required"),
+ runtime_config: RuntimeConfigSchema,
+ max_concurrent_tasks: z.number().int().optional(),
+ email_handle: z.string().optional(),
+});
+export type CreateAgentRequest = z.infer<typeof CreateAgentRequestSchema>;
+
+export const UpdateAgentRequestSchema = z
+ .object({
+ name: z.string().min(1).optional(),
+ description: z.string().optional(),
+ instructions: z.string().optional(),
+ runtime_id: z.string().min(1).optional(),
+ runtime_config: RuntimeConfigSchema,
+ })
+ .refine(
+ (v) =>
+ v.name !== undefined ||
+ v.description !== undefined ||
+ v.instructions !== undefined ||
+ v.runtime_id !== undefined ||
+ v.runtime_config !== undefined,
+ { message: "at least one field is required" },
+ );
+export type UpdateAgentRequest = z.infer<typeof UpdateAgentRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Conversation request schemas
+// ---------------------------------------------------------------------------
+
+export const CreateConversationRequestSchema = z.object({
+ agent_id: z.string().min(1, "agent_id is required"),
+});
+export type CreateConversationRequest = z.infer<
+ typeof CreateConversationRequestSchema
+>;
+
+// ---------------------------------------------------------------------------
+// Message request schema (JSON body only — FormData path is separate)
+// ---------------------------------------------------------------------------
+
+export const CreateMessageRequestSchema = z.object({
+ content: z.string().min(1, "content is required"),
+});
+export type CreateMessageRequest = z.infer<typeof CreateMessageRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Email request schemas
+// ---------------------------------------------------------------------------
+
+export const EmailAttachmentSchema = z.object({
+ key: z.string().min(1),
+ filename: z.string().min(1),
+ size: z.number().int().nonnegative().optional(),
+ contentType: z.string().min(1),
+});
+
+export const SendEmailRequestSchema = z.object({
+ agentId: z.string().min(1, "agentId is required"),
+ to: z.string().min(1, "to is required"),
+ subject: z.string().min(1, "subject is required"),
+ htmlBody: z.string().default(""),
+ inReplyTo: z.string().optional(),
+ references: z.string().optional(),
+ attachments: z.array(EmailAttachmentSchema).optional(),
+});
+export type SendEmailRequest = z.infer<typeof SendEmailRequestSchema>;
+
+export const UpdateEmailStatusRequestSchema = z.object({
+ status: z.enum(["unread", "read", "archived"]),
+});
+export type UpdateEmailStatusRequest = z.infer<
+ typeof UpdateEmailStatusRequestSchema
+>;
+
+export const EmailNotifyRequestSchema = z.object({
+ agentId: z.string().min(1),
+ workspaceId: z.string().min(1),
+ r2Key: z.string().min(1),
+ from: z.string().min(1),
+ to: z.string().optional(),
+ subject: z.string().min(1),
+ isWhitelisted: z.boolean(),
+ forwarded: z.boolean().optional().default(false),
+ messageId: z.string().optional().default(""),
+ inReplyTo: z.string().optional().default(""),
+ references: z.string().optional().default(""),
+});
+export type EmailNotifyRequest = z.infer<typeof EmailNotifyRequestSchema>;
+
+// ---------------------------------------------------------------------------
+// Workspace request schemas
+// ---------------------------------------------------------------------------
+
+export const CreateWorkspaceRequestSchema = z.object({
+ name: z.string().min(1, "name is required"),
+ slug: z.string().min(1, "slug is required"),
+});
+export type CreateWorkspaceRequest = z.infer<
+ typeof CreateWorkspaceRequestSchema
+>;
diff --git a/src/web/src/app/api/agents/[id]/route.test.ts b/src/web/src/app/api/agents/[id]/route.test.ts
index 0fedea2ff..93dc8c354 100644
--- a/src/web/src/app/api/agents/[id]/route.test.ts
+++ b/src/web/src/app/api/agents/[id]/route.test.ts
@@ -9,19 +9,23 @@ const mockDeleteAgent = vi.fn();
const mockUpdateAgent = vi.fn();
const mockGetAgentRuntimeForWorkspace = vi.fn();
-vi.mock("@alook/shared", () => ({
- createDb: vi.fn(() => ({})),
- queries: {
- agent: {
- getAgent: (...args: unknown[]) => mockGetAgent(...args),
- deleteAgent: (...args: unknown[]) => mockDeleteAgent(...args),
- updateAgent: (...args: unknown[]) => mockUpdateAgent(...args),
+vi.mock("@alook/shared", async () => {
+ const actual = await vi.importActual("@alook/shared");
+ return {
+ ...actual,
+ createDb: vi.fn(() => ({})),
+ queries: {
+ agent: {
+ getAgent: (...args: unknown[]) => mockGetAgent(...args),
+ deleteAgent: (...args: unknown[]) => mockDeleteAgent(...args),
+ updateAgent: (...args: unknown[]) => mockUpdateAgent(...args),
+ },
+ runtime: {
+ getAgentRuntimeForWorkspace: (...args: unknown[]) => mockGetAgentRuntimeForWorkspace(...args),
+ },
},
- runtime: {
- getAgentRuntimeForWorkspace: (...args: unknown[]) => mockGetAgentRuntimeForWorkspace(...args),
- },
- },
-}));
+ };
+});
vi.mock("@/lib/middleware/auth", () => ({
withAuth: vi.fn((handler: any) => async (req: any, ctx?: any) => {
@@ -133,7 +137,7 @@ describe("PATCH /api/agents/[id]", () => {
const body = await res.json();
expect(res.status).toBe(400);
- expect(body.error).toBe("no fields to update");
+ expect(body.error).toBe("validation error");
});
it("returns 400 for invalid request body", async () => {
diff --git a/src/web/src/app/api/agents/[id]/route.ts b/src/web/src/app/api/agents/[id]/route.ts
index cc1c5cdac..7b803da8a 100644
--- a/src/web/src/app/api/agents/[id]/route.ts
+++ b/src/web/src/app/api/agents/[id]/route.ts
@@ -1,8 +1,8 @@
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { createDb, queries } from "@alook/shared"
+import { createDb, queries, UpdateAgentRequestSchema } from "@alook/shared"
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { writeJSON, writeError } from "@/lib/middleware/helpers";
+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";
import { agentToResponse } from "@/lib/api/responses";
export const GET = withAuth(async (req, ctx) => {
@@ -37,18 +37,14 @@ export const PATCH = withAuth(async (req, ctx) => {
return writeError("agent id is required", 400);
}
- let body: Record<string, unknown>;
- try {
- body = await req.json();
- } catch {
- return writeError("invalid request body", 400);
- }
+ const [body, valErr] = await parseBody(req, UpdateAgentRequestSchema);
+ if (valErr) return valErr;
const data: Record<string, unknown> = {};
- if (typeof body.name === "string") data.name = body.name;
- if (typeof body.description === "string") data.description = body.description;
- if (typeof body.instructions === "string") data.instructions = body.instructions;
- if (typeof body.runtime_id === "string") {
+ if (body.name !== undefined) data.name = body.name;
+ if (body.description !== undefined) data.description = body.description;
+ if (body.instructions !== undefined) data.instructions = body.instructions;
+ if (body.runtime_id !== undefined) {
const runtime = await queries.runtime.getAgentRuntimeForWorkspace(db, body.runtime_id, ws.workspaceId);
if (!runtime) {
return writeError("runtime not found in workspace", 400);
@@ -56,18 +52,12 @@ export const PATCH = withAuth(async (req, ctx) => {
data.runtimeId = body.runtime_id;
}
if (body.runtime_config !== undefined) {
- if (typeof body.runtime_config === "object" && body.runtime_config !== null && !Array.isArray(body.runtime_config)) {
- const rc = body.runtime_config as Record<string, unknown>;
- const sanitized: Record<string, unknown> = {};
- if (typeof rc.model === "string" && rc.model.length <= 100) {
- sanitized.model = rc.model;
- }
- data.runtimeConfig = sanitized;
+ const rc = body.runtime_config;
+ const sanitized: Record<string, unknown> = {};
+ if (typeof rc.model === "string") {
+ sanitized.model = rc.model;
}
- }
-
- if (Object.keys(data).length === 0) {
- return writeError("no fields to update", 400);
+ data.runtimeConfig = sanitized;
}
const updated = await queries.agent.updateAgent(db, id, ws.workspaceId, data as { name?: string; description?: string; instructions?: string; runtimeId?: string; runtimeConfig?: unknown });
diff --git a/src/web/src/app/api/agents/route.test.ts b/src/web/src/app/api/agents/route.test.ts
index 51139446c..caef42a15 100644
--- a/src/web/src/app/api/agents/route.test.ts
+++ b/src/web/src/app/api/agents/route.test.ts
@@ -9,20 +9,24 @@ const mockCreateAgent = vi.fn();
const mockGetAgent = vi.fn();
const mockGetAgentRuntimeForWorkspace = vi.fn();
-vi.mock("@alook/shared", () => ({
- createDb: vi.fn(() => ({})),
- isOnline: vi.fn((t: string | null) => !!t && Date.now() - new Date(t).getTime() < 9000),
- queries: {
- agent: {
- listAgents: (...args: unknown[]) => mockListAgents(...args),
- createAgent: (...args: unknown[]) => mockCreateAgent(...args),
- getAgent: (...args: unknown[]) => mockGetAgent(...args),
+vi.mock("@alook/shared", async () => {
+ const actual = await vi.importActual("@alook/shared");
+ return {
+ ...actual,
+ createDb: vi.fn(() => ({})),
+ isOnline: vi.fn((t: string | null) => !!t && Date.now() - new Date(t).getTime() < 9000),
+ queries: {
+ agent: {
+ listAgents: (...args: unknown[]) => mockListAgents(...args),
+ createAgent: (...args: unknown[]) => mockCreateAgent(...args),
+ getAgent: (...args: unknown[]) => mockGetAgent(...args),
+ },
+ runtime: {
+ getAgentRuntimeForWorkspace: (...args: unknown[]) => mockGetAgentRuntimeForWorkspace(...args),
+ },
},
- runtime: {
- getAgentRuntimeForWorkspace: (...args: unknown[]) => mockGetAgentRuntimeForWorkspace(...args),
- },
- },
-}));
+ };
+});
vi.mock("@/lib/middleware/auth", () => ({
withAuth: vi.fn((handler: any) => async (req: any, ctx?: any) => {
@@ -101,7 +105,8 @@ describe("POST /api/agents", () => {
const body = await res.json();
expect(res.status).toBe(400);
- expect(body.error).toBe("name is required");
+ expect(body.error).toBe("validation error");
+ expect(body.details).toContainEqual(expect.stringContaining("name"));
});
it("returns 400 for missing runtime_id", async () => {
@@ -113,7 +118,8 @@ describe("POST /api/agents", () => {
const body = await res.json();
expect(res.status).toBe(400);
- expect(body.error).toBe("runtime_id is required");
+ expect(body.error).toBe("validation error");
+ expect(body.details).toContainEqual(expect.stringContaining("runtime_id"));
});
it("returns 404 when runtime not in workspace", async () => {
diff --git a/src/web/src/app/api/agents/route.ts b/src/web/src/app/api/agents/route.ts
index 8401f5114..9d90c8c15 100644
--- a/src/web/src/app/api/agents/route.ts
+++ b/src/web/src/app/api/agents/route.ts
@@ -1,9 +1,9 @@
import { NextRequest } from "next/server";
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { createDb, queries, isValidHandle, isOnline } from "@alook/shared"
+import { createDb, queries, isValidHandle, isOnline, CreateAgentRequestSchema } from "@alook/shared"
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { writeJSON, writeError } from "@/lib/middleware/helpers";
+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";
import { agentToResponse } from "@/lib/api/responses";
import { TaskService } from "@/lib/services/task";
import { sweepStaleState } from "@/lib/services/sweep";
@@ -29,30 +29,11 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const { env } = getCloudflareContext()
const db = createDb((env as Env).DB)
- let body: {
- name?: string;
- description?: string;
- instructions?: string;
- runtime_id?: string;
- runtime_config?: unknown;
- max_concurrent_tasks?: number;
- email_handle?: string;
- };
- try {
- body = await req.json();
- } catch {
- return writeError("invalid request body", 400);
- }
-
- const name = (body.name || "").trim();
- if (!name) {
- return writeError("name is required", 400);
- }
+ const [body, valErr] = await parseBody(req, CreateAgentRequestSchema);
+ if (valErr) return valErr;
- const runtimeId = body.runtime_id || "";
- if (!runtimeId) {
- return writeError("runtime_id is required", 400);
- }
+ const name = body.name.trim();
+ const runtimeId = body.runtime_id;
let maxConcurrentTasks = body.max_concurrent_tasks || 0;
if (maxConcurrentTasks <= 0) maxConcurrentTasks = 6;
@@ -77,20 +58,16 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
return writeError("runtime not found in workspace", 404);
}
- let sanitizedRc: Record<string, unknown> | null = null;
- if (typeof body.runtime_config === "object" && body.runtime_config !== null && !Array.isArray(body.runtime_config)) {
- const rc = body.runtime_config as Record<string, unknown>;
- sanitizedRc = {};
- if (typeof rc.model === "string" && rc.model.length <= 100) {
- sanitizedRc.model = rc.model;
- }
- }
+ const rc = body.runtime_config;
+ const sanitizedRc: Record<string, unknown> | null = rc
+ ? { ...(typeof rc.model === "string" ? { model: rc.model } : {}) }
+ : null;
const newAgent = await queries.agent.createAgent(db, {
workspaceId: ws.workspaceId,
name,
- description: body.description || "",
- instructions: body.instructions || "",
+ description: body.description,
+ instructions: body.instructions,
runtimeId,
runtimeMode: runtime.runtimeMode,
runtimeConfig: sanitizedRc,
diff --git a/src/web/src/app/api/conversations/[id]/messages/route.test.ts b/src/web/src/app/api/conversations/[id]/messages/route.test.ts
index 6913c8d83..081c41338 100644
--- a/src/web/src/app/api/conversations/[id]/messages/route.test.ts
+++ b/src/web/src/app/api/conversations/[id]/messages/route.test.ts
@@ -12,10 +12,12 @@ const mockTaskToResponse = vi.fn((t: any) => ({ id: t.id, status: t.status }));
vi.mock("@opennextjs/cloudflare", () => ({
getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),
}));
-vi.mock("@alook/shared", () => {
+vi.mock("@alook/shared", async () => {
+ const actual = await vi.importActual("@alook/shared");
const noop = () => {};
const log = { debug: noop, info: noop, warn: noop, error: noop, child: () => log };
return {
+ ...actual,
createDb: vi.fn(() => ({})),
createLogger: () => log,
TASK_TYPES: {
@@ -241,7 +243,8 @@ describe("POST /api/conversations/[id]/messages", () => {
const body = await res.json();
expect(res.status).toBe(400);
- expect(body.error).toBe("content is required");
+ expect(body.error).toBe("validation error");
+ expect(body.details).toContainEqual(expect.stringContaining("content"));
});
it("returns 404 when conversation not found", async () => {
diff --git a/src/web/src/app/api/conversations/[id]/messages/route.ts b/src/web/src/app/api/conversations/[id]/messages/route.ts
index c81479400..78b3679da 100644
--- a/src/web/src/app/api/conversations/[id]/messages/route.ts
+++ b/src/web/src/app/api/conversations/[id]/messages/route.ts
@@ -1,10 +1,10 @@
import { NextRequest } from "next/server";
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { createDb, queries, TASK_TYPES, buildContextKey } from "@alook/shared"
+import { createDb, queries, TASK_TYPES, buildContextKey, CreateMessageRequestSchema } from "@alook/shared"
import { nanoid } from "nanoid";
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { writeJSON, writeError } from "@/lib/middleware/helpers";
+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";
import { messageToResponse, taskToResponse } from "@/lib/api/responses";
import { TaskService } from "@/lib/services/task";
import { log } from "@/lib/logger";
@@ -86,16 +86,12 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
}
}
} else {
- let body: { content?: string };
- try {
- body = await req.json();
- } catch {
- return writeError("invalid request body", 400);
- }
- content = body.content || "";
+ const [body, valErr] = await parseBody(req, CreateMessageRequestSchema);
+ if (valErr) return valErr;
+ content = body.content;
}
- if (!content) {
+ if (isMultipart && !content) {
return writeError("content is required", 400);
}
diff --git a/src/web/src/app/api/conversations/route.test.ts b/src/web/src/app/api/conversations/route.test.ts
index 38c86974c..d049dc6c4 100644
--- a/src/web/src/app/api/conversations/route.test.ts
+++ b/src/web/src/app/api/conversations/route.test.ts
@@ -8,15 +8,19 @@ const mockConversationToResponse = vi.fn((c: any) => ({ id: c.id, title: c.title
vi.mock("@opennextjs/cloudflare", () => ({
getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),
}));
-vi.mock("@alook/shared", () => ({
- createDb: vi.fn(() => ({})),
- queries: {
- conversation: {
- listConversations: (...args: any[]) => mockListConversations(...args),
- createConversation: (...args: any[]) => mockCreateConversation(...args),
+vi.mock("@alook/shared", async () => {
+ const actual = await vi.importActual("@alook/shared");
+ return {
+ ...actual,
+ createDb: vi.fn(() => ({})),
+ queries: {
+ conversation: {
+ listConversations: (...args: any[]) => mockListConversations(...args),
+ createConversation: (...args: any[]) => mockCreateConversation(...args),
+ },
},
- },
-}));
+ };
+});
vi.mock("@/lib/middleware/auth", () => ({
withAuth: vi.fn((handler: any) => async (req: any, ctx?: any) => {
const params = ctx?.params instanceof Promise ? await ctx.params : ctx?.params;
@@ -91,7 +95,8 @@ describe("POST /api/conversations", () => {
const body = await res.json();
expect(res.status).toBe(400);
- expect(body.error).toBe("agent_id is required");
+ expect(body.error).toBe("validation error");
+ expect(body.details).toContainEqual(expect.stringContaining("agent_id"));
});
it("returns 400 for invalid body", async () => {
diff --git a/src/web/src/app/api/conversations/route.ts b/src/web/src/app/api/conversations/route.ts
index abe7d3a5f..5855f8ff3 100644
--- a/src/web/src/app/api/conversations/route.ts
+++ b/src/web/src/app/api/conversations/route.ts
@@ -1,9 +1,9 @@
import { NextRequest } from "next/server";
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { createDb, queries } from "@alook/shared"
+import { createDb, queries, CreateConversationRequestSchema } from "@alook/shared"
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { writeJSON, writeError } from "@/lib/middleware/helpers";
+import { writeJSON, parseBody } from "@/lib/middleware/helpers";
import { conversationToResponse } from "@/lib/api/responses";
export const GET = withAuth(async (req, ctx) => {
@@ -28,21 +28,12 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const { env } = getCloudflareContext()
const db = createDb((env as Env).DB)
- let body: { agent_id?: string };
- try {
- body = await req.json();
- } catch {
- return writeError("invalid request body", 400);
- }
-
- const agentId = body.agent_id || "";
- if (!agentId) {
- return writeError("agent_id is required", 400);
- }
+ const [body, valErr] = await parseBody(req, CreateConversationRequestSchema);
+ if (valErr) return valErr;
const conversation = await queries.conversation.createConversation(db, {
workspaceId: ws.workspaceId,
- agentId,
+ agentId: body.agent_id,
userId: ctx.userId,
title: "",
});
diff --git a/src/web/src/app/api/email/[id]/route.test.ts b/src/web/src/app/api/email/[id]/route.test.ts
index beaf513a3..9ee34e9ce 100644
--- a/src/web/src/app/api/email/[id]/route.test.ts
+++ b/src/web/src/app/api/email/[id]/route.test.ts
@@ -11,16 +11,20 @@ vi.mock("@opennextjs/cloudflare", () => ({
})),
}));
-vi.mock("@alook/shared", () => ({
- createDb: vi.fn(() => ({})),
- queries: {
- email: {
- getEmailById: (...args: unknown[]) => mockGetEmailById(...args),
- deleteEmail: (...args: unknown[]) => mockDeleteEmail(...args),
- updateEmailStatus: (...args: unknown[]) => mockUpdateEmailStatus(...args),
+vi.mock("@alook/shared", async () => {
+ const actual = await vi.importActual("@alook/shared");
+ return {
+ ...actual,
+ createDb: vi.fn(() => ({})),
+ queries: {
+ email: {
+ getEmailById: (...args: unknown[]) => mockGetEmailById(...args),
+ deleteEmail: (...args: unknown[]) => mockDeleteEmail(...args),
+ updateEmailStatus: (...args: unknown[]) => mockUpdateEmailStatus(...args),
+ },
},
- },
-}));
+ };
+});
vi.mock("@/lib/middleware/auth", () => ({
withAuth: vi.fn((handler: any) => async (req: any, ctx?: any) => {
@@ -33,9 +37,11 @@ vi.mock("@/lib/middleware/workspace", () => ({
withWorkspaceMember: vi.fn(async () => ({ workspaceId: "ws1" })),
}));
-vi.mock("@/lib/middleware/helpers", () => {
+vi.mock("@/lib/middleware/helpers", async () => {
const { NextResponse } = require("next/server");
+ const actual = await vi.importActual("@/lib/middleware/helpers");
return {
+ ...actual,
writeJSON: (data: unknown, status = 200) => NextResponse.json(data, { status }),
writeError: (message: string, status: number) => NextResponse.json({ error: message }, { status }),
};
@@ -146,7 +152,8 @@ describe("PATCH /api/email/[id]", () => {
expect(res.status).toBe(400);
const body = await res.json();
- expect(body.error).toBe("invalid status");
+ expect(body.error).toBe("validation error");
+ expect(body.details).toContainEqual(expect.stringContaining("status"));
});
it("returns 400 for missing status", async () => {
diff --git a/src/web/src/app/api/email/[id]/route.ts b/src/web/src/app/api/email/[id]/route.ts
index 5d0a45e63..3f4f27d09 100644
--- a/src/web/src/app/api/email/[id]/route.ts
+++ b/src/web/src/app/api/email/[id]/route.ts
@@ -1,8 +1,8 @@
import { getCloudflareContext } from "@opennextjs/cloudflare";
-import { createDb, queries } from "@alook/shared";
+import { createDb, queries, UpdateEmailStatusRequestSchema } from "@alook/shared";
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { writeJSON, writeError } from "@/lib/middleware/helpers";
+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";
import { emailToResponse } from "@/lib/api/responses";
export const GET = withAuth(async (req, ctx) => {
@@ -39,8 +39,6 @@ export const DELETE = withAuth(async (req, ctx) => {
return new Response(null, { status: 204 });
});
-const VALID_STATUSES = ["unread", "read", "archived"] as const;
-
export const PATCH = withAuth(async (req, ctx) => {
const ws = await withWorkspaceMember(req, ctx);
if (ws instanceof Response) return ws;
@@ -51,16 +49,8 @@ export const PATCH = withAuth(async (req, ctx) => {
const id = ctx.params?.id;
if (!id) return writeError("email id is required", 400);
- let body: { status?: string };
- try {
- body = await req.json();
- } catch {
- return writeError("invalid JSON body", 400);
- }
-
- if (!body.status || !VALID_STATUSES.includes(body.status as typeof VALID_STATUSES[number])) {
- return writeError("invalid status", 400);
- }
+ const [body, valErr] = await parseBody(req, UpdateEmailStatusRequestSchema);
+ if (valErr) return valErr;
const updated = await queries.email.updateEmailStatus(db, id, ws.workspaceId, body.status);
if (!updated) return writeError("email not found", 404);
diff --git a/src/web/src/app/api/email/notify/route.ts b/src/web/src/app/api/email/notify/route.ts
index 15713ce4b..553cb555a 100644
--- a/src/web/src/app/api/email/notify/route.ts
+++ b/src/web/src/app/api/email/notify/route.ts
@@ -1,7 +1,7 @@
import { NextRequest } from "next/server"
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { createDb, queries, TASK_TYPES, buildContextKey, extractThreadId } from "@alook/shared"
-import { writeJSON, writeError } from "@/lib/middleware/helpers"
+import { createDb, queries, TASK_TYPES, buildContextKey, extractThreadId, EmailNotifyRequestSchema } from "@alook/shared"
+import { writeJSON, parseBody } from "@/lib/middleware/helpers"
import { TaskService } from "@/lib/services/task"
import { broadcastToUser } from "@/lib/broadcast"
@@ -9,8 +9,8 @@ export async function POST(req: NextRequest) {
const { env } = getCloudflareContext()
const db = createDb((env as Env).DB)
- let body: { agentId: string; workspaceId: string; r2Key: string; from: string; to?: string; subject: string; isWhitelisted: boolean; forwarded?: boolean; messageId?: string; inReplyTo?: string; references?: string }
- try { body = await req.json() } catch { return writeError("invalid body", 400) }
+ const [body, valErr] = await parseBody(req, EmailNotifyRequestSchema);
+ if (valErr) return valErr;
const agent = await queries.agent.getAgent(db, body.agentId, body.workspaceId)
@@ -22,10 +22,10 @@ export async function POST(req: NextRequest) {
subject: body.subject,
r2Key: body.r2Key,
isWhitelisted: body.isWhitelisted,
- forwarded: body.forwarded ?? false,
- messageId: body.messageId ?? "",
- inReplyTo: body.inReplyTo ?? "",
- references: body.references ?? "",
+ forwarded: body.forwarded,
+ messageId: body.messageId,
+ inReplyTo: body.inReplyTo,
+ references: body.references,
})
if (body.isWhitelisted && agent && agent.runtimeId) {
diff --git a/src/web/src/app/api/email/send/route.test.ts b/src/web/src/app/api/email/send/route.test.ts
index c6780feb0..97b08f9b5 100644
--- a/src/web/src/app/api/email/send/route.test.ts
+++ b/src/web/src/app/api/email/send/route.test.ts
@@ -14,17 +14,21 @@ vi.mock("@opennextjs/cloudflare", () => ({
})),
}));
-vi.mock("@alook/shared", () => ({
- createDb: vi.fn(() => ({})),
- queries: {
- email: {
- createEmail: (...args: unknown[]) => mockCreateEmail(...args),
- },
- agent: {
- getAgent: (...args: unknown[]) => mockGetAgent(...args),
+vi.mock("@alook/shared", async () => {
+ const actual = await vi.importActual("@alook/shared");
+ return {
+ ...actual,
+ createDb: vi.fn(() => ({})),
+ queries: {
+ email: {
+ createEmail: (...args: unknown[]) => mockCreateEmail(...args),
+ },
+ agent: {
+ getAgent: (...args: unknown[]) => mockGetAgent(...args),
+ },
},
- },
-}));
+ };
+});
vi.mock("@/lib/middleware/auth", () => ({
withAuth: vi.fn((handler: any) => async (req: any, ctx?: any) => {
@@ -37,9 +41,11 @@ vi.mock("@/lib/middleware/workspace", () => ({
withWorkspaceMember: vi.fn(async () => ({ workspaceId: "ws1" })),
}));
-vi.mock("@/lib/middleware/helpers", () => {
+vi.mock("@/lib/middleware/helpers", async () => {
const { NextResponse } = require("next/server");
+ const actual = await vi.importActual("@/lib/middleware/helpers");
return {
+ ...actual,
writeJSON: (data: unknown, status = 200) => NextResponse.json(data, { status }),
writeError: (message: string, status: number) => NextResponse.json({ error: message }, { status }),
};
diff --git a/src/web/src/app/api/email/send/route.ts b/src/web/src/app/api/email/send/route.ts
index d37262481..14cdfb071 100644
--- a/src/web/src/app/api/email/send/route.ts
+++ b/src/web/src/app/api/email/send/route.ts
@@ -1,10 +1,9 @@
import { NextRequest } from "next/server";
import { getCloudflareContext } from "@opennextjs/cloudflare";
-import { createDb, queries, DEV_EMAIL_WORKER_URL } from "@alook/shared";
-import type { EmailAttachment } from "@alook/shared";
+import { createDb, queries, DEV_EMAIL_WORKER_URL, SendEmailRequestSchema } from "@alook/shared";
import { withAuth } from "@/lib/middleware/auth";
import { withWorkspaceMember } from "@/lib/middleware/workspace";
-import { writeJSON, writeError } from "@/lib/middleware/helpers";
+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";
import { emailToResponse } from "@/lib/api/responses";
export const POST = withAuth(async (req: NextRequest, ctx) => {
@@ -15,24 +14,8 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const cfEnv = env as Env;
const db = createDb(cfEnv.DB);
- let body: {
- agentId: string;
- to: string;
- subject: string;
- htmlBody: string;
- inReplyTo?: string;
- references?: string;
- attachments?: EmailAttachment[];
- };
- try {
- body = await req.json();
- } catch {
- return writeError("invalid request body", 400);
- }
-
- if (!body.agentId || !body.to || !body.subject) {
- return writeError("agentId, to, and subject are required", 400);
- }
+ const [body, valErr] = await parseBody(req, SendEmailRequestSchema);
+ if (valErr) return valErr;
const agent = await queries.agent.getAgent(db, body.agentId, ws.workspaceId);
if (!agent) return writeError("agent not found in workspace", 404);
diff --git a/src/web/src/app/api/workspaces/route.test.ts b/src/web/src/app/api/workspaces/route.test.ts
index 3651fc90a..d16a8fb14 100644
--- a/src/web/src/app/api/workspaces/route.test.ts
+++ b/src/web/src/app/api/workspaces/route.test.ts
@@ -33,9 +33,11 @@ vi.mock("@/lib/middleware/auth", () => ({
}),
}));
-vi.mock("@/lib/middleware/helpers", () => {
+vi.mock("@/lib/middleware/helpers", async () => {
const { NextResponse } = require("next/server");
+ const actual = await vi.importActual("@/lib/middleware/helpers");
return {
+ ...actual,
writeJSON: (data: unknown, status = 200) => NextResponse.json(data, { status }),
writeError: (message: string, status: number) => NextResponse.json({ error: message }, { status }),
};
@@ -101,7 +103,9 @@ describe("POST /api/workspaces", () => {
const res = await POST(req, {} as any);
expect(res.status).toBe(400);
- expect(await res.json()).toEqual({ error: "name is required" });
+ const body = await res.json();
+ expect(body.error).toBe("validation error");
+ expect(body.details).toContainEqual(expect.stringContaining("name"));
});
it("returns 400 for missing slug", async () => {
@@ -113,7 +117,9 @@ describe("POST /api/workspaces", () => {
const res = await POST(req, {} as any);
expect(res.status).toBe(400);
- expect(await res.json()).toEqual({ error: "slug is required" });
+ const body = await res.json();
+ expect(body.error).toBe("validation error");
+ expect(body.details).toContainEqual(expect.stringContaining("slug"));
});
it("retries with suffixed slug on duplicate and returns 201", async () => {
diff --git a/src/web/src/app/api/workspaces/route.ts b/src/web/src/app/api/workspaces/route.ts
index ed2029025..850c2fc05 100644
--- a/src/web/src/app/api/workspaces/route.ts
+++ b/src/web/src/app/api/workspaces/route.ts
@@ -1,9 +1,9 @@
import { NextRequest } from "next/server";
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { createDb, queries, isUniqueConstraintError } from "@alook/shared"
+import { createDb, queries, isUniqueConstraintError, CreateWorkspaceRequestSchema } from "@alook/shared"
import { nanoid } from "nanoid"
import { withAuth } from "@/lib/middleware/auth";
-import { writeJSON, writeError } from "@/lib/middleware/helpers";
+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";
import { workspaceToResponse } from "@/lib/api/responses";
export const GET = withAuth(async (_req, ctx) => {
@@ -18,22 +18,11 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {
const { env } = getCloudflareContext()
const db = createDb((env as Env).DB)
- let body: { name?: string; slug?: string };
- try {
- body = await req.json();
- } catch {
- return writeError("invalid request body", 400);
- }
-
- const name = (body.name || "").trim();
- const slug = (body.slug || "").toLowerCase().trim();
+ const [body, valErr] = await parseBody(req, CreateWorkspaceRequestSchema);
+ if (valErr) return valErr;
- if (!name) {
- return writeError("name is required", 400);
- }
- if (!slug) {
- return writeError("slug is required", 400);
- }
+ const name = body.name.trim();
+ const slug = body.slug.toLowerCase().trim();
const suffixLengths = [4, 4, 4, 8, 8, 8, 16, 16, 16];
let candidateSlug = slug;