Multi-Agent Collaboration for Team and Friends
TypeScript agent-automationagent-orchestrationagent-workflowai-agentsai-collaborationai-memoryai-workforceautonomous-agentsclaude-codeclaude-code-skillscodexcoding-agentmulti-agentmultiple-agentone-person-businessone-person-companyone-person-teamopencodesolopreneur
feat: workspace & member management (#27)
Gener4333a5b2b329
diff --git a/src/shared/src/api-types.ts b/src/shared/src/api-types.tsindex e15407ba0..aae1677b8 100644--- a/src/shared/src/api-types.ts+++ b/src/shared/src/api-types.ts@@ -92,6 +92,7 @@ export interface UpdateAgentRequest {runtime_config?: Record<string, unknown>;max_concurrent_tasks?: number;email_handle?: string;+ visibility?: string;}export interface SendMessageRequest {diff --git a/src/shared/src/db/queries-index.ts b/src/shared/src/db/queries-index.tsindex 52b2505c0..e0ae603ec 100644--- a/src/shared/src/db/queries-index.ts+++ b/src/shared/src/db/queries-index.ts@@ -15,3 +15,6 @@ export * as session from "./queries/session";export * as calendarEvent from "./queries/calendar-event";export * as artifact from "./queries/artifact";export * as emailAccount from "./queries/email-account";+export * as workspaceInvite from "./queries/workspace-invite";+export * as agentAccess from "./queries/agent-access";+export * as agentPin from "./queries/agent-pin";diff --git a/src/shared/src/db/queries/agent-access.ts b/src/shared/src/db/queries/agent-access.tsnew file mode 100644index 000000000..c5ff2dcaa--- /dev/null+++ b/src/shared/src/db/queries/agent-access.ts@@ -0,0 +1,43 @@+import { eq, and } from "drizzle-orm";+import { agentAccess, user } from "../schema";+import type { Database } from "../index";++export async function listAgentAccess(db: Database, agentId: string, workspaceId: string) {+ return db+ .select({+ id: agentAccess.id,+ agentId: agentAccess.agentId,+ workspaceId: agentAccess.workspaceId,+ userId: agentAccess.userId,+ createdAt: agentAccess.createdAt,+ userName: user.name,+ userEmail: user.email,+ })+ .from(agentAccess)+ .innerJoin(user, eq(agentAccess.userId, user.id))+ .where(and(eq(agentAccess.agentId, agentId), eq(agentAccess.workspaceId, workspaceId)));+}++export async function grantAgentAccess(db: Database, data: { agentId: string; workspaceId: string; userId: string }) {+ const rows = await db+ .insert(agentAccess)+ .values({ agentId: data.agentId, workspaceId: data.workspaceId, userId: data.userId })+ .returning();+ return rows[0]!;+}++export async function revokeAgentAccess(db: Database, agentId: string, workspaceId: string, userId: string) {+ const rows = await db+ .delete(agentAccess)+ .where(and(eq(agentAccess.agentId, agentId), eq(agentAccess.workspaceId, workspaceId), eq(agentAccess.userId, userId)))+ .returning();+ return rows[0] ?? null;+}++export async function hasAgentAccess(db: Database, agentId: string, workspaceId: string, userId: string): Promise<boolean> {+ const rows = await db+ .select({ id: agentAccess.id })+ .from(agentAccess)+ .where(and(eq(agentAccess.agentId, agentId), eq(agentAccess.workspaceId, workspaceId), eq(agentAccess.userId, userId)));+ return rows.length > 0;+}diff --git a/src/shared/src/db/queries/agent-pin.ts b/src/shared/src/db/queries/agent-pin.tsnew file mode 100644index 000000000..2ef61305a--- /dev/null+++ b/src/shared/src/db/queries/agent-pin.ts@@ -0,0 +1,33 @@+import { eq, and } from "drizzle-orm";+import { agentPin } from "../schema";+import type { Database } from "../index";++export async function listPins(db: Database, workspaceId: string, userId: string) {+ return db+ .select()+ .from(agentPin)+ .where(and(eq(agentPin.workspaceId, workspaceId), eq(agentPin.userId, userId)));+}++export async function pinAgent(db: Database, data: { agentId: string; workspaceId: string; userId: string }) {+ const rows = await db+ .insert(agentPin)+ .values(data)+ .onConflictDoNothing()+ .returning();+ return rows[0] ?? null;+}++export async function unpinAgent(db: Database, agentId: string, workspaceId: string, userId: string) {+ const rows = await db+ .delete(agentPin)+ .where(+ and(+ eq(agentPin.agentId, agentId),+ eq(agentPin.workspaceId, workspaceId),+ eq(agentPin.userId, userId),+ )+ )+ .returning();+ return rows[0] ?? null;+}diff --git a/src/shared/src/db/queries/agent.ts b/src/shared/src/db/queries/agent.tsindex 984834f87..b8cca9fd6 100644--- a/src/shared/src/db/queries/agent.ts+++ b/src/shared/src/db/queries/agent.ts@@ -1,20 +1,47 @@-import { eq, and, desc } from "drizzle-orm";-import { agent, agentTaskQueue } from "../schema";+import { eq, and, desc, or, exists } from "drizzle-orm";+import { agent, agentTaskQueue, agentAccess } from "../schema";import type { Database } from "../index";-export async function getAgent(db: Database, id: string, workspaceId: string) {+export async function getAgent(db: Database, id: string, workspaceId: string, userId?: string) {const rows = await db.select().from(agent).where(and(eq(agent.id, id), eq(agent.workspaceId, workspaceId)));- return rows[0] ?? null;+ const row = rows[0] ?? null;+ if (!row || !userId) return row;+ if (row.visibility === "public" || row.ownerId === userId) return row;+ const access = await db+ .select({ id: agentAccess.id })+ .from(agentAccess)+ .where(and(eq(agentAccess.agentId, id), eq(agentAccess.workspaceId, workspaceId), eq(agentAccess.userId, userId)));+ return access.length > 0 ? row : null;}-export async function listAgents(db: Database, workspaceId: string) {+export async function listAgents(db: Database, workspaceId: string, userId?: string) {+ if (!userId) {+ return db.select().from(agent).where(eq(agent.workspaceId, workspaceId)).orderBy(desc(agent.createdAt));+ }return db.select().from(agent)- .where(eq(agent.workspaceId, workspaceId))+ .where(+ and(+ eq(agent.workspaceId, workspaceId),+ or(+ eq(agent.visibility, "public"),+ eq(agent.ownerId, userId),+ exists(+ db.select({ id: agentAccess.id }).from(agentAccess).where(+ and(+ eq(agentAccess.agentId, agent.id),+ eq(agentAccess.workspaceId, agent.workspaceId),+ eq(agentAccess.userId, userId)+ )+ )+ )+ )+ )+ ).orderBy(desc(agent.createdAt));}@@ -62,14 +89,17 @@ export async function createAgent(export async function deleteAgent(db: Database,id: string,- workspaceId: string+ workspaceId: string,+ ownerId?: string) {await db.delete(agentTaskQueue).where(and(eq(agentTaskQueue.agentId, id), eq(agentTaskQueue.workspaceId, workspaceId)));+ const conditions = [eq(agent.id, id), eq(agent.workspaceId, workspaceId)];+ if (ownerId) conditions.push(eq(agent.ownerId, ownerId));const rows = await db.delete(agent)- .where(and(eq(agent.id, id), eq(agent.workspaceId, workspaceId)))+ .where(and(...conditions)).returning();return rows[0] ?? null;}@@ -84,12 +114,16 @@ export async function updateAgent(instructions?: string;runtimeId?: string | null;runtimeConfig?: unknown;- }+ visibility?: string;+ },+ ownerId?: string) {+ const conditions = [eq(agent.id, id), eq(agent.workspaceId, workspaceId)];+ if (ownerId) conditions.push(eq(agent.ownerId, ownerId));const rows = await db.update(agent).set({ ...data, updatedAt: new Date().toISOString() })- .where(and(eq(agent.id, id), eq(agent.workspaceId, workspaceId)))+ .where(and(...conditions)).returning();return rows[0] ?? null;}diff --git a/src/shared/src/db/queries/email.ts b/src/shared/src/db/queries/email.tsindex 020cf54ba..e33d3afb9 100644--- a/src/shared/src/db/queries/email.ts+++ b/src/shared/src/db/queries/email.ts@@ -1,10 +1,11 @@import { eq, desc, and } from "drizzle-orm";import { emails } from "../schema";import type { Database } from "../index";+import type { EmailDirection } from "../../types";export async function createEmail(db: Database,- data: { agentId: string; workspaceId: string; fromEmail: string; toEmail: string; subject: string; r2Key: string; isWhitelisted: boolean; forwarded: boolean; direction: "inbound" | "outbound"; messageId?: string; inReplyTo?: string; references?: string; htmlBody?: string; attachments?: string }+ data: { agentId: string; workspaceId: string; fromEmail: string; toEmail: string; subject: string; r2Key: string; isWhitelisted: boolean; forwarded: boolean; direction: EmailDirection; messageId?: string; inReplyTo?: string; references?: string; htmlBody?: string; attachments?: string }) {const rows = await db.insert(emails).values(data).returning();return rows[0]!;@@ -26,7 +27,7 @@ export async function getEmailsByAgent(db: Database, agentId: string, workspaceI}export async function getInboxEmails(db: Database, agentId: string, agentEmail: string, workspaceId: string, status?: string) {- const conditions = [eq(emails.agentId, agentId), eq(emails.toEmail, agentEmail), eq(emails.workspaceId, workspaceId), eq(emails.isWhitelisted, true), eq(emails.direction, "inbound")];+ const conditions = [eq(emails.agentId, agentId), eq(emails.toEmail, agentEmail), eq(emails.workspaceId, workspaceId), eq(emails.direction, "inbound")];if (status) conditions.push(eq(emails.status, status));return db.select().from(emails).where(and(...conditions))@@ -41,6 +42,14 @@ export async function getSentEmails(db: Database, agentId: string, agentEmail: s.orderBy(desc(emails.createdAt));}+export async function getTrustedEmails(db: Database, agentId: string, agentEmail: string, workspaceId: string, status?: string) {+ const conditions = [eq(emails.agentId, agentId), eq(emails.toEmail, agentEmail), eq(emails.workspaceId, workspaceId), eq(emails.isWhitelisted, true), eq(emails.direction, "inbound")];+ if (status) conditions.push(eq(emails.status, status));+ return db.select().from(emails)+ .where(and(...conditions))+ .orderBy(desc(emails.createdAt));+}+export async function getRejectedEmails(db: Database, agentId: string, agentEmail: string, workspaceId: string, status?: string) {const conditions = [eq(emails.agentId, agentId), eq(emails.toEmail, agentEmail), eq(emails.workspaceId, workspaceId), eq(emails.isWhitelisted, false), eq(emails.direction, "inbound")];if (status) conditions.push(eq(emails.status, status));diff --git a/src/shared/src/db/queries/member.ts b/src/shared/src/db/queries/member.tsindex b1e674609..d5cbe793f 100644--- a/src/shared/src/db/queries/member.ts+++ b/src/shared/src/db/queries/member.ts@@ -1,5 +1,5 @@import { eq, and } from "drizzle-orm";-import { member } from "../schema";+import { member, user } from "../schema";import type { Database } from "../index";export async function getMemberByUserAndWorkspace(@@ -15,7 +15,20 @@ export async function getMemberByUserAndWorkspace(}export async function listMembers(db: Database, workspaceId: string) {- return db.select().from(member).where(eq(member.workspaceId, workspaceId));+ return db+ .select({+ id: member.id,+ workspaceId: member.workspaceId,+ userId: member.userId,+ role: member.role,+ createdAt: member.createdAt,+ userName: user.name,+ userEmail: user.email,+ userImage: user.image,+ })+ .from(member)+ .innerJoin(user, eq(member.userId, user.id))+ .where(eq(member.workspaceId, workspaceId));}export async function updateMemberGlobalInstruction(@@ -46,3 +59,19 @@ export async function createMember(.returning();return rows[0]!;}++export async function getMember(db: Database, memberId: string, workspaceId: string) {+ const rows = await db+ .select()+ .from(member)+ .where(and(eq(member.id, memberId), eq(member.workspaceId, workspaceId)));+ return rows[0] ?? null;+}++export async function deleteMember(db: Database, memberId: string, workspaceId: string) {+ const rows = await db+ .delete(member)+ .where(and(eq(member.id, memberId), eq(member.workspaceId, workspaceId)))+ .returning();+ return rows[0] ?? null;+}diff --git a/src/shared/src/db/queries/task.ts b/src/shared/src/db/queries/task.tsindex 068371760..ba8336664 100644--- a/src/shared/src/db/queries/task.ts+++ b/src/shared/src/db/queries/task.ts@@ -1,4 +1,4 @@-import { eq, and, desc, asc, inArray, notInArray, ne, count, lt } from "drizzle-orm";+import { eq, and, desc, asc, inArray, notInArray, ne, count, lt, sql } from "drizzle-orm";import { agentTaskQueue } from "../schema";import type { Database } from "../index";import { ClaimedTaskRowSchema } from "../../schemas";@@ -493,7 +493,7 @@ export async function failStaleKillTasks(db: Database, workspaceId: string) {eq(agentTaskQueue.workspaceId, workspaceId),eq(agentTaskQueue.type, TASK_TYPES.KILL_TASK),inArray(agentTaskQueue.status, ["queued", "dispatched"]),- lt(agentTaskQueue.createdAt, threshold)+ lt(sql`coalesce(${agentTaskQueue.dispatchedAt}, ${agentTaskQueue.createdAt})`, threshold))).returning({ id: agentTaskQueue.id });diff --git a/src/shared/src/db/queries/whitelist.ts b/src/shared/src/db/queries/whitelist.tsindex 00f933983..328963e82 100644--- a/src/shared/src/db/queries/whitelist.ts+++ b/src/shared/src/db/queries/whitelist.ts@@ -32,6 +32,20 @@ export async function removeWhitelist(db: Database, id: string, agentId: string,return rows[0] ?? null;}+export async function removeWhitelistByEmail(db: Database, agentId: string, workspaceId: string, email: string) {+ const rows = await db+ .delete(agentWhitelist)+ .where(+ and(+ eq(agentWhitelist.agentId, agentId),+ eq(agentWhitelist.workspaceId, workspaceId),+ eq(agentWhitelist.email, email),+ )+ )+ .returning();+ return rows[0] ?? null;+}+export async function isWhitelisted(db: Database, agentId: string, workspaceId: string, email: string): Promise<boolean> {const rows = await db.select({ id: agentWhitelist.id })diff --git a/src/shared/src/db/queries/workspace-invite.ts b/src/shared/src/db/queries/workspace-invite.tsnew file mode 100644index 000000000..f14246291--- /dev/null+++ b/src/shared/src/db/queries/workspace-invite.ts@@ -0,0 +1,83 @@+import { eq, and, gt, isNull } from "drizzle-orm";+import { workspaceInvite, workspace, user } from "../schema";+import type { Database } from "../index";++export async function createInvite(+ db: Database,+ data: { workspaceId: string; createdBy: string; expiresAt: string }+) {+ const rows = await db+ .insert(workspaceInvite)+ .values({+ workspaceId: data.workspaceId,+ createdBy: data.createdBy,+ expiresAt: data.expiresAt,+ })+ .returning();+ return rows[0]!;+}++export async function getInviteByToken(db: Database, token: string) {+ const rows = await db+ .select({+ id: workspaceInvite.id,+ workspaceId: workspaceInvite.workspaceId,+ token: workspaceInvite.token,+ createdBy: workspaceInvite.createdBy,+ usedBy: workspaceInvite.usedBy,+ usedAt: workspaceInvite.usedAt,+ expiresAt: workspaceInvite.expiresAt,+ createdAt: workspaceInvite.createdAt,+ workspaceName: workspace.name,+ workspaceSlug: workspace.slug,+ creatorName: user.name,+ creatorEmail: user.email,+ })+ .from(workspaceInvite)+ .innerJoin(workspace, eq(workspaceInvite.workspaceId, workspace.id))+ .innerJoin(user, eq(workspaceInvite.createdBy, user.id))+ .where(eq(workspaceInvite.token, token));+ return rows[0] ?? null;+}++export async function listActiveInvites(db: Database, workspaceId: string) {+ return db+ .select()+ .from(workspaceInvite)+ .where(+ and(+ eq(workspaceInvite.workspaceId, workspaceId),+ isNull(workspaceInvite.usedBy),+ gt(workspaceInvite.expiresAt, new Date().toISOString())+ )+ );+}++export async function redeemInvite(db: Database, token: string, userId: string) {+ const now = new Date().toISOString();+ const rows = await db+ .update(workspaceInvite)+ .set({ usedBy: userId, usedAt: now })+ .where(+ and(+ eq(workspaceInvite.token, token),+ isNull(workspaceInvite.usedBy),+ gt(workspaceInvite.expiresAt, now)+ )+ )+ .returning();+ return rows[0] ?? null;+}++export async function deleteInvite(db: Database, inviteId: string, workspaceId: string) {+ const rows = await db+ .delete(workspaceInvite)+ .where(+ and(+ eq(workspaceInvite.id, inviteId),+ eq(workspaceInvite.workspaceId, workspaceId)+ )+ )+ .returning();+ return rows[0] ?? null;+}diff --git a/src/shared/src/db/queries/workspace.ts b/src/shared/src/db/queries/workspace.tsindex cc4e1d1c5..79d7eb77a 100644--- a/src/shared/src/db/queries/workspace.ts+++ b/src/shared/src/db/queries/workspace.ts@@ -47,3 +47,17 @@ export async function createWorkspace(.returning();return rows[0]!;}++export async function updateWorkspace(db: Database, id: string, data: { name?: string; slug?: string }) {+ const rows = await db+ .update(workspace)+ .set({ ...data, updatedAt: new Date().toISOString() })+ .where(eq(workspace.id, id))+ .returning();+ return rows[0] ?? null;+}++export async function deleteWorkspace(db: Database, id: string) {+ const rows = await db.delete(workspace).where(eq(workspace.id, id)).returning();+ return rows[0] ?? null;+}diff --git a/src/shared/src/db/schema.ts b/src/shared/src/db/schema.tsindex 6dd2b9b03..7d13ba44c 100644--- a/src/shared/src/db/schema.ts+++ b/src/shared/src/db/schema.ts@@ -94,6 +94,71 @@ export const member = sqliteTable((t) => [unique("member_workspace_user").on(t.workspaceId, t.userId)]);+export const workspaceInvite = sqliteTable(+ "workspace_invite",+ {+ id: text("id").primaryKey().$defaultFn(() => "inv_" + nanoid()),+ workspaceId: text("workspace_id")+ .notNull()+ .references(() => workspace.id, { onDelete: "cascade" }),+ token: text("token").unique().notNull().$defaultFn(() => nanoid(32)),+ createdBy: text("created_by")+ .notNull()+ .references(() => user.id, { onDelete: "cascade" }),+ usedBy: text("used_by").references(() => user.id, { onDelete: "set null" }),+ usedAt: text("used_at"),+ expiresAt: text("expires_at").notNull(),+ createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),+ },+ (t) => [+ index("idx_workspace_invite_token").on(t.token),+ index("idx_workspace_invite_workspace").on(t.workspaceId),+ ]+);++export const agentAccess = sqliteTable(+ "agent_access",+ {+ id: text("id").primaryKey().$defaultFn(() => nanoid()),+ agentId: text("agent_id").notNull(),+ workspaceId: text("workspace_id").notNull(),+ userId: text("user_id")+ .notNull()+ .references(() => user.id, { onDelete: "cascade" }),+ createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),+ },+ (t) => [+ unique("agent_access_agent_ws_user").on(t.agentId, t.workspaceId, t.userId),+ index("idx_agent_access_agent_ws").on(t.agentId, t.workspaceId),+ index("idx_agent_access_user").on(t.userId),+ foreignKey({+ columns: [t.agentId, t.workspaceId],+ foreignColumns: [agent.id, agent.workspaceId],+ }).onDelete("cascade"),+ ]+);++export const agentPin = sqliteTable(+ "agent_pin",+ {+ id: text("id").primaryKey().$defaultFn(() => nanoid()),+ agentId: text("agent_id").notNull(),+ workspaceId: text("workspace_id").notNull(),+ userId: text("user_id")+ .notNull()+ .references(() => user.id, { onDelete: "cascade" }),+ createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),+ },+ (t) => [+ unique("agent_pin_agent_ws_user").on(t.agentId, t.workspaceId, t.userId),+ index("idx_agent_pin_ws_user").on(t.workspaceId, t.userId),+ foreignKey({+ columns: [t.agentId, t.workspaceId],+ foreignColumns: [agent.id, agent.workspaceId],+ }).onDelete("cascade"),+ ]+);+export const machine = sqliteTable("machine",{diff --git a/src/shared/src/index.ts b/src/shared/src/index.tsindex d8f11ba81..f8821ab63 100644--- a/src/shared/src/index.ts+++ b/src/shared/src/index.ts@@ -10,6 +10,7 @@ export type {TaskMessage,MachineToken,Email,+ EmailDirection,EmailAttachment,Artifact,AgentEmailAccount,@@ -115,6 +116,9 @@ export {CreateEmailAccountSchema,UpdateEmailAccountSchema,TestEmailConnectionSchema,+ UpdateWorkspaceRequestSchema,+ DeleteWorkspaceRequestSchema,+ GrantAgentAccessRequestSchema,} from "./schemas";export type {diff --git a/src/shared/src/schemas.ts b/src/shared/src/schemas.tsindex 0e879f79b..cd2b071ba 100644--- a/src/shared/src/schemas.ts+++ b/src/shared/src/schemas.ts@@ -335,6 +335,7 @@ export const UpdateAgentRequestSchema = zinstructions: z.string().optional(),runtime_id: z.string().min(1).optional(),runtime_config: RuntimeConfigSchema,+ visibility: z.enum(["public", "private"]).optional(),}).refine((v) =>@@ -342,7 +343,8 @@ export const UpdateAgentRequestSchema = zv.description !== undefined ||v.instructions !== undefined ||v.runtime_id !== undefined ||- v.runtime_config !== undefined,+ v.runtime_config !== undefined ||+ v.visibility !== undefined,{ message: "at least one field is required" },);export type UpdateAgentRequest = z.infer<typeof UpdateAgentRequestSchema>;@@ -490,3 +492,19 @@ export const CreateWorkspaceRequestSchema = z.object({export type CreateWorkspaceRequest = z.infer<typeof CreateWorkspaceRequestSchema>;++export const UpdateWorkspaceRequestSchema = z.object({+ name: z.string().min(1, "name is required").max(100).trim().optional(),+ slug: z.string().min(1, "slug is required").max(100).trim().toLowerCase().optional(),+});+export type UpdateWorkspaceRequest = z.infer<typeof UpdateWorkspaceRequestSchema>;++export const DeleteWorkspaceRequestSchema = z.object({+ confirm_name: z.string().min(1, "confirm_name is required"),+});+export type DeleteWorkspaceRequest = z.infer<typeof DeleteWorkspaceRequestSchema>;++export const GrantAgentAccessRequestSchema = z.object({+ user_id: z.string().min(1, "user_id is required"),+});+export type GrantAgentAccessRequest = z.infer<typeof GrantAgentAccessRequestSchema>;diff --git a/src/shared/src/types.ts b/src/shared/src/types.tsindex d8aa10902..6cc363eec 100644--- a/src/shared/src/types.ts+++ b/src/shared/src/types.ts@@ -1,5 +1,7 @@import type { TaskApi } from "./schemas";+export type EmailDirection = "inbound" | "outbound";+export interface User {id: string;name: string;@@ -29,6 +31,8 @@ export interface Agent {status: string;max_concurrent_tasks: number;email_handle: string | null;+ visibility: string;+ owner_id: string | null;created_at: string;updated_at: string;}@@ -139,7 +143,7 @@ export interface Email {html_body: string;attachments: EmailAttachment[];status: string;- direction: "inbound" | "outbound";+ direction: EmailDirection;created_at: string;}diff --git a/src/web/migrations/0007_agent_access.sql b/src/web/migrations/0007_agent_access.sqlnew file mode 100644index 000000000..f1796da12--- /dev/null+++ b/src/web/migrations/0007_agent_access.sql@@ -0,0 +1,12 @@+CREATE TABLE agent_access (+ id TEXT PRIMARY KEY,+ agent_id TEXT NOT NULL,+ workspace_id TEXT NOT NULL,+ user_id TEXT NOT NULL REFERENCES user(id) ON DELETE CASCADE,+ created_at TEXT NOT NULL,+ UNIQUE(agent_id, workspace_id, user_id),+ FOREIGN KEY (agent_id, workspace_id) REFERENCES agent(id, workspace_id) ON DELETE CASCADE+);++CREATE INDEX idx_agent_access_agent_ws ON agent_access(agent_id, workspace_id);+CREATE INDEX idx_agent_access_user ON agent_access(user_id);diff --git a/src/web/migrations/0008_workspace_invite.sql b/src/web/migrations/0008_workspace_invite.sqlnew file mode 100644index 000000000..4c79390c6--- /dev/null+++ b/src/web/migrations/0008_workspace_invite.sql@@ -0,0 +1,13 @@+CREATE TABLE workspace_invite (+ id TEXT PRIMARY KEY,+ workspace_id TEXT NOT NULL REFERENCES workspace(id) ON DELETE CASCADE,+ token TEXT NOT NULL UNIQUE,+ created_by TEXT NOT NULL REFERENCES user(id) ON DELETE CASCADE,+ used_by TEXT REFERENCES user(id) ON DELETE SET NULL,+ used_at TEXT,+ expires_at TEXT NOT NULL,+ created_at TEXT NOT NULL+);++CREATE INDEX idx_workspace_invite_token ON workspace_invite(token);+CREATE INDEX idx_workspace_invite_workspace ON workspace_invite(workspace_id);diff --git a/src/web/migrations/0009_backfill_agent_owner.sql b/src/web/migrations/0009_backfill_agent_owner.sqlnew file mode 100644index 000000000..fd60153ea--- /dev/null+++ b/src/web/migrations/0009_backfill_agent_owner.sql@@ -0,0 +1,11 @@+-- Backfill agent.owner_id for existing agents that have NULL owner_id.+-- Sets it to the workspace owner (member with role = 'owner').+-- This is required because getAgent now filters by visibility/access control,+-- and agents with NULL owner_id + private visibility would be invisible.+UPDATE agent+SET owner_id = (+ SELECT m.user_id FROM member m+ WHERE m.workspace_id = agent.workspace_id AND m.role = 'owner'+ LIMIT 1+)+WHERE agent.owner_id IS NULL;diff --git a/src/web/migrations/0010_agent_pin.sql b/src/web/migrations/0010_agent_pin.sqlnew file mode 100644index 000000000..f56d31c58--- /dev/null+++ b/src/web/migrations/0010_agent_pin.sql@@ -0,0 +1,11 @@+CREATE TABLE agent_pin (+ id TEXT PRIMARY KEY,+ agent_id TEXT NOT NULL,+ workspace_id TEXT NOT NULL,+ user_id TEXT NOT NULL REFERENCES user(id) ON DELETE CASCADE,+ created_at TEXT NOT NULL,+ UNIQUE(agent_id, workspace_id, user_id),+ FOREIGN KEY (agent_id, workspace_id) REFERENCES agent(id, workspace_id) ON DELETE CASCADE+);++CREATE INDEX idx_agent_pin_ws_user ON agent_pin(workspace_id, user_id);diff --git a/src/web/src/app/(app)/invite/[token]/page.tsx b/src/web/src/app/(app)/invite/[token]/page.tsxnew file mode 100644index 000000000..68d6aeeec--- /dev/null+++ b/src/web/src/app/(app)/invite/[token]/page.tsx@@ -0,0 +1,100 @@+"use client";++import { useEffect, useState } from "react";+import { useParams, useRouter } from "next/navigation";+import { toast } from "sonner";+import { getInviteInfo, acceptInvite, type InviteInfo } from "@/lib/api";+import { Button } from "@/components/ui/button";+import { Skeleton } from "@/components/ui/skeleton";++type State = "loading" | "ready" | "error" | "accepting" | "done";++export default function InvitePage() {+ const { token } = useParams<{ token: string }>();+ const router = useRouter();++ const [state, setState] = useState<State>("loading");+ const [info, setInfo] = useState<InviteInfo | null>(null);+ const [errorMsg, setErrorMsg] = useState<string>("");++ useEffect(() => {+ if (!token) return;+ getInviteInfo(token)+ .then((data) => {+ setInfo(data);+ setState("ready");+ })+ .catch((err) => {+ setErrorMsg(err instanceof Error ? err.message : "Invalid or expired invite link");+ setState("error");+ });+ }, [token]);++ const handleAccept = async () => {+ if (!token) return;+ setState("accepting");+ try {+ const result = await acceptInvite(token);+ setState("done");+ toast.success(`Joined ${info?.workspace_name ?? "workspace"}`);+ router.replace(`/w/${result.workspace_slug}/home`);+ } catch (err) {+ setErrorMsg(err instanceof Error ? err.message : "Failed to join workspace");+ setState("error");+ }+ };++ return (+ <div className="min-h-screen flex items-center justify-center p-6">+ <div className="w-full max-w-sm space-y-6 text-center">+ {state === "loading" && (+ <div className="space-y-3">+ <Skeleton className="h-6 w-48 mx-auto" />+ <Skeleton className="h-4 w-64 mx-auto" />+ <Skeleton className="h-9 w-32 mx-auto" />+ </div>+ )}++ {state === "ready" && info && (+ <>+ <div className="space-y-1">+ <h1 className="text-xl font-semibold">You've been invited</h1>+ <p className="text-sm text-muted-foreground">+ {info.invited_by} invited you to join+ </p>+ </div>++ <div className="rounded-md border border-border/50 px-4 py-3 text-left space-y-0.5">+ <p className="text-sm font-medium">{info.workspace_name}</p>+ <p className="text-xs text-muted-foreground">Workspace</p>+ </div>++ <Button className="w-full" onClick={handleAccept}>+ Join Workspace+ </Button>+ </>+ )}++ {state === "accepting" && (+ <div className="space-y-3">+ <Skeleton className="h-6 w-48 mx-auto" />+ <Skeleton className="h-4 w-64 mx-auto" />+ <p className="text-sm text-muted-foreground">Joining workspace…</p>+ </div>+ )}++ {state === "error" && (+ <>+ <div className="space-y-1">+ <h1 className="text-xl font-semibold">Invite unavailable</h1>+ <p className="text-sm text-muted-foreground">{errorMsg}</p>+ </div>+ <Button variant="outline" onClick={() => router.replace("/workspaces")}>+ Go to workspaces+ </Button>+ </>+ )}+ </div>+ </div>+ );+}diff --git a/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsx b/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsxindex 1e7feaa18..6156d628b 100644--- a/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsx+++ b/src/web/src/app/(app)/w/[slug]/agents/[id]/email/page.tsx@@ -12,12 +12,12 @@ import { EmailCompose } from "@/components/email-compose";import { cn } from "@/lib/utils";import { toast } from "sonner";import { Skeleton } from "@/components/ui/skeleton";-import { ArrowLeft, Loader2, Mail, Inbox, Send, Plus, Trash2, Forward, Reply, Paperclip, File as FileIcon, Copy, Check, ShieldX, ChevronDown } from "lucide-react";+import { ArrowLeft, Loader2, Mail, Inbox, Send, Plus, Trash2, Forward, Reply, Paperclip, File as FileIcon, Copy, Check, ShieldAlert, ChevronDown } from "lucide-react";import { useIsMobile } from "@/hooks/use-mobile";import { ResizablePanels } from "@/components/ui/resizable-panels";import { EmailBodyFrame } from "@/components/email-body-frame";-type Folder = "inbox" | "sent" | "rejected";+type Folder = "inbox" | "sent" | "untrust";function relativeTime(dateStr: string): string {const date = new Date(dateStr);@@ -346,16 +346,16 @@ export default function AgentEmailPage() {</button><buttontype="button"- onClick={() => setFolder("rejected")}+ onClick={() => setFolder("untrust")}className={cn("flex items-center gap-2 rounded-lg px-2.5 py-1.5 text-sm transition-colors cursor-pointer",- folder === "rejected"+ folder === "untrust"? "bg-accent text-foreground font-medium": "text-muted-foreground hover:bg-accent/50 hover:text-foreground")}>- <ShieldX className="size-4 shrink-0" />- Rejected+ <ShieldAlert className="size-4 shrink-0" />+ Untrust</button></nav></div>@@ -380,7 +380,7 @@ export default function AgentEmailPage() {<div className="flex flex-col items-center justify-center h-full animate-[fade-up_400ms_ease-out_both]"><Mail className="size-8 text-muted-foreground mb-3" /><p className="text-sm text-muted-foreground">- {folder === "inbox" ? "No emails received yet" : folder === "sent" ? "No emails sent yet" : "No rejected emails"}+ {folder === "inbox" ? "No emails from trusted senders" : folder === "sent" ? "No emails sent yet" : "No untrusted emails"}</p></div>) : (@@ -397,7 +397,7 @@ export default function AgentEmailPage() {)}><div className="flex items-center justify-between gap-2 mb-0.5">- <p className="text-sm font-medium truncate">+ <p className="text-sm font-medium truncate flex items-center gap-1.5">{folder === "sent" ? email.to_email : email.from_email}</p><span className="text-xs text-muted-foreground shrink-0">@@ -672,19 +672,23 @@ export default function AgentEmailPage() {)}<div className="flex items-center gap-1 border-b border-border/50 px-3 py-2"><div className="flex items-center gap-0.5 flex-1 min-w-0">- {(["inbox", "sent", "rejected"] as Folder[]).map((f) => (+ {([+ { id: "inbox" as Folder, label: "Inbox" },+ { id: "sent" as Folder, label: "Sent" },+ { id: "untrust" as Folder, label: "Untrust" },+ ]).map((f) => (<button- key={f}+ key={f.id}type="button"- onClick={() => setFolder(f)}+ onClick={() => setFolder(f.id)}className={cn(- "px-2.5 py-1 rounded-md text-xs font-medium transition-colors capitalize",- folder === f+ "px-2.5 py-1 rounded-md text-xs font-medium transition-colors",+ folder === f.id? "bg-accent text-foreground": "text-muted-foreground hover:text-foreground")}>- {f}+ {f.label}</button>))}</div>diff --git a/src/web/src/app/(app)/w/[slug]/agents/new/page.tsx b/src/web/src/app/(app)/w/[slug]/agents/new/page.tsxindex 45d051e88..ef1c5934a 100644--- a/src/web/src/app/(app)/w/[slug]/agents/new/page.tsx+++ b/src/web/src/app/(app)/w/[slug]/agents/new/page.tsx@@ -4,7 +4,7 @@ import { useState, useEffect } from "react";import { useRouter } from "next/navigation";import { useAgentContext } from "@/contexts/agent-context";import { useWorkspace } from "@/contexts/workspace-context";-import { AgentEditForm } from "@/components/agent-edit-form";+import { AgentCreateForm } from "@/components/agent-create-form";import { fetchModelOptions, createEmailAccount } from "@/lib/api";import { toast } from "sonner";import { MobileSidebarLogo } from "@/components/mobile-sidebar-logo";@@ -32,13 +32,11 @@ export default function CreateAgentPage() {<h1 className="text-sm font-medium">Create Agent</h1></div>- <AgentEditForm+ <AgentCreateFormruntimes={runtimes}defaultRuntimeId={getFirstOnlineRuntimeId()}modelOptions={modelOptions}saving={saving}- submitLabel="Create"- savingLabel="Creating..."onCancel={() => router.back()}onSave={async (data) => {setSaving(true);diff --git a/src/web/src/app/(app)/w/[slug]/settings/general-tab.tsx b/src/web/src/app/(app)/w/[slug]/settings/general-tab.tsxnew file mode 100644index 000000000..9a508d60d--- /dev/null+++ b/src/web/src/app/(app)/w/[slug]/settings/general-tab.tsx@@ -0,0 +1,189 @@+"use client";++import { useCallback, useEffect, useState } from "react";+import { toast } from "sonner";+import { useRouter } from "next/navigation";+import { useWorkspace } from "@/contexts/workspace-context";+import { useSession } from "@/lib/auth-client";+import {+ listMembers,+ updateWorkspace,+ deleteWorkspace,+ listWorkspaces,+} from "@/lib/api";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { Skeleton } from "@/components/ui/skeleton";++export function GeneralTab() {+ const { workspaceId, slug } = useWorkspace();+ const session = useSession();+ const router = useRouter();++ const [memberRole, setMemberRole] = useState<string>("");+ const [loading, setLoading] = useState(true);++ const [workspaceName, setWorkspaceName] = useState("");+ const [workspaceSlug, setWorkspaceSlug] = useState("");+ const [savedWorkspaceName, setSavedWorkspaceName] = useState("");+ const [savedWorkspaceSlug, setSavedWorkspaceSlug] = useState("");+ const [savingWorkspace, setSavingWorkspace] = useState(false);++ const [deleteConfirm, setDeleteConfirm] = useState("");+ const [deleting, setDeleting] = useState(false);++ const isOwner = memberRole === "owner";++ const fetchData = useCallback(async () => {+ setLoading(true);+ try {+ const currentUserId = session.data?.user?.id;+ const [members, workspaces] = await Promise.all([+ listMembers(workspaceId),+ listWorkspaces(),+ ]);++ const me = members.find((m) => m.user_id === currentUserId);+ setMemberRole(me?.role ?? "");++ const ws = workspaces.find((w) => w.id === workspaceId);+ if (ws) {+ setWorkspaceName(ws.name);+ setWorkspaceSlug(ws.slug);+ setSavedWorkspaceName(ws.name);+ setSavedWorkspaceSlug(ws.slug);+ }+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to load workspace info");+ } finally {+ setLoading(false);+ }+ }, [workspaceId, session.data?.user?.id]);++ useEffect(() => {+ if (session.data) fetchData();+ }, [fetchData, session.data]);++ const isWorkspaceDirty =+ workspaceName !== savedWorkspaceName || workspaceSlug !== savedWorkspaceSlug;++ const handleSaveWorkspace = async () => {+ setSavingWorkspace(true);+ try {+ const updated = await updateWorkspace(workspaceId, {+ name: workspaceName,+ slug: workspaceSlug,+ });+ setSavedWorkspaceName(updated.name);+ setSavedWorkspaceSlug(updated.slug);+ toast.success("Workspace updated");+ if (updated.slug !== slug) {+ router.replace(`/w/${updated.slug}/settings`);+ }+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to update workspace");+ } finally {+ setSavingWorkspace(false);+ }+ };++ const handleDelete = async () => {+ if (deleteConfirm !== savedWorkspaceName) return;+ setDeleting(true);+ try {+ await deleteWorkspace(workspaceId, savedWorkspaceName);+ toast.success("Workspace deleted");+ router.replace("/workspaces");+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to delete workspace");+ } finally {+ setDeleting(false);+ }+ };++ if (loading) {+ return (+ <div className="space-y-4">+ <Skeleton className="h-4 w-32" />+ <Skeleton className="h-10 w-full" />+ <Skeleton className="h-10 w-full" />+ </div>+ );+ }++ if (!isOwner) {+ return (+ <p className="text-sm text-muted-foreground">+ Only workspace owners can edit workspace settings.+ </p>+ );+ }++ return (+ <div className="space-y-10">+ <section className="space-y-4">+ <h2 className="text-sm font-medium">Workspace</h2>+ <div className="space-y-3">+ <div className="space-y-1.5">+ <Label htmlFor="workspace-name">Name</Label>+ <Input+ id="workspace-name"+ value={workspaceName}+ onChange={(e) => setWorkspaceName(e.target.value)}+ placeholder="Workspace name"+ />+ </div>+ <div className="space-y-1.5">+ <Label htmlFor="workspace-slug">Slug</Label>+ <Input+ id="workspace-slug"+ value={workspaceSlug}+ onChange={(e) => setWorkspaceSlug(e.target.value)}+ placeholder="workspace-slug"+ />+ <p className="text-xs text-muted-foreground/70">+ Used in URLs: /w/{workspaceSlug}/+ </p>+ </div>+ </div>+ <Button+ size="sm"+ onClick={handleSaveWorkspace}+ disabled={!isWorkspaceDirty || savingWorkspace}+ >+ {savingWorkspace ? "Saving…" : "Save"}+ </Button>+ </section>++ <section className="space-y-4">+ <h2 className="text-sm font-medium text-destructive">Danger Zone</h2>+ <div className="rounded-md border border-destructive/30 p-4 space-y-3">+ <p className="text-sm text-muted-foreground">+ Deleting this workspace is permanent and cannot be undone. All agents,+ conversations, and data will be lost.+ </p>+ <div className="space-y-1.5">+ <Label htmlFor="delete-confirm" className="text-xs">+ Type <span className="font-medium text-foreground">{savedWorkspaceName}</span> to confirm+ </Label>+ <Input+ id="delete-confirm"+ value={deleteConfirm}+ onChange={(e) => setDeleteConfirm(e.target.value)}+ placeholder={savedWorkspaceName}+ />+ </div>+ <Button+ size="sm"+ variant="destructive"+ onClick={handleDelete}+ disabled={deleteConfirm !== savedWorkspaceName || deleting}+ >+ {deleting ? "Deleting…" : "Delete Workspace"}+ </Button>+ </div>+ </section>+ </div>+ );+}diff --git a/src/web/src/app/(app)/w/[slug]/settings/instruction-tab.tsx b/src/web/src/app/(app)/w/[slug]/settings/instruction-tab.tsxnew file mode 100644index 000000000..ac443c33e--- /dev/null+++ b/src/web/src/app/(app)/w/[slug]/settings/instruction-tab.tsx@@ -0,0 +1,155 @@+"use client";++import { useCallback, useEffect, useRef, useState } from "react";+import { toast } from "sonner";+import { useWorkspace } from "@/contexts/workspace-context";+import { getMemberMe, updateMemberMe } from "@/lib/api";+import { MarkdownEditor } from "@/components/ui/markdown-editor";+import { Skeleton } from "@/components/ui/skeleton";+import { cn } from "@/lib/utils";++const MAX_LENGTH = 50_000;+const DEBOUNCE_MS = 500;++function UsageRing({ ratio, size = 16, stroke = 1.5 }: { ratio: number; size?: number; stroke?: number }) {+ const r = (size - stroke) / 2;+ const circ = 2 * Math.PI * r;+ const visual = ratio <= 0 ? 0 : ratio >= 1 ? 1 : Math.log1p(ratio * 99) / Math.log(100);+ const filled = visual * circ;+ return (+ <svg width={size} height={size} className="shrink-0 -rotate-90" aria-hidden>+ <circle cx={size / 2} cy={size / 2} r={r} fill="none" stroke="currentColor" strokeWidth={stroke} className="text-border" />+ <circle+ cx={size / 2}+ cy={size / 2}+ r={r}+ fill="none"+ stroke="currentColor"+ strokeWidth={stroke}+ strokeDasharray={`${filled} ${circ - filled}`}+ strokeLinecap="round"+ className={cn(+ "transition-all duration-300",+ ratio > 0.9 ? "text-destructive/70" : ratio > 0.7 ? "text-yellow-500/50" : "text-muted-foreground/30"+ )}+ />+ </svg>+ );+}++export function InstructionTab() {+ const { workspaceId } = useWorkspace();+ const [value, setValue] = useState("");+ const [savedValue, setSavedValue] = useState("");+ const [loading, setLoading] = useState(true);++ const valueRef = useRef(value);+ valueRef.current = value;+ const savedValueRef = useRef(savedValue);+ savedValueRef.current = savedValue;+ const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);+ const savingRef = useRef(false);++ const fetchInstruction = useCallback(async () => {+ setLoading(true);+ try {+ const data = await getMemberMe(workspaceId);+ setValue(data.global_instruction);+ setSavedValue(data.global_instruction);+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to load settings");+ } finally {+ setLoading(false);+ }+ }, [workspaceId]);++ useEffect(() => {+ fetchInstruction();+ }, [fetchInstruction]);++ const flushSave = useCallback(async () => {+ if (savingRef.current) return;+ const current = valueRef.current;+ if (current === savedValueRef.current) return;+ savingRef.current = true;+ try {+ const data = await updateMemberMe(workspaceId, current);+ setSavedValue(data.global_instruction);+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to save");+ } finally {+ savingRef.current = false;+ }+ }, [workspaceId]);++ const scheduleSave = useCallback(() => {+ if (debounceRef.current) clearTimeout(debounceRef.current);+ debounceRef.current = setTimeout(flushSave, DEBOUNCE_MS);+ }, [flushSave]);++ const handleChange = useCallback(+ (next: string) => {+ setValue(next);+ scheduleSave();+ },+ [scheduleSave],+ );++ useEffect(() => {+ const onBeforeUnload = () => {+ if (debounceRef.current) clearTimeout(debounceRef.current);+ if (valueRef.current !== savedValueRef.current) {+ const params = new URLSearchParams({ workspace_id: workspaceId });+ fetch(`/api/members/me?${params}`, {+ method: "PATCH",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ global_instruction: valueRef.current }),+ keepalive: true,+ });+ }+ };+ window.addEventListener("beforeunload", onBeforeUnload);+ return () => window.removeEventListener("beforeunload", onBeforeUnload);+ }, [workspaceId]);++ useEffect(() => {+ return () => {+ if (debounceRef.current) clearTimeout(debounceRef.current);+ if (valueRef.current !== savedValueRef.current) {+ void flushSave();+ }+ };+ }, [flushSave]);++ const ratio = value.length / MAX_LENGTH;++ if (loading) {+ return (+ <div className="px-6 py-6 space-y-4">+ <Skeleton className="h-4 w-48" />+ <Skeleton className="h-40 w-full" />+ </div>+ );+ }++ return (+ <div className="flex flex-col h-full">+ <div className="flex-1 px-6 pt-4 pb-4">+ <MarkdownEditor+ value={value}+ onChange={handleChange}+ placeholder="Write instructions that every agent you own will follow..."+ minHeight="calc(100vh - 240px)"+ contentType="markdown"+ variant="seamless"+ />+ </div>+ <div className="flex items-center gap-2 px-6 py-3">+ <UsageRing ratio={ratio} />+ <p className="text-xs text-muted-foreground">+ This instruction is prepended to every agent's individual instruction.+ </p>+ </div>+ </div>+ );+}diff --git a/src/web/src/app/(app)/w/[slug]/settings/members-tab.tsx b/src/web/src/app/(app)/w/[slug]/settings/members-tab.tsxnew file mode 100644index 000000000..97dcd21f3--- /dev/null+++ b/src/web/src/app/(app)/w/[slug]/settings/members-tab.tsx@@ -0,0 +1,262 @@+"use client";++import { useCallback, useEffect, useState } from "react";+import { toast } from "sonner";+import { Copy, Trash2, Plus, UserMinus } from "lucide-react";+import { useWorkspace } from "@/contexts/workspace-context";+import { useSession } from "@/lib/auth-client";+import {+ listMembers,+ removeMember,+ listInvites,+ createInvite,+ revokeInvite,+ type MemberEntry,+ type InviteEntry,+} from "@/lib/api";+import { Button } from "@/components/ui/button";+import { Skeleton } from "@/components/ui/skeleton";+import { cn } from "@/lib/utils";++function getInviteLink(token: string) {+ return `${window.location.origin}/invite/${token}`;+}++export function MembersTab() {+ const { workspaceId } = useWorkspace();+ const session = useSession();++ const currentUserId = session.data?.user?.id;++ const [members, setMembers] = useState<MemberEntry[]>([]);+ const [invites, setInvites] = useState<InviteEntry[]>([]);+ const [loading, setLoading] = useState(true);+ const [generatingInvite, setGeneratingInvite] = useState(false);++ const isOwner = members.find((m) => m.user_id === currentUserId)?.role === "owner";++ const fetchData = useCallback(async () => {+ setLoading(true);+ try {+ const [membersData, invitesData] = await Promise.all([+ listMembers(workspaceId),+ listInvites(workspaceId).catch(() => [] as InviteEntry[]),+ ]);+ setMembers(membersData);+ setInvites(invitesData);+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to load members");+ } finally {+ setLoading(false);+ }+ }, [workspaceId]);++ useEffect(() => {+ fetchData();+ }, [fetchData]);++ const handleGenerateInvite = async () => {+ setGeneratingInvite(true);+ try {+ const invite = await createInvite(workspaceId);+ setInvites((prev) => [...prev, invite]);+ const link = getInviteLink(invite.token);+ await navigator.clipboard.writeText(link);+ toast.success("Invite link copied to clipboard");+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to generate invite");+ } finally {+ setGeneratingInvite(false);+ }+ };++ const handleCopyInvite = async (token: string) => {+ const link = getInviteLink(token);+ try {+ await navigator.clipboard.writeText(link);+ toast.success("Invite link copied");+ } catch {+ toast.error("Failed to copy link");+ }+ };++ const handleRevokeInvite = async (inviteId: string) => {+ try {+ await revokeInvite(workspaceId, inviteId);+ setInvites((prev) => prev.filter((i) => i.id !== inviteId));+ toast.success("Invite revoked");+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to revoke invite");+ }+ };++ const handleRemoveMember = async (memberId: string) => {+ try {+ await removeMember(workspaceId, memberId);+ setMembers((prev) => prev.filter((m) => m.id !== memberId));+ toast.success("Member removed");+ } catch (err) {+ toast.error(err instanceof Error ? err.message : "Failed to remove member");+ }+ };++ if (loading) {+ return (+ <div className="space-y-4">+ <Skeleton className="h-4 w-24" />+ <Skeleton className="h-10 w-full" />+ <Skeleton className="h-10 w-full" />+ <Skeleton className="h-4 w-24 mt-6" />+ <Skeleton className="h-10 w-full" />+ <Skeleton className="h-10 w-full" />+ </div>+ );+ }++ return (+ <div className="space-y-8">+ {/* Pending invites — owner only */}+ {isOwner && (+ <section className="space-y-3">+ <div className="flex items-center justify-between">+ <h2 className="text-sm font-medium">Pending Invites</h2>+ <Button+ size="sm"+ variant="outline"+ onClick={handleGenerateInvite}+ disabled={generatingInvite}+ >+ <Plus className="size-3.5 mr-1" />+ {generatingInvite ? "Generating…" : "Generate invite link"}+ </Button>+ </div>++ {invites.length === 0 ? (+ <p className="text-xs text-muted-foreground py-2">+ No active invite links. Generate one to invite someone to this workspace.+ </p>+ ) : (+ <div className="space-y-1.5">+ {invites.map((invite) => {+ const expiresAt = new Date(invite.expires_at);+ const isExpired = expiresAt < new Date();+ return (+ <div+ key={invite.id}+ className="flex items-center justify-between rounded-md border border-border/50 px-3 py-2 text-xs"+ >+ <div className="min-w-0 flex-1">+ <p className={cn("font-mono truncate", isExpired && "text-muted-foreground line-through")}>+ /invite/{invite.token.slice(0, 12)}…+ </p>+ <p className={cn("text-muted-foreground/70 mt-0.5", isExpired && "text-destructive/70")}>+ {isExpired+ ? "Expired"+ : `Expires ${expiresAt.toLocaleDateString()}`}+ </p>+ </div>+ <div className="flex items-center gap-1 ml-2 shrink-0">+ {!isExpired && (+ <Button+ size="sm"+ variant="ghost"+ className="h-7 w-7 p-0"+ onClick={() => handleCopyInvite(invite.token)}+ title="Copy invite link"+ >+ <Copy className="size-3.5" />+ </Button>+ )}+ <Button+ size="sm"+ variant="ghost"+ className="h-7 w-7 p-0 text-destructive hover:text-destructive"+ onClick={() => handleRevokeInvite(invite.id)}+ title="Revoke invite"+ >+ <Trash2 className="size-3.5" />+ </Button>+ </div>+ </div>+ );+ })}+ </div>+ )}+ </section>+ )}++ {/* Member list */}+ <section className="space-y-3">+ <h2 className="text-sm font-medium">Members</h2>+ <div className="space-y-1.5">+ {members.map((member) => {+ const isSelf = member.user_id === currentUserId;+ const initials = member.name+ ? member.name+ .split(" ")+ .map((n) => n[0])+ .join("")+ .slice(0, 2)+ .toUpperCase()+ : member.email.slice(0, 2).toUpperCase();++ return (+ <div+ key={member.id}+ className="flex items-center gap-3 rounded-md border border-border/50 px-3 py-2"+ >+ {/* Avatar */}+ <div className="size-7 rounded-full bg-muted flex items-center justify-center text-xs font-medium text-muted-foreground shrink-0 overflow-hidden">+ {member.image ? (+ // eslint-disable-next-line @next/next/no-img-element+ <img src={member.image} alt={member.name} className="size-full object-cover" />+ ) : (+ initials+ )}+ </div>++ {/* Name / email */}+ <div className="min-w-0 flex-1">+ <p className="text-sm font-medium truncate leading-tight">+ {member.name || member.email}+ {isSelf && (+ <span className="ml-1.5 text-xs text-muted-foreground font-normal">(you)</span>+ )}+ </p>+ {member.name && (+ <p className="text-xs text-muted-foreground truncate">{member.email}</p>+ )}+ </div>++ {/* Role badge */}+ <span+ className={cn(+ "text-xs px-1.5 py-0.5 rounded shrink-0",+ member.role === "owner"+ ? "bg-primary/10 text-primary"+ : "bg-muted text-muted-foreground"+ )}+ >+ {member.role}+ </span>++ {/* Remove button — owner only, not on self */}+ {isOwner && !isSelf && (+ <Button+ size="sm"+ variant="ghost"+ className="h-7 w-7 p-0 text-muted-foreground hover:text-destructive shrink-0"+ onClick={() => handleRemoveMember(member.id)}+ title="Remove member"+ >+ <UserMinus className="size-3.5" />+ </Button>+ )}+ </div>+ );+ })}+ </div>+ </section>+ </div>+ );+}diff --git a/src/web/src/app/(app)/w/[slug]/settings/page.tsx b/src/web/src/app/(app)/w/[slug]/settings/page.tsxindex f723cb058..234a5f55c 100644--- a/src/web/src/app/(app)/w/[slug]/settings/page.tsx+++ b/src/web/src/app/(app)/w/[slug]/settings/page.tsx@@ -1,135 +1,23 @@"use client";-import { useCallback, useEffect, useRef, useState } from "react";-import { toast } from "sonner";-import { useWorkspace } from "@/contexts/workspace-context";-import { getMemberMe, updateMemberMe } from "@/lib/api";+import { useState } from "react";import { MobileSidebarLogo } from "@/components/mobile-sidebar-logo";-import { MarkdownEditor } from "@/components/ui/markdown-editor";-import { Skeleton } from "@/components/ui/skeleton";+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";import { cn } from "@/lib/utils";--const MAX_LENGTH = 50_000;-const DEBOUNCE_MS = 500;+import { GeneralTab } from "./general-tab";+import { InstructionTab } from "./instruction-tab";+import { MembersTab } from "./members-tab";const TABS = [- { id: "global-instruction", label: "Global Instruction" },+ { id: "general", label: "General" },+ { id: "instruction", label: "Instruction" },+ { id: "members", label: "Members" },] as const;type TabId = (typeof TABS)[number]["id"];-function UsageRing({ ratio, size = 16, stroke = 1.5 }: { ratio: number; size?: number; stroke?: number }) {- const r = (size - stroke) / 2;- const circ = 2 * Math.PI * r;- const visual = ratio <= 0 ? 0 : ratio >= 1 ? 1 : Math.log1p(ratio * 99) / Math.log(100);- const filled = visual * circ;- return (- <svg width={size} height={size} className="shrink-0 -rotate-90" aria-hidden>- <circle cx={size / 2} cy={size / 2} r={r} fill="none" stroke="currentColor" strokeWidth={stroke} className="text-border" />- <circle- cx={size / 2}- cy={size / 2}- r={r}- fill="none"- stroke="currentColor"- strokeWidth={stroke}- strokeDasharray={`${filled} ${circ - filled}`}- strokeLinecap="round"- className={cn(- "transition-all duration-300",- ratio > 0.9 ? "text-destructive/70" : ratio > 0.7 ? "text-yellow-500/50" : "text-muted-foreground/30"- )}- />- </svg>- );-}-export default function SettingsPage() {- const { workspaceId } = useWorkspace();- const [activeTab, setActiveTab] = useState<TabId>("global-instruction");- const [value, setValue] = useState("");- const [savedValue, setSavedValue] = useState("");- const [loading, setLoading] = useState(true);-- const valueRef = useRef(value);- valueRef.current = value;- const savedValueRef = useRef(savedValue);- savedValueRef.current = savedValue;- const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);- const savingRef = useRef(false);-- const fetchInstruction = useCallback(async () => {- setLoading(true);- try {- const data = await getMemberMe(workspaceId);- setValue(data.global_instruction);- setSavedValue(data.global_instruction);- } catch (err) {- toast.error(err instanceof Error ? err.message : "Failed to load settings");- } finally {- setLoading(false);- }- }, [workspaceId]);-- useEffect(() => {- fetchInstruction();- }, [fetchInstruction]);-- const flushSave = useCallback(async () => {- if (savingRef.current) return;- const current = valueRef.current;- if (current === savedValueRef.current) return;- savingRef.current = true;- try {- const data = await updateMemberMe(workspaceId, current);- setSavedValue(data.global_instruction);- } catch (err) {- toast.error(err instanceof Error ? err.message : "Failed to save");- } finally {- savingRef.current = false;- }- }, [workspaceId]);-- const scheduleSave = useCallback(() => {- if (debounceRef.current) clearTimeout(debounceRef.current);- debounceRef.current = setTimeout(flushSave, DEBOUNCE_MS);- }, [flushSave]);-- const handleChange = useCallback(- (next: string) => {- setValue(next);- scheduleSave();- },- [scheduleSave],- );-- useEffect(() => {- const onBeforeUnload = () => {- if (debounceRef.current) clearTimeout(debounceRef.current);- if (valueRef.current !== savedValueRef.current) {- const params = new URLSearchParams({ workspace_id: workspaceId });- fetch(`/api/members/me?${params}`, {- method: "PATCH",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ global_instruction: valueRef.current }),- keepalive: true,- });- }- };- window.addEventListener("beforeunload", onBeforeUnload);- return () => window.removeEventListener("beforeunload", onBeforeUnload);- }, [workspaceId]);-- useEffect(() => {- return () => {- if (debounceRef.current) clearTimeout(debounceRef.current);- if (valueRef.current !== savedValueRef.current) {- void flushSave();- }- };- }, [flushSave]);-- const ratio = value.length / MAX_LENGTH;+ const [activeTab, setActiveTab] = useState<TabId>("general");return (<>@@ -159,54 +47,28 @@ export default function SettingsPage() {</nav><div className="flex-1 min-w-0 flex flex-col">- <div className="flex items-center gap-1 border-b border-border/50 px-4 md:hidden">- {TABS.map((tab) => (- <button- key={tab.id}- onClick={() => setActiveTab(tab.id)}- className={cn(- "relative px-3 py-2.5 text-sm transition-colors",- activeTab === tab.id- ? "text-foreground font-medium"- : "text-muted-foreground hover:text-foreground"- )}- >- {tab.label}- {activeTab === tab.id && (- <span className="absolute inset-x-3 -bottom-px h-px bg-foreground" />- )}- </button>- ))}+ <div className="px-4 pt-2 md:hidden">+ <Tabs value={activeTab} onValueChange={(v) => setActiveTab(v as TabId)}>+ <TabsList className="h-auto gap-1">+ {TABS.map((tab) => (+ <TabsTrigger key={tab.id} value={tab.id}>+ {tab.label}+ </TabsTrigger>+ ))}+ </TabsList>+ </Tabs></div>- <div className="flex-1 overflow-y-auto thin-scrollbar">- {activeTab === "global-instruction" && (- <div className="flex flex-col h-full">- {loading ? (- <div className="px-6 py-6 space-y-4">- <Skeleton className="h-4 w-48" />- <Skeleton className="h-40 w-full" />- </div>- ) : (- <div className="flex flex-col flex-1 min-h-0">- <div className="flex-1 px-6 pt-4 pb-4">- <MarkdownEditor- value={value}- onChange={handleChange}- placeholder="Write instructions that every agent you own will follow..."- minHeight="calc(100vh - 240px)"- contentType="markdown"- variant="seamless"- />- </div>- <div className="flex items-center gap-2 px-6 py-3">- <UsageRing ratio={ratio} />- <p className="text-xs text-muted-foreground">- This instruction is prepended to every agent's individual instruction.- </p>- </div>- </div>- )}+ <div className={cn(+ "flex-1 overflow-y-auto thin-scrollbar",+ activeTab !== "instruction" && "px-5 py-5"+ )}>+ {activeTab === "instruction" ? (+ <InstructionTab />+ ) : (+ <div className="mx-auto max-w-md">+ {activeTab === "general" && <GeneralTab />}+ {activeTab === "members" && <MembersTab />}</div>)}</div>diff --git a/src/web/src/app/api/agents/[id]/access/[userId]/route.test.ts b/src/web/src/app/api/agents/[id]/access/[userId]/route.test.tsnew file mode 100644index 000000000..ffaf2c045--- /dev/null+++ b/src/web/src/app/api/agents/[id]/access/[userId]/route.test.ts@@ -0,0 +1,144 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockGetAgent = vi.fn();+const mockListAgentAccess = vi.fn();+const mockRevokeAgentAccess = vi.fn();+const mockRemoveWhitelistByEmail = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ agent: {+ getAgent: (...args: unknown[]) => mockGetAgent(...args),+ },+ agentAccess: {+ listAgentAccess: (...args: unknown[]) => mockListAgentAccess(...args),+ revokeAgentAccess: (...args: unknown[]) => mockRevokeAgentAccess(...args),+ },+ whitelist: {+ removeWhitelistByEmail: (...args: unknown[]) => mockRemoveWhitelistByEmail(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceMember: vi.fn(async () => ({ workspaceId: "w1", memberRole: "member" })),+}));++import { DELETE } from "./route";++beforeEach(() => vi.clearAllMocks());++describe("DELETE /api/agents/[id]/access/[userId]", () => {+ it("revokes access and returns 204 without removing whitelist", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });+ mockListAgentAccess.mockResolvedValue([{ userId: "u2", userEmail: "[email protected]" }]);+ mockRevokeAgentAccess.mockResolvedValue({ id: "ac1", userId: "u2" });++ const req = new NextRequest("http://localhost/api/agents/a1/access/u2?workspace_id=w1", {+ method: "DELETE",+ });+ const ctx = { params: Promise.resolve({ id: "a1", userId: "u2" }) };+ const res = await DELETE(req, ctx as any);++ expect(res.status).toBe(204);+ expect(mockRevokeAgentAccess).toHaveBeenCalledWith({}, "a1", "w1", "u2");+ expect(mockRemoveWhitelistByEmail).not.toHaveBeenCalled();+ });++ it("also removes whitelist when remove_whitelist=true", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });+ mockListAgentAccess.mockResolvedValue([{ userId: "u2", userEmail: "[email protected]" }]);+ mockRevokeAgentAccess.mockResolvedValue({ id: "ac1", userId: "u2" });+ mockRemoveWhitelistByEmail.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/a1/access/u2?workspace_id=w1&remove_whitelist=true", {+ method: "DELETE",+ });+ const ctx = { params: Promise.resolve({ id: "a1", userId: "u2" }) };+ const res = await DELETE(req, ctx as any);++ expect(res.status).toBe(204);+ expect(mockRemoveWhitelistByEmail).toHaveBeenCalledWith({}, "a1", "w1", "[email protected]");+ });++ it("does not remove whitelist when member has no email even with remove_whitelist=true", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });+ mockListAgentAccess.mockResolvedValue([{ userId: "u2" }]);+ mockRevokeAgentAccess.mockResolvedValue({ id: "ac1", userId: "u2" });++ const req = new NextRequest("http://localhost/api/agents/a1/access/u2?workspace_id=w1&remove_whitelist=true", {+ method: "DELETE",+ });+ const ctx = { params: Promise.resolve({ id: "a1", userId: "u2" }) };+ const res = await DELETE(req, ctx as any);++ expect(res.status).toBe(204);+ expect(mockRemoveWhitelistByEmail).not.toHaveBeenCalled();+ });++ it("returns 404 when access record not found", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });+ mockListAgentAccess.mockResolvedValue([]);+ mockRevokeAgentAccess.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/a1/access/u2", {+ method: "DELETE",+ });+ const ctx = { params: Promise.resolve({ id: "a1", userId: "u2" }) };+ const res = await DELETE(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(404);+ expect(body.error).toBe("access record not found");+ });++ it("returns 403 when user is not agent owner", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "other-user" });++ const req = new NextRequest("http://localhost/api/agents/a1/access/u2", {+ method: "DELETE",+ });+ const ctx = { params: Promise.resolve({ id: "a1", userId: "u2" }) };+ const res = await DELETE(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(403);+ expect(body.error).toBe("agent owner access required");+ });++ it("returns 404 when agent not found", async () => {+ mockGetAgent.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/a1/access/u2", {+ method: "DELETE",+ });+ const ctx = { params: Promise.resolve({ id: "a1", userId: "u2" }) };+ const res = await DELETE(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(404);+ expect(body.error).toBe("agent not found");+ });+});diff --git a/src/web/src/app/api/agents/[id]/access/[userId]/route.ts b/src/web/src/app/api/agents/[id]/access/[userId]/route.tsnew file mode 100644index 000000000..b4576f4ab--- /dev/null+++ b/src/web/src/app/api/agents/[id]/access/[userId]/route.ts@@ -0,0 +1,27 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceMember } from "@/lib/middleware/workspace";+import { writeError } from "@/lib/middleware/helpers";++export const DELETE = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;+ const { id: agentId, userId: targetUserId } = ctx.params!;+ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);+ const ag = await queries.agent.getAgent(db, agentId, ws.workspaceId);+ if (!ag) return writeError("agent not found", 404);+ if (ag.ownerId !== ctx.userId) return writeError("agent owner access required", 403);+ const accessList = await queries.agentAccess.listAgentAccess(db, agentId, ws.workspaceId);+ const member = accessList.find((a: any) => a.userId === targetUserId);+ const revoked = await queries.agentAccess.revokeAgentAccess(db, agentId, ws.workspaceId, targetUserId);+ if (!revoked) return writeError("access record not found", 404);+ const removeWhitelist = new URL(req.url).searchParams.get("remove_whitelist") === "true";+ if (removeWhitelist && member?.userEmail) {+ await queries.whitelist.removeWhitelistByEmail(db, agentId, ws.workspaceId, member.userEmail);+ }+ return new Response(null, { status: 204 });+});diff --git a/src/web/src/app/api/agents/[id]/access/route.test.ts b/src/web/src/app/api/agents/[id]/access/route.test.tsnew file mode 100644index 000000000..e2fd287a2--- /dev/null+++ b/src/web/src/app/api/agents/[id]/access/route.test.ts@@ -0,0 +1,187 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockGetAgent = vi.fn();+const mockListAgentAccess = vi.fn();+const mockGrantAgentAccess = vi.fn();+const mockAddWhitelist = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ agent: {+ getAgent: (...args: unknown[]) => mockGetAgent(...args),+ },+ agentAccess: {+ listAgentAccess: (...args: unknown[]) => mockListAgentAccess(...args),+ grantAgentAccess: (...args: unknown[]) => mockGrantAgentAccess(...args),+ },+ whitelist: {+ addWhitelist: (...args: unknown[]) => mockAddWhitelist(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceMember: vi.fn(async () => ({ workspaceId: "w1", memberRole: "member" })),+}));++import { GET, POST } from "./route";++beforeEach(() => vi.clearAllMocks());++describe("GET /api/agents/[id]/access", () => {+ it("returns access list for agent owner", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });+ mockListAgentAccess.mockResolvedValue([+ { id: "ac1", userId: "u2", userName: "Bob", userEmail: "[email protected]", createdAt: "2024-01-01T00:00:00Z" },+ ]);++ const req = new NextRequest("http://localhost/api/agents/a1/access");+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await GET(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toHaveLength(1);+ expect(body[0]).toEqual({ id: "ac1", user_id: "u2", name: "Bob", email: "[email protected]", created_at: "2024-01-01T00:00:00Z" });+ });++ it("returns 403 when user is not agent owner", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "other-user" });++ const req = new NextRequest("http://localhost/api/agents/a1/access");+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await GET(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(403);+ expect(body.error).toBe("agent owner access required");+ });++ it("returns 403 when agent has null ownerId", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: null });++ const req = new NextRequest("http://localhost/api/agents/a1/access");+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await GET(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(403);+ expect(body.error).toBe("agent owner access required");+ });++ it("returns 404 when agent not found", async () => {+ mockGetAgent.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/missing/access");+ const ctx = { params: Promise.resolve({ id: "missing" }) };+ const res = await GET(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(404);+ expect(body.error).toBe("agent not found");+ });+});++describe("POST /api/agents/[id]/access", () => {+ it("grants access and returns 201", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });+ mockGrantAgentAccess.mockResolvedValue({ id: "ac1", userId: "u2" });+ mockListAgentAccess.mockResolvedValue([{ userId: "u2", userEmail: "[email protected]" }]);+ mockAddWhitelist.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/a1/access", {+ method: "POST",+ body: JSON.stringify({ user_id: "u2" }),+ });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(201);+ expect(body).toEqual({ id: "ac1", user_id: "u2" });+ expect(mockGrantAgentAccess).toHaveBeenCalledWith(+ {},+ { agentId: "a1", workspaceId: "w1", userId: "u2" }+ );+ expect(mockAddWhitelist).toHaveBeenCalledWith({}, "a1", "w1", "[email protected]");+ });++ it("does not add whitelist when member has no email", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });+ mockGrantAgentAccess.mockResolvedValue({ id: "ac1", userId: "u2" });+ mockListAgentAccess.mockResolvedValue([{ userId: "u2", userEmail: undefined }]);++ const req = new NextRequest("http://localhost/api/agents/a1/access", {+ method: "POST",+ body: JSON.stringify({ user_id: "u2" }),+ });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx as any);++ expect(res.status).toBe(201);+ expect(mockAddWhitelist).not.toHaveBeenCalled();+ });++ it("returns 403 when user is not agent owner", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "other-user" });++ const req = new NextRequest("http://localhost/api/agents/a1/access", {+ method: "POST",+ body: JSON.stringify({ user_id: "u2" }),+ });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(403);+ expect(body.error).toBe("agent owner access required");+ });++ it("returns 404 when agent not found", async () => {+ mockGetAgent.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/a1/access", {+ method: "POST",+ body: JSON.stringify({ user_id: "u2" }),+ });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx as any);+ const body = await res.json();++ expect(res.status).toBe(404);+ expect(body.error).toBe("agent not found");+ });++ it("returns 400 for invalid body", async () => {+ const req = new NextRequest("http://localhost/api/agents/a1/access", {+ method: "POST",+ body: JSON.stringify({ user_id: "" }),+ });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx as any);++ expect(res.status).toBe(400);+ });+});diff --git a/src/web/src/app/api/agents/[id]/access/route.ts b/src/web/src/app/api/agents/[id]/access/route.tsnew file mode 100644index 000000000..e6a6d2fee--- /dev/null+++ b/src/web/src/app/api/agents/[id]/access/route.ts@@ -0,0 +1,47 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries, GrantAgentAccessRequestSchema } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceMember } from "@/lib/middleware/workspace";+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";++async function requireAgentOwner(db: any, agentId: string, workspaceId: string, userId: string) {+ const ag = await queries.agent.getAgent(db, agentId, workspaceId, userId);+ if (!ag) return { error: writeError("agent not found", 404) };+ if (ag.ownerId !== userId) return { error: writeError("agent owner access required", 403) };+ return { agent: ag };+}++export const GET = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;+ const { id } = ctx.params!;+ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);+ const check = await requireAgentOwner(db, id, ws.workspaceId, ctx.userId);+ if (check.error) return check.error;+ const accessList = await queries.agentAccess.listAgentAccess(db, id, ws.workspaceId);+ return writeJSON(accessList.map((a: any) => ({+ id: a.id, user_id: a.userId, name: a.userName, email: a.userEmail, created_at: a.createdAt,+ })));+});++export const POST = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;+ const { id } = ctx.params!;+ const [body, err] = await parseBody(req, GrantAgentAccessRequestSchema);+ if (err) return err;+ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);+ const check = await requireAgentOwner(db, id, ws.workspaceId, ctx.userId);+ if (check.error) return check.error;+ const access = await queries.agentAccess.grantAgentAccess(db, { agentId: id, workspaceId: ws.workspaceId, userId: body.user_id });+ const accessList = await queries.agentAccess.listAgentAccess(db, id, ws.workspaceId);+ const member = accessList.find((a: any) => a.userId === body.user_id);+ if (member?.userEmail) {+ await queries.whitelist.addWhitelist(db, id, ws.workspaceId, member.userEmail);+ }+ return writeJSON({ id: access.id, user_id: access.userId }, 201);+});diff --git a/src/web/src/app/api/agents/[id]/active-tasks/route.ts b/src/web/src/app/api/agents/[id]/active-tasks/route.tsindex 183525e02..d0c22399a 100644--- a/src/web/src/app/api/agents/[id]/active-tasks/route.ts+++ b/src/web/src/app/api/agents/[id]/active-tasks/route.ts@@ -14,7 +14,7 @@ export const GET = withAuth(async (req, ctx) => {const id = ctx.params?.id;if (!id) return writeError("agent id is required", 400);- const agent = await queries.agent.getAgent(db, id, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);if (!agent) return writeError("agent not found", 404);const tasks = await queries.task.listActiveTasksByAgent(db, id, ws.workspaceId);diff --git a/src/web/src/app/api/agents/[id]/chat-init/route.ts b/src/web/src/app/api/agents/[id]/chat-init/route.tsindex aa767ba34..094b704a3 100644--- a/src/web/src/app/api/agents/[id]/chat-init/route.ts+++ b/src/web/src/app/api/agents/[id]/chat-init/route.ts@@ -25,7 +25,7 @@ export const POST = withAuth(async (req, ctx) => {return writeError("agent id is required", 400);}- const agent = await queries.agent.getAgent(db, id, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);if (!agent) {return writeError("agent not found", 404);}diff --git a/src/web/src/app/api/agents/[id]/conversation/route.ts b/src/web/src/app/api/agents/[id]/conversation/route.tsindex d2442f3c6..a85e3e195 100644--- a/src/web/src/app/api/agents/[id]/conversation/route.ts+++ b/src/web/src/app/api/agents/[id]/conversation/route.ts@@ -18,7 +18,7 @@ export const POST = withAuth(async (req, ctx) => {return writeError("agent id is required", 400);}- const agent = await queries.agent.getAgent(db, id, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);if (!agent) {return writeError("agent not found", 404);}diff --git a/src/web/src/app/api/agents/[id]/conversations/route.ts b/src/web/src/app/api/agents/[id]/conversations/route.tsindex 324745586..108591645 100644--- a/src/web/src/app/api/agents/[id]/conversations/route.ts+++ b/src/web/src/app/api/agents/[id]/conversations/route.ts@@ -18,7 +18,7 @@ export const GET = withAuth(async (req, ctx) => {return writeError("agent id is required", 400);}- const agent = await queries.agent.getAgent(db, id, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);if (!agent) {return writeError("agent not found", 404);}diff --git a/src/web/src/app/api/agents/[id]/email-accounts/route.ts b/src/web/src/app/api/agents/[id]/email-accounts/route.tsindex 055aff755..b127814a4 100644--- a/src/web/src/app/api/agents/[id]/email-accounts/route.ts+++ b/src/web/src/app/api/agents/[id]/email-accounts/route.ts@@ -38,7 +38,7 @@ export const GET = withAuth(async (req, ctx) => {const agentId = ctx.params?.idif (!agentId) return writeError("agent id is required", 400)- const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId)+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId, ctx.userId)if (!agent) return writeError("agent not found", 404)const accounts = await queries.emailAccount.getEmailAccountsByAgent(db, agentId, ws.workspaceId)@@ -56,7 +56,7 @@ export const POST = withAuth(async (req, ctx) => {const agentId = ctx.params?.idif (!agentId) return writeError("agent id is required", 400)- const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId)+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId, ctx.userId)if (!agent) return writeError("agent not found", 404)const [body, err] = await parseBody(req, CreateEmailAccountSchema)diff --git a/src/web/src/app/api/agents/[id]/pin/route.test.ts b/src/web/src/app/api/agents/[id]/pin/route.test.tsnew file mode 100644index 000000000..ebbba6180--- /dev/null+++ b/src/web/src/app/api/agents/[id]/pin/route.test.ts@@ -0,0 +1,112 @@+import { NextRequest } from "next/server";++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++const mockGetAgent = vi.fn();+const mockPinAgent = vi.fn();+const mockUnpinAgent = vi.fn();++vi.mock("@alook/shared", async () => {+ const actual = await vi.importActual("@alook/shared");+ return {+ ...actual,+ queries: {+ agent: {+ getAgent: (...args: unknown[]) => mockGetAgent(...args),+ },+ agentPin: {+ pinAgent: (...args: unknown[]) => mockPinAgent(...args),+ unpinAgent: (...args: unknown[]) => mockUnpinAgent(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers"),+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceMember: vi.fn(async () => ({ workspaceId: "w1", memberRole: "member" })),+}));++import { POST, DELETE } from "./route";++beforeEach(() => vi.clearAllMocks());++describe("POST /api/agents/[id]/pin", () => {+ it("pins agent and returns 201 for new pin", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", name: "Agent 1" });+ mockPinAgent.mockResolvedValue({ id: "pin1", agentId: "a1" });++ const req = new NextRequest("http://localhost/api/agents/a1/pin", { method: "POST" });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx);+ const body = await res.json();++ expect(res.status).toBe(201);+ expect(body).toEqual({ pinned: true });+ expect(mockPinAgent).toHaveBeenCalledWith({}, { agentId: "a1", workspaceId: "w1", userId: "u1" });+ });++ it("returns 200 when already pinned", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", name: "Agent 1" });+ mockPinAgent.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/a1/pin", { method: "POST" });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toEqual({ pinned: true });+ });++ it("returns 404 when agent not found", async () => {+ mockGetAgent.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/agents/a1/pin", { method: "POST" });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await POST(req, ctx);+ const body = await res.json();++ expect(res.status).toBe(404);+ expect(body.error).toBe("agent not found");+ expect(mockPinAgent).not.toHaveBeenCalled();+ });+});++describe("DELETE /api/agents/[id]/pin", () => {+ it("unpins agent and returns 204", async () => {+ mockUnpinAgent.mockResolvedValue(undefined);++ const req = new NextRequest("http://localhost/api/agents/a1/pin", { method: "DELETE" });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await DELETE(req, ctx);++ expect(res.status).toBe(204);+ expect(mockUnpinAgent).toHaveBeenCalledWith({}, "a1", "w1", "u1");+ });++ it("returns 204 even when no pin exists (idempotent)", async () => {+ mockUnpinAgent.mockResolvedValue(undefined);++ const req = new NextRequest("http://localhost/api/agents/no-pin/pin", { method: "DELETE" });+ const ctx = { params: Promise.resolve({ id: "no-pin" }) };+ const res = await DELETE(req, ctx);++ expect(res.status).toBe(204);+ expect(mockUnpinAgent).toHaveBeenCalledWith({}, "no-pin", "w1", "u1");+ });+});diff --git a/src/web/src/app/api/agents/[id]/pin/route.ts b/src/web/src/app/api/agents/[id]/pin/route.tsnew file mode 100644index 000000000..35216f9cc--- /dev/null+++ b/src/web/src/app/api/agents/[id]/pin/route.ts@@ -0,0 +1,29 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceMember } from "@/lib/middleware/workspace";+import { writeJSON, writeError } from "@/lib/middleware/helpers";++export const POST = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;+ const { id } = ctx.params!;+ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);+ const agent = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);+ if (!agent) return writeError("agent not found", 404);+ const pin = await queries.agentPin.pinAgent(db, { agentId: id, workspaceId: ws.workspaceId, userId: ctx.userId });+ return writeJSON({ pinned: true }, pin ? 201 : 200);+});++export const DELETE = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;+ const { id } = ctx.params!;+ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);+ await queries.agentPin.unpinAgent(db, id, ws.workspaceId, ctx.userId);+ return new Response(null, { status: 204 });+});diff --git a/src/web/src/app/api/agents/[id]/route.test.ts b/src/web/src/app/api/agents/[id]/route.test.tsindex 33e277b11..69481b306 100644--- a/src/web/src/app/api/agents/[id]/route.test.ts+++ b/src/web/src/app/api/agents/[id]/route.test.ts@@ -76,6 +76,7 @@ describe("GET /api/agents/[id]", () => {describe("DELETE /api/agents/[id]", () => {it("returns 204 on successful deletion", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });mockDeleteAgent.mockResolvedValue(true);const req = new NextRequest("http://localhost/api/agents/a1", { method: "DELETE" });@@ -96,10 +97,23 @@ describe("DELETE /api/agents/[id]", () => {expect(res.status).toBe(404);expect(body.error).toBe("agent not found");});++ it("returns 403 when user is not agent owner", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "other-user" });++ const req = new NextRequest("http://localhost/api/agents/a1", { method: "DELETE" });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await DELETE(req, ctx);+ const body = await res.json();++ expect(res.status).toBe(403);+ expect(body.error).toBe("agent owner access required");+ });});describe("PATCH /api/agents/[id]", () => {it("updates agent and returns response", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });mockUpdateAgent.mockResolvedValue({ id: "a1", name: "Updated" });const req = new NextRequest("http://localhost/api/agents/a1", {@@ -156,6 +170,7 @@ describe("PATCH /api/agents/[id]", () => {});it("accepts and persists runtime_config", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });mockUpdateAgent.mockResolvedValue({ id: "a1", name: "Agent" });const req = new NextRequest("http://localhost/api/agents/a1", {@@ -171,10 +186,12 @@ describe("PATCH /api/agents/[id]", () => {"a1","w1",expect.objectContaining({ runtimeConfig: { model: "claude-sonnet-4-6" } }),+ "u1",);});it("runtime_config alone is a valid update", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });mockUpdateAgent.mockResolvedValue({ id: "a1", name: "Agent" });const req = new NextRequest("http://localhost/api/agents/a1", {@@ -190,10 +207,12 @@ describe("PATCH /api/agents/[id]", () => {"a1","w1",expect.objectContaining({ runtimeConfig: { model: "x" } }),+ "u1",);});it("PATCH with valid runtime_id (same workspace) updates agent successfully", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "u1" });mockGetAgentRuntimeForWorkspace.mockResolvedValue({ id: "rt1", workspaceId: "w1" });mockUpdateAgent.mockResolvedValue({ id: "a1", name: "Agent" });@@ -215,6 +234,7 @@ describe("PATCH /api/agents/[id]", () => {"a1","w1",expect.objectContaining({ runtimeId: "rt1" }),+ "u1",);});@@ -250,4 +270,19 @@ describe("PATCH /api/agents/[id]", () => {expect(mockUpdateAgent).not.toHaveBeenCalled();});+ it("returns 403 when user is not agent owner", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", ownerId: "other-user" });++ const req = new NextRequest("http://localhost/api/agents/a1", {+ method: "PATCH",+ body: JSON.stringify({ name: "New" }),+ });+ const ctx = { params: Promise.resolve({ id: "a1" }) };+ const res = await PATCH(req, ctx);+ const body = await res.json();++ expect(res.status).toBe(403);+ expect(body.error).toBe("agent owner access required");+ });+});diff --git a/src/web/src/app/api/agents/[id]/route.ts b/src/web/src/app/api/agents/[id]/route.tsindex e498e4eb6..13630d640 100644--- a/src/web/src/app/api/agents/[id]/route.ts+++ b/src/web/src/app/api/agents/[id]/route.ts@@ -18,7 +18,7 @@ export const GET = withAuth(async (req, ctx) => {return writeError("agent id is required", 400);}- const agent = await queries.agent.getAgent(db, id, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);if (!agent) {return writeError("agent not found", 404);}@@ -60,8 +60,13 @@ export const PATCH = withAuth(async (req, ctx) => {}data.runtimeConfig = sanitized;}+ if (body.visibility !== undefined) data.visibility = body.visibility;- const updated = await queries.agent.updateAgent(db, id, ws.workspaceId, data as { name?: string; description?: string; instructions?: string; runtimeId?: string; runtimeConfig?: unknown });+ const existing = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);+ if (!existing) return writeError("agent not found", 404);+ if (existing.ownerId !== ctx.userId) return writeError("agent owner access required", 403);++ const updated = await queries.agent.updateAgent(db, id, ws.workspaceId, data as { name?: string; description?: string; instructions?: string; runtimeId?: string; runtimeConfig?: unknown; visibility?: string }, ctx.userId);if (!updated) {return writeError("agent not found", 404);}@@ -81,7 +86,11 @@ export const DELETE = withAuth(async (req, ctx) => {return writeError("agent id is required", 400);}- const deleted = await queries.agent.deleteAgent(db, id, ws.workspaceId);+ const existing = await queries.agent.getAgent(db, id, ws.workspaceId, ctx.userId);+ if (!existing) return writeError("agent not found", 404);+ if (existing.ownerId !== ctx.userId) return writeError("agent owner access required", 403);++ const deleted = await queries.agent.deleteAgent(db, id, ws.workspaceId, ctx.userId);if (!deleted) {return writeError("agent not found", 404);}diff --git a/src/web/src/app/api/agents/[id]/whitelist/route.ts b/src/web/src/app/api/agents/[id]/whitelist/route.tsindex b106561e1..154141357 100644--- a/src/web/src/app/api/agents/[id]/whitelist/route.ts+++ b/src/web/src/app/api/agents/[id]/whitelist/route.ts@@ -16,7 +16,7 @@ export const GET = withAuth(async (req, ctx) => {const agentId = ctx.params?.id;if (!agentId) return writeError("agent id is required", 400);- const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId, ctx.userId);if (!agent) return writeError("agent not found", 404);const entries = await queries.whitelist.getWhitelist(db, agentId, ws.workspaceId);@@ -39,7 +39,7 @@ export const POST = withAuth(async (req, ctx) => {const agentId = ctx.params?.id;if (!agentId) return writeError("agent id is required", 400);- const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId, ctx.userId);if (!agent) return writeError("agent not found", 404);const [body, err] = await parseBody(req, AddWhitelistRequestSchema);@@ -49,12 +49,12 @@ export const POST = withAuth(async (req, ctx) => {const entry = await queries.whitelist.addWhitelist(db, agentId, ws.workspaceId, email);if (!entry) return writeError("email already whitelisted", 409);- if (agent.runtimeId && agent.emailHandle) {+ if (agent.runtimeId && agent.emailHandle && agent.ownerId) {try {const conv = await queries.conversation.createConversation(db, {workspaceId: ws.workspaceId,agentId: agent.id,- userId: agent.ownerId!,+ userId: agent.ownerId,title: `Welcome: ${email}`.slice(0, 50),type: TASK_TYPES.EMAIL_NOTIFICATION,});diff --git a/src/web/src/app/api/agents/pins/route.test.ts b/src/web/src/app/api/agents/pins/route.test.tsnew file mode 100644index 000000000..d21364363--- /dev/null+++ b/src/web/src/app/api/agents/pins/route.test.ts@@ -0,0 +1,71 @@+import { NextRequest } from "next/server";++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++const mockListPins = vi.fn();++vi.mock("@alook/shared", async () => {+ const actual = await vi.importActual("@alook/shared");+ return {+ ...actual,+ queries: {+ agentPin: {+ listPins: (...args: unknown[]) => mockListPins(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers"),+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceMember: vi.fn(async () => ({ workspaceId: "w1", memberRole: "member" })),+}));++import { GET } from "./route";++beforeEach(() => vi.clearAllMocks());++describe("GET /api/agents/pins", () => {+ it("returns list of pins with mapped fields", async () => {+ mockListPins.mockResolvedValue([+ { id: "pin1", agentId: "a1", createdAt: "2025-01-01T00:00:00Z" },+ { id: "pin2", agentId: "a2", createdAt: "2025-01-02T00:00:00Z" },+ ]);++ const req = new NextRequest("http://localhost/api/agents/pins");+ const res = await GET(req, {});+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toEqual([+ { id: "pin1", agent_id: "a1", created_at: "2025-01-01T00:00:00Z" },+ { id: "pin2", agent_id: "a2", created_at: "2025-01-02T00:00:00Z" },+ ]);+ expect(mockListPins).toHaveBeenCalledWith({}, "w1", "u1");+ });++ it("returns empty array when no pins", async () => {+ mockListPins.mockResolvedValue([]);++ const req = new NextRequest("http://localhost/api/agents/pins");+ const res = await GET(req, {});+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toEqual([]);+ });+});diff --git a/src/web/src/app/api/agents/pins/route.ts b/src/web/src/app/api/agents/pins/route.tsnew file mode 100644index 000000000..3469a0dc5--- /dev/null+++ b/src/web/src/app/api/agents/pins/route.ts@@ -0,0 +1,16 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceMember } from "@/lib/middleware/workspace";+import { writeJSON } from "@/lib/middleware/helpers";++export const GET = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;+ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);+ const pins = await queries.agentPin.listPins(db, ws.workspaceId, ctx.userId);+ return writeJSON(pins.map((p) => ({ id: p.id, agent_id: p.agentId, created_at: p.createdAt })));+});diff --git a/src/web/src/app/api/agents/route.ts b/src/web/src/app/api/agents/route.tsindex a005f4078..d55704fbb 100644--- a/src/web/src/app/api/agents/route.ts+++ b/src/web/src/app/api/agents/route.ts@@ -19,7 +19,7 @@ export const GET = withAuth(async (req, ctx) => {// Sweep stale state: catches stuck tasks even when all daemons are deadawait sweepStaleState(db, ws.workspaceId);- const agents = await queries.agent.listAgents(db, ws.workspaceId);+ const agents = await queries.agent.listAgents(db, ws.workspaceId, ctx.userId);return writeJSON(agents.map(agentToResponse));});@@ -88,7 +88,8 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {const updated = await queries.agent.getAgent(db,newAgent.id,- ws.workspaceId+ ws.workspaceId,+ ctx.userId);if (updated) return writeJSON(agentToResponse(updated), 201);}diff --git a/src/web/src/app/api/artifacts/upload/route.ts b/src/web/src/app/api/artifacts/upload/route.tsindex 72a869c6d..cffc8d3f8 100644--- a/src/web/src/app/api/artifacts/upload/route.ts+++ b/src/web/src/app/api/artifacts/upload/route.ts@@ -70,7 +70,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {});const response = queries.artifact.artifactToResponse(row);- const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId, ctx.userId);if (agent?.ownerId) {broadcastToUser(agent.ownerId, {type: "artifact.uploaded",diff --git a/src/web/src/app/api/calendar/[id]/route.ts b/src/web/src/app/api/calendar/[id]/route.tsindex 40ff1f87e..7f2463c65 100644--- a/src/web/src/app/api/calendar/[id]/route.ts+++ b/src/web/src/app/api/calendar/[id]/route.ts@@ -56,7 +56,8 @@ export const PATCH = withAuth(async (req, ctx) => {const agent = await queries.agent.getAgent(db,body.agent_id,- ws.workspaceId+ ws.workspaceId,+ ctx.userId);if (!agent) return writeError("agent not found in workspace", 404);}diff --git a/src/web/src/app/api/calendar/route.ts b/src/web/src/app/api/calendar/route.tsindex e744b30d4..8d628bb7a 100644--- a/src/web/src/app/api/calendar/route.ts+++ b/src/web/src/app/api/calendar/route.ts@@ -25,7 +25,7 @@ export const GET = withAuth(async (req: NextRequest, ctx) => {const to = req.nextUrl.searchParams.get("to") ?? undefined;if (agentId) {- const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId, ctx.userId);if (!agent) return writeError("agent not found in workspace", 404);}@@ -78,7 +78,8 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {const agent = await queries.agent.getAgent(db,body.agent_id,- ws.workspaceId+ ws.workspaceId,+ ctx.userId);if (!agent) return writeError("agent not found in workspace", 404);diff --git a/src/web/src/app/api/email/route.test.ts b/src/web/src/app/api/email/route.test.tsindex ca1817a88..35ea6f77b 100644--- a/src/web/src/app/api/email/route.test.ts+++ b/src/web/src/app/api/email/route.test.ts@@ -3,8 +3,9 @@ import { NextRequest } from "next/server";const mockGetAgent = vi.fn();const mockGetEmailsByAgent = vi.fn();-const mockGetInboxEmails = vi.fn();+const mockGetTrustedEmails = vi.fn();const mockGetSentEmails = vi.fn();+const mockGetRejectedEmails = vi.fn();vi.mock("@opennextjs/cloudflare", () => ({getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),@@ -18,8 +19,9 @@ vi.mock("@alook/shared", () => ({agent: { getAgent: (...args: unknown[]) => mockGetAgent(...args) },email: {getEmailsByAgent: (...args: unknown[]) => mockGetEmailsByAgent(...args),- getInboxEmails: (...args: unknown[]) => mockGetInboxEmails(...args),+ getTrustedEmails: (...args: unknown[]) => mockGetTrustedEmails(...args),getSentEmails: (...args: unknown[]) => mockGetSentEmails(...args),+ getRejectedEmails: (...args: unknown[]) => mockGetRejectedEmails(...args),},},}));@@ -78,15 +80,26 @@ describe("GET /api/email", () => {expect(mockGetEmailsByAgent).toHaveBeenCalledWith({}, "a1", "ws1", "unread");});- it("filters by status and folder=inbox", async () => {+ it("filters by status and folder=inbox (whitelisted inbound)", async () => {mockGetAgent.mockResolvedValue({ id: "a1", emailHandle: "test" });- mockGetInboxEmails.mockResolvedValue([{ id: "e1" }]);+ mockGetTrustedEmails.mockResolvedValue([{ id: "e1" }]);const req = new NextRequest("http://localhost/api/email?agentId=a1&folder=inbox&status=unread");const res = await GET(req, {} as any);expect(res.status).toBe(200);- expect(mockGetInboxEmails).toHaveBeenCalledWith({}, "a1", "[email protected]", "ws1", "unread");+ expect(mockGetTrustedEmails).toHaveBeenCalledWith({}, "a1", "[email protected]", "ws1", "unread");+ });++ it("filters by folder=untrust (non-whitelisted inbound)", async () => {+ mockGetAgent.mockResolvedValue({ id: "a1", emailHandle: "test" });+ mockGetRejectedEmails.mockResolvedValue([{ id: "e2" }]);++ const req = new NextRequest("http://localhost/api/email?agentId=a1&folder=untrust");+ const res = await GET(req, {} as any);++ expect(res.status).toBe(200);+ expect(mockGetRejectedEmails).toHaveBeenCalledWith({}, "a1", "[email protected]", "ws1", undefined);});it("filters by status and folder=sent", async () => {diff --git a/src/web/src/app/api/email/route.ts b/src/web/src/app/api/email/route.tsindex 6c604bb1e..93547e092 100644--- a/src/web/src/app/api/email/route.ts+++ b/src/web/src/app/api/email/route.ts@@ -19,7 +19,7 @@ export const GET = withAuth(async (req: NextRequest, ctx) => {const agentId = req.nextUrl.searchParams.get("agentId");if (!agentId) return writeError("agentId is required", 400);- const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, agentId, ws.workspaceId, ctx.userId);if (!agent) return writeError("agent not found in workspace", 404);const status = req.nextUrl.searchParams.get("status") ?? undefined;@@ -33,10 +33,10 @@ export const GET = withAuth(async (req: NextRequest, ctx) => {let emailList;if (folder === "inbox" && agentEmail) {- emailList = await queries.email.getInboxEmails(db, agentId, agentEmail, ws.workspaceId, status);+ emailList = await queries.email.getTrustedEmails(db, agentId, agentEmail, ws.workspaceId, status);} else if (folder === "sent" && agentEmail) {emailList = await queries.email.getSentEmails(db, agentId, agentEmail, ws.workspaceId, status);- } else if (folder === "rejected" && agentEmail) {+ } else if (folder === "untrust" && agentEmail) {emailList = await queries.email.getRejectedEmails(db, agentId, agentEmail, ws.workspaceId, status);} else {emailList = await queries.email.getEmailsByAgent(db, agentId, ws.workspaceId, status);diff --git a/src/web/src/app/api/email/send/route.ts b/src/web/src/app/api/email/send/route.tsindex aee6b98fe..e10826fbd 100644--- a/src/web/src/app/api/email/send/route.ts+++ b/src/web/src/app/api/email/send/route.ts@@ -18,7 +18,7 @@ export const POST = withAuth(async (req: NextRequest, ctx) => {const [body, valErr] = await parseBody(req, SendEmailRequestSchema);if (valErr) return valErr;- const agent = await queries.agent.getAgent(db, body.agentId, ws.workspaceId);+ const agent = await queries.agent.getAgent(db, body.agentId, ws.workspaceId, ctx.userId);if (!agent) return writeError("agent not found in workspace", 404);let customAccountId = body.customAccountId;diff --git a/src/web/src/app/api/invite/[token]/route.test.ts b/src/web/src/app/api/invite/[token]/route.test.tsnew file mode 100644index 000000000..24bd76da8--- /dev/null+++ b/src/web/src/app/api/invite/[token]/route.test.ts@@ -0,0 +1,187 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockGetInviteByToken = vi.fn();+const mockGetMemberByUserAndWorkspace = vi.fn();+const mockRedeemInvite = vi.fn();+const mockCreateMember = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ workspaceInvite: {+ getInviteByToken: (...args: unknown[]) => mockGetInviteByToken(...args),+ redeemInvite: (...args: unknown[]) => mockRedeemInvite(...args),+ },+ member: {+ getMemberByUserAndWorkspace: (...args: unknown[]) => mockGetMemberByUserAndWorkspace(...args),+ createMember: (...args: unknown[]) => mockCreateMember(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);++import { GET, POST } from "./route";++const futureDate = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString();+const pastDate = new Date(Date.now() - 1000).toISOString();++const sampleInvite = {+ id: "inv1",+ workspaceId: "w1",+ workspaceName: "Acme Corp",+ workspaceSlug: "acme",+ token: "tok-abc",+ createdBy: "u2",+ creatorName: "Alice",+ creatorEmail: "[email protected]",+ usedBy: null,+ usedAt: null,+ expiresAt: futureDate,+ createdAt: "2024-01-01T00:00:00Z",+};++describe("GET /api/invite/[token]", () => {+ beforeEach(() => vi.clearAllMocks());++ it("returns invite info for a valid token", async () => {+ mockGetInviteByToken.mockResolvedValue(sampleInvite);++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "GET" });+ const res = await GET(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body.workspace_name).toBe("Acme Corp");+ expect(body.workspace_id).toBe("w1");+ expect(body.invited_by).toBe("Alice");+ });++ it("uses creator email when creator name is null", async () => {+ mockGetInviteByToken.mockResolvedValue({ ...sampleInvite, creatorName: null });++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "GET" });+ const res = await GET(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ const body = await res.json();++ expect(body.invited_by).toBe("[email protected]");+ });++ it("returns 404 when invite not found", async () => {+ mockGetInviteByToken.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/invite/bad-token", { method: "GET" });+ const res = await GET(req, { params: Promise.resolve({ token: "bad-token" }) } as any);+ expect(res.status).toBe(404);+ });++ it("returns 410 when invite is already used", async () => {+ mockGetInviteByToken.mockResolvedValue({ ...sampleInvite, usedBy: "u2" });++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "GET" });+ const res = await GET(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ expect(res.status).toBe(410);+ const body = await res.json();+ expect(body.error).toBe("invite already used");+ });++ it("returns 410 when invite is expired", async () => {+ mockGetInviteByToken.mockResolvedValue({ ...sampleInvite, expiresAt: pastDate });++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "GET" });+ const res = await GET(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ expect(res.status).toBe(410);+ const body = await res.json();+ expect(body.error).toBe("invite expired");+ });+});++describe("POST /api/invite/[token]", () => {+ beforeEach(() => vi.clearAllMocks());++ it("accepts a valid invite and creates membership", async () => {+ mockGetInviteByToken.mockResolvedValue(sampleInvite);+ mockGetMemberByUserAndWorkspace.mockResolvedValue(null);+ mockRedeemInvite.mockResolvedValue({ ...sampleInvite, usedBy: "u1" });+ mockCreateMember.mockResolvedValue({ id: "m-new" });++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "POST" });+ const res = await POST(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body.workspace_id).toBe("w1");+ expect(body.workspace_slug).toBe("acme");+ expect(mockRedeemInvite).toHaveBeenCalledWith({}, "tok-abc", "u1");+ expect(mockCreateMember).toHaveBeenCalledWith(+ {},+ { workspaceId: "w1", userId: "u1", role: "member" }+ );+ });++ it("returns 409 when user is already a member", async () => {+ mockGetInviteByToken.mockResolvedValue(sampleInvite);+ mockGetMemberByUserAndWorkspace.mockResolvedValue({ id: "m-existing" });++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "POST" });+ const res = await POST(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ expect(res.status).toBe(409);+ const body = await res.json();+ expect(body.error).toBe("already a member of this workspace");+ });++ it("returns 410 when invite is already used", async () => {+ mockGetInviteByToken.mockResolvedValue({ ...sampleInvite, usedBy: "u3" });++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "POST" });+ const res = await POST(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ expect(res.status).toBe(410);+ });++ it("returns 410 when invite is expired", async () => {+ mockGetInviteByToken.mockResolvedValue({ ...sampleInvite, expiresAt: pastDate });++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "POST" });+ const res = await POST(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ expect(res.status).toBe(410);+ const body = await res.json();+ expect(body.error).toBe("invite expired");+ });++ it("returns 404 when invite token not found", async () => {+ mockGetInviteByToken.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/invite/bad-token", { method: "POST" });+ const res = await POST(req, { params: Promise.resolve({ token: "bad-token" }) } as any);+ expect(res.status).toBe(404);+ });++ it("returns 410 when redeemInvite returns null (race condition)", async () => {+ mockGetInviteByToken.mockResolvedValue(sampleInvite);+ mockGetMemberByUserAndWorkspace.mockResolvedValue(null);+ mockRedeemInvite.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/invite/tok-abc", { method: "POST" });+ const res = await POST(req, { params: Promise.resolve({ token: "tok-abc" }) } as any);+ expect(res.status).toBe(410);+ });+});diff --git a/src/web/src/app/api/invite/[token]/route.ts b/src/web/src/app/api/invite/[token]/route.tsnew file mode 100644index 000000000..9f95c4afd--- /dev/null+++ b/src/web/src/app/api/invite/[token]/route.ts@@ -0,0 +1,50 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { writeJSON, writeError } from "@/lib/middleware/helpers";++export const GET = withAuth(async (req: NextRequest, ctx) => {+ const { token } = ctx.params!;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const invite = await queries.workspaceInvite.getInviteByToken(db, token);+ if (!invite) return writeError("invite not found", 404);+ if (invite.usedBy) return writeError("invite already used", 410);+ if (new Date(invite.expiresAt) < new Date()) return writeError("invite expired", 410);++ return writeJSON({+ workspace_name: invite.workspaceName,+ workspace_id: invite.workspaceId,+ invited_by: invite.creatorName || invite.creatorEmail,+ });+});++export const POST = withAuth(async (req: NextRequest, ctx) => {+ const { token } = ctx.params!;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const invite = await queries.workspaceInvite.getInviteByToken(db, token);+ if (!invite) return writeError("invite not found", 404);+ if (invite.usedBy) return writeError("invite already used", 410);+ if (new Date(invite.expiresAt) < new Date()) return writeError("invite expired", 410);++ const existing = await queries.member.getMemberByUserAndWorkspace(db, ctx.userId, invite.workspaceId);+ if (existing) return writeError("already a member of this workspace", 409);++ const redeemed = await queries.workspaceInvite.redeemInvite(db, token, ctx.userId);+ if (!redeemed) return writeError("invite already used", 410);++ await queries.member.createMember(db, {+ workspaceId: invite.workspaceId,+ userId: ctx.userId,+ role: "member",+ });++ return writeJSON({ workspace_id: invite.workspaceId, workspace_slug: invite.workspaceSlug });+});diff --git a/src/web/src/app/api/workspaces/[id]/invites/[inviteId]/route.test.ts b/src/web/src/app/api/workspaces/[id]/invites/[inviteId]/route.test.tsnew file mode 100644index 000000000..f3329e875--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/invites/[inviteId]/route.test.ts@@ -0,0 +1,64 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockDeleteInvite = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ workspaceInvite: {+ deleteInvite: (...args: unknown[]) => mockDeleteInvite(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceOwner: vi.fn(async () => ({ workspaceId: "w1", memberRole: "owner" })),+}));++import { DELETE } from "./route";++describe("DELETE /api/workspaces/[id]/invites/[inviteId]", () => {+ beforeEach(() => vi.clearAllMocks());++ it("revokes invite and returns 204", async () => {+ mockDeleteInvite.mockResolvedValue({ id: "inv1" });++ const req = new NextRequest("http://localhost/api/workspaces/w1/invites/inv1", { method: "DELETE" });+ const res = await DELETE(req, { params: Promise.resolve({ id: "w1", inviteId: "inv1" }) } as any);++ expect(res.status).toBe(204);+ expect(mockDeleteInvite).toHaveBeenCalledWith({}, "inv1", "w1");+ });++ it("returns 404 when invite not found", async () => {+ mockDeleteInvite.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/workspaces/w1/invites/inv-gone", { method: "DELETE" });+ const res = await DELETE(req, { params: Promise.resolve({ id: "w1", inviteId: "inv-gone" }) } as any);++ expect(res.status).toBe(404);+ const body = await res.json();+ expect(body.error).toBe("invite not found");+ });+});diff --git a/src/web/src/app/api/workspaces/[id]/invites/[inviteId]/route.ts b/src/web/src/app/api/workspaces/[id]/invites/[inviteId]/route.tsnew file mode 100644index 000000000..09c1cb364--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/invites/[inviteId]/route.ts@@ -0,0 +1,22 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceOwner } from "@/lib/middleware/workspace";+import { writeError } from "@/lib/middleware/helpers";++export const DELETE = withAuth(async (req: NextRequest, ctx) => {+ const owner = await withWorkspaceOwner(req, ctx);+ if (owner instanceof Response) return owner;++ const { inviteId } = ctx.params!;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const deleted = await queries.workspaceInvite.deleteInvite(db, inviteId, owner.workspaceId);+ if (!deleted) return writeError("invite not found", 404);++ return new Response(null, { status: 204 });+});diff --git a/src/web/src/app/api/workspaces/[id]/invites/route.test.ts b/src/web/src/app/api/workspaces/[id]/invites/route.test.tsnew file mode 100644index 000000000..c0486c801--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/invites/route.test.ts@@ -0,0 +1,103 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockListActiveInvites = vi.fn();+const mockCreateInvite = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ workspaceInvite: {+ listActiveInvites: (...args: unknown[]) => mockListActiveInvites(...args),+ createInvite: (...args: unknown[]) => mockCreateInvite(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceOwner: vi.fn(async () => ({ workspaceId: "w1", memberRole: "owner" })),+}));++vi.mock("@/lib/api/responses", async () =>+ await vi.importActual<typeof import("@/lib/api/responses")>("@/lib/api/responses")+);++import { GET, POST } from "./route";++const sampleInvite = {+ id: "inv1",+ token: "tok-abc",+ createdBy: "u1",+ usedBy: null,+ expiresAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),+ createdAt: "2024-01-01T00:00:00Z",+};++describe("GET /api/workspaces/[id]/invites", () => {+ beforeEach(() => vi.clearAllMocks());++ it("returns list of active invites", async () => {+ mockListActiveInvites.mockResolvedValue([sampleInvite]);++ const req = new NextRequest("http://localhost/api/workspaces/w1/invites", { method: "GET" });+ const res = await GET(req, { params: Promise.resolve({ id: "w1" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toHaveLength(1);+ expect(body[0].id).toBe("inv1");+ expect(body[0].token).toBe("tok-abc");+ expect(mockListActiveInvites).toHaveBeenCalledWith({}, "w1");+ });++ it("returns empty array when no active invites", async () => {+ mockListActiveInvites.mockResolvedValue([]);++ const req = new NextRequest("http://localhost/api/workspaces/w1/invites", { method: "GET" });+ const res = await GET(req, { params: Promise.resolve({ id: "w1" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toEqual([]);+ });+});++describe("POST /api/workspaces/[id]/invites", () => {+ beforeEach(() => vi.clearAllMocks());++ it("creates a new invite and returns 201", async () => {+ mockCreateInvite.mockResolvedValue(sampleInvite);++ const req = new NextRequest("http://localhost/api/workspaces/w1/invites", { method: "POST" });+ const res = await POST(req, { params: Promise.resolve({ id: "w1" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(201);+ expect(body.id).toBe("inv1");+ expect(body.token).toBe("tok-abc");+ expect(mockCreateInvite).toHaveBeenCalledWith(+ {},+ expect.objectContaining({ workspaceId: "w1", createdBy: "u1" })+ );+ });+});diff --git a/src/web/src/app/api/workspaces/[id]/invites/route.ts b/src/web/src/app/api/workspaces/[id]/invites/route.tsnew file mode 100644index 000000000..ddf335292--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/invites/route.ts@@ -0,0 +1,35 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceOwner } from "@/lib/middleware/workspace";+import { writeJSON } from "@/lib/middleware/helpers";+import { inviteToResponse } from "@/lib/api/responses";++export const GET = withAuth(async (req: NextRequest, ctx) => {+ const owner = await withWorkspaceOwner(req, ctx);+ if (owner instanceof Response) return owner;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const invites = await queries.workspaceInvite.listActiveInvites(db, owner.workspaceId);+ return writeJSON(invites.map(inviteToResponse));+});++export const POST = withAuth(async (req: NextRequest, ctx) => {+ const owner = await withWorkspaceOwner(req, ctx);+ if (owner instanceof Response) return owner;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString();+ const invite = await queries.workspaceInvite.createInvite(db, {+ workspaceId: owner.workspaceId,+ createdBy: ctx.userId,+ expiresAt,+ });+ return writeJSON(inviteToResponse(invite), 201);+});diff --git a/src/web/src/app/api/workspaces/[id]/members/[memberId]/route.test.ts b/src/web/src/app/api/workspaces/[id]/members/[memberId]/route.test.tsnew file mode 100644index 000000000..cb9037696--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/members/[memberId]/route.test.ts@@ -0,0 +1,85 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockGetMember = vi.fn();+const mockDeleteMember = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ member: {+ getMember: (...args: unknown[]) => mockGetMember(...args),+ deleteMember: (...args: unknown[]) => mockDeleteMember(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceOwner: vi.fn(async () => ({ workspaceId: "w1", memberRole: "owner" })),+}));++import { DELETE } from "./route";++function makeReq(memberId: string) {+ return new NextRequest(`http://localhost/api/workspaces/w1/members/${memberId}`, { method: "DELETE" });+}++describe("DELETE /api/workspaces/[id]/members/[memberId]", () => {+ beforeEach(() => vi.clearAllMocks());++ it("removes a member successfully", async () => {+ mockGetMember.mockResolvedValue({ id: "m2", userId: "u2", role: "member" });+ mockDeleteMember.mockResolvedValue({ id: "m2" });++ const res = await DELETE(makeReq("m2"), { params: Promise.resolve({ id: "w1", memberId: "m2" }) } as any);+ expect(res.status).toBe(204);+ expect(mockDeleteMember).toHaveBeenCalledWith({}, "m2", "w1");+ });++ it("returns 404 when member not found", async () => {+ mockGetMember.mockResolvedValue(null);++ const res = await DELETE(makeReq("m-unknown"), { params: Promise.resolve({ id: "w1", memberId: "m-unknown" }) } as any);+ expect(res.status).toBe(404);+ const body = await res.json();+ expect(body.error).toBe("member not found");+ });++ it("returns 400 when trying to remove yourself", async () => {+ mockGetMember.mockResolvedValue({ id: "m1", userId: "u1", role: "owner" });++ const res = await DELETE(makeReq("m1"), { params: Promise.resolve({ id: "w1", memberId: "m1" }) } as any);+ expect(res.status).toBe(400);+ const body = await res.json();+ expect(body.error).toBe("cannot remove yourself");+ });++ it("returns 403 when trying to remove an owner", async () => {+ mockGetMember.mockResolvedValue({ id: "m3", userId: "u3", role: "owner" });++ const res = await DELETE(makeReq("m3"), { params: Promise.resolve({ id: "w1", memberId: "m3" }) } as any);+ expect(res.status).toBe(403);+ const body = await res.json();+ expect(body.error).toBe("cannot remove a workspace owner");+ });+});diff --git a/src/web/src/app/api/workspaces/[id]/members/[memberId]/route.ts b/src/web/src/app/api/workspaces/[id]/members/[memberId]/route.tsnew file mode 100644index 000000000..6bd616c07--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/members/[memberId]/route.ts@@ -0,0 +1,26 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceOwner } from "@/lib/middleware/workspace";+import { writeError } from "@/lib/middleware/helpers";++export const DELETE = withAuth(async (req: NextRequest, ctx) => {+ const owner = await withWorkspaceOwner(req, ctx);+ if (owner instanceof Response) return owner;++ const { memberId } = ctx.params!;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const target = await queries.member.getMember(db, memberId, owner.workspaceId);+ if (!target) return writeError("member not found", 404);+ if (target.userId === ctx.userId) return writeError("cannot remove yourself", 400);+ if (target.role === "owner") return writeError("cannot remove a workspace owner", 403);++ await queries.member.deleteMember(db, memberId, owner.workspaceId);++ return new Response(null, { status: 204 });+});diff --git a/src/web/src/app/api/workspaces/[id]/members/route.test.ts b/src/web/src/app/api/workspaces/[id]/members/route.test.tsnew file mode 100644index 000000000..ba6e56e31--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/members/route.test.ts@@ -0,0 +1,95 @@+import { describe, it, expect, vi, beforeEach } from "vitest";+import { NextRequest } from "next/server";++const mockListMembers = vi.fn();++vi.mock("@opennextjs/cloudflare", () => ({+ getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),+}));++vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));++vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ member: {+ listMembers: (...args: unknown[]) => mockListMembers(...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;+ return handler(req, { userId: "u1", email: "[email protected]", params });+ }),+}));++vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);++vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceMember: vi.fn(async () => ({ workspaceId: "w1", memberRole: "member" })),+}));++vi.mock("@/lib/api/responses", async () =>+ await vi.importActual<typeof import("@/lib/api/responses")>("@/lib/api/responses")+);++import { GET } from "./route";++function makeReq() {+ return new NextRequest("http://localhost/api/workspaces/w1/members", { method: "GET" });+}++describe("GET /api/workspaces/[id]/members", () => {+ beforeEach(() => vi.clearAllMocks());++ it("returns list of members", async () => {+ mockListMembers.mockResolvedValue([+ {+ id: "m1",+ userId: "u1",+ role: "owner",+ createdAt: "2024-01-01T00:00:00Z",+ userName: "Alice",+ userEmail: "[email protected]",+ userImage: null,+ },+ {+ id: "m2",+ userId: "u2",+ role: "member",+ createdAt: "2024-01-02T00:00:00Z",+ userName: "Bob",+ userEmail: "[email protected]",+ userImage: "http://example.com/bob.png",+ },+ ]);++ const res = await GET(makeReq(), { params: Promise.resolve({ id: "w1" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toHaveLength(2);+ expect(body[0].id).toBe("m1");+ expect(body[0].user_id).toBe("u1");+ expect(body[0].role).toBe("owner");+ expect(body[1].id).toBe("m2");+ expect(mockListMembers).toHaveBeenCalledWith({}, "w1");+ });++ it("returns empty array when workspace has no members", async () => {+ mockListMembers.mockResolvedValue([]);++ const res = await GET(makeReq(), { params: Promise.resolve({ id: "w1" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body).toEqual([]);+ });+});diff --git a/src/web/src/app/api/workspaces/[id]/members/route.ts b/src/web/src/app/api/workspaces/[id]/members/route.tsnew file mode 100644index 000000000..ff026bbed--- /dev/null+++ b/src/web/src/app/api/workspaces/[id]/members/route.ts@@ -0,0 +1,19 @@+import { NextRequest } from "next/server";+import { getCloudflareContext } from "@opennextjs/cloudflare";+import { queries } from "@alook/shared";+import { getDb } from "@/lib/db";+import { withAuth } from "@/lib/middleware/auth";+import { withWorkspaceMember } from "@/lib/middleware/workspace";+import { writeJSON } from "@/lib/middleware/helpers";+import { memberToResponse } from "@/lib/api/responses";++export const GET = withAuth(async (req: NextRequest, ctx) => {+ const ws = await withWorkspaceMember(req, ctx);+ if (ws instanceof Response) return ws;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const members = await queries.member.listMembers(db, ws.workspaceId);+ return writeJSON(members.map(memberToResponse));+});diff --git a/src/web/src/app/api/workspaces/[id]/route.test.ts b/src/web/src/app/api/workspaces/[id]/route.test.tsindex 75a5f03a1..df7c2ea38 100644--- a/src/web/src/app/api/workspaces/[id]/route.test.ts+++ b/src/web/src/app/api/workspaces/[id]/route.test.ts@@ -4,19 +4,31 @@ import { NextRequest } from "next/server";let mockAuthCtx: Record<string, unknown> = { userId: "u1", email: "[email protected]" };vi.mock("@opennextjs/cloudflare", () => ({- getCloudflareContext: vi.fn(() => ({ env: { DB: {} } })),+ getCloudflareContext: vi.fn((opts?: { async?: boolean }) => {+ const result = { env: { DB: {} } };+ return opts?.async ? Promise.resolve(result) : result;+ }),}));const mockGetWorkspace = vi.fn();+const mockUpdateWorkspace = vi.fn();+const mockDeleteWorkspace = vi.fn();vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));-vi.mock("@alook/shared", () => ({- createDb: vi.fn(() => ({})),- queries: {- workspace: { getWorkspace: (...args: unknown[]) => mockGetWorkspace(...args) },- },-}));+vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ workspace: {+ getWorkspace: (...args: unknown[]) => mockGetWorkspace(...args),+ updateWorkspace: (...args: unknown[]) => mockUpdateWorkspace(...args),+ deleteWorkspace: (...args: unknown[]) => mockDeleteWorkspace(...args),+ },+ },+ };+});vi.mock("@/lib/middleware/auth", () => ({withAuth: vi.fn((handler: any) => async (req: any, ctx?: any) => {@@ -25,19 +37,19 @@ vi.mock("@/lib/middleware/auth", () => ({}),}));-vi.mock("@/lib/middleware/helpers", () => {- const { NextResponse } = require("next/server");- return {- writeJSON: (data: unknown, status = 200) => NextResponse.json(data, { status }),- writeError: (message: string, status: number) => NextResponse.json({ error: message }, { status }),- };-});+vi.mock("@/lib/middleware/helpers", async () =>+ await vi.importActual<typeof import("@/lib/middleware/helpers")>("@/lib/middleware/helpers")+);-vi.mock("@/lib/api/responses", () => ({- workspaceToResponse: vi.fn((w: any) => ({ id: w.id, name: w.name, slug: w.slug })),+vi.mock("@/lib/middleware/workspace", () => ({+ withWorkspaceOwner: vi.fn(async () => ({ workspaceId: "w1", memberRole: "owner" })),}));-import { GET } from "./route";+vi.mock("@/lib/api/responses", async () =>+ await vi.importActual<typeof import("@/lib/api/responses")>("@/lib/api/responses")+);++import { GET, PATCH, DELETE } from "./route";describe("GET /api/workspaces/[id]", () => {beforeEach(() => {@@ -46,13 +58,22 @@ describe("GET /api/workspaces/[id]", () => {});it("returns workspace for a member", async () => {- mockGetWorkspace.mockResolvedValue({ id: "w1", name: "Acme", slug: "acme" });+ mockGetWorkspace.mockResolvedValue({+ id: "w1",+ name: "Acme",+ slug: "acme",+ createdAt: "2024-01-01T00:00:00Z",+ updatedAt: "2024-01-01T00:00:00Z",+ });const req = new NextRequest("http://localhost/api/workspaces/w1");const res = await GET(req, { params: Promise.resolve({ id: "w1" }) } as any);+ const body = await res.json();expect(res.status).toBe(200);- expect(await res.json()).toEqual({ id: "w1", name: "Acme", slug: "acme" });+ expect(body.id).toBe("w1");+ expect(body.name).toBe("Acme");+ expect(body.slug).toBe("acme");expect(mockGetWorkspace).toHaveBeenCalledWith({}, "w1", "u1");});@@ -88,3 +109,136 @@ describe("GET /api/workspaces/[id]", () => {expect(mockGetWorkspace).toHaveBeenCalledWith({}, "w1", "u2");});});++describe("PATCH /api/workspaces/[id]", () => {+ beforeEach(() => {+ vi.clearAllMocks();+ mockAuthCtx = { userId: "u1", email: "[email protected]" };+ });++ it("updates workspace name successfully", async () => {+ mockUpdateWorkspace.mockResolvedValue({+ id: "w1",+ name: "New Name",+ slug: "my-workspace",+ createdAt: "2024-01-01T00:00:00Z",+ updatedAt: "2024-01-02T00:00:00Z",+ });++ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "PATCH",+ body: JSON.stringify({ name: "New Name" }),+ headers: { "Content-Type": "application/json" },+ });+ const res = await PATCH(req, { params: Promise.resolve({ id: "w1" }) } as any);+ const body = await res.json();++ expect(res.status).toBe(200);+ expect(body.name).toBe("New Name");+ expect(mockUpdateWorkspace).toHaveBeenCalledWith({}, "w1", { name: "New Name" });+ });++ it("returns 404 when workspace not found on update", async () => {+ mockUpdateWorkspace.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "PATCH",+ body: JSON.stringify({ name: "New Name" }),+ headers: { "Content-Type": "application/json" },+ });+ const res = await PATCH(req, { params: Promise.resolve({ id: "w1" }) } as any);+ expect(res.status).toBe(404);+ });++ it("returns 400 when neither name nor slug is provided", async () => {+ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "PATCH",+ body: JSON.stringify({}),+ headers: { "Content-Type": "application/json" },+ });+ const res = await PATCH(req, { params: Promise.resolve({ id: "w1" }) } as any);+ expect(res.status).toBe(400);+ });++ it("returns 409 when slug is already in use", async () => {+ const uniqueErr = Object.assign(new Error("UNIQUE constraint failed"), {});+ mockUpdateWorkspace.mockRejectedValue(uniqueErr);++ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "PATCH",+ body: JSON.stringify({ slug: "taken-slug" }),+ headers: { "Content-Type": "application/json" },+ });+ const res = await PATCH(req, { params: Promise.resolve({ id: "w1" }) } as any);+ expect(res.status).toBe(409);+ });+});++describe("DELETE /api/workspaces/[id]", () => {+ beforeEach(() => {+ vi.clearAllMocks();+ mockAuthCtx = { userId: "u1", email: "[email protected]" };+ });++ it("deletes workspace when confirm_name matches", async () => {+ mockGetWorkspace.mockResolvedValue({+ id: "w1",+ name: "My Workspace",+ slug: "my-workspace",+ createdAt: "2024-01-01T00:00:00Z",+ updatedAt: "2024-01-01T00:00:00Z",+ });+ mockDeleteWorkspace.mockResolvedValue(undefined);++ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "DELETE",+ body: JSON.stringify({ confirm_name: "My Workspace" }),+ headers: { "Content-Type": "application/json" },+ });+ const res = await DELETE(req, { params: Promise.resolve({ id: "w1" }) } as any);+ expect(res.status).toBe(204);+ expect(mockDeleteWorkspace).toHaveBeenCalledWith({}, "w1");+ });++ it("returns 400 when confirm_name does not match", async () => {+ mockGetWorkspace.mockResolvedValue({+ id: "w1",+ name: "My Workspace",+ slug: "my-workspace",+ createdAt: "2024-01-01T00:00:00Z",+ updatedAt: "2024-01-01T00:00:00Z",+ });++ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "DELETE",+ body: JSON.stringify({ confirm_name: "Wrong Name" }),+ headers: { "Content-Type": "application/json" },+ });+ const res = await DELETE(req, { params: Promise.resolve({ id: "w1" }) } as any);+ expect(res.status).toBe(400);+ const body = await res.json();+ expect(body.error).toBe("workspace name does not match");+ });++ it("returns 404 when workspace not found", async () => {+ mockGetWorkspace.mockResolvedValue(null);++ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "DELETE",+ body: JSON.stringify({ confirm_name: "My Workspace" }),+ headers: { "Content-Type": "application/json" },+ });+ const res = await DELETE(req, { params: Promise.resolve({ id: "w1" }) } as any);+ expect(res.status).toBe(404);+ });++ it("returns 400 when confirm_name is missing", async () => {+ const req = new NextRequest("http://localhost/api/workspaces/w1", {+ method: "DELETE",+ body: JSON.stringify({}),+ headers: { "Content-Type": "application/json" },+ });+ const res = await DELETE(req, { params: Promise.resolve({ id: "w1" }) } as any);+ expect(res.status).toBe(400);+ });+});diff --git a/src/web/src/app/api/workspaces/[id]/route.ts b/src/web/src/app/api/workspaces/[id]/route.tsindex 2ab59c883..85ca608c4 100644--- a/src/web/src/app/api/workspaces/[id]/route.ts+++ b/src/web/src/app/api/workspaces/[id]/route.ts@@ -1,8 +1,10 @@+import { NextRequest } from "next/server";import { getCloudflareContext } from "@opennextjs/cloudflare"-import { queries } from "@alook/shared"+import { queries, UpdateWorkspaceRequestSchema, DeleteWorkspaceRequestSchema, isUniqueConstraintError } from "@alook/shared"import { getDb } from "@/lib/db"import { withAuth } from "@/lib/middleware/auth";-import { writeJSON, writeError } from "@/lib/middleware/helpers";+import { withWorkspaceOwner } from "@/lib/middleware/workspace";+import { writeJSON, writeError, parseBody } from "@/lib/middleware/helpers";import { workspaceToResponse } from "@/lib/api/responses";export const GET = withAuth(async (_req, ctx) => {@@ -21,3 +23,43 @@ export const GET = withAuth(async (_req, ctx) => {return writeJSON(workspaceToResponse(workspace));});++export const PATCH = withAuth(async (req: NextRequest, ctx) => {+ const owner = await withWorkspaceOwner(req, ctx);+ if (owner instanceof Response) return owner;++ const [body, err] = await parseBody(req, UpdateWorkspaceRequestSchema);+ if (err) return err;++ if (!body.name && !body.slug) return writeError("at least one of name or slug is required", 400);++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ try {+ const updated = await queries.workspace.updateWorkspace(db, owner.workspaceId, body);+ if (!updated) return writeError("workspace not found", 404);+ return writeJSON(workspaceToResponse(updated));+ } catch (err: unknown) {+ if (isUniqueConstraintError(err)) return writeError("slug already in use", 409);+ throw err;+ }+});++export const DELETE = withAuth(async (req: NextRequest, ctx) => {+ const owner = await withWorkspaceOwner(req, ctx);+ if (owner instanceof Response) return owner;++ const [body, err] = await parseBody(req, DeleteWorkspaceRequestSchema);+ if (err) return err;++ const { env } = await getCloudflareContext({ async: true });+ const db = getDb((env as Env).DB);++ const ws = await queries.workspace.getWorkspace(db, owner.workspaceId, ctx.userId);+ if (!ws) return writeError("workspace not found", 404);+ if (ws.name !== body.confirm_name) return writeError("workspace name does not match", 400);++ await queries.workspace.deleteWorkspace(db, owner.workspaceId);+ return new Response(null, { status: 204 });+});diff --git a/src/web/src/components/agent-create-form.tsx b/src/web/src/components/agent-create-form.tsxnew file mode 100644index 000000000..39545787d--- /dev/null+++ b/src/web/src/components/agent-create-form.tsx@@ -0,0 +1,127 @@+"use client";++import { useState, useRef } from "react";+import { Button } from "@/components/ui/button";+import type { AgentRuntime as Runtime } from "@alook/shared";+import {+ GeneralFields,+ EmailHandleField,+ nameToHandle,+ getHandleError,+} from "@/components/agent-form-fields";+import {+ CustomEmailForm,+ type CustomEmailData,+} from "@/components/custom-email-form";+import { useWorkspace } from "@/contexts/workspace-context";++interface AgentCreateFormProps {+ runtimes: Runtime[];+ defaultRuntimeId?: string;+ modelOptions?: Record<string, string[]>;+ onSave: (data: {+ name: string;+ description: string;+ instructions: string;+ runtime_id: string;+ email_handle?: string;+ runtime_config?: Record<string, unknown>;+ custom_email?: CustomEmailData;+ }) => Promise<boolean>;+ onCancel: () => void;+ saving: boolean;+}++export function AgentCreateForm({+ runtimes,+ defaultRuntimeId = "",+ modelOptions,+ onSave,+ onCancel,+ saving,+}: AgentCreateFormProps) {+ const { workspaceId } = useWorkspace();+ const [name, setName] = useState("");+ const [description, setDescription] = useState("");+ const [instructions, setInstructions] = useState("");+ const [runtimeId, setRuntimeId] = useState(defaultRuntimeId);+ const [emailHandle, setEmailHandle] = useState("");+ const [customEmailData, setCustomEmailData] =+ useState<CustomEmailData | null>(null);+ const customEmailGetDataRef = useRef<(() => CustomEmailData | null) | null>(+ null+ );+ const [model, setModel] = useState("");++ const selectedRuntime = runtimes.find((r) => r.id === runtimeId);+ const providerModels =+ selectedRuntime && modelOptions+ ? (modelOptions[selectedRuntime.provider] ?? [])+ : [];++ const derivedHandle = nameToHandle(name);+ const effectiveHandle = emailHandle || derivedHandle;+ const handleError = getHandleError(effectiveHandle);++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault();+ await onSave({+ name,+ description,+ instructions,+ runtime_id: runtimeId,+ email_handle: emailHandle || derivedHandle || undefined,+ runtime_config: model ? { model } : {},+ custom_email:+ customEmailGetDataRef.current?.() ?? customEmailData ?? undefined,+ });+ };++ return (+ <div className="flex-1 min-h-0 overflow-y-auto thin-scrollbar px-5 py-6">+ <form onSubmit={handleSubmit} className="mx-auto max-w-md space-y-4">+ <GeneralFields+ name={name}+ setName={setName}+ description={description}+ setDescription={setDescription}+ instructions={instructions}+ setInstructions={setInstructions}+ model={model}+ setModel={setModel}+ runtimeId={runtimeId}+ setRuntimeId={setRuntimeId}+ runtimes={runtimes}+ providerModels={providerModels}+ />++ <div className="border-t border-border/50 pt-4 mt-4 space-y-4">+ <EmailHandleField+ emailHandle={emailHandle}+ setEmailHandle={setEmailHandle}+ derivedHandle={derivedHandle}+ />++ <CustomEmailForm+ workspaceId={workspaceId}+ onDataChange={setCustomEmailData}+ getDataRef={customEmailGetDataRef}+ />+ </div>++ <div className="flex items-center gap-2 pt-2">+ <Button type="button" variant="ghost" size="sm" onClick={onCancel}>+ Cancel+ </Button>+ <Button+ type="submit"+ size="sm"+ disabled={saving || !name || !!handleError}+ >+ {saving ? "Creating..." : "Create"}+ </Button>+ </div>+ </form>+ </div>+ );+}diff --git a/src/web/src/components/agent-edit-form.tsx b/src/web/src/components/agent-edit-form.tsxindex f741342a7..e5a611f6d 100644--- a/src/web/src/components/agent-edit-form.tsx+++ b/src/web/src/components/agent-edit-form.tsx@@ -1,107 +1,60 @@"use client";-import { useState, useEffect, useRef } from "react";+import { useState } from "react";import { Button } from "@/components/ui/button";-import { Input } from "@/components/ui/input";-import { Label } from "@/components/ui/label";-import { Textarea } from "@/components/ui/textarea";-import {- Sheet,- SheetTrigger,- SheetContent,- SheetTitle,- SheetBody,-} from "@/components/ui/sheet";-import { RuntimeSelect } from "@/components/runtime-select";+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";import type { Agent } from "@alook/shared";-import { isValidHandle } from "@alook/shared";import type { AgentRuntime as Runtime } from "@alook/shared";import { cn } from "@/lib/utils";-import { LockIcon, XIcon, ChevronRightIcon } from "lucide-react";-import { useWorkspace } from "@/contexts/workspace-context";-import { CustomEmailForm, type CustomEmailData } from "@/components/custom-email-form";+import { LockIcon } from "lucide-react";+import { CustomEmailForm } from "@/components/custom-email-form";import {- listWhitelist,- addWhitelistEmail,- removeWhitelistEmail,- type WhitelistEntry,-} from "@/lib/api";--function nameToHandle(name: string): string {- return name- .toLowerCase()- .replace(/[^a-z0-9-]/g, "-")- .replace(/-{2,}/g, "-")- .replace(/^-|-$/g, "");-}+ GeneralFields,+ PinToggle,+ AllowedSendersTab,+ AgentAccessTab,+} from "@/components/agent-form-fields";interface AgentEditFormProps {- agent?: Agent;+ agent: Agent;runtimes: Runtime[];- defaultRuntimeId?: string;modelOptions?: Record<string, string[]>;onSave: (data: {name: string;description: string;instructions: string;runtime_id: string;- email_handle?: string;runtime_config?: Record<string, unknown>;- custom_email?: CustomEmailData;}) => Promise<boolean>;onCancel: () => void;saving: boolean;- submitLabel?: string;- savingLabel?: string;}-const TABS = [- { id: "general", label: "General" },- { id: "email", label: "Email" },-] as const;--type TabId = (typeof TABS)[number]["id"];+type TabId = "general" | "email" | "senders" | "access";export function AgentEditForm({agent,runtimes,- defaultRuntimeId = "",modelOptions,onSave,onCancel,saving,- submitLabel = "Save",- savingLabel = "Saving...",}: AgentEditFormProps) {- const { workspaceId } = useWorkspace();const [activeTab, setActiveTab] = useState<TabId>("general");- const [name, setName] = useState(agent?.name ?? "");- const [description, setDescription] = useState(agent?.description ?? "");- const [instructions, setInstructions] = useState(agent?.instructions ?? "");- const [runtimeId, setRuntimeId] = useState(- agent?.runtime_id ?? defaultRuntimeId- );- const [emailHandle, setEmailHandle] = useState(agent?.email_handle ?? "");- const [customEmailData, setCustomEmailData] = useState<CustomEmailData | null>(null);- const customEmailGetDataRef = useRef<(() => CustomEmailData | null) | null>(null);- const [model, setModel] = useState(- () => {- const rc = agent?.runtime_config;- return typeof rc?.model === "string" ? rc.model : "";- }- );+ const [name, setName] = useState(agent.name ?? "");+ const [description, setDescription] = useState(agent.description ?? "");+ const [instructions, setInstructions] = useState(agent.instructions ?? "");+ const [runtimeId, setRuntimeId] = useState(agent.runtime_id ?? "");+ const [model, setModel] = useState(() => {+ const rc = agent.runtime_config;+ return typeof rc?.model === "string" ? rc.model : "";+ });const selectedRuntime = runtimes.find((r) => r.id === runtimeId);- const providerModels = selectedRuntime && modelOptions- ? modelOptions[selectedRuntime.provider] ?? []- : [];-- const derivedHandle = nameToHandle(name);- const effectiveHandle = emailHandle || derivedHandle;- const handleError =- effectiveHandle && !isValidHandle(effectiveHandle)- ? "Must be 3+ characters, letters/numbers/hyphens only"- : "";+ const providerModels =+ selectedRuntime && modelOptions+ ? (modelOptions[selectedRuntime.provider] ?? [])+ : [];const handleSubmit = async (e: React.FormEvent) => {e.preventDefault();@@ -110,16 +63,25 @@ export function AgentEditForm({description,instructions,runtime_id: runtimeId,- email_handle: emailHandle || derivedHandle || undefined,runtime_config: model ? { model } : {},- custom_email: customEmailGetDataRef.current?.() ?? customEmailData ?? undefined,});};+ const tabs: { id: TabId; label: string }[] = [+ { id: "general", label: "General" },+ { id: "email", label: "Email" },+ ...(agent.email_handle+ ? [{ id: "senders" as TabId, label: "Senders" }]+ : []),+ { id: "access", label: "Access" },+ ];++ const isFormTab = activeTab === "general" || activeTab === "email";+return (<div className="flex flex-1 min-h-0"><nav className="w-48 shrink-0 border-r border-border/50 py-3 px-2 hidden md:block">- {TABS.map((tab) => (+ {tabs.map((tab) => (<buttonkey={tab.id}type="button"@@ -137,344 +99,96 @@ export function AgentEditForm({</nav><div className="flex-1 min-w-0 flex flex-col">- <div className="flex items-center gap-1 border-b border-border/50 px-4 md:hidden">- {TABS.map((tab) => (- <button- key={tab.id}- type="button"- onClick={() => setActiveTab(tab.id)}- className={cn(- "relative px-3 py-2.5 text-sm transition-colors",- activeTab === tab.id- ? "text-foreground font-medium"- : "text-muted-foreground hover:text-foreground"- )}- >- {tab.label}- {activeTab === tab.id && (- <span className="absolute inset-x-3 -bottom-px h-px bg-foreground" />- )}- </button>- ))}+ <div className="px-4 pt-2 md:hidden">+ <Tabs+ value={activeTab}+ onValueChange={(v) => setActiveTab(v as TabId)}+ >+ <TabsList className="h-auto gap-1">+ {tabs.map((tab) => (+ <TabsTrigger key={tab.id} value={tab.id}>+ {tab.label}+ </TabsTrigger>+ ))}+ </TabsList>+ </Tabs></div><div className="flex-1 overflow-y-auto thin-scrollbar px-5 py-6">- <form onSubmit={handleSubmit} className="mx-auto max-w-md space-y-4">- {activeTab === "general" && (- <>- <div className="space-y-1.5">- <Label htmlFor="agent-name">Name</Label>- <Input- id="agent-name"- value={name}- onChange={(e) => setName(e.target.value)}- placeholder="My Agent"- required- />- </div>-- <div className="space-y-1.5">- <Label htmlFor="agent-description">Description</Label>- <Input- id="agent-description"- value={description}- onChange={(e) => setDescription(e.target.value)}- placeholder="What does this agent do?"- />- </div>-- <div className="space-y-1.5">- <Label htmlFor="agent-instructions">Instructions</Label>- <Textarea- id="agent-instructions"- value={instructions}- onChange={(e) => setInstructions(e.target.value)}- placeholder="System prompt or instructions..."- rows={6}- />- </div>-- <div className="space-y-1.5">- <Label htmlFor="agent-model">Model</Label>- <Input- id="agent-model"- value={model}- onChange={(e) => setModel(e.target.value)}- placeholder="Default (runtime model)"- list="agent-model-options"- />- {providerModels.length > 0 && (- <datalist id="agent-model-options">- {providerModels.map((m) => (- <option key={m} value={m} />- ))}- </datalist>- )}- <p className="text-xs text-muted-foreground/70">- Optional. Leave blank to use the runtime's default model.- </p>- </div>-- <div className="space-y-1.5">- <Label htmlFor="agent-runtime">Runtime</Label>- <RuntimeSelect- value={runtimeId}- onValueChange={(newId) => {- const oldProvider = runtimes.find((r) => r.id === runtimeId)?.provider;- const newProvider = runtimes.find((r) => r.id === newId)?.provider;- setRuntimeId(newId);- if (oldProvider && oldProvider !== newProvider) {- setModel("");- }- }}+ {isFormTab ? (+ <form+ onSubmit={handleSubmit}+ className="mx-auto max-w-md space-y-4"+ >+ {activeTab === "general" && (+ <>+ <GeneralFields+ name={name}+ setName={setName}+ description={description}+ setDescription={setDescription}+ instructions={instructions}+ setInstructions={setInstructions}+ model={model}+ setModel={setModel}+ runtimeId={runtimeId}+ setRuntimeId={setRuntimeId}runtimes={runtimes}+ providerModels={providerModels}/>- </div>- </>- )}-- {activeTab === "email" && (- <>- {!agent && (- <div className="space-y-1.5">- <Label htmlFor="agent-handle">Email Handle</Label>- <div className="flex items-center gap-0">- <Input- id="agent-handle"- value={emailHandle}- onChange={(e) => setEmailHandle(e.target.value.toLowerCase())}- placeholder={derivedHandle || "my-agent"}- className="rounded-r-none"- />- <span className="inline-flex h-8 items-center rounded-r-lg border border-l-0 border-input bg-muted px-2.5 text-sm text-muted-foreground">- @alook.ai- </span>- </div>- {effectiveHandle && (- <p className={cn(- "text-xs",- handleError ? "text-destructive" : "text-muted-foreground"- )}>- {handleError || `${effectiveHandle}@alook.ai`}- </p>- )}- <p className="text-xs text-muted-foreground/70">- This cannot be changed after creation.- </p>- </div>- )}-- {!agent && (- <CustomEmailForm- workspaceId={workspaceId}- onDataChange={setCustomEmailData}- getDataRef={customEmailGetDataRef}- />- )}+ <PinToggle agentId={agent.id} />+ </>+ )}- {agent && (+ {activeTab === "email" && (+ <><div className="rounded-lg border border-border/50 bg-muted/30 px-4 py-3"><div className="mb-2.5 flex items-center gap-1.5"><LockIcon className="size-3 text-muted-foreground/60" />- <span className="text-xs font-medium text-muted-foreground/60">Set at creation</span>+ <span className="text-xs font-medium text-muted-foreground/60">+ Set at creation+ </span></div><div className="flex items-center justify-between">- <span className="text-xs text-muted-foreground">Email</span><span className="text-xs text-muted-foreground">- {agent.email_handle ? `${agent.email_handle}@alook.ai` : "Not configured"}+ </span>+ <span className="text-xs text-muted-foreground">+ {agent.email_handle+ ? `${agent.email_handle}@alook.ai`+ : "Not configured"}</span></div></div>- )}-- {agent && agent.email_handle && (- <WhitelistTrigger agentId={agent.id} />- )}- {agent && (<CustomEmailFormagentId={agent.id}- workspaceId={workspaceId}+ workspaceId={agent.workspace_id}/>- )}- </>- )}+ </>+ )}- <div className="flex items-center gap-2 pt-2">- <Button- type="button"- variant="ghost"- size="sm"- onClick={onCancel}- >- Cancel- </Button>- <Button- type="submit"- size="sm"- disabled={saving || !name || !!handleError}- >- {saving ? savingLabel : submitLabel}- </Button>- </div>- </form>+ <div className="flex items-center gap-2 pt-2">+ <Button+ type="button"+ variant="ghost"+ size="sm"+ onClick={onCancel}+ >+ Cancel+ </Button>+ <Button type="submit" size="sm" disabled={saving || !name}>+ {saving ? "Saving..." : "Save"}+ </Button>+ </div>+ </form>+ ) : activeTab === "senders" ? (+ <AllowedSendersTab agentId={agent.id} />+ ) : (+ <AgentAccessTab agentId={agent.id} ownerId={agent.owner_id} />+ )}</div></div></div>);}--function WhitelistTrigger({ agentId }: { agentId: string }) {- const { workspaceId } = useWorkspace();- const [open, setOpen] = useState(false);- const [whitelist, setWhitelist] = useState<WhitelistEntry[]>([]);- const [newEmail, setNewEmail] = useState("");- const [loadingWhitelist, setLoadingWhitelist] = useState(true);- const [addingEmail, setAddingEmail] = useState(false);- const [error, setError] = useState<string | null>(null);-- useEffect(() => {- if (!open) return;- let cancelled = false;- setLoadingWhitelist(true);- listWhitelist(agentId, workspaceId)- .then((entries) => {- if (!cancelled) setWhitelist(entries);- })- .catch(() => {- if (!cancelled) setError("Failed to load whitelist");- })- .finally(() => {- if (!cancelled) setLoadingWhitelist(false);- });- return () => { cancelled = true; };- }, [agentId, workspaceId, open]);-- const isValidEmail = newEmail.includes("@") && newEmail.trim().length > 0;-- const handleAdd = async () => {- if (!isValidEmail || addingEmail) return;- setAddingEmail(true);- setError(null);- try {- const entry = await addWhitelistEmail(agentId, newEmail.toLowerCase(), workspaceId);- setWhitelist((prev) => [...prev, entry]);- setNewEmail("");- } catch (e: unknown) {- const msg = e instanceof Error ? e.message : "Failed to add email";- setError(msg);- } finally {- setAddingEmail(false);- }- };-- const handleRemove = async (entryId: string) => {- const prev = whitelist;- setWhitelist((wl) => wl.filter((w) => w.id !== entryId));- setError(null);- try {- await removeWhitelistEmail(agentId, entryId, workspaceId);- } catch {- setWhitelist(prev);- setError("Failed to remove email");- }- };-- return (- <Sheet open={open} onOpenChange={setOpen}>- <SheetTrigger- render={- <button- type="button"- className="flex w-full items-center justify-between rounded-lg border border-border/50 bg-muted/30 px-4 py-3 text-left transition-colors hover:bg-muted/50"- />- }- >- <div>- <span className="text-sm font-medium">Allowed Senders</span>- <p className="text-xs text-muted-foreground">- {whitelist.length > 0- ? `${whitelist.length} email${whitelist.length !== 1 ? "s" : ""} whitelisted`- : "All inbound emails will be rejected"}- </p>- </div>- <ChevronRightIcon className="size-4 text-muted-foreground" />- </SheetTrigger>- <SheetContent- side="right"- className="data-[side=right]:sm:inset-y-2 data-[side=right]:sm:right-2 data-[side=right]:sm:h-auto data-[side=right]:sm:rounded-xl data-[side=right]:sm:border"- >- <SheetTitle className="sr-only">Allowed Senders</SheetTitle>- <SheetBody className="px-8 pt-10 pb-6">- <div className="space-y-4">- <div>- <h2 className="font-heading text-lg font-semibold">Allowed Senders</h2>- <p className="text-sm text-muted-foreground mt-1">- Only emails from these addresses will trigger the agent.- </p>- </div>- <div className="flex items-center gap-2">- <Input- value={newEmail}- onChange={(e) => setNewEmail(e.target.value)}- onKeyDown={(e) => {- if (e.key === "Enter") {- e.preventDefault();- handleAdd();- }- }}- placeholder="[email protected]"- type="email"- className="flex-1"- />- <Button- type="button"- size="sm"- variant="secondary"- disabled={!isValidEmail || addingEmail}- onClick={handleAdd}- >- {addingEmail ? "Adding..." : "Add"}- </Button>- </div>- {error && (- <p className="text-xs text-destructive">{error}</p>- )}- {loadingWhitelist ? (- <div className="space-y-2">- {[1, 2, 3].map((i) => (- <span- key={i}- className="block h-8 animate-pulse rounded-md bg-muted"- />- ))}- </div>- ) : whitelist.length === 0 ? (- <p className="text-sm text-muted-foreground py-4 text-center">- No allowed senders — all inbound emails will be rejected.- </p>- ) : (- <div className="space-y-1.5">- {whitelist.map((entry) => (- <div- key={entry.id}- className="flex items-center justify-between rounded-md border border-border/50 px-3 py-2"- >- <span className="text-sm">{entry.email}</span>- <button- type="button"- onClick={() => handleRemove(entry.id)}- className="rounded-full p-1 text-muted-foreground hover:bg-destructive/10 hover:text-destructive transition-colors"- >- <XIcon className="size-3.5" />- </button>- </div>- ))}- </div>- )}- </div>- </SheetBody>- </SheetContent>- </Sheet>- );-}diff --git a/src/web/src/components/agent-form-fields.tsx b/src/web/src/components/agent-form-fields.tsxnew file mode 100644index 000000000..2bd9a0334--- /dev/null+++ b/src/web/src/components/agent-form-fields.tsx@@ -0,0 +1,735 @@+"use client";++import { useState, useEffect } from "react";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { Label } from "@/components/ui/label";+import { Textarea } from "@/components/ui/textarea";+import {+ Select,+ SelectTrigger,+ SelectValue,+ SelectPopup,+ SelectItem,+} from "@/components/ui/select";+import {+ Dialog,+ DialogContent,+ DialogHeader,+ DialogTitle,+ DialogDescription,+ DialogFooter,+ DialogClose,+} from "@/components/ui/dialog";+import { RuntimeSelect } from "@/components/runtime-select";+import type { Agent } from "@alook/shared";+import { isValidHandle } from "@alook/shared";+import type { AgentRuntime as Runtime } from "@alook/shared";+import { cn } from "@/lib/utils";+import { LockIcon, XIcon } from "lucide-react";+import { useWorkspace } from "@/contexts/workspace-context";+import {+ listWhitelist,+ addWhitelistEmail,+ removeWhitelistEmail,+ listAgentAccess,+ grantAgentAccess,+ revokeAgentAccess,+ listMembers,+ updateAgent as updateAgentApi,+ type WhitelistEntry,+ type AgentAccessEntry,+ type MemberEntry,+} from "@/lib/api";+import { useAgentContext } from "@/contexts/agent-context";+import { ApiError } from "@/lib/errors";+import { toast } from "sonner";++export function nameToHandle(name: string): string {+ return name+ .toLowerCase()+ .replace(/[^a-z0-9-]/g, "-")+ .replace(/-{2,}/g, "-")+ .replace(/^-|-$/g, "");+}++// --- General Fields ---++interface GeneralFieldsProps {+ name: string;+ setName: (v: string) => void;+ description: string;+ setDescription: (v: string) => void;+ instructions: string;+ setInstructions: (v: string) => void;+ model: string;+ setModel: (v: string) => void;+ runtimeId: string;+ setRuntimeId: (v: string) => void;+ runtimes: Runtime[];+ providerModels: string[];+}++export function GeneralFields({+ name,+ setName,+ description,+ setDescription,+ instructions,+ setInstructions,+ model,+ setModel,+ runtimeId,+ setRuntimeId,+ runtimes,+ providerModels,+}: GeneralFieldsProps) {+ return (+ <>+ <div className="space-y-1.5">+ <Label htmlFor="agent-name">Name</Label>+ <Input+ id="agent-name"+ value={name}+ onChange={(e) => setName(e.target.value)}+ placeholder="My Agent"+ required+ />+ </div>++ <div className="space-y-1.5">+ <Label htmlFor="agent-description">Description</Label>+ <Input+ id="agent-description"+ value={description}+ onChange={(e) => setDescription(e.target.value)}+ placeholder="What does this agent do?"+ />+ </div>++ <div className="space-y-1.5">+ <Label htmlFor="agent-instructions">Instructions</Label>+ <Textarea+ id="agent-instructions"+ value={instructions}+ onChange={(e) => setInstructions(e.target.value)}+ placeholder="System prompt or instructions..."+ rows={6}+ />+ </div>++ <div className="space-y-1.5">+ <Label htmlFor="agent-model">Model</Label>+ <Input+ id="agent-model"+ value={model}+ onChange={(e) => setModel(e.target.value)}+ placeholder="Default (runtime model)"+ list="agent-model-options"+ />+ {providerModels.length > 0 && (+ <datalist id="agent-model-options">+ {providerModels.map((m) => (+ <option key={m} value={m} />+ ))}+ </datalist>+ )}+ <p className="text-xs text-muted-foreground/70">+ Optional. Leave blank to use the runtime's default model.+ </p>+ </div>++ <div className="space-y-1.5">+ <Label htmlFor="agent-runtime">Runtime</Label>+ <RuntimeSelect+ value={runtimeId}+ onValueChange={(newId) => {+ const oldProvider = runtimes.find((r) => r.id === runtimeId)?.provider;+ const newProvider = runtimes.find((r) => r.id === newId)?.provider;+ setRuntimeId(newId);+ if (oldProvider && oldProvider !== newProvider) {+ setModel("");+ }+ }}+ runtimes={runtimes}+ />+ </div>+ </>+ );+}++// --- Email Handle Field ---++interface EmailHandleFieldProps {+ emailHandle: string;+ setEmailHandle: (v: string) => void;+ derivedHandle: string;+}++export function EmailHandleField({+ emailHandle,+ setEmailHandle,+ derivedHandle,+}: EmailHandleFieldProps) {+ const effectiveHandle = emailHandle || derivedHandle;+ const handleError =+ effectiveHandle && !isValidHandle(effectiveHandle)+ ? "Must be 3+ characters, letters/numbers/hyphens only"+ : "";++ return (+ <div className="space-y-1.5">+ <Label htmlFor="agent-handle">Email Handle</Label>+ <div className="flex items-center gap-0">+ <Input+ id="agent-handle"+ value={emailHandle}+ onChange={(e) => setEmailHandle(e.target.value.toLowerCase())}+ placeholder={derivedHandle || "my-agent"}+ className="rounded-r-none"+ />+ <span className="inline-flex h-8 items-center rounded-r-lg border border-l-0 border-input bg-muted px-2.5 text-sm text-muted-foreground">+ @alook.ai+ </span>+ </div>+ {effectiveHandle && (+ <p+ className={cn(+ "text-xs",+ handleError ? "text-destructive" : "text-muted-foreground"+ )}+ >+ {handleError || `${effectiveHandle}@alook.ai`}+ </p>+ )}+ <p className="text-xs text-muted-foreground/70">+ This cannot be changed after creation.+ </p>+ </div>+ );+}++export function getHandleError(effectiveHandle: string): string {+ if (effectiveHandle && !isValidHandle(effectiveHandle)) {+ return "Must be 3+ characters, letters/numbers/hyphens only";+ }+ return "";+}++// --- Pin Toggle ---++export function PinToggle({ agentId }: { agentId: string }) {+ const { pins, handlePinAgent, handleUnpinAgent } = useAgentContext();+ const isPinned = pins.has(agentId);+ const [toggling, setToggling] = useState(false);++ const handleToggle = async () => {+ setToggling(true);+ try {+ if (isPinned) {+ await handleUnpinAgent(agentId);+ } else {+ await handlePinAgent(agentId);+ }+ } finally {+ setToggling(false);+ }+ };++ return (+ <div className="space-y-4 rounded-lg border border-border/50 p-4">+ <div className="flex items-center justify-between">+ <div>+ <h3 className="text-sm font-medium">Pin to Sidebar</h3>+ <p className="text-xs text-muted-foreground mt-0.5">+ {isPinned+ ? "This agent is pinned to the top of the sidebar"+ : "Pin this agent to the top of the sidebar"}+ </p>+ </div>+ <label className="flex items-center gap-2 cursor-pointer">+ <span className="text-xs text-muted-foreground">+ {toggling ? "Saving…" : isPinned ? "Pinned" : "Unpinned"}+ </span>+ <input+ type="checkbox"+ checked={isPinned}+ onChange={handleToggle}+ disabled={toggling}+ className="sr-only peer"+ />+ <div className="relative w-9 h-5 bg-muted rounded-full peer-checked:bg-primary transition-colors">+ <div+ className={cn(+ "absolute left-0.5 top-0.5 w-4 h-4 bg-background rounded-full transition-transform",+ isPinned ? "translate-x-4" : "translate-x-0"+ )}+ />+ </div>+ </label>+ </div>+ <p className="text-xs text-muted-foreground/70">+ Tip: You can also right-click an agent in the sidebar to pin or unpin+ it.+ </p>+ </div>+ );+}++// --- Allowed Senders (inline tab content) ---++export function AllowedSendersTab({ agentId }: { agentId: string }) {+ const { workspaceId } = useWorkspace();+ const [whitelist, setWhitelist] = useState<WhitelistEntry[]>([]);+ const [newEmail, setNewEmail] = useState("");+ const [loading, setLoading] = useState(true);+ const [adding, setAdding] = useState(false);+ const [error, setError] = useState<string | null>(null);++ useEffect(() => {+ let cancelled = false;+ setLoading(true);+ listWhitelist(agentId, workspaceId)+ .then((entries) => {+ if (!cancelled) setWhitelist(entries);+ })+ .catch(() => {+ if (!cancelled) setError("Failed to load whitelist");+ })+ .finally(() => {+ if (!cancelled) setLoading(false);+ });+ return () => {+ cancelled = true;+ };+ }, [agentId, workspaceId]);++ const isValidEmail = newEmail.includes("@") && newEmail.trim().length > 0;++ const handleAdd = async () => {+ if (!isValidEmail || adding) return;+ setAdding(true);+ setError(null);+ try {+ const entry = await addWhitelistEmail(+ agentId,+ newEmail.toLowerCase(),+ workspaceId+ );+ setWhitelist((prev) => [...prev, entry]);+ setNewEmail("");+ } catch (e: unknown) {+ const msg = e instanceof Error ? e.message : "Failed to add email";+ setError(msg);+ } finally {+ setAdding(false);+ }+ };++ const handleRemove = async (entryId: string) => {+ const prev = whitelist;+ setWhitelist((wl) => wl.filter((w) => w.id !== entryId));+ setError(null);+ try {+ await removeWhitelistEmail(agentId, entryId, workspaceId);+ } catch {+ setWhitelist(prev);+ setError("Failed to remove email");+ }+ };++ return (+ <div className="mx-auto max-w-md space-y-4">+ <div>+ <h3 className="text-sm font-medium">Allowed Senders</h3>+ <p className="text-xs text-muted-foreground mt-1">+ Only emails from these addresses will trigger this agent. Applies to+ all configured email addresses (alook.ai handle and custom email).+ </p>+ </div>++ <div className="flex items-center gap-2">+ <Input+ value={newEmail}+ onChange={(e) => setNewEmail(e.target.value)}+ onKeyDown={(e) => {+ if (e.key === "Enter") {+ e.preventDefault();+ handleAdd();+ }+ }}+ placeholder="[email protected]"+ type="email"+ className="flex-1"+ />+ <Button+ type="button"+ size="sm"+ variant="secondary"+ disabled={!isValidEmail || adding}+ onClick={handleAdd}+ >+ {adding ? "Adding..." : "Add"}+ </Button>+ </div>++ {error && <p className="text-xs text-destructive">{error}</p>}++ {loading ? (+ <div className="space-y-2">+ {[1, 2, 3].map((i) => (+ <span+ key={i}+ className="block h-8 animate-pulse rounded-md bg-muted"+ />+ ))}+ </div>+ ) : whitelist.length === 0 ? (+ <p className="text-sm text-muted-foreground py-4 text-center">+ No allowed senders — all inbound emails will be rejected.+ </p>+ ) : (+ <div className="space-y-1.5">+ {whitelist.map((entry) => (+ <div+ key={entry.id}+ className="flex items-center justify-between rounded-md border border-border/50 px-3 py-2"+ >+ <span className="text-sm">{entry.email}</span>+ <button+ type="button"+ onClick={() => handleRemove(entry.id)}+ className="rounded-full p-1 text-muted-foreground hover:bg-destructive/10 hover:text-destructive transition-colors"+ >+ <XIcon className="size-3.5" />+ </button>+ </div>+ ))}+ </div>+ )}+ </div>+ );+}++// --- Agent Access Tab ---++export function AgentAccessTab({+ agentId,+ ownerId,+}: {+ agentId: string;+ ownerId: string | null;+}) {+ const { workspaceId } = useWorkspace();+ const [visibility, setVisibility] = useState<string>("private");+ const [savingVisibility, setSavingVisibility] = useState(false);+ const [accessList, setAccessList] = useState<AgentAccessEntry[]>([]);+ const [members, setMembers] = useState<MemberEntry[]>([]);+ const [loading, setLoading] = useState(true);+ const [error, setError] = useState<string | null>(null);+ const [selectedUserId, setSelectedUserId] = useState("");+ const [adding, setAdding] = useState(false);+ const [revokeTarget, setRevokeTarget] = useState<AgentAccessEntry | null>(+ null+ );+ const [removeWhitelist, setRemoveWhitelist] = useState(true);++ useEffect(() => {+ let cancelled = false;+ setLoading(true);+ Promise.all([+ listAgentAccess(workspaceId, agentId),+ listMembers(workspaceId),+ ])+ .then(([access, memberList]) => {+ if (!cancelled) {+ setAccessList(access);+ setMembers(memberList);+ }+ })+ .catch((e) => {+ if (cancelled) return;+ if (e instanceof ApiError && e.status === 403) {+ setError(e.message);+ } else {+ setError("Failed to load access list");+ }+ })+ .finally(() => {+ if (!cancelled) setLoading(false);+ });+ return () => {+ cancelled = true;+ };+ }, [workspaceId, agentId]);++ useEffect(() => {+ import("@/lib/api").then(({ listAgents }) => {+ listAgents(workspaceId)+ .then((agents) => {+ const ag = agents.find((a: { id: string }) => a.id === agentId);+ if (ag) setVisibility(ag.visibility ?? "private");+ })+ .catch(() => {});+ });+ }, [workspaceId, agentId]);++ const handleVisibilityChange = async (newVisibility: string) => {+ const prev = visibility;+ setVisibility(newVisibility);+ setSavingVisibility(true);+ try {+ await updateAgentApi(agentId, { visibility: newVisibility }, workspaceId);+ toast.success(+ newVisibility === "public"+ ? "Agent is now public"+ : "Agent is now private"+ );+ } catch {+ setVisibility(prev);+ toast.error("Failed to update visibility");+ } finally {+ setSavingVisibility(false);+ }+ };++ const ownerMember = members.find((m) => m.user_id === ownerId);+ const authorizedUserIds = new Set(accessList.map((e) => e.user_id));+ const availableMembers = members.filter(+ (m) => !authorizedUserIds.has(m.user_id) && m.user_id !== ownerId+ );++ const handleGrant = async (userId: string) => {+ if (!userId || adding) return;+ setAdding(true);+ setError(null);+ try {+ await grantAgentAccess(workspaceId, agentId, userId);+ const member = members.find((m) => m.user_id === userId);+ if (member) {+ setAccessList((prev) => [+ ...prev,+ {+ id: userId,+ user_id: member.user_id,+ name: member.name,+ email: member.email,+ created_at: new Date().toISOString(),+ },+ ]);+ }+ setSelectedUserId("");+ toast.success("Access granted");+ } catch (e: unknown) {+ setError(e instanceof Error ? e.message : "Failed to grant access");+ } finally {+ setAdding(false);+ }+ };++ const handleRevoke = (userId: string) => {+ const entry = accessList.find((e) => e.user_id === userId);+ if (entry) {+ setRevokeTarget(entry);+ setRemoveWhitelist(true);+ }+ };++ const confirmRevoke = async () => {+ if (!revokeTarget) return;+ const prev = accessList;+ setAccessList((list) =>+ list.filter((e) => e.user_id !== revokeTarget.user_id)+ );+ setRevokeTarget(null);+ setError(null);+ try {+ await revokeAgentAccess(+ workspaceId,+ agentId,+ revokeTarget.user_id,+ removeWhitelist+ );+ toast.success(+ removeWhitelist+ ? "Access revoked and removed from whitelist"+ : "Access revoked"+ );+ } catch {+ setAccessList(prev);+ setError("Failed to revoke access");+ }+ };++ return (+ <div className="mx-auto max-w-md space-y-6">+ <div className="space-y-4 rounded-lg border border-border/50 p-4">+ <div className="flex items-center justify-between">+ <div>+ <h3 className="text-sm font-medium">Visibility</h3>+ <p className="text-xs text-muted-foreground mt-0.5">+ {visibility === "public"+ ? "All workspace members can use this agent"+ : "Only authorized members can use this agent"}+ </p>+ </div>+ <label className="flex items-center gap-2 cursor-pointer">+ <span className="text-xs text-muted-foreground">+ {savingVisibility+ ? "Saving…"+ : visibility === "public"+ ? "Public"+ : "Private"}+ </span>+ <input+ type="checkbox"+ checked={visibility === "public"}+ onChange={(e) =>+ handleVisibilityChange(e.target.checked ? "public" : "private")+ }+ disabled={savingVisibility}+ className="sr-only peer"+ />+ <div className="relative w-9 h-5 bg-muted rounded-full peer-checked:bg-primary transition-colors">+ <div+ className={cn(+ "absolute left-0.5 top-0.5 w-4 h-4 bg-background rounded-full transition-transform",+ visibility === "public" ? "translate-x-4" : "translate-x-0"+ )}+ />+ </div>+ </label>+ </div>+ </div>++ {visibility === "private" && (+ <div className="space-y-3">+ <h3 className="text-sm font-medium">Authorized Members</h3>+ {error && <p className="text-xs text-destructive">{error}</p>}++ {loading ? (+ <div className="space-y-2">+ {[1, 2].map((i) => (+ <span+ key={i}+ className="block h-10 animate-pulse rounded-md bg-muted"+ />+ ))}+ </div>+ ) : (+ <>+ <div className="space-y-1.5">+ {ownerMember && (+ <div className="flex items-center justify-between rounded-md border border-border/50 px-3 py-2">+ <div className="min-w-0">+ <p className="text-xs font-medium truncate">+ {ownerMember.name || ownerMember.email}+ </p>+ {ownerMember.name && (+ <p className="text-xs text-muted-foreground truncate">+ {ownerMember.email}+ </p>+ )}+ </div>+ <span className="ml-2 shrink-0 text-xs text-muted-foreground">+ Owner+ </span>+ </div>+ )}+ {accessList.map((entry) => (+ <div+ key={entry.user_id}+ className="flex items-center justify-between rounded-md border border-border/50 px-3 py-2"+ >+ <div className="min-w-0">+ <p className="text-xs font-medium truncate">+ {entry.name || entry.email}+ </p>+ {entry.name && (+ <p className="text-xs text-muted-foreground truncate">+ {entry.email}+ </p>+ )}+ </div>+ <button+ type="button"+ onClick={() => handleRevoke(entry.user_id)}+ className="ml-2 shrink-0 rounded-full p-1 text-muted-foreground hover:bg-destructive/10 hover:text-destructive transition-colors"+ >+ <XIcon className="size-3.5" />+ </button>+ </div>+ ))}+ </div>++ {availableMembers.length > 0 ? (+ <div className="flex items-center gap-2">+ <Select+ value={selectedUserId}+ onValueChange={(val) => {+ if (!val) return;+ setSelectedUserId(val);+ handleGrant(val);+ }}+ >+ <SelectTrigger className="flex-1 text-xs">+ <SelectValue placeholder="Add a member..." />+ </SelectTrigger>+ <SelectPopup>+ {availableMembers.map((m) => (+ <SelectItem key={m.user_id} value={m.user_id}>+ {m.name || m.email}+ </SelectItem>+ ))}+ </SelectPopup>+ </Select>+ </div>+ ) : (+ <p className="text-xs text-muted-foreground">+ All workspace members have been added. Invite new members from workspace settings.+ </p>+ )}+ </>+ )}+ </div>+ )}++ <Dialog+ open={!!revokeTarget}+ onOpenChange={(open) => {+ if (!open) setRevokeTarget(null);+ }}+ >+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Remove Member Access</DialogTitle>+ <DialogDescription>+ Remove{" "}+ <span className="font-medium text-foreground">+ {revokeTarget?.name || revokeTarget?.email}+ </span>{" "}+ from this agent?+ </DialogDescription>+ </DialogHeader>+ <label className="flex items-center gap-2 cursor-pointer px-1">+ <input+ type="checkbox"+ checked={removeWhitelist}+ onChange={(e) => setRemoveWhitelist(e.target.checked)}+ className="size-4 rounded border-border accent-primary"+ />+ <span className="text-sm">Also remove from email whitelist</span>+ </label>+ <DialogFooter>+ <DialogClose render={<Button variant="outline" size="sm" />}>+ Cancel+ </DialogClose>+ <Button size="sm" variant="destructive" onClick={confirmRevoke}>+ Remove+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ </div>+ );+}diff --git a/src/web/src/components/app-sidebar.tsx b/src/web/src/components/app-sidebar.tsxindex 7cd335cb3..783400c66 100644--- a/src/web/src/components/app-sidebar.tsx+++ b/src/web/src/components/app-sidebar.tsx@@ -5,21 +5,33 @@ import { useAgentContext } from "@/contexts/agent-context";import { useWorkspace } from "@/contexts/workspace-context";import { Logo } from "@/components/logo";import { cn } from "@/lib/utils";-import { Monitor, SunMoon, Plus, LayoutGrid, CalendarDays, Settings } from "lucide-react";+import { Monitor, SunMoon, Plus, LayoutGrid, CalendarDays, Settings, PinIcon, PinOffIcon } from "lucide-react";import { Skeleton } from "@/components/ui/skeleton";import { useTheme } from "next-themes";import { NavUser } from "@/components/nav-user";+import {+ ContextMenu,+ ContextMenuTrigger,+ ContextMenuContent,+ ContextMenuItem,+} from "@/components/ui/context-menu";export function AppSidebar({ onNavigate }: { onNavigate?: () => void } = {}) {const router = useRouter();const pathname = usePathname();const searchParams = useSearchParams();- const { agents, loading } = useAgentContext();+ const { agents, loading, pins, handlePinAgent, handleUnpinAgent } = useAgentContext();const { slug } = useWorkspace();const { resolvedTheme, setTheme } = useTheme();const { activeTaskCounts: taskCounts } = useAgentContext();- const sorted = [...agents].sort((a, b) => a.name.localeCompare(b.name));++ const pinned = agents+ .filter((a) => pins.has(a.id))+ .sort((a, b) => (pins.get(a.id)! < pins.get(b.id)! ? -1 : 1));+ const unpinned = agents+ .filter((a) => !pins.has(a.id))+ .sort((a, b) => a.name.localeCompare(b.name));const prefix = `/w/${slug}`;const isRuntimes = pathname === `${prefix}/runtimes`;@@ -37,6 +49,48 @@ export function AppSidebar({ onNavigate }: { onNavigate?: () => void } = {}) {onNavigate?.();};+ const renderAgentButton = (agent: typeof agents[number]) => {+ const isActive = activeAgentId === agent.id;+ const isPinned = pins.has(agent.id);+ return (+ <ContextMenu key={agent.id}>+ <ContextMenuTrigger+ render={+ <button+ type="button"+ title={agent.name}+ onClick={() => handleAgentClick(agent.id)}+ className={cn(+ "relative flex shrink-0 items-center justify-center size-10 rounded-xl text-sm font-medium transition-colors duration-200 cursor-pointer",+ isActive+ ? "bg-primary text-primary-foreground shadow-sm"+ : "bg-secondary text-secondary-foreground hover:bg-accent"+ )}+ />+ }+ >+ {agent.name.charAt(0).toUpperCase()}+ {(taskCounts[agent.id] ?? 0) > 0 && (+ <span className="absolute bottom-0 right-0 size-2 rounded-full bg-status-online animate-pulse ring-2 ring-background" />+ )}+ </ContextMenuTrigger>+ <ContextMenuContent>+ {isPinned ? (+ <ContextMenuItem onClick={() => handleUnpinAgent(agent.id)}>+ <PinOffIcon className="size-3.5 mr-1.5" />+ Unpin+ </ContextMenuItem>+ ) : (+ <ContextMenuItem onClick={() => handlePinAgent(agent.id)}>+ <PinIcon className="size-3.5 mr-1.5" />+ Pin to top+ </ContextMenuItem>+ )}+ </ContextMenuContent>+ </ContextMenu>+ );+ };+return (<nav className="flex h-full w-14 flex-col items-center py-2 gap-0.5">{/* Top — logo */}@@ -51,28 +105,13 @@ export function AppSidebar({ onNavigate }: { onNavigate?: () => void } = {}) {{loading ? (<Skeleton className="size-10 rounded-xl" />) : (- sorted.map((agent) => {- const isActive = activeAgentId === agent.id;- return (- <button- key={agent.id}- type="button"- title={agent.name}- onClick={() => handleAgentClick(agent.id)}- className={cn(- "relative flex shrink-0 items-center justify-center size-10 rounded-xl text-sm font-medium transition-colors duration-200 cursor-pointer",- isActive- ? "bg-primary text-primary-foreground shadow-sm"- : "bg-secondary text-secondary-foreground hover:bg-accent"- )}- >- {agent.name.charAt(0).toUpperCase()}- {(taskCounts[agent.id] ?? 0) > 0 && (- <span className="absolute bottom-0 right-0 size-2 rounded-full bg-status-online animate-pulse ring-2 ring-background" />- )}- </button>- );- })+ <>+ {pinned.map(renderAgentButton)}+ {pinned.length > 0 && unpinned.length > 0 && (+ <div className="w-6 border-t border-border/50" />+ )}+ {unpinned.map(renderAgentButton)}+ </>)}{/* Create agent */}diff --git a/src/web/src/components/ui/context-menu.tsx b/src/web/src/components/ui/context-menu.tsxnew file mode 100644index 000000000..2be613811--- /dev/null+++ b/src/web/src/components/ui/context-menu.tsx@@ -0,0 +1,71 @@+"use client"++import * as React from "react"+import { ContextMenu as ContextMenuPrimitive } from "@base-ui/react/context-menu"++import { cn } from "@/lib/utils"++function ContextMenu({ ...props }: ContextMenuPrimitive.Root.Props) {+ return <ContextMenuPrimitive.Root data-slot="context-menu" {...props} />+}++function ContextMenuTrigger({ ...props }: ContextMenuPrimitive.Trigger.Props) {+ return <ContextMenuPrimitive.Trigger data-slot="context-menu-trigger" {...props} />+}++function ContextMenuContent({+ className,+ ...props+}: ContextMenuPrimitive.Popup.Props) {+ return (+ <ContextMenuPrimitive.Portal>+ <ContextMenuPrimitive.Positioner className="isolate z-50 outline-none">+ <ContextMenuPrimitive.Popup+ data-slot="context-menu-content"+ className={cn(+ "z-50 max-h-(--available-height) min-w-32 origin-(--transform-origin) overflow-x-hidden overflow-y-auto rounded-lg bg-popover p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 outline-none data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",+ className+ )}+ {...props}+ />+ </ContextMenuPrimitive.Positioner>+ </ContextMenuPrimitive.Portal>+ )+}++function ContextMenuItem({+ className,+ ...props+}: ContextMenuPrimitive.Item.Props) {+ return (+ <ContextMenuPrimitive.Item+ data-slot="context-menu-item"+ className={cn(+ "relative flex cursor-default items-center gap-1.5 rounded-md px-1.5 py-1 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",+ className+ )}+ {...props}+ />+ )+}++function ContextMenuSeparator({+ className,+ ...props+}: React.ComponentProps<"hr">) {+ return (+ <hr+ data-slot="context-menu-separator"+ className={cn("-mx-1 my-1 h-px border-0 bg-border", className)}+ {...props}+ />+ )+}++export {+ ContextMenu,+ ContextMenuTrigger,+ ContextMenuContent,+ ContextMenuItem,+ ContextMenuSeparator,+}diff --git a/src/web/src/contexts/agent-context.tsx b/src/web/src/contexts/agent-context.tsxindex 8935a3fe4..76758072b 100644--- a/src/web/src/contexts/agent-context.tsx+++ b/src/web/src/contexts/agent-context.tsx@@ -18,6 +18,10 @@ import {createMachineToken,deleteMachine,listAgentActiveTaskCounts,+ listAgentPins,+ pinAgent as pinAgentApi,+ unpinAgent as unpinAgentApi,+ type AgentPin,} from "@/lib/api";import type { AgentRuntime as Runtime } from "@alook/shared";import { toast } from "sonner";@@ -37,11 +41,14 @@ interface AgentContextValue {runtimes: Runtime[];loading: boolean;activeTaskCounts: Record<string, number>;+ pins: Map<string, string>;reload: () => Promise<void>;subscribeWs: (fn: WsSubscriber) => () => void;handleCreateAgent: (req: CreateAgentRequest) => Promise<Agent | null>;handleUpdateAgent: (id: string, req: UpdateAgentRequest) => Promise<boolean>;handleDeleteAgent: (id: string) => Promise<boolean>;+ handlePinAgent: (agentId: string) => Promise<void>;+ handleUnpinAgent: (agentId: string) => Promise<void>;getFirstOnlineRuntimeId: () => string;handleGenerateToken: () => Promise<string | null>;handleDeleteMachine: (daemonId: string) => Promise<boolean>;@@ -66,6 +73,7 @@ export function AgentProvider({const [runtimes, setRuntimes] = useState<Runtime[]>([]);const [loading, setLoading] = useState(true);const [activeTaskCounts, setActiveTaskCounts] = useState<Record<string, number>>({});+ const [pins, setPins] = useState<Map<string, string>>(new Map());const loadedRef = useRef(false);const subscribersRef = useRef(new Set<WsSubscriber>());const taskCountsMountedRef = useRef(true);@@ -96,12 +104,14 @@ export function AgentProvider({const reload = useCallback(async () => {try {- const [a, r] = await Promise.all([+ const [a, r, p] = await Promise.all([listAgents(workspaceId),listRuntimes(workspaceId),+ listAgentPins(workspaceId),]);setAgents(a);setRuntimes(r);+ setPins(new Map(p.map((pin) => [pin.agent_id, pin.created_at])));} catch (err) {toast.error(err instanceof Error ? err.message : "Failed to load data");} finally {@@ -209,6 +219,27 @@ export function AgentProvider({[reload, workspaceId]);+ const handlePinAgent = useCallback(async (agentId: string) => {+ setPins((prev) => new Map(prev).set(agentId, new Date().toISOString()));+ try {+ await pinAgentApi(workspaceId, agentId);+ } catch {+ setPins((prev) => { const next = new Map(prev); next.delete(agentId); return next; });+ toast.error("Failed to pin agent");+ }+ }, [workspaceId]);++ const handleUnpinAgent = useCallback(async (agentId: string) => {+ let savedValue: string | undefined;+ setPins((prev) => { savedValue = prev.get(agentId); const next = new Map(prev); next.delete(agentId); return next; });+ try {+ await unpinAgentApi(workspaceId, agentId);+ } catch {+ if (savedValue !== undefined) setPins((prev) => new Map(prev).set(agentId, savedValue!));+ toast.error("Failed to unpin agent");+ }+ }, [workspaceId]);+const getFirstOnlineRuntimeId = useCallback(() => {const first = runtimes.find((r) => r.status === "online");return first?.id ?? "";@@ -250,11 +281,14 @@ export function AgentProvider({runtimes,loading,activeTaskCounts,+ pins,reload,subscribeWs,handleCreateAgent,handleUpdateAgent,handleDeleteAgent,+ handlePinAgent,+ handleUnpinAgent,getFirstOnlineRuntimeId,handleGenerateToken,handleDeleteMachine,diff --git a/src/web/src/lib/api.ts b/src/web/src/lib/api.tsindex a5b608ec0..e425fa032 100644--- a/src/web/src/lib/api.ts+++ b/src/web/src/lib/api.ts@@ -559,3 +559,82 @@ export const verifyCode = (email: string, code: string) =>method: "POST",body: JSON.stringify({ email, otp: code }),});++// --- Workspace management ---++export const updateWorkspace = (workspaceId: string, data: { name?: string; slug?: string }) =>+ apiFetch<Workspace>(`/api/workspaces/${workspaceId}${wsQuery(workspaceId)}`, { method: "PATCH", body: JSON.stringify(data) });++export const deleteWorkspace = (workspaceId: string, confirmName: string) =>+ apiFetch<void>(`/api/workspaces/${workspaceId}${wsQuery(workspaceId)}`, { method: "DELETE", body: JSON.stringify({ confirm_name: confirmName }) });++// --- Members ---++export interface MemberEntry {+ id: string; user_id: string; role: string; name: string; email: string; image: string | null; created_at: string;+}++export const listMembers = (workspaceId: string) =>+ apiFetch<MemberEntry[]>(`/api/workspaces/${workspaceId}/members${wsQuery(workspaceId)}`);++export const removeMember = (workspaceId: string, memberId: string) =>+ apiFetch<void>(`/api/workspaces/${workspaceId}/members/${memberId}${wsQuery(workspaceId)}`, { method: "DELETE" });++// --- Invites ---++export interface InviteEntry {+ id: string; token: string; expires_at: string; created_at: string;+}++export const listInvites = (workspaceId: string) =>+ apiFetch<InviteEntry[]>(`/api/workspaces/${workspaceId}/invites${wsQuery(workspaceId)}`);++export const createInvite = (workspaceId: string) =>+ apiFetch<InviteEntry>(`/api/workspaces/${workspaceId}/invites${wsQuery(workspaceId)}`, { method: "POST" });++export const revokeInvite = (workspaceId: string, inviteId: string) =>+ apiFetch<void>(`/api/workspaces/${workspaceId}/invites/${inviteId}${wsQuery(workspaceId)}`, { method: "DELETE" });++// --- Invite accept ---++export interface InviteInfo {+ workspace_name: string; workspace_id: string; invited_by: string;+}++export interface InviteAcceptResult {+ workspace_id: string; workspace_slug: string;+}++export const getInviteInfo = (token: string) => apiFetch<InviteInfo>(`/api/invite/${token}`);+export const acceptInvite = (token: string) => apiFetch<InviteAcceptResult>(`/api/invite/${token}`, { method: "POST" });++// --- Agent access ---++export interface AgentAccessEntry {+ id: string; user_id: string; name: string; email: string; created_at: string;+}++export const listAgentAccess = (workspaceId: string, agentId: string) =>+ apiFetch<AgentAccessEntry[]>(`/api/agents/${agentId}/access${wsQuery(workspaceId)}`);++export const grantAgentAccess = (workspaceId: string, agentId: string, userId: string) =>+ apiFetch<{ id: string; user_id: string }>(`/api/agents/${agentId}/access${wsQuery(workspaceId)}`, { method: "POST", body: JSON.stringify({ user_id: userId }) });++export const revokeAgentAccess = (workspaceId: string, agentId: string, userId: string, removeWhitelist = false) =>+ apiFetch<void>(`/api/agents/${agentId}/access/${userId}${wsQuery(workspaceId)}${removeWhitelist ? "&remove_whitelist=true" : ""}`, { method: "DELETE" });++// Agent Pins+export interface AgentPin {+ id: string;+ agent_id: string;+ created_at: string;+}++export const listAgentPins = (workspaceId: string) =>+ apiFetch<AgentPin[]>(`/api/agents/pins${wsQuery(workspaceId)}`);++export const pinAgent = (workspaceId: string, agentId: string) =>+ apiFetch<{ pinned: boolean }>(`/api/agents/${agentId}/pin${wsQuery(workspaceId)}`, { method: "POST" });++export const unpinAgent = (workspaceId: string, agentId: string) =>+ apiFetch<void>(`/api/agents/${agentId}/pin${wsQuery(workspaceId)}`, { method: "DELETE" });diff --git a/src/web/src/lib/api/responses.test.ts b/src/web/src/lib/api/responses.test.tsindex 65964785b..7f98e7419 100644--- a/src/web/src/lib/api/responses.test.ts+++ b/src/web/src/lib/api/responses.test.ts@@ -331,8 +331,8 @@ describe("AgentResponse shape", () => {});expect(Object.keys(res).sort()).toEqual(["created_at", "description", "email_handle", "id", "instructions", "max_concurrent_tasks",- "name", "runtime_config", "runtime_id", "runtime_mode", "status",- "updated_at", "workspace_id",+ "name", "owner_id", "runtime_config", "runtime_id", "runtime_mode", "status",+ "updated_at", "visibility", "workspace_id",]);});});diff --git a/src/web/src/lib/api/responses.ts b/src/web/src/lib/api/responses.tsindex f78d3f0e7..28c130618 100644--- a/src/web/src/lib/api/responses.ts+++ b/src/web/src/lib/api/responses.ts@@ -42,6 +42,8 @@ export function agentToResponse(a: any) {status: a.status,max_concurrent_tasks: a.maxConcurrentTasks,email_handle: a.emailHandle || null,+ visibility: a.visibility ?? "private",+ owner_id: a.ownerId ?? null,created_at: formatTimestamp(a.createdAt),updated_at: formatTimestamp(a.updatedAt),};@@ -204,3 +206,41 @@ export function calendarEventToResponse(e: any) {updated_at: formatTimestamp(e.updatedAt),};}++export function memberToResponse(m: {+ id: string;+ userId: string;+ role: string;+ createdAt: string;+ userName: string;+ userEmail: string;+ userImage: string | null;+}) {+ return {+ id: m.id,+ user_id: m.userId,+ role: m.role,+ name: m.userName,+ email: m.userEmail,+ image: m.userImage,+ created_at: formatTimestamp(m.createdAt),+ };+}++export function inviteToResponse(inv: {+ id: string;+ token: string;+ createdBy: string;+ usedBy: string | null;+ expiresAt: string;+ createdAt: string;+}) {+ return {+ id: inv.id,+ token: inv.token,+ created_by: inv.createdBy,+ used_by: inv.usedBy,+ expires_at: formatTimestamp(inv.expiresAt),+ created_at: formatTimestamp(inv.createdAt),+ };+}diff --git a/src/web/src/lib/middleware/workspace.test.ts b/src/web/src/lib/middleware/workspace.test.tsindex a151d284b..d6ffb8339 100644--- a/src/web/src/lib/middleware/workspace.test.ts+++ b/src/web/src/lib/middleware/workspace.test.ts@@ -1,106 +1,79 @@import { describe, it, expect, vi, beforeEach } from "vitest";import { NextRequest, NextResponse } from "next/server";+const mockGetMemberByUserAndWorkspace = vi.fn();+vi.mock("@opennextjs/cloudflare", () => ({getCloudflareContext: vi.fn(async () => ({ env: { DB: {} } })),}));vi.mock("@/lib/db", () => ({ getDb: vi.fn(() => ({})) }));-vi.mock("@alook/shared", () => ({- createDb: vi.fn(() => ({})),- queries: {- member: {- getMemberByUserAndWorkspace: vi.fn(),+vi.mock("@alook/shared", async () => {+ const real = await vi.importActual<typeof import("@alook/shared")>("@alook/shared");+ return {+ ...real,+ queries: {+ member: {+ getMemberByUserAndWorkspace: (...args: unknown[]) => mockGetMemberByUserAndWorkspace(...args),+ },},- },-}));+ };+});-import { withWorkspaceMember } from "./workspace";-import { queries } from "@alook/shared";-import type { AuthContext } from "./auth";+import { withWorkspaceMember, withWorkspaceOwner } from "./workspace";-const mockGetMember = queries.member- .getMemberByUserAndWorkspace as ReturnType<typeof vi.fn>;+function makeReq(wsId?: string) {+ const url = wsId+ ? `http://localhost/api/test?workspace_id=${wsId}`+ : "http://localhost/api/test";+ return new NextRequest(url);+}++const auth = { userId: "u1", email: "[email protected]" };describe("withWorkspaceMember", () => {beforeEach(() => vi.clearAllMocks());- it("returns workspaceId from query param", async () => {- mockGetMember.mockResolvedValue({ id: "m1" });-- const req = new NextRequest("http://localhost/api/test?workspace_id=w1");- const auth: AuthContext = { userId: "u1", email: "[email protected]" };-- const result = await withWorkspaceMember(req, auth);- expect(result).toEqual({ workspaceId: "w1" });- expect(mockGetMember).toHaveBeenCalledWith({}, "u1", "w1");+ it("returns workspaceId and memberRole on success", async () => {+ mockGetMemberByUserAndWorkspace.mockResolvedValue({ role: "owner" });+ const result = await withWorkspaceMember(makeReq("w1"), auth);+ expect(result).toEqual({ workspaceId: "w1", memberRole: "owner" });});- it("returns workspaceId from X-Workspace-ID header", async () => {- mockGetMember.mockResolvedValue({ id: "m1" });-- const req = new NextRequest("http://localhost/api/test", {- headers: { "X-Workspace-ID": "w-header" },- });- const auth: AuthContext = { userId: "u1", email: "[email protected]" };-- const result = await withWorkspaceMember(req, auth);- expect(result).toEqual({ workspaceId: "w-header" });+ it("returns 400 when only params.id is available (not used as workspace fallback)", async () => {+ const result = await withWorkspaceMember(makeReq(), { ...auth, params: { id: "w2" } });+ expect(result).toBeInstanceOf(NextResponse);+ expect((result as NextResponse).status).toBe(400);});- it("returns workspaceId from auth context (machine token)", async () => {- mockGetMember.mockResolvedValue({ id: "m1" });-- const req = new NextRequest("http://localhost/api/test");- const auth: AuthContext = {- userId: "u1",- email: "[email protected]",- workspaceId: "w-auth",- };-- const result = await withWorkspaceMember(req, auth);- expect(result).toEqual({ workspaceId: "w-auth" });+ it("returns 400 when workspace_id missing", async () => {+ const result = await withWorkspaceMember(makeReq(), auth);+ expect(result).toBeInstanceOf(NextResponse);+ expect((result as NextResponse).status).toBe(400);});- it("returns 400 when no workspace_id provided", async () => {- const req = new NextRequest("http://localhost/api/test");- const auth: AuthContext = { userId: "u1", email: "[email protected]" };-- const result = await withWorkspaceMember(req, auth);+ it("returns 404 when not a member", async () => {+ mockGetMemberByUserAndWorkspace.mockResolvedValue(null);+ const result = await withWorkspaceMember(makeReq("w1"), auth);expect(result).toBeInstanceOf(NextResponse);-- const res = result as NextResponse;- const body = await res.json();- expect(res.status).toBe(400);- expect(body.error).toBe("workspace_id is required");+ expect((result as NextResponse).status).toBe(404);});+});- it("returns 404 when user is not a member", async () => {- mockGetMember.mockResolvedValue(null);-- const req = new NextRequest("http://localhost/api/test?workspace_id=w1");- const auth: AuthContext = { userId: "u1", email: "[email protected]" };-- const result = await withWorkspaceMember(req, auth);- expect(result).toBeInstanceOf(NextResponse);+describe("withWorkspaceOwner", () => {+ beforeEach(() => vi.clearAllMocks());- const res = result as NextResponse;- const body = await res.json();- expect(res.status).toBe(404);- expect(body.error).toBe("workspace not found");+ it("passes for owner", async () => {+ mockGetMemberByUserAndWorkspace.mockResolvedValue({ role: "owner" });+ const result = await withWorkspaceOwner(makeReq("w1"), auth);+ expect(result).toEqual({ workspaceId: "w1", memberRole: "owner" });});- it("returns 401 when userId is missing", async () => {- const req = new NextRequest("http://localhost/api/test?workspace_id=w1");- const auth: AuthContext = { userId: "", email: "[email protected]" };-- const result = await withWorkspaceMember(req, auth);+ it("returns 403 for member role", async () => {+ mockGetMemberByUserAndWorkspace.mockResolvedValue({ role: "member" });+ const result = await withWorkspaceOwner(makeReq("w1"), auth);expect(result).toBeInstanceOf(NextResponse);-- const res = result as NextResponse;- const body = await res.json();- expect(res.status).toBe(401);- expect(body.error).toBe("user not authenticated");+ expect((result as NextResponse).status).toBe(403);});});diff --git a/src/web/src/lib/middleware/workspace.ts b/src/web/src/lib/middleware/workspace.tsindex 89825117a..df792b8c2 100644--- a/src/web/src/lib/middleware/workspace.ts+++ b/src/web/src/lib/middleware/workspace.ts@@ -6,12 +6,13 @@ import type { AuthContext } from "./auth"export interface WorkspaceContext extends AuthContext {workspaceId: string+ memberRole: string}export async function withWorkspaceMember(req: NextRequest,- auth: AuthContext-): Promise<{ workspaceId: string } | NextResponse> {+ auth: AuthContext & { params?: Record<string, string> }+): Promise<{ workspaceId: string; memberRole: string } | NextResponse> {const workspaceId =req.nextUrl.searchParams.get("workspace_id") ||req.headers.get("X-Workspace-ID") ||@@ -46,5 +47,22 @@ export async function withWorkspaceMember()}- return { workspaceId }+ return { workspaceId, memberRole: membership.role }+}++export async function withWorkspaceOwner(+ req: NextRequest,+ auth: AuthContext & { params?: Record<string, string> }+): Promise<{ workspaceId: string; memberRole: string } | NextResponse> {+ const result = await withWorkspaceMember(req, auth)+ if (result instanceof NextResponse) return result++ if (result.memberRole !== "owner") {+ return NextResponse.json(+ { error: "owner access required" },+ { status: 403 }+ )+ }++ return result}diff --git a/src/web/src/test/e2e/agent-access.test.ts b/src/web/src/test/e2e/agent-access.test.tsnew file mode 100644index 000000000..33be9a190--- /dev/null+++ b/src/web/src/test/e2e/agent-access.test.ts@@ -0,0 +1,125 @@+import { describe, it, expect, beforeAll, afterAll } from "vitest"+import {+ seedTestData, cleanupTestData, type TestSeed,+ seedSecondaryUser, cleanupSecondaryUser, type SecondaryUser,+} from "../helpers/seed"+import { tokenRequest } from "../helpers/auth"++let seed: TestSeed+let secondary: SecondaryUser++beforeAll(() => {+ seed = seedTestData()+ secondary = seedSecondaryUser(seed.workspaceId, "member")+}, 60_000)++afterAll(() => {+ cleanupSecondaryUser(secondary)+ cleanupTestData(seed)+}, 60_000)++describe("agent access control", () => {+ it("GET /api/agents/:id/access returns empty list initially", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/access?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data).toEqual([])+ })++ it("POST /api/agents/:id/access grants access to secondary user", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/access?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ user_id: secondary.userId }),+ },+ )+ expect(res.status).toBe(201)+ const data = await res.json() as Record<string, unknown>+ expect(data.user_id).toBe(secondary.userId)+ })++ it("GET /api/agents/:id/access now includes the granted user", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/access?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data).toHaveLength(1)+ expect(data[0].user_id).toBe(secondary.userId)+ })++ it("POST /api/agents/:id/access also adds user email to whitelist", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/whitelist?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ const secondaryEmail = `${secondary.userId}@test.local`+ expect(data.some(w => w.email === secondaryEmail)).toBe(true)+ })++ it("DELETE /api/agents/:id/access/:userId revokes access", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/access/${secondary.userId}?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(204)+ })++ it("GET /api/agents/:id/access is empty after revoke", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/access?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data).toEqual([])+ })++ it("DELETE /api/agents/:id/access/:userId with remove_whitelist=true also removes whitelist", async () => {+ // Grant access again first+ await tokenRequest(+ `/api/agents/${seed.agentId}/access?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ user_id: secondary.userId }),+ },+ )++ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/access/${secondary.userId}?workspace_id=${seed.workspaceId}&remove_whitelist=true`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(204)++ // Verify whitelist entry removed+ const wlRes = await tokenRequest(+ `/api/agents/${seed.agentId}/whitelist?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ const wlData = await wlRes.json() as Array<Record<string, unknown>>+ const secondaryEmail = `${secondary.userId}@test.local`+ expect(wlData.some(w => w.email === secondaryEmail)).toBe(false)+ })++ it("DELETE /api/agents/:id/access/nonexistent returns 404", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/access/nonexistent?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(404)+ })+})diff --git a/src/web/src/test/e2e/agent-pin.test.ts b/src/web/src/test/e2e/agent-pin.test.tsnew file mode 100644index 000000000..28cb50993--- /dev/null+++ b/src/web/src/test/e2e/agent-pin.test.ts@@ -0,0 +1,95 @@+import { describe, it, expect, beforeAll, afterAll } from "vitest"+import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"+import { tokenRequest } from "../helpers/auth"++let seed: TestSeed++beforeAll(() => {+ seed = seedTestData()+}, 60_000)++afterAll(() => {+ cleanupTestData(seed)+}, 60_000)++describe("agent pin", () => {+ it("GET /api/agents/pins returns empty list initially", async () => {+ const res = await tokenRequest(+ `/api/agents/pins?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data).toEqual([])+ })++ it("POST /api/agents/:id/pin pins an agent", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/pin?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ { method: "POST" },+ )+ expect(res.status).toBe(201)+ const data = await res.json() as Record<string, unknown>+ expect(data.pinned).toBe(true)+ })++ it("POST /api/agents/:id/pin again returns 200 (already pinned)", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/pin?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ { method: "POST" },+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Record<string, unknown>+ expect(data.pinned).toBe(true)+ })++ it("GET /api/agents/pins returns the pinned agent", async () => {+ const res = await tokenRequest(+ `/api/agents/pins?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data).toHaveLength(1)+ expect(data[0].agent_id).toBe(seed.agentId)+ })++ it("DELETE /api/agents/:id/pin unpins the agent", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/pin?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(204)+ })++ it("GET /api/agents/pins returns empty after unpin", async () => {+ const res = await tokenRequest(+ `/api/agents/pins?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data).toEqual([])+ })++ it("DELETE /api/agents/:id/pin is idempotent (unpin again)", async () => {+ const res = await tokenRequest(+ `/api/agents/${seed.agentId}/pin?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(204)+ })++ it("POST /api/agents/:id/pin returns 404 for nonexistent agent", async () => {+ const res = await tokenRequest(+ `/api/agents/nonexistent/pin?workspace_id=${seed.workspaceId}`,+ seed.machineToken,+ { method: "POST" },+ )+ expect(res.status).toBe(404)+ })+})diff --git a/src/web/src/test/e2e/email.test.ts b/src/web/src/test/e2e/email.test.tsindex a8557d2f5..b2beebe04 100644--- a/src/web/src/test/e2e/email.test.ts+++ b/src/web/src/test/e2e/email.test.ts@@ -163,17 +163,17 @@ describe("email threading (inbound)", () => {})})-// ─── Rejected folder ───+// ─── Folder filtering ───-describe("email folder: rejected", () => {- it("GET /api/email?folder=rejected returns only non-whitelisted emails", async () => {+describe("email folder filtering", () => {+ it("GET /api/email?folder=untrust returns only non-whitelisted inbound emails", async () => {const agentEmail = `${seed.agentEmailHandle}@alook.ai`const now = new Date().toISOString()const rejId = `erej_${randomUUID().slice(0, 8)}`- sql(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES ('${rejId}', '${seed.agentId}', '${seed.workspaceId}', '[email protected]', '${agentEmail}', 'Rejected folder test', 'emails/fake-rej/raw', 0, 0, '', '', '', '${now}')`)+ sql(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES ('${rejId}', '${seed.agentId}', '${seed.workspaceId}', '[email protected]', '${agentEmail}', 'Untrust folder test', 'emails/fake-rej/raw', 0, 0, '', '', '', '${now}')`)const res = await tokenRequest(- `/api/email?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}&folder=rejected`,+ `/api/email?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}&folder=untrust`,seed.machineToken,)expect(res.status).toBe(200)@@ -185,8 +185,7 @@ describe("email folder: rejected", () => {}})- it("GET /api/email?folder=rejected excludes sent emails", async () => {- // Send an outgoing email (creates a record with is_whitelisted=false)+ it("GET /api/email?folder=untrust excludes sent emails", async () => {await tokenRequest(`/api/email/send?workspace_id=${seed.workspaceId}`,seed.machineToken,@@ -203,7 +202,7 @@ describe("email folder: rejected", () => {)const res = await tokenRequest(- `/api/email?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}&folder=rejected`,+ `/api/email?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}&folder=untrust`,seed.machineToken,)expect(res.status).toBe(200)@@ -215,15 +214,16 @@ describe("email folder: rejected", () => {}})- it("GET /api/email?folder=inbox returns only whitelisted emails", async () => {+ it("GET /api/email?folder=inbox returns only whitelisted inbound emails", async () => {const res = await tokenRequest(`/api/email?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}&folder=inbox`,seed.machineToken,)expect(res.status).toBe(200)- const emails = await res.json() as { is_whitelisted: boolean }[]+ const emails = await res.json() as { direction: string; is_whitelisted: boolean }[]for (const email of emails) {+ expect(email.direction).toBe("inbound")expect(email.is_whitelisted).toBe(true)}})@@ -260,7 +260,7 @@ describe("email send (outbound)", () => {// Create a temporary agent without emailHandleconst tmpAgentId = `ag_tmp_${Date.now()}`const now = new Date().toISOString()- sql(`INSERT INTO agent (id, workspace_id, name, runtime_id, created_at, updated_at) VALUES ('${tmpAgentId}', '${seed.workspaceId}', 'No Handle Agent', '${seed.runtimeId}', '${now}', '${now}')`)+ sql(`INSERT INTO agent (id, workspace_id, name, runtime_id, owner_id, created_at, updated_at) VALUES ('${tmpAgentId}', '${seed.workspaceId}', 'No Handle Agent', '${seed.runtimeId}', '${seed.userId}', '${now}', '${now}')`)try {const res = await tokenRequest(diff --git a/src/web/src/test/e2e/workspace-invites.test.ts b/src/web/src/test/e2e/workspace-invites.test.tsnew file mode 100644index 000000000..eb563da99--- /dev/null+++ b/src/web/src/test/e2e/workspace-invites.test.ts@@ -0,0 +1,116 @@+import { describe, it, expect, beforeAll, afterAll } from "vitest"+import { randomUUID } from "crypto"+import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"+import { signUp, signIn, sessionRequest, tokenRequest } from "../helpers/auth"+import { sql } from "../helpers/db"++let seed: TestSeed++const inviteeEmail = `e2e_invitee_${randomUUID().slice(0, 8)}@test.local`+const inviteePassword = "TestPassword123!"+let inviteeCookie: string++beforeAll(async () => {+ seed = seedTestData()+ await signUp(inviteeEmail, inviteePassword, "Invitee User")+ inviteeCookie = await signIn(inviteeEmail, inviteePassword)+}, 60_000)++afterAll(() => {+ cleanupTestData(seed)+ try {+ sql(`DELETE FROM member WHERE user_id IN (SELECT id FROM "user" WHERE email = '${inviteeEmail}')`)+ sql(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = '${inviteeEmail}')`)+ sql(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = '${inviteeEmail}')`)+ sql(`DELETE FROM "user" WHERE email = '${inviteeEmail}'`)+ } catch { /* ignore */ }+}, 60_000)++describe("workspace invite flow", () => {+ let inviteToken: string+ let inviteId: string++ it("POST /api/workspaces/:id/invites creates an invite (owner)", async () => {+ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/invites`,+ seed.machineToken,+ { method: "POST" },+ )+ expect(res.status).toBe(201)+ const data = await res.json() as Record<string, unknown>+ expect(data.token).toBeTruthy()+ expect(data.id).toBeTruthy()+ inviteToken = data.token as string+ inviteId = data.id as string+ })++ it("GET /api/workspaces/:id/invites lists active invites", async () => {+ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/invites`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data.some(i => i.id === inviteId)).toBe(true)+ })++ it("GET /api/invite/:token returns invite details", async () => {+ const res = await sessionRequest(`/api/invite/${inviteToken}`, inviteeCookie)+ expect(res.status).toBe(200)+ const data = await res.json() as Record<string, unknown>+ expect(data.workspace_id).toBe(seed.workspaceId)+ expect(data.workspace_name).toBeTruthy()+ })++ it("POST /api/invite/:token accepts invite and creates membership", async () => {+ const res = await sessionRequest(`/api/invite/${inviteToken}`, inviteeCookie, {+ method: "POST",+ })+ expect(res.status).toBe(200)+ const data = await res.json() as Record<string, unknown>+ expect(data.workspace_id).toBe(seed.workspaceId)+ })++ it("POST /api/invite/:token again returns 410 (already used)", async () => {+ const res = await sessionRequest(`/api/invite/${inviteToken}`, inviteeCookie, {+ method: "POST",+ })+ expect(res.status).toBe(410)+ })++ it("GET /api/workspaces/:id/members includes the new member", async () => {+ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/members`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data.length).toBeGreaterThanOrEqual(2)+ expect(data.some(m => m.email === inviteeEmail)).toBe(true)+ })++ it("DELETE /api/workspaces/:id/invites/:inviteId on used invite", async () => {+ const createRes = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/invites`,+ seed.machineToken,+ { method: "POST" },+ )+ const { id: newInviteId } = await createRes.json() as Record<string, unknown>++ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/invites/${newInviteId}`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(204)+ })++ it("DELETE /api/workspaces/:id/invites/nonexistent returns 404", async () => {+ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/invites/nonexistent`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(404)+ })+})diff --git a/src/web/src/test/e2e/workspace-members.test.ts b/src/web/src/test/e2e/workspace-members.test.tsnew file mode 100644index 000000000..bb212f451--- /dev/null+++ b/src/web/src/test/e2e/workspace-members.test.ts@@ -0,0 +1,65 @@+import { describe, it, expect, beforeAll, afterAll } from "vitest"+import {+ seedTestData, cleanupTestData, type TestSeed,+ seedSecondaryUser, cleanupSecondaryUser, type SecondaryUser,+} from "../helpers/seed"+import { tokenRequest } from "../helpers/auth"++let seed: TestSeed+let secondary: SecondaryUser++beforeAll(() => {+ seed = seedTestData()+ secondary = seedSecondaryUser(seed.workspaceId, "member")+}, 60_000)++afterAll(() => {+ cleanupSecondaryUser(secondary)+ cleanupTestData(seed)+}, 60_000)++describe("workspace member management", () => {+ it("GET /api/workspaces/:id/members returns members with user info", async () => {+ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/members`,+ seed.machineToken,+ )+ expect(res.status).toBe(200)+ const data = await res.json() as Array<Record<string, unknown>>+ expect(data.length).toBeGreaterThanOrEqual(2)++ const owner = data.find(m => m.user_id === seed.userId)+ expect(owner).toBeTruthy()+ expect(owner!.role).toBe("owner")++ const mem = data.find(m => m.user_id === secondary.userId)+ expect(mem).toBeTruthy()+ expect(mem!.role).toBe("member")+ })++ it("DELETE /api/workspaces/:id/members/:memberId removes a member", async () => {+ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/members/${secondary.memberId}`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(204)++ // Verify member is gone+ const listRes = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/members`,+ seed.machineToken,+ )+ const data = await listRes.json() as Array<Record<string, unknown>>+ expect(data.some(m => m.user_id === secondary.userId)).toBe(false)+ })++ it("DELETE /api/workspaces/:id/members/nonexistent returns 404", async () => {+ const res = await tokenRequest(+ `/api/workspaces/${seed.workspaceId}/members/nonexistent`,+ seed.machineToken,+ { method: "DELETE" },+ )+ expect(res.status).toBe(404)+ })+})diff --git a/src/web/src/test/helpers/seed.ts b/src/web/src/test/helpers/seed.tsindex 96b5cd274..d5bccca82 100644--- a/src/web/src/test/helpers/seed.ts+++ b/src/web/src/test/helpers/seed.ts@@ -62,6 +62,9 @@ export function cleanupTestData(seed: TestSeed) {sql(`DELETE FROM conversation WHERE workspace_id = '${ws}'`)sql(`DELETE FROM emails WHERE agent_id IN (SELECT id FROM agent WHERE workspace_id = '${ws}')`)sql(`DELETE FROM agent_whitelist WHERE agent_id IN (SELECT id FROM agent WHERE workspace_id = '${ws}')`)+ sql(`DELETE FROM agent_access WHERE workspace_id = '${ws}'`)+ sql(`DELETE FROM agent_pin WHERE workspace_id = '${ws}'`)+ sql(`DELETE FROM workspace_invite WHERE workspace_id = '${ws}'`)sql(`DELETE FROM agent WHERE workspace_id = '${ws}'`)sql(`DELETE FROM agent_runtime WHERE workspace_id = '${ws}'`)sql(`DELETE FROM machine WHERE workspace_id = '${ws}'`)@@ -70,3 +73,51 @@ export function cleanupTestData(seed: TestSeed) {sql(`DELETE FROM workspace WHERE id = '${ws}'`)sql(`DELETE FROM "user" WHERE id = '${seed.userId}'`)}++export interface SecondaryUser {+ userId: string+ memberId: string+}++/**+ * Create a second user + member record in an existing workspace.+ */+export function seedSecondaryUser(workspaceId: string, role = "member"): SecondaryUser {+ const userId = `u_${nanoid()}`+ const memberId = `mb_${nanoid()}`+ const now = new Date().toISOString()++ sql(`INSERT INTO "user" (id, name, email, emailVerified, createdAt, updatedAt) VALUES ('${userId}', 'Secondary User', '${userId}@test.local', 1, '${now}', '${now}')`)+ sql(`INSERT INTO member (id, workspace_id, user_id, role, created_at) VALUES ('${memberId}', '${workspaceId}', '${userId}', '${role}', '${now}')`)++ return { userId, memberId }+}++export interface TestInvite {+ inviteId: string+ token: string+}++/**+ * Create a workspace invite directly in DB for testing.+ */+export function seedInvite(workspaceId: string, createdBy: string): TestInvite {+ const inviteId = `inv_${nanoid()}`+ const token = `tok_${nanoid()}`+ const now = new Date().toISOString()+ const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()++ sql(`INSERT INTO workspace_invite (id, workspace_id, token, created_by, expires_at, created_at) VALUES ('${inviteId}', '${workspaceId}', '${token}', '${createdBy}', '${expiresAt}', '${now}')`)++ return { inviteId, token }+}++/**+ * Clean up secondary user (and their memberships).+ */+export function cleanupSecondaryUser(secondary: SecondaryUser) {+ sql(`DELETE FROM agent_access WHERE user_id = '${secondary.userId}'`)+ sql(`DELETE FROM agent_pin WHERE user_id = '${secondary.userId}'`)+ sql(`DELETE FROM member WHERE id = '${secondary.memberId}'`)+ sql(`DELETE FROM "user" WHERE id = '${secondary.userId}'`)+}