diff --git a/frontend/src/desktop/components/AppProviders.tsx b/frontend/src/desktop/components/AppProviders.tsx
index 8fcd9c64d..02617cd0d 100644
--- a/frontend/src/desktop/components/AppProviders.tsx
+++ b/frontend/src/desktop/components/AppProviders.tsx
@@ -6,7 +6,7 @@ import { SetupWizard } from '@app/components/SetupWizard';
 import { useFirstLaunchCheck } from '@app/hooks/useFirstLaunchCheck';
 import { useBackendInitializer } from '@app/hooks/useBackendInitializer';
 import { DESKTOP_DEFAULT_APP_CONFIG } from '@app/config/defaultAppConfig';
-import { connectionModeService } from '@desktop/services/connectionModeService';
+import { connectionModeService } from '@app/services/connectionModeService';
 import { tauriBackendService } from '@app/services/tauriBackendService';
 import { authService } from '@app/services/authService';
 
diff --git a/frontend/src/desktop/components/SetupWizard/DesktopOAuthButtons.tsx b/frontend/src/desktop/components/SetupWizard/DesktopOAuthButtons.tsx
index d0465f3c5..a7c5d5c34 100644
--- a/frontend/src/desktop/components/SetupWizard/DesktopOAuthButtons.tsx
+++ b/frontend/src/desktop/components/SetupWizard/DesktopOAuthButtons.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { authService, UserInfo } from '@app/services/authService';
 import { buildOAuthCallbackHtml } from '@app/utils/oauthCallbackHtml';
 import { BASE_PATH } from '@app/constants/app';
-import { STIRLING_SAAS_URL } from '@desktop/constants/connection';
+import { STIRLING_SAAS_URL } from '@app/constants/connection';
 import '@app/routes/authShared/auth.css';
 
 type KnownProviderId = 'google' | 'github' | 'keycloak' | 'azure' | 'apple' | 'oidc';
diff --git a/frontend/src/desktop/components/SetupWizard/index.tsx b/frontend/src/desktop/components/SetupWizard/index.tsx
index 171684237..a8e1f17ea 100644
--- a/frontend/src/desktop/components/SetupWizard/index.tsx
+++ b/frontend/src/desktop/components/SetupWizard/index.tsx
@@ -8,7 +8,7 @@ import { SelfHostedLoginScreen } from '@app/components/SetupWizard/SelfHostedLog
 import { ServerConfig, connectionModeService } from '@app/services/connectionModeService';
 import { AuthServiceError, authService, UserInfo } from '@app/services/authService';
 import { tauriBackendService } from '@app/services/tauriBackendService';
-import { STIRLING_SAAS_URL } from '@desktop/constants/connection';
+import { STIRLING_SAAS_URL } from '@app/constants/connection';
 import { listen } from '@tauri-apps/api/event';
 import { useEffect } from 'react';
 import '@app/routes/authShared/auth.css';
diff --git a/frontend/src/desktop/components/onboarding/orchestrator/useOnboardingOrchestrator.ts b/frontend/src/desktop/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
index a0e602ec9..fed28ed9d 100644
--- a/frontend/src/desktop/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
+++ b/frontend/src/desktop/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
@@ -1,6 +1,6 @@
 /**
  * Desktop Override: Onboarding Orchestrator Hook
- * 
+ *
  * Simply wraps the core hook with the desktop-specific default runtime state
  * which has isDesktopApp set to true.
  */
@@ -9,7 +9,7 @@ import {
   useOnboardingOrchestrator as useCoreOnboardingOrchestrator,
   type UseOnboardingOrchestratorResult,
 } from '@core/components/onboarding/orchestrator/useOnboardingOrchestrator';
-import { DEFAULT_RUNTIME_STATE } from '@desktop/components/onboarding/orchestrator/onboardingConfig';
+import { DEFAULT_RUNTIME_STATE } from '@app/components/onboarding/orchestrator/onboardingConfig';
 
 export type {
   OnboardingOrchestratorState,
diff --git a/frontend/src/desktop/hooks/useEndpointConfig.ts b/frontend/src/desktop/hooks/useEndpointConfig.ts
index 0b12868a1..b59f2492e 100644
--- a/frontend/src/desktop/hooks/useEndpointConfig.ts
+++ b/frontend/src/desktop/hooks/useEndpointConfig.ts
@@ -5,7 +5,7 @@ import apiClient from '@app/services/apiClient';
 import { tauriBackendService } from '@app/services/tauriBackendService';
 import { isBackendNotReadyError } from '@app/constants/backendErrors';
 import type { EndpointAvailabilityDetails } from '@app/types/endpointAvailability';
-import { connectionModeService } from '@desktop/services/connectionModeService';
+import { connectionModeService } from '@app/services/connectionModeService';
 import type { AppConfig } from '@app/contexts/AppConfigContext';
 
 
diff --git a/frontend/tsconfig.core.json b/frontend/tsconfig.core.json
index a06e67c0f..bccf7f84b 100644
--- a/frontend/tsconfig.core.json
+++ b/frontend/tsconfig.core.json
@@ -7,9 +7,10 @@
       ]
     }
   },
-  "exclude": [
-    "src/proprietary",
-    "src/desktop",
-    "node_modules"
+  "include": [
+    "src/*.js",
+    "src/*.ts",
+    "src/*.tsx",
+    "src/core"
   ]
 }
