Merge branch 'main' into dev

src/features/agents/hooks/use-agent-update-check.ts

@@ -0,0 +1,19 @@
+"use client";
+
+import {useQuery} from "@tanstack/react-query";
+import {getNewAgentRelease} from "@/features/updates/services/github";
+
+export const useAgentUpdateCheck = (currentVersion?: string | null) => {
+    const {data: newRelease, isLoading} = useQuery({
+        queryKey: ["agent-new-release", currentVersion],
+        queryFn: () => currentVersion ? getNewAgentRelease(currentVersion) : Promise.resolve(null),
+        staleTime: 1000 * 60 * 60,
+        enabled: !!currentVersion,
+    });
+
+    return {
+        newRelease,
+        isLoading,
+        isUpdateAvailable: !!newRelease,
+    };
+};

src/features/theme/mode-toggle.tsx

@@ -1,41 +1,77 @@
 "use client"
+import { Moon, Sun, Check, SunMoon } from "lucide-react"
+import { useTheme } from "next-themes"
+import { authClient } from "@/lib/auth/auth-client"
 
-import * as React from "react"
-import {Moon, Sun} from "lucide-react"
-import {Button} from "@/components/ui/button"
-import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from "@/components/ui/dropdown-menu"
-import {authClient} from "@/lib/auth/auth-client";
-import {toast} from "sonner";
+import { Button } from "@/components/ui/button"
+import {
+    DropdownMenu,
+    DropdownMenuContent,
+    DropdownMenuItem,
+    DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu"
+import { cn } from "@/lib/utils"
+
+const themes = [
+    { id: "light", icon: Sun, label: "Light" },
+    { id: "dark", icon: Moon, label: "Dark" },
+    { id: "system", icon: SunMoon, label: "System" },
+] as const
 
 export function ModeToggle() {
+    const { theme } = useTheme()
 
-    const setTheme = async (theme: "light" | "dark" | "system") => {
-        toast.success("Your theme preference has been updated.");
-        await authClient.updateUser({theme: theme});
-    };
+    const handleThemeChange = async (newTheme: "light" | "system" | "dark") => {
+        await authClient.updateUser({ theme: newTheme })
+    }
 
     return (
         <DropdownMenu>
             <DropdownMenuTrigger asChild>
-                <Button variant="ghost" size="sm">
-                    <Sun className="size-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0"/>
-                    <Moon className="absolute size-4  rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100"/>
+                <Button variant="ghost" size="icon" className="size-8 rounded-full border border-input bg-transparent shadow-xs transition-transform active:scale-95">
+                    {theme === "light" ? <Sun className="size-4" /> : theme === "dark" ? <Moon className="size-4" /> : <SunMoon className="size-4" />}
                     <span className="sr-only">Toggle theme</span>
                 </Button>
             </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-                <DropdownMenuItem onClick={() => setTheme("light")}>
-                    Light
-                </DropdownMenuItem>
-                <DropdownMenuItem onClick={() => setTheme("dark")}>
-                    Dark
-                </DropdownMenuItem>
-                <DropdownMenuItem onClick={() => setTheme("system")}>
-                    System
-                </DropdownMenuItem>
+            <DropdownMenuContent align="end" className="min-w-37.5 rounded-xl border-2 border-border p-1 shadow-none">
+                {themes.map((t) => {
+                    const ThemeIcon = t.icon
+                    const isActive = theme === t.id
+                    return (
+                        <DropdownMenuItem
+                            key={t.id}
+                            onClick={() => handleThemeChange(t.id)}
+                            className={cn(
+                                "group gap-2 p-2 cursor-pointer rounded-lg mb-1 last:mb-0 transition-colors",
+                                isActive
+                                    ? "bg-primary/10 text-primary border border-primary/20"
+                                    : "focus:bg-accent hover:bg-accent/50 border border-transparent"
+                            )}
+                        >
+                            <div className={cn(
+                                "flex size-7 shrink-0 items-center justify-center rounded-md border shadow-sm transition-all group-hover:shadow-md",
+                                isActive ? "bg-primary text-primary-foreground border-primary/30" : "bg-muted/50 border-border"
+                            )}>
+                                <ThemeIcon className={cn(
+                                    "size-4",
+                                    isActive ? "text-primary-foreground" : "text-muted-foreground"
+                                )} />
+                            </div>
+                            <span className={cn(
+                                "text-sm font-medium leading-none flex-1",
+                                isActive ? "text-primary" : ""
+                            )}>
+                                {t.label}
+                            </span>
+                            {isActive && (
+                                <div className="flex size-4 items-center justify-center rounded-full bg-primary shadow-sm ml-auto">
+                                    <Check className="size-2.5 text-primary-foreground" strokeWidth={3} />
+                                </div>
+                            )}
+                        </DropdownMenuItem>
+                    )
+                })}
             </DropdownMenuContent>
         </DropdownMenu>
     )
-}
-
-
+}

