diff --git a/OPENGUI.png b/OPENGUI.png
deleted file mode 100644
index c533569..0000000
Binary files a/OPENGUI.png and /dev/null differ
diff --git a/package.json b/package.json
index 3e849ac..3be9d46 100644
--- a/package.json
+++ b/package.json
@@ -67,9 +67,9 @@
 		"@opencode-ai/sdk": "^1.2.15",
 		"@radix-ui/react-label": "^2.1.8",
 		"@radix-ui/react-select": "^2.2.6",
-		"@radix-ui/react-slot": "^1.2.4",
+
 		"@radix-ui/react-tabs": "^1.1.13",
-		"amadeus": "^11.0.0",
+
 		"class-variance-authority": "^0.7.1",
 		"clsx": "^2.1.1",
 		"katex": "^0.16.33",
diff --git a/src/App.tsx b/src/App.tsx
index 3d6b89d..6120005 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -310,5 +310,3 @@ export function App() {
 		</OpenCodeProvider>
 	);
 }
-
-export default App;
diff --git a/src/components/AppSidebar.tsx b/src/components/AppSidebar.tsx
index d8cfa82..1393330 100644
--- a/src/components/AppSidebar.tsx
+++ b/src/components/AppSidebar.tsx
@@ -60,9 +60,6 @@ import { MergeDialog } from "./MergeDialog";
 import { getColorBorderClass, SessionContextMenu } from "./SessionContextMenu";
 import { WorktreeDialog } from "./WorktreeDialog";
 
