feat(api): add assigned_agent to Task model (MS22-DB-003, MS22-API-003)

apps/api/prisma/migrations/20260301144006_ms22_agent_fleet_schema/migration.sql

@@ -1,109 +0,0 @@
--- CreateTable
-CREATE TABLE "SystemConfig" (
-    "id" TEXT NOT NULL,
-    "key" TEXT NOT NULL,
-    "value" TEXT NOT NULL,
-    "encrypted" BOOLEAN NOT NULL DEFAULT false,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "SystemConfig_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "BreakglassUser" (
-    "id" TEXT NOT NULL,
-    "username" TEXT NOT NULL,
-    "passwordHash" TEXT NOT NULL,
-    "isActive" BOOLEAN NOT NULL DEFAULT true,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "BreakglassUser_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "LlmProvider" (
-    "id" TEXT NOT NULL,
-    "userId" TEXT NOT NULL,
-    "name" TEXT NOT NULL,
-    "displayName" TEXT NOT NULL,
-    "type" TEXT NOT NULL,
-    "baseUrl" TEXT,
-    "apiKey" TEXT,
-    "apiType" TEXT NOT NULL DEFAULT 'openai-completions',
-    "models" JSONB NOT NULL DEFAULT '[]',
-    "isActive" BOOLEAN NOT NULL DEFAULT true,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "LlmProvider_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "UserContainer" (
-    "id" TEXT NOT NULL,
-    "userId" TEXT NOT NULL,
-    "containerId" TEXT,
-    "containerName" TEXT NOT NULL,
-    "gatewayPort" INTEGER,
-    "gatewayToken" TEXT NOT NULL,
-    "status" TEXT NOT NULL DEFAULT 'stopped',
-    "lastActiveAt" TIMESTAMP(3),
-    "idleTimeoutMin" INTEGER NOT NULL DEFAULT 30,
-    "config" JSONB NOT NULL DEFAULT '{}',
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "UserContainer_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "SystemContainer" (
-    "id" TEXT NOT NULL,
-    "name" TEXT NOT NULL,
-    "role" TEXT NOT NULL,
-    "containerId" TEXT,
-    "gatewayPort" INTEGER,
-    "gatewayToken" TEXT NOT NULL,
-    "status" TEXT NOT NULL DEFAULT 'stopped',
-    "primaryModel" TEXT NOT NULL,
-    "isActive" BOOLEAN NOT NULL DEFAULT true,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "SystemContainer_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "UserAgentConfig" (
-    "id" TEXT NOT NULL,
-    "userId" TEXT NOT NULL,
-    "primaryModel" TEXT,
-    "fallbackModels" JSONB NOT NULL DEFAULT '[]',
-    "personality" TEXT,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "UserAgentConfig_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "SystemConfig_key_key" ON "SystemConfig"("key");
-
--- CreateIndex
-CREATE UNIQUE INDEX "BreakglassUser_username_key" ON "BreakglassUser"("username");
-
--- CreateIndex
-CREATE INDEX "LlmProvider_userId_idx" ON "LlmProvider"("userId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "LlmProvider_userId_name_key" ON "LlmProvider"("userId", "name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "UserContainer_userId_key" ON "UserContainer"("userId");
-
--- CreateIndex
-CREATE UNIQUE INDEX "SystemContainer_name_key" ON "SystemContainer"("name");
-
--- CreateIndex
-CREATE UNIQUE INDEX "UserAgentConfig_userId_key" ON "UserAgentConfig"("userId");

apps/api/prisma/schema.prisma

@@ -1625,81 +1625,3 @@ model ConversationArchive {
   @@index([startedAt])
   @@map("conversation_archives")
 }
-
-// ============================================
-// AGENT FLEET MODULE
-// ============================================
-
-model SystemConfig {
-  id        String   @id @default(cuid())
-  key       String   @unique
-  value     String
-  encrypted Boolean  @default(false)
-  updatedAt DateTime @updatedAt
-}
-
-model BreakglassUser {
-  id           String   @id @default(cuid())
-  username     String   @unique
-  passwordHash String
-  isActive     Boolean  @default(true)
-  createdAt    DateTime @default(now())
-  updatedAt    DateTime @updatedAt
-}
-
-model LlmProvider {
-  id          String   @id @default(cuid())
-  userId      String
-  name        String
-  displayName String
-  type        String
-  baseUrl     String?
-  apiKey      String?
-  apiType     String   @default("openai-completions")
-  models      Json     @default("[]")
-  isActive    Boolean  @default(true)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-
-  @@unique([userId, name])
-  @@index([userId])
-}
-
-model UserContainer {
-  id             String   @id @default(cuid())
-  userId         String   @unique
-  containerId    String?
-  containerName  String
-  gatewayPort    Int?
-  gatewayToken   String
-  status         String   @default("stopped")
-  lastActiveAt   DateTime?
-  idleTimeoutMin Int      @default(30)
-  config         Json     @default("{}")
-  createdAt      DateTime @default(now())
-  updatedAt      DateTime @updatedAt
-}
-
-model SystemContainer {
-  id           String   @id @default(cuid())
-  name         String   @unique
-  role         String
-  containerId  String?
-  gatewayPort  Int?
-  gatewayToken String
-  status       String   @default("stopped")
-  primaryModel String
-  isActive     Boolean  @default(true)
-  createdAt    DateTime @default(now())
-  updatedAt    DateTime @updatedAt
-}
-
-model UserAgentConfig {
-  id             String   @id @default(cuid())
-  userId         String   @unique
-  primaryModel   String?
-  fallbackModels Json     @default("[]")
-  personality    String?
-  createdAt      DateTime @default(now())
-  updatedAt      DateTime @updatedAt
-}

apps/api/src/agent-memory/agent-memory.integration.spec.ts

@@ -1,198 +0,0 @@
-import { beforeAll, beforeEach, describe, expect, it, afterAll } from "vitest";
-import { randomUUID as uuid } from "crypto";
-import { Test, TestingModule } from "@nestjs/testing";
-import { NotFoundException } from "@nestjs/common";
-import { PrismaClient } from "@prisma/client";
-import { AgentMemoryService } from "./agent-memory.service";
-import { PrismaService } from "../prisma/prisma.service";
-
-const shouldRunDbIntegrationTests =
-  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
-const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
-
-async function createWorkspace(
-  prisma: PrismaClient,
-  label: string
-): Promise<{ workspaceId: string; ownerId: string }> {
-  const workspace = await prisma.workspace.create({
-    data: {
-      name: `${label} ${Date.now()}`,
-      owner: {
-        create: {
-          email: `${label.toLowerCase().replace(/\s+/g, "-")}-${Date.now()}@example.com`,
-          name: `${label} Owner`,
-        },
-      },
-    },
-  });
-
-  return {
-    workspaceId: workspace.id,
-    ownerId: workspace.ownerId,
-  };
-}
-
-describeFn("AgentMemoryService Integration", () => {
-  let moduleRef: TestingModule;
-  let prisma: PrismaClient;
-  let service: AgentMemoryService;
-  let setupComplete = false;
-
-  let workspaceAId: string;
-  let workspaceAOwnerId: string;
-  let workspaceBId: string;
-  let workspaceBOwnerId: string;
-
-  beforeAll(async () => {
-    prisma = new PrismaClient();
-    await prisma.$connect();
-
-    const workspaceA = await createWorkspace(prisma, "Agent Memory Integration A");
-    workspaceAId = workspaceA.workspaceId;
-    workspaceAOwnerId = workspaceA.ownerId;
-
-    const workspaceB = await createWorkspace(prisma, "Agent Memory Integration B");
-    workspaceBId = workspaceB.workspaceId;
-    workspaceBOwnerId = workspaceB.ownerId;
-
-    moduleRef = await Test.createTestingModule({
-      providers: [
-        AgentMemoryService,
-        {
-          provide: PrismaService,
-          useValue: prisma,
-        },
-      ],
-    }).compile();
-
-    service = moduleRef.get<AgentMemoryService>(AgentMemoryService);
-    setupComplete = true;
-  });
-
-  beforeEach(async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    await prisma.agentMemory.deleteMany({
-      where: {
-        workspaceId: {
-          in: [workspaceAId, workspaceBId],
-        },
-      },
-    });
-  });
-
-  afterAll(async () => {
-    if (!prisma) {
-      return;
-    }
-
-    const workspaceIds = [workspaceAId, workspaceBId].filter(
-      (id): id is string => typeof id === "string"
-    );
-    const ownerIds = [workspaceAOwnerId, workspaceBOwnerId].filter(
-      (id): id is string => typeof id === "string"
-    );
-
-    if (workspaceIds.length > 0) {
-      await prisma.agentMemory.deleteMany({
-        where: {
-          workspaceId: {
-            in: workspaceIds,
-          },
-        },
-      });
-      await prisma.workspace.deleteMany({ where: { id: { in: workspaceIds } } });
-    }
-
-    if (ownerIds.length > 0) {
-      await prisma.user.deleteMany({ where: { id: { in: ownerIds } } });
-    }
-
-    if (moduleRef) {
-      await moduleRef.close();
-    }
-    await prisma.$disconnect();
-  });
-
-  it("upserts and lists memory entries", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const agentId = `agent-${uuid()}`;
-
-    const entry = await service.upsert(workspaceAId, agentId, "session-context", {
-      value: { intent: "create-tests", depth: "integration" },
-    });
-
-    expect(entry.workspaceId).toBe(workspaceAId);
-    expect(entry.agentId).toBe(agentId);
-    expect(entry.key).toBe("session-context");
-
-    const listed = await service.findAll(workspaceAId, agentId);
-
-    expect(listed).toHaveLength(1);
-    expect(listed[0]?.id).toBe(entry.id);
-    expect(listed[0]?.value).toMatchObject({ intent: "create-tests" });
-  });
-
-  it("updates existing key via upsert without creating duplicates", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const agentId = `agent-${uuid()}`;
-
-    const first = await service.upsert(workspaceAId, agentId, "preferences", {
-      value: { model: "fast" },
-    });
-
-    const second = await service.upsert(workspaceAId, agentId, "preferences", {
-      value: { model: "accurate" },
-    });
-
-    expect(second.id).toBe(first.id);
-    expect(second.value).toMatchObject({ model: "accurate" });
-
-    const rowCount = await prisma.agentMemory.count({
-      where: {
-        workspaceId: workspaceAId,
-        agentId,
-        key: "preferences",
-      },
-    });
-
-    expect(rowCount).toBe(1);
-  });
-
-  it("lists keys in sorted order and isolates by workspace", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const agentId = `agent-${uuid()}`;
-
-    await service.upsert(workspaceAId, agentId, "beta", { value: { v: 2 } });
-    await service.upsert(workspaceAId, agentId, "alpha", { value: { v: 1 } });
-    await service.upsert(workspaceBId, agentId, "alpha", { value: { v: 99 } });
-
-    const workspaceAEntries = await service.findAll(workspaceAId, agentId);
-    const workspaceBEntries = await service.findAll(workspaceBId, agentId);
-
-    expect(workspaceAEntries.map((row) => row.key)).toEqual(["alpha", "beta"]);
-    expect(workspaceBEntries).toHaveLength(1);
-    expect(workspaceBEntries[0]?.value).toMatchObject({ v: 99 });
-  });
-
-  it("throws NotFoundException when requesting unknown key", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    await expect(service.findOne(workspaceAId, `agent-${uuid()}`, "missing")).rejects.toThrow(
-      NotFoundException
-    );
-  });
-});

apps/api/src/app.module.ts

@@ -39,7 +39,6 @@ import { JobStepsModule } from "./job-steps/job-steps.module";
 import { CoordinatorIntegrationModule } from "./coordinator-integration/coordinator-integration.module";
 import { FederationModule } from "./federation/federation.module";
 import { CredentialsModule } from "./credentials/credentials.module";
-import { CryptoModule } from "./crypto/crypto.module";
 import { MosaicTelemetryModule } from "./mosaic-telemetry";
 import { SpeechModule } from "./speech/speech.module";
 import { DashboardModule } from "./dashboard/dashboard.module";
@@ -112,7 +111,6 @@ import { RlsContextInterceptor } from "./common/interceptors/rls-context.interce
     CoordinatorIntegrationModule,
     FederationModule,
     CredentialsModule,
-    CryptoModule,
     MosaicTelemetryModule,
     SpeechModule,
     DashboardModule,

apps/api/src/conversation-archive/conversation-archive.integration.spec.ts

@@ -1,239 +0,0 @@
-import { beforeAll, beforeEach, describe, expect, it, afterAll, vi } from "vitest";
-import { randomUUID as uuid } from "crypto";
-import { Test, TestingModule } from "@nestjs/testing";
-import { ConflictException } from "@nestjs/common";
-import { PrismaClient, Prisma } from "@prisma/client";
-import { EMBEDDING_DIMENSION } from "@mosaic/shared";
-import { ConversationArchiveService } from "./conversation-archive.service";
-import { PrismaService } from "../prisma/prisma.service";
-import { EmbeddingService } from "../knowledge/services/embedding.service";
-
-const shouldRunDbIntegrationTests =
-  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
-const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
-
-function vector(value: number): number[] {
-  return Array.from({ length: EMBEDDING_DIMENSION }, () => value);
-}
-
-function toVectorLiteral(input: number[]): string {
-  return `[${input.join(",")}]`;
-}
-
-describeFn("ConversationArchiveService Integration", () => {
-  let moduleRef: TestingModule;
-  let prisma: PrismaClient;
-  let service: ConversationArchiveService;
-  let workspaceId: string;
-  let ownerId: string;
-  let setupComplete = false;
-
-  const embeddingServiceMock = {
-    isConfigured: vi.fn(),
-    generateEmbedding: vi.fn(),
-  };
-
-  beforeAll(async () => {
-    prisma = new PrismaClient();
-    await prisma.$connect();
-
-    const workspace = await prisma.workspace.create({
-      data: {
-        name: `Conversation Archive Integration ${Date.now()}`,
-        owner: {
-          create: {
-            email: `conversation-archive-integration-${Date.now()}@example.com`,
-            name: "Conversation Archive Integration Owner",
-          },
-        },
-      },
-    });
-
-    workspaceId = workspace.id;
-    ownerId = workspace.ownerId;
-
-    moduleRef = await Test.createTestingModule({
-      providers: [
-        ConversationArchiveService,
-        {
-          provide: PrismaService,
-          useValue: prisma,
-        },
-        {
-          provide: EmbeddingService,
-          useValue: embeddingServiceMock,
-        },
-      ],
-    }).compile();
-
-    service = moduleRef.get<ConversationArchiveService>(ConversationArchiveService);
-    setupComplete = true;
-  });
-
-  beforeEach(async () => {
-    vi.clearAllMocks();
-    embeddingServiceMock.isConfigured.mockReturnValue(false);
-
-    if (!setupComplete) {
-      return;
-    }
-
-    await prisma.conversationArchive.deleteMany({ where: { workspaceId } });
-  });
-
-  afterAll(async () => {
-    if (!prisma) {
-      return;
-    }
-
-    if (workspaceId) {
-      await prisma.conversationArchive.deleteMany({ where: { workspaceId } });
-      await prisma.workspace.deleteMany({ where: { id: workspaceId } });
-    }
-    if (ownerId) {
-      await prisma.user.deleteMany({ where: { id: ownerId } });
-    }
-
-    if (moduleRef) {
-      await moduleRef.close();
-    }
-    await prisma.$disconnect();
-  });
-
-  it("ingests a conversation log", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const sessionId = `session-${uuid()}`;
-
-    const result = await service.ingest(workspaceId, {
-      sessionId,
-      agentId: "agent-conversation-ingest",
-      messages: [
-        { role: "user", content: "Can you summarize deployment issues?" },
-        { role: "assistant", content: "Yes, three retries timed out in staging." },
-      ],
-      summary: "Deployment retry failures discussed",
-      startedAt: "2026-02-28T21:00:00.000Z",
-      endedAt: "2026-02-28T21:05:00.000Z",
-      metadata: { source: "integration-test" },
-    });
-
-    expect(result.id).toBeDefined();
-
-    const stored = await prisma.conversationArchive.findUnique({
-      where: {
-        id: result.id,
-      },
-    });
-
-    expect(stored).toBeTruthy();
-    expect(stored?.workspaceId).toBe(workspaceId);
-    expect(stored?.sessionId).toBe(sessionId);
-    expect(stored?.messageCount).toBe(2);
-    expect(stored?.summary).toBe("Deployment retry failures discussed");
-  });
-
-  it("rejects duplicate session ingest per workspace", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const sessionId = `session-${uuid()}`;
-    const dto = {
-      sessionId,
-      agentId: "agent-conversation-duplicate",
-      messages: [{ role: "user", content: "hello" }],
-      summary: "simple conversation",
-      startedAt: "2026-02-28T22:00:00.000Z",
-    };
-
-    await service.ingest(workspaceId, dto);
-
-    await expect(service.ingest(workspaceId, dto)).rejects.toThrow(ConflictException);
-  });
-
-  it("rejects semantic search when embeddings are disabled", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    embeddingServiceMock.isConfigured.mockReturnValue(false);
-
-    await expect(
-      service.search(workspaceId, {
-        query: "deployment retries",
-      })
-    ).rejects.toThrow(ConflictException);
-  });
-
-  it("searches archived conversations by vector similarity", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const near = vector(0.02);
-    const far = vector(0.85);
-
-    const matching = await prisma.conversationArchive.create({
-      data: {
-        workspaceId,
-        sessionId: `session-search-${uuid()}`,
-        agentId: "agent-conversation-search-a",
-        messages: [
-          { role: "user", content: "What caused deployment retries?" },
-          { role: "assistant", content: "A connection pool timeout." },
-        ] as unknown as Prisma.InputJsonValue,
-        messageCount: 2,
-        summary: "Deployment retries caused by connection pool timeout",
-        startedAt: new Date("2026-02-28T23:00:00.000Z"),
-        metadata: { channel: "cli" } as Prisma.InputJsonValue,
-      },
-    });
-
-    const nonMatching = await prisma.conversationArchive.create({
-      data: {
-        workspaceId,
-        sessionId: `session-search-${uuid()}`,
-        agentId: "agent-conversation-search-b",
-        messages: [
-          { role: "user", content: "How is billing configured?" },
-        ] as unknown as Prisma.InputJsonValue,
-        messageCount: 1,
-        summary: "Billing and quotas conversation",
-        startedAt: new Date("2026-02-28T23:10:00.000Z"),
-        metadata: { channel: "cli" } as Prisma.InputJsonValue,
-      },
-    });
-
-    await prisma.$executeRaw`
-      UPDATE conversation_archives
-      SET embedding = ${toVectorLiteral(near)}::vector(${EMBEDDING_DIMENSION})
-      WHERE id = ${matching.id}::uuid
-    `;
-    await prisma.$executeRaw`
-      UPDATE conversation_archives
-      SET embedding = ${toVectorLiteral(far)}::vector(${EMBEDDING_DIMENSION})
-      WHERE id = ${nonMatching.id}::uuid
-    `;
-
-    embeddingServiceMock.isConfigured.mockReturnValue(true);
-    embeddingServiceMock.generateEmbedding.mockResolvedValue(near);
-
-    const result = await service.search(workspaceId, {
-      query: "deployment retries timeout",
-      agentId: "agent-conversation-search-a",
-      similarityThreshold: 0,
-      limit: 10,
-    });
-
-    const rows = result.data as Array<{ id: string; agent_id: string; similarity: number }>;
-
-    expect(result.pagination.total).toBe(1);
-    expect(rows).toHaveLength(1);
-    expect(rows[0]?.id).toBe(matching.id);
-    expect(rows[0]?.agent_id).toBe("agent-conversation-search-a");
-    expect(rows[0]?.similarity).toBeGreaterThan(0);
-  });
-});

apps/api/src/crypto/crypto.module.ts

@@ -1,10 +0,0 @@
-import { Module } from "@nestjs/common";
-import { ConfigModule } from "@nestjs/config";
-import { CryptoService } from "./crypto.service";
-
-@Module({
-  imports: [ConfigModule],
-  providers: [CryptoService],
-  exports: [CryptoService],
-})
-export class CryptoModule {}

apps/api/src/crypto/crypto.service.spec.ts

@@ -1,71 +0,0 @@
-import { describe, it, expect, beforeEach } from "vitest";
-import { ConfigService } from "@nestjs/config";
-import { CryptoService } from "./crypto.service";
-
-function createConfigService(secret?: string): ConfigService {
-  return {
-    get: (key: string) => {
-      if (key === "MOSAIC_SECRET_KEY") {
-        return secret;
-      }
-      return undefined;
-    },
-  } as unknown as ConfigService;
-}
-
-describe("CryptoService", () => {
-  let service: CryptoService;
-
-  beforeEach(() => {
-    service = new CryptoService(createConfigService("this-is-a-test-secret-key-with-32+chars"));
-  });
-
-  it("encrypt -> decrypt roundtrip", () => {
-    const plaintext = "my-secret-api-key";
-
-    const encrypted = service.encrypt(plaintext);
-    const decrypted = service.decrypt(encrypted);
-
-    expect(encrypted.startsWith("enc:")).toBe(true);
-    expect(decrypted).toBe(plaintext);
-  });
-
-  it("decrypt rejects tampered ciphertext", () => {
-    const encrypted = service.encrypt("sensitive-token");
-    const payload = encrypted.slice(4);
-    const bytes = Buffer.from(payload, "base64");
-
-    bytes[bytes.length - 1] = bytes[bytes.length - 1]! ^ 0xff;
-
-    const tampered = `enc:${bytes.toString("base64")}`;
-
-    expect(() => service.decrypt(tampered)).toThrow();
-  });
-
-  it("decrypt rejects non-encrypted string", () => {
-    expect(() => service.decrypt("plain-text-value")).toThrow();
-  });
-
-  it("isEncrypted detects prefix correctly", () => {
-    expect(service.isEncrypted("enc:abc")).toBe(true);
-    expect(service.isEncrypted("ENC:abc")).toBe(false);
-    expect(service.isEncrypted("plain-text")).toBe(false);
-  });
-
-  it("generateToken returns 64-char hex string", () => {
-    const token = service.generateToken();
-
-    expect(token).toMatch(/^[0-9a-f]{64}$/);
-  });
-
-  it("different plaintexts produce different ciphertexts (random IV)", () => {
-    const encryptedA = service.encrypt("value-a");
-    const encryptedB = service.encrypt("value-b");
-
-    expect(encryptedA).not.toBe(encryptedB);
-  });
-
-  it("missing MOSAIC_SECRET_KEY throws on construction", () => {
-    expect(() => new CryptoService(createConfigService(undefined))).toThrow();
-  });
-});

apps/api/src/crypto/crypto.service.ts

@@ -1,82 +0,0 @@
-import { Injectable } from "@nestjs/common";
-import { ConfigService } from "@nestjs/config";
-import { createCipheriv, createDecipheriv, hkdfSync, randomBytes } from "crypto";
-
-const ALGORITHM = "aes-256-gcm";
-const ENCRYPTED_PREFIX = "enc:";
-const IV_LENGTH = 12;
-const AUTH_TAG_LENGTH = 16;
-const DERIVED_KEY_LENGTH = 32;
-const HKDF_SALT = "mosaic.crypto.v1";
-const HKDF_INFO = "mosaic-db-secret-encryption";
-
-@Injectable()
-export class CryptoService {
-  private readonly key: Buffer;
-
-  constructor(private readonly config: ConfigService) {
-    const secret = this.config.get<string>("MOSAIC_SECRET_KEY");
-
-    if (!secret) {
-      throw new Error("MOSAIC_SECRET_KEY environment variable is required");
-    }
-
-    if (secret.length < 32) {
-      throw new Error("MOSAIC_SECRET_KEY must be at least 32 characters");
-    }
-
-    this.key = Buffer.from(
-      hkdfSync(
-        "sha256",
-        Buffer.from(secret, "utf8"),
-        Buffer.from(HKDF_SALT, "utf8"),
-        Buffer.from(HKDF_INFO, "utf8"),
-        DERIVED_KEY_LENGTH
-      )
-    );
-  }
-
-  encrypt(plaintext: string): string {
-    const iv = randomBytes(IV_LENGTH);
-    const cipher = createCipheriv(ALGORITHM, this.key, iv);
-    const ciphertext = Buffer.concat([cipher.update(plaintext, "utf8"), cipher.final()]);
-    const authTag = cipher.getAuthTag();
-    const payload = Buffer.concat([iv, ciphertext, authTag]).toString("base64");
-
-    return `${ENCRYPTED_PREFIX}${payload}`;
-  }
-
-  decrypt(encrypted: string): string {
-    if (!this.isEncrypted(encrypted)) {
-      throw new Error("Value is not encrypted");
-    }
-
-    const payloadBase64 = encrypted.slice(ENCRYPTED_PREFIX.length);
-
-    try {
-      const payload = Buffer.from(payloadBase64, "base64");
-      if (payload.length < IV_LENGTH + AUTH_TAG_LENGTH) {
-        throw new Error("Encrypted payload is too short");
-      }
-
-      const iv = payload.subarray(0, IV_LENGTH);
-      const authTag = payload.subarray(payload.length - AUTH_TAG_LENGTH);
-      const ciphertext = payload.subarray(IV_LENGTH, payload.length - AUTH_TAG_LENGTH);
-
-      const decipher = createDecipheriv(ALGORITHM, this.key, iv);
-      decipher.setAuthTag(authTag);
-
-      return Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
-    } catch {
-      throw new Error("Failed to decrypt value");
-    }
-  }
-
-  isEncrypted(value: string): boolean {
-    return value.startsWith(ENCRYPTED_PREFIX);
-  }
-
-  generateToken(): string {
-    return randomBytes(32).toString("hex");
-  }
-}

