diff --git a/frontend/src/app/pages/AgentChat/OpenSwarmThread/OpenSwarmThread.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/OpenSwarmThread.tsx
index 8b723495..52914051 100644
--- a/frontend/src/app/pages/AgentChat/OpenSwarmThread/OpenSwarmThread.tsx
+++ b/frontend/src/app/pages/AgentChat/OpenSwarmThread/OpenSwarmThread.tsx
@@ -6,8 +6,8 @@ import {
   AuiIf,
 } from '@assistant-ui/react';
 import { ArrowDownIcon } from 'lucide-react';
-import { Button } from '@/components/ui/button';
-import { TooltipProvider } from '@/components/ui/tooltip';
+import { Button } from '@/app/pages/AgentChat/_shared/button';
+import { TooltipProvider } from './components/tooltip';
 import { TooltipIconButton } from './components/TooltipIconButton';
 import { UserMessage } from './components/UserMessage/UserMessage';
 import { AssistantMessage } from './components/AssistantMessage/AssistantMessage';
diff --git a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackContent.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackContent.tsx
index c36b2910..ac54a653 100644
--- a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackContent.tsx
+++ b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackContent.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { CollapsibleContent } from "@/components/ui/collapsible";
+import { CollapsibleContent } from "@/app/pages/AgentChat/_shared/collapsible";
 import { cn } from "@/lib/utils";
 
 
diff --git a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackRoot.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackRoot.tsx
index 4f41f33c..51480105 100644
--- a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackRoot.tsx
+++ b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackRoot.tsx
@@ -4,7 +4,7 @@ import { useCallback, useRef, useState } from "react";
 import {
   useScrollLock,
 } from "@assistant-ui/react";
-import { Collapsible } from "@/components/ui/collapsible";
+import { Collapsible } from "@/app/pages/AgentChat/_shared/collapsible";
 import { cn } from "@/lib/utils";
 
 const ANIMATION_DURATION = 200;
diff --git a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackTrigger.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackTrigger.tsx
index 8ba37222..fe9b1d45 100644
--- a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackTrigger.tsx
+++ b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/AssistantMessage/ToolFallback/components/ToolFallbackTrigger.tsx
@@ -8,7 +8,7 @@ import {
   XCircleIcon,
 } from "lucide-react";
 import { type ToolCallMessagePartStatus } from "@assistant-ui/react";
-import { CollapsibleTrigger } from "@/components/ui/collapsible";
+import { CollapsibleTrigger } from "@/app/pages/AgentChat/_shared/collapsible";
 import { cn } from "@/lib/utils";
 
 type ToolStatus = ToolCallMessagePartStatus["type"];
diff --git a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/TooltipIconButton.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/TooltipIconButton.tsx
index b4496985..ce4075e6 100644
--- a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/TooltipIconButton.tsx
+++ b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/TooltipIconButton.tsx
@@ -7,8 +7,8 @@ import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { Button } from "@/components/ui/button";
+} from "./tooltip";
+import { Button } from "@/app/pages/AgentChat/_shared/button";
 import { cn } from "@/lib/utils";
 
 type TooltipIconButtonProps = ComponentPropsWithRef<typeof Button> & {
diff --git a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/UserMessageAttachments.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/UserMessageAttachments.tsx
index 0f49b041..db8af860 100644
--- a/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/UserMessageAttachments.tsx
+++ b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/UserMessageAttachments.tsx
@@ -13,14 +13,14 @@ import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
-} from "@/components/ui/tooltip";
+} from "../tooltip";
 import {
   Dialog,
   DialogTitle,
   DialogContent,
   DialogTrigger,
-} from "@/components/ui/dialog";
-import { Avatar, AvatarImage, AvatarFallback } from "@/components/ui/avatar";
+} from "./dialog";
+import { Avatar, AvatarImage, AvatarFallback } from "./avatar";
 import { TooltipIconButton } from "../TooltipIconButton";
 import { cn } from "@/lib/utils";
 
