diff --git a/packages/app/src/app/settings.tsx b/packages/app/src/app/settings.tsx
index 4ed657caf..d87d402c6 100644
--- a/packages/app/src/app/settings.tsx
+++ b/packages/app/src/app/settings.tsx
@@ -114,17 +114,20 @@ const styles = StyleSheet.create((theme) => ({
   hostHeaderRow: {
     flexDirection: "row",
     alignItems: "center",
-    justifyContent: "space-between",
+    gap: theme.spacing[3],
   },
   hostHeaderRight: {
     flexDirection: "row",
     alignItems: "center",
     gap: theme.spacing[2],
+    flexShrink: 0,
   },
   hostLabel: {
     color: theme.colors.foreground,
     fontSize: theme.fontSize.base,
     fontWeight: theme.fontWeight.normal,
+    flex: 1,
+    flexShrink: 1,
   },
   hostError: {
     color: theme.colors.palette.red[300],
@@ -1055,7 +1058,7 @@ function DaemonCard({
     <View style={styles.hostCard} testID={`daemon-card-${daemon.serverId}`}>
       <View style={styles.hostCardContent}>
         <View style={styles.hostHeaderRow}>
-          <Text style={styles.hostLabel}>{daemon.label}</Text>
+          <Text style={styles.hostLabel} numberOfLines={1}>{daemon.label}</Text>
           <View style={styles.hostHeaderRight}>
             <View style={[styles.statusPill, { backgroundColor: statusPillBg }]}>
               <View style={[styles.statusDot, { backgroundColor: statusColor }]} />
diff --git a/packages/app/src/components/sliding-sidebar.tsx b/packages/app/src/components/sliding-sidebar.tsx
index e4a641d84..b672c95ba 100644
--- a/packages/app/src/components/sliding-sidebar.tsx
+++ b/packages/app/src/components/sliding-sidebar.tsx
@@ -26,7 +26,7 @@ import { deriveSidebarShortcutAgentKeys } from "@/utils/sidebar-shortcuts";
 import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
 
 const DESKTOP_SIDEBAR_WIDTH = 320;
-const SIDEBAR_AGENT_LIMIT = 15;
+const SIDEBAR_AGENT_LIMIT = 50; // temporary for screenshots
 
 interface SlidingSidebarProps {
   selectedAgentId?: string;
@@ -83,12 +83,8 @@ export function SlidingSidebar({ selectedAgentId }: SlidingSidebarProps) {
     });
   }, [agents]);
 
-  const limitedAgents = useMemo(
-    () => sortedAgents.slice(0, SIDEBAR_AGENT_LIMIT),
-    [sortedAgents]
-  );
-
-  const sidebarSections = useSidebarAgentSections(limitedAgents);
+  // Pass all agents to grouping, limit is applied inside groupAgents per-project
+  const sidebarSections = useSidebarAgentSections(sortedAgents);
   const collapsedProjectKeys = useSidebarCollapsedSectionsStore((s) => s.collapsedProjectKeys);
   const setSidebarShortcutAgentKeys = useKeyboardNavStore((s) => s.setSidebarShortcutAgentKeys);
   const sidebarShortcutAgentKeys = useMemo(() => {
@@ -294,7 +290,7 @@ export function SlidingSidebar({ selectedAgentId }: SlidingSidebarProps) {
 
               {/* Middle: scrollable agent list */}
               <GroupedAgentList
-                agents={limitedAgents}
+                agents={sortedAgents}
                 isRefreshing={isManualRefresh && isRevalidating}
                 onRefresh={handleRefresh}
                 selectedAgentId={selectedAgentId}
@@ -420,7 +416,7 @@ export function SlidingSidebar({ selectedAgentId }: SlidingSidebarProps) {
 
       {/* Middle: scrollable agent list */}
       <GroupedAgentList
-        agents={limitedAgents}
+        agents={sortedAgents}
         isRefreshing={isManualRefresh && isRevalidating}
         onRefresh={handleRefresh}
         selectedAgentId={selectedAgentId}
diff --git a/packages/app/src/hooks/use-global-keyboard-nav.ts b/packages/app/src/hooks/use-global-keyboard-nav.ts
index 53ce81259..c115bdf08 100644
--- a/packages/app/src/hooks/use-global-keyboard-nav.ts
+++ b/packages/app/src/hooks/use-global-keyboard-nav.ts
@@ -89,12 +89,19 @@ export function useGlobalKeyboardNav({
       const key = event.key ?? "";
       const lowerKey = key.toLowerCase();
 
-      if (key === "Alt") {
+      if (key === "Alt" && !event.shiftKey) {
         useKeyboardNavStore.getState().setAltDown(true);
       }
-      if (isTauri && (key === "Meta" || key === "Control")) {
+      if (isTauri && (key === "Meta" || key === "Control") && !event.shiftKey) {
         useKeyboardNavStore.getState().setCmdOrCtrlDown(true);
       }
+      // If shift is pressed while a modifier is held, hide the badges
+      if (key === "Shift") {
+        const state = useKeyboardNavStore.getState();
+        if (state.altDown || state.cmdOrCtrlDown) {
+          state.resetModifiers();
+        }
+      }
 
       // Cmd+B: toggle sidebar
       if (
diff --git a/packages/app/src/utils/agent-grouping.ts b/packages/app/src/utils/agent-grouping.ts
index cd9955544..455c0204a 100644
--- a/packages/app/src/utils/agent-grouping.ts
+++ b/packages/app/src/utils/agent-grouping.ts
@@ -210,6 +210,9 @@ export interface GroupedAgents {
 
 const ACTIVE_GRACE_PERIOD_MS = 2 * 24 * 60 * 60 * 1000; // 2 days (temporary for screenshots)
 
+// eslint-disable-next-line no-console
+console.log('[agent-grouping] ACTIVE_GRACE_PERIOD_MS:', ACTIVE_GRACE_PERIOD_MS, 'ms =', ACTIVE_GRACE_PERIOD_MS / (1000 * 60 * 60), 'hours');
+
 interface GroupAgentsOptions {
   /**
    * Optional function to read a remote URL for an agent.
@@ -245,10 +248,21 @@ export function groupAgents(
 
     const isRunningOrAttention =
       agent.status === "running" || agent.requiresAttention;
-    const isRecentlyActive =
-      now - agent.lastActivityAt.getTime() < ACTIVE_GRACE_PERIOD_MS;
+    const ageDiff = now - agent.lastActivityAt.getTime();
+    const isRecentlyActive = ageDiff < ACTIVE_GRACE_PERIOD_MS;
     const isActive = isRunningOrAttention || isRecentlyActive;
 
+    // eslint-disable-next-line no-console
+    console.log('[agent-grouping] agent:', agent.title || agent.id, {
+      status: agent.status,
+      lastActivityAt: agent.lastActivityAt,
+      ageDiffHours: ageDiff / (1000 * 60 * 60),
+      gracePeriodHours: ACTIVE_GRACE_PERIOD_MS / (1000 * 60 * 60),
+      isRunningOrAttention,
+      isRecentlyActive,
+      isActive,
+    });
+
     if (isActive) {
       activeAgents.push(agent);
     } else {
diff --git a/packages/app/src/utils/test-daemon-connection.ts b/packages/app/src/utils/test-daemon-connection.ts
index e4ecb25df..ea4a284df 100644
--- a/packages/app/src/utils/test-daemon-connection.ts
+++ b/packages/app/src/utils/test-daemon-connection.ts
@@ -1,6 +1,7 @@
 import { DaemonClient } from "@server/client/daemon-client";
 import type { ConnectionState } from "@server/client/daemon-client";
 import { buildDaemonWebSocketUrl } from "./daemon-endpoints";
+import { createTauriWebSocketTransportFactory } from "./tauri-daemon-transport";
 
 function normalizeNonEmptyString(value: unknown): string | null {
   if (typeof value !== "string") return null;
@@ -45,9 +46,11 @@ export async function probeDaemonEndpoint(
   const timeoutMs = options?.timeoutMs ?? 6000;
   const url = buildDaemonWebSocketUrl(endpoint);
 
+  const tauriTransportFactory = createTauriWebSocketTransportFactory();
   const client = new DaemonClient({
     url,
     suppressSendErrors: true,
+    ...(tauriTransportFactory ? { transportFactory: tauriTransportFactory } : {}),
   });
 
   try {
diff --git a/packages/server/src/server/bootstrap.ts b/packages/server/src/server/bootstrap.ts
index 82c54fd28..92f13cff7 100644
--- a/packages/server/src/server/bootstrap.ts
+++ b/packages/server/src/server/bootstrap.ts
@@ -136,6 +136,9 @@ export async function createPaseoDaemon(
   // CORS - allow same-origin + configured origins
   const allowedOrigins = new Set([
     ...config.corsAllowedOrigins,
+    // Tauri desktop app WebView origin (used for fetch/WebSocket in production builds).
+    // This origin can't be produced by normal websites, so it's safe to allow by default.
+    "tauri://localhost",
     // For TCP, add localhost variants
     ...(listenTarget.type === "tcp"
       ? [
diff --git a/packages/website/public/paseo-mockup.png b/packages/website/public/paseo-mockup.png
index 29dfed10b..17fd65d21 100644
Binary files a/packages/website/public/paseo-mockup.png and b/packages/website/public/paseo-mockup.png differ