apps/api/src/findings/findings.integration.spec.ts

@@ -1,226 +0,0 @@
-import { beforeAll, beforeEach, describe, expect, it, afterAll, vi } from "vitest";
-import { randomUUID as uuid } from "crypto";
-import { Test, TestingModule } from "@nestjs/testing";
-import { BadRequestException, NotFoundException } from "@nestjs/common";
-import { PrismaClient, Prisma } from "@prisma/client";
-import { FindingsService } from "./findings.service";
-import { PrismaService } from "../prisma/prisma.service";
-import { EmbeddingService } from "../knowledge/services/embedding.service";
-
-const shouldRunDbIntegrationTests =
-  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
-const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
-
-const EMBEDDING_DIMENSION = 1536;
-
-function vector(value: number): number[] {
-  return Array.from({ length: EMBEDDING_DIMENSION }, () => value);
-}
-
-function toVectorLiteral(input: number[]): string {
-  return `[${input.join(",")}]`;
-}
-
-describeFn("FindingsService Integration", () => {
-  let moduleRef: TestingModule;
-  let prisma: PrismaClient;
-  let service: FindingsService;
-  let workspaceId: string;
-  let ownerId: string;
-  let setupComplete = false;
-
-  const embeddingServiceMock = {
-    isConfigured: vi.fn(),
-    generateEmbedding: vi.fn(),
-  };
-
-  beforeAll(async () => {
-    prisma = new PrismaClient();
-    await prisma.$connect();
-
-    const workspace = await prisma.workspace.create({
-      data: {
-        name: `Findings Integration ${Date.now()}`,
-        owner: {
-          create: {
-            email: `findings-integration-${Date.now()}@example.com`,
-            name: "Findings Integration Owner",
-          },
-        },
-      },
-    });
-
-    workspaceId = workspace.id;
-    ownerId = workspace.ownerId;
-
-    moduleRef = await Test.createTestingModule({
-      providers: [
-        FindingsService,
-        {
-          provide: PrismaService,
-          useValue: prisma,
-        },
-        {
-          provide: EmbeddingService,
-          useValue: embeddingServiceMock,
-        },
-      ],
-    }).compile();
-
-    service = moduleRef.get<FindingsService>(FindingsService);
-    setupComplete = true;
-  });
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    embeddingServiceMock.isConfigured.mockReturnValue(false);
-  });
-
-  afterAll(async () => {
-    if (!prisma) {
-      return;
-    }
-
-    if (workspaceId) {
-      await prisma.finding.deleteMany({ where: { workspaceId } });
-      await prisma.workspace.deleteMany({ where: { id: workspaceId } });
-    }
-    if (ownerId) {
-      await prisma.user.deleteMany({ where: { id: ownerId } });
-    }
-
-    if (moduleRef) {
-      await moduleRef.close();
-    }
-    await prisma.$disconnect();
-  });
-
-  it("creates, lists, fetches, and deletes findings", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const created = await service.create(workspaceId, {
-      agentId: "agent-findings-crud",
-      type: "security",
-      title: "Unescaped SQL fragment",
-      data: { severity: "high" },
-      summary: "Potential injection risk in dynamic query path.",
-    });
-
-    expect(created.id).toBeDefined();
-    expect(created.workspaceId).toBe(workspaceId);
-    expect(created.taskId).toBeNull();
-
-    const listed = await service.findAll(workspaceId, {
-      page: 1,
-      limit: 10,
-      agentId: "agent-findings-crud",
-    });
-
-    expect(listed.meta.total).toBeGreaterThanOrEqual(1);
-    expect(listed.data.some((row) => row.id === created.id)).toBe(true);
-
-    const found = await service.findOne(created.id, workspaceId);
-    expect(found.id).toBe(created.id);
-    expect(found.title).toBe("Unescaped SQL fragment");
-
-    await expect(service.findOne(created.id, uuid())).rejects.toThrow(NotFoundException);
-
-    await expect(service.remove(created.id, workspaceId)).resolves.toEqual({
-      message: "Finding deleted successfully",
-    });
-
-    await expect(service.findOne(created.id, workspaceId)).rejects.toThrow(NotFoundException);
-  });
-
-  it("rejects create when taskId does not exist in workspace", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    await expect(
-      service.create(workspaceId, {
-        taskId: uuid(),
-        agentId: "agent-findings-missing-task",
-        type: "bug",
-        title: "Invalid task id",
-        data: { source: "integration-test" },
-        summary: "Should fail when task relation is not found.",
-      })
-    ).rejects.toThrow(NotFoundException);
-  });
-
-  it("rejects vector search when embeddings are disabled", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    embeddingServiceMock.isConfigured.mockReturnValue(false);
-
-    await expect(
-      service.search(workspaceId, {
-        query: "security issue",
-      })
-    ).rejects.toThrow(BadRequestException);
-  });
-
-  it("searches findings by vector similarity with filters", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const near = vector(0.01);
-    const far = vector(0.9);
-
-    const matchedFinding = await prisma.finding.create({
-      data: {
-        workspaceId,
-        agentId: "agent-findings-search-a",
-        type: "incident",
-        title: "Authentication bypass",
-        data: { score: 0.9 } as Prisma.InputJsonValue,
-        summary: "Bypass risk found in login checks.",
-      },
-    });
-
-    const otherFinding = await prisma.finding.create({
-      data: {
-        workspaceId,
-        agentId: "agent-findings-search-b",
-        type: "incident",
-        title: "Retry timeout",
-        data: { score: 0.2 } as Prisma.InputJsonValue,
-        summary: "Timeout issue in downstream retries.",
-      },
-    });
-
-    await prisma.$executeRaw`
-      UPDATE findings
-      SET embedding = ${toVectorLiteral(near)}::vector(1536)
-      WHERE id = ${matchedFinding.id}::uuid
-    `;
-    await prisma.$executeRaw`
-      UPDATE findings
-      SET embedding = ${toVectorLiteral(far)}::vector(1536)
-      WHERE id = ${otherFinding.id}::uuid
-    `;
-
-    embeddingServiceMock.isConfigured.mockReturnValue(true);
-    embeddingServiceMock.generateEmbedding.mockResolvedValue(near);
-
-    const result = await service.search(workspaceId, {
-      query: "authentication bypass risk",
-      agentId: "agent-findings-search-a",
-      limit: 10,
-      similarityThreshold: 0,
-    });
-
-    expect(result.query).toBe("authentication bypass risk");
-    expect(result.meta.total).toBe(1);
-    expect(result.data).toHaveLength(1);
-    expect(result.data[0]?.id).toBe(matchedFinding.id);
-    expect(result.data[0]?.agentId).toBe("agent-findings-search-a");
-    expect(result.data.find((row) => row.id === otherFinding.id)).toBeUndefined();
-  });
-});

apps/api/src/tasks/tasks.assigned-agent.integration.spec.ts

@@ -1,162 +0,0 @@
-import { beforeAll, beforeEach, describe, expect, it, afterAll, vi } from "vitest";
-import { randomUUID as uuid } from "crypto";
-import { Test, TestingModule } from "@nestjs/testing";
-import { PrismaClient } from "@prisma/client";
-import { TasksService } from "./tasks.service";
-import { PrismaService } from "../prisma/prisma.service";
-import { ActivityService } from "../activity/activity.service";
-
-const shouldRunDbIntegrationTests =
-  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
-const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
-
-describeFn("TasksService assignedAgent Integration", () => {
-  let moduleRef: TestingModule;
-  let prisma: PrismaClient;
-  let service: TasksService;
-  let workspaceId: string;
-  let ownerId: string;
-  let setupComplete = false;
-
-  const activityServiceMock = {
-    logTaskCreated: vi.fn().mockResolvedValue(undefined),
-    logTaskUpdated: vi.fn().mockResolvedValue(undefined),
-    logTaskDeleted: vi.fn().mockResolvedValue(undefined),
-    logTaskCompleted: vi.fn().mockResolvedValue(undefined),
-    logTaskAssigned: vi.fn().mockResolvedValue(undefined),
-  };
-
-  beforeAll(async () => {
-    prisma = new PrismaClient();
-    await prisma.$connect();
-
-    const workspace = await prisma.workspace.create({
-      data: {
-        name: `Tasks Assigned Agent Integration ${Date.now()}`,
-        owner: {
-          create: {
-            email: `tasks-assigned-agent-integration-${Date.now()}@example.com`,
-            name: "Tasks Assigned Agent Integration Owner",
-          },
-        },
-      },
-    });
-
-    workspaceId = workspace.id;
-    ownerId = workspace.ownerId;
-
-    moduleRef = await Test.createTestingModule({
-      providers: [
-        TasksService,
-        {
-          provide: PrismaService,
-          useValue: prisma,
-        },
-        {
-          provide: ActivityService,
-          useValue: activityServiceMock,
-        },
-      ],
-    }).compile();
-
-    service = moduleRef.get<TasksService>(TasksService);
-    setupComplete = true;
-  });
-
-  beforeEach(async () => {
-    vi.clearAllMocks();
-
-    if (!setupComplete) {
-      return;
-    }
-
-    await prisma.task.deleteMany({ where: { workspaceId } });
-  });
-
-  afterAll(async () => {
-    if (!prisma) {
-      return;
-    }
-
-    if (workspaceId) {
-      await prisma.task.deleteMany({ where: { workspaceId } });
-      await prisma.workspace.deleteMany({ where: { id: workspaceId } });
-    }
-    if (ownerId) {
-      await prisma.user.deleteMany({ where: { id: ownerId } });
-    }
-
-    if (moduleRef) {
-      await moduleRef.close();
-    }
-    await prisma.$disconnect();
-  });
-
-  it("persists assignedAgent on create", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const task = await service.create(workspaceId, ownerId, {
-      title: `Assigned agent create ${uuid()}`,
-      assignedAgent: "fleet-worker-1",
-    });
-
-    expect(task.assignedAgent).toBe("fleet-worker-1");
-
-    const stored = await prisma.task.findUnique({
-      where: {
-        id: task.id,
-      },
-      select: {
-        id: true,
-        assignedAgent: true,
-      },
-    });
-
-    expect(stored).toMatchObject({
-      id: task.id,
-      assignedAgent: "fleet-worker-1",
-    });
-
-    const listed = await service.findAll({ workspaceId, page: 1, limit: 10 }, ownerId);
-    const listedTask = listed.data.find((row) => row.id === task.id);
-
-    expect(listedTask?.assignedAgent).toBe("fleet-worker-1");
-  });
-
-  it("updates and clears assignedAgent", async () => {
-    if (!setupComplete) {
-      return;
-    }
-
-    const created = await service.create(workspaceId, ownerId, {
-      title: `Assigned agent update ${uuid()}`,
-    });
-
-    expect(created.assignedAgent).toBeNull();
-
-    const updated = await service.update(created.id, workspaceId, ownerId, {
-      assignedAgent: "fleet-worker-2",
-    });
-
-    expect(updated.assignedAgent).toBe("fleet-worker-2");
-
-    const cleared = await service.update(created.id, workspaceId, ownerId, {
-      assignedAgent: null,
-    });
-
-    expect(cleared.assignedAgent).toBeNull();
-
-    const stored = await prisma.task.findUnique({
-      where: {
-        id: created.id,
-      },
-      select: {
-        assignedAgent: true,
-      },
-    });
-
-    expect(stored?.assignedAgent).toBeNull();
-  });
-});

apps/web/src/app/(authenticated)/settings/page.tsx