src/features/updates/components/update-notification.tsx

@@ -18,9 +18,9 @@ export const UpdateNotification = () => {
         <SidebarGroup className="py-0">
             <SidebarGroupContent>
                 <SidebarMenu>
-                    <SidebarMenuItem className="px-2">
+                    <SidebarMenuItem>
                         <div
-                            className="relative flex flex-col gap-2 rounded-lg border bg-primary/5 p-3 text-sidebar-foreground border-primary/20">
+                            className="w-[var(--radix-popper-anchor-width)] relative flex flex-col gap-2 rounded-lg border bg-primary/5 p-3 text-sidebar-foreground border-primary/20">
                             <button
                                 onClick={dismissUpdate}
                                 className="absolute right-2 top-2 rounded-md p-0.5 text-muted-foreground/50 hover:bg-sidebar-accent hover:text-foreground transition-colors"
@@ -37,10 +37,12 @@ export const UpdateNotification = () => {
                                 <div className="flex flex-col min-w-0">
                                     <div className="flex items-center gap-1">
                                         <span className="text-[10px] font-semibold leading-none">Update available</span>
-                                        <span
-                                            className="text-[10px] text-muted-foreground font-medium px-1 py-0.5 bg-primary/10 rounded-full">
-                                            v{newRelease.tag_name.replace(/^v/, "")}
-                                        </span>
+                                        {newRelease.tag_name && (
+                                            <span
+                                                className="text-[10px] text-muted-foreground font-medium px-1 py-0.5 bg-primary/10 rounded-full">
+                                                v{newRelease.tag_name.replace(/^v/, "")}
+                                            </span>
+                                        )}
                                     </div>
                                     <Link
                                         href={newRelease.html_url}

src/features/updates/services/github.ts

@@ -14,7 +14,7 @@ type ParsedVersion = {
 };
 
 function parseVersion(version: string): ParsedVersion {
-    const match = version.match(/^(\d+)\.(\d+)\.(\d+)(?:-rc\.(\d+))?$/);
+    const match = version.match(/^v?(\d+)\.(\d+)\.(\d+)(?:-rc\.(\d+))?$/);
     if (!match) return {
         major: 0,
         minor: 0,
@@ -30,6 +30,49 @@ function parseVersion(version: string): ParsedVersion {
     };
 }
 
+const findLatestVersion = (currentVersion: string, releases: GitHubRelease[]): GitHubRelease | null => {
+    const cleanCurrentVersion = currentVersion.replace(/^v/, "");
+    const isStable = /^\d+\.\d+\.\d+$/.test(cleanCurrentVersion);
+    const isRc = /^\d+\.\d+\.\d+-rc\.\d+$/.test(cleanCurrentVersion);
+
+    const currentParsedVersion = parseVersion(cleanCurrentVersion);
+    
+    if (isRc) {
+        const latestStableVersion = releases.find(r => !r.prerelease);
+        const latestRcVersion = releases.find(r => r.prerelease && (r.tag_name.includes("rc") || (r.name && r.name.includes("rc"))));
+
+        if (latestStableVersion) {
+            const versionStr = latestStableVersion.tag_name || latestStableVersion.name;
+            const latestStableParsedVersion = parseVersion(versionStr);
+            if (latestStableParsedVersion.major > currentParsedVersion.major) return latestStableVersion;
+            if (latestStableParsedVersion.major === currentParsedVersion.major && latestStableParsedVersion.minor > currentParsedVersion.minor) return latestStableVersion;
+            if (latestStableParsedVersion.major === currentParsedVersion.major && latestStableParsedVersion.minor === currentParsedVersion.minor && latestStableParsedVersion.patch >= currentParsedVersion.patch) return latestStableVersion;
+        }
+
+        if (latestRcVersion) {
+            const versionStr = latestRcVersion.tag_name || latestRcVersion.name;
+            const latestRcParsedVersion = parseVersion(versionStr);
+            if (latestRcParsedVersion.major > currentParsedVersion.major) return latestRcVersion;
+            if (latestRcParsedVersion.major === currentParsedVersion.major && latestRcParsedVersion.minor > currentParsedVersion.minor) return latestRcVersion;
+            if (latestRcParsedVersion.major === currentParsedVersion.major && latestRcParsedVersion.minor === currentParsedVersion.minor && latestRcParsedVersion.patch > currentParsedVersion.patch) return latestRcVersion;
+            if (latestRcParsedVersion.major === currentParsedVersion.major && latestRcParsedVersion.minor === currentParsedVersion.minor && latestRcParsedVersion.patch === currentParsedVersion.patch && 
+                latestRcParsedVersion.rc !== undefined && currentParsedVersion.rc !== undefined && latestRcParsedVersion.rc > currentParsedVersion.rc) return latestRcVersion;
+        }
+    } else if (isStable) {
+        const latestStableVersion = releases.find(r => !r.prerelease);
+        if (latestStableVersion) {
+            const versionStr = latestStableVersion.tag_name || latestStableVersion.name;
+            const latestStableParsedVersion = parseVersion(versionStr);
+            
+            if (latestStableParsedVersion.major > currentParsedVersion.major) return latestStableVersion;
+            if (latestStableParsedVersion.major === currentParsedVersion.major && latestStableParsedVersion.minor > currentParsedVersion.minor) return latestStableVersion;
+            if (latestStableParsedVersion.major === currentParsedVersion.major && latestStableParsedVersion.minor === currentParsedVersion.minor && latestStableParsedVersion.patch > currentParsedVersion.patch) return latestStableVersion;
+        }
+    }
+
+    return null;
+};
+
 export const getNewRelease = async (currentVersion: string): Promise<GitHubRelease | null> => {
     try {
         const response = await fetch("https://api.github.com/repos/Portabase/portabase/releases");
@@ -38,49 +81,28 @@ export const getNewRelease = async (currentVersion: string): Promise<GitHubRelea
         }
 
         const releases: GitHubRelease[] = await response.json();
-
-        const isStable = /^\d+\.\d+\.\d+$/.test(currentVersion);
-        const isRc = /^\d+\.\d+\.\d+-rc\.\d+$/.test(currentVersion);
-
-        console.log("isStable", isStable)
-        console.log("isRc", isRc)
-
-
-        const currentParsedVersion = parseVersion(currentVersion)
-
-        const latestStableVersion = releases.find(r => !r.prerelease)
-        const latestRcVersion = releases.find(r => r.name.includes("rc"))!
-
-        if (isRc) {
-            if (!latestRcVersion) return null
-            const latestRcParsedVersion = parseVersion(latestRcVersion.name)
-            if (currentParsedVersion.major < latestRcParsedVersion.major) return latestRcVersion;
-            if (currentParsedVersion.minor < latestRcParsedVersion.minor) return latestRcVersion;
-            if (currentParsedVersion.patch < latestRcParsedVersion.patch) return latestRcVersion;
-            if (currentParsedVersion.rc! < latestRcParsedVersion.rc!) return latestRcVersion;
-
-            if (!latestStableVersion) return null
-            const latestStableParsedVersion = parseVersion(latestStableVersion.name)
-            if (currentParsedVersion.major < latestStableParsedVersion.major) return latestStableVersion;
-            if (currentParsedVersion.minor < latestStableParsedVersion.minor) return latestStableVersion;
-            if (currentParsedVersion.patch < latestStableParsedVersion.patch) return latestStableVersion;
-
-            return null;
-
-        } else if (isStable) {
-            if (!latestStableVersion) return null
-            const latestStableParsedVersion = parseVersion(latestStableVersion.name)
-            if (currentParsedVersion.major < latestStableParsedVersion.major) return latestStableVersion;
-            if (currentParsedVersion.minor < latestStableParsedVersion.minor) return latestStableVersion;
-            if (currentParsedVersion.patch < latestStableParsedVersion.patch) return latestStableVersion;
-
-            return null;
-        }
-
-        return null;
+        return findLatestVersion(currentVersion, releases);
 
     } catch (error) {
         console.error("Failed to fetch latest release", error);
         return null;
     }
 };
+
+export const getNewAgentRelease = async (currentVersion: string): Promise<GitHubRelease | null> => {
+    try {
+        const response = await fetch("https://api.github.com/repos/Portabase/agent-rust/releases", {
+            next: { revalidate: 3600 }
+        });
+        if (!response.ok) {
+            return null;
+        }
+
+        const releases: GitHubRelease[] = await response.json();
+        return findLatestVersion(currentVersion, releases);
+
+    } catch (error) {
+        console.error("Failed to fetch latest agent release", error);
+        return null;
+    }
+};