diff --git a/src/renderer/src/components/sidebar/WorktreeCardSlot.tsx b/src/renderer/src/components/sidebar/WorktreeCardSlot.tsx
index 51d6a3b63b7..d81fbe6bd42 100644
--- a/src/renderer/src/components/sidebar/WorktreeCardSlot.tsx
+++ b/src/renderer/src/components/sidebar/WorktreeCardSlot.tsx
@@ -3,8 +3,8 @@ import { Activity, ChevronRight, CircleX } from 'lucide-react'
 import { AgentQuestionIcon } from '@/components/AgentQuestionIcon'
 import { AgentWorkingSpinner } from '@/components/AgentWorkingSpinner'
 import { translate } from '@/i18n/i18n'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
-import { cn } from '@/lib/utils'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
+import { cn } from '@/lib/class-names'
 import type { SlotException, SlotSignal } from './worktree-card-slot-signal'
 import type { SlotTarget } from './worktree-card-slot-targets'
 import { SlotJumpTrigger } from './worktree-card-slot-jump'
diff --git a/src/renderer/src/components/sidebar/worktree-card-host-name.tsx b/src/renderer/src/components/sidebar/worktree-card-host-name.tsx
index 5c55145d461..300ac959479 100644
--- a/src/renderer/src/components/sidebar/worktree-card-host-name.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-host-name.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Server, ServerOff } from 'lucide-react'
 import { translate } from '@/i18n/i18n'
-import { cn } from '@/lib/utils'
+import { cn } from '@/lib/class-names'
 import type { WorktreeCardController } from './workspace-card/controller/use-worktree-card-controller'
 
 export type WorktreeCardHost = {
diff --git a/src/renderer/src/components/sidebar/worktree-card-slot-jump.tsx b/src/renderer/src/components/sidebar/worktree-card-slot-jump.tsx
index 1eb2fb6c008..bad57d1a302 100644
--- a/src/renderer/src/components/sidebar/worktree-card-slot-jump.tsx
+++ b/src/renderer/src/components/sidebar/worktree-card-slot-jump.tsx
@@ -12,8 +12,8 @@ import {
 } from '@/components/ui/dropdown-menu'
 import { translate } from '@/i18n/i18n'
 import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
-import { cn } from '@/lib/utils'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
+import { cn } from '@/lib/class-names'
 import { useAppStore } from '@/store'
 import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label'
 import { getAgentRowPrimaryText } from '../../../../shared/agent-status/presentation/agent-row-primary-text'