@@ -230,7 +230,6 @@ const categories: CategoryConfig[] = [
     title: "Teams",
     description: "Create and manage teams within your active workspace.",
     href: "/settings/teams",
-    adminOnly: true,
     accent: "var(--ms-blue-400)",
     iconBg: "rgba(47, 128, 255, 0.12)",
     icon: (

apps/web/src/app/(authenticated)/settings/teams/page.test.tsx

@@ -1,12 +1,9 @@
 import type { ReactElement, ReactNode } from "react";
 import type { TeamRecord } from "@/lib/api/teams";
 
-import { WorkspaceMemberRole } from "@mosaic/shared";
+import { render, screen } from "@testing-library/react";
-import { render, screen, waitFor } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { createTeam, deleteTeam, fetchTeams, updateTeam } from "@/lib/api/teams";
+import { fetchTeams } from "@/lib/api/teams";
-import { fetchUserWorkspaces } from "@/lib/api/workspaces";
 
 import TeamsSettingsPage from "./page";
 
@@ -25,19 +22,9 @@ vi.mock("next/link", () => ({
 vi.mock("@/lib/api/teams", () => ({
   fetchTeams: vi.fn(),
   createTeam: vi.fn(),
-  updateTeam: vi.fn(),
-  deleteTeam: vi.fn(),
-}));
-
-vi.mock("@/lib/api/workspaces", () => ({
-  fetchUserWorkspaces: vi.fn(),
 }));
 
 const fetchTeamsMock = vi.mocked(fetchTeams);
-const createTeamMock = vi.mocked(createTeam);
-const updateTeamMock = vi.mocked(updateTeam);
-const deleteTeamMock = vi.mocked(deleteTeam);
-const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
 
 const baseTeam: TeamRecord = {
   id: "team-1",
@@ -55,33 +42,6 @@ const baseTeam: TeamRecord = {
 describe("TeamsSettingsPage", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    fetchTeamsMock.mockResolvedValue([]);
-    fetchUserWorkspacesMock.mockResolvedValue([
-      {
-        id: "workspace-1",
-        name: "Personal Workspace",
-        ownerId: "owner-1",
-        role: WorkspaceMemberRole.OWNER,
-        createdAt: "2026-01-01T00:00:00.000Z",
-      },
-    ]);
-  });
-
-  it("shows access denied to non-admin users", async () => {
-    fetchUserWorkspacesMock.mockResolvedValueOnce([
-      {
-        id: "workspace-1",
-        name: "Personal Workspace",
-        ownerId: "owner-1",
-        role: WorkspaceMemberRole.MEMBER,
-        createdAt: "2026-01-01T00:00:00.000Z",
-      },
-    ]);
-
-    render(<TeamsSettingsPage />);
-
-    expect(await screen.findByText("Access Denied")).toBeInTheDocument();
-    expect(fetchTeamsMock).not.toHaveBeenCalled();
   });
 
   it("loads and renders teams from the API", async () => {
@@ -89,7 +49,9 @@ describe("TeamsSettingsPage", () => {
 
     render(<TeamsSettingsPage />);
 
-    expect(await screen.findByText("Team Directory")).toBeInTheDocument();
+    expect(screen.getByText("Loading teams...")).toBeInTheDocument();
+
+    expect(await screen.findByText("Your Teams (1)")).toBeInTheDocument();
     expect(screen.getByText("Platform Team")).toBeInTheDocument();
     expect(fetchTeamsMock).toHaveBeenCalledTimes(1);
   });
@@ -99,8 +61,8 @@ describe("TeamsSettingsPage", () => {
 
     render(<TeamsSettingsPage />);
 
-    expect(await screen.findByText("No Teams Yet")).toBeInTheDocument();
+    expect(await screen.findByText("Your Teams (0)")).toBeInTheDocument();
-    expect(screen.getByText("Create the first team to get started.")).toBeInTheDocument();
+    expect(screen.getByText("No teams yet")).toBeInTheDocument();
   });
 
   it("shows error state and does not show empty state", async () => {
@@ -109,82 +71,6 @@ describe("TeamsSettingsPage", () => {
     render(<TeamsSettingsPage />);
 
     expect(await screen.findByText("Unable to load teams")).toBeInTheDocument();
-  });
+    expect(screen.queryByText("No teams yet")).not.toBeInTheDocument();
-
-  it("creates a team from the create dialog", async () => {
-    const user = userEvent.setup();
-    fetchTeamsMock.mockResolvedValue([baseTeam]);
-    createTeamMock.mockResolvedValue({
-      ...baseTeam,
-      id: "team-2",
-      name: "Design Team",
-      description: "Owns design quality",
-    });
-
-    render(<TeamsSettingsPage />);
-
-    expect(await screen.findByText("Platform Team")).toBeInTheDocument();
-
-    const triggerButton = screen.getByRole("button", { name: "Create Team" });
-    await user.click(triggerButton);
-
-    await user.type(screen.getByLabelText("Name"), "Design Team");
-    await user.type(screen.getByLabelText("Description"), "Owns design quality");
-
-    const submitButton = screen.getAllByRole("button", { name: "Create Team" })[1];
-    if (!submitButton) {
-      throw new Error("Expected create-team submit button to be rendered");
-    }
-    await user.click(submitButton);
-
-    await waitFor(() => {
-      expect(createTeamMock).toHaveBeenCalledWith({
-        name: "Design Team",
-        description: "Owns design quality",
-      });
-    });
-  });
-
-  it("opens team details and updates name", async () => {
-    const user = userEvent.setup();
-    fetchTeamsMock.mockResolvedValue([baseTeam]);
-    updateTeamMock.mockResolvedValue({
-      ...baseTeam,
-      name: "Platform Engineering",
-    });
-
-    render(<TeamsSettingsPage />);
-
-    expect(await screen.findByText("Platform Team")).toBeInTheDocument();
-
-    await user.click(screen.getByText("Platform Team"));
-
-    const nameInput = await screen.findByLabelText("Name");
-    await user.clear(nameInput);
-    await user.type(nameInput, "Platform Engineering");
-    await user.click(screen.getByRole("button", { name: "Save Changes" }));
-
-    await waitFor(() => {
-      expect(updateTeamMock).toHaveBeenCalledWith("team-1", {
-        name: "Platform Engineering",
-      });
-    });
-  });
-
-  it("deletes a team from the confirmation dialog", async () => {
-    const user = userEvent.setup();
-    fetchTeamsMock.mockResolvedValue([baseTeam]);
-    deleteTeamMock.mockResolvedValue();
-
-    render(<TeamsSettingsPage />);
-
-    expect(await screen.findByText("Platform Team")).toBeInTheDocument();
-
-    await user.click(screen.getByRole("button", { name: "Delete" }));
-    await user.click(screen.getByRole("button", { name: "Delete Team" }));
-
-    await waitFor(() => {
-      expect(deleteTeamMock).toHaveBeenCalledWith("team-1");
-    });
   });
 });

apps/web/src/app/(authenticated)/settings/teams/page.tsx

@@ -1,582 +1,244 @@
 "use client";
 
-import {
+import type { ReactElement, SyntheticEvent } from "react";
-  useCallback,
+
-  useEffect,
+import { useCallback, useEffect, useState } from "react";
-  useState,
-  type ChangeEvent,
-  type KeyboardEvent,
-  type ReactElement,
-  type SyntheticEvent,
-} from "react";
 import Link from "next/link";
-import { Plus, Trash2, Users } from "lucide-react";
+import { createTeam, fetchTeams, type CreateTeamDto, type TeamRecord } from "@/lib/api/teams";
-import { WorkspaceMemberRole } from "@mosaic/shared";
-import { SettingsAccessDenied } from "@/components/settings/SettingsAccessDenied";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
-import {
-  createTeam,
-  deleteTeam,
-  fetchTeams,
-  updateTeam,
-  type CreateTeamDto,
-  type TeamRecord,
-  type UpdateTeamDto,
-} from "@/lib/api/teams";
-import { fetchUserWorkspaces } from "@/lib/api/workspaces";
 
-const INITIAL_CREATE_FORM = {
+function getErrorMessage(error: unknown, fallback: string): string {
-  name: "",
+  if (error instanceof Error) {
-  description: "",
+    return error.message;
-};
+  }
 
-const INITIAL_DETAIL_FORM = {
+  return fallback;
-  name: "",
-  description: "",
-};
-
-interface DetailInitialState {
-  name: string;
-  description: string;
-}
-
-function toMemberLabel(count: number): string {
-  return `${String(count)} member${count === 1 ? "" : "s"}`;
 }
 
 export default function TeamsSettingsPage(): ReactElement {
   const [teams, setTeams] = useState<TeamRecord[]>([]);
-  const [isLoading, setIsLoading] = useState<boolean>(true);
+  const [isLoading, setIsLoading] = useState(true);
-  const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
+  const [loadError, setLoadError] = useState<string | null>(null);
-  const [error, setError] = useState<string | null>(null);
+  const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
-  const [isAdmin, setIsAdmin] = useState<boolean | null>(null);
+  const [isCreating, setIsCreating] = useState(false);
-
+  const [newTeamName, setNewTeamName] = useState("");
-  const [isCreateOpen, setIsCreateOpen] = useState<boolean>(false);
+  const [newTeamDescription, setNewTeamDescription] = useState("");
-  const [createForm, setCreateForm] = useState(INITIAL_CREATE_FORM);
   const [createError, setCreateError] = useState<string | null>(null);
-  const [isCreating, setIsCreating] = useState<boolean>(false);
 
-  const [detailTarget, setDetailTarget] = useState<TeamRecord | null>(null);
+  const loadTeams = useCallback(async (): Promise<void> => {
-  const [detailForm, setDetailForm] = useState(INITIAL_DETAIL_FORM);
+    setIsLoading(true);
-  const [detailInitial, setDetailInitial] = useState<DetailInitialState | null>(null);
-  const [detailError, setDetailError] = useState<string | null>(null);
-  const [isSavingDetails, setIsSavingDetails] = useState<boolean>(false);
 
-  const [deleteTarget, setDeleteTarget] = useState<TeamRecord | null>(null);
-  const [isDeleting, setIsDeleting] = useState<boolean>(false);
-
-  const loadTeams = useCallback(async (showLoadingState: boolean): Promise<void> => {
     try {
-      if (showLoadingState) {
-        setIsLoading(true);
-      } else {
-        setIsRefreshing(true);
-      }
-
       const data = await fetchTeams();
       setTeams(data);
-      setError(null);
+      setLoadError(null);
-    } catch (err: unknown) {
+    } catch (error) {
-      setError(err instanceof Error ? err.message : "Failed to load teams");
+      setLoadError(getErrorMessage(error, "Failed to load teams"));
     } finally {
       setIsLoading(false);
-      setIsRefreshing(false);
     }
   }, []);
 
   useEffect(() => {
-    fetchUserWorkspaces()
+    void loadTeams();
-      .then((workspaces) => {
+  }, [loadTeams]);
-        const adminRoles: WorkspaceMemberRole[] = [
-          WorkspaceMemberRole.OWNER,
-          WorkspaceMemberRole.ADMIN,
-        ];
 
-        setIsAdmin(workspaces.some((workspace) => adminRoles.includes(workspace.role)));
+  const handleCreateTeam = async (e: SyntheticEvent<HTMLFormElement>): Promise<void> => {
-      })
+    e.preventDefault();
-      .catch(() => {
-        setIsAdmin(true); // fail open
-      });
-  }, []);
 
-  useEffect(() => {
+    const teamName = newTeamName.trim();
-    if (isAdmin !== true) {
+    if (!teamName) return;
-      return;
-    }
 
-    void loadTeams(true);
+    setIsCreating(true);
-  }, [isAdmin, loadTeams]);
-
-  function resetCreateForm(): void {
-    setCreateForm(INITIAL_CREATE_FORM);
     setCreateError(null);
-  }
-
-  function openTeamDetails(team: TeamRecord): void {
-    const nextDetailForm = {
-      name: team.name,
-      description: team.description ?? "",
-    };
-
-    setDetailTarget(team);
-    setDetailForm(nextDetailForm);
-    setDetailInitial({
-      name: nextDetailForm.name,
-      description: nextDetailForm.description,
-    });
-    setDetailError(null);
-  }
-
-  function resetTeamDetails(): void {
-    setDetailTarget(null);
-    setDetailForm(INITIAL_DETAIL_FORM);
-    setDetailInitial(null);
-    setDetailError(null);
-  }
-
-  function handleTeamRowKeyDown(event: KeyboardEvent<HTMLDivElement>, team: TeamRecord): void {
-    if (event.key === "Enter" || event.key === " ") {
-      event.preventDefault();
-      openTeamDetails(team);
-    }
-  }
-
-  async function handleCreateSubmit(event: SyntheticEvent): Promise<void> {
-    event.preventDefault();
-    setCreateError(null);
-
-    const name = createForm.name.trim();
-    if (!name) {
-      setCreateError("Name is required.");
-      return;
-    }
-
-    const description = createForm.description.trim();
-    const dto: CreateTeamDto = { name };
-    if (description) {
-      dto.description = description;
-    }
 
     try {
-      setIsCreating(true);
+      const description = newTeamDescription.trim();
+      const dto: CreateTeamDto = { name: teamName };
+      if (description.length > 0) {
+        dto.description = description;
+      }
+
       await createTeam(dto);
-      setIsCreateOpen(false);
+      setNewTeamName("");
-      resetCreateForm();
+      setNewTeamDescription("");
-      await loadTeams(false);
+      setIsCreateDialogOpen(false);
-    } catch (err: unknown) {
+      await loadTeams();
-      setCreateError(err instanceof Error ? err.message : "Failed to create team");
+    } catch (error) {
+      setCreateError(getErrorMessage(error, "Failed to create team"));
     } finally {
       setIsCreating(false);
     }
-  }
+  };
-
-  async function handleDetailSubmit(event: SyntheticEvent): Promise<void> {
-    event.preventDefault();
-
-    if (detailTarget === null || detailInitial === null) {
-      return;
-    }
-
-    const name = detailForm.name.trim();
-    if (!name) {
-      setDetailError("Name is required.");
-      return;
-    }
-
-    const nextDescription = detailForm.description.trim();
-    const normalizedNextDescription = nextDescription.length > 0 ? nextDescription : null;
-    const normalizedInitialDescription =
-      detailInitial.description.trim().length > 0 ? detailInitial.description.trim() : null;
-
-    const dto: UpdateTeamDto = {};
-
-    if (name !== detailInitial.name) {
-      dto.name = name;
-    }
-
-    if (normalizedNextDescription !== normalizedInitialDescription) {
-      dto.description = normalizedNextDescription;
-    }
-
-    if (Object.keys(dto).length === 0) {
-      resetTeamDetails();
-      return;
-    }
-
-    try {
-      setIsSavingDetails(true);
-      setDetailError(null);
-      await updateTeam(detailTarget.id, dto);
-      resetTeamDetails();
-      await loadTeams(false);
-    } catch (err: unknown) {
-      setDetailError(err instanceof Error ? err.message : "Failed to update team");
-    } finally {
-      setIsSavingDetails(false);
-    }
-  }
-
-  async function confirmDelete(): Promise<void> {
-    if (!deleteTarget) {
-      return;
-    }
-
-    try {
-      setIsDeleting(true);
-      await deleteTeam(deleteTarget.id);
-      setDeleteTarget(null);
-      await loadTeams(false);
-      setError(null);
-    } catch (err: unknown) {
-      setError(err instanceof Error ? err.message : "Failed to delete team");
-    } finally {
-      setIsDeleting(false);
-    }
-  }
-
-  if (isAdmin === null) {
-    return (
-      <Card className="max-w-2xl mx-auto mt-8">
-        <CardContent className="py-12 text-center text-muted-foreground">
-          Checking permissions...
-        </CardContent>
-      </Card>
-    );
-  }
-
-  if (!isAdmin) {
-    return <SettingsAccessDenied message="You need Admin or Owner role to manage teams." />;
-  }
 
   return (
-    <div className="max-w-6xl mx-auto p-6 space-y-6">
+    <main className="container mx-auto px-4 py-8 max-w-5xl">
-      <div className="flex items-start justify-between gap-4">
+      <div className="mb-8">
-        <div>
+        <div className="flex items-center justify-between mb-2">
-          <div className="flex items-center gap-3">
+          <h1 className="text-3xl font-bold text-gray-900">Teams</h1>
-            <h1 className="text-3xl font-bold">Teams</h1>
+          <Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
-            <Badge variant="outline">{teams.length} total</Badge>
+            {"<-"} Back to Settings
-          </div>
+          </Link>
-          <p className="text-muted-foreground mt-1">Create and manage workspace teams</p>
-        </div>
-
-        <div className="flex items-center gap-2">
-          <Button
-            variant="outline"
-            onClick={() => {
-              void loadTeams(false);
-            }}
-            disabled={isLoading || isRefreshing}
-          >
-            {isRefreshing ? "Refreshing..." : "Refresh"}
-          </Button>
-
-          <Dialog
-            open={isCreateOpen}
-            onOpenChange={(open) => {
-              if (!open && !isCreating) {
-                resetCreateForm();
-              }
-              setIsCreateOpen(open);
-            }}
-          >
-            <DialogTrigger asChild>
-              <Button>
-                <Plus className="h-4 w-4 mr-2" />
-                Create Team
-              </Button>
-            </DialogTrigger>
-            <DialogContent>
-              <DialogHeader>
-                <DialogTitle>Create Team</DialogTitle>
-                <DialogDescription>
-                  Create a team in the active workspace to organize members and permissions.
-                </DialogDescription>
-              </DialogHeader>
-
-              <form
-                onSubmit={(event) => {
-                  void handleCreateSubmit(event);
-                }}
-                className="space-y-4"
-              >
-                <div className="space-y-2">
-                  <Label htmlFor="create-name">Name</Label>
-                  <Input
-                    id="create-name"
-                    value={createForm.name}
-                    onChange={(event: ChangeEvent<HTMLInputElement>) => {
-                      setCreateForm((prev) => ({ ...prev, name: event.target.value }));
-                    }}
-                    placeholder="Platform Team"
-                    maxLength={100}
-                    required
-                  />
-                </div>
-
-                <div className="space-y-2">
-                  <Label htmlFor="create-description">Description</Label>
-                  <Textarea
-                    id="create-description"
-                    value={createForm.description}
-                    onChange={(event: ChangeEvent<HTMLTextAreaElement>) => {
-                      setCreateForm((prev) => ({ ...prev, description: event.target.value }));
-                    }}
-                    placeholder="Owns platform services and infrastructure"
-                    maxLength={500}
-                    rows={4}
-                  />
-                </div>
-
-                {createError ? (
-                  <p className="text-sm text-destructive" role="alert">
-                    {createError}
-                  </p>
-                ) : null}
-
-                <DialogFooter>
-                  <Button
-                    type="button"
-                    variant="outline"
-                    onClick={() => {
-                      if (!isCreating) {
-                        setIsCreateOpen(false);
-                        resetCreateForm();
-                      }
-                    }}
-                    disabled={isCreating}
-                  >
-                    Cancel
-                  </Button>
-                  <Button type="submit" disabled={isCreating}>
-                    {isCreating ? "Creating..." : "Create Team"}
-                  </Button>
-                </DialogFooter>
-              </form>
-            </DialogContent>
-          </Dialog>
         </div>
+        <p className="text-gray-600">Manage teams in your active workspace</p>
       </div>
 
-      <div>
+      <div className="bg-white rounded-lg shadow-sm border border-gray-200 p-6 mb-6">
-        <Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
+        <div className="flex items-center justify-between gap-4">
-          ← Back to Settings
+          <div>
-        </Link>
+            <h2 className="text-lg font-semibold text-gray-900">Create New Team</h2>
-      </div>
+            <p className="text-sm text-gray-600 mt-1">
-
+              Add a team to organize members and permissions.
-      {error ? (
-        <Card>
-          <CardContent className="py-4">
-            <p className="text-sm text-destructive" role="alert">
-              {error}
             </p>
-          </CardContent>
+          </div>
-        </Card>
+          <button
-      ) : null}
+            type="button"
+            onClick={() => {
+              setCreateError(null);
+              setIsCreateDialogOpen(true);
+            }}
+            className="px-6 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 font-medium"
+          >
+            Create Team
+          </button>
+        </div>
+      </div>
 
-      {isLoading ? (
+      {isCreateDialogOpen && (
-        <Card>
+        <div
-          <CardContent className="py-12 text-center text-muted-foreground">
+          className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 px-4"
-            Loading teams...
+          role="dialog"
-          </CardContent>
+        >
-        </Card>
+          <div className="w-full max-w-lg rounded-lg border border-gray-200 bg-white p-6 shadow-xl">
-      ) : teams.length === 0 ? (
+            <h3 className="text-lg font-semibold text-gray-900">Create New Team</h3>
-        <Card>
+            <p className="mt-1 text-sm text-gray-600">
-          <CardHeader>
+              Enter a team name and optional description.
-            <CardTitle>No Teams Yet</CardTitle>
+            </p>
-            <CardDescription>Create the first team to get started.</CardDescription>
-          </CardHeader>
-        </Card>
-      ) : (
-        <Card>
-          <CardHeader>
-            <CardTitle>Team Directory</CardTitle>
-            <CardDescription>
-              Click a team to view details or edit name and description.
-            </CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-3">
-            {teams.map((team) => {
-              const memberCount = team._count?.members ?? 0;
-              const description = team.description?.trim();
 
-              return (
+            <form onSubmit={handleCreateTeam} className="mt-4 space-y-4">
-                <div
+              <div>
-                  key={team.id}
+                <label htmlFor="team-name" className="mb-1 block text-sm font-medium text-gray-700">
-                  className="rounded-md border p-4 flex flex-col gap-3 md:flex-row md:items-center md:justify-between cursor-pointer hover:bg-muted/30"
+                  Team Name
-                  role="button"
+                </label>
-                  tabIndex={0}
+                <input
-                  onClick={() => {
+                  id="team-name"
-                    openTeamDetails(team);
+                  type="text"
-                  }}
+                  value={newTeamName}
-                  onKeyDown={(event) => {
+                  onChange={(e) => {
-                    handleTeamRowKeyDown(event, team);
+                    setNewTeamName(e.target.value);
                   }}
+                  placeholder="Enter team name..."
+                  disabled={isCreating}
+                  className="w-full rounded-lg border border-gray-300 px-4 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 disabled:bg-gray-100"
+                  autoFocus
+                />
+              </div>
+
+              <div>
+                <label
+                  htmlFor="team-description"
+                  className="mb-1 block text-sm font-medium text-gray-700"
                 >
-                  <div className="space-y-1 min-w-0">
+                  Description (optional)
-                    <p className="font-semibold truncate">{team.name}</p>
+                </label>
-                    <p className="text-sm text-muted-foreground truncate">
+                <textarea
-                      {description && description.length > 0 ? description : "No description"}
+                  id="team-description"
-                    </p>
+                  value={newTeamDescription}
-                  </div>
+                  onChange={(e) => {
+                    setNewTeamDescription(e.target.value);
+                  }}
+                  placeholder="Describe this team's purpose..."
+                  disabled={isCreating}
+                  rows={3}
+                  className="w-full rounded-lg border border-gray-300 px-4 py-2 focus:border-transparent focus:ring-2 focus:ring-blue-500 disabled:bg-gray-100"
+                />
+              </div>
 
-                  <div className="flex items-center gap-2 flex-wrap md:justify-end">
+              {createError !== null && (
-                    <Badge variant="outline">
+                <div className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
-                      <Users className="h-3.5 w-3.5 mr-1" />
+                  {createError}
-                      {toMemberLabel(memberCount)}
-                    </Badge>
-                    <Badge variant="secondary">
-                      Created {new Date(team.createdAt).toLocaleDateString()}
-                    </Badge>
-                    <Button
-                      variant="destructive"
-                      size="sm"
-                      onClick={(event) => {
-                        event.stopPropagation();
-                        setDeleteTarget(team);
-                      }}
-                    >
-                      <Trash2 className="h-4 w-4 mr-2" />
-                      Delete
-                    </Button>
-                  </div>
                 </div>
-              );
+              )}
-            })}
+
-          </CardContent>
+              <div className="flex justify-end gap-3">
-        </Card>
+                <button
+                  type="button"
+                  onClick={() => {
+                    if (!isCreating) {
+                      setIsCreateDialogOpen(false);
+                    }
+                  }}
+                  disabled={isCreating}
+                  className="px-4 py-2 rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-50 disabled:cursor-not-allowed"
+                >
+                  Cancel
+                </button>
+                <button
+                  type="submit"
+                  disabled={isCreating || !newTeamName.trim()}
+                  className="px-5 py-2 rounded-lg bg-blue-600 text-white font-medium hover:bg-blue-700 disabled:cursor-not-allowed disabled:opacity-50"
+                >
+                  {isCreating ? "Creating..." : "Create Team"}
+                </button>
+              </div>
+            </form>
+          </div>
+        </div>
       )}
 
-      <Dialog
+      <div className="space-y-4">
-        open={detailTarget !== null}
+        <h2 className="text-xl font-semibold text-gray-900">
-        onOpenChange={(open) => {
+          Your Teams ({isLoading ? "..." : teams.length})
-          if (!open && !isSavingDetails) {
+        </h2>
-            resetTeamDetails();
+        {loadError !== null ? (
-          }
+          <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-red-700">
-        }}
+            {loadError}
-      >
+          </div>
-        <DialogContent>
+        ) : isLoading ? (
-          <DialogHeader>
+          <div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center text-gray-600">
-            <DialogTitle>Team Details</DialogTitle>
+            Loading teams...
-            <DialogDescription>
+          </div>
-              Edit team details for {detailTarget?.name ?? "selected team"}.
+        ) : teams.length === 0 ? (
-            </DialogDescription>
+          <div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center">
-          </DialogHeader>
+            <svg
-
+              className="mx-auto h-12 w-12 text-gray-400 mb-4"
-          <form
+              fill="none"
-            onSubmit={(event) => {
+              stroke="currentColor"
-              void handleDetailSubmit(event);
+              viewBox="0 0 24 24"
-            }}
-            className="space-y-4"
-          >
-            <div className="space-y-2">
-              <Label htmlFor="detail-name">Name</Label>
-              <Input
-                id="detail-name"
-                value={detailForm.name}
-                onChange={(event: ChangeEvent<HTMLInputElement>) => {
-                  setDetailForm((prev) => ({ ...prev, name: event.target.value }));
-                }}
-                placeholder="Team name"
-                maxLength={100}
-                disabled={isSavingDetails}
-                required
-              />
-            </div>
-
-            <div className="space-y-2">
-              <Label htmlFor="detail-description">Description</Label>
-              <Textarea
-                id="detail-description"
-                value={detailForm.description}
-                onChange={(event: ChangeEvent<HTMLTextAreaElement>) => {
-                  setDetailForm((prev) => ({ ...prev, description: event.target.value }));
-                }}
-                placeholder="Describe this team"
-                maxLength={500}
-                rows={4}
-                disabled={isSavingDetails}
-              />
-            </div>
-
-            {detailError !== null ? (
-              <p className="text-sm text-destructive" role="alert">
-                {detailError}
-              </p>
-            ) : null}
-
-            <DialogFooter>
-              <Button
-                type="button"
-                variant="outline"
-                onClick={() => {
-                  if (!isSavingDetails) {
-                    resetTeamDetails();
-                  }
-                }}
-                disabled={isSavingDetails}
-              >
-                Cancel
-              </Button>
-              <Button type="submit" disabled={isSavingDetails}>
-                {isSavingDetails ? "Saving..." : "Save Changes"}
-              </Button>
-            </DialogFooter>
-          </form>
-        </DialogContent>
-      </Dialog>
-
-      <AlertDialog
-        open={deleteTarget !== null}
-        onOpenChange={(open) => {
-          if (!open && !isDeleting) {
-            setDeleteTarget(null);
-          }
-        }}
-      >
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>Delete Team</AlertDialogTitle>
-            <AlertDialogDescription>
-              Delete {deleteTarget?.name}? Team members will be removed from this team assignment.
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              disabled={isDeleting}
-              onClick={() => {
-                void confirmDelete();
-              }}
             >
-              {isDeleting ? "Deleting..." : "Delete Team"}
+              <path
-            </AlertDialogAction>
+                strokeLinecap="round"
-          </AlertDialogFooter>
+                strokeLinejoin="round"
-        </AlertDialogContent>
+                strokeWidth={2}
-      </AlertDialog>
+                d="M17 20h5V8H2v12h5m10 0v-4a3 3 0 10-6 0v4m6 0H7"
-    </div>
+              />
+            </svg>
+            <h3 className="text-lg font-medium text-gray-900 mb-2">No teams yet</h3>
+            <p className="text-gray-600">Create your first team to get started</p>
+          </div>
+        ) : (
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            {teams.map((team) => (
+              <article
+                key={team.id}
+                className="rounded-lg border border-gray-200 bg-white p-5 shadow-sm"
+                data-testid="team-card"
+              >
+                <h3 className="text-lg font-semibold text-gray-900">{team.name}</h3>
+                {team.description ? (
+                  <p className="mt-1 text-sm text-gray-600">{team.description}</p>
+                ) : (
+                  <p className="mt-1 text-sm text-gray-400 italic">No description</p>
+                )}
+                <div className="mt-4 flex items-center gap-3 text-xs text-gray-500">
+                  <span>{team._count?.members ?? 0} members</span>
+                  <span>|</span>
+                  <span>Created {new Date(team.createdAt).toLocaleDateString()}</span>
+                </div>
+              </article>
+            ))}
+          </div>
+        )}
+      </div>
+    </main>
   );
 }

apps/web/src/app/(authenticated)/settings/users/page.test.tsx

@@ -1,352 +0,0 @@
-import type { ReactElement, ReactNode } from "react";
-
-import { WorkspaceMemberRole } from "@mosaic/shared";
-import { render, screen, waitFor, within } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import {
-  type AdminUser,
-  deactivateUser,
-  fetchAdminUsers,
-  inviteUser,
-  updateUser,
-  type AdminUsersResponse,
-} from "@/lib/api/admin";
-import { useAuth } from "@/lib/auth/auth-context";
-import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
-import UsersSettingsPage from "./page";
-
-vi.mock("next/link", () => ({
-  default: function LinkMock({
-    children,
-    href,
-  }: {
-    children: ReactNode;
-    href: string;
-  }): ReactElement {
-    return <a href={href}>{children}</a>;
-  },
-}));
-
-vi.mock("@/lib/api/admin", () => ({
-  fetchAdminUsers: vi.fn(),
-  inviteUser: vi.fn(),
-  updateUser: vi.fn(),
-  deactivateUser: vi.fn(),
-}));
-
-vi.mock("@/lib/api/workspaces", () => ({
-  fetchUserWorkspaces: vi.fn(),
-  updateWorkspaceMemberRole: vi.fn(),
-}));
-
-vi.mock("@/lib/auth/auth-context", () => ({
-  useAuth: vi.fn(),
-}));
-
-const fetchAdminUsersMock = vi.mocked(fetchAdminUsers);
-const inviteUserMock = vi.mocked(inviteUser);
-const updateUserMock = vi.mocked(updateUser);
-const deactivateUserMock = vi.mocked(deactivateUser);
-const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
-const updateWorkspaceMemberRoleMock = vi.mocked(updateWorkspaceMemberRole);
-const useAuthMock = vi.mocked(useAuth);
-
-function makeAdminUser(overrides?: Partial<AdminUser>): AdminUser {
-  return {
-    id: "user-1",
-    name: "Alice",
-    email: "alice@example.com",
-    emailVerified: true,
-    image: null,
-    createdAt: "2026-01-01T00:00:00.000Z",
-    deactivatedAt: null,
-    isLocalAuth: false,
-    invitedAt: null,
-    invitedBy: null,
-    workspaceMemberships: [
-      {
-        workspaceId: "workspace-1",
-        workspaceName: "Personal Workspace",
-        role: WorkspaceMemberRole.ADMIN,
-        joinedAt: "2026-01-01T00:00:00.000Z",
-      },
-    ],
-    ...overrides,
-  };
-}
-
-function makeAdminUsersResponse(options?: {
-  data?: AdminUser[];
-  page?: number;
-  totalPages?: number;
-  total?: number;
-  limit?: number;
-}): AdminUsersResponse {
-  const data = options?.data ?? [makeAdminUser()];
-  return {
-    data,
-    meta: {
-      total: options?.total ?? data.length,
-      page: options?.page ?? 1,
-      limit: options?.limit ?? 50,
-      totalPages: options?.totalPages ?? 1,
-    },
-  };
-}
-
-function makeAuthState(userId: string): ReturnType<typeof useAuth> {
-  return {
-    user: { id: userId, email: `${userId}@example.com`, name: "Current User" },
-    isLoading: false,
-    isAuthenticated: true,
-    authError: null,
-    sessionExpiring: false,
-    sessionMinutesRemaining: 0,
-    signOut: vi.fn(() => Promise.resolve()),
-    refreshSession: vi.fn(() => Promise.resolve()),
-  };
-}
-
-describe("UsersSettingsPage", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-
-    const adminUsersResponse = makeAdminUsersResponse();
-
-    fetchAdminUsersMock.mockResolvedValue(adminUsersResponse);
-    fetchUserWorkspacesMock.mockResolvedValue([
-      {
-        id: "workspace-1",
-        name: "Personal Workspace",
-        ownerId: "owner-1",
-        role: WorkspaceMemberRole.OWNER,
-        createdAt: "2026-01-01T00:00:00.000Z",
-      },
-    ]);
-    inviteUserMock.mockResolvedValue({
-      userId: "user-2",
-      invitationToken: "token-1",
-      email: "new@example.com",
-      invitedAt: "2026-01-02T00:00:00.000Z",
-    });
-    const firstUser = adminUsersResponse.data[0] ?? makeAdminUser();
-
-    updateUserMock.mockResolvedValue(firstUser);
-    deactivateUserMock.mockResolvedValue(firstUser);
-    updateWorkspaceMemberRoleMock.mockResolvedValue({
-      workspaceId: "workspace-1",
-      userId: "user-1",
-      role: WorkspaceMemberRole.ADMIN,
-      joinedAt: "2026-01-01T00:00:00.000Z",
-      user: {
-        id: "user-1",
-        email: "alice@example.com",
-        name: "Alice",
-        image: null,
-      },
-    });
-
-    useAuthMock.mockReturnValue(makeAuthState("user-current"));
-  });
-
-  it("shows access denied to non-admin users", async () => {
-    fetchUserWorkspacesMock.mockResolvedValueOnce([
-      {
-        id: "workspace-1",
-        name: "Personal Workspace",
-        ownerId: "owner-1",
-        role: WorkspaceMemberRole.MEMBER,
-        createdAt: "2026-01-01T00:00:00.000Z",
-      },
-    ]);
-
-    render(<UsersSettingsPage />);
-
-    expect(await screen.findByText("Access Denied")).toBeInTheDocument();
-    expect(fetchAdminUsersMock).not.toHaveBeenCalled();
-  });
-
-  it("invites a user with email and role from the dialog", async () => {
-    const user = userEvent.setup();
-    render(<UsersSettingsPage />);
-
-    expect(await screen.findByText("User Directory")).toBeInTheDocument();
-
-    await user.click(screen.getByRole("button", { name: "Invite User" }));
-    await user.type(screen.getByLabelText("Email"), "new@example.com");
-    await user.click(screen.getByRole("button", { name: "Send Invite" }));
-
-    await waitFor(() => {
-      expect(inviteUserMock).toHaveBeenCalledWith({
-        email: "new@example.com",
-        role: WorkspaceMemberRole.MEMBER,
-        workspaceId: "workspace-1",
-      });
-    });
-  });
-
-  it("opens user detail dialog from row click and saves edited profile fields", async () => {
-    const user = userEvent.setup();
-    render(<UsersSettingsPage />);
-
-    expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
-
-    await user.click(screen.getByText("Alice"));
-
-    const nameInput = await screen.findByLabelText("Name");
-    await user.clear(nameInput);
-    await user.type(nameInput, "Alice Updated");
-
-    await user.click(screen.getByRole("button", { name: "Save Changes" }));
-
-    await waitFor(() => {
-      expect(updateUserMock).toHaveBeenCalledWith("user-1", { name: "Alice Updated" });
-    });
-
-    expect(updateWorkspaceMemberRoleMock).not.toHaveBeenCalled();
-  });
-
-  it("caps pagination to the last valid page after deactivation shrinks the dataset", async () => {
-    const user = userEvent.setup();
-    const pageOneUser = makeAdminUser({
-      id: "user-1",
-      name: "Alice",
-      email: "alice@example.com",
-    });
-    const pageTwoUser = makeAdminUser({
-      id: "user-2",
-      name: "Bob",
-      email: "bob@example.com",
-    });
-
-    fetchAdminUsersMock.mockReset();
-    const responses = [
-      {
-        expectedPage: 1,
-        response: makeAdminUsersResponse({
-          data: [pageOneUser],
-          page: 1,
-          totalPages: 2,
-          total: 2,
-        }),
-      },
-      {
-        expectedPage: 2,
-        response: makeAdminUsersResponse({
-          data: [pageTwoUser],
-          page: 2,
-          totalPages: 2,
-          total: 2,
-        }),
-      },
-      {
-        expectedPage: 2,
-        response: makeAdminUsersResponse({
-          data: [],
-          page: 2,
-          totalPages: 1,
-          total: 1,
-        }),
-      },
-      {
-        expectedPage: 1,
-        response: makeAdminUsersResponse({
-          data: [pageOneUser],
-          page: 1,
-          totalPages: 1,
-          total: 1,
-        }),
-      },
-    ];
-
-    fetchAdminUsersMock.mockImplementation((page = 1) => {
-      const next = responses.shift();
-      if (!next) {
-        throw new Error("Unexpected fetchAdminUsers call in pagination-cap test");
-      }
-
-      expect(page).toBe(next.expectedPage);
-      return Promise.resolve(next.response);
-    });
-
-    render(<UsersSettingsPage />);
-
-    expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
-
-    await user.click(screen.getByRole("button", { name: "Next" }));
-    expect(await screen.findByText("bob@example.com")).toBeInTheDocument();
-
-    const pageTwoRow = screen.getByText("bob@example.com").closest('[role="button"]');
-    if (!(pageTwoRow instanceof HTMLElement)) {
-      throw new Error("Expected Bob's row to exist");
-    }
-
-    await user.click(within(pageTwoRow).getByRole("button", { name: "Deactivate" }));
-    const deactivateButtons = await screen.findAllByRole("button", { name: "Deactivate" });
-    const confirmDeactivateButton = deactivateButtons[deactivateButtons.length - 1];
-    if (!confirmDeactivateButton) {
-      throw new Error("Expected confirmation deactivate button to be rendered");
-    }
-    await user.click(confirmDeactivateButton);
-
-    expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
-    expect(screen.queryByText("No Users Yet")).not.toBeInTheDocument();
-    expect(deactivateUserMock).toHaveBeenCalledWith("user-2");
-    const requestedPages = fetchAdminUsersMock.mock.calls.map(([requestedPage]) => requestedPage);
-    expect(requestedPages.slice(-2)).toEqual([2, 1]);
-  });
-
-  it("shows the API error state without rendering the empty-state message", async () => {
-    fetchAdminUsersMock.mockRejectedValueOnce(new Error("Unable to load users"));
-
-    render(<UsersSettingsPage />);
-
-    expect(await screen.findByText("Unable to load users")).toBeInTheDocument();
-    expect(screen.queryByText("No Users Yet")).not.toBeInTheDocument();
-    expect(screen.queryByText("Invite the first user to get started.")).not.toBeInTheDocument();
-  });
-
-  it("prevents the current user from deactivating their own account", async () => {
-    useAuthMock.mockReturnValue(makeAuthState("user-1"));
-
-    const selfUser = makeAdminUser({
-      id: "user-1",
-      name: "Alice",
-      email: "alice@example.com",
-    });
-    const otherUser = makeAdminUser({
-      id: "user-2",
-      name: "Bob",
-      email: "bob@example.com",
-    });
-
-    fetchAdminUsersMock.mockResolvedValueOnce(
-      makeAdminUsersResponse({
-        data: [selfUser, otherUser],
-        page: 1,
-        totalPages: 1,
-        total: 2,
-      })
-    );
-
-    render(<UsersSettingsPage />);
-
-    expect(await screen.findByText("alice@example.com")).toBeInTheDocument();
-    expect(screen.getByText("bob@example.com")).toBeInTheDocument();
-
-    const selfRow = screen.getByText("alice@example.com").closest('[role="button"]');
-    if (!(selfRow instanceof HTMLElement)) {
-      throw new Error("Expected current-user row to exist");
-    }
-    expect(within(selfRow).queryByRole("button", { name: "Deactivate" })).not.toBeInTheDocument();
-
-    const otherRow = screen.getByText("bob@example.com").closest('[role="button"]');
-    if (!(otherRow instanceof HTMLElement)) {
-      throw new Error("Expected other-user row to exist");
-    }
-    expect(within(otherRow).getByRole("button", { name: "Deactivate" })).toBeInTheDocument();
-    expect(deactivateUserMock).not.toHaveBeenCalled();
-  });
-});

apps/web/src/app/(authenticated)/settings/users/page.tsx

@@ -5,14 +5,12 @@ import {
   useEffect,
   useState,
   type ChangeEvent,
-  type KeyboardEvent,
   type ReactElement,
   type SyntheticEvent,
 } from "react";
 import Link from "next/link";
-import { UserPlus, UserX } from "lucide-react";
+import { Pencil, UserPlus, UserX } from "lucide-react";
 import { WorkspaceMemberRole } from "@mosaic/shared";
-import { isValidEmail } from "@/components/workspace/validation";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
@@ -44,6 +42,7 @@ import {
   AlertDialogHeader,
   AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
+import { fetchUserWorkspaces } from "@/lib/api/workspaces";
 import {
   deactivateUser,
   fetchAdminUsers,
@@ -51,13 +50,9 @@ import {
   updateUser,
   type AdminUser,
   type AdminUsersResponse,
-  type AdminWorkspaceMembership,
   type InviteUserDto,
   type UpdateUserDto,
 } from "@/lib/api/admin";
-import { useAuth } from "@/lib/auth/auth-context";
-import { fetchUserWorkspaces, updateWorkspaceMemberRole } from "@/lib/api/workspaces";
-import { SettingsAccessDenied } from "@/components/settings/SettingsAccessDenied";
 
 const ROLE_PRIORITY: Record<WorkspaceMemberRole, number> = {
   [WorkspaceMemberRole.OWNER]: 4,
@@ -68,99 +63,74 @@ const ROLE_PRIORITY: Record<WorkspaceMemberRole, number> = {
 
 const INITIAL_INVITE_FORM = {
   email: "",
-  role: WorkspaceMemberRole.MEMBER,
-};
-
-const INITIAL_DETAIL_FORM = {
   name: "",
-  email: "",
+  workspaceId: "",
   role: WorkspaceMemberRole.MEMBER,
-  workspaceId: null as string | null,
-  workspaceName: null as string | null,
 };
-const USERS_PAGE_SIZE = 50;
-
-interface DetailInitialState {
-  name: string;
-  email: string;
-  role: WorkspaceMemberRole;
-  workspaceId: string | null;
-}
 
 function toRoleLabel(role: WorkspaceMemberRole): string {
   return `${role.charAt(0)}${role.slice(1).toLowerCase()}`;
 }
 
-function getPrimaryMembership(user: AdminUser): AdminWorkspaceMembership | null {
+function getPrimaryRole(user: AdminUser): WorkspaceMemberRole | null {
   const [firstMembership, ...restMemberships] = user.workspaceMemberships;
   if (!firstMembership) {
     return null;
   }
 
   return restMemberships.reduce((highest, membership) => {
-    if (ROLE_PRIORITY[membership.role] > ROLE_PRIORITY[highest.role]) {
+    if (ROLE_PRIORITY[membership.role] > ROLE_PRIORITY[highest]) {
-      return membership;
+      return membership.role;
     }
     return highest;
-  }, firstMembership);
+  }, firstMembership.role);
 }
 
 export default function UsersSettingsPage(): ReactElement {
-  const { user: authUser } = useAuth();
-
   const [users, setUsers] = useState<AdminUser[]>([]);
   const [meta, setMeta] = useState<AdminUsersResponse["meta"] | null>(null);
-  const [page, setPage] = useState<number>(1);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
 
-  const [defaultWorkspaceId, setDefaultWorkspaceId] = useState<string | null>(null);
-  const [isAdmin, setIsAdmin] = useState<boolean | null>(null);
-
   const [isInviteOpen, setIsInviteOpen] = useState<boolean>(false);
   const [inviteForm, setInviteForm] = useState(INITIAL_INVITE_FORM);
   const [inviteError, setInviteError] = useState<string | null>(null);
   const [isInviting, setIsInviting] = useState<boolean>(false);
 
-  const [detailTarget, setDetailTarget] = useState<AdminUser | null>(null);
-  const [detailForm, setDetailForm] = useState(INITIAL_DETAIL_FORM);
-  const [detailInitial, setDetailInitial] = useState<DetailInitialState | null>(null);
-  const [detailError, setDetailError] = useState<string | null>(null);
-  const [isSavingDetails, setIsSavingDetails] = useState<boolean>(false);
-
   const [deactivateTarget, setDeactivateTarget] = useState<AdminUser | null>(null);
   const [isDeactivating, setIsDeactivating] = useState<boolean>(false);
 
-  const loadUsers = useCallback(
+  const [editTarget, setEditTarget] = useState<AdminUser | null>(null);
-    async (showLoadingState: boolean): Promise<void> => {
+  const [editName, setEditName] = useState<string>("");
-      try {
+  const [editError, setEditError] = useState<string | null>(null);
-        if (showLoadingState) {
+  const [isEditing, setIsEditing] = useState<boolean>(false);
-          setIsLoading(true);
-        } else {
-          setIsRefreshing(true);
-        }
 
-        const response = await fetchAdminUsers(page, USERS_PAGE_SIZE);
+  const [isAdmin, setIsAdmin] = useState<boolean | null>(null);
-        const lastValidPage = Math.max(1, response.meta.totalPages);
 
-        if (page > lastValidPage) {
+  const loadUsers = useCallback(async (showLoadingState: boolean): Promise<void> => {
-          setPage(lastValidPage);
+    try {
-          return;
+      if (showLoadingState) {
-        }
+        setIsLoading(true);
-
+      } else {
-        setUsers(response.data);
+        setIsRefreshing(true);
-        setMeta(response.meta);
-        setError(null);
-      } catch (err: unknown) {
-        setError(err instanceof Error ? err.message : "Failed to load admin users");
-      } finally {
-        setIsLoading(false);
-        setIsRefreshing(false);
       }
-    },
+
-    [page]
+      const response = await fetchAdminUsers(1, 50);
-  );
+      setUsers(response.data);
+      setMeta(response.meta);
+      setError(null);
+    } catch (err: unknown) {
+      setError(err instanceof Error ? err.message : "Failed to load admin users");
+    } finally {
+      setIsLoading(false);
+      setIsRefreshing(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    void loadUsers(true);
+  }, [loadUsers]);
 
   useEffect(() => {
     fetchUserWorkspaces()
@@ -169,67 +139,27 @@ export default function UsersSettingsPage(): ReactElement {
           WorkspaceMemberRole.OWNER,
           WorkspaceMemberRole.ADMIN,
         ];
-
+        setIsAdmin(workspaces.some((ws) => adminRoles.includes(ws.role)));
-        setDefaultWorkspaceId(workspaces[0]?.id ?? null);
-        setIsAdmin(workspaces.some((workspace) => adminRoles.includes(workspace.role)));
       })
       .catch(() => {
-        setDefaultWorkspaceId(null);
         setIsAdmin(true); // fail open
       });
   }, []);
 
-  useEffect(() => {
-    if (isAdmin !== true) {
-      return;
-    }
-
-    void loadUsers(true);
-  }, [isAdmin, loadUsers, page]);
-
   function resetInviteForm(): void {
     setInviteForm(INITIAL_INVITE_FORM);
     setInviteError(null);
   }
 
-  function openUserDetails(user: AdminUser): void {
+  function handleInviteOpenChange(open: boolean): void {
-    const primaryMembership = getPrimaryMembership(user);
+    if (!open && !isInviting) {
-
+      resetInviteForm();
-    const nextDetailForm = {
-      name: user.name,
-      email: user.email,
-      role: primaryMembership?.role ?? WorkspaceMemberRole.MEMBER,
-      workspaceId: primaryMembership?.workspaceId ?? null,
-      workspaceName: primaryMembership?.workspaceName ?? null,
-    };
-
-    setDetailTarget(user);
-    setDetailForm(nextDetailForm);
-    setDetailInitial({
-      name: nextDetailForm.name,
-      email: nextDetailForm.email,
-      role: nextDetailForm.role,
-      workspaceId: nextDetailForm.workspaceId,
-    });
-    setDetailError(null);
-  }
-
-  function resetUserDetails(): void {
-    setDetailTarget(null);
-    setDetailForm(INITIAL_DETAIL_FORM);
-    setDetailInitial(null);
-    setDetailError(null);
-  }
-
-  function handleUserRowKeyDown(event: KeyboardEvent<HTMLDivElement>, user: AdminUser): void {
-    if (event.key === "Enter" || event.key === " ") {
-      event.preventDefault();
-      openUserDetails(user);
     }
+    setIsInviteOpen(open);
   }
 
-  async function handleInviteSubmit(event: SyntheticEvent): Promise<void> {
+  async function handleInviteSubmit(e: SyntheticEvent): Promise<void> {
-    event.preventDefault();
+    e.preventDefault();
     setInviteError(null);
 
     const email = inviteForm.email.trim();
@@ -238,18 +168,17 @@ export default function UsersSettingsPage(): ReactElement {
       return;
     }
 
-    if (!isValidEmail(email)) {
+    const dto: InviteUserDto = { email };
-      setInviteError("Please enter a valid email address.");
+
-      return;
+    const name = inviteForm.name.trim();
+    if (name) {
+      dto.name = name;
     }
 
-    const dto: InviteUserDto = {
+    const workspaceId = inviteForm.workspaceId.trim();
-      email,
+    if (workspaceId) {
-      role: inviteForm.role,
+      dto.workspaceId = workspaceId;
-    };
+      dto.role = inviteForm.role;
-
-    if (defaultWorkspaceId) {
-      dto.workspaceId = defaultWorkspaceId;
     }
 
     try {
@@ -265,86 +194,11 @@ export default function UsersSettingsPage(): ReactElement {
     }
   }
 
-  async function handleDetailSubmit(event: SyntheticEvent): Promise<void> {
-    event.preventDefault();
-
-    if (detailTarget === null || detailInitial === null) {
-      return;
-    }
-
-    const name = detailForm.name.trim();
-    const email = detailForm.email.trim();
-
-    if (!name) {
-      setDetailError("Name is required.");
-      return;
-    }
-
-    if (!email) {
-      setDetailError("Email is required.");
-      return;
-    }
-
-    if (!isValidEmail(email)) {
-      setDetailError("Please enter a valid email address.");
-      return;
-    }
-
-    const didUpdateUser = name !== detailInitial.name || email !== detailInitial.email;
-    const didUpdateRole =
-      detailForm.workspaceId !== null &&
-      detailForm.workspaceId === detailInitial.workspaceId &&
-      detailForm.role !== detailInitial.role;
-
-    if (!didUpdateUser && !didUpdateRole) {
-      resetUserDetails();
-      return;
-    }
-
-    try {
-      setIsSavingDetails(true);
-      setDetailError(null);
-
-      if (didUpdateUser) {
-        const dto: UpdateUserDto = {};
-
-        if (name !== detailInitial.name) {
-          dto.name = name;
-        }
-
-        if (email !== detailInitial.email) {
-          dto.email = email;
-        }
-
-        await updateUser(detailTarget.id, dto);
-      }
-
-      if (didUpdateRole && detailForm.workspaceId !== null) {
-        await updateWorkspaceMemberRole(detailForm.workspaceId, detailTarget.id, {
-          role: detailForm.role,
-        });
-      }
-
-      resetUserDetails();
-      await loadUsers(false);
-    } catch (err: unknown) {
-      setDetailError(err instanceof Error ? err.message : "Failed to update user");
-    } finally {
-      setIsSavingDetails(false);
-    }
-  }
-
   async function confirmDeactivate(): Promise<void> {
     if (!deactivateTarget) {
       return;
     }
 
-    if (authUser?.id === deactivateTarget.id) {
-      setDeactivateTarget(null);
-      setError("You cannot deactivate your own account.");
-      return;
-    }
-
     try {
       setIsDeactivating(true);
       await deactivateUser(deactivateTarget.id);
@@ -358,18 +212,32 @@ export default function UsersSettingsPage(): ReactElement {
     }
   }
 
-  if (isAdmin === null) {
+  async function handleEditSubmit(): Promise<void> {
-    return (
+    if (editTarget === null) return;
-      <Card className="max-w-2xl mx-auto mt-8">
+    setIsEditing(true);
-        <CardContent className="py-12 text-center text-muted-foreground">
+    setEditError(null);
-          Checking permissions...
+    try {
-        </CardContent>
+      const dto: UpdateUserDto = {};
-      </Card>
+      if (editName.trim()) dto.name = editName.trim();
-    );
+      await updateUser(editTarget.id, dto);
+      setEditTarget(null);
+      await loadUsers(false);
+    } catch (err: unknown) {
+      setEditError(err instanceof Error ? err.message : "Failed to update user");
+    } finally {
+      setIsEditing(false);
+    }
   }
 
-  if (!isAdmin) {
+  if (isAdmin === false) {
-    return <SettingsAccessDenied message="You need Admin or Owner role to manage users." />;
+    return (
+      <div className="p-8 max-w-2xl">
+        <div className="rounded-lg border border-red-200 bg-red-50 p-6 text-center">
+          <p className="text-lg font-semibold text-red-700">Access Denied</p>
+          <p className="mt-2 text-sm text-red-600">You need Admin or Owner role to manage users.</p>
+        </div>
+      </div>
+    );
   }
 
   return (
@@ -394,15 +262,7 @@ export default function UsersSettingsPage(): ReactElement {
             {isRefreshing ? "Refreshing..." : "Refresh"}
           </Button>
 
-          <Dialog
+          <Dialog open={isInviteOpen} onOpenChange={handleInviteOpenChange}>
-            open={isInviteOpen}
-            onOpenChange={(open) => {
-              if (!open && !isInviting) {
-                resetInviteForm();
-              }
-              setIsInviteOpen(open);
-            }}
-          >
             <DialogTrigger asChild>
               <Button>
                 <UserPlus className="h-4 w-4 mr-2" />
@@ -413,13 +273,13 @@ export default function UsersSettingsPage(): ReactElement {
               <DialogHeader>
                 <DialogTitle>Invite User</DialogTitle>
                 <DialogDescription>
-                  Invite a new user and assign their role for your default workspace.
+                  Create an invited account and optionally assign workspace access.
                 </DialogDescription>
               </DialogHeader>
 
               <form
-                onSubmit={(event) => {
+                onSubmit={(e) => {
-                  void handleInviteSubmit(event);
+                  void handleInviteSubmit(e);
                 }}
                 className="space-y-4"
               >
@@ -429,8 +289,8 @@ export default function UsersSettingsPage(): ReactElement {
                     id="invite-email"
                     type="email"
                     value={inviteForm.email}
-                    onChange={(event: ChangeEvent<HTMLInputElement>) => {
+                    onChange={(e: ChangeEvent<HTMLInputElement>) => {
-                      setInviteForm((prev) => ({ ...prev, email: event.target.value }));
+                      setInviteForm((prev) => ({ ...prev, email: e.target.value }));
                     }}
                     placeholder="user@example.com"
                     maxLength={255}
@@ -438,6 +298,33 @@ export default function UsersSettingsPage(): ReactElement {
                   />
                 </div>
 
+                <div className="space-y-2">
+                  <Label htmlFor="invite-name">Name (optional)</Label>
+                  <Input
+                    id="invite-name"
+                    type="text"
+                    value={inviteForm.name}
+                    onChange={(e: ChangeEvent<HTMLInputElement>) => {
+                      setInviteForm((prev) => ({ ...prev, name: e.target.value }));
+                    }}
+                    placeholder="Jane Doe"
+                    maxLength={255}
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <Label htmlFor="invite-workspace-id">Workspace ID (optional)</Label>
+                  <Input
+                    id="invite-workspace-id"
+                    type="text"
+                    value={inviteForm.workspaceId}
+                    onChange={(e: ChangeEvent<HTMLInputElement>) => {
+                      setInviteForm((prev) => ({ ...prev, workspaceId: e.target.value }));
+                    }}
+                    placeholder="UUID workspace id"
+                  />
+                </div>
+
                 <div className="space-y-2">
                   <Label htmlFor="invite-role">Role</Label>
                   <Select
@@ -457,13 +344,9 @@ export default function UsersSettingsPage(): ReactElement {
                       ))}
                     </SelectContent>
                   </Select>
-                  {defaultWorkspaceId ? (
+                  <p className="text-xs text-muted-foreground">
-                    <p className="text-xs text-muted-foreground">Role will be applied on invite.</p>
+                    Role is only applied when workspace ID is provided.
-                  ) : (
+                  </p>
-                    <p className="text-xs text-muted-foreground">
-                      No default workspace found. User will be invited without workspace assignment.
-                    </p>
-                  )}
                 </div>
 
                 {inviteError ? (
@@ -477,10 +360,7 @@ export default function UsersSettingsPage(): ReactElement {
                     type="button"
                     variant="outline"
                     onClick={() => {
-                      if (!isInviting) {
+                      handleInviteOpenChange(false);
-                        setIsInviteOpen(false);
-                        resetInviteForm();
-                      }
                     }}
                     disabled={isInviting}
                   >
@@ -502,13 +382,7 @@ export default function UsersSettingsPage(): ReactElement {
         </Link>
       </div>
 
-      {isLoading ? (
+      {error ? (
-        <Card>
-          <CardContent className="py-12 text-center text-muted-foreground">
-            Loading users...
-          </CardContent>
-        </Card>
-      ) : error ? (
         <Card>
           <CardContent className="py-4">
             <p className="text-sm text-destructive" role="alert">
@@ -516,6 +390,14 @@ export default function UsersSettingsPage(): ReactElement {
             </p>
           </CardContent>
         </Card>
+      ) : null}
+
+      {isLoading ? (
+        <Card>
+          <CardContent className="py-12 text-center text-muted-foreground">
+            Loading users...
+          </CardContent>
+        </Card>
       ) : users.length === 0 ? (
         <Card>
           <CardHeader>
@@ -527,52 +409,47 @@ export default function UsersSettingsPage(): ReactElement {
         <Card>
           <CardHeader>
             <CardTitle>User Directory</CardTitle>
-            <CardDescription>Click a user to view details or edit profile fields.</CardDescription>
+            <CardDescription>Name, email, role, and account status.</CardDescription>
           </CardHeader>
           <CardContent className="space-y-3">
             {users.map((user) => {
-              const primaryMembership = getPrimaryMembership(user);
+              const primaryRole = getPrimaryRole(user);
               const isActive = user.deactivatedAt === null;
-              const isCurrentUser = authUser?.id === user.id;
 
               return (
                 <div
                   key={user.id}
-                  className="rounded-md border p-4 flex flex-col gap-3 md:flex-row md:items-center md:justify-between cursor-pointer hover:bg-muted/30"
+                  className="rounded-md border p-4 flex flex-col gap-3 md:flex-row md:items-center md:justify-between"
-                  role="button"
-                  tabIndex={0}
-                  onClick={() => {
-                    openUserDetails(user);
-                  }}
-                  onKeyDown={(event) => {
-                    handleUserRowKeyDown(event, user);
-                  }}
                 >
                   <div className="space-y-1 min-w-0">
-                    <p className="font-semibold truncate">
+                    <p className="font-semibold truncate">{user.name || "Unnamed User"}</p>
-                      {user.name || "Unnamed User"}
-                      {isCurrentUser ? (
-                        <span className="ml-2 text-xs font-normal text-muted-foreground">
-                          (You)
-                        </span>
-                      ) : null}
-                    </p>
                     <p className="text-sm text-muted-foreground truncate">{user.email}</p>
                   </div>
 
                   <div className="flex items-center gap-2 flex-wrap md:justify-end">
                     <Badge variant="outline">
-                      {primaryMembership ? toRoleLabel(primaryMembership.role) : "No role"}
+                      {primaryRole ? toRoleLabel(primaryRole) : "No role"}
                     </Badge>
                     <Badge variant={isActive ? "secondary" : "destructive"}>
                       {isActive ? "Active" : "Inactive"}
                     </Badge>
-                    {isActive && !isCurrentUser ? (
+                    <Button
+                      variant="outline"
+                      size="sm"
+                      onClick={() => {
+                        setEditTarget(user);
+                        setEditName(user.name);
+                        setEditError(null);
+                      }}
+                    >
+                      <Pencil className="h-4 w-4 mr-2" />
+                      Edit Role
+                    </Button>
+                    {isActive ? (
                       <Button
                         variant="destructive"
                         size="sm"
-                        onClick={(event) => {
+                        onClick={() => {
-                          event.stopPropagation();
                           setDeactivateTarget(user);
                         }}
                       >
@@ -584,151 +461,10 @@ export default function UsersSettingsPage(): ReactElement {
                 </div>
               );
             })}
-
-            {meta && meta.totalPages > 1 ? (
-              <div className="flex items-center justify-between pt-3 mt-1 border-t">
-                <p className="text-sm text-muted-foreground">
-                  Page {page} of {meta.totalPages}
-                </p>
-                <div className="flex gap-2">
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    disabled={page === 1}
-                    onClick={() => {
-                      setPage((previousPage) => Math.max(1, previousPage - 1));
-                    }}
-                  >
-                    Previous
-                  </Button>
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    disabled={page >= meta.totalPages}
-                    onClick={() => {
-                      setPage((previousPage) => Math.min(meta.totalPages, previousPage + 1));
-                    }}
-                  >
-                    Next
-                  </Button>
-                </div>
-              </div>
-            ) : null}
           </CardContent>
         </Card>
       )}
 
-      <Dialog
-        open={detailTarget !== null}
-        onOpenChange={(open) => {
-          if (!open && !isSavingDetails) {
-            resetUserDetails();
-          }
-        }}
-      >
-        <DialogContent>
-          <DialogHeader>
-            <DialogTitle>User Details</DialogTitle>
-            <DialogDescription>
-              Edit profile details for {detailTarget?.email ?? "selected user"}.
-            </DialogDescription>
-          </DialogHeader>
-
-          <form
-            onSubmit={(event) => {
-              void handleDetailSubmit(event);
-            }}
-            className="space-y-4"
-          >
-            <div className="space-y-2">
-              <Label htmlFor="detail-name">Name</Label>
-              <Input
-                id="detail-name"
-                value={detailForm.name}
-                onChange={(event: ChangeEvent<HTMLInputElement>) => {
-                  setDetailForm((prev) => ({ ...prev, name: event.target.value }));
-                }}
-                placeholder="Full name"
-                maxLength={255}
-                disabled={isSavingDetails}
-                required
-              />
-            </div>
-
-            <div className="space-y-2">
-              <Label htmlFor="detail-email">Email</Label>
-              <Input
-                id="detail-email"
-                type="email"
-                value={detailForm.email}
-                onChange={(event: ChangeEvent<HTMLInputElement>) => {
-                  setDetailForm((prev) => ({ ...prev, email: event.target.value }));
-                }}
-                placeholder="user@example.com"
-                maxLength={255}
-                disabled={isSavingDetails}
-                required
-              />
-            </div>
-
-            <div className="space-y-2">
-              <Label htmlFor="detail-role">Role</Label>
-              <Select
-                value={detailForm.role}
-                disabled={detailForm.workspaceId === null || isSavingDetails}
-                onValueChange={(value) => {
-                  setDetailForm((prev) => ({ ...prev, role: value as WorkspaceMemberRole }));
-                }}
-              >
-                <SelectTrigger id="detail-role">
-                  <SelectValue placeholder="Select role" />
-                </SelectTrigger>
-                <SelectContent>
-                  {Object.values(WorkspaceMemberRole).map((role) => (
-                    <SelectItem key={role} value={role}>
-                      {toRoleLabel(role)}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              {detailForm.workspaceName ? (
-                <p className="text-xs text-muted-foreground">
-                  Role updates apply to: {detailForm.workspaceName}
-                </p>
-              ) : (
-                <p className="text-xs text-muted-foreground">
-                  This user has no workspace membership. Role cannot be updated.
-                </p>
-              )}
-            </div>
-
-            {detailError !== null ? (
-              <p className="text-sm text-destructive" role="alert">
-                {detailError}
-              </p>
-            ) : null}
-
-            <DialogFooter>
-              <Button
-                type="button"
-                variant="outline"
-                onClick={() => {
-                  if (!isSavingDetails) {
-                    resetUserDetails();
-                  }
-                }}
-                disabled={isSavingDetails}
-              >
-                Cancel
-              </Button>
-              <Button type="submit" disabled={isSavingDetails}>
-                {isSavingDetails ? "Saving..." : "Save Changes"}
-              </Button>
-            </DialogFooter>
-          </form>
-        </DialogContent>
-      </Dialog>
-
       <AlertDialog
         open={deactivateTarget !== null}
         onOpenChange={(open) => {
@@ -760,4 +496,55 @@ export default function UsersSettingsPage(): ReactElement {
       </AlertDialog>
     </div>
   );
+
+  <Dialog
+    open={editTarget !== null}
+    onOpenChange={(open) => {
+      if (!open && !isEditing) {
+        setEditTarget(null);
+        setEditError(null);
+      }
+    }}
+  >
+    <DialogContent>
+      <DialogHeader>
+        <DialogTitle>Edit User Role</DialogTitle>
+        <DialogDescription>Change role for {editTarget?.email ?? "user"}.</DialogDescription>
+      </DialogHeader>
+      <div className="space-y-4 py-2">
+        {editError !== null ? <p className="text-sm text-destructive">{editError}</p> : null}
+        <div className="space-y-2">
+          <Label htmlFor="edit-name">Display Name</Label>
+          <Input
+            id="edit-name"
+            value={editName}
+            onChange={(e: ChangeEvent<HTMLInputElement>) => {
+              setEditName(e.target.value);
+            }}
+            placeholder="Full name"
+            disabled={isEditing}
+          />
+        </div>
+      </div>
+      <DialogFooter>
+        <Button
+          variant="outline"
+          onClick={() => {
+            setEditTarget(null);
+          }}
+          disabled={isEditing}
+        >
+          Cancel
+        </Button>
+        <Button
+          onClick={() => {
+            void handleEditSubmit();
+          }}
+          disabled={isEditing}
+        >
+          {isEditing ? "Saving..." : "Save"}
+        </Button>
+      </DialogFooter>
+    </DialogContent>
+  </Dialog>;
 }

apps/web/src/app/(authenticated)/settings/workspaces/page.test.tsx

@@ -1,12 +1,12 @@
-import type { UserWorkspace, WorkspaceMemberEntry } from "@/lib/api/workspaces";
+import type { UserWorkspace } from "@/lib/api/workspaces";
 import type { ReactElement, ReactNode } from "react";
 
 import { WorkspaceMemberRole } from "@mosaic/shared";
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createWorkspace, fetchUserWorkspaces } from "@/lib/api/workspaces";
 
-import { createWorkspace, fetchUserWorkspaces, fetchWorkspaceMembers } from "@/lib/api/workspaces";
 import WorkspacesPage from "./page";
 
 vi.mock("next/link", () => ({
@@ -21,23 +21,33 @@ vi.mock("next/link", () => ({
   },
 }));
 
+vi.mock("@/components/workspace/WorkspaceCard", () => ({
+  WorkspaceCard: function WorkspaceCardMock({
+    workspace,
+    userRole,
+    memberCount,
+  }: {
+    workspace: { name: string };
+    userRole: WorkspaceMemberRole;
+    memberCount: number;
+  }): ReactElement {
+    return (
+      <div data-testid="workspace-card">
+        {workspace.name} | {userRole} | {String(memberCount)}
+      </div>
+    );
+  },
+}));
+
 vi.mock("@/lib/api/workspaces", () => ({
   fetchUserWorkspaces: vi.fn(),
   createWorkspace: vi.fn(),
-  fetchWorkspaceMembers: vi.fn(),
-  addWorkspaceMember: vi.fn(),
-  removeWorkspaceMember: vi.fn(),
-}));
-
-vi.mock("@/lib/api/admin", () => ({
-  fetchAdminUsers: vi.fn(),
 }));
 
 const fetchUserWorkspacesMock = vi.mocked(fetchUserWorkspaces);
 const createWorkspaceMock = vi.mocked(createWorkspace);
-const fetchWorkspaceMembersMock = vi.mocked(fetchWorkspaceMembers);
 
-const workspaceA: UserWorkspace = {
+const baseWorkspace: UserWorkspace = {
   id: "workspace-1",
   name: "Personal Workspace",
   ownerId: "owner-1",
@@ -45,93 +55,45 @@ const workspaceA: UserWorkspace = {
   createdAt: "2026-01-01T00:00:00.000Z",
 };
 
-const workspaceB: UserWorkspace = {
-  id: "workspace-2",
-  name: "Client Workspace",
-  ownerId: "owner-2",
-  role: WorkspaceMemberRole.ADMIN,
-  createdAt: "2026-01-02T00:00:00.000Z",
-};
-
-const membersA: WorkspaceMemberEntry[] = [
-  {
-    workspaceId: "workspace-1",
-    userId: "user-a",
-    role: WorkspaceMemberRole.OWNER,
-    joinedAt: "2026-01-03T00:00:00.000Z",
-    user: {
-      id: "user-a",
-      email: "alice@example.com",
-      name: "Alice",
-      image: null,
-    },
-  },
-];
-
-const membersB: WorkspaceMemberEntry[] = [
-  {
-    workspaceId: "workspace-2",
-    userId: "user-b",
-    role: WorkspaceMemberRole.MEMBER,
-    joinedAt: "2026-01-04T00:00:00.000Z",
-    user: {
-      id: "user-b",
-      email: "bob@example.com",
-      name: "Bob",
-      image: null,
-    },
-  },
-];
-
 describe("WorkspacesPage", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it("loads workspaces and fetches members for the first workspace", async () => {
+  it("loads and renders user workspaces from the API", async () => {
-    fetchUserWorkspacesMock.mockResolvedValue([workspaceA, workspaceB]);
+    fetchUserWorkspacesMock.mockResolvedValue([baseWorkspace]);
-    fetchWorkspaceMembersMock.mockResolvedValue(membersA);
 
     render(<WorkspacesPage />);
 
-    expect(await screen.findByText("Your Workspaces (2)")).toBeInTheDocument();
+    expect(screen.getByText("Loading workspaces...")).toBeInTheDocument();
-    expect(await screen.findByText("Personal Workspace Members")).toBeInTheDocument();
 
-    await waitFor(() => {
+    expect(await screen.findByText("Your Workspaces (1)")).toBeInTheDocument();
-      expect(fetchWorkspaceMembersMock).toHaveBeenCalledWith("workspace-1");
+    expect(screen.getByTestId("workspace-card")).toHaveTextContent("Personal Workspace");
-    });
+    expect(fetchUserWorkspacesMock).toHaveBeenCalledTimes(1);
-
-    expect(screen.getByText("alice@example.com")).toBeInTheDocument();
   });
 
-  it("switches selected workspace and reloads member list", async () => {
+  it("shows fetch errors in the UI", async () => {
-    fetchUserWorkspacesMock.mockResolvedValue([workspaceA, workspaceB]);
+    fetchUserWorkspacesMock.mockRejectedValue(new Error("Unable to load workspaces"));
-    fetchWorkspaceMembersMock.mockResolvedValueOnce(membersA).mockResolvedValueOnce(membersB);
 
-    const user = userEvent.setup();
     render(<WorkspacesPage />);
 
-    expect(await screen.findByText("Personal Workspace Members")).toBeInTheDocument();
+    expect(await screen.findByText("Unable to load workspaces")).toBeInTheDocument();
-
-    await user.click(screen.getByRole("button", { name: /client workspace/i }));
-
-    await waitFor(() => {
-      expect(fetchWorkspaceMembersMock).toHaveBeenLastCalledWith("workspace-2");
-    });
-
-    expect(await screen.findByText("Client Workspace Members")).toBeInTheDocument();
-    expect(screen.getByText("bob@example.com")).toBeInTheDocument();
   });
 
   it("creates a workspace and refreshes the list", async () => {
-    fetchUserWorkspacesMock
+    fetchUserWorkspacesMock.mockResolvedValueOnce([baseWorkspace]).mockResolvedValueOnce([
-      .mockResolvedValueOnce([workspaceA])
+      baseWorkspace,
-      .mockResolvedValueOnce([workspaceA, workspaceB]);
+      {
-    fetchWorkspaceMembersMock.mockResolvedValue(membersA);
+        ...baseWorkspace,
+        id: "workspace-2",
+        name: "New Workspace",
+        role: WorkspaceMemberRole.MEMBER,
+      },
+    ]);
     createWorkspaceMock.mockResolvedValue({
       id: "workspace-2",
-      name: "Client Workspace",
+      name: "New Workspace",
-      ownerId: "owner-2",
+      ownerId: "owner-1",
       settings: {},
       createdAt: "2026-01-02T00:00:00.000Z",
       updatedAt: "2026-01-02T00:00:00.000Z",
@@ -143,17 +105,31 @@ describe("WorkspacesPage", () => {
 
     expect(await screen.findByText("Your Workspaces (1)")).toBeInTheDocument();
 
-    await user.type(screen.getByPlaceholderText("Enter workspace name..."), "Client Workspace");
+    await user.type(screen.getByPlaceholderText("Enter workspace name..."), "New Workspace");
     await user.click(screen.getByRole("button", { name: "Create Workspace" }));
 
     await waitFor(() => {
-      expect(createWorkspaceMock).toHaveBeenCalledWith({ name: "Client Workspace" });
+      expect(createWorkspaceMock).toHaveBeenCalledWith({ name: "New Workspace" });
     });
-
     await waitFor(() => {
       expect(fetchUserWorkspacesMock).toHaveBeenCalledTimes(2);
     });
 
     expect(await screen.findByText("Your Workspaces (2)")).toBeInTheDocument();
   });
+
+  it("shows create errors in the UI", async () => {
+    fetchUserWorkspacesMock.mockResolvedValue([baseWorkspace]);
+    createWorkspaceMock.mockRejectedValue(new Error("Workspace creation failed"));
+
+    const user = userEvent.setup();
+    render(<WorkspacesPage />);
+
+    expect(await screen.findByText("Your Workspaces (1)")).toBeInTheDocument();
+
+    await user.type(screen.getByPlaceholderText("Enter workspace name..."), "Bad Workspace");
+    await user.click(screen.getByRole("button", { name: "Create Workspace" }));
+
+    expect(await screen.findByText("Workspace creation failed")).toBeInTheDocument();
+  });
 });

apps/web/src/app/(authenticated)/settings/workspaces/page.tsx

@@ -2,51 +2,10 @@
 
 import type { ReactElement, SyntheticEvent } from "react";
 
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
+import { WorkspaceCard } from "@/components/workspace/WorkspaceCard";
+import { createWorkspace, fetchUserWorkspaces, type UserWorkspace } from "@/lib/api/workspaces";
 import Link from "next/link";
-import { UserPlus, UserX } from "lucide-react";
-import { WorkspaceMemberRole } from "@mosaic/shared";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import {
-  addWorkspaceMember,
-  createWorkspace,
-  fetchUserWorkspaces,
-  fetchWorkspaceMembers,
-  removeWorkspaceMember,
-  type UserWorkspace,
-  type WorkspaceMemberEntry,
-} from "@/lib/api/workspaces";
-import { fetchAdminUsers, type AdminUser } from "@/lib/api/admin";
 
 function getErrorMessage(error: unknown, fallback: string): string {
   if (error instanceof Error) {
@@ -56,53 +15,18 @@ function getErrorMessage(error: unknown, fallback: string): string {
   return fallback;
 }
 
-function toRoleLabel(role: WorkspaceMemberRole): string {
+/**
-  return `${role.charAt(0)}${role.slice(1).toLowerCase()}`;
+ * Workspaces Page
-}
+ * Fetches and creates workspaces through the real API.
-
+ */
-interface RemoveMemberTarget {
-  userId: string;
-  email: string;
-}
-
-const ROLE_BADGE_CLASS: Record<WorkspaceMemberRole, string> = {
-  [WorkspaceMemberRole.OWNER]: "border-purple-200 bg-purple-50 text-purple-700",
-  [WorkspaceMemberRole.ADMIN]: "border-blue-200 bg-blue-50 text-blue-700",
-  [WorkspaceMemberRole.MEMBER]: "border-green-200 bg-green-50 text-green-700",
-  [WorkspaceMemberRole.GUEST]: "border-gray-200 bg-gray-50 text-gray-700",
-};
-
 export default function WorkspacesPage(): ReactElement {
   const [workspaces, setWorkspaces] = useState<UserWorkspace[]>([]);
-  const [selectedWorkspaceId, setSelectedWorkspaceId] = useState<string | null>(null);
-
   const [isLoading, setIsLoading] = useState(true);
   const [loadError, setLoadError] = useState<string | null>(null);
-
   const [isCreating, setIsCreating] = useState(false);
   const [newWorkspaceName, setNewWorkspaceName] = useState("");
   const [createError, setCreateError] = useState<string | null>(null);
 
-  const [members, setMembers] = useState<WorkspaceMemberEntry[]>([]);
-  const [isMembersLoading, setIsMembersLoading] = useState(false);
-  const [membersError, setMembersError] = useState<string | null>(null);
-
-  const [isAddMemberOpen, setIsAddMemberOpen] = useState(false);
-  const [isAddingMember, setIsAddingMember] = useState(false);
-  const [addMemberError, setAddMemberError] = useState<string | null>(null);
-  const [memberUserId, setMemberUserId] = useState<string>("");
-  const [memberRole, setMemberRole] = useState<WorkspaceMemberRole>(WorkspaceMemberRole.MEMBER);
-  const [availableUsers, setAvailableUsers] = useState<AdminUser[]>([]);
-  const [isLoadingUsers, setIsLoadingUsers] = useState(false);
-
-  const [removeTarget, setRemoveTarget] = useState<RemoveMemberTarget | null>(null);
-  const [isRemovingMember, setIsRemovingMember] = useState(false);
-
-  const selectedWorkspace = useMemo(
-    () => workspaces.find((workspace) => workspace.id === selectedWorkspaceId) ?? null,
-    [selectedWorkspaceId, workspaces]
-  );
-
   const loadWorkspaces = useCallback(async (): Promise<void> => {
     setIsLoading(true);
 
@@ -110,57 +34,31 @@ export default function WorkspacesPage(): ReactElement {
       const data = await fetchUserWorkspaces();
       setWorkspaces(data);
       setLoadError(null);
-      setSelectedWorkspaceId((current) => {
-        if (current && data.some((workspace) => workspace.id === current)) {
-          return current;
-        }
-
-        return data[0]?.id ?? null;
-      });
     } catch (error) {
       setLoadError(getErrorMessage(error, "Failed to load workspaces"));
-      setSelectedWorkspaceId(null);
     } finally {
       setIsLoading(false);
     }
   }, []);
 
-  const loadMembers = useCallback(async (workspaceId: string): Promise<void> => {
-    setIsMembersLoading(true);
-    setMembersError(null);
-
-    try {
-      const data = await fetchWorkspaceMembers(workspaceId);
-      setMembers(data);
-    } catch (error) {
-      setMembersError(getErrorMessage(error, "Failed to load workspace members"));
-      setMembers([]);
-    } finally {
-      setIsMembersLoading(false);
-    }
-  }, []);
-
   useEffect(() => {
     void loadWorkspaces();
   }, [loadWorkspaces]);
 
-  useEffect(() => {
+  const workspacesWithRoles = workspaces.map((workspace) => ({
-    if (!selectedWorkspaceId) {
+    ...workspace,
-      setMembers([]);
+    settings: {},
-      setMembersError(null);
+    createdAt: new Date(workspace.createdAt),
-      return;
+    updatedAt: new Date(workspace.createdAt),
-    }
+    userRole: workspace.role,
+    memberCount: 1,
+  }));
 
-    void loadMembers(selectedWorkspaceId);
+  const handleCreateWorkspace = async (e: SyntheticEvent<HTMLFormElement>): Promise<void> => {
-  }, [loadMembers, selectedWorkspaceId]);
+    e.preventDefault();
-
-  const handleCreateWorkspace = async (event: SyntheticEvent<HTMLFormElement>): Promise<void> => {
-    event.preventDefault();
 
     const workspaceName = newWorkspaceName.trim();
-    if (!workspaceName) {
+    if (!workspaceName) return;
-      return;
-    }
 
     setIsCreating(true);
     setCreateError(null);
@@ -176,394 +74,91 @@ export default function WorkspacesPage(): ReactElement {
     }
   };
 
-  const eligibleUsers = useMemo(() => {
-    const memberIds = new Set(members.map((member) => member.userId));
-    return availableUsers.filter((user) => !memberIds.has(user.id));
-  }, [availableUsers, members]);
-
-  const loadAvailableUsers = useCallback(async (): Promise<void> => {
-    setIsLoadingUsers(true);
-
-    try {
-      const response = await fetchAdminUsers(1, 200);
-      const activeUsers = response.data.filter((user) => user.deactivatedAt === null);
-      setAvailableUsers(activeUsers);
-
-      if (memberUserId && activeUsers.some((user) => user.id === memberUserId)) {
-        return;
-      }
-
-      const memberIds = new Set(members.map((member) => member.userId));
-      const firstEligible = activeUsers.find((user) => !memberIds.has(user.id));
-      setMemberUserId(firstEligible?.id ?? "");
-    } catch (error) {
-      setAddMemberError(getErrorMessage(error, "Failed to load users for member assignment"));
-      setAvailableUsers([]);
-      setMemberUserId("");
-    } finally {
-      setIsLoadingUsers(false);
-    }
-  }, [memberUserId, members]);
-
-  const openAddMemberDialog = async (): Promise<void> => {
-    setAddMemberError(null);
-    setMemberRole(WorkspaceMemberRole.MEMBER);
-    setIsAddMemberOpen(true);
-    await loadAvailableUsers();
-  };
-
-  const handleAddMember = async (event: SyntheticEvent<HTMLFormElement>): Promise<void> => {
-    event.preventDefault();
-
-    if (!selectedWorkspaceId) {
-      setAddMemberError("Select a workspace before adding members.");
-      return;
-    }
-
-    if (!memberUserId) {
-      setAddMemberError("Select a user to add.");
-      return;
-    }
-
-    setIsAddingMember(true);
-    setAddMemberError(null);
-
-    try {
-      await addWorkspaceMember(selectedWorkspaceId, {
-        userId: memberUserId,
-        role: memberRole,
-      });
-      setIsAddMemberOpen(false);
-      await loadMembers(selectedWorkspaceId);
-    } catch (error) {
-      setAddMemberError(getErrorMessage(error, "Failed to add member"));
-    } finally {
-      setIsAddingMember(false);
-    }
-  };
-
-  const handleRemoveMember = async (): Promise<void> => {
-    if (!selectedWorkspaceId || !removeTarget) {
-      return;
-    }
-
-    setIsRemovingMember(true);
-
-    try {
-      await removeWorkspaceMember(selectedWorkspaceId, removeTarget.userId);
-      setRemoveTarget(null);
-      await loadMembers(selectedWorkspaceId);
-    } catch (error) {
-      setMembersError(getErrorMessage(error, "Failed to remove member"));
-    } finally {
-      setIsRemovingMember(false);
-    }
-  };
-
   return (
-    <main className="max-w-6xl mx-auto p-6 space-y-6">
+    <main className="container mx-auto px-4 py-8 max-w-5xl">
-      <div className="flex items-start justify-between gap-4">
+      <div className="mb-8">
-        <div>
+        <div className="flex items-center justify-between mb-2">
-          <h1 className="text-3xl font-bold">Workspaces</h1>
+          <h1 className="text-3xl font-bold text-gray-900">Workspaces</h1>
-          <p className="text-muted-foreground mt-1">Manage workspaces and workspace members</p>
+          <Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
+            ← Back to Settings
+          </Link>
         </div>
-        <Link href="/settings" className="text-sm text-blue-600 hover:text-blue-700">
+        <p className="text-gray-600">Manage your workspaces and collaborate with your team</p>
-          ← Back to Settings
-        </Link>
       </div>
 
-      <Card>
+      {/* Create New Workspace */}
-        <CardHeader>
+      <div className="bg-white rounded-lg shadow-sm border border-gray-200 p-6 mb-6">
-          <CardTitle>Create New Workspace</CardTitle>
+        <h2 className="text-lg font-semibold text-gray-900 mb-4">Create New Workspace</h2>
-          <CardDescription>Create a workspace for a new team or project.</CardDescription>
+        <form onSubmit={handleCreateWorkspace} className="flex gap-3">
-        </CardHeader>
+          <input
-        <CardContent>
+            type="text"
-          <form onSubmit={handleCreateWorkspace} className="flex gap-3">
+            value={newWorkspaceName}
-            <Input
+            onChange={(e) => {
-              type="text"
+              setNewWorkspaceName(e.target.value);
-              value={newWorkspaceName}
+            }}
-              onChange={(event) => {
+            placeholder="Enter workspace name..."
-                setNewWorkspaceName(event.target.value);
+            disabled={isCreating}
-              }}
+            className="flex-1 px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent disabled:bg-gray-100"
-              placeholder="Enter workspace name..."
+          />
-              disabled={isCreating}
+          <button
-            />
+            type="submit"
-            <Button type="submit" disabled={isCreating || !newWorkspaceName.trim()}>
+            disabled={isCreating || !newWorkspaceName.trim()}
-              {isCreating ? "Creating..." : "Create Workspace"}
+            className="px-6 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 disabled:opacity-50 disabled:cursor-not-allowed font-medium"
-            </Button>
+          >
-          </form>
+            {isCreating ? "Creating..." : "Create Workspace"}
-          {createError !== null ? (
+          </button>
-            <p className="mt-3 text-sm text-destructive" role="alert">
+        </form>
-              {createError}
+        {createError !== null && (
-            </p>
+          <div className="mt-3 rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
-          ) : null}
+            {createError}
-        </CardContent>
+          </div>
-      </Card>
+        )}
-
-      {loadError !== null ? (
-        <Card>
-          <CardContent className="py-4">
-            <p className="text-sm text-destructive" role="alert">
-              {loadError}
-            </p>
-          </CardContent>
-        </Card>
-      ) : null}
-
-      <div className="grid grid-cols-1 lg:grid-cols-5 gap-6">
-        <Card className="lg:col-span-2">
-          <CardHeader>
-            <CardTitle>Your Workspaces ({isLoading ? "..." : workspaces.length})</CardTitle>
-            <CardDescription>Click a workspace to manage its members.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-3">
-            {isLoading ? (
-              <p className="text-sm text-muted-foreground">Loading workspaces...</p>
-            ) : workspaces.length === 0 ? (
-              <p className="text-sm text-muted-foreground">
-                No workspaces yet. Create one to begin.
-              </p>
-            ) : (
-              workspaces.map((workspace) => {
-                const isSelected = selectedWorkspaceId === workspace.id;
-
-                return (
-                  <button
-                    key={workspace.id}
-                    type="button"
-                    onClick={() => {
-                      setSelectedWorkspaceId(workspace.id);
-                    }}
-                    className={`w-full rounded-lg border p-4 text-left transition-colors ${
-                      isSelected ? "border-primary bg-muted/40" : "border-border hover:bg-muted/20"
-                    }`}
-                  >
-                    <div className="flex items-start justify-between gap-3">
-                      <div className="min-w-0">
-                        <p className="font-semibold truncate">{workspace.name}</p>
-                        <p className="text-xs text-muted-foreground mt-1">
-                          Created {new Date(workspace.createdAt).toLocaleDateString()}
-                        </p>
-                      </div>
-                      <Badge variant="outline">{toRoleLabel(workspace.role)}</Badge>
-                    </div>
-                  </button>
-                );
-              })
-            )}
-          </CardContent>
-        </Card>
-
-        <Card className="lg:col-span-3">
-          <CardHeader>
-            <div className="flex items-start justify-between gap-3">
-              <div>
-                <CardTitle>
-                  {selectedWorkspace ? `${selectedWorkspace.name} Members` : "Workspace Members"}
-                </CardTitle>
-                <CardDescription>
-                  {selectedWorkspace
-                    ? "Manage member roles and access for this workspace."
-                    : "Select a workspace to view its members."}
-                </CardDescription>
-              </div>
-
-              <Dialog
-                open={isAddMemberOpen}
-                onOpenChange={(open) => {
-                  if (!open && !isAddingMember) {
-                    setIsAddMemberOpen(false);
-                    setAddMemberError(null);
-                  }
-                }}
-              >
-                <DialogTrigger asChild>
-                  <Button
-                    onClick={() => {
-                      void openAddMemberDialog();
-                    }}
-                    disabled={!selectedWorkspace}
-                  >
-                    <UserPlus className="h-4 w-4 mr-2" />
-                    Add Member
-                  </Button>
-                </DialogTrigger>
-                <DialogContent>
-                  <DialogHeader>
-                    <DialogTitle>Add Workspace Member</DialogTitle>
-                    <DialogDescription>
-                      Add an existing user to {selectedWorkspace?.name ?? "this workspace"}.
-                    </DialogDescription>
-                  </DialogHeader>
-
-                  <form
-                    onSubmit={(event) => {
-                      void handleAddMember(event);
-                    }}
-                    className="space-y-4"
-                  >
-                    <div className="space-y-2">
-                      <Label htmlFor="member-user">User</Label>
-                      <Select
-                        value={memberUserId}
-                        onValueChange={(value) => {
-                          setMemberUserId(value);
-                        }}
-                        disabled={isLoadingUsers || eligibleUsers.length === 0 || isAddingMember}
-                      >
-                        <SelectTrigger id="member-user">
-                          <SelectValue
-                            placeholder={
-                              isLoadingUsers
-                                ? "Loading users..."
-                                : eligibleUsers.length === 0
-                                  ? "No eligible users"
-                                  : "Select a user"
-                            }
-                          />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {eligibleUsers.map((user) => (
-                            <SelectItem key={user.id} value={user.id}>
-                              {user.name} ({user.email})
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
-                    </div>
-
-                    <div className="space-y-2">
-                      <Label htmlFor="member-role">Role</Label>
-                      <Select
-                        value={memberRole}
-                        onValueChange={(value) => {
-                          setMemberRole(value as WorkspaceMemberRole);
-                        }}
-                        disabled={isAddingMember}
-                      >
-                        <SelectTrigger id="member-role">
-                          <SelectValue placeholder="Select role" />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {Object.values(WorkspaceMemberRole)
-                            .filter((role) => role !== WorkspaceMemberRole.OWNER)
-                            .map((role) => (
-                              <SelectItem key={role} value={role}>
-                                {toRoleLabel(role)}
-                              </SelectItem>
-                            ))}
-                        </SelectContent>
-                      </Select>
-                    </div>
-
-                    {addMemberError !== null ? (
-                      <p className="text-sm text-destructive" role="alert">
-                        {addMemberError}
-                      </p>
-                    ) : null}
-
-                    <DialogFooter>
-                      <Button
-                        type="button"
-                        variant="outline"
-                        onClick={() => {
-                          if (!isAddingMember) {
-                            setIsAddMemberOpen(false);
-                            setAddMemberError(null);
-                          }
-                        }}
-                        disabled={isAddingMember}
-                      >
-                        Cancel
-                      </Button>
-                      <Button type="submit" disabled={isAddingMember || !memberUserId}>
-                        {isAddingMember ? "Adding..." : "Add Member"}
-                      </Button>
-                    </DialogFooter>
-                  </form>
-                </DialogContent>
-              </Dialog>
-            </div>
-          </CardHeader>
-
-          <CardContent className="space-y-3">
-            {selectedWorkspace === null ? (
-              <p className="text-sm text-muted-foreground">Select a workspace to view members.</p>
-            ) : membersError !== null ? (
-              <p className="text-sm text-destructive" role="alert">
-                {membersError}
-              </p>
-            ) : isMembersLoading ? (
-              <p className="text-sm text-muted-foreground">Loading members...</p>
-            ) : members.length === 0 ? (
-              <p className="text-sm text-muted-foreground">No members found for this workspace.</p>
-            ) : (
-              members.map((member) => (
-                <div
-                  key={member.userId}
-                  className="rounded-md border p-4 flex flex-col gap-3 md:flex-row md:items-center md:justify-between"
-                >
-                  <div className="space-y-1 min-w-0">
-                    <p className="font-semibold truncate">{member.user.name ?? "Unnamed User"}</p>
-                    <p className="text-sm text-muted-foreground truncate">{member.user.email}</p>
-                  </div>
-
-                  <div className="flex items-center gap-2 md:justify-end">
-                    <Badge variant="outline" className={ROLE_BADGE_CLASS[member.role]}>
-                      {toRoleLabel(member.role)}
-                    </Badge>
-
-                    <Button
-                      type="button"
-                      variant="destructive"
-                      size="sm"
-                      onClick={() => {
-                        setRemoveTarget({
-                          userId: member.userId,
-                          email: member.user.email,
-                        });
-                      }}
-                    >
-                      <UserX className="h-4 w-4 mr-2" />
-                      Remove
-                    </Button>
-                  </div>
-                </div>
-              ))
-            )}
-          </CardContent>
-        </Card>
       </div>
 
-      <AlertDialog
+      {/* Workspace List */}
-        open={removeTarget !== null}
+      <div className="space-y-4">
-        onOpenChange={(open) => {
+        <h2 className="text-xl font-semibold text-gray-900">
-          if (!open && !isRemovingMember) {
+          Your Workspaces ({isLoading ? "..." : workspacesWithRoles.length})
-            setRemoveTarget(null);
+        </h2>
-          }
+        {loadError !== null ? (
-        }}
+          <div className="rounded-md border border-red-200 bg-red-50 px-4 py-3 text-red-700">
-      >
+            {loadError}
-        <AlertDialogContent>
+          </div>
-          <AlertDialogHeader>
+        ) : isLoading ? (
-            <AlertDialogTitle>Remove Workspace Member</AlertDialogTitle>
+          <div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center text-gray-600">
-            <AlertDialogDescription>
+            Loading workspaces...
-              Remove {removeTarget?.email} from {selectedWorkspace?.name}? They will lose access to
+          </div>
-              this workspace.
+        ) : workspacesWithRoles.length === 0 ? (
-            </AlertDialogDescription>
+          <div className="bg-white rounded-lg shadow-sm border border-gray-200 p-12 text-center">
-          </AlertDialogHeader>
+            <svg
-          <AlertDialogFooter>
+              className="mx-auto h-12 w-12 text-gray-400 mb-4"
-            <AlertDialogCancel disabled={isRemovingMember}>Cancel</AlertDialogCancel>
+              fill="none"
-            <AlertDialogAction
+              stroke="currentColor"
-              disabled={isRemovingMember}
+              viewBox="0 0 24 24"
-              onClick={() => {
-                void handleRemoveMember();
-              }}
             >
-              {isRemovingMember ? "Removing..." : "Remove"}
+              <path
-            </AlertDialogAction>
+                strokeLinecap="round"
-          </AlertDialogFooter>
+                strokeLinejoin="round"
-        </AlertDialogContent>
+                strokeWidth={2}
-      </AlertDialog>
+                d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4"
+              />
+            </svg>
+            <h3 className="text-lg font-medium text-gray-900 mb-2">No workspaces yet</h3>
+            <p className="text-gray-600">Create your first workspace to get started</p>
+          </div>
+        ) : (
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            {workspacesWithRoles.map((workspace) => (
+              <WorkspaceCard
+                key={workspace.id}
+                workspace={workspace}
+                userRole={workspace.userRole}
+                memberCount={workspace.memberCount}
+              />
+            ))}
+          </div>
+        )}
+      </div>
     </main>
   );
 }

apps/web/src/components/settings/SettingsAccessDenied.tsx

@@ -1,16 +0,0 @@
-import type { ReactElement } from "react";
-
-interface SettingsAccessDeniedProps {
-  message: string;
-}
-
-export function SettingsAccessDenied({ message }: SettingsAccessDeniedProps): ReactElement {
-  return (
-    <div className="p-8 max-w-2xl">
-      <div className="rounded-lg border border-red-200 bg-red-50 p-6 text-center">
-        <p className="text-lg font-semibold text-red-700">Access Denied</p>
-        <p className="mt-2 text-sm text-red-600">{message}</p>
-      </div>
-    </div>
-  );
-}

apps/web/src/lib/api/admin.ts

@@ -53,7 +53,6 @@ export interface InvitationResponse {
 
 export interface UpdateUserDto {
   name?: string;
-  email?: string;
   deactivatedAt?: string | null;
   emailVerified?: boolean;
   preferences?: Record<string, unknown>;

apps/web/src/lib/api/teams.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import * as client from "./client";
-import { fetchTeams, createTeam, fetchTeamMembers, updateTeam, deleteTeam } from "./teams";
+import { fetchTeams, createTeam, fetchTeamMembers } from "./teams";
 
 vi.mock("./client");
 
@@ -44,18 +44,6 @@ describe("createTeam", (): void => {
   });
 });
 
-describe("updateTeam", (): void => {
-  it("patches team endpoint", async (): Promise<void> => {
-    vi.mocked(client.apiPatch).mockResolvedValueOnce({ id: "t1", name: "Platform" } as never);
-    await updateTeam("t1", { name: "Platform" });
-    expect(client.apiPatch).toHaveBeenCalledWith(
-      "/api/workspaces/ws-1/teams/t1",
-      expect.objectContaining({ name: "Platform" }),
-      "ws-1"
-    );
-  });
-});
-
 describe("fetchTeamMembers", (): void => {
   it("calls members endpoint for team", async (): Promise<void> => {
     vi.mocked(client.apiGet).mockResolvedValueOnce([] as never);
@@ -63,11 +51,3 @@ describe("fetchTeamMembers", (): void => {
     expect(client.apiGet).toHaveBeenCalledWith("/api/workspaces/ws-1/teams/t-1/members", "ws-1");
   });
 });
-
-describe("deleteTeam", (): void => {
-  it("deletes team endpoint", async (): Promise<void> => {
-    vi.mocked(client.apiDelete).mockResolvedValueOnce(undefined as never);
-    await deleteTeam("t1");
-    expect(client.apiDelete).toHaveBeenCalledWith("/api/workspaces/ws-1/teams/t1", "ws-1");
-  });
-});

apps/web/src/lib/api/teams.ts

@@ -4,7 +4,7 @@
  */
 
 import type { TeamMemberRole } from "@mosaic/shared";
-import { apiDelete, apiGet, apiPatch, apiPost } from "./client";
+import { apiDelete, apiGet, apiPost } from "./client";
 
 const WORKSPACE_STORAGE_KEY = "mosaic-workspace-id";
 
@@ -55,11 +55,6 @@ export interface CreateTeamDto {
   description?: string;
 }
 
-export interface UpdateTeamDto {
-  name?: string;
-  description?: string | null;
-}
-
 export interface AddTeamMemberDto {
   userId: string;
   role?: TeamMemberRole;
@@ -85,22 +80,6 @@ export async function createTeam(dto: CreateTeamDto, workspaceId?: string): Prom
   );
 }
 
-/**
- * Update a team in the active workspace.
- */
-export async function updateTeam(
-  teamId: string,
-  dto: UpdateTeamDto,
-  workspaceId?: string
-): Promise<TeamRecord> {
-  const resolvedWorkspaceId = resolveWorkspaceId(workspaceId);
-  return apiPatch<TeamRecord>(
-    `/api/workspaces/${resolvedWorkspaceId}/teams/${teamId}`,
-    dto,
-    resolvedWorkspaceId
-  );
-}
-
 /**
  * Fetch team members for a team in the active workspace.
  * The current backend route shape is workspace-scoped team membership.

docker/openbao/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/openbao/openbao:2.5.1
+FROM quay.io/openbao/openbao:2.5.0
 
 LABEL maintainer="Mosaic Stack <dev@mosaic.local>"
 LABEL description="OpenBao secrets management for Mosaic Stack"

docs/PRD-MS22.md

@@ -1,114 +0,0 @@
-# PRD: MS22 — Fleet Evolution (DB-Centric Agent Architecture)
-
-## Metadata
-
-- Owner: Jason Woltje
-- Date: 2026-03-01
-- Status: in-progress
-- Design Doc: `docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md`
-
-## Problem Statement
-
-Mosaic Stack needs a multi-user agent fleet where each user gets their own isolated OpenClaw instance with their own LLM provider credentials and agent config. The system must be Docker-first with minimal environment variables and all configuration managed through the WebUI.
-
-## Objectives
-
-1. **Minimal bootstrap** — 2 env vars (`DATABASE_URL`, `MOSAIC_SECRET_KEY`) to start the entire stack
-2. **DB-centric config** — All runtime config in Postgres, managed via WebUI
-3. **Per-user isolation** — Each user gets their own OpenClaw container with own API keys, memory, sessions
-4. **Onboarding wizard** — First-boot experience: breakglass admin → OIDC → LLM provider → agent config
-5. **Settings UI** — Runtime management of providers, agents, and auth config
-6. **Mosaic as gatekeeper** — Users never talk to OpenClaw directly; Mosaic proxies all requests
-7. **Zero cross-user access** — Full container, volume, and DB isolation between users
-
-## Security Requirements
-
-- User A cannot access User B's API keys, chat history, or agent memory
-- All API keys stored encrypted (AES-256-GCM) in database
-- Breakglass admin always works as OIDC fallback
-- OIDC config stored in DB (not env vars) — configured via settings UI
-- Container-to-container communication blocked by default
-- Admin cannot decrypt other users' API keys
-
-## Phase 0: Knowledge Layer — COMPLETE
-
-- Findings API (pgvector, CRUD, similarity search)
-- AgentMemory API (key/value store)
-- ConversationArchive API (pgvector, ingest, search)
-- OpenClaw mosaic skill
-- Session log ingestion pipeline
-
-## Phase 1: DB-Centric Agent Fleet
-
-### Phase 1a: DB Schema — COMPLETE
-
-- SystemConfig, BreakglassUser, LlmProvider, UserContainer, SystemContainer, UserAgentConfig tables
-
-### Phase 1b: Encryption Service — COMPLETE
-
-- CryptoService (AES-256-GCM using MOSAIC_SECRET_KEY)
-
-### Phase 1c: Internal Config API
-
-- `GET /api/internal/agent-config/:id` — assembles openclaw.json from DB
-- Auth: bearer token (container's own gateway token)
-- Returns complete openclaw.json with decrypted provider credentials
-
-### Phase 1d: Container Lifecycle Manager
-
-- Docker API integration via `dockerode` npm package
-- Start/stop/health-check/reap user containers
-- Auto-generate gateway tokens, assign ports
-- Docker socket access required (`/var/run/docker.sock`)
-
-### Phase 1e: Onboarding API
-
-- First-boot detection (`SystemConfig.onboarding.completed`)
-- `POST /api/onboarding/breakglass` — create admin user
-- `POST /api/onboarding/oidc` — save OIDC provider config
-- `POST /api/onboarding/provider` — add LLM provider + test connection
-- `POST /api/onboarding/complete` — mark done
-
-### Phase 1f: Onboarding Wizard UI
-
-- Multi-step wizard component
-- Skip-able OIDC step
-- LLM provider connection test
-
-### Phase 1g: Settings API
-
-- CRUD: LLM providers (per-user scoped)
-- CRUD: Agent config (model assignments, personalities)
-- CRUD: OIDC config (admin only)
-- Breakglass password reset (admin only)
-
-### Phase 1h: Settings UI
-
-- Settings/Providers page
-- Settings/Agent Config page
-- Settings/Auth page (OIDC + breakglass)
-
-### Phase 1i: Chat Proxy
-
-- Route WebUI chat to user's OpenClaw container
-- SSE streaming pass-through
-- Ensure container is running before proxying (auto-start)
-
-### Phase 1j: Docker Compose + Entrypoint
-
-- Simplified compose (core services only — user containers are dynamic)
-- Entrypoint: fetch config from API, write openclaw.json, start gateway
-- Health check integration
-
-### Phase 1k: Idle Reaper
-
-- Cron job to stop inactive user containers
-- Configurable idle timeout (default 30min)
-- Preserve state volumes
-
-## Future Phases (out of scope)
-
-- Phase 2: Agent fleet standup (predefined agent roles)
-- Phase 3: WebUI chat + task management integration
-- Phase 4: Multi-LLM provider management UI (advanced)
-- Team workspaces (shared agent contexts) — explicitly out of scope

docs/TASKS.md

@@ -25,14 +25,14 @@
 | MS21-MIG-003   | not-started | phase-3   | Run migration on production database                                              | #568     | api   | —                              | MS21-MIG-001,MS21-TEST-003                                  | MS21-VER-001               | —               | —          | —            | 5K       | —    | Needs deploy coordination; not automatable                                                                            |
 | MS21-MIG-004   | done        | phase-3   | Import API endpoints (6/6 tests)                                                  | #568     | api   | feat/ms21-import-api           | MS21-DB-001                                                 | —                          | codex           | 2026-02-28 | 2026-02-28   | 20K      | 24K  | PR #567 merged, CI green. Review: 0 blockers, 4 should-fix, 1 medium sec (no audit log).                              |
 | MS21-UI-001    | done        | phase-4   | Settings/users page                                                               | #569     | web   | feat/ms21-ui-users             | MS21-API-001,MS21-API-002                                   | —                          | codex           | 2026-02-28 | 2026-02-28   | 20K      | ~30K | PR #573 merged. Review: 0 blockers, 4 should-fix → MS21-UI-001-QA                                                     |
-| MS21-UI-001-QA | done        | phase-4   | QA: fix 4 review findings (pagination, error state, self-deactivate guard, tests) | #569     | web   | fix/ms21-ui-001-qa             | MS21-UI-001                                                 | —                          | —               | —          | —            | 15K      | —    | 0 blockers; merged per framework. Should-fix: pagination cap, error/empty collision, self-deactivate guard, no tests. |
+| MS21-UI-001-QA | not-started | phase-4   | QA: fix 4 review findings (pagination, error state, self-deactivate guard, tests) | #569     | web   | fix/ms21-ui-001-qa             | MS21-UI-001                                                 | —                          | —               | —          | —            | 15K      | —    | 0 blockers; merged per framework. Should-fix: pagination cap, error/empty collision, self-deactivate guard, no tests. |
-| MS21-UI-002    | done        | phase-4   | User detail/edit and invite dialogs                                               | #569     | web   | feat/ms21-ui-users             | MS21-UI-001                                                 | —                          | —               | —          | —            | 15K      | —    |                                                                                                                       |
+| MS21-UI-002    | not-started | phase-4   | User detail/edit and invite dialogs                                               | #569     | web   | feat/ms21-ui-users             | MS21-UI-001                                                 | —                          | —               | —          | —            | 15K      | —    |                                                                                                                       |
 | MS21-UI-003    | done        | phase-4   | Settings/workspaces page (wire to real API)                                       | #569     | web   | feat/ms21-ui-workspaces        | MS21-API-003                                                | —                          | codex           | 2026-02-28 | 2026-02-28   | 15K      | ~25K | PR #574 merged. Review: 0 critical, 1 low (raw errors in UI)                                                          |
-| MS21-UI-004    | done        | phase-4   | Workspace member management UI                                                    | #569     | web   | feat/ms21-ui-workspaces        | MS21-UI-003,MS21-API-003                                    | —                          | —               | —          | —            | 15K      | —    | Components exist                                                                                                      |
+| MS21-UI-004    | not-started | phase-4   | Workspace member management UI                                                    | #569     | web   | feat/ms21-ui-workspaces        | MS21-UI-003,MS21-API-003                                    | —                          | —               | —          | —            | 15K      | —    | Components exist                                                                                                      |
-| MS21-UI-005    | done        | phase-4   | Settings/teams page                                                               | #569     | web   | feat/ms21-ui-teams             | MS21-API-004                                                | —                          | —               | —          | —            | 15K      | —    |                                                                                                                       |
+| MS21-UI-005    | not-started | phase-4   | Settings/teams page                                                               | #569     | web   | feat/ms21-ui-teams             | MS21-API-004                                                | —                          | —               | —          | —            | 15K      | —    |                                                                                                                       |
-| MS21-TEST-004  | done        | phase-4   | Frontend component tests                                                          | #569     | web   | test/ms21-ui                   | MS21-UI-001,MS21-UI-002,MS21-UI-003,MS21-UI-004,MS21-UI-005 | —                          | —               | —          | —            | 20K      | —    |                                                                                                                       |
+| MS21-TEST-004  | not-started | phase-4   | Frontend component tests                                                          | #569     | web   | test/ms21-ui                   | MS21-UI-001,MS21-UI-002,MS21-UI-003,MS21-UI-004,MS21-UI-005 | —                          | —               | —          | —            | 20K      | —    |                                                                                                                       |
-| MS21-RBAC-001  | done        | phase-5   | Sidebar navigation role gating                                                    | #570     | web   | feat/ms21-rbac                 | MS21-UI-001                                                 | —                          | —               | —          | —            | 10K      | —    |                                                                                                                       |
+| MS21-RBAC-001  | not-started | phase-5   | Sidebar navigation role gating                                                    | #570     | web   | feat/ms21-rbac                 | MS21-UI-001                                                 | —                          | —               | —          | —            | 10K      | —    |                                                                                                                       |
-| MS21-RBAC-002  | done        | phase-5   | Settings page access restriction                                                  | #570     | web   | feat/ms21-rbac                 | MS21-RBAC-001                                               | —                          | —               | —          | —            | 8K       | —    |                                                                                                                       |
+| MS21-RBAC-002  | not-started | phase-5   | Settings page access restriction                                                  | #570     | web   | feat/ms21-rbac                 | MS21-RBAC-001                                               | —                          | —               | —          | —            | 8K       | —    |                                                                                                                       |
 | MS21-RBAC-003  | done        | phase-5   | Action button permission gating                                                   | #570     | web   | feat/ms21-rbac                 | MS21-RBAC-001                                               | —                          | —               | —          | —            | 8K       | —    |                                                                                                                       |
 | MS21-RBAC-004  | done        | phase-5   | User profile role display                                                         | #570     | web   | feat/ms21-rbac                 | MS21-RBAC-001                                               | —                          | —               | —          | —            | 5K       | —    |                                                                                                                       |
 | MS21-VER-001   | done        | phase-6   | Full quality gate pass                                                            | #571     | stack | —                              | MS21-TEST-004,MS21-RBAC-004,MS21-MIG-003                    | MS21-VER-002               | —               | —          | —            | 5K       | —    |                                                                                                                       |
@@ -55,37 +55,19 @@ Remaining estimate: ~143K tokens (Codex budget).
 
 ## MS22 — Fleet Evolution (Phase 0: Knowledge Layer)
 
-| id              | status | milestone    | description                                                  | issue    | repo  | branch                         | depends_on                                                | blocks        | agent        | started_at | completed_at | estimate | used | notes                                         |
+| id              | status      | milestone    | description                                                  | issue    | repo  | branch                         | depends_on                                                | blocks        | agent        | started_at | completed_at | estimate | used | notes                                         |
-| --------------- | ------ | ------------ | ------------------------------------------------------------ | -------- | ----- | ------------------------------ | --------------------------------------------------------- | ------------- | ------------ | ---------- | ------------ | -------- | ---- | --------------------------------------------- |
+| --------------- | ----------- | ------------ | ------------------------------------------------------------ | -------- | ----- | ------------------------------ | --------------------------------------------------------- | ------------- | ------------ | ---------- | ------------ | -------- | ---- | --------------------------------------------- |
-| MS22-PLAN-001   | done   | p0-knowledge | PRD + mission bootstrap + TASKS.md                           | TASKS:P0 | stack | feat/ms22-knowledge-schema     | —                                                         | MS22-DB-001   | orchestrator | 2026-02-28 | 2026-02-28   | 10K      | 8K   | PRD-MS22.md, mission fleet-evolution-20260228 |
+| MS22-PLAN-001   | done        | p0-knowledge | PRD + mission bootstrap + TASKS.md                           | TASKS:P0 | stack | feat/ms22-knowledge-schema     | —                                                         | MS22-DB-001   | orchestrator | 2026-02-28 | 2026-02-28   | 10K      | 8K   | PRD-MS22.md, mission fleet-evolution-20260228 |
-| MS22-DB-001     | done   | p0-knowledge | Findings module (pgvector, CRUD, similarity search)          | TASKS:P0 | api   | feat/ms22-findings             | MS22-PLAN-001                                             | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~22K | PR #585 merged, CI green                      |
+| MS22-DB-001     | done        | p0-knowledge | Findings module (pgvector, CRUD, similarity search)          | TASKS:P0 | api   | feat/ms22-findings             | MS22-PLAN-001                                             | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~22K | PR #585 merged, CI green                      |
-| MS22-API-001    | done   | p0-knowledge | Findings API endpoints                                       | TASKS:P0 | api   | feat/ms22-findings             | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-001                          |
+| MS22-API-001    | done        | p0-knowledge | Findings API endpoints                                       | TASKS:P0 | api   | feat/ms22-findings             | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-001                          |
-| MS22-DB-002     | done   | p0-knowledge | AgentMemory module (key/value store, upsert)                 | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 15K      | ~16K | PR #586 merged, CI green                      |
+| MS22-DB-002     | done        | p0-knowledge | AgentMemory module (key/value store, upsert)                 | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 15K      | ~16K | PR #586 merged, CI green                      |
-| MS22-API-002    | done   | p0-knowledge | AgentMemory API endpoints                                    | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-002                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-002                          |
+| MS22-API-002    | done        | p0-knowledge | AgentMemory API endpoints                                    | TASKS:P0 | api   | feat/ms22-agent-memory         | MS22-DB-002                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-002                          |
-| MS22-DB-004     | done   | p0-knowledge | ConversationArchive module (pgvector, ingest, search)        | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~18K | PR #587 merged, CI green                      |
+| MS22-DB-004     | done        | p0-knowledge | ConversationArchive module (pgvector, ingest, search)        | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-001                                               | —             | codex        | 2026-02-28 | 2026-02-28   | 20K      | ~18K | PR #587 merged, CI green                      |
-| MS22-API-004    | done   | p0-knowledge | ConversationArchive API endpoints                            | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-004                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-004                          |
+| MS22-API-004    | done        | p0-knowledge | ConversationArchive API endpoints                            | TASKS:P0 | api   | feat/ms22-conversation-archive | MS22-DB-004                                               | —             | codex        | 2026-02-28 | 2026-02-28   | —        | —    | Combined with DB-004                          |
-| MS22-API-005    | done   | p0-knowledge | EmbeddingService (reuse existing KnowledgeModule)            | TASKS:P0 | api   | —                              | —                                                         | —             | orchestrator | 2026-02-28 | 2026-02-28   | 0        | 0    | Already existed; no work needed               |
+| MS22-API-005    | done        | p0-knowledge | EmbeddingService (reuse existing KnowledgeModule)            | TASKS:P0 | api   | —                              | —                                                         | —             | orchestrator | 2026-02-28 | 2026-02-28   | 0        | 0    | Already existed; no work needed               |
-| MS22-DB-003     | done   | p0-knowledge | Task model: add assigned_agent field + migration             | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-001                                               | MS22-API-003  | —            | —          | —            | 8K       | —    | Small schema + migration only                 |
+| MS22-DB-003     | not-started | p0-knowledge | Task model: add assigned_agent field + migration             | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-001                                               | MS22-API-003  | —            | —          | —            | 8K       | —    | Small schema + migration only                 |
-| MS22-API-003    | done   | p0-knowledge | Task API: expose assigned_agent in CRUD                      | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-003                                               | MS22-TEST-001 | —            | —          | —            | 8K       | —    | Extend existing TaskModule                    |
+| MS22-API-003    | not-started | p0-knowledge | Task API: expose assigned_agent in CRUD                      | TASKS:P0 | api   | feat/ms22-task-agent           | MS22-DB-003                                               | MS22-TEST-001 | —            | —          | —            | 8K       | —    | Extend existing TaskModule                    |
-| MS22-TEST-001   | done   | p0-knowledge | Integration tests: Findings + AgentMemory + ConvArchive      | TASKS:P0 | api   | test/ms22-integration          | MS22-API-001,MS22-API-002,MS22-API-004                    | MS22-VER-P0   | —            | —          | —            | 20K      | —    | E2E with live postgres                        |
+| MS22-TEST-001   | not-started | p0-knowledge | Integration tests: Findings + AgentMemory + ConvArchive      | TASKS:P0 | api   | test/ms22-integration          | MS22-API-001,MS22-API-002,MS22-API-004                    | MS22-VER-P0   | —            | —          | —            | 20K      | —    | E2E with live postgres                        |
-| MS22-SKILL-001  | done   | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory)    | TASKS:P0 | stack | feat/ms22-openclaw-skill       | MS22-API-001,MS22-API-002                                 | MS22-VER-P0   | —            | —          | —            | 15K      | —    | Skill in ~/.agents/skills/mosaic/             |
+| MS22-SKILL-001  | not-started | p0-knowledge | OpenClaw mosaic skill (agents read/write findings/memory)    | TASKS:P0 | stack | feat/ms22-openclaw-skill       | MS22-API-001,MS22-API-002                                 | MS22-VER-P0   | —            | —          | —            | 15K      | —    | Skill in ~/.agents/skills/mosaic/             |
-| MS22-INGEST-001 | done   | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest               | MS22-API-004                                              | MS22-VER-P0   | —            | —          | —            | 20K      | —    | Script to batch-ingest existing logs          |
+| MS22-INGEST-001 | not-started | p0-knowledge | Session log ingestion pipeline (OpenClaw logs → ConvArchive) | TASKS:P0 | stack | feat/ms22-ingest               | MS22-API-004                                              | MS22-VER-P0   | —            | —          | —            | 20K      | —    | Script to batch-ingest existing logs          |
-| MS22-VER-P0     | done   | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested    | TASKS:P0 | stack | —                              | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | —             | —            | —          | —            | 5K       | —    |                                               |
+| MS22-VER-P0     | not-started | p0-knowledge | Phase 0 verification: all modules deployed + smoke tested    | TASKS:P0 | stack | —                              | MS22-TEST-001,MS22-SKILL-001,MS22-INGEST-001,MS22-API-003 | —             | —            | —          | —            | 5K       | —    |                                               |
-
-## MS22 Phase 1: DB-Centric Agent Fleet (reworked)
-
-Design doc: `docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md`
-
-| Task ID  | Status      | Phase    | Description                                                                                                           | Issue | Scope   | Branch                       | Depends On | Blocks          | Assigned Worker | Started | Completed | Est Tokens | Act Tokens | Notes |
-| -------- | ----------- | -------- | --------------------------------------------------------------------------------------------------------------------- | ----- | ------- | ---------------------------- | ---------- | --------------- | --------------- | ------- | --------- | ---------- | ---------- | ----- |
-| MS22-P1a | done        | phase-1a | Prisma schema: SystemConfig, BreakglassUser, LlmProvider, UserContainer, SystemContainer, UserAgentConfig + migration | —     | api     | feat/ms22-p1a-schema         | —          | P1b,P1c,P1d,P1e | —               | —       | —         | 20K        | —          |       |
-| MS22-P1b | done        | phase-1b | Encryption service (AES-256-GCM) for API keys and tokens                                                              | —     | api     | feat/ms22-p1b-crypto         | —          | P1c,P1e,P1g     | —               | —       | —         | 15K        | —          |       |
-| MS22-P1c | not-started | phase-1c | Internal config endpoint: assemble openclaw.json from DB                                                              | —     | api     | feat/ms22-p1c-config-api     | P1a,P1b    | P1i,P1j         | —               | —       | —         | 20K        | —          |       |
-| MS22-P1d | not-started | phase-1d | ContainerLifecycleService: Docker API (dockerode) start/stop/health/reap                                              | —     | api     | feat/ms22-p1d-container-mgr  | P1a        | P1i,P1k         | —               | —       | —         | 25K        | —          |       |
-| MS22-P1e | not-started | phase-1e | Onboarding API: breakglass, OIDC, provider, agents, complete                                                          | —     | api     | feat/ms22-p1e-onboarding-api | P1a,P1b    | P1f             | —               | —       | —         | 20K        | —          |       |
-| MS22-P1f | not-started | phase-1f | Onboarding wizard WebUI (multi-step form)                                                                             | —     | web     | feat/ms22-p1f-onboarding-ui  | P1e        | —               | —               | —       | —         | 25K        | —          |       |
-| MS22-P1g | not-started | phase-1g | Settings API: CRUD providers, agent config, OIDC, breakglass                                                          | —     | api     | feat/ms22-p1g-settings-api   | P1a,P1b    | P1h             | —               | —       | —         | 20K        | —          |       |
-| MS22-P1h | not-started | phase-1h | Settings UI: Providers, Agent Config, Auth pages                                                                      | —     | web     | feat/ms22-p1h-settings-ui    | P1g        | —               | —               | —       | —         | 25K        | —          |       |
-| MS22-P1i | not-started | phase-1i | Chat proxy: route WebUI chat to user's OpenClaw container (SSE)                                                       | —     | api+web | feat/ms22-p1i-chat-proxy     | P1c,P1d    | —               | —               | —       | —         | 20K        | —          |       |
-| MS22-P1j | not-started | phase-1j | Docker entrypoint + health checks + core compose                                                                      | —     | docker  | feat/ms22-p1j-docker         | P1c        | —               | —               | —       | —         | 10K        | —          |       |
-| MS22-P1k | not-started | phase-1k | Idle reaper cron: stop inactive user containers                                                                       | —     | api     | feat/ms22-p1k-idle-reaper    | P1d        | —               | —               | —       | —         | 10K        | —          |       |

docs/design/MS22-DB-CENTRIC-ARCHITECTURE.md

@@ -1,413 +0,0 @@
-# MS22 Phase 1: DB-Centric Multi-User Agent Architecture
-
-## Design Principles
-
-1. **2 env vars to bootstrap** — `DATABASE_URL` + `MOSAIC_SECRET_KEY`
-2. **DB-centric config** — All runtime config in Postgres, managed via WebUI
-3. **Mosaic is the gatekeeper** — Users authenticate to Mosaic, never to OpenClaw directly
-4. **Per-user agent isolation** — Each user gets their own OpenClaw container(s) with their own credentials
-5. **Onboarding-first** — Breakglass user + wizard on first boot
-6. **Generic product** — No hardcoded names, models, providers, or endpoints
-
-## Architecture Overview
-
-```
-┌─────────────────────────────────────────────────────┐
-│                    MOSAIC WEBUI                      │
-│  (Auth: breakglass local + OIDC via settings)       │
-└──────────────────────┬──────────────────────────────┘
-                       │
-                       ▼
-┌─────────────────────────────────────────────────────┐
-│                    MOSAIC API                        │
-│                                                     │
-│  ┌──────────────┐  ┌────────────────┐  ┌─────────┐ │
-│  │ Onboarding   │  │ Container      │  │ Config  │ │
-│  │ Wizard       │  │ Lifecycle Mgr  │  │ Store   │ │
-│  └──────────────┘  └───────┬────────┘  └─────────┘ │
-│                            │                        │
-└────────────────────────────┼────────────────────────┘
-                             │ Docker API
-          ┌──────────────────┼──────────────────┐
-          │                  │                  │
-          ▼                  ▼                  ▼
-   ┌─────────────┐   ┌─────────────┐   ┌─────────────┐
-   │  OpenClaw   │   │  OpenClaw   │   │  OpenClaw   │
-   │  User A     │   │  User B     │   │  System     │
-   │             │   │             │   │  (admin)    │
-   │ Claude Max  │   │ Z.ai key   │   │ Shared key  │
-   │ own memory  │   │ own memory  │   │ monitoring  │
-   └─────────────┘   └─────────────┘   └─────────────┘
-    Scale to zero      Scale to zero     Always on
-    after idle         after idle
-```
-
-## Container Lifecycle
-
-### User containers (on-demand)
-
-1. User logs in → Mosaic checks `UserContainer` table
-2. No running container → Mosaic calls Docker API to create one
-3. Injects user's encrypted API keys via config endpoint
-4. Routes chat requests to user's container
-5. Idle timeout (configurable, default 30min) → scale to zero
-6. State volume persists (sessions, memory, auth tokens)
-7. Next request → container restarts, picks up state from volume
-
-### System containers (always-on, optional)
-
-- Admin-provisioned for system tasks (monitoring, scheduled jobs)
-- Use admin-configured shared API keys
-- Not tied to any user
-
-## Auth Layers
-
-| Flow                            | Method                                                                 |
-| ------------------------------- | ---------------------------------------------------------------------- |
-| User → Mosaic WebUI             | Breakglass (local) or OIDC (configured in settings)                    |
-| Mosaic API → OpenClaw container | Bearer token (auto-generated per container, stored encrypted in DB)    |
-| OpenClaw → LLM providers        | User's own API keys (delivered via config endpoint, decrypted from DB) |
-| Admin → System settings         | RBAC (admin role required)                                             |
-| Internal config endpoint        | Bearer token (container authenticates to fetch its config)             |
-
-## Database Schema
-
-### System Tables
-
-```prisma
-model SystemConfig {
-  id        String   @id @default(cuid())
-  key       String   @unique  // "oidc.issuerUrl", "oidc.clientId", "onboarding.completed"
-  value     String             // plaintext or encrypted (prefix: "enc:")
-  encrypted Boolean  @default(false)
-  updatedAt DateTime @updatedAt
-}
-
-model BreakglassUser {
-  id           String   @id @default(cuid())
-  username     String   @unique
-  passwordHash String   // bcrypt
-  isActive     Boolean  @default(true)
-  createdAt    DateTime @default(now())
-  updatedAt    DateTime @updatedAt
-}
-```
-
-### Provider Tables (per-user)
-
-```prisma
-model LlmProvider {
-  id          String   @id @default(cuid())
-  userId      String             // owner — each user manages their own providers
-  name        String             // "my-zai", "work-openai", "local-ollama"
-  displayName String             // "Z.ai", "OpenAI (Work)", "Local Ollama"
-  type        String             // "zai" | "openai" | "anthropic" | "ollama" | "custom"
-  baseUrl     String?            // null for built-in, URL for custom/ollama
-  apiKey      String?            // encrypted
-  apiType     String   @default("openai-completions")
-  models      Json     @default("[]")  // [{id, name, contextWindow, maxTokens}]
-  isActive    Boolean  @default(true)
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-
-  @@unique([userId, name])
-}
-```
-
-### Container Tables
-
-```prisma
-model UserContainer {
-  id              String    @id @default(cuid())
-  userId          String    @unique
-  containerId     String?   // Docker container ID (null = not running)
-  containerName   String    // "mosaic-user-{userId}"
-  gatewayPort     Int?      // assigned port (null = not running)
-  gatewayToken    String    // encrypted — auto-generated
-  status          String    @default("stopped")  // "running" | "stopped" | "starting" | "error"
-  lastActiveAt    DateTime?
-  idleTimeoutMin  Int       @default(30)
-  config          Json      @default("{}")  // cached openclaw.json for this user
-  createdAt       DateTime  @default(now())
-  updatedAt       DateTime  @updatedAt
-}
-
-model SystemContainer {
-  id              String   @id @default(cuid())
-  name            String   @unique  // "mosaic-system-ops", "mosaic-system-monitor"
-  role            String   // "operations" | "monitor" | "scheduler"
-  containerId     String?
-  gatewayPort     Int?
-  gatewayToken    String   // encrypted
-  status          String   @default("stopped")
-  providerId      String?  // references admin-level LlmProvider
-  primaryModel    String   // "zai/glm-5", etc.
-  isActive        Boolean  @default(true)
-  createdAt       DateTime @default(now())
-  updatedAt       DateTime @updatedAt
-}
-```
-
-### User Agent Preferences
-
-```prisma
-model UserAgentConfig {
-  id             String  @id @default(cuid())
-  userId         String  @unique
-  primaryModel   String?           // user's preferred model
-  fallbackModels Json    @default("[]")
-  personality    String?           // custom SOUL.md content
-  providerId     String?           // default provider for this user
-  createdAt      DateTime @default(now())
-  updatedAt      DateTime @updatedAt
-}
-```
-
-## Internal Config Endpoint
-
-`GET /api/internal/agent-config/:containerType/:id`
-
-- Auth: Bearer token (container's own gateway token)
-- Returns: Complete `openclaw.json` generated from DB
-- For user containers: includes user's providers, model prefs, personality
-- For system containers: includes admin provider config
-
-Response assembles openclaw.json dynamically:
-
-```json
-{
-  "gateway": { "mode": "local", "port": 18789, "bind": "lan", "auth": { "mode": "token" } ... },
-  "agents": { "defaults": { "model": { "primary": "<from UserAgentConfig>" } } },
-  "models": { "providers": { "<from LlmProvider rows>": { ... } } }
-}
-```
-
-## Container Lifecycle Manager
-
-NestJS service that manages Docker containers:
-
-```typescript
-class ContainerLifecycleService {
-  // Create and start a user's OpenClaw container
-  async ensureRunning(userId: string): Promise<{ url: string; token: string }>;
-
-  // Stop idle containers (called by cron/scheduler)
-  async reapIdle(): Promise<number>;
-
-  // Stop a specific user's container
-  async stop(userId: string): Promise<void>;
-
-  // Health check all running containers
-  async healthCheckAll(): Promise<HealthStatus[]>;
-
-  // Restart container with updated config
-  async restart(userId: string): Promise<void>;
-}
-```
-
-Uses Docker Engine API (`/var/run/docker.sock` or TCP) via `dockerode` npm package.
-
-## Onboarding Wizard
-
-### First-Boot Detection
-
-- API checks: `SystemConfig.get("onboarding.completed")` → null = first boot
-- WebUI redirects to `/onboarding` if not completed
-
-### Steps
-
-**Step 1: Create Breakglass Admin**
-
-- Username + password → bcrypt → `BreakglassUser` table
-- This user always works, even if OIDC is misconfigured
-
-**Step 2: Configure Authentication (optional)**
-
-- OIDC: provider URL, client ID, client secret → encrypted in `SystemConfig`
-- Skip = breakglass-only auth (can add OIDC later in settings)
-
-**Step 3: Add Your First LLM Provider**
-
-- Pick type → enter API key/endpoint → test connection → save to `LlmProvider`
-- This becomes the admin's default provider
-
-**Step 4: System Agents (optional)**
-
-- Configure always-on system agents for monitoring/ops
-- Or skip — users can just use their own personal agents
-
-**Step 5: Complete**
-
-- Sets `SystemConfig("onboarding.completed") = true`
-- Redirects to dashboard
-
-### Post-Onboarding: User Self-Service
-
-- Each user adds their own LLM providers in profile settings
-- Each user configures their preferred model, personality
-- First chat request triggers container creation
-
-## Docker Compose (final)
-
-```yaml
-services:
-  mosaic-api:
-    image: mosaic/api:latest
-    environment:
-      DATABASE_URL: ${DATABASE_URL}
-      MOSAIC_SECRET_KEY: ${MOSAIC_SECRET_KEY}
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock # Docker API access
-    networks:
-      - internal
-
-  mosaic-web:
-    image: mosaic/web:latest
-    environment:
-      NEXT_PUBLIC_API_URL: http://mosaic-api:4000
-    networks:
-      - internal
-
-  postgres:
-    image: postgres:17
-    environment:
-      POSTGRES_DB: mosaic
-      POSTGRES_USER: mosaic
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-    networks:
-      - internal
-
-  # System agent (optional, admin-provisioned)
-  # mosaic-system:
-  #   image: alpine/openclaw:latest
-  #   ... (managed by ContainerLifecycleService)
-
-  # User containers are NOT in this file —
-  # they are dynamically created by ContainerLifecycleService
-  # via the Docker API at runtime.
-
-networks:
-  internal:
-    driver: overlay
-
-volumes:
-  postgres-data:
-```
-
-Note: User OpenClaw containers are **not** defined in docker-compose. They are
-created dynamically by the `ContainerLifecycleService` when users start chatting.
-
-## Entrypoint (for dynamically created containers)
-
-```sh
-#!/bin/sh
-set -e
-: "${MOSAIC_API_URL:?required}"
-: "${AGENT_TOKEN:?required}"
-: "${AGENT_ID:?required}"
-
-# Fetch config from Mosaic API
-curl -sf "${MOSAIC_API_URL}/api/internal/agent-config/${AGENT_ID}" \
-  -H "Authorization: Bearer ${AGENT_TOKEN}" \
-  -o /tmp/openclaw.json
-
-export OPENCLAW_CONFIG_PATH=/tmp/openclaw.json
-exec openclaw gateway run --bind lan --auth token
-```
-
-Container env vars (injected by ContainerLifecycleService):
-
-- `MOSAIC_API_URL` — internal API URL
-- `AGENT_TOKEN` — this container's bearer token (from DB)
-- `AGENT_ID` — container ID for config lookup
-
-## Config Update Strategy
-
-When a user changes settings (model, provider, personality):
-
-1. Mosaic API updates DB
-2. API calls `ContainerLifecycleService.restart(userId)`
-3. Container restarts, fetches fresh config from API
-4. OpenClaw gateway starts with new config
-5. State volume preserves sessions/memory across restarts
-
-## Task Breakdown
-
-| Task     | Phase          | Scope                                                                                                                 | Dependencies |
-| -------- | -------------- | --------------------------------------------------------------------------------------------------------------------- | ------------ |
-| MS22-P1a | Schema         | Prisma models: SystemConfig, BreakglassUser, LlmProvider, UserContainer, SystemContainer, UserAgentConfig. Migration. | —            |
-| MS22-P1b | Crypto         | Encryption service for API keys/tokens (AES-256-GCM using MOSAIC_SECRET_KEY)                                          | P1a          |
-| MS22-P1c | Config API     | Internal config endpoint: assembles openclaw.json from DB                                                             | P1a, P1b     |
-| MS22-P1d | Container Mgr  | ContainerLifecycleService: Docker API integration (dockerode), start/stop/health/reap                                 | P1a          |
-| MS22-P1e | Onboarding API | Onboarding endpoints: breakglass, OIDC, provider, complete                                                            | P1a, P1b     |
-| MS22-P1f | Onboarding UI  | Multi-step wizard in WebUI                                                                                            | P1e          |
-| MS22-P1g | Settings API   | CRUD: providers, agent config, OIDC, breakglass                                                                       | P1a, P1b     |
-| MS22-P1h | Settings UI    | Settings pages: Providers, Agent Config, Auth                                                                         | P1g          |
-| MS22-P1i | Chat Proxy     | Route WebUI chat → user's OpenClaw container (SSE)                                                                    | P1c, P1d     |
-| MS22-P1j | Docker         | Entrypoint script, health checks, compose for core services                                                           | P1c          |
-| MS22-P1k | Idle Reaper    | Cron service to stop idle user containers                                                                             | P1d          |
-
-## Open Questions (Resolved)
-
-1. ~~Config updates → restart?~~ **Yes.** Mosaic restarts the container, fresh config on boot.
-2. ~~CLI alternative for breakglass?~~ **Yes.** Both WebUI wizard and CLI (`mosaic admin create-breakglass`).
-3. ~~Config cache TTL?~~ **Yes.** Config fetched once at startup, changes trigger restart.
-
-## Security Isolation Model
-
-### Core Principle: ZERO cross-user access
-
-Every user is fully sandboxed. No exceptions.
-
-### Container Isolation
-
-- Each user gets their **own** OpenClaw container (separate process, PID namespace)
-- Each container has its **own** Docker volume (sessions, memory, workspace)
-- Containers run on an **internal-only** Docker network — no external exposure
-- Users NEVER talk to OpenClaw directly — Mosaic proxies all requests
-- Container gateway tokens are unique per-user and single-purpose
-
-### Data Isolation (enforced at API + DB level)
-
-| Data             | Isolation                 | Enforcement                                                                       |
-| ---------------- | ------------------------- | --------------------------------------------------------------------------------- |
-| LLM API keys     | Per-user, encrypted       | `LlmProvider.userId` — all queries scoped by authenticated user                   |
-| Chat history     | Per-user container volume | Separate Docker volume per user, not shared                                       |
-| Agent memory     | Per-user container volume | Separate Docker volume per user                                                   |
-| Agent config     | Per-user                  | `UserAgentConfig.userId` — scoped queries                                         |
-| Container access | Per-user                  | `UserContainer.userId` — Mosaic validates user owns the container before proxying |
-
-### API Enforcement
-
-- **All user-facing endpoints** include `WHERE userId = authenticatedUser.id`
-- **No admin endpoint** exposes another user's API keys (even to admins)
-- **Chat proxy** validates: authenticated user → owns target container → forwards request
-- **Config endpoint** validates: container token matches the container requesting config
-- **Provider CRUD** is fully user-scoped — User A cannot list, read, or modify User B's providers
-
-### What admins CAN see
-
-- Container status (running/stopped) — not contents
-- User list and roles
-- System-level config (OIDC, system agents)
-- Aggregate usage metrics (not individual conversations)
-
-### What admins CANNOT see
-
-- Other users' API keys (encrypted, no decrypt endpoint)
-- Other users' chat history (in container volumes, not in Mosaic DB)
-- Other users' agent memory/workspace contents
-
-### Future: Team Workspaces (NOT in scope)
-
-Team/shared workspaces are a potential future feature where users opt-in to
-shared agent contexts. This requires explicit consent, shared-key management,
-and a different isolation model. **Not designed here. Not built now.**
-
-### Attack Surface Notes
-
-- Docker socket access (`/var/run/docker.sock`) is required by Mosaic API for container management. This is a privileged operation — the Mosaic API container must be trusted.
-- `MOSAIC_SECRET_KEY` is the root of trust for encryption. Rotation requires re-encrypting all secrets in DB.
-- Container-to-container communication is blocked by default (no shared network between user containers unless explicitly configured).

package.json

@@ -35,8 +35,7 @@
     "docker:ps": "docker compose ps",
     "docker:build": "docker compose build",
     "docker:restart": "docker compose restart",
-    "prepare": "husky || true",
+    "prepare": "husky || true"
-    "ingest:sessions": "tsx scripts/ingest-openclaw-sessions.ts"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^8.26.0",

scripts/ingest-openclaw-sessions.ts

@@ -1,621 +0,0 @@
-import { createReadStream, constants as fsConstants } from "node:fs";
-import { access, readdir, stat } from "node:fs/promises";
-import { homedir } from "node:os";
-import * as path from "node:path";
-import * as process from "node:process";
-import { createInterface } from "node:readline";
-
-const DEFAULT_ENDPOINT = "https://mosaic-api.woltje.com/conversation-archive/ingest";
-
-type IngestRole = "user" | "assistant";
-
-interface IngestMessage {
-  role: IngestRole;
-  content: string;
-  timestamp?: string;
-}
-
-interface IngestPayload {
-  sessionId: string;
-  workspaceId: string;
-  title: string;
-  messages: IngestMessage[];
-  agentId?: string;
-}
-
-interface CliOptions {
-  workspaceId: string;
-  agentId?: string;
-  since?: Date;
-  sessionsDir?: string;
-  endpoint: string;
-}
-
-interface ParsedSession {
-  sessionId: string;
-  title: string;
-  messages: IngestMessage[];
-  startedAt?: string;
-  endedAt?: string;
-  parseErrors: number;
-  inferredAgentId?: string;
-}
-
-interface SendResult {
-  ok: boolean;
-  status: number;
-  body: string;
-}
-
-interface IngestSummary {
-  discovered: number;
-  processed: number;
-  ingested: number;
-  skippedSince: number;
-  skippedEmpty: number;
-  skippedDuplicate: number;
-  failed: number;
-}
-
-function printUsage(): void {
-  console.log(
-    [
-      "Usage:",
-      "  pnpm ingest:sessions --workspace-id <id> [--agent-id <id>] [--since <ISO date>] [--sessions-dir <path>] [--endpoint <url>]",
-      "",
-      "Required:",
-      "  --workspace-id   Target Mosaic workspace ID",
-      "",
-      "Optional:",
-      "  --agent-id       Agent ID to include in each ingest payload",
-      "  --since          Skip sessions before this date/time (ISO8601 or YYYY-MM-DD)",
-      "  --sessions-dir   Override session directory path",
-      `  --endpoint       Ingest endpoint (default: ${DEFAULT_ENDPOINT})`,
-    ].join("\n")
-  );
-}
-
-function expandHomePath(inputPath: string): string {
-  if (inputPath === "~") {
-    return homedir();
-  }
-  if (inputPath.startsWith("~/")) {
-    return path.join(homedir(), inputPath.slice(2));
-  }
-  return inputPath;
-}
-
-function parseSinceDate(rawDate: string): Date {
-  const parsed = new Date(rawDate);
-  if (Number.isNaN(parsed.getTime())) {
-    throw new Error(`Invalid --since date: "${rawDate}". Use ISO8601 or YYYY-MM-DD.`);
-  }
-  return parsed;
-}
-
-function parseCliArgs(args: string[]): CliOptions {
-  let workspaceId: string | null = null;
-  let agentId: string | undefined;
-  let since: Date | undefined;
-  let sessionsDir: string | undefined;
-  let endpoint = DEFAULT_ENDPOINT;
-
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index];
-
-    if (arg === "--help" || arg === "-h") {
-      printUsage();
-      process.exit(0);
-    }
-
-    if (arg.startsWith("--workspace-id=")) {
-      workspaceId = arg.slice("--workspace-id=".length);
-      continue;
-    }
-    if (arg === "--workspace-id") {
-      const value = args[index + 1];
-      if (!value) {
-        throw new Error("Missing value for --workspace-id");
-      }
-      workspaceId = value;
-      index += 1;
-      continue;
-    }
-
-    if (arg.startsWith("--agent-id=")) {
-      agentId = arg.slice("--agent-id=".length);
-      continue;
-    }
-    if (arg === "--agent-id") {
-      const value = args[index + 1];
-      if (!value) {
-        throw new Error("Missing value for --agent-id");
-      }
-      agentId = value;
-      index += 1;
-      continue;
-    }
-
-    if (arg.startsWith("--since=")) {
-      since = parseSinceDate(arg.slice("--since=".length));
-      continue;
-    }
-    if (arg === "--since") {
-      const value = args[index + 1];
-      if (!value) {
-        throw new Error("Missing value for --since");
-      }
-      since = parseSinceDate(value);
-      index += 1;
-      continue;
-    }
-
-    if (arg.startsWith("--sessions-dir=")) {
-      sessionsDir = arg.slice("--sessions-dir=".length);
-      continue;
-    }
-    if (arg === "--sessions-dir") {
-      const value = args[index + 1];
-      if (!value) {
-        throw new Error("Missing value for --sessions-dir");
-      }
-      sessionsDir = value;
-      index += 1;
-      continue;
-    }
-
-    if (arg.startsWith("--endpoint=")) {
-      endpoint = arg.slice("--endpoint=".length);
-      continue;
-    }
-    if (arg === "--endpoint") {
-      const value = args[index + 1];
-      if (!value) {
-        throw new Error("Missing value for --endpoint");
-      }
-      endpoint = value;
-      index += 1;
-      continue;
-    }
-
-    throw new Error(`Unknown flag: ${arg}`);
-  }
-
-  if (!workspaceId || workspaceId.trim().length === 0) {
-    throw new Error("--workspace-id is required");
-  }
-
-  return {
-    workspaceId: workspaceId.trim(),
-    agentId: agentId?.trim(),
-    since,
-    sessionsDir: sessionsDir ? path.resolve(expandHomePath(sessionsDir)) : undefined,
-    endpoint,
-  };
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}
-
-function asString(value: unknown): string | null {
-  return typeof value === "string" ? value : null;
-}
-
-function normalizeIsoTimestamp(value: unknown): string | null {
-  if (typeof value === "string") {
-    const parsed = new Date(value);
-    if (!Number.isNaN(parsed.getTime())) {
-      return parsed.toISOString();
-    }
-    return null;
-  }
-
-  if (typeof value === "number" && Number.isFinite(value)) {
-    const millis = value >= 1_000_000_000_000 ? value : value * 1000;
-    const parsed = new Date(millis);
-    if (!Number.isNaN(parsed.getTime())) {
-      return parsed.toISOString();
-    }
-  }
-
-  return null;
-}
-
-function truncate(value: string, maxLength: number): string {
-  if (value.length <= maxLength) {
-    return value;
-  }
-  return `${value.slice(0, maxLength - 3)}...`;
-}
-
-function deriveTitle(content: string, fallbackSessionId: string): string {
-  const firstLine = content
-    .split(/\r?\n/u)
-    .map((line) => line.trim())
-    .find((line) => line.length > 0);
-
-  if (!firstLine) {
-    return `OpenClaw session ${fallbackSessionId}`;
-  }
-
-  const normalized = firstLine.replace(/\s+/gu, " ").trim();
-  return truncate(normalized, 140);
-}
-
-function extractTextContent(content: unknown): string {
-  if (typeof content === "string") {
-    return content.trim();
-  }
-
-  if (Array.isArray(content)) {
-    const parts: string[] = [];
-    for (const item of content) {
-      if (typeof item === "string") {
-        const trimmed = item.trim();
-        if (trimmed.length > 0) {
-          parts.push(trimmed);
-        }
-        continue;
-      }
-      if (!isRecord(item)) {
-        continue;
-      }
-      const itemType = asString(item.type);
-      if (itemType !== null && itemType !== "text") {
-        continue;
-      }
-      const textValue = asString(item.text);
-      if (textValue && textValue.trim().length > 0) {
-        parts.push(textValue.trim());
-      }
-    }
-    return parts.join("\n\n").trim();
-  }
-
-  if (isRecord(content)) {
-    const textValue = asString(content.text);
-    if (textValue) {
-      return textValue.trim();
-    }
-  }
-
-  return "";
-}
-
-function inferAgentIdFromPath(filePath: string): string | null {
-  const pathParts = filePath.split(path.sep);
-  const agentsIndex = pathParts.lastIndexOf("agents");
-  if (agentsIndex < 0) {
-    return null;
-  }
-  const candidate = pathParts[agentsIndex + 1];
-  return candidate && candidate.trim().length > 0 ? candidate : null;
-}
-
-async function parseSessionFile(filePath: string): Promise<ParsedSession> {
-  const fallbackSessionId = path.basename(filePath, path.extname(filePath));
-  const inferredAgentId = inferAgentIdFromPath(filePath) ?? undefined;
-
-  let sessionId = fallbackSessionId;
-  let title: string | null = null;
-  let startedAt: string | undefined;
-  let endedAt: string | undefined;
-  let parseErrors = 0;
-  const messages: IngestMessage[] = [];
-
-  const readStream = createReadStream(filePath, { encoding: "utf8" });
-  const lineReader = createInterface({
-    input: readStream,
-    crlfDelay: Number.POSITIVE_INFINITY,
-  });
-
-  for await (const rawLine of lineReader) {
-    const line = rawLine.trim();
-    if (line.length === 0) {
-      continue;
-    }
-
-    let parsedLine: unknown;
-    try {
-      parsedLine = JSON.parse(line) as unknown;
-    } catch {
-      parseErrors += 1;
-      continue;
-    }
-
-    if (!isRecord(parsedLine)) {
-      parseErrors += 1;
-      continue;
-    }
-
-    const eventType = asString(parsedLine.type);
-    if (eventType === "session") {
-      const rawSessionId = asString(parsedLine.id);
-      if (rawSessionId && rawSessionId.trim().length > 0) {
-        sessionId = rawSessionId;
-      }
-
-      const sessionTimestamp = normalizeIsoTimestamp(parsedLine.timestamp);
-      if (sessionTimestamp) {
-        startedAt ??= sessionTimestamp;
-      }
-      continue;
-    }
-
-    if (eventType !== "message") {
-      continue;
-    }
-
-    const messageRecord = parsedLine.message;
-    if (!isRecord(messageRecord)) {
-      continue;
-    }
-
-    const role = asString(messageRecord.role);
-    if (role !== "user" && role !== "assistant") {
-      continue;
-    }
-
-    const content = extractTextContent(messageRecord.content);
-    if (content.length === 0) {
-      continue;
-    }
-
-    const timestamp =
-      normalizeIsoTimestamp(messageRecord.timestamp) ?? normalizeIsoTimestamp(parsedLine.timestamp);
-
-    const message: IngestMessage = {
-      role,
-      content,
-      timestamp: timestamp ?? undefined,
-    };
-    messages.push(message);
-
-    if (!title && role === "user") {
-      title = deriveTitle(content, sessionId);
-    }
-    if (!startedAt && timestamp) {
-      startedAt = timestamp;
-    }
-    if (timestamp) {
-      endedAt = timestamp;
-    }
-  }
-
-  return {
-    sessionId,
-    title: title ?? `OpenClaw session ${sessionId}`,
-    messages,
-    startedAt,
-    endedAt,
-    parseErrors,
-    inferredAgentId,
-  };
-}
-
-async function pathExists(candidatePath: string): Promise<boolean> {
-  try {
-    await access(candidatePath, fsConstants.F_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-async function discoverSessionDirectories(overrideDir?: string): Promise<string[]> {
-  if (overrideDir) {
-    if (!(await pathExists(overrideDir))) {
-      throw new Error(`Provided --sessions-dir does not exist: ${overrideDir}`);
-    }
-    return [overrideDir];
-  }
-
-  const defaultDir = path.join(homedir(), ".openclaw", "sessions");
-  if (await pathExists(defaultDir)) {
-    return [defaultDir];
-  }
-
-  const agentsRoot = path.join(homedir(), ".openclaw", "agents");
-  if (!(await pathExists(agentsRoot))) {
-    return [];
-  }
-
-  const agentEntries = await readdir(agentsRoot, { withFileTypes: true });
-  const directories: string[] = [];
-  for (const entry of agentEntries) {
-    if (!entry.isDirectory()) {
-      continue;
-    }
-    const sessionsDir = path.join(agentsRoot, entry.name, "sessions");
-    if (await pathExists(sessionsDir)) {
-      directories.push(sessionsDir);
-    }
-  }
-
-  return directories.sort((left, right) => left.localeCompare(right));
-}
-
-async function discoverSessionFiles(overrideDir?: string): Promise<string[]> {
-  const directories = await discoverSessionDirectories(overrideDir);
-  const files: string[] = [];
-
-  for (const directory of directories) {
-    const entries = await readdir(directory, { withFileTypes: true });
-    for (const entry of entries) {
-      if (!entry.isFile() || !entry.name.endsWith(".jsonl")) {
-        continue;
-      }
-      files.push(path.join(directory, entry.name));
-    }
-  }
-
-  return files.sort((left, right) => left.localeCompare(right));
-}
-
-async function resolveSessionTimestamp(session: ParsedSession, filePath: string): Promise<Date> {
-  const sessionTimestamp = session.startedAt ?? session.endedAt;
-  if (sessionTimestamp) {
-    const parsed = new Date(sessionTimestamp);
-    if (!Number.isNaN(parsed.getTime())) {
-      return parsed;
-    }
-  }
-
-  const fileStat = await stat(filePath);
-  return fileStat.mtime;
-}
-
-function buildPayload(
-  options: CliOptions,
-  session: ParsedSession,
-  fallbackAgentId: string | undefined
-): IngestPayload {
-  const payload: IngestPayload = {
-    sessionId: session.sessionId,
-    workspaceId: options.workspaceId,
-    title: session.title,
-    messages: session.messages,
-  };
-
-  const selectedAgentId = options.agentId ?? fallbackAgentId;
-  if (selectedAgentId && selectedAgentId.trim().length > 0) {
-    payload.agentId = selectedAgentId.trim();
-  }
-
-  return payload;
-}
-
-async function sendIngestRequest(
-  endpoint: string,
-  token: string,
-  payload: IngestPayload
-): Promise<SendResult> {
-  const response = await fetch(endpoint, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(payload),
-  });
-
-  const body = await response.text();
-  return {
-    ok: response.ok,
-    status: response.status,
-    body,
-  };
-}
-
-function summarizeFailureBody(body: string): string {
-  const compact = body.replace(/\s+/gu, " ").trim();
-  if (compact.length === 0) {
-    return "(empty response body)";
-  }
-  return truncate(compact, 220);
-}
-
-async function main(): Promise<void> {
-  const options = parseCliArgs(process.argv.slice(2));
-  const token = process.env.MOSAIC_API_TOKEN;
-  if (!token || token.trim().length === 0) {
-    throw new Error("MOSAIC_API_TOKEN environment variable is required.");
-  }
-
-  const sessionFiles = await discoverSessionFiles(options.sessionsDir);
-  if (sessionFiles.length === 0) {
-    console.log("No OpenClaw session files found.");
-    return;
-  }
-
-  console.log(`Discovered ${sessionFiles.length} session file(s).`);
-  if (options.since) {
-    console.log(`Applying --since filter at ${options.since.toISOString()}.`);
-  }
-
-  const summary: IngestSummary = {
-    discovered: sessionFiles.length,
-    processed: 0,
-    ingested: 0,
-    skippedSince: 0,
-    skippedEmpty: 0,
-    skippedDuplicate: 0,
-    failed: 0,
-  };
-
-  for (const [index, filePath] of sessionFiles.entries()) {
-    const position = `${index + 1}/${sessionFiles.length}`;
-    const parsedSession = await parseSessionFile(filePath);
-    summary.processed += 1;
-
-    if (parsedSession.messages.length === 0) {
-      summary.skippedEmpty += 1;
-      console.log(
-        `[${position}] Skipped ${parsedSession.sessionId}: no user/assistant text messages.`
-      );
-      continue;
-    }
-
-    const sessionDate = await resolveSessionTimestamp(parsedSession, filePath);
-    if (options.since && sessionDate.getTime() < options.since.getTime()) {
-      summary.skippedSince += 1;
-      console.log(
-        `[${position}] Skipped ${parsedSession.sessionId}: session is before --since (${sessionDate.toISOString()}).`
-      );
-      continue;
-    }
-
-    const payload = buildPayload(options, parsedSession, parsedSession.inferredAgentId);
-    let result: SendResult;
-
-    try {
-      result = await sendIngestRequest(options.endpoint, token, payload);
-    } catch (error) {
-      summary.failed += 1;
-      const message = error instanceof Error ? error.message : String(error);
-      console.error(`[${position}] Failed ${parsedSession.sessionId}: request error: ${message}`);
-      continue;
-    }
-
-    if (result.ok) {
-      summary.ingested += 1;
-      const note =
-        parsedSession.parseErrors > 0 ? ` (parse warnings: ${parsedSession.parseErrors})` : "";
-      console.log(
-        `[${position}] Ingested ${parsedSession.sessionId} (${parsedSession.messages.length} messages)${note}.`
-      );
-      continue;
-    }
-
-    if (result.status === 409) {
-      summary.skippedDuplicate += 1;
-      console.log(`[${position}] Skipped ${parsedSession.sessionId}: already exists (409).`);
-      continue;
-    }
-
-    summary.failed += 1;
-    console.error(
-      `[${position}] Failed ${parsedSession.sessionId}: HTTP ${result.status} ${summarizeFailureBody(result.body)}`
-    );
-  }
-
-  console.log("\nIngestion summary:");
-  console.log(`  Discovered: ${summary.discovered}`);
-  console.log(`  Processed: ${summary.processed}`);
-  console.log(`  Ingested: ${summary.ingested}`);
-  console.log(`  Skipped (--since): ${summary.skippedSince}`);
-  console.log(`  Skipped (empty): ${summary.skippedEmpty}`);
-  console.log(`  Skipped (duplicate): ${summary.skippedDuplicate}`);
-  console.log(`  Failed: ${summary.failed}`);
-
-  if (summary.failed > 0) {
-    process.exit(1);
-  }
-}
-
-main().catch((error: unknown) => {
-  const message = error instanceof Error ? error.message : String(error);
-  console.error(`Fatal error: ${message}`);
-  process.exit(1);
-});