-/** @deprecated Use getProjectName from @/lib/utils instead. */
-const projectName = (directory: string) => getProjectName(directory, directory);
-
 /** Build a "create pull request" URL from a git remote URL and branch. */
 function buildPRUrl(
 	remoteUrl: string,
@@ -209,9 +206,19 @@ export function AppSidebar() {
 		branch: string;
 		worktreePath: string;
 	} | null>(null);
+	const fixWithAiTimeoutRef = useRef<number | null>(null);
 	// Per-project: remote URL (for PR links)
 	const [remoteUrls, setRemoteUrls] = useState<Record<string, string>>({});
 
+	useEffect(() => {
+		return () => {
+			if (fixWithAiTimeoutRef.current !== null) {
+				window.clearTimeout(fixWithAiTimeoutRef.current);
+				fixWithAiTimeoutRef.current = null;
+			}
+		};
+	}, []);
+
 	/** Refresh git info for a project directory (is repo + worktree list + remote). */
 	const refreshGitInfo = useCallback(async (directory: string) => {
 		const git = window.electronAPI?.git;
@@ -384,7 +391,7 @@ export function AppSidebar() {
 																/>
 															)}
 															<span className="truncate min-w-0 flex-1">
-																{projectName(directory)}
+																{getProjectName(directory)}
 															</span>
 															{/* New session for this project */}
 															{isProjectConnected &&
@@ -537,7 +544,7 @@ export function AppSidebar() {
 																							>
 																								<span className="truncate">
 																									{wt.branch ??
-																										projectName(wt.path)}
+																										getProjectName(wt.path)}
 																								</span>
 																							</ContextMenu.SubTrigger>
 																							<ContextMenu.Portal>
@@ -672,7 +679,7 @@ export function AppSidebar() {
 												>
 													<MessageSquare className="size-3.5 shrink-0" />
 													<span className="truncate">
-														{projectName(directory)}
+														{getProjectName(directory)}
 													</span>
 													<span className="ml-auto text-[10px] text-muted-foreground">
 														main
@@ -692,7 +699,7 @@ export function AppSidebar() {
 														>
 															<GitBranch className="size-3.5 shrink-0" />
 															<span className="truncate">
-																{projectName(wtDir)}
+																{getProjectName(wtDir)}
 															</span>
 														</button>
 													))}
@@ -730,7 +737,7 @@ export function AppSidebar() {
 																worktreeParents[session.directory] ===
 																	directory;
 															const worktreeBranch = isWorktreeSession
-																? projectName(session.directory)
+																? getProjectName(session.directory)
 																: null;
 															return (
 																<SessionContextMenu
@@ -940,7 +947,7 @@ export function AppSidebar() {
 					>
 						<div className="mb-1 flex items-center gap-2 px-2 py-1">
 							<div className="truncate text-sm font-medium">
-								{projectName(projectPopover.directory)}
+								{getProjectName(projectPopover.directory)}
 							</div>
 							<div className="ml-auto text-xs text-muted-foreground">
 								{popoverSessions.length}
@@ -1090,11 +1097,15 @@ export function AppSidebar() {
 					// Start a new session in the main directory and send the conflict resolution prompt
 					startDraftSession(mergeInfo.mainDir);
 					// Use a small delay so the draft session is active before sending
-					setTimeout(() => {
+					if (fixWithAiTimeoutRef.current !== null) {
+						window.clearTimeout(fixWithAiTimeoutRef.current);
+					}
+					fixWithAiTimeoutRef.current = window.setTimeout(() => {
 						const fileList = conflicts.map((f) => `- ${f}`).join("\n");
 						sendPrompt(
 							`There are git merge conflicts from merging branch "${mergeInfo.branch}" into the current branch.\n\nThe following files have unresolved conflicts:\n${fileList}\n\nPlease resolve all merge conflicts in these files. Remove all conflict markers (<<<<<<, ======, >>>>>>) and produce the correct merged code. After resolving all conflicts, stage the resolved files with \`git add\` for each file.`,
 						);
+						fixWithAiTimeoutRef.current = null;
 					}, POST_MERGE_DELAY_MS);
 				}}
 			/>
diff --git a/src/components/ConnectionPanel.tsx b/src/components/ConnectionPanel.tsx
index 7f957b1..2c25534 100644
--- a/src/components/ConnectionPanel.tsx
+++ b/src/components/ConnectionPanel.tsx
@@ -38,7 +38,6 @@ import { Spinner } from "@/components/ui/spinner";
 import { Switch } from "@/components/ui/switch";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import {
-	hasAnyConnection,
 	NOTIFICATIONS_ENABLED_KEY,
 	useActions,
 	useConnectionState,
@@ -114,9 +113,8 @@ type ServerState =
 	| "error";
 
 function AddProjectForm({ onDone }: { onDone: () => void }) {
-	const { addProject, connectToProject, disconnect, clearError } = useActions();
+	const { addProject, connectToProject, clearError } = useActions();
 	const { connections } = useConnectionState();
-	const isConnected = hasAnyConnection(connections);
 	const isElectron = !!window.electronAPI;
 
 	const [url, setUrl] = useState(
diff --git a/src/components/MergeDialog.tsx b/src/components/MergeDialog.tsx
index 8726ada..8942a0e 100644
--- a/src/components/MergeDialog.tsx
+++ b/src/components/MergeDialog.tsx
@@ -24,7 +24,7 @@ type MergeState =
 	| { step: "conflicts"; files: string[] }
 	| { step: "error"; message: string };
 
-export interface MergeDialogProps {
+interface MergeDialogProps {
 	open: boolean;
 	onOpenChange: (open: boolean) => void;
 	/** The main project directory (merge target). */
diff --git a/src/components/QueueList.tsx b/src/components/QueueList.tsx
index 873dba7..7c75de5 100644
--- a/src/components/QueueList.tsx
+++ b/src/components/QueueList.tsx
@@ -13,7 +13,7 @@ import * as React from "react";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
 
-export interface QueueItem {
+interface QueueItem {
 	id: string;
 	text: string;
 	variant?: string;
diff --git a/src/components/SessionContextMenu.tsx b/src/components/SessionContextMenu.tsx
index 18478f9..b91e697 100644
--- a/src/components/SessionContextMenu.tsx
+++ b/src/components/SessionContextMenu.tsx
@@ -14,7 +14,7 @@ import { cn } from "@/lib/utils";
 // Color config
 // ---------------------------------------------------------------------------
 
-export const SESSION_COLORS: {
+const SESSION_COLORS: {
 	value: SessionColor;
 	label: string;
 	className: string;
diff --git a/src/components/provider-icons/ProviderIcon.tsx b/src/components/provider-icons/ProviderIcon.tsx
index 59194c2..67725ac 100644
--- a/src/components/provider-icons/ProviderIcon.tsx
+++ b/src/components/provider-icons/ProviderIcon.tsx
@@ -9,7 +9,7 @@ import type { SVGAttributes } from "react";
 import sprite from "./sprite.svg";
 import { type ProviderIconName, providerIconNames } from "./types";
 
-export type ProviderIconProps = SVGAttributes<SVGSVGElement> & {
+type ProviderIconProps = SVGAttributes<SVGSVGElement> & {
 	/** Provider ID (must match a key in the sprite sheet). */
 	provider: string;
 };
@@ -17,7 +17,7 @@ export type ProviderIconProps = SVGAttributes<SVGSVGElement> & {
 const iconNameSet = new Set<string>(providerIconNames);
 
 /** Resolve a provider ID to a valid icon name, falling back to "synthetic". */
-export function resolveProviderIcon(id: string): ProviderIconName {
+function resolveProviderIcon(id: string): ProviderIconName {
 	if (iconNameSet.has(id)) return id as ProviderIconName;
 	return "synthetic";
 }
diff --git a/src/components/provider-icons/index.ts b/src/components/provider-icons/index.ts
index cde9428..d39e734 100644
--- a/src/components/provider-icons/index.ts
+++ b/src/components/provider-icons/index.ts
@@ -1,4 +1 @@
-export type { ProviderIconProps } from "./ProviderIcon";
-export { ProviderIcon, resolveProviderIcon } from "./ProviderIcon";
-export type { ProviderIconName } from "./types";
-export { providerIconNames } from "./types";
+export { ProviderIcon } from "./ProviderIcon";
diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsx
index 86bed41..9e30e7f 100644
--- a/src/components/ui/badge.tsx
+++ b/src/components/ui/badge.tsx
@@ -23,9 +23,8 @@ const badgeVariants = cva(
 	},
 );
 
-export interface BadgeProps
-	extends React.HTMLAttributes<HTMLDivElement>,
-		VariantProps<typeof badgeVariants> {}
+type BadgeProps = React.HTMLAttributes<HTMLDivElement> &
+	VariantProps<typeof badgeVariants>;
 
 function Badge({ className, variant, ...props }: BadgeProps) {
 	return (
@@ -33,4 +32,4 @@ function Badge({ className, variant, ...props }: BadgeProps) {
 	);
 }
 
-export { Badge, badgeVariants };
+export { Badge };
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 8f484d6..542cc75 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -61,4 +61,4 @@ function Button({
 	);
 }
 
-export { Button, buttonVariants };
+export { Button };
diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx
index 2cb8c5d..1c462c6 100644
--- a/src/components/ui/card.tsx
+++ b/src/components/ui/card.tsx
@@ -38,16 +38,6 @@ function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
 	);
 }
 
-function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-description"
-			className={cn("text-muted-foreground text-sm", className)}
-			{...props}
-		/>
-	);
-}
-
 function CardAction({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
@@ -71,22 +61,4 @@ function CardContent({ className, ...props }: React.ComponentProps<"div">) {
 	);
 }
 
-function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="card-footer"
-			className={cn("flex items-center px-6 [.border-t]:pt-6", className)}
-			{...props}
-		/>
-	);
-}
-
-export {
-	Card,
-	CardAction,
-	CardContent,
-	CardDescription,
-	CardFooter,
-	CardHeader,
-	CardTitle,
-};
+export { Card, CardAction, CardContent, CardHeader, CardTitle };
diff --git a/src/components/ui/collapsible.tsx b/src/components/ui/collapsible.tsx
deleted file mode 100644
index 439b44d..0000000
--- a/src/components/ui/collapsible.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Collapsible as CollapsiblePrimitive } from "radix-ui";
-
-function Collapsible({
-	...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.Root>) {
-	return <CollapsiblePrimitive.Root data-slot="collapsible" {...props} />;
-}
-
-function CollapsibleTrigger({
-	...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleTrigger>) {
-	return (
-		<CollapsiblePrimitive.CollapsibleTrigger
-			data-slot="collapsible-trigger"
-			{...props}
-		/>
-	);
-}
-
-function CollapsibleContent({
-	...props
-}: React.ComponentProps<typeof CollapsiblePrimitive.CollapsibleContent>) {
-	return (
-		<CollapsiblePrimitive.CollapsibleContent
-			data-slot="collapsible-content"
-			{...props}
-		/>
-	);
-}
-
-export { Collapsible, CollapsibleTrigger, CollapsibleContent };
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index 4251e4e..8cfd97b 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -22,12 +22,6 @@ function DialogPortal({
 	return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
 }
 
-function DialogClose({
-	...props
-}: React.ComponentProps<typeof DialogPrimitive.Close>) {
-	return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
-}
-
 function DialogOverlay({
 	className,
 	...props
@@ -143,13 +137,10 @@ function DialogDescription({
 
 export {
 	Dialog,
-	DialogClose,
 	DialogContent,
 	DialogDescription,
 	DialogFooter,
 	DialogHeader,
-	DialogOverlay,
-	DialogPortal,
 	DialogTitle,
 	DialogTrigger,
 };
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index 2bf2ce4..6050140 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -8,18 +8,6 @@ function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {
 	return <SheetPrimitive.Root data-slot="sheet" {...props} />;
 }
 
-function SheetTrigger({
-	...props
-}: React.ComponentProps<typeof SheetPrimitive.Trigger>) {
-	return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />;
-}
-
-function SheetClose({
-	...props
-}: React.ComponentProps<typeof SheetPrimitive.Close>) {
-	return <SheetPrimitive.Close data-slot="sheet-close" {...props} />;
-}
-
 function SheetPortal({
 	...props
 }: React.ComponentProps<typeof SheetPrimitive.Portal>) {
@@ -93,16 +81,6 @@ function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
 	);
 }
 
-function SheetFooter({ className, ...props }: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="sheet-footer"
-			className={cn("mt-auto flex flex-col gap-2 p-4", className)}
-			{...props}
-		/>
-	);
-}
-
 function SheetTitle({
 	className,
 	...props
@@ -129,13 +107,4 @@ function SheetDescription({
 	);
 }
 
-export {
-	Sheet,
-	SheetTrigger,
-	SheetClose,
-	SheetContent,
-	SheetHeader,
-	SheetFooter,
-	SheetTitle,
-	SheetDescription,
-};
+export { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle };
diff --git a/src/components/ui/sidebar.tsx b/src/components/ui/sidebar.tsx
index ab6d836..0a8a9fc 100644
--- a/src/components/ui/sidebar.tsx
+++ b/src/components/ui/sidebar.tsx
@@ -3,8 +3,7 @@ import { PanelLeftIcon } from "lucide-react";
 import { Slot } from "radix-ui";
 import * as React from "react";
 import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Separator } from "@/components/ui/separator";
+
 import {
 	Sheet,
 	SheetContent,
@@ -12,7 +11,7 @@ import {
 	SheetHeader,
 	SheetTitle,
 } from "@/components/ui/sheet";
-import { Skeleton } from "@/components/ui/skeleton";
+
 import {
 	Tooltip,
 	TooltipContent,
@@ -318,20 +317,6 @@ function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
 	);
 }
 
-function SidebarInput({
-	className,
-	...props
-}: React.ComponentProps<typeof Input>) {
-	return (
-		<Input
-			data-slot="sidebar-input"
-			data-sidebar="input"
-			className={cn("bg-background h-8 w-full shadow-none", className)}
-			{...props}
-		/>
-	);
-}
-
 function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
@@ -354,20 +339,6 @@ function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
 	);
 }
 
-function SidebarSeparator({
-	className,
-	...props
-}: React.ComponentProps<typeof Separator>) {
-	return (
-		<Separator
-			data-slot="sidebar-separator"
-			data-sidebar="separator"
-			className={cn("bg-sidebar-border mx-2 w-auto", className)}
-			{...props}
-		/>
-	);
-}
-
 function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
 	return (
 		<div
@@ -414,29 +385,6 @@ function SidebarGroupLabel({
 	);
 }
 
-function SidebarGroupAction({
-	className,
-	asChild = false,
-	...props
-}: React.ComponentProps<"button"> & { asChild?: boolean }) {
-	const Comp = asChild ? Slot.Root : "button";
-
-	return (
-		<Comp
-			data-slot="sidebar-group-action"
-			data-sidebar="group-action"
-			className={cn(
-				"text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
-				// Increases the hit area of the button on mobile.
-				"after:absolute after:-inset-2 md:after:hidden",
-				"group-data-[collapsible=icon]:hidden",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
 function SidebarGroupContent({
 	className,
 	...props
@@ -545,159 +493,6 @@ function SidebarMenuButton({
 	);
 }
 
-function SidebarMenuAction({
-	className,
-	asChild = false,
-	showOnHover = false,
-	...props
-}: React.ComponentProps<"button"> & {
-	asChild?: boolean;
-	showOnHover?: boolean;
-}) {
-	const Comp = asChild ? Slot.Root : "button";
-
-	return (
-		<Comp
-			data-slot="sidebar-menu-action"
-			data-sidebar="menu-action"
-			className={cn(
-				"text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground peer-hover/menu-button:text-sidebar-accent-foreground absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
-				// Increases the hit area of the button on mobile.
-				"after:absolute after:-inset-2 md:after:hidden",
-				"peer-data-[size=sm]/menu-button:top-1",
-				"peer-data-[size=default]/menu-button:top-1.5",
-				"peer-data-[size=lg]/menu-button:top-2.5",
-				"group-data-[collapsible=icon]:hidden",
-				showOnHover &&
-					"peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
-function SidebarMenuBadge({
-	className,
-	...props
-}: React.ComponentProps<"div">) {
-	return (
-		<div
-			data-slot="sidebar-menu-badge"
-			data-sidebar="menu-badge"
-			className={cn(
-				"text-sidebar-foreground pointer-events-none absolute right-1 flex h-5 min-w-5 items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums select-none",
-				"peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground",
-				"peer-data-[size=sm]/menu-button:top-1",
-				"peer-data-[size=default]/menu-button:top-1.5",
-				"peer-data-[size=lg]/menu-button:top-2.5",
-				"group-data-[collapsible=icon]:hidden",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
-function SidebarMenuSkeleton({
-	className,
-	showIcon = false,
-	...props
-}: React.ComponentProps<"div"> & {
-	showIcon?: boolean;
-}) {
-	// Random width between 50 to 90%.
-	const width = React.useMemo(() => {
-		return `${Math.floor(Math.random() * 40) + 50}%`;
-	}, []);
-
-	return (
-		<div
-			data-slot="sidebar-menu-skeleton"
-			data-sidebar="menu-skeleton"
-			className={cn("flex h-8 items-center gap-2 rounded-md px-2", className)}
-			{...props}
-		>
-			{showIcon && (
-				<Skeleton
-					className="size-4 rounded-md"
-					data-sidebar="menu-skeleton-icon"
-				/>
-			)}
-			<Skeleton
-				className="h-4 max-w-(--skeleton-width) flex-1"
-				data-sidebar="menu-skeleton-text"
-				style={
-					{
-						"--skeleton-width": width,
-					} as React.CSSProperties
-				}
-			/>
-		</div>
-	);
-}
-
-function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
-	return (
-		<ul
-			data-slot="sidebar-menu-sub"
-			data-sidebar="menu-sub"
-			className={cn(
-				"border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5",
-				"group-data-[collapsible=icon]:hidden",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
-function SidebarMenuSubItem({
-	className,
-	...props
-}: React.ComponentProps<"li">) {
-	return (
-		<li
-			data-slot="sidebar-menu-sub-item"
-			data-sidebar="menu-sub-item"
-			className={cn("group/menu-sub-item relative", className)}
-			{...props}
-		/>
-	);
-}
-
-function SidebarMenuSubButton({
-	asChild = false,
-	size = "md",
-	isActive = false,
-	className,
-	...props
-}: React.ComponentProps<"a"> & {
-	asChild?: boolean;
-	size?: "sm" | "md";
-	isActive?: boolean;
-}) {
-	const Comp = asChild ? Slot.Root : "a";
-
-	return (
-		<Comp
-			data-slot="sidebar-menu-sub-button"
-			data-sidebar="menu-sub-button"
-			data-size={size}
-			data-active={isActive}
-			className={cn(
-				"text-sidebar-foreground ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground active:bg-sidebar-accent active:text-sidebar-accent-foreground [&>svg]:text-sidebar-accent-foreground flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 outline-hidden focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
-				"data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
-				size === "sm" && "text-xs",
-				size === "md" && "text-sm",
-				"group-data-[collapsible=icon]:hidden",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
 // ---------------------------------------------------------------------------
 // Right Sidebar – independent provider that re-uses SidebarContext so all
 // standard Sidebar sub-components (SidebarHeader, SidebarContent, …) work
@@ -831,24 +626,15 @@ export {
 	SidebarContent,
 	SidebarFooter,
 	SidebarGroup,
-	SidebarGroupAction,
 	SidebarGroupContent,
 	SidebarGroupLabel,
 	SidebarHeader,
-	SidebarInput,
 	SidebarInset,
 	SidebarMenu,
-	SidebarMenuAction,
-	SidebarMenuBadge,
 	SidebarMenuButton,
 	SidebarMenuItem,
-	SidebarMenuSkeleton,
-	SidebarMenuSub,
-	SidebarMenuSubButton,
-	SidebarMenuSubItem,
 	SidebarProvider,
 	SidebarRail,
-	SidebarSeparator,
 	SidebarTrigger,
 	useSidebar,
 	RightSidebarProvider,
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
deleted file mode 100644
index 70e5b64..0000000
--- a/src/components/ui/textarea.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import type * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
-	return (
-		<textarea
-			data-slot="textarea"
-			className={cn(
-				"border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
-				className,
-			)}
-			{...props}
-		/>
-	);
-}
-
-export { Textarea };
diff --git a/src/components/ui/toggle.tsx b/src/components/ui/toggle.tsx
deleted file mode 100644
index 18719de..0000000
--- a/src/components/ui/toggle.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { cva, type VariantProps } from "class-variance-authority";
-import { Toggle as TogglePrimitive } from "radix-ui";
-import type * as React from "react";
-
-import { cn } from "@/lib/utils";
-
-const toggleVariants = cva(
-	"inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium hover:bg-muted hover:text-muted-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] outline-none transition-[color,box-shadow] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive whitespace-nowrap",
-	{
-		variants: {
-			variant: {
-				default: "bg-transparent",
-				outline:
-					"border border-input bg-transparent shadow-xs hover:bg-accent hover:text-accent-foreground",
-			},
-			size: {
-				default: "h-9 px-2 min-w-9",
-				sm: "h-8 px-1.5 min-w-8",
-				lg: "h-10 px-2.5 min-w-10",
-			},
-		},
-		defaultVariants: {
-			variant: "default",
-			size: "default",
-		},
-	},
-);
-
-function Toggle({
-	className,
-	variant,
-	size,
-	...props
-}: React.ComponentProps<typeof TogglePrimitive.Root> &
-	VariantProps<typeof toggleVariants>) {
-	return (
-		<TogglePrimitive.Root
-			data-slot="toggle"
-			className={cn(toggleVariants({ variant, size, className }))}
-			{...props}
-		/>
-	);
-}
-
-export { Toggle, toggleVariants };
diff --git a/src/hooks/opencode/use-variant.ts b/src/hooks/opencode/use-variant.ts
index facc9ac..1dd06ad 100644
--- a/src/hooks/opencode/use-variant.ts
+++ b/src/hooks/opencode/use-variant.ts
@@ -34,7 +34,7 @@ export function updateVariantSelections(
 	return next;
 }
 
-export function cycleVariantSelection(
+function cycleVariantSelection(
 	current: string | undefined,
 	model: Model | undefined,
 ): string | undefined {
diff --git a/src/hooks/use-opencode.tsx b/src/hooks/use-opencode.tsx
index ded1a1b..26883f3 100644
--- a/src/hooks/use-opencode.tsx
+++ b/src/hooks/use-opencode.tsx
@@ -1647,88 +1647,12 @@ export function getChildSessionToolParts(
 // Context
 // ---------------------------------------------------------------------------
 
-interface OpenCodeContextValue {
-	state: OpenCodeState;
-	/** Add a project (connects to server with directory scope). Additive. */
-	addProject: (
-		config: ConnectionConfig,
-		options?: { suppressError?: boolean },
-	) => Promise<void>;
-	/** Remove a project (disconnects its connection). */
-	removeProject: (directory: string) => Promise<void>;
-	/** Disconnect ALL projects. */
-	disconnect: () => Promise<void>;
-	selectSession: (id: string | null) => Promise<void>;
-	createSession: (
-		title?: string,
-		directory?: string,
-	) => Promise<Session | null>;
-	deleteSession: (id: string) => Promise<void>;
-	renameSession: (id: string, title: string) => Promise<void>;
-	sendPrompt: (text: string, images?: string[]) => Promise<void>;
-	sendCommand: (command: string, args: string) => Promise<void>;
-	abortSession: () => Promise<void>;
-	respondPermission: (response: "once" | "always" | "reject") => Promise<void>;
-	replyQuestion: (answers: QuestionAnswer[]) => Promise<void>;
-	rejectQuestion: () => Promise<void>;
-	setModel: (model: SelectedModel | null) => void;
-	setAgent: (agent: string | null) => void;
-	/** Cycle the variant for the currently selected model */
-	cycleVariant: () => void;
-	/** Set variant explicitly for the currently selected model */
-	setVariant: (variant: string | undefined) => void;
-	/** Get the currently effective variant */
-	currentVariant: string | undefined;
-	clearError: () => void;
-	/** Re-fetch providers from the server (e.g. after connecting/disconnecting a provider). */
-	refreshProviders: () => Promise<void>;
-	refreshSessions: () => Promise<void>;
-	/** Get queued prompts for a session */
-	getQueuedPrompts: (sessionId: string) => QueuedPrompt[];
-	/** Remove one queued prompt by ID */
-	removeFromQueue: (sessionId: string, promptId: string) => void;
-	/** Reorder one queued prompt by indexes */
-	reorderQueue: (sessionId: string, fromIndex: number, toIndex: number) => void;
-	/** Update queued prompt text by ID */
-	updateQueuedPrompt: (
-		sessionId: string,
-		promptId: string,
-		text: string,
-	) => void;
-	/** Send one queued prompt immediately; aborts current run if needed */
-	sendQueuedNow: (sessionId: string, promptId: string) => Promise<void>;
-	/** Open native directory picker, returns path or null */
-	openDirectory: () => Promise<string | null>;
-	/** Connect to a project directory (convenience wrapper for addProject) */
-	connectToProject: (directory: string, serverUrl?: string) => Promise<void>;
-	/** Start a draft session for a directory (no API call until first send) */
-	startDraftSession: (directory: string) => void;
-	/** Toggle whether the current draft session should be temporary */
-	setDraftTemporary: (temporary: boolean) => void;
-	/** Revert the active session to a specific message (undo). */
-	revertToMessage: (messageID: string) => Promise<void>;
-	/** Restore all reverted messages in the active session (redo all). */
-	unrevert: () => Promise<void>;
-	/** Fork the active session at a specific message, creating a new session. */
-	forkFromMessage: (messageID: string) => Promise<void>;
-	/** Set the color for a session (local-only, stored in localStorage). */
-	setSessionColor: (sessionId: string, color: SessionColor) => void;
-	/** Set tags for a session (local-only, stored in localStorage). */
-	setSessionTags: (sessionId: string, tags: string[]) => void;
-	/** Register a worktree directory as belonging to a parent project. */
-	registerWorktree: (worktreeDir: string, parentDir: string) => void;
-	/** Unregister a worktree directory. */
-	unregisterWorktree: (worktreeDir: string) => void;
-}
-
-const OpenCodeContext = createContext<OpenCodeContextValue | null>(null);
-
 // ---------------------------------------------------------------------------
 // Split contexts  (subscribe to only the slice you need)
 // ---------------------------------------------------------------------------
 
 /** Session-related state – sessions list, active session, messages, busy state, queue. */
-export interface SessionContextValue {
+interface SessionContextValue {
 	sessions: Session[];
 	activeSessionId: string | null;
 	messages: MessageEntry[];
@@ -1748,7 +1672,7 @@ export interface SessionContextValue {
 }
 
 /** Model / agent / variant / command state. */
-export interface ModelContextValue {
+interface ModelContextValue {
 	providers: Provider[];
 	providerDefaults: Record<string, string>;
 	selectedModel: SelectedModel | null;
@@ -1760,7 +1684,7 @@ export interface ModelContextValue {
 }
 
 /** Connection lifecycle state. */
-export interface ConnectionContextValue {
+interface ConnectionContextValue {
 	connections: Record<string, ConnectionStatus>;
 	bootState: OpenCodeState["bootState"];
 	bootError: string | null;
@@ -1769,7 +1693,7 @@ export interface ConnectionContextValue {
 }
 
 /** Stable action functions – these references rarely change. */
-export interface ActionsContextValue {
+interface ActionsContextValue {
 	addProject: (
 		config: ConnectionConfig,
 		options?: { suppressError?: boolean },
@@ -1792,7 +1716,6 @@ export interface ActionsContextValue {
 	setModel: (model: SelectedModel | null) => void;
 	setAgent: (agent: string | null) => void;
 	cycleVariant: () => void;
-	setVariant: (variant: string | undefined) => void;
 	clearError: () => void;
 	refreshProviders: () => Promise<void>;
 	refreshSessions: () => Promise<void>;
@@ -2144,7 +2067,6 @@ export function OpenCodeProvider({ children }: { children: ReactNode }) {
 		setModel,
 		setAgent,
 		cycleVariant: doCycleVariant,
-		setVariant,
 	} = useVariant({
 		selectedModel: state.selectedModel,
 		providers: state.providers,
@@ -3246,7 +3168,6 @@ export function OpenCodeProvider({ children }: { children: ReactNode }) {
 			setModel,
 			setAgent,
 			cycleVariant: doCycleVariant,
-			setVariant,
 			clearError,
 			refreshProviders,
 			refreshSessions,
@@ -3284,7 +3205,6 @@ export function OpenCodeProvider({ children }: { children: ReactNode }) {
 			setModel,
 			setAgent,
 			doCycleVariant,
-			setVariant,
 			clearError,
 			refreshProviders,
 			refreshSessions,
@@ -3307,16 +3227,6 @@ export function OpenCodeProvider({ children }: { children: ReactNode }) {
 		],
 	);
 
-	// Legacy combined value for backwards-compatible useOpenCode()
-	const value = useMemo<OpenCodeContextValue>(
-		() => ({
-			state,
-			...actionsCtx,
-			currentVariant,
-		}),
-		[state, actionsCtx, currentVariant],
-	);
-
 	// Clean up temporary sessions on window unload (app close / refresh)
 	useEffect(() => {
 		const cleanup = () => {
@@ -3335,9 +3245,7 @@ export function OpenCodeProvider({ children }: { children: ReactNode }) {
 			<ConnectionContext.Provider value={connectionCtx}>
 				<ModelContext.Provider value={modelCtx}>
 					<SessionContext.Provider value={sessionCtx}>
-						<OpenCodeContext.Provider value={value}>
-							{children}
-						</OpenCodeContext.Provider>
+						{children}
 					</SessionContext.Provider>
 				</ModelContext.Provider>
 			</ConnectionContext.Provider>
@@ -3345,18 +3253,6 @@ export function OpenCodeProvider({ children }: { children: ReactNode }) {
 	);
 }
 
-// ---------------------------------------------------------------------------
-// Hook (legacy – subscribes to ALL state changes, prefer split hooks below)
-// ---------------------------------------------------------------------------
-
-export function useOpenCode(): OpenCodeContextValue {
-	const ctx = useContext(OpenCodeContext);
-	if (!ctx) {
-		throw new Error("useOpenCode must be used within <OpenCodeProvider>");
-	}
-	return ctx;
-}
-
 // ---------------------------------------------------------------------------
 // Split hooks  (subscribe only to the slice you need)
 // ---------------------------------------------------------------------------
diff --git a/white.txt b/white.txt
deleted file mode 100644
index cb19065..0000000
--- a/white.txt
+++ /dev/null
@@ -1 +0,0 @@
- 　 　 　 　 　 ​‌‍⁠⠀
\ No newline at end of file
diff --git a/whitespaces.txt b/whitespaces.txt
deleted file mode 100644
index b9db1fb..0000000
--- a/whitespaces.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Unicode Whitespace Characters (copy the character between the pipes)
-
-Regular space (U+0020):          | |
-No-break space (U+00A0):        | |
-En quad (U+2000):                | |
-Em quad (U+2001):                | |
-En space (U+2002):               | |
-Em space (U+2003):               | |
-Three-per-em space (U+2004):     | |
-Four-per-em space (U+2005):      | |
-Six-per-em space (U+2006):       | |
-Figure space (U+2007):           | |
-Punctuation space (U+2008):      | |
-Thin space (U+2009):             | |
-Hair space (U+200A):             | |
-Zero-width space (U+200B):       |​|
-Zero-width non-joiner (U+200C):  |‌|
-Zero-width joiner (U+200D):      |‍|
-Narrow no-break space (U+202F):  | |
-Medium math space (U+205F):      | |
-Word joiner (U+2060):            |⁠|
-Ideographic space (U+3000):      |　|
-Ogham space mark (U+1680):       | |
-Braille blank (U+2800):          |⠀|
-
---- Zero-width / invisible (useful for "invisible" text) ---
-Zero-width space (U+200B):       ​
-Zero-width non-joiner (U+200C):  ‌
-Zero-width joiner (U+200D):      ‍
-Word joiner (U+2060):            ⁠