resolve merge conflicts

.vscode/buster.code-workspace

@@ -1,6 +1,5 @@
 {
   "folders": [
-    { "path": "../apps/api" },
     { "path": "../apps/server" },
     { "path": "../apps/web" },
     { "path": "../apps/web-tss" },

apps/web-tss/package.json

@@ -80,7 +80,7 @@
     "@tanstack/react-table": "^8.21.3",
     "@tanstack/router-plugin": "^1.131.19",
     "@tanstack/store": "^0.7.2",
-    "axios": "^1.11.0",
+    "axios": "catalog:",
     "canvas-confetti": "^1.9.3",
     "chart.js": "4.5.0",
     "class-variance-authority": "^0.7.1",
@@ -112,10 +112,10 @@
     "tailwindcss": "^4.1.12",
     "tw-animate-css": "^1.3.7",
     "use-context-selector": "^2.0.0",
-    "uuid": "^11.1.0",
+    "uuid": "catalog:",
     "virtua": "^0.41.5",
     "vite-tsconfig-paths": "^5.1.4",
-    "zod": "^3.24.2"
+    "zod": "catalog:"
   },
   "devDependencies": {
     "@biomejs/biome": "2.2.0",
@@ -143,10 +143,10 @@
     "sass": "^1.90.0",
     "storybook": "^9.1.2",
     "typescript": "^5.9.0",
-    "vite": "^7.1.2",
+    "vite": "catalog:",
     "vite-plugin-checker": "^0.10.2",
     "vite-tsconfig-paths": "catalog:",
-    "vitest": "^3.2.4",
+    "vitest": "catalog:",
     "web-vitals": "^5.1.0"
   }
 }

pnpm-workspace.yaml

@@ -8,6 +8,7 @@ packages:
   - "apps/electric-server"
   - "apps/trigger"
   - "apps/web-tss"
+  - "apps/api"
 
 catalog:
   "@mastra/core": "^0.10.8"
@@ -29,7 +30,7 @@ catalog:
   "@platejs/toc": "^49.0.0"
   "@platejs/toggle": "^49.0.0"
   ai: "^4.0.0"
-  axios: "^1.10.0"
+  axios: "^1.11.0"
   "braintrust": "^0.0.209"
   dotenv: "^17.2.0"
   drizzle-orm: "^0.44.2"
@@ -41,7 +42,7 @@ catalog:
   tsup: "^8.5.0"
   tsx: "^4.20.0"
   uuid: "^11.0.0"
-  vite: "^7.0.0"
+  vite: "^7.1.2"
   "vite-tsconfig-paths": "6.0.0-beta.3"
   vitest: "^3.2.4"
   zod: "^3.25.0"