diff --git a/frontend/src/components/ui/avatar.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/avatar.tsx
similarity index 100%
rename from frontend/src/components/ui/avatar.tsx
rename to frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/avatar.tsx
diff --git a/frontend/src/components/ui/dialog.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/dialog.tsx
similarity index 100%
rename from frontend/src/components/ui/dialog.tsx
rename to frontend/src/app/pages/AgentChat/OpenSwarmThread/components/UserMessage/dialog.tsx
diff --git a/frontend/src/components/ui/tooltip.tsx b/frontend/src/app/pages/AgentChat/OpenSwarmThread/components/tooltip.tsx
similarity index 100%
rename from frontend/src/components/ui/tooltip.tsx
rename to frontend/src/app/pages/AgentChat/OpenSwarmThread/components/tooltip.tsx
diff --git a/frontend/src/components/ui/button.tsx b/frontend/src/app/pages/AgentChat/_shared/Button.tsx
similarity index 100%
rename from frontend/src/components/ui/button.tsx
rename to frontend/src/app/pages/AgentChat/_shared/Button.tsx
diff --git a/frontend/src/components/ui/collapsible.tsx b/frontend/src/app/pages/AgentChat/_shared/collapsible.tsx
similarity index 100%
rename from frontend/src/components/ui/collapsible.tsx
rename to frontend/src/app/pages/AgentChat/_shared/collapsible.tsx
diff --git a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ActionButtons/ActionButtons.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ActionButtons/ActionButtons.tsx
index f9a99083..806b8d79 100644
--- a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ActionButtons/ActionButtons.tsx
+++ b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ActionButtons/ActionButtons.tsx
@@ -3,7 +3,7 @@
 import type { Action } from "../../utils/types";
 import { useActionButtons } from "./useActionButtons";
 import { cn } from "@/lib/utils";
-import { Button } from "@/components/ui/button";
+import { Button } from "@/app/pages/AgentChat/_shared/button";
 
 interface ActionButtonsProps {
   actions: Action[];
diff --git a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolApproval/ApprovalCard/_adapter.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolApproval/ApprovalCard/_adapter.tsx
index ae37fd77..4453de82 100644
--- a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolApproval/ApprovalCard/_adapter.tsx
+++ b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolApproval/ApprovalCard/_adapter.tsx
@@ -1,2 +1,2 @@
 export { cn } from "@/lib/utils";
-export { Separator } from "@/components/ui/separator";
+export { Separator } from "../../separator";
diff --git a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/_adapter.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/_adapter.tsx
index 43b0c941..04631370 100644
--- a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/_adapter.tsx
+++ b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/OptionList/_adapter.tsx
@@ -1,3 +1,3 @@
 export { cn } from "@/lib/utils";
-export { Button } from "@/components/ui/button";
-export { Separator } from "@/components/ui/separator";
+export { Button } from "@/app/pages/AgentChat/_shared/button";
+export { Separator } from "../../separator";
diff --git a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/QuestionFlow/_adapter.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/QuestionFlow/_adapter.tsx
index 43b0c941..04631370 100644
--- a/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/QuestionFlow/_adapter.tsx
+++ b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/ToolQuestion/QuestionFlow/_adapter.tsx
@@ -1,3 +1,3 @@
 export { cn } from "@/lib/utils";
-export { Button } from "@/components/ui/button";
-export { Separator } from "@/components/ui/separator";
+export { Button } from "@/app/pages/AgentChat/_shared/button";
+export { Separator } from "../../separator";
diff --git a/frontend/src/components/ui/separator.tsx b/frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/separator.tsx
similarity index 100%
rename from frontend/src/components/ui/separator.tsx
rename to frontend/src/app/pages/AgentChat/toolkit/approvalToolkit/components/separator.tsx
diff --git a/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeBlock/_adapter.tsx b/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeBlock/_adapter.tsx
index 2dda5216..a4cf635f 100644
--- a/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeBlock/_adapter.tsx
+++ b/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeBlock/_adapter.tsx
@@ -1,3 +1,3 @@
 export { cn } from "@/lib/utils";
-export { Button } from "@/components/ui/button";
-export { Collapsible, CollapsibleTrigger } from "@/components/ui/collapsible";
+export { Button } from "@/app/pages/AgentChat/_shared/button";
+export { Collapsible, CollapsibleTrigger } from "@/app/pages/AgentChat/_shared/collapsible";
diff --git a/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeDiff/_adapter.tsx b/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeDiff/_adapter.tsx
index 2dda5216..a4cf635f 100644
--- a/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeDiff/_adapter.tsx
+++ b/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/CodeDiff/_adapter.tsx
@@ -1,3 +1,3 @@
 export { cn } from "@/lib/utils";
-export { Button } from "@/components/ui/button";
-export { Collapsible, CollapsibleTrigger } from "@/components/ui/collapsible";
+export { Button } from "@/app/pages/AgentChat/_shared/button";
+export { Collapsible, CollapsibleTrigger } from "@/app/pages/AgentChat/_shared/collapsible";
diff --git a/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/Terminal/_adapter.tsx b/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/Terminal/_adapter.tsx
index 2dda5216..a4cf635f 100644
--- a/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/Terminal/_adapter.tsx
+++ b/frontend/src/app/pages/AgentChat/toolkit/nativeToolkit/components/Terminal/_adapter.tsx
@@ -1,3 +1,3 @@
 export { cn } from "@/lib/utils";
-export { Button } from "@/components/ui/button";
-export { Collapsible, CollapsibleTrigger } from "@/components/ui/collapsible";
+export { Button } from "@/app/pages/AgentChat/_shared/button";
+export { Collapsible, CollapsibleTrigger } from "@/app/pages/AgentChat/_shared/collapsible";