diff --git a/frontend/tsconfig.core.vite.json b/frontend/tsconfig.core.vite.json
new file mode 100644
index 000000000..a06e67c0f
--- /dev/null
+++ b/frontend/tsconfig.core.vite.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "paths": {
+      "@app/*": [
+        "src/core/*"
+      ]
+    }
+  },
+  "exclude": [
+    "src/proprietary",
+    "src/desktop",
+    "node_modules"
+  ]
+}
diff --git a/frontend/tsconfig.desktop.json b/frontend/tsconfig.desktop.json
index cb842c399..679f0664f 100644
--- a/frontend/tsconfig.desktop.json
+++ b/frontend/tsconfig.desktop.json
@@ -7,16 +7,15 @@
         "src/proprietary/*",
         "src/core/*"
       ],
-      "@desktop/*": ["src/desktop/*"],
       "@proprietary/*": ["src/proprietary/*"],
       "@core/*": ["src/core/*"]
     }
   },
-  "exclude": [
-    "src/core/**/*.test.ts*",
-    "src/core/**/*.spec.ts*",
-    "src/proprietary/**/*.test.ts*",
-    "src/proprietary/**/*.spec.ts*",
-    "node_modules"
+  "include": [
+    "src/*.js",
+    "src/*.ts",
+    "src/*.tsx",
+    "src/core/setupTests.ts",
+    "src/desktop"
   ]
 }
diff --git a/frontend/tsconfig.desktop.vite.json b/frontend/tsconfig.desktop.vite.json
new file mode 100644
index 000000000..8d586f5be
--- /dev/null
+++ b/frontend/tsconfig.desktop.vite.json
@@ -0,0 +1,21 @@
+{
+  "extends": "./tsconfig.proprietary.vite.json",
+  "compilerOptions": {
+    "paths": {
+      "@app/*": [
+        "src/desktop/*",
+        "src/proprietary/*",
+        "src/core/*"
+      ],
+      "@proprietary/*": ["src/proprietary/*"],
+      "@core/*": ["src/core/*"]
+    }
+  },
+  "exclude": [
+    "src/core/**/*.test.ts*",
+    "src/core/**/*.spec.ts*",
+    "src/proprietary/**/*.test.ts*",
+    "src/proprietary/**/*.spec.ts*",
+    "node_modules"
+  ]
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 4d151995b..242f518f6 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -36,7 +36,6 @@
         "src/proprietary/*",
         "src/core/*"
       ],
-      "@desktop/*": ["src/desktop/*"],
       "@proprietary/*": ["src/proprietary/*"],
       "@core/*": ["src/core/*"]
     },
diff --git a/frontend/tsconfig.proprietary.json b/frontend/tsconfig.proprietary.json
index 4c726f09a..6b60d8bc0 100644
--- a/frontend/tsconfig.proprietary.json
+++ b/frontend/tsconfig.proprietary.json
@@ -9,10 +9,11 @@
       "@core/*": ["src/core/*"]
     }
   },
-  "exclude": [
-    "src/core/**/*.test.ts*",
-    "src/core/**/*.spec.ts*",
-    "src/desktop",
-    "node_modules"
+  "include": [
+    "src/*.js",
+    "src/*.ts",
+    "src/*.tsx",
+    "src/core/setupTests.ts",
+    "src/proprietary"
   ]
 }
diff --git a/frontend/tsconfig.proprietary.vite.json b/frontend/tsconfig.proprietary.vite.json
new file mode 100644
index 000000000..4c726f09a
--- /dev/null
+++ b/frontend/tsconfig.proprietary.vite.json
@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "paths": {
+      "@app/*": [
+        "src/proprietary/*",
+        "src/core/*"
+      ],
+      "@core/*": ["src/core/*"]
+    }
+  },
+  "exclude": [
+    "src/core/**/*.test.ts*",
+    "src/core/**/*.spec.ts*",
+    "src/desktop",
+    "node_modules"
+  ]
+}
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index ad269a19d..de3dc20fc 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -11,8 +11,8 @@ export default defineConfig(({ mode }) => {
     process.env.STIRLING_DESKTOP === 'true' ||
     process.env.VITE_DESKTOP === 'true';
 
-  const baseProject = isProprietary ? './tsconfig.proprietary.json' : './tsconfig.core.json';
-  const desktopProject = isProprietary ? './tsconfig.desktop.json' : baseProject;
+  const baseProject = isProprietary ? './tsconfig.proprietary.vite.json' : './tsconfig.core.vite.json';
+  const desktopProject = isProprietary ? './tsconfig.desktop.vite.json' : baseProject;
   const tsconfigProject = isDesktopMode ? desktopProject : baseProject;
 
   return {
diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts
index 111099896..6bfdf92dc 100644
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts
@@ -37,7 +37,7 @@ export default defineConfig({
         plugins: [
           react(),
           tsconfigPaths({
-            projects: ['./tsconfig.core.json'],
+            projects: ['./tsconfig.core.vite.json'],
           }),
         ],
         esbuild: {
@@ -55,7 +55,7 @@ export default defineConfig({
         plugins: [
           react(),
           tsconfigPaths({
-            projects: ['./tsconfig.proprietary.json'],
+            projects: ['./tsconfig.proprietary.vite.json'],
           }),
         ],
         esbuild: {
@@ -73,7 +73,7 @@ export default defineConfig({
         plugins: [
           react(),
           tsconfigPaths({
-            projects: ['./tsconfig.desktop.json'],
+            projects: ['./tsconfig.desktop.vite.json'],
           }),
         ],
         esbuild: {