fix(api): add ConfigModule to ContainerLifecycleModule imports

2026-03-01 11:52:00 -06:00
46 changed files with 497 additions and 2325 deletions
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -62,7 +62,6 @@
    "discord.js": "^14.25.1",
    "dockerode": "^4.0.9",
    "gray-matter": "^4.0.3",
-    "helmet": "^8.1.0",
    "highlight.js": "^11.11.1",
    "ioredis": "^5.9.2",
    "jose": "^6.1.3",
--- a/apps/api/src/activity/activity.controller.ts
+++ b/apps/api/src/activity/activity.controller.ts
@@ -1,7 +1,7 @@
 import { Controller, Get, Query, Param, UseGuards } from "@nestjs/common";
 import { ActivityService } from "./activity.service";
 import { EntityType } from "@prisma/client";
-import { QueryActivityLogDto } from "./dto";
+import type { QueryActivityLogDto } from "./dto";
 import { AuthGuard } from "../auth/guards/auth.guard";
 import { WorkspaceGuard, PermissionGuard } from "../common/guards";
 import { Workspace, Permission, RequirePermission } from "../common/decorators";
--- a/apps/api/src/activity/activity.service.ts
+++ b/apps/api/src/activity/activity.service.ts
@@ -117,13 +117,12 @@ export class ActivityService {
  /**
   * Get a single activity log by ID
   */
-  async findOne(id: string, workspaceId?: string): Promise<ActivityLogResult | null> {
-    const where: Prisma.ActivityLogWhereUniqueInput = { id };
-    if (workspaceId) {
-      where.workspaceId = workspaceId;
-    }
+  async findOne(id: string, workspaceId: string): Promise<ActivityLogResult | null> {
    return await this.prisma.activityLog.findUnique({
-      where,
+      where: {
+        id,
+        workspaceId,
+      },
      include: {
        user: {
          select: {
--- a/apps/api/src/activity/interceptors/activity-logging.interceptor.ts
+++ b/apps/api/src/activity/interceptors/activity-logging.interceptor.ts
@@ -4,7 +4,6 @@ import { tap } from "rxjs/operators";
 import { ActivityService } from "../activity.service";
 import { ActivityAction, EntityType } from "@prisma/client";
 import type { Prisma } from "@prisma/client";
-import type { CreateActivityLogInput } from "../interfaces/activity.interface";
 import type { AuthenticatedRequest } from "../../common/types/user.types";

 /**
@@ -62,13 +61,10 @@ export class ActivityLoggingInterceptor implements NestInterceptor {
      // Extract entity information
      const resultObj = result as Record<string, unknown> | undefined;
      const entityId = params.id ?? (resultObj?.id as string | undefined);
-
-      // workspaceId is now optional - log events even when missing
      const workspaceId = user.workspaceId ?? (body.workspaceId as string | undefined);

-      // Log with warning if entityId is missing, but still proceed with logging if workspaceId exists
-      if (!entityId) {
-        this.logger.warn("Cannot log activity: missing entityId");
+      if (!entityId || !workspaceId) {
+        this.logger.warn("Cannot log activity: missing entityId or workspaceId");
        return;
      }

@@ -96,8 +92,9 @@ export class ActivityLoggingInterceptor implements NestInterceptor {
      const userAgent =
        typeof userAgentHeader === "string" ? userAgentHeader : userAgentHeader?.[0];

-      // Log the activity — workspaceId is optional
-      const activityInput: CreateActivityLogInput = {
+      // Log the activity
+      await this.activityService.logActivity({
+        workspaceId,
        userId: user.id,
        action,
        entityType,
@@ -105,11 +102,7 @@ export class ActivityLoggingInterceptor implements NestInterceptor {
        details,
        ipAddress: ip ?? undefined,
        userAgent: userAgent ?? undefined,
-      };
-      if (workspaceId) {
-        activityInput.workspaceId = workspaceId;
-      }
-      await this.activityService.logActivity(activityInput);
+      });
    } catch (error) {
      // Don't fail the request if activity logging fails
      this.logger.error(
--- a/apps/api/src/activity/interfaces/activity.interface.ts
+++ b/apps/api/src/activity/interfaces/activity.interface.ts
@@ -2,10 +2,9 @@ import type { ActivityAction, EntityType, Prisma } from "@prisma/client";

 /**
 * Interface for creating a new activity log entry
- * workspaceId is optional - allows logging events without workspace context
 */
 export interface CreateActivityLogInput {
-  workspaceId?: string | null;
+  workspaceId: string;
  userId: string;
  action: ActivityAction;
  entityType: EntityType;
--- a/apps/api/src/agent-config/agent-config.service.ts
+++ b/apps/api/src/agent-config/agent-config.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException } from "@nestjs/common";
 import type { LlmProvider } from "@prisma/client";
-import { createHash, timingSafeEqual } from "node:crypto";
+import { timingSafeEqual } from "node:crypto";
 import { PrismaService } from "../prisma/prisma.service";
 import { CryptoService } from "../crypto/crypto.service";

@@ -143,23 +143,21 @@ export class AgentConfigService {
      }),
    ]);

-    let match: ContainerTokenValidation | null = null;
-
    for (const container of userContainers) {
      const storedToken = this.decryptContainerToken(container.gatewayToken);
-      if (!match && storedToken && this.tokensEqual(storedToken, token)) {
-        match = { type: "user", id: container.id };
+      if (storedToken && this.tokensEqual(storedToken, token)) {
+        return { type: "user", id: container.id };
      }
    }

    for (const container of systemContainers) {
      const storedToken = this.decryptContainerToken(container.gatewayToken);
-      if (!match && storedToken && this.tokensEqual(storedToken, token)) {
-        match = { type: "system", id: container.id };
+      if (storedToken && this.tokensEqual(storedToken, token)) {
+        return { type: "system", id: container.id };
      }
    }

-    return match;
+    return null;
  }

  private buildOpenClawConfig(
@@ -270,9 +268,14 @@ export class AgentConfigService {
  }

  private tokensEqual(left: string, right: string): boolean {
-    const leftDigest = createHash("sha256").update(left, "utf8").digest();
-    const rightDigest = createHash("sha256").update(right, "utf8").digest();
-    return timingSafeEqual(leftDigest, rightDigest);
+    const leftBuffer = Buffer.from(left, "utf8");
+    const rightBuffer = Buffer.from(right, "utf8");
+
+    if (leftBuffer.length !== rightBuffer.length) {
+      return false;
+    }
+
+    return timingSafeEqual(leftBuffer, rightBuffer);
  }

  private hasModelId(modelEntry: unknown): modelEntry is { id: string } {
--- a/apps/api/src/app.module.ts
+++ b/apps/api/src/app.module.ts
@@ -58,7 +58,6 @@ import { ContainerReaperModule } from "./container-reaper/container-reaper.modul
 import { FleetSettingsModule } from "./fleet-settings/fleet-settings.module";
 import { OnboardingModule } from "./onboarding/onboarding.module";
 import { ChatProxyModule } from "./chat-proxy/chat-proxy.module";
-import { OrchestratorModule } from "./orchestrator/orchestrator.module";

@Module({
  imports: [
@@ -138,7 +137,6 @@ import { OrchestratorModule } from "./orchestrator/orchestrator.module";
    FleetSettingsModule,
    OnboardingModule,
    ChatProxyModule,
-    OrchestratorModule,
  ],
  controllers: [AppController, CsrfController],
  providers: [
--- a/apps/api/src/auth/auth.controller.ts
+++ b/apps/api/src/auth/auth.controller.ts
@@ -106,7 +106,7 @@ export class AuthController {
  // @SkipCsrf avoids double-protection conflicts.
  // See: https://www.better-auth.com/docs/reference/security
  @SkipCsrf()
-  @Throttle({ default: { ttl: 60_000, limit: 5 } })
+  @Throttle({ strict: { limit: 10, ttl: 60000 } })
  async handleAuth(@Req() req: ExpressRequest, @Res() res: ExpressResponse): Promise<void> {
    // Extract client IP for logging
    const clientIp = this.getClientIp(req);
--- a/apps/api/src/chat-proxy/chat-proxy.controller.ts
+++ b/apps/api/src/chat-proxy/chat-proxy.controller.ts
@@ -1,14 +1,4 @@
-import {
-  Body,
-  Controller,
-  HttpException,
-  Logger,
-  Post,
-  Req,
-  Res,
-  UnauthorizedException,
-  UseGuards,
-} from "@nestjs/common";
+import { Body, Controller, Post, Req, Res, UnauthorizedException, UseGuards } from "@nestjs/common";
 import type { Response } from "express";
 import { AuthGuard } from "../auth/guards/auth.guard";
 import type { MaybeAuthenticatedRequest } from "../auth/types/better-auth-request.interface";
@@ -18,8 +8,6 @@ import { ChatProxyService } from "./chat-proxy.service";
@Controller("chat")
@UseGuards(AuthGuard)
 export class ChatProxyController {
-  private readonly logger = new Logger(ChatProxyController.name);
-
  constructor(private readonly chatProxyService: ChatProxyService) {}

  // POST /api/chat/stream
@@ -70,11 +58,10 @@ export class ChatProxyController {
        res.write(Buffer.from(chunk));
      }
    } catch (error: unknown) {
-      this.logStreamError(error);
-
      if (!res.writableEnded && !res.destroyed) {
+        const message = error instanceof Error ? error.message : String(error);
        res.write("event: error\n");
-        res.write(`data: ${JSON.stringify({ error: this.toSafeClientMessage(error) })}\n\n`);
+        res.write(`data: ${JSON.stringify({ error: message })}\n\n`);
      }
    } finally {
      if (!res.writableEnded && !res.destroyed) {
@@ -82,21 +69,4 @@ export class ChatProxyController {
      }
    }
  }
-
-  private toSafeClientMessage(error: unknown): string {
-    if (error instanceof HttpException && error.getStatus() < 500) {
-      return "Chat request was rejected";
-    }
-
-    return "Chat stream failed";
-  }
-
-  private logStreamError(error: unknown): void {
-    if (error instanceof Error) {
-      this.logger.warn(`Chat stream failed: ${error.message}`);
-      return;
-    }
-
-    this.logger.warn(`Chat stream failed: ${String(error)}`);
-  }
 }
--- a/apps/api/src/chat-proxy/chat-proxy.module.ts
+++ b/apps/api/src/chat-proxy/chat-proxy.module.ts
@@ -1,5 +1,4 @@
 import { Module } from "@nestjs/common";
-import { AuthModule } from "../auth/auth.module";
 import { AgentConfigModule } from "../agent-config/agent-config.module";
 import { ContainerLifecycleModule } from "../container-lifecycle/container-lifecycle.module";
 import { PrismaModule } from "../prisma/prisma.module";
@@ -7,7 +6,7 @@ import { ChatProxyController } from "./chat-proxy.controller";
 import { ChatProxyService } from "./chat-proxy.service";

@Module({
-  imports: [AuthModule, PrismaModule, ContainerLifecycleModule, AgentConfigModule],
+  imports: [PrismaModule, ContainerLifecycleModule, AgentConfigModule],
  controllers: [ChatProxyController],
  providers: [ChatProxyService],
  exports: [ChatProxyService],
--- a/apps/api/src/chat-proxy/chat-proxy.service.spec.ts
+++ b/apps/api/src/chat-proxy/chat-proxy.service.spec.ts
@@ -64,7 +64,6 @@ describe("ChatProxyService", () => {
        expect.objectContaining({
          method: "POST",
          headers: {
-            Authorization: "Bearer gateway-token",
            "Content-Type": "application/json",
          },
        })
--- a/apps/api/src/chat-proxy/chat-proxy.service.ts
+++ b/apps/api/src/chat-proxy/chat-proxy.service.ts
@@ -1,24 +1,12 @@
-import {
-  BadGatewayException,
-  Injectable,
-  Logger,
-  ServiceUnavailableException,
-} from "@nestjs/common";
+import { BadGatewayException, Injectable, ServiceUnavailableException } from "@nestjs/common";
 import { ContainerLifecycleService } from "../container-lifecycle/container-lifecycle.service";
 import { PrismaService } from "../prisma/prisma.service";
 import type { ChatMessage } from "./chat-proxy.dto";

 const DEFAULT_OPENCLAW_MODEL = "openclaw:default";

-interface ContainerConnection {
-  url: string;
-  token: string;
-}
-
@Injectable()
 export class ChatProxyService {
-  private readonly logger = new Logger(ChatProxyService.name);
-
  constructor(
    private readonly prisma: PrismaService,
    private readonly containerLifecycle: ContainerLifecycleService
@@ -26,7 +14,8 @@ export class ChatProxyService {

  // Get the user's OpenClaw container URL and mark it active.
  async getContainerUrl(userId: string): Promise<string> {
-    const { url } = await this.getContainerConnection(userId);
+    const { url } = await this.containerLifecycle.ensureRunning(userId);
+    await this.containerLifecycle.touch(userId);
    return url;
  }

@@ -36,14 +25,11 @@ export class ChatProxyService {
    messages: ChatMessage[],
    signal?: AbortSignal
  ): Promise<Response> {
-    const { url: containerUrl, token: gatewayToken } = await this.getContainerConnection(userId);
+    const containerUrl = await this.getContainerUrl(userId);
    const model = await this.getPreferredModel(userId);
    const requestInit: RequestInit = {
      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${gatewayToken}`,
-      },
+      headers: { "Content-Type": "application/json" },
      body: JSON.stringify({
        messages,
        model,
@@ -61,10 +47,10 @@ export class ChatProxyService {
      if (!response.ok) {
        const detail = await this.readResponseText(response);
        const status = `${String(response.status)} ${response.statusText}`.trim();
-        this.logger.warn(
-          detail ? `OpenClaw returned ${status}: ${detail}` : `OpenClaw returned ${status}`
-        );
-        throw new BadGatewayException(`OpenClaw returned ${status}`);
+        const message = detail
+          ? `OpenClaw returned ${status}: ${detail}`
+          : `OpenClaw returned ${status}`;
+        throw new BadGatewayException(message);
      }

      return response;
@@ -74,17 +60,10 @@ export class ChatProxyService {
      }

      const message = error instanceof Error ? error.message : String(error);
-      this.logger.warn(`Failed to proxy chat request: ${message}`);
-      throw new ServiceUnavailableException("Failed to proxy chat to OpenClaw");
+      throw new ServiceUnavailableException(`Failed to proxy chat to OpenClaw: ${message}`);
    }
  }

-  private async getContainerConnection(userId: string): Promise<ContainerConnection> {
-    const connection = await this.containerLifecycle.ensureRunning(userId);
-    await this.containerLifecycle.touch(userId);
-    return connection;
-  }
-
  private async getPreferredModel(userId: string): Promise<string> {
    const config = await this.prisma.userAgentConfig.findUnique({
      where: { userId },
--- a/apps/api/src/common/guards/csrf.guard.spec.ts
+++ b/apps/api/src/common/guards/csrf.guard.spec.ts
@@ -87,17 +87,6 @@ describe("CsrfGuard", () => {
  });

  describe("State-changing methods requiring CSRF", () => {
-    it("should allow POST with Bearer auth without CSRF token", () => {
-      const context = createContext(
-        "POST",
-        {},
-        { authorization: "Bearer api-token" },
-        false,
-        "user-123"
-      );
-      expect(guard.canActivate(context)).toBe(true);
-    });
-
    it("should reject POST without CSRF token", () => {
      const context = createContext("POST", {}, {}, false, "user-123");
      expect(() => guard.canActivate(context)).toThrow(ForbiddenException);
--- a/apps/api/src/common/guards/csrf.guard.ts
+++ b/apps/api/src/common/guards/csrf.guard.ts
@@ -57,11 +57,6 @@ export class CsrfGuard implements CanActivate {
      return true;
    }

-    const authHeader = request.headers.authorization;
-    if (typeof authHeader === "string" && authHeader.startsWith("Bearer ")) {
-      return true;
-    }
-
    // Get CSRF token from cookie and header
    const cookies = request.cookies as Record<string, string> | undefined;
    const cookieToken = cookies?.["csrf-token"];
@@ -111,9 +106,14 @@ export class CsrfGuard implements CanActivate {

        throw new ForbiddenException("CSRF token not bound to session");
      }
+    } else {
+      this.logger.debug({
+        event: "CSRF_SKIP_SESSION_BINDING",
+        method: request.method,
+        path: request.path,
+        reason: "User context not yet available (global guard runs before AuthGuard)",
+      });
    }
-    // Note: when userId is absent, the double-submit cookie check above is
-    // sufficient CSRF protection. AuthGuard populates request.user afterward.

    return true;
  }
--- a/apps/api/src/dashboard/dashboard.controller.ts
+++ b/apps/api/src/dashboard/dashboard.controller.ts
@@ -3,7 +3,7 @@ import { DashboardService } from "./dashboard.service";
 import { AuthGuard } from "../auth/guards/auth.guard";
 import { WorkspaceGuard, PermissionGuard } from "../common/guards";
 import { Workspace, Permission, RequirePermission } from "../common/decorators";
-import { DashboardSummaryDto } from "./dto";
+import type { DashboardSummaryDto } from "./dto";

 /**
 * Controller for dashboard endpoints.
--- a/apps/api/src/fleet-settings/fleet-settings.controller.ts
+++ b/apps/api/src/fleet-settings/fleet-settings.controller.ts
@@ -15,7 +15,7 @@ import type { AuthUser } from "@mosaic/shared";
 import { CurrentUser } from "../auth/decorators/current-user.decorator";
 import { AdminGuard } from "../auth/guards/admin.guard";
 import { AuthGuard } from "../auth/guards/auth.guard";
-import {
+import type {
  CreateProviderDto,
  ResetPasswordDto,
  UpdateAgentConfigDto,
--- a/apps/api/src/fleet-settings/fleet-settings.module.ts
+++ b/apps/api/src/fleet-settings/fleet-settings.module.ts
@@ -1,12 +1,11 @@
 import { Module } from "@nestjs/common";
-import { AuthModule } from "../auth/auth.module";
 import { PrismaModule } from "../prisma/prisma.module";
 import { CryptoModule } from "../crypto/crypto.module";
 import { FleetSettingsController } from "./fleet-settings.controller";
 import { FleetSettingsService } from "./fleet-settings.service";

@Module({
-  imports: [AuthModule, PrismaModule, CryptoModule],
+  imports: [PrismaModule, CryptoModule],
  controllers: [FleetSettingsController],
  providers: [FleetSettingsService],
  exports: [FleetSettingsService],
--- a/apps/api/src/llm-usage/llm-usage.controller.ts
+++ b/apps/api/src/llm-usage/llm-usage.controller.ts
@@ -1,7 +1,7 @@
 import { Controller, Get, Param, Query } from "@nestjs/common";
 import type { LlmUsageLog } from "@prisma/client";
 import { LlmUsageService } from "./llm-usage.service";
-import { UsageAnalyticsQueryDto, UsageAnalyticsResponseDto } from "./dto";
+import type { UsageAnalyticsQueryDto, UsageAnalyticsResponseDto } from "./dto";

 /**
 * LLM Usage Controller
--- a/apps/api/src/main.ts
+++ b/apps/api/src/main.ts
@@ -1,7 +1,6 @@
 import { NestFactory } from "@nestjs/core";
 import { RequestMethod, ValidationPipe } from "@nestjs/common";
 import cookieParser from "cookie-parser";
-import helmet from "helmet";
 import { AppModule } from "./app.module";
 import { getTrustedOrigins } from "./auth/auth.config";
 import { GlobalExceptionFilter } from "./filters/global-exception.filter";
@@ -34,14 +33,6 @@ async function bootstrap() {
  // Enable cookie parser for session handling
  app.use(cookieParser());

-  // Enable helmet security headers
-  app.use(
-    helmet({
-      contentSecurityPolicy: false, // Let Next.js handle CSP
-      crossOriginEmbedderPolicy: false,
-    })
-  );
-
  // Enable global validation pipe with transformation
  app.useGlobalPipes(
    new ValidationPipe({
--- a/apps/api/src/orchestrator/orchestrator.controller.spec.ts
+++ b/apps/api/src/orchestrator/orchestrator.controller.spec.ts
@@ -1,194 +0,0 @@
-import { beforeEach, describe, expect, it, vi, afterEach } from "vitest";
-import type { Response } from "express";
-import { AgentStatus } from "@prisma/client";
-import { OrchestratorController } from "./orchestrator.controller";
-import { PrismaService } from "../prisma/prisma.service";
-import { AuthGuard } from "../auth/guards/auth.guard";
-
-describe("OrchestratorController", () => {
-  const mockPrismaService = {
-    agent: {
-      findMany: vi.fn(),
-    },
-  };
-
-  let controller: OrchestratorController;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    controller = new OrchestratorController(mockPrismaService as unknown as PrismaService);
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
-  describe("getAgents", () => {
-    it("returns active agents with API widget shape", async () => {
-      mockPrismaService.agent.findMany.mockResolvedValue([
-        {
-          id: "agent-1",
-          name: "Planner",
-          status: AgentStatus.WORKING,
-          role: "planner",
-          createdAt: new Date("2026-02-28T10:00:00.000Z"),
-        },
-      ]);
-
-      const result = await controller.getAgents();
-
-      expect(result).toEqual([
-        {
-          id: "agent-1",
-          name: "Planner",
-          status: AgentStatus.WORKING,
-          type: "planner",
-          createdAt: new Date("2026-02-28T10:00:00.000Z"),
-        },
-      ]);
-
-      expect(mockPrismaService.agent.findMany).toHaveBeenCalledWith({
-        where: {
-          status: {
-            not: AgentStatus.TERMINATED,
-          },
-        },
-        orderBy: {
-          createdAt: "desc",
-        },
-        select: {
-          id: true,
-          name: true,
-          status: true,
-          role: true,
-          createdAt: true,
-        },
-      });
-    });
-
-    it("falls back to type=agent when role is missing", async () => {
-      mockPrismaService.agent.findMany.mockResolvedValue([
-        {
-          id: "agent-2",
-          name: null,
-          status: AgentStatus.IDLE,
-          role: null,
-          createdAt: new Date("2026-02-28T11:00:00.000Z"),
-        },
-      ]);
-
-      const result = await controller.getAgents();
-
-      expect(result[0]).toMatchObject({
-        id: "agent-2",
-        type: "agent",
-      });
-    });
-  });
-
-  describe("streamEvents", () => {
-    it("sets SSE headers and writes initial data payload", async () => {
-      const onHandlers: Record<string, (() => void) | undefined> = {};
-      const mockRes = {
-        setHeader: vi.fn(),
-        write: vi.fn(),
-        end: vi.fn(),
-        on: vi.fn((event: string, handler: () => void) => {
-          onHandlers[event] = handler;
-          return mockRes;
-        }),
-      } as unknown as Response;
-
-      mockPrismaService.agent.findMany.mockResolvedValue([
-        {
-          id: "agent-1",
-          name: "Worker",
-          status: AgentStatus.WORKING,
-          role: "worker",
-          createdAt: new Date("2026-02-28T12:00:00.000Z"),
-        },
-      ]);
-
-      await controller.streamEvents(mockRes);
-
-      expect(mockRes.setHeader).toHaveBeenCalledWith("Content-Type", "text/event-stream");
-      expect(mockRes.setHeader).toHaveBeenCalledWith("Cache-Control", "no-cache");
-      expect(mockRes.setHeader).toHaveBeenCalledWith("Connection", "keep-alive");
-      expect(mockRes.setHeader).toHaveBeenCalledWith("X-Accel-Buffering", "no");
-
-      expect(mockRes.write).toHaveBeenCalledWith(
-        expect.stringContaining('"type":"agents:updated"')
-      );
-      expect(typeof onHandlers.close).toBe("function");
-    });
-
-    it("polls every 5 seconds and only emits when payload changes", async () => {
-      vi.useFakeTimers();
-
-      const onHandlers: Record<string, (() => void) | undefined> = {};
-      const mockRes = {
-        setHeader: vi.fn(),
-        write: vi.fn(),
-        end: vi.fn(),
-        on: vi.fn((event: string, handler: () => void) => {
-          onHandlers[event] = handler;
-          return mockRes;
-        }),
-      } as unknown as Response;
-
-      const firstPayload = [
-        {
-          id: "agent-1",
-          name: "Worker",
-          status: AgentStatus.WORKING,
-          role: "worker",
-          createdAt: new Date("2026-02-28T12:00:00.000Z"),
-        },
-      ];
-      const secondPayload = [
-        {
-          id: "agent-1",
-          name: "Worker",
-          status: AgentStatus.WAITING,
-          role: "worker",
-          createdAt: new Date("2026-02-28T12:00:00.000Z"),
-        },
-      ];
-
-      mockPrismaService.agent.findMany
-        .mockResolvedValueOnce(firstPayload)
-        .mockResolvedValueOnce(firstPayload)
-        .mockResolvedValueOnce(secondPayload);
-
-      await controller.streamEvents(mockRes);
-
-      // 1 initial data event
-      const getDataEventCalls = () =>
-        mockRes.write.mock.calls.filter(
-          (call) => typeof call[0] === "string" && call[0].startsWith("data: ")
-        );
-
-      expect(getDataEventCalls()).toHaveLength(1);
-
-      // No change after first poll => no new data event
-      await vi.advanceTimersByTimeAsync(5000);
-      expect(getDataEventCalls()).toHaveLength(1);
-
-      // Status changed on second poll => emits new data event
-      await vi.advanceTimersByTimeAsync(5000);
-      expect(getDataEventCalls()).toHaveLength(2);
-
-      onHandlers.close?.();
-      expect(mockRes.end).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("security", () => {
-    it("uses AuthGuard at the controller level", () => {
-      const guards = Reflect.getMetadata("__guards__", OrchestratorController) as unknown[];
-      const guardClasses = guards.map((guard) => guard);
-
-      expect(guardClasses).toContain(AuthGuard);
-    });
-  });
-});
--- a/apps/api/src/orchestrator/orchestrator.controller.ts
+++ b/apps/api/src/orchestrator/orchestrator.controller.ts
@@ -1,115 +0,0 @@
-import { Controller, Get, Res, UseGuards } from "@nestjs/common";
-import { AgentStatus } from "@prisma/client";
-import type { Response } from "express";
-import { AuthGuard } from "../auth/guards/auth.guard";
-import { PrismaService } from "../prisma/prisma.service";
-
-const AGENT_POLL_INTERVAL_MS = 5_000;
-const SSE_HEARTBEAT_MS = 15_000;
-
-interface OrchestratorAgentDto {
-  id: string;
-  name: string | null;
-  status: AgentStatus;
-  type: string;
-  createdAt: Date;
-}
-
-@Controller("orchestrator")
-@UseGuards(AuthGuard)
-export class OrchestratorController {
-  constructor(private readonly prisma: PrismaService) {}
-
-  @Get("agents")
-  async getAgents(): Promise<OrchestratorAgentDto[]> {
-    return this.fetchActiveAgents();
-  }
-
-  @Get("events")
-  async streamEvents(@Res() res: Response): Promise<void> {
-    res.setHeader("Content-Type", "text/event-stream");
-    res.setHeader("Cache-Control", "no-cache");
-    res.setHeader("Connection", "keep-alive");
-    res.setHeader("X-Accel-Buffering", "no");
-
-    if (typeof res.flushHeaders === "function") {
-      res.flushHeaders();
-    }
-
-    let isClosed = false;
-    let previousSnapshot = "";
-
-    const emitSnapshotIfChanged = async (): Promise<void> => {
-      if (isClosed) {
-        return;
-      }
-
-      try {
-        const agents = await this.fetchActiveAgents();
-        const snapshot = JSON.stringify(agents);
-
-        if (snapshot !== previousSnapshot) {
-          previousSnapshot = snapshot;
-          res.write(
-            `data: ${JSON.stringify({
-              type: "agents:updated",
-              agents,
-              timestamp: new Date().toISOString(),
-            })}\n\n`
-          );
-        }
-      } catch (error: unknown) {
-        const message = error instanceof Error ? error.message : String(error);
-        res.write(`event: error\n`);
-        res.write(`data: ${JSON.stringify({ error: message })}\n\n`);
-      }
-    };
-
-    await emitSnapshotIfChanged();
-
-    const pollInterval = setInterval(() => {
-      void emitSnapshotIfChanged();
-    }, AGENT_POLL_INTERVAL_MS);
-
-    const heartbeatInterval = setInterval(() => {
-      if (!isClosed) {
-        res.write(": keepalive\n\n");
-      }
-    }, SSE_HEARTBEAT_MS);
-
-    res.on("close", () => {
-      isClosed = true;
-      clearInterval(pollInterval);
-      clearInterval(heartbeatInterval);
-      res.end();
-    });
-  }
-
-  private async fetchActiveAgents(): Promise<OrchestratorAgentDto[]> {
-    const agents = await this.prisma.agent.findMany({
-      where: {
-        status: {
-          not: AgentStatus.TERMINATED,
-        },
-      },
-      orderBy: {
-        createdAt: "desc",
-      },
-      select: {
-        id: true,
-        name: true,
-        status: true,
-        role: true,
-        createdAt: true,
-      },
-    });
-
-    return agents.map((agent) => ({
-      id: agent.id,
-      name: agent.name,
-      status: agent.status,
-      type: agent.role ?? "agent",
-      createdAt: agent.createdAt,
-    }));
-  }
-}
--- a/apps/api/src/orchestrator/orchestrator.module.ts
+++ b/apps/api/src/orchestrator/orchestrator.module.ts
@@ -1,10 +0,0 @@
-import { Module } from "@nestjs/common";
-import { AuthModule } from "../auth/auth.module";
-import { PrismaModule } from "../prisma/prisma.module";
-import { OrchestratorController } from "./orchestrator.controller";
-
-@Module({
-  imports: [AuthModule, PrismaModule],
-  controllers: [OrchestratorController],
-})
-export class OrchestratorModule {}
--- a/apps/api/src/projects/dto/create-project.dto.ts
+++ b/apps/api/src/projects/dto/create-project.dto.ts
@@ -8,7 +8,6 @@ import {
  MinLength,
  MaxLength,
  Matches,
-  IsUUID,
 } from "class-validator";

 /**
@@ -44,10 +43,6 @@ export class CreateProjectDto {
  })
  color?: string;

-  @IsOptional()
-  @IsUUID("4", { message: "domainId must be a valid UUID" })
-  domainId?: string;
-
  @IsOptional()
  @IsObject({ message: "metadata must be an object" })
  metadata?: Record<string, unknown>;
--- a/apps/api/src/projects/dto/update-project.dto.ts
+++ b/apps/api/src/projects/dto/update-project.dto.ts
@@ -8,7 +8,6 @@ import {
  MinLength,
  MaxLength,
  Matches,
-  IsUUID,
 } from "class-validator";

 /**
@@ -46,10 +45,6 @@ export class UpdateProjectDto {
  })
  color?: string | null;

-  @IsOptional()
-  @IsUUID("4", { message: "domainId must be a valid UUID" })
-  domainId?: string | null;
-
  @IsOptional()
  @IsObject({ message: "metadata must be an object" })
  metadata?: Record<string, unknown>;
--- a/apps/api/src/projects/projects.service.ts
+++ b/apps/api/src/projects/projects.service.ts
@@ -47,9 +47,6 @@ export class ProjectsService {
    createProjectDto: CreateProjectDto
  ): Promise<ProjectWithRelations> {
    const data: Prisma.ProjectCreateInput = {
-      ...(createProjectDto.domainId
-        ? { domain: { connect: { id: createProjectDto.domainId } } }
-        : {}),
      name: createProjectDto.name,
      description: createProjectDto.description ?? null,
      color: createProjectDto.color ?? null,
@@ -224,18 +221,6 @@ export class ProjectsService {
    if (updateProjectDto.startDate !== undefined) updateData.startDate = updateProjectDto.startDate;
    if (updateProjectDto.endDate !== undefined) updateData.endDate = updateProjectDto.endDate;
    if (updateProjectDto.color !== undefined) updateData.color = updateProjectDto.color;
-    if (updateProjectDto.domainId !== undefined)
-      updateData.domain = updateProjectDto.domainId
-        ? { connect: { id: updateProjectDto.domainId } }
-        : { disconnect: true };
-    if (updateProjectDto.domainId !== undefined)
-      updateData.domain = updateProjectDto.domainId
-        ? {
-            connect: {
-              id: updateProjectDto.domainId,
-            },
-          }
-        : { disconnect: true };
    if (updateProjectDto.metadata !== undefined) {
      updateData.metadata = updateProjectDto.metadata as unknown as Prisma.InputJsonValue;
    }
--- a/apps/api/src/speech/speech.gateway.ts
+++ b/apps/api/src/speech/speech.gateway.ts
@@ -66,9 +66,7 @@ interface StartTranscriptionPayload {
@WSGateway({
  namespace: "/speech",
  cors: {
-    origin: (process.env.TRUSTED_ORIGINS ?? process.env.WEB_URL ?? "http://localhost:3000")
-      .split(",")
-      .map((s) => s.trim()),
+    origin: process.env.WEB_URL ?? "http://localhost:3000",
    credentials: true,
  },
 })
--- a/apps/api/src/terminal/terminal.gateway.ts
+++ b/apps/api/src/terminal/terminal.gateway.ts
@@ -63,9 +63,7 @@ interface AuthenticatedSocket extends Socket {
@WSGateway({
  namespace: "/terminal",
  cors: {
-    origin: (process.env.TRUSTED_ORIGINS ?? process.env.WEB_URL ?? "http://localhost:3000")
-      .split(",")
-      .map((s) => s.trim()),
+    origin: process.env.WEB_URL ?? "http://localhost:3000",
    credentials: true,
  },
 })
--- a/apps/api/src/widgets/widgets.controller.throttler.spec.ts
+++ b/apps/api/src/widgets/widgets.controller.throttler.spec.ts
@@ -1,31 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { WidgetsController } from "./widgets.controller";
-
-const THROTTLER_SKIP_DEFAULT_KEY = "THROTTLER:SKIPdefault";
-
-describe("WidgetsController throttler metadata", () => {
-  it("marks widget data polling endpoints to skip throttling", () => {
-    const pollingHandlers = [
-      WidgetsController.prototype.getStatCardData,
-      WidgetsController.prototype.getChartData,
-      WidgetsController.prototype.getListData,
-      WidgetsController.prototype.getCalendarPreviewData,
-      WidgetsController.prototype.getActiveProjectsData,
-      WidgetsController.prototype.getAgentChainsData,
-    ];
-
-    for (const handler of pollingHandlers) {
-      expect(Reflect.getMetadata(THROTTLER_SKIP_DEFAULT_KEY, handler)).toBe(true);
-    }
-  });
-
-  it("does not skip throttling for non-polling widget routes", () => {
-    expect(
-      Reflect.getMetadata(THROTTLER_SKIP_DEFAULT_KEY, WidgetsController.prototype.findAll)
-    ).toBe(undefined);
-
-    expect(
-      Reflect.getMetadata(THROTTLER_SKIP_DEFAULT_KEY, WidgetsController.prototype.findByName)
-    ).toBe(undefined);
-  });
-});
--- a/apps/api/src/widgets/widgets.controller.ts
+++ b/apps/api/src/widgets/widgets.controller.ts
@@ -1,10 +1,9 @@
 import { Controller, Get, Post, Body, Param, UseGuards, Request } from "@nestjs/common";
-import { SkipThrottle as SkipThrottler } from "@nestjs/throttler";
 import { WidgetsService } from "./widgets.service";
 import { WidgetDataService } from "./widget-data.service";
 import { AuthGuard } from "../auth/guards/auth.guard";
 import { WorkspaceGuard } from "../common/guards/workspace.guard";
-import { StatCardQueryDto, ChartQueryDto, ListQueryDto, CalendarPreviewQueryDto } from "./dto";
+import type { StatCardQueryDto, ChartQueryDto, ListQueryDto, CalendarPreviewQueryDto } from "./dto";
 import type { RequestWithWorkspace } from "../common/types/user.types";

 /**
@@ -44,7 +43,6 @@ export class WidgetsController {
   * Get stat card widget data
   */
  @Post("data/stat-card")
-  @SkipThrottler()
  @UseGuards(WorkspaceGuard)
  async getStatCardData(@Request() req: RequestWithWorkspace, @Body() query: StatCardQueryDto) {
    return this.widgetDataService.getStatCardData(req.workspace.id, query);
@@ -55,7 +53,6 @@ export class WidgetsController {
   * Get chart widget data
   */
  @Post("data/chart")
-  @SkipThrottler()
  @UseGuards(WorkspaceGuard)
  async getChartData(@Request() req: RequestWithWorkspace, @Body() query: ChartQueryDto) {
    return this.widgetDataService.getChartData(req.workspace.id, query);
@@ -66,7 +63,6 @@ export class WidgetsController {
   * Get list widget data
   */
  @Post("data/list")
-  @SkipThrottler()
  @UseGuards(WorkspaceGuard)
  async getListData(@Request() req: RequestWithWorkspace, @Body() query: ListQueryDto) {
    return this.widgetDataService.getListData(req.workspace.id, query);
@@ -77,7 +73,6 @@ export class WidgetsController {
   * Get calendar preview widget data
   */
  @Post("data/calendar-preview")
-  @SkipThrottler()
  @UseGuards(WorkspaceGuard)
  async getCalendarPreviewData(
    @Request() req: RequestWithWorkspace,
@@ -91,7 +86,6 @@ export class WidgetsController {
   * Get active projects widget data
   */
  @Post("data/active-projects")
-  @SkipThrottler()
  @UseGuards(WorkspaceGuard)
  async getActiveProjectsData(@Request() req: RequestWithWorkspace) {
    return this.widgetDataService.getActiveProjectsData(req.workspace.id);
@@ -102,7 +96,6 @@ export class WidgetsController {
   * Get agent chains widget data (active agent sessions)
   */
  @Post("data/agent-chains")
-  @SkipThrottler()
  @UseGuards(WorkspaceGuard)
  async getAgentChainsData(@Request() req: RequestWithWorkspace) {
    return this.widgetDataService.getAgentChainsData(req.workspace.id);
--- a/apps/api/src/workspaces/workspaces.controller.ts
+++ b/apps/api/src/workspaces/workspaces.controller.ts
@@ -6,7 +6,7 @@ import { WorkspaceGuard, PermissionGuard } from "../common/guards";
 import { Permission, RequirePermission } from "../common/decorators";
 import type { WorkspaceMember } from "@prisma/client";
 import type { AuthenticatedUser } from "../common/types/user.types";
-import { AddMemberDto, UpdateMemberRoleDto, WorkspaceResponseDto } from "./dto";
+import type { AddMemberDto, UpdateMemberRoleDto, WorkspaceResponseDto } from "./dto";

 /**
 * User-scoped workspace operations.
@@ -29,25 +29,6 @@ export class WorkspacesController {
    return this.workspacesService.getUserWorkspaces(user.id);
  }

-  /**
-   * GET /api/workspaces/:workspaceId/stats
-   * Returns member, project, and domain counts for a workspace.
-   */
-  @Get(":workspaceId/stats")
-  async getStats(@Param("workspaceId") workspaceId: string) {
-    return this.workspacesService.getStats(workspaceId);
-  }
-
-  /**
-   * GET /api/workspaces/:workspaceId/members
-   * Returns the list of members for a workspace.
-   */
-  @Get(":workspaceId/members")
-  @UseGuards(WorkspaceGuard)
-  async getMembers(@Param("workspaceId") workspaceId: string) {
-    return this.workspacesService.getMembers(workspaceId);
-  }
-
  /**
   * POST /api/workspaces/:workspaceId/members
   * Add a member to a workspace with the specified role.
--- a/apps/api/src/workspaces/workspaces.service.ts
+++ b/apps/api/src/workspaces/workspaces.service.ts
@@ -321,18 +321,6 @@ export class WorkspacesService {
    });
  }

-  /**
-   * Get members of a workspace.
-   */
-  async getMembers(workspaceId: string) {
-    return this.prisma.workspaceMember.findMany({
-      where: { workspaceId },
-      include: {
-        user: { select: { id: true, name: true, email: true, createdAt: true } },
-      },
-      orderBy: { joinedAt: "asc" },
-    });
-  }
  private assertCanAssignRole(
    actorRole: WorkspaceMemberRole,
    requestedRole: WorkspaceMemberRole
@@ -354,15 +342,4 @@ export class WorkspacesService {
  private isUniqueConstraintError(error: unknown): error is Prisma.PrismaClientKnownRequestError {
    return error instanceof Prisma.PrismaClientKnownRequestError && error.code === "P2002";
  }
-
-  async getStats(
-    workspaceId: string
-  ): Promise<{ memberCount: number; projectCount: number; domainCount: number }> {
-    const [memberCount, projectCount, domainCount] = await Promise.all([
-      this.prisma.workspaceMember.count({ where: { workspaceId } }),
-      this.prisma.project.count({ where: { workspaceId } }),
-      this.prisma.domain.count({ where: { workspaceId } }),
-    ]);
-    return { memberCount, projectCount, domainCount };
-  }
 }
--- a/apps/web/src/app/(authenticated)/files/page.tsx
+++ b/apps/web/src/app/(authenticated)/files/page.tsx
@@ -13,7 +13,7 @@ import {
  ChevronUp,
  ChevronDown,
 } from "lucide-react";
-import type { KnowledgeEntryWithTags, KnowledgeTag } from "@mosaic/shared";
+import type { KnowledgeEntryWithTags } from "@mosaic/shared";
 import { EntryStatus, Visibility } from "@mosaic/shared";

 import { MosaicSpinner } from "@/components/ui/MosaicSpinner";
@@ -25,7 +25,7 @@ import {
  DialogDescription,
  DialogFooter,
 } from "@/components/ui/dialog";
-import { fetchEntries, createEntry, deleteEntry, fetchTags } from "@/lib/api/knowledge";
+import { fetchEntries, createEntry, deleteEntry } from "@/lib/api/knowledge";
 import type { EntriesResponse, CreateEntryData, EntryFilters } from "@/lib/api/knowledge";

 /* ---------------------------------------------------------------------------
@@ -421,26 +421,6 @@ function CreateEntryDialog({
  const [visibility, setVisibility] = useState<Visibility>(Visibility.PRIVATE);
  const [formError, setFormError] = useState<string | null>(null);

-  // Tag state
-  const [selectedTags, setSelectedTags] = useState<string[]>([]);
-  const [tagInput, setTagInput] = useState("");
-  const [availableTags, setAvailableTags] = useState<KnowledgeTag[]>([]);
-  const [showSuggestions, setShowSuggestions] = useState(false);
-  const tagInputRef = useRef<HTMLInputElement>(null);
-
-  // Load available tags when dialog opens
-  useEffect(() => {
-    if (open) {
-      fetchTags()
-        .then((tags) => {
-          setAvailableTags(tags);
-        })
-        .catch((err: unknown) => {
-          console.error("Failed to load tags:", err);
-        });
-    }
-  }, [open]);
-
  function resetForm(): void {
    setTitle("");
    setContent("");
@@ -448,9 +428,6 @@ function CreateEntryDialog({
    setStatus(EntryStatus.DRAFT);
    setVisibility(Visibility.PRIVATE);
    setFormError(null);
-    setSelectedTags([]);
-    setTagInput("");
-    setShowSuggestions(false);
  }

  async function handleSubmit(e: SyntheticEvent): Promise<void> {
@@ -475,7 +452,6 @@ function CreateEntryDialog({
        content: trimmedContent,
        status,
        visibility,
-        tags: selectedTags,
      };
      const trimmedSummary = summary.trim();
      if (trimmedSummary) {
@@ -634,212 +610,6 @@ function CreateEntryDialog({
              />
            </div>

-            {/* Tags */}
-            <div style={{ marginBottom: 16 }}>
-              <label
-                htmlFor="entry-tags"
-                style={{
-                  display: "block",
-                  marginBottom: 6,
-                  fontSize: "0.85rem",
-                  fontWeight: 500,
-                  color: "var(--text-2)",
-                }}
-              >
-                Tags
-              </label>
-              <div
-                style={{
-                  width: "100%",
-                  minHeight: 38,
-                  padding: "6px 8px",
-                  background: "var(--bg)",
-                  border: "1px solid var(--border)",
-                  borderRadius: "var(--r)",
-                  boxSizing: "border-box",
-                  display: "flex",
-                  flexWrap: "wrap",
-                  gap: 4,
-                  alignItems: "center",
-                  position: "relative",
-                }}
-              >
-                {/* Selected tag chips */}
-                {selectedTags.map((tag) => (
-                  <span
-                    key={tag}
-                    style={{
-                      display: "inline-flex",
-                      alignItems: "center",
-                      gap: 4,
-                      padding: "2px 8px",
-                      background: "var(--surface-2)",
-                      border: "1px solid var(--border)",
-                      borderRadius: "var(--r-sm)",
-                      fontSize: "0.75rem",
-                      color: "var(--text)",
-                    }}
-                  >
-                    {tag}
-                    <button
-                      type="button"
-                      onClick={() => {
-                        setSelectedTags((prev) => prev.filter((t) => t !== tag));
-                      }}
-                      style={{
-                        background: "transparent",
-                        border: "none",
-                        padding: 0,
-                        cursor: "pointer",
-                        color: "var(--muted)",
-                        display: "flex",
-                        alignItems: "center",
-                        lineHeight: 1,
-                      }}
-                    >
-                      ×
-                    </button>
-                  </span>
-                ))}
-                {/* Tag text input */}
-                <input
-                  ref={tagInputRef}
-                  id="entry-tags"
-                  type="text"
-                  value={tagInput}
-                  onChange={(e) => {
-                    setTagInput(e.target.value);
-                    setShowSuggestions(e.target.value.length > 0);
-                  }}
-                  onKeyDown={(e) => {
-                    if (e.key === "Enter" || e.key === ",") {
-                      e.preventDefault();
-                      const trimmed = tagInput.trim();
-                      if (trimmed && !selectedTags.includes(trimmed)) {
-                        setSelectedTags((prev) => [...prev, trimmed]);
-                        setTagInput("");
-                      }
-                    }
-                    if (e.key === "Backspace" && tagInput === "" && selectedTags.length > 0) {
-                      setSelectedTags((prev) => prev.slice(0, -1));
-                    }
-                  }}
-                  onBlur={() => {
-                    // Delay to allow click on suggestion
-                    setTimeout(() => {
-                      setShowSuggestions(false);
-                    }, 150);
-                  }}
-                  onFocus={() => {
-                    if (tagInput.length > 0) setShowSuggestions(true);
-                  }}
-                  placeholder={selectedTags.length === 0 ? "Add tags..." : ""}
-                  style={{
-                    flex: 1,
-                    minWidth: 80,
-                    border: "none",
-                    background: "transparent",
-                    color: "var(--text)",
-                    fontSize: "0.85rem",
-                    outline: "none",
-                    padding: "2px 0",
-                  }}
-                />
-                {/* Autocomplete suggestions */}
-                {showSuggestions && (
-                  <div
-                    style={{
-                      position: "absolute",
-                      top: "100%",
-                      left: 0,
-                      right: 0,
-                      marginTop: 4,
-                      background: "var(--surface)",
-                      border: "1px solid var(--border)",
-                      borderRadius: "var(--r)",
-                      boxShadow: "0 4px 12px rgba(0,0,0,0.15)",
-                      maxHeight: 150,
-                      overflowY: "auto",
-                      zIndex: 10,
-                    }}
-                  >
-                    {availableTags
-                      .filter(
-                        (t) =>
-                          t.name.toLowerCase().includes(tagInput.toLowerCase()) &&
-                          !selectedTags.includes(t.name)
-                      )
-                      .slice(0, 5)
-                      .map((tag) => (
-                        <button
-                          key={tag.id}
-                          type="button"
-                          onClick={() => {
-                            if (!selectedTags.includes(tag.name)) {
-                              setSelectedTags((prev) => [...prev, tag.name]);
-                            }
-                            setTagInput("");
-                            setShowSuggestions(false);
-                            tagInputRef.current?.focus();
-                          }}
-                          style={{
-                            width: "100%",
-                            padding: "8px 12px",
-                            background: "transparent",
-                            border: "none",
-                            textAlign: "left",
-                            cursor: "pointer",
-                            color: "var(--text)",
-                            fontSize: "0.85rem",
-                          }}
-                          onMouseEnter={(e) => {
-                            e.currentTarget.style.background = "var(--surface-2)";
-                          }}
-                          onMouseLeave={(e) => {
-                            e.currentTarget.style.background = "transparent";
-                          }}
-                        >
-                          {tag.name}
-                        </button>
-                      ))}
-                    {availableTags.filter(
-                      (t) =>
-                        t.name.toLowerCase().includes(tagInput.toLowerCase()) &&
-                        !selectedTags.includes(t.name)
-                    ).length === 0 &&
-                      tagInput.trim() &&
-                      !selectedTags.includes(tagInput.trim()) && (
-                        <button
-                          type="button"
-                          onClick={() => {
-                            const trimmed = tagInput.trim();
-                            if (trimmed && !selectedTags.includes(trimmed)) {
-                              setSelectedTags((prev) => [...prev, trimmed]);
-                            }
-                            setTagInput("");
-                            setShowSuggestions(false);
-                            tagInputRef.current?.focus();
-                          }}
-                          style={{
-                            width: "100%",
-                            padding: "8px 12px",
-                            background: "transparent",
-                            border: "none",
-                            textAlign: "left",
-                            cursor: "pointer",
-                            color: "var(--muted)",
-                            fontSize: "0.85rem",
-                            fontStyle: "italic",
-                          }}
-                        >
-                          Create "{tagInput.trim()}"
-                        </button>
-                      )}
-                  </div>
-                )}
-              </div>
-            </div>
-
            {/* Status + Visibility row */}
            <div style={{ display: "flex", gap: 16, marginBottom: 16 }}>
              <div style={{ flex: 1 }}>
--- a/apps/web/src/app/(authenticated)/kanban/page.test.tsx
+++ b/apps/web/src/app/(authenticated)/kanban/page.test.tsx
@@ -1,188 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen, waitFor } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import type { Task } from "@mosaic/shared";
-import { TaskPriority, TaskStatus } from "@mosaic/shared";
-import KanbanPage from "./page";
-
-const mockReplace = vi.fn();
-let mockSearchParams = new URLSearchParams();
-
-vi.mock("next/navigation", () => ({
-  useRouter: (): { replace: typeof mockReplace } => ({ replace: mockReplace }),
-  useSearchParams: (): URLSearchParams => mockSearchParams,
-}));
-
-vi.mock("@hello-pangea/dnd", () => ({
-  DragDropContext: ({ children }: { children: React.ReactNode }): React.JSX.Element => (
-    <div data-testid="mock-dnd-context">{children}</div>
-  ),
-  Droppable: ({
-    children,
-    droppableId,
-  }: {
-    children: (provided: {
-      innerRef: (el: HTMLElement | null) => void;
-      droppableProps: Record<string, never>;
-      placeholder: React.ReactNode;
-    }) => React.ReactNode;
-    droppableId: string;
-  }): React.JSX.Element => (
-    <div data-testid={`mock-droppable-${droppableId}`}>
-      {children({
-        innerRef: () => {
-          /* noop */
-        },
-        droppableProps: {},
-        placeholder: null,
-      })}
-    </div>
-  ),
-  Draggable: ({
-    children,
-    draggableId,
-  }: {
-    children: (
-      provided: {
-        innerRef: (el: HTMLElement | null) => void;
-        draggableProps: { style: Record<string, string> };
-        dragHandleProps: Record<string, string>;
-      },
-      snapshot: { isDragging: boolean }
-    ) => React.ReactNode;
-    draggableId: string;
-    index: number;
-  }): React.JSX.Element => (
-    <div data-testid={`mock-draggable-${draggableId}`}>
-      {children(
-        {
-          innerRef: () => {
-            /* noop */
-          },
-          draggableProps: { style: {} },
-          dragHandleProps: {},
-        },
-        { isDragging: false }
-      )}
-    </div>
-  ),
-}));
-
-vi.mock("@/components/ui/MosaicSpinner", () => ({
-  MosaicSpinner: ({ label }: { label?: string }): React.JSX.Element => (
-    <div data-testid="mosaic-spinner">{label ?? "Loading..."}</div>
-  ),
-}));
-
-const mockUseWorkspaceId = vi.fn<() => string | null>();
-vi.mock("@/lib/hooks", () => ({
-  useWorkspaceId: (): string | null => mockUseWorkspaceId(),
-}));
-
-const mockFetchTasks = vi.fn<() => Promise<Task[]>>();
-const mockUpdateTask = vi.fn<() => Promise<unknown>>();
-const mockCreateTask = vi.fn<() => Promise<Task>>();
-vi.mock("@/lib/api/tasks", () => ({
-  fetchTasks: (...args: unknown[]): Promise<Task[]> => mockFetchTasks(...(args as [])),
-  updateTask: (...args: unknown[]): Promise<unknown> => mockUpdateTask(...(args as [])),
-  createTask: (...args: unknown[]): Promise<Task> => mockCreateTask(...(args as [])),
-}));
-
-const mockFetchProjects = vi.fn<() => Promise<unknown[]>>();
-vi.mock("@/lib/api/projects", () => ({
-  fetchProjects: (...args: unknown[]): Promise<unknown[]> => mockFetchProjects(...(args as [])),
-}));
-
-const createdTask: Task = {
-  id: "task-new-1",
-  title: "Ship Kanban add task flow",
-  description: null,
-  status: TaskStatus.NOT_STARTED,
-  priority: TaskPriority.MEDIUM,
-  dueDate: null,
-  creatorId: "user-1",
-  assigneeId: null,
-  workspaceId: "ws-1",
-  projectId: "project-42",
-  parentId: null,
-  sortOrder: 0,
-  metadata: {},
-  completedAt: null,
-  createdAt: new Date("2026-03-01"),
-  updatedAt: new Date("2026-03-01"),
-};
-
-describe("KanbanPage add task flow", (): void => {
-  beforeEach((): void => {
-    vi.clearAllMocks();
-    mockSearchParams = new URLSearchParams("project=project-42");
-    mockUseWorkspaceId.mockReturnValue("ws-1");
-    mockFetchTasks.mockResolvedValue([]);
-    mockFetchProjects.mockResolvedValue([]);
-    mockCreateTask.mockResolvedValue(createdTask);
-  });
-
-  it("opens add-task form in a column and creates a task via API", async (): Promise<void> => {
-    const user = userEvent.setup();
-
-    render(<KanbanPage />);
-
-    await waitFor((): void => {
-      expect(screen.getByText("Kanban Board")).toBeInTheDocument();
-    });
-
-    // Click the "+ Add task" button in the To Do column
-    const addTaskButtons = screen.getAllByRole("button", { name: /\+ Add task/i });
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    await user.click(addTaskButtons[0]!); // First column is "To Do"
-
-    // Type in the title input
-    const titleInput = screen.getByPlaceholderText("Task title...");
-    await user.type(titleInput, createdTask.title);
-
-    // Click the Add button
-    await user.click(screen.getByRole("button", { name: /✓ Add/i }));
-
-    await waitFor((): void => {
-      expect(mockCreateTask).toHaveBeenCalledWith(
-        expect.objectContaining({
-          title: createdTask.title,
-          status: TaskStatus.NOT_STARTED,
-          projectId: "project-42",
-        }),
-        "ws-1"
-      );
-    });
-  });
-
-  it("cancels add-task form when pressing Escape", async (): Promise<void> => {
-    const user = userEvent.setup();
-
-    render(<KanbanPage />);
-
-    await waitFor((): void => {
-      expect(screen.getByText("Kanban Board")).toBeInTheDocument();
-    });
-
-    // Click the "+ Add task" button
-    const addTaskButtons = screen.getAllByRole("button", { name: /\+ Add task/i });
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    await user.click(addTaskButtons[0]!);
-
-    // Type in the title input
-    const titleInput = screen.getByPlaceholderText("Task title...");
-    await user.type(titleInput, "Test task");
-
-    // Press Escape to cancel
-    await user.keyboard("{Escape}");
-
-    // Form should be closed, back to "+ Add task" button
-    await waitFor((): void => {
-      const buttons = screen.getAllByRole("button", { name: /\+ Add task/i });
-      expect(buttons.length).toBe(5); // One per column
-    });
-
-    // Should not have called createTask
-    expect(mockCreateTask).not.toHaveBeenCalled();
-  });
-});
--- a/apps/web/src/app/(authenticated)/kanban/page.tsx
+++ b/apps/web/src/app/(authenticated)/kanban/page.tsx
@@ -1,6 +1,6 @@
 "use client";

-import { useState, useEffect, useCallback, useMemo, useRef } from "react";
+import { useState, useEffect, useCallback, useMemo } from "react";
 import type { ReactElement } from "react";
 import { useSearchParams, useRouter } from "next/navigation";
 import { DragDropContext, Droppable, Draggable } from "@hello-pangea/dnd";
@@ -12,7 +12,7 @@ import type {
 } from "@hello-pangea/dnd";

 import { MosaicSpinner } from "@/components/ui/MosaicSpinner";
-import { fetchTasks, updateTask, createTask, type TaskFilters } from "@/lib/api/tasks";
+import { fetchTasks, updateTask, type TaskFilters } from "@/lib/api/tasks";
 import { fetchProjects, type Project } from "@/lib/api/projects";
 import { useWorkspaceId } from "@/lib/hooks";
 import type { Task } from "@mosaic/shared";
@@ -184,47 +184,9 @@ function TaskCard({ task, provided, snapshot, columnAccent }: TaskCardProps): Re
 interface KanbanColumnProps {
  config: ColumnConfig;
  tasks: Task[];
-  onAddTask: (status: TaskStatus, title: string) => Promise<void>;
 }

-function KanbanColumn({ config, tasks, onAddTask }: KanbanColumnProps): ReactElement {
-  const [showAddForm, setShowAddForm] = useState(false);
-  const [inputValue, setInputValue] = useState("");
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  // Focus input when form is shown
-  useEffect(() => {
-    if (showAddForm && inputRef.current) {
-      inputRef.current.focus();
-    }
-  }, [showAddForm]);
-
-  const handleSubmit = async (e: React.SyntheticEvent): Promise<void> => {
-    e.preventDefault();
-    if (!inputValue.trim() || isSubmitting) {
-      return;
-    }
-
-    setIsSubmitting(true);
-    try {
-      await onAddTask(config.status, inputValue.trim());
-      setInputValue("");
-      setShowAddForm(false);
-    } catch (err) {
-      console.error("[KanbanColumn] Failed to add task:", err);
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>): void => {
-    if (e.key === "Escape") {
-      setShowAddForm(false);
-      setInputValue("");
-    }
-  };
-
+function KanbanColumn({ config, tasks }: KanbanColumnProps): ReactElement {
  return (
    <div
      style={{
@@ -306,89 +268,6 @@ function KanbanColumn({ config, tasks, onAddTask }: KanbanColumnProps): ReactEle
          </div>
        )}
      </Droppable>
-
-      {/* Add Task Form */}
-      {!showAddForm ? (
-        <button
-          type="button"
-          onClick={() => {
-            setShowAddForm(true);
-          }}
-          style={{
-            padding: "10px 16px",
-            border: "none",
-            background: "transparent",
-            color: "var(--muted)",
-            fontSize: "0.8rem",
-            cursor: "pointer",
-            textAlign: "left",
-            transition: "color 0.15s",
-            width: "100%",
-          }}
-          onMouseEnter={(e) => {
-            e.currentTarget.style.color = "var(--text)";
-          }}
-          onMouseLeave={(e) => {
-            e.currentTarget.style.color = "var(--muted)";
-          }}
-        >
-          + Add task
-        </button>
-      ) : (
-        <form
-          onSubmit={handleSubmit}
-          style={{ padding: "8px 12px 12px", borderTop: "1px solid var(--border)" }}
-        >
-          <input
-            ref={inputRef}
-            type="text"
-            value={inputValue}
-            onChange={(e) => {
-              setInputValue(e.target.value);
-            }}
-            onKeyDown={handleKeyDown}
-            placeholder="Task title..."
-            disabled={isSubmitting}
-            style={{
-              width: "100%",
-              padding: "8px 10px",
-              borderRadius: "var(--r)",
-              border: `1px solid ${inputValue ? "var(--primary)" : "var(--border)"}`,
-              background: "var(--surface)",
-              color: "var(--text)",
-              fontSize: "0.85rem",
-              outline: "none",
-              opacity: isSubmitting ? 0.6 : 1,
-            }}
-            autoFocus
-          />
-          <div style={{ marginTop: 6, fontSize: "0.75rem", color: "var(--muted)" }}>
-            Press{" "}
-            <kbd
-              style={{
-                padding: "2px 4px",
-                background: "var(--bg-mid)",
-                borderRadius: "2px",
-                fontFamily: "var(--mono)",
-              }}
-            >
-              Enter
-            </kbd>{" "}
-            to save,{" "}
-            <kbd
-              style={{
-                padding: "2px 4px",
-                background: "var(--bg-mid)",
-                borderRadius: "2px",
-                fontFamily: "var(--mono)",
-              }}
-            >
-              Escape
-            </kbd>{" "}
-            to cancel
-          </div>
-        </form>
-      )}
    </div>
  );
 }
@@ -742,24 +621,6 @@ export default function KanbanPage(): ReactElement {
    void loadTasks(workspaceId);
  }

-  /* --- add task handler --- */
-
-  const handleAddTask = useCallback(
-    async (status: TaskStatus, title: string) => {
-      try {
-        const wsId = workspaceId ?? undefined;
-        const newTask = await createTask({ title, status }, wsId);
-        // Optimistically add to local state
-        setTasks((prev) => [...prev, newTask]);
-      } catch (err: unknown) {
-        console.error("[Kanban] Failed to create task:", err);
-        // Re-fetch on error to get consistent state
-        void loadTasks(workspaceId);
-      }
-    },
-    [workspaceId, loadTasks]
-  );
-
  /* --- render --- */

  return (
@@ -894,12 +755,7 @@ export default function KanbanPage(): ReactElement {
            }}
          >
            {COLUMNS.map((col) => (
-              <KanbanColumn
-                key={col.status}
-                config={col}
-                tasks={grouped[col.status]}
-                onAddTask={handleAddTask}
-              />
+              <KanbanColumn key={col.status} config={col} tasks={grouped[col.status]} />
            ))}
          </div>
        </DragDropContext>
--- a/apps/web/src/app/(authenticated)/logs/page.tsx
+++ b/apps/web/src/app/(authenticated)/logs/page.tsx
@@ -4,39 +4,21 @@ import { useState, useEffect, useCallback, useRef } from "react";
 import type { ReactElement } from "react";

 import { MosaicSpinner } from "@/components/ui/MosaicSpinner";
-import {
-  fetchActivityLogs,
-  ActivityAction,
-  EntityType,
-  type ActivityLog,
-  type ActivityLogFilters,
-} from "@/lib/api/activity";
+import { fetchRunnerJobs, fetchJobSteps, RunnerJobStatus } from "@/lib/api/runner-jobs";
+import type { RunnerJob, JobStep } from "@/lib/api/runner-jobs";
 import { useWorkspaceId } from "@/lib/hooks";

 // ─── Constants ────────────────────────────────────────────────────────

-type ActionFilter = "all" | ActivityAction;
-type EntityFilter = "all" | EntityType;
+type StatusFilter = "all" | "running" | "completed" | "failed" | "queued";
 type DateRange = "24h" | "7d" | "30d" | "all";

-const ACTION_OPTIONS: { value: ActionFilter; label: string }[] = [
-  { value: "all", label: "All actions" },
-  { value: ActivityAction.CREATED, label: "Created" },
-  { value: ActivityAction.UPDATED, label: "Updated" },
-  { value: ActivityAction.DELETED, label: "Deleted" },
-  { value: ActivityAction.COMPLETED, label: "Completed" },
-  { value: ActivityAction.ASSIGNED, label: "Assigned" },
-];
-
-const ENTITY_OPTIONS: { value: EntityFilter; label: string }[] = [
-  { value: "all", label: "All entities" },
-  { value: EntityType.TASK, label: "Tasks" },
-  { value: EntityType.EVENT, label: "Events" },
-  { value: EntityType.PROJECT, label: "Projects" },
-  { value: EntityType.WORKSPACE, label: "Workspaces" },
-  { value: EntityType.USER, label: "Users" },
-  { value: EntityType.DOMAIN, label: "Domains" },
-  { value: EntityType.IDEA, label: "Ideas" },
+const STATUS_OPTIONS: { value: StatusFilter; label: string }[] = [
+  { value: "all", label: "All statuses" },
+  { value: "running", label: "Running" },
+  { value: "completed", label: "Completed" },
+  { value: "failed", label: "Failed" },
+  { value: "queued", label: "Queued" },
 ];

 const DATE_RANGES: { value: DateRange; label: string }[] = [
@@ -46,37 +28,37 @@ const DATE_RANGES: { value: DateRange; label: string }[] = [
  { value: "all", label: "All" },
 ];

+const STATUS_FILTER_TO_ENUM: Record<StatusFilter, RunnerJobStatus[] | undefined> = {
+  all: undefined,
+  running: [RunnerJobStatus.RUNNING],
+  completed: [RunnerJobStatus.COMPLETED],
+  failed: [RunnerJobStatus.FAILED],
+  queued: [RunnerJobStatus.QUEUED, RunnerJobStatus.PENDING],
+};
+
 const POLL_INTERVAL_MS = 5_000;

 // ─── Helpers ──────────────────────────────────────────────────────────

-const ACTION_COLORS: Record<string, string> = {
-  [ActivityAction.CREATED]: "var(--ms-teal-400)",
-  [ActivityAction.UPDATED]: "var(--ms-blue-400)",
-  [ActivityAction.DELETED]: "var(--danger)",
-  [ActivityAction.COMPLETED]: "var(--ms-emerald-400)",
-  [ActivityAction.ASSIGNED]: "var(--ms-amber-400)",
-};
-
-function getActionColor(action: string): string {
-  return ACTION_COLORS[action] ?? "var(--muted)";
+function getStatusColor(status: string): string {
+  switch (status) {
+    case "RUNNING":
+      return "var(--ms-amber-400)";
+    case "COMPLETED":
+      return "var(--ms-teal-400)";
+    case "FAILED":
+    case "CANCELLED":
+      return "var(--danger)";
+    case "QUEUED":
+    case "PENDING":
+      return "var(--ms-blue-400)";
+    default:
+      return "var(--muted)";
+  }
 }

-const ENTITY_LABELS: Record<string, string> = {
-  [EntityType.TASK]: "Task",
-  [EntityType.EVENT]: "Event",
-  [EntityType.PROJECT]: "Project",
-  [EntityType.WORKSPACE]: "Workspace",
-  [EntityType.USER]: "User",
-  [EntityType.DOMAIN]: "Domain",
-  [EntityType.IDEA]: "Idea",
-};
-
-function getEntityTypeLabel(entityType: string): string {
-  return ENTITY_LABELS[entityType] ?? entityType;
-}
-
-function formatRelativeTime(dateStr: string): string {
+function formatRelativeTime(dateStr: string | null): string {
+  if (!dateStr) return "\u2014";
  const date = new Date(dateStr);
  const now = Date.now();
  const diffMs = now - date.getTime();
@@ -92,6 +74,29 @@ function formatRelativeTime(dateStr: string): string {
  return date.toLocaleDateString();
 }

+function formatDuration(startedAt: string | null, completedAt: string | null): string {
+  if (!startedAt) return "\u2014";
+  const start = new Date(startedAt).getTime();
+  const end = completedAt ? new Date(completedAt).getTime() : Date.now();
+  const ms = end - start;
+  if (ms < 1_000) return `${String(ms)}ms`;
+  const sec = Math.floor(ms / 1_000);
+  if (sec < 60) return `${String(sec)}s`;
+  const min = Math.floor(sec / 60);
+  const remainSec = sec % 60;
+  return `${String(min)}m ${String(remainSec)}s`;
+}
+
+function formatStepDuration(durationMs: number | null): string {
+  if (durationMs === null) return "\u2014";
+  if (durationMs < 1_000) return `${String(durationMs)}ms`;
+  const sec = Math.floor(durationMs / 1_000);
+  if (sec < 60) return `${String(sec)}s`;
+  const min = Math.floor(sec / 60);
+  const remainSec = sec % 60;
+  return `${String(min)}m ${String(remainSec)}s`;
+}
+
 function isWithinDateRange(dateStr: string, range: DateRange): boolean {
  if (range === "all") return true;
  const date = new Date(dateStr);
@@ -100,16 +105,18 @@ function isWithinDateRange(dateStr: string, range: DateRange): boolean {
  return now - date.getTime() < hours * 60 * 60 * 1_000;
 }

-// ─── Action Badge ─────────────────────────────────────────────────────
+// ─── Status Badge ─────────────────────────────────────────────────────

-function ActionBadge({ action }: { action: string }): ReactElement {
-  const color = getActionColor(action);
+function StatusBadge({ status }: { status: string }): ReactElement {
+  const color = getStatusColor(status);
+  const isRunning = status === "RUNNING";

  return (
    <span
      style={{
        display: "inline-flex",
        alignItems: "center",
+        gap: 6,
        padding: "2px 10px",
        borderRadius: 9999,
        fontSize: "0.75rem",
@@ -120,7 +127,18 @@ function ActionBadge({ action }: { action: string }): ReactElement {
        textTransform: "capitalize",
      }}
    >
-      {action.toLowerCase()}
+      {isRunning && (
+        <span
+          style={{
+            width: 6,
+            height: 6,
+            borderRadius: "50%",
+            background: color,
+            animation: "pulse 1.5s ease-in-out infinite",
+          }}
+        />
+      )}
+      {status.toLowerCase()}
    </span>
  );
 }
@@ -131,55 +149,59 @@ export default function LogsPage(): ReactElement {
  const workspaceId = useWorkspaceId();

  // Data state
-  const [activities, setActivities] = useState<ActivityLog[]>([]);
+  const [jobs, setJobs] = useState<RunnerJob[]>([]);
  const [isLoading, setIsLoading] = useState(true);
  const [error, setError] = useState<string | null>(null);

+  // Expanded job and steps
+  const [expandedJobId, setExpandedJobId] = useState<string | null>(null);
+  const [jobStepsMap, setJobStepsMap] = useState<Record<string, JobStep[]>>({});
+  const [stepsLoading, setStepsLoading] = useState<Set<string>>(new Set());
+
  // Filters
-  const [actionFilter, setActionFilter] = useState<ActionFilter>("all");
-  const [entityFilter, setEntityFilter] = useState<EntityFilter>("all");
+  const [statusFilter, setStatusFilter] = useState<StatusFilter>("all");
  const [dateRange, setDateRange] = useState<DateRange>("7d");
  const [searchQuery, setSearchQuery] = useState("");

  // Auto-refresh
-  const [autoRefresh, setAutoRefresh] = useState(true);
+  const [autoRefresh, setAutoRefresh] = useState(false);
  const intervalRef = useRef<ReturnType<typeof setInterval> | null>(null);

+  // Hover state
+  const [hoveredRowId, setHoveredRowId] = useState<string | null>(null);
+
  // ─── Data Loading ─────────────────────────────────────────────────

-  const loadActivities = useCallback(async (): Promise<void> => {
+  const loadJobs = useCallback(async (): Promise<void> => {
    try {
-      const filters: ActivityLogFilters = {};
+      const statusEnums = STATUS_FILTER_TO_ENUM[statusFilter];
+      const filters: Parameters<typeof fetchRunnerJobs>[0] = {};
      if (workspaceId) {
        filters.workspaceId = workspaceId;
      }
-      if (actionFilter !== "all") {
-        filters.action = actionFilter;
-      }
-      if (entityFilter !== "all") {
-        filters.entityType = entityFilter;
+      if (statusEnums) {
+        filters.status = statusEnums;
      }

-      const response: Awaited<ReturnType<typeof fetchActivityLogs>> =
-        await fetchActivityLogs(filters);
-      setActivities(response);
+      const data = await fetchRunnerJobs(filters);
+      setJobs(data);
      setError(null);
    } catch (err: unknown) {
-      console.error("[Logs] Failed to fetch activity logs:", err);
+      console.error("[Logs] Failed to fetch runner jobs:", err);
      setError(
        err instanceof Error
          ? err.message
-          : "We had trouble loading activity logs. Please try again when you're ready."
+          : "We had trouble loading jobs. Please try again when you're ready."
      );
    }
-  }, [workspaceId, actionFilter, entityFilter]);
+  }, [workspaceId, statusFilter]);

  // Initial load
  useEffect(() => {
    let cancelled = false;
    setIsLoading(true);

-    loadActivities()
+    loadJobs()
      .then(() => {
        if (!cancelled) {
          setIsLoading(false);
@@ -194,13 +216,13 @@ export default function LogsPage(): ReactElement {
    return (): void => {
      cancelled = true;
    };
-  }, [loadActivities]);
+  }, [loadJobs]);

  // Auto-refresh polling
  useEffect(() => {
    if (autoRefresh) {
      intervalRef.current = setInterval(() => {
-        void loadActivities();
+        void loadJobs();
      }, POLL_INTERVAL_MS);
    } else if (intervalRef.current) {
      clearInterval(intervalRef.current);
@@ -213,22 +235,55 @@ export default function LogsPage(): ReactElement {
        intervalRef.current = null;
      }
    };
-  }, [autoRefresh, loadActivities]);
+  }, [autoRefresh, loadJobs]);
+
+  // ─── Steps Loading ────────────────────────────────────────────────
+
+  const toggleExpand = useCallback(
+    (jobId: string) => {
+      if (expandedJobId === jobId) {
+        setExpandedJobId(null);
+        return;
+      }
+
+      setExpandedJobId(jobId);
+
+      // Load steps if not already loaded
+      if (!jobStepsMap[jobId] && !stepsLoading.has(jobId)) {
+        setStepsLoading((prev) => new Set(prev).add(jobId));
+
+        fetchJobSteps(jobId, workspaceId ?? undefined)
+          .then((steps) => {
+            setJobStepsMap((prev) => ({ ...prev, [jobId]: steps }));
+          })
+          .catch((err: unknown) => {
+            console.error("[Logs] Failed to fetch steps for job:", jobId, err);
+            setJobStepsMap((prev) => ({ ...prev, [jobId]: [] }));
+          })
+          .finally(() => {
+            setStepsLoading((prev) => {
+              const next = new Set(prev);
+              next.delete(jobId);
+              return next;
+            });
+          });
+      }
+    },
+    [expandedJobId, jobStepsMap, stepsLoading, workspaceId]
+  );

  // ─── Filtering ────────────────────────────────────────────────────

-  const filteredActivities = activities.filter((activity) => {
+  const filteredJobs = jobs.filter((job) => {
    // Date range filter
-    if (!isWithinDateRange(activity.createdAt, dateRange)) return false;
+    if (!isWithinDateRange(job.createdAt, dateRange)) return false;

    // Search filter
    if (searchQuery.trim()) {
      const q = searchQuery.toLowerCase();
-      const matchesEntity = getEntityTypeLabel(activity.entityType).toLowerCase().includes(q);
-      const matchesId = activity.entityId.toLowerCase().includes(q);
-      const matchesUser = activity.user?.name?.toLowerCase().includes(q);
-      const matchesEmail = activity.user?.email.toLowerCase().includes(q);
-      if (!matchesEntity && !matchesId && !matchesUser && !matchesEmail) return false;
+      const matchesType = job.type.toLowerCase().includes(q);
+      const matchesId = job.id.toLowerCase().includes(q);
+      if (!matchesType && !matchesId) return false;
    }

    return true;
@@ -238,7 +293,7 @@ export default function LogsPage(): ReactElement {

  const handleManualRefresh = (): void => {
    setIsLoading(true);
-    void loadActivities().finally(() => {
+    void loadJobs().finally(() => {
      setIsLoading(false);
    });
  };
@@ -252,12 +307,16 @@ export default function LogsPage(): ReactElement {

  return (
    <main className="container mx-auto px-4 py-8">
-      {/* Pulse animation for auto-refresh */}
+      {/* Pulse animation for running status */}
      <style>{`
        @keyframes pulse {
          0%, 100% { opacity: 1; }
          50% { opacity: 0.4; }
        }
+        @keyframes auto-refresh-spin {
+          from { transform: rotate(0deg); }
+          to { transform: rotate(360deg); }
+        }
      `}</style>

      {/* ─── Header ─────────────────────────────────────────────── */}
@@ -273,10 +332,10 @@ export default function LogsPage(): ReactElement {
      >
        <div>
          <h1 className="text-3xl font-bold" style={{ color: "var(--text)" }}>
-            Activity Logs
+            Logs &amp; Telemetry
          </h1>
          <p className="mt-1" style={{ color: "var(--text-muted)" }}>
-            Audit trail and activity history
+            Runner job history and step-level detail
          </p>
        </div>

@@ -349,11 +408,11 @@ export default function LogsPage(): ReactElement {
          marginBottom: 24,
        }}
      >
-        {/* Action filter */}
+        {/* Status filter */}
        <select
-          value={actionFilter}
+          value={statusFilter}
          onChange={(e) => {
-            setActionFilter(e.target.value as ActionFilter);
+            setStatusFilter(e.target.value as StatusFilter);
          }}
          style={{
            padding: "8px 12px",
@@ -366,31 +425,7 @@ export default function LogsPage(): ReactElement {
            minWidth: 140,
          }}
        >
-          {ACTION_OPTIONS.map((opt) => (
-            <option key={opt.value} value={opt.value}>
-              {opt.label}
-            </option>
-          ))}
-        </select>
-
-        {/* Entity filter */}
-        <select
-          value={entityFilter}
-          onChange={(e) => {
-            setEntityFilter(e.target.value as EntityFilter);
-          }}
-          style={{
-            padding: "8px 12px",
-            borderRadius: 8,
-            fontSize: "0.82rem",
-            border: "1px solid var(--border)",
-            background: "var(--surface)",
-            color: "var(--text)",
-            cursor: "pointer",
-            minWidth: 140,
-          }}
-        >
-          {ENTITY_OPTIONS.map((opt) => (
+          {STATUS_OPTIONS.map((opt) => (
            <option key={opt.value} value={opt.value}>
              {opt.label}
            </option>
@@ -432,7 +467,7 @@ export default function LogsPage(): ReactElement {
        {/* Search input */}
        <input
          type="text"
-          placeholder="Search by entity or user..."
+          placeholder="Search by job type..."
          value={searchQuery}
          onChange={(e) => {
            setSearchQuery(e.target.value);
@@ -452,9 +487,9 @@ export default function LogsPage(): ReactElement {
      </div>

      {/* ─── Content ────────────────────────────────────────────── */}
-      {isLoading && activities.length === 0 ? (
+      {isLoading && jobs.length === 0 ? (
        <div className="flex justify-center py-16">
-          <MosaicSpinner label="Loading activity logs..." />
+          <MosaicSpinner label="Loading jobs..." />
        </div>
      ) : error !== null ? (
        <div
@@ -473,7 +508,7 @@ export default function LogsPage(): ReactElement {
            Try again
          </button>
        </div>
-      ) : filteredActivities.length === 0 ? (
+      ) : filteredJobs.length === 0 ? (
        <div
          className="rounded-lg p-8 text-center"
          style={{
@@ -481,10 +516,10 @@ export default function LogsPage(): ReactElement {
            border: "1px solid var(--border)",
          }}
        >
-          <p style={{ color: "var(--text-muted)" }}>No activity logs found</p>
+          <p style={{ color: "var(--text-muted)" }}>No jobs found</p>
        </div>
      ) : (
-        /* ─── Activity Table ──────────────────────────────────────── */
+        /* ─── Job Table ──────────────────────────────────────────── */
        <div
          style={{
            borderRadius: 12,
@@ -500,7 +535,7 @@ export default function LogsPage(): ReactElement {
                    background: "var(--bg-mid)",
                  }}
                >
-                  {["Action", "Entity", "User", "Details", "Time"].map((header) => (
+                  {["Job Type", "Status", "Started", "Duration", "Steps"].map((header) => (
                    <th
                      key={header}
                      style={{
@@ -521,9 +556,32 @@ export default function LogsPage(): ReactElement {
                </tr>
              </thead>
              <tbody>
-                {filteredActivities.map((activity) => (
-                  <ActivityRow key={activity.id} activity={activity} />
-                ))}
+                {filteredJobs.map((job) => {
+                  const isExpanded = expandedJobId === job.id;
+                  const isHovered = hoveredRowId === job.id;
+                  const steps = jobStepsMap[job.id];
+                  const isStepsLoading = stepsLoading.has(job.id);
+
+                  return (
+                    <JobRow
+                      key={job.id}
+                      job={job}
+                      isExpanded={isExpanded}
+                      isHovered={isHovered}
+                      steps={steps}
+                      isStepsLoading={isStepsLoading}
+                      onToggle={() => {
+                        toggleExpand(job.id);
+                      }}
+                      onMouseEnter={() => {
+                        setHoveredRowId(job.id);
+                      }}
+                      onMouseLeave={() => {
+                        setHoveredRowId(null);
+                      }}
+                    />
+                  );
+                })}
              </tbody>
            </table>
          </div>
@@ -533,91 +591,260 @@ export default function LogsPage(): ReactElement {
  );
 }

-// ─── Activity Row Component ───────────────────────────────────────────
+// ─── Job Row Component ────────────────────────────────────────────────
+
+function JobRow({
+  job,
+  isExpanded,
+  isHovered,
+  steps,
+  isStepsLoading,
+  onToggle,
+  onMouseEnter,
+  onMouseLeave,
+}: {
+  job: RunnerJob;
+  isExpanded: boolean;
+  isHovered: boolean;
+  steps: JobStep[] | undefined;
+  isStepsLoading: boolean;
+  onToggle: () => void;
+  onMouseEnter: () => void;
+  onMouseLeave: () => void;
+}): ReactElement {
+  return (
+    <>
+      <tr
+        onClick={onToggle}
+        onMouseEnter={onMouseEnter}
+        onMouseLeave={onMouseLeave}
+        style={{
+          background: isExpanded
+            ? "var(--surface-2)"
+            : isHovered
+              ? "var(--surface-2)"
+              : "var(--surface)",
+          cursor: "pointer",
+          borderBottom: isExpanded ? "none" : "1px solid var(--border)",
+          transition: "background 100ms ease",
+        }}
+      >
+        <td
+          style={{
+            padding: "12px 16px",
+            fontSize: "0.85rem",
+            fontWeight: 500,
+            color: "var(--text)",
+            whiteSpace: "nowrap",
+          }}
+        >
+          <span style={{ display: "inline-flex", alignItems: "center", gap: 8 }}>
+            <span
+              style={{
+                display: "inline-block",
+                width: 16,
+                textAlign: "center",
+                fontSize: "0.7rem",
+                color: "var(--muted)",
+                transition: "transform 150ms ease",
+                transform: isExpanded ? "rotate(90deg)" : "rotate(0deg)",
+              }}
+            >
+              &#9654;
+            </span>
+            {job.type}
+          </span>
+        </td>
+        <td style={{ padding: "12px 16px" }}>
+          <StatusBadge status={job.status} />
+        </td>
+        <td
+          style={{
+            padding: "12px 16px",
+            fontSize: "0.82rem",
+            fontFamily: "var(--mono)",
+            color: "var(--text-muted)",
+            whiteSpace: "nowrap",
+          }}
+        >
+          {formatRelativeTime(job.startedAt ?? job.createdAt)}
+        </td>
+        <td
+          style={{
+            padding: "12px 16px",
+            fontSize: "0.82rem",
+            fontFamily: "var(--mono)",
+            color: "var(--text-muted)",
+            whiteSpace: "nowrap",
+          }}
+        >
+          {formatDuration(job.startedAt, job.completedAt)}
+        </td>
+        <td
+          style={{
+            padding: "12px 16px",
+            fontSize: "0.82rem",
+            fontFamily: "var(--mono)",
+            color: "var(--text-muted)",
+          }}
+        >
+          {steps ? String(steps.length) : "\u2014"}
+        </td>
+      </tr>
+
+      {/* Expanded Steps Section */}
+      {isExpanded && (
+        <tr>
+          <td
+            colSpan={5}
+            style={{
+              padding: 0,
+              borderBottom: "1px solid var(--border)",
+            }}
+          >
+            <div
+              style={{
+                background: "var(--bg-mid)",
+                padding: "12px 16px 12px 48px",
+              }}
+            >
+              {isStepsLoading ? (
+                <div style={{ display: "flex", justifyContent: "center", padding: 16 }}>
+                  <MosaicSpinner size={24} label="Loading steps..." />
+                </div>
+              ) : !steps || steps.length === 0 ? (
+                <p
+                  style={{
+                    fontSize: "0.82rem",
+                    color: "var(--text-muted)",
+                    padding: "8px 0",
+                  }}
+                >
+                  No steps recorded for this job
+                </p>
+              ) : (
+                <table style={{ width: "100%", borderCollapse: "collapse" }}>
+                  <thead>
+                    <tr>
+                      {["#", "Name", "Phase", "Status", "Duration"].map((header) => (
+                        <th
+                          key={header}
+                          style={{
+                            padding: "6px 12px",
+                            textAlign: "left",
+                            fontSize: "0.7rem",
+                            fontWeight: 600,
+                            textTransform: "uppercase",
+                            letterSpacing: "0.05em",
+                            color: "var(--muted)",
+                            fontFamily: "var(--mono)",
+                            borderBottom: "1px solid var(--border)",
+                            whiteSpace: "nowrap",
+                          }}
+                        >
+                          {header}
+                        </th>
+                      ))}
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {steps
+                      .sort((a, b) => a.ordinal - b.ordinal)
+                      .map((step) => (
+                        <StepRow key={step.id} step={step} />
+                      ))}
+                  </tbody>
+                </table>
+              )}
+
+              {/* Job error message if failed */}
+              {job.error && (
+                <div
+                  style={{
+                    marginTop: 12,
+                    padding: "8px 12px",
+                    borderRadius: 6,
+                    fontSize: "0.78rem",
+                    fontFamily: "var(--mono)",
+                    color: "var(--danger)",
+                    background: "color-mix(in srgb, var(--danger) 8%, transparent)",
+                    border: "1px solid color-mix(in srgb, var(--danger) 20%, transparent)",
+                    wordBreak: "break-all",
+                  }}
+                >
+                  {job.error}
+                </div>
+              )}
+            </div>
+          </td>
+        </tr>
+      )}
+    </>
+  );
+}
+
+// ─── Step Row Component ───────────────────────────────────────────────
+
+function StepRow({ step }: { step: JobStep }): ReactElement {
+  const [hovered, setHovered] = useState(false);

-function ActivityRow({ activity }: { activity: ActivityLog }): ReactElement {
  return (
    <tr
+      onMouseEnter={() => {
+        setHovered(true);
+      }}
+      onMouseLeave={() => {
+        setHovered(false);
+      }}
      style={{
-        background: "var(--surface)",
-        borderBottom: "1px solid var(--border)",
+        background: hovered ? "color-mix(in srgb, var(--surface) 50%, transparent)" : "transparent",
+        borderBottom: "1px solid color-mix(in srgb, var(--border) 50%, transparent)",
        transition: "background 100ms ease",
      }}
    >
-      <td style={{ padding: "12px 16px" }}>
-        <ActionBadge action={activity.action} />
-      </td>
      <td
        style={{
-          padding: "12px 16px",
-          fontSize: "0.85rem",
-          fontWeight: 500,
-          color: "var(--text)",
-        }}
-      >
-        <div style={{ display: "flex", flexDirection: "column", gap: 2 }}>
-          <span>{getEntityTypeLabel(activity.entityType)}</span>
-          <span
-            style={{
-              fontSize: "0.75rem",
-              color: "var(--muted)",
-              fontFamily: "var(--mono)",
-            }}
-          >
-            {activity.entityId}
-          </span>
-        </div>
-      </td>
-      <td
-        style={{
-          padding: "12px 16px",
-          fontSize: "0.82rem",
-          color: "var(--text)",
-        }}
-      >
-        {activity.user ? (
-          <div style={{ display: "flex", flexDirection: "column", gap: 2 }}>
-            <span>{activity.user.name ?? activity.user.email}</span>
-            {activity.user.name && (
-              <span
-                style={{
-                  fontSize: "0.75rem",
-                  color: "var(--muted)",
-                }}
-              >
-                {activity.user.email}
-              </span>
-            )}
-          </div>
-        ) : (
-          <span style={{ color: "var(--muted)" }}>—</span>
-        )}
-      </td>
-      <td
-        style={{
-          padding: "12px 16px",
+          padding: "6px 12px",
          fontSize: "0.78rem",
-          color: "var(--text-muted)",
          fontFamily: "var(--mono)",
-          maxWidth: 300,
-          overflow: "hidden",
-          textOverflow: "ellipsis",
-          whiteSpace: "nowrap",
+          color: "var(--muted)",
        }}
-        title={activity.details ? JSON.stringify(activity.details) : undefined}
      >
-        {activity.details ? JSON.stringify(activity.details) : "—"}
+        {String(step.ordinal)}
      </td>
      <td
        style={{
-          padding: "12px 16px",
-          fontSize: "0.82rem",
+          padding: "6px 12px",
+          fontSize: "0.8rem",
+          color: "var(--text)",
+        }}
+      >
+        {step.name}
+      </td>
+      <td
+        style={{
+          padding: "6px 12px",
+          fontSize: "0.75rem",
+          fontFamily: "var(--mono)",
+          color: "var(--text-muted)",
+          textTransform: "lowercase",
+        }}
+      >
+        {step.phase}
+      </td>
+      <td style={{ padding: "6px 12px" }}>
+        <StatusBadge status={step.status} />
+      </td>
+      <td
+        style={{
+          padding: "6px 12px",
+          fontSize: "0.78rem",
          fontFamily: "var(--mono)",
          color: "var(--text-muted)",
          whiteSpace: "nowrap",
        }}
      >
-        {formatRelativeTime(activity.createdAt)}
+        {formatStepDuration(step.durationMs)}
      </td>
    </tr>
  );
--- a/apps/web/src/app/(authenticated)/projects/[id]/page.tsx
+++ b/apps/web/src/app/(authenticated)/projects/[id]/page.tsx
@@ -1,491 +0,0 @@
-"use client";
-
-import { useState, useEffect, useCallback } from "react";
-import type { ReactElement } from "react";
-import { useParams, useRouter } from "next/navigation";
-import { ArrowLeft } from "lucide-react";
-
-import { MosaicSpinner } from "@/components/ui/MosaicSpinner";
-import { fetchProject, type ProjectDetail } from "@/lib/api/projects";
-import { useWorkspaceId } from "@/lib/hooks";
-
-interface BadgeStyle {
-  label: string;
-  bg: string;
-  color: string;
-}
-
-interface StatusBadgeProps {
-  style: BadgeStyle;
-}
-
-interface MetaItemProps {
-  label: string;
-  value: string;
-}
-
-function getProjectStatusStyle(status: string): BadgeStyle {
-  switch (status) {
-    case "PLANNING":
-      return { label: "Planning", bg: "rgba(47,128,255,0.15)", color: "var(--primary)" };
-    case "ACTIVE":
-      return { label: "Active", bg: "rgba(20,184,166,0.15)", color: "var(--success)" };
-    case "PAUSED":
-      return { label: "Paused", bg: "rgba(245,158,11,0.15)", color: "var(--warn)" };
-    case "COMPLETED":
-      return { label: "Completed", bg: "rgba(139,92,246,0.15)", color: "var(--purple)" };
-    case "ARCHIVED":
-      return { label: "Archived", bg: "rgba(143,157,183,0.15)", color: "var(--muted)" };
-    default:
-      return { label: status, bg: "rgba(143,157,183,0.15)", color: "var(--muted)" };
-  }
-}
-
-function getPriorityStyle(priority: string | null | undefined): BadgeStyle {
-  switch (priority) {
-    case "HIGH":
-      return { label: "High", bg: "rgba(229,72,77,0.15)", color: "var(--danger)" };
-    case "MEDIUM":
-      return { label: "Medium", bg: "rgba(245,158,11,0.15)", color: "var(--warn)" };
-    case "LOW":
-      return { label: "Low", bg: "rgba(143,157,183,0.15)", color: "var(--muted)" };
-    default:
-      return { label: "Unspecified", bg: "rgba(143,157,183,0.15)", color: "var(--muted)" };
-  }
-}
-
-function getTaskStatusStyle(status: string): BadgeStyle {
-  switch (status) {
-    case "NOT_STARTED":
-      return { label: "Not Started", bg: "rgba(47,128,255,0.15)", color: "var(--primary)" };
-    case "IN_PROGRESS":
-      return { label: "In Progress", bg: "rgba(245,158,11,0.15)", color: "var(--warn)" };
-    case "PAUSED":
-      return { label: "Paused", bg: "rgba(143,157,183,0.15)", color: "var(--muted)" };
-    case "COMPLETED":
-      return { label: "Completed", bg: "rgba(20,184,166,0.15)", color: "var(--success)" };
-    case "ARCHIVED":
-      return { label: "Archived", bg: "rgba(143,157,183,0.15)", color: "var(--muted)" };
-    default:
-      return { label: status, bg: "rgba(143,157,183,0.15)", color: "var(--muted)" };
-  }
-}
-
-function formatDate(iso: string | null | undefined): string {
-  if (!iso) return "Not set";
-
-  try {
-    return new Date(iso).toLocaleDateString("en-US", {
-      month: "short",
-      day: "numeric",
-      year: "numeric",
-    });
-  } catch {
-    return iso;
-  }
-}
-
-function formatDateTime(iso: string | null | undefined): string {
-  if (!iso) return "Not set";
-
-  try {
-    return new Date(iso).toLocaleString("en-US", {
-      month: "short",
-      day: "numeric",
-      year: "numeric",
-      hour: "numeric",
-      minute: "2-digit",
-    });
-  } catch {
-    return iso;
-  }
-}
-
-function toFriendlyErrorMessage(error: unknown): string {
-  const fallback = "We had trouble loading this project. Please try again when you're ready.";
-
-  if (!(error instanceof Error)) {
-    return fallback;
-  }
-
-  const message = error.message.trim();
-  if (message.toLowerCase().includes("not found")) {
-    return "Project not found. It may have been deleted or you may not have access to it.";
-  }
-
-  return message || fallback;
-}
-
-function StatusBadge({ style: statusStyle }: StatusBadgeProps): ReactElement {
-  return (
-    <span
-      style={{
-        display: "inline-flex",
-        alignItems: "center",
-        padding: "2px 10px",
-        borderRadius: "var(--r)",
-        background: statusStyle.bg,
-        color: statusStyle.color,
-        fontSize: "0.75rem",
-        fontWeight: 500,
-      }}
-    >
-      {statusStyle.label}
-    </span>
-  );
-}
-
-function MetaItem({ label, value }: MetaItemProps): ReactElement {
-  return (
-    <div
-      style={{
-        background: "var(--bg)",
-        border: "1px solid var(--border)",
-        borderRadius: "var(--r)",
-        padding: "10px 12px",
-      }}
-    >
-      <p style={{ margin: "0 0 4px", fontSize: "0.75rem", color: "var(--muted)" }}>{label}</p>
-      <p style={{ margin: 0, fontSize: "0.85rem", color: "var(--text)" }}>{value}</p>
-    </div>
-  );
-}
-
-export default function ProjectDetailPage(): ReactElement {
-  const router = useRouter();
-  const params = useParams<{ id: string | string[] }>();
-  const workspaceId = useWorkspaceId();
-  const rawProjectId = params.id;
-  const projectId = Array.isArray(rawProjectId) ? (rawProjectId[0] ?? null) : rawProjectId;
-
-  const [project, setProject] = useState<ProjectDetail | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-
-  const loadProject = useCallback(async (id: string, wsId: string): Promise<void> => {
-    try {
-      setIsLoading(true);
-      setError(null);
-      const data = await fetchProject(id, wsId);
-      setProject(data);
-    } catch (err: unknown) {
-      console.error("[ProjectDetail] Failed to fetch project:", err);
-      setProject(null);
-      setError(toFriendlyErrorMessage(err));
-    } finally {
-      setIsLoading(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    if (!projectId) {
-      setProject(null);
-      setError("The project link is invalid. Please return to the projects page.");
-      setIsLoading(false);
-      return;
-    }
-
-    if (!workspaceId) {
-      setProject(null);
-      setError("Select a workspace to view this project.");
-      setIsLoading(false);
-      return;
-    }
-
-    const id = projectId;
-    const wsId = workspaceId;
-    let cancelled = false;
-
-    async function load(): Promise<void> {
-      try {
-        setIsLoading(true);
-        setError(null);
-        const data = await fetchProject(id, wsId);
-        if (!cancelled) {
-          setProject(data);
-        }
-      } catch (err: unknown) {
-        console.error("[ProjectDetail] Failed to fetch project:", err);
-        if (!cancelled) {
-          setProject(null);
-          setError(toFriendlyErrorMessage(err));
-        }
-      } finally {
-        if (!cancelled) {
-          setIsLoading(false);
-        }
-      }
-    }
-
-    void load();
-
-    return (): void => {
-      cancelled = true;
-    };
-  }, [projectId, workspaceId]);
-
-  function handleRetry(): void {
-    if (!projectId || !workspaceId) return;
-    void loadProject(projectId, workspaceId);
-  }
-
-  function handleBack(): void {
-    router.push("/projects");
-  }
-
-  const projectStatus = project ? getProjectStatusStyle(project.status) : null;
-  const projectPriority = project ? getPriorityStyle(project.priority) : null;
-  const dueDate = project?.dueDate ?? project?.endDate;
-  const creator =
-    project?.creator.name && project.creator.name.trim().length > 0
-      ? `${project.creator.name} (${project.creator.email})`
-      : (project?.creator.email ?? "Unknown");
-
-  return (
-    <main className="container mx-auto px-4 py-8" style={{ maxWidth: 960 }}>
-      <button
-        onClick={handleBack}
-        style={{
-          display: "inline-flex",
-          alignItems: "center",
-          gap: 8,
-          marginBottom: 20,
-          padding: "8px 12px",
-          borderRadius: "var(--r)",
-          border: "1px solid var(--border)",
-          background: "var(--surface)",
-          color: "var(--text-2)",
-          fontSize: "0.85rem",
-          fontWeight: 500,
-          cursor: "pointer",
-        }}
-      >
-        <ArrowLeft size={16} />
-        Back to projects
-      </button>
-
-      {isLoading ? (
-        <div className="flex justify-center py-16">
-          <MosaicSpinner label="Loading project..." />
-        </div>
-      ) : error !== null ? (
-        <div
-          style={{
-            background: "var(--surface)",
-            border: "1px solid var(--border)",
-            borderRadius: "var(--r-lg)",
-            padding: 32,
-            textAlign: "center",
-          }}
-        >
-          <p style={{ color: "var(--danger)", margin: "0 0 20px" }}>{error}</p>
-          <div style={{ display: "flex", gap: 12, justifyContent: "center", flexWrap: "wrap" }}>
-            <button
-              onClick={handleBack}
-              style={{
-                padding: "8px 16px",
-                background: "transparent",
-                border: "1px solid var(--border)",
-                borderRadius: "var(--r)",
-                color: "var(--text-2)",
-                fontSize: "0.85rem",
-                cursor: "pointer",
-              }}
-            >
-              Back to projects
-            </button>
-            <button
-              onClick={handleRetry}
-              style={{
-                padding: "8px 16px",
-                background: "var(--danger)",
-                border: "none",
-                borderRadius: "var(--r)",
-                color: "#fff",
-                fontSize: "0.85rem",
-                fontWeight: 500,
-                cursor: "pointer",
-              }}
-            >
-              Try again
-            </button>
-          </div>
-        </div>
-      ) : project === null ? (
-        <div
-          style={{
-            background: "var(--surface)",
-            border: "1px solid var(--border)",
-            borderRadius: "var(--r-lg)",
-            padding: 32,
-            textAlign: "center",
-          }}
-        >
-          <p style={{ color: "var(--muted)", margin: 0 }}>Project details are not available.</p>
-        </div>
-      ) : (
-        <div style={{ display: "flex", flexDirection: "column", gap: 16 }}>
-          <section
-            style={{
-              background: "var(--surface)",
-              border: "1px solid var(--border)",
-              borderRadius: "var(--r-lg)",
-              padding: 24,
-            }}
-          >
-            <div
-              style={{
-                display: "flex",
-                justifyContent: "space-between",
-                alignItems: "flex-start",
-                gap: 12,
-                flexWrap: "wrap",
-              }}
-            >
-              <div style={{ minWidth: 0 }}>
-                <h1
-                  style={{ margin: 0, fontSize: "1.875rem", fontWeight: 700, color: "var(--text)" }}
-                >
-                  {project.name}
-                </h1>
-              </div>
-              <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
-                {projectStatus && <StatusBadge style={projectStatus} />}
-                {projectPriority && <StatusBadge style={projectPriority} />}
-              </div>
-            </div>
-
-            {project.description ? (
-              <p
-                style={{
-                  margin: "14px 0 0",
-                  color: "var(--muted)",
-                  fontSize: "0.9rem",
-                  lineHeight: 1.6,
-                }}
-              >
-                {project.description}
-              </p>
-            ) : (
-              <p
-                style={{
-                  margin: "14px 0 0",
-                  color: "var(--muted)",
-                  fontSize: "0.9rem",
-                  lineHeight: 1.6,
-                  fontStyle: "italic",
-                }}
-              >
-                No description provided.
-              </p>
-            )}
-
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-3" style={{ marginTop: 18 }}>
-              <MetaItem label="Start date" value={formatDate(project.startDate)} />
-              <MetaItem label="Due date" value={formatDate(dueDate)} />
-              <MetaItem label="Created" value={formatDateTime(project.createdAt)} />
-              <MetaItem label="Updated" value={formatDateTime(project.updatedAt)} />
-              <MetaItem label="Creator" value={creator} />
-              <MetaItem
-                label="Work items"
-                value={`${String(project._count.tasks)} tasks · ${String(project._count.events)} events`}
-              />
-            </div>
-          </section>
-
-          <section
-            style={{
-              background: "var(--surface)",
-              border: "1px solid var(--border)",
-              borderRadius: "var(--r-lg)",
-              padding: 24,
-            }}
-          >
-            <h2 style={{ margin: "0 0 12px", fontSize: "1.1rem", color: "var(--text)" }}>
-              Tasks ({String(project._count.tasks)})
-            </h2>
-
-            {project.tasks.length === 0 ? (
-              <p style={{ margin: 0, color: "var(--muted)", fontSize: "0.9rem" }}>
-                No tasks yet for this project.
-              </p>
-            ) : (
-              <div>
-                {project.tasks.map((task, index) => (
-                  <div
-                    key={task.id}
-                    style={{
-                      padding: "12px 0",
-                      borderTop: index === 0 ? "none" : "1px solid var(--border)",
-                    }}
-                  >
-                    <div
-                      style={{
-                        display: "flex",
-                        alignItems: "flex-start",
-                        justifyContent: "space-between",
-                        gap: 12,
-                        flexWrap: "wrap",
-                      }}
-                    >
-                      <div style={{ minWidth: 0 }}>
-                        <p style={{ margin: 0, color: "var(--text)", fontWeight: 500 }}>
-                          {task.title}
-                        </p>
-                        <p style={{ margin: "4px 0 0", color: "var(--muted)", fontSize: "0.8rem" }}>
-                          Due: {formatDate(task.dueDate)}
-                        </p>
-                      </div>
-                      <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
-                        <StatusBadge style={getTaskStatusStyle(task.status)} />
-                        <StatusBadge style={getPriorityStyle(task.priority)} />
-                      </div>
-                    </div>
-                  </div>
-                ))}
-              </div>
-            )}
-          </section>
-
-          <section
-            style={{
-              background: "var(--surface)",
-              border: "1px solid var(--border)",
-              borderRadius: "var(--r-lg)",
-              padding: 24,
-            }}
-          >
-            <h2 style={{ margin: "0 0 12px", fontSize: "1.1rem", color: "var(--text)" }}>
-              Events ({String(project._count.events)})
-            </h2>
-
-            {project.events.length === 0 ? (
-              <p style={{ margin: 0, color: "var(--muted)", fontSize: "0.9rem" }}>
-                No events scheduled for this project.
-              </p>
-            ) : (
-              <div>
-                {project.events.map((event, index) => (
-                  <div
-                    key={event.id}
-                    style={{
-                      padding: "12px 0",
-                      borderTop: index === 0 ? "none" : "1px solid var(--border)",
-                    }}
-                  >
-                    <p style={{ margin: 0, color: "var(--text)", fontWeight: 500 }}>
-                      {event.title}
-                    </p>
-                    <p style={{ margin: "4px 0 0", color: "var(--muted)", fontSize: "0.8rem" }}>
-                      {formatDateTime(event.startTime)} - {formatDateTime(event.endTime)}
-                    </p>
-                  </div>
-                ))}
-              </div>
-            )}
-          </section>
-        </div>
-      )}
-    </main>
-  );
-}
--- a/apps/web/src/app/(authenticated)/projects/page.tsx
+++ b/apps/web/src/app/(authenticated)/projects/page.tsx
@@ -17,8 +17,6 @@ import {
 import { fetchProjects, createProject, deleteProject, ProjectStatus } from "@/lib/api/projects";
 import type { Project, CreateProjectDto } from "@/lib/api/projects";
 import { useWorkspaceId } from "@/lib/hooks";
-import { fetchDomains } from "@/lib/api/domains";
-import type { Domain } from "@mosaic/shared";

 /* ---------------------------------------------------------------------------
   Status badge helpers
@@ -67,14 +65,11 @@ interface ProjectCardProps {
  project: Project;
  onDelete: (id: string) => void;
  onClick: (id: string) => void;
-  domains: Domain[];
 }

-function ProjectCard({ project, onDelete, onClick, domains }: ProjectCardProps): ReactElement {
+function ProjectCard({ project, onDelete, onClick }: ProjectCardProps): ReactElement {
  const [hovered, setHovered] = useState(false);
  const status = getStatusStyle(project.status);
-  // Find domain if project has a domainId
-  const domain = project.domainId ? domains.find((d) => d.id === project.domainId) : undefined;

  return (
    <div
@@ -209,22 +204,6 @@ function ProjectCard({ project, onDelete, onClick, domains }: ProjectCardProps):
        >
          {status.label}
        </span>
-        {domain && (
-          <span
-            style={{
-              display: "inline-block",
-              padding: "2px 10px",
-              borderRadius: "var(--r)",
-              background: "rgba(139,92,246,0.15)",
-              color: "var(--purple)",
-              fontSize: "0.75rem",
-              fontWeight: 500,
-              marginLeft: 8,
-            }}
-          >
-            {domain.name}
-          </span>
-        )}

        {/* Timestamps */}
        <span
@@ -250,7 +229,6 @@ interface CreateDialogProps {
  onOpenChange: (open: boolean) => void;
  onSubmit: (data: CreateProjectDto) => Promise<void>;
  isSubmitting: boolean;
-  domains: Domain[];
 }

 function CreateProjectDialog({
@@ -258,24 +236,20 @@ function CreateProjectDialog({
  onOpenChange,
  onSubmit,
  isSubmitting,
-  domains,
 }: CreateDialogProps): ReactElement {
  const [name, setName] = useState("");
  const [description, setDescription] = useState("");
  const [formError, setFormError] = useState<string | null>(null);
-  const [domainId, setDomainId] = useState("");

  function resetForm(): void {
    setName("");
    setDescription("");
    setFormError(null);
-    setDomainId("");
  }

  async function handleSubmit(e: SyntheticEvent): Promise<void> {
    e.preventDefault();
    setFormError(null);
-    setDomainId("");

    const trimmedName = name.trim();
    if (!trimmedName) {
@@ -289,9 +263,6 @@ function CreateProjectDialog({
      if (trimmedDesc) {
        payload.description = trimmedDesc;
      }
-      if (domainId) {
-        payload.domainId = domainId;
-      }
      await onSubmit(payload);
      resetForm();
    } catch (err: unknown) {
@@ -411,47 +382,6 @@ function CreateProjectDialog({
              />
            </div>

-            {/* Domain */}
-            <div style={{ marginBottom: 16 }}>
-              <label
-                htmlFor="project-domain"
-                style={{
-                  display: "block",
-                  marginBottom: 6,
-                  fontSize: "0.85rem",
-                  fontWeight: 500,
-                  color: "var(--text-2)",
-                }}
-              >
-                Domain (optional)
-              </label>
-              <select
-                id="project-domain"
-                value={domainId}
-                onChange={(e) => {
-                  setDomainId(e.target.value);
-                }}
-                style={{
-                  width: "100%",
-                  padding: "8px 12px",
-                  background: "var(--bg)",
-                  border: "1px solid var(--border)",
-                  borderRadius: "var(--r)",
-                  color: "var(--text)",
-                  fontSize: "0.9rem",
-                  outline: "none",
-                  boxSizing: "border-box",
-                }}
-              >
-                <option value="">None</option>
-                {domains.map((d) => (
-                  <option key={d.id} value={d.id}>
-                    {d.name}
-                  </option>
-                ))}
-              </select>
-            </div>
-
            {/* Form error */}
            {formError !== null && (
              <p style={{ color: "var(--danger)", fontSize: "0.85rem", margin: "0 0 12px" }}>
@@ -602,7 +532,6 @@ export default function ProjectsPage(): ReactElement {
  const workspaceId = useWorkspaceId();

  const [projects, setProjects] = useState<Project[]>([]);
-  const [domains, setDomains] = useState<Domain[]>([]);
  const [isLoading, setIsLoading] = useState(true);
  const [error, setError] = useState<string | null>(null);

@@ -672,33 +601,6 @@ export default function ProjectsPage(): ReactElement {
    };
  }, [workspaceId]);

-  // Load domains
-  useEffect(() => {
-    if (!workspaceId) {
-      return;
-    }
-
-    let cancelled = false;
-    const wsId = workspaceId;
-
-    async function loadDomains(): Promise<void> {
-      try {
-        const response = await fetchDomains(undefined, wsId);
-        if (!cancelled) {
-          setDomains(response.data);
-        }
-      } catch (err: unknown) {
-        console.error("[Projects] Failed to fetch domains:", err);
-      }
-    }
-
-    void loadDomains();
-
-    return (): void => {
-      cancelled = true;
-    };
-  }, [workspaceId]);
-
  function handleRetry(): void {
    void loadProjects(workspaceId);
  }
@@ -877,7 +779,6 @@ export default function ProjectsPage(): ReactElement {
              project={project}
              onDelete={handleDeleteRequest}
              onClick={handleCardClick}
-              domains={domains}
            />
          ))}
        </div>
@@ -889,7 +790,6 @@ export default function ProjectsPage(): ReactElement {
        onOpenChange={setCreateOpen}
        onSubmit={handleCreate}
        isSubmitting={isCreating}
-        domains={domains}
      />

      {/* Delete Confirmation Dialog */}
--- a/apps/web/src/app/(authenticated)/settings/providers/page.tsx
+++ b/apps/web/src/app/(authenticated)/settings/providers/page.tsx
@@ -85,6 +85,14 @@ const INITIAL_FORM: ProviderFormState = {
  isActive: true,
 };

+function getErrorMessage(error: unknown, fallback: string): string {
+  if (error instanceof Error && error.message.trim().length > 0) {
+    return error.message;
+  }
+
+  return fallback;
+}
+
 function buildProviderName(displayName: string, type: string): string {
  const slug = displayName
    .trim()
@@ -97,14 +105,6 @@ function buildProviderName(displayName: string, type: string): string {
  return candidate.slice(0, 100);
 }

-function getErrorMessage(error: unknown, fallback: string): string {
-  if (error instanceof Error && error.message.trim().length > 0) {
-    return error.message;
-  }
-
-  return fallback;
-}
-
 function normalizeProviderModels(models: unknown): FleetProviderModel[] {
  if (!Array.isArray(models)) {
    return [];
@@ -153,11 +153,11 @@ function modelsToEditorText(models: unknown): string {
    .join("\n");
 }

-function parseModelsText(value: string): string[] {
+function parseModelsText(value: string): FleetProviderModel[] {
  const seen = new Set<string>();

  return value
-    .split(/\r?\n/g)
+    .split(/\n|,/g)
    .map((segment) => segment.trim())
    .filter((segment) => segment.length > 0)
    .filter((segment) => {
@@ -166,7 +166,8 @@ function parseModelsText(value: string): string[] {
      }
      seen.add(segment);
      return true;
-    });
+    })
+    .map((id) => ({ id, name: id }));
 }

 function maskApiKey(value: string): string {
@@ -278,7 +279,6 @@ export default function ProvidersSettingsPage(): ReactElement {
    }

    const models = parseModelsText(form.modelsText);
-    const providerModels = models.map((id) => ({ id, name: id }));
    const baseUrl = form.baseUrl.trim();
    const apiKey = form.apiKey.trim();

@@ -289,7 +289,7 @@ export default function ProvidersSettingsPage(): ReactElement {
        const updatePayload: UpdateFleetProviderRequest = {
          displayName,
          isActive: form.isActive,
-          models: providerModels,
+          models,
        };

        if (baseUrl.length > 0) {
@@ -307,6 +307,7 @@ export default function ProvidersSettingsPage(): ReactElement {
          name: buildProviderName(displayName, form.type),
          displayName,
          type: form.type,
+          models,
        };

        if (baseUrl.length > 0) {
@@ -317,10 +318,6 @@ export default function ProvidersSettingsPage(): ReactElement {
          createPayload.apiKey = apiKey;
        }

-        if (providerModels.length > 0) {
-          createPayload.models = providerModels;
-        }
-
        await createFleetProvider(createPayload);
        setSuccessMessage(`Added provider "${displayName}".`);
      }
--- a/apps/web/src/lib/api/activity.ts
+++ b/apps/web/src/lib/api/activity.ts
@@ -1,139 +0,0 @@
-/**
- * Activity API Client
- * Handles activity-log-related API requests
- */
-
-import { apiGet, type ApiResponse } from "./client";
-
-/**
- * Activity action enum (matches backend ActivityAction)
- */
-export enum ActivityAction {
-  CREATED = "CREATED",
-  UPDATED = "UPDATED",
-  DELETED = "DELETED",
-  COMPLETED = "COMPLETED",
-  ASSIGNED = "ASSIGNED",
-}
-
-/**
- * Entity type enum (matches backend EntityType)
- */
-export enum EntityType {
-  TASK = "TASK",
-  EVENT = "EVENT",
-  PROJECT = "PROJECT",
-  WORKSPACE = "WORKSPACE",
-  USER = "USER",
-  DOMAIN = "DOMAIN",
-  IDEA = "IDEA",
-}
-
-/**
- * Activity log response interface (matches Prisma ActivityLog model)
- */
-export interface ActivityLog {
-  id: string;
-  workspaceId: string;
-  userId: string;
-  action: ActivityAction;
-  entityType: EntityType;
-  entityId: string;
-  details: Record<string, unknown> | null;
-  ipAddress: string | null;
-  userAgent: string | null;
-  createdAt: string;
-  user?: {
-    id: string;
-    name: string | null;
-    email: string;
-  };
-}
-
-/**
- * Filters for querying activity logs
- */
-export interface ActivityLogFilters {
-  workspaceId?: string;
-  userId?: string;
-  action?: ActivityAction;
-  entityType?: EntityType;
-  entityId?: string;
-  startDate?: string;
-  endDate?: string;
-  page?: number;
-  limit?: number;
-}
-
-/**
- * Paginated activity logs response
- */
-export interface PaginatedActivityLogs {
-  data: ActivityLog[];
-  meta: {
-    total: number;
-    page: number;
-    limit: number;
-    totalPages: number;
-  };
-}
-
-/**
- * Fetch activity logs with optional filters
- */
-export async function fetchActivityLogs(filters?: ActivityLogFilters): Promise<ActivityLog[]> {
-  const params = new URLSearchParams();
-
-  if (filters?.userId) {
-    params.append("userId", filters.userId);
-  }
-  if (filters?.action) {
-    params.append("action", filters.action);
-  }
-  if (filters?.entityType) {
-    params.append("entityType", filters.entityType);
-  }
-  if (filters?.entityId) {
-    params.append("entityId", filters.entityId);
-  }
-  if (filters?.startDate) {
-    params.append("startDate", filters.startDate);
-  }
-  if (filters?.endDate) {
-    params.append("endDate", filters.endDate);
-  }
-  if (filters?.page !== undefined) {
-    params.append("page", String(filters.page));
-  }
-  if (filters?.limit !== undefined) {
-    params.append("limit", String(filters.limit));
-  }
-
-  const queryString = params.toString();
-  const endpoint = queryString ? `/api/activity?${queryString}` : "/api/activity";
-
-  const response = await apiGet<PaginatedActivityLogs>(endpoint, filters?.workspaceId);
-  return response.data;
-}
-
-/**
- * Fetch a single activity log by ID
- */
-export async function fetchActivityLog(id: string, workspaceId?: string): Promise<ActivityLog> {
-  return apiGet<ActivityLog>(`/api/activity/${id}`, workspaceId);
-}
-
-/**
- * Fetch audit trail for a specific entity
- */
-export async function fetchAuditTrail(
-  entityType: EntityType,
-  entityId: string,
-  workspaceId?: string
-): Promise<ActivityLog[]> {
-  const response = await apiGet<ApiResponse<ActivityLog[]>>(
-    `/api/activity/audit/${entityType}/${entityId}`,
-    workspaceId
-  );
-  return response.data;
-}
--- a/apps/web/src/lib/api/fleet-settings.test.ts
+++ b/apps/web/src/lib/api/fleet-settings.test.ts
@@ -37,24 +37,14 @@ describe("createFleetProvider", (): void => {
      name: "openai-main",
      displayName: "OpenAI Main",
      type: "openai",
-      baseUrl: "https://api.openai.com/v1",
      apiKey: "sk-test",
-      models: [
-        { id: "gpt-4.1-mini", name: "gpt-4.1-mini" },
-        { id: "gpt-4o-mini", name: "gpt-4o-mini" },
-      ],
    });

    expect(client.apiPost).toHaveBeenCalledWith("/api/fleet-settings/providers", {
      name: "openai-main",
      displayName: "OpenAI Main",
      type: "openai",
-      baseUrl: "https://api.openai.com/v1",
      apiKey: "sk-test",
-      models: [
-        { id: "gpt-4.1-mini", name: "gpt-4.1-mini" },
-        { id: "gpt-4o-mini", name: "gpt-4o-mini" },
-      ],
    });
  });
 });
--- a/apps/web/src/lib/api/index.ts
+++ b/apps/web/src/lib/api/index.ts
@@ -18,4 +18,3 @@ export * from "./projects";
 export * from "./workspaces";
 export * from "./admin";
 export * from "./fleet-settings";
-export * from "./activity";
--- a/apps/web/src/lib/api/projects.ts
+++ b/apps/web/src/lib/api/projects.ts
@@ -25,9 +25,7 @@ export interface Project {
  name: string;
  description: string | null;
  status: ProjectStatus;
-  priority?: string | null;
  startDate: string | null;
-  dueDate?: string | null;
  endDate: string | null;
  creatorId: string;
  domainId: string | null;
@@ -37,54 +35,6 @@ export interface Project {
  updatedAt: string;
 }

-/**
- * Minimal creator details included on project detail response
- */
-export interface ProjectCreator {
-  id: string;
-  name: string | null;
-  email: string;
-}
-
-/**
- * Task row included on project detail response
- */
-export interface ProjectTaskSummary {
-  id: string;
-  title: string;
-  status: string;
-  priority: string;
-  dueDate: string | null;
-}
-
-/**
- * Event row included on project detail response
- */
-export interface ProjectEventSummary {
-  id: string;
-  title: string;
-  startTime: string;
-  endTime: string | null;
-}
-
-/**
- * Counts included on project detail response
- */
-export interface ProjectDetailCounts {
-  tasks: number;
-  events: number;
-}
-
-/**
- * Single-project response with related details
- */
-export interface ProjectDetail extends Project {
-  creator: ProjectCreator;
-  tasks: ProjectTaskSummary[];
-  events: ProjectEventSummary[];
-  _count: ProjectDetailCounts;
-}
-
 /**
 * DTO for creating a new project
 */
@@ -95,7 +45,6 @@ export interface CreateProjectDto {
  startDate?: string;
  endDate?: string;
  color?: string;
-  domainId?: string;
  metadata?: Record<string, unknown>;
 }

@@ -109,7 +58,6 @@ export interface UpdateProjectDto {
  startDate?: string | null;
  endDate?: string | null;
  color?: string | null;
-  domainId?: string | null;
  metadata?: Record<string, unknown>;
 }

@@ -124,8 +72,8 @@ export async function fetchProjects(workspaceId?: string): Promise<Project[]> {
 /**
 * Fetch a single project by ID
 */
-export async function fetchProject(id: string, workspaceId?: string): Promise<ProjectDetail> {
-  return apiGet<ProjectDetail>(`/api/projects/${id}`, workspaceId);
+export async function fetchProject(id: string, workspaceId?: string): Promise<Project> {
+  return apiGet<Project>(`/api/projects/${id}`, workspaceId);
 }

 /**
--- a/apps/web/src/lib/api/tasks.ts
+++ b/apps/web/src/lib/api/tasks.ts
@@ -46,21 +46,3 @@ export async function updateTask(
  const res = await apiPatch<ApiResponse<Task>>(`/api/tasks/${id}`, data, workspaceId);
  return res.data;
 }
-
-export interface CreateTaskInput {
-  title: string;
-  description?: string;
-  status?: TaskStatus;
-  priority?: TaskPriority;
-  dueDate?: string;
-  projectId?: string;
-}
-
-/**
- * Create a new task
- */
-export async function createTask(data: CreateTaskInput, workspaceId?: string): Promise<Task> {
-  const { apiPost } = await import("./client");
-  const res = await apiPost<ApiResponse<Task>>("/api/tasks", data, workspaceId);
-  return res.data;
-}
--- a/docker-compose.swarm.portainer.yml
+++ b/docker-compose.swarm.portainer.yml
@@ -128,8 +128,6 @@ services:
      # Matrix bridge (optional — configure after Synapse is running)
      MATRIX_HOMESERVER_URL: ${MATRIX_HOMESERVER_URL:-http://synapse:8008}
      MATRIX_ACCESS_TOKEN: ${MATRIX_ACCESS_TOKEN:-}
-      # System admin IDs (comma-separated user UUIDs) for auth settings access
-      SYSTEM_ADMIN_IDS: ${SYSTEM_ADMIN_IDS:-}
      MATRIX_BOT_USER_ID: ${MATRIX_BOT_USER_ID:-}
      MATRIX_CONTROL_ROOM_ID: ${MATRIX_CONTROL_ROOM_ID:-}
      MATRIX_WORKSPACE_ID: ${MATRIX_WORKSPACE_ID:-}
--- a/docs/audits/ms22-phase1-audit.md
+++ b/docs/audits/ms22-phase1-audit.md
@@ -1,157 +0,0 @@
-# MS22 Phase 1 Module Audit
-
-Date: 2026-03-01
-Branch: `fix/ms22-audit`
-Scope:
-
- `apps/api/src/container-lifecycle/`
- `apps/api/src/crypto/`
- `apps/api/src/agent-config/`
- `apps/api/src/onboarding/`
- `apps/api/src/fleet-settings/`
- `apps/api/src/chat-proxy/`
-
-## Summary
-
-Audit completed for module wiring, security controls, input validation, and error handling.
-
-Findings:
-
-1. `chat-proxy`: raw internal/upstream error messages were returned to clients over SSE (fixed).
-2. `chat-proxy`: proxy requests to OpenClaw did not forward the container bearer token returned by lifecycle startup (fixed).
-3. `agent-config`: token validation returned early and used length-gated compare logic, creating avoidable timing side-channel behavior (hardened).
-
-## Module Review Results
-
-### 1) `container-lifecycle`
-
- NestJS module dependency audit:
-  - `ContainerLifecycleModule` imports `ConfigModule`, `PrismaModule`, and `CryptoModule` required by `ContainerLifecycleService`.
-  - Providers/exports are correct (`ContainerLifecycleService` provided and exported).
- Security review:
-  - Container operations are user-scoped by `userId` and do not expose cross-user selectors in this module.
-  - AES token generation/decryption delegated to `CryptoService`.
- Input validation:
-  - No controller endpoints in this module; no direct request DTO surface here.
- Error handling:
-  - No direct HTTP layer here; errors flow to callers/global filter.
- Finding status: **No issues found in this module**.
-
-### 2) `crypto`
-
- NestJS module dependency audit:
-  - `CryptoModule` correctly imports `ConfigModule` for `ConfigService`.
-  - `CryptoService` is correctly provided/exported.
- Security review:
-  - AES-256-GCM is implemented correctly.
-  - 96-bit IV generated via `randomBytes(12)` per encryption.
-  - Auth tag captured and verified on decrypt (`setAuthTag` + `decipher.final()`).
-  - HKDF derives a fixed 32-byte key from `MOSAIC_SECRET_KEY`.
- Input validation:
-  - No DTO/request surface in this module.
- Error handling:
-  - Decrypt failures are normalized to `Failed to decrypt value`.
- Finding status: **No issues found in this module**.
-
-### 3) `agent-config`
-
- NestJS module dependency audit:
-  - `AgentConfigModule` imports `PrismaModule` + `CryptoModule`; `AgentConfigService` and `AgentConfigGuard` are provided.
-  - Controller/guard/service wiring is correct.
- Security review:
-  - Bearer token comparisons used `timingSafeEqual`, but returned early on first match and performed length-gated comparison.
-  - Internal route (`/api/internal/agent-config/:id`) is access-controlled by bearer token guard and container-id match (`containerAuth.id === :id`).
- Input validation:
-  - Header token extraction and route param are manually handled (no DTO for `:id`, acceptable for current use but should remain constrained).
- Error handling:
-  - Service throws typed Nest exceptions for not-found paths.
- Finding status: **Issue found and fixed**.
-
-### 4) `onboarding`
-
- NestJS module dependency audit:
-  - `OnboardingModule` imports required dependencies (`PrismaModule`, `CryptoModule`; `ConfigModule` currently unused but harmless).
-  - Providers/controllers are correctly declared.
- Security review:
-  - `OnboardingGuard` blocks all mutating onboarding routes once `onboarding.completed=true`.
-  - Onboarding cannot be re-run via guarded endpoints after completion.
- Input validation:
-  - DTOs use `class-validator` decorators for all request bodies.
- Error handling:
-  - Uses typed Nest exceptions (`ConflictException`, `BadRequestException`).
- Finding status: **No issues found in this module**.
-
-### 5) `fleet-settings`
-
- NestJS module dependency audit:
-  - `FleetSettingsModule` imports `AuthModule`, `PrismaModule`, `CryptoModule` required by its controller/service.
-  - Provider/export wiring is correct for `FleetSettingsService`.
- Security review:
-  - Class-level `AuthGuard` protects all routes.
-  - Admin-only routes additionally use `AdminGuard` (`oidc` and `breakglass/reset-password`).
-  - Provider list/get responses do not expose `apiKey`.
-  - OIDC read response intentionally omits `clientSecret`.
- Input validation:
-  - DTOs are decorated with `class-validator`.
- Error handling:
-  - Ownership/not-found conditions use typed exceptions.
- Finding status: **No issues found in this module**.
-
-### 6) `chat-proxy`
-
- NestJS module dependency audit:
-  - `ChatProxyModule` imports `AuthModule`, `PrismaModule`, `ContainerLifecycleModule` needed by controller/service.
-  - Provider/controller wiring is correct.
- Security review:
-  - User identity comes from `AuthGuard`; no user-provided container selector, so no cross-user container proxy path found.
-  - **Issue fixed:** gateway bearer token was not forwarded on proxied requests.
-  - **Issue fixed:** SSE error events exposed raw internal exception messages.
- Input validation:
-  - `ChatStreamDto` + nested `ChatMessageDto` use `class-validator` decorators.
- Error handling:
-  - **Issue fixed:** controller now emits safe client error messages and logs details server-side.
- Finding status: **Issues found and fixed**.
-
-## Security Checklist Outcomes
-
- `fleet-settings`: admin-only routes are guarded; non-admin users cannot access OIDC or breakglass reset routes. Provider secrets are not returned in provider read endpoints.
- `agent-config`: token comparison hardened; route remains gated by bearer token + container id binding.
- `onboarding`: guarded mutating endpoints cannot run after completion.
- `crypto`: AES-256-GCM usage is correct (random IV, auth-tag verification, fixed 32-byte key derivation).
- `chat-proxy`: user cannot target another user’s container; proxy now authenticates to OpenClaw using per-container bearer token.
-
-## Input Validation
-
- DTO coverage is present in onboarding, fleet-settings, and chat-proxy request bodies.
- No critical unvalidated body inputs found in scoped modules.
-
-## Error Handling
-
- Global API layer has a sanitizing `GlobalExceptionFilter`.
- `chat-proxy` used manual response handling (`@Res`) and bypassed global filter; this was corrected by sending safe generic SSE errors.
- No additional critical sensitive-data leaks found in reviewed scope.
-
-## Changes Made
-
-1. Hardened token comparison behavior in:
-   - `apps/api/src/agent-config/agent-config.service.ts`
-   - Changes:
-     - Compare SHA-256 digests with `timingSafeEqual`.
-     - Avoid early return during scan to reduce timing signal differences.
-
-2. Fixed OpenClaw auth forwarding and error leak risk in:
-   - `apps/api/src/chat-proxy/chat-proxy.service.ts`
-   - `apps/api/src/chat-proxy/chat-proxy.controller.ts`
-   - `apps/api/src/chat-proxy/chat-proxy.service.spec.ts`
-   - Changes:
-     - Forward `Authorization: Bearer <gatewayToken>` when proxying chat requests.
-     - Stop returning raw internal/upstream error text to clients over SSE.
-     - Log details server-side and return safe client-facing messages.
-
-## Validation Commands
-
-Required quality gate command run:
-
- `pnpm turbo lint typecheck --filter=@mosaic/api`
-
-(Results captured in session logs.)
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -180,9 +180,6 @@ importers:
      gray-matter:
        specifier: ^4.0.3
        version: 4.0.3
-      helmet:
-        specifier: ^8.1.0
-        version: 8.1.0
      highlight.js:
        specifier: ^11.11.1
        version: 11.11.1
@@ -5213,10 +5210,6 @@ packages:
    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
    engines: {node: '>= 0.4'}

-  helmet@8.1.0:
-    resolution: {integrity: sha512-jOiHyAZsmnr8LqoPGmCjYAaiuWwjAPLgY8ZX2XrmHawt99/u1y6RgrZMTeoPfpUbV96HOalYgz1qzkRbw54Pmg==}
-    engines: {node: '>=18.0.0'}
-
  highlight.js@11.11.1:
    resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
    engines: {node: '>=12.0.0'}
@@ -12822,8 +12815,6 @@ snapshots:
    dependencies:
      function-bind: 1.1.2

-  helmet@8.1.0: {}
-
  highlight.js@11.11.1: {}

  html-encoding-sniffer@4.0.0: