fix(sidebar): check all sidebar URLs for active state, not just current section

The previous fix only checked sibling items within the same SidebarMenuList
group. This meant cross-section conflicts (e.g. Organization at
/organizations/:id in Dashboard vs Cloud Agent at /organizations/:id/cloud
in Cloud) were not caught.

Add an allUrls prop to SidebarMenuList so the more-specific-route check
has visibility into all sidebar items across all sections. Both
PersonalAppSidebar and OrganizationAppSidebar now compute and pass the
full URL list. Falls back to section-local items when allUrls is omitted.

Author: kilo-code-bot[bot]

src/app/(app)/components/OrganizationAppSidebar.tsx

@@ -246,6 +246,11 @@ export default function OrganizationAppSidebar({
       : []),
   ];
 
+  const allUrls = useMemo(
+    () => [...dashboardItems, ...cloudItems, ...accountItems].map(i => i.url),
+    [dashboardItems, cloudItems, accountItems]
+  );
+
   // Determine if we should show the OrganizationSwitcher
   // Hide it when an admin user is viewing an organization they're not a member of
   const shouldShowOrganizationSwitcher = !user?.is_admin || currentOrg;
@@ -266,9 +271,13 @@ export default function OrganizationAppSidebar({
       </SidebarHeader>
 
       <SidebarContent>
-        <SidebarMenuList label="Dashboard" items={dashboardItems} />
-        {cloudItems.length > 0 && <SidebarMenuList label="Cloud" items={cloudItems} />}
-        {accountItems.length > 0 && <SidebarMenuList label="Account" items={accountItems} />}
+        <SidebarMenuList label="Dashboard" items={dashboardItems} allUrls={allUrls} />
+        {cloudItems.length > 0 && (
+          <SidebarMenuList label="Cloud" items={cloudItems} allUrls={allUrls} />
+        )}
+        {accountItems.length > 0 && (
+          <SidebarMenuList label="Account" items={accountItems} allUrls={allUrls} />
+        )}
       </SidebarContent>
 
       <SidebarUserFooter user={user} isLoading={isLoading} />

src/app/(app)/components/PersonalAppSidebar.tsx

@@ -25,6 +25,7 @@ import {
   Webhook,
   Factory,
 } from 'lucide-react';
+import { useMemo } from 'react';
 import HeaderLogo from '@/components/HeaderLogo';
 import OrganizationSwitcher from './OrganizationSwitcher';
 import SidebarMenuList from './SidebarMenuList';
@@ -202,6 +203,11 @@ export default function PersonalAppSidebar(props: React.ComponentProps<typeof Si
     },
   ];
 
+  const allUrls = useMemo(
+    () => [...dashboardItems, ...cloudItems, ...accountItems, ...startItems].map(i => i.url),
+    [dashboardItems, cloudItems, accountItems, startItems]
+  );
+
   return (
     <Sidebar {...props}>
       <SidebarHeader className="p-4">
@@ -216,10 +222,12 @@ export default function PersonalAppSidebar(props: React.ComponentProps<typeof Si
       </SidebarHeader>
 
       <SidebarContent>
-        <SidebarMenuList label="Dashboard" items={dashboardItems} />
-        {cloudItems.length > 0 && <SidebarMenuList label="Cloud" items={cloudItems} />}
-        <SidebarMenuList label="Account" items={accountItems} />
-        <SidebarMenuList label="Start" items={startItems} />
+        <SidebarMenuList label="Dashboard" items={dashboardItems} allUrls={allUrls} />
+        {cloudItems.length > 0 && (
+          <SidebarMenuList label="Cloud" items={cloudItems} allUrls={allUrls} />
+        )}
+        <SidebarMenuList label="Account" items={accountItems} allUrls={allUrls} />
+        <SidebarMenuList label="Start" items={startItems} allUrls={allUrls} />
       </SidebarContent>
 
       <SidebarUserFooter user={user} isLoading={isLoading} />

src/app/(app)/components/SidebarMenuList.tsx

@@ -21,10 +21,16 @@ type MenuItem = {
 type SidebarMenuListProps = {
   items: MenuItem[];
   label?: string;
+  allUrls?: string[];
 };
 
-export default function SidebarMenuList({ items, label = 'Dashboard' }: SidebarMenuListProps) {
+export default function SidebarMenuList({
+  items,
+  label = 'Dashboard',
+  allUrls,
+}: SidebarMenuListProps) {
   const pathname = usePathname();
+  const urlsToCheck = allUrls ?? items.map(i => i.url);
 
   return (
     <SidebarGroup>
@@ -35,11 +41,11 @@ export default function SidebarMenuList({ items, label = 'Dashboard' }: SidebarM
             const matchesPrefix = pathname === item.url || pathname.startsWith(item.url + '/');
             const hasMoreSpecificMatch =
               matchesPrefix &&
-              items.some(
-                other =>
-                  other.url !== item.url &&
-                  other.url.length > item.url.length &&
-                  (pathname === other.url || pathname.startsWith(other.url + '/'))
+              urlsToCheck.some(
+                url =>
+                  url !== item.url &&
+                  url.length > item.url.length &&
+                  (pathname === url || pathname.startsWith(url + '/'))
               );
             const isActive = matchesPrefix && !hasMoreSpecificMatch;
             return (