Merge pull request #695 from AutoMaker-Org/feature/bug-create-global-tooltip-provider-in-main-app-fi-ge48

refactor: Create global TooltipProvider in app.tsx to eliminate duplication

apps/ui/src/app.tsx

@@ -7,6 +7,7 @@ import { useSettingsSync } from './hooks/use-settings-sync';
 import { useCursorStatusInit } from './hooks/use-cursor-status-init';
 import { useProviderAuthInit } from './hooks/use-provider-auth-init';
 import { useAppStore } from './store/app-store';
+import { TooltipProvider } from '@/components/ui/tooltip';
 import './styles/global.css';
 import './styles/theme-imports';
 import './styles/font-imports';
@@ -75,9 +76,9 @@ export default function App() {
   }, []);
 
   return (
-    <>
+    <TooltipProvider delayDuration={300}>
       <RouterProvider router={router} />
       {showSplash && !disableSplashScreen && <SplashScreen onComplete={handleSplashComplete} />}
-    </>
+    </TooltipProvider>
   );
 }

apps/ui/src/components/layout/sidebar/components/sidebar-footer.tsx

@@ -5,7 +5,7 @@ import { formatShortcut } from '@/store/app-store';
 import { Activity, Settings, BookOpen, MessageSquare, ExternalLink } from 'lucide-react';
 import { useOSDetection } from '@/hooks/use-os-detection';
 import { getElectronAPI } from '@/lib/electron';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 
 function getOSAbbreviation(os: string): string {
   switch (os) {
@@ -72,7 +72,6 @@ export function SidebarFooter({
         <div className="flex flex-col items-center py-2 px-2 gap-1">
           {/* Running Agents */}
           {!hideRunningAgents && (
-            <TooltipProvider delayDuration={0}>
             <Tooltip>
               <TooltipTrigger asChild>
                 <button
@@ -121,11 +120,9 @@ export function SidebarFooter({
                 )}
               </TooltipContent>
             </Tooltip>
-            </TooltipProvider>
           )}
 
           {/* Settings */}
-          <TooltipProvider delayDuration={0}>
           <Tooltip>
             <TooltipTrigger asChild>
               <button
@@ -147,10 +144,7 @@ export function SidebarFooter({
                 data-testid="settings-button"
               >
                 <Settings
-                    className={cn(
+                  className={cn('w-[18px] h-[18px]', isActiveRoute('settings') && 'text-brand-500')}
-                      'w-[18px] h-[18px]',
-                      isActiveRoute('settings') && 'text-brand-500'
-                    )}
                 />
               </button>
             </TooltipTrigger>
@@ -161,11 +155,9 @@ export function SidebarFooter({
               </span>
             </TooltipContent>
           </Tooltip>
-          </TooltipProvider>
 
           {/* Documentation */}
           {!hideWiki && (
-            <TooltipProvider delayDuration={0}>
             <Tooltip>
               <TooltipTrigger asChild>
                 <button
@@ -185,11 +177,9 @@ export function SidebarFooter({
                 Documentation
               </TooltipContent>
             </Tooltip>
-            </TooltipProvider>
           )}
 
           {/* Feedback */}
-          <TooltipProvider delayDuration={0}>
           <Tooltip>
             <TooltipTrigger asChild>
               <button
@@ -209,7 +199,6 @@ export function SidebarFooter({
               Feedback
             </TooltipContent>
           </Tooltip>
-          </TooltipProvider>
         </div>
       </div>
     );

apps/ui/src/components/layout/sidebar/components/sidebar-header.tsx

@@ -15,7 +15,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 
 interface SidebarHeaderProps {
   sidebarOpen: boolean;
@@ -92,7 +92,6 @@ export function SidebarHeader({
           isMac && isElectron() && 'pt-[10px]'
         )}
       >
-        <TooltipProvider delayDuration={0}>
         <Tooltip>
           <TooltipTrigger asChild>
             <button
@@ -139,14 +138,12 @@ export function SidebarHeader({
             Go to Dashboard
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
 
         {/* Collapsed project icon with dropdown */}
         {currentProject && (
           <>
             <div className="w-full h-px bg-border/40 my-2" />
             <DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
-              <TooltipProvider delayDuration={0}>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <DropdownMenuTrigger asChild>
@@ -163,7 +160,6 @@ export function SidebarHeader({
                   {currentProject.name}
                 </TooltipContent>
               </Tooltip>
-              </TooltipProvider>
               <DropdownMenuContent
                 align="start"
                 side="right"

apps/ui/src/components/layout/sidebar/components/sidebar-navigation.tsx

@@ -13,7 +13,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 
 // Map section labels to icons
 const sectionIcons: Record<string, React.ComponentType<{ className?: string }>> = {
@@ -158,7 +158,6 @@ export function SidebarNavigation({
             {/* Section icon with dropdown (collapsed sidebar) */}
             {section.label && !sidebarOpen && SectionIcon && section.collapsible && isCollapsed && (
               <DropdownMenu>
-                <TooltipProvider delayDuration={0}>
                 <Tooltip>
                   <TooltipTrigger asChild>
                     <DropdownMenuTrigger asChild>
@@ -178,7 +177,6 @@ export function SidebarNavigation({
                     {section.label}
                   </TooltipContent>
                 </Tooltip>
-                </TooltipProvider>
                 <DropdownMenuContent side="right" align="start" sideOffset={8} className="w-48">
                   {section.items.map((item) => {
                     const ItemIcon = item.icon;

apps/ui/src/components/ui/keyboard-map.tsx

@@ -7,7 +7,7 @@ import {
 } from '@/store/app-store';
 import type { KeyboardShortcuts } from '@/store/app-store';
 import { cn } from '@/lib/utils';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
 import { CheckCircle2, X, RotateCcw, Edit2 } from 'lucide-react';
@@ -305,7 +305,6 @@ export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMap
   };
 
   return (
-    <TooltipProvider>
     <div className={cn('space-y-4', className)} data-testid="keyboard-map">
       {/* Legend */}
       <div className="flex flex-wrap gap-4 justify-center text-xs">
@@ -341,8 +340,8 @@ export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMap
           shortcuts configured
         </span>
         <span>
-            <strong className="text-foreground">{Object.keys(keyToShortcuts).length}</strong> keys
+          <strong className="text-foreground">{Object.keys(keyToShortcuts).length}</strong> keys in
-            in use
+          use
         </span>
         <span>
           <strong className="text-foreground">
@@ -352,7 +351,6 @@ export function KeyboardMap({ onKeySelect, selectedKey, className }: KeyboardMap
         </span>
       </div>
     </div>
-    </TooltipProvider>
   );
 }
 
@@ -508,7 +506,6 @@ export function ShortcutReferencePanel({ editable = false }: ShortcutReferencePa
   };
 
   return (
-    <TooltipProvider>
     <div className="space-y-4" data-testid="shortcut-reference-panel">
       {editable && (
         <div className="flex justify-end">
@@ -698,6 +695,5 @@ export function ShortcutReferencePanel({ editable = false }: ShortcutReferencePa
         );
       })}
     </div>
-    </TooltipProvider>
   );
 }

apps/ui/src/components/views/board-view/board-controls.tsx

@@ -1,4 +1,4 @@
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { ImageIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 
@@ -18,7 +18,6 @@ export function BoardControls({ isMounted, onShowBoardBackground }: BoardControl
   );
 
   return (
-    <TooltipProvider>
     <div className="flex items-center gap-2">
       {/* Board Background Button */}
       <Tooltip>
@@ -36,6 +35,5 @@ export function BoardControls({ isMounted, onShowBoardBackground }: BoardControl
         </TooltipContent>
       </Tooltip>
     </div>
-    </TooltipProvider>
   );
 }

apps/ui/src/components/views/board-view/components/kanban-card/card-badges.tsx

@@ -2,7 +2,7 @@
 import { memo, useEffect, useMemo, useState } from 'react';
 import { Feature, useAppStore } from '@/store/app-store';
 import { cn } from '@/lib/utils';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { AlertCircle, Lock, Hand, Sparkles, SkipForward } from 'lucide-react';
 import { getBlockingDependencies } from '@automaker/dependency-resolver';
 import { useShallow } from 'zustand/react/shallow';
@@ -28,7 +28,6 @@ export const CardBadges = memo(function CardBadges({ feature }: CardBadgesProps)
   return (
     <div className="flex flex-wrap items-center gap-1.5 px-3 pt-1.5 min-h-[24px]">
       {/* Error badge */}
-      <TooltipProvider delayDuration={200}>
       <Tooltip>
         <TooltipTrigger asChild>
           <div
@@ -45,7 +44,6 @@ export const CardBadges = memo(function CardBadges({ feature }: CardBadgesProps)
           <p>{feature.error}</p>
         </TooltipContent>
       </Tooltip>
-      </TooltipProvider>
     </div>
   );
 });
@@ -138,7 +136,6 @@ export const PriorityBadges = memo(function PriorityBadges({
     <div className="absolute top-2 left-2 flex items-center gap-1">
       {/* Priority badge */}
       {feature.priority && (
-        <TooltipProvider delayDuration={200}>
         <Tooltip>
           <TooltipTrigger asChild>
             <div
@@ -168,12 +165,10 @@ export const PriorityBadges = memo(function PriorityBadges({
             </p>
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
       )}
 
       {/* Manual verification badge */}
       {showManualVerification && (
-        <TooltipProvider delayDuration={200}>
         <Tooltip>
           <TooltipTrigger asChild>
             <div
@@ -190,12 +185,10 @@ export const PriorityBadges = memo(function PriorityBadges({
             <p>Manual verification required</p>
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
       )}
 
       {/* Blocked badge */}
       {isBlocked && (
-        <TooltipProvider delayDuration={200}>
         <Tooltip>
           <TooltipTrigger asChild>
             <div
@@ -223,12 +216,10 @@ export const PriorityBadges = memo(function PriorityBadges({
             </p>
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
       )}
 
       {/* Just Finished badge */}
       {isJustFinished && (
-        <TooltipProvider delayDuration={200}>
         <Tooltip>
           <TooltipTrigger asChild>
             <div
@@ -245,12 +236,10 @@ export const PriorityBadges = memo(function PriorityBadges({
             <p>Agent just finished working on this feature</p>
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
       )}
 
       {/* Pipeline exclusion badge */}
       {hasPipelineExclusions && (
-        <TooltipProvider delayDuration={200}>
         <Tooltip>
           <TooltipTrigger asChild>
             <div
@@ -278,7 +267,6 @@ export const PriorityBadges = memo(function PriorityBadges({
             </p>
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
       )}
     </div>
   );

apps/ui/src/components/views/board-view/components/list-view/list-row.tsx

@@ -3,7 +3,7 @@
 // @ts-nocheck
 import { memo, useCallback, useState, useEffect } from 'react';
 import { cn } from '@/lib/utils';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { AlertCircle, Lock, Hand, Sparkles, FileText } from 'lucide-react';
 import type { Feature } from '@/store/app-store';
 import { RowActions, type RowActionHandlers } from './row-actions';
@@ -149,7 +149,6 @@ const IndicatorBadges = memo(function IndicatorBadges({
 
   return (
     <div className="flex items-center gap-1 ml-2">
-      <TooltipProvider delayDuration={200}>
       {badges.map((badge) => (
         <Tooltip key={badge.key}>
           <TooltipTrigger asChild>
@@ -171,7 +170,6 @@ const IndicatorBadges = memo(function IndicatorBadges({
           </TooltipContent>
         </Tooltip>
       ))}
-      </TooltipProvider>
     </div>
   );
 });

apps/ui/src/components/views/board-view/dialogs/add-feature-dialog.tsx

@@ -50,7 +50,7 @@ import {
 } from '../shared';
 import type { WorkMode } from '../shared';
 import { PhaseModelSelector } from '@/components/views/settings-view/model-defaults/phase-model-selector';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import {
   getAncestors,
   formatAncestorContextForPrompt,
@@ -528,7 +528,6 @@ export function AddFeatureDialog({
                 <Cpu className="w-4 h-4 text-muted-foreground" />
                 <span>AI & Execution</span>
               </div>
-              <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <button
@@ -547,7 +546,6 @@ export function AddFeatureDialog({
                   <p>Change default model and planning settings for new features</p>
                 </TooltipContent>
               </Tooltip>
-              </TooltipProvider>
             </div>
 
             <div className="space-y-1.5">
@@ -578,7 +576,6 @@ export function AddFeatureDialog({
                     compact
                   />
                 ) : (
-                  <TooltipProvider>
                   <Tooltip>
                     <TooltipTrigger asChild>
                       <div>
@@ -595,7 +592,6 @@ export function AddFeatureDialog({
                       <p>Planning modes are only available for Claude Provider</p>
                     </TooltipContent>
                   </Tooltip>
-                  </TooltipProvider>
                 )}
               </div>
               <div className="space-y-1.5">

apps/ui/src/components/views/board-view/dialogs/edit-feature-dialog.tsx

@@ -41,7 +41,7 @@ import {
 } from '../shared';
 import type { WorkMode } from '../shared';
 import { PhaseModelSelector } from '@/components/views/settings-view/model-defaults/phase-model-selector';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { DependencyTreeDialog } from './dependency-tree-dialog';
 import { isClaudeModel, supportsReasoningEffort } from '@automaker/types';
 
@@ -420,7 +420,6 @@ export function EditFeatureDialog({
                 <Cpu className="w-4 h-4 text-muted-foreground" />
                 <span>AI & Execution</span>
               </div>
-              <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <button
@@ -439,7 +438,6 @@ export function EditFeatureDialog({
                   <p>Change default model and planning settings for new features</p>
                 </TooltipContent>
               </Tooltip>
-              </TooltipProvider>
             </div>
 
             <div className="space-y-1.5">
@@ -470,7 +468,6 @@ export function EditFeatureDialog({
                     compact
                   />
                 ) : (
-                  <TooltipProvider>
                   <Tooltip>
                     <TooltipTrigger asChild>
                       <div>
@@ -487,7 +484,6 @@ export function EditFeatureDialog({
                       <p>Planning modes are only available for Claude Provider</p>
                     </TooltipContent>
                   </Tooltip>
-                  </TooltipProvider>
                 )}
               </div>
               <div className="space-y-1.5">

apps/ui/src/components/views/board-view/dialogs/mass-edit-dialog.tsx

@@ -24,7 +24,7 @@ import type { WorkMode } from '../shared';
 import { PhaseModelSelector } from '@/components/views/settings-view/model-defaults/phase-model-selector';
 import { isCursorModel, isClaudeModel, type PhaseModelEntry } from '@automaker/types';
 import { cn } from '@/lib/utils';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 
 interface MassEditDialogProps {
   open: boolean;
@@ -302,7 +302,6 @@ export function MassEditDialog({
               />
             </FieldWrapper>
           ) : (
-            <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
                 <div
@@ -332,7 +331,6 @@ export function MassEditDialog({
                 <p>Planning modes are only available for Claude Provider</p>
               </TooltipContent>
             </Tooltip>
-            </TooltipProvider>
           )}
 
           {/* Priority */}

apps/ui/src/components/views/board-view/kanban-board.tsx

@@ -13,7 +13,7 @@ import { Button } from '@/components/ui/button';
 import { KanbanColumn, KanbanCard, EmptyStateCard } from './components';
 import { Feature, useAppStore, formatShortcut } from '@/store/app-store';
 import { Archive, Settings2, CheckSquare, GripVertical, Plus, CheckCircle2 } from 'lucide-react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { useResponsiveKanban } from '@/hooks/use-responsive-kanban';
 import { getColumnsWithPipeline, type ColumnId } from './constants';
 import type { PipelineConfig } from '@automaker/types';
@@ -358,7 +358,6 @@ export function KanbanBoard({
                   contentClassName="perf-contain"
                   headerAction={
                     column.id === 'verified' ? (
-                      <TooltipProvider>
                       <div className="flex items-center gap-1">
                         {columnFeatures.length > 0 && (
                           <Tooltip>
@@ -400,7 +399,6 @@ export function KanbanBoard({
                           </TooltipContent>
                         </Tooltip>
                       </div>
-                      </TooltipProvider>
                     ) : column.id === 'backlog' ? (
                       <div className="flex items-center gap-1">
                         <Button

apps/ui/src/components/views/board-view/worktree-panel/components/tooltip-wrapper.tsx

@@ -1,5 +1,5 @@
 import type { ReactElement, ReactNode } from 'react';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 
 interface TooltipWrapperProps {
   /** The element to wrap with a tooltip */
@@ -29,7 +29,6 @@ export function TooltipWrapper({
   }
 
   return (
-    <TooltipProvider>
     <Tooltip>
       <TooltipTrigger asChild>
         {/* The div wrapper is necessary for tooltips to work on disabled elements */}
@@ -39,6 +38,5 @@ export function TooltipWrapper({
         <p>{tooltipContent}</p>
       </TooltipContent>
     </Tooltip>
-    </TooltipProvider>
   );
 }

apps/ui/src/components/views/board-view/worktree-panel/components/worktree-dropdown-item.tsx

@@ -1,5 +1,5 @@
 import { DropdownMenuItem } from '@/components/ui/dropdown-menu';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { Check, CircleDot, Globe, GitPullRequest, FlaskConical } from 'lucide-react';
 import { Spinner } from '@/components/ui/spinner';
 import { cn } from '@/lib/utils';
@@ -101,14 +101,12 @@ export function WorktreeDropdownItem({
 
         {/* Branch name with optional tooltip */}
         {isBranchNameTruncated ? (
-          <TooltipProvider>
           <Tooltip>
             <TooltipTrigger asChild>{branchNameElement}</TooltipTrigger>
             <TooltipContent>
               <p className="font-mono text-xs">{worktree.branch}</p>
             </TooltipContent>
           </Tooltip>
-          </TooltipProvider>
         ) : (
           branchNameElement
         )}

apps/ui/src/components/views/board-view/worktree-panel/components/worktree-dropdown.tsx

@@ -8,7 +8,7 @@ import {
   DropdownMenuTrigger,
   DropdownMenuGroup,
 } from '@/components/ui/dropdown-menu';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import {
   GitBranch,
   ChevronDown,
@@ -335,14 +335,12 @@ export function WorktreeDropdown({
   const dropdownTrigger = <DropdownMenuTrigger asChild>{triggerButton}</DropdownMenuTrigger>;
 
   const triggerWithTooltip = isBranchNameTruncated ? (
-    <TooltipProvider>
     <Tooltip>
       <TooltipTrigger asChild>{dropdownTrigger}</TooltipTrigger>
       <TooltipContent>
         <p className="font-mono text-xs">{displayBranch}</p>
       </TooltipContent>
     </Tooltip>
-    </TooltipProvider>
   ) : (
     dropdownTrigger
   );

apps/ui/src/components/views/board-view/worktree-panel/components/worktree-tab.tsx

@@ -3,7 +3,7 @@ import { Button } from '@/components/ui/button';
 import { Globe, CircleDot, GitPullRequest } from 'lucide-react';
 import { Spinner } from '@/components/ui/spinner';
 import { cn } from '@/lib/utils';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { useDroppable } from '@dnd-kit/core';
 import type {
   WorktreeInfo,
@@ -271,7 +271,6 @@ export function WorktreeTab({
               </span>
             )}
             {hasChanges && (
-              <TooltipProvider>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <span
@@ -293,7 +292,6 @@ export function WorktreeTab({
                   </p>
                 </TooltipContent>
               </Tooltip>
-              </TooltipProvider>
             )}
             {prBadge}
           </Button>
@@ -340,7 +338,6 @@ export function WorktreeTab({
             </span>
           )}
           {hasChanges && (
-            <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
                 <span
@@ -362,14 +359,12 @@ export function WorktreeTab({
                 </p>
               </TooltipContent>
             </Tooltip>
-            </TooltipProvider>
           )}
           {prBadge}
         </Button>
       )}
 
       {isDevServerRunning && (
-        <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>
             <Button
@@ -391,11 +386,9 @@ export function WorktreeTab({
             <p>Open dev server (:{devServerInfo?.port})</p>
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
       )}
 
       {isAutoModeRunning && (
-        <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>
             <span
@@ -411,7 +404,6 @@ export function WorktreeTab({
             <p>Auto Mode Running</p>
           </TooltipContent>
         </Tooltip>
-        </TooltipProvider>
       )}
 
       <WorktreeActionsDropdown

apps/ui/src/components/views/graph-view/components/graph-controls.tsx

@@ -1,6 +1,6 @@
 import { useReactFlow, Panel } from '@xyflow/react';
 import { Button } from '@/components/ui/button';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import {
   ZoomIn,
   ZoomOut,
@@ -30,7 +30,6 @@ export function GraphControls({
 
   return (
     <Panel position="bottom-left" className="flex flex-col gap-2">
-      <TooltipProvider delayDuration={200}>
       <div
         className="flex flex-col gap-1 p-1.5 rounded-lg backdrop-blur-sm border border-border shadow-lg text-popover-foreground"
         style={{ backgroundColor: 'color-mix(in oklch, var(--popover) 90%, transparent)' }}
@@ -132,7 +131,6 @@ export function GraphControls({
           <TooltipContent side="right">{isLocked ? 'Unlock Nodes' : 'Lock Nodes'}</TooltipContent>
         </Tooltip>
       </div>
-      </TooltipProvider>
     </Panel>
   );
 }

apps/ui/src/components/views/graph-view/components/graph-filter-controls.tsx

@@ -4,7 +4,7 @@ import { Checkbox } from '@/components/ui/checkbox';
 import { Switch } from '@/components/ui/switch';
 import { Input } from '@/components/ui/input';
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import {
   Filter,
   X,
@@ -115,7 +115,6 @@ export function GraphFilterControls({
 
   return (
     <Panel position="top-left" className="flex items-center gap-2">
-      <TooltipProvider delayDuration={200}>
       <div
         className="flex items-center gap-2 p-2 rounded-lg backdrop-blur-sm border border-border shadow-lg text-popover-foreground"
         style={{ backgroundColor: 'color-mix(in oklch, var(--popover) 90%, transparent)' }}
@@ -165,11 +164,13 @@ export function GraphFilterControls({
             </TooltipTrigger>
             <TooltipContent>Filter by Category</TooltipContent>
           </Tooltip>
-            <PopoverContent align="start" className="w-56 p-2">
+          <PopoverContent
+            align="start"
+            className="w-56 p-2"
+            onOpenAutoFocus={(e) => e.preventDefault()}
+          >
             <div className="space-y-2">
-                <div className="text-xs font-medium text-muted-foreground px-2 py-1">
+              <div className="text-xs font-medium text-muted-foreground px-2 py-1">Categories</div>
-                  Categories
-                </div>
 
               {/* Select All option */}
               <div
@@ -239,7 +240,11 @@ export function GraphFilterControls({
             </TooltipTrigger>
             <TooltipContent>Filter by Status</TooltipContent>
           </Tooltip>
-            <PopoverContent align="start" className="w-56 p-2">
+          <PopoverContent
+            align="start"
+            className="w-56 p-2"
+            onOpenAutoFocus={(e) => e.preventDefault()}
+          >
             <div className="space-y-2">
               <div className="text-xs font-medium text-muted-foreground px-2 py-1">Status</div>
 
@@ -356,7 +361,6 @@ export function GraphFilterControls({
           </>
         )}
       </div>
-      </TooltipProvider>
     </Panel>
   );
 }

apps/ui/src/components/views/graph-view/components/task-node.tsx

@@ -26,7 +26,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 
 type TaskNodeProps = NodeProps & {
   data: TaskNodeData;
@@ -286,7 +286,6 @@ export const TaskNode = memo(function TaskNode({ data, selected }: TaskNodeProps
 
             {/* Blocked indicator */}
             {data.isBlocked && !data.error && data.status === 'backlog' && (
-              <TooltipProvider delayDuration={200}>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <div className="p-1 rounded bg-orange-500/20">
@@ -297,12 +296,10 @@ export const TaskNode = memo(function TaskNode({ data, selected }: TaskNodeProps
                   <p>Blocked by {data.blockingDependencies.length} dependencies</p>
                 </TooltipContent>
               </Tooltip>
-              </TooltipProvider>
             )}
 
             {/* Error indicator */}
             {data.error && (
-              <TooltipProvider delayDuration={200}>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <div className="p-1 rounded bg-[var(--status-error-bg)]">
@@ -313,12 +310,10 @@ export const TaskNode = memo(function TaskNode({ data, selected }: TaskNodeProps
                   <p>{data.error}</p>
                 </TooltipContent>
               </Tooltip>
-              </TooltipProvider>
             )}
 
             {/* Stopped indicator - task is in_progress but not actively running */}
             {isStopped && (
-              <TooltipProvider delayDuration={200}>
               <Tooltip>
                 <TooltipTrigger asChild>
                   <div className="p-1 rounded bg-[var(--status-warning-bg)]">
@@ -329,7 +324,6 @@ export const TaskNode = memo(function TaskNode({ data, selected }: TaskNodeProps
                   <p>Task paused - click menu to resume</p>
                 </TooltipContent>
               </Tooltip>
-              </TooltipProvider>
             )}
 
             {/* Actions dropdown */}

apps/ui/src/components/views/settings-view/account/account-section.tsx

@@ -8,7 +8,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select';
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
 import { toast } from 'sonner';
 import { LogOut, User, Code2, RefreshCw } from 'lucide-react';
 import { Spinner } from '@/components/ui/spinner';
@@ -134,7 +134,6 @@ export function AccountSection() {
                 })}
               </SelectContent>
             </Select>
-            <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
                 <Button
@@ -151,7 +150,6 @@ export function AccountSection() {
                 <p>Refresh available editors</p>
               </TooltipContent>
             </Tooltip>
-            </TooltipProvider>
           </div>
         </div>