diff --git a/apps/publisher-dashboard/src/lib/components/account/account-nav.svelte b/apps/publisher-dashboard/src/lib/components/account/account-nav.svelte
index bf64247..4cc6bfc 100644
--- a/apps/publisher-dashboard/src/lib/components/account/account-nav.svelte
+++ b/apps/publisher-dashboard/src/lib/components/account/account-nav.svelte
@@ -60,7 +60,7 @@ function isActive(href: string, pathname: string): boolean {
   {#each navItems as item (item.href)}
     {@const active = isActive(item.href, $page.url.pathname)}
     <a
-      href={resolve(item.href)}
+      href={resolve(item.href as any)}
       class={cn(
         "inline-flex h-[calc(100%-1px)] items-center justify-center gap-1.5 rounded-md border border-transparent px-3 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow]",
         active
diff --git a/apps/publisher-dashboard/src/lib/components/auth/auth-guard.svelte b/apps/publisher-dashboard/src/lib/components/auth/auth-guard.svelte
index 9c4220e..274fbbf 100644
--- a/apps/publisher-dashboard/src/lib/components/auth/auth-guard.svelte
+++ b/apps/publisher-dashboard/src/lib/components/auth/auth-guard.svelte
@@ -27,7 +27,9 @@ const userQuery = createQuery(() => ({
 $effect(() => {
   if (!isAuthPage && userQuery.error) {
     goto(
-      resolve(`/auth/login?redirect=${encodeURIComponent(page.url.pathname)}`),
+      resolve(
+        `/auth/login?redirect=${encodeURIComponent(page.url.pathname)}` as any,
+      ),
     );
   }
 });
diff --git a/apps/publisher-dashboard/src/lib/components/dashboard/frequent-filters.svelte b/apps/publisher-dashboard/src/lib/components/dashboard/frequent-filters.svelte
index 33600ed..477f4c1 100644
--- a/apps/publisher-dashboard/src/lib/components/dashboard/frequent-filters.svelte
+++ b/apps/publisher-dashboard/src/lib/components/dashboard/frequent-filters.svelte
@@ -28,7 +28,7 @@ const filters = [
   <div class="divide-y divide-border/50">
     {#each filters as filter (filter.label)}
       <a
-        href={resolve(filter.href)}
+        href={resolve(filter.href as any)}
         class="group flex items-center gap-3 px-5 py-3 transition-colors hover:bg-muted/30"
       >
         <div class="flex h-7 w-7 items-center justify-center rounded-md bg-muted text-muted-foreground transition-colors group-hover:bg-foreground/10 group-hover:text-foreground">
diff --git a/apps/publisher-dashboard/src/lib/components/dashboard/performance-table.svelte b/apps/publisher-dashboard/src/lib/components/dashboard/performance-table.svelte
index bf9276a..07d1258 100644
--- a/apps/publisher-dashboard/src/lib/components/dashboard/performance-table.svelte
+++ b/apps/publisher-dashboard/src/lib/components/dashboard/performance-table.svelte
@@ -40,7 +40,7 @@ function handleTabChange(tabId: string) {
   } else {
     url.searchParams.set("tab", tabId);
   }
-  goto(resolve(url.toString()), { replaceState: true, noScroll: true });
+  goto(resolve(url.toString() as any), { replaceState: true, noScroll: true });
 }
 </script>
 
diff --git a/apps/publisher-dashboard/src/lib/components/layout/account/account-settings-layout.svelte b/apps/publisher-dashboard/src/lib/components/layout/account/account-settings-layout.svelte
index c17beb8..8d62342 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/account/account-settings-layout.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/account/account-settings-layout.svelte
@@ -6,6 +6,7 @@ import MonitorIcon from "@lucide/svelte/icons/monitor";
 import ShieldCheckIcon from "@lucide/svelte/icons/shield-check";
 import UserIcon from "@lucide/svelte/icons/user";
 import { createQuery } from "@tanstack/svelte-query";
+import { resolve } from "$app/paths";
 import { page } from "$app/stores";
 import { api } from "$lib/api/client";
 import { DashboardLayout } from "$lib/components/layout";
@@ -91,10 +92,10 @@ function isActive(href: string): boolean {
     <nav class="w-full shrink-0 lg:w-64">
       <!-- Mobile: horizontal scroll -->
       <div class="flex gap-2 overflow-x-auto pb-2 lg:hidden">
-        {#each navItems as item}
+        {#each navItems as item (item.href)}
           {@const active = isActive(item.href)}
           <a
-            href={item.href}
+            href={resolve(item.href as any)}
             class={cn(
               "flex shrink-0 items-center gap-2 rounded-lg border px-3 py-2 text-sm font-medium transition-colors",
               active
@@ -110,10 +111,10 @@ function isActive(href: string): boolean {
 
       <!-- Desktop: vertical list -->
       <div class="hidden space-y-1 lg:block">
-        {#each navItems as item}
+        {#each navItems as item (item.href)}
           {@const active = isActive(item.href)}
           <a
-            href={item.href}
+            href={resolve(item.href as any)}
             class={cn(
               "group flex items-start gap-3 rounded-lg px-3 py-2.5 transition-colors",
               active
diff --git a/apps/publisher-dashboard/src/lib/components/layout/admin/admin-mobile-nav.svelte b/apps/publisher-dashboard/src/lib/components/layout/admin/admin-mobile-nav.svelte
index 6c2de21..6b0c356 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/admin/admin-mobile-nav.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/admin/admin-mobile-nav.svelte
@@ -53,7 +53,7 @@ async function handleSignOut() {
     await api.auth.logout();
     queryClient.clear();
     open = false;
-    goto(resolve("/login"));
+    goto(resolve("/auth/login"));
   } catch (error) {
     console.error("Failed to sign out:", error);
   }
@@ -99,7 +99,7 @@ const navItems = [
               ? $page.url.pathname === "/admin"
               : $page.url.pathname.startsWith(item.href)}
           <a
-            href={resolve(item.href)}
+            href={resolve(item.href as any)}
             onclick={handleNavClick}
             class={cn(
               "flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm font-medium transition-colors",
diff --git a/apps/publisher-dashboard/src/lib/components/layout/admin/admin-sidebar.svelte b/apps/publisher-dashboard/src/lib/components/layout/admin/admin-sidebar.svelte
index b7ad416..fa18fb0 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/admin/admin-sidebar.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/admin/admin-sidebar.svelte
@@ -44,7 +44,7 @@ async function handleSignOut() {
   try {
     await api.auth.logout();
     queryClient.clear();
-    goto(resolve("/login"));
+    goto(resolve("/auth/login"));
   } catch (error) {
     console.error("Failed to sign out:", error);
   }
@@ -91,7 +91,7 @@ const navItems = [
           ? $page.url.pathname === "/admin"
           : $page.url.pathname.startsWith(item.href)}
       <a
-        href={resolve(item.href)}
+        href={resolve(item.href as any)}
         class={cn(
           "group relative flex h-8 w-8 items-center justify-center rounded-lg transition-all duration-150",
           isActive
diff --git a/apps/publisher-dashboard/src/lib/components/layout/dashboard/app-sidebar.svelte b/apps/publisher-dashboard/src/lib/components/layout/dashboard/app-sidebar.svelte
index 7b360fd..8600e57 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/dashboard/app-sidebar.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/dashboard/app-sidebar.svelte
@@ -75,7 +75,7 @@ const navItems = $derived.by(() => {
           : $page.url.pathname === item.href ||
             $page.url.pathname.startsWith(item.href + "/")}
       <a
-        href={resolve(item.href)}
+        href={resolve(item.href as any)}
         class={cn(
           "group relative flex h-8 w-8 items-center justify-center rounded-lg transition-all duration-150",
           isActive
diff --git a/apps/publisher-dashboard/src/lib/components/layout/dashboard/mobile-nav.svelte b/apps/publisher-dashboard/src/lib/components/layout/dashboard/mobile-nav.svelte
index 61ce146..37c0c56 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/dashboard/mobile-nav.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/dashboard/mobile-nav.svelte
@@ -86,7 +86,7 @@ async function handleSignOut() {
     await api.auth.logout();
     queryClient.clear();
     open = false;
-    goto(resolve("/login"));
+    goto(resolve("/auth/login"));
   } catch (error) {
     console.error("Failed to sign out:", error);
   }
@@ -124,7 +124,7 @@ async function handleSignOut() {
             $page.url.pathname === item.href ||
             (item.href !== "/" && $page.url.pathname.startsWith(item.href))}
           <a
-            href={resolve(item.href)}
+            href={resolve(item.href as any)}
             onclick={handleNavClick}
             class={cn(
               "flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm font-medium transition-colors",
diff --git a/apps/publisher-dashboard/src/lib/components/layout/dashboard/org-switcher.svelte b/apps/publisher-dashboard/src/lib/components/layout/dashboard/org-switcher.svelte
index ebdcf0a..568fdc4 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/dashboard/org-switcher.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/dashboard/org-switcher.svelte
@@ -20,7 +20,7 @@ const orgsQuery = createQuery(() => ({
 const orgs = $derived(orgsQuery.data ?? []);
 
 function handleOrgSelect(slug: string) {
-  goto(resolve(`/dashboard/${slug}`));
+  goto(resolve(`/dashboard/${slug}` as any));
 }
 </script>
 
diff --git a/apps/publisher-dashboard/src/lib/components/layout/dashboard/user-menu.svelte b/apps/publisher-dashboard/src/lib/components/layout/dashboard/user-menu.svelte
index 9fb9102..a4176bc 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/dashboard/user-menu.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/dashboard/user-menu.svelte
@@ -44,7 +44,7 @@ async function handleSignOut() {
     await api.auth.logout();
     // Clear all cached queries
     queryClient.clear();
-    goto(resolve("/login"));
+    goto(resolve("/auth/login"));
   } catch (error) {
     console.error("Failed to sign out:", error);
   }
diff --git a/apps/publisher-dashboard/src/lib/components/layout/settings/settings-layout.svelte b/apps/publisher-dashboard/src/lib/components/layout/settings/settings-layout.svelte
index 7736bd0..79f8944 100644
--- a/apps/publisher-dashboard/src/lib/components/layout/settings/settings-layout.svelte
+++ b/apps/publisher-dashboard/src/lib/components/layout/settings/settings-layout.svelte
@@ -62,7 +62,7 @@ function isActive(href: string): boolean {
         {#each navItems as item (item.href)}
           {@const active = isActive(item.href)}
           <a
-            href={resolve(item.href)}
+            href={resolve(item.href as any)}
             class={cn(
               "flex shrink-0 items-center gap-2 rounded-lg border px-3 py-2 text-sm font-medium transition-colors",
               active
@@ -81,7 +81,7 @@ function isActive(href: string): boolean {
         {#each navItems as item (item.href)}
           {@const active = isActive(item.href)}
           <a
-            href={resolve(item.href)}
+            href={resolve(item.href as any)}
             class={cn(
               "group flex items-start gap-3 rounded-lg px-3 py-2.5 transition-colors",
               active
diff --git a/apps/publisher-dashboard/src/routes/+page.svelte b/apps/publisher-dashboard/src/routes/+page.svelte
index e9d00dc..7295f97 100644
--- a/apps/publisher-dashboard/src/routes/+page.svelte
+++ b/apps/publisher-dashboard/src/routes/+page.svelte
@@ -17,11 +17,11 @@ const orgsQuery = createQuery(() => ({
 $effect(() => {
   if (orgsQuery.error) {
     // Not authenticated, redirect to login
-    goto(resolve(`/auth/login?redirect=${encodeURIComponent("/")}`));
+    goto(resolve(`/auth/login?redirect=${encodeURIComponent("/")}` as any));
   } else if (orgsQuery.data) {
     if (orgsQuery.data.length > 0) {
       // Redirect to first org's dashboard
-      goto(resolve(`/dashboard/${orgsQuery.data[0].slug}`), {
+      goto(resolve(`/dashboard/${orgsQuery.data[0].slug}` as any), {
         replaceState: true,
       });
     } else {
diff --git a/apps/publisher-dashboard/src/routes/account/api-tokens/+page.svelte b/apps/publisher-dashboard/src/routes/account/api-tokens/+page.svelte
index 20d91bd..ca62311 100644
--- a/apps/publisher-dashboard/src/routes/account/api-tokens/+page.svelte
+++ b/apps/publisher-dashboard/src/routes/account/api-tokens/+page.svelte
@@ -11,6 +11,7 @@ import {
 import { createQuery, useQueryClient } from "@tanstack/svelte-query";
 import { toast } from "svelte-sonner";
 import { goto } from "$app/navigation";
+import { resolve } from "$app/paths";
 import { api } from "$lib/api/client";
 import { ConfirmDialog } from "$lib/components/account";
 import { Alert, AlertDescription } from "$lib/components/ui/alert";
@@ -38,7 +39,7 @@ const userQuery = createQuery(() => ({
 $effect(() => {
   if (userQuery.data && !userQuery.data.isSuperuser) {
     toast.error("Access denied. Superuser privileges required.");
-    goto("/account");
+    goto(resolve("/account"));
   }
 });
 
diff --git a/apps/publisher-dashboard/src/routes/account/org-invites/[inviteId]/+page.svelte b/apps/publisher-dashboard/src/routes/account/org-invites/[inviteId]/+page.svelte
index b6f7352..abe014c 100644
--- a/apps/publisher-dashboard/src/routes/account/org-invites/[inviteId]/+page.svelte
+++ b/apps/publisher-dashboard/src/routes/account/org-invites/[inviteId]/+page.svelte
@@ -53,7 +53,7 @@ const acceptMutation = createMutation(() => ({
     queryClient.invalidateQueries({ queryKey: ["orgs"] });
     // Redirect to the org dashboard
     if (inviteQuery.data) {
-      goto(resolve(`/dashboard/${inviteQuery.data.org.slug}`));
+      goto(resolve(`/dashboard/${inviteQuery.data.org.slug}` as any));
     } else {
       goto(resolve("/dashboard"));
     }
diff --git a/apps/publisher-dashboard/src/routes/admin/+layout.svelte b/apps/publisher-dashboard/src/routes/admin/+layout.svelte
index fd2becd..c56db44 100644
--- a/apps/publisher-dashboard/src/routes/admin/+layout.svelte
+++ b/apps/publisher-dashboard/src/routes/admin/+layout.svelte
@@ -28,7 +28,7 @@ $effect(() => {
   if (userQuery.error) {
     goto(
       resolve(
-        `/auth/login?redirect=${encodeURIComponent(window.location.pathname)}`,
+        `/auth/login?redirect=${encodeURIComponent(window.location.pathname)}` as any,
       ),
     );
   }
diff --git a/apps/publisher-dashboard/src/routes/auth/+layout.svelte b/apps/publisher-dashboard/src/routes/auth/+layout.svelte
index 219d372..6bf3cb8 100644
--- a/apps/publisher-dashboard/src/routes/auth/+layout.svelte
+++ b/apps/publisher-dashboard/src/routes/auth/+layout.svelte
@@ -81,9 +81,9 @@ let { children }: Props = $props();
       <!-- Footer -->
       <p class="text-center text-xs text-muted-foreground">
         By continuing, you agree to our
-        <a href={resolve("/terms")} class="underline underline-offset-4 hover:text-foreground">Terms of Service</a>
+        <a href={resolve("/terms" as any)} class="underline underline-offset-4 hover:text-foreground">Terms of Service</a>
         and
-        <a href={resolve("/privacy")} class="underline underline-offset-4 hover:text-foreground">Privacy Policy</a>
+        <a href={resolve("/privacy" as any)} class="underline underline-offset-4 hover:text-foreground">Privacy Policy</a>
       </p>
     </div>
   </div>
diff --git a/apps/publisher-dashboard/src/routes/auth/confirm/+page.svelte b/apps/publisher-dashboard/src/routes/auth/confirm/+page.svelte
index 6992e1a..e794d84 100644
--- a/apps/publisher-dashboard/src/routes/auth/confirm/+page.svelte
+++ b/apps/publisher-dashboard/src/routes/auth/confirm/+page.svelte
@@ -59,7 +59,7 @@ const statusQuery = createQuery(() => ({
 $effect(() => {
   if (statusQuery.data?.status === "completed") {
     clearLoginFlowState();
-    goto(resolve(statusQuery.data.redirectTo || "/"));
+    goto(resolve((statusQuery.data.redirectTo || "/") as any));
   }
 });
 
diff --git a/apps/publisher-dashboard/src/routes/auth/trust-device/+page.svelte b/apps/publisher-dashboard/src/routes/auth/trust-device/+page.svelte
index d64541b..256ff8e 100644
--- a/apps/publisher-dashboard/src/routes/auth/trust-device/+page.svelte
+++ b/apps/publisher-dashboard/src/routes/auth/trust-device/+page.svelte
@@ -62,7 +62,7 @@ async function handleTrust() {
 }
 
 async function handleSkip() {
-  goto(resolve("/performance"));
+  goto(resolve("/"));
 }
 
 // Get device icon based on type
diff --git a/apps/publisher-dashboard/src/routes/dashboard/+page.svelte b/apps/publisher-dashboard/src/routes/dashboard/+page.svelte
index 112efe7..d91d011 100644
--- a/apps/publisher-dashboard/src/routes/dashboard/+page.svelte
+++ b/apps/publisher-dashboard/src/routes/dashboard/+page.svelte
@@ -42,7 +42,7 @@ $effect(() => {
   if (orgsQuery.error) {
     goto(
       resolve(
-        `/auth/login?redirect=${encodeURIComponent(window.location.pathname)}`,
+        `/auth/login?redirect=${encodeURIComponent(window.location.pathname)}` as any,
       ),
     );
   }
diff --git a/apps/publisher-dashboard/src/routes/invite/accept/+page.svelte b/apps/publisher-dashboard/src/routes/invite/accept/+page.svelte
index 50ac128..4ec9d31 100644
--- a/apps/publisher-dashboard/src/routes/invite/accept/+page.svelte
+++ b/apps/publisher-dashboard/src/routes/invite/accept/+page.svelte
@@ -46,7 +46,9 @@ async function acceptInvite(): Promise<void> {
   if (!isAuthenticated) {
     // Redirect to login with return URL
     const returnUrl = `/invite/accept?token=${encodeURIComponent(token)}`;
-    goto(resolve(`/auth/login?redirect=${encodeURIComponent(returnUrl)}`));
+    goto(
+      resolve(`/auth/login?redirect=${encodeURIComponent(returnUrl)}` as any),
+    );
     return;
   }