diff --git a/apps/web/src/app/api/memory/cron/__tests__/route.test.ts b/apps/web/src/app/api/memory/cron/__tests__/route.test.ts
index 67dfd7a4ed..f957e611c3 100644
--- a/apps/web/src/app/api/memory/cron/__tests__/route.test.ts
+++ b/apps/web/src/app/api/memory/cron/__tests__/route.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, vi, beforeEach } from 'vitest';
-import { assert } from '@/lib/memory/__tests__/riteway';
+import { assert } from '@/test/riteway';
 
 /**
  * Memory Cron Route Tests
diff --git a/apps/web/src/lib/ai/tools/__tests__/calendar-read-tools.test.ts b/apps/web/src/lib/ai/tools/__tests__/calendar-read-tools.test.ts
index 07600ec1ff..5b931c1be0 100644
--- a/apps/web/src/lib/ai/tools/__tests__/calendar-read-tools.test.ts
+++ b/apps/web/src/lib/ai/tools/__tests__/calendar-read-tools.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 // Mock database and dependencies
 vi.mock('@pagespace/db', () => ({
diff --git a/apps/web/src/lib/ai/tools/__tests__/calendar-write-tools.test.ts b/apps/web/src/lib/ai/tools/__tests__/calendar-write-tools.test.ts
index a13816e5a1..9a88c58aff 100644
--- a/apps/web/src/lib/ai/tools/__tests__/calendar-write-tools.test.ts
+++ b/apps/web/src/lib/ai/tools/__tests__/calendar-write-tools.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 // Mock database and dependencies
 vi.mock('@pagespace/db', () => ({
diff --git a/apps/web/src/lib/ai/tools/__tests__/page-read-tools.test.ts b/apps/web/src/lib/ai/tools/__tests__/page-read-tools.test.ts
index ebe1e7afde..048d0d5ae4 100644
--- a/apps/web/src/lib/ai/tools/__tests__/page-read-tools.test.ts
+++ b/apps/web/src/lib/ai/tools/__tests__/page-read-tools.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 // Mock database and dependencies
 vi.mock('@pagespace/db', () => ({
diff --git a/apps/web/src/lib/ai/tools/__tests__/search-tools.test.ts b/apps/web/src/lib/ai/tools/__tests__/search-tools.test.ts
index 21883a4b16..f2eb24c127 100644
--- a/apps/web/src/lib/ai/tools/__tests__/search-tools.test.ts
+++ b/apps/web/src/lib/ai/tools/__tests__/search-tools.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 // Mock only the boundary we actually test
 vi.mock('@pagespace/lib/server', () => ({
diff --git a/apps/web/src/lib/editor/code-block/__tests__/code-block-shiki.test.ts b/apps/web/src/lib/editor/code-block/__tests__/code-block-shiki.test.ts
index bc3fd0bf89..0009b78c28 100644
--- a/apps/web/src/lib/editor/code-block/__tests__/code-block-shiki.test.ts
+++ b/apps/web/src/lib/editor/code-block/__tests__/code-block-shiki.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { Editor } from '@tiptap/core';
 import StarterKit from '@tiptap/starter-kit';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 import { CodeBlockShiki } from '../CodeBlockShikiExtension';
 
 function createEditor(content?: string) {
diff --git a/apps/web/src/lib/editor/code-block/__tests__/language-selector.test.tsx b/apps/web/src/lib/editor/code-block/__tests__/language-selector.test.tsx
index 75caa14dd4..d61fc989d0 100644
--- a/apps/web/src/lib/editor/code-block/__tests__/language-selector.test.tsx
+++ b/apps/web/src/lib/editor/code-block/__tests__/language-selector.test.tsx
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi } from 'vitest';
 import React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 import { LanguageSelector } from '../LanguageSelector';
 import type { NodeViewProps } from '@tiptap/react';
 
diff --git a/apps/web/src/lib/editor/code-block/__tests__/riteway.ts b/apps/web/src/lib/editor/code-block/__tests__/riteway.ts
deleted file mode 100644
index bec3208c0e..0000000000
--- a/apps/web/src/lib/editor/code-block/__tests__/riteway.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from 'vitest';
-
-interface AssertParams {
-  given: string;
-  should: string;
-  actual: unknown;
-  expected: unknown;
-}
-
-export const assert = ({ given, should, actual, expected }: AssertParams): void => {
-  const message = `Given ${given}, should ${should}`;
-  expect(actual, message).toEqual(expected);
-};
diff --git a/apps/web/src/lib/editor/code-block/__tests__/shiki-highlighter.test.ts b/apps/web/src/lib/editor/code-block/__tests__/shiki-highlighter.test.ts
index 1e126260d7..6d7520e810 100644
--- a/apps/web/src/lib/editor/code-block/__tests__/shiki-highlighter.test.ts
+++ b/apps/web/src/lib/editor/code-block/__tests__/shiki-highlighter.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 import { tokenizeCode } from '../shiki-highlighter';
 
 describe('Shiki Highlighter Service', () => {
diff --git a/apps/web/src/lib/editor/code-block/__tests__/sudolang-grammar.test.ts b/apps/web/src/lib/editor/code-block/__tests__/sudolang-grammar.test.ts
index 951cefbe52..60ffede56c 100644
--- a/apps/web/src/lib/editor/code-block/__tests__/sudolang-grammar.test.ts
+++ b/apps/web/src/lib/editor/code-block/__tests__/sudolang-grammar.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeAll } from 'vitest';
 import { createHighlighter, type Highlighter, type BundledLanguage } from 'shiki';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 import { sudolangGrammar } from '../sudolang-grammar';
 
 let highlighter: Highlighter;
diff --git a/apps/web/src/lib/editor/code-block/__tests__/token-decorations.test.ts b/apps/web/src/lib/editor/code-block/__tests__/token-decorations.test.ts
index fe6ffde044..1e21b90e70 100644
--- a/apps/web/src/lib/editor/code-block/__tests__/token-decorations.test.ts
+++ b/apps/web/src/lib/editor/code-block/__tests__/token-decorations.test.ts
@@ -1,6 +1,6 @@
 import { describe, it } from 'vitest';
 import type { ThemedToken } from 'shiki';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 import { tokensToDecorationSpecs } from '../token-decorations';
 
 function makeToken(content: string, color?: string, fontStyle?: number): ThemedToken {
diff --git a/apps/web/src/lib/integrations/google-calendar/__tests__/map-attendees.test.ts b/apps/web/src/lib/integrations/google-calendar/__tests__/map-attendees.test.ts
index be7f2087ad..3cfcaf88d1 100644
--- a/apps/web/src/lib/integrations/google-calendar/__tests__/map-attendees.test.ts
+++ b/apps/web/src/lib/integrations/google-calendar/__tests__/map-attendees.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 // Track calls for assertions
 const mockSelectFrom = vi.fn().mockReturnValue({ where: vi.fn().mockResolvedValue([]) });
diff --git a/apps/web/src/lib/integrations/google-calendar/__tests__/riteway.ts b/apps/web/src/lib/integrations/google-calendar/__tests__/riteway.ts
deleted file mode 100644
index bec3208c0e..0000000000
--- a/apps/web/src/lib/integrations/google-calendar/__tests__/riteway.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from 'vitest';
-
-interface AssertParams {
-  given: string;
-  should: string;
-  actual: unknown;
-  expected: unknown;
-}
-
-export const assert = ({ given, should, actual, expected }: AssertParams): void => {
-  const message = `Given ${given}, should ${should}`;
-  expect(actual, message).toEqual(expected);
-};
diff --git a/apps/web/src/lib/integrations/google-calendar/__tests__/sync-service.test.ts b/apps/web/src/lib/integrations/google-calendar/__tests__/sync-service.test.ts
index da7717c2bb..db6e2bfffc 100644
--- a/apps/web/src/lib/integrations/google-calendar/__tests__/sync-service.test.ts
+++ b/apps/web/src/lib/integrations/google-calendar/__tests__/sync-service.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 // Mock database
 const mockFindFirst = vi.fn();
diff --git a/apps/web/src/lib/memory/__tests__/compaction-service.test.ts b/apps/web/src/lib/memory/__tests__/compaction-service.test.ts
index 30d551218e..4ec0a9aab9 100644
--- a/apps/web/src/lib/memory/__tests__/compaction-service.test.ts
+++ b/apps/web/src/lib/memory/__tests__/compaction-service.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 /**
  * Compaction Service Tests
diff --git a/apps/web/src/lib/memory/__tests__/discovery-service.test.ts b/apps/web/src/lib/memory/__tests__/discovery-service.test.ts
index 42a1987661..256e23e699 100644
--- a/apps/web/src/lib/memory/__tests__/discovery-service.test.ts
+++ b/apps/web/src/lib/memory/__tests__/discovery-service.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 /**
  * Discovery Service Tests
diff --git a/apps/web/src/lib/memory/__tests__/integration-service.test.ts b/apps/web/src/lib/memory/__tests__/integration-service.test.ts
index 7127cd541f..bd26b914ef 100644
--- a/apps/web/src/lib/memory/__tests__/integration-service.test.ts
+++ b/apps/web/src/lib/memory/__tests__/integration-service.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, vi, beforeEach } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 
 /**
  * Integration Service Tests
diff --git a/apps/web/src/lib/memory/__tests__/riteway.ts b/apps/web/src/lib/memory/__tests__/riteway.ts
deleted file mode 100644
index bec3208c0e..0000000000
--- a/apps/web/src/lib/memory/__tests__/riteway.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from 'vitest';
-
-interface AssertParams {
-  given: string;
-  should: string;
-  actual: unknown;
-  expected: unknown;
-}
-
-export const assert = ({ given, should, actual, expected }: AssertParams): void => {
-  const message = `Given ${given}, should ${should}`;
-  expect(actual, message).toEqual(expected);
-};
diff --git a/apps/web/src/lib/utils/__tests__/riteway.ts b/apps/web/src/lib/utils/__tests__/riteway.ts
deleted file mode 100644
index bec3208c0e..0000000000
--- a/apps/web/src/lib/utils/__tests__/riteway.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from 'vitest';
-
-interface AssertParams {
-  given: string;
-  should: string;
-  actual: unknown;
-  expected: unknown;
-}
-
-export const assert = ({ given, should, actual, expected }: AssertParams): void => {
-  const message = `Given ${given}, should ${should}`;
-  expect(actual, message).toEqual(expected);
-};
diff --git a/apps/web/src/lib/utils/__tests__/timestamp.test.ts b/apps/web/src/lib/utils/__tests__/timestamp.test.ts
index 56f053f32d..a82d2af5c6 100644
--- a/apps/web/src/lib/utils/__tests__/timestamp.test.ts
+++ b/apps/web/src/lib/utils/__tests__/timestamp.test.ts
@@ -1,5 +1,5 @@
 import { describe, it } from 'vitest';
-import { assert } from './riteway';
+import { assert } from '@/test/riteway';
 import { toISOTimestamp } from '../timestamp';
 
 describe('toISOTimestamp', () => {
diff --git a/apps/web/src/lib/ai/tools/__tests__/riteway.ts b/apps/web/src/test/riteway.ts
similarity index 100%
rename from apps/web/src/lib/ai/tools/__tests__/riteway.ts
rename to apps/web/src/test/riteway.ts
diff --git a/apps/web/vitest.config.ts b/apps/web/vitest.config.ts
index 68bee2d0d2..b471099bc8 100644
--- a/apps/web/vitest.config.ts
+++ b/apps/web/vitest.config.ts
@@ -9,6 +9,7 @@ const packagesDir = path.resolve(__dirname, '../../packages')
 export default defineConfig({
   plugins: [react()],
   test: {
+    name: 'web',
     globals: true,
     environment: 'jsdom',
     css: true,
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
index 038de97e78..ca33fd8201 100644
--- a/vitest.workspace.ts
+++ b/vitest.workspace.ts
@@ -9,15 +9,7 @@ export default defineWorkspace([
       globals: true,
     },
   },
-  {
-    test: {
-      name: 'web',
-      root: './apps/web',
-      environment: 'jsdom',
-      globals: true,
-      setupFiles: ['./src/test/setup.ts'],
-    },
-  },
+  './apps/web/vitest.config.ts',
   {
     test: {
       name: 'realtime',