2026-02-21 20:56:41 +00:00
22 changed files with 605 additions and 744 deletions
--- a/apps/api/src/auth/auth-rls.integration.spec.ts
+++ b/apps/api/src/auth/auth-rls.integration.spec.ts
@@ -12,7 +12,10 @@ import { PrismaClient, Prisma } from "@prisma/client";
 import { randomUUID as uuid } from "crypto";
 import { runWithRlsClient, getRlsClient } from "../prisma/rls-context.provider";

-describe.skipIf(!process.env.DATABASE_URL)(
+const shouldRunDbIntegrationTests =
+  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
+
+describe.skipIf(!shouldRunDbIntegrationTests)(
  "Auth Tables RLS Policies (requires DATABASE_URL)",
  () => {
    let prisma: PrismaClient;
@@ -28,7 +31,7 @@ describe.skipIf(!process.env.DATABASE_URL)(

    beforeAll(async () => {
      // Skip setup if DATABASE_URL is not available
-      if (!process.env.DATABASE_URL) {
+      if (!shouldRunDbIntegrationTests) {
        return;
      }

@@ -49,7 +52,7 @@ describe.skipIf(!process.env.DATABASE_URL)(

    afterAll(async () => {
      // Skip cleanup if DATABASE_URL is not available or prisma not initialized
-      if (!process.env.DATABASE_URL || !prisma) {
+      if (!shouldRunDbIntegrationTests || !prisma) {
        return;
      }

--- a/apps/api/src/credentials/user-credential.model.spec.ts
+++ b/apps/api/src/credentials/user-credential.model.spec.ts
@@ -15,7 +15,12 @@
 import { describe, it, expect, beforeAll, afterAll } from "vitest";
 import { PrismaClient, CredentialType, CredentialScope } from "@prisma/client";

-describe("UserCredential Model", () => {
+const shouldRunDbIntegrationTests =
+  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
+
+const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;
+
+describeFn("UserCredential Model", () => {
  let prisma: PrismaClient;
  let testUserId: string;
  let testWorkspaceId: string;
@@ -23,8 +28,8 @@ describe("UserCredential Model", () => {
  beforeAll(async () => {
    // Note: These tests require a running database
    // They will be skipped in CI if DATABASE_URL is not set
-    if (!process.env.DATABASE_URL) {
-      console.warn("DATABASE_URL not set, skipping UserCredential model tests");
+    if (!shouldRunDbIntegrationTests) {
+      console.warn("Skipping UserCredential model tests (set RUN_DB_TESTS=true and DATABASE_URL)");
      return;
    }

--- a/apps/api/src/job-events/job-events.performance.spec.ts
+++ b/apps/api/src/job-events/job-events.performance.spec.ts
@@ -16,7 +16,9 @@ import { JOB_CREATED, JOB_STARTED, STEP_STARTED } from "./event-types";
 * NOTE: These tests require a real database connection with realistic data volume.
 * Run with: pnpm test:api -- job-events.performance.spec.ts
 */
-const describeFn = process.env.DATABASE_URL ? describe : describe.skip;
+const shouldRunDbIntegrationTests =
+  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
+const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;

 describeFn("JobEventsService Performance", () => {
  let service: JobEventsService;
--- a/apps/api/src/knowledge/services/fulltext-search.spec.ts
+++ b/apps/api/src/knowledge/services/fulltext-search.spec.ts
@@ -27,7 +27,9 @@ async function isFulltextSearchConfigured(prisma: PrismaClient): Promise<boolean
 * Skip when DATABASE_URL is not set. Tests that require the trigger/index
 * will be skipped if the database migration hasn't been applied.
 */
-const describeFn = process.env.DATABASE_URL ? describe : describe.skip;
+const shouldRunDbIntegrationTests =
+  process.env.RUN_DB_TESTS === "true" && Boolean(process.env.DATABASE_URL);
+const describeFn = shouldRunDbIntegrationTests ? describe : describe.skip;

 describeFn("Full-Text Search Setup (Integration)", () => {
  let prisma: PrismaClient;
--- a/apps/api/src/mosaic-telemetry/mosaic-telemetry.module.spec.ts
+++ b/apps/api/src/mosaic-telemetry/mosaic-telemetry.module.spec.ts
@@ -3,6 +3,7 @@ import { Test, TestingModule } from "@nestjs/testing";
 import { ConfigModule } from "@nestjs/config";
 import { MosaicTelemetryModule } from "./mosaic-telemetry.module";
 import { MosaicTelemetryService } from "./mosaic-telemetry.service";
+import { PrismaService } from "../prisma/prisma.service";

 // Mock the telemetry client to avoid real HTTP calls
 vi.mock("@mosaicstack/telemetry-client", async (importOriginal) => {
@@ -56,6 +57,30 @@ vi.mock("@mosaicstack/telemetry-client", async (importOriginal) => {

 describe("MosaicTelemetryModule", () => {
  let module: TestingModule;
+  const sharedTestEnv = {
+    ENCRYPTION_KEY: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+  };
+  const mockPrismaService = {
+    onModuleInit: vi.fn(),
+    onModuleDestroy: vi.fn(),
+    $connect: vi.fn(),
+    $disconnect: vi.fn(),
+  };
+
+  const buildTestModule = async (env: Record<string, string>): Promise<TestingModule> =>
+    Test.createTestingModule({
+      imports: [
+        ConfigModule.forRoot({
+          isGlobal: true,
+          envFilePath: [],
+          load: [() => ({ ...env, ...sharedTestEnv })],
+        }),
+        MosaicTelemetryModule,
+      ],
+    })
+      .overrideProvider(PrismaService)
+      .useValue(mockPrismaService)
+      .compile();

  beforeEach(() => {
    vi.clearAllMocks();
@@ -63,40 +88,18 @@ describe("MosaicTelemetryModule", () => {

  describe("module initialization", () => {
    it("should compile the module successfully", async () => {
-      module = await Test.createTestingModule({
-        imports: [
-          ConfigModule.forRoot({
-            isGlobal: true,
-            envFilePath: [],
-            load: [
-              () => ({
-                MOSAIC_TELEMETRY_ENABLED: "false",
-              }),
-            ],
-          }),
-          MosaicTelemetryModule,
-        ],
-      }).compile();
+      module = await buildTestModule({
+        MOSAIC_TELEMETRY_ENABLED: "false",
+      });

      expect(module).toBeDefined();
      await module.close();
    });

    it("should provide MosaicTelemetryService", async () => {
-      module = await Test.createTestingModule({
-        imports: [
-          ConfigModule.forRoot({
-            isGlobal: true,
-            envFilePath: [],
-            load: [
-              () => ({
-                MOSAIC_TELEMETRY_ENABLED: "false",
-              }),
-            ],
-          }),
-          MosaicTelemetryModule,
-        ],
-      }).compile();
+      module = await buildTestModule({
+        MOSAIC_TELEMETRY_ENABLED: "false",
+      });

      const service = module.get<MosaicTelemetryService>(MosaicTelemetryService);
      expect(service).toBeDefined();
@@ -106,20 +109,9 @@ describe("MosaicTelemetryModule", () => {
    });

    it("should export MosaicTelemetryService for injection in other modules", async () => {
-      module = await Test.createTestingModule({
-        imports: [
-          ConfigModule.forRoot({
-            isGlobal: true,
-            envFilePath: [],
-            load: [
-              () => ({
-                MOSAIC_TELEMETRY_ENABLED: "false",
-              }),
-            ],
-          }),
-          MosaicTelemetryModule,
-        ],
-      }).compile();
+      module = await buildTestModule({
+        MOSAIC_TELEMETRY_ENABLED: "false",
+      });

      const service = module.get(MosaicTelemetryService);
      expect(service).toBeDefined();
@@ -130,24 +122,13 @@ describe("MosaicTelemetryModule", () => {

  describe("lifecycle integration", () => {
    it("should initialize service on module init when enabled", async () => {
-      module = await Test.createTestingModule({
-        imports: [
-          ConfigModule.forRoot({
-            isGlobal: true,
-            envFilePath: [],
-            load: [
-              () => ({
-                MOSAIC_TELEMETRY_ENABLED: "true",
-                MOSAIC_TELEMETRY_SERVER_URL: "https://tel.test.local",
-                MOSAIC_TELEMETRY_API_KEY: "a".repeat(64),
-                MOSAIC_TELEMETRY_INSTANCE_ID: "550e8400-e29b-41d4-a716-446655440000",
-                MOSAIC_TELEMETRY_DRY_RUN: "false",
-              }),
-            ],
-          }),
-          MosaicTelemetryModule,
-        ],
-      }).compile();
+      module = await buildTestModule({
+        MOSAIC_TELEMETRY_ENABLED: "true",
+        MOSAIC_TELEMETRY_SERVER_URL: "https://tel.test.local",
+        MOSAIC_TELEMETRY_API_KEY: "a".repeat(64),
+        MOSAIC_TELEMETRY_INSTANCE_ID: "550e8400-e29b-41d4-a716-446655440000",
+        MOSAIC_TELEMETRY_DRY_RUN: "false",
+      });

      await module.init();

@@ -158,20 +139,9 @@ describe("MosaicTelemetryModule", () => {
    });

    it("should not start client when disabled via env", async () => {
-      module = await Test.createTestingModule({
-        imports: [
-          ConfigModule.forRoot({
-            isGlobal: true,
-            envFilePath: [],
-            load: [
-              () => ({
-                MOSAIC_TELEMETRY_ENABLED: "false",
-              }),
-            ],
-          }),
-          MosaicTelemetryModule,
-        ],
-      }).compile();
+      module = await buildTestModule({
+        MOSAIC_TELEMETRY_ENABLED: "false",
+      });

      await module.init();

@@ -182,24 +152,13 @@ describe("MosaicTelemetryModule", () => {
    });

    it("should cleanly shut down on module destroy", async () => {
-      module = await Test.createTestingModule({
-        imports: [
-          ConfigModule.forRoot({
-            isGlobal: true,
-            envFilePath: [],
-            load: [
-              () => ({
-                MOSAIC_TELEMETRY_ENABLED: "true",
-                MOSAIC_TELEMETRY_SERVER_URL: "https://tel.test.local",
-                MOSAIC_TELEMETRY_API_KEY: "a".repeat(64),
-                MOSAIC_TELEMETRY_INSTANCE_ID: "550e8400-e29b-41d4-a716-446655440000",
-                MOSAIC_TELEMETRY_DRY_RUN: "false",
-              }),
-            ],
-          }),
-          MosaicTelemetryModule,
-        ],
-      }).compile();
+      module = await buildTestModule({
+        MOSAIC_TELEMETRY_ENABLED: "true",
+        MOSAIC_TELEMETRY_SERVER_URL: "https://tel.test.local",
+        MOSAIC_TELEMETRY_API_KEY: "a".repeat(64),
+        MOSAIC_TELEMETRY_INSTANCE_ID: "550e8400-e29b-41d4-a716-446655440000",
+        MOSAIC_TELEMETRY_DRY_RUN: "false",
+      });

      await module.init();

--- a/apps/api/src/prisma/prisma.service.spec.ts
+++ b/apps/api/src/prisma/prisma.service.spec.ts
@@ -156,7 +156,7 @@ describe("PrismaService", () => {
    it("should set workspace context variables in transaction", async () => {
      const userId = "user-123";
      const workspaceId = "workspace-456";
-      const executeRawSpy = vi.spyOn(service, "$executeRaw").mockResolvedValue(0);
+      vi.spyOn(service, "$executeRaw").mockResolvedValue(0);

      // Mock $transaction to execute the callback with a mock tx client
      const mockTx = {
@@ -195,7 +195,6 @@ describe("PrismaService", () => {
      };

      // Mock both methods at the same time to avoid spy issues
-      const originalSetContext = service.setWorkspaceContext.bind(service);
      const setContextCalls: [string, string, unknown][] = [];
      service.setWorkspaceContext = vi.fn().mockImplementation((uid, wid, tx) => {
        setContextCalls.push([uid, wid, tx]);
--- a/apps/api/src/prisma/prisma.service.ts
+++ b/apps/api/src/prisma/prisma.service.ts
@@ -3,6 +3,7 @@ import { PrismaClient } from "@prisma/client";
 import { VaultService } from "../vault/vault.service";
 import { createAccountEncryptionExtension } from "./account-encryption.extension";
 import { createLlmEncryptionExtension } from "./llm-encryption.extension";
+import { getRlsClient } from "./rls-context.provider";

 /**
 * Prisma service that manages database connection lifecycle
@@ -177,6 +178,13 @@ export class PrismaService extends PrismaClient implements OnModuleInit, OnModul
    workspaceId: string,
    fn: (tx: PrismaClient) => Promise<T>
  ): Promise<T> {
+    const rlsClient = getRlsClient();
+
+    if (rlsClient) {
+      await this.setWorkspaceContext(userId, workspaceId, rlsClient as unknown as PrismaClient);
+      return fn(rlsClient as unknown as PrismaClient);
+    }
+
    return this.$transaction(async (tx) => {
      await this.setWorkspaceContext(userId, workspaceId, tx as PrismaClient);
      return fn(tx as PrismaClient);
--- a/apps/api/src/tasks/tasks.controller.spec.ts
+++ b/apps/api/src/tasks/tasks.controller.spec.ts
@@ -25,6 +25,8 @@ describe("TasksController", () => {
      const request = context.switchToHttp().getRequest();
      request.user = {
        id: "550e8400-e29b-41d4-a716-446655440002",
+        email: "test@example.com",
+        name: "Test User",
        workspaceId: "550e8400-e29b-41d4-a716-446655440001",
      };
      return true;
@@ -46,6 +48,8 @@ describe("TasksController", () => {
  const mockRequest = {
    user: {
      id: mockUserId,
+      email: "test@example.com",
+      name: "Test User",
      workspaceId: mockWorkspaceId,
    },
  };
@@ -132,13 +136,16 @@ describe("TasksController", () => {

      mockTasksService.findAll.mockResolvedValue(paginatedResult);

-      const result = await controller.findAll(query, mockWorkspaceId);
+      const result = await controller.findAll(query, mockWorkspaceId, mockRequest.user);

      expect(result).toEqual(paginatedResult);
-      expect(service.findAll).toHaveBeenCalledWith({
-        ...query,
-        workspaceId: mockWorkspaceId,
-      });
+      expect(service.findAll).toHaveBeenCalledWith(
+        {
+          ...query,
+          workspaceId: mockWorkspaceId,
+        },
+        mockUserId
+      );
    });

    it("should extract workspaceId from request.user if not in query", async () => {
@@ -149,12 +156,13 @@ describe("TasksController", () => {
        meta: { total: 0, page: 1, limit: 50, totalPages: 0 },
      });

-      await controller.findAll(query as any, mockWorkspaceId);
+      await controller.findAll(query as any, mockWorkspaceId, mockRequest.user);

      expect(service.findAll).toHaveBeenCalledWith(
        expect.objectContaining({
          workspaceId: mockWorkspaceId,
-        })
+        }),
+        mockUserId
      );
    });
  });
@@ -163,10 +171,10 @@ describe("TasksController", () => {
    it("should return a task by id", async () => {
      mockTasksService.findOne.mockResolvedValue(mockTask);

-      const result = await controller.findOne(mockTaskId, mockWorkspaceId);
+      const result = await controller.findOne(mockTaskId, mockWorkspaceId, mockRequest.user);

      expect(result).toEqual(mockTask);
-      expect(service.findOne).toHaveBeenCalledWith(mockTaskId, mockWorkspaceId);
+      expect(service.findOne).toHaveBeenCalledWith(mockTaskId, mockWorkspaceId, mockUserId);
    });

    it("should throw error if workspaceId not found", async () => {
@@ -175,10 +183,10 @@ describe("TasksController", () => {
      // We can test that the controller properly uses the provided workspaceId instead
      mockTasksService.findOne.mockResolvedValue(mockTask);

-      const result = await controller.findOne(mockTaskId, mockWorkspaceId);
+      const result = await controller.findOne(mockTaskId, mockWorkspaceId, mockRequest.user);

      expect(result).toEqual(mockTask);
-      expect(service.findOne).toHaveBeenCalledWith(mockTaskId, mockWorkspaceId);
+      expect(service.findOne).toHaveBeenCalledWith(mockTaskId, mockWorkspaceId, mockUserId);
    });
  });

--- a/apps/api/src/tasks/tasks.controller.ts
+++ b/apps/api/src/tasks/tasks.controller.ts
@@ -53,8 +53,12 @@ export class TasksController {
   */
  @Get()
  @RequirePermission(Permission.WORKSPACE_ANY)
-  async findAll(@Query() query: QueryTasksDto, @Workspace() workspaceId: string) {
-    return this.tasksService.findAll(Object.assign({}, query, { workspaceId }));
+  async findAll(
+    @Query() query: QueryTasksDto,
+    @Workspace() workspaceId: string,
+    @CurrentUser() user: AuthenticatedUser
+  ) {
+    return this.tasksService.findAll(Object.assign({}, query, { workspaceId }), user.id);
  }

  /**
@@ -64,8 +68,12 @@ export class TasksController {
   */
  @Get(":id")
  @RequirePermission(Permission.WORKSPACE_ANY)
-  async findOne(@Param("id") id: string, @Workspace() workspaceId: string) {
-    return this.tasksService.findOne(id, workspaceId);
+  async findOne(
+    @Param("id") id: string,
+    @Workspace() workspaceId: string,
+    @CurrentUser() user: AuthenticatedUser
+  ) {
+    return this.tasksService.findOne(id, workspaceId, user.id);
  }

  /**
--- a/apps/api/src/tasks/tasks.service.spec.ts
+++ b/apps/api/src/tasks/tasks.service.spec.ts
@@ -21,6 +21,7 @@ describe("TasksService", () => {
      update: vi.fn(),
      delete: vi.fn(),
    },
+    withWorkspaceContext: vi.fn(),
  };

  const mockActivityService = {
@@ -75,6 +76,9 @@ describe("TasksService", () => {

    // Clear all mocks before each test
    vi.clearAllMocks();
+    mockPrismaService.withWorkspaceContext.mockImplementation(async (_userId, _workspaceId, fn) => {
+      return fn(mockPrismaService as unknown as PrismaService);
+    });
  });

  it("should be defined", () => {
@@ -95,6 +99,11 @@ describe("TasksService", () => {
      const result = await service.create(mockWorkspaceId, mockUserId, createDto);

      expect(result).toEqual(mockTask);
+      expect(prisma.withWorkspaceContext).toHaveBeenCalledWith(
+        mockUserId,
+        mockWorkspaceId,
+        expect.any(Function)
+      );
      expect(prisma.task.create).toHaveBeenCalledWith({
        data: {
          title: createDto.title,
@@ -177,6 +186,29 @@ describe("TasksService", () => {
      });
    });

+    it("should use workspace context when userId is provided", async () => {
+      mockPrismaService.task.findMany.mockResolvedValue([mockTask]);
+      mockPrismaService.task.count.mockResolvedValue(1);
+
+      await service.findAll({ workspaceId: mockWorkspaceId }, mockUserId);
+
+      expect(prisma.withWorkspaceContext).toHaveBeenCalledWith(
+        mockUserId,
+        mockWorkspaceId,
+        expect.any(Function)
+      );
+    });
+
+    it("should fallback to direct Prisma access when userId is missing", async () => {
+      mockPrismaService.task.findMany.mockResolvedValue([mockTask]);
+      mockPrismaService.task.count.mockResolvedValue(1);
+
+      await service.findAll({ workspaceId: mockWorkspaceId });
+
+      expect(prisma.withWorkspaceContext).not.toHaveBeenCalled();
+      expect(prisma.task.findMany).toHaveBeenCalled();
+    });
+
    it("should filter by status", async () => {
      mockPrismaService.task.findMany.mockResolvedValue([mockTask]);
      mockPrismaService.task.count.mockResolvedValue(1);
--- a/apps/api/src/tasks/tasks.service.ts
+++ b/apps/api/src/tasks/tasks.service.ts
@@ -1,8 +1,7 @@
 import { Injectable, NotFoundException } from "@nestjs/common";
-import { Prisma, Task } from "@prisma/client";
+import { Prisma, Task, TaskStatus, TaskPriority, type PrismaClient } from "@prisma/client";
 import { PrismaService } from "../prisma/prisma.service";
 import { ActivityService } from "../activity/activity.service";
-import { TaskStatus, TaskPriority } from "@prisma/client";
 import type { CreateTaskDto, UpdateTaskDto, QueryTasksDto } from "./dto";

 type TaskWithRelations = Task & {
@@ -24,6 +23,18 @@ export class TasksService {
    private readonly activityService: ActivityService
  ) {}

+  private async withWorkspaceContextIfAvailable<T>(
+    workspaceId: string | undefined,
+    userId: string | undefined,
+    fn: (client: PrismaClient) => Promise<T>
+  ): Promise<T> {
+    if (workspaceId && userId && typeof this.prisma.withWorkspaceContext === "function") {
+      return this.prisma.withWorkspaceContext(userId, workspaceId, fn);
+    }
+
+    return fn(this.prisma);
+  }
+
  /**
   * Create a new task
   */
@@ -66,19 +77,21 @@ export class TasksService {
      data.completedAt = new Date();
    }

-    const task = await this.prisma.task.create({
-      data,
-      include: {
-        assignee: {
-          select: { id: true, name: true, email: true },
+    const task = await this.withWorkspaceContextIfAvailable(workspaceId, userId, async (client) => {
+      return client.task.create({
+        data,
+        include: {
+          assignee: {
+            select: { id: true, name: true, email: true },
+          },
+          creator: {
+            select: { id: true, name: true, email: true },
+          },
+          project: {
+            select: { id: true, name: true, color: true },
+          },
        },
-        creator: {
-          select: { id: true, name: true, email: true },
-        },
-        project: {
-          select: { id: true, name: true, color: true },
-        },
-      },
+      });
    });

    // Log activity
@@ -92,7 +105,10 @@ export class TasksService {
  /**
   * Get paginated tasks with filters
   */
-  async findAll(query: QueryTasksDto): Promise<{
+  async findAll(
+    query: QueryTasksDto,
+    userId?: string
+  ): Promise<{
    data: Omit<TaskWithRelations, "subtasks">[];
    meta: {
      total: number;
@@ -143,28 +159,34 @@ export class TasksService {
    }

    // Execute queries in parallel
-    const [data, total] = await Promise.all([
-      this.prisma.task.findMany({
-        where,
-        include: {
-          assignee: {
-            select: { id: true, name: true, email: true },
-          },
-          creator: {
-            select: { id: true, name: true, email: true },
-          },
-          project: {
-            select: { id: true, name: true, color: true },
-          },
-        },
-        orderBy: {
-          createdAt: "desc",
-        },
-        skip,
-        take: limit,
-      }),
-      this.prisma.task.count({ where }),
-    ]);
+    const [data, total] = await this.withWorkspaceContextIfAvailable(
+      query.workspaceId,
+      userId,
+      async (client) => {
+        return Promise.all([
+          client.task.findMany({
+            where,
+            include: {
+              assignee: {
+                select: { id: true, name: true, email: true },
+              },
+              creator: {
+                select: { id: true, name: true, email: true },
+              },
+              project: {
+                select: { id: true, name: true, color: true },
+              },
+            },
+            orderBy: {
+              createdAt: "desc",
+            },
+            skip,
+            take: limit,
+          }),
+          client.task.count({ where }),
+        ]);
+      }
+    );

    return {
      data,
@@ -180,30 +202,32 @@ export class TasksService {
  /**
   * Get a single task by ID
   */
-  async findOne(id: string, workspaceId: string): Promise<TaskWithRelations> {
-    const task = await this.prisma.task.findUnique({
-      where: {
-        id,
-        workspaceId,
-      },
-      include: {
-        assignee: {
-          select: { id: true, name: true, email: true },
+  async findOne(id: string, workspaceId: string, userId?: string): Promise<TaskWithRelations> {
+    const task = await this.withWorkspaceContextIfAvailable(workspaceId, userId, async (client) => {
+      return client.task.findUnique({
+        where: {
+          id,
+          workspaceId,
        },
-        creator: {
-          select: { id: true, name: true, email: true },
-        },
-        project: {
-          select: { id: true, name: true, color: true },
-        },
-        subtasks: {
-          include: {
-            assignee: {
-              select: { id: true, name: true, email: true },
+        include: {
+          assignee: {
+            select: { id: true, name: true, email: true },
+          },
+          creator: {
+            select: { id: true, name: true, email: true },
+          },
+          project: {
+            select: { id: true, name: true, color: true },
+          },
+          subtasks: {
+            include: {
+              assignee: {
+                select: { id: true, name: true, email: true },
+              },
            },
          },
        },
-      },
+      });
    });

    if (!task) {
@@ -222,82 +246,89 @@ export class TasksService {
    userId: string,
    updateTaskDto: UpdateTaskDto
  ): Promise<Omit<TaskWithRelations, "subtasks">> {
-    // Verify task exists
-    const existingTask = await this.prisma.task.findUnique({
-      where: { id, workspaceId },
-    });
+    const { task, existingTask } = await this.withWorkspaceContextIfAvailable(
+      workspaceId,
+      userId,
+      async (client) => {
+        const existingTask = await client.task.findUnique({
+          where: { id, workspaceId },
+        });

-    if (!existingTask) {
-      throw new NotFoundException(`Task with ID ${id} not found`);
-    }
+        if (!existingTask) {
+          throw new NotFoundException(`Task with ID ${id} not found`);
+        }

-    // Build update data - only include defined fields
-    const data: Prisma.TaskUpdateInput = {};
+        // Build update data - only include defined fields
+        const data: Prisma.TaskUpdateInput = {};

-    if (updateTaskDto.title !== undefined) {
-      data.title = updateTaskDto.title;
-    }
-    if (updateTaskDto.description !== undefined) {
-      data.description = updateTaskDto.description;
-    }
-    if (updateTaskDto.status !== undefined) {
-      data.status = updateTaskDto.status;
-    }
-    if (updateTaskDto.priority !== undefined) {
-      data.priority = updateTaskDto.priority;
-    }
-    if (updateTaskDto.dueDate !== undefined) {
-      data.dueDate = updateTaskDto.dueDate;
-    }
-    if (updateTaskDto.sortOrder !== undefined) {
-      data.sortOrder = updateTaskDto.sortOrder;
-    }
-    if (updateTaskDto.metadata !== undefined) {
-      data.metadata = updateTaskDto.metadata as unknown as Prisma.InputJsonValue;
-    }
-    if (updateTaskDto.assigneeId !== undefined && updateTaskDto.assigneeId !== null) {
-      data.assignee = { connect: { id: updateTaskDto.assigneeId } };
-    }
-    if (updateTaskDto.projectId !== undefined && updateTaskDto.projectId !== null) {
-      data.project = { connect: { id: updateTaskDto.projectId } };
-    }
-    if (updateTaskDto.parentId !== undefined && updateTaskDto.parentId !== null) {
-      data.parent = { connect: { id: updateTaskDto.parentId } };
-    }
+        if (updateTaskDto.title !== undefined) {
+          data.title = updateTaskDto.title;
+        }
+        if (updateTaskDto.description !== undefined) {
+          data.description = updateTaskDto.description;
+        }
+        if (updateTaskDto.status !== undefined) {
+          data.status = updateTaskDto.status;
+        }
+        if (updateTaskDto.priority !== undefined) {
+          data.priority = updateTaskDto.priority;
+        }
+        if (updateTaskDto.dueDate !== undefined) {
+          data.dueDate = updateTaskDto.dueDate;
+        }
+        if (updateTaskDto.sortOrder !== undefined) {
+          data.sortOrder = updateTaskDto.sortOrder;
+        }
+        if (updateTaskDto.metadata !== undefined) {
+          data.metadata = updateTaskDto.metadata as unknown as Prisma.InputJsonValue;
+        }
+        if (updateTaskDto.assigneeId !== undefined && updateTaskDto.assigneeId !== null) {
+          data.assignee = { connect: { id: updateTaskDto.assigneeId } };
+        }
+        if (updateTaskDto.projectId !== undefined && updateTaskDto.projectId !== null) {
+          data.project = { connect: { id: updateTaskDto.projectId } };
+        }
+        if (updateTaskDto.parentId !== undefined && updateTaskDto.parentId !== null) {
+          data.parent = { connect: { id: updateTaskDto.parentId } };
+        }

-    // Handle completedAt based on status changes
-    if (updateTaskDto.status) {
-      if (
-        updateTaskDto.status === TaskStatus.COMPLETED &&
-        existingTask.status !== TaskStatus.COMPLETED
-      ) {
-        data.completedAt = new Date();
-      } else if (
-        updateTaskDto.status !== TaskStatus.COMPLETED &&
-        existingTask.status === TaskStatus.COMPLETED
-      ) {
-        data.completedAt = null;
+        // Handle completedAt based on status changes
+        if (updateTaskDto.status) {
+          if (
+            updateTaskDto.status === TaskStatus.COMPLETED &&
+            existingTask.status !== TaskStatus.COMPLETED
+          ) {
+            data.completedAt = new Date();
+          } else if (
+            updateTaskDto.status !== TaskStatus.COMPLETED &&
+            existingTask.status === TaskStatus.COMPLETED
+          ) {
+            data.completedAt = null;
+          }
+        }
+
+        const task = await client.task.update({
+          where: {
+            id,
+            workspaceId,
+          },
+          data,
+          include: {
+            assignee: {
+              select: { id: true, name: true, email: true },
+            },
+            creator: {
+              select: { id: true, name: true, email: true },
+            },
+            project: {
+              select: { id: true, name: true, color: true },
+            },
+          },
+        });
+
+        return { task, existingTask };
      }
-    }
-
-    const task = await this.prisma.task.update({
-      where: {
-        id,
-        workspaceId,
-      },
-      data,
-      include: {
-        assignee: {
-          select: { id: true, name: true, email: true },
-        },
-        creator: {
-          select: { id: true, name: true, email: true },
-        },
-        project: {
-          select: { id: true, name: true, color: true },
-        },
-      },
-    });
+    );

    // Log activities
    await this.activityService.logTaskUpdated(workspaceId, userId, id, {
@@ -332,20 +363,23 @@ export class TasksService {
   * Delete a task
   */
  async remove(id: string, workspaceId: string, userId: string): Promise<void> {
-    // Verify task exists
-    const task = await this.prisma.task.findUnique({
-      where: { id, workspaceId },
-    });
+    const task = await this.withWorkspaceContextIfAvailable(workspaceId, userId, async (client) => {
+      const task = await client.task.findUnique({
+        where: { id, workspaceId },
+      });

-    if (!task) {
-      throw new NotFoundException(`Task with ID ${id} not found`);
-    }
+      if (!task) {
+        throw new NotFoundException(`Task with ID ${id} not found`);
+      }

-    await this.prisma.task.delete({
-      where: {
-        id,
-        workspaceId,
-      },
+      await client.task.delete({
+        where: {
+          id,
+          workspaceId,
+        },
+      });
+
+      return task;
    });

    // Log activity
--- a/apps/orchestrator/src/config/orchestrator.config.ts
+++ b/apps/orchestrator/src/config/orchestrator.config.ts
@@ -29,7 +29,7 @@ export const orchestratorConfig = registerAs("orchestrator", () => ({
    defaultImage: process.env.SANDBOX_DEFAULT_IMAGE ?? "node:20-alpine",
    defaultMemoryMB: parseInt(process.env.SANDBOX_DEFAULT_MEMORY_MB ?? "512", 10),
    defaultCpuLimit: parseFloat(process.env.SANDBOX_DEFAULT_CPU_LIMIT ?? "1.0"),
-    networkMode: process.env.SANDBOX_NETWORK_MODE ?? "bridge",
+    networkMode: process.env.SANDBOX_NETWORK_MODE ?? "none",
  },
  coordinator: {
    url: process.env.COORDINATOR_URL ?? "http://localhost:8000",
--- a/apps/web/src/app/api/orchestrator/agents/route.ts
+++ b/apps/web/src/app/api/orchestrator/agents/route.ts
@@ -0,0 +1,59 @@
+import { NextResponse } from "next/server";
+
+const DEFAULT_ORCHESTRATOR_URL = "http://localhost:3001";
+
+function getOrchestratorUrl(): string {
+  return (
+    process.env.ORCHESTRATOR_URL ??
+    process.env.NEXT_PUBLIC_ORCHESTRATOR_URL ??
+    process.env.NEXT_PUBLIC_API_URL ??
+    DEFAULT_ORCHESTRATOR_URL
+  );
+}
+
+/**
+ * Server-side proxy for orchestrator agent status.
+ * Keeps ORCHESTRATOR_API_KEY out of browser code.
+ */
+export async function GET(): Promise<NextResponse> {
+  const orchestratorApiKey = process.env.ORCHESTRATOR_API_KEY;
+  if (!orchestratorApiKey) {
+    return NextResponse.json(
+      { error: "ORCHESTRATOR_API_KEY is not configured on the web server." },
+      { status: 503 }
+    );
+  }
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => {
+    controller.abort();
+  }, 10_000);
+
+  try {
+    const response = await fetch(`${getOrchestratorUrl()}/agents`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-Key": orchestratorApiKey,
+      },
+      cache: "no-store",
+      signal: controller.signal,
+    });
+
+    const text = await response.text();
+    return new NextResponse(text, {
+      status: response.status,
+      headers: {
+        "Content-Type": response.headers.get("Content-Type") ?? "application/json",
+      },
+    });
+  } catch (error) {
+    const message =
+      error instanceof Error && error.name === "AbortError"
+        ? "Orchestrator request timed out."
+        : "Unable to reach orchestrator.";
+    return NextResponse.json({ error: message }, { status: 502 });
+  } finally {
+    clearTimeout(timeout);
+  }
+}
--- a/apps/web/src/components/knowledge/tests/LinkAutocomplete.test.tsx
+++ b/apps/web/src/components/knowledge/tests/LinkAutocomplete.test.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import React from "react";
 import { render, screen, waitFor, fireEvent, act } from "@testing-library/react";
@@ -352,10 +351,7 @@ describe("LinkAutocomplete", (): void => {
    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should perform debounced search when typing query", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should perform debounced search when typing query", async (): Promise<void> => {
    const mockResults = {
      data: [
        {
@@ -395,11 +391,6 @@ describe("LinkAutocomplete", (): void => {
    // Should not call API immediately
    expect(mockApiRequest).not.toHaveBeenCalled();

-    // Fast-forward 300ms and let promises resolve
-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
      expect(mockApiRequest).toHaveBeenCalledWith(
        "/api/knowledge/search?q=test&limit=10",
@@ -411,14 +402,9 @@ describe("LinkAutocomplete", (): void => {
    await waitFor(() => {
      expect(screen.getByText("Test Entry")).toBeInTheDocument();
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should navigate results with arrow keys", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should navigate results with arrow keys", async (): Promise<void> => {
    const mockResults = {
      data: [
        {
@@ -471,10 +457,6 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
      expect(screen.getByText("Entry One")).toBeInTheDocument();
    });
@@ -500,14 +482,9 @@ describe("LinkAutocomplete", (): void => {
      const firstItem = screen.getByText("Entry One").closest("li");
      expect(firstItem).toHaveClass("bg-blue-50");
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should insert link on Enter key", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should insert link on Enter key", async (): Promise<void> => {
    const mockResults = {
      data: [
        {
@@ -544,10 +521,6 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
      expect(screen.getByText("Test Entry")).toBeInTheDocument();
    });
@@ -558,14 +531,9 @@ describe("LinkAutocomplete", (): void => {
    await waitFor(() => {
      expect(onInsertMock).toHaveBeenCalledWith("[[test-entry|Test Entry]]");
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should insert link on click", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should insert link on click", async (): Promise<void> => {
    const mockResults = {
      data: [
        {
@@ -602,10 +570,6 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
      expect(screen.getByText("Test Entry")).toBeInTheDocument();
    });
@@ -616,14 +580,9 @@ describe("LinkAutocomplete", (): void => {
    await waitFor(() => {
      expect(onInsertMock).toHaveBeenCalledWith("[[test-entry|Test Entry]]");
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should close dropdown on Escape key", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should close dropdown on Escape key", async (): Promise<void> => {
    render(<LinkAutocomplete textareaRef={textareaRef} onInsert={onInsertMock} />);

    const textarea = textareaRef.current;
@@ -636,28 +595,19 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
-      expect(screen.getByText(/Start typing to search/)).toBeInTheDocument();
+      expect(screen.getByText("↑↓ Navigate • Enter Select • Esc Cancel")).toBeInTheDocument();
    });

    // Press Escape
    fireEvent.keyDown(textarea, { key: "Escape" });

    await waitFor(() => {
-      expect(screen.queryByText(/Start typing to search/)).not.toBeInTheDocument();
+      expect(screen.queryByText("↑↓ Navigate • Enter Select • Esc Cancel")).not.toBeInTheDocument();
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should close dropdown when closing brackets are typed", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should close dropdown when closing brackets are typed", async (): Promise<void> => {
    render(<LinkAutocomplete textareaRef={textareaRef} onInsert={onInsertMock} />);

    const textarea = textareaRef.current;
@@ -670,12 +620,8 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
-      expect(screen.getByText(/Start typing to search/)).toBeInTheDocument();
+      expect(screen.getByText("↑↓ Navigate • Enter Select • Esc Cancel")).toBeInTheDocument();
    });

    // Type closing brackets
@@ -686,16 +632,11 @@ describe("LinkAutocomplete", (): void => {
    });

    await waitFor(() => {
-      expect(screen.queryByText(/Start typing to search/)).not.toBeInTheDocument();
+      expect(screen.queryByText("↑↓ Navigate • Enter Select • Esc Cancel")).not.toBeInTheDocument();
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should show 'No entries found' when search returns no results", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should show 'No entries found' when search returns no results", async (): Promise<void> => {
    mockApiRequest.mockResolvedValue({
      data: [],
      meta: { total: 0, page: 1, limit: 10, totalPages: 0 },
@@ -713,32 +654,24 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
      expect(screen.getByText("No entries found")).toBeInTheDocument();
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should show loading state while searching", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should show loading state while searching", async (): Promise<void> => {
    // Mock a slow API response
-    let resolveSearch: (value: unknown) => void;
-    const searchPromise = new Promise((resolve) => {
+    let resolveSearch: (value: {
+      data: unknown[];
+      meta: { total: number; page: number; limit: number; totalPages: number };
+    }) => void = () => undefined;
+    const searchPromise = new Promise<{
+      data: unknown[];
+      meta: { total: number; page: number; limit: number; totalPages: number };
+    }>((resolve) => {
      resolveSearch = resolve;
    });
-    mockApiRequest.mockReturnValue(
-      searchPromise as Promise<{
-        data: unknown[];
-        meta: { total: number; page: number; limit: number; totalPages: number };
-      }>
-    );
+    mockApiRequest.mockReturnValue(searchPromise);

    render(<LinkAutocomplete textareaRef={textareaRef} onInsert={onInsertMock} />);

@@ -752,16 +685,12 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
      expect(screen.getByText("Searching...")).toBeInTheDocument();
    });

    // Resolve the search
-    resolveSearch!({
+    resolveSearch({
      data: [],
      meta: { total: 0, page: 1, limit: 10, totalPages: 0 },
    });
@@ -769,14 +698,9 @@ describe("LinkAutocomplete", (): void => {
    await waitFor(() => {
      expect(screen.queryByText("Searching...")).not.toBeInTheDocument();
    });
-
-    vi.useRealTimers();
  });

-  // TODO: Fix async/timer interaction - component works but test has timing issues with fake timers
-  it.skip("should display summary preview for entries", async (): Promise<void> => {
-    vi.useFakeTimers();
-
+  it("should display summary preview for entries", async (): Promise<void> => {
    const mockResults = {
      data: [
        {
@@ -813,14 +737,8 @@ describe("LinkAutocomplete", (): void => {
      fireEvent.input(textarea);
    });

-    await act(async () => {
-      await vi.runAllTimersAsync();
-    });
-
    await waitFor(() => {
      expect(screen.getByText("This is a helpful summary")).toBeInTheDocument();
    });
-
-    vi.useRealTimers();
  });
 });
--- a/apps/web/src/components/widgets/AgentStatusWidget.tsx
+++ b/apps/web/src/components/widgets/AgentStatusWidget.tsx
@@ -5,7 +5,6 @@
 import { useState, useEffect } from "react";
 import { Bot, Activity, AlertCircle, CheckCircle, Clock } from "lucide-react";
 import type { WidgetProps } from "@mosaic/shared";
-import { ORCHESTRATOR_URL } from "@/lib/config";

 interface Agent {
  agentId: string;
@@ -29,7 +28,7 @@ export function AgentStatusWidget({ id: _id, config: _config }: WidgetProps): Re
      setError(null);

      try {
-        const response = await fetch(`${ORCHESTRATOR_URL}/agents`, {
+        const response = await fetch("/api/orchestrator/agents", {
          headers: {
            "Content-Type": "application/json",
          },
--- a/apps/web/src/components/widgets/TaskProgressWidget.tsx
+++ b/apps/web/src/components/widgets/TaskProgressWidget.tsx
@@ -8,7 +8,6 @@
 import { useState, useEffect } from "react";
 import { Activity, CheckCircle, XCircle, Clock, Loader2 } from "lucide-react";
 import type { WidgetProps } from "@mosaic/shared";
-import { ORCHESTRATOR_URL } from "@/lib/config";

 interface AgentTask {
  agentId: string;
@@ -100,7 +99,7 @@ export function TaskProgressWidget({ id: _id, config: _config }: WidgetProps): R

  useEffect(() => {
    const fetchTasks = (): void => {
-      fetch(`${ORCHESTRATOR_URL}/agents`)
+      fetch("/api/orchestrator/agents")
        .then((res) => {
          if (!res.ok) throw new Error(`HTTP ${String(res.status)}`);
          return res.json() as Promise<AgentTask[]>;
--- a/apps/web/src/components/widgets/tests/CalendarWidget.test.tsx
+++ b/apps/web/src/components/widgets/tests/CalendarWidget.test.tsx
@@ -1,126 +1,55 @@
-/**
- * CalendarWidget Component Tests
- * Following TDD principles
- */
-
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen, waitFor } from "@testing-library/react";
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { act, render, screen } from "@testing-library/react";
 import { CalendarWidget } from "../CalendarWidget";

-global.fetch = vi.fn() as typeof global.fetch;
+async function finishWidgetLoad(): Promise<void> {
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(500);
+  });
+}

 describe("CalendarWidget", (): void => {
  beforeEach((): void => {
-    vi.clearAllMocks();
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-02-01T08:00:00Z"));
  });

-  it("should render loading state initially", (): void => {
-    vi.mocked(global.fetch).mockImplementation(
-      () =>
-        new Promise(() => {
-          // Intentionally never resolves to keep loading state
-        })
-    );
-
-    render(<CalendarWidget id="calendar-1" />);
-
-    expect(screen.getByText(/loading/i)).toBeInTheDocument();
+  afterEach((): void => {
+    vi.useRealTimers();
  });

-  // TODO: Re-enable when CalendarWidget uses fetch API instead of setTimeout mock data
-  it.skip("should render upcoming events", async (): Promise<void> => {
-    const mockEvents = [
-      {
-        id: "1",
-        title: "Team Meeting",
-        startTime: new Date(Date.now() + 3600000).toISOString(),
-        endTime: new Date(Date.now() + 7200000).toISOString(),
-      },
-      {
-        id: "2",
-        title: "Project Review",
-        startTime: new Date(Date.now() + 86400000).toISOString(),
-        endTime: new Date(Date.now() + 90000000).toISOString(),
-      },
-    ];
-
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve(mockEvents),
-    } as unknown as Response);
-
+  it("renders loading state initially", (): void => {
    render(<CalendarWidget id="calendar-1" />);

-    await waitFor(() => {
-      expect(screen.getByText("Team Meeting")).toBeInTheDocument();
-      expect(screen.getByText("Project Review")).toBeInTheDocument();
-    });
+    expect(screen.getByText("Loading events...")).toBeInTheDocument();
  });

-  // TODO: Re-enable when CalendarWidget uses fetch API instead of setTimeout mock data
-  it.skip("should handle empty event list", async (): Promise<void> => {
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve([]),
-    } as unknown as Response);
-
+  it("renders upcoming events after loading", async (): Promise<void> => {
    render(<CalendarWidget id="calendar-1" />);

-    await waitFor(() => {
-      expect(screen.getByText(/no upcoming events/i)).toBeInTheDocument();
-    });
+    await finishWidgetLoad();
+
+    expect(screen.getByText("Upcoming Events")).toBeInTheDocument();
+    expect(screen.getByText("Team Standup")).toBeInTheDocument();
+    expect(screen.getByText("Project Review")).toBeInTheDocument();
+    expect(screen.getByText("Sprint Planning")).toBeInTheDocument();
  });

-  // TODO: Re-enable when CalendarWidget uses fetch API instead of setTimeout mock data
-  it.skip("should handle API errors gracefully", async (): Promise<void> => {
-    vi.mocked(global.fetch).mockRejectedValueOnce(new Error("API Error"));
-
+  it("shows relative day labels", async (): Promise<void> => {
    render(<CalendarWidget id="calendar-1" />);

-    await waitFor(() => {
-      expect(screen.getByText(/error/i)).toBeInTheDocument();
-    });
+    await finishWidgetLoad();
+
+    expect(screen.getAllByText("Today").length).toBeGreaterThan(0);
+    expect(screen.getByText("Tomorrow")).toBeInTheDocument();
  });

-  // TODO: Re-enable when CalendarWidget uses fetch API instead of setTimeout mock data
-  it.skip("should format event times correctly", async (): Promise<void> => {
-    const now = new Date();
-    const startTime = new Date(now.getTime() + 3600000); // 1 hour from now
-
-    const mockEvents = [
-      {
-        id: "1",
-        title: "Meeting",
-        startTime: startTime.toISOString(),
-        endTime: new Date(startTime.getTime() + 3600000).toISOString(),
-      },
-    ];
-
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve(mockEvents),
-    } as unknown as Response);
-
+  it("shows event locations when present", async (): Promise<void> => {
    render(<CalendarWidget id="calendar-1" />);

-    await waitFor(() => {
-      expect(screen.getByText("Meeting")).toBeInTheDocument();
-      // Should show time in readable format
-    });
-  });
+    await finishWidgetLoad();

-  // TODO: Re-enable when CalendarWidget uses fetch API and adds calendar-header test id
-  it.skip("should display current date", async (): Promise<void> => {
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve([]),
-    } as unknown as Response);
-
-    render(<CalendarWidget id="calendar-1" />);
-
-    await waitFor(() => {
-      // Widget should display current date or month
-      expect(screen.getByTestId("calendar-header")).toBeInTheDocument();
-    });
+    expect(screen.getByText("Zoom")).toBeInTheDocument();
+    expect(screen.getByText("Conference Room A")).toBeInTheDocument();
  });
 });
--- a/apps/web/src/components/widgets/tests/TasksWidget.test.tsx
+++ b/apps/web/src/components/widgets/tests/TasksWidget.test.tsx
@@ -1,138 +1,54 @@
-/**
- * TasksWidget Component Tests
- * Following TDD principles
- */
-
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen, waitFor } from "@testing-library/react";
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { act, render, screen } from "@testing-library/react";
 import { TasksWidget } from "../TasksWidget";

-// Mock fetch for API calls
-global.fetch = vi.fn() as typeof global.fetch;
+async function finishWidgetLoad(): Promise<void> {
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(500);
+  });
+}

 describe("TasksWidget", (): void => {
  beforeEach((): void => {
-    vi.clearAllMocks();
+    vi.useFakeTimers();
  });

-  it("should render loading state initially", (): void => {
-    vi.mocked(global.fetch).mockImplementation(
-      () =>
-        new Promise(() => {
-          // Intentionally empty - creates a never-resolving promise for loading state
-        })
-    );
-
-    render(<TasksWidget id="tasks-1" />);
-
-    expect(screen.getByText(/loading/i)).toBeInTheDocument();
+  afterEach((): void => {
+    vi.useRealTimers();
  });

-  // TODO: Re-enable when TasksWidget uses fetch API instead of setTimeout mock data
-  it.skip("should render task statistics", async (): Promise<void> => {
-    const mockTasks = [
-      { id: "1", title: "Task 1", status: "IN_PROGRESS", priority: "HIGH" },
-      { id: "2", title: "Task 2", status: "COMPLETED", priority: "MEDIUM" },
-      { id: "3", title: "Task 3", status: "NOT_STARTED", priority: "LOW" },
-    ];
-
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve(mockTasks),
-    } as unknown as Response);
-
+  it("renders loading state initially", (): void => {
    render(<TasksWidget id="tasks-1" />);

-    await waitFor(() => {
-      expect(screen.getByText("3")).toBeInTheDocument(); // Total
-      expect(screen.getByText("1")).toBeInTheDocument(); // In Progress
-      expect(screen.getByText("1")).toBeInTheDocument(); // Completed
-    });
+    expect(screen.getByText("Loading tasks...")).toBeInTheDocument();
  });

-  // TODO: Re-enable when TasksWidget uses fetch API instead of setTimeout mock data
-  it.skip("should render task list", async (): Promise<void> => {
-    const mockTasks = [
-      { id: "1", title: "Complete documentation", status: "IN_PROGRESS", priority: "HIGH" },
-      { id: "2", title: "Review PRs", status: "NOT_STARTED", priority: "MEDIUM" },
-    ];
-
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve(mockTasks),
-    } as unknown as Response);
-
+  it("renders default summary stats", async (): Promise<void> => {
    render(<TasksWidget id="tasks-1" />);

-    await waitFor(() => {
-      expect(screen.getByText("Complete documentation")).toBeInTheDocument();
-      expect(screen.getByText("Review PRs")).toBeInTheDocument();
-    });
+    await finishWidgetLoad();
+
+    expect(screen.getByText("Total")).toBeInTheDocument();
+    expect(screen.getByText("In Progress")).toBeInTheDocument();
+    expect(screen.getByText("Done")).toBeInTheDocument();
+    expect(screen.getByText("3")).toBeInTheDocument();
  });

-  // TODO: Re-enable when TasksWidget uses fetch API instead of setTimeout mock data
-  it.skip("should handle empty task list", async (): Promise<void> => {
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve([]),
-    } as unknown as Response);
-
+  it("renders default task rows", async (): Promise<void> => {
    render(<TasksWidget id="tasks-1" />);

-    await waitFor(() => {
-      expect(screen.getByText(/no tasks/i)).toBeInTheDocument();
-    });
+    await finishWidgetLoad();
+
+    expect(screen.getByText("Complete project documentation")).toBeInTheDocument();
+    expect(screen.getByText("Review pull requests")).toBeInTheDocument();
+    expect(screen.getByText("Update dependencies")).toBeInTheDocument();
  });

-  // TODO: Re-enable when TasksWidget uses fetch API instead of setTimeout mock data
-  it.skip("should handle API errors gracefully", async (): Promise<void> => {
-    vi.mocked(global.fetch).mockRejectedValueOnce(new Error("API Error"));
-
+  it("shows due date labels for each task", async (): Promise<void> => {
    render(<TasksWidget id="tasks-1" />);

-    await waitFor(() => {
-      expect(screen.getByText(/error/i)).toBeInTheDocument();
-    });
-  });
+    await finishWidgetLoad();

-  // TODO: Re-enable when TasksWidget uses fetch API instead of setTimeout mock data
-  it.skip("should display priority indicators", async (): Promise<void> => {
-    const mockTasks = [
-      { id: "1", title: "High priority task", status: "IN_PROGRESS", priority: "HIGH" },
-    ];
-
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve(mockTasks),
-    } as unknown as Response);
-
-    render(<TasksWidget id="tasks-1" />);
-
-    await waitFor(() => {
-      expect(screen.getByText("High priority task")).toBeInTheDocument();
-      // Priority icon should be rendered (high priority = red)
-    });
-  });
-
-  // TODO: Re-enable when TasksWidget uses fetch API instead of setTimeout mock data
-  it.skip("should limit displayed tasks to 5", async (): Promise<void> => {
-    const mockTasks = Array.from({ length: 10 }, (_, i) => ({
-      id: String(i + 1),
-      title: `Task ${String(i + 1)}`,
-      status: "NOT_STARTED",
-      priority: "MEDIUM",
-    }));
-
-    vi.mocked(global.fetch).mockResolvedValueOnce({
-      ok: true,
-      json: () => Promise.resolve(mockTasks),
-    } as unknown as Response);
-
-    render(<TasksWidget id="tasks-1" />);
-
-    await waitFor(() => {
-      const taskElements = screen.getAllByText(/Task \d+/);
-      expect(taskElements.length).toBeLessThanOrEqual(5);
-    });
+    expect(screen.getAllByText(/Due:/).length).toBe(3);
  });
 });
--- a/docs/tasks.md
+++ b/docs/tasks.md
@@ -314,3 +314,31 @@
 | 12 - QA: Test Coverage          | #411  | 4      | 35K            |
 | 13 - QA R2: Hardening + Tests   | #411  | 7      | 57K            |
 | **Total**                       |       | **64** | **605K**       |
+
+---
+
+## 2026-02-17 Full Code/Security/QA Review
+
+**Reviewer:** Jarvis (Codex runtime)
+**Scope:** Monorepo code review + security review + QA verification
+**Branch:** `fix/auth-frontend-remediation`
+
+### Verification Snapshot
+
+- `pnpm lint`: pass
+- `pnpm typecheck`: pass
+- `pnpm --filter @mosaic/api test -- src/mosaic-telemetry/mosaic-telemetry.module.spec.ts src/auth/auth-rls.integration.spec.ts src/credentials/user-credential.model.spec.ts src/job-events/job-events.performance.spec.ts src/knowledge/services/fulltext-search.spec.ts`: pass (DB-bound suites intentionally skipped unless `RUN_DB_TESTS=true`)
+- `pnpm audit --prod`: pass (0 vulnerabilities after overrides + lock refresh)
+
+### Remediation Tasks
+
+| id           | status | severity | category            | description                                                                                                                                                                                                                                                                                                                        | evidence                                                                                                                                                                                                                                    |
+| ------------ | ------ | -------- | ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| REV-2026-001 | done   | high     | security+functional | Web dashboard widgets call orchestrator `GET /agents` directly without `X-API-Key`, but orchestrator protects all `/agents` routes with `OrchestratorApiKeyGuard`. This creates a broken production path or pressures exposing a sensitive API key client-side. Add a server-side proxy/BFF route and remove direct browser calls. | `apps/web/src/app/api/orchestrator/agents/route.ts:1`, `apps/web/src/components/widgets/AgentStatusWidget.tsx:32`, `apps/web/src/components/widgets/TaskProgressWidget.tsx:103`                                                             |
+| REV-2026-002 | done   | high     | security            | RLS context helpers are now applied in `TasksService` service boundaries (`create`, `findAll`, `findOne`, `update`, `remove`) with safe fallback behavior for test doubles; controller now passes user context for list/detail paths, and regression tests assert context usage.                                                   | `apps/api/src/tasks/tasks.service.ts:27`, `apps/api/src/tasks/tasks.controller.ts:54`, `apps/api/src/tasks/tasks.service.spec.ts:15`                                                                                                        |
+| REV-2026-003 | done   | medium   | security            | Docker sandbox defaults still use `bridge` networking; isolation hardening is incomplete by default. Move default to `none` and explicitly opt in to egress where required.                                                                                                                                                        | `apps/orchestrator/src/config/orchestrator.config.ts:32`, `apps/orchestrator/src/spawner/docker-sandbox.service.ts:115`, `apps/orchestrator/src/spawner/docker-sandbox.service.ts:265`                                                      |
+| REV-2026-004 | done   | high     | security            | Production dependency chain hardened via root overrides: replaced legacy `request` with `@cypress/request`, pinned `tough-cookie` and `qs` to patched ranges, and forced patched `ajv`; lockfile updated and production audit now reports zero vulnerabilities.                                                                    | `package.json:68`, `pnpm-lock.yaml:1`, `pnpm audit --prod --json` (0 vulnerabilities)                                                                                                                                                       |
+| REV-2026-005 | done   | high     | qa                  | API test suite is not hermetic for default `pnpm test`: database-backed tests run when `DATABASE_URL` exists but credentials are invalid, causing hard failures. Gate integration/perf suites behind explicit integration flag and connectivity preflight, or split commands in turbo pipeline.                                    | `apps/api/src/credentials/user-credential.model.spec.ts:18`, `apps/api/src/knowledge/services/fulltext-search.spec.ts:30`, `apps/api/src/job-events/job-events.performance.spec.ts:19`, `apps/api/src/auth/auth-rls.integration.spec.ts:10` |
+| REV-2026-006 | done   | medium   | qa+architecture     | `MosaicTelemetryModule` imports `AuthModule`, causing telemetry module tests to fail on unrelated `ENCRYPTION_KEY` auth config requirements. Decouple telemetry module dependencies or provide test-safe module overrides.                                                                                                         | `apps/api/src/mosaic-telemetry/mosaic-telemetry.module.ts:36`, `apps/api/src/mosaic-telemetry/mosaic-telemetry.module.spec.ts:1`                                                                                                            |
+| REV-2026-007 | done   | medium   | qa                  | Frontend skip cleanup completed for scoped findings: `TasksWidget`, `CalendarWidget`, and `LinkAutocomplete` coverage now runs with deterministic assertions and no stale `it.skip` markers in those suites.                                                                                                                       | `apps/web/src/components/widgets/__tests__/TasksWidget.test.tsx:1`, `apps/web/src/components/widgets/__tests__/CalendarWidget.test.tsx:1`, `apps/web/src/components/knowledge/__tests__/LinkAutocomplete.test.tsx:1`                        |
+| REV-2026-008 | done   | low      | tooling             | Repo session bootstrap reliability issue: `scripts/agent/session-start.sh` fails due stale branch tracking ref, which can silently block required lifecycle checks. Update script to tolerate missing remote branch or self-heal branch config.                                                                                    | `scripts/agent/session-start.sh:10`, `scripts/agent/session-start.sh:16`, `scripts/agent/session-start.sh:34`                                                                                                                               |
--- a/package.json
+++ b/package.json
@@ -66,7 +66,10 @@
      "form-data": ">=2.5.4",
      "lodash": ">=4.17.23",
      "lodash-es": ">=4.17.23",
-      "qs": ">=6.14.1",
+      "ajv": ">=8.18.0",
+      "request": "npm:@cypress/request@3.0.10",
+      "qs": ">=6.15.0",
+      "tough-cookie": ">=4.1.3",
      "undici": ">=6.23.0"
    }
  }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,7 +9,10 @@ overrides:
  form-data: '>=2.5.4'
  lodash: '>=4.17.23'
  lodash-es: '>=4.17.23'
-  qs: '>=6.14.1'
+  ajv: '>=8.18.0'
+  request: npm:@cypress/request@3.0.10
+  qs: '>=6.15.0'
+  tough-cookie: '>=4.1.3'
  undici: '>=6.23.0'

 importers:
@@ -891,6 +894,10 @@ packages:
    resolution: {integrity: sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==}
    engines: {node: '>=18'}

+  '@cypress/request@3.0.10':
+    resolution: {integrity: sha512-hauBrOdvu08vOsagkZ/Aju5XuiZx6ldsLfByg1htFeldhex+PeMrYauANzFsMJeAA0+dyPLbDoX2OYuvVoLDkQ==}
+    engines: {node: '>= 6'}
+
  '@discordjs/builders@1.13.1':
    resolution: {integrity: sha512-cOU0UDHc3lp/5nKByDxkmRiNZBpdp0kx55aarbiAfakfKJHlxv/yFW1zmIqCAmwH5CRlrH9iMFKJMpvW4DPB+w==}
    engines: {node: '>=16.11.0'}
@@ -3286,7 +3293,7 @@ packages:
  ajv-formats@2.1.1:
    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
    peerDependencies:
-      ajv: ^8.0.0
+      ajv: '>=8.18.0'
    peerDependenciesMeta:
      ajv:
        optional: true
@@ -3294,7 +3301,7 @@ packages:
  ajv-formats@3.0.1:
    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
    peerDependencies:
-      ajv: ^8.0.0
+      ajv: '>=8.18.0'
    peerDependenciesMeta:
      ajv:
        optional: true
@@ -3302,18 +3309,15 @@ packages:
  ajv-keywords@3.5.2:
    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
    peerDependencies:
-      ajv: ^6.9.1
+      ajv: '>=8.18.0'

  ajv-keywords@5.1.0:
    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
    peerDependencies:
-      ajv: ^8.8.2
+      ajv: '>=8.18.0'

-  ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
-
-  ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+  ajv@8.18.0:
+    resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}

  another-json@0.2.0:
    resolution: {integrity: sha512-/Ndrl68UQLhnCdsAzEXLMFuOR546o2qbYRqCglaNHbjXrwG1ayTcdwr3zkSGOGtGXDyR5X9nCFfnyG2AFJIsqg==}
@@ -4576,9 +4580,6 @@ packages:
  fast-fifo@1.3.2:
    resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}

-  fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
-
  fast-levenshtein@2.0.6:
    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}

@@ -4776,15 +4777,6 @@ packages:
  hachure-fill@0.5.2:
    resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==}

-  har-schema@2.0.0:
-    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
-    engines: {node: '>=4'}
-
-  har-validator@5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
-
  has-flag@4.0.0:
    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
    engines: {node: '>=8'}
@@ -4833,9 +4825,9 @@ packages:
    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
    engines: {node: '>= 14'}

-  http-signature@1.2.0:
-    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
+  http-signature@1.4.0:
+    resolution: {integrity: sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==}
+    engines: {node: '>=0.10'}

  https-proxy-agent@7.0.6:
    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
@@ -5071,9 +5063,6 @@ packages:
    resolution: {integrity: sha512-+DWg8jCJG2TEnpy7kOm/7/AxaYoaRbjVB4LFZLySZlWn8exGs3A4OLJR966cVvU26N7X9TWxl+Jsw7dzAqKT6g==}
    engines: {node: '>=16'}

-  json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-
  json-schema-traverse@1.0.0:
    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}

@@ -5097,9 +5086,9 @@ packages:
  jsonfile@6.2.0:
    resolution: {integrity: sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==}

-  jsprim@1.4.2:
-    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
-    engines: {node: '>=0.6.0'}
+  jsprim@2.0.2:
+    resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==}
+    engines: {'0': node >=0.6.0}

  katex@0.16.28:
    resolution: {integrity: sha512-YHzO7721WbmAL6Ov1uzN/l5mY5WWWhJBSW+jq4tkfZfsxmo1hu6frS0EOswvjBUnWE6NtjEs48SFn5CQESRLZg==}
@@ -5538,9 +5527,6 @@ packages:
    engines: {node: '>=18'}
    hasBin: true

-  oauth-sign@0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
-
  object-assign@4.1.1:
    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
    engines: {node: '>=0.10.0'}
@@ -5854,9 +5840,6 @@ packages:
  proxy-from-env@1.1.0:
    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}

-  psl@1.15.0:
-    resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}
-
  pump@3.0.3:
    resolution: {integrity: sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==}

@@ -5867,8 +5850,8 @@ packages:
  pure-rand@6.1.0:
    resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}

-  qs@6.14.1:
-    resolution: {integrity: sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==}
+  qs@6.15.0:
+    resolution: {integrity: sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==}
    engines: {node: '>=0.6'}

  randombytes@2.1.0:
@@ -6015,11 +5998,6 @@ packages:
    peerDependencies:
      request: ^2.34

-  request@2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
-
  require-directory@2.1.1:
    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
    engines: {node: '>=0.10.0'}
@@ -6505,10 +6483,6 @@ packages:
    resolution: {integrity: sha512-dRXchy+C0IgK8WPC6xvCHFRIWYUbqqdEIKPaKo/AcTUNzwLTK6AH7RjdLWsEZcAN/TBdtfUw3PYEgPr5VPr6ww==}
    engines: {node: '>=14.16'}

-  tough-cookie@2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
-
  tough-cookie@5.1.2:
    resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}
    engines: {node: '>=16'}
@@ -6677,9 +6651,6 @@ packages:
    peerDependencies:
      browserslist: '>= 4.21.0'

-  uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
-
  use-sync-external-store@1.6.0:
    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
    peerDependencies:
@@ -6700,9 +6671,8 @@ packages:
    resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}
    hasBin: true

-  uuid@3.4.0:
-    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
-    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
+  uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
    hasBin: true

  uuid@9.0.1:
@@ -7064,8 +7034,8 @@ snapshots:

  '@angular-devkit/core@19.2.17(chokidar@4.0.3)':
    dependencies:
-      ajv: 8.17.1
-      ajv-formats: 3.0.1(ajv@8.17.1)
+      ajv: 8.18.0
+      ajv-formats: 3.0.1(ajv@8.18.0)
      jsonc-parser: 3.3.1
      picomatch: 4.0.2
      rxjs: 7.8.1
@@ -7075,8 +7045,8 @@ snapshots:

  '@angular-devkit/core@19.2.19(chokidar@4.0.3)':
    dependencies:
-      ajv: 8.17.1
-      ajv-formats: 3.0.1(ajv@8.17.1)
+      ajv: 8.18.0
+      ajv-formats: 3.0.1(ajv@8.18.0)
      jsonc-parser: 3.3.1
      picomatch: 4.0.2
      rxjs: 7.8.1
@@ -7408,7 +7378,7 @@ snapshots:
      chalk: 5.6.2
      commander: 12.1.0
      dotenv: 17.2.4
-      drizzle-orm: 0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@5.22.0(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3)))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
+      drizzle-orm: 0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@6.19.2(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))(typescript@5.9.3))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
      open: 10.2.0
      pg: 8.17.2
      prettier: 3.8.1
@@ -7557,6 +7527,27 @@ snapshots:

  '@csstools/css-tokenizer@3.0.4': {}

+  '@cypress/request@3.0.10':
+    dependencies:
+      aws-sign2: 0.7.0
+      aws4: 1.13.2
+      caseless: 0.12.0
+      combined-stream: 1.0.8
+      extend: 3.0.2
+      forever-agent: 0.6.1
+      form-data: 4.0.5
+      http-signature: 1.4.0
+      is-typedarray: 1.0.0
+      isstream: 0.1.2
+      json-stringify-safe: 5.0.1
+      mime-types: 2.1.35
+      performance-now: 2.1.0
+      qs: 6.15.0
+      safe-buffer: 5.2.1
+      tough-cookie: 5.1.2
+      tunnel-agent: 0.6.0
+      uuid: 8.3.2
+
  '@discordjs/builders@1.13.1':
    dependencies:
      '@discordjs/formatters': 0.6.2
@@ -7739,7 +7730,7 @@ snapshots:

  '@eslint/eslintrc@3.3.3':
    dependencies:
-      ajv: 6.12.6
+      ajv: 8.18.0
      debug: 4.4.3
      espree: 10.4.0
      globals: 14.0.0
@@ -10243,31 +10234,24 @@ snapshots:

  agent-base@7.1.4: {}

-  ajv-formats@2.1.1(ajv@8.17.1):
+  ajv-formats@2.1.1(ajv@8.18.0):
    optionalDependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0

-  ajv-formats@3.0.1(ajv@8.17.1):
+  ajv-formats@3.0.1(ajv@8.18.0):
    optionalDependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0

-  ajv-keywords@3.5.2(ajv@6.12.6):
+  ajv-keywords@3.5.2(ajv@8.18.0):
    dependencies:
-      ajv: 6.12.6
+      ajv: 8.18.0

-  ajv-keywords@5.1.0(ajv@8.17.1):
+  ajv-keywords@5.1.0(ajv@8.18.0):
    dependencies:
-      ajv: 8.17.1
+      ajv: 8.18.0
      fast-deep-equal: 3.1.3

-  ajv@6.12.6:
-    dependencies:
-      fast-deep-equal: 3.1.3
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.4.1
-
-  ajv@8.17.1:
+  ajv@8.18.0:
    dependencies:
      fast-deep-equal: 3.1.3
      fast-uri: 3.1.0
@@ -10410,7 +10394,7 @@ snapshots:
    optionalDependencies:
      '@prisma/client': 5.22.0(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
      better-sqlite3: 12.6.2
-      drizzle-orm: 0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@5.22.0(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3)))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
+      drizzle-orm: 0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@6.19.2(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))(typescript@5.9.3))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
      next: 16.1.6(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
      pg: 8.17.2
      prisma: 6.19.2(magicast@0.3.5)(typescript@5.9.3)
@@ -10435,7 +10419,7 @@ snapshots:
    optionalDependencies:
      '@prisma/client': 6.19.2(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))(typescript@5.9.3)
      better-sqlite3: 12.6.2
-      drizzle-orm: 0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@5.22.0(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3)))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
+      drizzle-orm: 0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@6.19.2(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))(typescript@5.9.3))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
      next: 16.1.6(@babel/core@7.28.6)(@opentelemetry/api@1.9.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
      pg: 8.17.2
      prisma: 6.19.2(magicast@0.3.5)(typescript@5.9.3)
@@ -10506,7 +10490,7 @@ snapshots:
      http-errors: 2.0.1
      iconv-lite: 0.4.24
      on-finished: 2.4.1
-      qs: 6.14.1
+      qs: 6.15.0
      raw-body: 2.5.3
      type-is: 1.6.18
      unpipe: 1.0.0
@@ -10521,7 +10505,7 @@ snapshots:
      http-errors: 2.0.1
      iconv-lite: 0.7.2
      on-finished: 2.4.1
-      qs: 6.14.1
+      qs: 6.15.0
      raw-body: 3.0.2
      type-is: 2.0.1
    transitivePeerDependencies:
@@ -11229,17 +11213,6 @@ snapshots:

  dotenv@17.2.4: {}

-  drizzle-orm@0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@5.22.0(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3)))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3)):
-    optionalDependencies:
-      '@opentelemetry/api': 1.9.0
-      '@prisma/client': 5.22.0(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))
-      '@types/pg': 8.16.0
-      better-sqlite3: 12.6.2
-      kysely: 0.28.10
-      pg: 8.17.2
-      postgres: 3.4.8
-      prisma: 6.19.2(magicast@0.3.5)(typescript@5.9.3)
-
  drizzle-orm@0.41.0(@opentelemetry/api@1.9.0)(@prisma/client@6.19.2(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3))(typescript@5.9.3))(@types/pg@8.16.0)(better-sqlite3@12.6.2)(kysely@0.28.10)(pg@8.17.2)(postgres@3.4.8)(prisma@6.19.2(magicast@0.3.5)(typescript@5.9.3)):
    optionalDependencies:
      '@opentelemetry/api': 1.9.0
@@ -11250,7 +11223,6 @@ snapshots:
      pg: 8.17.2
      postgres: 3.4.8
      prisma: 6.19.2(magicast@0.3.5)(typescript@5.9.3)
-    optional: true

  dunder-proto@1.0.1:
    dependencies:
@@ -11437,7 +11409,7 @@ snapshots:
      '@humanwhocodes/module-importer': 1.0.1
      '@humanwhocodes/retry': 0.4.3
      '@types/estree': 1.0.8
-      ajv: 6.12.6
+      ajv: 8.18.0
      chalk: 4.1.2
      cross-spawn: 7.0.6
      debug: 4.4.3
@@ -11533,7 +11505,7 @@ snapshots:
      parseurl: 1.3.3
      path-to-regexp: 0.1.12
      proxy-addr: 2.0.7
-      qs: 6.14.1
+      qs: 6.15.0
      range-parser: 1.2.1
      safe-buffer: 5.2.1
      send: 0.19.2
@@ -11568,7 +11540,7 @@ snapshots:
      once: 1.4.0
      parseurl: 1.3.3
      proxy-addr: 2.0.7
-      qs: 6.14.1
+      qs: 6.15.0
      range-parser: 1.2.1
      router: 2.2.0
      send: 1.2.1
@@ -11601,8 +11573,6 @@ snapshots:

  fast-fifo@1.3.2: {}

-  fast-json-stable-stringify@2.1.0: {}
-
  fast-levenshtein@2.0.6: {}

  fast-safe-stringify@2.1.1: {}
@@ -11833,13 +11803,6 @@ snapshots:

  hachure-fill@0.5.2: {}

-  har-schema@2.0.0: {}
-
-  har-validator@5.1.5:
-    dependencies:
-      ajv: 6.12.6
-      har-schema: 2.0.0
-
  has-flag@4.0.0: {}

  has-symbols@1.1.0: {}
@@ -11897,10 +11860,10 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  http-signature@1.2.0:
+  http-signature@1.4.0:
    dependencies:
      assert-plus: 1.0.0
-      jsprim: 1.4.2
+      jsprim: 2.0.2
      sshpk: 1.18.0

  https-proxy-agent@7.0.6:
@@ -12124,8 +12087,6 @@ snapshots:
      '@babel/runtime': 7.28.6
      ts-algebra: 2.0.0

-  json-schema-traverse@0.4.1: {}
-
  json-schema-traverse@1.0.0: {}

  json-schema@0.4.0: {}
@@ -12144,7 +12105,7 @@ snapshots:
    optionalDependencies:
      graceful-fs: 4.2.11

-  jsprim@1.4.2:
+  jsprim@2.0.2:
    dependencies:
      assert-plus: 1.0.0
      extsprintf: 1.3.0
@@ -12344,8 +12305,8 @@ snapshots:
      mkdirp: 3.0.1
      morgan: 1.10.1
      postgres: 3.4.8
-      request: 2.88.2
-      request-promise: 4.2.6(request@2.88.2)
+      request: '@cypress/request@3.0.10'
+      request-promise: 4.2.6(@cypress/request@3.0.10)
      sanitize-html: 2.17.0
    transitivePeerDependencies:
      - supports-color
@@ -12578,8 +12539,6 @@ snapshots:
      pathe: 2.0.3
      tinyexec: 1.0.2

-  oauth-sign@0.9.0: {}
-
  object-assign@4.1.1: {}

  object-hash@3.0.0: {}
@@ -12888,10 +12847,6 @@ snapshots:

  proxy-from-env@1.1.0: {}

-  psl@1.15.0:
-    dependencies:
-      punycode: 2.3.1
-
  pump@3.0.3:
    dependencies:
      end-of-stream: 1.4.5
@@ -12901,7 +12856,7 @@ snapshots:

  pure-rand@6.1.0: {}

-  qs@6.14.1:
+  qs@6.15.0:
    dependencies:
      side-channel: 1.1.0

@@ -13059,41 +13014,18 @@ snapshots:

  regexp-tree@0.1.27: {}

-  request-promise-core@1.1.4(request@2.88.2):
+  request-promise-core@1.1.4(@cypress/request@3.0.10):
    dependencies:
      lodash: 4.17.23
-      request: 2.88.2
+      request: '@cypress/request@3.0.10'

-  request-promise@4.2.6(request@2.88.2):
+  request-promise@4.2.6(@cypress/request@3.0.10):
    dependencies:
      bluebird: 3.7.2
-      request: 2.88.2
-      request-promise-core: 1.1.4(request@2.88.2)
+      request: '@cypress/request@3.0.10'
+      request-promise-core: 1.1.4(@cypress/request@3.0.10)
      stealthy-require: 1.1.1
-      tough-cookie: 2.5.0
-
-  request@2.88.2:
-    dependencies:
-      aws-sign2: 0.7.0
-      aws4: 1.13.2
-      caseless: 0.12.0
-      combined-stream: 1.0.8
-      extend: 3.0.2
-      forever-agent: 0.6.1
-      form-data: 4.0.5
-      har-validator: 5.1.5
-      http-signature: 1.2.0
-      is-typedarray: 1.0.0
-      isstream: 0.1.2
-      json-stringify-safe: 5.0.1
-      mime-types: 2.1.35
-      oauth-sign: 0.9.0
-      performance-now: 2.1.0
-      qs: 6.14.1
-      safe-buffer: 5.2.1
-      tough-cookie: 2.5.0
-      tunnel-agent: 0.6.0
-      uuid: 3.4.0
+      tough-cookie: 5.1.2

  require-directory@2.1.1: {}

@@ -13227,15 +13159,15 @@ snapshots:
  schema-utils@3.3.0:
    dependencies:
      '@types/json-schema': 7.0.15
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2(ajv@6.12.6)
+      ajv: 8.18.0
+      ajv-keywords: 3.5.2(ajv@8.18.0)

  schema-utils@4.3.3:
    dependencies:
      '@types/json-schema': 7.0.15
-      ajv: 8.17.1
-      ajv-formats: 2.1.1(ajv@8.17.1)
-      ajv-keywords: 5.1.0(ajv@8.17.1)
+      ajv: 8.18.0
+      ajv-formats: 2.1.1(ajv@8.18.0)
+      ajv-keywords: 5.1.0(ajv@8.18.0)

  section-matter@1.0.0:
    dependencies:
@@ -13592,7 +13524,7 @@ snapshots:
      formidable: 3.5.4
      methods: 1.1.2
      mime: 2.6.0
-      qs: 6.14.1
+      qs: 6.15.0
    transitivePeerDependencies:
      - supports-color

@@ -13717,11 +13649,6 @@ snapshots:
      '@tokenizer/token': 0.3.0
      ieee754: 1.2.1

-  tough-cookie@2.5.0:
-    dependencies:
-      psl: 1.15.0
-      punycode: 2.3.1
-
  tough-cookie@5.1.2:
    dependencies:
      tldts: 6.1.86
@@ -13887,10 +13814,6 @@ snapshots:
      escalade: 3.2.0
      picocolors: 1.1.1

-  uri-js@4.4.1:
-    dependencies:
-      punycode: 2.3.1
-
  use-sync-external-store@1.6.0(react@19.2.4):
    dependencies:
      react: 19.2.4
@@ -13903,7 +13826,7 @@ snapshots:

  uuid@11.1.0: {}

-  uuid@3.4.0: {}
+  uuid@8.3.2: {}

  uuid@9.0.1: {}

--- a/scripts/agent/session-start.sh
+++ b/scripts/agent/session-start.sh
@@ -9,8 +9,35 @@ ensure_repo_root
 load_repo_hooks

 if git rev-parse --is-inside-work-tree >/dev/null 2>&1 && has_remote; then
+  current_branch="$(git rev-parse --abbrev-ref HEAD)"
+  upstream_ref="$(git rev-parse --abbrev-ref --symbolic-full-name "@{upstream}" 2>/dev/null || true)"
+
+  if [[ -n "$upstream_ref" ]] && ! git show-ref --verify --quiet "refs/remotes/$upstream_ref"; then
+    echo "[agent-framework] Upstream ref '$upstream_ref' is missing; attempting to self-heal branch tracking"
+
+    fallback_upstream=""
+    if git show-ref --verify --quiet "refs/remotes/origin/develop"; then
+      fallback_upstream="origin/develop"
+    elif git show-ref --verify --quiet "refs/remotes/origin/main"; then
+      fallback_upstream="origin/main"
+    fi
+
+    if [[ -n "$fallback_upstream" ]] && [[ "$current_branch" != "HEAD" ]]; then
+      git branch --set-upstream-to="$fallback_upstream" "$current_branch" >/dev/null
+      upstream_ref="$fallback_upstream"
+      echo "[agent-framework] Set upstream for '$current_branch' to '$fallback_upstream'"
+    else
+      echo "[agent-framework] No fallback upstream found; skipping pull"
+      upstream_ref=""
+    fi
+  fi
+
  if git diff --quiet && git diff --cached --quiet; then
-    run_step "Pull latest changes" git pull --rebase
+    if [[ -n "$upstream_ref" ]]; then
+      run_step "Pull latest changes" git pull --rebase
+    else
+      echo "[agent-framework] Skip pull: no valid upstream configured"
+    fi
  else
    echo "[agent-framework] Skip pull: working tree has local changes"
  fi