diff --git a/INSTALL.md b/INSTALL.md
index d46f787af..6c0a8a276 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -176,30 +176,6 @@ CREATE TABLE users (
   CONSTRAINT users_id_fkey FOREIGN KEY (id) REFERENCES auth.users(id) ON DELETE CASCADE -- Explicit FK definition
 );
 
--- Agents table
-CREATE TABLE agents (
-  id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
-  name TEXT NOT NULL,
-  slug TEXT NOT NULL,
-  description TEXT NOT NULL,
-  avatar_url TEXT,
-  system_prompt TEXT NOT NULL,
-  model_preference TEXT,
-  is_public BOOLEAN DEFAULT false NOT NULL,
-  remixable BOOLEAN DEFAULT false NOT NULL,
-  tools_enabled BOOLEAN DEFAULT false NOT NULL,
-  example_inputs TEXT[],
-  tags TEXT[],
-  category TEXT,
-  creator_id UUID,
-  created_at TIMESTAMPTZ DEFAULT NOW(),
-  updated_at TIMESTAMPTZ,
-  tools TEXT[],
-  max_steps INTEGER,
-  mcp_config JSONB, -- Representing the object structure as JSONB
-  CONSTRAINT agents_creator_id_fkey FOREIGN KEY (creator_id) REFERENCES users(id) ON DELETE SET NULL -- Changed to SET NULL based on schema, could also be CASCADE
-);
-
 -- Projects table
 CREATE TABLE projects (
   id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
@@ -217,12 +193,10 @@ CREATE TABLE chats (
   title TEXT,
   model TEXT,
   system_prompt TEXT,
-  agent_id UUID,
   created_at TIMESTAMPTZ DEFAULT NOW(),
   updated_at TIMESTAMPTZ DEFAULT NOW(),
   public BOOLEAN DEFAULT FALSE NOT NULL,
   CONSTRAINT chats_user_id_fkey FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
-  CONSTRAINT chats_agent_id_fkey FOREIGN KEY (agent_id) REFERENCES agents(id) ON DELETE SET NULL,
   CONSTRAINT chats_project_id_fkey FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE
 );
 
@@ -281,7 +255,7 @@ CREATE TABLE user_keys (
 -- ALTER TABLE users ENABLE ROW LEVEL SECURITY;
 -- CREATE POLICY "Users can view their own data." ON users FOR SELECT USING (auth.uid() = id);
 -- CREATE POLICY "Users can update their own data." ON users FOR UPDATE USING (auth.uid() = id);
--- ... add policies for other tables (agents, chats, messages, etc.) ...
+-- ... add policies for other tables (chats, messages, etc.) ...
 ```
 
 ### Storage Setup
@@ -292,25 +266,6 @@ Create the buckets `chat-attachments` and `avatars` in your Supabase dashboard:
 2. Click "New bucket" and create two buckets: `chat-attachments` and `avatars`
 3. Configure public access permissions for both buckets
 
-#### Agent Avatar Configuration
-
-For agent profile pictures to work properly:
-
-1. Create an `agents` folder inside your `avatars` bucket:
-
-   - Navigate to the `avatars` bucket
-   - Click "Create folder" and name it `agents`
-
-2. Upload agent avatar images
-
-3. Set up public access for the avatars bucket:
-   - Go to "Configuration" tab for the `avatars` bucket
-   - Under "Row Level Security (RLS)" ensure it's disabled or create a policy:
-   ```sql
-   CREATE POLICY "Public Read Access" ON storage.objects
-   FOR SELECT USING (bucket_id = 'avatars');
-   ```
-
 ## Ollama Setup (Local AI Models)
 
 Ollama allows you to run AI models locally on your machine. Zola has built-in support for Ollama with automatic model detection.
diff --git a/README.md b/README.md
index 1b737b74f..c3dd8d6ef 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,6 @@
 - Open-source and self-hostable
 - Customizable: user system prompt, multiple layout options
 - Local AI with Ollama: Run models locally with automatic model detection
-- Basic agent (wip)
 - Full MCP support (wip)
 
 ## Quick Start
@@ -57,7 +56,7 @@ docker-compose -f docker-compose.ollama.yml up
 
 [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/ibelick/zola)
 
-To unlock features like auth, file uploads, and agents, see [INSTALL.md](./INSTALL.md).
+To unlock features like auth, file uploads, see [INSTALL.md](./INSTALL.md).
 
 ## Built with
 
diff --git a/app/agents/[...agentSlug]/page.tsx b/app/agents/[...agentSlug]/page.tsx
deleted file mode 100644
index cbd276e4e..000000000
--- a/app/agents/[...agentSlug]/page.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { AgentDetail } from "@/app/components/agents/agent-detail"
-import { LayoutApp } from "@/app/components/layout/layout-app"
-import { MessagesProvider } from "@/lib/chat-store/messages/provider"
-import { isSupabaseEnabled } from "@/lib/supabase/config"
-import { createClient } from "@/lib/supabase/server"
-import { notFound } from "next/navigation"
-
-export default async function AgentIdPage({
-  params,
-}: {
-  params: Promise<{ agentSlug: string | string[] }>
-}) {
-  if (!isSupabaseEnabled) {
-    notFound()
-  }
-
-  const { agentSlug: slugParts } = await params
-  const agentSlug = Array.isArray(slugParts) ? slugParts.join("/") : slugParts
-
-  const supabase = await createClient()
-
-  if (!supabase) {
-    notFound()
-  }
-
-  const { data: agent, error: agentError } = await supabase
-    .from("agents")
-    .select("*")
-    .eq("slug", agentSlug)
-    .single()
-
-  if (agentError) {
-    throw new Error(agentError.message)
-  }
-
-  const { data: agents, error: agentsError } = await supabase
-    .from("agents")
-    .select("*")
-    .not("slug", "eq", agentSlug)
-    .limit(4)
-
-  if (agentsError) {
-    throw new Error(agentsError.message)
-  }
-
-  return (
-    <MessagesProvider>
-      <LayoutApp>
-        <div className="bg-background mx-auto max-w-3xl pt-20">
-          <AgentDetail
-            slug={agent.slug}
-            name={agent.name}
-            description={agent.description}
-            example_inputs={agent.example_inputs || []}
-            creator_id={agent.creator_id}
-            avatar_url={agent.avatar_url}
-            randomAgents={agents || []}
-            isFullPage
-            system_prompt={agent.system_prompt}
-            tools={agent.tools}
-            mcp_config={agent.mcp_config}
-          />
-        </div>
-      </LayoutApp>
-    </MessagesProvider>
-  )
-}
diff --git a/app/agents/page.tsx b/app/agents/page.tsx
deleted file mode 100644
index d1a990cb7..000000000
--- a/app/agents/page.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { AgentsPage } from "@/app/components/agents/agents-page"
-import { LayoutApp } from "@/app/components/layout/layout-app"
-import { MessagesProvider } from "@/lib/chat-store/messages/provider"
-import { CURATED_AGENTS_SLUGS } from "@/lib/config"
-import { isSupabaseEnabled } from "@/lib/supabase/config"
-import { createClient } from "@/lib/supabase/server"
-import { notFound } from "next/navigation"
-
-export const dynamic = "force-dynamic"
-
-export default async function Page() {
-  if (!isSupabaseEnabled) {
-    notFound()
-  }
-
-  const supabase = await createClient()
-
-  if (!supabase) {
-    notFound()
-  }
-
-  const { data: userData } = await supabase.auth.getUser()
-
-  const { data: curatedAgents, error: agentsError } = await supabase
-    .from("agents")
-    .select("*")
-    .in("slug", CURATED_AGENTS_SLUGS)
-
-  const { data: userAgents, error: userAgentsError } = userData?.user?.id
-    ? await supabase
-        .from("agents")
-        .select("*")
-        .eq("creator_id", userData?.user?.id)
-    : { data: [], error: null }
-
-  if (agentsError) {
-    console.error(agentsError)
-    return <div>Error loading agents</div>
-  }
-
-  if (userAgentsError) {
-    console.error(userAgentsError)
-    return <div>Error loading user agents</div>
-  }
-
-  return (
-    <MessagesProvider>
-      <LayoutApp>
-        <AgentsPage
-          curatedAgents={curatedAgents}
-          userAgents={userAgents || null}
-          userId={userData?.user?.id || null}
-        />
-      </LayoutApp>
-    </MessagesProvider>
-  )
-}
diff --git a/app/api/chat/api.ts b/app/api/chat/api.ts
index b6bfbc8c4..c84757056 100644
--- a/app/api/chat/api.ts
+++ b/app/api/chat/api.ts
@@ -1,14 +1,13 @@
 import { saveFinalAssistantMessage } from "@/app/api/chat/db"
-import { checkSpecialAgentUsage, incrementSpecialAgentUsage } from "@/lib/api"
+import type {
+  ChatApiParams,
+  LogUserMessageParams,
+  StoreAssistantMessageParams,
+  SupabaseClientType,
+} from "@/app/types/api.types"
 import { sanitizeUserInput } from "@/lib/sanitize"
 import { validateUserIdentity } from "@/lib/server/api"
 import { checkUsageByModel, incrementUsageByModel } from "@/lib/usage"
-import type { 
-  SupabaseClientType, 
-  ChatApiParams, 
-  LogUserMessageParams, 
-  StoreAssistantMessageParams 
-} from "@/app/types/api.types"
 
 export async function validateAndTrackUsage({
   userId,
@@ -48,12 +47,6 @@ export async function logUserMessage({
   }
 }
 
-export async function trackSpecialAgentUsage(supabase: SupabaseClientType, userId: string): Promise<void> {
-  if (!supabase) return
-  await checkSpecialAgentUsage(supabase, userId)
-  await incrementSpecialAgentUsage(supabase, userId)
-}
-
 export async function storeAssistantMessage({
   supabase,
   chatId,
diff --git a/app/api/chat/route.ts b/app/api/chat/route.ts
index 4732c4049..cf06d917e 100644
--- a/app/api/chat/route.ts
+++ b/app/api/chat/route.ts
@@ -1,6 +1,4 @@
-import { loadAgent } from "@/lib/agents/load-agent"
 import { SYSTEM_PROMPT_DEFAULT } from "@/lib/config"
-import { loadMCPToolsFromURL } from "@/lib/mcp/load-mcp-from-url"
 import { getAllModels } from "@/lib/models"
 import { getProviderForModel } from "@/lib/openproviders/provider-map"
 import type { ProviderWithoutOllama } from "@/lib/user-keys"
@@ -9,14 +7,9 @@ import { Message as MessageAISDK, streamText, ToolSet } from "ai"
 import {
   logUserMessage,
   storeAssistantMessage,
-  trackSpecialAgentUsage,
   validateAndTrackUsage,
 } from "./api"
-import {
-  cleanMessagesForTools,
-  createErrorResponse,
-  extractErrorMessage,
-} from "./utils"
+import { createErrorResponse, extractErrorMessage } from "./utils"
 
 export const maxDuration = 60
 
@@ -27,7 +20,6 @@ type ChatRequest = {
   model: string
   isAuthenticated: boolean
   systemPrompt: string
-  agentId: string | null
   enableSearch: boolean
 }
 
@@ -40,7 +32,6 @@ export async function POST(req: Request) {
       model,
       isAuthenticated,
       systemPrompt,
-      agentId,
       enableSearch,
     } = (await req.json()) as ChatRequest
 
@@ -71,12 +62,6 @@ export async function POST(req: Request) {
       })
     }
 
-    let agentConfig = null
-
-    if (agentId) {
-      agentConfig = await loadAgent(agentId)
-    }
-
     const allModels = await getAllModels()
     const modelConfig = allModels.find((m) => m.id === model)
 
@@ -84,24 +69,7 @@ export async function POST(req: Request) {
       throw new Error(`Model ${model} not found`)
     }
 
-    const effectiveSystemPrompt =
-      agentConfig?.systemPrompt || systemPrompt || SYSTEM_PROMPT_DEFAULT
-
-    let toolsToUse = undefined
-
-    if (agentConfig?.mcpConfig) {
-      const { tools } = await loadMCPToolsFromURL(agentConfig.mcpConfig.server)
-      toolsToUse = tools
-    } else if (agentConfig?.tools) {
-      toolsToUse = agentConfig.tools
-      if (supabase) {
-        await trackSpecialAgentUsage(supabase, userId)
-      }
-    }
-
-    // Clean messages when switching between agents with different tool capabilities
-    const hasTools = !!toolsToUse && Object.keys(toolsToUse).length > 0
-    const cleanedMessages = cleanMessagesForTools(messages, hasTools)
+    const effectiveSystemPrompt = systemPrompt || SYSTEM_PROMPT_DEFAULT
 
     let apiKey: string | undefined
     if (isAuthenticated && userId) {
@@ -115,8 +83,8 @@ export async function POST(req: Request) {
     const result = streamText({
       model: modelConfig.apiSdk(apiKey, { enableSearch }),
       system: effectiveSystemPrompt,
-      messages: cleanedMessages,
-      tools: toolsToUse as ToolSet,
+      messages: messages,
+      tools: {} as ToolSet,
       maxSteps: 10,
       onError: (err: unknown) => {
         console.error("Streaming error occurred:", err)
diff --git a/app/api/create-agent/route.ts b/app/api/create-agent/route.ts
deleted file mode 100644
index b474e4530..000000000
--- a/app/api/create-agent/route.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { createClient } from "@/lib/supabase/server"
-import { nanoid } from "nanoid"
-import slugify from "slugify"
-
-function generateAgentSlug(title: string) {
-  const base = slugify(title, { lower: true, strict: true, trim: true })
-  const id = nanoid(6)
-  return `${base}-${id}`
-}
-
-export async function POST(request: Request) {
-  try {
-    const {
-      name,
-      description,
-      systemPrompt,
-      mcp_config,
-      example_inputs,
-      avatar_url,
-      tools = [],
-      remixable = false,
-      is_public = true,
-      max_steps = 5,
-    } = await request.json()
-
-    if (!name || !description || !systemPrompt) {
-      return new Response(
-        JSON.stringify({ error: "Missing required fields" }),
-        {
-          status: 400,
-        }
-      )
-    }
-
-    const supabase = await createClient()
-
-    if (!supabase) {
-      return new Response(
-        JSON.stringify({ error: "Supabase not available in this deployment." }),
-        { status: 200 }
-      )
-    }
-
-    const { data: authData } = await supabase.auth.getUser()
-
-    if (!authData?.user?.id) {
-      return new Response(JSON.stringify({ error: "Missing userId" }), {
-        status: 400,
-      })
-    }
-
-    const { data: agent, error: supabaseError } = await supabase
-      .from("agents")
-      .insert({
-        slug: generateAgentSlug(name),
-        name,
-        description,
-        avatar_url,
-        mcp_config,
-        example_inputs,
-        tools,
-        remixable,
-        is_public,
-        system_prompt: systemPrompt,
-        max_steps,
-        creator_id: authData.user.id,
-      })
-      .select()
-      .single()
-
-    if (supabaseError) {
-      return new Response(JSON.stringify({ error: supabaseError.message }), {
-        status: 500,
-      })
-    }
-
-    return new Response(JSON.stringify({ agent }), { status: 201 })
-  } catch (err: unknown) {
-    console.error("Error in create-agent endpoint:", err)
-
-    return new Response(
-      JSON.stringify({ error: (err as Error).message || "Internal server error" }),
-      { status: 500 }
-    )
-  }
-}
diff --git a/app/api/create-chat/api.ts b/app/api/create-chat/api.ts
index 5de3cb349..6e7e9db81 100644
--- a/app/api/create-chat/api.ts
+++ b/app/api/create-chat/api.ts
@@ -1,4 +1,3 @@
-import { filterLocalAgentId } from "@/lib/agents/utils"
 import { validateUserIdentity } from "@/lib/server/api"
 import { checkUsageByModel } from "@/lib/usage"
 
@@ -7,7 +6,6 @@ type CreateChatInput = {
   title?: string
   model: string
   isAuthenticated: boolean
-  agentId?: string
   projectId?: string
 }
 
@@ -16,12 +14,8 @@ export async function createChatInDb({
   title,
   model,
   isAuthenticated,
-  agentId,
   projectId,
 }: CreateChatInput) {
-  // Filter out local agent IDs for database operations
-  const dbAgentId = filterLocalAgentId(agentId)
-
   const supabase = await validateUserIdentity(userId, isAuthenticated)
   if (!supabase) {
     return {
@@ -31,7 +25,6 @@ export async function createChatInDb({
       model,
       created_at: new Date().toISOString(),
       updated_at: new Date().toISOString(),
-      agent_id: dbAgentId,
     }
   }
 
@@ -41,7 +34,6 @@ export async function createChatInDb({
     user_id: string
     title: string
     model: string
-    agent_id?: string
     project_id?: string
   } = {
     user_id: userId,
@@ -49,10 +41,6 @@ export async function createChatInDb({
     model,
   }
 
-  if (dbAgentId) {
-    insertData.agent_id = dbAgentId
-  }
-
   if (projectId) {
     insertData.project_id = projectId
   }
diff --git a/app/api/create-chat/route.ts b/app/api/create-chat/route.ts
index 45ff91df8..ca68d869e 100644
--- a/app/api/create-chat/route.ts
+++ b/app/api/create-chat/route.ts
@@ -2,7 +2,7 @@ import { createChatInDb } from "./api"
 
 export async function POST(request: Request) {
   try {
-    const { userId, title, model, isAuthenticated, agentId, projectId } =
+    const { userId, title, model, isAuthenticated, projectId } =
       await request.json()
 
     if (!userId) {
@@ -16,7 +16,6 @@ export async function POST(request: Request) {
       title,
       model,
       isAuthenticated,
-      agentId,
       projectId,
     })
 
diff --git a/app/api/delete-agent/route.ts b/app/api/delete-agent/route.ts
deleted file mode 100644
index 7e98a6a4a..000000000
--- a/app/api/delete-agent/route.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { createClient } from "@/lib/supabase/server"
-
-export async function DELETE(request: Request) {
-  try {
-    const { slug } = await request.json()
-
-    if (!slug) {
-      return new Response(JSON.stringify({ error: "Missing agent slug" }), {
-        status: 400,
-      })
-    }
-
-    const supabase = await createClient()
-
-    if (!supabase) {
-      return new Response(
-        JSON.stringify({ error: "Supabase not available in this deployment." }),
-        { status: 500 }
-      )
-    }
-
-    // Get the authenticated user
-    const { data: authData, error: authError } = await supabase.auth.getUser()
-
-    if (authError || !authData?.user?.id) {
-      return new Response(
-        JSON.stringify({ error: "Authentication required" }),
-        { status: 401 }
-      )
-    }
-
-    // First, check if the agent exists and the user owns it
-    const { data: agent, error: fetchError } = await supabase
-      .from("agents")
-      .select("id, creator_id, name")
-      .eq("slug", slug)
-      .single()
-
-    if (fetchError || !agent) {
-      return new Response(JSON.stringify({ error: "Agent not found" }), {
-        status: 404,
-      })
-    }
-
-    if (agent.creator_id !== authData.user.id) {
-      return new Response(
-        JSON.stringify({
-          error: "You can only delete agents that you created",
-        }),
-        { status: 403 }
-      )
-    }
-
-    // Delete the agent
-    const { error: deleteError } = await supabase
-      .from("agents")
-      .delete()
-      .eq("slug", slug)
-      .eq("creator_id", authData.user.id) // Extra safety check
-
-    if (deleteError) {
-      console.error("Error deleting agent:", deleteError)
-      return new Response(
-        JSON.stringify({
-          error: "Failed to delete agent",
-          details: deleteError.message,
-        }),
-        { status: 500 }
-      )
-    }
-
-    return new Response(
-      JSON.stringify({ message: "Agent deleted successfully" }),
-      { status: 200 }
-    )
-  } catch (err: unknown) {
-    console.error("Error in delete-agent endpoint:", err)
-
-    return new Response(
-      JSON.stringify({ error: (err as Error).message || "Internal server error" }),
-      { status: 500 }
-    )
-  }
-}
diff --git a/app/api/developer-tools/route.ts b/app/api/developer-tools/route.ts
deleted file mode 100644
index 389306b15..000000000
--- a/app/api/developer-tools/route.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { NextResponse } from "next/server"
-
-export async function GET() {
-  // Only allow in development
-  if (process.env.NODE_ENV !== "development") {
-    return NextResponse.json(
-      { error: "Not available in production" },
-      { status: 403 }
-    )
-  }
-
-  const getMaskedKey = (key: string | undefined) => {
-    if (!key || key.length < 4) return null
-    return `${"*".repeat(8)}${key.slice(-3)}`
-  }
-
-  const tools = [
-    {
-      id: "exa",
-      name: "Exa",
-      icon: "🧠",
-      description: "Use Exa to power search-based agents.",
-      envKeys: ["EXA_API_KEY"],
-      connected: Boolean(process.env.EXA_API_KEY),
-      maskedKey: getMaskedKey(process.env.EXA_API_KEY),
-      sampleEnv: `EXA_API_KEY=your_key_here`,
-    },
-    {
-      id: "github",
-      name: "GitHub",
-      icon: "🐙",
-      description: "Use GitHub Search in your agents.",
-      envKeys: ["GITHUB_TOKEN"],
-      connected: Boolean(process.env.GITHUB_TOKEN),
-      maskedKey: getMaskedKey(process.env.GITHUB_TOKEN),
-      sampleEnv: `GITHUB_TOKEN=your_token_here`,
-    },
-  ]
-
-  return NextResponse.json({ tools })
-}
diff --git a/app/api/tools-available/route.ts b/app/api/tools-available/route.ts
deleted file mode 100644
index 022a3ff6f..000000000
--- a/app/api/tools-available/route.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { TOOL_REGISTRY } from "@/lib/tools"
-import { NextResponse } from "next/server"
-
-export async function GET() {
-  const availableToolIds = Object.entries(TOOL_REGISTRY)
-    .filter(([, tool]) => tool?.isAvailable?.())
-    .map(([id]) => id)
-
-  return NextResponse.json({ available: availableToolIds })
-}
diff --git a/app/api/update-chat-agent/route.ts b/app/api/update-chat-agent/route.ts
deleted file mode 100644
index 50ba74813..000000000
--- a/app/api/update-chat-agent/route.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { filterLocalAgentId } from "@/lib/agents/utils"
-import { validateUserIdentity } from "@/lib/server/api"
-
-export async function POST(request: Request) {
-  try {
-    const { userId, chatId, agentId, isAuthenticated } = await request.json()
-
-    if (!userId || !chatId) {
-      return new Response(
-        JSON.stringify({ error: "Missing userId or chatId" }),
-        { status: 400 }
-      )
-    }
-
-    // Filter out local agent IDs for database operations
-    const dbAgentId = filterLocalAgentId(agentId)
-
-    const supabase = await validateUserIdentity(userId, isAuthenticated)
-
-    if (!supabase) {
-      console.log("Supabase not enabled, skipping agent update")
-      return new Response(
-        JSON.stringify({ chat: { id: chatId, agent_id: dbAgentId } }),
-        {
-          status: 200,
-        }
-      )
-    }
-
-    const { data, error: updateError } = await supabase
-      .from("chats")
-      .update({ agent_id: dbAgentId || null })
-      .eq("id", chatId)
-      .select()
-      .single()
-
-    if (updateError) {
-      return new Response(JSON.stringify({ error: "Failed to update chat" }), {
-        status: 500,
-      })
-    }
-
-    return new Response(JSON.stringify({ chat: data }), {
-      status: 200,
-    })
-  } catch (error) {
-    console.error("Error updating chat agent:", error)
-    return new Response(
-      JSON.stringify({ error: "Failed to update chat agent" }),
-      { status: 500 }
-    )
-  }
-}
diff --git a/app/components/agents/agent-card.tsx b/app/components/agents/agent-card.tsx
deleted file mode 100644
index 6fe149964..000000000
--- a/app/components/agents/agent-card.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Tables } from "@/app/types/database.types"
-import { Avatar, AvatarImage } from "@/components/ui/avatar"
-import { cn } from "@/lib/utils"
-
-type AgentCardProps = {
-  id: string
-  name: string
-  description: string
-  avatar_url?: string | null
-  className?: string
-  isAvailable: boolean
-  onClick?: () => void
-  system_prompt?: string
-  tools?: string[] | null
-  mcp_config?: Tables<"agents">["mcp_config"] | null
-  isLight?: boolean
-}
-
-export function AgentCard({
-  name,
-  description,
-  avatar_url,
-  className,
-  isAvailable,
-  onClick,
-  system_prompt,
-  tools,
-  mcp_config,
-  isLight = false,
-}: AgentCardProps) {
-  return (
-    <button
-      className={cn(
-        "flex items-start justify-start",
-        "bg-secondary hover:bg-accent cursor-pointer rounded-xl p-4 transition-colors",
-        className,
-        !isAvailable && "cursor-not-allowed opacity-50"
-      )}
-      type="button"
-      onClick={(e) => {
-        e.preventDefault()
-
-        if (!isAvailable) return
-
-        onClick?.()
-      }}
-    >
-      <div className="flex flex-col items-start space-y-2">
-        <div className="flex items-center space-x-2">
-          {avatar_url ? (
-            <div className="bg-muted size-4 overflow-hidden rounded-full">
-              <Avatar className="h-full w-full object-cover">
-                <AvatarImage
-                  src={avatar_url}
-                  alt={name}
-                  className="h-full w-full object-cover"
-                />
-              </Avatar>
-            </div>
-          ) : null}
-          <h3 className="text-foreground text-base font-medium">{name}</h3>
-        </div>
-
-        <p className="text-foreground line-clamp-2 text-left text-sm">
-          {description}
-        </p>
-
-        {!isLight && system_prompt && (
-          <p className="text-muted-foreground line-clamp-2 text-left font-mono text-sm">
-            {system_prompt}
-          </p>
-        )}
-
-        {!isLight && (
-          <div className="flex flex-wrap gap-2 text-xs">
-            {tools && tools.length > 0 ? (
-              <span className="text-muted-foreground">
-                tools: {tools.join(", ")}
-              </span>
-            ) : mcp_config ? (
-              <span className="text-muted-foreground">
-                mcp: {mcp_config.server}
-              </span>
-            ) : (
-              <span className="text-muted-foreground">tools: none</span>
-            )}
-          </div>
-        )}
-      </div>
-    </button>
-  )
-}
diff --git a/app/components/agents/agent-detail.tsx b/app/components/agents/agent-detail.tsx
deleted file mode 100644
index 203092f1f..000000000
--- a/app/components/agents/agent-detail.tsx
+++ /dev/null
@@ -1,442 +0,0 @@
-"use client"
-
-import { AgentSummary } from "@/app/types/agent"
-import type { Tables } from "@/app/types/database.types"
-import { ButtonCopy } from "@/components/common/button-copy"
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog"
-import { Avatar, AvatarImage } from "@/components/ui/avatar"
-import { Button } from "@/components/ui/button"
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu"
-import { toast } from "@/components/ui/toast"
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip"
-import { fetchClient } from "@/lib/fetch"
-import { API_ROUTE_DELETE_AGENT } from "@/lib/routes"
-import { useUser } from "@/lib/user-store/provider"
-import { cn } from "@/lib/utils"
-import {
-  ChatCircle,
-  Check,
-  CopySimple,
-  Cube,
-  DotsThree,
-  Trash,
-  X,
-} from "@phosphor-icons/react"
-import { useRouter } from "next/navigation"
-import { useRef, useState } from "react"
-
-function SystemPromptDisplay({ prompt }: { prompt: string }) {
-  const [expanded, setExpanded] = useState(false)
-  const isLong = prompt.length > 300
-
-  const displayText =
-    isLong && !expanded ? prompt.slice(0, 300) + "..." : prompt
-
-  return (
-    <div className="group relative rounded-md border p-2">
-      <div className="absolute top-0 right-0 flex h-9 items-center bg-white pr-1.5 opacity-0 transition-opacity duration-150 group-hover:opacity-100">
-        <ButtonCopy code={prompt} />
-      </div>
-      <div className="text-muted-foreground max-h-[expanded ? '400px' : '150px'] overflow-auto text-left font-mono text-sm whitespace-pre-wrap">
-        {displayText}
-      </div>
-      {isLong && (
-        <Button
-          variant="ghost"
-          size="sm"
-          onClick={() => setExpanded(!expanded)}
-          className="mt-2 h-6 text-xs"
-        >
-          {expanded ? "Show less" : "Show more"}
-        </Button>
-      )}
-    </div>
-  )
-}
-
-type AgentDetailProps = {
-  slug: string
-  name: string
-  description: string
-  example_inputs: string[]
-  creator_id?: string | null
-  avatar_url?: string | null
-  onAgentClick?: (agentId: string) => void
-  randomAgents: AgentSummary[]
-  isFullPage?: boolean
-  system_prompt?: string | null
-  tools?: string[] | null
-  mcp_config?: Tables<"agents">["mcp_config"] | null
-}
-
-export function AgentDetail({
-  slug,
-  name,
-  description,
-  example_inputs,
-  creator_id,
-  avatar_url,
-  onAgentClick,
-  randomAgents,
-  isFullPage,
-  system_prompt,
-  tools,
-  mcp_config,
-}: AgentDetailProps) {
-  const [copied, setCopied] = useState(false)
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false)
-  const [isDeleting, setIsDeleting] = useState(false)
-  const router = useRouter()
-  const { user } = useUser()
-  const didPrefetch = useRef(false)
-
-  if (!didPrefetch.current && isFullPage && randomAgents.length > 0) {
-    randomAgents.forEach((agent) => {
-      router.prefetch(`/agents/${agent.slug}`)
-    })
-    didPrefetch.current = true
-  }
-
-  const copyToClipboard = () => {
-    navigator.clipboard.writeText(`${window.location.origin}/agents/${slug}`)
-    setCopied(true)
-    setTimeout(() => setCopied(false), 1000)
-  }
-
-  const handleAgentClick = (agent: AgentSummary) => {
-    if (onAgentClick) {
-      onAgentClick(agent.id)
-    } else {
-      router.push(`/agents/${agent.slug}`)
-    }
-  }
-
-  const tryAgentWithPrompt = async (prompt: string) => {
-    router.push(`/?agent=${slug}&prompt=${encodeURIComponent(prompt)}`)
-  }
-
-  const tryAgent = async () => {
-    router.push(`/?agent=${slug}`)
-  }
-
-  const handleDelete = async () => {
-    if (!user?.id) {
-      toast({
-        title: "Error",
-        description: "You must be logged in to delete an agent.",
-        status: "error",
-      })
-      return
-    }
-
-    if (creator_id !== user.id) {
-      toast({
-        title: "Error",
-        description: "You can only delete agents that you created.",
-        status: "error",
-      })
-      return
-    }
-
-    setIsDeleting(true)
-    try {
-      const response = await fetchClient(API_ROUTE_DELETE_AGENT, {
-        method: "DELETE",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ slug }),
-      })
-
-      const data = await response.json()
-
-      if (!response.ok) {
-        throw new Error(data.error || `HTTP ${response.status}`)
-      }
-
-      toast({
-        title: "Success",
-        description: "Agent deleted successfully.",
-        status: "success",
-      })
-
-      setShowDeleteDialog(false)
-
-      // If we're in a dialog (not full page), close it first
-      if (!isFullPage && onAgentClick) {
-        onAgentClick("")
-      }
-
-      // Navigate to agents page
-      router.push("/agents")
-    } catch (error) {
-      console.error("Failed to delete agent:", error)
-      toast({
-        title: "Error",
-        description:
-          error instanceof Error
-            ? error.message
-            : "Failed to delete agent. Please try again.",
-        status: "error",
-      })
-    } finally {
-      setIsDeleting(false)
-    }
-  }
-
-  const canDelete = user?.id && creator_id === user.id
-
-  return (
-    <div
-      className={cn(
-        "bg-background relative flex w-full flex-col",
-        !isFullPage ? "h-full max-h-[80vh]" : "h-full"
-      )}
-    >
-      <div
-        className={cn(
-          "flex-1 overflow-x-hidden overflow-y-auto",
-          isFullPage ? "pb-0" : "pb-20"
-        )}
-      >
-        <div className="mb-6 flex items-center justify-between gap-4 pt-8 pr-8 pl-8">
-          <div className="flex items-center gap-4">
-            {avatar_url ? (
-              <Avatar className="size-16">
-                <AvatarImage
-                  src={avatar_url}
-                  alt={name}
-                  className="h-full w-full object-cover"
-                />
-              </Avatar>
-            ) : (
-              <div className="bg-background flex size-16 items-center justify-center rounded-full border border-dashed">
-                <Cube className="size-8" />
-              </div>
-            )}
-            <h1 className="text-2xl font-medium">{name}</h1>
-          </div>
-
-          <div
-            className={cn(
-              isFullPage ? "relative" : "absolute top-0 right-0 p-4"
-            )}
-          >
-            {isFullPage && canDelete && (
-              <DropdownMenu modal={false}>
-                <DropdownMenuTrigger asChild>
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    className="h-8 w-8 p-0"
-                    type="button"
-                  >
-                    <DotsThree className="size-4" weight="bold" />
-                    <span className="sr-only">Open menu</span>
-                  </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent align="end">
-                  <DropdownMenuItem
-                    className="text-destructive focus:text-destructive"
-                    onClick={() => setShowDeleteDialog(true)}
-                  >
-                    <Trash className="fill-destructive size-4" />
-                    Delete agent
-                  </DropdownMenuItem>
-                </DropdownMenuContent>
-              </DropdownMenu>
-            )}
-            {!isFullPage && (
-              <Button
-                variant="ghost"
-                size="sm"
-                className="h-8 w-8 p-0"
-                type="button"
-                onClick={() => onAgentClick?.("")}
-              >
-                <X className="size-4" />
-              </Button>
-            )}
-          </div>
-        </div>
-
-        <div className="px-4 md:px-8">
-          <p className="text-muted-foreground mb-6">{description}</p>
-        </div>
-
-        {system_prompt && (
-          <div className="mt-4 mb-8 px-4 md:px-8">
-            <h2 className="mb-4 text-lg font-medium">System Prompt</h2>
-            <SystemPromptDisplay prompt={system_prompt} />
-          </div>
-        )}
-
-        {(tools || mcp_config) && (
-          <div className="mb-8 grid grid-cols-1 gap-4 px-4 sm:grid-cols-2 md:px-8">
-            {tools && (
-              <div className="rounded-md border p-2">
-                <h3 className="mb-2 text-xs font-medium">Tools</h3>
-                <p className="text-muted-foreground text-xs">{tools}</p>
-              </div>
-            )}
-            {mcp_config && (
-              <div className="rounded-md border p-2">
-                <h3 className="mb-2 text-xs font-medium">MCP</h3>
-                <p className="text-muted-foreground truncate text-xs">
-                  {JSON.stringify(mcp_config)}
-                </p>
-              </div>
-            )}
-          </div>
-        )}
-
-        {example_inputs && example_inputs.length > 0 && (
-          <div className="mb-8 px-4 md:px-8">
-            <h2 className="mb-4 text-lg font-medium">What can I ask?</h2>
-            <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-              {example_inputs.map((example_input) => (
-                <Button
-                  key={example_input}
-                  type="button"
-                  className="flex h-auto w-full items-center justify-start px-2 py-1 text-left text-xs break-words whitespace-normal"
-                  variant="outline"
-                  size="sm"
-                  onClick={() => tryAgentWithPrompt(example_input)}
-                >
-                  {example_input}
-                </Button>
-              ))}
-            </div>
-          </div>
-        )}
-
-        {randomAgents && randomAgents.length > 0 && (
-          <div className="mt-8 pb-8">
-            <h2 className="mb-4 pl-4 text-lg font-medium md:pl-8">
-              More agents
-            </h2>
-            <div
-              className={cn(
-                isFullPage
-                  ? "grid grid-cols-1 gap-4 px-4 md:grid-cols-2 md:px-8"
-                  : "flex snap-x snap-mandatory scroll-ps-6 flex-nowrap gap-4 overflow-x-auto pl-4 md:pl-8"
-              )}
-              style={{
-                scrollbarWidth: "none",
-              }}
-            >
-              {randomAgents.map((agent, index) => (
-                <div
-                  key={agent.id}
-                  onClick={() => handleAgentClick(agent)}
-                  className={cn(
-                    "bg-secondary hover:bg-accent h-full cursor-pointer rounded-xl p-4 transition-colors",
-                    isFullPage ? "w-full" : "min-w-[280px]",
-                    index === randomAgents.length - 1 && "mr-6"
-                  )}
-                >
-                  <div className="flex items-start space-x-4">
-                    <div className="flex-shrink-0">
-                      {agent.avatar_url ? (
-                        <div className="bg-muted size-12 overflow-hidden rounded-full">
-                          <Avatar className="size-12 object-cover">
-                            <AvatarImage
-                              src={agent.avatar_url}
-                              alt={agent.name}
-                              className="h-full w-full object-cover"
-                            />
-                          </Avatar>
-                        </div>
-                      ) : (
-                        <div className="bg-muted size-12 overflow-hidden rounded-full">
-                          <Cube className="size-8" />
-                        </div>
-                      )}
-                    </div>
-                    <div className="min-w-0 flex-1">
-                      <h3 className="text-foreground truncate text-base font-medium">
-                        {agent.name}
-                      </h3>
-                      <p className="text-foreground mt-1 line-clamp-2 text-xs">
-                        {agent.description}
-                      </p>
-                    </div>
-                  </div>
-                </div>
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-
-      <div
-        className={cn(
-          "bg-background right-0 bottom-0 left-0 z-10 flex flex-row gap-2 border-t px-4 py-4 md:px-8",
-          !isFullPage ? "fixed" : "relative"
-        )}
-      >
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Button
-              onClick={copyToClipboard}
-              className="flex-1 text-center"
-              type="button"
-              variant="outline"
-            >
-              {copied ? (
-                <Check className="size-4" />
-              ) : (
-                <CopySimple className="size-4" />
-              )}
-              Share this agent
-            </Button>
-          </TooltipTrigger>
-          <TooltipContent>
-            {copied ? "Copied to clipboard" : "Copy link to clipboard"}
-          </TooltipContent>
-        </Tooltip>
-        <Button onClick={tryAgent} className="flex-1 text-center" type="button">
-          <ChatCircle className="size-4" />
-          Chat with {name}
-        </Button>
-      </div>
-
-      {/* Only show AlertDialog in full page mode to avoid nesting issues */}
-      {isFullPage && (
-        <AlertDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
-          <AlertDialogContent>
-            <AlertDialogHeader>
-              <AlertDialogTitle>Delete Agent</AlertDialogTitle>
-              <AlertDialogDescription>
-                Are you sure you want to delete &quot;{name}&quot;? This action
-                cannot be undone.
-              </AlertDialogDescription>
-            </AlertDialogHeader>
-            <AlertDialogFooter>
-              <AlertDialogCancel>Cancel</AlertDialogCancel>
-              <AlertDialogAction onClick={handleDelete} disabled={isDeleting}>
-                {isDeleting ? "Deleting..." : "Delete"}
-              </AlertDialogAction>
-            </AlertDialogFooter>
-          </AlertDialogContent>
-        </AlertDialog>
-      )}
-    </div>
-  )
-}
diff --git a/app/components/agents/agent-featured-section.tsx b/app/components/agents/agent-featured-section.tsx
deleted file mode 100644
index e0ca938cf..000000000
--- a/app/components/agents/agent-featured-section.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Agent } from "@/app/types/agent"
-import React from "react"
-import { DialogAgent } from "./dialog-agent"
-
-type AgentFeaturedSectionProps = {
-  agents: Agent[]
-  handleAgentClick: (agentId: string | null) => void
-  openAgentId: string | null
-  setOpenAgentId: (agentId: string | null) => void
-  moreAgents: Agent[]
-}
-
-export function AgentFeaturedSection({
-  agents,
-  moreAgents,
-  handleAgentClick,
-  openAgentId,
-  setOpenAgentId,
-}: AgentFeaturedSectionProps) {
-  if (!agents || agents.length === 0) {
-    return null
-  }
-
-  return (
-    <div className="mt-12">
-      <h2 className="text-foreground mb-4 text-lg font-medium">Featured</h2>
-      <div className="grid gap-4 md:grid-cols-2">
-        {agents.map((agent) => (
-          <DialogAgent
-            key={agent.id}
-            id={agent.id}
-            name={agent.name}
-            description={agent.description}
-            avatar_url={agent.avatar_url}
-            system_prompt={agent.system_prompt}
-            example_inputs={agent.example_inputs || []}
-            isAvailable={true}
-            slug={agent.slug}
-            onAgentClick={handleAgentClick}
-            isOpen={openAgentId === agent.id}
-            onOpenChange={(open) => setOpenAgentId(open ? agent.id : null)}
-            randomAgents={moreAgents}
-          />
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/app/components/agents/agents-page.tsx b/app/components/agents/agents-page.tsx
deleted file mode 100644
index 1fb5153de..000000000
--- a/app/components/agents/agents-page.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-"use client"
-
-import { Agent } from "@/app/types/agent"
-import { Button } from "@/components/ui/button"
-import { useMemo, useState } from "react"
-import { AgentFeaturedSection } from "./agent-featured-section"
-import { DialogCreateAgentTrigger } from "./dialog-create-agent/dialog-trigger-create-agent"
-import { UserAgentsSection } from "./user-agent-section"
-
-type AgentsPageProps = {
-  curatedAgents: Agent[]
-  userAgents: Agent[] | null
-  userId: string | null
-}
-
-export function AgentsPage({
-  curatedAgents,
-  userAgents,
-  userId,
-}: AgentsPageProps) {
-  const [openAgentId, setOpenAgentId] = useState<string | null>(null)
-
-  const randomAgents = useMemo(() => {
-    return curatedAgents
-      .filter((agent) => agent.id !== openAgentId)
-      .sort(() => Math.random() - 0.5)
-      .slice(0, 4)
-  }, [curatedAgents, openAgentId])
-
-  const handleAgentClick = (agentId: string | null) => {
-    setOpenAgentId(agentId)
-  }
-
-  return (
-    <div className="bg-background min-h-screen px-4 pt-20 pb-20 sm:px-6">
-      <div className="mx-auto max-w-3xl">
-        <div className="mb-20 text-center">
-          <h1 className="text-foreground text-sm font-medium">
-            Agents (experimental)
-          </h1>
-          <div className="text-foreground mx-auto my-4 max-w-2xl text-3xl font-medium tracking-tight md:text-5xl">
-            Your every day AI assistant
-          </div>
-          <p className="text-muted-foreground mx-auto mb-4 max-w-2xl text-lg">
-            a growing set of personal AI agents, built for ideas, writing, and
-            product work.
-          </p>
-          <DialogCreateAgentTrigger
-            trigger={
-              <Button variant="outline" className="rounded-full">
-                Create an agent
-              </Button>
-            }
-          />
-        </div>
-
-        <AgentFeaturedSection
-          agents={curatedAgents}
-          moreAgents={randomAgents}
-          handleAgentClick={handleAgentClick}
-          openAgentId={openAgentId}
-          setOpenAgentId={setOpenAgentId}
-        />
-        <UserAgentsSection
-          agents={userAgents || null}
-          moreAgents={randomAgents}
-          userId={userId || null}
-          handleAgentClick={handleAgentClick}
-          openAgentId={openAgentId}
-          setOpenAgentId={setOpenAgentId}
-        />
-      </div>
-    </div>
-  )
-}
diff --git a/app/components/agents/dialog-agent.tsx b/app/components/agents/dialog-agent.tsx
deleted file mode 100644
index 9f25135ee..000000000
--- a/app/components/agents/dialog-agent.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { useBreakpoint } from "@/app/hooks/use-breakpoint"
-import { AgentSummary } from "@/app/types/agent"
-import type { Tables } from "@/app/types/database.types"
-import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog"
-import { Drawer, DrawerContent, DrawerTrigger } from "@/components/ui/drawer"
-import { AgentCard } from "./agent-card"
-import { AgentDetail } from "./agent-detail"
-
-type DialogAgentProps = {
-  id: string
-  name: string
-  description: string
-  avatar_url?: string | null
-  example_inputs: string[]
-  className?: string
-  isAvailable: boolean
-  slug: string
-  onAgentClick?: (agentId: string | null) => void
-  isOpen: boolean
-  onOpenChange: (open: boolean) => void
-  randomAgents: AgentSummary[]
-  trigger?: React.ReactNode
-  system_prompt?: string | null
-  tools?: string[] | null
-  mcp_config?: Tables<"agents">["mcp_config"] | null
-  isCardLight?: boolean
-  creator_id?: string | null
-}
-
-export function DialogAgent({
-  id,
-  name,
-  description,
-  avatar_url,
-  example_inputs,
-  slug,
-  system_prompt,
-  className,
-  isAvailable,
-  onAgentClick,
-  isOpen,
-  onOpenChange,
-  randomAgents,
-  trigger = null,
-  tools,
-  mcp_config,
-  isCardLight = false,
-  creator_id,
-}: DialogAgentProps) {
-  const isMobile = useBreakpoint(768)
-
-  const handleOpenChange = (open: boolean) => {
-    if (!isAvailable) {
-      return
-    }
-
-    window.history.replaceState(null, "", `/agents/${slug}`)
-    onOpenChange(open)
-  }
-
-  const defaultTrigger = (
-    <AgentCard
-      id={id}
-      name={name}
-      description={description}
-      avatar_url={avatar_url}
-      className={className}
-      isAvailable={isAvailable}
-      onClick={() => handleOpenChange(true)}
-      tools={tools}
-      mcp_config={mcp_config}
-      isLight={isCardLight}
-    />
-  )
-
-  const renderContent = () => (
-    <AgentDetail
-      slug={slug}
-      name={name}
-      description={description}
-      example_inputs={example_inputs}
-      avatar_url={avatar_url}
-      system_prompt={system_prompt}
-      tools={tools}
-      mcp_config={mcp_config}
-      onAgentClick={onAgentClick}
-      randomAgents={randomAgents}
-      creator_id={creator_id}
-    />
-  )
-
-  if (isMobile) {
-    return (
-      <Drawer open={isOpen} onOpenChange={handleOpenChange}>
-        <DrawerTrigger asChild>{trigger || defaultTrigger}</DrawerTrigger>
-        <DrawerContent className="bg-background border-border">
-          {renderContent()}
-        </DrawerContent>
-      </Drawer>
-    )
-  }
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleOpenChange}>
-      <DialogTrigger asChild>{trigger || defaultTrigger}</DialogTrigger>
-      <DialogContent
-        hasCloseButton={false}
-        className="[&>button:last-child]:bg-background flex gap-0 overflow-hidden rounded-3xl p-0 shadow-xs [&>button:last-child]:rounded-full [&>button:last-child]:p-1"
-        onOpenAutoFocus={(e) => e.preventDefault()}
-      >
-        {renderContent()}
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/app/components/agents/dialog-create-agent/create-agent-form.tsx b/app/components/agents/dialog-create-agent/create-agent-form.tsx
deleted file mode 100644
index 1d2c1520d..000000000
--- a/app/components/agents/dialog-create-agent/create-agent-form.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-"use client"
-
-import { Badge } from "@/components/ui/badge"
-import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Label } from "@/components/ui/label"
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select"
-import { Textarea } from "@/components/ui/textarea"
-import { AlertCircle, Check, Github, X } from "lucide-react"
-import type React from "react"
-import { ToolsSection } from "./tools-section"
-
-export type AgentFormData = {
-  name: string
-  description: string
-  systemPrompt: string
-  mcp: "none" | "git-mcp"
-  repository?: string
-  tools: string[]
-}
-
-type CreateAgentFormProps = {
-  formData: AgentFormData
-  repository: string
-  setRepository: (e: React.ChangeEvent<HTMLInputElement>) => void
-  error: { [key: string]: string }
-  isLoading: boolean
-  handleInputChange: (
-    e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
-  ) => void
-  handleSelectChange: (value: string) => void
-  handleToolsChange: (selectedTools: string[]) => void
-  handleSubmit: (e: React.FormEvent) => Promise<void>
-  onClose: () => void
-  isDrawer?: boolean
-}
-
-export function CreateAgentForm({
-  formData,
-  repository,
-  setRepository,
-  error,
-  isLoading,
-  handleInputChange,
-  handleSelectChange,
-  handleToolsChange,
-  handleSubmit,
-  onClose,
-  isDrawer = false,
-}: CreateAgentFormProps) {
-  return (
-    <div
-      className={`space-y-0 ${isDrawer ? "p-0 pb-16" : "py-0"} overflow-y-auto`}
-    >
-      {isDrawer && (
-        <div className="border-border mb-2 flex items-center justify-between border-b px-4 pb-2">
-          <h2 className="text-lg font-medium">Create agent (experimental)</h2>
-          <Button variant="ghost" size="icon" onClick={onClose}>
-            <X className="h-4 w-4" />
-          </Button>
-        </div>
-      )}
-
-      <div className="px-6 py-4">
-        <div className="bg-muted/50 mb-6 rounded-lg p-3">
-          <p className="text-sm">
-            Agents can use a system prompt and optionally connect to GitHub
-            repos via git-mcp. More tools and MCP integrations are coming soon.
-          </p>
-        </div>
-
-        <form onSubmit={handleSubmit} className="space-y-6">
-          {/* Agent Name */}
-          <div className="space-y-2">
-            <Label htmlFor="name">Agent name</Label>
-            <Input
-              id="name"
-              name="name"
-              placeholder="My Agent"
-              value={formData.name}
-              onChange={handleInputChange}
-              className={error.name ? "border-red-500" : ""}
-            />
-
-            {error.name && (
-              <div className="mt-1 flex items-center text-sm text-red-500">
-                <AlertCircle className="mr-1 h-4 w-4" />
-                <span>{error.name}</span>
-              </div>
-            )}
-          </div>
-
-          {/* Description */}
-          <div className="space-y-2">
-            <Label htmlFor="description">Description</Label>
-            <Input
-              id="description"
-              name="description"
-              placeholder="A short description of what this agent does"
-              value={formData.description}
-              onChange={handleInputChange}
-              className={error.description ? "border-red-500" : ""}
-            />
-            <p className="text-muted-foreground text-xs">
-              Short sentence, used in list/search
-            </p>
-            {error.description && (
-              <div className="mt-1 flex items-center text-sm text-red-500">
-                <AlertCircle className="mr-1 h-4 w-4" />
-                <span>{error.description}</span>
-              </div>
-            )}
-          </div>
-
-          <ToolsSection onSelectTools={handleToolsChange} />
-
-          {/* MCP Dropdown */}
-          <div className="space-y-2">
-            <Label htmlFor="mcp">MCP</Label>
-            <Select value={formData.mcp} onValueChange={handleSelectChange}>
-              <SelectTrigger className="w-full">
-                <SelectValue placeholder="Select MCP" />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="none">None</SelectItem>
-                <SelectItem value="git-mcp">git-mcp</SelectItem>
-              </SelectContent>
-            </Select>
-          </div>
-
-          {/* Repository (only shown if git-mcp is selected) */}
-          {formData.mcp === "git-mcp" && (
-            <div className="space-y-2">
-              <Label htmlFor="repository">GitHub repository</Label>
-              <div className="flex items-center">
-                <Github className="text-muted-foreground mr-2 h-4 w-4" />
-                <Input
-                  id="repository"
-                  placeholder="owner/repo"
-                  value={repository}
-                  onChange={setRepository}
-                  className={error.repository ? "border-red-500" : ""}
-                />
-              </div>
-
-              {error.repository && (
-                <div className="mt-1 flex items-center text-sm text-red-500">
-                  <AlertCircle className="mr-1 h-4 w-4" />
-                  <span>{error.repository}</span>
-                </div>
-              )}
-            </div>
-          )}
-
-          {/* System Prompt */}
-          <div className="space-y-2">
-            <Label htmlFor="systemPrompt">System prompt</Label>
-            <Textarea
-              id="systemPrompt"
-              name="systemPrompt"
-              placeholder="You are a helpful assistant..."
-              value={formData.systemPrompt}
-              onChange={handleInputChange}
-              className={`h-32 font-mono ${error.systemPrompt ? "border-red-500" : ""}`}
-            />
-            {error.systemPrompt && (
-              <div className="mt-1 flex items-center text-sm text-red-500">
-                <AlertCircle className="mr-1 h-4 w-4" />
-                <span>{error.systemPrompt}</span>
-              </div>
-            )}
-          </div>
-
-          {/* Tools (only shown if git-mcp is selected) */}
-          {formData.mcp === "git-mcp" && (
-            <div className="overflow-hidden rounded-lg border p-2">
-              <div className="mb-2 flex items-center justify-between">
-                <h3 className="text-sm font-medium">
-                  Enabled tools via git-mcp:
-                </h3>
-                <Badge
-                  variant="outline"
-                  className="border-green-200 bg-green-50 text-green-700"
-                >
-                  <Check className="mr-1 h-3 w-3" /> Enabled
-                </Badge>
-              </div>
-              <ul className="list-disc space-y-1 pl-5 text-sm">
-                <li>get_repo_info</li>
-                <li>list_issues</li>
-                <li>create_issue</li>
-                <li>get_file_contents</li>
-              </ul>
-            </div>
-          )}
-
-          {/* Submit Button */}
-          <Button type="submit" className="w-full" disabled={isLoading}>
-            {isLoading ? "Creating Agent..." : "Create Agent"}
-          </Button>
-        </form>
-      </div>
-    </div>
-  )
-}
diff --git a/app/components/agents/dialog-create-agent/dialog-trigger-create-agent.tsx b/app/components/agents/dialog-create-agent/dialog-trigger-create-agent.tsx
deleted file mode 100644
index 4351de62c..000000000
--- a/app/components/agents/dialog-create-agent/dialog-trigger-create-agent.tsx
+++ /dev/null
@@ -1,200 +0,0 @@
-"use client"
-
-import { PopoverContentAuth } from "@/app/components/chat-input/popover-content-auth"
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog"
-import { Drawer, DrawerContent, DrawerTrigger } from "@/components/ui/drawer"
-import { Popover, PopoverTrigger } from "@/components/ui/popover"
-import { toast } from "@/components/ui/toast"
-import { useAgent } from "@/lib/agent-store/provider"
-import { fetchClient } from "@/lib/fetch"
-import { API_ROUTE_CREATE_AGENT } from "@/lib/routes"
-import { useUser } from "@/lib/user-store/provider"
-import { useRouter } from "next/navigation"
-import type React from "react"
-import { useState } from "react"
-import { useBreakpoint } from "../../../hooks/use-breakpoint"
-import { AgentFormData, CreateAgentForm } from "./create-agent-form"
-
-export function DialogCreateAgentTrigger({
-  trigger,
-}: {
-  trigger: React.ReactNode
-}) {
-  const { user } = useUser()
-  const { refetchUserAgents } = useAgent()
-  const isAuthenticated = !!user?.id
-  const [open, setOpen] = useState(false)
-  const [formData, setFormData] = useState<AgentFormData>({
-    name: "",
-    description: "",
-    systemPrompt: "",
-    mcp: "none",
-    tools: [],
-  })
-  const [repository, setRepository] = useState("")
-  const [error, setError] = useState<{ [key: string]: string }>({})
-  const [isLoading, setIsLoading] = useState(false)
-  const router = useRouter()
-  const isMobile = useBreakpoint(768)
-
-  const generateSystemPrompt = (owner: string, repo: string) => {
-    return `You are a helpful GitHub assistant focused on the repository: ${owner}/${repo}.
-
-Use the available tools below to answer any questions. Always prefer using tools over guessing.
-
-Tools available for this repository:
-- \`fetch_${repo}_documentation\`: Fetch the entire documentation file.
-- \`search_${repo}_documentation\`: Semantically search the documentation.
-- \`search_${repo}_code\`: Search code with exact matches using the GitHub API.
-- \`fetch_generic_url_content\`: Fetch absolute URLs when referenced in the docs or needed for context.
-
-Never invent answers. Use tools and return what you find.`
-  }
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    const newErrors: { [key: string]: string } = {}
-    if (!formData.name.trim()) newErrors.name = "Agent name is required"
-    if (!formData.description.trim())
-      newErrors.description = "Description is required"
-    if (!formData.systemPrompt.trim())
-      newErrors.systemPrompt = "System prompt is required"
-    if (
-      formData.mcp === "git-mcp" &&
-      !/^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/.test(repository)
-    ) {
-      newErrors.repository =
-        'Please enter a valid repository in the format "owner/repo"'
-    }
-    if (Object.keys(newErrors).length) return setError(newErrors)
-
-    setIsLoading(true)
-    try {
-      if (formData.mcp === "git-mcp") {
-        const response = await fetch(
-          `https://api.github.com/repos/${repository}`
-        )
-        if (!response.ok) {
-          setError({ repository: "Repository not found." })
-          setIsLoading(false)
-          return
-        }
-        formData.repository = repository
-      }
-
-      const [owner, repo] = repository.split("/")
-
-      const res = await fetchClient(API_ROUTE_CREATE_AGENT, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          name: formData.name,
-          description: formData.description,
-          systemPrompt: formData.systemPrompt,
-          avatar_url: repository ? `https://github.com/${owner}.png` : null,
-          mcp_config: repository
-            ? { server: `https://gitmcp.io/${owner}/${repo}`, variables: [] }
-            : null,
-          example_inputs: repository
-            ? [
-                "what does this repository do?",
-                "how to install the project?",
-                "how can I use this project?",
-                "where is the main code located?",
-              ]
-            : null,
-          tools: formData.tools,
-          remixable: false,
-          is_public: true,
-          max_steps: 5,
-        }),
-      })
-
-      if (!res.ok) throw new Error("Failed to create agent")
-      const { agent } = await res.json()
-      refetchUserAgents()
-      setOpen(false)
-      router.push(`/?agent=${agent.slug}`)
-    } catch (err) {
-      console.error(err)
-      toast({
-        title: "Error",
-        description: "Could not create agent. Try again.",
-      })
-    } finally {
-      setIsLoading(false)
-    }
-  }
-
-  const content = (
-    <CreateAgentForm
-      formData={formData}
-      repository={repository}
-      setRepository={(e) => setRepository(e.target.value)}
-      error={error}
-      isLoading={isLoading}
-      handleInputChange={(e) => {
-        const { name, value } = e.target
-        setFormData((f) => ({ ...f, [name]: value }))
-        if (error[name]) setError((err) => ({ ...err, [name]: "" }))
-      }}
-      handleSelectChange={(value) => {
-        setFormData((f) => ({ ...f, mcp: value as "none" | "git-mcp" }))
-        if (value !== "git-mcp") setError((e) => ({ ...e, repository: "" }))
-        if (value === "git-mcp" && /^[^/]+\/[^/]+$/.test(repository)) {
-          const [owner, repo] = repository.split("/")
-          setFormData((f) => ({
-            ...f,
-            systemPrompt: generateSystemPrompt(owner, repo),
-          }))
-        }
-      }}
-      handleToolsChange={(tools) => setFormData((f) => ({ ...f, tools }))}
-      handleSubmit={handleSubmit}
-      onClose={() => setOpen(false)}
-      isDrawer={isMobile}
-    />
-  )
-
-  if (!isAuthenticated) {
-    return (
-      <Popover>
-        <PopoverTrigger asChild>{trigger}</PopoverTrigger>
-        <PopoverContentAuth />
-      </Popover>
-    )
-  }
-
-  if (isMobile) {
-    return (
-      <Drawer open={open} onOpenChange={setOpen}>
-        <DrawerTrigger asChild>{trigger}</DrawerTrigger>
-        <DrawerContent className="max-h-[90vh]">{content}</DrawerContent>
-      </Drawer>
-    )
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>{trigger}</DialogTrigger>
-      <DialogContent className="max-h-[90vh] gap-0 overflow-y-auto p-0 sm:max-w-xl">
-        <div
-          className="h-full w-full"
-          onClick={(e) => e.stopPropagation()}
-          onMouseDown={(e) => e.stopPropagation()}
-        >
-          <DialogHeader className="border-border border-b px-6 py-4">
-            <DialogTitle>Create agent (experimental)</DialogTitle>
-          </DialogHeader>
-          {content}
-        </div>
-      </DialogContent>
-    </Dialog>
-  )
-}
diff --git a/app/components/agents/dialog-create-agent/tools-section.tsx b/app/components/agents/dialog-create-agent/tools-section.tsx
deleted file mode 100644
index a00e34457..000000000
--- a/app/components/agents/dialog-create-agent/tools-section.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-"use client"
-
-import { Label } from "@/components/ui/label"
-import { fetchClient } from "@/lib/fetch"
-import { getAllTools } from "@/lib/tools"
-import { cn } from "@/lib/utils"
-import { useQuery } from "@tanstack/react-query"
-import React, { useState } from "react"
-
-const isDev = process.env.NODE_ENV === "development"
-
-type ToolsSectionProps = {
-  onSelectTools: (selectedTools: string[]) => void
-}
-
-export function ToolsSection({ onSelectTools }: ToolsSectionProps) {
-  const [selectedTools, setSelectedTools] = useState<string[]>([])
-  const tools = getAllTools()
-
-  const { data: availableTools } = useQuery<string[]>({
-    queryKey: ["available-tools"],
-    queryFn: async () => {
-      if (!isDev) return []
-      const res = await fetchClient("/api/tools-available")
-      const json = await res.json()
-      return json.available || []
-    },
-    enabled: isDev,
-  })
-
-  const handleToolToggle = (toolId: string) => {
-    const newSelection = selectedTools.includes(toolId)
-      ? selectedTools.filter((id) => id !== toolId)
-      : [...selectedTools, toolId]
-
-    setSelectedTools(newSelection)
-    onSelectTools(newSelection)
-  }
-
-  // Development mode required
-  if (!isDev) {
-    return (
-      <div className="space-y-2">
-        <div className="space-y-2">
-          <Label>Tools</Label>
-          <p className="text-muted-foreground text-sm">
-            Tools are only available in development mode.
-          </p>
-        </div>
-      </div>
-    )
-  }
-
-  return (
-    <div className="space-y-4">
-      <div className="space-y-2">
-        <Label htmlFor="tools">Tools</Label>
-        <p className="text-muted-foreground text-sm">
-          Select tools to enable for this agent. Tools are used to interact with
-          the world.
-        </p>
-      </div>
-
-      <div className="grid gap-3">
-        {tools.map((tool) => {
-          const isSelected = selectedTools.includes(tool.id)
-          const isAvailable = availableTools?.includes(tool.id)
-
-          return (
-            <div
-              key={tool.id}
-              className={cn(
-                "cursor-pointer rounded-lg border p-4 transition-all hover:shadow-sm",
-                isSelected
-                  ? "border-primary bg-primary/5 ring-primary/20 ring-1"
-                  : "border-border hover:border-primary/50",
-                !isAvailable && "cursor-not-allowed opacity-60"
-              )}
-              onClick={() => isAvailable && handleToolToggle(tool.id)}
-            >
-              <div className="flex items-start gap-4">
-                <div className="flex items-center pt-0.5">
-                  <input
-                    type="checkbox"
-                    checked={isSelected}
-                    disabled={!isAvailable}
-                    className="size-4"
-                  />
-                </div>
-                <div className="min-w-0 flex-1">
-                  <div className="mb-2 flex items-center gap-2">
-                    <h3 className="text-sm font-medium">{tool.id}</h3>
-                  </div>
-                  <p className="text-muted-foreground text-xs leading-relaxed">
-                    {tool.description}
-                  </p>
-                </div>
-              </div>
-            </div>
-          )
-        })}
-      </div>
-
-      {selectedTools.length > 0 && (
-        <div className="bg-muted/50 rounded-lg border p-3">
-          <div className="mb-1 text-sm font-medium">Selected tools:</div>
-          <div className="text-muted-foreground text-xs">
-            {selectedTools
-              .map((toolId) => {
-                const tool = tools.find((t) => t.id === toolId)
-                return tool?.description || toolId
-              })
-              .join(", ")}
-          </div>
-        </div>
-      )}
-
-      {tools.length === 0 && (
-        <div className="text-muted-foreground py-6 text-center">
-          <p className="text-sm">No tools available</p>
-        </div>
-      )}
-    </div>
-  )
-}
diff --git a/app/components/agents/research-section.tsx b/app/components/agents/research-section.tsx
deleted file mode 100644
index 4d14d0b2e..000000000
--- a/app/components/agents/research-section.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import { AgentSummary } from "@/app/types/agent"
-import { ArrowUpRight } from "@phosphor-icons/react"
-import Image from "next/image"
-import { DialogAgent } from "./dialog-agent"
-
-type ResearchSectionProps = {
-  researchAgent: AgentSummary
-  handleAgentClick: (agentId: string | null) => void
-  openAgentId: string | null
-  setOpenAgentId: (agentId: string | null) => void
-  randomAgents: AgentSummary[]
-}
-export function ResearchSection({
-  researchAgent,
-  handleAgentClick,
-  openAgentId,
-  setOpenAgentId,
-  randomAgents,
-}: ResearchSectionProps) {
-  return (
-    <div className="mt-12">
-      <h2 className="text-foreground text-lg font-medium">Research</h2>
-      <p className="text-muted-foreground mb-4">
-        Backed by real-time web search. Ideal for deep, accurate research.
-      </p>
-      <DialogAgent
-        key={researchAgent.id}
-        id={researchAgent.id}
-        slug={researchAgent.slug}
-        name={researchAgent.name}
-        description={researchAgent.description}
-        avatar_url={researchAgent.avatar_url}
-        example_inputs={researchAgent.example_inputs || []}
-        isAvailable={true}
-        onAgentClick={handleAgentClick}
-        isOpen={openAgentId === researchAgent.id}
-        onOpenChange={(open) => setOpenAgentId(open ? researchAgent.id : null)}
-        randomAgents={randomAgents}
-        system_prompt={researchAgent.system_prompt}
-        tools={researchAgent.tools || []}
-        mcp_config={researchAgent.mcp_config}
-        trigger={
-          <button
-            className="group w-full items-end justify-start"
-            type="button"
-          >
-            <div className="relative min-h-[140px] w-full overflow-hidden rounded-2xl shadow-lg md:aspect-[4/1]">
-              <div className="absolute inset-0">
-                <Image
-                  src="/banner_cloud.jpg"
-                  alt="Cloud background"
-                  fill
-                  className="object-cover transition-all duration-300 group-hover:scale-105"
-                />
-              </div>
-
-              <div className="absolute inset-0 bg-gradient-to-t from-black/70 via-black/20 to-transparent dark:from-black/70 dark:via-black/20" />
-
-              <div className="relative flex h-full min-h-[140px] flex-col p-5">
-                {/* <div className="self-start rounded-full bg-black/70 px-3 py-1.5 text-xs font-medium text-white backdrop-blur-sm">
-        Research
-      </div> */}
-
-                <div className="mt-auto flex flex-row items-end justify-between gap-2">
-                  <div className="flex flex-col items-start gap-0.5 text-left">
-                    <h3 className="text-2xl leading-tight font-medium text-white">
-                      Zola Research
-                    </h3>
-
-                    <p className="text-sm text-white/80">
-                      Summarizes sources, finds answers. Helps you explore any
-                      topic, fast, focused, and clear.
-                    </p>
-                  </div>
-                  <div className="rounded-full bg-white/20 p-2 backdrop-blur-sm">
-                    <ArrowUpRight className="h-4 w-4 text-white" />
-                  </div>
-                </div>
-              </div>
-            </div>
-          </button>
-        }
-      />
-    </div>
-  )
-}
diff --git a/app/components/agents/user-agent-section.tsx b/app/components/agents/user-agent-section.tsx
deleted file mode 100644
index f5f5a6d86..000000000
--- a/app/components/agents/user-agent-section.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Agent } from "@/app/types/agent"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent } from "@/components/ui/card"
-import Link from "next/link"
-import { DialogAgent } from "./dialog-agent"
-import { DialogCreateAgentTrigger } from "./dialog-create-agent/dialog-trigger-create-agent"
-
-type UserAgentsSectionProps = {
-  agents: Agent[] | null
-  userId?: string | null
-  handleAgentClick: (agentId: string | null) => void
-  openAgentId: string | null
-  setOpenAgentId: (agentId: string | null) => void
-  moreAgents: Agent[]
-}
-
-export function UserAgentsSection({
-  agents,
-  userId,
-  handleAgentClick,
-  openAgentId,
-  setOpenAgentId,
-  moreAgents,
-}: UserAgentsSectionProps) {
-  const hasUserAgents = agents && agents.length > 0
-
-  // Not authenticated
-  if (!userId) {
-    return (
-      <Card className="mt-8 border-dashed">
-        <CardContent className="flex flex-col items-center justify-center py-6 text-center">
-          <h3 className="mb-2 text-lg font-medium">
-            Want to create your own agents?
-          </h3>
-          <p className="text-muted-foreground mb-4">
-            Sign in to create and manage custom AI agents
-          </p>
-          <Button asChild>
-            <Link href="/auth">Sign in to get started</Link>
-          </Button>
-        </CardContent>
-      </Card>
-    )
-  }
-
-  // Authenticated but no agents
-  if (userId && !hasUserAgents) {
-    return (
-      <div className="mt-8 border-dashed">
-        <CardContent className="flex flex-col items-center justify-center py-6 text-center">
-          <h3 className="mb-2 text-lg font-medium">
-            You haven&apos;t created any agents yet
-          </h3>
-          <p className="text-muted-foreground mb-4">
-            Create your first custom agent to get started
-          </p>
-          <DialogCreateAgentTrigger
-            trigger={<Button>Create an agent</Button>}
-          />
-        </CardContent>
-      </div>
-    )
-  }
-
-  // Authenticated with agents
-  return (
-    <div className="mt-12">
-      <h2 className="text-foreground mb-4 text-lg font-medium">Your agents</h2>
-      <div className="grid gap-4 md:grid-cols-2">
-        {agents?.map((agent) => (
-          <DialogAgent
-            key={agent.id}
-            id={agent.id}
-            name={agent.name}
-            description={agent.description}
-            avatar_url={agent.avatar_url}
-            example_inputs={agent.example_inputs || []}
-            isAvailable={true}
-            onAgentClick={handleAgentClick}
-            isOpen={openAgentId === agent.id}
-            onOpenChange={(open) => setOpenAgentId(open ? agent.id : null)}
-            randomAgents={moreAgents}
-            slug={agent.slug}
-            system_prompt={agent.system_prompt}
-            tools={agent.tools}
-            mcp_config={agent.mcp_config}
-            creator_id={agent.creator_id}
-          />
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/app/components/chat-input/agent-command.tsx b/app/components/chat-input/agent-command.tsx
deleted file mode 100644
index 64bf2e924..000000000
--- a/app/components/chat-input/agent-command.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-"use client"
-
-import useClickOutside from "@/app/hooks/use-click-outside"
-import { Agent } from "@/app/types/agent"
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import { isSupabaseEnabled } from "@/lib/supabase/config"
-import { cn } from "@/lib/utils"
-import { Cube, Plus } from "@phosphor-icons/react"
-import { useRef } from "react"
-import { DialogCreateAgentTrigger } from "../agents/dialog-create-agent/dialog-trigger-create-agent"
-
-type AgentCommandProps = {
-  isOpen: boolean
-  searchTerm: string
-  onSelect: (agent: Agent) => void
-  onClose: () => void
-  activeIndex: number
-  onActiveIndexChange: (index: number) => void
-  onCreateNewAgent?: () => void
-  curatedAgents: Agent[]
-  userAgents: Agent[]
-}
-
-export function AgentCommand({
-  isOpen,
-  searchTerm,
-  onSelect,
-  onClose,
-  activeIndex,
-  onActiveIndexChange,
-  onCreateNewAgent = () => {},
-  curatedAgents,
-  userAgents,
-}: AgentCommandProps) {
-  const containerRef = useRef<HTMLDivElement>(null)
-
-  // Handle clicks outside using the custom hook
-  useClickOutside(containerRef, onClose)
-
-  // Ref callback to handle scrolling into view
-  const activeItemRef = (element: HTMLLIElement | null) => {
-    if (element && isOpen) {
-      element.scrollIntoView({ block: "nearest" })
-    }
-  }
-
-  if (!isSupabaseEnabled) {
-    return null
-  }
-
-  // Filter agents based on search term
-  const filteredAgents = searchTerm
-    ? [...curatedAgents, ...userAgents].filter((agent) =>
-        agent.name.toLowerCase().includes(searchTerm.toLowerCase())
-      )
-    : [...curatedAgents, ...userAgents]
-
-  // Helper function to check if an agent is curated
-  const isCuratedAgent = (agentId: string) => {
-    return curatedAgents.some((curatedAgent) => curatedAgent.id === agentId)
-  }
-
-  if (!isOpen) return null
-
-  return (
-    <div
-      ref={containerRef}
-      className="bg-popover absolute bottom-full z-50 mb-2 flex w-full max-w-sm flex-col rounded-lg border shadow-md"
-    >
-      <div className="text-muted-foreground px-3 py-2 text-xs font-medium">
-        Agents (experimental)
-      </div>
-      {filteredAgents.length === 0 ? (
-        <div className="py-6 text-center text-sm">No agent found.</div>
-      ) : (
-        <ul className="max-h-[176px] overflow-auto mask-t-from-96% mask-t-to-100% p-1">
-          {filteredAgents.map((agent, index) => {
-            return (
-              <li
-                key={agent.id}
-                ref={index === activeIndex ? activeItemRef : null}
-                className={cn(
-                  "relative flex cursor-pointer flex-col rounded-lg px-2 py-1.5",
-                  "hover:bg-accent hover:text-accent-foreground",
-                  activeIndex === index && "bg-accent text-accent-foreground"
-                )}
-                onMouseEnter={() => onActiveIndexChange(index)}
-                onClick={() => onSelect(agent)}
-              >
-                <div className="flex items-center gap-2">
-                  {agent.avatar_url ? (
-                    <Avatar className="size-9">
-                      <AvatarImage
-                        src={agent.avatar_url}
-                        className="object-cover"
-                      />
-                      <AvatarFallback>
-                        {agent.name.charAt(0).toUpperCase()}
-                      </AvatarFallback>
-                    </Avatar>
-                  ) : (
-                    <div className="flex size-9 items-center justify-center overflow-hidden rounded-full border border-dashed">
-                      <Cube className="text-muted-foreground size-6" />
-                    </div>
-                  )}
-                  <div className="flex flex-col">
-                    <span className="text-sm font-medium">{agent.name}</span>
-                    <span className="text-muted-foreground line-clamp-1 text-xs">
-                      {agent.description}
-                    </span>
-                  </div>
-                  {isCuratedAgent(agent.id) && (
-                    <span className="bg-primary/10 text-primary absolute top-4 right-2 -translate-y-1/2 rounded-full px-1.5 py-0.5 text-[9px] font-medium">
-                      Zola
-                    </span>
-                  )}
-                </div>
-              </li>
-            )
-          })}
-        </ul>
-      )}
-      <DialogCreateAgentTrigger
-        trigger={
-          <div className="border-border mt-auto h-12 border-t p-1">
-            <button
-              onClick={onCreateNewAgent}
-              className="text-primary hover:bg-accent hover:text-accent-foreground flex h-full w-full items-center justify-center gap-1.5 rounded-lg px-2 py-1 text-sm font-medium"
-              type="button"
-            >
-              <Plus size={16} weight="bold" /> Create New Agent
-            </button>
-          </div>
-        }
-      />
-    </div>
-  )
-}
diff --git a/app/components/chat-input/agents.tsx b/app/components/chat-input/agents.tsx
deleted file mode 100644
index dae06c166..000000000
--- a/app/components/chat-input/agents.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-"use client"
-
-import type { AgentsSuggestions } from "@/app/types/agent"
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import { Button } from "@/components/ui/button"
-import {
-  HoverCard,
-  HoverCardContent,
-  HoverCardTrigger,
-} from "@/components/ui/hover-card"
-import { TRANSITION_SUGGESTIONS } from "@/lib/motion"
-import { cn } from "@/lib/utils"
-import { motion } from "motion/react"
-import { useRouter, useSearchParams } from "next/navigation"
-import { memo, useState } from "react"
-
-type ButtonAgentProps = {
-  label: string
-  avatarUrl: string
-  description: string
-  slug: string
-  isActive: boolean
-  onSelect: (slug: string) => void
-}
-
-const ButtonAgent = memo(function ButtonAgent({
-  label,
-  avatarUrl,
-  description,
-  slug,
-  isActive,
-  onSelect,
-}: ButtonAgentProps) {
-  return (
-    <HoverCard>
-      <HoverCardTrigger asChild>
-        <Button
-          key={label}
-          variant="outline"
-          size="lg"
-          onClick={() => onSelect(slug)}
-          className={cn(
-            "rounded-full px-2.5",
-            isActive &&
-              "bg-primary text-primary-foreground hover:bg-primary/90 hover:text-primary-foreground transition-none"
-          )}
-          type="button"
-        >
-          <Avatar className="size-6">
-            <AvatarImage src={avatarUrl} className="size-6 object-cover" />
-            <AvatarFallback>{label.charAt(0)}</AvatarFallback>
-          </Avatar>
-          {label}
-        </Button>
-      </HoverCardTrigger>
-      <HoverCardContent side="top" className="bg-popover px-2 py-1">
-        <p className="text-secondary-foreground text-sm">{description}</p>
-      </HoverCardContent>
-    </HoverCard>
-  )
-})
-
-type AgentsProps = {
-  sugestedAgents: AgentsSuggestions[]
-}
-
-export const Agents = memo(function Agents({ sugestedAgents }: AgentsProps) {
-  const router = useRouter()
-  const params = useSearchParams()
-  const agentSlug = params.get("agent")
-  const [selectedAgent, setSelectedAgent] = useState<string | null>(agentSlug)
-
-  const handleAgentSelect = (slug: string) => {
-    const newSelectedAgent = selectedAgent === slug ? null : slug
-    setSelectedAgent(newSelectedAgent)
-
-    if (newSelectedAgent) {
-      router.push(`/?agent=${newSelectedAgent}`)
-    } else {
-      router.push(`/`)
-    }
-  }
-
-  return (
-    <motion.div
-      className="flex w-full max-w-full flex-nowrap justify-start gap-2 overflow-x-auto px-2 md:mx-auto md:max-w-2xl md:flex-wrap md:justify-center md:pl-0"
-      initial="initial"
-      animate="animate"
-      exit="exit"
-      variants={{
-        initial: { opacity: 0, y: 10, filter: "blur(4px)" },
-        animate: { opacity: 1, y: 0, filter: "blur(0px)" },
-        exit: { opacity: 0, y: -10, filter: "blur(4px)" },
-      }}
-      transition={TRANSITION_SUGGESTIONS}
-      style={{
-        scrollbarWidth: "none",
-      }}
-    >
-      {sugestedAgents?.map((agent, index) => (
-        <motion.div
-          key={agent.id}
-          initial={{ opacity: 0, scale: 0.8 }}
-          animate={{ opacity: 1, scale: 1 }}
-          transition={{
-            ...TRANSITION_SUGGESTIONS,
-            delay: index * 0.02,
-          }}
-        >
-          <ButtonAgent
-            key={agent.id}
-            label={agent.name}
-            avatarUrl={agent.avatar_url || ""}
-            slug={agent.slug}
-            description={agent.description || ""}
-            isActive={selectedAgent === agent.slug}
-            onSelect={handleAgentSelect}
-          />
-        </motion.div>
-      ))}
-    </motion.div>
-  )
-})
diff --git a/app/components/chat-input/chat-input.tsx b/app/components/chat-input/chat-input.tsx
index c3a73044a..1f00d2e7e 100644
--- a/app/components/chat-input/chat-input.tsx
+++ b/app/components/chat-input/chat-input.tsx
@@ -1,6 +1,5 @@
 "use client"
 
-import { useAgentCommand } from "@/app/components/chat-input/use-agent-command"
 import { ModelSelector } from "@/components/common/model-selector/base"
 import {
   PromptInput,
@@ -9,16 +8,13 @@ import {
   PromptInputTextarea,
 } from "@/components/prompt-kit/prompt-input"
 import { Button } from "@/components/ui/button"
-import { useAgent } from "@/lib/agent-store/provider"
 import { getModelInfo } from "@/lib/models"
 import { ArrowUp, Stop, Warning } from "@phosphor-icons/react"
 import React, { useCallback, useEffect, useMemo } from "react"
 import { PromptSystem } from "../suggestions/prompt-system"
-import { AgentCommand } from "./agent-command"
 import { ButtonFileUpload } from "./button-file-upload"
 import { ButtonSearch } from "./button-search"
 import { FileList } from "./file-list"
-import { SelectedAgent } from "./selected-agent"
 
 type ChatInputProps = {
   value: string
@@ -58,15 +54,6 @@ export function ChatInput({
   setEnableSearch,
   enableSearch,
 }: ChatInputProps) {
-  const { currentAgent, curatedAgents, userAgents } = useAgent()
-
-  const agentCommand = useAgentCommand({
-    value,
-    onValueChange,
-    agents: [...(curatedAgents || []), ...(userAgents || [])],
-    defaultAgent: currentAgent,
-  })
-
   const selectModelConfig = getModelInfo(selectedModel)
   const hasToolSupport = Boolean(selectModelConfig?.tools)
   const hasSearchSupport = Boolean(selectModelConfig?.webSearch)
@@ -87,9 +74,6 @@ export function ChatInput({
 
   const handleKeyDown = useCallback(
     (e: React.KeyboardEvent) => {
-      // First process agent command related key handling
-      agentCommand.handleKeyDown(e)
-
       if (isSubmitting) {
         e.preventDefault()
         return
@@ -100,7 +84,7 @@ export function ChatInput({
         return
       }
 
-      if (e.key === "Enter" && !e.shiftKey && !agentCommand.showAgentCommand) {
+      if (e.key === "Enter" && !e.shiftKey) {
         if (isOnlyWhitespace(value)) {
           return
         }
@@ -109,7 +93,7 @@ export function ChatInput({
         onSend()
       }
     },
-    [agentCommand, isSubmitting, onSend, status, value]
+    [isSubmitting, onSend, status, value]
   )
 
   const handlePaste = useCallback(
@@ -152,13 +136,6 @@ export function ChatInput({
     [isUserAuthenticated, onFileUpload]
   )
 
-  useEffect(() => {
-    const el = agentCommand.textareaRef.current
-    if (!el) return
-    el.addEventListener("paste", handlePaste)
-    return () => el.removeEventListener("paste", handlePaste)
-  }, [agentCommand.textareaRef, handlePaste])
-
   useMemo(() => {
     if (!hasSearchSupport && enableSearch) {
       setEnableSearch?.(false)
@@ -179,32 +156,13 @@ export function ChatInput({
           className="bg-popover relative z-10 p-0 pt-1 shadow-xs backdrop-blur-xl"
           maxHeight={200}
           value={value}
-          onValueChange={agentCommand.handleValueChange}
+          onValueChange={onValueChange}
         >
-          {agentCommand.showAgentCommand && (
-            <div className="absolute bottom-full left-0 w-full">
-              <AgentCommand
-                isOpen={agentCommand.showAgentCommand}
-                searchTerm={agentCommand.agentSearchTerm}
-                onSelect={agentCommand.handleAgentSelect}
-                onClose={agentCommand.closeAgentCommand}
-                activeIndex={agentCommand.activeAgentIndex}
-                onActiveIndexChange={agentCommand.setActiveAgentIndex}
-                curatedAgents={curatedAgents || []}
-                userAgents={userAgents || []}
-              />
-            </div>
-          )}
-          <SelectedAgent
-            selectedAgent={agentCommand.selectedAgent}
-            removeSelectedAgent={agentCommand.removeSelectedAgent}
-          />
           <FileList files={files} onFileRemove={onFileRemove} />
           <PromptInputTextarea
             placeholder="Ask Zola"
             onKeyDown={handleKeyDown}
             className="min-h-[44px] pt-3 pl-4 text-base leading-[1.3] sm:text-base md:text-base"
-            ref={agentCommand.textareaRef}
           />
           <PromptInputActions className="mt-5 w-full justify-between px-3 pb-3">
             <div className="flex gap-2">
@@ -226,15 +184,6 @@ export function ChatInput({
                   isAuthenticated={isUserAuthenticated}
                 />
               ) : null}
-              {currentAgent && !hasToolSupport && (
-                <div className="flex items-center gap-1">
-                  <Warning className="size-4" />
-                  <p className="line-clamp-2 text-xs">
-                    {selectedModel} does not support tools. Agents may not work
-                    as expected.
-                  </p>
-                </div>
-              )}
             </div>
             <PromptInputAction
               tooltip={status === "streaming" ? "Stop" : "Send"}
diff --git a/app/components/chat-input/popover-content-auth.tsx b/app/components/chat-input/popover-content-auth.tsx
index aa548aad5..c654665b3 100644
--- a/app/components/chat-input/popover-content-auth.tsx
+++ b/app/components/chat-input/popover-content-auth.tsx
@@ -67,7 +67,7 @@ export function PopoverContentAuth() {
           Login to try more features for free
         </p>
         <p className="text-muted-foreground mb-5 text-base">
-          Add files, use more models, agents, and more.
+          Add files, use more models, BYO API keys, and more.
         </p>
         <Button
           variant="secondary"
diff --git a/app/components/chat-input/selected-agent.tsx b/app/components/chat-input/selected-agent.tsx
deleted file mode 100644
index 17cc18123..000000000
--- a/app/components/chat-input/selected-agent.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-"use client"
-
-import { Agent } from "@/app/types/agent"
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import { Button } from "@/components/ui/button"
-import {
-  HoverCard as HoverCardComponent,
-  HoverCardContent,
-  HoverCardTrigger,
-} from "@/components/ui/hover-card"
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip"
-import { Cube, Eye } from "@phosphor-icons/react"
-import { X } from "lucide-react"
-import { AnimatePresence, motion } from "motion/react"
-import Link from "next/link"
-import React, { useState } from "react"
-
-const TRANSITION = {
-  type: "spring",
-  duration: 0.2,
-  bounce: 0,
-}
-
-function HoverCard({
-  selectedAgent,
-  isOpen,
-  setIsOpen,
-}: {
-  selectedAgent: Agent
-  isOpen: boolean
-  setIsOpen: (isOpen: boolean) => void
-}) {
-  return (
-    <HoverCardComponent open={isOpen} onOpenChange={setIsOpen}>
-      <HoverCardTrigger className="w-full">
-        <div className="bg-background hover:bg-accent border-input mr-2 mb-0 flex max-w-56 cursor-default items-center gap-2 rounded-2xl border p-2 pr-3 transition-colors">
-          <div className="flex items-center gap-1.5">
-            {selectedAgent.avatar_url ? (
-              <Avatar className="size-5">
-                <AvatarImage src={selectedAgent.avatar_url ?? undefined} />
-                <AvatarFallback>
-                  {selectedAgent.name.charAt(0).toUpperCase()}
-                </AvatarFallback>
-              </Avatar>
-            ) : (
-              <div className="flex size-5 items-center justify-center overflow-hidden rounded-full border border-dashed">
-                <Cube className="text-muted-foreground size-3" />
-              </div>
-            )}
-            <span className="text-sm font-medium">{selectedAgent.name}</span>
-          </div>
-        </div>
-      </HoverCardTrigger>
-      <HoverCardContent className="w-80 px-3 py-2.5" side="top" align="start">
-        <div className="flex flex-col">
-          <div className="flex items-center gap-2">
-            {selectedAgent.avatar_url ? (
-              <Avatar className="size-5">
-                <AvatarImage src={selectedAgent.avatar_url ?? undefined} />
-                <AvatarFallback>
-                  {selectedAgent.name.charAt(0).toUpperCase()}
-                </AvatarFallback>
-              </Avatar>
-            ) : (
-              <div className="flex size-5 items-center justify-center overflow-hidden rounded-full border border-dashed">
-                <Cube className="text-muted-foreground size-3" />
-              </div>
-            )}
-            <h3 className="text-base font-medium">{selectedAgent.name}</h3>
-          </div>
-          <span className="text-muted-foreground mt-0.5 mb-1 text-xs">
-            experimental (early version)
-          </span>
-          <p className="text-muted-foreground mt-1 line-clamp-2 font-mono text-xs">
-            {selectedAgent.system_prompt}
-          </p>
-
-          <hr className="border-border my-2 border-dashed" />
-
-          <Link href={`/agents/${selectedAgent.slug}`}>
-            <Button variant="outline" className="h-7 w-full text-xs" size="sm">
-              See agent page <Eye className="size-3" />
-            </Button>
-          </Link>
-
-          {/* <div className="flex flex-wrap gap-4">
-            <div className="flex items-center gap-1">
-              <Wrench className="text-muted-foreground size-4" />
-              <span className="text-muted-foreground text-sm leading-1">
-                Tools
-              </span>
-            </div>
-            <div className="flex items-center gap-1">
-              <Toolbox className="text-muted-foreground size-4" />
-              <span className="text-muted-foreground text-sm leading-1">
-                MCP
-              </span>
-            </div>
-            <div className="flex items-center gap-1">
-              <FireSimple className="text-muted-foreground size-4" />
-              <span className="text-muted-foreground text-sm leading-1">
-                1.3k used
-              </span>
-            </div>
-          </div> */}
-
-          {/* {selectedAgent.tags && selectedAgent.tags.length > 0 && (
-            <div className="flex flex-wrap gap-1">
-              {selectedAgent.tags.map((tag) => (
-                <span
-                  key={tag}
-                  className="bg-secondary text-secondary-foreground rounded-full px-2 py-0.5 text-xs"
-                >
-                  {tag}
-                </span>
-              ))}
-            </div>
-          )} */}
-        </div>
-      </HoverCardContent>
-    </HoverCardComponent>
-  )
-}
-
-type SelectedAgentProps = {
-  selectedAgent: Agent | null
-  removeSelectedAgent: () => void
-}
-
-export function SelectedAgent({
-  selectedAgent,
-  removeSelectedAgent,
-}: SelectedAgentProps) {
-  const [isOpen, setIsOpen] = useState(false)
-
-  return (
-    <AnimatePresence initial={false}>
-      {selectedAgent && (
-        <motion.div
-          key={selectedAgent.id}
-          initial={{ height: 0 }}
-          animate={{ height: "auto" }}
-          exit={{ height: 0 }}
-          transition={TRANSITION}
-          className="overflow-hidden"
-        >
-          <div className="flex flex-row px-3 pt-0">
-            <motion.div key="selected-agent-item" className="relative pt-2">
-              <HoverCard
-                selectedAgent={selectedAgent}
-                isOpen={isOpen}
-                setIsOpen={setIsOpen}
-              />
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    onClick={removeSelectedAgent}
-                    className="border-background absolute top-3 right-3 z-10 inline-flex size-6 translate-x-1/2 -translate-y-1/2 items-center justify-center rounded-full border-[3px] bg-black text-white shadow-none transition-colors"
-                    aria-label="Remove selected agent"
-                  >
-                    <X className="size-3" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent>Remove {selectedAgent.name}</TooltipContent>
-              </Tooltip>
-            </motion.div>
-          </div>
-        </motion.div>
-      )}
-    </AnimatePresence>
-  )
-}
diff --git a/app/components/chat-input/use-agent-command.ts b/app/components/chat-input/use-agent-command.ts
deleted file mode 100644
index 98a7ab17b..000000000
--- a/app/components/chat-input/use-agent-command.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-"use client"
-
-import { Agent } from "@/app/types/agent"
-import { useChats } from "@/lib/chat-store/chats/provider"
-import { useChatSession } from "@/lib/chat-store/session/provider"
-import { useUser } from "@/lib/user-store/provider"
-import { usePathname, useRouter, useSearchParams } from "next/navigation"
-import { useCallback, useMemo, useRef, useState } from "react"
-
-export function useAgentCommand({
-  value,
-  onValueChange,
-  agents,
-  defaultAgent = null,
-}: {
-  value: string
-  onValueChange: (value: string) => void
-  agents: Agent[]
-  defaultAgent?: Agent | null
-}) {
-  const searchParams = useSearchParams()
-  const { chatId } = useChatSession()
-  const { user } = useUser()
-  const { updateChatAgent } = useChats()
-
-  const pathname = usePathname()
-  const router = useRouter()
-
-  // Track if user has explicitly removed the agent (optimistic state)
-  const [hasExplicitlyRemovedAgent, setHasExplicitlyRemovedAgent] =
-    useState(false)
-  const [selectedAgent, setSelectedAgent] = useState<Agent | null>(null)
-  const [showAgentCommand, setShowAgentCommand] = useState(false)
-  const [agentSearchTerm, setAgentSearchTerm] = useState("")
-  const [activeAgentIndex, setActiveAgentIndex] = useState(0)
-
-  const textareaRef = useRef<HTMLTextAreaElement | null>(null)
-  const mentionStartPosRef = useRef<number | null>(null)
-
-  const filteredAgents = agentSearchTerm
-    ? agents.filter((a) =>
-        a.name.toLowerCase().includes(agentSearchTerm.toLowerCase())
-      )
-    : agents
-
-  // Determine the effective selected agent
-  const effectiveSelectedAgent = (() => {
-    // If user explicitly removed agent, respect that (optimistic)
-    if (hasExplicitlyRemovedAgent) return null
-
-    // If user selected an agent explicitly, use that
-    if (selectedAgent) return selectedAgent
-
-    // Otherwise fall back to defaultAgent (from URL/chat)
-    return defaultAgent
-  })()
-
-  // Sync selectedAgent when defaultAgent changes (when URL agent loads)
-  // This handles the case where defaultAgent starts as null and then gets populated
-  if (defaultAgent && !selectedAgent && !hasExplicitlyRemovedAgent) {
-    setSelectedAgent(defaultAgent)
-  }
-
-  // Reset explicit removal flag when defaultAgent changes
-  if (
-    defaultAgent &&
-    hasExplicitlyRemovedAgent &&
-    defaultAgent.id !== selectedAgent?.id
-  ) {
-    setHasExplicitlyRemovedAgent(false)
-  }
-
-  const updateAgentInUrl = useCallback(
-    (agent: Agent | null) => {
-      if (!searchParams) return
-
-      const params = new URLSearchParams(searchParams.toString())
-      if (agent) {
-        params.set("agent", agent.slug)
-      } else {
-        params.delete("agent")
-      }
-      router.push(`${pathname}?${params.toString()}`, { scroll: false })
-    },
-    [pathname, router, searchParams]
-  )
-
-  const updateChatAgentDebounced = useMemo(() => {
-    let timeoutId: NodeJS.Timeout | null = null
-
-    return (agent: Agent | null) => {
-      if (timeoutId) {
-        clearTimeout(timeoutId)
-      }
-
-      timeoutId = setTimeout(() => {
-        if (!user || !chatId) return
-        updateChatAgent(user.id, chatId, agent?.id ?? null, !user.anonymous)
-      }, 500)
-    }
-  }, [chatId, user, updateChatAgent])
-
-  const handleValueChange = useCallback(
-    (newValue: string) => {
-      onValueChange(newValue)
-      const match = newValue.match(/@([^@\s]*)$/)
-      if (match) {
-        const newSearchTerm = match[1]
-        const wasSearchTermDifferent = agentSearchTerm !== newSearchTerm
-
-        setShowAgentCommand(true)
-        setAgentSearchTerm(newSearchTerm)
-
-        // Reset active index when search term changes
-        if (wasSearchTermDifferent) {
-          setActiveAgentIndex(0)
-        }
-
-        if (mentionStartPosRef.current === null && textareaRef.current) {
-          const atIndex = newValue.lastIndexOf("@" + match[1])
-          mentionStartPosRef.current = atIndex
-        }
-      } else {
-        setShowAgentCommand(false)
-        setAgentSearchTerm("")
-        mentionStartPosRef.current = null
-        setActiveAgentIndex(0)
-      }
-    },
-    [onValueChange, agentSearchTerm]
-  )
-
-  const handleAgentSelect = useCallback(
-    (agent: Agent) => {
-      // Optimistic update: set state immediately
-      setSelectedAgent(agent)
-      setHasExplicitlyRemovedAgent(false)
-
-      // Then update URL and API
-      updateAgentInUrl(agent)
-      updateChatAgentDebounced(agent)
-
-      const start = mentionStartPosRef.current
-      const text = value.replace(/@([^@\s]*)$/, "")
-      onValueChange(
-        start !== null ? value.slice(0, start) + text.slice(start) : text
-      )
-
-      setShowAgentCommand(false)
-      mentionStartPosRef.current = null
-      textareaRef.current?.focus()
-    },
-    [value, onValueChange, updateAgentInUrl, updateChatAgentDebounced]
-  )
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (!showAgentCommand || !filteredAgents.length) return
-
-      if (["ArrowDown", "ArrowUp", "Enter", "Escape", "Tab"].includes(e.key)) {
-        e.preventDefault()
-      }
-
-      if (e.key === "ArrowDown") {
-        setActiveAgentIndex((i) => (i + 1) % filteredAgents.length)
-      }
-      if (e.key === "ArrowUp") {
-        setActiveAgentIndex(
-          (i) => (i - 1 + filteredAgents.length) % filteredAgents.length
-        )
-      }
-      if (e.key === "Enter") {
-        handleAgentSelect(filteredAgents[activeAgentIndex])
-      }
-      if (e.key === "Escape") {
-        setShowAgentCommand(false)
-      }
-    },
-    [showAgentCommand, filteredAgents, activeAgentIndex, handleAgentSelect]
-  )
-
-  const removeSelectedAgent = useCallback(() => {
-    // Optimistic update: immediately update UI state
-    setSelectedAgent(null)
-    setHasExplicitlyRemovedAgent(true)
-
-    // Then update URL and API (non-blocking)
-    updateAgentInUrl(null)
-    if (user?.id && chatId) {
-      updateChatAgent(user.id, chatId, null, !user.anonymous).catch(
-        console.error
-      )
-    }
-    textareaRef.current?.focus()
-  }, [updateAgentInUrl, user, chatId, updateChatAgent])
-
-  return {
-    showAgentCommand,
-    agentSearchTerm,
-    selectedAgent: effectiveSelectedAgent,
-    activeAgentIndex,
-    filteredAgents,
-    mentionStartPos: mentionStartPosRef.current,
-    textareaRef,
-    handleKeyDown,
-    handleValueChange,
-    handleAgentSelect,
-    removeSelectedAgent,
-    closeAgentCommand: () => setShowAgentCommand(false),
-    setActiveAgentIndex,
-  }
-}
diff --git a/app/components/chat-input/use-search-agent.ts b/app/components/chat-input/use-search-agent.ts
deleted file mode 100644
index c1698f0f7..000000000
--- a/app/components/chat-input/use-search-agent.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useAgent } from "@/lib/agent-store/provider"
-import { localAgents } from "@/lib/agents/local-agents"
-import { useCallback, useState } from "react"
-
-const SEARCH_AGENT_ID = "search"
-
-export function useSearchAgent() {
-  const { currentAgent } = useAgent()
-  const isSearchAgentAvailable = SEARCH_AGENT_ID in localAgents
-
-  const [isSearchEnabled, setIsSearchEnabled] = useState(() => {
-    return currentAgent?.id === SEARCH_AGENT_ID
-  })
-
-  const isSearchAgentActive = isSearchEnabled
-
-  const toggleSearch = useCallback((enabled: boolean) => {
-    setIsSearchEnabled(enabled)
-  }, [])
-
-  const getActiveAgentId = useCallback(() => {
-    return isSearchEnabled ? SEARCH_AGENT_ID : currentAgent?.id || null
-  }, [isSearchEnabled, currentAgent?.id])
-
-  return {
-    isSearchEnabled,
-    toggleSearch,
-    getActiveAgentId,
-    isSearchAgentAvailable,
-    isSearchAgentActive,
-  }
-}
diff --git a/app/components/chat/chat.tsx b/app/components/chat/chat.tsx
index 626b1f475..fe460b32f 100644
--- a/app/components/chat/chat.tsx
+++ b/app/components/chat/chat.tsx
@@ -5,7 +5,6 @@ import { Conversation } from "@/app/components/chat/conversation"
 import { useModel } from "@/app/components/chat/use-model"
 import { useChatDraft } from "@/app/hooks/use-chat-draft"
 import { toast } from "@/components/ui/toast"
-import { useAgent } from "@/lib/agent-store/provider"
 import { getOrCreateGuestUserId } from "@/lib/api"
 import { useChats } from "@/lib/chat-store/chats/provider"
 import { useMessages } from "@/lib/chat-store/messages/provider"
@@ -89,13 +88,9 @@ export function Chat() {
     chatId,
   })
 
-  const { currentAgent } = useAgent()
   const systemPrompt = useMemo(
-    () =>
-      currentAgent?.system_prompt ||
-      user?.system_prompt ||
-      SYSTEM_PROMPT_DEFAULT,
-    [currentAgent?.system_prompt, user?.system_prompt]
+    () => user?.system_prompt || SYSTEM_PROMPT_DEFAULT,
+    [user?.system_prompt]
   )
 
   const hasSentFirstMessageRef = useRef(false)
@@ -159,7 +154,6 @@ export function Chat() {
     input,
     selectedModel,
     systemPrompt,
-    selectedAgentId: currentAgent?.id || null,
     createNewChat,
     setHasDialogAuth,
   })
@@ -243,7 +237,6 @@ export function Chat() {
           model: selectedModel,
           isAuthenticated,
           systemPrompt: systemPrompt || SYSTEM_PROMPT_DEFAULT,
-          agentId: currentAgent?.id || null,
           enableSearch,
         },
         experimental_attachments: attachments || undefined,
@@ -280,7 +273,6 @@ export function Chat() {
     cleanupOptimisticAttachments,
     ensureChatExists,
     handleFileUploads,
-    currentAgent?.id,
     selectedModel,
     isAuthenticated,
     systemPrompt,
diff --git a/app/components/chat/use-chat-utils.ts b/app/components/chat/use-chat-utils.ts
index 22b1e1b09..a86db7615 100644
--- a/app/components/chat/use-chat-utils.ts
+++ b/app/components/chat/use-chat-utils.ts
@@ -11,14 +11,12 @@ type UseChatUtilsProps = {
   input: string
   selectedModel: string
   systemPrompt: string
-  selectedAgentId: string | null
   createNewChat: (
     userId: string,
     title?: string,
     model?: string,
     isAuthenticated?: boolean,
-    systemPrompt?: string,
-    agentId?: string
+    systemPrompt?: string
   ) => Promise<Chats | undefined>
   setHasDialogAuth: (value: boolean) => void
 }
@@ -30,7 +28,6 @@ export function useChatUtils({
   input,
   selectedModel,
   systemPrompt,
-  selectedAgentId,
   createNewChat,
   setHasDialogAuth,
 }: UseChatUtilsProps) {
@@ -81,8 +78,7 @@ export function useChatUtils({
           input,
           selectedModel,
           isAuthenticated,
-          selectedAgentId ? undefined : systemPrompt, // if agentId is set, systemPrompt is not used
-          selectedAgentId || undefined
+          systemPrompt
         )
 
         if (!newChat) return null
diff --git a/app/components/layout/agent-link.tsx b/app/components/layout/agent-link.tsx
deleted file mode 100644
index f19828fb7..000000000
--- a/app/components/layout/agent-link.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip"
-import { isSupabaseEnabled } from "@/lib/supabase/config"
-import { UsersThree } from "@phosphor-icons/react"
-import Link from "next/link"
-
-export function AgentLink() {
-  if (!isSupabaseEnabled) {
-    return null
-  }
-
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <Link
-          href="/agents"
-          className="text-muted-foreground hover:text-foreground hover:bg-muted bg-background rounded-full p-1.5 transition-colors"
-          prefetch
-          aria-label="Agents"
-        >
-          <UsersThree size={24} />
-        </Link>
-      </TooltipTrigger>
-      <TooltipContent>Agents</TooltipContent>
-    </Tooltip>
-  )
-}
diff --git a/app/components/layout/header-agent.tsx b/app/components/layout/header-agent.tsx
deleted file mode 100644
index 002a96b5b..000000000
--- a/app/components/layout/header-agent.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { useBreakpoint } from "@/app/hooks/use-breakpoint"
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip"
-import { Info } from "@phosphor-icons/react"
-import { AnimatePresence, motion } from "motion/react"
-import { AgentHeader } from "./header"
-
-type HeaderAgentProps = {
-  agent?: AgentHeader | null
-}
-
-export function HeaderAgent({ agent }: HeaderAgentProps) {
-  const isMobile = useBreakpoint(768)
-  const initials = agent?.name
-    .split(" ")
-    .map((n) => n[0])
-    .join("")
-
-  return (
-    <AnimatePresence mode="wait">
-      {agent && (
-        <motion.div
-          key={agent.slug}
-          initial={{ opacity: 0, scale: 0.95, filter: "blur(2px)" }}
-          animate={{ opacity: 1, scale: 1, filter: "blur(0px)" }}
-          exit={{ opacity: 0, scale: 0.95, filter: "blur(2px)" }}
-          transition={{
-            duration: 0.15,
-            ease: "easeOut",
-          }}
-          className="bg-background/40 pointer-events-auto flex max-w-[240px] items-center justify-center gap-2 rounded-t-none rounded-b-md px-3 py-3 backdrop-blur-2xl"
-        >
-          <Avatar className="size-10">
-            <AvatarImage
-              src={agent?.avatar_url || ""}
-              alt={agent.name}
-              className="object-cover"
-            />
-            <AvatarFallback>{initials}</AvatarFallback>
-          </Avatar>
-
-          <div className="flex items-center">
-            <h2 className="text-sm font-medium">{agent.name}</h2>
-            {!isMobile && agent.description && (
-              <TooltipProvider>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <button className="text-muted-foreground hover:text-foreground ml-1.5 transition-colors">
-                      <Info className="size-4" />
-                      <span className="sr-only">User information</span>
-                    </button>
-                  </TooltipTrigger>
-                  <TooltipContent>
-                    <p className="max-w-xs text-sm">{agent.description}</p>
-                  </TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
-            )}
-          </div>
-        </motion.div>
-      )}
-    </AnimatePresence>
-  )
-}
diff --git a/app/components/layout/header.tsx b/app/components/layout/header.tsx
index 0e07e8606..c99149976 100644
--- a/app/components/layout/header.tsx
+++ b/app/components/layout/header.tsx
@@ -5,10 +5,8 @@ import { AppInfoTrigger } from "@/app/components/layout/app-info/app-info-trigge
 import { ButtonNewChat } from "@/app/components/layout/button-new-chat"
 import { UserMenu } from "@/app/components/layout/user-menu"
 import { useBreakpoint } from "@/app/hooks/use-breakpoint"
-import type { Agent } from "@/app/types/agent"
 import { ZolaIcon } from "@/components/icons/zola"
 import { Button } from "@/components/ui/button"
-import { useAgent } from "@/lib/agent-store/provider"
 import { APP_NAME } from "@/lib/config"
 import { useUser } from "@/lib/user-store/provider"
 import { Info } from "@phosphor-icons/react"
@@ -16,15 +14,9 @@ import Link from "next/link"
 import { DialogPublish } from "./dialog-publish"
 import { HeaderSidebarTrigger } from "./header-sidebar-trigger"
 
-export type AgentHeader = Pick<
-  Agent,
-  "name" | "description" | "avatar_url" | "slug"
->
-
 export function Header({ hasSidebar }: { hasSidebar: boolean }) {
   const isMobile = useBreakpoint(768)
   const { user } = useUser()
-  const { currentAgent } = useAgent()
 
   const isLoggedIn = !!user
 
@@ -68,7 +60,7 @@ export function Header({ hasSidebar }: { hasSidebar: boolean }) {
             </div>
           ) : (
             <div className="pointer-events-auto flex flex-1 items-center justify-end gap-2">
-              {currentAgent && <DialogPublish />}
+              <DialogPublish />
               <ButtonNewChat />
               {!hasSidebar && <HistoryTrigger hasSidebar={hasSidebar} />}
               <UserMenu />
diff --git a/app/components/layout/settings/general/system-prompt.tsx b/app/components/layout/settings/general/system-prompt.tsx
index ced334026..2145e2a7e 100644
--- a/app/components/layout/settings/general/system-prompt.tsx
+++ b/app/components/layout/settings/general/system-prompt.tsx
@@ -23,7 +23,7 @@ export function SystemPromptSection() {
 
       toast({
         title: "Prompt saved",
-        description: "It'll be used for new chats unless you select an agent.",
+        description: "It'll be used for new chats.",
         status: "success",
       })
     } catch (error) {
@@ -81,7 +81,7 @@ export function SystemPromptSection() {
         </AnimatePresence>
       </div>
       <p className="text-muted-foreground mt-2 text-xs">
-        This prompt will be used for new chats unless you select an agent.
+        This prompt will be used for new chats.
       </p>
     </div>
   )
diff --git a/app/layout.tsx b/app/layout.tsx
index 2f659e6f5..96bf62722 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -4,7 +4,6 @@ import "./globals.css"
 import { SidebarProvider } from "@/components/ui/sidebar"
 import { Toaster } from "@/components/ui/sonner"
 import { TooltipProvider } from "@/components/ui/tooltip"
-import { AgentProvider } from "@/lib/agent-store/provider"
 import { ChatsProvider } from "@/lib/chat-store/chats/provider"
 import { ChatSessionProvider } from "@/lib/chat-store/session/provider"
 import { ModelProvider } from "@/lib/model-store/provider"
@@ -58,26 +57,24 @@ export default async function RootLayout({
             <ModelProvider>
               <ChatsProvider userId={userProfile?.id}>
                 <ChatSessionProvider>
-                  <AgentProvider userId={userProfile?.id}>
-                    <UserPreferencesProvider userId={userProfile?.id}>
-                      <TooltipProvider
-                        delayDuration={200}
-                        skipDelayDuration={500}
+                  <UserPreferencesProvider userId={userProfile?.id}>
+                    <TooltipProvider
+                      delayDuration={200}
+                      skipDelayDuration={500}
+                    >
+                      <ThemeProvider
+                        attribute="class"
+                        defaultTheme="light"
+                        enableSystem
+                        disableTransitionOnChange
                       >
-                        <ThemeProvider
-                          attribute="class"
-                          defaultTheme="light"
-                          enableSystem
-                          disableTransitionOnChange
-                        >
-                          <SidebarProvider defaultOpen>
-                            <Toaster position="top-center" />
-                            {children}
-                          </SidebarProvider>
-                        </ThemeProvider>
-                      </TooltipProvider>
-                    </UserPreferencesProvider>
-                  </AgentProvider>
+                        <SidebarProvider defaultOpen>
+                          <Toaster position="top-center" />
+                          {children}
+                        </SidebarProvider>
+                      </ThemeProvider>
+                    </TooltipProvider>
+                  </UserPreferencesProvider>
                 </ChatSessionProvider>
               </ChatsProvider>
             </ModelProvider>
diff --git a/app/p/[projectId]/project-view.tsx b/app/p/[projectId]/project-view.tsx
index 30bb34835..920988e9b 100644
--- a/app/p/[projectId]/project-view.tsx
+++ b/app/p/[projectId]/project-view.tsx
@@ -129,7 +129,6 @@ export function ProjectView({ projectId }: ProjectViewProps) {
             selectedModel,
             true, // Always authenticated in this context
             SYSTEM_PROMPT_DEFAULT,
-            undefined, // agentId
             projectId
           )
 
@@ -242,7 +241,6 @@ export function ProjectView({ projectId }: ProjectViewProps) {
           model: selectedModel,
           isAuthenticated: true,
           systemPrompt: SYSTEM_PROMPT_DEFAULT,
-          agentId: null,
           enableSearch,
         },
         experimental_attachments: attachments || undefined,
diff --git a/app/share/[chatId]/article.tsx b/app/share/[chatId]/article.tsx
index 775e6d9f1..b5b4d4261 100644
--- a/app/share/[chatId]/article.tsx
+++ b/app/share/[chatId]/article.tsx
@@ -16,8 +16,6 @@ type ArticleProps = {
   title: string
   subtitle: string
   messages: MessageType[]
-  agentSlug?: string
-  agentName?: string
 }
 
 export default function Article({
@@ -25,8 +23,6 @@ export default function Article({
   title,
   subtitle,
   messages,
-  agentSlug,
-  agentName,
 }: ArticleProps) {
   return (
     <>
@@ -43,14 +39,6 @@ export default function Article({
               day: "numeric",
             })}
           </time>
-          {agentSlug ? (
-            <>
-              <span className="mx-2">·</span>
-              <span className="text-muted-foreground hover:text-foreground transition-colors">
-                <Link href={`/agents/${agentSlug}`}>{agentName}</Link>
-              </span>
-            </>
-          ) : null}
         </div>
 
         <h1 className="mb-4 text-center text-4xl font-medium tracking-tight md:text-5xl">
diff --git a/app/share/[chatId]/page.tsx b/app/share/[chatId]/page.tsx
index 370db57eb..36a689fe3 100644
--- a/app/share/[chatId]/page.tsx
+++ b/app/share/[chatId]/page.tsx
@@ -10,7 +10,7 @@ export const dynamic = "force-static"
 export async function generateMetadata({
   params,
 }: {
-  params: Promise<{ agentSlug?: string; chatId: string }>
+  params: Promise<{ chatId: string }>
 }): Promise<Metadata> {
   if (!isSupabaseEnabled) {
     return notFound()
@@ -49,16 +49,16 @@ export async function generateMetadata({
   }
 }
 
-export default async function AgentChat({
+export default async function ShareChat({
   params,
 }: {
-  params: Promise<{ agentSlug?: string; chatId: string }>
+  params: Promise<{ chatId: string }>
 }) {
   if (!isSupabaseEnabled) {
     return notFound()
   }
 
-  const { agentSlug, chatId } = await params
+  const { chatId } = await params
   const supabase = await createClient()
 
   if (!supabase) {
@@ -67,12 +67,12 @@ export default async function AgentChat({
 
   const { data: chatData, error: chatError } = await supabase
     .from("chats")
-    .select("id, title, agent_id, created_at")
+    .select("id, title, created_at")
     .eq("id", chatId)
     .single()
 
   if (chatError || !chatData) {
-    redirect("/agents")
+    redirect("/")
   }
 
   const { data: messagesData, error: messagesError } = await supabase
@@ -82,35 +82,15 @@ export default async function AgentChat({
     .order("created_at", { ascending: true })
 
   if (messagesError || !messagesData) {
-    redirect("/agents")
-  }
-
-  let agentData = null
-
-  if (agentSlug) {
-    const { data, error } = await supabase
-      .from("agents")
-      .select("*")
-      .eq("slug", agentSlug)
-      .single()
-
-    if (!error) {
-      agentData = data
-    }
+    redirect("/")
   }
 
   return (
     <Article
       messages={messagesData}
       date={chatData.created_at || ""}
-      agentSlug={agentSlug || ""}
-      agentName={agentData?.name || ""}
       title={chatData.title || ""}
-      subtitle={
-        agentData
-          ? `A conversation with ${agentData.name}, an AI agent built in Zola`
-          : "A conversation in Zola"
-      }
+      subtitle={"A conversation in Zola"}
     />
   )
 }
diff --git a/app/types/agent.ts b/app/types/agent.ts
deleted file mode 100644
index 101368b03..000000000
--- a/app/types/agent.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { Tables } from "./database.types"
-
-export type Agent = Tables<"agents">
-
-export type AgentSummary = Pick<
-  Tables<"agents">,
-  | "id"
-  | "name"
-  | "description"
-  | "avatar_url"
-  | "example_inputs"
-  | "creator_id"
-  | "slug"
-  | "system_prompt"
-  | "tools"
-  | "mcp_config"
->
-
-export type AgentsSuggestions = Pick<
-  Tables<"agents">,
-  "id" | "name" | "description" | "avatar_url" | "slug"
->
diff --git a/app/types/database.types.ts b/app/types/database.types.ts
index 6e46a981b..686296892 100644
--- a/app/types/database.types.ts
+++ b/app/types/database.types.ts
@@ -11,89 +11,6 @@ export type Json =
 export type Database = {
   public: {
     Tables: {
-      agents: {
-        Row: {
-          avatar_url: string | null
-          category: string | null
-          created_at: string | null
-          creator_id: string | null
-          description: string
-          example_inputs: string[] | null
-          id: string
-          is_public: boolean
-          model_preference: string | null
-          name: string
-          remixable: boolean
-          slug: string
-          system_prompt: string
-          tags: string[] | null
-          tools_enabled: boolean
-          updated_at: string | null
-          tools: string[] | null
-          max_steps: number | null
-          mcp_config?: {
-            server: string
-            variables: string[]
-          } | null
-        }
-        Insert: {
-          avatar_url?: string | null
-          category?: string | null
-          created_at?: string | null
-          creator_id?: string | null
-          description: string
-          example_inputs?: string[] | null
-          id?: string
-          is_public?: boolean
-          model_preference?: string | null
-          name: string
-          remixable?: boolean
-          slug: string
-          system_prompt: string
-          tags?: string[] | null
-          tools_enabled?: boolean
-          updated_at?: string | null
-          tools?: string[] | null
-          max_steps?: number | null
-          mcp_config?: {
-            server: string
-            variables: string[]
-          } | null
-        }
-        Update: {
-          avatar_url?: string | null
-          category?: string | null
-          created_at?: string | null
-          creator_id?: string | null
-          description?: string
-          example_inputs?: string[] | null
-          id?: string
-          is_public?: boolean
-          model_preference?: string | null
-          name?: string
-          remixable?: boolean
-          slug?: string
-          system_prompt?: string
-          tags?: string[] | null
-          tools_enabled?: boolean
-          updated_at?: string | null
-          tools?: string[] | null
-          max_steps?: number | null
-          mcp_config?: {
-            server: string
-            variables: string[]
-          } | null
-        }
-        Relationships: [
-          {
-            foreignKeyName: "agents_creator_id_fkey"
-            columns: ["creator_id"]
-            isOneToOne: false
-            referencedRelation: "users"
-            referencedColumns: ["id"]
-          },
-        ]
-      }
       projects: {
         Row: {
           id: string
@@ -173,7 +90,6 @@ export type Database = {
       }
       chats: {
         Row: {
-          agent_id: string | null
           created_at: string | null
           updated_at: string | null
           id: string
@@ -184,7 +100,6 @@ export type Database = {
           public: boolean
         }
         Insert: {
-          agent_id?: string | null
           created_at?: string | null
           updated_at?: string | null
           id?: string
@@ -195,7 +110,6 @@ export type Database = {
           public?: boolean
         }
         Update: {
-          agent_id?: string | null
           created_at?: string | null
           updated_at?: string | null
           id?: string
@@ -206,13 +120,6 @@ export type Database = {
           public?: boolean
         }
         Relationships: [
-          {
-            foreignKeyName: "chats_agent_id_fkey"
-            columns: ["agent_id"]
-            isOneToOne: false
-            referencedRelation: "agents"
-            referencedColumns: ["id"]
-          },
           {
             foreignKeyName: "chats_project_id_fkey"
             columns: ["project_id"]
diff --git a/lib/agent-store/api.ts b/lib/agent-store/api.ts
deleted file mode 100644
index 5bc54e3bd..000000000
--- a/lib/agent-store/api.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Agent } from "@/app/types/agent"
-import { createClient } from "@/lib/supabase/client"
-import { CURATED_AGENTS_SLUGS } from "../config"
-
-export async function fetchCuratedAgentsFromDb(): Promise<Agent[] | null> {
-  const supabase = createClient()
-  if (!supabase) return null
-
-  const { data, error } = await supabase
-    .from("agents")
-    .select("*")
-    .in("slug", CURATED_AGENTS_SLUGS)
-
-  if (error) {
-    console.error("Error fetching curated agents:", error)
-    return null
-  }
-
-  return data
-}
-
-export async function fetchUserAgentsFromDb(
-  userId: string
-): Promise<Agent[] | null> {
-  const supabase = createClient()
-  if (!supabase) return null
-
-  const { data, error } = await supabase
-    .from("agents")
-    .select("*")
-    .eq("creator_id", userId)
-
-  if (error) {
-    console.error("Error fetching user agents:", error)
-    return null
-  }
-
-  return data
-}
-
-export async function fetchAgentBySlugOrId({
-  slug,
-  id,
-}: {
-  slug?: string
-  id?: string | null
-}): Promise<Agent | null> {
-  const supabase = createClient()
-  if (!supabase) return null
-
-  let query = supabase.from("agents").select("*")
-
-  if (slug) {
-    query = query.eq("slug", slug)
-  } else if (id) {
-    query = query.eq("id", id)
-  } else {
-    return null
-  }
-
-  const { data, error } = await query.single()
-
-  if (error || !data) {
-    console.error("Error fetching agent:", error)
-    return null
-  }
-
-  return data
-}
diff --git a/lib/agent-store/provider.tsx b/lib/agent-store/provider.tsx
deleted file mode 100644
index 1e676d4e9..000000000
--- a/lib/agent-store/provider.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-"use client"
-
-import { Agent } from "@/app/types/agent"
-import {
-  fetchAgentBySlugOrId,
-  fetchCuratedAgentsFromDb,
-  fetchUserAgentsFromDb,
-} from "@/lib/agent-store/api"
-import { convertLocalAgentToAgentDb } from "@/lib/agent-store/utils"
-import { localAgents } from "@/lib/agents/local-agents"
-import { useChats } from "@/lib/chat-store/chats/provider"
-import { useChatSession } from "@/lib/chat-store/session/provider"
-import { useQuery } from "@tanstack/react-query"
-import { createContext, ReactNode, useContext, useMemo } from "react"
-
-type AgentContextType = {
-  currentAgent: Agent | null
-  curatedAgents: Agent[] | null
-  userAgents: Agent[] | null
-  refetchUserAgents: () => void
-}
-
-const AgentContext = createContext<AgentContextType | undefined>(undefined)
-
-export function AgentProvider({
-  children,
-  userId,
-  searchAgentSlug,
-}: {
-  children: ReactNode
-  userId?: string | null
-  searchAgentSlug?: string | null
-}) {
-  const { getChatById } = useChats()
-  const { chatId } = useChatSession()
-  const currentChat = chatId ? getChatById(chatId) : null
-  const currentChatAgentId = currentChat?.agent_id || null
-  const agentIdentifier = searchAgentSlug || currentChatAgentId
-
-  const { data: currentAgent } = useQuery({
-    queryKey: ["current-agent", agentIdentifier],
-    queryFn: async () => {
-      if (!agentIdentifier) return null
-
-      if (localAgents[agentIdentifier as keyof typeof localAgents]) {
-        return convertLocalAgentToAgentDb(
-          localAgents[agentIdentifier as keyof typeof localAgents]
-        )
-      }
-
-      return await fetchAgentBySlugOrId({
-        slug: searchAgentSlug || undefined,
-        id: currentChatAgentId || undefined,
-      })
-    },
-    enabled: !!agentIdentifier,
-    staleTime: Infinity,
-  })
-
-  const { data: curatedAgents } = useQuery({
-    queryKey: ["curated-agents"],
-    queryFn: fetchCuratedAgentsFromDb,
-    staleTime: Infinity,
-  })
-
-  const { data: userAgents, refetch: refetchUserAgents } = useQuery({
-    queryKey: ["user-agents", userId],
-    queryFn: () => (userId ? fetchUserAgentsFromDb(userId) : []),
-    enabled: !!userId,
-    staleTime: Infinity,
-  })
-
-  const contextValue = useMemo(
-    () => ({
-      currentAgent: currentAgent ?? null,
-      curatedAgents: curatedAgents ?? null,
-      userAgents: userAgents ?? null,
-      refetchUserAgents,
-    }),
-    [currentAgent, curatedAgents, userAgents, refetchUserAgents]
-  )
-
-  return (
-    <AgentContext.Provider value={contextValue}>
-      {children}
-    </AgentContext.Provider>
-  )
-}
-
-export function useAgent() {
-  const context = useContext(AgentContext)
-  if (!context) throw new Error("useAgent must be used within AgentProvider")
-  return context
-}
diff --git a/lib/agent-store/utils.ts b/lib/agent-store/utils.ts
deleted file mode 100644
index d3cb9f2ca..000000000
--- a/lib/agent-store/utils.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { Agent } from "@/app/types/agent"
-import type { LocalAgent } from "@/lib/agents/local-agents"
-
-export const convertLocalAgentToAgentDb = (localAgent: LocalAgent) => {
-  const convertedAgent: Agent = {
-    id: localAgent.id,
-    name: localAgent.name,
-    description: "",
-    system_prompt: localAgent.system_prompt,
-    tools: [],
-    slug: localAgent.id,
-    avatar_url: null,
-    category: null,
-    created_at: null,
-    creator_id: null,
-    example_inputs: null,
-    is_public: false,
-    model_preference: null,
-    remixable: false,
-    tags: null,
-    tools_enabled: true,
-    updated_at: null,
-    max_steps: null,
-    mcp_config: null,
-  }
-
-  return convertedAgent
-}
diff --git a/lib/agents/load-agent.ts b/lib/agents/load-agent.ts
deleted file mode 100644
index af90513bc..000000000
--- a/lib/agents/load-agent.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { createClient } from "@/lib/supabase/server"
-import { TOOL_REGISTRY, ToolId } from "../tools"
-import { localAgents } from "./local-agents"
-
-export async function loadAgent(agentId: string) {
-  // Check local agents first
-  if (localAgents[agentId as keyof typeof localAgents]) {
-    const localAgent = localAgents[agentId as keyof typeof localAgents]
-
-    return {
-      systemPrompt: localAgent.system_prompt,
-      tools: localAgent.tools,
-      maxSteps: 5,
-      mcpConfig: null,
-    }
-  }
-
-  // Fallback to database agents
-  const supabase = await createClient()
-
-  if (!supabase) {
-    throw new Error("Supabase is not configured")
-  }
-
-  const { data: agent, error } = await supabase
-    .from("agents")
-    .select("*")
-    .eq("id", agentId)
-    .maybeSingle()
-
-  if (error || !agent) {
-    throw new Error("Agent not found")
-  }
-
-  const activeTools = Array.isArray(agent.tools)
-    ? agent.tools.reduce((acc: Record<string, unknown>, toolId: string) => {
-        const tool = TOOL_REGISTRY[toolId as ToolId]
-        if (!tool) return acc
-        if (tool.isAvailable?.() === false) return acc
-        acc[toolId] = tool
-        return acc
-      }, {})
-    : {}
-
-  return {
-    systemPrompt: agent.system_prompt,
-    tools: activeTools,
-    maxSteps: agent.max_steps ?? 5,
-    mcpConfig: agent.mcp_config,
-  }
-}
diff --git a/lib/agents/local-agents.ts b/lib/agents/local-agents.ts
deleted file mode 100644
index b489685d5..000000000
--- a/lib/agents/local-agents.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { imageSearchTool } from "@/lib/tools/exa/imageSearch/tool"
-import { webSearchTool } from "@/lib/tools/exa/webSearch/tool"
-import { Tool } from "ai"
-
-export type LocalAgent = {
-  id: string
-  name: string
-  system_prompt: string
-  tools: Record<string, Tool>
-  hidden: boolean
-}
-
-export const localAgents: Record<string, LocalAgent> = {
-  search: {
-    id: "search",
-    name: "Search",
-    system_prompt: `You are a smart websearch assistant.
-
-Always do both of these for every user query — no exception:
-- Call imageSearch using the full original user prompt to fetch visual context.
-- Call webSearch using the same prompt to find useful links and information.
-
-Your written response must:
-- Be short, clear, and directly useful.
-- Include 2–4 relevant links from the webSearch results (with titles if possible).
-- Never describe, mention, or refer to images or visuals. The UI will display them automatically.
-- Never mention tool names or tool usage.
-- Only skip a tool if the user explicitly says “no image” or “no web”.
-    `,
-    tools: {
-      webSearch: webSearchTool,
-      imageSearch: imageSearchTool,
-    },
-    hidden: true,
-  },
-}
diff --git a/lib/agents/utils.ts b/lib/agents/utils.ts
deleted file mode 100644
index bfd6cdeff..000000000
--- a/lib/agents/utils.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { localAgents } from "./local-agents"
-
-/**
- * Check if an agent ID corresponds to a local agent
- */
-export function isLocalAgent(agentId: string | null | undefined): boolean {
-  if (!agentId) return false
-  return agentId in localAgents
-}
-
-/**
- * Filter out local agent IDs, returning null if the agent is local
- * This is useful for database operations that should only receive database agent IDs
- */
-export function filterLocalAgentId(
-  agentId: string | null | undefined
-): string | null {
-  if (!agentId) return null
-  return isLocalAgent(agentId) ? null : agentId
-}
diff --git a/lib/api.ts b/lib/api.ts
index 11a2964b2..86a572e82 100644
--- a/lib/api.ts
+++ b/lib/api.ts
@@ -1,12 +1,8 @@
 import { UserProfile } from "@/app/types/user"
-import { APP_DOMAIN, DAILY_SPECIAL_AGENT_LIMIT } from "@/lib/config"
+import { APP_DOMAIN } from "@/lib/config"
 import { SupabaseClient } from "@supabase/supabase-js"
 import { fetchClient } from "./fetch"
-import {
-  API_ROUTE_CREATE_GUEST,
-  API_ROUTE_UPDATE_CHAT_AGENT,
-  API_ROUTE_UPDATE_CHAT_MODEL,
-} from "./routes"
+import { API_ROUTE_CREATE_GUEST, API_ROUTE_UPDATE_CHAT_MODEL } from "./routes"
 import { createClient } from "./supabase/client"
 
 /**
@@ -206,139 +202,3 @@ export const getOrCreateGuestUserId = async (
     return null
   }
 }
-
-export class SpecialAgentLimitError extends Error {
-  code: string
-  constructor(message: string = "Special agent usage limit reached.") {
-    super(message)
-    this.code = "SPECIAL_AGENT_LIMIT_REACHED"
-  }
-}
-
-export async function checkSpecialAgentUsage(
-  supabase: SupabaseClient,
-  userId: string
-) {
-  const { data: user, error } = await supabase
-    .from("users")
-    .select("special_agent_count, special_agent_reset, premium")
-    .eq("id", userId)
-    .maybeSingle()
-
-  if (error) {
-    throw new Error("Failed to fetch user data: " + error.message)
-  }
-  if (!user) {
-    throw new Error("User not found")
-  }
-
-  const now = new Date()
-  const lastReset = user.special_agent_reset
-    ? new Date(user.special_agent_reset)
-    : null
-  let usageCount = user.special_agent_count || 0
-
-  const isNewDay =
-    !lastReset ||
-    now.getUTCFullYear() !== lastReset.getUTCFullYear() ||
-    now.getUTCMonth() !== lastReset.getUTCMonth() ||
-    now.getUTCDate() !== lastReset.getUTCDate()
-
-  if (isNewDay) {
-    usageCount = 0
-    const { error: resetError } = await supabase
-      .from("users")
-      .update({
-        special_agent_count: 0,
-        special_agent_reset: now.toISOString(),
-      })
-      .eq("id", userId)
-    if (resetError) {
-      throw new Error(
-        "Failed to reset special agent count: " + resetError.message
-      )
-    }
-  }
-
-  if (usageCount >= DAILY_SPECIAL_AGENT_LIMIT) {
-    const err = new SpecialAgentLimitError()
-    throw err
-  }
-
-  return {
-    usageCount,
-    limit: DAILY_SPECIAL_AGENT_LIMIT,
-  }
-}
-
-export async function incrementSpecialAgentUsage(
-  supabase: SupabaseClient,
-  userId: string,
-  currentCount?: number
-): Promise<void> {
-  let specialAgentCount: number
-
-  if (typeof currentCount === "number") {
-    specialAgentCount = currentCount
-  } else {
-    const { data, error } = await supabase
-      .from("users")
-      .select("special_agent_count")
-      .eq("id", userId)
-      .maybeSingle()
-
-    if (error || !data) {
-      throw new Error(
-        "Failed to fetch special agent count: " +
-          (error?.message || "Not found")
-      )
-    }
-
-    specialAgentCount = data.special_agent_count || 0
-  }
-
-  const { error: updateError } = await supabase
-    .from("users")
-    .update({
-      special_agent_count: specialAgentCount + 1,
-      last_active_at: new Date().toISOString(),
-    })
-    .eq("id", userId)
-
-  if (updateError) {
-    throw new Error(
-      "Failed to increment special agent count: " + updateError.message
-    )
-  }
-}
-
-/**
- * Updates the agent for an existing chat
- */
-export async function updateChatAgent(
-  userId: string,
-  chatId: string,
-  agentId: string | null,
-  isAuthenticated: boolean
-) {
-  try {
-    const res = await fetchClient(API_ROUTE_UPDATE_CHAT_AGENT, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ userId, chatId, agentId, isAuthenticated }),
-    })
-    const responseData = await res.json()
-
-    if (!res.ok) {
-      throw new Error(
-        responseData.error ||
-          `Failed to update chat agent: ${res.status} ${res.statusText}`
-      )
-    }
-
-    return responseData
-  } catch (error) {
-    console.error("Error updating chat agent:", error)
-    throw error
-  }
-}
diff --git a/lib/chat-store/chats/api.ts b/lib/chat-store/chats/api.ts
index dc2155713..a6adf0c4d 100644
--- a/lib/chat-store/chats/api.ts
+++ b/lib/chat-store/chats/api.ts
@@ -1,4 +1,3 @@
-import { filterLocalAgentId } from "@/lib/agents/utils"
 import { readFromIndexedDB, writeToIndexedDB } from "@/lib/chat-store/persist"
 import type { Chat, Chats } from "@/lib/chat-store/types"
 import { createClient } from "@/lib/supabase/client"
@@ -7,7 +6,6 @@ import { MODEL_DEFAULT } from "../../config"
 import { fetchClient } from "../../fetch"
 import {
   API_ROUTE_CREATE_CHAT,
-  API_ROUTE_UPDATE_CHAT_AGENT,
   API_ROUTE_UPDATE_CHAT_MODEL,
 } from "../../routes"
 
@@ -190,29 +188,22 @@ export async function createNewChat(
   title?: string,
   model?: string,
   isAuthenticated?: boolean,
-  agentId?: string,
   projectId?: string
 ): Promise<Chats> {
   try {
-    // Note: Local agent IDs are filtered out at the API level (create-chat route)
     const payload: {
       userId: string
       title: string
       model: string
       isAuthenticated?: boolean
-      agentId?: string
       projectId?: string
     } = {
       userId,
-      title: title || (agentId ? `Conversation with agent` : "New Chat"),
+      title: title || "New Chat",
       model: model || MODEL_DEFAULT,
       isAuthenticated,
     }
 
-    if (agentId) {
-      payload.agentId = agentId
-    }
-
     if (projectId) {
       payload.projectId = projectId
     }
@@ -234,7 +225,6 @@ export async function createNewChat(
       title: responseData.chat.title,
       created_at: responseData.chat.created_at,
       model: responseData.chat.model,
-      agent_id: responseData.chat.agent_id,
       user_id: responseData.chat.user_id,
       public: responseData.chat.public,
       updated_at: responseData.chat.updated_at,
@@ -248,45 +238,3 @@ export async function createNewChat(
     throw error
   }
 }
-
-export async function updateChatAgent(
-  userId: string,
-  chatId: string,
-  agentId: string | null,
-  isAuthenticated: boolean
-) {
-  try {
-    // Filter out local agent IDs for database operations
-    const dbAgentId = filterLocalAgentId(agentId)
-
-    const res = await fetchClient(API_ROUTE_UPDATE_CHAT_AGENT, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        userId,
-        chatId,
-        agentId: dbAgentId,
-        isAuthenticated,
-      }),
-    })
-    const responseData = await res.json()
-
-    if (!res.ok) {
-      throw new Error(
-        responseData.error ||
-          `Failed to update chat agent: ${res.status} ${res.statusText}`
-      )
-    }
-
-    const all = await getCachedChats()
-    const updated = (all as Chats[]).map((c) =>
-      c.id === chatId ? { ...c, agent_id: dbAgentId } : c
-    )
-    await writeToIndexedDB("chats", updated)
-
-    return responseData
-  } catch (error) {
-    console.error("Error updating chat agent:", error)
-    throw error
-  }
-}
diff --git a/lib/chat-store/chats/provider.tsx b/lib/chat-store/chats/provider.tsx
index 6aa897456..c491f36f7 100644
--- a/lib/chat-store/chats/provider.tsx
+++ b/lib/chat-store/chats/provider.tsx
@@ -9,7 +9,6 @@ import {
   deleteChat as deleteChatFromDb,
   fetchAndCacheChats,
   getCachedChats,
-  updateChatAgent as updateChatAgentFromDb,
   updateChatModel as updateChatModelFromDb,
   updateChatTitle,
 } from "./api"
@@ -31,18 +30,11 @@ interface ChatsContextType {
     model?: string,
     isAuthenticated?: boolean,
     systemPrompt?: string,
-    agentId?: string,
     projectId?: string
   ) => Promise<Chats | undefined>
   resetChats: () => Promise<void>
   getChatById: (id: string) => Chats | undefined
   updateChatModel: (id: string, model: string) => Promise<void>
-  updateChatAgent: (
-    userId: string,
-    chatId: string,
-    agentId: string | null,
-    isAuthenticated: boolean
-  ) => Promise<void>
   bumpChat: (id: string) => Promise<void>
 }
 const ChatsContext = createContext<ChatsContextType | null>(null)
@@ -129,7 +121,6 @@ export function ChatsProvider({
     model?: string,
     isAuthenticated?: boolean,
     systemPrompt?: string,
-    agentId?: string,
     projectId?: string
   ) => {
     if (!userId) return
@@ -138,11 +129,10 @@ export function ChatsProvider({
     const optimisticId = `optimistic-${Date.now().toString()}`
     const optimisticChat = {
       id: optimisticId,
-      title: title || (agentId ? `Conversation with agent` : "New Chat"),
+      title: title || "New Chat",
       created_at: new Date().toISOString(),
       model: model || MODEL_DEFAULT,
       system_prompt: systemPrompt || SYSTEM_PROMPT_DEFAULT,
-      agent_id: agentId || null,
       user_id: userId,
       public: true,
       updated_at: new Date().toISOString(),
@@ -156,7 +146,6 @@ export function ChatsProvider({
         title,
         model,
         isAuthenticated,
-        agentId,
         projectId
       )
 
@@ -192,15 +181,6 @@ export function ChatsProvider({
     }
   }
 
-  const updateChatAgent = async (
-    userId: string,
-    chatId: string,
-    agentId: string | null,
-    isAuthenticated: boolean
-  ) => {
-    await updateChatAgentFromDb(userId, chatId, agentId, isAuthenticated)
-  }
-
   const bumpChat = async (id: string) => {
     const prev = [...chats]
     const updatedChatWithNewUpdatedAt = prev.map((c) =>
@@ -224,7 +204,6 @@ export function ChatsProvider({
         resetChats,
         getChatById,
         updateChatModel,
-        updateChatAgent,
         bumpChat,
         isLoading,
       }}
diff --git a/lib/config.ts b/lib/config.ts
index 2455397a8..4619b77c4 100644
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -12,7 +12,6 @@ export const NON_AUTH_DAILY_MESSAGE_LIMIT = 5
 export const AUTH_DAILY_MESSAGE_LIMIT = 1000
 export const REMAINING_QUERY_ALERT_THRESHOLD = 2
 export const DAILY_FILE_UPLOAD_LIMIT = 5
-export const DAILY_SPECIAL_AGENT_LIMIT = 5
 export const DAILY_LIMIT_PRO_MODELS = 500
 
 export const FREE_MODELS_IDS = [
@@ -117,11 +116,3 @@ export const SUGGESTIONS = [
 export const SYSTEM_PROMPT_DEFAULT = `You are Zola, a thoughtful and clear assistant. Your tone is calm, minimal, and human. You write with intention—never too much, never too little. You avoid clichés, speak simply, and offer helpful, grounded answers. When needed, you ask good questions. You don’t try to impress—you aim to clarify. You may use metaphors if they bring clarity, but you stay sharp and sincere. You're here to help the user think clearly and move forward, not to overwhelm or overperform.`
 
 export const MESSAGE_MAX_LENGTH = 10000
-
-export const CURATED_AGENTS_SLUGS = [
-  "github/ibelick/prompt-kit",
-  "github/ibelick/zola",
-  "github/shadcn/ui",
-  "tweet-vibe-checker",
-  "blog-draft",
-]
diff --git a/lib/routes.ts b/lib/routes.ts
index 8c9402d2c..ac92ed9c1 100644
--- a/lib/routes.ts
+++ b/lib/routes.ts
@@ -3,6 +3,3 @@ export const API_ROUTE_CREATE_CHAT = "/api/create-chat"
 export const API_ROUTE_CREATE_GUEST = "/api/create-guest"
 export const API_ROUTE_UPDATE_CHAT_MODEL = "/api/update-chat-model"
 export const API_ROUTE_CSRF = "/api/csrf"
-export const API_ROUTE_CREATE_AGENT = "/api/create-agent"
-export const API_ROUTE_DELETE_AGENT = "/api/delete-agent"
-export const API_ROUTE_UPDATE_CHAT_AGENT = "/api/update-chat-agent"
diff --git a/lib/tools/exa/crawl/config.ts b/lib/tools/exa/crawl/config.ts
deleted file mode 100644
index 7769228bb..000000000
--- a/lib/tools/exa/crawl/config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const config = {
-  label: "Crawl URL",
-  description:
-    "Extract content from a specific URL using Exa. Useful for articles, PDFs, or webpages when you know the exact URL.",
-  envVars: ["EXA_API_KEY"],
-  optionalVars: [],
-  docsUrl: "https://docs.exa.ai",
-}
diff --git a/lib/tools/exa/crawl/run.ts b/lib/tools/exa/crawl/run.ts
deleted file mode 100644
index 2dbfda064..000000000
--- a/lib/tools/exa/crawl/run.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-type Input = {
-  url: string
-}
-
-export async function runCrawl(input: Input) {
-  const { url } = input
-
-  if (!process.env.EXA_API_KEY) {
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: "Missing EXA_API_KEY in .env.local.",
-        },
-      ],
-      isError: true,
-    }
-  }
-
-  try {
-    const res = await fetch("https://api.exa.ai/contents", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-api-key": process.env.EXA_API_KEY,
-      },
-      body: JSON.stringify({
-        ids: [url],
-        text: true,
-        livecrawl: "always",
-      }),
-    })
-
-    if (!res.ok) {
-      const errData = await res.json()
-      throw new Error(errData?.message || "Unknown Exa error")
-    }
-
-    const data = await res.json()
-
-    if (!data?.results?.length) {
-      return {
-        content: [
-          {
-            type: "text" as const,
-            text: "No content found at the specified URL. Please check the URL and try again.",
-          },
-        ],
-      }
-    }
-
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: JSON.stringify(data, null, 2),
-        },
-      ],
-    }
-  } catch (err: unknown) {
-    const errorMessage = err instanceof Error ? err.message : String(err)
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: `Crawling error: ${errorMessage}`,
-        },
-      ],
-      isError: true,
-    }
-  }
-}
diff --git a/lib/tools/exa/crawl/tool.ts b/lib/tools/exa/crawl/tool.ts
deleted file mode 100644
index 0fde50b45..000000000
--- a/lib/tools/exa/crawl/tool.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { tool } from "ai"
-import { z } from "zod"
-import { runCrawl } from "./run"
-
-export const crawlTool = tool({
-  description:
-    "Extract content from a specific URL using Exa. Useful for articles, PDFs, or any webpage when you know the exact URL.",
-  parameters: z.object({
-    url: z.string().url().describe("The URL to crawl"),
-  }),
-  async execute({ url }) {
-    return await runCrawl({ url })
-  },
-})
diff --git a/lib/tools/exa/imageSearch/config.ts b/lib/tools/exa/imageSearch/config.ts
deleted file mode 100644
index 28605d76c..000000000
--- a/lib/tools/exa/imageSearch/config.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const config = {
-  label: "Image Search",
-  description: "Search for 2–3 relevant images using Exa for visual display.",
-  envVars: ["EXA_API_KEY"],
-  docsUrl: "https://docs.exa.ai",
-}
diff --git a/lib/tools/exa/imageSearch/run.ts b/lib/tools/exa/imageSearch/run.ts
deleted file mode 100644
index c0ccd9c96..000000000
--- a/lib/tools/exa/imageSearch/run.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-type Input = {
-  query: string
-  numResults?: number
-}
-
-export async function runImageSearch(input: Input) {
-  const { query, numResults = 3 } = input
-
-  if (!process.env.EXA_API_KEY) {
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: "Missing EXA_API_KEY in .env.local.",
-        },
-      ],
-      isError: true,
-    }
-  }
-
-  try {
-    const res = await fetch("https://api.exa.ai/search", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-api-key": process.env.EXA_API_KEY,
-      },
-      body: JSON.stringify({
-        query,
-        type: "auto",
-        numResults,
-        contents: {
-          text: { maxCharacters: 200 },
-          livecrawl: "always",
-        },
-      }),
-    })
-
-    if (!res.ok) {
-      const error = await res.json()
-      throw new Error(error?.message || "Unknown error from Exa")
-    }
-
-    const data = await res.json()
-
-    const imageResults = data.results
-      .map((r: { title: string; image?: string; imageUrl?: string; url: string }) => ({
-        title: r.title,
-        imageUrl: r.image || r.imageUrl || null,
-        sourceUrl: r.url,
-      }))
-      .filter((r: { imageUrl: string | null }) => r.imageUrl)
-      .slice(0, numResults)
-
-    return {
-      content: [
-        {
-          type: "images" as const,
-          results: imageResults,
-        },
-      ],
-    }
-  } catch (err: unknown) {
-    const errorMessage = err instanceof Error ? err.message : String(err)
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: `Image search error: ${errorMessage}`,
-        },
-      ],
-      isError: true,
-    }
-  }
-}
diff --git a/lib/tools/exa/imageSearch/tool.ts b/lib/tools/exa/imageSearch/tool.ts
deleted file mode 100644
index 5ee2adf05..000000000
--- a/lib/tools/exa/imageSearch/tool.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { tool } from "ai"
-import { z } from "zod"
-import { runImageSearch } from "./run"
-
-export const imageSearchTool = tool({
-  description: "Search for images using Exa.",
-  parameters: z.object({
-    query: z.string().describe("The topic to search for images"),
-    numResults: z
-      .number()
-      .optional()
-      .describe("Max number of images (default 3)"),
-  }),
-  async execute({ query, numResults }) {
-    return await runImageSearch({ query, numResults })
-  },
-})
diff --git a/lib/tools/exa/index.ts b/lib/tools/exa/index.ts
deleted file mode 100644
index 434cbbd75..000000000
--- a/lib/tools/exa/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { config as crawlConfig } from "./crawl/config"
-import { crawlTool } from "./crawl/tool"
-import { config as imageSearchConfig } from "./imageSearch/config"
-import { imageSearchTool } from "./imageSearch/tool"
-import { config as webSearchConfig } from "./webSearch/config"
-import { webSearchTool } from "./webSearch/tool"
-
-const isAvailable = (envVars: string[]) => {
-  return envVars.every((v) => !!process.env[v])
-}
-
-export const exaTools = {
-  exaWebSearch: {
-    ...webSearchTool,
-    isAvailable: () => isAvailable(webSearchConfig.envVars),
-  },
-  exaCrawl: {
-    ...crawlTool,
-    isAvailable: () => isAvailable(crawlConfig.envVars),
-  },
-  exaImageSearch: {
-    ...imageSearchTool,
-    isAvailable: () => isAvailable(imageSearchConfig.envVars),
-  },
-}
diff --git a/lib/tools/exa/webSearch/config.ts b/lib/tools/exa/webSearch/config.ts
deleted file mode 100644
index 78c9ac26c..000000000
--- a/lib/tools/exa/webSearch/config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export const config = {
-  label: "Web Search",
-  description:
-    "Search the web using Exa. Returns relevant results with live crawling.",
-  envVars: ["EXA_API_KEY"],
-  optionalVars: ["EXA_INDEX_ID"],
-  docsUrl: "https://docs.exa.ai",
-}
diff --git a/lib/tools/exa/webSearch/run.ts b/lib/tools/exa/webSearch/run.ts
deleted file mode 100644
index f28ae4a89..000000000
--- a/lib/tools/exa/webSearch/run.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-type Input = {
-  query: string
-  numResults?: number
-}
-
-export async function runWebSearch(input: Input) {
-  const { query, numResults = 5 } = input
-
-  if (!process.env.EXA_API_KEY) {
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: "Missing EXA_API_KEY in .env.local.",
-        },
-      ],
-      isError: true,
-    }
-  }
-
-  try {
-    const res = await fetch("https://api.exa.ai/search", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Accept: "application/json",
-        "x-api-key": process.env.EXA_API_KEY,
-      },
-      body: JSON.stringify({
-        query,
-        type: "auto",
-        numResults,
-        contents: {
-          text: {
-            maxCharacters: 12000,
-          },
-          livecrawl: "always",
-        },
-      }),
-    })
-
-    if (!res.ok) {
-      const error = await res.json()
-      throw new Error(error?.message || "Unknown error from Exa")
-    }
-
-    const data = await res.json()
-
-    if (!data?.results?.length) {
-      return {
-        content: [
-          {
-            type: "text" as const,
-            text: "No search results found.",
-          },
-        ],
-      }
-    }
-
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: JSON.stringify(data.results, null, 2),
-        },
-      ],
-    }
-  } catch (err: unknown) {
-    const errorMessage = err instanceof Error ? err.message : String(err)
-    return {
-      content: [
-        {
-          type: "text" as const,
-          text: `Search error: ${errorMessage}`,
-        },
-      ],
-      isError: true,
-    }
-  }
-}
diff --git a/lib/tools/exa/webSearch/tool.ts b/lib/tools/exa/webSearch/tool.ts
deleted file mode 100644
index f67134599..000000000
--- a/lib/tools/exa/webSearch/tool.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { tool } from "ai"
-import { z } from "zod"
-import { runWebSearch } from "./run"
-
-export const webSearchTool = tool({
-  description:
-    "Search the web using Exa. Returns relevant results with live crawling.",
-  parameters: z.object({
-    query: z.string().describe("Search query"),
-    numResults: z
-      .number()
-      .optional()
-      .describe("Number of results (default: 5)"),
-  }),
-  async execute({ query, numResults }) {
-    return await runWebSearch({ query, numResults })
-  },
-})
diff --git a/lib/tools/index.ts b/lib/tools/index.ts
deleted file mode 100644
index 750971e28..000000000
--- a/lib/tools/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { exaTools } from "./exa/index"
-
-export const TOOL_REGISTRY = {
-  ...exaTools,
-  // future: ...githubTools, ...huggingfaceTools, etc.
-}
-
-export type ToolId = keyof typeof TOOL_REGISTRY
-
-export const getAvailableTools = () =>
-  Object.entries(TOOL_REGISTRY)
-    .filter(([, tool]) => tool.isAvailable)
-    .map(([id, tool]) => ({ ...tool, id }))
-
-export const getAllTools = () =>
-  Object.entries(TOOL_REGISTRY).map(([id, tool]) => ({
-    ...tool,
-    id,
-  }))